|
From: <sv...@de...> - 2005-06-21 18:17:22
|
Author: pcamacho
Date: 2005-06-21 10:05:48 -0400 (Tue, 21 Jun 2005)
New Revision: 1377
Modified:
humano2/trunk/components/webTools/interfacetools.cs
humano2/trunk/web/builder/site/createreport.aspx.cs
humano2/trunk/web/builder/site/formmanagement.aspx.cs
humano2/trunk/web/builder/site/viewmain.aspx.cs
Log:
FIX: bug #216. Now interface for creation of forms only show attributes o=
f class, no attributes of pertinence related=20
class.
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-21 02:07:=
14 UTC (rev 1376)
+++ humano2/trunk/components/webTools/interfacetools.cs 2005-06-21 14:05:=
48 UTC (rev 1377)
@@ -252,9 +252,10 @@
///Get the attributes of a class
///<param name=3D"classId">The id of class</param>
///<param name=3D"userCred">Session object of user</param>
+ ///<param name=3D"fullPert">True: the id of pertinence att will =
be idatt^destAtt. False only idAtt (used in forms)</param>
///<return>A xml string with the list of attributes for a class<=
/returns>
///</summary>
- public static string GetXmlAttribListForClass(int classId,SessionCrede=
ncial userCred)=20
+ public static string GetXmlAttribListForClass(int classId,SessionCrede=
ncial userCred, bool fullPert)=20
{
string salida=3D"";
int attlogin =3D 0;
@@ -279,13 +280,14 @@
{
string attName =3D Convert.ToString(row["attName"]);
string attType =3D Convert.ToString(row["attType"]);
- if(attType=3D=3D"pertinence")
+ if((attType=3D=3D"pertinence") && fullPert)
{
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());
=09
+ =20
//For each attribute of pertinence put the id with t=
ogo and=20
// the pertname.attname
int [] listAttId =3D GetAttributeIdListForClass(idCl=
assRel,userCred);
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-21 02:07:=
14 UTC (rev 1376)
+++ humano2/trunk/web/builder/site/createreport.aspx.cs 2005-06-21 14:05:=
48 UTC (rev 1377)
@@ -129,7 +129,7 @@
//relacionadas...
if(Convert.ToInt32(classId) > 0)
{
- strXml +=3D Interface.GetXmlAttribListForClass(Convert.T=
oInt32(classId),userCred);
+ strXml +=3D Interface.GetXmlAttribListForClass(Convert.T=
oInt32(classId),userCred,true);
}
strXml +=3D Interface.GetClassListForUser(userCred=
);
strXml +=3D "</classes>";
Modified: humano2/trunk/web/builder/site/formmanagement.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/formmanagement.aspx.cs 2005-06-21 02:0=
7:14 UTC (rev 1376)
+++ humano2/trunk/web/builder/site/formmanagement.aspx.cs 2005-06-21 14:0=
5:48 UTC (rev 1377)
@@ -101,7 +101,7 @@
Logger.Log("classId=3D " + classId,LogLevel.Trace);
if(classId > 0) //A class has been selected
{
- strXml +=3D Interface.GetXmlAttribListForClass(classId,u=
serCred); =20
+ strXml +=3D Interface.GetXmlAttribListForClass(classId,u=
serCred,false); =20
}
strXml +=3D Interface.GetClassListForUser(userCred=
);
strXml +=3D "</classes>";
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-21 02:07:14 U=
TC (rev 1376)
+++ humano2/trunk/web/builder/site/viewmain.aspx.cs 2005-06-21 14:05:48 U=
TC (rev 1377)
@@ -124,7 +124,7 @@
//relacionadas...
if(Convert.ToInt32(classId) > 0)
{
- strXml +=3D Interface.GetXmlAttribListForClass(Convert.T=
oInt32(classId),userCred);
+ strXml +=3D Interface.GetXmlAttribListForClass(Convert.T=
oInt32(classId),userCred,true);
}
strXml +=3D Interface.GetClassListForUser(userCred=
);
strXml +=3D "</classes>";
|