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-06-07 18:44:23
|
Author: pcamacho Date: 2005-06-07 14:44:23 -0400 (Tue, 07 Jun 2005) New Revision: 1249 Removed: humano2/trunk/web/builder/site/crearatributo.aspx humano2/trunk/web/builder/site/crearatributo.aspx.cs humano2/trunk/web/builder/site/functionsinterface/ Log: DELETE: unuseful files Deleted: humano2/trunk/web/builder/site/crearatributo.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/crearatributo.aspx 2005-06-07 16:49:51= UTC (rev 1248) +++ humano2/trunk/web/builder/site/crearatributo.aspx 2005-06-07 18:44:23= UTC (rev 1249) @@ -1,18 +0,0 @@ -<%@ Page language=3D"c#" Codebehind=3D"crearatributo.aspx.cs" AutoEventW= ireup=3D"false" Inherits=3D"Builder.site.crearatributo" %> -<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" > -<HTML> - <HEAD> - <title>crearatributo</title> - </HEAD> - <body> - <form id=3D"Form1" method=3D"post" runat=3D"server"> - <asp:Panel id=3D"pnlAtributo" runat=3D"server"> - <P>Clase: - <asp:DropDownList id=3D"ddlClases" runat=3D"server" AutoPostBack=3D= "True"></asp:DropDownList><BR> - Tipo Atributo: - <asp:DropDownList id=3D"ddlTipoAtributo" runat=3D"server" AutoPostB= ack=3D"True"></asp:DropDownList><BR> - <asp:Button id=3D"btnCrear" runat=3D"server" Text=3D"Crear"></asp:B= utton></P> - </asp:Panel> - </form> - </body> -</HTML> Deleted: humano2/trunk/web/builder/site/crearatributo.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/crearatributo.aspx.cs 2005-06-07 16:49= :51 UTC (rev 1248) +++ humano2/trunk/web/builder/site/crearatributo.aspx.cs 2005-06-07 18:44= :23 UTC (rev 1249) @@ -1,102 +0,0 @@ -// -// 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 -// -// $Id$ -// - -using System; -using System.Collections; -using System.ComponentModel; -using System.Data; -using System.Drawing; -using System.Web; -using System.Web.SessionState; -using System.Web.UI; -using System.Web.UI.WebControls; -using System.Web.UI.HtmlControls; - -using Humano2.Components.ViewTools; -using Humano2.Components.WebTools; -using Humano2.Core.Db; - -namespace Builder.site -{ - /// <summary> - /// Summary description for crearatributo. - /// </summary> - public class crearatributo : System.Web.UI.Page - { - protected System.Web.UI.WebControls.Panel pnlAtributo; - protected System.Web.UI.WebControls.DropDownList ddlTipoAtributo; - protected System.Web.UI.WebControls.DropDownList ddlClases; - private absCrud crud; - protected System.Web.UI.WebControls.Button btnCrear; - private absComplex complex; - - private void Page_Load(object sender, System.EventArgs e) - { - crud =3D Factory.Crud(); - crud.Domain=3D109; - complex =3D crud.GetCore().Complex; - - if(!Page.IsPostBack) - { - string[] clases =3D complex.domainsClass(crud.Domain.ToString()); - =09 - ddlClases.Items.Add(new ListItem("Seleccione una Clase","0")); - for(int i=3D0;i<=3Dclases.Length-1;i+=3D2) - { - ddlClases.Items.Add(new ListItem(clases[i+1].ToString(),clases[i].T= oString())); - } - } - } - - #region Web Form Designer generated code - override protected void OnInit(EventArgs e) - { - // - // CODEGEN: This call is required by the ASP.NET Web Form Designer. - // - InitializeComponent(); - base.OnInit(e); - } - =09 - /// <summary> - /// Required method for Designer support - do not modify - /// the contents of this method with the code editor. - /// </summary> - private void InitializeComponent() - { =20 - this.ddlClases.SelectedIndexChanged +=3D new System.EventHandler(this= .ddlClases_SelectedIndexChanged); - this.btnCrear.Click +=3D new System.EventHandler(this.btnCrear_Click)= ; - this.Load +=3D new System.EventHandler(this.Page_Load); - - } - #endregion - - private void ddlClases_SelectedIndexChanged(object sender, System.Even= tArgs e) - { - if(ddlClases.SelectedValue !=3D "0") - { - string[] atributos =3D complex.AllAttributes(); - ddlTipoAtributo.Items.Clear(); - ddlTipoAtributo.Items.Add(new ListItem("Seleccione un Tipo","0")); - for(int i=3D0;i<=3Datributos.Length-1;i+=3D2) - { - ddlTipoAtributo.Items.Add(new ListItem(atributos[i].ToString(),atri= butos[i+1].ToString())); - } - } - } - - private void btnCrear_Click(object sender, System.EventArgs e) - { - Response.Redirect(Html.genAbsoluteUrl("/builder/site/createInstanceAt= t.aspx?id_entity=3D" + ddlTipoAtributo.SelectedValue + "&domain=3D109&id_= class=3D" + ddlClases.SelectedValue)); - } - } -} |
|
From: <sv...@de...> - 2005-06-07 16:49:52
|
Author: pcamacho
Date: 2005-06-07 12:49:51 -0400 (Tue, 07 Jun 2005)
New Revision: 1248
Modified:
humano2/trunk/components/webTools/Adapter.cs
humano2/trunk/core/db/mssql/mssqlComplex.cs
humano2/trunk/core/db/pgsql/pgsqlComplex.cs
Log:
FIX: bug #189. When updating the view by default of a class, if an attrib=
ute was a pertinence, the first attribute=20
(select) of this pertinence was taken and not the isPrimary one as it sho=
uld be.
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-06-06 22:33:49 UTC =
(rev 1247)
+++ humano2/trunk/components/webTools/Adapter.cs 2005-06-07 16:49:51 UTC =
(rev 1248)
@@ -1434,6 +1434,12 @@
Logger.Log("CreateViewStandard: classId: "+classId+" domainId: "+d=
omainId, LogLevel.Trace);
string[] attributeIds =3D complex.GetUserSetableAttributeList(classId=
, domainId).AllKeys;
=20
+ Logger.Log("attributesIds: ",LogLevel.Trace);
+ for(int i=3D0;i<attributeIds.Length;i++)
+ {
+ Logger.Log("attributeIds[" + i + "]: " + attributeIds[i]=
,LogLevel.Trace); =20
+ }
+ =20
string listOfAttributeIds =3D Support.Commify(attributeIds);
=20
Logger.Log("CreateViewStandard: listOfAttributeIds=3D " + li=
stOfAttributeIds, LogLevel.Trace);
@@ -1521,10 +1527,14 @@
col2 =3D view.Rows[0][1].ToString();
}
=09
+ Logger.Log("col1: " + col1,LogLevel.Trace);
+ Logger.Log("col2: " + col1,LogLevel.Trace);
+ =20
string columns;
if(mode =3D=3D 0)
{
string attCol =3D CheckForPertinence(idEntity.ToString());
+ Logger.Log("Pertinence att: " + attCol, LogLevel.Trace);
columns =3D col2 + "," + attCol;
}
else
@@ -1546,6 +1556,7 @@
for(int t=3D0; t < colValues.Length; t++)
{
dr[t] =3D colValues[t];
+ Logger.Log("value[" + t + "]=3D " + Convert.ToString(col=
Values[t]),LogLevel.Trace);
}
dt.Rows.Add(dr);
=20
Modified: humano2/trunk/core/db/mssql/mssqlComplex.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/mssql/mssqlComplex.cs 2005-06-06 22:33:49 UTC (=
rev 1247)
+++ humano2/trunk/core/db/mssql/mssqlComplex.cs 2005-06-07 16:49:51 UTC (=
rev 1248)
@@ -876,13 +876,14 @@
}
=20
/// <summary>
- /// Get the string id of the pertinence attribute an attribute is relat=
ed to
+ /// Get the string id of the pertinence attribute an attribute is rela=
ted to
/// </summary>
/// <param name=3D"attributeId">The attribute for which we want =
the pertinence attribute related to</param>
- /// <returns>The attribute of the pertinence attribute or "" if =
attributeId is not a pertinence attribute</returns>
+ /// <returns>The PRIMARY attribute of the pertinence attribute o=
r "" if attributeId is not a pertinence attribute</returns>
override public string GetPertinenceForAttribute(string attribut=
eId)
{
- string req =3D "select \"id_entity\" from attribute where \"=
classId\" in (select \"to\" from pertinence where id_entity =3D " + Conve=
rt.ToInt32(attributeId) + ")";
+ string req =3D "select \"id_entity\" from attribute where \"=
classId\" in (select \"to\" from pertinence where id_entity =3D " + Conve=
rt.ToInt32(attributeId) + ") ";
+ req +=3D"and \"isPrimary\"=3D't'"; //Only takes the p=
rimary attribute of the pertinence
=20
DataTable dt =3D doSelect(req);
if( (dt =3D=3D null) || (dt.Rows.Count =3D=3D 0))
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-06-06 22:33:49 UTC (=
rev 1247)
+++ humano2/trunk/core/db/pgsql/pgsqlComplex.cs 2005-06-07 16:49:51 UTC (=
rev 1248)
@@ -916,11 +916,13 @@
/// Get the string id of the pertinence attribute an attribute is rela=
ted to
/// </summary>
/// <param name=3D"attributeId">The attribute for which we want =
the pertinence attribute related to</param>
- /// <returns>The attribute of the pertinence attribute or "" if =
attributeId is not a pertinence attribute</returns>
+ /// <returns>The PRIMARY attribute of the pertinence attribute o=
r "" if attributeId is not a pertinence attribute</returns>
override public string GetPertinenceForAttribute(string attribut=
eId)
{
- string req =3D "select \"id_entity\" from attribute where \"=
classId\" in (select \"to\" from pertinence where id_entity =3D " + Conve=
rt.ToInt32(attributeId) + ")";
- =20
+ string req =3D "select \"id_entity\" from attribute where \"=
classId\" in (select \"to\" from pertinence where id_entity =3D " + Conve=
rt.ToInt32(attributeId) + ") ";
+ req +=3D"and \"isPrimary\"=3D't'"; //Only takes the p=
rimary attribute of the pertinence
+ Logger.Log("GetPertinenceForAttribute: query=3D " + req,LogL=
evel.Trace); =20
+ =20
DataTable dt =3D doSelect(req);
if( (dt =3D=3D null) || (dt.Rows.Count =3D=3D 0))
{
|
|
From: <sv...@de...> - 2005-06-06 22:34:01
|
Author: pcamacho
Date: 2005-06-06 18:33:49 -0400 (Mon, 06 Jun 2005)
New Revision: 1247
Modified:
humano2/trunk/web/builder/site/functionoperationbar.aspx
humano2/trunk/web/builder/site/xsl/functionindex.xsl
Log:
FIX: bug #178. Reports have been temporarly desactivated due to this part=
is not mature at all.
Modified: humano2/trunk/web/builder/site/functionoperationbar.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/functionoperationbar.aspx 2005-06-06 1=
9:53:22 UTC (rev 1246)
+++ humano2/trunk/web/builder/site/functionoperationbar.aspx 2005-06-06 2=
2:33:49 UTC (rev 1247)
@@ -48,7 +48,7 @@
<!--div id=3D"CreateRule"><a href=3D"#" onClick=3D"CreateRule()">Crea=
te Rule</a></div-->
<div id=3D"CreateForm"><a href=3D"#" onClick=3D"CreateForm()">Create =
Form</a></div>
<div id=3D"CreateFolder"><a href=3D"#" onClick=3D"CreateFolder()">Cre=
ate Folder</a></div>
- <div id=3D"CreateReport"><a href=3D"#" onClick=3D"CreateRepo=
rt()">Create Report</a></div>
+ <!-- <div id=3D"CreateReport"><a href=3D"#" onClick=3D"Creat=
eReport()">Create Report</a></div> -->
</div>
<form id=3D"Form1" method=3D"post" runat=3D"server">
<input id=3D"classId2" name=3D"classId2" type=3D"hidden">=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-06-06 19:53=
:22 UTC (rev 1246)
+++ humano2/trunk/web/builder/site/xsl/functionindex.xsl 2005-06-06 22:33=
:49 UTC (rev 1247)
@@ -78,6 +78,7 @@
=20
=20
//Reports
+ <!--
var reportBranch =3D new WebFXTreeItem('Reports',act=
ion);
tree.add(reportBranch);
<xsl:for-each select=3D"/vffr/reports/report">
@@ -89,8 +90,8 @@
reportBranch.add(child_<xsl:value-of select=3D"i=
d"/>);
</xsl:if> =09
</xsl:for-each>=09
+ -->
=20
- =20
//Write all tree
document.write(tree);
</script>
|
|
From: <sv...@de...> - 2005-06-06 19:53:29
|
Author: pcamacho
Date: 2005-06-06 15:53:22 -0400 (Mon, 06 Jun 2005)
New Revision: 1246
Modified:
humano2/trunk/web/portal/site/updateInstance.aspx.cs
Log:
FIX: when updating an instance, the user is redirected to the page of thi=
s instance and not to the view of the class.=20
(cf bug #166).
Modified: humano2/trunk/web/portal/site/updateInstance.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/updateInstance.aspx.cs 2005-06-03 23:51=
:39 UTC (rev 1245)
+++ humano2/trunk/web/portal/site/updateInstance.aspx.cs 2005-06-06 19:53=
:22 UTC (rev 1246)
@@ -72,10 +72,8 @@
//Nada
}
}
-
- // Get the correct view to redirect the user to.
- int defaultViewId =3D dbAdapter.getDefaultViewId(classId);
- HttpContext.Current.Response.Redirect(Html.genAbsoluteUrl("/portal/si=
te/" + ViewPages.showViewPage + defaultViewId + "&classId=3D"+classId)); =
=09
+ //HttpContext.Current.Response.Redirect(Html.genAbsoluteUrl("/portal/=
site/" + ViewPages.showViewPage + defaultViewId + "&classId=3D"+classId))=
; =09
+ HttpContext.Current.Response.Redirect(Html.genAbsoluteUrl("/=
portal/site/Data_structured.aspx?id_entity=3D" + idEntity + "&classId=3D"=
+classId + "&action=3Dread" +"&display=3DreadXslt.aspx"));
}
=09
#region Web Form Designer generated code
|
|
From: <sv...@de...> - 2005-06-03 23:51:36
|
Author: marcelo Date: 2005-06-03 19:51:39 -0400 (Fri, 03 Jun 2005) New Revision: 1245 Added: humano2/tags/5.0.beta4/ Log: Release of Humano2 5.0.Beta4 Copied: humano2/tags/5.0.beta4 (from rev 1244, humano2/trunk) |
|
From: <sv...@de...> - 2005-06-03 23:50:40
|
Author: marcelo
Date: 2005-06-03 19:50:42 -0400 (Fri, 03 Jun 2005)
New Revision: 1244
Added:
humano2/trunk/core/schema/pgsql/pgsql-9-HelpDesk SMB.sql
Modified:
humano2/trunk/changelog.txt
Log:
* Adding schema for basic help desk.=20
* Final change to CHANGELOG.TXT
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-06-03 23:47:02 UTC (rev 1243)
+++ humano2/trunk/changelog.txt 2005-06-03 23:50:42 UTC (rev 1244)
@@ -6,6 +6,7 @@
* Changed paging logic in ViewTools so that it works in MsSql
* This last change means that Postgresql V.8 has to used=20
* Caching was implemented to minimize calls to the DB
+ * Added a schema file to implement basic help desk
=20
* Metamodel=20
* Added new attribute types of attributes:
@@ -15,6 +16,7 @@
* Image upload is now soported and the images will be displayed in in=
stance.aspx
* Views which have multiple column with the same no longer crash
=20
+ =20
=20
=3D=3D 5.0.beta3 - 2005-05-27 =3D=3D
=20
Added: humano2/trunk/core/schema/pgsql/pgsql-9-HelpDesk SMB.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-9-HelpDesk SMB.sql 2005-06-03 2=
3:47:02 UTC (rev 1243)
+++ humano2/trunk/core/schema/pgsql/pgsql-9-HelpDesk SMB.sql 2005-06-03 2=
3:50:42 UTC (rev 1244)
@@ -0,0 +1,234 @@
+
+CREATE TABLE "d10160cAsset" (
+ id_entity integer NOT NULL,
+ "c10165Name" character varying(20),
+ "c10165Serial Nr." character varying(20),
+ "c10165Details" pg_catalog.text,
+ "c10165User" integer,
+ "c10165Purchase Data" timestamp without time zone,
+ "c10165User1" integer
+);
+
+CREATE TABLE "d10160cAsset Type" (
+ id_entity integer NOT NULL,
+ "c10213Type Name" character varying(20)
+);
+
+
+CREATE TABLE "d10160cProblem Type" (
+ id_entity integer NOT NULL,
+ "c10189Problem Type" character varying(20)
+);
+
+
+CREATE TABLE "d10160cTicket" (
+ id_entity integer NOT NULL,
+ "c10162Title" character varying(20),
+ "c10162Detail" pg_catalog.text,
+ "c10162Request by" integer,
+ "c10162Assigned to" integer,
+ "c10162Assigned to1" integer,
+ "c10162Status" integer,
+ "c10162Solution Detail" pg_catalog.text,
+ "c10162Problem Type" integer,
+ "c10162Attachment" character varying(255),
+ "c10162Date" timestamp without time zone,
+ "c10162Resolution Date" timestamp without time zone,
+ "c10162Request by1" integer,
+ "c10162Assigned to2" integer,
+ "c10162Assigned to3" integer
+);
+
+CREATE TABLE "d10160cTicket Status" (
+ id_entity integer NOT NULL,
+ "c10163Status Name" character varying(20)
+);
+
+INSERT INTO "domain" (id_entity, "domainName", "statusDomain") VALUES (1=
0160, 'HelpDesk SMB', NULL);
+
+INSERT INTO user_domain (id_entity, "userTable", "domainTable") VALUES (=
10161, 110, 10160);
+
+
+INSERT INTO "class" (id_entity, "classType", "sysName", name, "parentId"=
, "isAbstract", "isHidden", "descClass") VALUES (10162, 29, 'd10160cTicke=
t', 'Ticket', 3, false, false, NULL);
+INSERT INTO "class" (id_entity, "classType", "sysName", name, "parentId"=
, "isAbstract", "isHidden", "descClass") VALUES (10163, 29, 'd10160cTicke=
t Status', 'Ticket Status', 3, false, false, NULL);
+INSERT INTO "class" (id_entity, "classType", "sysName", name, "parentId"=
, "isAbstract", "isHidden", "descClass") VALUES (10165, 29, 'd10160cAsset=
', 'Asset', 3, false, false, NULL);
+INSERT INTO "class" (id_entity, "classType", "sysName", name, "parentId"=
, "isAbstract", "isHidden", "descClass") VALUES (10189, 29, 'd10160cProbl=
em Type', 'Problem Type', 3, false, false, NULL);
+INSERT INTO "class" (id_entity, "classType", "sysName", name, "parentId"=
, "isAbstract", "isHidden", "descClass") VALUES (10213, 29, 'd10160cAsset=
Type', 'Asset Type', 3, false, false, NULL);
+
+
+INSERT INTO entity (id_entity, "domainId", "class", "createDate", "modDa=
te", "delDate", status) VALUES (10160, 10, 6, '2005-06-03 13:42:40.382654=
', '2005-06-03 13:42:40.382654', NULL, NULL);
+INSERT INTO entity (id_entity, "domainId", "class", "createDate", "modDa=
te", "delDate", status) VALUES (10161, 10, 26, '2005-06-03 13:42:40.38265=
4', '2005-06-03 13:42:40.382654', NULL, NULL);
+INSERT INTO entity (id_entity, "domainId", "class", "createDate", "modDa=
te", "delDate", status) VALUES (10183, 10160, 13, '2005-06-03 13:49:23.35=
705', '2005-06-03 13:50:51.900709', NULL, NULL);
+INSERT INTO entity (id_entity, "domainId", "class", "createDate", "modDa=
te", "delDate", status) VALUES (10188, 10160, 13, '2005-06-03 13:51:06.95=
1818', '2005-06-03 13:51:06.951818', NULL, NULL);
+INSERT INTO entity (id_entity, "domainId", "class", "createDate", "modDa=
te", "delDate", status) VALUES (10191, 10160, 1011, '2005-06-03 13:52:08.=
746904', '2005-06-03 14:00:51.690467', NULL, NULL);
+INSERT INTO entity (id_entity, "domainId", "class", "createDate", "modDa=
te", "delDate", status) VALUES (10180, 10160, 1011, '2005-06-03 13:49:03.=
157439', '2005-06-03 14:01:03.294255', NULL, NULL);
+INSERT INTO entity (id_entity, "domainId", "class", "createDate", "modDa=
te", "delDate", status) VALUES (10213, 10160, 2, '2005-06-03 14:01:25.703=
696', '2005-06-03 14:01:25.703696', NULL, NULL);
+INSERT INTO entity (id_entity, "domainId", "class", "createDate", "modDa=
te", "delDate", status) VALUES (10217, 10160, 8, '2005-06-03 14:02:01.815=
791', '2005-06-03 14:02:01.815791', NULL, NULL);
+INSERT INTO entity (id_entity, "domainId", "class", "createDate", "modDa=
te", "delDate", status) VALUES (10211, 10160, 1400, '2005-06-03 14:00:13.=
606343', '2005-06-03 14:09:25.558326', NULL, NULL);
+INSERT INTO entity (id_entity, "domainId", "class", "createDate", "modDa=
te", "delDate", status) VALUES (10169, 10160, 13, '2005-06-03 13:45:57.32=
3388', '2005-06-03 14:22:30.991451', NULL, NULL);
+INSERT INTO entity (id_entity, "domainId", "class", "createDate", "modDa=
te", "delDate", status) VALUES (10168, 10160, 8, '2005-06-03 13:45:43.336=
775', '2005-06-03 14:25:37.287955', NULL, NULL);
+INSERT INTO entity (id_entity, "domainId", "class", "createDate", "modDa=
te", "delDate", status) VALUES (10208, 10160, 12, '2005-06-03 13:58:04.81=
2695', '2005-06-03 14:26:15.834796', NULL, NULL);
+INSERT INTO entity (id_entity, "domainId", "class", "createDate", "modDa=
te", "delDate", status) VALUES (10192, 10160, 81, '2005-06-03 13:52:32.32=
6281', '2005-06-03 14:28:15.268152', NULL, NULL);
+INSERT INTO entity (id_entity, "domainId", "class", "createDate", "modDa=
te", "delDate", status) VALUES (10229, 10160, 81, '2005-06-03 14:39:34.53=
7608', '2005-06-03 14:40:29.939294', NULL, NULL);
+INSERT INTO entity (id_entity, "domainId", "class", "createDate", "modDa=
te", "delDate", status) VALUES (10231, 10160, 81, '2005-06-03 14:42:01.61=
6166', '2005-06-03 14:42:19.932286', NULL, NULL);
+INSERT INTO entity (id_entity, "domainId", "class", "createDate", "modDa=
te", "delDate", status) VALUES (10182, 10160, 1011, '2005-06-03 13:49:16.=
240216', '2005-06-03 14:46:42.304934', NULL, NULL);
+INSERT INTO entity (id_entity, "domainId", "class", "createDate", "modDa=
te", "delDate", status) VALUES (10228, 10160, 1300, '2005-06-03 14:19:33.=
34587', '2005-06-03 14:53:13.709408', NULL, NULL);
+INSERT INTO entity (id_entity, "domainId", "class", "createDate", "modDa=
te", "delDate", status) VALUES (10234, 10160, 81, '2005-06-03 14:54:09.56=
251', '2005-06-03 14:54:09.56251', NULL, NULL);
+INSERT INTO entity (id_entity, "domainId", "class", "createDate", "modDa=
te", "delDate", status) VALUES (10167, 10160, 1011, '2005-06-03 13:45:32.=
65888', '2005-06-03 14:55:26.309087', NULL, NULL);
+INSERT INTO entity (id_entity, "domainId", "class", "createDate", "modDa=
te", "delDate", status) VALUES (10187, 10160, 81, '2005-06-03 13:50:34.47=
0391', '2005-06-03 14:56:52.144244', NULL, NULL);
+INSERT INTO entity (id_entity, "domainId", "class", "createDate", "modDa=
te", "delDate", status) VALUES (10162, 10160, 2, '2005-06-03 13:43:27.916=
665', '2005-06-03 13:43:27.916665', NULL, NULL);
+INSERT INTO entity (id_entity, "domainId", "class", "createDate", "modDa=
te", "delDate", status) VALUES (10163, 10160, 2, '2005-06-03 13:43:46.308=
109', '2005-06-03 13:43:46.308109', NULL, NULL);
+INSERT INTO entity (id_entity, "domainId", "class", "createDate", "modDa=
te", "delDate", status) VALUES (10165, 10160, 2, '2005-06-03 13:45:18.909=
72', '2005-06-03 13:45:18.90972', NULL, NULL);
+INSERT INTO entity (id_entity, "domainId", "class", "createDate", "modDa=
te", "delDate", status) VALUES (10166, 10160, 8, '2005-06-03 13:45:32.568=
103', '2005-06-03 13:45:32.568103', NULL, NULL);
+INSERT INTO entity (id_entity, "domainId", "class", "createDate", "modDa=
te", "delDate", status) VALUES (10179, 10160, 8, '2005-06-03 13:49:03.037=
233', '2005-06-03 13:49:03.037233', NULL, NULL);
+INSERT INTO entity (id_entity, "domainId", "class", "createDate", "modDa=
te", "delDate", status) VALUES (10189, 10160, 2, '2005-06-03 13:51:55.936=
952', '2005-06-03 13:51:55.936952', NULL, NULL);
+INSERT INTO entity (id_entity, "domainId", "class", "createDate", "modDa=
te", "delDate", status) VALUES (10190, 10160, 8, '2005-06-03 13:52:08.663=
398', '2005-06-03 13:52:08.663398', NULL, NULL);
+INSERT INTO entity (id_entity, "domainId", "class", "createDate", "modDa=
te", "delDate", status) VALUES (10171, 10160, 1011, '2005-06-03 13:46:14.=
711256', '2005-06-03 14:11:48.27411', NULL, NULL);
+INSERT INTO entity (id_entity, "domainId", "class", "createDate", "modDa=
te", "delDate", status) VALUES (10218, 10160, 1011, '2005-06-03 14:02:01.=
896462', '2005-06-03 14:12:17.918998', NULL, NULL);
+INSERT INTO entity (id_entity, "domainId", "class", "createDate", "modDa=
te", "delDate", status) VALUES (10216, 10160, 1011, '2005-06-03 14:01:49.=
2393', '2005-06-03 14:12:32.141613', NULL, NULL);
+INSERT INTO entity (id_entity, "domainId", "class", "createDate", "modDa=
te", "delDate", status) VALUES (10207, 10160, 12, '2005-06-03 13:57:45.49=
2882', '2005-06-03 14:22:45.989972', NULL, NULL);
+INSERT INTO entity (id_entity, "domainId", "class", "createDate", "modDa=
te", "delDate", status) VALUES (10181, 10160, 8, '2005-06-03 13:49:16.159=
46', '2005-06-03 14:26:07.052118', NULL, NULL);
+INSERT INTO entity (id_entity, "domainId", "class", "createDate", "modDa=
te", "delDate", status) VALUES (10209, 10160, 12, '2005-06-03 13:58:16.05=
7463', '2005-06-03 14:28:37.025827', NULL, NULL);
+INSERT INTO entity (id_entity, "domainId", "class", "createDate", "modDa=
te", "delDate", status) VALUES (10212, 10160, 1400, '2005-06-03 14:00:21.=
580172', '2005-06-03 14:41:01.392034', NULL, NULL);
+INSERT INTO entity (id_entity, "domainId", "class", "createDate", "modDa=
te", "delDate", status) VALUES (10227, 10160, 1011, '2005-06-03 14:14:50.=
273608', '2005-06-03 14:46:50.975127', NULL, NULL);
+INSERT INTO entity (id_entity, "domainId", "class", "createDate", "modDa=
te", "delDate", status) VALUES (10226, 10160, 1011, '2005-06-03 14:14:03.=
451426', '2005-06-03 14:46:59.017467', NULL, NULL);
+INSERT INTO entity (id_entity, "domainId", "class", "createDate", "modDa=
te", "delDate", status) VALUES (10210, 10160, 1400, '2005-06-03 14:00:06.=
409507', '2005-06-03 14:53:42.120173', NULL, NULL);
+INSERT INTO entity (id_entity, "domainId", "class", "createDate", "modDa=
te", "delDate", status) VALUES (10193, 10160, 39, '2005-06-03 13:52:55.97=
5696', '2005-06-03 14:56:44.293002', NULL, NULL);
+INSERT INTO entity (id_entity, "domainId", "class", "createDate", "modDa=
te", "delDate", status) VALUES (10194, 10160, 10163, '2005-06-03 13:53:51=
.821092', '2005-06-03 13:53:51.821092', NULL, NULL);
+INSERT INTO entity (id_entity, "domainId", "class", "createDate", "modDa=
te", "delDate", status) VALUES (10195, 10160, 10163, '2005-06-03 13:53:59=
.706222', '2005-06-03 13:53:59.706222', NULL, NULL);
+INSERT INTO entity (id_entity, "domainId", "class", "createDate", "modDa=
te", "delDate", status) VALUES (10196, 10160, 10189, '2005-06-03 13:54:17=
.310243', '2005-06-03 13:54:17.310243', NULL, NULL);
+INSERT INTO entity (id_entity, "domainId", "class", "createDate", "modDa=
te", "delDate", status) VALUES (10197, 10160, 10189, '2005-06-03 13:54:46=
.136202', '2005-06-03 13:54:46.136202', NULL, NULL);
+INSERT INTO entity (id_entity, "domainId", "class", "createDate", "modDa=
te", "delDate", status) VALUES (10198, 10160, 10189, '2005-06-03 13:54:53=
.731381', '2005-06-03 13:54:53.731381', NULL, NULL);
+INSERT INTO entity (id_entity, "domainId", "class", "createDate", "modDa=
te", "delDate", status) VALUES (10199, 10160, 10189, '2005-06-03 13:55:04=
.593734', '2005-06-03 13:55:04.593734', NULL, NULL);
+INSERT INTO entity (id_entity, "domainId", "class", "createDate", "modDa=
te", "delDate", status) VALUES (10200, 10160, 10189, '2005-06-03 13:55:17=
.971074', '2005-06-03 13:55:17.971074', NULL, NULL);
+INSERT INTO entity (id_entity, "domainId", "class", "createDate", "modDa=
te", "delDate", status) VALUES (10201, 10160, 10189, '2005-06-03 13:55:41=
.042234', '2005-06-03 13:55:41.042234', NULL, NULL);
+INSERT INTO entity (id_entity, "domainId", "class", "createDate", "modDa=
te", "delDate", status) VALUES (10202, 10160, 10189, '2005-06-03 13:55:49=
.192745', '2005-06-03 13:55:49.192745', NULL, NULL);
+INSERT INTO entity (id_entity, "domainId", "class", "createDate", "modDa=
te", "delDate", status) VALUES (10203, 10160, 10189, '2005-06-03 13:56:15=
.128508', '2005-06-03 13:56:15.128508', NULL, NULL);
+INSERT INTO entity (id_entity, "domainId", "class", "createDate", "modDa=
te", "delDate", status) VALUES (10204, 10160, 10189, '2005-06-03 13:56:25=
.237106', '2005-06-03 13:56:25.237106', NULL, NULL);
+INSERT INTO entity (id_entity, "domainId", "class", "createDate", "modDa=
te", "delDate", status) VALUES (10205, 10160, 10189, '2005-06-03 13:56:36=
.198424', '2005-06-03 13:56:36.198424', NULL, NULL);
+INSERT INTO entity (id_entity, "domainId", "class", "createDate", "modDa=
te", "delDate", status) VALUES (10206, 10160, 10189, '2005-06-03 13:56:46=
.303592', '2005-06-03 13:56:46.303592', NULL, NULL);
+INSERT INTO entity (id_entity, "domainId", "class", "createDate", "modDa=
te", "delDate", status) VALUES (10221, 10160, 10213, '2005-06-03 14:03:01=
.731759', '2005-06-03 14:03:01.731759', NULL, NULL);
+INSERT INTO entity (id_entity, "domainId", "class", "createDate", "modDa=
te", "delDate", status) VALUES (10222, 10160, 10213, '2005-06-03 14:03:11=
.262688', '2005-06-03 14:03:11.262688', NULL, NULL);
+INSERT INTO entity (id_entity, "domainId", "class", "createDate", "modDa=
te", "delDate", status) VALUES (10223, 10160, 10213, '2005-06-03 14:03:19=
.212243', '2005-06-03 14:03:19.212243', NULL, NULL);
+INSERT INTO entity (id_entity, "domainId", "class", "createDate", "modDa=
te", "delDate", status) VALUES (10224, 10160, 10213, '2005-06-03 14:03:27=
.729589', '2005-06-03 14:03:27.729589', NULL, NULL);
+INSERT INTO entity (id_entity, "domainId", "class", "createDate", "modDa=
te", "delDate", status) VALUES (10225, 10160, 10213, '2005-06-03 14:03:34=
.714994', '2005-06-03 14:03:34.714994', NULL, NULL);
+INSERT INTO entity (id_entity, "domainId", "class", "createDate", "modDa=
te", "delDate", status) VALUES (10233, 10160, 10162, '2005-06-03 14:48:54=
.39211', '2005-06-03 14:48:54.809633', NULL, NULL);
+INSERT INTO entity (id_entity, "domainId", "class", "createDate", "modDa=
te", "delDate", status) VALUES (10235, 10160, 10165, '2005-06-03 14:54:50=
.088007', '2005-06-03 14:55:44.129858', NULL, NULL);
+INSERT INTO entity (id_entity, "domainId", "class", "createDate", "modDa=
te", "delDate", status) VALUES (10232, 10160, 10162, '2005-06-03 14:43:15=
.241259', '2005-06-03 14:57:13.749824', NULL, NULL);
+
+
+INSERT INTO attribute (id_entity, "classId", "sysAttName", "attName", "o=
rder", "isObligatory", "isActive", "isSearchable", "isEditable", "isSelfL=
ookup", "isPrimary", "isUnique", "isVirtual", "descAtt", protection, disp=
lay) VALUES (10183, 10162, 'c10162Detail', 'Problem Detail', 0.00, false,=
true, false, true, false, false, false, false, NULL, false, NULL);
+INSERT INTO attribute (id_entity, "classId", "sysAttName", "attName", "o=
rder", "isObligatory", "isActive", "isSearchable", "isEditable", "isSelfL=
ookup", "isPrimary", "isUnique", "isVirtual", "descAtt", protection, disp=
lay) VALUES (10188, 10162, 'c10162Solution Detail', 'Solution Detail', 0.=
00, false, true, false, true, false, false, false, false, NULL, false, NU=
LL);
+INSERT INTO attribute (id_entity, "classId", "sysAttName", "attName", "o=
rder", "isObligatory", "isActive", "isSearchable", "isEditable", "isSelfL=
ookup", "isPrimary", "isUnique", "isVirtual", "descAtt", protection, disp=
lay) VALUES (10217, 10213, 'c10213Type Name', 'Type Name', 0.00, false, t=
rue, false, true, false, true, false, false, NULL, false, NULL);
+INSERT INTO attribute (id_entity, "classId", "sysAttName", "attName", "o=
rder", "isObligatory", "isActive", "isSearchable", "isEditable", "isSelfL=
ookup", "isPrimary", "isUnique", "isVirtual", "descAtt", protection, disp=
lay) VALUES (10169, 10165, 'c10165Details', 'Details', 10.00, false, true=
, false, true, false, false, false, false, NULL, false, NULL);
+INSERT INTO attribute (id_entity, "classId", "sysAttName", "attName", "o=
rder", "isObligatory", "isActive", "isSearchable", "isEditable", "isSelfL=
ookup", "isPrimary", "isUnique", "isVirtual", "descAtt", protection, disp=
lay) VALUES (10168, 10165, 'c10165Serial Nr.', 'Serial Nr.', 4.00, false,=
true, false, true, false, false, false, false, NULL, false, NULL);
+INSERT INTO attribute (id_entity, "classId", "sysAttName", "attName", "o=
rder", "isObligatory", "isActive", "isSearchable", "isEditable", "isSelfL=
ookup", "isPrimary", "isUnique", "isVirtual", "descAtt", protection, disp=
lay) VALUES (10208, 10162, 'c10162Date', 'Date', -9.00, false, true, fals=
e, true, false, false, false, false, NULL, false, NULL);
+INSERT INTO attribute (id_entity, "classId", "sysAttName", "attName", "o=
rder", "isObligatory", "isActive", "isSearchable", "isEditable", "isSelfL=
ookup", "isPrimary", "isUnique", "isVirtual", "descAtt", protection, disp=
lay) VALUES (10192, 10162, 'c10162Problem Type', 'Problem Type', -4.00, f=
alse, true, false, true, false, false, false, false, NULL, false, NULL);
+INSERT INTO attribute (id_entity, "classId", "sysAttName", "attName", "o=
rder", "isObligatory", "isActive", "isSearchable", "isEditable", "isSelfL=
ookup", "isPrimary", "isUnique", "isVirtual", "descAtt", protection, disp=
lay) VALUES (10229, 10162, 'c10162Request by1', 'Request by', -5.00, fals=
e, true, true, true, false, false, false, false, NULL, false, NULL);
+INSERT INTO attribute (id_entity, "classId", "sysAttName", "attName", "o=
rder", "isObligatory", "isActive", "isSearchable", "isEditable", "isSelfL=
ookup", "isPrimary", "isUnique", "isVirtual", "descAtt", protection, disp=
lay) VALUES (10231, 10162, 'c10162Assigned to3', 'Assigned to', 0.00, fal=
se, true, true, true, false, false, false, false, NULL, false, NULL);
+INSERT INTO attribute (id_entity, "classId", "sysAttName", "attName", "o=
rder", "isObligatory", "isActive", "isSearchable", "isEditable", "isSelfL=
ookup", "isPrimary", "isUnique", "isVirtual", "descAtt", protection, disp=
lay) VALUES (10234, 10165, 'c10165User1', 'User', 0.00, false, true, true=
, true, false, false, false, false, NULL, false, NULL);
+INSERT INTO attribute (id_entity, "classId", "sysAttName", "attName", "o=
rder", "isObligatory", "isActive", "isSearchable", "isEditable", "isSelfL=
ookup", "isPrimary", "isUnique", "isVirtual", "descAtt", protection, disp=
lay) VALUES (10187, 10162, 'c10162Status', 'Status', 15.00, false, true, =
false, true, false, false, false, false, NULL, false, NULL);
+INSERT INTO attribute (id_entity, "classId", "sysAttName", "attName", "o=
rder", "isObligatory", "isActive", "isSearchable", "isEditable", "isSelfL=
ookup", "isPrimary", "isUnique", "isVirtual", "descAtt", protection, disp=
lay) VALUES (10166, 10165, 'c10165Name', 'Name', 0.00, false, true, false=
, true, false, true, false, false, NULL, false, NULL);
+INSERT INTO attribute (id_entity, "classId", "sysAttName", "attName", "o=
rder", "isObligatory", "isActive", "isSearchable", "isEditable", "isSelfL=
ookup", "isPrimary", "isUnique", "isVirtual", "descAtt", protection, disp=
lay) VALUES (10179, 10163, 'c10163Status Name', 'Status Name', 0.00, fals=
e, true, false, true, false, true, false, false, NULL, false, NULL);
+INSERT INTO attribute (id_entity, "classId", "sysAttName", "attName", "o=
rder", "isObligatory", "isActive", "isSearchable", "isEditable", "isSelfL=
ookup", "isPrimary", "isUnique", "isVirtual", "descAtt", protection, disp=
lay) VALUES (10190, 10189, 'c10189Problem Type', 'Problem Type', 0.00, fa=
lse, true, false, true, false, true, false, false, NULL, false, NULL);
+INSERT INTO attribute (id_entity, "classId", "sysAttName", "attName", "o=
rder", "isObligatory", "isActive", "isSearchable", "isEditable", "isSelfL=
ookup", "isPrimary", "isUnique", "isVirtual", "descAtt", protection, disp=
lay) VALUES (10207, 10165, 'c10165Purchase Data', 'Purchase Date', 5.00, =
false, true, false, true, false, false, false, false, NULL, false, NULL);
+INSERT INTO attribute (id_entity, "classId", "sysAttName", "attName", "o=
rder", "isObligatory", "isActive", "isSearchable", "isEditable", "isSelfL=
ookup", "isPrimary", "isUnique", "isVirtual", "descAtt", protection, disp=
lay) VALUES (10181, 10162, 'c10162Title', 'Title', -10.00, false, true, f=
alse, true, false, true, false, false, NULL, false, NULL);
+INSERT INTO attribute (id_entity, "classId", "sysAttName", "attName", "o=
rder", "isObligatory", "isActive", "isSearchable", "isEditable", "isSelfL=
ookup", "isPrimary", "isUnique", "isVirtual", "descAtt", protection, disp=
lay) VALUES (10209, 10162, 'c10162Resolution Date', 'Resolution Date', 8.=
00, false, true, false, true, false, false, false, false, NULL, false, NU=
LL);
+INSERT INTO attribute (id_entity, "classId", "sysAttName", "attName", "o=
rder", "isObligatory", "isActive", "isSearchable", "isEditable", "isSelfL=
ookup", "isPrimary", "isUnique", "isVirtual", "descAtt", protection, disp=
lay) VALUES (10193, 10162, 'c10162Attachment', 'Attachment', 20.00, false=
, true, false, true, false, false, false, false, NULL, false, NULL);
+
+
+INSERT INTO "dateTime" (id_entity, format, "dispHours", custom) VALUES (=
10207, NULL, NULL, NULL);
+INSERT INTO "dateTime" (id_entity, format, "dispHours", custom) VALUES (=
10208, NULL, NULL, NULL);
+INSERT INTO "dateTime" (id_entity, format, "dispHours", custom) VALUES (=
10209, NULL, NULL, NULL);
+
+
+INSERT INTO file (id_entity, maxsize, path, extensions, link) VALUES (10=
193, 100000, NULL, NULL, true);
+
+
+INSERT INTO folder (id_entity, "folderName", "folderParent", "folderForm=
s") VALUES (10211, 'Assets', 0, '10167');
+INSERT INTO folder (id_entity, "folderName", "folderParent", "folderForm=
s") VALUES (10212, 'Users and Setup', 0, '10191,10180,10218');
+INSERT INTO folder (id_entity, "folderName", "folderParent", "folderForm=
s") VALUES (10210, 'Tickets', 0, '10227,10226');
+
+
+INSERT INTO pertinence (id_entity, "owner", "to", ratio, "parentPertinen=
ce", "visualAttrib", "filterView") VALUES (10192, 10192, 10189, 'n:1', NU=
LL, NULL, NULL);
+INSERT INTO pertinence (id_entity, "owner", "to", ratio, "parentPertinen=
ce", "visualAttrib", "filterView") VALUES (10229, 10229, 7, 'n:1', NULL, =
NULL, NULL);
+INSERT INTO pertinence (id_entity, "owner", "to", ratio, "parentPertinen=
ce", "visualAttrib", "filterView") VALUES (10231, 10231, 7, 'n:1', NULL, =
NULL, NULL);
+INSERT INTO pertinence (id_entity, "owner", "to", ratio, "parentPertinen=
ce", "visualAttrib", "filterView") VALUES (10234, 10234, 7, 'n:1', NULL, =
NULL, NULL);
+INSERT INTO pertinence (id_entity, "owner", "to", ratio, "parentPertinen=
ce", "visualAttrib", "filterView") VALUES (10187, 10187, 10163, 'n:1', NU=
LL, NULL, NULL);
+
+
+INSERT INTO report (id_entity, columns, "where", groupby, "having", "ord=
er", "idClassReport", "reportName") VALUES (10228, '10181|1,10187^10179',=
NULL, '10187^10179', NULL, NULL, 10162, 'Tickets by Assignment');
+
+
+INSERT INTO text (id_entity, "rows", cols, "isHtml") VALUES (10183, 7, 3=
0, false);
+INSERT INTO text (id_entity, "rows", cols, "isHtml") VALUES (10188, 7, 3=
0, false);
+INSERT INTO text (id_entity, "rows", cols, "isHtml") VALUES (10169, 7, 3=
0, false);
+
+
+INSERT INTO textline (id_entity, "maxLength", "minLength", "defaultText"=
, "dispSize") VALUES (10166, 20, NULL, NULL, NULL);
+INSERT INTO textline (id_entity, "maxLength", "minLength", "defaultText"=
, "dispSize") VALUES (10179, 20, NULL, NULL, NULL);
+INSERT INTO textline (id_entity, "maxLength", "minLength", "defaultText"=
, "dispSize") VALUES (10190, 20, NULL, NULL, NULL);
+INSERT INTO textline (id_entity, "maxLength", "minLength", "defaultText"=
, "dispSize") VALUES (10217, 20, NULL, NULL, NULL);
+INSERT INTO textline (id_entity, "maxLength", "minLength", "defaultText"=
, "dispSize") VALUES (10168, 20, NULL, NULL, NULL);
+INSERT INTO textline (id_entity, "maxLength", "minLength", "defaultText"=
, "dispSize") VALUES (10181, 20, NULL, NULL, NULL);
+
+
+INSERT INTO "view" (id_entity, columns, "where", groupby, "having", "ord=
er", "idClassView", "viewName") VALUES (10218, '0,10217', NULL, NULL, NUL=
L, NULL, 10213, 'Asset Type Pick List');
+INSERT INTO "view" (id_entity, columns, "where", groupby, "having", "ord=
er", "idClassView", "viewName") VALUES (10227, '0,10181,10208,10231^18,10=
209', '10187^10179|7|''closed''|0|0', NULL, NULL, NULL, 10162, 'Closed Ti=
ckets');
+INSERT INTO "view" (id_entity, columns, "where", groupby, "having", "ord=
er", "idClassView", "viewName") VALUES (10226, '0,10181,10208,10231^18,10=
187^10179', '10187^10179|7|''open''|0|0', NULL, NULL, NULL, 10162, 'Open =
Tickets');
+INSERT INTO "view" (id_entity, columns, "where", groupby, "having", "ord=
er", "idClassView", "viewName") VALUES (10191, '0,10190', NULL, NULL, NUL=
L, NULL, 10189, 'Problem Type Pick List');
+INSERT INTO "view" (id_entity, columns, "where", groupby, "having", "ord=
er", "idClassView", "viewName") VALUES (10180, '0,10179', NULL, NULL, NUL=
L, NULL, 10163, 'Ticket Status Pick List');
+INSERT INTO "view" (id_entity, columns, "where", groupby, "having", "ord=
er", "idClassView", "viewName") VALUES (10182, '0,10181,10208,10231^18,10=
187^10179', NULL, NULL, NULL, NULL, 10162, 'All Tickets');
+INSERT INTO "view" (id_entity, columns, "where", groupby, "having", "ord=
er", "idClassView", "viewName") VALUES (10167, '0,10166,10168,10207,10169=
', NULL, NULL, NULL, NULL, 10165, 'All Assets');
+
+
+INSERT INTO "d10160cAsset" (id_entity, "c10165Name", "c10165Serial Nr.",=
"c10165Details", "c10165User", "c10165Purchase Data", "c10165User1") VAL=
UES (10235, 'PC Work Station', '453345345', 'Dell Work Station with Monit=
or VisewSonic 14F', NULL, '2005-06-14 00:00:00', 110);
+
+INSERT INTO "d10160cAsset Type" (id_entity, "c10213Type Name") VALUES (1=
0221, 'PC Work Station');
+INSERT INTO "d10160cAsset Type" (id_entity, "c10213Type Name") VALUES (1=
0222, 'PC Notebook');
+INSERT INTO "d10160cAsset Type" (id_entity, "c10213Type Name") VALUES (1=
0223, 'Monitor');
+INSERT INTO "d10160cAsset Type" (id_entity, "c10213Type Name") VALUES (1=
0224, 'Printer');
+INSERT INTO "d10160cAsset Type" (id_entity, "c10213Type Name") VALUES (1=
0225, 'Other');
+
+
+INSERT INTO "d10160cProblem Type" (id_entity, "c10189Problem Type") VALU=
ES (10196, 'Conectivity');
+INSERT INTO "d10160cProblem Type" (id_entity, "c10189Problem Type") VALU=
ES (10197, 'Bug');
+INSERT INTO "d10160cProblem Type" (id_entity, "c10189Problem Type") VALU=
ES (10198, 'Crash');
+INSERT INTO "d10160cProblem Type" (id_entity, "c10189Problem Type") VALU=
ES (10199, 'Priniting');
+INSERT INTO "d10160cProblem Type" (id_entity, "c10189Problem Type") VALU=
ES (10200, 'System Start-up');
+INSERT INTO "d10160cProblem Type" (id_entity, "c10189Problem Type") VALU=
ES (10201, 'Audio Visual');
+INSERT INTO "d10160cProblem Type" (id_entity, "c10189Problem Type") VALU=
ES (10202, 'Virus');
+INSERT INTO "d10160cProblem Type" (id_entity, "c10189Problem Type") VALU=
ES (10203, 'eMail');
+INSERT INTO "d10160cProblem Type" (id_entity, "c10189Problem Type") VALU=
ES (10204, 'Software - Windows');
+INSERT INTO "d10160cProblem Type" (id_entity, "c10189Problem Type") VALU=
ES (10205, 'Software - Office');
+INSERT INTO "d10160cProblem Type" (id_entity, "c10189Problem Type") VALU=
ES (10206, 'Software - Outlook');
+
+
+INSERT INTO "d10160cTicket" (id_entity, "c10162Title", "c10162Detail", "=
c10162Request by", "c10162Assigned to", "c10162Assigned to1", "c10162Stat=
us", "c10162Solution Detail", "c10162Problem Type", "c10162Attachment", "=
c10162Date", "c10162Resolution Date", "c10162Request by1", "c10162Assigne=
d to2", "c10162Assigned to3") VALUES (10233, 'Internet Down', 'User can n=
ot connect to the Internet', NULL, NULL, NULL, 10194, NULL, 10196, NULL, =
'2005-06-03 00:00:00', '2005-06-03 00:00:00', 110, NULL, 110);
+INSERT INTO "d10160cTicket" (id_entity, "c10162Title", "c10162Detail", "=
c10162Request by", "c10162Assigned to", "c10162Assigned to1", "c10162Stat=
us", "c10162Solution Detail", "c10162Problem Type", "c10162Attachment", "=
c10162Date", "c10162Resolution Date", "c10162Request by1", "c10162Assigne=
d to2", "c10162Assigned to3") VALUES (10232, 'PC does not startup', 'PC d=
oes not startup', NULL, NULL, NULL, 10195, 'PC was not plugged in. I plug=
ged in the PC. Now the PC works fine. User happy.', 10200, NULL, '2005-06=
-03 00:00:00', '2005-06-03 00:00:00', 110, NULL, 110);
+
+
+INSERT INTO "d10160cTicket Status" (id_entity, "c10163Status Name") VALU=
ES (10194, 'open');
+INSERT INTO "d10160cTicket Status" (id_entity, "c10163Status Name") VALU=
ES (10195, 'closed');
+
+
+ALTER TABLE ONLY "d10160cAsset Type"
+ ADD CONSTRAINT "d10160cAsset Type_pkey" PRIMARY KEY (id_entity);
+
+ALTER TABLE ONLY "d10160cAsset"
+ ADD CONSTRAINT "d10160cAsset_pkey" PRIMARY KEY (id_entity);
+
+
+
+ALTER TABLE ONLY "d10160cProblem Type"
+ ADD CONSTRAINT "d10160cProblem Type_pkey" PRIMARY KEY (id_entity);
+
+
+ALTER TABLE ONLY "d10160cTicket Status"
+ ADD CONSTRAINT "d10160cTicket Status_pkey" PRIMARY KEY (id_entity);
+
+
+ALTER TABLE ONLY "d10160cTicket"
+ ADD CONSTRAINT "d10160cTicket_pkey" PRIMARY KEY (id_entity);
+
+
|
|
From: <sv...@de...> - 2005-06-03 23:47:00
|
Author: marcelo Date: 2005-06-03 19:47:02 -0400 (Fri, 03 Jun 2005) New Revision: 1243 Removed: humano2/tags/5.0.beta4/ Log: not quite ready |
|
From: <sv...@de...> - 2005-06-03 23:46:31
|
Author: marcelo Date: 2005-06-03 19:46:32 -0400 (Fri, 03 Jun 2005) New Revision: 1242 Added: humano2/tags/ Log: made a copy Copied: humano2/tags (from rev 1240, humano2/tags) |
|
From: <sv...@de...> - 2005-06-03 23:44:16
|
Author: marcelo Date: 2005-06-03 19:44:19 -0400 (Fri, 03 Jun 2005) New Revision: 1241 Removed: humano2/tags/ Log: forgot stuff |
|
From: <sv...@de...> - 2005-06-03 23:42:47
|
Author: marcelo
Date: 2005-06-03 19:42:40 -0400 (Fri, 03 Jun 2005)
New Revision: 1240
Added:
humano2/tags/5.0.beta4/
Log:
=3D=3D 5.0.beta4 - 2005-06-02 =3D=3D
* Databases
* Changed paging logic in ViewTools so that it works in MsSql
* This last change means that Postgresql V.8 has to used=20
* Caching was implemented to minimize calls to the DB
* Metamodel=20
* Added new attribute types of attributes:
- File
* Portal
* Image upload is now soported and the images will be displayed in ins=
tance.aspx
* Views which have multiple column with the same no longer crash
=20
Copied: humano2/tags/5.0.beta4 (from rev 1239, humano2/trunk)
|
|
From: <sv...@de...> - 2005-06-03 23:36:01
|
Author: marcelo
Date: 2005-06-03 19:35:57 -0400 (Fri, 03 Jun 2005)
New Revision: 1239
Modified:
humano2/trunk/changelog.txt
humano2/trunk/components/viewTools/ViewTools.cs
Log:
* Adding changelog for release 5.0.beta4
* fixed code so search does not crash, still exists a problem with retur=
ns columns.
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-06-03 21:52:06 UTC (rev 1238)
+++ humano2/trunk/changelog.txt 2005-06-03 23:35:57 UTC (rev 1239)
@@ -1,5 +1,21 @@
$Id$
=20
+=3D=3D 5.0.beta4 - 2005-06-02 =3D=3D
+
+ * Databases
+ * Changed paging logic in ViewTools so that it works in MsSql
+ * This last change means that Postgresql V.8 has to used=20
+ * Caching was implemented to minimize calls to the DB
+ =20
+ * Metamodel=20
+ * Added new attribute types of attributes:
+ - File
+
+ * Portal
+ * Image upload is now soported and the images will be displayed in in=
stance.aspx
+ * Views which have multiple column with the same no longer crash
+ =20
+
=3D=3D 5.0.beta3 - 2005-05-27 =3D=3D
=20
* Databases
Modified: humano2/trunk/components/viewTools/ViewTools.cs
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- humano2/trunk/components/viewTools/ViewTools.cs 2005-06-03 21:52:06 U=
TC (rev 1238)
+++ humano2/trunk/components/viewTools/ViewTools.cs 2005-06-03 23:35:57 U=
TC (rev 1239)
@@ -478,15 +478,22 @@
=09
Query.Append("SELECT ");
int loop =3D 0;
+ Hashtable selCols =3D Hashtable.Synchronized( new Hashtable() );
foreach(DisplayOrder var in disp)
{
var.Text.Substring(var.Text.IndexOf(".") + 1,var.Text.Length - var.T=
ext.IndexOf(",") - 1);
int begin =3D var.Text.IndexOf(".")+1;
int end =3D var.Text.IndexOf(",",begin);
string field =3D var.Text.Substring(begin,end - begin);
- if ( field =3D=3D "id_entity" && loop > 0)
- var.Text =3D var.Text.Substring(0, end) + " as " + field + loop.T=
oString() + ", ";
-
+ if (selCols.ContainsKey(field))
+ {
+ field =3D field.Replace("\"","");
+ var.Text =3D var.Text.Substring(0, end) + " as \"" + field + loop.=
ToString() + "\", ";
+ }
+ else
+ {
+ selCols.Add(field, "1");
+ }
Query.Append(var.Text);
loop+=3D1;
}
|
|
From: <sv...@de...> - 2005-06-03 21:52:12
|
Author: pcamacho
Date: 2005-06-03 17:52:06 -0400 (Fri, 03 Jun 2005)
New Revision: 1238
Modified:
humano2/trunk/web/portal/site/createInstance.aspx.cs
Log:
CHANGE: when creating an instance, the user is now redirected to the page=
showing all attributes value of this=20
instance (instead of the view by default).
Modified: humano2/trunk/web/portal/site/createInstance.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/createInstance.aspx.cs 2005-06-03 21:36=
:15 UTC (rev 1237)
+++ humano2/trunk/web/portal/site/createInstance.aspx.cs 2005-06-03 21:52=
:06 UTC (rev 1238)
@@ -41,7 +41,7 @@
// El idEntity es la classId dado que estamos creando una instancia d=
el ID de id_entity
// no la clase de la clase (it's confusing, but makes sence in the en=
d.)
int classId =3D Convert.ToInt32(Request.Params["id_entity"]);
- int idview =3D Convert.ToInt32(Request.Params["idview"]);
+ //int idview =3D Convert.ToInt32(Request.Params["idview"]);
=20
int domainId =3D Convert.ToInt32(Request.Params["domainIdClass"]);
=20
@@ -68,19 +68,7 @@
}
}
=09
- //Response.End();
-
- int defaultViewId =3D dbAdapter.getDefaultViewId(classId);
- =09
- if (idview=3D=3DclassId)
- {
- //HttpContext.Current.Response.Redirect(Html.genAbsoluteUrl("/portal=
/site/" + ViewPages.showViewPage + defaultViewId));
- HttpContext.Current.Response.Redirect(Html.genAbsoluteUrl("/portal/s=
ite/Data_structured.aspx?id_entity=3D" + defaultViewId + "&classId=3D"+cl=
assId));
- }
- else
- {
- HttpContext.Current.Response.Redirect(Html.genAbsoluteUrl("/portal/s=
ite/Data_structured.aspx?id_entity=3D" + idview + "&classId=3D"+classId))=
;
- }
+ HttpContext.Current.Response.Redirect(Html.genAbsoluteUrl("/=
portal/site/Data_structured.aspx?id_entity=3D" + idEntity + "&classId=3D"=
+classId + "&action=3Dread" +"&display=3DreadXslt.aspx"));
}
=20
#region Web Form Designer generated code
|
|
From: <sv...@de...> - 2005-06-03 21:36:23
|
Author: pcamacho
Date: 2005-06-03 17:36:15 -0400 (Fri, 03 Jun 2005)
New Revision: 1237
Modified:
humano2/trunk/web/portal/site/xsl/leftbar.xsl
Log:
REMOVE: remove instance creation link in the leftbar.
Modified: humano2/trunk/web/portal/site/xsl/leftbar.xsl
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- humano2/trunk/web/portal/site/xsl/leftbar.xsl 2005-06-03 14:36:52 UTC=
(rev 1236)
+++ humano2/trunk/web/portal/site/xsl/leftbar.xsl 2005-06-03 21:36:15 UTC=
(rev 1237)
@@ -45,11 +45,14 @@
<xsl:value-of select=3D"urlCreate"/>
</xsl:variable>
=20
+ <!-- Later we will add the forms ins=
tead
var titleLink =3D 'Create instance of <xsl:value-of select=3D"$=
className" />';
var contentLink =3D '<xsl:value-of select=3D"$linkCreate"/>';
=20
<xsl:value-of select=3D"$classVarName" />.add(new WebFXTreeItem=
(titleLink,contentLink,'','img/webfxtree/crearinstance.jpeg'));
- <xsl:for-each select=3D"/views/links/link[classId =3D$classId]"=
>
+ -->
+ =20
+ <xsl:for-each select=3D"/views/links=
/link[classId =3D$classId]">
var content =3D '<xsl:value-of select=3D"href"/>';
var title =3D '<xsl:value-of select=3D"text"/>'
<xsl:value-of select=3D"$classVarName" />.add(new WebFXTreeIte=
m(title,content,'','img/webfxtree/view.jpeg'));
@@ -107,4 +110,4 @@
</body>
</html>
</xsl:template>
-</xsl:stylesheet>
\ No newline at end of file
+</xsl:stylesheet>
|
|
From: <sv...@de...> - 2005-06-03 14:37:02
|
Author: pcamacho
Date: 2005-06-03 10:36:52 -0400 (Fri, 03 Jun 2005)
New Revision: 1236
Modified:
humano2/trunk/web/portal/site/js/commonfunctions.js
humano2/trunk/web/portal/site/readXslt.aspx
Log:
FIX: bug #156. When pressing enter, we only submitted the form without do=
ing any checks... The target of form has=20
been put in html code (readXslt.aspx).
Modified: humano2/trunk/web/portal/site/js/commonfunctions.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/portal/site/js/commonfunctions.js 2005-06-02 23:26:=
52 UTC (rev 1235)
+++ humano2/trunk/web/portal/site/js/commonfunctions.js 2005-06-03 14:36:=
52 UTC (rev 1236)
@@ -1,3 +1,4 @@
+//FIXME I think I'm unuseful... Could you check and delete me?
function fn_doCheckValidString(strCheck)
{
var chrArray =3D " abcdefghijklmn?opqrstuvwxyzABCDEFGHIJKLMN?OPQRSTUVWX=
YZ.,;:-_{}()??!\\/=3D+*#$%&\n\r0123456789";
@@ -32,6 +33,8 @@
{
return str.replace(/^\s*|\s*$/g,"");
}
+
+//FIXME I think I'm unuseful... Could you check and delete me?
/*
*Obtain object array with all element's of some type, in especific tag
*/
@@ -51,6 +54,7 @@
}
return myArr;
}
+
/**
* Check every attributes: if one is incorrect, then raise an alert,
* put its name color to red, and do not submit
@@ -102,37 +106,50 @@
return formOk;
}
=20
-function saveInstance()
+
+/**
+ * Check the form before sending it
+ * @param enterPressed to know if the form has been sent by pressing ent=
er of clicking on "Save" button
+ * @return true if the check is ok, false if not (in this case the form =
is obviously not submitted)
+ */
+function saveInstance(enterPressed)
{
if(!checkForm())
- return;
+ {
+ return false;
+ }
=09
- document.MainForm.target=3D"mainFrame" =20
- document.MainForm.submit()
+ if(enterPressed !=3D true) //Button pressed
+ {
+ document.MainForm.submit();
+ }
+ else
+ {
+ return true; //Enter key was pressed =3D> so the form is automat=
ically sumbited =20
+ }
}
=20
-
-function ChangeBlockReclamo(objTab,ClassFrom,ClassTo,IdEntityFrom){
-var StrTables
-var StrTab,StrTabShort
- StrTables =3D document.getElementsByTagName('TABLE')
- for(i=3D0; i<StrTables.length;i++){
- if(StrTables[i].id!=3D''){
- StrTab =3D StrTables[i].id
- StrTabShort =3D StrTab.substr(0, 3)
- if(StrTabShort=3D=3D'Tab'){
- StrTables[i].className =3D "A-page3"
- }
- =09
- }=09
- }
-
-objTab.className =3D "A-page4"
-
-
-//document.frames['IframeObjRel'].location.href=3D"nothing.htm?classId=3D=
"+classId+"&IdEntity=3D"+IdEntity
-document.all.IframeObjRel.src=3D"viewrelations.aspx?ClassFrom=3D"+ClassF=
rom+"&Classto=3D"+ClassTo+"&IdEntityFrom=3D"+IdEntityFrom
-
+//FIXME : document me please
+function ChangeBlockReclamo(objTab,ClassFrom,ClassTo,IdEntityFrom)
+{
+ var StrTables;
+ var StrTab,StrTabShort;
+ StrTables =3D document.getElementsByTagName('TABLE');
+ for(i=3D0; i<StrTables.length;i++)
+ {
+ if(StrTables[i].id!=3D'')
+ {
+ StrTab =3D StrTables[i].id
+ StrTabShort =3D StrTab.substr(0, 3)
+ if(StrTabShort=3D=3D'Tab')
+ {
+ StrTables[i].className =3D "A-page3"
+ }
+ }=09
+ }
+ objTab.className =3D "A-page4"
+ //document.frames['IframeObjRel'].location.href=3D"nothing.htm?class=
Id=3D"+classId+"&IdEntity=3D"+IdEntity
+ document.all.IframeObjRel.src=3D"viewrelations.aspx?ClassFrom=3D"+Cl=
assFrom+"&Classto=3D"+ClassTo+"&IdEntityFrom=3D"+IdEntityFrom
}
=20
=20
Modified: humano2/trunk/web/portal/site/readXslt.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/readXslt.aspx 2005-06-02 23:26:52 UTC (=
rev 1235)
+++ humano2/trunk/web/portal/site/readXslt.aspx 2005-06-03 14:36:52 UTC (=
rev 1236)
@@ -45,8 +45,8 @@
}
</script>
</head>
- <body style=3D"MARGIN: 10px" text=3D"#000000" vLink=3D"#000=
000" aLink=3D"#000000" link=3D"#000000" bgColor=3D"#ffffff">
- <form method=3D"POST" name=3D"MainForm" enctype=3D"multi=
part/form-data">
+ <body style=3D"MARGIN: 10px" text=3D"#000000" vLink=3D"#000=
000" aLink=3D"#000000" link=3D"#000000" bgColor=3D"#ffffff" >
+ <form method=3D"POST" name=3D"MainForm" enctype=3D"multi=
part/form-data" target=3D"mainFrame" onsubmit=3D"return saveInstance(true=
)">
<xsl:attribute name=3D"action">
<xsl:if test=3D"/page/flagaction=3D'Create'">
<xsl:value-of select=3D"/page/action/create"=
/>
|
|
From: <sv...@de...> - 2005-06-02 23:26:54
|
Author: marcelo
Date: 2005-06-02 19:26:52 -0400 (Thu, 02 Jun 2005)
New Revision: 1235
Modified:
humano2/trunk/components/viewTools/ViewTools.cs
Log:
* Had forgoten to uncoment the code which uses the SQL Caching, we have =
to develop a better system for enabling/disabling the caching for debug r=
easons.
Modified: humano2/trunk/components/viewTools/ViewTools.cs
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- humano2/trunk/components/viewTools/ViewTools.cs 2005-06-02 23:09:51 U=
TC (rev 1234)
+++ humano2/trunk/components/viewTools/ViewTools.cs 2005-06-02 23:26:52 U=
TC (rev 1235)
@@ -679,7 +679,7 @@
string res =3D ViewCache.Instance().GetCachedStatement(objRow, PageVi=
ew) ;
if( res !=3D null )
{ // We got the cached datatable result. lets return that and not con=
struct a new one again.
-// UNCOMMENT THIS LINE return res;=20
+ return res;=20
}
=20
objArray =3D objRow.ItemArray;
@@ -751,7 +751,7 @@
=20
res =3D Query.ToString();
//Logger.Log("Query=3D" + res,LogLevel.Trace);
- // UNCOMMENT THIS ViewCache.Instance().AddStatement(objRow, res, Page=
View);
+ ViewCache.Instance().AddStatement(objRow, res, PageView);
=20
return res;
}
|
|
From: <sv...@de...> - 2005-06-02 23:09:59
|
Author: marcelo
Date: 2005-06-02 19:09:51 -0400 (Thu, 02 Jun 2005)
New Revision: 1234
Modified:
humano2/trunk/components/webTools/Adapter.cs
Log:
* Removed code (if statement) which turned of paging in case the driver =
being used was MsSql.
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-06-02 17:04:00 UTC =
(rev 1233)
+++ humano2/trunk/components/webTools/Adapter.cs 2005-06-02 23:09:51 UTC =
(rev 1234)
@@ -334,18 +334,16 @@
vtTable.Rows[0]["order"] =3D order; // Set the order with which are=
recovered the values.
}
=09
- if(Config.Instance().DataBase !=3D DataBaseEnum.MicrosoftSQL)
- { //FIXME: Microsoft SQL server no hace paging correctamente actualme=
nte.=20
- if(page !=3D 0)=20
- { =20
- 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;=20
- vt.PageView =3D page; // Set the current page
- }
+ if(page !=3D 0)=20
+ { =20
+ Logger.Log("ExecViewFromDataTable: page: " + page , LogLevel.Trace);
+ =09
+ vt.Page =3D 1; // Do Pageing
+ vt.RowsView =3D 20; // Number of rows per page.
+ //vt.RowsView =3D 2;=20
+ vt.PageView =3D page; // Set the current page
}
+
DataTable viewInstancesData =3D new DataTable();
=20
// Ejecuta el ViewTools y traye todos los valores en un dataTable.
|
|
From: <sv...@de...> - 2005-06-02 17:04:11
|
Author: marcelo
Date: 2005-06-02 13:04:00 -0400 (Thu, 02 Jun 2005)
New Revision: 1233
Modified:
humano2/trunk/components/viewTools/ViewTools.cs
Log:
* Fixed pertinance in views. This now allows to display multiple collumn=
s with same name within the view
Modified: humano2/trunk/components/viewTools/ViewTools.cs
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- humano2/trunk/components/viewTools/ViewTools.cs 2005-06-02 16:11:30 U=
TC (rev 1232)
+++ humano2/trunk/components/viewTools/ViewTools.cs 2005-06-02 17:04:00 U=
TC (rev 1233)
@@ -477,9 +477,18 @@
}
=09
Query.Append("SELECT ");
+ int loop =3D 0;
foreach(DisplayOrder var in disp)
{
+ var.Text.Substring(var.Text.IndexOf(".") + 1,var.Text.Length - var.T=
ext.IndexOf(",") - 1);
+ int begin =3D var.Text.IndexOf(".")+1;
+ int end =3D var.Text.IndexOf(",",begin);
+ string field =3D var.Text.Substring(begin,end - begin);
+ if ( field =3D=3D "id_entity" && loop > 0)
+ var.Text =3D var.Text.Substring(0, end) + " as " + field + loop.T=
oString() + ", ";
+
Query.Append(var.Text);
+ loop+=3D1;
}
Query.Remove(Query.Length-2,2);
=09
@@ -670,7 +679,7 @@
string res =3D ViewCache.Instance().GetCachedStatement(objRow, PageVi=
ew) ;
if( res !=3D null )
{ // We got the cached datatable result. lets return that and not con=
struct a new one again.
- // return res; //UNCOMENT THIS LINE
+// UNCOMMENT THIS LINE return res;=20
}
=20
objArray =3D objRow.ItemArray;
@@ -695,6 +704,7 @@
//Construir Cabezera Select
Query.Append(SQLSelect(dataRowColumns[0]));
//Logger.Log("SelectParam: " + dataRowColumns[0],LogLevel.Tr=
ace);
+
//Paso 2:
//Construir FROM
Query.Append(SQLFrom(dataRowColumns[0],dataRowColumns[1]));
@@ -741,7 +751,7 @@
=20
res =3D Query.ToString();
//Logger.Log("Query=3D" + res,LogLevel.Trace);
- // UNCOMENT THIS LINE ViewCache.Instance().AddStatement(objRow, res, =
Page);
+ // UNCOMMENT THIS ViewCache.Instance().AddStatement(objRow, res, Page=
View);
=20
return res;
}
|
|
From: <sv...@de...> - 2005-06-02 16:11:37
|
Author: pcamacho Date: 2005-06-02 12:11:30 -0400 (Thu, 02 Jun 2005) New Revision: 1232 Modified: humano2/trunk/INSTALL-LINUX.en.txt humano2/trunk/INSTALL-LINUX.es.txt Log: CHANGE: in the install textfile it is notified that postgressql version >= =3D 8.0.3 must be used (because of change of=20 revision 1231). Modified: humano2/trunk/INSTALL-LINUX.en.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/INSTALL-LINUX.en.txt 2005-06-01 22:10:19 UTC (rev 1231) +++ humano2/trunk/INSTALL-LINUX.en.txt 2005-06-02 16:11:30 UTC (rev 1232) @@ -17,7 +17,7 @@ ./configure -with-preview=3Dyes (It is needed to compile XPS) =20 - 2. Get and install PostgreSQL ( http://www.postgresql.org ) + 2. Get and install PostgreSQL ( http://www.postgresql.org ) (version >=3D= 8.0.3 se debe usar) 3. Get XSP (http://www.go-mono.com/archive/1.0.6/xsp-1.0.6.tar.gz) =20 =20 Modified: humano2/trunk/INSTALL-LINUX.es.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/INSTALL-LINUX.es.txt 2005-06-01 22:10:19 UTC (rev 1231) +++ humano2/trunk/INSTALL-LINUX.es.txt 2005-06-02 16:11:30 UTC (rev 1232) @@ -18,7 +18,7 @@ =20 (Eso es necesario para compilar XSP) =20 - 2. PostgreSQL ( http://www.postgresql.org ) + 2. PostgreSQL ( http://www.postgresql.org ) (version >=3D 8.0.3 must be= used) 3. Instale XSP (http://www.go-mono.com/archive/1.0.6/xsp-1.0.6.tar.gz) =20 =20 |
|
From: <sv...@de...> - 2005-06-01 22:10:23
|
Author: marcelo
Date: 2005-06-01 18:10:19 -0400 (Wed, 01 Jun 2005)
New Revision: 1231
Modified:
humano2/trunk/components/viewTools/ViewTools.cs
humano2/trunk/components/viewTools/viewCache.cs
humano2/trunk/core/db/absComplex.cs
humano2/trunk/core/db/mssql/mssqlComplex.cs
humano2/trunk/core/db/pgsql/pgsqlComplex.cs
Log:
* Fixed paging with MsSql server
* Fixed paging which broke with caching
Modified: humano2/trunk/components/viewTools/ViewTools.cs
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- humano2/trunk/components/viewTools/ViewTools.cs 2005-06-01 15:35:19 U=
TC (rev 1230)
+++ humano2/trunk/components/viewTools/ViewTools.cs 2005-06-01 22:10:19 U=
TC (rev 1231)
@@ -328,36 +328,38 @@
DataTable res =3D new DataTable();
int find =3D sql.IndexOf("tempTable");
string var;
- string dropTable =3D "", maxRecord, createTable, insert, select;
+ string dropTable =3D "";
if(find > -1)
{
var =3D sql;
dropTable =3D var.Substring(0,var.IndexOf(";"));
var =3D var.Substring(var.IndexOf(";") + 1,var.Length - var.IndexOf(=
";") - 1);
=09
- maxRecord =3D var.Substring(0,var.IndexOf(";"));
+ string maxRecord =3D var.Substring(0,var.IndexOf(";"));
var =3D var.Substring(var.IndexOf(";") + 1,var.Length - var.IndexOf(=
";") - 1);
=09
+ string alterTable =3D var.Substring(0,var.IndexOf(";"));
+ var =3D var.Substring(var.IndexOf(";") + 1,var.Length - var.IndexOf(=
";") - 1);
+ =09
//try
//{
=20
int pos =3D var.IndexOf(";");
- //string a =3D var.Substring(pos + 1,7);
- if(var.Substring(pos + 1,7).ToLower() =3D=3D "\ninsert")
+ // string a =3D var.Substring(pos + 1,7);
+ if(var.IndexOf("\" INTO temp")>0)
{
=20
- createTable =3D var.Substring(0,pos);
- var =3D var.Substring(var.IndexOf(";") + 2,var.Length - var.IndexO=
f(";") - 2);
+ string createTable =3D var.Substring(0,pos);
+ var =3D var.Substring(var.IndexOf(";") + 1,var.Length - var.IndexO=
f(";") - 1);
pos =3D var.IndexOf(";");
- //a =3D var.Substring(pos + 1,7);
+ // a =3D var.Substring(pos + 1,7);
=20
if(var.Substring(pos + 1,7).ToLower() =3D=3D "\nselect")
{
- =20
- insert =3D var.Substring(0,pos);
- select =3D var.Substring(var.IndexOf(";") + 2,var.Length - var.In=
dexOf(";") - 2);
+ // insert =3D var.Substring(0,pos);
+ string select =3D var; //.Substring(var.IndexOf(";") + 2,var.Leng=
th - var.IndexOf(";") - 2);
Complex.doCommand(createTable);
- Complex.doCommand(insert);
+ Complex.doCommand(alterTable);
_totalRecordCount =3D Convert.ToInt32(Complex.doScalar(maxRecord)=
);
sql =3D select;
}
@@ -466,28 +468,28 @@
values.Sort();
=09
disp =3D (DisplayOrder[])values.ToArray(typeof(DisplayOrder));
+
+ string tableName =3D "";
if(Page !=3D 0)
{
- string tableName =3D "";
- ArrayList vars =3D new ArrayList();
- foreach(DisplayOrder var2 in disp)
- {
- vars.Add(var2.Text + "," + var2.Type);
- //Logger.Log("ViewTools: vars[]=3D" + var2.Text + ",=
" + var2.Type,LogLevel.Trace);
- }
- //Logger.Log("ViewTools: call of BuildTempTable",LogLeve=
l.Trace);
- Query.Append(Complex.BuildTempTable((string[])vars.ToArray(typeof(st=
ring)),ref tableName));
- TempTable =3D tableName;
+ Query.Append(Complex.BuildTempTable(ref tableName));
+ TempTable =3D tableName;
}
+ =09
Query.Append("SELECT ");
foreach(DisplayOrder var in disp)
{
Query.Append(var.Text);
}
- =20
Query.Remove(Query.Length-2,2);
+ =09
+ if(Page !=3D 0)
+ {
+ Query.Append(" INTO " + tableName );
+ } =20
+
Query.Append(" ");
- //Logger.Log("Select Query: " + Query.ToString() ,LogLevel.T=
race);
+ //Logger.Log("Select Query: " + Query.ToString() ,LogLevel.Trace);
return Query.ToString();
}
=20
@@ -665,10 +667,10 @@
=20
objRow =3D Params.Rows[0];
=20
- string res =3D ViewCache.Instance().GetCachedStatement(objRow) ;
+ string res =3D ViewCache.Instance().GetCachedStatement(objRow, PageVi=
ew) ;
if( res !=3D null )
{ // We got the cached datatable result. lets return that and not con=
struct a new one again.
- return res;
+ // return res; //UNCOMENT THIS LINE
}
=20
objArray =3D objRow.ItemArray;
@@ -739,7 +741,7 @@
=20
res =3D Query.ToString();
//Logger.Log("Query=3D" + res,LogLevel.Trace);
- ViewCache.Instance().AddStatement(objRow, res);
+ // UNCOMENT THIS LINE ViewCache.Instance().AddStatement(objRow, res, =
Page);
=20
return res;
}
Modified: humano2/trunk/components/viewTools/viewCache.cs
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- humano2/trunk/components/viewTools/viewCache.cs 2005-06-01 15:35:19 U=
TC (rev 1230)
+++ humano2/trunk/components/viewTools/viewCache.cs 2005-06-01 22:10:19 U=
TC (rev 1231)
@@ -43,9 +43,9 @@
return instance;
}
=20
- public string GetCachedStatement(DataRow dr)
+ public string GetCachedStatement(DataRow dr, int pageView)
{
- int rowHash =3D genStableHashKey(dr);
+ int rowHash =3D genStableHashKey(dr, pageView);
string res =3D (string) databaseStatementCache[rowHash];
/*
Logger.Log("GetCachedStatement: data count: " + databaseStatementCach=
e.Count, LogLevel.Trace);
@@ -62,13 +62,13 @@
return res;
}
=20
- public void AddStatement(DataRow dr, string statement)
+ public void AddStatement(DataRow dr, string statement, int pageView)
{
- int rowHash =3D genStableHashKey(dr);
+ int rowHash =3D genStableHashKey(dr, pageView);
databaseStatementCache.Add(rowHash, statement);
}
=20
- private int genStableHashKey(DataRow dr)
+ private int genStableHashKey(DataRow dr, int pageView)
{
StringBuilder res =3D new StringBuilder();
int colCount =3D dr.Table.Columns.Count;
@@ -76,6 +76,7 @@
{
res.Append(Convert.ToString(dr[c]));
}
+ res.Append(pageView.ToString());
string str =3D res.ToString();
int code =3D str.GetHashCode();
=20
Modified: humano2/trunk/core/db/absComplex.cs
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- humano2/trunk/core/db/absComplex.cs 2005-06-01 15:35:19 UTC (rev 1230=
)
+++ humano2/trunk/core/db/absComplex.cs 2005-06-01 22:10:19 UTC (rev 1231=
)
@@ -53,7 +53,7 @@
/// </summary>
/// <param name=3D"args">columnas de la tabla temporal</param>
/// <returns>la consulta que crea la tabla temporal</returns>
- abstract public string BuildTempTable(string[] args, ref string tableN=
ame);
+ abstract public string BuildTempTable(ref string tableName);
=20
/// <summary>
/// get a list of the attributes Ids and their sysAttName that the use=
r can set/change of a class.
Modified: humano2/trunk/core/db/mssql/mssqlComplex.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/mssql/mssqlComplex.cs 2005-06-01 15:35:19 UTC (=
rev 1230)
+++ humano2/trunk/core/db/mssql/mssqlComplex.cs 2005-06-01 22:10:19 UTC (=
rev 1231)
@@ -392,42 +392,17 @@
return tName;
}
=20
- public override string BuildTempTable(string[] args, ref string tableN=
ame)
+ public override string BuildTempTable(ref string tableName)
{
-
StringBuilder table =3D new StringBuilder();
- string[] var;
- string name;
- string type;
- int loop;
=09
tableName =3D "tempTable" + System.Guid.NewGuid().ToString();
tableName =3D tableName.Replace("-","");
=09
table.Append("drop table "+ tableName + ";");
table.Append("select max(\"row\") from "+ tableName + ";");
- table.Append("create table dbo."+ tableName +" (");
- loop =3D 0;
- foreach(string col in args)
- {
- var =3D col.Split(",".ToCharArray());
- 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 + "\"";
- type =3D core.Crud.AttributeTypeMapping(var[2].ToString());
- // FIXME: Get ols sizes from db
- if (type =3D=3D "varchar") type =3D type + " (50)";
- //string coDef =3D getColDef();
- if (type =3D=3D null) type =3D var[2].ToString();
- table.Append(name + " " + type + ",");
- loop++;
- }
- table.Append("\"row\" integer IDENTITY);\n");
- table.Append("insert into " + tableName + " " );
- =09
+ table.Append("alter table "+ tableName +" add \"row\" integer IDENTIT=
Y;");
+ =09
return table.ToString();
}
=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-06-01 15:35:19 UTC (=
rev 1230)
+++ humano2/trunk/core/db/pgsql/pgsqlComplex.cs 2005-06-01 22:10:19 UTC (=
rev 1231)
@@ -427,46 +427,16 @@
return sysName;
}
=20
- public override string BuildTempTable(string[] args, ref string tableN=
ame)
+ public override string BuildTempTable(ref string tableName)
{
StringBuilder table =3D new StringBuilder();
- string[] var;
- string name;
- string type;
- int loop;
=09
tableName =3D "tempTable" + System.Guid.NewGuid().ToString();
tableName =3D tableName.Replace("-","");
=09
table.Append("drop table "+ tableName + ";");
table.Append("select max(\"row\") from "+ tableName + ";");
- table.Append("create table "+ tableName +" (");
- loop =3D 0;
- foreach(string col in args)
- {
- var =3D col.Split(",".ToCharArray());
- //Logger.Log("BuildTempTable: col[" + loop + "]=3D " + c=
ol,LogLevel.Trace);
- name =3D var[0];
- name =3D name.Substring(name.IndexOf(".")+1);
- if ((loop > 0) && (name =3D=3D "id_entity"))=20
- {
- name =3D name + loop.ToString();
- }
- //FIXME: This "AttributeTypeMapping" needs to change to support dyna=
mic derived types in view.
- //Logger.Log("BuildTempTable: var[2].ToString()=3D " + var[2].ToStri=
ng(),LogLevel.Trace);
- type =3D core.Crud.AttributeTypeMapping(var[0].ToString(=
)); //var[0] is of the form "d109cVerifAttribs"."c10007Text1" for example
- =
//The data we need is c10007Text1
- if (type =3D=3D null)=20
- {
- //Logger.Log("BuildTempTable: type=3D=3Dnull",LogLev=
el.Trace);
- type =3D var[2].ToString(); //FIXME ok but it is a b=
ig patch
- }
- table.Append(name + " " + type + ",");
- //Logger.Log("BuildTempTable. name=3D " + name + ", typ=
e=3D " + type,LogLevel.Trace);
- loop++;
- }
- table.Append("\"row\" Serial);\n");
- table.Append("insert into " + tableName + " " );
+ table.Append("alter table "+ tableName +" add column \"row\" Serial;"=
);
=09
return table.ToString();
}
|
|
From: <sv...@de...> - 2005-06-01 15:35:19
|
Author: marcelo
Date: 2005-06-01 11:35:19 -0400 (Wed, 01 Jun 2005)
New Revision: 1230
Modified:
humano2/trunk/Humano2.sln
Log:
* Removed Humano2.Core.Test.csproj from Solution
Modified: humano2/trunk/Humano2.sln
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=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/Humano2.sln 2005-06-01 15:28:01 UTC (rev 1229)
+++ humano2/trunk/Humano2.sln 2005-06-01 15:35:19 UTC (rev 1230)
@@ -63,10 +63,6 @@
ProjectSection(ProjectDependencies) =3D postProject
EndProjectSection
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") =3D "Humano2.Core.Test=
", "core\tests\Humano2.Core.Test.csproj", "{27007DA7-713C-4913-A096-84493=
7FBBF70}"
- ProjectSection(ProjectDependencies) =3D postProject
- EndProjectSection
-EndProject
Global
GlobalSection(SolutionConfiguration) =3D preSolution
Debug =3D Debug
@@ -137,10 +133,6 @@
{C0AE3603-47F7-4C40-96D0-070690204834}.Debug.Build.0 =3D Debug|.NET
{C0AE3603-47F7-4C40-96D0-070690204834}.Release.ActiveCfg =3D Release|.=
NET
{C0AE3603-47F7-4C40-96D0-070690204834}.Release.Build.0 =3D Release|.NE=
T
- {27007DA7-713C-4913-A096-844937FBBF70}.Debug.ActiveCfg =3D Debug|.NET
- {27007DA7-713C-4913-A096-844937FBBF70}.Debug.Build.0 =3D Debug|.NET
- {27007DA7-713C-4913-A096-844937FBBF70}.Release.ActiveCfg =3D Release|.=
NET
- {27007DA7-713C-4913-A096-844937FBBF70}.Release.Build.0 =3D Release|.NE=
T
EndGlobalSection
GlobalSection(ExtensibilityGlobals) =3D postSolution
EndGlobalSection
|
|
From: <sv...@de...> - 2005-06-01 15:28:11
|
Author: svera
Date: 2005-06-01 11:28:01 -0400 (Wed, 01 Jun 2005)
New Revision: 1229
Modified:
humano2/trunk/web/portal/portal.csproj
Log:
* File updated for Visual Studio
Modified: humano2/trunk/web/portal/portal.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/portal/portal.csproj 2005-06-01 15:09:30 UTC (rev 1=
228)
+++ humano2/trunk/web/portal/portal.csproj 2005-06-01 15:28:01 UTC (rev 1=
229)
@@ -136,7 +136,7 @@
<File
RelPath =3D "site\createInstance.aspx.cs"
DependentUpon =3D "createInstance.aspx"
- SubType =3D "Code"
+ SubType =3D "ASPXCodeBehind"
BuildAction =3D "Compile"
/>
<File
@@ -167,6 +167,16 @@
<File
RelPath =3D "site\domain.aspx.cs"
DependentUpon =3D "domain.aspx"
+ SubType =3D "Code"
+ BuildAction =3D "Compile"
+ />
+ <File
+ RelPath =3D "site\download.aspx"
+ BuildAction =3D "Content"
+ />
+ <File
+ RelPath =3D "site\download.aspx.cs"
+ DependentUpon =3D "download.aspx"
SubType =3D "ASPXCodeBehind"
BuildAction =3D "Compile"
/>
@@ -178,7 +188,7 @@
<File
RelPath =3D "site\downloadView.aspx.cs"
DependentUpon =3D "downloadView.aspx"
- SubType =3D "Code"
+ SubType =3D "ASPXCodeBehind"
BuildAction =3D "Compile"
/>
<File
@@ -189,7 +199,7 @@
<File
RelPath =3D "site\importWz-step1.aspx.cs"
DependentUpon =3D "importWz-step1.aspx"
- SubType =3D "ASPXCodeBehind"
+ SubType =3D "Code"
BuildAction =3D "Compile"
/>
<File
@@ -271,6 +281,11 @@
BuildAction =3D "Compile"
/>
<File
+ RelPath =3D "site\leftbar.aspx.resx"
+ DependentUpon =3D "leftbar.aspx.cs"
+ BuildAction =3D "EmbeddedResource"
+ />
+ <File
RelPath =3D "site\login.aspx"
SubType =3D "Form"
BuildAction =3D "Content"
@@ -301,11 +316,6 @@
BuildAction =3D "Compile"
/>
<File
- RelPath =3D "site\readXslt.aspx.resx"
- DependentUpon =3D "readXslt.aspx.cs"
- BuildAction =3D "EmbeddedResource"
- />
- <File
RelPath =3D "site\Report.aspx"
SubType =3D "Form"
BuildAction =3D "Content"
@@ -313,7 +323,7 @@
<File
RelPath =3D "site\Report.aspx.cs"
DependentUpon =3D "Report.aspx"
- SubType =3D "ASPXCodeBehind"
+ SubType =3D "Code"
BuildAction =3D "Compile"
/>
<File
@@ -324,6 +334,16 @@
<File
RelPath =3D "site\search.aspx.cs"
DependentUpon =3D "search.aspx"
+ SubType =3D "Code"
+ BuildAction =3D "Compile"
+ />
+ <File
+ RelPath =3D "site\showimage.aspx"
+ BuildAction =3D "Content"
+ />
+ <File
+ RelPath =3D "site\showimage.aspx.cs"
+ DependentUpon =3D "showimage.aspx"
SubType =3D "ASPXCodeBehind"
BuildAction =3D "Compile"
/>
@@ -334,7 +354,7 @@
<File
RelPath =3D "site\showView.aspx.cs"
DependentUpon =3D "showView.aspx"
- SubType =3D "ASPXCodeBehind"
+ SubType =3D "Code"
BuildAction =3D "Compile"
/>
<File
@@ -350,7 +370,7 @@
<File
RelPath =3D "site\topbar.aspx.cs"
DependentUpon =3D "topbar.aspx"
- SubType =3D "ASPXCodeBehind"
+ SubType =3D "Code"
BuildAction =3D "Compile"
/>
<File
@@ -360,7 +380,7 @@
<File
RelPath =3D "site\updateInstance.aspx.cs"
DependentUpon =3D "updateInstance.aspx"
- SubType =3D "Code"
+ SubType =3D "ASPXCodeBehind"
BuildAction =3D "Compile"
/>
<File
@@ -391,7 +411,7 @@
<File
RelPath =3D "site\viewrelations.aspx.cs"
DependentUpon =3D "viewrelations.aspx"
- SubType =3D "ASPXCodeBehind"
+ SubType =3D "Code"
BuildAction =3D "Compile"
/>
<File
|
|
From: <sv...@de...> - 2005-06-01 15:09:32
|
Author: pcamacho Date: 2005-06-01 11:09:30 -0400 (Wed, 01 Jun 2005) New Revision: 1228 Modified: humano2/trunk/components/webTools/basePage.cs Log: FIX: same problem as previous revision. I forgot to change the name of fi= le that is entered in database. 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-06-01 14:49:23 UTC= (rev 1227) +++ humano2/trunk/components/webTools/basePage.cs 2005-06-01 15:09:30 UTC= (rev 1228) @@ -16,7 +16,7 @@ using System.Data; using System.Collections; using System.Collections.Specialized; - +using System.IO; using Humano2.Core; using Humano2.Core.Db; using System.Text.RegularExpressions; @@ -151,8 +151,9 @@ NameValueCollection InstanceParams =3D new NameValueCollecti= on(); foreach(string attributeId in AllKeys) { + string shortPathName =3D Path.GetFileName(Request.Files[= attributeId].FileName); //Get only the file name (without path) Html.UploadFile(Request.Files[attributeId],idEntity,attr= ibuteId,Response,userCred); - InstanceParams.Add(attributeId,Request.Files[attributeId= ].FileName); + InstanceParams.Add(attributeId,shortPathName); } //Update the instance with the names of files if(InstanceParams.Count !=3D 0) |
|
From: <sv...@de...> - 2005-06-01 14:49:27
|
Author: pcamacho
Date: 2005-06-01 10:49:23 -0400 (Wed, 01 Jun 2005)
New Revision: 1227
Modified:
humano2/trunk/components/webTools/Html.cs
Log:
FIX: file uploading was not working in .NET because of a difference with =
mono. HttpPostedFile.Filename returns the=20
full name (with path) in .NET and only the filename (without path) in mon=
o.
Modified: humano2/trunk/components/webTools/Html.cs
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- humano2/trunk/components/webTools/Html.cs 2005-06-01 14:20:17 UTC (re=
v 1226)
+++ humano2/trunk/components/webTools/Html.cs 2005-06-01 14:49:23 UTC (re=
v 1227)
@@ -106,8 +106,12 @@
=20
if (file.FileName !=3D "")=20
{
- strFileName =3D idEntity + "_" + attId + "_" + file.File=
Name;
+ //Due to a difference between Mono an .NET we must do a =
check here
+ string fileNameWithoutExtension =3D Path.GetFileName(fil=
e.FileName);
+ //Logger.Log("fileNameWithoutExtension:" + fileNameWitho=
utExtension,LogLevel.Trace);
=20
+ strFileName =3D idEntity + "_" + attId + "_" + fileNameW=
ithoutExtension;
+ =20
//FIXME: Here create a new path with domainId if it does=
not exists yet
string uploadPath =3D GetClientPath(userCred);
//Create the uploadPath if it does not exist
|
|
From: <sv...@de...> - 2005-06-01 14:20:30
|
Author: pcamacho
Date: 2005-06-01 10:20:17 -0400 (Wed, 01 Jun 2005)
New Revision: 1226
Modified:
humano2/trunk/web/portal/site/js/inputstocheck.js
humano2/trunk/web/portal/site/xsl/RUT.xsl
Log:
FIX:=20
* bug in email
* validation of RUT
Modified: humano2/trunk/web/portal/site/js/inputstocheck.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/portal/site/js/inputstocheck.js 2005-05-31 22:44:23=
UTC (rev 1225)
+++ humano2/trunk/web/portal/site/js/inputstocheck.js 2005-06-01 14:20:17=
UTC (rev 1226)
@@ -1,3 +1,63 @@
+/// Mail functions ///
+function isValidEmail(email, required) {
+ if (required=3D=3Dundefined) { // if not specified, assume it's re=
quired
+ required=3Dtrue;
+ }
+ if (email=3D=3Dnull) {
+ if (required) {
+ return false;
+ }
+ return true;
+ }
+ =20
+ if (email.length=3D=3D0) {
+ if (required) {
+ return false;
+ }
+ return true;
+ }
+ if (! allValidChars(email)) { // check to make sure all characters =
are valid
+ return false;
+ }
+ if (email.indexOf("@") < 1) { // must contain @, and it must not be=
the first character
+ return false;
+ } else if (email.lastIndexOf(".") <=3D email.indexOf("@")) { // las=
t dot must be after the @
+ return false;
+ } else if (email.indexOf("@") =3D=3D email.length) { // @ must not =
be the last character
+ return false;
+ }
+=09
+ return true;
+}
+
+
+function verifyEmail(value)=20
+{
+ var checkEmail =3D value
+ var mailOk =3D true;
+ if (isValidEmail(checkEmail,false) =3D=3D false)
+ {
+ alert("You have entered an invalid email address( " + checkEmail=
+ "). Please try again.");
+ mailOk =3D false; =20
+ }
+ return mailOk;
+}
+
+function allValidChars(email) {
+ var parsed =3D true;
+ var validchars =3D "abcdefghijklmnopqrstuvwxyz0123456789@.-";
+ for (var i=3D0; i < email.length; i++) {
+ var letter =3D email.charAt(i).toLowerCase();
+ if (validchars.indexOf(letter) !=3D -1)
+ continue;
+ parsed =3D false;
+ break;
+ }
+ return parsed;
+}
+
+/// Decimals function ///
+
function checkDecimals(fieldValue,decallowed,min,max)=20
{=09
var decimalsOk =3D true;
@@ -37,37 +97,89 @@
}
=20
=20
-function verifyEmail(value)=20
+/// RUT Validation ///
+ =20
+/**
+ * To validate the rut given the base and the check digit (digito verifi=
cador)
+ * @param rut everything minus the check digit and the separator charact=
er
+ * @param dv the check digit
+ * @return true if the rut fits with dv , false otherwise
+ */ =20
+function validaM11(rut, dv)=20
{
- var checkEmail =3D value
- var mailOk =3D true;
+ var suma =3D 0;
+ var mul =3D 2;
+ var i =3D 0;
+ for (i =3D rut.length-1; i >=3D 0; i--)=20
+ {
+ suma =3D suma + rut.charAt(i) * mul;
+ mul =3D mul=3D=3D7 ? 2 : mul+1;
+ }
+ var dvr =3D '' + (11 - suma % 11);
+ if (dvr =3D=3D '10')
+ dvr =3D 'K';
+ else if (dvr=3D=3D'11')
+ dvr =3D '0';
+ if (dvr !=3D dv)
+ return false;
+ else
+ return true;
+} =20
+
+/**
+ * Takes a string and removes all instances of characters passed in para=
m
+ * @param str the string to clean
+ * @param car the car to remove
+ * @return the string str without all instances of car
+ */
+function Clean(str,car)
+{
+ var res =3D"";
=20
- if (isValidEmail(checkEmail,true) =3D=3D true)
+ for(i=3D0;i<str.length;i++)
{
- =20
- }else{
- alert("You have entered an invalid email address( " + checkEmail=
+ "). Please try again.");
- mailOk =3D false; =20
+ if(str[i] !=3D car) =20
+ {
+ res +=3D str[i];
+ }
}
+ return res; =20
+}
+
+
+/**
+ * Says if a rut is valid or not
+ * @param rutStr something like 21557952-2 or 21.557.952-2 etc...
+ * @return true if the rut is valid, false otherwise
+ */
+function checkRut(rutStr)
+{
+ var rutOk =3D true;
+ //Delete all possible separator caracters
+ var carSepArr =3D new Array('.','-',' ','/');
+ var i=3D0;
+ var rutClean =3D rutStr
=20
-/* =20
- if(checkEmail =3D=3D '' || checkEmail =3D=3D null)
+ =20
+ for(i=3D0;i<carSepArr.length;i++)
{
- return true;
+ rutClean =3D Clean(rutClean,carSepArr[i]);
}
=20
- if ( (checkEmail.indexOf('@') < 0)=20
- ||=20
- ((checkEmail.charAt(checkEmail.length-4) !=3D '.') && (check=
Email.charAt(checkEmail.length-3) !=3D'.'))
- ) =09
+ var rut =3D rutClean.substring(0,rutClean.length-1);
+ var verif =3D rutClean[rutClean.length-1];
+ //alert(rut);
+ //alert(verif);
+ rutOk =3D validaM11(rut,verif);
+ =20
+ if(rutOk =3D=3D false)
{
- alert("You have entered an invalid email address( " + checkEmail=
+ "). Please try again.");
- mailOk =3D false;
- }=09
- */ =20
- return mailOk;
+ alert("The RUT " + rutStr + " is not valid.") =20
+ }
+ =20
+ return rutOk;
}
- =20
+ =20
function checkIsObligatory(isObligatory,value)
{
var isObligatoryOk =3D true;
@@ -117,6 +229,9 @@
case 'EMAIL':
checkOk =3D verifyEmail(this.value);
break;
+ case 'RUT':
+ checkOk =3D checkRut(this.value);
+ break;
}
=20
return checkOk; =20
@@ -207,47 +322,4 @@
aNewInput.Check() =3D=3D false );
}
=20
-//Mail functions
=20
-function isValidEmail(email, required) {
- if (required=3D=3Dundefined) { // if not specified, assume it's re=
quired
- required=3Dtrue;
- }
- if (email=3D=3Dnull) {
- if (required) {
- return false;
- }
- return true;
- }
- if (email.length=3D=3D0) { =20
- if (required) {
- return false;
- }
- return true;
- }
- if (! allValidChars(email)) { // check to make sure all characters =
are valid
- return false;
- }
- if (email.indexOf("@") < 1) { // must contain @, and it must not be=
the first character
- return false;
- } else if (email.lastIndexOf(".") <=3D email.indexOf("@")) { // las=
t dot must be after the @
- return false;
- } else if (email.indexOf("@") =3D=3D email.length) { // @ must not =
be the last character
- return false;
- }
-=09
- return true;
-}
-
-function allValidChars(email) {
- var parsed =3D true;
- var validchars =3D "abcdefghijklmnopqrstuvwxyz0123456789@.-";
- for (var i=3D0; i < email.length; i++) {
- var letter =3D email.charAt(i).toLowerCase();
- if (validchars.indexOf(letter) !=3D -1)
- continue;
- parsed =3D false;
- break;
- }
- return parsed;
-}
Modified: humano2/trunk/web/portal/site/xsl/RUT.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/RUT.xsl 2005-05-31 22:44:23 UTC (re=
v 1225)
+++ humano2/trunk/web/portal/site/xsl/RUT.xsl 2005-06-01 14:20:17 UTC (re=
v 1226)
@@ -30,7 +30,7 @@
=20
<xsl:if test=3D"/page/flagaction!=3D'Read'"> <!-- Only for creat=
e and update -->
<script language=3D"Javascript">
- var aInputToCheck =3D new InputToCheck('TEXT',''); //By =
default, does no verification
+ var aInputToCheck =3D new InputToCheck('RUT',''); //RUT =
verification
allInputsToCheck.Add(aInputToCheck);
</script>
</xsl:if>
|
|
From: <sv...@de...> - 2005-05-31 22:44:27
|
Author: svera
Date: 2005-05-31 18:44:23 -0400 (Tue, 31 May 2005)
New Revision: 1225
Modified:
humano2/trunk/web/portal/site/xsl/leftbar.xsl
Log:
* Desabilited the link reload
Modified: humano2/trunk/web/portal/site/xsl/leftbar.xsl
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- humano2/trunk/web/portal/site/xsl/leftbar.xsl 2005-05-31 22:35:57 UTC=
(rev 1224)
+++ humano2/trunk/web/portal/site/xsl/leftbar.xsl 2005-05-31 22:44:23 UTC=
(rev 1225)
@@ -99,7 +99,7 @@
</form>
<hr width=3D"50%" />
<center>
- <xsl:if test=3D"/views/reload=3D'true'">
+ <xsl:if test=3D"/views/reload=3D'false'">
<a id=3D"builder" href=3D"javascript:location.reload()=
;" target=3D"_Self">Reload</a>
</xsl:if>
<a id=3D"builder" href=3D"../../builder/site/index.a=
spx" target=3D"_blank">Configuration</a>
|