Menu
▾
▴
[H2-commits] r1101 - in humano2/trunk: components/webTools web/builder/site web/builder/site/css web/builder/site/html web/builder/site/js web/builder/site/js/grafcomponents web/builder/site/xsl
Author: pcamacho
Date: 2005-05-19 14:55:38 -0400 (Thu, 19 May 2005)
New Revision: 1101
Added:
humano2/trunk/web/builder/site/css/createreport.css
humano2/trunk/web/builder/site/html/createreportok.html
humano2/trunk/web/builder/site/html/deletereportok.html
humano2/trunk/web/builder/site/html/updatereportok.html
humano2/trunk/web/builder/site/js/createreport.js
Modified:
humano2/trunk/components/webTools/basePage.cs
humano2/trunk/web/builder/site/createreport.aspx.cs
humano2/trunk/web/builder/site/js/formreport.js
humano2/trunk/web/builder/site/js/grafcomponents/expandformreport.js
humano2/trunk/web/builder/site/xsl/createreport.xsl
Log:
ADD: warning messages for report (create, update, delete).
FIX: a bug in the creation of report when the where and order conditions =
were empty.
MISC: delete of unuseful code.
Modified: humano2/trunk/components/webTools/basePage.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/components/webTools/basePage.cs 2005-05-19 18:45:33 UTC=
(rev 1100)
+++ humano2/trunk/components/webTools/basePage.cs 2005-05-19 18:55:38 UTC=
(rev 1101)
@@ -32,7 +32,10 @@
{
CREATEVIEWOK,
DELETEVIEWOK,
- UPDATEVIEWOK
+ UPDATEVIEWOK,
+ CREATEREPORTOK,
+ DELETEREPORTOK,
+ UPDATEREPORTOK
} =20
=20
public basePage()
@@ -140,7 +143,19 @@
case UserMessage.CREATEVIEWOK:
messagePage =3D "createviewok.html";
break;
+ =20
+ case UserMessage.DELETEREPORTOK:
+ messagePage =3D "deletereportok.html";
+ break;
=20
+ case UserMessage.UPDATEREPORTOK:
+ messagePage =3D "updatereportok.html";
+ break;
+ =20
+ case UserMessage.CREATEREPORTOK:
+ messagePage =3D "createreportok.html";
+ break;
+ =20
default:
messagePage =3D "noexistingmessage.html";
break;
Modified: humano2/trunk/web/builder/site/createreport.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/builder/site/createreport.aspx.cs 2005-05-19 18:45:=
33 UTC (rev 1100)
+++ humano2/trunk/web/builder/site/createreport.aspx.cs 2005-05-19 18:55:=
38 UTC (rev 1101)
@@ -383,7 +383,7 @@
{
Logger.Log("deleteReport called", LogLevel.Trace);
userCred.CoreAdapter.DeleteInstance(reportId, userCred);
- sendMessageToUser(UserMessage.DELETEVIEWOK);
+ sendMessageToUser(UserMessage.DELETEREPORTOK);
this.MyRedirect();
return;
}
@@ -445,6 +445,12 @@
///</summary>
private string parseOrder(string order) =20
{
+ =20
+ if(order=3D=3D"")
+ {
+ return ""; =20
+ }
+ =20
string res =3D "";
string [] orderSplit =3D order.Split((";").ToCharArray()); /=
/First get the lines
=20
@@ -478,6 +484,12 @@
///</summary>
private string parseWhere(string where) =20
{
+
+ if(where=3D=3D"") //Nothing to do
+ {
+ return "";
+ }
+ =20
string res =3D "";
string [] whereSplit =3D where.Split((";").ToCharArray()); /=
/First get the lines
=20
@@ -584,14 +596,14 @@
//Response.Write("Create");
Logger.Log("Creation of report",LogLevel.Trace);
userCred.CoreAdapter.CreateReport(reportTable, userC=
red);
- sendMessageToUser(UserMessage.CREATEVIEWOK); //Chang=
e
+ sendMessageToUser(UserMessage.CREATEREPORTOK); //Cha=
nge
}
else=20
{
//Response.Write("Update");
Logger.Log("Update of report",LogLevel.Trace);
userCred.CoreAdapter.UpdateInstance(reportId, report=
Table, userCred);
- sendMessageToUser(UserMessage.UPDATEVIEWOK); //Chang=
e
+ sendMessageToUser(UserMessage.UPDATEREPORTOK); //Cha=
nge
}
}=09
this.MyRedirect();
Added: humano2/trunk/web/builder/site/css/createreport.css
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=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/css/createreport.css 2005-05-19 18:45:=
33 UTC (rev 1100)
+++ humano2/trunk/web/builder/site/css/createreport.css 2005-05-19 18:55:=
38 UTC (rev 1101)
@@ -0,0 +1,39 @@
+.s { font-family: Verdana, Arial, Helvetica, sans-serif; color: #000000=
; font-size:10pt}
+
+DIV.lev1divider {
+ MARGIN: 10px 0px 5px; BACKGROUND-COLOR: #417096
+}
+TD.lev2divider {
+ PADDING-RIGHT: 0px; PADDING-LEFT: 0px; PADDING-BOTTOM: 5px; PADDING-TOP=
: 10px
+}
+TD.lev1head {
+ PADDING-RIGHT: 5px; PADDING-LEFT: 0px; FONT-WEIGHT: bold; FONT-SIZE: 90=
%; PADDING-BOTTOM: 0px; COLOR: #417096; PADDING-TOP: 0px; FONT-FAMILY: ar=
ial
+}
+TD.lev1choices {
+ PADDING-RIGHT: 0px; PADDING-LEFT: 0px; FONT-SIZE: 70%; PADDING-BOTTOM: =
0px; COLOR: #444444; PADDING-TOP: 0px; FONT-FAMILY: verdana
+}
+TD.lev1 {
+ BACKGROUND-COLOR: #c6c6c6
+}
+TD.lev2 {
+ PADDING-RIGHT: 10px; PADDING-LEFT: 10px; PADDING-BOTTOM: 10px
+}
+TABLE.lev0 {
+=09
+}
+TD.lev0 {
+=09
+}
+TD.vtypeSect {
+ PADDING-RIGHT: 5px; PADDING-LEFT: 5px; FONT-WEIGHT: bold; FONT-SIZE: 80=
%; PADDING-BOTTOM: 15px; COLOR: #333333; PADDING-TOP: 15px; FONT-FAMILY: =
arial
+}
+TD.smallBlue {
+ FONT-WEIGHT: bold; FONT-SIZE: 70%; COLOR: #417096; FONT-FAMILY: verdana
+}
+TD.largeBlue {
+ FONT-WEIGHT: bold; FONT-SIZE: 90%; COLOR: #417096; FONT-FAMILY: arial
+}
+TD.butbar {
+ PADDING-RIGHT: 5px; PADDING-LEFT: 15px; PADDING-BOTTOM: 5px; PADDING-TO=
P: 5px
+} =09
+
Added: humano2/trunk/web/builder/site/html/createreportok.html
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=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/html/createreportok.html 2005-05-19 18=
:45:33 UTC (rev 1100)
+++ humano2/trunk/web/builder/site/html/createreportok.html 2005-05-19 18=
:55:38 UTC (rev 1101)
@@ -0,0 +1,18 @@
+<html>
+ <head>
+ <link href=3D"css/left.css" rel=3D"stylesheet" type=3D"text/css"=
/>=09
+ <script language=3D"javascript">
+ function reloadlist()
+ {
+ self.parent.frames[1].location =3D "../functionclasses.aspx";
+ }
+ </script>
+ </head>
+ <body onload=3D"reloadlist()">
+ <center>
+ <span class=3D"message">
+ The report was successfully created.
+ </span>
+ </center>
+ </body>
+</html>
Added: humano2/trunk/web/builder/site/html/deletereportok.html
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=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/html/deletereportok.html 2005-05-19 18=
:45:33 UTC (rev 1100)
+++ humano2/trunk/web/builder/site/html/deletereportok.html 2005-05-19 18=
:55:38 UTC (rev 1101)
@@ -0,0 +1,18 @@
+<html>
+ <head>
+ <link href=3D"css/left.css" rel=3D"stylesheet" type=3D"text/css"=
/>=09
+ <script language=3D"javascript">
+ function reloadlist()
+ {
+ self.parent.frames[1].location =3D "../functionclasses.aspx";
+ }
+ </script>
+ </head>
+ <body onload=3D"reloadlist()">
+ <center>
+ <span class=3D"message">
+ The report was successfully deleted.
+ </span>
+ </center>
+ </body>
+</html>
Added: humano2/trunk/web/builder/site/html/updatereportok.html
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=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/html/updatereportok.html 2005-05-19 18=
:45:33 UTC (rev 1100)
+++ humano2/trunk/web/builder/site/html/updatereportok.html 2005-05-19 18=
:55:38 UTC (rev 1101)
@@ -0,0 +1,18 @@
+<html>
+ <head>
+ <link href=3D"css/left.css" rel=3D"stylesheet" type=3D"text/css"=
/>=09
+ <script language=3D"javascript">
+ function reloadlist()
+ {
+ self.parent.frames[1].location =3D "../functionclasses.aspx";
+ }
+ </script>
+ </head>
+ <body onload=3D"reloadlist()">
+ <center>
+ <span class=3D"message">
+ The report was successfully updated.
+ </span>
+ </center>
+ </body>
+</html>
Added: humano2/trunk/web/builder/site/js/createreport.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/builder/site/js/createreport.js 2005-05-19 18:45:33=
UTC (rev 1100)
+++ humano2/trunk/web/builder/site/js/createreport.js 2005-05-19 18:55:38=
UTC (rev 1101)
@@ -0,0 +1,86 @@
+//
+// The Humano2 Business solution.
+// Copyright (C) 2004,5 Humano2 Chile S.A. (http://www.humano2.com)
+//
+// This program is free software; you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation; either version 2 of the License, or
+// (at your option) any later version. =20
+//
+//
+
+
+function AttribsGetSelect0Arr(formArray,classId)
+{
+ var lengthArray =3D formArray[classId].length;
+ //alert("lengthArray: " + lengthArray);
+
+ var optionArray =3D new Array();
+ optionArray[0] =3D new Array();
+ optionArray[0]["value"] =3D "-1";
+ optionArray[0]["text"] =3D "--Nothing--"
+ for (var i =3D 0; i < lengthArray ;i++)=20
+ {
+ optionArray[i+1] =3D new Array(); //Begin to second element
+ optionArray[i+1]["value"] =3D formArray[classId][i]["value"];
+ optionArray[i+1]["text"] =3D formArray[classId][i]["name"];
+ }
+ =20
+ return optionArray;
+} =20
+
+function FilterGetSelect1Arr()
+{
+ var optionArray =3D new Array();
+ =20
+ optionArray[0] =3D new Array();
+ optionArray[0]["value"] =3D "-1";
+ optionArray[0]["text"] =3D "--Nothing--";
+ optionArray[1] =3D new Array();
+ optionArray[1]["value"] =3D "0";
+ optionArray[1]["text"] =3D "GreaterOrEqualThan";
+ optionArray[2] =3D new Array();
+ optionArray[2]["value"] =3D "1";
+ optionArray[2]["text"] =3D "LessEqualThan";
+ optionArray[3] =3D new Array();
+ optionArray[3]["value"] =3D "2";
+ optionArray[3]["text"] =3D "GreaterThan";
+ optionArray[4] =3D new Array();
+ optionArray[4]["value"] =3D "3";
+ optionArray[4]["text"] =3D "LessThan";
+ optionArray[5] =3D new Array();
+ optionArray[5]["value"] =3D "4";
+ optionArray[5]["text"] =3D "EqualTo";
+ optionArray[6] =3D new Array();
+ optionArray[6]["value"] =3D "5";
+ optionArray[6]["text"] =3D "DistinctTo";
+ optionArray[7] =3D new Array();
+ optionArray[7]["value"] =3D "6";
+ optionArray[7]["text"] =3D "BeginWith";
+ optionArray[8] =3D new Array();
+ optionArray[8]["value"] =3D "7";
+ optionArray[8]["text"] =3D "ContainsTo";
+ optionArray[9] =3D new Array();
+ optionArray[9]["value"] =3D "8";
+ optionArray[9]["text"] =3D "In";
+ =20
+ return optionArray;
+}
+
+
+function OrderGetSelect1Arr()
+{
+ var optionArray =3D new Array();
+ =20
+ optionArray[0] =3D new Array();
+ optionArray[0]["value"] =3D "-1";
+ optionArray[0]["text"] =3D "--Nothing--";
+ optionArray[1] =3D new Array();
+ optionArray[1]["value"] =3D "0";
+ optionArray[1]["text"] =3D "Asc";
+ optionArray[2] =3D new Array();
+ optionArray[2]["value"] =3D "1";
+ optionArray[2]["text"] =3D "Desc";
+ =20
+ return optionArray;
+}
Modified: humano2/trunk/web/builder/site/js/formreport.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/builder/site/js/formreport.js 2005-05-19 18:45:33 U=
TC (rev 1100)
+++ humano2/trunk/web/builder/site/js/formreport.js 2005-05-19 18:55:38 U=
TC (rev 1101)
@@ -11,32 +11,6 @@
//
*/
=20
-
-/**
- * When you choose a class you have to update the buttons Crud
- */
-function UpdateHeader()
-{
- //Update crudbuttons =20
- var crudTag1 =3D GetNodeByTagNameAndAttName("div","CrudButtons1")[0]=
;
- =20
- crudTag1.innerHTML=3D
- "<input type=3D\"submit\" value=3D\"Create\" onclick=3D=
\"Form.UpdateSubmitAll(rightColumn,expandFormSort,expandFormFilter);\">"
- + "</input>";
- =20
- var crudTag2 =3D GetNodeByTagNameAndAttName("div","CrudButtons2")[0]=
;
- //alert("crudTag2: " + crudTag2);
- crudTag2.innerHTML =3D ""; //No delete button
- =20
- =20
- //update input reportname =20
- var reportNameDiv =3D GetNodeByTagNameAndAttName("div","ReportName")=
[0];
- reportNameDiv.innerHTML =3D=20
- "<input type=3D\"text\" id=3D \"reportNameInput\" name=3D\"r=
eportNameInput\">"
- +"</input>";
-}
-
-
//////////////////////////////////////////////ReportParams Class ///////=
////////////////////////////////////////////////
function ReportParams(columns,where,order)
{
@@ -106,10 +80,6 @@
this.SetToDefault =3D FormSetToDefault;
this.UpdateSubmitAll =3D FormUpdateSubmitAll;
this.DeleteReport =3D FormDeleteReport;
- this.GetSortArray =3D FormGetSortArray;
- //this.GetFilterArray =3D FormGetFilterArray;
- this.UpdateSort =3D FormUpdateSort;
- this.UpdateFilter =3D FormUpdateFilter;
this.GetNameOfAttribute =3D FormGetNameOfAttribute;
=20
//Update the attributes
@@ -230,113 +200,6 @@
this.UpdateLists(left,right,this.classId); =20
}
=20
-function FormGetSortArray(number)
-{
- var optionArray =3D new Array();
- =20
- if(number =3D=3D 1) // The attributes
- {
- var lengthArray =3D this.formArray[this.classId].length;
- //alert("lengthArray: " + lengthArray);
- =20
- optionArray[0] =3D new Array(); //Begin to second element
- optionArray[0]["value"] =3D "-1";
- optionArray[0]["text"] =3D "--Nothing--";
- =20
- for (var i =3D 0; i < lengthArray ;i++)
- {
- optionArray[i+1] =3D new Array(); //Begin to second element
- optionArray[i+1]["value"] =3D this.formArray[this.classId][i=
]["value"];
- optionArray[i+1]["text"] =3D this.formArray[this.classId][i=
]["name"];
- }
- }
- else // Asc Desc etc...
- {
- optionArray[0] =3D new Array();
- optionArray[0]["value"] =3D "-1";
- optionArray[0]["text"] =3D "--Nothing--";
- optionArray[1] =3D new Array();
- optionArray[1]["value"] =3D "0";
- optionArray[1]["text"] =3D "Ascendent";
- optionArray[2] =3D new Array();
- optionArray[2]["value"] =3D "1";
- optionArray[2]["text"] =3D "Descendent";
- }
- return optionArray;
-}
-
-/*
-function FormGetFilterArray(number)
-{
- var optionArray =3D new Array();
- =20
- if(number =3D=3D 1) // The attributes (as for sort)
- {
- var lengthArray =3D this.formArray[this.classId].length;
- //alert("lengthArray: " + lengthArray);
- =20
- optionArray[0] =3D new Array();
- optionArray[0]["value"] =3D "-1";
- optionArray[0]["text"] =3D "--Nothing--"
- for (var i =3D 0; i < lengthArray ;i++)=20
- {
- optionArray[i+1] =3D new Array(); //Begin to second element
- optionArray[i+1]["value"] =3D this.formArray[this.classId][i=
]["value"];
- optionArray[i+1]["text"] =3D this.formArray[this.classId][i=
]["name"];
- }
- }
- else // Asc Desc etc...
- {
- optionArray[0] =3D new Array();
- optionArray[0]["value"] =3D "-1";
- optionArray[0]["text"] =3D "--Nothing--";
- optionArray[1] =3D new Array();
- optionArray[1]["value"] =3D "0";
- optionArray[1]["text"] =3D "GreaterOrEqualThan";
- optionArray[2] =3D new Array();
- optionArray[2]["value"] =3D "1";
- optionArray[2]["text"] =3D "LessEqualThan";
- optionArray[3] =3D new Array();
- optionArray[3]["value"] =3D "2";
- optionArray[3]["text"] =3D "GreaterThan";
- optionArray[4] =3D new Array();
- optionArray[4]["value"] =3D "3";
- optionArray[4]["text"] =3D "LessThan";
- optionArray[5] =3D new Array();
- optionArray[5]["value"] =3D "4";
- optionArray[5]["text"] =3D "EqualTo";
- optionArray[6] =3D new Array();
- optionArray[6]["value"] =3D "5";
- optionArray[6]["text"] =3D "DistinctTo";
- optionArray[7] =3D new Array();
- optionArray[7]["value"] =3D "6";
- optionArray[7]["text"] =3D "BeginWith";
- optionArray[8] =3D new Array();
- optionArray[8]["value"] =3D "7";
- optionArray[8]["text"] =3D "ContainsTo";
- optionArray[9] =3D new Array();
- optionArray[9]["value"] =3D "8";
- optionArray[9]["text"] =3D "In";
- =20
- }
- =20
- return optionArray;
-}
-
-*/
-
-function FormUpdateSort(sort,classId)
-{
- this.classId =3D classId;
- sort.Update(this.GetSortArray(1),this.GetSortArray(2)); //TODO: sort=
doesn't work yet
-}
-
-function FormUpdateFilter(filter,classId)
-{
- this.classId =3D classId;
- filter.Update(this.GetFilterArray(1),this.GetFilterArray(2)); =20
-}
-
function FormUpdateAttributes(classId)
{
//alert(classId);
Modified: humano2/trunk/web/builder/site/js/grafcomponents/expandformrepo=
rt.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/builder/site/js/grafcomponents/expandformreport.js =
2005-05-19 18:45:33 UTC (rev 1100)
+++ humano2/trunk/web/builder/site/js/grafcomponents/expandformreport.js =
2005-05-19 18:55:38 UTC (rev 1101)
@@ -12,60 +12,6 @@
=20
/**
* Constructor
- * class used to build an expand form with predeterminated values
- * @param selectedOption1Array the options selected for select tag #1
- * @param selectedOption2Array the options selected for select tag #2
- * @param inputTagValuesArray the input values
- */
-function InputValues(selectOption1Array,selectOption2Array,inputTagValue=
sArray)
-{
- //Fields
- this.selectOption1 =3D CopyArray(selectOption1Array);
- this.selectOption2 =3D CopyArray(selectOption2Array);
- this.inputTagValuesArray =3D CopyArray(inputTagValuesArray);
- =20
- //Methods
- this.GetTriplet =3D InputValuesGetTriplet; =20
- this.Size =3D InputValuesSize;
- =20
- if((this.selectOption1 !=3D null) &&=20
- (this.selectOption2 !=3D null))
- {
- return this; =20
- }
- else=20
- return null; =20
-}
- =20
-/**
- * @param index the index used for the free fields array of class
- * @returns a triplet (selected option 1, selected option2, input)
- */ =20
-function InputValuesGetTriplet(index)
-{
- var triplet =3D new Array();
- triplet["option1"] =3D this.selectOption1[index];
- triplet["option2"] =3D this.selectOption2[index];
- //alert("this.inputTagValuesArray: " + this.inputTagValuesArray);
- if(this.inputTagValuesArray !=3D null) //Only if there's a text of c=
ourse
- {
- triplet["input"] =3D this.inputTagValuesArray[index];
- }
- //alert("triplet[\"option1\"]:" + triplet["option1"] + " triplet[\"o=
ption2\"]: " + triplet["option2"] + "triplet[\"input\"]: " + triplet["inp=
ut"]);
- return triplet;
-}
-
-/**
- * @return size of one
- */
-function InputValuesSize()
-{
- //Whatever array minus the input one that may be empty
- return this.selectOption1.length; =20
-}
-
-/**
- * Constructor
* @param line object that contains the fields to display for each line =
and that also contains preselected values
*/
function ExpandForm(selfRefName,receptorNode,title,inputLine)
@@ -138,7 +84,7 @@
var divWithLines =3D GetNodeByTagNameAndAttName("div",this.selfRefNa=
me)[0]; //Unique id in the document as every
=
// graphical components should have unique identificator
var node =3D divWithLines.firstChild;
- alert("divWithLines.firstChild.childNodes.length: " + divWithLines.f=
irstChild.childNodes.length);
+ //alert("divWithLines.firstChild.childNodes.length: " + divWithLines=
.firstChild.childNodes.length);
//alert("divWithLines.firstChild.innerHTML: " + divWithLines.firstCh=
ild.innerHTML)
while(node !=3D null)
{
@@ -152,12 +98,12 @@
{
if(this.inputLine.type =3D=3D 'TWOSELECTANDINPUT')
{
- alert("divFirstSelect:" + divFirstSelect);
+ //alert("divFirstSelect:" + divFirstSelect);
res +=3D divFirstSelect.value + "|";
- alert("divSecondSelect:" + divSecondSelect);
+ //alert("divSecondSelect:" + divSecondSelect);
res +=3D divSecondSelect.value + "|";
var divInput =3D divSecondSelect.nextSibling;
- alert("divInput:" + divInput);
+ //alert("divInput:" + divInput);
res +=3D "\'" + divInput.value + "\'";
}
=20
@@ -175,7 +121,7 @@
=20
res =3D res.substring(0,res.length-1);//remove last ;
=20
- alert("res:" + res);
+ //alert("res:" + res);
return res;
}
=20
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-05-19 18:45:=
33 UTC (rev 1100)
+++ humano2/trunk/web/builder/site/xsl/createreport.xsl 2005-05-19 18:55:=
38 UTC (rev 1101)
@@ -21,325 +21,207 @@
<script language=3D"Javascript" src=3D"js/grafcomponents/exp=
andformreport.js"></script>
<!-- Load this script before the next one -->
<script language=3D"Javascript" src=3D"js/formreport.js" typ=
e=3D"text/javascript"></script>=20
+ <script language=3D"Javascript" src=3D"js/createreport.js" t=
ype=3D"text/javascript"></script>=20
<link href=3D"styles/css/general_styles_verde.css" rel=3D"st=
ylesheet" type=3D"text/css"></link>
+ <link href=3D"css/createreport.css" rel=3D"stylesheet" type=3D=
"text/css"></link>
</head>
=09
- <!-- Here we create an array and use it as parameter for For=
m class constructor -->
- <script language=3D"Javascript">
- =20
- //////////////////////
- //The report params
- =20
- //Columns
- var reportColumnsArray =3D new Array();
- var i=3D0;
- <xsl:for-each select=3D"/report/reportDatas/reportParams=
/columns/column">
- reportColumnsArray[i++] =3D "<xsl:value-of select=3D=
"." />";
- </xsl:for-each>
- //alert(reportColumnsArray.length);
- var ReportParams =3D new ReportParams(reportColumnsArray=
,null,null);
- =20
- ////////////////////////
- //The form
- var formArray =3D new Array();
- var i; //Counter
- =20
- <xsl:for-each select=3D"/report/classes/class[count(attr=
ibutes)>0]">
- <xsl:variable name=3D"classId">
- <xsl:value-of select=3D"id" />
- </xsl:variable>
- formArray[<xsl:value-of select=3D"$classId"/>] =3D n=
ew Array();
- i=3D0;
- <xsl:for-each select=3D"attributes/attribute">
- formArray[<xsl:value-of select=3D"$classId"/>][i=
] =3D new Array();
- formArray[<xsl:value-of select=3D"$classId"/>][i=
]["value"] =3D "<xsl:value-of select=3D"id"/>";
- formArray[<xsl:value-of select=3D"$classId"/>][i=
]["name"] =3D "<xsl:value-of select=3D"name" />";
- i++;
- </xsl:for-each>
- </xsl:for-each>
- =20
- <xsl:if test=3D"/report/reportDatas/classId!=3D''">
- var Form =3D new Form(formArray,<xsl:value-of select=3D"=
/report/reportDatas/classId" />,ReportParams);
- </xsl:if>
- //alert(Form.GetOptionString(0));
- =20
- //Filters =20
- var selectOption0ArrayFilter =3D new Array();
- var selectOption1ArrayFilter =3D new Array();
- var inputTagValuesArrayFilter =3D new Array();
- =20
- var i=3D0;
- <xsl:for-each select=3D"/report/reportDatas/reportParams=
/conditions/condition">
- selectOption0ArrayFilter[i] =3D <xsl:value-of selec=
t=3D"idAtt" />;
- selectOption1ArrayFilter[i] =3D <xsl:value-of selec=
t=3D"operator" />;
- inputTagValuesArrayFilter[i] =3D <xsl:value-of sele=
ct=3D"value" />;
+ <!-- Here we create an array and use it as parameter for Form cl=
ass constructor -->
+ <script language=3D"Javascript">
+ =20
+ //////////////////////
+ //The report params
+ =20
+ //Columns
+ var reportColumnsArray =3D new Array();
+ var i=3D0;
+ <xsl:for-each select=3D"/report/reportDatas/reportParams/col=
umns/column">
+ reportColumnsArray[i++] =3D "<xsl:value-of select=3D"." =
/>";
+ </xsl:for-each>
+ //alert(reportColumnsArray.length);
+ var ReportParams =3D new ReportParams(reportColumnsArray,nul=
l,null);
+ =20
+ ////////////////////////
+ //The form
+ var formArray =3D new Array();
+ var i; //Counter
+ =20
+ <xsl:for-each select=3D"/report/classes/class[count(attribut=
es)>0]">
+ <xsl:variable name=3D"classId">
+ <xsl:value-of select=3D"id" />
+ </xsl:variable>
+ formArray[<xsl:value-of select=3D"$classId"/>] =3D new A=
rray();
+ i=3D0;
+ <xsl:for-each select=3D"attributes/attribute">
+ formArray[<xsl:value-of select=3D"$classId"/>][i] =3D=
new Array();
+ formArray[<xsl:value-of select=3D"$classId"/>][i]["v=
alue"] =3D "<xsl:value-of select=3D"id"/>";
+ formArray[<xsl:value-of select=3D"$classId"/>][i]["n=
ame"] =3D "<xsl:value-of select=3D"name" />";
i++;
</xsl:for-each>
- =20
- function AttribsGetSelect0Arr(formArray,classId)
+ </xsl:for-each>
+ =20
+ <xsl:if test=3D"/report/reportDatas/classId!=3D''">
+ var Form =3D new Form(formArray,<xsl:value-of select=3D"/rep=
ort/reportDatas/classId" />,ReportParams);
+ </xsl:if>
+ //alert(Form.GetOptionString(0));
+ =20
+ //Filters =20
+ var selectOption0ArrayFilter =3D new Array();
+ var selectOption1ArrayFilter =3D new Array();
+ var inputTagValuesArrayFilter =3D new Array();
+ =20
+ var i=3D0;
+ <xsl:for-each select=3D"/report/reportDatas/reportParams/con=
ditions/condition">
+ selectOption0ArrayFilter[i] =3D <xsl:value-of select=3D=
"idAtt" />;
+ selectOption1ArrayFilter[i] =3D <xsl:value-of select=3D=
"operator" />;
+ inputTagValuesArrayFilter[i] =3D <xsl:value-of select=3D=
"value" />;
+ i++;
+ </xsl:for-each>
+ =20
+ <xsl:if test=3D"/report/reportDatas/classId!=3D''">
+ var InputLineParamsFilters =3D
{
- var lengthArray =3D formArray[classId].length;
- //alert("lengthArray: " + lengthArray);
+ type: 'TWOSELECTANDINPUT',
+ select0: AttribsGetSelect0Arr(formArray,<xsl:value-o=
f select=3D"/report/reportDatas/classId" />),
+ select1: FilterGetSelect1Arr(),
+ lineTitle: 'Filter',
+ input0: '',
+ PreselectedInput0: inputTagValuesArrayFilter,
+ PreselectedSelect0: selectOption0ArrayFilter,
+ PreselectedSelect1: selectOption1ArrayFilter,
+ refName: 'expandFormFilter'
+ }
+ var InputLineFilters =3D new InputLine(InputLineParamsFi=
lters);
+ </xsl:if>
=20
- var optionArray =3D new Array();
- optionArray[0] =3D new Array();
- optionArray[0]["value"] =3D "-1";
- optionArray[0]["text"] =3D "--Nothing--"
- for (var i =3D 0; i < lengthArray ;i++)=20
- {
- optionArray[i+1] =3D new Array(); //Begin to sec=
ond element
- optionArray[i+1]["value"] =3D formArray[classId]=
[i]["value"];
- optionArray[i+1]["text"] =3D formArray[classId]=
[i]["name"];
- }
- =20
- return optionArray;
- } =20
- =20
- function FilterGetSelect1Arr()
+ =20
+ //Order
+ var selectOption0ArrayOrder =3D new Array();
+ var selectOption1ArrayOrder =3D new Array();
+ var i=3D0;
+ <xsl:for-each select=3D"/report/reportDatas/reportParams/ord=
ers/order">
+ selectOption0ArrayOrder[i] =3D <xsl:value-of select=3D"=
idAtt" />;
+ selectOption1ArrayOrder[i] =3D <xsl:value-of select=3D"=
ascOrDesc" />;
+ i++;
+ </xsl:for-each>
+ =20
+ <xsl:if test=3D"/report/reportDatas/classId!=3D''">
+ var InputLineParamsOrders =3D
{
- var optionArray =3D new Array();
- =20
- optionArray[0] =3D new Array();
- optionArray[0]["value"] =3D "-1";
- optionArray[0]["text"] =3D "--Nothing--";
- optionArray[1] =3D new Array();
- optionArray[1]["value"] =3D "0";
- optionArray[1]["text"] =3D "GreaterOrEqualThan";
- optionArray[2] =3D new Array();
- optionArray[2]["value"] =3D "1";
- optionArray[2]["text"] =3D "LessEqualThan";
- optionArray[3] =3D new Array();
- optionArray[3]["value"] =3D "2";
- optionArray[3]["text"] =3D "GreaterThan";
- optionArray[4] =3D new Array();
- optionArray[4]["value"] =3D "3";
- optionArray[4]["text"] =3D "LessThan";
- optionArray[5] =3D new Array();
- optionArray[5]["value"] =3D "4";
- optionArray[5]["text"] =3D "EqualTo";
- optionArray[6] =3D new Array();
- optionArray[6]["value"] =3D "5";
- optionArray[6]["text"] =3D "DistinctTo";
- optionArray[7] =3D new Array();
- optionArray[7]["value"] =3D "6";
- optionArray[7]["text"] =3D "BeginWith";
- optionArray[8] =3D new Array();
- optionArray[8]["value"] =3D "7";
- optionArray[8]["text"] =3D "ContainsTo";
- optionArray[9] =3D new Array();
- optionArray[9]["value"] =3D "8";
- optionArray[9]["text"] =3D "In";
- =20
- return optionArray;
+ type: 'TWOSELECT',
+ select0: AttribsGetSelect0Arr(formArray,<xsl:value-o=
f select=3D"/report/reportDatas/classId" />),
+ select1: OrderGetSelect1Arr(),
+ lineTitle: 'Order',
+ input0: '',
+ PreselectedInput0: null,
+ PreselectedSelect0: selectOption0ArrayOrder,
+ PreselectedSelect1: selectOption1ArrayOrder,
+ refName: 'expandFormSort'
}
- =20
- <xsl:if test=3D"/report/reportDatas/classId!=3D''">
- var InputLineParamsFilters =3D
- {
- type: 'TWOSELECTANDINPUT',
- select0: AttribsGetSelect0Arr(formArray,<xsl:val=
ue-of select=3D"/report/reportDatas/classId" />),
- select1: FilterGetSelect1Arr(),
- lineTitle: 'Filter',
- input0: '',
- PreselectedInput0: inputTagValuesArrayFilter,
- PreselectedSelect0: selectOption0ArrayFilter,
- PreselectedSelect1: selectOption1ArrayFilter,
- refName: 'expandFormFilter'
- }
- var InputLineFilters =3D new InputLine(InputLinePara=
msFilters);
- </xsl:if>
- =20
- =20
- //Order
- var selectOption0ArrayOrder =3D new Array();
- var selectOption1ArrayOrder =3D new Array();
- var i=3D0;
- <xsl:for-each select=3D"/report/reportDatas/reportParams=
/orders/order">
- selectOption0ArrayOrder[i] =3D <xsl:value-of select=
=3D"idAtt" />;
- selectOption1ArrayOrder[i] =3D <xsl:value-of select=
=3D"ascOrDesc" />;
- i++;
- </xsl:for-each>
- =20
- function OrderGetSelect1Arr()
+ var InputLineOrders =3D new InputLine(InputLineParamsOrd=
ers);
+ </xsl:if>
+ =20
+ =20
+ function recargar()
+ {
+ <![CDATA[
+ //for(i=3D0;i<document.formulario.elements.length;i++)
+ // alert(document.formulario.elements[i].name);
+ ]]>
+ indice =3D document.formulario.classList.selectedIndex;
+ if(indice>0)
{
- var optionArray =3D new Array();
- =20
- optionArray[0] =3D new Array();
- optionArray[0]["value"] =3D "-1";
- optionArray[0]["text"] =3D "--Nothing--";
- optionArray[1] =3D new Array();
- optionArray[1]["value"] =3D "0";
- optionArray[1]["text"] =3D "Asc";
- optionArray[2] =3D new Array();
- optionArray[2]["value"] =3D "1";
- optionArray[2]["text"] =3D "Desc";
- =20
- return optionArray;
+ valor =3D document.formulario.classList.options[indi=
ce].value;
+ self.location =3D "createreport.aspx?classList=3D"+v=
alor;
}
+ }
+ //Esta funcion no esta siendo usada, pues se usa una mejora =
hecha por pcamacho
+ function valoresIni()
+ {
+ var divFilter;
+ var expandFormFilter;
+ var divSort;
+ var expandFormSort;
+ var cantfilters =3D <xsl:value-of select=3D"count(/repor=
t/reportDatas/reportParams/conditions/condition)"/>
+ var cantorders =3D <xsl:value-of select=3D"count(/report=
/reportDatas/reportParams/orders/order)"/>
=20
- <xsl:if test=3D"/report/reportDatas/classId!=3D''">
- var InputLineParamsOrders =3D
- {
- type: 'TWOSELECT',
- select0: AttribsGetSelect0Arr(formArray,<xsl:val=
ue-of select=3D"/report/reportDatas/classId" />),
- select1: OrderGetSelect1Arr(),
- lineTitle: 'Order',
- input0: '',
- PreselectedInput0: null,
- PreselectedSelect0: selectOption0ArrayOrder,
- PreselectedSelect1: selectOption1ArrayOrder,
- refName: 'expandFormSort'
- }
- var InputLineOrders =3D new InputLine(InputLineParam=
sOrders);
- </xsl:if>
+ var divSort =3D GetNodeByTagNameAndAttName("div","Sort")=
;
+ var divFilter =3D GetNodeByTagNameAndAttName("div","Filt=
er");
+ =20
+ //alert(cantfilters);
=20
- //var inputValuesOrder;
- //inputValuesOrder =3D new InputValues(selectOption1Arra=
yOrder,selectOption2ArrayOrder,null);
- =20
- =20
- =20
- function recargar()
+ <![CDATA[
+ for(i=3D1;i<cantfilters;i++)
{
- <![CDATA[
- //for(i=3D0;i<document.formulario.elements.length;i++)
- // alert(document.formulario.elements[i].name);
- ]]>
- indice =3D document.formulario.classList.selectedIndex;
- if(indice>0)
- {
- valor =3D document.formulario.classList.options[indice].value;
- self.location =3D "createreport.aspx?classList=3D"+valor;
- }
+ expandFormFilter =3D new ExpandForm("expandFormFil=
ter",divFilter,true,Form.GetFilterArray(1),Form.GetFilterArray(2),"Filter=
",inputValuesFilter);
+ expandFormFilter.AddLine();
}
- //Esta funcion no esta siendo usada, pues se usa una mej=
ora hecha por pcamacho
- function valoresIni()
+ ]]>
+ <![CDATA[
+ for(i=3D1;i<cantorders;i++)
{
- var divFilter;
- var expandFormFilter;
- var divSort;
- var expandFormSort;
- var cantfilters =3D <xsl:value-of select=3D"count(/report/reportDat=
as/reportParams/conditions/condition)"/>
- var cantorders =3D <xsl:value-of select=3D"count(/report/reportData=
s/reportParams/orders/order)"/>
- =09
- var divSort =3D GetNodeByTagNameAndAttName("div","Sort");
- var divFilter =3D GetNodeByTagNameAndAttName("div","Filter");
- =09
- //alert(cantfilters);
- =09
- <![CDATA[
- for(i=3D1;i<cantfilters;i++)
- {
- expandFormFilter =3D new ExpandForm("expandFormFilter",divFilter=
,true,Form.GetFilterArray(1),Form.GetFilterArray(2),"Filter",inputValuesF=
ilter);
- expandFormFilter.AddLine();
+ expandFormSort =3D new ExpandForm("expandFormSort",d=
ivSort,false,Form.GetSortArray(1),Form.GetSortArray(2),"Order");
+ expandFormSort.AddLine();
+ }
+ ]]>
+ i =3D 0;
+ <xsl:for-each select=3D"/report/reportDatas/reportParams=
/conditions/condition">
+ <![CDATA[
+ Objrow =3D eval("document.formulario.select1expandFo=
rmFilter"+i);
+ if(eval(Objrow))
+ {
+ for(j=3D0;j<Objrow.length;j++)
+ {
+ if(Objrow[j].value=3D=3D"]]><xsl:value-of se=
lect=3D"idAtt"/><![CDATA[")
+ Objrow.options[j].selected=3Dtrue;
+ }
}
- ]]>
- <![CDATA[
- for(i=3D1;i<cantorders;i++)
- {
- expandFormSort =3D new ExpandForm("expandFormSor=
t",divSort,false,Form.GetSortArray(1),Form.GetSortArray(2),"Order");
- expandFormSort.AddLine();
+ =20
+ Objrow =3D eval("document.formulario.select2expandFo=
rmFilter"+i);
+ if(eval(Objrow))
+ {
+ for(j=3D0;j<Objrow.length;j++)
+ {
+ if(Objrow[j].value=3D=3D"]]><xsl:value-of se=
lect=3D"operator"/><![CDATA[")
+ Objrow.options[j].selected=3Dtrue;
+ }
}
- ]]>
- i =3D 0;
- <xsl:for-each select=3D"/report/reportDatas/reportParams/conditions=
/condition">
- <![CDATA[
- Objrow =3D eval("document.formulario.select1expandFormFilter"+i);
- if(eval(Objrow))
- {
- for(j=3D0;j<Objrow.length;j++)
- {
- if(Objrow[j].value=3D=3D"]]><xsl:value-of select=3D"idAtt"/><![C=
DATA[")
- Objrow.options[j].selected=3Dtrue;
- }
- }
- =09
- Objrow =3D eval("document.formulario.select2expandFormFilter"+i);
- if(eval(Objrow))
- {
- for(j=3D0;j<Objrow.length;j++)
- {
- if(Objrow[j].value=3D=3D"]]><xsl:value-of select=3D"operator"/><=
![CDATA[")
- Objrow.options[j].selected=3Dtrue;
- }
- }
- =09
- Objrow =3D eval("document.formulario.inputexpandFormFilter"+i);
- dato =3D ]]><xsl:value-of select=3D"value"/><![CDATA[;
- if(eval(Objrow))
- Objrow.value =3D dato;
- i++;
- ]]>
- </xsl:for-each>
- i =3D 0;
- <xsl:for-each select=3D"/report/reportDatas/reportParams/orders/ord=
er">
- <![CDATA[
- Objrow =3D eval("document.formulario.select1expandFormSort"+i);
- if(eval(Objrow))
- {
- for(j=3D0;j<Objrow.length;j++)
- {
- if(Objrow[j].value=3D=3D]]><xsl:value-of select=3D"idAtt"/><![CD=
ATA[)
- Objrow.options[j].selected=3Dtrue;
- }
- }
- if(eval(Objrow))
- {
- Objrow =3D eval("document.formulario.select2expandFormSort"+i);
- for(j=3D0;j<Objrow.length;j++)
- {
- if(Objrow[j].value=3D=3D]]><xsl:value-of select=3D"ascOrDesc"/><=
![CDATA[)
- Objrow.options[j].selected=3Dtrue;
- }
- }
- i++;
- ]]>
- </xsl:for-each>
- }
- </script>
- =20
-<style type=3D"text/css">=20
-
-.s { font-family: Verdana, Arial, Helvetica, sans-serif; color: #000000=
; font-size:10pt}
-
-DIV.lev1divider {
- MARGIN: 10px 0px 5px; BACKGROUND-COLOR: #417096
-}
-TD.lev2divider {
- PADDING-RIGHT: 0px; PADDING-LEFT: 0px; PADDING-BOTTOM: 5px; PADDING-TOP=
: 10px
-}
-TD.lev1head {
- PADDING-RIGHT: 5px; PADDING-LEFT: 0px; FONT-WEIGHT: bold; FONT-SIZE: 90=
%; PADDING-BOTTOM: 0px; COLOR: #417096; PADDING-TOP: 0px; FONT-FAMILY: ar=
ial
-}
-TD.lev1choices {
- PADDING-RIGHT: 0px; PADDING-LEFT: 0px; FONT-SIZE: 70%; PADDING-BOTTOM: =
0px; COLOR: #444444; PADDING-TOP: 0px; FONT-FAMILY: verdana
-}
-TD.lev1 {
- BACKGROUND-COLOR: #c6c6c6
-}
-TD.lev2 {
- PADDING-RIGHT: 10px; PADDING-LEFT: 10px; PADDING-BOTTOM: 10px
-}
-TABLE.lev0 {
-=09
-}
-TD.lev0 {
-=09
-}
-TD.vtypeSect {
- PADDING-RIGHT: 5px; PADDING-LEFT: 5px; FONT-WEIGHT: bold; FONT-SIZE: 80=
%; PADDING-BOTTOM: 15px; COLOR: #333333; PADDING-TOP: 15px; FONT-FAMILY: =
arial
-}
-TD.smallBlue {
- FONT-WEIGHT: bold; FONT-SIZE: 70%; COLOR: #417096; FONT-FAMILY: verdana
-}
-TD.largeBlue {
- FONT-WEIGHT: bold; FONT-SIZE: 90%; COLOR: #417096; FONT-FAMILY: arial
-}
-TD.butbar {
- PADDING-RIGHT: 5px; PADDING-LEFT: 15px; PADDING-BOTTOM: 5px; PADDING-TO=
P: 5px
-} =09
-
-</style>
-<body >
+ =20
+ Objrow =3D eval("document.formulario.inputexpandForm=
Filter"+i);
+ dato =3D ]]><xsl:value-of select=3D"value"/><![CDATA=
[;
+ if(eval(Objrow))
+ Objrow.value =3D dato;
+ i++;
+ ]]>
+ </xsl:for-each>
+ i =3D 0;
+ <xsl:for-each select=3D"/report/reportDatas/reportParams=
/orders/order">
+ <![CDATA[
+ Objrow =3D eval("document.formulario.select1expandFo=
rmSort"+i);
+ if(eval(Objrow))
+ {
+ for(j=3D0;j<Objrow.length;j++)
+ {
+ if(Objrow[j].value=3D=3D]]><xsl:value-of sel=
ect=3D"idAtt"/><![CDATA[)
+ Objrow.options[j].selected=3Dtrue;
+ }
+ }
+ if(eval(Objrow))
+ {
+ Objrow =3D eval("document.formulario.select2expa=
ndFormSort"+i);
+ for(j=3D0;j<Objrow.length;j++)
+ {
+ if(Objrow[j].value=3D=3D]]><xsl:value-of sel=
ect=3D"ascOrDesc"/><![CDATA[)
+ Objrow.options[j].selected=3Dtrue;
+ }
+ }
+ i++;
+ ]]>
+ </xsl:for-each>
+ }
+ </script>
+ =20
+ <body >
<form id=3D"formulario" name=3D"formulario" method=3D"post">
<table width=3D"100%" border=3D"0" cellspacing=3D"0" cellpad=
ding=3D"0" class=3D"conttablecenter2">
<tr>
@@ -365,15 +247,8 @@
</td>
<!-- Only show classes for select wh=
en creating -->
<xsl:if test=3D"/report/reportDatas/=
saveName=3D'Create'" >=20
- <td >
- <!--
- <select class=3D"drpdwn2" id=3D"=
classList" onchange=3D" UpdateHeader();
- =
Form.UpdateLists(leftColumn,rightColumn,this.value);
- =
Form.UpdateSort(expandFormSort,this.value);=20
- =
Form.UpdateFilter(expandFormFilter,this.value);
- =
">=20
- =
-->
- <select class=3D"drpdwn2" id=3D"classList" onchange=3D"recarga=
r();">
+ <td>
+ <select class=3D"drpdwn2" id=3D"cla=
ssList" onchange=3D"recargar();">
<xsl:for-each select=3D"repo=
rt/classes/class">
<option>
<xsl:attribute name=3D=
"name">
|
