Menu
▾
▴
[H2-commits] r1407 - in humano2/trunk: components/webTools web/builder/site
|
From: <sv...@de...> - 2005-06-23 17:27:03
|
Author: pcamacho
Date: 2005-06-23 13:27:09 -0400 (Thu, 23 Jun 2005)
New Revision: 1407
Modified:
humano2/trunk/components/webTools/interfacetools.cs
humano2/trunk/web/builder/site/buildattribute.aspx.cs
Log:
FIX: bug #225. Use now the same function as for the creation of views to =
display attribute list.
Modified: humano2/trunk/components/webTools/interfacetools.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/interfacetools.cs 2005-06-23 17:16:=
33 UTC (rev 1406)
+++ humano2/trunk/components/webTools/interfacetools.cs 2005-06-23 17:27:=
09 UTC (rev 1407)
@@ -310,7 +310,7 @@
=20
*/
=20
- DataTable DtListAtt =3D getAttribListForClass(classId, userC=
red,fullPert);
+ DataTable DtListAtt =3D GetAttribListForClass(classId, userC=
red,fullPert);
foreach(DataRow row in DtListAtt.Rows)
{
salida +=3D "<attribute>";
@@ -331,7 +331,7 @@
}
=20
=20
- private static DataTable getAttribListForClass(int classId, Sess=
ionCredencial userCred,bool fullPert)
+ public static DataTable GetAttribListForClass(int classId, Sessi=
onCredencial userCred,bool fullPert)
{
int attlogin =3D 0;
int idatt =3D 0;
Modified: humano2/trunk/web/builder/site/buildattribute.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/buildattribute.aspx.cs 2005-06-23 17:1=
6:33 UTC (rev 1406)
+++ humano2/trunk/web/builder/site/buildattribute.aspx.cs 2005-06-23 17:2=
7:09 UTC (rev 1407)
@@ -865,7 +865,7 @@
res.Append(@"<table><tr>");
=20
res.Append(@"<td><select size=3D""6"" name=3D""fx_formAttribList"" ond=
blclick=3D""insertElementBracedText(this.options[this.selectedIndex], For=
m1.fx_Formula)"">");
- res.Append( formAttibList(classId) );
+ res.Append( formAttribList(classId) );
res.Append(@"</select></td>");
=20
res.Append(@"<td>");
@@ -1043,77 +1043,18 @@
return result;
}
=20
- private StringBuilder formAttibList(int classId)=20
- {
- StringBuilder res =3D new StringBuilder();
- int idatt =3D 0;
- int attlogin =3D 0;
- DataTable dtpert;
- DataTable dtrel;
- int idClassRel =3D 0;
+ private StringBuilder formAttribList(int classId)=20
+ {
+ StringBuilder res =3D new StringBuilder();
+ =20
+ DataTable DtAttList =3D Interface.GetAttribListForClass(clas=
sId, userCred,true); //All attribs with pertinence
+ foreach(DataRow row in DtAttList.Rows)
+ {
+ res.Append("<option value=3D\"" + row["id"] + "\">" + ro=
w["name"] + "</option>"); =20
+ }
+ return res;
+ }
=20
- DataTable dt =3D userCred.CoreAdapter.GetAttributesFromClass(classId);
-
- // foreach(DataColumn dc in dt.Columns)
- // {
- // Response.Write(dc.ColumnName+"\n");
- // }
- =20
- foreach(DataRow row in dt.Rows)=20
- {
- string attName =3D Convert.ToString(row["attName"]);
- string attType =3D Convert.ToString(row["attType"]);
- if(attType=3D=3D"pertinence")
- {
- idatt =3D Convert.ToInt32(row["id_entity"]);
- dtpert =3D userCred.CoreAdapter.GetClassesFromPertinence(idatt);
- DataRow dr2 =3D dtpert.Rows[0];
- idClassRel =3D Convert.ToInt32(dr2["to"].ToString());
- attlogin =3D this.GetAttributePrimary(idClassRel);
-
- res.Append("<option value=3D\""+attName+".ID\">"+attName+".ID</optio=
n>");
- =09
- idClassRel =3D Convert.ToInt32(dr2["to"].ToString());
- dtrel =3D userCred.CoreAdapter.GetAttributesFromClass(idClassRel);
- //Siempre debe ingresar a este if, a menos que la clase relacionada =
no tenga login (isPrimary)
- if(Convert.ToInt32(attlogin)>0)
- {
- if(dtrel.Select("id_entity=3D"+attlogin).Length>0)
- {
- DataRow row3 =3D dtrel.Select("id_entity=3D"+attlogin)[0];
- string attNameAux =3D Convert.ToString(row3["attName"]);
-
- res.Append("<option value=3D\""+dr2["name"]+"^"+attNameAux+"\">"+a=
ttName+"</option>");
- }
- }
- }
- else
- {
- res.Append("<option>"+attName+"</option>");
- }
- }
- foreach(DataRow row in dt.Select("attType=3D'pertinence'"))=20
- {
- idatt =3D Convert.ToInt32(row["id_entity"]);
- =09
- dtpert =3D userCred.CoreAdapter.GetClassesFromPertinence(idatt);
- =20
- foreach(DataRow dr in dtpert.Rows)
- {
- =09
- idClassRel =3D Convert.ToInt32(dr["to"].ToString());
- dtrel =3D userCred.CoreAdapter.GetAttributesFromClass(idClassRel);
- foreach(DataRow row2 in dtrel.Rows)=20
- {
- string attName =3D Convert.ToString(row2["attName"]);
- string className =3D Convert.ToString(dr["name"]);
- res.Append("<option>"+className+":"+attName+"</option>");
- }
- }=09
- }
- return res;
- }
-
private StringBuilder formOperatorList() {
StringBuilder res =3D new StringBuilder();
string[] operators =3D {"+", "-", "*", "/", "&"};
|
