|
From: <sv...@de...> - 2005-06-13 23:09:29
|
Author: pcamacho
Date: 2005-06-13 19:08:47 -0400 (Mon, 13 Jun 2005)
New Revision: 1317
Modified:
humano2/trunk/web/builder/site/xsl/createreport.xsl
humano2/trunk/web/builder/site/xsl/createview.xsl
Log:
FIX: view can get back attributes when updating (creation of view in buil=
der).
Modified: humano2/trunk/web/builder/site/xsl/createreport.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/builder/site/xsl/createreport.xsl 2005-06-13 22:51:=
14 UTC (rev 1316)
+++ humano2/trunk/web/builder/site/xsl/createreport.xsl 2005-06-13 23:08:=
47 UTC (rev 1317)
@@ -28,8 +28,6 @@
<!-- Here we create an array and use it as parameter for For=
m class constructor -->
<script language=3D"Javascript">
=20
- //var ReportParams =3D new ReportParams(new Array(),null=
,null); //To be removed
- =20
////////////////////////
//The form
var formArray =3D new Array();
Modified: humano2/trunk/web/builder/site/xsl/createview.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/builder/site/xsl/createview.xsl 2005-06-13 22:51:14=
UTC (rev 1316)
+++ humano2/trunk/web/builder/site/xsl/createview.xsl 2005-06-13 23:08:47=
UTC (rev 1317)
@@ -95,45 +95,95 @@
var attribsArr =3D new Array();
var item;
var i=3D0;
- <xsl:for-each select=3D"/view/classes/class/attributes/a=
ttribute"> //Get all attributes
+ <xsl:for-each select=3D"/view/classes/class[count(attrib=
utes)>0]/attributes/attribute"> //Get all attributes
<xsl:variable name=3D"classId">
<xsl:value-of select=3D"id" />
</xsl:variable>
- =20
var item =3D new ListElement("<xsl:value-of select=3D=
"name" />","<xsl:value-of select=3D"id"/>",false);
attribsArr[i] =3D item;
i++;
</xsl:for-each>
- <![CDATA[=20
- //Now builds left and right array for columns
- var sizeAttribsArr =3D attribsArr.length;
- var maxPreSelectedNum =3D sizeAttribsArr;
- if(maxPreSelectedNum < 3)
- {
- maxPreSelectedNum =3D 0;
- }
- else
- {
- maxPreSelectedNum =3D 3;=20
- }
- var leftAttribsArr =3D new Array();=20
- var rightAttribsArr =3D new Array();
- for(i=3D0;i<maxPreSelectedNum;i++)
- {
- rightAttribsArr[i] =3D new ListElement(attribsAr=
r[i].GetName(),attribsArr[i].GetValue(),false);
- }
+ var sizeAttribsArr =3D attribsArr.length;
+ <xsl:if test=3D"/view/viewDatas/name=3D''"> <!-- Creatio=
n -->
+ <![CDATA[
+ //Now builds left and right array for columns
+ var maxPreSelectedNum =3D sizeAttribsArr;
=20
- for(i=3D0;i<sizeAttribsArr;i++)
- {
- leftAttribsArr[i] =3D new ListElement(attribsArr=
[i].GetName(),attribsArr[i].GetValue(),false);
- if(i<maxPreSelectedNum)
+ if(maxPreSelectedNum < 3)
{
- leftAttribsArr[i].SetDisabled(true);
+ maxPreSelectedNum =3D 0;
}
- }
- ]]>
+ else
+ {
+ maxPreSelectedNum =3D 3;=20
+ }
+ var leftAttribsArr =3D new Array();=20
+ var rightAttribsArr =3D new Array();
+ var i=3D0;
+ for(i=3D0;i<maxPreSelectedNum;i++)
+ {
+ rightAttribsArr[i] =3D new ListElement(attri=
bsArr[i].GetName(),attribsArr[i].GetValue(),false);
+ }
+ =20
+ var i=3D0;
+ for(i=3D0;i<sizeAttribsArr;i++)
+ {
+ leftAttribsArr[i] =3D new ListElement(attrib=
sArr[i].GetName(),attribsArr[i].GetValue(),false);
+ if(i<maxPreSelectedNum)
+ {
+ leftAttribsArr[i].SetDisabled(true);
+ }
+ }
+ ]]>
+ </xsl:if>
+ <xsl:if test=3D"view/viewDatas/name!=3D''"> <!-- Update =
-->
+ //Columns
+ var reportColumnsArray =3D new Array();
+ var i=3D0;
+ <xsl:for-each select=3D"/view/viewDatas/viewParams/c=
olumns/column">
+ reportColumnsArray[i++] =3D "<xsl:value-of selec=
t=3D"." />";
+ </xsl:for-each>
+ //alert(reportColumnsArray.length);
+ =20
+ <![CDATA[
+ var leftAttribsArr =3D new Array();
+ var rightAttribsArr =3D new Array();
+ var j=3D0;
+ var i=3D0;
+ //alert("size: " + sizeAttribsArr);
+ for(i=3D0;i<sizeAttribsArr;i++)
+ {
+ var idAtt =3D attribsArr[i].GetValue();
+ =20
+ if(IsInArray(idAtt,reportColumnsArray) =3D=3D=
true)
+ {
+ //The left array
+ var element =3D new ListElement( attrib=
sArr[i].GetName(),
+ attribsA=
rr[i].GetValue(),
+ true);
+ leftAttribsArr[i] =3D element; =20
+ //The right array: the element
+ //alert(attribsArr[i].GetName());
+ var element =3D new ListElement( attrib=
sArr[i].GetName(),
+ attribsA=
rr[i].GetValue(),
+ false);
+ this.rightAttribsArr[j++] =3D element; =
=20
+ }
+ else
+ {
+ //The left array
+ //alert(attribsArr[i].GetName());
+ var element =3D new ListElement( attrib=
sArr[i].GetName(),
+ attribsA=
rr[i].GetValue(),
+ false);
+ leftAttribsArr[i] =3D element; =20
+ //The right array: nothing=20
+ }
+ =20
+ }
+ ]]>
+ </xsl:if>
=20
- =20
function recargar()
{
indice =3D document.formulario.classList.selectedInd=
ex;
@@ -219,7 +269,7 @@
</td>
</tr>
<tr>
- <td class=3D"lev1hea=
d" valign=3D"top"><font size=3D"2">Filtros...</font></td>
+ <td class=3D"lev1hea=
d" valign=3D"top"><font size=3D"2">Filters...</font></td>
</tr>
</table>
</td>
@@ -357,7 +407,7 @@
</td>
</tr>
<tr>
- <td class=3D"lev1hea=
d" valign=3D"top"><font size=3D"2">Orden...</font></td>
+ <td class=3D"lev1hea=
d" valign=3D"top"><font size=3D"2">Order...</font></td>
</tr>
</table>
</td>
|