Menu
▾
▴
[H2-commits] r1091 - in humano2/trunk/web/builder/site: . xsl
|
From: <sv...@de...> - 2005-05-18 20:16:40
|
Author: pcamacho
Date: 2005-05-18 16:16:37 -0400 (Wed, 18 May 2005)
New Revision: 1091
Modified:
humano2/trunk/web/builder/site/createreport.aspx.cs
humano2/trunk/web/builder/site/functionclasses.aspx.cs
humano2/trunk/web/builder/site/xsl/functionindex.xsl
Log:
ADD: in builder, the reports appears ready for editing in the function tr=
ee as views,folders and forms.
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-18 19:48:=
18 UTC (rev 1090)
+++ humano2/trunk/web/builder/site/createreport.aspx.cs 2005-05-18 20:16:=
37 UTC (rev 1091)
@@ -612,14 +612,11 @@
salida +=3D "<id>" + idatt + "^" + row2["id_entity"].ToString() + =
"</id>";
salida +=3D "<name>" + className + "." + attName + "</name>";
salida +=3D "</attribute>";
-
}
salida +=3D "</attributes>";
salida +=3D "</class>";
}
-
}
- =09
return salida;
}
=20
@@ -638,7 +635,6 @@
=20
dr["columna"] =3D "0";
=20
-
//Explicacion de los filtros...
//atributo 67|4|'true' =3D> isPrimary=3D'true'
//atributo 40|4|idClass =3D> classId=3DidClass
Modified: humano2/trunk/web/builder/site/functionclasses.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/functionclasses.aspx.cs 2005-05-18 19:=
48:18 UTC (rev 1090)
+++ humano2/trunk/web/builder/site/functionclasses.aspx.cs 2005-05-18 20:=
16:37 UTC (rev 1091)
@@ -61,11 +61,12 @@
override protected string createXml()
{
string xmlString =3D "";
- xmlString +=3D "<vff>"; //views folders forms
+ xmlString +=3D "<vffr>"; //views folders forms
xmlString +=3D getViewsXml();
xmlString +=3D getFolders();
xmlString +=3D getForms();
- xmlString +=3D "</vff>";
+ xmlString +=3D getReports();
+ xmlString +=3D "</vffr>";
=20
//Add the header
xmlString =3D "<?xml version=3D\"1.0\" encoding=3D\"UTF-8 =
\"?>"
@@ -145,6 +146,26 @@
return xmlString;
}
=20
+ private string getReports()
+ {
+ adapter dbAdapter =3D userCred.CoreAdapter;
+ DataTable DTReport =3D dbAdapter.GenerateViewTools(1300,"0,1=
307","","","","",0);
+ =20
+ string xmlString =3D "";
+ =20
+ xmlString +=3D "<reports>";
+ foreach(DataRow Dr in DTReport.Rows)=20
+ {
+ xmlString +=3D "<report>";
+ xmlString +=3D "<id>" + Dr["id_entity"] + "</id>";
+ xmlString +=3D "<name>" + Dr["reportName"] + "</name>=
";
+ xmlString +=3D "</report>";
+ }
+ xmlString +=3D "</reports>"; =20
+ =20
+ return xmlString;
+ }
+ =20
override protected void OnInit(EventArgs e)
{
InitializeComponent();
Modified: humano2/trunk/web/builder/site/xsl/functionindex.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/functionindex.xsl 2005-05-18 19:48=
:18 UTC (rev 1090)
+++ humano2/trunk/web/builder/site/xsl/functionindex.xsl 2005-05-18 20:16=
:37 UTC (rev 1091)
@@ -48,7 +48,7 @@
//Views
var viewBranch =3D new WebFXTreeItem('Views',action)=
;
tree.add(viewBranch);
- <xsl:for-each select=3D"vff/views/view">
+ <xsl:for-each select=3D"vffr/views/view">
var titleLink =3D '<xsl:value-of select=3D"name"=
/>';
var contentLink =3D 'viewmain.aspx?viewId=3D<xsl=
:value-of select=3D"id" />';
viewBranch.add(new WebFXTreeItem(titleLink,conte=
ntLink,'','img/webfxtree/view.jpeg'));
@@ -57,7 +57,7 @@
//Folders
var folderBranch =3D new WebFXTreeItem('Folders',act=
ion);
tree.add(folderBranch);
- <xsl:for-each select=3D"/vff/folders/folder">
+ <xsl:for-each select=3D"/vffr/folders/folder">
var titleLink =3D '<xsl:value-of select=3D"name"=
/>';
var contentLink =3D 'foldermanagement.aspx?folde=
rId=3D<xsl:value-of select=3D"id" />&opaction=3D2';
folderBranch.add(new WebFXTreeItem(titleLink,con=
tentLink,'','img/webfxtree/view.jpeg'));
@@ -66,13 +66,31 @@
//Forms
var formBranch =3D new WebFXTreeItem('Forms',action)=
;
tree.add(formBranch);
- <xsl:for-each select=3D"/vff/forms/form">
+ <xsl:for-each select=3D"/vffr/forms/form">
<xsl:if test=3D"id!=3D''">
- var child_<xsl:value-of select=3D"id" /> =3D new=
WebFXTreeItem('<xsl:value-of select=3D"name" />','formmanagement.aspx?fo=
rmid=3D<xsl:value-of select=3D"id" />&classId=3D<xsl:value-of select=3D=
"classId" />&opaction=3D2','','img/webfxtree/view.jpeg');
+ var child_<xsl:value-of select=3D"id" /> =3D new=
WebFXTreeItem('<xsl:value-of select=3D"name" />',
+ =
'formmanagement.aspx?formid=3D<xsl:value-of select=3D"id" />&=
amp;classId=3D<xsl:value-of select=3D"classId" />&opaction=3D2',
+ =
'',
+ =
'img/webfxtree/view.jpeg');
formBranch.add(child_<xsl:value-of select=3D"id"=
/>);
</xsl:if> =09
</xsl:for-each>=09
=20
+ =20
+ //Reports
+ var reportBranch =3D new WebFXTreeItem('Reports',act=
ion);
+ tree.add(reportBranch);
+ <xsl:for-each select=3D"/vffr/reports/report">
+ <xsl:if test=3D"id!=3D''">
+ var child_<xsl:value-of select=3D"id" /> =3D new=
WebFXTreeItem('<xsl:value-of select=3D"name" />',
+ =
'createreport.aspx?reportId=3D<xsl:value-of select=3D"id" />',
+ =
'',
+ =
'img/webfxtree/view.jpeg');
+ reportBranch.add(child_<xsl:value-of select=3D"i=
d"/>);
+ </xsl:if> =09
+ </xsl:for-each>=09
+ =20
+ =20
//Write all tree
document.write(tree);
</script>
|
