[H2-commits] r1088 - in humano2/trunk/web/portal/site: . xsl

[<sv...@de...>]

Author: svera
Date: 2005-05-18 13:46:14 -0400 (Wed, 18 May 2005)
New Revision: 1088

Modified:
   humano2/trunk/web/portal/site/leftbar.aspx.cs
   humano2/trunk/web/portal/site/xsl/leftbar.xsl
Log:
 * the left bar now include the report's to show

Modified: humano2/trunk/web/portal/site/leftbar.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/portal/site/leftbar.aspx.cs	2005-05-18 17:42:31 UTC=
 (rev 1087)
+++ humano2/trunk/web/portal/site/leftbar.aspx.cs	2005-05-18 17:46:14 UTC=
 (rev 1088)
@@ -109,6 +109,8 @@
=20
 				DataTable DTView =3D dbAdapter.GenerateViewTools(1011,"0,1017,1018",=
filtro,"","","",0);
=20
+				DataTable DTReport =3D dbAdapter.GenerateViewTools(1300,"0,1307",fil=
tro,"","","",0);
+
 				filtro =3D String.Format("1201|4|'CREATE'|1|0;{0}",filtro);
 				DataTable DTForm =3D dbAdapter.GenerateViewTools(1200,"0,1203,1202,1=
201",filtro,"","","",0);
=20
@@ -119,7 +121,17 @@
 					xmlString +=3D "	<folder>";
 					xmlString +=3D "		<id>" + Dr["id_entity"] + "</id>";
 					xmlString +=3D "		<name>" + Dr[1] + "</name>";
-					xmlString +=3D "		<parent>" + Dr[3] + "</parent>";
+					if (Dr[3] !=3D null)
+					{
+						if (Dr[3].ToString() !=3D "" && Dr[3].ToString() !=3D "0")
+						{
+							xmlString +=3D "		<parent>" + Dr[3] + "</parent>";
+						}else{
+							xmlString +=3D "		<parent></parent>";
+						}
+					}else{
+						xmlString +=3D "		<parent></parent>";
+					}
 					Forms =3D Convert.ToString(Dr[2]);
=20
 					if (Forms!=3D"")
@@ -143,7 +155,15 @@
 							xmlString +=3D "			<type></type>";
 							xmlString +=3D "		</form>";
 						}
-
+						foreach(DataRow Dr3 in DTReport.Select("id_entity in (" + Forms + =
")"))=20
+						{
+							xmlString +=3D "		<report>";
+							xmlString +=3D "			<id>" + Dr3["id_entity"] + "</id>";
+							xmlString +=3D "			<classId></classId>";
+							xmlString +=3D "			<name>" + Dr3[1] + "</name>";
+							xmlString +=3D "			<type></type>";
+							xmlString +=3D "		</report>";
+						}
 					}
 					xmlString +=3D "	</folder>";
 				}

Modified: humano2/trunk/web/portal/site/xsl/leftbar.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/portal/site/xsl/leftbar.xsl	2005-05-18 17:42:31 UTC=
 (rev 1087)
+++ humano2/trunk/web/portal/site/xsl/leftbar.xsl	2005-05-18 17:46:14 UTC=
 (rev 1088)
@@ -86,7 +86,21 @@
 										tree_<xsl:value-of select=3D"$idFolder"/>.add(child_<xsl:value=
-of select=3D"id"/>);
 									  </xsl:if>		=09
 									</xsl:for-each>=09
-								=09
+<!--SVERA Inicio seccion Report -->								=09
+									<xsl:for-each select=3D"report">
+									  <xsl:if test=3D"id!=3D''">
+									  <!--
+										<xsl:if test=3D"type!=3D''">
+											var child_<xsl:value-of select=3D"id" /> =3D new WebFXTreeIte=
m('<xsl:value-of select=3D"name" />','Data_structured.aspx?action=3Dcreat=
e&amp;display=3DreadXslt.aspx&amp;id_entity=3D<xsl:value-of select=3D"cla=
ssId" />&amp;formsId=3D<xsl:value-of select=3D"id" />','','img/webfxtree/=
crearinstance.jpeg');
+										</xsl:if> -->
+										<!--		=09
+										<xsl:if test=3D"type=3D''"> -->
+											var child_<xsl:value-of select=3D"id" /> =3D new WebFXTreeIte=
m('<xsl:value-of select=3D"name" />','report.aspx?id_entity=3D<xsl:value-=
of select=3D"id" />&amp;classId=3D<xsl:value-of select=3D"classId" />',''=
,'img/webfxtree/reporte.jpeg');
+										<!-- </xsl:if> -->		=09
+										tree_<xsl:value-of select=3D"$idFolder"/>.add(child_<xsl:value=
-of select=3D"id"/>);
+									  </xsl:if>		=09
+									</xsl:for-each>
+<!-- Fin seccion Report -->																	=09
 								</xsl:for-each><!--Para Folders-->
                         </xsl:if>
                        =20