Menu
▾
▴
humano2-commits — Changes in the source repository
You can subscribe to this list here.
| 2005 |
Jan
|
Feb
|
Mar
|
Apr
|
May
(146) |
Jun
(188) |
Jul
(11) |
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|---|
|
From: <sv...@de...> - 2005-05-20 23:38:36
|
Author: marijn Date: 2005-05-20 19:38:32 -0400 (Fri, 20 May 2005) New Revision: 1124 Added: humano2/tags/5.0.beta2/ Log: Marking trunk as 5.0.beta2 Copied: humano2/tags/5.0.beta2 (from rev 1123, humano2/trunk) |
|
From: <sv...@de...> - 2005-05-20 23:11:21
|
Author: pcamacho
Date: 2005-05-20 19:11:19 -0400 (Fri, 20 May 2005)
New Revision: 1123
Modified:
humano2/trunk/core/db/absCrud.cs
Log:
CHANGE: for now we do not take in consideration empty strings to be inser=
ted. (cf [1112]).
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-05-20 22:05:19 UTC (rev 1122)
+++ humano2/trunk/core/db/absCrud.cs 2005-05-20 23:11:19 UTC (rev 1123)
@@ -1278,7 +1278,7 @@
string value =3D Convert.ToString(workRow[columnName]);
=09
// If the value is empty, don't bother adding it.
- //if(value.Length =3D=3D 0) { continue; }
+ if(value.Length =3D=3D 0) { continue; }
=09
string columnValue =3D escapeAttribute( value, columnType );
=09
|
|
From: <sv...@de...> - 2005-05-20 22:05:27
|
Author: marijn
Date: 2005-05-20 18:05:19 -0400 (Fri, 20 May 2005)
New Revision: 1122
Modified:
humano2/trunk/changelog.txt
Log:
* Adding more information to the changelog
Modified: humano2/trunk/changelog.txt
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=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/changelog.txt 2005-05-20 21:45:37 UTC (rev 1121)
+++ humano2/trunk/changelog.txt 2005-05-20 22:05:19 UTC (rev 1122)
@@ -1,5 +1,5 @@
=20
-=3D=3D 5.0.Beta2 - 2005-05-19 =3D=3D
+=3D=3D 5.0.beta2 - 2005-05-19 =3D=3D
=20
* Portal
* Views with many results are now split into pages.
@@ -15,6 +15,9 @@
* Limited the classes to the currentdomain in formulas.
* The creating of classes now refreshes the list of classes in the
domain.=20
+ * Can no longer delete the system domain via the interface.
+ * Temporarily Removing attributes types that are not completely suppor=
ted (yet).
+ * Fixing URL to informational HTML files after operations.
=20
* Core
* Fixing the view of attributes that are derived from the standard
|
|
From: <sv...@de...> - 2005-05-20 21:45:42
|
Author: marijn
Date: 2005-05-20 17:45:37 -0400 (Fri, 20 May 2005)
New Revision: 1121
Modified:
humano2/trunk/core/db/pgsql/pgsqlComplex.cs
Log:
Fixing bug when displaying a view.
* Fixing bug of what is the default view after creating an instance.
Modified: humano2/trunk/core/db/pgsql/pgsqlComplex.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/pgsql/pgsqlComplex.cs 2005-05-20 20:56:42 UTC (=
rev 1120)
+++ humano2/trunk/core/db/pgsql/pgsqlComplex.cs 2005-05-20 21:45:37 UTC (=
rev 1121)
@@ -304,7 +304,7 @@
/// <returns>the id of the view that should be shown.</returns>
public override int getDefaultViewId(int classId)
{
- string query =3D "select \"id_entity\" from view where \"where\" is n=
ull and \"idClassView\" =3D " + classId;
+ string query =3D "select min(\"id_entity\") from view where \"idClass=
View\" =3D " + classId;
return Convert.ToInt32( doScalar( query ) );
}
=09
|
|
From: <sv...@de...> - 2005-05-20 20:56:42
|
Author: marijn
Date: 2005-05-20 16:56:42 -0400 (Fri, 20 May 2005)
New Revision: 1120
Modified:
humano2/trunk/components/webTools/basePage.cs
Log:
* Fixing url of static html files in builder.
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-05-20 20:55:30 UTC=
(rev 1119)
+++ humano2/trunk/components/webTools/basePage.cs 2005-05-20 20:56:42 UTC=
(rev 1120)
@@ -161,7 +161,7 @@
break;
}
=20
- string httpAddress =3D baseUrl() + "html/" + messagePage;
+ string httpAddress =3D Html.genAbsoluteUrl("/builder/site/ht=
ml/" + messagePage);
Logger.Log("basePage.cs: " + httpAddress,LogLevel.Trace);
Response.Redirect(httpAddress);=20
}
|
|
From: <sv...@de...> - 2005-05-20 20:55:33
|
Author: pcamacho
Date: 2005-05-20 16:55:30 -0400 (Fri, 20 May 2005)
New Revision: 1119
Modified:
humano2/trunk/web/portal/site/showView.aspx.cs
Log:
FIX: now number of line does not appear anymore when showing a view.
Modified: humano2/trunk/web/portal/site/showView.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/showView.aspx.cs 2005-05-20 20:27:36 UT=
C (rev 1118)
+++ humano2/trunk/web/portal/site/showView.aspx.cs 2005-05-20 20:55:30 UT=
C (rev 1119)
@@ -194,7 +194,7 @@
xmlString =3D "<?xml version=3D\"1.0\" encoding=3D\"UTF-8\=
"?>"
+ "<?xml-stylesheet type=3D\"text/xsl\" href=3D\=
"xsl/showview.xsl\"?>"=20
+ xmlString;
-
+ //Logger.Log("showview: xmlString=3D " + xmlString, LogLevel=
.Trace);
return xmlString;
}
=20
@@ -297,7 +297,11 @@
if(colName.StartsWith("id_entity")) //Skip this col
{=20
continue;=20
- } =20
+ } =20
+ if(colName =3D=3D "row") //This col contains the number =
of lines and has no name
+ {
+ continue; =20
+ }
xmlString +=3D"<attribute>"; =20
=20
//Get the real user column name that corresponds to system column na=
me
@@ -311,7 +315,7 @@
}
xmlString +=3D "</attributes>";
=20
-
+ //Logger.Log("showview: getXmlAttributes=3D " + xmlString,Lo=
gLevel.Trace);
return xmlString;
}
=20
@@ -324,7 +328,7 @@
xmlString +=3D "<instance>";
foreach( DataColumn col in row.Table.Columns )
{
- if(col.ColumnName =3D=3D "instanceUrl") //Computes the url for upda=
te and show.
+ if(col.ColumnName =3D=3D "instanceUrl") //Computes t=
he url for update and show.
{
string baseUrl =3D row["instanceUrl"] +=20
"&display=3DreadXslt.aspx&iniClass=3D" +=20
@@ -338,7 +342,13 @@
//but it may be useful later.
xmlString +=3D xml_getEntity(row,col,complex,IdRead);
=20
- }else{=20
+ }
+ else if(col.ColumnName =3D=3D "row") //We don't want=
to display number of lines
+ {
+ continue; =20
+ }
+ =20
+ else{=20
//a standard value
xmlString +=3D xml_getStandar(row,col,complex);
}
|
|
From: <sv...@de...> - 2005-05-20 20:27:39
|
Author: pcamacho
Date: 2005-05-20 16:27:36 -0400 (Fri, 20 May 2005)
New Revision: 1118
Modified:
humano2/trunk/components/webTools/Adapter.cs
Log:
CHANGE: number of registers for page put to 20.
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-05-20 20:25:35 UTC =
(rev 1117)
+++ humano2/trunk/components/webTools/Adapter.cs 2005-05-20 20:27:36 UTC =
(rev 1118)
@@ -371,7 +371,7 @@
Logger.Log("ExecViewFromDataTable: page: " + page , LogLevel.Trace)=
;
=20
vt.Page =3D 1; // Do Pageing
- vt.RowsView =3D 2; // Number of rows per page.
+ vt.RowsView =3D 20; // Number of rows per page.
//vt.RowsView =3D 2; // Number of rows per page.
vt.PageView =3D page; // Set the current page
}
|
|
From: <sv...@de...> - 2005-05-20 20:25:42
|
Author: pcamacho
Date: 2005-05-20 16:25:35 -0400 (Fri, 20 May 2005)
New Revision: 1117
Modified:
humano2/trunk/components/webTools/Adapter.cs
humano2/trunk/web/builder/site/createreport.aspx.cs
humano2/trunk/web/builder/site/js/createreport.js
humano2/trunk/web/builder/site/js/formreport.js
humano2/trunk/web/builder/site/js/grafcomponents/expandformreport.js
humano2/trunk/web/builder/site/js/grafcomponents/inputline.js
humano2/trunk/web/builder/site/xsl/createreport.xsl
Log:
ADD: having for the creation for reports. It does not work yet because of=
bug #123, but all the interface works well=20
(writing and recovering datas from the db for the interface).
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-05-20 20:18:52 UTC =
(rev 1116)
+++ humano2/trunk/components/webTools/Adapter.cs 2005-05-20 20:25:35 UTC =
(rev 1117)
@@ -371,8 +371,8 @@
Logger.Log("ExecViewFromDataTable: page: " + page , LogLevel.Trace)=
;
=20
vt.Page =3D 1; // Do Pageing
- //vt.RowsView =3D 20; // Number of rows per page.
vt.RowsView =3D 2; // Number of rows per page.
+ //vt.RowsView =3D 2; // Number of rows per page.
vt.PageView =3D page; // Set the current page
}
Logger.Log("ExecViewFromDataTable: vtTable.Rows[0][\"order\"=
]=3D " + vtTable.Rows[0]["order"],LogLevel.Trace);
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-20 20:18:=
52 UTC (rev 1116)
+++ humano2/trunk/web/builder/site/createreport.aspx.cs 2005-05-20 20:25:=
35 UTC (rev 1117)
@@ -42,6 +42,7 @@
private string receivedWhereStr;
private string receivedOrderStr;
private string receivedPersoColumnsStr;
+ private string receivedHavingsStr;
=20
private void Page_Load(object sender, System.EventArgs e)
{
@@ -160,6 +161,7 @@
res +=3D getReportPersoColumnsXml((dt.Rows[0]["columns"]).To=
String()); //Here are the functions
res +=3D getReportWhereXml((dt.Rows[0]["where"]).ToString())=
; //Where=20
res +=3D getReportOrderXml((dt.Rows[0]["order"]).ToString())=
; //Order
+ res +=3D getReportHavingsXml((dt.Rows[0]["having"]).ToString=
()); //Having
res +=3D "</reportParams>";
return res;
}
@@ -252,6 +254,44 @@
return xmlRes;
}
=20
+ private string getReportHavingsXml(string havings)
+ {
+ string [] tabHavings =3D havings.Split(new char [] {'|',';'}=
); =20
+ string xmlRes =3D "";
+ =20
+ if(tabHavings.Length <=3D 1)
+ {
+ return "";
+ }
+ =20
+ xmlRes +=3D "<havings>";
+ string [] columnsList =3D getColumnsList();
+ =20
+ for(int i=3D0;i<tabHavings.Length;i+=3D6) //The string is |a=
ttId|numFunc |numCond|'valor'|0 or 1|
+ {
+ string operatorValue =3D Convert.ToString(Convert.ToInt3=
2(tabHavings[i+2]) +1); //Because the first item in the list is -----
+ string attributeValue =3D Convert.ToString(Convert.ToInt=
32(getIndexOfElement(tabHavings[i+0],columnsList)) + 1);
+ string functionValue =3D tabHavings[i+1]; //No need to a=
dd 1 because functions start from 1 and not 0
+ =20
+ xmlRes +=3D"<having>";
+ xmlRes +=3D "<idAtt>" + attributeValue + "</idAtt>";
+ xmlRes +=3D "<operator>" + operatorValue + "</operator=
>";
+ xmlRes +=3D "<func>" + functionValue + "</func>";
+ xmlRes +=3D "<value>";
+ if(operatorValue =3D=3D "9") //In special case (don't fo=
rget the operator value has been incremented (9=3D8+1)...)
+ {
+ xmlRes +=3D convertInCaseFromReportToInterface(tabHa=
vings[i+3]);
+ }
+ else
+ { =20
+ xmlRes +=3D tabHavings[i+3];
+ }
+ xmlRes +=3D "</value>";
+ xmlRes +=3D "</having>";
+ }
+ xmlRes +=3D "</havings>";
+ return xmlRes;
+ }
=20
///<summary>
/// Basically this function takes a string of form: "[(item1,ite=
m2,item3)]" and returns "item1 item2 item3"
@@ -454,11 +494,14 @@
dr["groupby"] =3D receivedColumnsStr; //The columns selected=
by user are to put in group by
=20
//Special case for IN filter
- dr["where"] =3D parseWhere(receivedWhereStr);
+ dr["where"] =3D parseWhere(receivedWhereStr);
=20
dr["columns"] =3D buildColumnsForReport(receivedPersoColumns=
Str,dr["groupby"].ToString()); //
=20
dr["order"] =3D parseOrder(receivedOrderStr);
+ =20
+ dr["having"] =3D parseHavings(receivedHavingsStr);
+ =20
Logger.Log("receivedOrderStr" + receivedOrderStr, LogLevel.T=
race);
Logger.Log("receivedWhereStr" + receivedWhereStr, LogLevel.T=
race);
=09
@@ -516,7 +559,7 @@
///</summary>
private string parseOrder(string order) =20
{
- if(order=3D=3D"")
+ if(order=3D=3D"" || order =3D=3D null)
{
return ""; =20
}
@@ -555,9 +598,9 @@
private string parseWhere(string where) =20
{
=20
- if(where=3D=3D"") //Nothing to do
+ if(where=3D=3D"" || where =3D=3D null) //Nothing to do
{
- return "";
+ return ""; //Don't return "" because in this case the fi=
eld of database won't be updated
}
=20
string res =3D "";
@@ -591,8 +634,54 @@
=20
return res;
}
- =20
+ =20
+ =20
///<summary>
+ /// A having string is received from the web page in this format=
:
+ /// idFunc0 |idAtt0 | idOp0 | 'value'|;idFunc1|idAtt1 | idOp1 | =
'value'|; ... etc
+ /// We have to add the queue to each where condition (1|0 or 0|0=
)
+ ///</summary>
+ private string parseHavings(string havings) =20
+ {
+
+ if(havings=3D=3D"") //Nothing to do
+ {
+ return "";
+ }
+ =20
+ string res =3D "";
+ string [] havingsSplit =3D havings.Split((";").ToCharArray()=
); //First get the lines
+ =20
+ for(int i=3D0;i<havingsSplit.Length;i++)
+ {
+ string [] lineSplit =3D havingsSplit[i].Split(("|").ToCh=
arArray());
+ string line =3D "";
+ for(int j=3D0; j<lineSplit.Length;j++)
+ {
+ line +=3D lineSplit[j];
+ line +=3D '|'; =20
+ }
+ res +=3D line;
+ if(i!=3D havingsSplit.Length-1)
+ {
+ res +=3D "1|0;"; =20
+ }
+ else //Last line
+ {
+ res +=3D"0|0";
+ }
+ }
+ Logger.Log("parseHavings(before treatin)=3D " + res,LogLeve=
l.Trace);
+ =20
+ //res =3D treatInSpecialCase(res);=20
+ =20
+ Logger.Log("parseHavings=3D " + res,LogLevel.Trace);
+ =20
+ return res;
+ }
+ =20
+ =20
+ ///<summary>
/// The IN filter must be treated in a special maner. If the val=
ue to compare to is "20 30", then=20
/// this value must be changed to ['20','30']; (ReportToolsDoc)
///</summary> =20
@@ -649,12 +738,14 @@
receivedOrderStr =3D Request["sendOrderStr"];
receivedWhereStr =3D Request["sendWhereStr"];
receivedPersoColumnsStr =3D Request["sendPersoColumnsStr"]; =
=20
+ receivedHavingsStr =3D Request["sendHavingsStr"];
=20
Logger.Log("receivedClassId: " + receivedClassId, LogLevel.T=
race);
Logger.Log("receivedReportName: " + receivedReportName, LogL=
evel.Trace);
Logger.Log("receivedColumnsStr: " + receivedColumnsStr, LogL=
evel.Trace);
Logger.Log("receivedWhereStr: " + receivedWhereStr, LogLevel=
.Trace);
Logger.Log("receivedPersoColumnsStr " + receivedPersoColumns=
Str, LogLevel.Trace);
+ Logger.Log("receivedHavingsStr " + receivedHavingsStr, LogLe=
vel.Trace);
=20
int reportId =3D Convert.ToInt32(Request.QueryString["report=
Id"]);
Logger.Log("reportId: " + reportId, LogLevel.Trace);
Modified: humano2/trunk/web/builder/site/js/createreport.js
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=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/js/createreport.js 2005-05-20 20:18:52=
UTC (rev 1116)
+++ humano2/trunk/web/builder/site/js/createreport.js 2005-05-20 20:25:35=
UTC (rev 1117)
@@ -10,7 +10,7 @@
//
=20
=20
-function AttribsGetSelect0Arr(formArray,classId)
+function AttribsGetSelectArray(formArray,classId)
{
var lengthArray =3D formArray[classId].length;
//alert("lengthArray: " + lengthArray);
@@ -29,7 +29,7 @@
return optionArray;
} =20
=20
-function FilterGetSelect1Arr()
+function OperatorsGetSelectArray()
{
var optionArray =3D new Array();
=20
@@ -68,7 +68,7 @@
}
=20
=20
-function OrderGetSelect1Arr()
+function OrderGetSelectArray()
{
var optionArray =3D new Array();
=20
@@ -85,7 +85,7 @@
return optionArray;
}
=20
-function PersoColumnsGetSelect1Arr()
+function FunctionsGetSelectArray()
{
var optionArray =3D new Array();
=20
@@ -101,3 +101,14 @@
=20
return optionArray;
}
+
+function Reload()
+{
+ indice =3D document.formulario.classList.selectedIndex;
+ if(indice>0)
+ {
+ valor =3D document.formulario.classList.options[indice].value;
+ self.location =3D "createreport.aspx?classList=3D"+valor;
+ }
+}
+
Modified: humano2/trunk/web/builder/site/js/formreport.js
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=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/js/formreport.js 2005-05-20 20:18:52 U=
TC (rev 1116)
+++ humano2/trunk/web/builder/site/js/formreport.js 2005-05-20 20:25:35 U=
TC (rev 1117)
@@ -86,7 +86,7 @@
this.UpdateAttributes(this.classId);
}
=20
-function FormUpdateSubmitAll(rightColumn,sort,filter,persoColumns)
+function FormUpdateSubmitAll(rightColumn,sort,filter,persoColumns,having=
s)
{
//Get the ReportName
var reportNameInput =3D GetNodeByTagNameAndAttName("input","reportNa=
meInput")[0];
@@ -123,13 +123,18 @@
//alert("sort SelfRefName:" + sort.GetSelfRefName());
=20
var orderStr =3D sort.ReturnValues();=20
+ //alert("orderStr: " + orderStr);
=20
//The filter
//alert("filter SelfRefName:" + filter.GetSelfRefName());
var whereStr =3D filter.ReturnValues();
+ //alert("whereStr: " + whereStr);
=20
var persoColumnsStr =3D persoColumns.ReturnValues();
//alert("persoColumnsStr: " + persoColumnsStr);
+ =20
+ var havingsStr =3D havings.ReturnValues();
+ =20
//Update the submit all TD
var divSubmitAll =3D GetNodeByTagNameAndAttName("div","SubmitAll")[0=
];
//alert(divSubmitAll);
@@ -141,7 +146,8 @@
+"<input type=3D\"hidden\" name=3D\"sendColumnsStr\" value=3D\""=
+ columnsStr + "\"></input>"
+"<input type=3D\"hidden\" name=3D\"sendOrderStr\" value=3D\"" +=
orderStr + "\"></input>"
+"<input type=3D\"hidden\" name=3D\"sendWhereStr\" value=3D\"" +=
whereStr + "\"></input>"
- +"<input type=3D\"hidden\" name=3D\"sendPersoColumnsStr\" value=3D=
\"" + persoColumnsStr + "\"></input>";
+ +"<input type=3D\"hidden\" name=3D\"sendPersoColumnsStr\" value=3D=
\"" + persoColumnsStr + "\"></input>"
+ +"<input type=3D\"hidden\" name=3D\"sendHavingsStr\" value=3D\""=
+ havingsStr + "\"></input>";
=20
//alert(divSubmitAll.innerHTML);
return true;
Modified: humano2/trunk/web/builder/site/js/grafcomponents/expandformrepo=
rt.js
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=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/js/grafcomponents/expandformreport.js =
2005-05-20 20:18:52 UTC (rev 1116)
+++ humano2/trunk/web/builder/site/js/grafcomponents/expandformreport.js =
2005-05-20 20:25:35 UTC (rev 1117)
@@ -93,7 +93,10 @@
//CAUTION: we start from the second child because the first is a=
text node (title) !!!!
var divFirstSelect =3D node.firstChild.nextSibling;
var divSecondSelect =3D divFirstSelect.nextSibling;
+ var divThirdSelect =3D divSecondSelect.nextSibling;
=20
+ ///FIXME: this code should be inside inputline
+ =20
if((divFirstSelect.value !=3D -1) && (divSecondSelect.value!=3D =
-1)) //Verify if something has been selected
{
if(this.inputLine.type =3D=3D 'TWOSELECTANDINPUT')
@@ -107,6 +110,19 @@
res +=3D "\'" + divInput.value + "\'";
}
=20
+ =20
+ if(this.inputLine.type =3D=3D 'THREESELECTANDINPUT')
+ {
+ //alert("divFirstSelect:" + divFirstSelect);
+ res +=3D divFirstSelect.value + "|";
+ //alert("divSecondSelect:" + divSecondSelect);
+ res +=3D divSecondSelect.value + "|";
+ res +=3D divThirdSelect.value + "|";
+ var divInput =3D divThirdSelect.nextSibling;
+ //alert("divInput:" + divInput);
+ res +=3D "\'" + divInput.value + "\'";
+ }
+ =20
if(this.inputLine.type =3D=3D 'TWOSELECT')
{
//alert("divFirstSelect:" + divFirstSelect);
Modified: humano2/trunk/web/builder/site/js/grafcomponents/inputline.js
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=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/js/grafcomponents/inputline.js 2005-05=
-20 20:18:52 UTC (rev 1116)
+++ humano2/trunk/web/builder/site/js/grafcomponents/inputline.js 2005-05=
-20 20:25:35 UTC (rev 1117)
@@ -25,6 +25,7 @@
//The content of html elements
this.select0 =3D params.select0;
this.select1 =3D params.select1;
+ this.select2 =3D params.select2;
this.lineTitle =3D params.lineTitle;
=20
//The preselected values
@@ -34,6 +35,7 @@
this.PreselectedSelect0 =3D params.PreselectedSelect0;
this.PreselectedSelect1 =3D params.PreselectedSelect1;
break;
+ =20
case 'TWOSELECTANDINPUT':
case 'INPUTANDTWOSELECT':
this.PreselectedSelect0 =3D params.PreselectedSelect0;
@@ -41,6 +43,13 @@
this.PreselectedInput0 =3D params.PreselectedInput0;
break;
=20
+ case 'THREESELECTANDINPUT':
+ this.PreselectedSelect0 =3D params.PreselectedSelect0;
+ this.PreselectedSelect1 =3D params.PreselectedSelect1;
+ this.PreselectedSelect2 =3D params.PreselectedSelect2;
+ this.PreselectedInput0 =3D params.PreselectedInput0;
+ break; =20
+ =20
default:=20
alert("Oopps... Looks like the InputLine has been badly init=
ialized!");
break;
@@ -112,7 +121,14 @@
=20
var option1String =3D this.GetOptionString(this.select0,index,this.P=
reselectedSelect0);
var option2String =3D this.GetOptionString(this.select1,index,this.P=
reselectedSelect1);
+ var option3String =3D"";
=20
+ if( this.select2 !=3D null)
+ {
+ option3String =3D this.GetOptionString(this.select2,index,this.P=
reselectedSelect2);
+ }
+ =20
+ =20
var inputValue;
if((this.PreselectedInput0 !=3D null) && (index >=3D 0) )
{
@@ -135,6 +151,19 @@
+ "<input name=3D\"input" + this.refName + lineNum=
ber + "\" value=3D\"" + inputValue + "" + "\" id=3D\"\"></input>";=20
break;
=20
+ case 'THREESELECTANDINPUT':
+ res =3D this.lineTitle + lineNumber + ": " + "<select style=3D=
\"width:100px;\" name=3D\"select1" + this.refName + lineNumber + "\" clas=
s=3D\"drpdwn2\">"
+ + option1String
+ + "</select>"
+ + "<select style=3D\"width:100px;\" name=3D\"select2" =
+ this.refName + lineNumber + "\" class=3D\"drpdwn2\">"
+ + option2String =20
+ + "</select>"
+ + "<select style=3D\"width:100px;\" name=3D\"select3" =
+ this.refName + lineNumber + "\" class=3D\"drpdwn2\">"
+ + option3String =20
+ + "</select>"
+ + "<input name=3D\"input" + this.refName + lineNumber =
+ "\" value=3D\"" + inputValue + "" + "\" id=3D\"\"></input>";=20
+ break;
+ =20
case 'TWOSELECT':
res =3D this.lineTitle + lineNumber + ": " + "<select style=
=3D\"width:100px;\" name=3D\"select1" + this.refName + lineNumber + "\" c=
lass=3D\"drpdwn2\">"
+ option1String
Modified: humano2/trunk/web/builder/site/xsl/createreport.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/createreport.xsl 2005-05-20 20:18:=
52 UTC (rev 1116)
+++ humano2/trunk/web/builder/site/xsl/createreport.xsl 2005-05-20 20:25:=
35 UTC (rev 1117)
@@ -82,8 +82,8 @@
var InputLineParamsFilters =3D
{
type: 'TWOSELECTANDINPUT',
- select0: AttribsGetSelect0Arr(formArray,<xsl:value-o=
f select=3D"/report/reportDatas/classId" />),
- select1: FilterGetSelect1Arr(),
+ select0: AttribsGetSelectArray(formArray,<xsl:value-=
of select=3D"/report/reportDatas/classId" />),
+ select1: OperatorsGetSelectArray(),
lineTitle: 'Filter',
input0: '',
PreselectedInput0: inputTagValuesArrayFilter,
@@ -109,8 +109,8 @@
var InputLineParamsOrders =3D
{
type: 'TWOSELECT',
- select0: AttribsGetSelect0Arr(formArray,<xsl:value-o=
f select=3D"/report/reportDatas/classId" />),
- select1: OrderGetSelect1Arr(),
+ select0: AttribsGetSelectArray(formArray,<xsl:value-=
of select=3D"/report/reportDatas/classId" />),
+ select1: OrderGetSelectArray(),
lineTitle: 'Order',
input0: '',
PreselectedInput0: null,
@@ -136,8 +136,8 @@
var InputLineParamsPersoColumns =3D
{
type: 'TWOSELECT', //For the moment
- select0: AttribsGetSelect0Arr(formArray,<xsl:value-o=
f select=3D"/report/reportDatas/classId" />),
- select1: PersoColumnsGetSelect1Arr(),
+ select0: AttribsGetSelectArray(formArray,<xsl:value-=
of select=3D"/report/reportDatas/classId" />),
+ select1: FunctionsGetSelectArray(),
lineTitle: 'PersoCol',
input0: '',
PreselectedInput0: null,
@@ -148,105 +148,39 @@
var InputLinePersoColumns =3D new InputLine(InputLinePar=
amsPersoColumns);
</xsl:if>
=20
+ //Having
+ var selectIdAttArrayHaving =3D new Array();
+ var selectOpArrayHaving =3D new Array();
+ var selectFuncArrayHaving =3D new Array();
+ var inputTagValuesArrayHaving =3D new Array();
=20
+ var i=3D0;
+ <xsl:for-each select=3D"/report/reportDatas/reportParams/hav=
ings/having">
+ selectFuncArrayHaving[i] =3D <xsl:value-of select=3D"fu=
nc" />;
+ selectIdAttArrayHaving[i] =3D <xsl:value-of select=3D"i=
dAtt" />;
+ selectOpArrayHaving[i] =3D <xsl:value-of select=3D"oper=
ator" />;
+ inputTagValuesArrayHaving[i] =3D <xsl:value-of select=3D=
"value" />;
+ i++;
+ </xsl:for-each>
=20
- function recargar()
- {
- <![CDATA[
- //for(i=3D0;i<document.formulario.elements.length;i++)
- // alert(document.formulario.elements[i].name);
- ]]>
- indice =3D document.formulario.classList.selectedIndex;
- if(indice>0)
+ <xsl:if test=3D"/report/reportDatas/classId!=3D''">
+ var InputLineParamsHavings =3D
{
- valor =3D document.formulario.classList.options[indi=
ce].value;
- self.location =3D "createreport.aspx?classList=3D"+v=
alor;
+ type: 'THREESELECTANDINPUT',
+ select0: AttribsGetSelectArray(formArray,<xsl:value-=
of select=3D"/report/reportDatas/classId" />),
+ select1: FunctionsGetSelectArray(),
+ select2: OperatorsGetSelectArray(),
+ lineTitle: 'GroupFilter',
+ input0: '',
+ PreselectedInput0: inputTagValuesArrayHaving,
+ PreselectedSelect0: selectIdAttArrayHaving,
+ PreselectedSelect1: selectFuncArrayHaving,
+ PreselectedSelect2: selectOpArrayHaving,
+ refName: 'expandFormHaving'
}
- }
- //Esta funcion no esta siendo usada, pues se usa una mejora =
hecha por pcamacho
- function valoresIni()
- {
- var divFilter;
- var expandFormFilter;
- var divSort;
- var expandFormSort;
- var cantfilters =3D <xsl:value-of select=3D"count(/repor=
t/reportDatas/reportParams/conditions/condition)"/>
- var cantorders =3D <xsl:value-of select=3D"count(/report=
/reportDatas/reportParams/orders/order)"/>
- =20
- var divSort =3D GetNodeByTagNameAndAttName("div","Sort")=
;
- var divFilter =3D GetNodeByTagNameAndAttName("div","Filt=
er");
+ var InputLineHavings =3D new InputLine(InputLineParamsHa=
vings);
+ </xsl:if>
=20
- //alert(cantfilters);
- =20
- <![CDATA[
- for(i=3D1;i<cantfilters;i++)
- {
- expandFormFilter =3D new ExpandForm("expandFormFil=
ter",divFilter,true,Form.GetFilterArray(1),Form.GetFilterArray(2),"Filter=
",inputValuesFilter);
- expandFormFilter.AddLine();
- }
- ]]>
- <![CDATA[
- for(i=3D1;i<cantorders;i++)
- {
- expandFormSort =3D new ExpandForm("expandFormSort",d=
ivSort,false,Form.GetSortArray(1),Form.GetSortArray(2),"Order");
- expandFormSort.AddLine();
- }
- ]]>
- i =3D 0;
- <xsl:for-each select=3D"/report/reportDatas/reportParams=
/conditions/condition">
- <![CDATA[
- Objrow =3D eval("document.formulario.select1expandFo=
rmFilter"+i);
- if(eval(Objrow))
- {
- for(j=3D0;j<Objrow.length;j++)
- {
- if(Objrow[j].value=3D=3D"]]><xsl:value-of se=
lect=3D"idAtt"/><![CDATA[")
- Objrow.options[j].selected=3Dtrue;
- }
- }
- =20
- Objrow =3D eval("document.formulario.select2expandFo=
rmFilter"+i);
- if(eval(Objrow))
- {
- for(j=3D0;j<Objrow.length;j++)
- {
- if(Objrow[j].value=3D=3D"]]><xsl:value-of se=
lect=3D"operator"/><![CDATA[")
- Objrow.options[j].selected=3Dtrue;
- }
- }
- =20
- Objrow =3D eval("document.formulario.inputexpandForm=
Filter"+i);
- dato =3D ]]><xsl:value-of select=3D"value"/><![CDATA=
[;
- if(eval(Objrow))
- Objrow.value =3D dato;
- i++;
- ]]>
- </xsl:for-each>
- i =3D 0;
- <xsl:for-each select=3D"/report/reportDatas/reportParams=
/orders/order">
- <![CDATA[
- Objrow =3D eval("document.formulario.select1expandFo=
rmSort"+i);
- if(eval(Objrow))
- {
- for(j=3D0;j<Objrow.length;j++)
- {
- if(Objrow[j].value=3D=3D]]><xsl:value-of sel=
ect=3D"idAtt"/><![CDATA[)
- Objrow.options[j].selected=3Dtrue;
- }
- }
- if(eval(Objrow))
- {
- Objrow =3D eval("document.formulario.select2expa=
ndFormSort"+i);
- for(j=3D0;j<Objrow.length;j++)
- {
- if(Objrow[j].value=3D=3D]]><xsl:value-of sel=
ect=3D"ascOrDesc"/><![CDATA[)
- Objrow.options[j].selected=3Dtrue;
- }
- }
- i++;
- ]]>
- </xsl:for-each>
- }
</script>
=20
<body >
@@ -276,7 +210,7 @@
<!-- Only show classes for select wh=
en creating -->
<xsl:if test=3D"/report/reportDatas/=
saveName=3D'Create'" >=20
<td>
- <select class=3D"drpdwn2" id=3D"cla=
ssList" onchange=3D"recargar();">
+ <select class=3D"drpdwn2" id=3D"cla=
ssList" onchange=3D"Reload();">
<xsl:for-each select=3D"repo=
rt/classes/class">
<option>
<xsl:attribute name=3D=
"name">
@@ -374,17 +308,56 @@
=20
<!--######################### END: Perso=
Columns ################################## -->
=20
- <!-- ######################## Columns To=
Show ############################## -->
+ =20
+ <!--######################### Havings ##=
########################################## -->
<tr>
<td colspan=3D"2">
<table width=3D"100%" border=3D"=
0" cellSpacing=3D"0" cellPadding=3D"0">
<tr>
+ <td width=3D"100%" colspan=3D=
"2" class=3D"lev1divider">
+ <div class=3D"lev1divide=
r"><IMG height=3D"9" src=3D"clear2x2.gif" width=3D"100%"/></div>
+ </td>
+ </tr>
+ <tr>
+ <td class=3D"lev1head" valig=
n=3D"top"><font size=3D"2">Group filters...</font></td>
+ </tr>
+ </table>
+ </td>
+ </tr>
+
+ <tr>
+ <td class=3D"smallgraytextnolink" co=
lspan=3D"2">
+ <table>
+ <tr>
+ <td>
+ <div id=3D"Havings">
+ </div>
+ </td>
+ </tr>
+ </table>
+ <script language=3D"Javascript">
+ var divHavings =3D GetNodeBy=
TagNameAndAttName("div","Havings")[0];
+ var expandFormHavings =3D ne=
w ExpandForm("expandFormHavings",
+ =
divHavings,
+ =
"Having",
+ =
InputLineHavings);
+ </script>
+ </td>
+ </tr>
+ =20
+ <!--######################### END: Havin=
gs ####################################### -->
+ =20
+ <!-- ######################## Group colu=
mns ############################## -->
+ <tr>
+ <td colspan=3D"2">
+ <table width=3D"100%" border=3D"=
0" cellSpacing=3D"0" cellPadding=3D"0">
+ <tr>
<td width=3D"100%" colspan=3D=
"2">
<div class=3D"lev1divide=
r"><IMG height=3D"9" src=3D"clear2x2.gif" width=3D"100%"/></div>
</td>
</tr>
<tr>
- <td class=3D"lev1head" valig=
n=3D"top"><font size=3D"2">Columns...</font></td>
+ <td class=3D"lev1head" valig=
n=3D"top"><font size=3D"2">Group columns...</font></td>
</tr>
</table>
</td>
@@ -442,19 +415,14 @@
</tr>
</table>
<script>
- =20
//First List
var divColumnsToShowLeft =3D=
GetNodeByTagNameAndAttName("div","ColumnsToShowLeft")[0]; =20
var leftColumn =3D new Sorte=
dGraphicalList(Form.GetLeftAtt(),
=
divColumnsToShowLeft,"leftColumn");
- =09
- =
=20
//Second List
var divColumnsToShowRight =3D=
GetNodeByTagNameAndAttName("div","ColumnsToShowRight")[0]; =20
var rightColumn =3D new Sort=
edGraphicalList(Form.GetRightAtt(),
=
divColumnsToShowRight,"rightColumn"); =
=20
- =09
- =09
</script>
</td>
</tr>
@@ -521,7 +489,8 @@
Form.UpdateSubmitAll=
(rightColumn,
=
expandFormSort,
=
expandFormFilter,
- =
expandFormPersoColumns); //Don't forget to do the same in Form.UpdateHea=
der
+ =
expandFormPersoColumns,
+ =
expandFormHavings);=20
</xsl:attribute>
</input>
</div>
|
|
From: <sv...@de...> - 2005-05-20 20:18:59
|
Author: marijn
Date: 2005-05-20 16:18:52 -0400 (Fri, 20 May 2005)
New Revision: 1116
Modified:
humano2/trunk/core/db/pgsql/pgsqlComplex.cs
humano2/trunk/core/db/pgsql/pgsqlCrud.cs
humano2/trunk/core/schema/pgsql/pgsql-1-metadata.sql
humano2/trunk/core/schema/pgsql/pgsql-4-extendedAttributes.sql
Log:
* Removing datatypes that are not correctly defined yet by marking them =
"isHidden"
* Adding information about what to change to get these functions.
Modified: humano2/trunk/core/db/pgsql/pgsqlComplex.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/pgsql/pgsqlComplex.cs 2005-05-20 17:21:06 UTC (=
rev 1115)
+++ humano2/trunk/core/db/pgsql/pgsqlComplex.cs 2005-05-20 20:18:52 UTC (=
rev 1116)
@@ -432,9 +432,7 @@
name =3D var[0];
name =3D name.Substring(name.IndexOf(".")+1);
if ((loop > 0) && (name =3D=3D "id_entity")) name =3D name + loop.To=
String();
- //name =3D var[0].Replace(".","_");
- //name =3D name.Replace("\"","");
- //name =3D "\"" + name + "\"";
+ //FIXME: This "AttributeTypeMapping" needs to change to support dyna=
mic derived types in view.
type =3D core.Crud.AttributeTypeMapping(var[2].ToString());
if (type =3D=3D null) type =3D var[2].ToString();
table.Append(name + " " + type + ",");
Modified: humano2/trunk/core/db/pgsql/pgsqlCrud.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/pgsql/pgsqlCrud.cs 2005-05-20 17:21:06 UTC (rev=
1115)
+++ humano2/trunk/core/db/pgsql/pgsqlCrud.cs 2005-05-20 20:18:52 UTC (rev=
1116)
@@ -46,6 +46,9 @@
map.Add( "numeric", "numeric" );
map.Add( "boolean", "boolean" );
map.Add( "dateTime", "timestamp" );
+
+ //map.Add( "file", "varchar" ); // does not work anyway.
+ //map.Add( "image", "varchar" ); // don't work anyway.
return map;
}
=09
Modified: humano2/trunk/core/schema/pgsql/pgsql-1-metadata.sql
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=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/schema/pgsql/pgsql-1-metadata.sql 2005-05-20 17:21=
:06 UTC (rev 1115)
+++ humano2/trunk/core/schema/pgsql/pgsql-1-metadata.sql 2005-05-20 20:18=
:52 UTC (rev 1116)
@@ -245,7 +245,7 @@
INSERT INTO "class" ("id_entity","classType","sysName","name","parentId=
","isAbstract", "isHidden") VALUES (14,1,'inheritance','inheritance',5,'=
f', 't');
INSERT INTO "class" ("id_entity","classType","sysName","name","parentId=
","isAbstract", "isHidden") VALUES (15,1,'choice','choice',81,'f', 't');
INSERT INTO "class" ("id_entity","classType","sysName","name","parentId=
","isAbstract", "isHidden") VALUES (26,27,'user_domain','user_domain',3,=
'f', 'f');
-INSERT INTO "class" ("id_entity","classType","sysName","name","parentId=
","isAbstract", "isHidden") VALUES (39,1,'file','file',5,'f', 'f');
+INSERT INTO "class" ("id_entity","classType","sysName","name","parentId=
","isAbstract", "isHidden") VALUES (39,1,'file','file',5,'f', 't');
INSERT INTO "class" ("id_entity","classType","sysName","name","parentId=
","isAbstract", "isHidden") VALUES (80,1, 'option','option',3,'f', 'f');
INSERT INTO "class" ("id_entity","classType","sysName","name","parentId=
","isAbstract", "isHidden") VALUES (81,1,'pertinence','pertinence',5,'f'=
, 'f');
INSERT INTO "class" ("id_entity","classType","sysName","name","parentId=
","isAbstract", "isHidden") VALUES (82,1,'boolean','boolean',5,'f', 'f')=
;
Modified: humano2/trunk/core/schema/pgsql/pgsql-4-extendedAttributes.sql
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=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/schema/pgsql/pgsql-4-extendedAttributes.sql 2005-0=
5-20 17:21:06 UTC (rev 1115)
+++ humano2/trunk/core/schema/pgsql/pgsql-4-extendedAttributes.sql 2005-0=
5-20 20:18:52 UTC (rev 1116)
@@ -76,13 +76,13 @@
Alter table "image" add foreign key ("id_entity") references "attribute=
" ("id_entity") on update restrict on delete cascade;
=20
=20
-INSERT INTO "class" ("id_entity","classType","sysName","name","parentId=
","isAbstract") VALUES (94,27,'email','email',8,'f');
-INSERT INTO "class" ("id_entity","classType","sysName","name","parentId=
","isAbstract") VALUES (87,27,'currency','currency',9,'f');
-INSERT INTO "class" ("id_entity","classType","sysName","name","parentId=
","isAbstract") VALUES (500,27, 'password','password',8,'f');
-INSERT INTO "class" ("id_entity","classType","sysName","name","parentId=
","isAbstract") VALUES (502,27, 'HTML','HTML',13,'f');
-INSERT INTO "class" ("id_entity","classType","sysName","name","parentId=
","isAbstract") VALUES (503,27, 'RUT','RUT',8,'f');
-INSERT INTO "class" ("id_entity","classType","sysName","name","parentId=
","isAbstract") VALUES (504,27, 'URL','URL',8,'f');
-INSERT INTO "class" ("id_entity","classType","sysName","name","parentId=
","isAbstract") VALUES (506,27, 'image','image',39,'f');
+INSERT INTO "class" ("id_entity","classType","sysName","name","parentId=
","isAbstract","isHidden") VALUES (94,27,'email','email',8,'f','t');
+INSERT INTO "class" ("id_entity","classType","sysName","name","parentId=
","isAbstract","isHidden") VALUES (87,27,'currency','currency',9,'f','t'=
);
+INSERT INTO "class" ("id_entity","classType","sysName","name","parentId=
","isAbstract","isHidden") VALUES (500,27, 'password','password',8,'f','=
t');
+INSERT INTO "class" ("id_entity","classType","sysName","name","parentId=
","isAbstract","isHidden") VALUES (502,27, 'HTML','HTML',13,'f','t');
+INSERT INTO "class" ("id_entity","classType","sysName","name","parentId=
","isAbstract","isHidden") VALUES (503,27, 'RUT','RUT',8,'f','t');
+INSERT INTO "class" ("id_entity","classType","sysName","name","parentId=
","isAbstract","isHidden") VALUES (504,27, 'URL','URL',8,'f','t');
+INSERT INTO "class" ("id_entity","classType","sysName","name","parentId=
","isAbstract","isHidden") VALUES (506,27, 'image','image',39,'f','t');
=20
=20
INSERT INTO "entity" ("id_entity","domainId","class","delDate","status"=
) VALUES (87,10,2,NULL,NULL);
|
|
From: <sv...@de...> - 2005-05-20 17:21:38
|
Author: svera
Date: 2005-05-20 13:21:06 -0400 (Fri, 20 May 2005)
New Revision: 1115
Modified:
humano2/trunk/components/webTools/Adapter.cs
humano2/trunk/web/portal/site/Data_structured.aspx
humano2/trunk/web/portal/site/search.aspx.cs
humano2/trunk/web/portal/site/showView.aspx
humano2/trunk/web/portal/site/showView.aspx.cs
humano2/trunk/web/portal/site/xsl/showview.xsl
Log:
* Fix Bug #117 and #118
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-05-20 16:47:54 UTC =
(rev 1114)
+++ humano2/trunk/components/webTools/Adapter.cs 2005-05-20 17:21:06 UTC =
(rev 1115)
@@ -273,7 +273,7 @@
/// <param name=3D"viewId">The id of the view to be retrieved into the=
datatable.</param>
/// <param name=3D"iniClass">The Id of the class that the view has rel=
evance over.</param>
/// <returns>A DataTable with the structure of the view referenced by =
the viewId.</returns>
- public DataTable GetViewDataTableFromId(int viewId, out int iniCla=
ss)
+ public DataTable GetViewDataTableFromId(int viewId, out int iniClas=
s)
{
iniClass =3D 0;
=20
@@ -371,8 +371,8 @@
Logger.Log("ExecViewFromDataTable: page: " + page , LogLevel.Trace)=
;
=20
vt.Page =3D 1; // Do Pageing
- vt.RowsView =3D 20; // Number of rows per page.
- //vt.RowsView =3D 2; // Number of rows per page.
+ //vt.RowsView =3D 20; // Number of rows per page.
+ vt.RowsView =3D 2; // Number of rows per page.
vt.PageView =3D page; // Set the current page
}
Logger.Log("ExecViewFromDataTable: vtTable.Rows[0][\"order\"=
]=3D " + vtTable.Rows[0]["order"],LogLevel.Trace);
Modified: humano2/trunk/web/portal/site/Data_structured.aspx
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=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/Data_structured.aspx 2005-05-20 16:47:5=
4 UTC (rev 1114)
+++ humano2/trunk/web/portal/site/Data_structured.aspx 2005-05-20 17:21:0=
6 UTC (rev 1115)
@@ -95,23 +95,20 @@
obj.className =3D "altButtonNormal2"
}=09
=20
- =09
-
function redirect_Page(){
Param =3D Param.replace()
var re =3D /&/g
Param =3D Param.replace(re,"&")
=09
if(textToSearch!=3D''){
- document.getElementById("FrameSHowView").src=3D'search.aspx?'+P=
aram;
+ document.getElementById("FrameSHowView").src=3D'showView.aspx?i=
sSearch=3D1&classId=3D' + classId + '&'+ Param;
}else{
if(display=3D=3D'')
document.getElementById("FrameSHowView").src=3D'showView.aspx?i=
d_entity=3D'+id_entity+'&classId=3D'+classId;
else{
document.getElementById("FrameSHowView").src=3D'instance.aspx?i=
d_entity=3D'+id_entity+'&display=3D'+display+'&idView=3D'+idView+'&action=
=3D'+action+'&classId=3D'+classId+"&formsId=3D"+formsId;
}
- } =20
- =09
+ } =09
}
=09
function New_instance(){
@@ -124,10 +121,6 @@
window.location.href=3D'Data_structured.aspx?display=3DcreateXslt.asp=
x&idView=3D'+idView+'&action=3Dcreate&id_entity=3D'+classId+'&classId=3D'=
+classId+"&formsId=3D"+id;
}
=20
- =09
- =09
- =09
-
function Edit_instance(){
window.location.href=3D'Data_structured.aspx?display=3DreadXslt.aspx&=
idView=3D'+idView+'&action=3Dupdate&id_entity=3D'+id_entity+'&classId=3D'=
+classId
}
@@ -216,10 +209,9 @@
if (total <=3D 0) total =3D 1
document.getElementById("CantRegBottom").innerHTML =3D total
}
- } =20
+ } =20
}
- }
- =09
+ } =09
=20
=20
function nextPage() {
@@ -259,8 +251,6 @@
}
}
=20
-
- =09
</script>
</head>
=09
Modified: humano2/trunk/web/portal/site/search.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/search.aspx.cs 2005-05-20 16:47:54 UTC =
(rev 1114)
+++ humano2/trunk/web/portal/site/search.aspx.cs 2005-05-20 17:21:06 UTC =
(rev 1115)
@@ -72,7 +72,17 @@
string idAttributes=3D Request["idAttribute"]; //The attribu=
tes to filter with
string idOperators =3D Request["idOPerator"]; //The operator=
s (<=3D,=3D,>=3D etc...)
string valuesToSearch =3D Request["textToSearch"]; //The val=
ues to compare with
- =20
+/*******************
+ * Codigo para paginacion SVERA =3D> 20052005
+ * */
+ string orderArr =3D Convert.ToString(Request.QueryString["order"]);
+ int currPage =3D Convert.ToInt32(Request.QueryString["page"]);
+ if(currPage =3D=3D 0)=20
+ {
+ currPage =3D 1;
+ }
+//***************
+ =20
Logger.Log("iniClass=3D" + Convert.ToString(iniClass),LogLev=
el.Trace);
Logger.Log("idAttributes=3D" + idAttributes,LogLevel.Trace);
Logger.Log("idOperator=3D" + idOperators,LogLevel.Trace);
@@ -92,7 +102,13 @@
=20
dtParam.Rows.Add(dr);
=20
- dt1 =3D dbAdapter1.GetDataTableView(dtParam, iniClass);
+ //dt1 =3D dbAdapter1.GetDataTableView(dtParam, iniClass);
+/************************
+ * Codigo para paginacion SVERA 20052005
+ * */
+ dt1 =3D dbAdapter1.ExecViewFromDataTable(iniClass,dtParam,iniClass,or=
derArr,1,1);
+ int pageCount=3D dbAdapter1.NumberOfPagesInPagedView;
+//********************
=20
string xmlString =3D""; //the result string
=20
@@ -158,11 +174,8 @@
xmlString +=3D "</update>";
xmlString +=3D "</url>";
}
- else if(col.ColumnName =3D=3D "id_entity") //Get the id_entity: for=
now it is not needed,=20
- { //but it may be useful later.
- //xmlString +=3D "<id_entity>" =
=20
- //+ "</id_entity>";
-
+ else if(col.ColumnName =3D=3D "id_entity")=20
+ { =20
xmlString +=3D "<value>"
+ "<text>" + row[col] + "</text>";
//Now check if the attribute is Primary
@@ -200,6 +213,20 @@
} =20
xmlString +=3D "</instance>";
}
+/************************
+ * Codigo para paginacion SVERA 20052005
+ * */
+ xmlString +=3D "<infoView>";
+ xmlString +=3D "<page>" + currPage + "</page>";
+ xmlString +=3D "<order>" + orderArr + "</order>";
+ xmlString +=3D "<recordCount>" + pageCount + "</recordCount>";
+ xmlString +=3D "<id_entity>" + iniClass + "</id_entity>";
+ xmlString +=3D "<classId>" + iniClass + "</classId>";
+ xmlString +=3D "<nextPage>true</nextPage>";
+ xmlString +=3D "<prevPage>true</prevPage>";
+ xmlString +=3D "</infoView>";
+//***********************
+
xmlString +=3D "</instances>";
=20
//Add the header
Modified: humano2/trunk/web/portal/site/showView.aspx
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=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/showView.aspx 2005-05-20 16:47:54 UTC (=
rev 1114)
+++ humano2/trunk/web/portal/site/showView.aspx 2005-05-20 17:21:06 UTC (=
rev 1115)
@@ -33,8 +33,19 @@
var idEntity =3D document.Form1.id_entity.value;
var classId =3D document.Form1.classId.value;
var order =3D document.Form1.order.value;
+ var isSearch =3D document.Form1.isSearch.value;
+ var idAttributes =3D document.Form1.idAttribute.value;
+ var idOperators =3D document.Form1.idOPerator.value;
+ var valuesToSearch =3D document.Form1.textToSearch.value;
+ var iniClass =3D document.Form1.iniClass.value;
//alert("order =3D " + order);
- var url =3D "showView.aspx?id_entity=3D" +idEntity+ "&classId=3D" +c=
lassId+ "&order=3D" +order+ "&page=3D" + newPage;
+ var strParam =3D "";
+ strParam =3D "id_entity=3D" +idEntity+ "&classId=3D" +classId;
+ strParam +=3D "&order=3D" +order+ "&page=3D" + newPage;
+ strParam +=3D "&isSearch=3D" +isSearch+ "&idAttribute=3D" + idAttrib=
utes;
+ strParam +=3D "&idOPerator=3D" +idOperators+ "&textToSearch=3D" + va=
luesToSearch;
+ strParam +=3D "&iniClass=3D" +iniClass;
+ var url =3D "showView.aspx?" + strParam;
=20
location.href =3D url;
//alert("url =3D " + url);
Modified: humano2/trunk/web/portal/site/showView.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/showView.aspx.cs 2005-05-20 16:47:54 UT=
C (rev 1114)
+++ humano2/trunk/web/portal/site/showView.aspx.cs 2005-05-20 17:21:06 UT=
C (rev 1115)
@@ -79,8 +79,32 @@
absComplex complex =3D crud.GetCore().Complex;
=20
iniClass =3D 0;
+
+/************************
+ * Datos usados por Search SVERA 20052005
+ */
+ iniClass =3D Convert.ToInt32(Request["iniClass"]);
+ string idAttributes=3D Request["idAttribute"]; //The attribu=
tes to filter with
+ string idOperators =3D Request["idOPerator"]; //The operator=
s (<=3D,=3D,>=3D etc...)
+ string valuesToSearch =3D Request["textToSearch"]; //The val=
ues to compare with
+ int isSearch =3D Convert.ToInt32(Request["isSearch"]);
+ DataTable viewTable =3D null;
+ int idEntity =3D 0;
+
+ string xmlSearch =3D "";
+
+ //***********************
+
//Mandamos el id de la instancia "vista"
- int idEntity =3D Convert.ToInt32(Request.QueryString["id_ent=
ity"]);
+ if (isSearch =3D=3D 0)
+ {
+ idEntity =3D Convert.ToInt32(Request.QueryString["id_entity"]);
+ }
+ else
+ {
+ idEntity =3D iniClass;
+ }
+
string orderArr =3D Convert.ToString(Request.QueryString["or=
der"]);
=20
int currPage =3D Convert.ToInt32(Request.QueryString["page"]=
);
@@ -90,8 +114,14 @@
}
=20
//Logger.Log("showView createXml: currPage" + currPage, LogL=
evel.Trace);
-
- DataTable viewTable =3D dbAdapter.GetViewDataTableFromId(idE=
ntity, out iniClass);
+ if(isSearch =3D=3D 0)
+ {
+ viewTable =3D dbAdapter.GetViewDataTableFromId(idEntity, out iniClas=
s);
+ }
+ else
+ {
+ viewTable =3D getStructForSearch(iniClass,idAttributes,idOperators,v=
aluesToSearch);
+ }
=20
// If there are multiple "order" arguments, they should be s=
eperated by ",";
// The framework already puts a "," between multiple "order =
arguments.
@@ -149,7 +179,14 @@
xmlString +=3D "<nextPage>" + nextPage + "</nextPage>";
xmlString +=3D "<prevPage>" + prevPage + "</prevPage>";
xmlString +=3D "</infoView>";
- =09
+ xmlSearch +=3D "<searchFields>";
+ xmlSearch +=3D String.Format("<isSearch>{0}</isSearch>",isSearch);
+ xmlSearch +=3D String.Format("<idAttributes><![CDATA[{0}]]></idAttrib=
utes>",idAttributes);
+ xmlSearch +=3D String.Format("<idOperators><![CDATA[{0}]]></idOperato=
rs>",idOperators);
+ xmlSearch +=3D String.Format("<valuesToSearch><![CDATA[{0}]]></values=
ToSearch>",valuesToSearch);
+ xmlSearch +=3D String.Format("<iniClass><![CDATA[{0}]]></iniClass>",i=
niClass);
+ xmlSearch +=3D "</searchFields>";
+ xmlString +=3D xmlSearch;
xmlString +=3D "</instances>";
=20
=20
@@ -160,6 +197,82 @@
=20
return xmlString;
}
+
+ private DataTable getStructForSearch(int iniClass,string idAttributes,=
string idOperators,string valuesToSearch)
+ {
+ DataTable dtParam =3D this.makeDataTableInViewTools();
+ DataRow dr =3D dtParam.NewRow();
+
+ dr["columna"] =3D getAttributeListForClass(iniClass);
+ //Logger.Log("search: list of attributes =3D " + dr["columna"],LogLev=
el.Trace);
+ =20
+ //Explicacion de los filtros...
+ char separator =3D '^';
+ dr["filtros"] =3D getFilters(idAttributes,idOperators,valuesToSearch,=
separator);
+ Logger.Log("search: filtros =3D " + dr["filtros"],LogLevel.Trace);
+ =20
+ =20
+ dtParam.Rows.Add(dr);
+ return dtParam;
+ }
+
+ private string getAttributeListForClass(int classId)
+ {
+ string columnsList =3D "0,";
+ DataTable res =3D userCred.CoreAdapter.GetAttributesFromClass(classId=
);
+
+ foreach(DataRow row in res.Rows)
+ {
+ columnsList +=3D row["id_entity"] + ","; =20
+ }
+ =20
+ columnsList =3D columnsList.Substring(0,columnsList.Length-1); //Remo=
ve last ","
+ =20
+ return columnsList;
+ }
+ private string getFilters(string idAttributes, string idOperators, str=
ing valuesToCompare, char separator)
+ {
+ string filter =3D"";
+ Logger.Log("getFilters: Step1", LogLevel.Trace);
+ string [] idAttributesArr =3D idAttributes.Split(new char [] {separat=
or});
+ string [] idOperatorsArr =3D idOperators.Split(new char [] {separator=
});
+ string [] valuesToCompareArr =3D valuesToCompare.Split(new char [] {s=
eparator});
+ =20
+ if(idAttributesArr.Length =3D=3D 1) //There is no separator (ie norma=
l search)
+ {
+ filter =3D idAttributesArr[0] + "|" + idOperatorsArr[0] + "|'" + val=
uesToCompareArr[0] + "'|0|0"; =20
+ }
+ else //Search for report
+ {
+ for(int i=3D0;i<idAttributesArr.Length-2;i++) //The last is a bit di=
fferent
+ {
+ filter +=3D idAttributesArr[i] + "|" + idOperatorsArr[i] + "|'" + v=
aluesToCompareArr[i] + "'|1|0;"; =20
+ }
+ Logger.Log("getFilters: Step2", LogLevel.Trace);
+ int lastIndex =3D idAttributesArr.Length-2; //The index idAttributes=
Arr.Length-1 is empty because of split
+ filter +=3D idAttributesArr[lastIndex] + "|" + idOperatorsArr[lastIn=
dex] + "|'" + valuesToCompareArr[lastIndex] + "'|0|0"; =20
+ }
+ return filter;
+ }
+ private DataTable makeDataTableInViewTools()
+ {
+ DataTable dt1 =3D new DataTable();
+ DataColumn dc1;
+ dc1 =3D new DataColumn("columna",typeof(string));
+ dt1.Columns.Add(dc1);
+ dc1 =3D new DataColumn("filtros",typeof(string));
+ dt1.Columns.Add(dc1);
+ dc1 =3D new DataColumn("group",typeof(string));
+ dt1.Columns.Add(dc1);
+ dc1 =3D new DataColumn("having",typeof(string));
+ dt1.Columns.Add(dc1);
+ dc1 =3D new DataColumn("order",typeof(string));
+ dt1.Columns.Add(dc1);
+ dc1 =3D new DataColumn("claves",typeof(string));
+ dt1.Columns.Add(dc1);
+ return dt1;
+ }
+
#region xml
private string xml_GetAttributes(DataTable viewRes,absComplex complex)
{
Modified: humano2/trunk/web/portal/site/xsl/showview.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/showview.xsl 2005-05-20 16:47:54 UT=
C (rev 1114)
+++ humano2/trunk/web/portal/site/xsl/showview.xsl 2005-05-20 17:21:06 UT=
C (rev 1115)
@@ -165,6 +165,11 @@
<xsl:variable name=3D"classId" select=3D"/instances/infoView/classId"/=
>
<xsl:variable name=3D"nextPage" select=3D"/instances/infoView/nextPage=
"/>
<xsl:variable name=3D"prevPage" select=3D"/instances/infoView/prevPage=
"/>
+ <xsl:variable name=3D"isSearch" select=3D"/instances/searchFields/isSe=
arch"/>
+ <xsl:variable name=3D"idAttributes" select=3D"/instances/searchFields/=
idAttributes"/>
+ <xsl:variable name=3D"idOperators" select=3D"/instances/searchFields/i=
dOperators"/>
+ <xsl:variable name=3D"valuesToSearch" select=3D"/instances/searchField=
s/valuesToSearch"/>
+ <xsl:variable name=3D"iniClass" select=3D"/instances/searchFields/iniC=
lass"/>
<xsl:choose>
<xsl:when test=3D"$RowCount > 0 ">
<table width=3D"100%" border=3D"0" cellspacing=3D"0" cellpadding=3D=
"0">
@@ -241,6 +246,12 @@
<input type=3D"hidden" name=3D"recordCount" value=3D"{$recordCoun=
t}" />=20
<input type=3D"hidden" name=3D"id_entity" value=3D"{$idEntity}" /=
>=20
<input type=3D"hidden" name=3D"classId" value=3D"{$classId}" />=20
+ <input type=3D"hidden" name=3D"isSearch" value=3D"{$isSearch}" />=
=20
+ <input type=3D"hidden" name=3D"idAttribute" value=3D"{$idAttribut=
es}" />=20
+ <input type=3D"hidden" name=3D"idOPerator" value=3D"{$idOperators=
}" />=20
+ <input type=3D"hidden" name=3D"textToSearch" value=3D"{$valuesToS=
earch}" />=20
+ <input type=3D"hidden" name=3D"iniClass" value=3D"{$iniClass}" />=
=20
+
</td></tr></table>
</xsl:when>
<xsl:when test=3D"$RowCount =3D 0 ">
|
|
From: <sv...@de...> - 2005-05-20 16:48:02
|
Author: marijn
Date: 2005-05-20 12:47:54 -0400 (Fri, 20 May 2005)
New Revision: 1114
Modified:
humano2/trunk/core/schema/mssql/mssql-1-metadata.sql
humano2/trunk/core/schema/pgsql/pgsql-1-metadata.sql
Log:
* Fixing bug in metamodel introduced in [1113].
Modified: humano2/trunk/core/schema/mssql/mssql-1-metadata.sql
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=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/schema/mssql/mssql-1-metadata.sql 2005-05-20 16:38=
:51 UTC (rev 1113)
+++ humano2/trunk/core/schema/mssql/mssql-1-metadata.sql 2005-05-20 16:47=
:54 UTC (rev 1114)
@@ -234,8 +234,8 @@
=20
INSERT INTO "class" ("id_entity","classType","sysName","name","parentId=
","isAbstract", "isHidden") VALUES (1,1, 'classType','classType',3,0, 0=
);
INSERT INTO "class" ("id_entity","classType","sysName","name","parentId=
","isAbstract", "isHidden") VALUES (2,1, 'class','class',3,0, 0);
-INSERT INTO "class" ("id_entity","classType","sysName","name","parentId=
","isAbstract", "isHidden") VALUES (3,1, 'entity','entity',NULL,1);
-INSERT INTO "class" ("id_entity","classType","sysName","name","parentId=
","isAbstract", "isHidden") VALUES (5,1, 'attribute','attribute',3,1);
+INSERT INTO "class" ("id_entity","classType","sysName","name","parentId=
","isAbstract", "isHidden") VALUES (3,1, 'entity','entity',NULL,1,0);
+INSERT INTO "class" ("id_entity","classType","sysName","name","parentId=
","isAbstract", "isHidden") VALUES (5,1, 'attribute','attribute',3,1,0);
INSERT INTO "class" ("id_entity","classType","sysName","name","parentId=
","isAbstract", "isHidden") VALUES (6,27, 'domain','domain',3,0, 0);
INSERT INTO "class" ("id_entity","classType","sysName","name","parentId=
","isAbstract", "isHidden") VALUES (7,27, 'user','user',3,0, 0);
INSERT INTO "class" ("id_entity","classType","sysName","name","parentId=
","isAbstract", "isHidden") VALUES (8,1, 'textline','textline',5,0, 0);
Modified: humano2/trunk/core/schema/pgsql/pgsql-1-metadata.sql
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=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/schema/pgsql/pgsql-1-metadata.sql 2005-05-20 16:38=
:51 UTC (rev 1113)
+++ humano2/trunk/core/schema/pgsql/pgsql-1-metadata.sql 2005-05-20 16:47=
:54 UTC (rev 1114)
@@ -234,8 +234,8 @@
=20
INSERT INTO "class" ("id_entity","classType","sysName","name","parentId=
","isAbstract", "isHidden") VALUES (1,1, 'classType','classType',3,'f',=
'f');
INSERT INTO "class" ("id_entity","classType","sysName","name","parentId=
","isAbstract", "isHidden") VALUES (2,1, 'class','class',3,'f', 'f');
-INSERT INTO "class" ("id_entity","classType","sysName","name","parentId=
","isAbstract", "isHidden") VALUES (3,1, 'entity','entity',NULL,'t');
-INSERT INTO "class" ("id_entity","classType","sysName","name","parentId=
","isAbstract", "isHidden") VALUES (5,1, 'attribute','attribute',3,'t');
+INSERT INTO "class" ("id_entity","classType","sysName","name","parentId=
","isAbstract", "isHidden") VALUES (3,1, 'entity','entity',NULL,'t','f'=
);
+INSERT INTO "class" ("id_entity","classType","sysName","name","parentId=
","isAbstract", "isHidden") VALUES (5,1, 'attribute','attribute',3,'t','=
f');
INSERT INTO "class" ("id_entity","classType","sysName","name","parentId=
","isAbstract", "isHidden") VALUES (6,27, 'domain','domain',3,'f', 'f');
INSERT INTO "class" ("id_entity","classType","sysName","name","parentId=
","isAbstract", "isHidden") VALUES (7,27, 'user','user',3,'f', 'f');
INSERT INTO "class" ("id_entity","classType","sysName","name","parentId=
","isAbstract", "isHidden") VALUES (8,1, 'textline','textline',5,'f', 'f=
');
|
|
From: <sv...@de...> - 2005-05-20 16:38:56
|
Author: marijn
Date: 2005-05-20 12:38:51 -0400 (Fri, 20 May 2005)
New Revision: 1113
Modified:
humano2/trunk/components/webTools/Adapter.cs
humano2/trunk/core/db/pgsql/pgsqlComplex.cs
humano2/trunk/core/schema/mssql/mssql-1-metadata.sql
humano2/trunk/core/schema/pgsql/pgsql-1-metadata.sql
Log:
Fixing bug #121
* If a class that is a attribute type is marked as "isHidden" it does no=
t show up in the list of attributes in builder.
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-05-20 16:10:19 UTC =
(rev 1112)
+++ humano2/trunk/components/webTools/Adapter.cs 2005-05-20 16:38:51 UTC =
(rev 1113)
@@ -212,17 +212,6 @@
DataTable res;
res =3D complex.GetAttributes();
=20
- int inheritenceIndex =3D -1;
- for(int i =3D 0; i < res.Rows.Count; i++)=20
- {
- if(Convert.ToInt32(res.Rows[i]["id_entity"]) =3D=3D (int) MetaMod=
elConsts.EntitiesInheritance)
- {
- inheritenceIndex =3D i;
- }
- }
- =09
- res.Rows.RemoveAt(inheritenceIndex); // Zap the inheritance attribute=
.
-
return res;
}
=20
Modified: humano2/trunk/core/db/pgsql/pgsqlComplex.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/pgsql/pgsqlComplex.cs 2005-05-20 16:10:19 UTC (=
rev 1112)
+++ humano2/trunk/core/db/pgsql/pgsqlComplex.cs 2005-05-20 16:38:51 UTC (=
rev 1113)
@@ -212,7 +212,7 @@
string query;
DataTable res;
=20
- query =3D @"select id_entity, name from class where ""parentId"" =3D =
5 or ""parentId"" in (select id_entity from class where ""parentId"" =3D =
5)";
+ query =3D @"select id_entity, name from class where ( ""parentId"" =3D=
5 or ""parentId"" in (select id_entity from class where ""parentId"" =3D=
5) ) and ""isHidden"" =3D '0'";
=20
res =3D this.doSelect(query);
return res;
Modified: humano2/trunk/core/schema/mssql/mssql-1-metadata.sql
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=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/schema/mssql/mssql-1-metadata.sql 2005-05-20 16:10=
:19 UTC (rev 1112)
+++ humano2/trunk/core/schema/mssql/mssql-1-metadata.sql 2005-05-20 16:38=
:51 UTC (rev 1113)
@@ -232,26 +232,26 @@
INSERT INTO "classType" ("id_entity","sysClassTypeName","parentClassTyp=
e") VALUES (27,'component',NULL);
INSERT INTO "classType" ("id_entity","sysClassTypeName","parentClassTyp=
e") VALUES (29,'solutionData',NULL);
=20
-INSERT INTO "class" ("id_entity","classType","sysName","name","parentId=
","isAbstract") VALUES (1,1, 'classType','classType',3,0);
-INSERT INTO "class" ("id_entity","classType","sysName","name","parentId=
","isAbstract") VALUES (2,1, 'class','class',3,0);
-INSERT INTO "class" ("id_entity","classType","sysName","name","parentId=
","isAbstract") VALUES (3,1, 'entity','entity',NULL,1);
-INSERT INTO "class" ("id_entity","classType","sysName","name","parentId=
","isAbstract") VALUES (5,1, 'attribute','attribute',3,1);
-INSERT INTO "class" ("id_entity","classType","sysName","name","parentId=
","isAbstract") VALUES (6,27, 'domain','domain',3,0);
-INSERT INTO "class" ("id_entity","classType","sysName","name","parentId=
","isAbstract") VALUES (7,27, 'user','user',3,0);
-INSERT INTO "class" ("id_entity","classType","sysName","name","parentId=
","isAbstract") VALUES (8,1, 'textline','textline',5,0);
-INSERT INTO "class" ("id_entity","classType","sysName","name","parentId=
","isAbstract") VALUES (9,1, 'numeric','numeric',5,0);
-INSERT INTO "class" ("id_entity","classType","sysName","name","parentId=
","isAbstract") VALUES (12,1,'dateTime','dateTime',5,0);
-INSERT INTO "class" ("id_entity","classType","sysName","name","parentId=
","isAbstract") VALUES (13,1,'text','text',5,0);
-INSERT INTO "class" ("id_entity","classType","sysName","name","parentId=
","isAbstract") VALUES (14,1,'inheritance','inheritance',5,0);
-INSERT INTO "class" ("id_entity","classType","sysName","name","parentId=
","isAbstract") VALUES (15,1,'choice','choice',81,0);
-INSERT INTO "class" ("id_entity","classType","sysName","name","parentId=
","isAbstract") VALUES (26,27,'user_domain','user_domain',3,0);
-INSERT INTO "class" ("id_entity","classType","sysName","name","parentId=
","isAbstract") VALUES (39,1,'file','file',5,0);
-INSERT INTO "class" ("id_entity","classType","sysName","name","parentId=
","isAbstract") VALUES (80,1, 'option','option',3,0);
-INSERT INTO "class" ("id_entity","classType","sysName","name","parentId=
","isAbstract") VALUES (81,1,'pertinence','pertinence',5,0);
-INSERT INTO "class" ("id_entity","classType","sysName","name","parentId=
","isAbstract") VALUES (82,1,'Boolean','Boolean',5,0);
-INSERT INTO "class" ("id_entity","classType","sysName","name","parentId=
","isAbstract") VALUES (130,1,'optionGroup','optionGroup',3,0);
-INSERT INTO "class" ("id_entity","classType","sysName","name","parentId=
","isAbstract") VALUES (149,1,'displayAttribute','displayAttribute',3,0)=
;
-INSERT INTO "class" ("id_entity","classType","sysName","name","parentId=
","isAbstract") VALUES (153,1,'version','version',3,0);
+INSERT INTO "class" ("id_entity","classType","sysName","name","parentId=
","isAbstract", "isHidden") VALUES (1,1, 'classType','classType',3,0, 0=
);
+INSERT INTO "class" ("id_entity","classType","sysName","name","parentId=
","isAbstract", "isHidden") VALUES (2,1, 'class','class',3,0, 0);
+INSERT INTO "class" ("id_entity","classType","sysName","name","parentId=
","isAbstract", "isHidden") VALUES (3,1, 'entity','entity',NULL,1);
+INSERT INTO "class" ("id_entity","classType","sysName","name","parentId=
","isAbstract", "isHidden") VALUES (5,1, 'attribute','attribute',3,1);
+INSERT INTO "class" ("id_entity","classType","sysName","name","parentId=
","isAbstract", "isHidden") VALUES (6,27, 'domain','domain',3,0, 0);
+INSERT INTO "class" ("id_entity","classType","sysName","name","parentId=
","isAbstract", "isHidden") VALUES (7,27, 'user','user',3,0, 0);
+INSERT INTO "class" ("id_entity","classType","sysName","name","parentId=
","isAbstract", "isHidden") VALUES (8,1, 'textline','textline',5,0, 0);
+INSERT INTO "class" ("id_entity","classType","sysName","name","parentId=
","isAbstract", "isHidden") VALUES (9,1, 'numeric','numeric',5,0, 0);
+INSERT INTO "class" ("id_entity","classType","sysName","name","parentId=
","isAbstract", "isHidden") VALUES (12,1,'dateTime','dateTime',5,0, 0);
+INSERT INTO "class" ("id_entity","classType","sysName","name","parentId=
","isAbstract", "isHidden") VALUES (13,1,'text','text',5,0, 0);
+INSERT INTO "class" ("id_entity","classType","sysName","name","parentId=
","isAbstract", "isHidden") VALUES (14,1,'inheritance','inheritance',5,0=
, 1);
+INSERT INTO "class" ("id_entity","classType","sysName","name","parentId=
","isAbstract", "isHidden") VALUES (15,1,'choice','choice',81,0, 1);
+INSERT INTO "class" ("id_entity","classType","sysName","name","parentId=
","isAbstract", "isHidden") VALUES (26,27,'user_domain','user_domain',3,=
0, 0);
+INSERT INTO "class" ("id_entity","classType","sysName","name","parentId=
","isAbstract", "isHidden") VALUES (39,1,'file','file',5,0, 0);
+INSERT INTO "class" ("id_entity","classType","sysName","name","parentId=
","isAbstract", "isHidden") VALUES (80,1, 'option','option',3,0, 0);
+INSERT INTO "class" ("id_entity","classType","sysName","name","parentId=
","isAbstract", "isHidden") VALUES (81,1,'pertinence','pertinence',5,0, =
0);
+INSERT INTO "class" ("id_entity","classType","sysName","name","parentId=
","isAbstract", "isHidden") VALUES (82,1,'Boolean','Boolean',5,0, 0);
+INSERT INTO "class" ("id_entity","classType","sysName","name","parentId=
","isAbstract", "isHidden") VALUES (130,1,'optionGroup','optionGroup',3,=
0, 0);
+INSERT INTO "class" ("id_entity","classType","sysName","name","parentId=
","isAbstract", "isHidden") VALUES (149,1,'displayAttribute','displayAtt=
ribute',3,0, 0);
+INSERT INTO "class" ("id_entity","classType","sysName","name","parentId=
","isAbstract", "isHidden") VALUES (153,1,'version','version',3,0, 0);
=20
SET IDENTITY_INSERT "entity" ON=20
INSERT INTO "entity" ("id_entity","domainId","class","delDate","status"=
) VALUES (1,10,2,NULL,NULL);
Modified: humano2/trunk/core/schema/pgsql/pgsql-1-metadata.sql
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=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/schema/pgsql/pgsql-1-metadata.sql 2005-05-20 16:10=
:19 UTC (rev 1112)
+++ humano2/trunk/core/schema/pgsql/pgsql-1-metadata.sql 2005-05-20 16:38=
:51 UTC (rev 1113)
@@ -232,26 +232,26 @@
INSERT INTO "classType" ("id_entity","sysClassTypeName","parentClassTyp=
e") VALUES (27,'component',NULL);
INSERT INTO "classType" ("id_entity","sysClassTypeName","parentClassTyp=
e") VALUES (29,'solutionData',NULL);
=20
-INSERT INTO "class" ("id_entity","classType","sysName","name","parentId=
","isAbstract") VALUES (1,1, 'classType','classType',3,'f');
-INSERT INTO "class" ("id_entity","classType","sysName","name","parentId=
","isAbstract") VALUES (2,1, 'class','class',3,'f');
-INSERT INTO "class" ("id_entity","classType","sysName","name","parentId=
","isAbstract") VALUES (3,1, 'entity','entity',NULL,'t');
-INSERT INTO "class" ("id_entity","classType","sysName","name","parentId=
","isAbstract") VALUES (5,1, 'attribute','attribute',3,'t');
-INSERT INTO "class" ("id_entity","classType","sysName","name","parentId=
","isAbstract") VALUES (6,27, 'domain','domain',3,'f');
-INSERT INTO "class" ("id_entity","classType","sysName","name","parentId=
","isAbstract") VALUES (7,27, 'user','user',3,'f');
-INSERT INTO "class" ("id_entity","classType","sysName","name","parentId=
","isAbstract") VALUES (8,1, 'textline','textline',5,'f');
-INSERT INTO "class" ("id_entity","classType","sysName","name","parentId=
","isAbstract") VALUES (9,1, 'numeric','numeric',5,'f');
-INSERT INTO "class" ("id_entity","classType","sysName","name","parentId=
","isAbstract") VALUES (12,1,'dateTime','dateTime',5,'f');
-INSERT INTO "class" ("id_entity","classType","sysName","name","parentId=
","isAbstract") VALUES (13,1,'text','text',5,'f');
-INSERT INTO "class" ("id_entity","classType","sysName","name","parentId=
","isAbstract") VALUES (14,1,'inheritance','inheritance',5,'f');
-INSERT INTO "class" ("id_entity","classType","sysName","name","parentId=
","isAbstract") VALUES (15,1,'choice','choice',81,'f');
-INSERT INTO "class" ("id_entity","classType","sysName","name","parentId=
","isAbstract") VALUES (26,27,'user_domain','user_domain',3,'f');
-INSERT INTO "class" ("id_entity","classType","sysName","name","parentId=
","isAbstract") VALUES (39,1,'file','file',5,'f');
-INSERT INTO "class" ("id_entity","classType","sysName","name","parentId=
","isAbstract") VALUES (80,1, 'option','option',3,'f');
-INSERT INTO "class" ("id_entity","classType","sysName","name","parentId=
","isAbstract") VALUES (81,1,'pertinence','pertinence',5,'f');
-INSERT INTO "class" ("id_entity","classType","sysName","name","parentId=
","isAbstract") VALUES (82,1,'boolean','boolean',5,'f');
-INSERT INTO "class" ("id_entity","classType","sysName","name","parentId=
","isAbstract") VALUES (130,1,'optionGroup','optionGroup',3,'f');
-INSERT INTO "class" ("id_entity","classType","sysName","name","parentId=
","isAbstract") VALUES (149,1,'displayAttribute','displayAttribute',3,'f=
');
-INSERT INTO "class" ("id_entity","classType","sysName","name","parentId=
","isAbstract") VALUES (153,1,'version','version',3,'f');
+INSERT INTO "class" ("id_entity","classType","sysName","name","parentId=
","isAbstract", "isHidden") VALUES (1,1, 'classType','classType',3,'f',=
'f');
+INSERT INTO "class" ("id_entity","classType","sysName","name","parentId=
","isAbstract", "isHidden") VALUES (2,1, 'class','class',3,'f', 'f');
+INSERT INTO "class" ("id_entity","classType","sysName","name","parentId=
","isAbstract", "isHidden") VALUES (3,1, 'entity','entity',NULL,'t');
+INSERT INTO "class" ("id_entity","classType","sysName","name","parentId=
","isAbstract", "isHidden") VALUES (5,1, 'attribute','attribute',3,'t');
+INSERT INTO "class" ("id_entity","classType","sysName","name","parentId=
","isAbstract", "isHidden") VALUES (6,27, 'domain','domain',3,'f', 'f');
+INSERT INTO "class" ("id_entity","classType","sysName","name","parentId=
","isAbstract", "isHidden") VALUES (7,27, 'user','user',3,'f', 'f');
+INSERT INTO "class" ("id_entity","classType","sysName","name","parentId=
","isAbstract", "isHidden") VALUES (8,1, 'textline','textline',5,'f', 'f=
');
+INSERT INTO "class" ("id_entity","classType","sysName","name","parentId=
","isAbstract", "isHidden") VALUES (9,1, 'numeric','numeric',5,'f', 'f')=
;
+INSERT INTO "class" ("id_entity","classType","sysName","name","parentId=
","isAbstract", "isHidden") VALUES (12,1,'dateTime','dateTime',5,'f', 'f=
');
+INSERT INTO "class" ("id_entity","classType","sysName","name","parentId=
","isAbstract", "isHidden") VALUES (13,1,'text','text',5,'f', 'f');
+INSERT INTO "class" ("id_entity","classType","sysName","name","parentId=
","isAbstract", "isHidden") VALUES (14,1,'inheritance','inheritance',5,'=
f', 't');
+INSERT INTO "class" ("id_entity","classType","sysName","name","parentId=
","isAbstract", "isHidden") VALUES (15,1,'choice','choice',81,'f', 't');
+INSERT INTO "class" ("id_entity","classType","sysName","name","parentId=
","isAbstract", "isHidden") VALUES (26,27,'user_domain','user_domain',3,=
'f', 'f');
+INSERT INTO "class" ("id_entity","classType","sysName","name","parentId=
","isAbstract", "isHidden") VALUES (39,1,'file','file',5,'f', 'f');
+INSERT INTO "class" ("id_entity","classType","sysName","name","parentId=
","isAbstract", "isHidden") VALUES (80,1, 'option','option',3,'f', 'f');
+INSERT INTO "class" ("id_entity","classType","sysName","name","parentId=
","isAbstract", "isHidden") VALUES (81,1,'pertinence','pertinence',5,'f'=
, 'f');
+INSERT INTO "class" ("id_entity","classType","sysName","name","parentId=
","isAbstract", "isHidden") VALUES (82,1,'boolean','boolean',5,'f', 'f')=
;
+INSERT INTO "class" ("id_entity","classType","sysName","name","parentId=
","isAbstract", "isHidden") VALUES (130,1,'optionGroup','optionGroup',3,=
'f', 'f');
+INSERT INTO "class" ("id_entity","classType","sysName","name","parentId=
","isAbstract", "isHidden") VALUES (149,1,'displayAttribute','displayAtt=
ribute',3,'f', 'f');
+INSERT INTO "class" ("id_entity","classType","sysName","name","parentId=
","isAbstract", "isHidden") VALUES (153,1,'version','version',3,'f', 'f'=
);
=20
INSERT INTO "entity" ("id_entity","domainId","class","delDate","status"=
) VALUES (1,10,2,NULL,NULL);
INSERT INTO "entity" ("id_entity","domainId","class","delDate","status"=
) VALUES (2,10,2,NULL,NULL);
|
|
From: <sv...@de...> - 2005-05-20 16:10:20
|
Author: pcamacho
Date: 2005-05-20 12:10:19 -0400 (Fri, 20 May 2005)
New Revision: 1112
Modified:
humano2/trunk/core/db/absCrud.cs
Log:
FIX: bug #120. In the function formatDataAccordingToStructure there was a=
line that said no to update a field if the=20
value passed was the empty string. Yet we don't know what is the impact o=
f this change.
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-05-20 15:18:20 UTC (rev 1111)
+++ humano2/trunk/core/db/absCrud.cs 2005-05-20 16:10:19 UTC (rev 1112)
@@ -966,6 +966,7 @@
ArrayList missingAttribs =3D new ArrayList();
int columnCounter =3D 0;
=09
+ Logger.Log("updateInstance: " + DbUtils.DumpData(data), LogL=
evel.Trace);
formatDataAccordingToStructure(classId, structure, workRow,
instNames, instColumns, instValues,
missingAttribs, virtAttribs);
@@ -1277,7 +1278,7 @@
string value =3D Convert.ToString(workRow[columnName]);
=09
// If the value is empty, don't bother adding it.
- if(value.Length =3D=3D 0) { continue; }
+ //if(value.Length =3D=3D 0) { continue; }
=09
string columnValue =3D escapeAttribute( value, columnType );
=09
|
|
From: <sv...@de...> - 2005-05-20 15:18:31
|
Author: marijn
Date: 2005-05-20 11:18:20 -0400 (Fri, 20 May 2005)
New Revision: 1111
Modified:
humano2/trunk/web/builder/site/domainmain.aspx.cs
Log:
Fixes bug #119
* SystemDomain is listed but cannot be deleted via the interface.
Modified: humano2/trunk/web/builder/site/domainmain.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/domainmain.aspx.cs 2005-05-20 15:12:28=
UTC (rev 1110)
+++ humano2/trunk/web/builder/site/domainmain.aspx.cs 2005-05-20 15:18:20=
UTC (rev 1111)
@@ -29,7 +29,7 @@
/// Summary description for crearusuario.
/// </summary>
public class DomainMain : basePage
- {=09
+ {
protected System.Web.UI.WebControls.Label DomainList;
=09
private void Page_Load(object sender, System.EventArgs e)
@@ -57,7 +57,17 @@
foreach(DataRow row in list.Rows) {
int domainId =3D Convert.ToInt32(row["id_entity"]);
string domainName =3D Convert.ToString(row["domainName"]);
- DomainList.Text +=3D "<li><a href=3D\"domainedit.aspx?domainId=3D"+ =
domainId +"\">"+domainName+"</a> (<a href=3D\"#\" onClick=3D\"DeleteDomai=
n("+domainId+")\">Delete</a>)</li>";
+ DomainList.Text +=3D "<li><a href=3D\"domainedit.aspx?domainId=3D"+ =
domainId +"\">"+domainName+"</a> ";
+ if(domainId !=3D 10)=20
+ {
+ DomainList.Text +=3D "(<a href=3D\"#\" onClick=3D\"DeleteDomain("+d=
omainId+")\">Delete</a>)";
+ }=20
+ else=20
+ {
+ DomainList.Text +=3D "(Not Deletable)";
+ }
+
+ DomainList.Text +=3D "</li>";
}
}
=09
|
|
From: <sv...@de...> - 2005-05-20 15:12:34
|
Author: marijn Date: 2005-05-20 11:12:28 -0400 (Fri, 20 May 2005) New Revision: 1110 Added: humano2/trunk/changelog.txt Log: * Adding a Changelog. Added: humano2/trunk/changelog.txt =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=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/changelog.txt 2005-05-20 12:41:46 UTC (rev 1109) +++ humano2/trunk/changelog.txt 2005-05-20 15:12:28 UTC (rev 1110) @@ -0,0 +1,32 @@ + +=3D=3D 5.0.Beta2 - 2005-05-19 =3D=3D + + * Portal + * Views with many results are now split into pages. + * Folders now support subfolders, views, forms and reports. + * Portal now has a new, more advanced calendar[1] + * Added xsl files for each of the extended attribute types. + * Changing many texts from spanish into English. + + * Builder + * Addition of interface for Folders. + * Additing of basic interface for reports. + * Defining a pertinence with a view now only show appliable views. + * Limited the classes to the currentdomain in formulas. + * The creating of classes now refreshes the list of classes in the + domain.=20 + + * Core + * Fixing the view of attributes that are derived from the standard + attributes.=20 + * Changing the version string's "patch" element from int to string. +=20 + * MetaModel + * Added a class "version" for maintaining the version of the metamodel= . + * Fixes in various parts of the meta-model database definitions. + + + +=3D=3D 4.9.5 / 5.0.Beta1 - 2005-05-13 =3D=3D + +First public release. |
|
From: <sv...@de...> - 2005-05-20 12:42:00
|
Author: svera
Date: 2005-05-20 08:41:46 -0400 (Fri, 20 May 2005)
New Revision: 1109
Modified:
humano2/trunk/web/builder/site/foldermanagement.aspx.cs
Log:
* Fix form filter, for show only CREATE type
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-05-19 22=
:35:40 UTC (rev 1108)
+++ humano2/trunk/web/builder/site/foldermanagement.aspx.cs 2005-05-20 12=
:41:46 UTC (rev 1109)
@@ -120,7 +120,7 @@
ClassId =3D Convert.ToInt32( Request["classId"]);
if (Convert.ToInt32( Request["newform"]) > 0)
newForm =3D false;
-
+ =09
action =3D Convert.ToInt32( Request["opaction"]);
ClassName =3D Convert.ToString( Request["ClassName"]);
folderName =3D Convert.ToString( Request["formName"]);
@@ -256,7 +256,7 @@
=20
private DataTable getListForms(int domainId)
{
- string filtro =3D String.Format("34|4|'{0}'|0|0",domainId);
+ string filtro =3D String.Format("1201|4|'CREATE'|1|0;34|4|'{0}'|0|0",=
domainId);
DataTable dt =3D userCred.CoreAdapter.GenerateViewTools(1200,"0, 1202=
",filtro,"","","",0);
=20
if (dt.Rows.Count > 0)
|
|
From: <sv...@de...> - 2005-05-19 22:35:51
|
Author: svera
Date: 2005-05-19 18:35:40 -0400 (Thu, 19 May 2005)
New Revision: 1108
Modified:
humano2/trunk/web/builder/Builder.csproj
Log:
* Updated file for visual studio, wish include create Report
Modified: humano2/trunk/web/builder/Builder.csproj
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=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/Builder.csproj 2005-05-19 22:32:51 UTC (rev=
1107)
+++ humano2/trunk/web/builder/Builder.csproj 2005-05-19 22:35:40 UTC (rev=
1108)
@@ -144,7 +144,7 @@
<File
RelPath =3D "site\accessdenied.aspx.cs"
DependentUpon =3D "accessdenied.aspx"
- SubType =3D "Code"
+ SubType =3D "ASPXCodeBehind"
BuildAction =3D "Compile"
/>
<File
@@ -187,7 +187,7 @@
<File
RelPath =3D "site\combobox_type_entity.aspx.cs"
DependentUpon =3D "combobox_type_entity.aspx"
- SubType =3D "Code"
+ SubType =3D "ASPXCodeBehind"
BuildAction =3D "Compile"
/>
<File
@@ -233,13 +233,23 @@
BuildAction =3D "Compile"
/>
<File
+ RelPath =3D "site\createreport.aspx"
+ BuildAction =3D "Content"
+ />
+ <File
+ RelPath =3D "site\createreport.aspx.cs"
+ DependentUpon =3D "createreport.aspx"
+ SubType =3D "ASPXCodeBehind"
+ BuildAction =3D "Compile"
+ />
+ <File
RelPath =3D "site\dataattributedelete.aspx"
BuildAction =3D "Content"
/>
<File
RelPath =3D "site\dataattributedelete.aspx.cs"
DependentUpon =3D "dataattributedelete.aspx"
- SubType =3D "Code"
+ SubType =3D "ASPXCodeBehind"
BuildAction =3D "Compile"
/>
<File
@@ -250,7 +260,7 @@
<File
RelPath =3D "site\dataclasscreate.aspx.cs"
DependentUpon =3D "dataclasscreate.aspx"
- SubType =3D "Code"
+ SubType =3D "ASPXCodeBehind"
BuildAction =3D "Compile"
/>
<File
@@ -260,7 +270,7 @@
<File
RelPath =3D "site\dataclassdelete.aspx.cs"
DependentUpon =3D "dataclassdelete.aspx"
- SubType =3D "Code"
+ SubType =3D "ASPXCodeBehind"
BuildAction =3D "Compile"
/>
<File
@@ -271,7 +281,7 @@
<File
RelPath =3D "site\dataclasses.aspx.cs"
DependentUpon =3D "dataclasses.aspx"
- SubType =3D "Code"
+ SubType =3D "ASPXCodeBehind"
BuildAction =3D "Compile"
/>
<File
@@ -281,7 +291,7 @@
<File
RelPath =3D "site\dataclassproperties.aspx.cs"
DependentUpon =3D "dataclassproperties.aspx"
- SubType =3D "Code"
+ SubType =3D "ASPXCodeBehind"
BuildAction =3D "Compile"
/>
<File
@@ -339,7 +349,7 @@
<File
RelPath =3D "site\domainedit.aspx.cs"
DependentUpon =3D "domainedit.aspx"
- SubType =3D "Code"
+ SubType =3D "ASPXCodeBehind"
BuildAction =3D "Compile"
/>
<File
@@ -349,7 +359,7 @@
<File
RelPath =3D "site\domainmain.aspx.cs"
DependentUpon =3D "domainmain.aspx"
- SubType =3D "Code"
+ SubType =3D "ASPXCodeBehind"
BuildAction =3D "Compile"
/>
<File
@@ -389,16 +399,26 @@
BuildAction =3D "Compile"
/>
<File
- RelPath =3D "site\FormManagement.aspx"
+ RelPath =3D "site\foldermanagement.aspx"
BuildAction =3D "Content"
/>
<File
- RelPath =3D "site\FormManagement.aspx.cs"
- DependentUpon =3D "FormManagement.aspx"
+ RelPath =3D "site\foldermanagement.aspx.cs"
+ DependentUpon =3D "foldermanagement.aspx"
SubType =3D "ASPXCodeBehind"
BuildAction =3D "Compile"
/>
<File
+ RelPath =3D "site\formManagement.aspx"
+ BuildAction =3D "Content"
+ />
+ <File
+ RelPath =3D "site\formManagement.aspx.cs"
+ DependentUpon =3D "formManagement.aspx"
+ SubType =3D "ASPXCodeBehind"
+ BuildAction =3D "Compile"
+ />
+ <File
RelPath =3D "site\formulamain.aspx"
SubType =3D "Form"
BuildAction =3D "Content"
@@ -406,7 +426,7 @@
<File
RelPath =3D "site\formulamain.aspx.cs"
DependentUpon =3D "formulamain.aspx"
- SubType =3D "Code"
+ SubType =3D "ASPXCodeBehind"
BuildAction =3D "Compile"
/>
<File
@@ -421,7 +441,7 @@
<File
RelPath =3D "site\functionclasses.aspx.cs"
DependentUpon =3D "functionclasses.aspx"
- SubType =3D "Code"
+ SubType =3D "ASPXCodeBehind"
BuildAction =3D "Compile"
/>
<File
@@ -441,7 +461,7 @@
<File
RelPath =3D "site\functioninfo.aspx.cs"
DependentUpon =3D "functioninfo.aspx"
- SubType =3D "Code"
+ SubType =3D "ASPXCodeBehind"
BuildAction =3D "Compile"
/>
<File
@@ -451,7 +471,7 @@
<File
RelPath =3D "site\functionoperationbar.aspx.cs"
DependentUpon =3D "functionoperationbar.aspx"
- SubType =3D "Code"
+ SubType =3D "ASPXCodeBehind"
BuildAction =3D "Compile"
/>
<File
@@ -521,15 +541,10 @@
<File
RelPath =3D "site\topbar.aspx.cs"
DependentUpon =3D "topbar.aspx"
- SubType =3D "Code"
+ SubType =3D "ASPXCodeBehind"
BuildAction =3D "Compile"
/>
<File
- RelPath =3D "site\topbar.aspx.resx"
- DependentUpon =3D "topbar.aspx.cs"
- BuildAction =3D "EmbeddedResource"
- />
- <File
RelPath =3D "site\useredit.aspx"
BuildAction =3D "Content"
/>
@@ -546,7 +561,7 @@
<File
RelPath =3D "site\datamodeling.aspx.cs"
DependentUpon =3D "userindex.aspx"
- SubType =3D "Code"
+ SubType =3D "ASPXCodeBehind"
BuildAction =3D "Compile"
/>
<File
@@ -562,7 +577,7 @@
<File
RelPath =3D "site\usermain.aspx.cs"
DependentUpon =3D "usermain.aspx"
- SubType =3D "Code"
+ SubType =3D "ASPXCodeBehind"
BuildAction =3D "Compile"
/>
<File
@@ -572,7 +587,7 @@
<File
RelPath =3D "site\useroperationbar.aspx.cs"
DependentUpon =3D "useroperationbar.aspx"
- SubType =3D "Code"
+ SubType =3D "ASPXCodeBehind"
BuildAction =3D "Compile"
/>
<File
|
|
From: <sv...@de...> - 2005-05-19 22:32:52
|
Author: marijn
Date: 2005-05-19 18:32:51 -0400 (Thu, 19 May 2005)
New Revision: 1107
Modified:
humano2/trunk/web/portal/site/xsl/topbar.xsl
Log:
* changing to spanish some more.
Modified: humano2/trunk/web/portal/site/xsl/topbar.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/topbar.xsl 2005-05-19 21:50:56 UTC =
(rev 1106)
+++ humano2/trunk/web/portal/site/xsl/topbar.xsl 2005-05-19 22:32:51 UTC =
(rev 1107)
@@ -74,7 +74,7 @@
<td>Search in:</td>
<td>
<select name=3D"intEntityType" id=3D"intEntityType" style=3D"=
width:150px;" onchange=3D"javascript:ChargeAtt(this)">
- <option value=3D"0">Seleccionar...</option>
+ <option value=3D"0">Select...</option>
<xsl:for-each select=3D"Page/classes/class">
<xsl:variable name=3D"classID" select=3D"value"/>
<option value=3D"{$classID}">=20
|
|
From: <sv...@de...> - 2005-05-19 21:51:01
|
Author: pcamacho
Date: 2005-05-19 17:50:56 -0400 (Thu, 19 May 2005)
New Revision: 1106
Modified:
humano2/trunk/web/builder/site/createreport.aspx.cs
humano2/trunk/web/builder/site/js/createreport.js
humano2/trunk/web/builder/site/js/formreport.js
humano2/trunk/web/builder/site/xsl/createreport.xsl
Log:
ADD: basic interface for creattion of reports: with groupby and selection=
of functions to apply to attributes.=09
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-19 21:06:=
59 UTC (rev 1105)
+++ humano2/trunk/web/builder/site/createreport.aspx.cs 2005-05-19 21:50:=
56 UTC (rev 1106)
@@ -41,6 +41,7 @@
private string receivedColumnsStr; =20
private string receivedWhereStr;
private string receivedOrderStr;
+ private string receivedPersoColumnsStr;
=20
private void Page_Load(object sender, System.EventArgs e)
{
@@ -152,30 +153,59 @@
=20
private string getReportContent()
{
- =20
DataTable dt =3D userCred.CoreAdapter.GetReportData(reportId=
);
- =09
string res =3D"";
- =20
res +=3D "<reportParams>";
- res +=3D getReportColumnsXml((dt.Rows[0]["columns"]).ToStrin=
g()); // The columns
+ res +=3D getReportColumnsXml((dt.Rows[0]["groupby"]).ToStrin=
g()); // The columns for a report are in groupby
+ res +=3D getReportPersoColumnsXml((dt.Rows[0]["columns"]).To=
String()); //Here are the functions
res +=3D getReportWhereXml((dt.Rows[0]["where"]).ToString())=
; //Where=20
res +=3D getReportOrderXml((dt.Rows[0]["order"]).ToString())=
; //Order
res +=3D "</reportParams>";
-
return res;
}
=20
+ =20
+ private string getReportPersoColumnsXml(string columns)
+ {
+ string [] allColumns =3D columns.Split(new char[] {','});
+ string xmlRes =3D "";
+ =20
+ xmlRes +=3D "<persoColumns>";
+ for(int i=3D0;i<allColumns.Length;i++)
+ {
+ string [] columnValues =3D allColumns[i].Split("|".ToCha=
rArray());
+ string idAtt =3D "";
+ string op =3D "";
+ string [] columnsList =3D getColumnsList();
+ =20
+ if(columnValues.Length >=3D2) //Only take attributes wit=
h functions
+ {
+ op =3D columnValues[1];//No need to move index (+1) =
because the op functions start with num 1 and not 0
+ idAtt =3D Convert.ToString(Convert.ToInt32(getIndexO=
fElement(columnValues[0],columnsList)) + 1); // idem
+ =20
+ xmlRes +=3D"<persoColumn>";
+ xmlRes +=3D "<idAtt>" + idAtt + "</idAtt>";
+ xmlRes +=3D "<op>" + op + "</op>";
+ xmlRes +=3D "</persoColumn>";
+ }
+ }
+ xmlRes +=3D "</persoColumns>";
+ =20
+ return xmlRes;
+ }
+ =20
private string getReportColumnsXml(string columns)
{
string [] allColumns =3D columns.Split(new char [] {','}); =
=20
string xmlRes =3D "";
=20
- if(allColumns.Length <=3D 1)
- {
- return "";
- }
xmlRes +=3D "<columns>";
+ =20
+ //Add the column with id attribute 0 to be coherent with the=
interface of showview
+ xmlRes +=3D"<column>";
+ xmlRes +=3D "0";
+ xmlRes +=3D "</column>";
+ =20
for(int i=3D0;i<allColumns.Length;i++)
{
xmlRes +=3D"<column>";
@@ -219,7 +249,6 @@
xmlRes +=3D "</condition>";
}
xmlRes +=3D "</conditions>";
- =20
return xmlRes;
}
=20
@@ -422,11 +451,13 @@
//Logger.Log("reportmain: checkForPertinence: " + userCred.C=
oreAdapter.CheckForPertinence(receivedColumnsStr),LogLevel.Trace);
=20
//dr["columns"] =3D userCred.CoreAdapter.CheckForPertinence(=
receivedColumnsStr); //If a column is a pertinence, change it
- dr["columns"] =3D receivedColumnsStr; //If a column is a per=
tinence, change it
+ dr["groupby"] =3D receivedColumnsStr; //The columns selected=
by user are to put in group by
=20
//Special case for IN filter
dr["where"] =3D parseWhere(receivedWhereStr);
=20
+ dr["columns"] =3D buildColumnsForReport(receivedPersoColumns=
Str,dr["groupby"].ToString()); //
+ =20
dr["order"] =3D parseOrder(receivedOrderStr);
Logger.Log("receivedOrderStr" + receivedOrderStr, LogLevel.T=
race);
Logger.Log("receivedWhereStr" + receivedWhereStr, LogLevel.T=
race);
@@ -437,15 +468,54 @@
}
=20
=20
+ ///<summary>
+ /// The persoCol string comes from the web in this format idAtt0=
|idFunc0;idAtt1|idFunc1; ...
+ /// It has to be converted to:=20
+ /// idAtt0|idFunc0, idAtt1|idFunc1; etc...=20
+ /// So we only have to replace ; for ,
+ ///</summary>
+ private string parsePersoColumns(string persoCol)
+ {
+ if((persoCol!=3D null) && (persoCol.Length >0))
+ {
+ return persoCol.Replace(";",",");
+ }
+ else
+ {
+ return ""; =20
+ }
+ =20
+ }
=20
///<summary>
+ /// The user selects columns to display and columns to group by
+ /// The final list of columns to display are the selected column=
s more the grouby columns
+ ///</summary>
+ private string buildColumnsForReport(string persoColumns, string=
groupByColumns)
+ {
+ string res =3D "";
+ string persoColumnsParsed =3D parsePersoColumns(persoColumns=
);
+ if((persoColumnsParsed.Length > 0) && (groupByColumns.Length=
> 0))
+ {
+ res =3D persoColumnsParsed + "," +groupByColumns;
+ }
+ else //One of the two string at least is empty
+ {
+ res =3D persoColumnsParsed + groupByColumns;
+ }
+ =20
+ Logger.Log("buildColumnsForReport: " + res,LogLevel.Trace);
+ =20
+ return res;
+ }
+ =20
+ ///<summary>
/// A order string is received from the web page in this format:
/// idAtt0 | 0 or 1,idAtt1 | 0 or 1 etc...
/// We have to add the queue to each where condition (1|0 or 0|0=
)
///</summary>
private string parseOrder(string order) =20
{
- =20
if(order=3D=3D"")
{
return ""; =20
@@ -578,11 +648,13 @@
receivedColumnsStr =3D Request["sendColumnsStr"];
receivedOrderStr =3D Request["sendOrderStr"];
receivedWhereStr =3D Request["sendWhereStr"];
+ receivedPersoColumnsStr =3D Request["sendPersoColumnsStr"]; =
=20
=20
Logger.Log("receivedClassId: " + receivedClassId, LogLevel.T=
race);
Logger.Log("receivedReportName: " + receivedReportName, LogL=
evel.Trace);
Logger.Log("receivedColumnsStr: " + receivedColumnsStr, LogL=
evel.Trace);
Logger.Log("receivedWhereStr: " + receivedWhereStr, LogLevel=
.Trace);
+ Logger.Log("receivedPersoColumnsStr " + receivedPersoColumns=
Str, LogLevel.Trace);
=20
int reportId =3D Convert.ToInt32(Request.QueryString["report=
Id"]);
Logger.Log("reportId: " + reportId, LogLevel.Trace);
Modified: humano2/trunk/web/builder/site/js/createreport.js
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=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/js/createreport.js 2005-05-19 21:06:59=
UTC (rev 1105)
+++ humano2/trunk/web/builder/site/js/createreport.js 2005-05-19 21:50:56=
UTC (rev 1106)
@@ -84,3 +84,20 @@
=20
return optionArray;
}
+
+function PersoColumnsGetSelect1Arr()
+{
+ var optionArray =3D new Array();
+
+ optionArray[0] =3D new Array();
+ optionArray[0]["value"] =3D "-1";
+ optionArray[0]["text"] =3D "--Nothing--";
+ optionArray[1] =3D new Array();
+ optionArray[1]["value"] =3D "1";
+ optionArray[1]["text"] =3D "Count";
+ optionArray[2] =3D new Array();
+ optionArray[2]["value"] =3D "2";
+ optionArray[2]["text"] =3D "Sum";
+ =20
+ return optionArray;
+}
Modified: humano2/trunk/web/builder/site/js/formreport.js
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=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/js/formreport.js 2005-05-19 21:06:59 U=
TC (rev 1105)
+++ humano2/trunk/web/builder/site/js/formreport.js 2005-05-19 21:50:56 U=
TC (rev 1106)
@@ -19,7 +19,7 @@
this.columns =3D columns;
this.where =3D where;
this.order =3D order;
-
+ =20
//alert("columns.length: " + columns.length);
=20
//Methods
@@ -86,7 +86,7 @@
this.UpdateAttributes(this.classId);
}
=20
-function FormUpdateSubmitAll(rightColumn,sort,filter)
+function FormUpdateSubmitAll(rightColumn,sort,filter,persoColumns)
{
//Get the ReportName
var reportNameInput =3D GetNodeByTagNameAndAttName("input","reportNa=
meInput")[0];
@@ -115,7 +115,7 @@
columnsStr +=3D sortedList.GetItem(i).GetValue() + ",";
}
//Remove the last coma
- columnsStr =3D "0," + columnsStr; //Don't forget 0!
+ columnsStr =3D columnsStr;=20
columnsStr =3D columnsStr.substring(0,columnsStr.length-1); =
=20
//alert("columnsStr:" + columnsStr);
=20
@@ -128,6 +128,8 @@
//alert("filter SelfRefName:" + filter.GetSelfRefName());
var whereStr =3D filter.ReturnValues();
=20
+ var persoColumnsStr =3D persoColumns.ReturnValues();
+ //alert("persoColumnsStr: " + persoColumnsStr);
//Update the submit all TD
var divSubmitAll =3D GetNodeByTagNameAndAttName("div","SubmitAll")[0=
];
//alert(divSubmitAll);
@@ -138,7 +140,8 @@
+"<input type=3D\"hidden\" name=3D\"sendReportName\" value=3D\""=
+ reportName + "\"></input>"
+"<input type=3D\"hidden\" name=3D\"sendColumnsStr\" value=3D\""=
+ columnsStr + "\"></input>"
+"<input type=3D\"hidden\" name=3D\"sendOrderStr\" value=3D\"" +=
orderStr + "\"></input>"
- +"<input type=3D\"hidden\" name=3D\"sendWhereStr\" value=3D\"" +=
whereStr + "\"></input>";
+ +"<input type=3D\"hidden\" name=3D\"sendWhereStr\" value=3D\"" +=
whereStr + "\"></input>"
+ +"<input type=3D\"hidden\" name=3D\"sendPersoColumnsStr\" value=3D=
\"" + persoColumnsStr + "\"></input>";
=20
//alert(divSubmitAll.innerHTML);
return true;
Modified: humano2/trunk/web/builder/site/xsl/createreport.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/createreport.xsl 2005-05-19 21:06:=
59 UTC (rev 1105)
+++ humano2/trunk/web/builder/site/xsl/createreport.xsl 2005-05-19 21:50:=
56 UTC (rev 1106)
@@ -122,6 +122,34 @@
</xsl:if>
=20
=20
+ //Personalized columns
+ var selectOption0ArrayPersoColumns =3D new Array();
+ var selectOption1ArrayPersoColumns =3D new Array();
+ var i=3D0;
+ <xsl:for-each select=3D"/report/reportDatas/reportParams/per=
soColumns/persoColumn">
+ selectOption0ArrayPersoColumns[i] =3D <xsl:value-of sel=
ect=3D"idAtt" />;
+ selectOption1ArrayPersoColumns[i] =3D <xsl:value-of sel=
ect=3D"op" />;
+ i++;
+ </xsl:for-each>
+ =20
+ <xsl:if test=3D"/report/reportDatas/classId!=3D''">
+ var InputLineParamsPersoColumns =3D
+ {
+ type: 'TWOSELECT', //For the moment
+ select0: AttribsGetSelect0Arr(formArray,<xsl:value-o=
f select=3D"/report/reportDatas/classId" />),
+ select1: PersoColumnsGetSelect1Arr(),
+ lineTitle: 'PersoCol',
+ input0: '',
+ PreselectedInput0: null,
+ PreselectedSelect0: selectOption0ArrayPersoColumns, =
//For the moment
+ PreselectedSelect1: selectOption1ArrayPersoColumns, =
//For the moment
+ refName: 'expandFormPersoColumns'
+ }
+ var InputLinePersoColumns =3D new InputLine(InputLinePar=
amsPersoColumns);
+ </xsl:if>
+ =20
+ =20
+ =20
function recargar()
{
<![CDATA[
@@ -308,19 +336,57 @@
</tr>
<!-- ######################## End filter=
s ######################################## -->
=20
+ <!--######################### Perso Colu=
mns ################################## -->
+ <tr>
+ <td colspan=3D"2">
+ <table width=3D"100%" border=3D"=
0" cellSpacing=3D"0" cellPadding=3D"0">
+ <tr>
+ <td width=3D"100%" colspan=3D=
"2" class=3D"lev1divider">
+ <div class=3D"lev1divide=
r"><IMG height=3D"9" src=3D"clear2x2.gif" width=3D"100%"/></div>
+ </td>
+ </tr>
+ <tr>
+ <td class=3D"lev1head" valig=
n=3D"top"><font size=3D"2">Personalized columns...</font></td>
+ </tr>
+ </table>
+ </td>
+ </tr>
+
+ <tr>
+ <td class=3D"smallgraytextnolink" co=
lspan=3D"2">
+ <table>
+ <tr>
+ <td>
+ <div id=3D"PersoColu=
mns">
+ </div>
+ </td>
+ </tr>
+ </table>
+ <script language=3D"Javascript">
+ var divPersoColumns =3D GetN=
odeByTagNameAndAttName("div","PersoColumns")[0];
+ var expandFormPersoColumns =3D=
new ExpandForm("expandFormPersoColumns",
+ =
divPersoColumns,
+ =
"Order",
+ =
InputLinePersoColumns);
+ </script>
+ </td>
+ </tr>
+ =20
+ <!--######################### END: Perso=
Columns ################################## -->
+ =20
<!-- ######################## Columns To=
Show ############################## -->
<tr>
<td colspan=3D"2">
- <table width=3D"100%" border=3D"0" cellSpacing=3D"0" cellPadding=
=3D"0">
- <tr>
- <td width=3D"100%" colspan=3D"2">
- <div class=3D"lev1divider"><IMG height=3D"9" src=3D"clear2x2.=
gif" width=3D"100%"/></div>
- </td>
- </tr>
- <tr>
- <td class=3D"lev1head" valign=3D"top"><font size=3D"2">Columns=
...</font></td>
- </tr>
- </table>
+ <table width=3D"100%" border=3D"=
0" cellSpacing=3D"0" cellPadding=3D"0">
+ <tr>
+ <td width=3D"100%" colspan=3D=
"2">
+ <div class=3D"lev1divide=
r"><IMG height=3D"9" src=3D"clear2x2.gif" width=3D"100%"/></div>
+ </td>
+ </tr>
+ <tr>
+ <td class=3D"lev1head" valig=
n=3D"top"><font size=3D"2">Columns...</font></td>
+ </tr>
+ </table>
</td>
</tr>
=20
@@ -397,16 +463,16 @@
<!--######################### Sort #####=
######################################### -->
<tr>
<td colspan=3D"2">
- <table width=3D"100%" border=3D"0" cellSpacing=3D"0" cellPadding=
=3D"0">
- <tr>
- <td width=3D"100%" colspan=3D"2" class=3D"lev1divider">
- <div class=3D"lev1divider"><IMG height=3D"9" src=3D"clear2x2.=
gif" width=3D"100%"/></div>
- </td>
- </tr>
- <tr>
- <td class=3D"lev1head" valign=3D"top"><font size=3D"2">Orden..=
.</font></td>
- </tr>
- </table>
+ <table width=3D"100%" border=3D"=
0" cellSpacing=3D"0" cellPadding=3D"0">
+ <tr>
+ <td width=3D"100%" colspan=3D=
"2" class=3D"lev1divider">
+ <div class=3D"lev1divide=
r"><IMG height=3D"9" src=3D"clear2x2.gif" width=3D"100%"/></div>
+ </td>
+ </tr>
+ <tr>
+ <td class=3D"lev1head" valig=
n=3D"top"><font size=3D"2">Orden...</font></td>
+ </tr>
+ </table>
</td>
</tr>
=20
@@ -426,11 +492,6 @@
=
divSort,
=
"Order",
=
InputLineOrders);
- =
=20
- =
var expandFormFilter =3D new ExpandForm( "expandFormFilter",
- =
divFilter,
- =
"Filter",
- =
InputLineFilters);
</script>
</td>
</tr>
@@ -451,28 +512,31 @@
</tr>
<tr>
<td class=3D"ContentAlt">
- <div id=3D"CrudButtons1">
- <input type=3D"submit">
- <xsl:attribute name=3D=
"value">
- <xsl:value-of se=
lect=3D"/report/reportDatas/saveName" />
- </xsl:attribute>
+ <div id=3D"CrudButtons1">
+ <input type=3D"submit">
+ <xsl:attribute name=3D"v=
alue">
+ <xsl:value-of select=
=3D"/report/reportDatas/saveName" />
+ </xsl:attribute>
+ <xsl:attribute name=3D"o=
nclick">
+ Form.UpdateSubmitAll=
(rightColumn,
+ =
expandFormSort,
+ =
expandFormFilter,
+ =
expandFormPersoColumns); //Don't forget to do the same in Form.UpdateHea=
der
+ </xsl:attribute>
+ </input>
+ </div>
+ </td>
+ <td>
+ <div id=3D"CrudButtons2">
+ <xsl:if test=3D"/report/repo=
rtDatas/displayDeleteButton=3D'true'" >
+ <input type=3D"submit" v=
alue=3D"Delete">
<xsl:attribute name=3D=
"onclick">
- Form.UpdateSubmi=
tAll(rightColumn,expandFormSort,expandFormFilter); //Don't forget to do t=
he same in Form.UpdateHeader
+ Form.DeleteRepor=
t(<xsl:value-of select=3D"/report/id" />);
</xsl:attribute>
</input>
- </div>
+ </xsl:if>
+ </div>
</td>
- <td>
- <div id=3D"CrudButtons2">
- <xsl:if test=3D"/report/=
reportDatas/displayDeleteButton=3D'true'" >
- <input type=3D"submi=
t" value=3D"Delete">
- <xsl:attribute n=
ame=3D"onclick">
- Form.DeleteR=
eport(<xsl:value-of select=3D"/report/id" />);
- </xsl:attribute>
- </input>
- </xsl:if>
- </div>
- </td>
</tr>
<!--######################### End:Button=
s ########################################## -->
</xsl:if>
|
|
From: <sv...@de...> - 2005-05-19 21:07:08
|
Author: svera
Date: 2005-05-19 17:06:59 -0400 (Thu, 19 May 2005)
New Revision: 1105
Modified:
humano2/trunk/web/builder/site/functionclasses.aspx.cs
Log:
* Fix som trouble with formtype
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-19 20:=
45:58 UTC (rev 1104)
+++ humano2/trunk/web/builder/site/functionclasses.aspx.cs 2005-05-19 21:=
06:59 UTC (rev 1105)
@@ -127,7 +127,8 @@
private string getForms()
{
adapter dbAdapter =3D userCred.CoreAdapter;
- DataTable DTForm =3D dbAdapter.GenerateViewTools(1200,"0,120=
3,1202,1201","1201|4|'CREATE'|0|0","","","",0);
+ string filtro =3D String.Format("1201|4|'CREATE'|0|0");
+ DataTable DTForm =3D dbAdapter.GenerateViewTools(1200,"0,120=
3,1202,1201","","","","",0);
=20
string xmlString =3D "";
=20
|
|
From: <sv...@de...> - 2005-05-19 20:46:06
|
Author: svera
Date: 2005-05-19 16:45:58 -0400 (Thu, 19 May 2005)
New Revision: 1104
Modified:
humano2/trunk/web/builder/site/formmanagement.aspx
humano2/trunk/web/builder/site/formmanagement.aspx.cs
humano2/trunk/web/builder/site/xsl/functionindex.xsl
Log:
* Fix some trouble
Modified: humano2/trunk/web/builder/site/formmanagement.aspx
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=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 2005-05-19 20:12:4=
4 UTC (rev 1103)
+++ humano2/trunk/web/builder/site/formmanagement.aspx 2005-05-19 20:45:5=
8 UTC (rev 1104)
@@ -16,7 +16,7 @@
</HEAD>
<body>
<form name=3D"formulario" action=3D"#" method=3D"post">
- <input type=3D"hidden" name=3D"newform" id=3D"newform" value=3D"0">=20
+ <input type=3D"hidden" name=3D"first" id=3D"first" value=3D"<% html_g=
etFirst(); %>">=20
<input type=3D"hidden" name=3D"opaction" id=3D"opaction" value=3D"<% =
html_getAction(); %>">
<input type=3D"hidden" name=3D"formid" id=3D"formid" value=3D"<% html=
_getFormId(); %>">
<table width=3D"600" border=3D"0">
@@ -99,10 +99,12 @@
<input type=3D"button" value=3D"RemoveAll" onclick=3D"=
leftColumn.EnableAll();rightColumn.RemoveAll();">
</td>
<td><select size=3D"1" id=3D"formType" name=3D"formType=
">
- <option value=3D"READ" selected>READ</option>
+ <% html_getOptionSelect(); %>
+ </select>
+ </td>
+ <!-- <option value=3D"READ" selected>READ</option>
<option value=3D"CREATE">CREATE</option>
- <option value=3D"UPDATE">UPDATE</option>
- </select></td>
+ <option value=3D"UPDATE">UPDATE</option> -->
</tr>
<tr>
<td> </td>
@@ -116,7 +118,7 @@
<tr>
<td>
<input type=3D"button" onclick=3D"fn_saveData(rightCol=
umn);" name=3D"btnSave" value=3D"<% html_getBtnSaveValue(); %>">
- <% html_getButtonDelete(); %>=09
+ <% html_getButtonDelete(); %>
</td>
<td></td>
<td></td>
@@ -155,4 +157,4 @@
</table>
</form>
</body>
-</HTML>
\ No newline at end of file
+</HTML>
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-05-19 20:1=
2:44 UTC (rev 1103)
+++ humano2/trunk/web/builder/site/formmanagement.aspx.cs 2005-05-19 20:4=
5:58 UTC (rev 1104)
@@ -27,7 +27,7 @@
string formAttrib =3D "";
string formType =3D "";
=09
-
+ int first =3D 0;
int ClassId =3D 0;
int formId =3D 0;
int action =3D 0;
@@ -43,7 +43,7 @@
{
=09
getRequestParam();
- if (ClassId > 0)
+ if (ClassId > 0 && action !=3D CNS_DELETE)
{
buildListAttrib(ClassId);
ClassName =3D getClassName(ClassId);
@@ -55,6 +55,8 @@
break;
case CNS_CREATE:
createDbForm();
+ action =3D CNS_UPDATE;
+ buildListAttribFromForm(ClassId,formId);
break;
case CNS_UPDATE:
if(formAttrib !=3D null)
@@ -65,6 +67,7 @@
break;
case CNS_DELETE:
deleteDbForm(formId);
+ clearFormsElement();
break;
default:
break;
@@ -95,6 +98,9 @@
#region my method
private void getRequestParam()
{
+ int modFormId =3D 0;
+ int modClassId =3D 0;
+
ClassId =3D Convert.ToInt32( Request["classId"]);
if (Convert.ToInt32( Request["newform"]) > 0)
newForm =3D false;
@@ -106,7 +112,26 @@
formType =3D Convert.ToString( Request["formType"]);
formAttrib =3D Convert.ToString( Request["LstAttrib"]);
formId =3D Convert.ToInt32( Request["formid"]);
+ modFormId =3D Convert.ToInt32( Request["modformid"]);
+ modClassId =3D Convert.ToInt32( Request["modClassId"]);
+ first =3D Convert.ToInt32( Request["first"]);
+ if (modFormId > 0 && modClassId > 0 && first =3D=3D 0)
+ {
+ action =3D CNS_UPDATE;
+ formId =3D modFormId;
+ ClassId =3D modClassId;
+ first =3D 1;
+ }
}
+ private void clearFormsElement()
+ {
+ formId =3D 0;
+ ClassId =3D 0;
+ ClassName =3D "";
+ formName =3D "";
+ first =3D 1;
+ action =3D CNS_NOTHING;
+ }
=09
private string getClassName(int classId)
{
@@ -130,7 +155,7 @@
{=20
if(action =3D=3D CNS_CREATE )
{
- userCred.CoreAdapter.CreateForm (1200,dt, userCred);
+ formId =3D userCred.CoreAdapter.CreateForm (1200,dt, userCred);
}
if (action =3D=3D CNS_UPDATE )
{
@@ -239,6 +264,45 @@
}
}
}
+ public void html_getOptionSelect()
+ {
+ string strHtml =3D "";
+
+ if( formType !=3D "")
+ {
+ }
+ if(formType =3D=3D "CREATE")
+ {
+ strHtml +=3D "<option selected value=3D\"CREATE\">CREATE</option>";
+ }
+ else
+ {
+ strHtml +=3D "<option value=3D\"CREATE\">CREATE</option>";
+ }
+ if(formType =3D=3D "READ")
+ {
+ strHtml +=3D "<option selected value=3D\"READ\">READ</option>";
+ }
+ else
+ {
+ strHtml +=3D "<option value=3D\"READ\">READ</option>";
+ }
+ if(formType =3D=3D "UPDATE")
+ {
+ strHtml +=3D "<option selected value=3D\"UPDATE\">UPDATE</option>";
+ }
+ else
+ {
+ strHtml +=3D "<option value=3D\"UPDATE\">UPDATE</option>";
+ }
+ Response.Write(strHtml);
+ }
+
+ public void html_getFirst()
+ {
+ Response.Write(first);
+ }
+
#endregion
#region html method
public void html_getAttrList(int val)
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-19 20:12=
:44 UTC (rev 1103)
+++ humano2/trunk/web/builder/site/xsl/functionindex.xsl 2005-05-19 20:45=
:58 UTC (rev 1104)
@@ -69,7 +69,7 @@
<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?formid=3D<xsl:value-of select=3D"id" />&=
amp;classId=3D<xsl:value-of select=3D"classId" />&opaction=3D2',
+ =
'formmanagement.aspx?modformid=3D<xsl:value-of select=3D"id" =
/>&modclassId=3D<xsl:value-of select=3D"classId" />',
=
'',
=
'img/webfxtree/view.jpeg');
formBranch.add(child_<xsl:value-of select=3D"id"=
/>);
|
|
From: <sv...@de...> - 2005-05-19 20:12:48
|
Author: marijn Date: 2005-05-19 16:12:44 -0400 (Thu, 19 May 2005) New Revision: 1103 Added: humano2/branches/fileupload/ Log: * Branching for file upload Copied: humano2/branches/fileupload (from rev 1102, humano2/trunk) |
|
From: <sv...@de...> - 2005-05-19 19:43:35
|
Author: svera
Date: 2005-05-19 15:43:24 -0400 (Thu, 19 May 2005)
New Revision: 1102
Modified:
humano2/trunk/web/builder/site/foldermanagement.aspx
humano2/trunk/web/builder/site/foldermanagement.aspx.cs
humano2/trunk/web/builder/site/js/fn_formsmng.js
humano2/trunk/web/builder/site/xsl/functionindex.xsl
Log:
* Fix some problem with folders
Modified: humano2/trunk/web/builder/site/foldermanagement.aspx
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=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 2005-05-19 18:55=
:38 UTC (rev 1101)
+++ humano2/trunk/web/builder/site/foldermanagement.aspx 2005-05-19 19:43=
:24 UTC (rev 1102)
@@ -20,6 +20,7 @@
<input type=3D"hidden" name=3D"folderid" id=3D"folderid" value=3D"<% =
html_getFolderId(); %>">
<input type=3D"hidden" name=3D"LstAttrib" id=3D"LstAttrib">
<input type=3D"hidden" name=3D"classId" id=3D"classId" value=3D"1400"=
>
+ <input type=3D"hidden" name=3D"first" id=3D"first" value=3D"<% html_g=
etFirst(); %>">
<table width=3D"600" border=3D"0">
<tr>
<td width=3D"131">
@@ -34,7 +35,7 @@
<div align=3D"right">* Folder Father :</div>
</td>
<td width=3D"459">
- <select name=3D"select" size=3D"1" name=3D"folderpar=
ent" id=3D"folderparent" onChange=3D"fn_setFolderParentId(this.options[th=
is.selectedIndex].value);">
+ <select name=3D"select" size=3D"1" id=3D"folderparen=
t" onChange=3D"fn_setFolderParentId(this.options[this.selectedIndex].valu=
e);">
<% html_getFolderParent();%>
</select>
<input type=3D"hidden" id=3D"folderparentid" name=3D=
"folderparentid" value=3D"<% html_getFolderParentId(); %>">
@@ -153,4 +154,4 @@
</table>
</form>
</body>
-</HTML>
+</HTML>
\ No newline at end of file
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-05-19 18=
:55:38 UTC (rev 1101)
+++ humano2/trunk/web/builder/site/foldermanagement.aspx.cs 2005-05-19 19=
:43:24 UTC (rev 1102)
@@ -15,6 +15,19 @@
=20
namespace Builder.site
{
+ public struct strct_folderNode
+ {
+ public int idNode;
+ public int idParent;
+ public bool isListable;
+
+ public strct_folderNode(int val1,int val2,bool lst)
+ {
+ this.idNode =3D val1;
+ this.idParent =3D val2;
+ this.isListable =3D lst;
+ }
+ };
/// <summary>
/// Summary description for FormManagement.
/// </summary>
@@ -27,10 +40,12 @@
string folderForms =3D "";
string formType =3D "";
string folderParentId =3D "";
+ string htmlMsgError =3D "";
int ClassId =3D 0;
int folderId =3D 0;
int action =3D 0;
int countElement =3D 1;
+ int first =3D 0;
=20
bool newForm =3D true;
=09
@@ -54,16 +69,22 @@
break;
case CNS_CREATE:
createDbFolder();
+ action =3D CNS_UPDATE;
+ buildListAttribFromFolder(ClassId,folderId,domainId);
break;
case CNS_UPDATE:
if(folderForms !=3D null)
{
- createDbFolder();=09
+ if (checkDataForUpdate(domainId) =3D=3D true)
+ {
+ createDbFolder();=09
+ }
}
buildListAttribFromFolder(ClassId,folderId,domainId);
break;
case CNS_DELETE:
deleteDbFolder(folderId);
+ clearFormData();
break;
default:
break;
@@ -94,6 +115,8 @@
#region my method
private void getRequestParam()
{
+ int modFolderId =3D 0;
+
ClassId =3D Convert.ToInt32( Request["classId"]);
if (Convert.ToInt32( Request["newform"]) > 0)
newForm =3D false;
@@ -106,8 +129,25 @@
folderForms =3D Convert.ToString( Request["LstAttrib"]);
folderId =3D Convert.ToInt32( Request["folderid"]);
folderParentId =3D Convert.ToString( Request["folderparentid"]);
+ modFolderId =3D Convert.ToInt32(Request["modfolderid"]);
+ first =3D Convert.ToInt32(Request["first"]);
+ if (modFolderId > 0 && first =3D=3D 0)
+ {
+ first =3D 1;
+ folderId =3D modFolderId;
+ }
+ if(folderId > 0 && action =3D=3D 0)
+ {
+ action =3D CNS_UPDATE;
+ }
}
-
+ private void clearFormData()
+ {
+ action =3D CNS_NOTHING;
+ folderForms =3D "";
+ folderName =3D "";
+ folderId =3D 0;
+ }
private void createDbFolder()
{
DataTable dt =3D genDataTbl();
@@ -116,7 +156,7 @@
{=20
if(action =3D=3D CNS_CREATE )
{
- userCred.CoreAdapter.CreateForm (1400,dt, userCred);
+ folderId =3D userCred.CoreAdapter.CreateForm (1400,dt, userCred);
}
if (action =3D=3D CNS_UPDATE )
{
@@ -132,10 +172,7 @@
=20
private void UpdateDbFolder(int folderId, DataTable dt,SessionCredenci=
al userCred)
{
- if(action =3D=3D CNS_UPDATE )
- {
- userCred.CoreAdapter.UpdateInstance (folderId,dt, userCred);
- }
+ userCred.CoreAdapter.UpdateInstance (folderId,dt, userCred);
}
=20
private DataTable genDataTbl()
@@ -339,6 +376,35 @@
}
dtResult =3D null;
}
+ private bool checkDataForUpdate(int domainId)
+ {
+ bool retVal =3D false;
+ retVal =3D true;
+ return retVal;
+ }
+
+ private ArrayList getListFolderChilds(int domainId)
+ {
+ int row =3D 0;
+ int pos =3D 0;
+ ArrayList myList =3D new ArrayList();
+ strct_folderNode folderNodes =3D new strct_folderNode(0,0,true);
+
+ string filtro =3D String.Format("1402|2|'0'|1|0;34|4|'{0}'|0|0",domai=
nId);
+ DataTable dtResult =3D userCred.CoreAdapter.GenerateViewTools(1400,"0=
, 1402",filtro,"","","",0);
+ if(dtResult.Rows.Count =3D=3D 0)
+ {
+ return null;
+ }
+ foreach (DataRow dr in dtResult.Rows )
+ {
+ folderNodes.idNode =3D Convert.ToInt32(dr["id_entity"]);
+ folderNodes.idParent =3D Convert.ToInt32(dr["folderParent"]);
+ myList.Add(folderNodes);
+ }
+ return myList;
+ }
+
#endregion
#region html method
public void html_getAttrList(int val)
@@ -387,8 +453,13 @@
}
public void html_getFolderId()
{
- Response.Write(folderId);
+ Response.Write(folderId);
}
+ public void html_getFirst()
+ {
+ Response.Write(first);
+ }
+
public void html_getButtonDelete()
{
string strHtml =3D "<input type=3D\"button\" id=3D\"btnDelete\" ";
@@ -404,13 +475,17 @@
{
int domainId =3D userCred.DomainIds[userCred.CurrentDomainIndex];
string strHtml =3D "";
+ ArrayList arrFolder =3D null;
=09
- if(action =3D=3D CNS_CREATE)
+ if(action =3D=3D CNS_CREATE && action =3D=3D CNS_NOTHING)
{
strHtml =3D String.Format("<option value=3D\"0\" selected>---No Fold=
er---</option>");
- }else{
+ }
+ else
+ {
strHtml =3D String.Format("<option value=3D\"0\">---No Folder---</op=
tion>");
}
+
DataTable dtResult =3D getListFolder(domainId);
if (dtResult =3D=3D null)
{
@@ -418,29 +493,63 @@
return;
}
=20
+ arrFolder =3D getListFolderChilds(domainId);
foreach(DataRow row in dtResult.Rows)
{
- if(folderParentId !=3D null && folderParentId.Length > 0)
+ strHtml +=3D getNextOptionFolder(row,arrFolder,folderId);
+ }
+ Response.Write(strHtml);
+ }
+
+ private string getNextOptionFolder(DataRow row, ArrayList arrFolder, i=
nt folderId)
+ {
+ string strHtml =3D "";
+ int flag =3D 0;
+ =09
+ int id_entity =3D Convert.ToInt32(row["id_entity"]);
+ =09
+ if(folderId =3D=3D id_entity)
+ {
+ return strHtml;
+ }
+ if (arrFolder !=3D null)
+ {
+ for(int pos =3D 0;pos < arrFolder.Count;pos++)
{
- if(Convert.ToInt32(folderParentId) =3D=3D Convert.ToInt32(row["id_e=
ntity"]))
+ if (((strct_folderNode)arrFolder[pos]).idParent =3D=3D folderId)
{
- strHtml +=3D String.Format("<option value=3D\"{0}\" selected>{1}</=
option>",row["id_entity"],row[1]);
+ //((strct_folderNode)arrFolder[pos]).isListable. =3D false;
+ flag =3D 1;
}
- else
+ }
+ }
+ if(folderParentId !=3D null && folderParentId.Length > 0)
+ {
+ if(Convert.ToInt32(folderParentId) =3D=3D id_entity)
+ {
+ if(flag =3D=3D 0)
{
- strHtml +=3D String.Format("<option value=3D\"{0}\">{1}</option>",=
row["id_entity"],row[1]);
+ strHtml =3D String.Format("<option value=3D\"{0}\" selected>{1}</o=
ption>",row["id_entity"],row[1]);
+ return strHtml;
}
- }else{
- strHtml +=3D String.Format("<option value=3D\"{0}\">{1}</option>",r=
ow["id_entity"],row[1]);
}
}
- Response.Write(strHtml);
+ if(flag =3D=3D 0)
+ {
+ strHtml +=3D String.Format("<option value=3D\"{0}\">{1}</option>",ro=
w["id_entity"],row[1]);
+ }
+ return strHtml;
+ }
=20
- }
public void html_getFolderParentId()
{
Response.Write("0");
}
+ public void html_sendMessage()
+ {
+ Response.Write(htmlMsgError);
+ }
+
#endregion=20
}
}
\ No newline at end of file
Modified: humano2/trunk/web/builder/site/js/fn_formsmng.js
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=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/js/fn_formsmng.js 2005-05-19 18:55:38 =
UTC (rev 1101)
+++ humano2/trunk/web/builder/site/js/fn_formsmng.js 2005-05-19 19:43:24 =
UTC (rev 1102)
@@ -64,15 +64,21 @@
//******************************************************************=
********************=20
function fn_deleteData()
{
- var frm =3D document.formulario;
- var strError =3D "";
+ //var frm =3D document.formulario;
+ //var strError =3D "";
=20
//alert("Antes :: " + document.formulario.opAction.value);
- document.formulario.opAction.setAttribute("value",3);
+ document.formulario.opaction.setAttribute("value",3);// =3D 3; /=
/value",3);
=20
- //alert("Despues :: " + document.formulario.opAction.value);
+ //alert("Despues :: " + document.formulario.opaction.value);
+ //document.formulario.submit();
+ =20
+ //var folderId =3D document.formulario.folderid.value;
+ //var url[] =3D String(document.location).split("?");
+ =20
+ //alert(document.formulario.opaction.value);
+ //document.location =3D "foldermanagement.aspx?opaction=3D3&fold=
erId=3D" + folderId;=20
document.formulario.submit();
- =20
}
=20
//******************************************************************=
********************=20
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-19 18:55=
:38 UTC (rev 1101)
+++ humano2/trunk/web/builder/site/xsl/functionindex.xsl 2005-05-19 19:43=
:24 UTC (rev 1102)
@@ -59,7 +59,7 @@
tree.add(folderBranch);
<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';
+ var contentLink =3D 'foldermanagement.aspx?modfo=
lderId=3D<xsl:value-of select=3D"id" />';
folderBranch.add(new WebFXTreeItem(titleLink,con=
tentLink,'','img/webfxtree/view.jpeg'));
</xsl:for-each>
=20
|
Author: pcamacho
Date: 2005-05-19 14:55:38 -0400 (Thu, 19 May 2005)
New Revision: 1101
Added:
humano2/trunk/web/builder/site/css/createreport.css
humano2/trunk/web/builder/site/html/createreportok.html
humano2/trunk/web/builder/site/html/deletereportok.html
humano2/trunk/web/builder/site/html/updatereportok.html
humano2/trunk/web/builder/site/js/createreport.js
Modified:
humano2/trunk/components/webTools/basePage.cs
humano2/trunk/web/builder/site/createreport.aspx.cs
humano2/trunk/web/builder/site/js/formreport.js
humano2/trunk/web/builder/site/js/grafcomponents/expandformreport.js
humano2/trunk/web/builder/site/xsl/createreport.xsl
Log:
ADD: warning messages for report (create, update, delete).
FIX: a bug in the creation of report when the where and order conditions =
were empty.
MISC: delete of unuseful code.
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-05-19 18:45:33 UTC=
(rev 1100)
+++ humano2/trunk/components/webTools/basePage.cs 2005-05-19 18:55:38 UTC=
(rev 1101)
@@ -32,7 +32,10 @@
{
CREATEVIEWOK,
DELETEVIEWOK,
- UPDATEVIEWOK
+ UPDATEVIEWOK,
+ CREATEREPORTOK,
+ DELETEREPORTOK,
+ UPDATEREPORTOK
} =20
=20
public basePage()
@@ -140,7 +143,19 @@
case UserMessage.CREATEVIEWOK:
messagePage =3D "createviewok.html";
break;
+ =20
+ case UserMessage.DELETEREPORTOK:
+ messagePage =3D "deletereportok.html";
+ break;
=20
+ case UserMessage.UPDATEREPORTOK:
+ messagePage =3D "updatereportok.html";
+ break;
+ =20
+ case UserMessage.CREATEREPORTOK:
+ messagePage =3D "createreportok.html";
+ break;
+ =20
default:
messagePage =3D "noexistingmessage.html";
break;
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-19 18:45:=
33 UTC (rev 1100)
+++ humano2/trunk/web/builder/site/createreport.aspx.cs 2005-05-19 18:55:=
38 UTC (rev 1101)
@@ -383,7 +383,7 @@
{
Logger.Log("deleteReport called", LogLevel.Trace);
userCred.CoreAdapter.DeleteInstance(reportId, userCred);
- sendMessageToUser(UserMessage.DELETEVIEWOK);
+ sendMessageToUser(UserMessage.DELETEREPORTOK);
this.MyRedirect();
return;
}
@@ -445,6 +445,12 @@
///</summary>
private string parseOrder(string order) =20
{
+ =20
+ if(order=3D=3D"")
+ {
+ return ""; =20
+ }
+ =20
string res =3D "";
string [] orderSplit =3D order.Split((";").ToCharArray()); /=
/First get the lines
=20
@@ -478,6 +484,12 @@
///</summary>
private string parseWhere(string where) =20
{
+
+ if(where=3D=3D"") //Nothing to do
+ {
+ return "";
+ }
+ =20
string res =3D "";
string [] whereSplit =3D where.Split((";").ToCharArray()); /=
/First get the lines
=20
@@ -584,14 +596,14 @@
//Response.Write("Create");
Logger.Log("Creation of report",LogLevel.Trace);
userCred.CoreAdapter.CreateReport(reportTable, userC=
red);
- sendMessageToUser(UserMessage.CREATEVIEWOK); //Chang=
e
+ sendMessageToUser(UserMessage.CREATEREPORTOK); //Cha=
nge
}
else=20
{
//Response.Write("Update");
Logger.Log("Update of report",LogLevel.Trace);
userCred.CoreAdapter.UpdateInstance(reportId, report=
Table, userCred);
- sendMessageToUser(UserMessage.UPDATEVIEWOK); //Chang=
e
+ sendMessageToUser(UserMessage.UPDATEREPORTOK); //Cha=
nge
}
}=09
this.MyRedirect();
Added: humano2/trunk/web/builder/site/css/createreport.css
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=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/css/createreport.css 2005-05-19 18:45:=
33 UTC (rev 1100)
+++ humano2/trunk/web/builder/site/css/createreport.css 2005-05-19 18:55:=
38 UTC (rev 1101)
@@ -0,0 +1,39 @@
+.s { font-family: Verdana, Arial, Helvetica, sans-serif; color: #000000=
; font-size:10pt}
+
+DIV.lev1divider {
+ MARGIN: 10px 0px 5px; BACKGROUND-COLOR: #417096
+}
+TD.lev2divider {
+ PADDING-RIGHT: 0px; PADDING-LEFT: 0px; PADDING-BOTTOM: 5px; PADDING-TOP=
: 10px
+}
+TD.lev1head {
+ PADDING-RIGHT: 5px; PADDING-LEFT: 0px; FONT-WEIGHT: bold; FONT-SIZE: 90=
%; PADDING-BOTTOM: 0px; COLOR: #417096; PADDING-TOP: 0px; FONT-FAMILY: ar=
ial
+}
+TD.lev1choices {
+ PADDING-RIGHT: 0px; PADDING-LEFT: 0px; FONT-SIZE: 70%; PADDING-BOTTOM: =
0px; COLOR: #444444; PADDING-TOP: 0px; FONT-FAMILY: verdana
+}
+TD.lev1 {
+ BACKGROUND-COLOR: #c6c6c6
+}
+TD.lev2 {
+ PADDING-RIGHT: 10px; PADDING-LEFT: 10px; PADDING-BOTTOM: 10px
+}
+TABLE.lev0 {
+=09
+}
+TD.lev0 {
+=09
+}
+TD.vtypeSect {
+ PADDING-RIGHT: 5px; PADDING-LEFT: 5px; FONT-WEIGHT: bold; FONT-SIZE: 80=
%; PADDING-BOTTOM: 15px; COLOR: #333333; PADDING-TOP: 15px; FONT-FAMILY: =
arial
+}
+TD.smallBlue {
+ FONT-WEIGHT: bold; FONT-SIZE: 70%; COLOR: #417096; FONT-FAMILY: verdana
+}
+TD.largeBlue {
+ FONT-WEIGHT: bold; FONT-SIZE: 90%; COLOR: #417096; FONT-FAMILY: arial
+}
+TD.butbar {
+ PADDING-RIGHT: 5px; PADDING-LEFT: 15px; PADDING-BOTTOM: 5px; PADDING-TO=
P: 5px
+} =09
+
Added: humano2/trunk/web/builder/site/html/createreportok.html
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=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/html/createreportok.html 2005-05-19 18=
:45:33 UTC (rev 1100)
+++ humano2/trunk/web/builder/site/html/createreportok.html 2005-05-19 18=
:55:38 UTC (rev 1101)
@@ -0,0 +1,18 @@
+<html>
+ <head>
+ <link href=3D"css/left.css" rel=3D"stylesheet" type=3D"text/css"=
/>=09
+ <script language=3D"javascript">
+ function reloadlist()
+ {
+ self.parent.frames[1].location =3D "../functionclasses.aspx";
+ }
+ </script>
+ </head>
+ <body onload=3D"reloadlist()">
+ <center>
+ <span class=3D"message">
+ The report was successfully created.
+ </span>
+ </center>
+ </body>
+</html>
Added: humano2/trunk/web/builder/site/html/deletereportok.html
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=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/html/deletereportok.html 2005-05-19 18=
:45:33 UTC (rev 1100)
+++ humano2/trunk/web/builder/site/html/deletereportok.html 2005-05-19 18=
:55:38 UTC (rev 1101)
@@ -0,0 +1,18 @@
+<html>
+ <head>
+ <link href=3D"css/left.css" rel=3D"stylesheet" type=3D"text/css"=
/>=09
+ <script language=3D"javascript">
+ function reloadlist()
+ {
+ self.parent.frames[1].location =3D "../functionclasses.aspx";
+ }
+ </script>
+ </head>
+ <body onload=3D"reloadlist()">
+ <center>
+ <span class=3D"message">
+ The report was successfully deleted.
+ </span>
+ </center>
+ </body>
+</html>
Added: humano2/trunk/web/builder/site/html/updatereportok.html
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=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/html/updatereportok.html 2005-05-19 18=
:45:33 UTC (rev 1100)
+++ humano2/trunk/web/builder/site/html/updatereportok.html 2005-05-19 18=
:55:38 UTC (rev 1101)
@@ -0,0 +1,18 @@
+<html>
+ <head>
+ <link href=3D"css/left.css" rel=3D"stylesheet" type=3D"text/css"=
/>=09
+ <script language=3D"javascript">
+ function reloadlist()
+ {
+ self.parent.frames[1].location =3D "../functionclasses.aspx";
+ }
+ </script>
+ </head>
+ <body onload=3D"reloadlist()">
+ <center>
+ <span class=3D"message">
+ The report was successfully updated.
+ </span>
+ </center>
+ </body>
+</html>
Added: humano2/trunk/web/builder/site/js/createreport.js
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=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/js/createreport.js 2005-05-19 18:45:33=
UTC (rev 1100)
+++ humano2/trunk/web/builder/site/js/createreport.js 2005-05-19 18:55:38=
UTC (rev 1101)
@@ -0,0 +1,86 @@
+//
+// The Humano2 Business solution.
+// Copyright (C) 2004,5 Humano2 Chile S.A. (http://www.humano2.com)
+//
+// This program is free software; you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation; either version 2 of the License, or
+// (at your option) any later version. =20
+//
+//
+
+
+function AttribsGetSelect0Arr(formArray,classId)
+{
+ var lengthArray =3D formArray[classId].length;
+ //alert("lengthArray: " + lengthArray);
+
+ var optionArray =3D new Array();
+ optionArray[0] =3D new Array();
+ optionArray[0]["value"] =3D "-1";
+ optionArray[0]["text"] =3D "--Nothing--"
+ for (var i =3D 0; i < lengthArray ;i++)=20
+ {
+ optionArray[i+1] =3D new Array(); //Begin to second element
+ optionArray[i+1]["value"] =3D formArray[classId][i]["value"];
+ optionArray[i+1]["text"] =3D formArray[classId][i]["name"];
+ }
+ =20
+ return optionArray;
+} =20
+
+function FilterGetSelect1Arr()
+{
+ var optionArray =3D new Array();
+ =20
+ optionArray[0] =3D new Array();
+ optionArray[0]["value"] =3D "-1";
+ optionArray[0]["text"] =3D "--Nothing--";
+ optionArray[1] =3D new Array();
+ optionArray[1]["value"] =3D "0";
+ optionArray[1]["text"] =3D "GreaterOrEqualThan";
+ optionArray[2] =3D new Array();
+ optionArray[2]["value"] =3D "1";
+ optionArray[2]["text"] =3D "LessEqualThan";
+ optionArray[3] =3D new Array();
+ optionArray[3]["value"] =3D "2";
+ optionArray[3]["text"] =3D "GreaterThan";
+ optionArray[4] =3D new Array();
+ optionArray[4]["value"] =3D "3";
+ optionArray[4]["text"] =3D "LessThan";
+ optionArray[5] =3D new Array();
+ optionArray[5]["value"] =3D "4";
+ optionArray[5]["text"] =3D "EqualTo";
+ optionArray[6] =3D new Array();
+ optionArray[6]["value"] =3D "5";
+ optionArray[6]["text"] =3D "DistinctTo";
+ optionArray[7] =3D new Array();
+ optionArray[7]["value"] =3D "6";
+ optionArray[7]["text"] =3D "BeginWith";
+ optionArray[8] =3D new Array();
+ optionArray[8]["value"] =3D "7";
+ optionArray[8]["text"] =3D "ContainsTo";
+ optionArray[9] =3D new Array();
+ optionArray[9]["value"] =3D "8";
+ optionArray[9]["text"] =3D "In";
+ =20
+ return optionArray;
+}
+
+
+function OrderGetSelect1Arr()
+{
+ var optionArray =3D new Array();
+ =20
+ optionArray[0] =3D new Array();
+ optionArray[0]["value"] =3D "-1";
+ optionArray[0]["text"] =3D "--Nothing--";
+ optionArray[1] =3D new Array();
+ optionArray[1]["value"] =3D "0";
+ optionArray[1]["text"] =3D "Asc";
+ optionArray[2] =3D new Array();
+ optionArray[2]["value"] =3D "1";
+ optionArray[2]["text"] =3D "Desc";
+ =20
+ return optionArray;
+}
Modified: humano2/trunk/web/builder/site/js/formreport.js
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=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/js/formreport.js 2005-05-19 18:45:33 U=
TC (rev 1100)
+++ humano2/trunk/web/builder/site/js/formreport.js 2005-05-19 18:55:38 U=
TC (rev 1101)
@@ -11,32 +11,6 @@
//
*/
=20
-
-/**
- * When you choose a class you have to update the buttons Crud
- */
-function UpdateHeader()
-{
- //Update crudbuttons =20
- var crudTag1 =3D GetNodeByTagNameAndAttName("div","CrudButtons1")[0]=
;
- =20
- crudTag1.innerHTML=3D
- "<input type=3D\"submit\" value=3D\"Create\" onclick=3D=
\"Form.UpdateSubmitAll(rightColumn,expandFormSort,expandFormFilter);\">"
- + "</input>";
- =20
- var crudTag2 =3D GetNodeByTagNameAndAttName("div","CrudButtons2")[0]=
;
- //alert("crudTag2: " + crudTag2);
- crudTag2.innerHTML =3D ""; //No delete button
- =20
- =20
- //update input reportname =20
- var reportNameDiv =3D GetNodeByTagNameAndAttName("div","ReportName")=
[0];
- reportNameDiv.innerHTML =3D=20
- "<input type=3D\"text\" id=3D \"reportNameInput\" name=3D\"r=
eportNameInput\">"
- +"</input>";
-}
-
-
//////////////////////////////////////////////ReportParams Class ///////=
////////////////////////////////////////////////
function ReportParams(columns,where,order)
{
@@ -106,10 +80,6 @@
this.SetToDefault =3D FormSetToDefault;
this.UpdateSubmitAll =3D FormUpdateSubmitAll;
this.DeleteReport =3D FormDeleteReport;
- this.GetSortArray =3D FormGetSortArray;
- //this.GetFilterArray =3D FormGetFilterArray;
- this.UpdateSort =3D FormUpdateSort;
- this.UpdateFilter =3D FormUpdateFilter;
this.GetNameOfAttribute =3D FormGetNameOfAttribute;
=20
//Update the attributes
@@ -230,113 +200,6 @@
this.UpdateLists(left,right,this.classId); =20
}
=20
-function FormGetSortArray(number)
-{
- var optionArray =3D new Array();
- =20
- if(number =3D=3D 1) // The attributes
- {
- var lengthArray =3D this.formArray[this.classId].length;
- //alert("lengthArray: " + lengthArray);
- =20
- optionArray[0] =3D new Array(); //Begin to second element
- optionArray[0]["value"] =3D "-1";
- optionArray[0]["text"] =3D "--Nothing--";
- =20
- for (var i =3D 0; i < lengthArray ;i++)
- {
- optionArray[i+1] =3D new Array(); //Begin to second element
- optionArray[i+1]["value"] =3D this.formArray[this.classId][i=
]["value"];
- optionArray[i+1]["text"] =3D this.formArray[this.classId][i=
]["name"];
- }
- }
- else // Asc Desc etc...
- {
- optionArray[0] =3D new Array();
- optionArray[0]["value"] =3D "-1";
- optionArray[0]["text"] =3D "--Nothing--";
- optionArray[1] =3D new Array();
- optionArray[1]["value"] =3D "0";
- optionArray[1]["text"] =3D "Ascendent";
- optionArray[2] =3D new Array();
- optionArray[2]["value"] =3D "1";
- optionArray[2]["text"] =3D "Descendent";
- }
- return optionArray;
-}
-
-/*
-function FormGetFilterArray(number)
-{
- var optionArray =3D new Array();
- =20
- if(number =3D=3D 1) // The attributes (as for sort)
- {
- var lengthArray =3D this.formArray[this.classId].length;
- //alert("lengthArray: " + lengthArray);
- =20
- optionArray[0] =3D new Array();
- optionArray[0]["value"] =3D "-1";
- optionArray[0]["text"] =3D "--Nothing--"
- for (var i =3D 0; i < lengthArray ;i++)=20
- {
- optionArray[i+1] =3D new Array(); //Begin to second element
- optionArray[i+1]["value"] =3D this.formArray[this.classId][i=
]["value"];
- optionArray[i+1]["text"] =3D this.formArray[this.classId][i=
]["name"];
- }
- }
- else // Asc Desc etc...
- {
- optionArray[0] =3D new Array();
- optionArray[0]["value"] =3D "-1";
- optionArray[0]["text"] =3D "--Nothing--";
- optionArray[1] =3D new Array();
- optionArray[1]["value"] =3D "0";
- optionArray[1]["text"] =3D "GreaterOrEqualThan";
- optionArray[2] =3D new Array();
- optionArray[2]["value"] =3D "1";
- optionArray[2]["text"] =3D "LessEqualThan";
- optionArray[3] =3D new Array();
- optionArray[3]["value"] =3D "2";
- optionArray[3]["text"] =3D "GreaterThan";
- optionArray[4] =3D new Array();
- optionArray[4]["value"] =3D "3";
- optionArray[4]["text"] =3D "LessThan";
- optionArray[5] =3D new Array();
- optionArray[5]["value"] =3D "4";
- optionArray[5]["text"] =3D "EqualTo";
- optionArray[6] =3D new Array();
- optionArray[6]["value"] =3D "5";
- optionArray[6]["text"] =3D "DistinctTo";
- optionArray[7] =3D new Array();
- optionArray[7]["value"] =3D "6";
- optionArray[7]["text"] =3D "BeginWith";
- optionArray[8] =3D new Array();
- optionArray[8]["value"] =3D "7";
- optionArray[8]["text"] =3D "ContainsTo";
- optionArray[9] =3D new Array();
- optionArray[9]["value"] =3D "8";
- optionArray[9]["text"] =3D "In";
- =20
- }
- =20
- return optionArray;
-}
-
-*/
-
-function FormUpdateSort(sort,classId)
-{
- this.classId =3D classId;
- sort.Update(this.GetSortArray(1),this.GetSortArray(2)); //TODO: sort=
doesn't work yet
-}
-
-function FormUpdateFilter(filter,classId)
-{
- this.classId =3D classId;
- filter.Update(this.GetFilterArray(1),this.GetFilterArray(2)); =20
-}
-
function FormUpdateAttributes(classId)
{
//alert(classId);
Modified: humano2/trunk/web/builder/site/js/grafcomponents/expandformrepo=
rt.js
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=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/js/grafcomponents/expandformreport.js =
2005-05-19 18:45:33 UTC (rev 1100)
+++ humano2/trunk/web/builder/site/js/grafcomponents/expandformreport.js =
2005-05-19 18:55:38 UTC (rev 1101)
@@ -12,60 +12,6 @@
=20
/**
* Constructor
- * class used to build an expand form with predeterminated values
- * @param selectedOption1Array the options selected for select tag #1
- * @param selectedOption2Array the options selected for select tag #2
- * @param inputTagValuesArray the input values
- */
-function InputValues(selectOption1Array,selectOption2Array,inputTagValue=
sArray)
-{
- //Fields
- this.selectOption1 =3D CopyArray(selectOption1Array);
- this.selectOption2 =3D CopyArray(selectOption2Array);
- this.inputTagValuesArray =3D CopyArray(inputTagValuesArray);
- =20
- //Methods
- this.GetTriplet =3D InputValuesGetTriplet; =20
- this.Size =3D InputValuesSize;
- =20
- if((this.selectOption1 !=3D null) &&=20
- (this.selectOption2 !=3D null))
- {
- return this; =20
- }
- else=20
- return null; =20
-}
- =20
-/**
- * @param index the index used for the free fields array of class
- * @returns a triplet (selected option 1, selected option2, input)
- */ =20
-function InputValuesGetTriplet(index)
-{
- var triplet =3D new Array();
- triplet["option1"] =3D this.selectOption1[index];
- triplet["option2"] =3D this.selectOption2[index];
- //alert("this.inputTagValuesArray: " + this.inputTagValuesArray);
- if(this.inputTagValuesArray !=3D null) //Only if there's a text of c=
ourse
- {
- triplet["input"] =3D this.inputTagValuesArray[index];
- }
- //alert("triplet[\"option1\"]:" + triplet["option1"] + " triplet[\"o=
ption2\"]: " + triplet["option2"] + "triplet[\"input\"]: " + triplet["inp=
ut"]);
- return triplet;
-}
-
-/**
- * @return size of one
- */
-function InputValuesSize()
-{
- //Whatever array minus the input one that may be empty
- return this.selectOption1.length; =20
-}
-
-/**
- * Constructor
* @param line object that contains the fields to display for each line =
and that also contains preselected values
*/
function ExpandForm(selfRefName,receptorNode,title,inputLine)
@@ -138,7 +84,7 @@
var divWithLines =3D GetNodeByTagNameAndAttName("div",this.selfRefNa=
me)[0]; //Unique id in the document as every
=
// graphical components should have unique identificator
var node =3D divWithLines.firstChild;
- alert("divWithLines.firstChild.childNodes.length: " + divWithLines.f=
irstChild.childNodes.length);
+ //alert("divWithLines.firstChild.childNodes.length: " + divWithLines=
.firstChild.childNodes.length);
//alert("divWithLines.firstChild.innerHTML: " + divWithLines.firstCh=
ild.innerHTML)
while(node !=3D null)
{
@@ -152,12 +98,12 @@
{
if(this.inputLine.type =3D=3D 'TWOSELECTANDINPUT')
{
- alert("divFirstSelect:" + divFirstSelect);
+ //alert("divFirstSelect:" + divFirstSelect);
res +=3D divFirstSelect.value + "|";
- alert("divSecondSelect:" + divSecondSelect);
+ //alert("divSecondSelect:" + divSecondSelect);
res +=3D divSecondSelect.value + "|";
var divInput =3D divSecondSelect.nextSibling;
- alert("divInput:" + divInput);
+ //alert("divInput:" + divInput);
res +=3D "\'" + divInput.value + "\'";
}
=20
@@ -175,7 +121,7 @@
=20
res =3D res.substring(0,res.length-1);//remove last ;
=20
- alert("res:" + res);
+ //alert("res:" + res);
return res;
}
=20
Modified: humano2/trunk/web/builder/site/xsl/createreport.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/createreport.xsl 2005-05-19 18:45:=
33 UTC (rev 1100)
+++ humano2/trunk/web/builder/site/xsl/createreport.xsl 2005-05-19 18:55:=
38 UTC (rev 1101)
@@ -21,325 +21,207 @@
<script language=3D"Javascript" src=3D"js/grafcomponents/exp=
andformreport.js"></script>
<!-- Load this script before the next one -->
<script language=3D"Javascript" src=3D"js/formreport.js" typ=
e=3D"text/javascript"></script>=20
+ <script language=3D"Javascript" src=3D"js/createreport.js" t=
ype=3D"text/javascript"></script>=20
<link href=3D"styles/css/general_styles_verde.css" rel=3D"st=
ylesheet" type=3D"text/css"></link>
+ <link href=3D"css/createreport.css" rel=3D"stylesheet" type=3D=
"text/css"></link>
</head>
=09
- <!-- Here we create an array and use it as parameter for For=
m class constructor -->
- <script language=3D"Javascript">
- =20
- //////////////////////
- //The report params
- =20
- //Columns
- var reportColumnsArray =3D new Array();
- var i=3D0;
- <xsl:for-each select=3D"/report/reportDatas/reportParams=
/columns/column">
- reportColumnsArray[i++] =3D "<xsl:value-of select=3D=
"." />";
- </xsl:for-each>
- //alert(reportColumnsArray.length);
- var ReportParams =3D new ReportParams(reportColumnsArray=
,null,null);
- =20
- ////////////////////////
- //The form
- var formArray =3D new Array();
- var i; //Counter
- =20
- <xsl:for-each select=3D"/report/classes/class[count(attr=
ibutes)>0]">
- <xsl:variable name=3D"classId">
- <xsl:value-of select=3D"id" />
- </xsl:variable>
- formArray[<xsl:value-of select=3D"$classId"/>] =3D n=
ew Array();
- i=3D0;
- <xsl:for-each select=3D"attributes/attribute">
- formArray[<xsl:value-of select=3D"$classId"/>][i=
] =3D new Array();
- formArray[<xsl:value-of select=3D"$classId"/>][i=
]["value"] =3D "<xsl:value-of select=3D"id"/>";
- formArray[<xsl:value-of select=3D"$classId"/>][i=
]["name"] =3D "<xsl:value-of select=3D"name" />";
- i++;
- </xsl:for-each>
- </xsl:for-each>
- =20
- <xsl:if test=3D"/report/reportDatas/classId!=3D''">
- var Form =3D new Form(formArray,<xsl:value-of select=3D"=
/report/reportDatas/classId" />,ReportParams);
- </xsl:if>
- //alert(Form.GetOptionString(0));
- =20
- //Filters =20
- var selectOption0ArrayFilter =3D new Array();
- var selectOption1ArrayFilter =3D new Array();
- var inputTagValuesArrayFilter =3D new Array();
- =20
- var i=3D0;
- <xsl:for-each select=3D"/report/reportDatas/reportParams=
/conditions/condition">
- selectOption0ArrayFilter[i] =3D <xsl:value-of selec=
t=3D"idAtt" />;
- selectOption1ArrayFilter[i] =3D <xsl:value-of selec=
t=3D"operator" />;
- inputTagValuesArrayFilter[i] =3D <xsl:value-of sele=
ct=3D"value" />;
+ <!-- Here we create an array and use it as parameter for Form cl=
ass constructor -->
+ <script language=3D"Javascript">
+ =20
+ //////////////////////
+ //The report params
+ =20
+ //Columns
+ var reportColumnsArray =3D new Array();
+ var i=3D0;
+ <xsl:for-each select=3D"/report/reportDatas/reportParams/col=
umns/column">
+ reportColumnsArray[i++] =3D "<xsl:value-of select=3D"." =
/>";
+ </xsl:for-each>
+ //alert(reportColumnsArray.length);
+ var ReportParams =3D new ReportParams(reportColumnsArray,nul=
l,null);
+ =20
+ ////////////////////////
+ //The form
+ var formArray =3D new Array();
+ var i; //Counter
+ =20
+ <xsl:for-each select=3D"/report/classes/class[count(attribut=
es)>0]">
+ <xsl:variable name=3D"classId">
+ <xsl:value-of select=3D"id" />
+ </xsl:variable>
+ formArray[<xsl:value-of select=3D"$classId"/>] =3D new A=
rray();
+ i=3D0;
+ <xsl:for-each select=3D"attributes/attribute">
+ formArray[<xsl:value-of select=3D"$classId"/>][i] =3D=
new Array();
+ formArray[<xsl:value-of select=3D"$classId"/>][i]["v=
alue"] =3D "<xsl:value-of select=3D"id"/>";
+ formArray[<xsl:value-of select=3D"$classId"/>][i]["n=
ame"] =3D "<xsl:value-of select=3D"name" />";
i++;
</xsl:for-each>
- =20
- function AttribsGetSelect0Arr(formArray,classId)
+ </xsl:for-each>
+ =20
+ <xsl:if test=3D"/report/reportDatas/classId!=3D''">
+ var Form =3D new Form(formArray,<xsl:value-of select=3D"/rep=
ort/reportDatas/classId" />,ReportParams);
+ </xsl:if>
+ //alert(Form.GetOptionString(0));
+ =20
+ //Filters =20
+ var selectOption0ArrayFilter =3D new Array();
+ var selectOption1ArrayFilter =3D new Array();
+ var inputTagValuesArrayFilter =3D new Array();
+ =20
+ var i=3D0;
+ <xsl:for-each select=3D"/report/reportDatas/reportParams/con=
ditions/condition">
+ selectOption0ArrayFilter[i] =3D <xsl:value-of select=3D=
"idAtt" />;
+ selectOption1ArrayFilter[i] =3D <xsl:value-of select=3D=
"operator" />;
+ inputTagValuesArrayFilter[i] =3D <xsl:value-of select=3D=
"value" />;
+ i++;
+ </xsl:for-each>
+ =20
+ <xsl:if test=3D"/report/reportDatas/classId!=3D''">
+ var InputLineParamsFilters =3D
{
- var lengthArray =3D formArray[classId].length;
- //alert("lengthArray: " + lengthArray);
+ type: 'TWOSELECTANDINPUT',
+ select0: AttribsGetSelect0Arr(formArray,<xsl:value-o=
f select=3D"/report/reportDatas/classId" />),
+ select1: FilterGetSelect1Arr(),
+ lineTitle: 'Filter',
+ input0: '',
+ PreselectedInput0: inputTagValuesArrayFilter,
+ PreselectedSelect0: selectOption0ArrayFilter,
+ PreselectedSelect1: selectOption1ArrayFilter,
+ refName: 'expandFormFilter'
+ }
+ var InputLineFilters =3D new InputLine(InputLineParamsFi=
lters);
+ </xsl:if>
=20
- var optionArray =3D new Array();
- optionArray[0] =3D new Array();
- optionArray[0]["value"] =3D "-1";
- optionArray[0]["text"] =3D "--Nothing--"
- for (var i =3D 0; i < lengthArray ;i++)=20
- {
- optionArray[i+1] =3D new Array(); //Begin to sec=
ond element
- optionArray[i+1]["value"] =3D formArray[classId]=
[i]["value"];
- optionArray[i+1]["text"] =3D formArray[classId]=
[i]["name"];
- }
- =20
- return optionArray;
- } =20
- =20
- function FilterGetSelect1Arr()
+ =20
+ //Order
+ var selectOption0ArrayOrder =3D new Array();
+ var selectOption1ArrayOrder =3D new Array();
+ var i=3D0;
+ <xsl:for-each select=3D"/report/reportDatas/reportParams/ord=
ers/order">
+ selectOption0ArrayOrder[i] =3D <xsl:value-of select=3D"=
idAtt" />;
+ selectOption1ArrayOrder[i] =3D <xsl:value-of select=3D"=
ascOrDesc" />;
+ i++;
+ </xsl:for-each>
+ =20
+ <xsl:if test=3D"/report/reportDatas/classId!=3D''">
+ var InputLineParamsOrders =3D
{
- var optionArray =3D new Array();
- =20
- optionArray[0] =3D new Array();
- optionArray[0]["value"] =3D "-1";
- optionArray[0]["text"] =3D "--Nothing--";
- optionArray[1] =3D new Array();
- optionArray[1]["value"] =3D "0";
- optionArray[1]["text"] =3D "GreaterOrEqualThan";
- optionArray[2] =3D new Array();
- optionArray[2]["value"] =3D "1";
- optionArray[2]["text"] =3D "LessEqualThan";
- optionArray[3] =3D new Array();
- optionArray[3]["value"] =3D "2";
- optionArray[3]["text"] =3D "GreaterThan";
- optionArray[4] =3D new Array();
- optionArray[4]["value"] =3D "3";
- optionArray[4]["text"] =3D "LessThan";
- optionArray[5] =3D new Array();
- optionArray[5]["value"] =3D "4";
- optionArray[5]["text"] =3D "EqualTo";
- optionArray[6] =3D new Array();
- optionArray[6]["value"] =3D "5";
- optionArray[6]["text"] =3D "DistinctTo";
- optionArray[7] =3D new Array();
- optionArray[7]["value"] =3D "6";
- optionArray[7]["text"] =3D "BeginWith";
- optionArray[8] =3D new Array();
- optionArray[8]["value"] =3D "7";
- optionArray[8]["text"] =3D "ContainsTo";
- optionArray[9] =3D new Array();
- optionArray[9]["value"] =3D "8";
- optionArray[9]["text"] =3D "In";
- =20
- return optionArray;
+ type: 'TWOSELECT',
+ select0: AttribsGetSelect0Arr(formArray,<xsl:value-o=
f select=3D"/report/reportDatas/classId" />),
+ select1: OrderGetSelect1Arr(),
+ lineTitle: 'Order',
+ input0: '',
+ PreselectedInput0: null,
+ PreselectedSelect0: selectOption0ArrayOrder,
+ PreselectedSelect1: selectOption1ArrayOrder,
+ refName: 'expandFormSort'
}
- =20
- <xsl:if test=3D"/report/reportDatas/classId!=3D''">
- var InputLineParamsFilters =3D
- {
- type: 'TWOSELECTANDINPUT',
- select0: AttribsGetSelect0Arr(formArray,<xsl:val=
ue-of select=3D"/report/reportDatas/classId" />),
- select1: FilterGetSelect1Arr(),
- lineTitle: 'Filter',
- input0: '',
- PreselectedInput0: inputTagValuesArrayFilter,
- PreselectedSelect0: selectOption0ArrayFilter,
- PreselectedSelect1: selectOption1ArrayFilter,
- refName: 'expandFormFilter'
- }
- var InputLineFilters =3D new InputLine(InputLinePara=
msFilters);
- </xsl:if>
- =20
- =20
- //Order
- var selectOption0ArrayOrder =3D new Array();
- var selectOption1ArrayOrder =3D new Array();
- var i=3D0;
- <xsl:for-each select=3D"/report/reportDatas/reportParams=
/orders/order">
- selectOption0ArrayOrder[i] =3D <xsl:value-of select=
=3D"idAtt" />;
- selectOption1ArrayOrder[i] =3D <xsl:value-of select=
=3D"ascOrDesc" />;
- i++;
- </xsl:for-each>
- =20
- function OrderGetSelect1Arr()
+ var InputLineOrders =3D new InputLine(InputLineParamsOrd=
ers);
+ </xsl:if>
+ =20
+ =20
+ function recargar()
+ {
+ <![CDATA[
+ //for(i=3D0;i<document.formulario.elements.length;i++)
+ // alert(document.formulario.elements[i].name);
+ ]]>
+ indice =3D document.formulario.classList.selectedIndex;
+ if(indice>0)
{
- var optionArray =3D new Array();
- =20
- optionArray[0] =3D new Array();
- optionArray[0]["value"] =3D "-1";
- optionArray[0]["text"] =3D "--Nothing--";
- optionArray[1] =3D new Array();
- optionArray[1]["value"] =3D "0";
- optionArray[1]["text"] =3D "Asc";
- optionArray[2] =3D new Array();
- optionArray[2]["value"] =3D "1";
- optionArray[2]["text"] =3D "Desc";
- =20
- return optionArray;
+ valor =3D document.formulario.classList.options[indi=
ce].value;
+ self.location =3D "createreport.aspx?classList=3D"+v=
alor;
}
+ }
+ //Esta funcion no esta siendo usada, pues se usa una mejora =
hecha por pcamacho
+ function valoresIni()
+ {
+ var divFilter;
+ var expandFormFilter;
+ var divSort;
+ var expandFormSort;
+ var cantfilters =3D <xsl:value-of select=3D"count(/repor=
t/reportDatas/reportParams/conditions/condition)"/>
+ var cantorders =3D <xsl:value-of select=3D"count(/report=
/reportDatas/reportParams/orders/order)"/>
=20
- <xsl:if test=3D"/report/reportDatas/classId!=3D''">
- var InputLineParamsOrders =3D
- {
- type: 'TWOSELECT',
- select0: AttribsGetSelect0Arr(formArray,<xsl:val=
ue-of select=3D"/report/reportDatas/classId" />),
- select1: OrderGetSelect1Arr(),
- lineTitle: 'Order',
- input0: '',
- PreselectedInput0: null,
- PreselectedSelect0: selectOption0ArrayOrder,
- PreselectedSelect1: selectOption1ArrayOrder,
- refName: 'expandFormSort'
- }
- var InputLineOrders =3D new InputLine(InputLineParam=
sOrders);
- </xsl:if>
+ var divSort =3D GetNodeByTagNameAndAttName("div","Sort")=
;
+ var divFilter =3D GetNodeByTagNameAndAttName("div","Filt=
er");
+ =20
+ //alert(cantfilters);
=20
- //var inputValuesOrder;
- //inputValuesOrder =3D new InputValues(selectOption1Arra=
yOrder,selectOption2ArrayOrder,null);
- =20
- =20
- =20
- function recargar()
+ <![CDATA[
+ for(i=3D1;i<cantfilters;i++)
{
- <![CDATA[
- //for(i=3D0;i<document.formulario.elements.length;i++)
- // alert(document.formulario.elements[i].name);
- ]]>
- indice =3D document.formulario.classList.selectedIndex;
- if(indice>0)
- {
- valor =3D document.formulario.classList.options[indice].value;
- self.location =3D "createreport.aspx?classList=3D"+valor;
- }
+ expandFormFilter =3D new ExpandForm("expandFormFil=
ter",divFilter,true,Form.GetFilterArray(1),Form.GetFilterArray(2),"Filter=
",inputValuesFilter);
+ expandFormFilter.AddLine();
}
- //Esta funcion no esta siendo usada, pues se usa una mej=
ora hecha por pcamacho
- function valoresIni()
+ ]]>
+ <![CDATA[
+ for(i=3D1;i<cantorders;i++)
{
- var divFilter;
- var expandFormFilter;
- var divSort;
- var expandFormSort;
- var cantfilters =3D <xsl:value-of select=3D"count(/report/reportDat=
as/reportParams/conditions/condition)"/>
- var cantorders =3D <xsl:value-of select=3D"count(/report/reportData=
s/reportParams/orders/order)"/>
- =09
- var divSort =3D GetNodeByTagNameAndAttName("div","Sort");
- var divFilter =3D GetNodeByTagNameAndAttName("div","Filter");
- =09
- //alert(cantfilters);
- =09
- <![CDATA[
- for(i=3D1;i<cantfilters;i++)
- {
- expandFormFilter =3D new ExpandForm("expandFormFilter",divFilter=
,true,Form.GetFilterArray(1),Form.GetFilterArray(2),"Filter",inputValuesF=
ilter);
- expandFormFilter.AddLine();
+ expandFormSort =3D new ExpandForm("expandFormSort",d=
ivSort,false,Form.GetSortArray(1),Form.GetSortArray(2),"Order");
+ expandFormSort.AddLine();
+ }
+ ]]>
+ i =3D 0;
+ <xsl:for-each select=3D"/report/reportDatas/reportParams=
/conditions/condition">
+ <![CDATA[
+ Objrow =3D eval("document.formulario.select1expandFo=
rmFilter"+i);
+ if(eval(Objrow))
+ {
+ for(j=3D0;j<Objrow.length;j++)
+ {
+ if(Objrow[j].value=3D=3D"]]><xsl:value-of se=
lect=3D"idAtt"/><![CDATA[")
+ Objrow.options[j].selected=3Dtrue;
+ }
}
- ]]>
- <![CDATA[
- for(i=3D1;i<cantorders;i++)
- {
- expandFormSort =3D new ExpandForm("expandFormSor=
t",divSort,false,Form.GetSortArray(1),Form.GetSortArray(2),"Order");
- expandFormSort.AddLine();
+ =20
+ Objrow =3D eval("document.formulario.select2expandFo=
rmFilter"+i);
+ if(eval(Objrow))
+ {
+ for(j=3D0;j<Objrow.length;j++)
+ {
+ if(Objrow[j].value=3D=3D"]]><xsl:value-of se=
lect=3D"operator"/><![CDATA[")
+ Objrow.options[j].selected=3Dtrue;
+ }
}
- ]]>
- i =3D 0;
- <xsl:for-each select=3D"/report/reportDatas/reportParams/conditions=
/condition">
- <![CDATA[
- Objrow =3D eval("document.formulario.select1expandFormFilter"+i);
- if(eval(Objrow))
- {
- for(j=3D0;j<Objrow.length;j++)
- {
- if(Objrow[j].value=3D=3D"]]><xsl:value-of select=3D"idAtt"/><![C=
DATA[")
- Objrow.options[j].selected=3Dtrue;
- }
- }
- =09
- Objrow =3D eval("document.formulario.select2expandFormFilter"+i);
- if(eval(Objrow))
- {
- for(j=3D0;j<Objrow.length;j++)
- {
- if(Objrow[j].value=3D=3D"]]><xsl:value-of select=3D"operator"/><=
![CDATA[")
- Objrow.options[j].selected=3Dtrue;
- }
- }
- =09
- Objrow =3D eval("document.formulario.inputexpandFormFilter"+i);
- dato =3D ]]><xsl:value-of select=3D"value"/><![CDATA[;
- if(eval(Objrow))
- Objrow.value =3D dato;
- i++;
- ]]>
- </xsl:for-each>
- i =3D 0;
- <xsl:for-each select=3D"/report/reportDatas/reportParams/orders/ord=
er">
- <![CDATA[
- Objrow =3D eval("document.formulario.select1expandFormSort"+i);
- if(eval(Objrow))
- {
- for(j=3D0;j<Objrow.length;j++)
- {
- if(Objrow[j].value=3D=3D]]><xsl:value-of select=3D"idAtt"/><![CD=
ATA[)
- Objrow.options[j].selected=3Dtrue;
- }
- }
- if(eval(Objrow))
- {
- Objrow =3D eval("document.formulario.select2expandFormSort"+i);
- for(j=3D0;j<Objrow.length;j++)
- {
- if(Objrow[j].value=3D=3D]]><xsl:value-of select=3D"ascOrDesc"/><=
![CDATA[)
- Objrow.options[j].selected=3Dtrue;
- }
- }
- i++;
- ]]>
- </xsl:for-each>
- }
- </script>
- =20
-<style type=3D"text/css">=20
-
-.s { font-family: Verdana, Arial, Helvetica, sans-serif; color: #000000=
; font-size:10pt}
-
-DIV.lev1divider {
- MARGIN: 10px 0px 5px; BACKGROUND-COLOR: #417096
-}
-TD.lev2divider {
- PADDING-RIGHT: 0px; PADDING-LEFT: 0px; PADDING-BOTTOM: 5px; PADDING-TOP=
: 10px
-}
-TD.lev1head {
- PADDING-RIGHT: 5px; PADDING-LEFT: 0px; FONT-WEIGHT: bold; FONT-SIZE: 90=
%; PADDING-BOTTOM: 0px; COLOR: #417096; PADDING-TOP: 0px; FONT-FAMILY: ar=
ial
-}
-TD.lev1choices {
- PADDING-RIGHT: 0px; PADDING-LEFT: 0px; FONT-SIZE: 70%; PADDING-BOTTOM: =
0px; COLOR: #444444; PADDING-TOP: 0px; FONT-FAMILY: verdana
-}
-TD.lev1 {
- BACKGROUND-COLOR: #c6c6c6
-}
-TD.lev2 {
- PADDING-RIGHT: 10px; PADDING-LEFT: 10px; PADDING-BOTTOM: 10px
-}
-TABLE.lev0 {
-=09
-}
-TD.lev0 {
-=09
-}
-TD.vtypeSect {
- PADDING-RIGHT: 5px; PADDING-LEFT: 5px; FONT-WEIGHT: bold; FONT-SIZE: 80=
%; PADDING-BOTTOM: 15px; COLOR: #333333; PADDING-TOP: 15px; FONT-FAMILY: =
arial
-}
-TD.smallBlue {
- FONT-WEIGHT: bold; FONT-SIZE: 70%; COLOR: #417096; FONT-FAMILY: verdana
-}
-TD.largeBlue {
- FONT-WEIGHT: bold; FONT-SIZE: 90%; COLOR: #417096; FONT-FAMILY: arial
-}
-TD.butbar {
- PADDING-RIGHT: 5px; PADDING-LEFT: 15px; PADDING-BOTTOM: 5px; PADDING-TO=
P: 5px
-} =09
-
-</style>
-<body >
+ =20
+ Objrow =3D eval("document.formulario.inputexpandForm=
Filter"+i);
+ dato =3D ]]><xsl:value-of select=3D"value"/><![CDATA=
[;
+ if(eval(Objrow))
+ Objrow.value =3D dato;
+ i++;
+ ]]>
+ </xsl:for-each>
+ i =3D 0;
+ <xsl:for-each select=3D"/report/reportDatas/reportParams=
/orders/order">
+ <![CDATA[
+ Objrow =3D eval("document.formulario.select1expandFo=
rmSort"+i);
+ if(eval(Objrow))
+ {
+ for(j=3D0;j<Objrow.length;j++)
+ {
+ if(Objrow[j].value=3D=3D]]><xsl:value-of sel=
ect=3D"idAtt"/><![CDATA[)
+ Objrow.options[j].selected=3Dtrue;
+ }
+ }
+ if(eval(Objrow))
+ {
+ Objrow =3D eval("document.formulario.select2expa=
ndFormSort"+i);
+ for(j=3D0;j<Objrow.length;j++)
+ {
+ if(Objrow[j].value=3D=3D]]><xsl:value-of sel=
ect=3D"ascOrDesc"/><![CDATA[)
+ Objrow.options[j].selected=3Dtrue;
+ }
+ }
+ i++;
+ ]]>
+ </xsl:for-each>
+ }
+ </script>
+ =20
+ <body >
<form id=3D"formulario" name=3D"formulario" method=3D"post">
<table width=3D"100%" border=3D"0" cellspacing=3D"0" cellpad=
ding=3D"0" class=3D"conttablecenter2">
<tr>
@@ -365,15 +247,8 @@
</td>
<!-- Only show classes for select wh=
en creating -->
<xsl:if test=3D"/report/reportDatas/=
saveName=3D'Create'" >=20
- <td >
- <!--
- <select class=3D"drpdwn2" id=3D"=
classList" onchange=3D" UpdateHeader();
- =
Form.UpdateLists(leftColumn,rightColumn,this.value);
- =
Form.UpdateSort(expandFormSort,this.value);=20
- =
Form.UpdateFilter(expandFormFilter,this.value);
- =
">=20
- =
-->
- <select class=3D"drpdwn2" id=3D"classList" onchange=3D"recarga=
r();">
+ <td>
+ <select class=3D"drpdwn2" id=3D"cla=
ssList" onchange=3D"recargar();">
<xsl:for-each select=3D"repo=
rt/classes/class">
<option>
<xsl:attribute name=3D=
"name">
|
|
From: <sv...@de...> - 2005-05-19 18:45:35
|
Author: marijn Date: 2005-05-19 14:45:33 -0400 (Thu, 19 May 2005) New Revision: 1100 Modified: humano2/trunk/web/portal/site/domain.aspx humano2/trunk/web/portal/site/login.aspx Log: * Changing welcome messages to english. Modified: humano2/trunk/web/portal/site/domain.aspx =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=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/domain.aspx 2005-05-19 18:12:47 UTC (re= v 1099) +++ humano2/trunk/web/portal/site/domain.aspx 2005-05-19 18:45:33 UTC (re= v 1100) @@ -9,7 +9,7 @@ <body> <!---FORM AREA--> <div id=3D"rightBox"> - <div class=3D"rightBoxH1">Selección de Dominio </div> + <div class=3D"rightBoxH1">Domain selection</div> <ul> <% getDomainUser(); %> </ul> =20 Modified: humano2/trunk/web/portal/site/login.aspx =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=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/login.aspx 2005-05-19 18:12:47 UTC (rev= 1099) +++ humano2/trunk/web/portal/site/login.aspx 2005-05-19 18:45:33 UTC (rev= 1100) @@ -18,7 +18,7 @@ <!---FORM AREA--> <form id=3D"Form1" method=3D"post" runat=3D"server"> <div id=3D"rightBox"> - <div class=3D"rightBoxH1">Bienvenido</div> + <div class=3D"rightBoxH1">Welcome</div> <div class=3D"spacer"></div> <div class=3D"leftList"></div> <div class=3D"rightList"> |
