Menu
▾
▴
[H2-commits] r1099 - in humano2/trunk/web/builder/site: . js js/grafcomponents xsl
|
From: <sv...@de...> - 2005-05-19 18:12:51
|
Author: pcamacho
Date: 2005-05-19 14:12:47 -0400 (Thu, 19 May 2005)
New Revision: 1099
Added:
humano2/trunk/web/builder/site/js/grafcomponents/inputline.js
Modified:
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/js/grafcomponents/test.html
humano2/trunk/web/builder/site/xsl/createreport.xsl
Log:
ADD: new grafcomponent: inputLine that is used by expandform. It has been=
integrated in the interface to create=20
reports.
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 16:58:=
18 UTC (rev 1098)
+++ humano2/trunk/web/builder/site/createreport.aspx.cs 2005-05-19 18:12:=
47 UTC (rev 1099)
@@ -133,7 +133,7 @@
strXml +=3D "</classes>";
strXml +=3D "</report>";
=20
- Logger.Log("ReportMain: createXml(): " + strXml, LogLevel.Tr=
ace);
+ //Logger.Log("ReportMain: createXml(): " + strXml, LogLevel.=
Trace);
=20
return strXml;
}
@@ -289,11 +289,13 @@
listAtt =3D listAtt.Substring(0,listAtt.Length-1);
=20
//Now split the string create the list
- string [] listAttArr =3D listAtt.Split(new char [] {'|'});
+ string [] listAttArr =3D listAtt.Split(new char [] {'|'});
+ /*
for(int i=3D0;i<listAttArr.Length;i++)
{
Logger.Log("listAttArr[" +Convert.ToString(i) + "]=3D " =
+ listAttArr[i],LogLevel.Trace);
}
+ */
return listAttArr;
}
=20
@@ -306,11 +308,11 @@
int index =3D 0;
for(int i=3D0;i<tabElements.Length;i++)
{
- if(element =3D=3D tabElements[i])
- {
- index=3Di;
- break;
- }
+ if(element =3D=3D tabElements[i])
+ {
+ index=3Di;
+ break;
+ }
}
return Convert.ToString(index);
}
@@ -423,9 +425,9 @@
dr["columns"] =3D receivedColumnsStr; //If a column is a per=
tinence, change it
=20
//Special case for IN filter
- dr["where"] =3D treatInSpecialCase(receivedWhereStr);=20
+ dr["where"] =3D parseWhere(receivedWhereStr);
=20
- dr["order"] =3D receivedOrderStr;
+ dr["order"] =3D parseOrder(receivedOrderStr);
Logger.Log("receivedOrderStr" + receivedOrderStr, LogLevel.T=
race);
Logger.Log("receivedWhereStr" + receivedWhereStr, LogLevel.T=
race);
=09
@@ -433,6 +435,80 @@
=20
return dt;
}
+ =20
+ =20
+ =20
+ ///<summary>
+ /// A order string is received from the web page in this format:
+ /// idAtt0 | 0 or 1,idAtt1 | 0 or 1 etc...
+ /// We have to add the queue to each where condition (1|0 or 0|0=
)
+ ///</summary>
+ private string parseOrder(string order) =20
+ {
+ string res =3D "";
+ string [] orderSplit =3D order.Split((";").ToCharArray()); /=
/First get the lines
+ =20
+ for(int i=3D0;i<orderSplit.Length;i++)
+ {
+ string [] lineSplit =3D orderSplit[i].Split(("|").ToChar=
Array());
+ string line =3D "";
+ =20
+ line +=3D lineSplit[0];
+ line +=3D '|'; =20
+ line +=3D lineSplit[1];
+ =20
+ res +=3D line;
+ if(i!=3D orderSplit.Length-1)
+ {
+ res +=3D ","; =20
+ }
+ //Last line nothing to add
+ }
+ =20
+ Logger.Log("parseOrder=3D " + res,LogLevel.Trace);
+ =20
+ return res;
+ }
+ =20
+ =20
+ ///<summary>
+ /// A where string is received from the web page in this format:
+ /// idAtt0 | idOp0 | 'value'|;idAtt1 | idOp1 | 'value'|; ... etc
+ /// We have to add the queue to each where condition (1|0 or 0|0=
)
+ ///</summary>
+ private string parseWhere(string where) =20
+ {
+ string res =3D "";
+ string [] whereSplit =3D where.Split((";").ToCharArray()); /=
/First get the lines
+ =20
+ for(int i=3D0;i<whereSplit.Length;i++)
+ {
+ string [] lineSplit =3D whereSplit[i].Split(("|").ToChar=
Array());
+ string line =3D "";
+ for(int j=3D0; j<lineSplit.Length;j++)
+ {
+ line +=3D lineSplit[j];
+ line +=3D '|'; =20
+ =20
+ }
+ res +=3D line;
+ if(i!=3D whereSplit.Length-1)
+ {
+ res +=3D "1|0;"; =20
+ }
+ else //Last line
+ {
+ res +=3D"0|0";
+ }
+ }
+ Logger.Log("parseWhere(before treatin)=3D " + res,LogLevel.=
Trace);
+ =20
+ res =3D treatInSpecialCase(res);=20
+ =20
+ Logger.Log("parseWhere=3D " + res,LogLevel.Trace);
+ =20
+ return res;
+ }
=20
///<summary>
/// The IN filter must be treated in a special maner. If the val=
ue to compare to is "20 30", then=20
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 16:58:18 U=
TC (rev 1098)
+++ humano2/trunk/web/builder/site/js/formreport.js 2005-05-19 18:12:47 U=
TC (rev 1099)
@@ -107,7 +107,7 @@
this.UpdateSubmitAll =3D FormUpdateSubmitAll;
this.DeleteReport =3D FormDeleteReport;
this.GetSortArray =3D FormGetSortArray;
- this.GetFilterArray =3D FormGetFilterArray;
+ //this.GetFilterArray =3D FormGetFilterArray;
this.UpdateSort =3D FormUpdateSort;
this.UpdateFilter =3D FormUpdateFilter;
this.GetNameOfAttribute =3D FormGetNameOfAttribute;
@@ -152,10 +152,8 @@
//Now the sort
//alert("sort SelfRefName:" + sort.GetSelfRefName());
=20
- =20
var orderStr =3D sort.ReturnValues();=20
=20
- =20
//The filter
//alert("filter SelfRefName:" + filter.GetSelfRefName());
var whereStr =3D filter.ReturnValues();
@@ -267,7 +265,7 @@
return optionArray;
}
=20
-
+/*
function FormGetFilterArray(number)
{
var optionArray =3D new Array();
@@ -325,6 +323,8 @@
return optionArray;
}
=20
+*/
+
function FormUpdateSort(sort,classId)
{
this.classId =3D 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 16:58:18 UTC (rev 1098)
+++ humano2/trunk/web/builder/site/js/grafcomponents/expandformreport.js =
2005-05-19 18:12:47 UTC (rev 1099)
@@ -64,258 +64,122 @@
return this.selectOption1.length; =20
}
=20
-
/**
* Constructor
- * with input: add an input as third field
- * @param htmlForm text: the form: no matters the Id of Name of the inpu=
ts / select, they will be renamed
- * @param withInput: add an <input> tag or not (depending on the value o=
f the boolean)
- * @param inputValues is an object ExpanFormInput that contains the sele=
cted options (1 & 2) and eventually the inputs
+ * @param line object that contains the fields to display for each line =
and that also contains preselected values
*/
-function ExpandForm(selfRefName,receptorNode,withInput,optionArray1,opti=
onArray2,title,inputValues)
+function ExpandForm(selfRefName,receptorNode,title,inputLine)
{
//Fields
this.selfRefName =3D selfRefName;
this.receptorNode =3D receptorNode;
- this.withInput =3D withInput;
- this.optionArray1 =3D new Array();
- this.optionArray2 =3D new Array();
+ this.inputLine =3D inputLine;
+ =20
+ //this.optionArray1 =3D new Array();
+ //this.optionArray2 =3D new Array();
this.title =3D title;
- this.inputValues =3D inputValues;
+
=20
//Methods
this.PutAllComponents =3D ExpandFormPutAllComponents;
this.AddLine =3D ExpandFormAddLine;
this.RemoveLine =3D ExpandFormRemoveLine;
this.ReturnValues =3D ExpandFormReturnValues;
- this.GetOptionsString =3D ExpandFormGetOptionsString;
this.GetReceptorNode =3D ExpandFormGetReceptorNode;
this.GetSelfRefName =3D ExpandFormGetSelfRefName;
this.GetTitle =3D ExpandFormGetTitle;
- this.Update =3D ExpandFormUpdate;
=20
- //Copy the arrays passed in parameters=20
- var i;
- for(i=3D0;i<optionArray1.length;i++)
- {
- this.optionArray1[i] =3D new Array();
- this.optionArray1[i]["text"] =3D optionArray1[i]["text"];
- this.optionArray1[i]["value"] =3D optionArray1[i]["value"];
- }
- =20
- for(i=3D0;i<optionArray2.length;i++)
- {
- this.optionArray2[i] =3D new Array();
- this.optionArray2[i]["text"] =3D optionArray2[i]["text"];
- this.optionArray2[i]["value"] =3D optionArray2[i]["value"];
- }
- //alert("inputValues=3D " + this.inputValues);
- //Update the current document
this.PutAllComponents(receptorNode);
=20
return this; =20
}
=20
-function ExpandFormUpdate(optionArray1,optionArray2)
-{
- //Don't forget to clear the existing arrays
- this.optionArray1 =3D new Array();
- this.optionArray2 =3D new Array();
=20
- //option tables
- //Copy the arrays passed in parameters=20
-
- var i;
- for(i=3D0;i<optionArray1.length;i++)
- {
- this.optionArray1[i] =3D new Array();
- this.optionArray1[i]["text"] =3D optionArray1[i]["text"];
- this.optionArray1[i]["value"] =3D optionArray1[i]["value"];
- }
- =20
- for(i=3D0;i<optionArray2.length;i++)
- {
- this.optionArray2[i] =3D new Array();
- this.optionArray2[i]["text"] =3D optionArray2[i]["text"];
- this.optionArray2[i]["value"] =3D optionArray2[i]["value"];
- }
- =20
- //Remove all lines but one
- var nbNodes =3D this.receptorNode.childNodes.length;
- while(nbNodes>0)
- {
- nbNodes =3D this.RemoveLine(); =20
- }
- =20
- //Add a line
- this.AddLine();
-}
-
-
/**
* This function adds a line to the expand form but
* with preselect values
- * @param indexOption1=20
- * @param indexOption2
- * @param blank if true insert a blank form if not use the inputValues o=
bject and the index
*/
-function ExpandFormAddLine(index,blank)
+function ExpandFormAddLine(index)
{
var divReceptor =3D GetNodeByTagNameAndAttName("div",this.selfRefNam=
e)[0]; //Unique id in the document as every
=
// graphical components should have unique identificator
//alert("divReceptor: " + divReceptor);
var lineNumber =3D divReceptor.childNodes.length;
=20
- var option1String;
- var option2String;
- var inputValue;
- //alert("index:" + index + " blank: " + blank + " inputValues:" + th=
is.inputValues);
- if((this.inputValues!=3D null)=20
- && (blank =3D=3D false)) //Insert new line with preselected valu=
es
+ var innerHtml =3D "";
+ =20
+ if(index !=3D null)
{
- var triplet =3D this.inputValues.GetTriplet(index);
- option1String =3D this.GetOptionsString(1,triplet["option1"])
- option2String =3D this.GetOptionsString(2,triplet["option2"])
- inputValue =3D triplet["input"];
+ innerHtml =3D this.inputLine.GetPreselectedLineHtml(index,lineNum=
ber); =20
}
else
{
- option1String =3D this.GetOptionsString(1,0) //first selected by=
default
- option2String =3D this.GetOptionsString(2,0) // idem
- inputValue =3D "";
+ innerHtml =3D this.inputLine.GetEmptyLineHtml(lineNumber);
}
=20
- var innerHtml =3D this.title + lineNumber + ": "
- + "<select style=3D\"width:100px;\" name=3D\"selec=
t1" + this.selfRefName + lineNumber + "\" class=3D\"drpdwn2\">"
- + option1String
- + "</select>"
- + "<select style=3D\"width:100px;\" name=3D\"selec=
t2" + this.selfRefName + lineNumber + "\" class=3D\"drpdwn2\">"
- + option2String
- + "</select>";=20
- =20
- if(this.withInput =3D=3D true) =
=20
- {
- innerHtml +=3D "<input name=3D\"input" + this.selfRefName + line=
Number + "\" value=3D\"" + inputValue + "\" id=3D\"\"></input>";
- }
- //alert("innerHtml:" + innerHtml);
- =20
var divLine =3D document.createElement("div");
=20
divLine.innerHTML =3D innerHtml;
=20
//alert("divLine.childNodes.length: " + divLine.childNodes.length)
- =20
+ //alert("innerHtml: " + innerHtml);
//Add the line
divReceptor.appendChild(divLine);
}
=20
=20
-
-
-
/**
* Should be conform to viewtools norm
*/
function ExpandFormReturnValues()
{ =20
var res =3D "";
- =20
+
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=
.firstChild.childNodes.length);
+ alert("divWithLines.firstChild.childNodes.length: " + divWithLines.f=
irstChild.childNodes.length);
//alert("divWithLines.firstChild.innerHTML: " + divWithLines.firstCh=
ild.innerHTML)
while(node !=3D null)
{
- if(this.withInput =3D=3D false)
+ =20
+ //Here we must get the input value moreover
+ //CAUTION: we start from the second child because the first is a=
text node (title) !!!!
+ var divFirstSelect =3D node.firstChild.nextSibling;
+ var divSecondSelect =3D divFirstSelect.nextSibling;
+ =20
+ if((divFirstSelect.value !=3D -1) && (divSecondSelect.value!=3D =
-1)) //Verify if something has been selected
{
- //CAUTION: we start from the second child because the first =
is a text node (title) !!!!
- var divFirstSelect =3D node.firstChild.nextSibling;
- var divSecondSelect =3D divFirstSelect.nextSibling;
- =20
- if((divFirstSelect.value !=3D -1) && (divSecondSelect.value!=
=3D -1)) //Verify if something has been selected
+ if(this.inputLine.type =3D=3D 'TWOSELECTANDINPUT')
{
- //alert("divFirstSelect:" + divFirstSelect);
+ alert("divFirstSelect:" + divFirstSelect);
res +=3D divFirstSelect.value + "|";
- //alert("divSecondSelect:" + divSecondSelect);
- res +=3D divSecondSelect.value;
- res +=3D ","; //Separator between two order
+ alert("divSecondSelect:" + divSecondSelect);
+ res +=3D divSecondSelect.value + "|";
+ var divInput =3D divSecondSelect.nextSibling;
+ alert("divInput:" + divInput);
+ res +=3D "\'" + divInput.value + "\'";
}
- }
- else
- {
- //Here we must get the input value moreover
- //CAUTION: we start from the second child because the first =
is a text node (title) !!!!
- var divFirstSelect =3D node.firstChild.nextSibling;
- var divSecondSelect =3D divFirstSelect.nextSibling;
=20
- if((divFirstSelect.value !=3D -1) && (divSecondSelect.value!=
=3D -1)) //Verify if something has been selected
+ if(this.inputLine.type =3D=3D 'TWOSELECT')
{
//alert("divFirstSelect:" + divFirstSelect);
- res +=3D divFirstSelect.value + "|";
- =20
+ res +=3D divFirstSelect.value + "|"; =20
//alert("divSecondSelect:" + divSecondSelect);
- res +=3D divSecondSelect.value + "|";
- =20
- var divInput =3D divSecondSelect.nextSibling;
- //alert("divInput:" + divInput);
- res +=3D "\'" + divInput.value + "\'";
- =20
- var queue =3D "";
- if(node.nextSibling =3D=3D null) //Last criteria ?
- {
- queue =3D "|0|0";
- }
- else=20
- {
- queue =3D "|1|0";
- }
- res +=3D queue;
- res+=3D ";"; //Separator between two where
+ res +=3D divSecondSelect.value; =20
}
+ res+=3D ";"; //Separator between two lines
}
node =3D node.nextSibling;
}
- //Leave last coma (caracter)
- if(res !=3D "") //In case select was put to nothing
- {
- res =3D res.substring(0,res.length-1);
- }
- //alert("res expand:" + res);
-
- return res;
-}
-
-function ExpandFormGetOptionsString(value,selectedValueIndex)
-{
- var optionsArray;
=20
- if( value=3D=3D 1)
- {
- optionArray =3D this.optionArray1;
- }
- else
- {
- optionArray =3D this.optionArray2; =20
- }
+ res =3D res.substring(0,res.length-1);//remove last ;
=20
- var resStr =3D "";
- =20
- for(i=3D0;i<optionArray.length;i++)
- {
- =20
- var selected =3D "";
- if (selectedValueIndex =3D=3D i)
- {
- selected =3D " selected ";
- }
- resStr +=3D "<option name=3D\"" + this.selfRefName + i + "\"=
value =3D\"" + optionArray[i]["value"] + "\"" + selected + ">"
- + optionArray[i]["text"] + "</option>";
- }
- //alert(resStr);
- return resStr;
+ alert("res:" + res);
+ return res;
}
=20
+
function ExpandFormRemoveLine()
{
var divReceptor =3D GetNodeByTagNameAndAttName("div",this.selfRefNam=
e)[0]; //Unique id in the document as every
@@ -358,18 +222,19 @@
this.receptorNode.innerHTML =3D innerHtml; =20
=20
//Add lines with preselected values if inputValues exists
- if(this.inputValues !=3D null)
+ if(this.inputLine.HasPreselected() =3D=3D true)
{
var i;
+ var nbPreselected =3D this.inputLine.GetNumberOfPreselected();
//alert("size inputs: " + this.inputValues.Size());
- for(i=3D0; i < this.inputValues.Size();i++)
+ for(i=3D0; i < nbPreselected;i++)
{
- this.AddLine(i,false);
+ this.AddLine(i);
}
}
else
{
- this.AddLine(); =20
+ this.AddLine(); //Add empty line
}
}
=20
@@ -387,6 +252,8 @@
{
///////////////////////////////////////////////
TestGroupWrite("ExpandFormTest");
+ =20
+ =20
var divReceptor =3D GetNodeByTagNameAndAttName("div","ExpandForm")[0=
];=20
var divInsideReceptor =3D document.createElement("div");
divReceptor.appendChild(divInsideReceptor);
@@ -396,69 +263,45 @@
=20
divReceptor.appendChild(buttonShowValues);
=20
- var optionArray1 =3D new Array();
- optionArray1[0] =3D new Array();
- optionArray1[0]["value"] =3D "17";
- optionArray1[0]["text"] =3D "email";
- optionArray1[1] =3D new Array();
- optionArray1[1]["value"] =3D "18";
- optionArray1[1]["text"] =3D "file";
=20
- var optionArray2 =3D new Array();
- optionArray2[0] =3D new Array();
- optionArray2[0]["value"] =3D "asc";
- optionArray2[0]["text"] =3D "Ascendant";
- optionArray2[1] =3D new Array();
- optionArray2[1]["value"] =3D "desc";
- optionArray2[1]["text"] =3D "Descendant";
+ //Preselected values
+ var select0Arr =3D new Array();
+ select0Arr[0] =3D new Array();
+ select0Arr[0]["text"] =3D 'attribute0';
+ select0Arr[0]["value"] =3D 'att0';
=20
- aExpandForm =3D new ExpandForm("aExpandForm",divInsideReceptor,false=
,optionArray1,optionArray2,"Order");
+ select0Arr[1] =3D new Array();
+ select0Arr[1]["text"] =3D 'attribute1';
+ select0Arr[1]["value"] =3D 'att1';
=20
- ////////////////////////////////////////////////////////////////////=
////////////////////////////////////
+ select0Arr[2] =3D new Array();
+ select0Arr[2]["text"] =3D 'attribute2';
+ select0Arr[2]["value"] =3D 'att2';
=20
+ var select1Arr =3D new Array();
+ select1Arr[0] =3D new Array();
+ select1Arr[0]["text"] =3D 'EqualTo';
+ select1Arr[0]["value"] =3D '4';
=20
- //Build an expand form with preselected values
- var optionArray1 =3D new Array();
- optionArray1[0] =3D new Array();
- optionArray1[0]["value"] =3D "17";
- optionArray1[0]["text"] =3D "email";
- optionArray1[1] =3D new Array();
- optionArray1[1]["value"] =3D "18";
- optionArray1[1]["text"] =3D "file";
- optionArray1[2] =3D new Array();
- optionArray1[2]["value"] =3D "19";
- optionArray1[2]["text"] =3D "text";
+ select1Arr[1] =3D new Array();
+ select1Arr[1]["text"] =3D 'GreaterThan';
+ select1Arr[1]["value"] =3D '5';
=20
- var optionArray2 =3D new Array();
- optionArray2[0] =3D new Array();
- optionArray2[0]["value"] =3D "0";
- optionArray2[0]["text"] =3D "<=3D";
- optionArray2[1] =3D new Array();
- optionArray2[1]["value"] =3D "1";
- optionArray2[1]["text"] =3D "=3D";
+ var InputLineParams =3D
+ {
+ type: 'TWOSELECTANDINPUT',
+ select0: select0Arr,
+ select1: select1Arr,
+ input0: '',
+ PreselectedInput0: new Array('hola','hola2'),
+ PreselectedSelect0: new Array(0,2),
+ PreselectedSelect1: new Array(1,0),
+ refName: 'aExpandForm'
+ }
+
+ anInputLine =3D new InputLine(InputLineParams);
=20
- var selectOption1Arr =3D new Array();
- selectOption1Arr[0] =3D 0; //select file by default
- selectOption1Arr[1] =3D 2; //select text by default
- =20
- var selectOption2Arr =3D new Array();
- selectOption2Arr[0] =3D 0; //asc
- selectOption2Arr[1] =3D 1; //desc
- =20
- var inputValuesArr =3D new Array();
- inputValuesArr[0] =3D "toto.xsl";
- inputValuesArr[1] =3D "texto... Hola";
- =20
- aInputValues =3D new InputValues(selectOption1Arr,selectOption2Arr,i=
nputValuesArr);
- otherExpandForm =3D new ExpandForm("otherExpandForm",divInsideRecept=
or,true,optionArray1,optionArray2,"TestExpand: ",aInputValues);
- Test("LENGTH","Size of inputValues",aInputValues.Size() =3D=3D 2); =
=20
- Test("GetTriplet","Call #1",aInputValues.GetTriplet(0)["option1"] =3D=
=3D 0=20
- && aInputValues.GetTriplet(0)["option2"]=
=3D=3D 0
- && aInputValues.GetTriplet(0)["input"] =3D=
=3D "toto.xsl");
- Test("GetTriplet","Call #2",aInputValues.GetTriplet(1)["option1"] =3D=
=3D 2=20
- && aInputValues.GetTriplet(1)["option2"]=
=3D=3D 1
- && aInputValues.GetTriplet(1)["input"] =3D=
=3D "texto... Hola");
- =20
+ aExpandForm =3D new ExpandForm("aExpandForm",divInsideReceptor,"Expa=
ndFormReport",anInputLine);
}
=20
=20
Added: humano2/trunk/web/builder/site/js/grafcomponents/inputline.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/inputline.js 2005-05=
-19 16:58:18 UTC (rev 1098)
+++ humano2/trunk/web/builder/site/js/grafcomponents/inputline.js 2005-05=
-19 18:12:47 UTC (rev 1099)
@@ -0,0 +1,237 @@
+//
+// 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
+//
+//
+
+
+/**
+ * Class that generates a line with various option, buttons, input selec=
t.
+ * If preselected values of these inputs are entered, then it is possibl=
e to display
+ * all the lines (one after this other) with the values.
+ * @param params object that contains all parameters needed to build the=
input
+ */
+function InputLine(params)
+{
+ =20
+ this.type =3D params.type; //the type of line (2 select, 2 se=
lect and input etc...)
+ this.refName =3D params.refName; //For the ids of the html elements
+ =20
+ //The content of html elements
+ this.select0 =3D params.select0;
+ this.select1 =3D params.select1;
+ this.lineTitle =3D params.lineTitle;
+ =20
+ //The preselected values
+ switch(this.type)
+ {
+ case 'TWOSELECT': =20
+ this.PreselectedSelect0 =3D params.PreselectedSelect0;
+ this.PreselectedSelect1 =3D params.PreselectedSelect1;
+ break;
+ case 'TWOSELECTANDINPUT':
+ case 'INPUTANDTWOSELECT':
+ this.PreselectedSelect0 =3D params.PreselectedSelect0;
+ this.PreselectedSelect1 =3D params.PreselectedSelect1;
+ this.PreselectedInput0 =3D params.PreselectedInput0;
+ break;
+ =20
+ default:=20
+ alert("Oopps... Looks like the InputLine has been badly init=
ialized!");
+ break;
+ }
+ =20
+ //Methods
+ this.GetLine =3D InputLineGetLine;
+ this.GetEmptyLineHtml =3D InputLineGetEmptyLineHtml;
+ this.GetPreselectedLineHtml =3D InputLineGetPreselectedLineHtml;
+ this.GetNumberOfPreselected =3D InputLineGetNumberOfPreselected;
+ this.GetOptionString =3D InputLineGetOptionString;
+ this.HasPreselected =3D InputLineHasPreselected;
+}
+
+
+function InputLineHasPreselected()
+{
+ var bool;
+ if (this.PreselectedSelect0 !=3D null)
+ {
+ bool =3D (this.PreselectedSelect0.length > 0); //If the array is=
empty no preselection neither bool =3D true; =20
+ }
+ else
+ {
+ bool =3D false;
+ }
+ return bool;
+}
+
+function InputLineGetOptionString(optionArray,index, preselectedArray)
+{
+ =20
+ var resStr =3D "";
+ =20
+ var optionPreselectedValue=20
+ =20
+ if(index >=3D 0)
+ {
+ optionPreselectedValue =3D preselectedArray[index];
+ }
+ else
+ {
+ optionPreselectedValue =3D -1;
+ }
+ =20
+ //alert("optionPreselectedValue: " + optionPreselectedValue);
+ var i;
+ for(i=3D0;i<optionArray.length;i++)
+ {
+ var selected;
+ selected=3D"";
+ =20
+ if (optionPreselectedValue =3D=3D i)
+ {
+ selected =3D " selected ";
+ }
+ =20
+ resStr +=3D "<option name=3D\"" + this.refName + i + "\" value =3D=
\"" + optionArray[i]["value"] + "\"" + selected + ">"
+ + optionArray[i]["text"] + "</option>";
+ }
+ //alert(resStr);
+ return resStr; =20
+}
+
+
+function InputLineGetLine(index,lineNumber)
+{
+ var res =3D "";
+ =20
+ var option1String =3D this.GetOptionString(this.select0,index,this.P=
reselectedSelect0);
+ var option2String =3D this.GetOptionString(this.select1,index,this.P=
reselectedSelect1);
+ =20
+ var inputValue;
+ if((this.PreselectedInput0 !=3D null) && (index >=3D 0) )
+ {
+ inputValue =3D this.PreselectedInput0[index];
+ }
+ else
+ {
+ inputValue =3D ""; =20
+ }
+ =20
+ switch(this.type)=20
+ {
+ case 'TWOSELECTANDINPUT':
+ res =3D this.lineTitle + lineNumber + ": " + "<select style=3D=
\"width:100px;\" name=3D\"select1" + this.refName + lineNumber + "\" clas=
s=3D\"drpdwn2\">"
+ + option1String
+ + "</select>"
+ + "<select style=3D\"width:100px;\" name=3D\"selec=
t2" + this.refName + lineNumber + "\" class=3D\"drpdwn2\">"
+ + option2String =20
+ + "</select>"
+ + "<input name=3D\"input" + this.refName + lineNum=
ber + "\" value=3D\"" + inputValue + "" + "\" id=3D\"\"></input>";=20
+ break;
+ =20
+ case 'TWOSELECT':
+ res =3D this.lineTitle + lineNumber + ": " + "<select style=
=3D\"width:100px;\" name=3D\"select1" + this.refName + lineNumber + "\" c=
lass=3D\"drpdwn2\">"
+ + option1String
+ + "</select>"
+ + "<select style=3D\"width:100px;\" name=3D\"selec=
t2" + this.refName + lineNumber + "\" class=3D\"drpdwn2\">"
+ + option2String =20
+ + "</select>"
+ break;
+ }
+ =20
+ return res;
+}
+
+function InputLineGetEmptyLineHtml(lineNumber)
+{
+ return this.GetLine(-1,lineNumber);
+}
+
+/**
+ * Get the preselected line with its number
+ */
+function InputLineGetPreselectedLineHtml(index,lineNumber)
+{
+ return this.GetLine(index,lineNumber);
+}
+
+function InputLineGetNumberOfPreselected()
+{
+ var preselectedArr =3D this.PreselectedSelect0;
+ if (preselectedArr !=3D null)
+ {
+ res =3D preselectedArr.length;
+ }
+ else
+ res =3D 0;
+ =20
+ return res; =20
+}
+
+function InputLineTest()
+{
+ ///////////////////////////////////////////////
+ TestGroupWrite("InputLineTest");
+ =20
+ var select0Arr =3D new Array();
+ select0Arr[0] =3D new Array();
+ select0Arr[0]["text"] =3D 'attribute0';
+ select0Arr[0]["value"] =3D 'att0';
+ =20
+ select0Arr[1] =3D new Array();
+ select0Arr[1]["text"] =3D 'attribute1';
+ select0Arr[1]["value"] =3D 'att1';
+ =20
+ select0Arr[2] =3D new Array();
+ select0Arr[2]["text"] =3D 'attribute2';
+ select0Arr[2]["value"] =3D 'att2';
+ =20
+ var select1Arr =3D new Array();
+ select1Arr[0] =3D new Array();
+ select1Arr[0]["text"] =3D 'EqualTo';
+ select1Arr[0]["value"] =3D '4';
+ =20
+ select1Arr[1] =3D new Array();
+ select1Arr[1]["text"] =3D 'GreaterThan';
+ select1Arr[1]["value"] =3D '5';
+ =20
+ =20
+ var InputLineParams =3D
+ {
+ type: 'TWOSELECTANDINPUT',
+ select0: select0Arr,
+ select1: select1Arr,
+ input0: '',
+ PreselectedInput0: new Array('hola','hola2'),
+ PreselectedSelect0: new Array(1,2),
+ PreselectedSelect1: new Array(1,1),
+ refName: 'toto'
+ }
+
+ var aInputLine =3D new InputLine(InputLineParams);
+ =20
+ var EmptyLineHtml =3D aInputLine.GetEmptyLineHtml(0);
+ var nbOfPreselected =3D aInputLine.GetNumberOfPreselected();
+ Test("GetEmptyLineHtml","an empty line", EmptyLineHtml =3D=3D '');
+ document.write("EmptyLineHtml: " + EmptyLineHtml);
+ Test("GetNumberOfPreselected","Should be 2", nbOfPreselected =3D=3D =
2);
+ =20
+ =20
+ var PreselectedLineHtml =3D "";
+ var OraclePreselectedLineHtmlArr =3D new Array('','');
+ var i;
+ for(i=3D0;i<nbOfPreselected;i++)
+ {
+ PreselectedLineHtml =3D aInputLine.GetPreselectedLineHtml(i,i+3)=
;
+ //alert("PreselectedLineHtml[" + i +"]: \n" + PreselectedLineHt=
ml);
+ document.write("<br>" + " PreselectedLineHtml[" + i +"]: "+ Pr=
eselectedLineHtml + "<br>");
+ Test("GetPreselectedLineHtml[" + i + "]:", "A preselected line",=
PreselectedLineHtml =3D=3D OraclePreselectedLineHtmlArr[i]);
+ }
+ =20
+}
Modified: humano2/trunk/web/builder/site/js/grafcomponents/test.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/js/grafcomponents/test.html 2005-05-19=
16:58:18 UTC (rev 1098)
+++ humano2/trunk/web/builder/site/js/grafcomponents/test.html 2005-05-19=
18:12:47 UTC (rev 1099)
@@ -10,53 +10,59 @@
$Id $
-->
<html>
- <head> =20
- <script language=3D"Javascript" src=3D"misc.js"></script=
>
- <script language=3D"javascript" src=3D"test.js"></script=
>
- <script language=3D"Javascript" src=3D"sortedlist.js"></=
script>
- <script language=3D"Javascript" src=3D"sortedgraphicalli=
st.js"></script>
- <script language=3D"Javascript" src=3D"radiobuttonexpand=
.js"></script>
- <script language=3D"Javascript" src=3D"expandform.js"></=
script>
- <script language=3D"Javascript">
- var aSortedGraphicalList;
- var aRadioButtonExpand;
- var aExpandForm;
- </script>
- </head>
- <body>
- <center>
- <h1>
- Test of graphical components
- <h1> =20
- </center>
- <br>
- <br>
- <div>
- <script language=3D"Javascript">
- SortedListTest();
- </script>
- </div>
- =20
- <div id=3D"hola" id=3D"hola">
- <script language=3D"Javascript">
- MiscTest();
- </script>
- </div>
- =20
- <div id=3D"SortedGraphicalList">
- <script language=3D"Javascript">
- SortedGraphicalListTest();
- </script>
- </div>
- <div id=3D"RadioButtonExpand">
- <script language=3D"Javascript">
- RadioButtonExpandTest();
- </script>
- </div>
- <div id=3D"ExpandForm">
- <script language=3D"Javascript">
- ExpandFormTest();
- </script>
- </div>
- </body>
+ <head> =20
+ <script language=3D"Javascript" src=3D"misc.js"></script>
+ <script language=3D"javascript" src=3D"test.js"></script>
+ <script language=3D"Javascript" src=3D"sortedlist.js"></script>
+ <script language=3D"Javascript" src=3D"sortedgraphicallist.js"><=
/script>
+ <script language=3D"Javascript" src=3D"radiobuttonexpand.js"></s=
cript>
+ <script language=3D"Javascript" src=3D"expandformreport.js"></sc=
ript>
+ <script language=3D"Javascript" src=3D"inputline.js"></script>
+ <script language=3D"Javascript">
+ var aSortedGraphicalList;
+ var aRadioButtonExpand;
+ var aExpandForm;
+ </script>
+ </head>
+ <body>
+ <center>
+ <h1>
+ Test of graphical components
+ <h1> =20
+ </center>
+ <br>
+ <br>
+ <div>
+ <script language=3D"Javascript">
+ SortedListTest();
+ </script>
+ </div>
+ =20
+ <div id=3D"hola" id=3D"hola">
+ <script language=3D"Javascript">
+ MiscTest();
+ </script>
+ </div>
+ =20
+ <div id=3D"SortedGraphicalList">
+ <script language=3D"Javascript">
+ SortedGraphicalListTest();
+ </script>
+ </div>
+ <div id=3D"RadioButtonExpand">
+ <script language=3D"Javascript">
+ RadioButtonExpandTest();
+ </script>
+ </div>
+ <div id=3D"ExpandForm">
+ <script language=3D"Javascript">
+ ExpandFormTest();
+ </script>
+ </div>
+ <div id=3D"InputLine">
+ <script language=3D"Javascript">
+ InputLineTest();
+ </script>
+ </div>
+ </body>
</html>
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 16:58:=
18 UTC (rev 1098)
+++ humano2/trunk/web/builder/site/xsl/createreport.xsl 2005-05-19 18:12:=
47 UTC (rev 1099)
@@ -4,25 +4,26 @@
<xsl:template match=3D"/">
<html>
<head>
- <title>Report Edit</title>
- <script language=3D"javascript">
- function ConfirmDelete(userId)
- {
- return confirm("Are you sure you want to remove this rep=
ort?");
- }
- </script>
- <!-- For the graphical components -->
- <script language=3D"Javascript" src=3D"js/grafcomponents/misc.js=
"></script>
- <script language=3D"javascript" src=3D"js/grafcomponents/test.js=
"></script>
- <script language=3D"Javascript" src=3D"js/grafcomponents/sortedl=
ist.js"></script>
- <script language=3D"Javascript" src=3D"js/grafcomponents/sortedg=
raphicallist.js"></script>
- <script language=3D"Javascript" src=3D"js/grafcomponents/radiobu=
ttonexpand.js"></script>
- <script language=3D"Javascript" src=3D"js/grafcomponents/expandf=
ormreport.js"></script>
- <!-- Load this script before the next one -->
- <script language=3D"Javascript" src=3D"js/formreport.js" type=3D=
"text/javascript"></script>=20
- =20
+ <title>Report Edit</title>
+ <script language=3D"javascript">
+ function ConfirmDelete(userId)
+ {
+ return confirm("Are you sure you want to remove this=
report?");
+ }
+ </script>
+ <!-- For the graphical components -->
+ <script language=3D"Javascript" src=3D"js/grafcomponents/mis=
c.js"></script>
+ <script language=3D"javascript" src=3D"js/grafcomponents/tes=
t.js"></script>
+ <script language=3D"Javascript" src=3D"js/grafcomponents/sor=
tedlist.js"></script>
+ <script language=3D"Javascript" src=3D"js/grafcomponents/sor=
tedgraphicallist.js"></script>
+ <script language=3D"Javascript" src=3D"js/grafcomponents/rad=
iobuttonexpand.js"></script>
+ <script language=3D"Javascript" src=3D"js/grafcomponents/inp=
utline.js"></script>
+ <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
+ <link href=3D"styles/css/general_styles_verde.css" rel=3D"st=
ylesheet" type=3D"text/css"></link>
</head>
- <link href=3D"styles/css/general_styles_verde.css" rel=3D"stylesheet"=
type=3D"text/css"/>
+ =09
<!-- Here we create an array and use it as parameter for For=
m class constructor -->
<script language=3D"Javascript">
=20
@@ -33,39 +34,11 @@
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"." =
/>";
+ reportColumnsArray[i++] =3D "<xsl:value-of select=3D=
"." />";
</xsl:for-each>
//alert(reportColumnsArray.length);
var ReportParams =3D new ReportParams(reportColumnsArray=
,null,null);
=20
- //Filters =20
- var selectOption1Array =3D new Array();
- var selectOption2Array =3D new Array();
- var inputTagValuesArray =3D new Array();
- =20
- var i=3D0;
- <xsl:for-each select=3D"/report/reportDatas/reportParams=
/conditions/condition">
- selectOption1Array[i] =3D <xsl:value-of select=3D"i=
dAtt" />;
- selectOption2Array[i] =3D <xsl:value-of select=3D"o=
perator" />;
- inputTagValuesArray[i] =3D <xsl:value-of select=3D"=
value" />;
- i++;
- </xsl:for-each>
- =20
- var inputValuesFilter;
- inputValuesFilter =3D new InputValues(selectOption1Array=
,selectOption2Array,inputTagValuesArray);
- =20
- //Order
- var selectOption1ArrayOrder =3D new Array();
- var selectOption2ArrayOrder =3D new Array();
- var i=3D0;
- <xsl:for-each select=3D"/report/reportDatas/reportParams=
/orders/order">
- selectOption1ArrayOrder[i] =3D <xsl:value-of select=
=3D"idAtt" />;
- selectOption2ArrayOrder[i] =3D <xsl:value-of select=
=3D"ascOrDesc" />;
- i++;
- </xsl:for-each>
- var inputValuesOrder;
- inputValuesOrder =3D new InputValues(selectOption1ArrayO=
rder,selectOption2ArrayOrder,null);
- =20
////////////////////////
//The form
var formArray =3D new Array();
@@ -90,6 +63,141 @@
</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" />;
+ i++;
+ </xsl:for-each>
+ =20
+ function AttribsGetSelect0Arr(formArray,classId)
+ {
+ var lengthArray =3D formArray[classId].length;
+ //alert("lengthArray: " + lengthArray);
+ =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()
+ {
+ 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;
+ }
+ =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 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;
+ }
+ =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>
+ =20
+ //var inputValuesOrder;
+ //inputValuesOrder =3D new InputValues(selectOption1Arra=
yOrder,selectOption2ArrayOrder,null);
+ =20
+ =20
+ =20
function recargar()
{
<![CDATA[
@@ -188,6 +296,7 @@
</xsl:for-each>
}
</script>
+ =20
<style type=3D"text/css">=20
=20
.s { font-family: Verdana, Arial, Helvetica, sans-serif; color: #000000=
; font-size:10pt}
@@ -315,13 +424,10 @@
</table>
<script language=3D"Javascript">
var divFilter =3D GetNodeByT=
agNameAndAttName("div","Filter")[0];
- var expandFormFilter =3D new=
ExpandForm("expandFormFilter",
- =
divFilter,
- =
true,
- =
Form.GetFilterArray(1),
- =
Form.GetFilterArray(2),
- =
"Filter",
- =
inputValuesFilter);
+ var expandFormFilter =3D new=
ExpandForm( "expandFormFilter",
+ =
divFilter,
+ =
"Filter",
+ =
InputLineFilters);
</script>
</td>
</tr>
@@ -443,11 +549,13 @@
var divSort =3D GetNodeByTag=
NameAndAttName("div","Sort")[0];
var expandFormSort =3D new E=
xpandForm("expandFormSort",
=
divSort,
- =
false,
- =
Form.GetSortArray(1),
- =
Form.GetSortArray(2),
=
"Order",
- =
inputValuesOrder);
+ =
InputLineOrders);
+ =
=20
+ =
var expandFormFilter =3D new ExpandForm( "expandFormFilter",
+ =
divFilter,
+ =
"Filter",
+ =
InputLineFilters);
</script>
</td>
</tr>
@@ -460,7 +568,7 @@
<table width=3D"100%" border=3D"0" cellSpacing=3D"0" cellPadding=
=3D"0">
<tr>
<td width=3D"100%" colspan=3D"2">
- <div class=3D"lev1divider"><IMG height=3D"9" src=3D"clear2x2.=
gif" width=3D"100%"/></div>
+ <div class=3D"lev1divider"><img height=3D"9" src=3D"clear2x2.=
gif" width=3D"100%"/></div>
</td>
</tr>
</table>
|
