Menu
▾
▴
[H2-commits] r1324 - in humano2/trunk/web/builder/site: . js js/grafcomponents xsl
|
From: <sv...@de...> - 2005-06-14 20:27:43
|
Author: pcamacho
Date: 2005-06-14 16:27:39 -0400 (Tue, 14 Jun 2005)
New Revision: 1324
Modified:
humano2/trunk/web/builder/site/createreport.aspx.cs
humano2/trunk/web/builder/site/js/form.js
humano2/trunk/web/builder/site/js/grafcomponents/expandform.js
humano2/trunk/web/builder/site/viewmain.aspx.cs
humano2/trunk/web/builder/site/xsl/createreport.xsl
humano2/trunk/web/builder/site/xsl/createview.xsl
Log:
CHANGE: factorisation of form. Works for reports. Remain views.
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-06-14 19:11:=
02 UTC (rev 1323)
+++ humano2/trunk/web/builder/site/createreport.aspx.cs 2005-06-14 20:27:=
39 UTC (rev 1324)
@@ -733,7 +733,7 @@
Logger.Log("ReportMain: ProcessCreationUpdate", LogLevel.Tra=
ce);
=20
receivedClassId =3D Request["sendClassId"];
- receivedReportName =3D Request["sendReportName"];
+ receivedReportName =3D Request["sendName"];
receivedColumnsStr =3D Request["sendColumnsStr"];
receivedOrderStr =3D Request["sendOrderStr"];
receivedWhereStr =3D Request["sendWhereStr"];
Modified: humano2/trunk/web/builder/site/js/form.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/form.js 2005-06-14 19:11:02 UTC (re=
v 1323)
+++ humano2/trunk/web/builder/site/js/form.js 2005-06-14 20:27:39 UTC (re=
v 1324)
@@ -12,28 +12,27 @@
*/
=20
////////////////////////////////////////////// Form Class //////////////=
///////////////////////////////////////////////
-function Form(formArray, classId) //, ReportParams)
+function Form(classId,type,infosToSubmit)=20
{
//Fields
- this.attributeLeftArray =3D new Array();
- this.attributeRightArray =3D new Array();
- this.formArray =3D formArray;
+ this.type =3D type;
this.classId =3D classId;
+ this.infosToSubmit =3D infosToSubmit;
=20
//Methods
this.UpdateSubmitAll =3D FormUpdateSubmitAll;
this.DeleteReport =3D FormDeleteReport;
}
=20
-function FormUpdateSubmitAll(rightColumn,sort,filter,persoColumns,having=
s)
+function FormUpdateSubmitAll()
{
//Get the ReportName
- var reportNameInput =3D GetNodeByTagNameAndAttName("input","reportNa=
meInput")[0];
- var reportName =3D reportNameInput.value;
+ var name =3D this.infosToSubmit.divName.value; //GetNodeByTagNameAnd=
AttName("input","reportNameInput")[0];
+ //var reportName =3D reportNameInput.value;
=20
- if(reportName =3D=3D "")
+ if(name =3D=3D "")
{
- alert("You must enter the name of report."); =20
+ alert("You must enter the name."); =20
return false;
}
=20
@@ -46,7 +45,7 @@
//Build the columnstr string
//alert(rightColumn);
var i;
- var sortedList =3D rightColumn.fSortedList;
+ var sortedList =3D this.infosToSubmit.rightColumn.fSortedList;
//alert(sortedList.Length());
var columnsStr =3D "";
for(i=3D0;i<sortedList.Length();i++)
@@ -61,46 +60,70 @@
//Now the sort
//alert("sort SelfRefName:" + sort.GetSelfRefName());
=20
- var orderStr =3D sort.ReturnValues();=20
+ var orderStr =3D this.infosToSubmit.sort.ReturnValues();=20
//alert("orderStr: " + orderStr);
=20
//The filter
//alert("filter SelfRefName:" + filter.GetSelfRefName());
- var whereStr =3D filter.ReturnValues();
+ var whereStr =3D this.infosToSubmit.filter.ReturnValues();
//alert("whereStr: " + whereStr);
=20
- var persoColumnsStr =3D persoColumns.ReturnValues();
- //alert("persoColumnsStr: " + persoColumnsStr);
+ if(this.type =3D=3D 'REPORT')
+ {
+ var persoColumnsStr =3D this.infosToSubmit.persoColumns.ReturnVa=
lues();
+ //var havingsStr =3D this.infosToSubmit.havings.ReturnValues(); =
Commented due to bug#123
+ var havingsStr =3D "";
+ }
=20
- //var havingsStr =3D havings.ReturnValues(); Commented due to bug#12=
3
- var havingsStr =3D "";
- =20
//Update the submit all TD
- var divSubmitAll =3D GetNodeByTagNameAndAttName("div","SubmitAll")[0=
];
+ var divSubmitAll =3D this.infosToSubmit.divSubmitAll;
//alert(divSubmitAll);
divSubmitAll.innerHTML +=3D=20
=20
"<input type=3D\"hidden\" name=3D\"sendCreateUpdate\" value=3D\"=
true\"></input>"
+"<input type=3D\"hidden\" name=3D\"sendClassId\" value=3D\""+ c=
lassId +"\"></input>"
- +"<input type=3D\"hidden\" name=3D\"sendReportName\" value=3D\""=
+ reportName + "\"></input>"
+ +"<input type=3D\"hidden\" name=3D\"sendName\" value=3D\"" + nam=
e + "\"></input>"
+"<input type=3D\"hidden\" name=3D\"sendColumnsStr\" value=3D\""=
+ columnsStr + "\"></input>"
+"<input type=3D\"hidden\" name=3D\"sendOrderStr\" value=3D\"" +=
orderStr + "\"></input>"
- +"<input type=3D\"hidden\" name=3D\"sendWhereStr\" value=3D\"" +=
whereStr + "\"></input>"
- +"<input type=3D\"hidden\" name=3D\"sendPersoColumnsStr\" value=3D=
\"" + persoColumnsStr + "\"></input>"
- +"<input type=3D\"hidden\" name=3D\"sendHavingsStr\" value=3D\""=
+ havingsStr + "\"></input>";
- =20
+ +"<input type=3D\"hidden\" name=3D\"sendWhereStr\" value=3D\"" +=
whereStr + "\"></input>";
+ =20
+ if (this.type =3D=3D 'REPORT')
+ {
+ divSubmitAll.innerHTML +=3D=20
+ "<input type=3D\"hidden\" name=3D\"sendPersoColumnsStr\" val=
ue=3D\"" + persoColumnsStr + "\"></input>"
+ +"<input type=3D\"hidden\" name=3D\"sendHavingsStr\" value=3D=
\"" + havingsStr + "\"></input>";
+ } =20
//alert(divSubmitAll.innerHTML);
return true;
}
=20
-function FormDeleteReport(reportId)
+function FormDeleteReport()
{
- if (confirm("Are you sure you want to delete the report?"))
+ var msg =3D "Are you sure you want to delete the ";
+ switch(this.type)
{
+ case 'VIEW': =20
+ msg +=3D "view";
+ case 'REPORT':
+ msg +=3D "report"; =20
+ }
+ msg +=3D"?";
+ =20
+ if (confirm(msg))
+ {
+ var id =3D this.infosToSubmit.id;
+ var name;
+ switch(this.type)
+ {
+ case 'VIEW': =20
+ name =3D "viewId";
+ case 'REPORT':
+ name =3D "reportId"; =20
+ }
var divSubmitAll =3D GetNodeByTagNameAndAttName("div","SubmitAll=
")[0];
- //alert(divSubmitAll);
- divSubmitAll.innerHTML +=3D "<input type=3D\"hidden\" name=3D=
\"delete\" value=3D\"true\"></input>";
- divSubmitAll.innerHTML +=3D "<input type=3D\"hidden\" name=3D=
\"reportId\" value=3D\"" + reportId + "\"></input>";
+ //alert(divSubmitAll);
+ divSubmitAll.innerHTML +=3D "<input type=3D\"hidden\" name=3D\"d=
elete\" value=3D\"true\"></input>";
+ divSubmitAll.innerHTML +=3D "<input type=3D\"hidden\" name=3D\""=
+ name + "\" value=3D\"" + id + "\"></input>";
return true; =20
}
else
Modified: humano2/trunk/web/builder/site/js/grafcomponents/expandform.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/expandform.js 2005-0=
6-14 19:11:02 UTC (rev 1323)
+++ humano2/trunk/web/builder/site/js/grafcomponents/expandform.js 2005-0=
6-14 20:27:39 UTC (rev 1324)
@@ -25,7 +25,6 @@
//this.optionArray2 =3D new Array();
this.title =3D title;
=20
- =20
//Methods
this.PutAllComponents =3D ExpandFormPutAllComponents;
this.AddLine =3D ExpandFormAddLine;
Modified: humano2/trunk/web/builder/site/viewmain.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/viewmain.aspx.cs 2005-06-14 19:11:02 U=
TC (rev 1323)
+++ humano2/trunk/web/builder/site/viewmain.aspx.cs 2005-06-14 20:27:39 U=
TC (rev 1324)
@@ -492,7 +492,7 @@
Logger.Log("ViewMain: ProcessCreationUpdate", LogLevel.Trace=
);
=20
receivedClassId =3D Request["sendClassId"];
- receivedViewName =3D Request["sendViewName"];
+ receivedViewName =3D Request["sendName"];
receivedColumnsStr =3D Request["sendColumnsStr"];
receivedOrderStr =3D Request["sendOrderStr"];
receivedWhereStr =3D Request["sendWhereStr"];
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-14 19:11:=
02 UTC (rev 1323)
+++ humano2/trunk/web/builder/site/xsl/createreport.xsl 2005-06-14 20:27:=
39 UTC (rev 1324)
@@ -27,32 +27,6 @@
=20
<!-- Here we create an array and use it as parameter for For=
m class constructor -->
<script language=3D"Javascript">
- =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" />);
- </xsl:if>
- //alert(Form.GetOptionString(0));
- =20
- =20
///////////////
/// The columns of attributes (group columns)
var attribsArr =3D new Array();
@@ -539,12 +513,7 @@
<xsl:val=
ue-of select=3D"/report/reportDatas/saveName" />
</xsl:attrib=
ute>
<xsl:attribu=
te name=3D"onclick">
- Form.Upd=
ateSubmitAll(rightColumn,
- =
expandFormSort,
- =
expandFormFilter,
- =
expandFormPersoColumns,
- =
null);
- =
//expandFormHavings); Commented due to bug #123 (replaced te=
mporarly by null)
+ Form.Upd=
ateSubmitAll();
</xsl:attrib=
ute>
</input>
</div>
@@ -554,7 +523,7 @@
<xsl:if test=3D"=
/report/reportDatas/displayDeleteButton=3D'true'" >
<input type=3D=
"submit" value=3D"Delete">
<xsl:att=
ribute name=3D"onclick">
- Form=
.DeleteReport(<xsl:value-of select=3D"/report/id" />);
+ Form=
.DeleteReport();
</xsl:at=
tribute>
</input>
</xsl:if>
@@ -579,6 +548,24 @@
</xsl:attribute>
</input>=20
</div>
+ <script language=3D"Javascript">
+ <xsl:if test=3D"/report/reportDatas/classId!=3D''">
+ var infosToSubmit =3D
+ {
+ <xsl:if test=3D"/report/reportDatas/name!=3D=
''"> <!-- UPDATE -->
+ id:<xsl:value-of select=3D"/report/repor=
tDatas/id" />,
+ </xsl:if>
+ divName:document.getElementById('reportNameI=
nput'),
+ rightColumn: rightColumn,
+ sort: expandFormSort,
+ filter: expandFormFilter,
+ persoColumns:expandFormPersoColumns,
+ divSubmitAll: document.getElementById('Submi=
tAll')
+ //havings =3D=20
+ }
+ var Form =3D new Form(<xsl:value-of select=3D"/r=
eport/reportDatas/classId" />,"REPORT", infosToSubmit);
+ </xsl:if>
+ </script>
</form>
</body>
</html>
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-14 19:11:02=
UTC (rev 1323)
+++ humano2/trunk/web/builder/site/xsl/createview.xsl 2005-06-14 20:27:39=
UTC (rev 1324)
@@ -43,9 +43,7 @@
</xsl:for-each>
</xsl:for-each>
=20
- <xsl:if test=3D"/view/viewDatas/classId!=3D''">
- var Form =3D new Form(formArray,<xsl:value-of select=3D"=
/view/viewDatas/classId" />);
- </xsl:if>
+ =20
=20
=20
//////////////////
@@ -467,6 +465,11 @@
</xsl:attribute>
</input>=20
</div>
+ <script language=3D"Javascript">
+ <xsl:if test=3D"/view/viewDatas/classId!=3D''">
+ var Form =3D new Form(<xsl:value-of select=3D=
"/view/viewDatas/classId" />,"VIEW");
+ </xsl:if>
+ </script>
</form>
</body>
</html>
|
