|
From: <sv...@de...> - 2005-06-22 16:01:57
|
Author: pcamacho
Date: 2005-06-22 12:02:01 -0400 (Wed, 22 Jun 2005)
New Revision: 1386
Modified:
humano2/trunk/core/schema/pgsql/pgsql-1-metadata.sql
humano2/trunk/web/portal/site/js/iframe.js
humano2/trunk/web/portal/site/viewpertinencelist.aspx
humano2/trunk/web/portal/site/viewpertinencelist.aspx.cs
humano2/trunk/web/portal/site/xsl/pertinence.xsl
Log:
FIX: bug #191
Now pertinence have a width and height property configurable in the build=
er. Remark: to do the thing work, the height=20
and width have to be set in the iframe and in the listbox of the pertinen=
ce.
Modified: humano2/trunk/core/schema/pgsql/pgsql-1-metadata.sql
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- humano2/trunk/core/schema/pgsql/pgsql-1-metadata.sql 2005-06-22 14:17=
:06 UTC (rev 1385)
+++ humano2/trunk/core/schema/pgsql/pgsql-1-metadata.sql 2005-06-22 16:02=
:01 UTC (rev 1386)
@@ -141,6 +141,8 @@
"parentPertinence" Integer, -- Padre de la relacion.
"visualAttrib" Integer, -- Attributo que se trae desde la tabla fora=
nea. Si es null se trae la llave del metadata
"filterView" Text, -- Un filter sobre los pertinences que se muestr=
an. -- FIXME: Is this the cleanst solution?
+ "widthPertinence" Integer, -- Width to display the pert=
inence
+ "heightPertinence" Integer, -- Height to display
primary key ("id_entity")
);
=20
@@ -390,6 +392,8 @@
INSERT INTO "entity" ("id_entity","domainId","class","delDate","status"=
) VALUES (154,10,8,NULL,NULL);
INSERT INTO "entity" ("id_entity","domainId","class","delDate","status"=
) VALUES (155,10,8,NULL,NULL);
INSERT INTO "entity" ("id_entity","domainId","class","delDate","status"=
) VALUES (156,10,153,NULL,NULL);
+INSERT INTO "entity" ("id_entity","domainId","class","delDate","status"=
) VALUES (157,10,9,NULL,NULL);
+INSERT INTO "entity" ("id_entity","domainId","class","delDate","status"=
) VALUES (158,10,9,NULL,NULL);
=20
=20
INSERT INTO "attribute" ("id_entity","classId","sysAttName","attName","=
order","isObligatory","isActive","isSearchable","isEditable","isSelfLooku=
p","isPrimary","isUnique","protection","display") VALUES (4,1,'parentCla=
ssType','parentId',4,'t','t','f','f','f','f','f','t',null);
@@ -469,6 +473,10 @@
INSERT INTO "attribute" ("id_entity","classId","sysAttName","attName","=
order","isObligatory","isActive","isSearchable","isEditable","isSelfLooku=
p","isPrimary","isUnique","protection","display") VALUES (150,149,'xslt'=
,'xslt',0,'t','t','f','t','f','t','f','t',null);
INSERT INTO "attribute" ("id_entity","classId","sysAttName","attName","=
order","isObligatory","isActive","isSearchable","isEditable","isSelfLooku=
p","isPrimary","isUnique","protection","display") VALUES (151,149,'attTy=
peRef','attTypeRef',0,'t','t','f','t','f','f','f','t',null);
INSERT INTO "attribute" ("id_entity","classId","sysAttName","attName","=
order","isObligatory","isActive","isSearchable","isEditable","isSelfLooku=
p","isPrimary","isUnique","protection","display") VALUES (152,81,'filter=
View','filterView',0,'f','t','f','f','f','f','f','t',null);
+
+INSERT INTO "attribute" ("id_entity","classId","sysAttName","attName","=
order","isObligatory","isActive","isSearchable","isEditable","isSelfLooku=
p","isPrimary","isUnique","protection","display") VALUES (157,81,'widthP=
ertinence','width',0,'f','t','f','t','f','f','f','t',null);
+INSERT INTO "attribute" ("id_entity","classId","sysAttName","attName","=
order","isObligatory","isActive","isSearchable","isEditable","isSelfLooku=
p","isPrimary","isUnique","protection","display") VALUES (158,81,'height=
Pertinence','height',0,'f','t','f','t','f','f','f','t',null);
+
INSERT INTO "attribute" ("id_entity","classId","sysAttName","attName","=
order","isObligatory","isActive","isSearchable","isEditable","isSelfLooku=
p","isPrimary","isUnique","protection","display") VALUES (154,153,'versi=
onItem','versionItem',0,'t','t','f','f','f','t','t','f',null);
INSERT INTO "attribute" ("id_entity","classId","sysAttName","attName","=
order","isObligatory","isActive","isSearchable","isEditable","isSelfLooku=
p","isPrimary","isUnique","protection","display") VALUES (155,153,'versi=
onValue','versionValue',0,'t','t','f','f','f','f','f','f',null);
=20
@@ -486,8 +494,9 @@
INSERT INTO "numeric" ("id_entity","decimals","max","min","default") V=
ALUES (54,0,50, 1, 7); -- text rows
INSERT INTO "numeric" ("id_entity","decimals","max","min","default") V=
ALUES (77,0,NULL,NULL,NULL);
INSERT INTO "numeric" ("id_entity","decimals","max","min","default") V=
ALUES (83,2,10,0,1);
+INSERT INTO "numeric" ("id_entity","decimals","max","min","default") V=
ALUES (157,4,NULL,NULL,200); -- pertinence width
+INSERT INTO "numeric" ("id_entity","decimals","max","min","default") V=
ALUES (158,4,NULL,NULL,200); -- pertinence height
=20
-
INSERT INTO "textline" ("id_entity","maxLength","minLength","dispSize")=
VALUES (16,50,1,20);
INSERT INTO "textline" ("id_entity","maxLength","minLength","dispSize")=
VALUES (18,25,1,25);
INSERT INTO "textline" ("id_entity","maxLength","minLength","dispSize")=
VALUES (19,10,6,20);
Modified: humano2/trunk/web/portal/site/js/iframe.js
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- humano2/trunk/web/portal/site/js/iframe.js 2005-06-22 14:17:06 UTC (r=
ev 1385)
+++ humano2/trunk/web/portal/site/js/iframe.js 2005-06-22 16:02:01 UTC (r=
ev 1386)
@@ -19,7 +19,7 @@
return now.getTime();
}
=20
-function toggleIFrame(nframe,urlToLoad)=20
+function toggleIFrame(nframe,urlToLoad)
{
var f =3D document.getElementById(nframe); // The iframe object
urlToLoad +=3D "¤tTime=3D" + currentTime();
Modified: humano2/trunk/web/portal/site/viewpertinencelist.aspx
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- humano2/trunk/web/portal/site/viewpertinencelist.aspx 2005-06-22 14:1=
7:06 UTC (rev 1385)
+++ humano2/trunk/web/portal/site/viewpertinencelist.aspx 2005-06-22 16:0=
2:01 UTC (rev 1386)
@@ -1,8 +1,8 @@
<%@ Page language=3D"c#" Codebehind=3D"viewpertinencelist.aspx.cs" AutoE=
ventWireup=3D"false" Inherits=3D"Portal.site.ViewPertinenceList" %>
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" >
<!-- $Id$ -->
-<HTML>
- <HEAD>
+<html>
+ <head>
<title>ViewPertinenceList</title>
<script language=3D"javascript">
function sendData()
@@ -47,7 +47,7 @@
</HEAD>
<body leftMargin=3D"0" topMargin=3D"0" marginheight=3D"0" marginwidth=3D=
"0">
<form id=3D"Form1" method=3D"post" runat=3D"server"> <!-- FIXME: // Wi=
dth and height to be read from attributes -->
- <asp:listbox id=3D"ListBox1" runat=3D"server" style=3D"height:168px;w=
idth:192px;"></asp:listbox>
+ <asp:listbox id=3D"ListBox1" runat=3D"server" style=3D""></asp:listbo=
x>
</form>
</body>
</HTML>
Modified: humano2/trunk/web/portal/site/viewpertinencelist.aspx.cs
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- humano2/trunk/web/portal/site/viewpertinencelist.aspx.cs 2005-06-22 1=
4:17:06 UTC (rev 1385)
+++ humano2/trunk/web/portal/site/viewpertinencelist.aspx.cs 2005-06-22 1=
6:02:01 UTC (rev 1386)
@@ -95,27 +95,39 @@
displayColumn =3D "0,"+columnPrimary;
}
=20
- DataTable dtParam =3D this.makeDataTableInViewTools();
- DataRow dr =3D dtParam.NewRow();
- =09
- //dr["columna"] =3D "0,"+columnPrimary;
- dr["columna"] =3D displayColumn;
- =09
- if(filterView !=3D 0)=20
- {
-// dr["filtros"] =3D viewColumn+"|4|'"+filterValue+"'|0|0";
- dr["filtros"] =3D viewFilter;
- }
- =09
- dtParam.Rows.Add(dr); =09
- =09
- dt1 =3D dbAdapter.GetDataTableView(dtParam, idClass);
- =20
- this.ListBox1.DataValueField =3D "id_entity";
- this.ListBox1.DataTextField =3D dt1.Columns[1].ColumnName;//"col"+c=
olumnPrimary;
- this.ListBox1.DataSource =3D dt1;
- this.ListBox1.DataBind();
- this.ListBox1.Items.Add("-- Nothing --");
+ DataTable dtParam =3D this.makeDataTableInViewTools();
+ DataRow dr =3D dtParam.NewRow();
+ =20
+ dr["columna"] =3D displayColumn;
+ =20
+ if(filterView !=3D 0)=20
+ {
+ dr["filtros"] =3D viewFilter;
+ }
+ =20
+ dtParam.Rows.Add(dr); =09
+ =20
+ dt1 =3D dbAdapter.GetDataTableView(dtParam, idClass);
+ =20
+ this.ListBox1.DataValueField =3D "id_entity";
+ this.ListBox1.DataTextField =3D dt1.Columns[1].ColumnNam=
e;//"col"+columnPrimary;
+ this.ListBox1.DataSource =3D dt1;
+ this.ListBox1.DataBind();
+ this.ListBox1.Items.Add("-- Nothing --");
+ =20
+ string width =3D Request["width"];
+ //Adjust width and height
+ if(width.Length > 0)
+ {
+ this.ListBox1.Width =3D Convert.ToInt32(width);
+ }
+ =20
+ string height =3D Request["height"];
+ //Adjust width and height
+ if(height.Length > 0)
+ {
+ this.ListBox1.Height =3D Convert.ToInt32(height);
+ }
}
}
=20
Modified: humano2/trunk/web/portal/site/xsl/pertinence.xsl
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- humano2/trunk/web/portal/site/xsl/pertinence.xsl 2005-06-22 14:17:06 =
UTC (rev 1385)
+++ humano2/trunk/web/portal/site/xsl/pertinence.xsl 2005-06-22 16:02:01 =
UTC (rev 1386)
@@ -9,7 +9,9 @@
<xsl:variable name=3D"sysAttName" select=3D"/page/classInstance/struct=
ure/attribute[id_entity=3D$idEntity]/sysAttName"/>
<xsl:variable name=3D"isEditable" select=3D"/page/classInstance/=
structure/attribute[id_entity=3D$idEntity]/isEditable"/> =
=09
<xsl:variable name=3D"filterView" select=3D"/page/classInstance/=
structure/pertinence[id_entity=3D$idEntity]/filterView"/> =
=09
- =20
+ <xsl:variable name=3D"widthPertinence" select=3D"/page/classInst=
ance/structure/pertinence[id_entity=3D$idEntity]/widthPertinence"/> =
=09
+ <xsl:variable name=3D"heightPertinence" select=3D"/page/classIns=
tance/structure/pertinence[id_entity=3D$idEntity]/heightPertinence"/> =
=09
+ =20
<xsl:choose>=09
<xsl:when test=3D"/page/flagaction=3D'Read'">
<a href=3D"instance.aspx?id_entity=3D{$data}&display=3DreadXslt.=
aspx&action=3Dread" target=3D"_blank">
@@ -26,10 +28,10 @@
</td>
<td valign=3D"center">
<xsl:if test=3D"not($filterView)">
- <img src=3D"img/arrowDown.gif" borde=
r=3D"0" onclick=3D"CurrentIframe=3D'{concat('frame_',$idEntity)}';toggleI=
Frame('{concat('frame_',$idEntity)}','viewpertinencelist.aspx?idClass=3D{=
$idClass}&idEntity=3D{$idEntity}&sysAttName=3D{$sysAttName}');"><=
/img>
+ <img src=3D"img/arrowDown.gif" borde=
r=3D"0" onclick=3D"CurrentIframe=3D'{concat('frame_',$idEntity)}';toggleI=
Frame('{concat('frame_',$idEntity)}','viewpertinencelist.aspx?idClass=3D{=
$idClass}&idEntity=3D{$idEntity}&sysAttName=3D{$sysAttName}&w=
idth=3D{$widthPertinence}&height=3D{$heightPertinence}');"></img>
</xsl:if>=20
<xsl:if test=3D"$filterView">
- <img src=3D"img/arrowDown.gif" borde=
r=3D"0" onclick=3D"CurrentIframe=3D'{concat('frame_',$idEntity)}';toggleI=
FrameWithFilter('{concat('frame_',$idEntity)}','viewpertinencelist.aspx?i=
dClass=3D{$idClass}&idEntity=3D{$idEntity}&sysAttName=3D{$sysAttN=
ame}', '{$filterView}');"></img>
+ <img src=3D"img/arrowDown.gif" borde=
r=3D"0" onclick=3D"CurrentIframe=3D'{concat('frame_',$idEntity)}';toggleI=
FrameWithFilter('{concat('frame_',$idEntity)}','viewpertinencelist.aspx?i=
dClass=3D{$idClass}&idEntity=3D{$idEntity}&sysAttName=3D{$sysAttN=
ame}&width=3D{$widthPertinence}&height=3D{$heightPertinence}', '{=
$filterView}');"></img>
</xsl:if>=20
<img src=3D"img/1x1.gif" border=3D"0" w=
idth=3D"22" heigth=3D"22"></img>
</td>
@@ -37,7 +39,7 @@
</table>=09
<!--<input type=3D"button" name=3D"aaa" value=3D"Ver=
" onclick=3D"toggleIFrame('{concat('frame_',$idEntity)}','viewpertinencel=
ist.aspx?idClass=3D{$idClass}&idEntity=3D{$idEntity}&sysAttName=3D=
{$sysAttName}');" />-->
<input type=3D"hidden" name=3D"{$sysAttName}" value=3D=
"{$data}"/>
- <iframe scrolling=3D"no" id=3D"{concat('frame_',$idE=
ntity)}" src=3D"" style=3D"visibility: hidden; position:absolute;" width=3D=
"190" height=3D"165" frameborder=3D"0" align=3D"middle"></iframe>
+ <iframe scrolling=3D"no" id=3D"{concat('frame_',$idE=
ntity)}" src=3D"" style=3D"visibility: hidden; position:absolute;" width=3D=
"{$widthPertinence}" height=3D"{$heightPertinence}" frameborder=3D"0" al=
ign=3D"middle"></iframe>
</xsl:if>
=20
<xsl:if test=3D"not(string($isEditable)=3D'true')"> =20
@@ -55,17 +57,17 @@
</td>
<td valign=3D"center">
<xsl:if test=3D"not($filterView)">
- <img src=3D"img/arrowDown.gif" borde=
r=3D"0" onclick=3D"CurrentIframe=3D'{concat('frame_',$idEntity)}';toggleI=
Frame('{concat('frame_',$idEntity)}','viewpertinencelist.aspx?idClass=3D{=
$idClass}&idEntity=3D{$idEntity}&sysAttName=3D{$sysAttName}');"><=
/img>
+ <img src=3D"img/arrowDown.gif" borde=
r=3D"0" onclick=3D"CurrentIframe=3D'{concat('frame_',$idEntity)}';toggleI=
Frame('{concat('frame_',$idEntity)}','viewpertinencelist.aspx?idClass=3D{=
$idClass}&idEntity=3D{$idEntity}&sysAttName=3D{$sysAttName}&w=
idth=3D{$widthPertinence}&height=3D{$heightPertinence}');"></img>
</xsl:if>=20
<xsl:if test=3D"$filterView">
- <img src=3D"img/arrowDown.gif" borde=
r=3D"0" onclick=3D"CurrentIframe=3D'{concat('frame_',$idEntity)}';toggleI=
FrameWithFilter('{concat('frame_',$idEntity)}','viewpertinencelist.aspx?i=
dClass=3D{$idClass}&idEntity=3D{$idEntity}&sysAttName=3D{$sysAttN=
ame}', '{$filterView}');"></img>
+ <img src=3D"img/arrowDown.gif" borde=
r=3D"0" onclick=3D"CurrentIframe=3D'{concat('frame_',$idEntity)}';toggleI=
FrameWithFilter('{concat('frame_',$idEntity)}','viewpertinencelist.aspx?i=
dClass=3D{$idClass}&idEntity=3D{$idEntity}&sysAttName=3D{$sysAttN=
ame}&width=3D{$widthPertinence}&height=3D{$heightPertinence}', '{=
$filterView}');"></img>
</xsl:if>=20
<img src=3D"img/1x1.gif" border=3D"0" w=
idth=3D"22" heigth=3D"22"></img>
</td>
</tr>
</table>=09
<input type=3D"hidden" name=3D"{$sysAttName}" />
- <iframe id=3D"{concat('frame_',$idEntity)}" src=3D""=
style=3D"visibility: hidden; position:absolute;" scrolling=3D"no" width=3D=
"190" height=3D"165" frameborder=3D"0" align=3D"middle" ></iframe>
+ <iframe id=3D"{concat('frame_',$idEntity)}" src=3D""=
style=3D"visibility: hidden; position:absolute;" scrolling=3D"no" width=3D=
"{$widthPertinence}" height=3D"{$heightPertinence}" frameborder=3D"0" ali=
gn=3D"middle" ></iframe>
</xsl:if>
</xsl:when>
</xsl:choose>
|