Menu
▾
▴
[H2-commits] r1451 - in humano2/trunk: apps/import components/import components/rules components/tests components/viewTools components/webTools core/db web/builder/site web/portal/site
Author: marcelo
Date: 2005-07-08 10:29:43 -0400 (Fri, 08 Jul 2005)
New Revision: 1451
Modified:
humano2/trunk/apps/import/ProcessDir.cs
humano2/trunk/components/import/Import.cs
humano2/trunk/components/rules/Rules.cs
humano2/trunk/components/tests/xmltools.cs
humano2/trunk/components/viewTools/ViewTools.cs
humano2/trunk/components/webTools/Adapter.cs
humano2/trunk/components/webTools/Html.cs
humano2/trunk/components/webTools/basePage.cs
humano2/trunk/components/webTools/interfacetools.cs
humano2/trunk/components/webTools/session.cs
humano2/trunk/components/webTools/xmltools.cs
humano2/trunk/core/db/absComplex.cs
humano2/trunk/core/db/absCrud.cs
humano2/trunk/web/builder/site/buildattribute.aspx.cs
humano2/trunk/web/builder/site/combobox_type_entity.aspx.cs
humano2/trunk/web/builder/site/createInstanceRule.aspx.cs
humano2/trunk/web/builder/site/dataoperationbar.aspx.cs
humano2/trunk/web/builder/site/foldermanagement.aspx.cs
humano2/trunk/web/portal/site/downloadView.aspx.cs
Log:
* Included Marijns patches to remove compiler warnings. Went with the fl=
ow and I removed some aswell.
Modified: humano2/trunk/apps/import/ProcessDir.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/apps/import/ProcessDir.cs 2005-07-08 14:08:25 UTC (rev =
1450)
+++ humano2/trunk/apps/import/ProcessDir.cs 2005-07-08 14:29:43 UTC (rev =
1451)
@@ -20,7 +20,7 @@
//string baseDir =3D Environment.CurrentDirectory + "import\\toBeProc=
esed\\";
string baseDir =3D @"D:\H250-Trunk\upload\import\toBeProcesed\";
=09
- string sAttr =3D ConfigurationSettings.AppSettings["configFile"];
+ //string sAttr =3D ConfigurationSettings.AppSettings["configFile"];
=20
DirectoryInfo di =3D new DirectoryInfo(baseDir);
FileInfo[] fi =3D di.GetFiles();
Modified: humano2/trunk/components/import/Import.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/import/Import.cs 2005-07-08 14:08:25 UTC (re=
v 1450)
+++ humano2/trunk/components/import/Import.cs 2005-07-08 14:29:43 UTC (re=
v 1451)
@@ -448,10 +448,10 @@
}
catch(Exception e)
{
- throw(new ImportException("Basic information in XML file missing"));
+ throw(new ImportException("Basic information in XML file missing : "=
+e.Message));
}
if (userId =3D=3D 0 || domainId =3D=3D 0 || classId =3D=3D 0 || delim=
itator =3D=3D '0' || dbAttsStr =3D=3D null || fileAttsStr =3D=3D null)
- throw(new ImportException("Basic information in XML file is corrupt/=
wrong"));
+ throw(new ImportException("Basic information in XML file is corrupt/=
wrong" ));
=20
if (qualifierStr !=3D "")
qualifier =3D Convert.ToChar(qualifierStr);
Modified: humano2/trunk/components/rules/Rules.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/rules/Rules.cs 2005-07-08 14:08:25 UTC (rev =
1450)
+++ humano2/trunk/components/rules/Rules.cs 2005-07-08 14:29:43 UTC (rev =
1451)
@@ -13,7 +13,7 @@
{
public ProcessFormulas theFormH2 =3D new ProcessFormulas();
=09
- private absComplex complex =3D null;
+ private absComplex complex =3D null;
private absCrud crud =3D null;
=20
#region CONSTRUCTOR
@@ -22,7 +22,7 @@
//
// TODO: Add constructor logic here
//
- complex =3D Factory.Complex();
+ complex =3D Factory.Complex();
crud =3D complex.GetCore().Crud;
}
#endregion
@@ -40,21 +40,21 @@
=20
#region METODOS
=20
- ///<summary>Creates an empty DataTable with the formula structure.</su=
mmary>
- ///<returns>a datatable with one row and the correct column names</ret=
urns>
- public static DataTable getEmptyRuleDataTable()
- {
- DataTable dt =3D new DataTable();
- dt.Columns.Add("attributeIdRule");
- dt.Columns.Add("operatorRule");
- dt.Columns.Add("elementRule");
- dt.Columns.Add("setTo");
- dt.Columns.Add("valueRule");
- dt.Columns.Add("orderRule");
- dt.Columns.Add("nameRule");
- dt.Columns.Add("descRule");
- dt.Rows.Add(dt.NewRow());
- return dt;
+ ///<summary>Creates an empty DataTable with the formula structure.</su=
mmary>
+ ///<returns>a datatable with one row and the correct column names</ret=
urns>
+ public static DataTable getEmptyRuleDataTable()
+ {
+ DataTable dt =3D new DataTable();
+ dt.Columns.Add("attributeIdRule");
+ dt.Columns.Add("operatorRule");
+ dt.Columns.Add("elementRule");
+ dt.Columns.Add("setTo");
+ dt.Columns.Add("valueRule");
+ dt.Columns.Add("orderRule");
+ dt.Columns.Add("nameRule");
+ dt.Columns.Add("descRule");
+ dt.Rows.Add(dt.NewRow());
+ return dt;
}
=20
/// <summary>
@@ -235,7 +235,6 @@
{
string attributes,operators,elements;
string[] arrAttributes,arrOperators,arrElements;
- int attrib;
string str_attrib=3D"";
int operatorId; //,setToId,idRel;
string elementRule,setTo;
@@ -343,7 +342,6 @@
{
string attributes,operators,elements;
string[] arrAttributes,arrOperators,arrElements;
- int attrib;
string str_attrib =3D "";
int operatorId; //,setToId,idRel;
string elementRule,setTo;
@@ -579,7 +577,7 @@
=20
//dt1 =3D vt.GetSQLDataTable(dtParam);
=20
-
+
}
=20
///<sumary>funcion que recorre el DT y actualiza la columna en la DB</=
sumary>
Modified: humano2/trunk/components/tests/xmltools.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/tests/xmltools.cs 2005-07-08 14:08:25 UTC (r=
ev 1450)
+++ humano2/trunk/components/tests/xmltools.cs 2005-07-08 14:29:43 UTC (r=
ev 1451)
@@ -27,7 +27,7 @@
char[] buf =3D new char[FileSize]; // lets define an array o=
f type char field (i.e. variable) buf
// for more help please see .net sdk
StreamReader sr =3D new StreamReader(new FileStream(FileName=
, FileMode.Open, FileAccess.Read));
- int retval =3D sr.ReadBlock(buf, 0, FileSize); // no. of byt=
es read
+ sr.ReadBlock(buf, 0, FileSize); // no. of bytes read
//Console.Write ("Total Bytes Read =3D " + retval + "\n");
filereadbuf =3D new string(buf); // store it in our field
=20
Modified: humano2/trunk/components/viewTools/ViewTools.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/viewTools/ViewTools.cs 2005-07-08 14:08:25 U=
TC (rev 1450)
+++ humano2/trunk/components/viewTools/ViewTools.cs 2005-07-08 14:29:43 U=
TC (rev 1451)
@@ -480,7 +480,7 @@
foreach(ViewTable table in affectedTables)
{
affectedColumns =3D table.Columns;
- int index =3D 0;
+ =09
foreach(ViewColumns Col in affectedColumns)
{
aux =3D new DisplayOrder();
@@ -1737,8 +1737,6 @@
Relation.IdFK =3D toColumnIndex;
Relation.RelationType =3D rel;
=20
- int position =3D 0;
- int pos =3D -1;
=20
//Logger.Log("fromColumnIndex=3D " + fromColumnIndex, LogLev=
el.Trace);
//Logger.Log("toColumnIndex=3D " + toColumnIndex, LogLevel.T=
race);
Modified: humano2/trunk/components/webTools/Adapter.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/Adapter.cs 2005-07-08 14:08:25 UTC =
(rev 1450)
+++ humano2/trunk/components/webTools/Adapter.cs 2005-07-08 14:29:43 UTC =
(rev 1451)
@@ -536,7 +536,7 @@
}
=20
///<summary>Says if the name of a domain already exists</summary=
>
- ///<param name=3D"name">The name of domain to check</summary>
+ ///<param name=3D"name">The name of domain to check</param>
///<returns>True: the name of domain exists, else returns false<=
/returns>
public bool DomainNameExists(string name)
{
@@ -1719,10 +1719,10 @@
return (int[]) res.ToArray(typeof(int));
}
=20
- /// <summary>
- /// Busca las reglas de una clase y las ejecuta...
- /// </summary>
- /// <param name=3D"classId"></param>
+ /// <summary>
+ /// Busca las reglas de una clase y las ejecuta...
+ /// </summary>
+ /// <param name=3D"classId"></param>
/// <param name=3D"id_entity"></param>
public void RulesForClass(int classId, int id_entity)
{
Modified: humano2/trunk/components/webTools/Html.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/Html.cs 2005-07-08 14:08:25 UTC (re=
v 1450)
+++ humano2/trunk/components/webTools/Html.cs 2005-07-08 14:29:43 UTC (re=
v 1451)
@@ -87,9 +87,9 @@
=20
///<summary>
///Returns the path used to store client datas/files (uploaded f=
iles for example).
- ///This path is taken from the config.xml <clientPath> tag which=
is concatenated to the current domainId
- ///<returns>The path of client</return>
+ ///This path is taken from the config.xml <clientPath> tag=
which is concatenated to the current domainId
///</summary>
+ ///<returns>The path of client</returns>
public static string GetClientPath(SessionCredencial userCred)
{
int domainId =3D userCred.DomainIds[userCred.CurrentDomainIn=
dex];
Modified: humano2/trunk/components/webTools/basePage.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/basePage.cs 2005-07-08 14:08:25 UTC=
(rev 1450)
+++ humano2/trunk/components/webTools/basePage.cs 2005-07-08 14:29:43 UTC=
(rev 1451)
@@ -131,7 +131,7 @@
=20
///<summary>
///To get the filename that will be used to store files uploaded=
by the user
- ///<summary>
+ ///</summary>
protected string buildFileName(int idEntity, string attId, strin=
g filename)
{
string res =3D idEntity + "_" + attId + "_" + filename;
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-07-08 14:08:=
25 UTC (rev 1450)
+++ humano2/trunk/components/webTools/interfacetools.cs 2005-07-08 14:29:=
43 UTC (rev 1451)
@@ -253,7 +253,7 @@
///<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>
+ ///<returns>A xml string with the list of attributes for a class=
</returns>
///</summary>
public static string GetXmlAttribListForClass(int classId,SessionCrede=
ncial userCred, bool fullPert)=20
{
@@ -292,10 +292,9 @@
public static DataTable GetAttribListForClass(int classId, Sessi=
onCredencial userCred,bool fullPert)
{
int attlogin =3D 0;
- int idatt =3D 0;
- DataTable dtpert;
- DataTable dtrel;
- int idClassRel =3D 0;
+ int idatt =3D 0;
+ DataTable dtpert;
+ int idClassRel =3D 0;
DataTable dt =3D userCred.CoreAdapter.GetAttributesFromClass=
(classId);
DataTable res =3D new DataTable();
DataColumn colName;
Modified: humano2/trunk/components/webTools/session.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/session.cs 2005-07-08 14:08:25 UTC =
(rev 1450)
+++ humano2/trunk/components/webTools/session.cs 2005-07-08 14:29:43 UTC =
(rev 1451)
@@ -273,7 +273,7 @@
}
csc.lastAccess =3D DateTime.Now;
}
- catch(System.Exception e)
+ catch
{
csc =3D null;
}
Modified: humano2/trunk/components/webTools/xmltools.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/xmltools.cs 2005-07-08 14:08:25 UTC=
(rev 1450)
+++ humano2/trunk/components/webTools/xmltools.cs 2005-07-08 14:29:43 UTC=
(rev 1451)
@@ -73,7 +73,7 @@
System.Xml.XPath.XPathDocument oXPath =3D new Syste=
m.Xml.XPath.XPathDocument(oXR);
xsl.Transform(oXPath,null,oSW);
}
- catch (System.Exception e)
+ catch=20
{
//Put in custom error handler here...
//string x =3D e.ToString();
@@ -138,7 +138,7 @@
///Takes a xml string representing a structure of a form with cl=
ass and attributes.
///The objective is to reorder the tags "attribute" using a list=
of attributes (that comes from the table [form])
///</summary>
- ///<param name=3D"xmlStructure"></param>
+ ///<param name=3D"xmlDataStructure"></param>
///<param name=3D"attributesList">The list of id of attributes: =
we want this order for the xml struture string</param>
///<returns>the xml datastruture with the tags "attributes" in s=
ame order as in attributesList</returns>
public static string OrderAttributesInDataStructure( string xmlD=
ataStructure, string attributesList, string xslPath)
Modified: humano2/trunk/core/db/absComplex.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/core/db/absComplex.cs 2005-07-08 14:08:25 UTC (rev 1450=
)
+++ humano2/trunk/core/db/absComplex.cs 2005-07-08 14:29:43 UTC (rev 1451=
)
@@ -51,7 +51,7 @@
/// <summary>
/// Crea una tabla temporal para realizar el paginado de una consulta =
por ViewTools
/// </summary>
- /// <param name=3D"args">columnas de la tabla temporal</param>
+ /// <param name=3D"tableName">columnas de la tabla temporal</param>
/// <returns>la consulta que crea la tabla temporal</returns>
abstract public string BuildTempTable(ref string tableName);
=20
@@ -118,7 +118,7 @@
///<returns>Devuele un true si una clase. Si no, false.</returns>
abstract public bool IsClass(int idEntity);
=20
- ///<sumaray>Returns the sysName of a class given the classId</su=
mmary>
+ ///<summary>Returns the sysName of a class given the classId</su=
mmary>
///<param name=3D"classId">The id of the class</param>
///<returns>The sysName of the class</returns>
abstract public string GetClassSysName(string classId);
@@ -343,7 +343,7 @@
=20
///<summary>
///Returns the class a pertinence attribute points to
- ///<summary>
+ ///</summary>summary>
///<param name=3D"attributeId">the pertinence attribute</param>
///<returns>The id_entity of the class pointed by the attribute.=
If the att is not a pert att, returns ""</returns>
abstract public string GetPertinenceClassForAttribute(string att=
ributeId);
Modified: humano2/trunk/core/db/absCrud.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/core/db/absCrud.cs 2005-07-08 14:08:25 UTC (rev 1450)
+++ humano2/trunk/core/db/absCrud.cs 2005-07-08 14:29:43 UTC (rev 1451)
@@ -117,7 +117,7 @@
=20
/// <summary>Devuelve los valores no nulos de una instancia</summary>
/// <param name=3D"idEntity">El ID del objeto del cual se desea los va=
lores</param>
- ///<param name=3D"">si True tambien muestra los elementos marcados bor=
rados.</param>
+ ///<param name=3D"withDeletes">si True tambien muestra los elementos m=
arcados borrados.</param>
/// <returns>Un DataSet con los valores, una tabla por tipo de dato</r=
eturns>
abstract public DataSet ReadData(int idEntity, bool withDeletes,string=
idsAtt);
=20
@@ -266,7 +266,7 @@
///<summary>Elimina una lista de atributos de una clase.</summary>
///<remarks>Este metodo solo marca los objetos como borrados pero no l=
os borra fisicamente de la base de datos.</remarks>
///<returns>La cantidad de elementos borraros.</returns>
- ///<param name=3D"idEntities">Los Id_Entity's de los objetos para elim=
inar</param>
+ ///<param name=3D"structure">La estructura con el objeto para eliminar=
</param>
///<exception cref=3D"Humano2.Core.Db.NoExistException">Cuando un ID n=
o existe en el sistema.</exception>
virtual public int deleteClassAttributes(DataSet structure)=20
{
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-07-08 14:0=
8:25 UTC (rev 1450)
+++ humano2/trunk/web/builder/site/buildattribute.aspx.cs 2005-07-08 14:2=
9:43 UTC (rev 1451)
@@ -1,4 +1,4 @@
-//
+ //
// The Humano2 Business solution.
// Copyright (C) 2004,5 Humano2 Chile S.A. (http://www.humano2.com)
//
@@ -41,7 +41,7 @@
protected System.Web.UI.WebControls.Label lblTablas;
=20
private bool isNewAttribute =3D true;
- private string selectedVisibleTabName;
+ // private string selectedVisibleTabName;
private string tmpAttName =3D "";
=20
override protected void OnInit(EventArgs e)
@@ -969,7 +969,7 @@
foreach(DataRow row2 in dtrel.Rows)=20
{
string attName =3D Convert.ToString(row2["attName"]);
- string className =3D Convert.ToString(dr["name"]);
+ //string className =3D Convert.ToString(dr["name"]);
//attrNameList[Convert.ToString(className+":"+attName)] =3D Conve=
rt.ToString(idatt.ToString()+"^"+row2["id_entity"]);
attrNameList[Convert.ToString(attNamePert+"."+attName)] =3D Conve=
rt.ToString(idatt.ToString()+"^"+row2["id_entity"]);
if(row2["isPrimary"].ToString()=3D=3D"1")
@@ -1016,7 +1016,7 @@
foreach(DataRow row2 in dtrel.Rows)=20
{
string attName =3D Convert.ToString(row2["attName"]);
- string className =3D Convert.ToString(dr["name"]);
+ //string className =3D Convert.ToString(dr["name"]);
//attrIdList[Convert.ToString(idatt.ToString()+"^"+row2["id_entit=
y"])] =3D Convert.ToString(className+":"+attName);
attrIdList[Convert.ToString(idatt.ToString()+"^"+row2["id_entity"=
])] =3D Convert.ToString(attNamePert+"."+attName);
if(row2["isPrimary"].ToString()=3D=3D"1")
Modified: humano2/trunk/web/builder/site/combobox_type_entity.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/combobox_type_entity.aspx.cs 2005-07-0=
8 14:08:25 UTC (rev 1450)
+++ humano2/trunk/web/builder/site/combobox_type_entity.aspx.cs 2005-07-0=
8 14:29:43 UTC (rev 1451)
@@ -33,8 +33,8 @@
public class combobox_type_entity : basePage
{
protected System.Web.UI.WebControls.ListBox sel_cache;
- private absComplex complex =3D null;
- private absCrud crud =3D null;
+ //private absComplex complex =3D null;
+ //private absCrud crud =3D null;
=20
string[] classNames; // Nombres de las clases.
int[] classIds; // Ids de las classes.
Modified: humano2/trunk/web/builder/site/createInstanceRule.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/createInstanceRule.aspx.cs 2005-07-08 =
14:08:25 UTC (rev 1450)
+++ humano2/trunk/web/builder/site/createInstanceRule.aspx.cs 2005-07-08 =
14:29:43 UTC (rev 1451)
@@ -10,8 +10,8 @@
using System.Web.UI.WebControls;
using System.Web.UI.HtmlControls;
=20
-using Humano2.Core;
-using Humano2.Core.Db;
+using Humano2.Core;
+using Humano2.Core.Db;
using Humano2.Components.WebTools;
using Humano2.Components.Rules;
=20
@@ -22,17 +22,17 @@
/// </summary>
public class createInstanceRule : basePage
{
- =20
- private string ruleName;
- private string ruleDesc;
- private string attributeIdRule;
- private string operatorRule;
- private string elementRule;
- private string setTo;
- private string valueRule;
- private string orderRule;
-
-
+ =20
+ private string ruleName;
+ private string ruleDesc;
+ private string attributeIdRule;
+ private string operatorRule;
+ private string elementRule;
+ private string setTo;
+ private string valueRule;
+ private string orderRule;
+
+
private int ruleId;
private int classId;
private int domainId;
@@ -55,12 +55,12 @@
foreach(DataRow dr in dt1.Rows)
{
ruleName =3D dr["nameRule"].ToString();
- ruleDesc =3D dr["descRule"].ToString();
- attributeIdRule =3D dr["attributeIdRule"].ToString();
- operatorRule =3D dr["operatorRule"].ToString();
- elementRule =3D dr["elementRule"].ToString();
- setTo =3D dr["setTo"].ToString();
- valueRule =3D dr["valueRule"].ToString();
+ ruleDesc =3D dr["descRule"].ToString();
+ attributeIdRule =3D dr["attributeIdRule"].ToString();
+ operatorRule =3D dr["operatorRule"].ToString();
+ elementRule =3D dr["elementRule"].ToString();
+ setTo =3D dr["setTo"].ToString();
+ valueRule =3D dr["valueRule"].ToString();
orderRule =3D dr["orderRule"].ToString();
}
}
@@ -82,46 +82,46 @@
=20
}
=20
- override protected string createXml()
- {
- int index =3D userCred.CurrentDomainIndex;
- classId =3D Convert.ToInt32(Request["classId"]);
- ruleId =3D Convert.ToInt32(Request["ruleId"]);
- domainId =3D userCred.DomainIds[index];
-
- if(ruleId>0)
- {
+ override protected string createXml()
+ {
+ int index =3D userCred.CurrentDomainIndex;
+ classId =3D Convert.ToInt32(Request["classId"]);
+ ruleId =3D Convert.ToInt32(Request["ruleId"]);
+ domainId =3D userCred.DomainIds[index];
+
+ if(ruleId>0)
+ {
RulesH2 myrules =3D new RulesH2();
DataTable dt1 =3D new DataTable();
- dt1 =3D myrules.GetRules(domainId,0,ruleId);
- if(dt1.Rows.Count>0)
- {
- ruleName =3D dt1.Rows[0]["nameRule"].ToString();
- ruleDesc =3D dt1.Rows[0]["descRule"].ToString();
- attributeIdRule =3D dt1.Rows[0]["attributeIdRule"].ToString();
- operatorRule =3D dt1.Rows[0]["operatorRule"].ToString();
- elementRule =3D dt1.Rows[0]["elementRule"].ToString();
- setTo =3D dt1.Rows[0]["setTo"].ToString();
- valueRule =3D dt1.Rows[0]["valueRule"].ToString();
- orderRule =3D dt1.Rows[0]["orderRule"].ToString();
- }
- }
-
- string strXml =3D "<Page>";
- strXml +=3D "<domainId>" + domainId + "</domainId>";
- strXml +=3D "<rule>";
- strXml +=3D "<id>" + ruleId + "</id>";
- strXml +=3D "<classId>" + classId + "</classId>";
- strXml +=3D "<name>" + ruleName + "</name>";
- strXml +=3D "<ruleDesc>" + ruleDesc + "</ruleDesc>";
- strXml +=3D "<attributeIdRule>" + attributeIdRule + "</attr=
ibuteIdRule>";
- strXml +=3D "<operatorRule>" + operatorRule + "</operatorRu=
le>";
- strXml +=3D "<elementRule>" + elementRule + "</elementRule>=
";
- strXml +=3D "<setTo>" + setTo + "</setTo>";
- strXml +=3D "<valueRule>" + valueRule + "</valueRule>";
- strXml +=3D "<orderRule>" + orderRule + "</orderRule>";
- strXml +=3D "</rule>";
- strXml +=3D "<Attributes>";
+ dt1 =3D myrules.GetRules(domainId,0,ruleId);
+ if(dt1.Rows.Count>0)
+ {
+ ruleName =3D dt1.Rows[0]["nameRule"].ToString();
+ ruleDesc =3D dt1.Rows[0]["descRule"].ToString();
+ attributeIdRule =3D dt1.Rows[0]["attributeIdRule"].ToString();
+ operatorRule =3D dt1.Rows[0]["operatorRule"].ToString();
+ elementRule =3D dt1.Rows[0]["elementRule"].ToString();
+ setTo =3D dt1.Rows[0]["setTo"].ToString();
+ valueRule =3D dt1.Rows[0]["valueRule"].ToString();
+ orderRule =3D dt1.Rows[0]["orderRule"].ToString();
+ }
+ }
+
+ string strXml =3D "<Page>";
+ strXml +=3D "<domainId>" + domainId + "</domainId>";
+ strXml +=3D "<rule>";
+ strXml +=3D "<id>" + ruleId + "</id>";
+ strXml +=3D "<classId>" + classId + "</classId>";
+ strXml +=3D "<name>" + ruleName + "</name>";
+ strXml +=3D "<ruleDesc>" + ruleDesc + "</ruleDesc>";
+ strXml +=3D "<attributeIdRule>" + attributeIdRule + "</attr=
ibuteIdRule>";
+ strXml +=3D "<operatorRule>" + operatorRule + "</operatorRu=
le>";
+ strXml +=3D "<elementRule>" + elementRule + "</elementRule>=
";
+ strXml +=3D "<setTo>" + setTo + "</setTo>";
+ strXml +=3D "<valueRule>" + valueRule + "</valueRule>";
+ strXml +=3D "<orderRule>" + orderRule + "</orderRule>";
+ strXml +=3D "</rule>";
+ strXml +=3D "<Attributes>";
adapter dbAdapter =3D new adapter();
DataTable attributeTable =3D dbAdapter.GetAttributesFromClass(classId=
);
=20
@@ -147,7 +147,7 @@
foreach(DataRow row2 in dtrel.Rows)=20
{
string attName =3D Convert.ToString(row2["attName"]);
- string className =3D Convert.ToString(dr["name"]);
+ //string className =3D Convert.ToString(dr["name"]);
strXml +=3D "<Att>";
strXml +=3D "<id>" + idatt.ToString()+"^"+row2["id_entity"] + "</i=
d>";
strXml +=3D "<name>" + attNamePert+"."+attName + "</name>";
@@ -164,22 +164,22 @@
}=09
}
=20
- strXml +=3D "</Attributes>";
- strXml +=3D "<operator>";
- strXml +=3D "<option><id>0</id><text>Greater Equal Than</text></opt=
ion>";
- strXml +=3D "<option><id>1</id><text>Less Equal Than</text></option=
>";
- strXml +=3D "<option><id>2</id><text>Greater Than</text></option>";
- strXml +=3D "<option><id>3</id><text>Less Than</text></option>";
- strXml +=3D "<option><id>4</id><text>Equal To</text></option>";
- strXml +=3D "<option><id>5</id><text>Distinct To</text></option>";
- strXml +=3D "<option><id>6</id><text>Begin With</text></option>";
- strXml +=3D "<option><id>7</id><text>Contains To</text></option>";
- strXml +=3D "<option><id>8</id><text>In</text></option>";
- strXml +=3D "</operator>";
- strXml +=3D "</Page>";
- Logger.Log("RuleMain: createXml(): " + strXml, LogLevel.Trace);
- =20
- return strXml;
+ strXml +=3D "</Attributes>";
+ strXml +=3D "<operator>";
+ strXml +=3D "<option><id>0</id><text>Greater Equal Than</text></opt=
ion>";
+ strXml +=3D "<option><id>1</id><text>Less Equal Than</text></option=
>";
+ strXml +=3D "<option><id>2</id><text>Greater Than</text></option>";
+ strXml +=3D "<option><id>3</id><text>Less Than</text></option>";
+ strXml +=3D "<option><id>4</id><text>Equal To</text></option>";
+ strXml +=3D "<option><id>5</id><text>Distinct To</text></option>";
+ strXml +=3D "<option><id>6</id><text>Begin With</text></option>";
+ strXml +=3D "<option><id>7</id><text>Contains To</text></option>";
+ strXml +=3D "<option><id>8</id><text>In</text></option>";
+ strXml +=3D "</operator>";
+ strXml +=3D "</Page>";
+ Logger.Log("RuleMain: createXml(): " + strXml, LogLevel.Trace);
+ =20
+ return strXml;
}
=20
private int createRule(){
Modified: humano2/trunk/web/builder/site/dataoperationbar.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/dataoperationbar.aspx.cs 2005-07-08 14=
:08:25 UTC (rev 1450)
+++ humano2/trunk/web/builder/site/dataoperationbar.aspx.cs 2005-07-08 14=
:29:43 UTC (rev 1451)
@@ -35,7 +35,7 @@
{
protected System.Web.UI.WebControls.DropDownList attributeList;
protected System.Web.UI.WebControls.DropDownList ruleList;
- private int _idClass;
+ // private int _idClass;
=09
private void Page_Load(object sender, System.EventArgs e)
{
Modified: humano2/trunk/web/builder/site/foldermanagement.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/foldermanagement.aspx.cs 2005-07-08 14=
:08:25 UTC (rev 1450)
+++ humano2/trunk/web/builder/site/foldermanagement.aspx.cs 2005-07-08 14=
:29:43 UTC (rev 1451)
@@ -72,7 +72,7 @@
dt.Rows.Add(dr);
=20
//Creates the table now
- DataTable formTable =3D createFolderTable();
+ //DataTable formTable =3D createFolderTable();
=20
if(dt !=3D null)=20
{=20
Modified: humano2/trunk/web/portal/site/downloadView.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/downloadView.aspx.cs 2005-07-08 14:08:2=
5 UTC (rev 1450)
+++ humano2/trunk/web/portal/site/downloadView.aspx.cs 2005-07-08 14:29:4=
3 UTC (rev 1451)
@@ -69,7 +69,6 @@
DataTable resp =3D dbAdapter.GetDataTableView(viewTable, iniClass);
=20
StringBuilder sb =3D new StringBuilder();
- int rows, cols;
int div =3D Convert.ToInt32(Request.QueryString["separador"]);
string delimiter =3D "\"";
=20
@@ -86,8 +85,8 @@
break;
}
=20
- rows =3D resp.Rows.Count;
- cols =3D resp.Columns.Count;
+ //rows =3D resp.Rows.Count;
+ //cols =3D resp.Columns.Count;
=20
absCrud crud =3D Factory.Crud();
absComplex complex =3D crud.GetCore().Complex;
|
