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-30 16:12:20
|
Author: svera
Date: 2005-05-30 12:12:15 -0400 (Mon, 30 May 2005)
New Revision: 1199
Modified:
humano2/trunk/web/portal/site/xsl/currency.xsl
humano2/trunk/web/portal/site/xsl/numeric.xsl
Log:
* Fix trouble generated by duplicity in "decimal" declaration in the XSL=
s on Microsoft Framework.
Modified: humano2/trunk/web/portal/site/xsl/currency.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/currency.xsl 2005-05-30 14:46:02 UT=
C (rev 1198)
+++ humano2/trunk/web/portal/site/xsl/currency.xsl 2005-05-30 16:12:15 UT=
C (rev 1199)
@@ -33,8 +33,7 @@
</input>
</xsl:when>=09
<xsl:when test=3D"/page/flagaction=3D'Create'">
- <xsl:variable name=3D"default" select=3D"/page/classInstance/structu=
re/currency[id_entity=3D$idEntity]/default"/>
- <xsl:variable name=3D"decimals" select=3D"/page/classIns=
tance/structure/currency[id_entity=3D$idEntity]/decimals" /> =09
+ <xsl:variable name=3D"default" select=3D"/page/classInstance/structu=
re/currency[id_entity=3D$idEntity]/default"/> =09
<xsl:variable name=3D"decimalsToCheck"> <!-- If there no=
decimals specified put it to 0 -->
<xsl:choose>
<xsl:when test=3D"string-length($decimals)=3D0">
@@ -45,7 +44,6 @@
</xsl:otherwise>
</xsl:choose>
</xsl:variable>
- =20
<input type=3D"text" name=3D"{$sysAttName}" id=3D"{$sysA=
ttName}" value=3D"{$data}" >
<xsl:if test=3D"not(string($isEditable)=3D'true'=
)">
<xsl:attribute name=3D"disabled"/>
Modified: humano2/trunk/web/portal/site/xsl/numeric.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/numeric.xsl 2005-05-30 14:46:02 UTC=
(rev 1198)
+++ humano2/trunk/web/portal/site/xsl/numeric.xsl 2005-05-30 16:12:15 UTC=
(rev 1199)
@@ -30,11 +30,9 @@
<xsl:attribute name=3D"disabled"/>
</xsl:if>
</input>
- <!-- FIXME: create new inputToCheck with all needed data=
s onblur=3D"checkDecimals(value,{$decimalsToCheck})" -->
</xsl:when>=09
<xsl:when test=3D"/page/flagaction=3D'Create'">
- <xsl:variable name=3D"default" select=3D"/page/classInstance/structu=
re/numeric[id_entity=3D$idEntity]/default"/>
- <xsl:variable name=3D"decimals" select=3D"/page/classIns=
tance/structure/numeric[id_entity=3D$idEntity]/decimals" /> =09
+ <xsl:variable name=3D"default" select=3D"/page/classInstance/structu=
re/numeric[id_entity=3D$idEntity]/default"/> =09
<xsl:variable name=3D"decimalsToCheck"> <!-- If there no=
decimals specified put it to 0 -->
<xsl:choose>
<xsl:when test=3D"string-length($decimals)=3D0">
@@ -67,7 +65,6 @@
allInputsToCheck.Add(aInputToCheck);
</script>
</xsl:if>
- =20
</xsl:template>=09
</xsl:stylesheet>
=20
|
|
From: <sv...@de...> - 2005-05-30 15:20:27
|
Author: svera
Date: 2005-05-30 10:46:02 -0400 (Mon, 30 May 2005)
New Revision: 1198
Modified:
humano2/trunk/core/db/mssql/mssqlComplex.cs
Log:
FIX trouble in method GetChildsOfFolder? with deleted folders.=20
* When you chose a Folder this method dosn't recognize if the child was d=
eleted or not.
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-05-30 14:41:20 UTC (=
rev 1197)
+++ humano2/trunk/core/db/mssql/mssqlComplex.cs 2005-05-30 14:46:02 UTC (=
rev 1198)
@@ -1227,8 +1227,12 @@
=20
public override int [] GetChildsOfFolder(int folderId)
{
- string req =3D "select \"id_entity\" from folder where \"fol=
derParent\" =3D " + folderId;
- DataTable dt =3D doSelect(req);
+ string req =3D "select f.\"id_entity\" " +=20
+ "FROM folder f, entity e " +=20
+ "WHERE f.\"folderParent\" =3D " + folderId + " " +
+ "AND f.\"id_entity\"=3De.\"id_entity\" " +
+ "AND e.\"delDate\" IS NULL";=20
+ DataTable dt =3D doSelect(req);
int dtSize =3D dt.Rows.Count;
int [] res =3D new int [dtSize];
for(int i=3D0; i< dtSize; i++)
|
|
From: <sv...@de...> - 2005-05-30 14:41:26
|
Author: svera
Date: 2005-05-30 10:41:20 -0400 (Mon, 30 May 2005)
New Revision: 1197
Modified:
humano2/trunk/web/builder/site/foldermanagement.aspx.cs
Log:
* Fix Bug #136
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-30 14=
:38:42 UTC (rev 1196)
+++ humano2/trunk/web/builder/site/foldermanagement.aspx.cs 2005-05-30 14=
:41:20 UTC (rev 1197)
@@ -450,9 +450,20 @@
=20
public void html_getButtonDelete()
{
+ absCrud crud =3D Factory.Crud();
+ absComplex complex =3D crud.GetCore().Complex;
+ int[] idChilds;
string strHtml =3D "<input type=3D\"button\" id=3D\"btnDelete\" ";
strHtml +=3D "name=3D\"btnDelete\" onClick=3D\"fn_deleteData();\" ";
strHtml +=3D "value=3D\"Delete\" ";
+ if (folderId !=3D 0)
+ {
+ idChilds =3D complex.GetChildsOfFolder(folderId);
+ if(idChilds.Length > 0)
+ {
+ strHtml =3D "";
+ }
+ }
=20
if (action =3D=3D CNS_UPDATE)
{
|
|
From: <sv...@de...> - 2005-05-30 14:38:53
|
Author: svera
Date: 2005-05-30 10:38:42 -0400 (Mon, 30 May 2005)
New Revision: 1196
Modified:
humano2/trunk/core/db/pgsql/pgsqlComplex.cs
Log:
FIX trouble in method GetChildsOfFolder with deleted folders.=20
* When you chose a Folder this method dosn't recognize if the child was =
deleted or not.
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-30 03:15:08 UTC (=
rev 1195)
+++ humano2/trunk/core/db/pgsql/pgsqlComplex.cs 2005-05-30 14:38:42 UTC (=
rev 1196)
@@ -1244,7 +1244,11 @@
=20
public override int [] GetChildsOfFolder(int folderId)
{
- string req =3D "select \"id_entity\" from folder where \"fol=
derParent\" =3D " + folderId;
+ string req =3D "select f.\"id_entity\" " +=20
+ "FROM folder f, entity e " +=20
+ "WHERE f.\"folderParent\" =3D " + folderId + " " +
+ "AND f.\"id_entity\"=3De.\"id_entity\" " +
+ "AND e.\"delDate\" IS NULL";=20
DataTable dt =3D doSelect(req);
int dtSize =3D dt.Rows.Count;
int [] res =3D new int [dtSize];
|
|
From: <sv...@de...> - 2005-05-30 03:15:34
|
Author: marijn
Date: 2005-05-29 23:15:08 -0400 (Sun, 29 May 2005)
New Revision: 1195
Added:
humano2/branches/caching/components/viewTools/viewCache.cs
Modified:
humano2/branches/caching/components/viewTools/ViewTools.cs
humano2/branches/caching/components/webTools/Adapter.cs
humano2/branches/caching/core/db/absCrud.cs
humano2/branches/caching/web/portal/site/instance.aspx.cs
Log:
* Adding simple caching system for viewTools.
* Removing some excessive logger verbosity.
Modified: humano2/branches/caching/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/branches/caching/components/viewTools/ViewTools.cs 2005-05-30=
01:11:31 UTC (rev 1194)
+++ humano2/branches/caching/components/viewTools/ViewTools.cs 2005-05-30=
03:15:08 UTC (rev 1195)
@@ -319,6 +319,11 @@
=20
public DataTable GetSQLDataTable(DataTable parametros)
{
+ return GetSQLDataTable(parametros, true);
+ }
+
+ private DataTable GetSQLDataTable(DataTable parametros, bool retry)
+ {
string sql =3D ParseQuery(parametros);
DataTable res =3D new DataTable();
int find =3D sql.IndexOf("tempTable");
@@ -363,8 +368,29 @@
// throw new Exception("Error realizando paginado de la consulta.\n"=
+ex.Message,ex.InnerException);
//}
}
- res =3D Complex.doSelect(sql);
=20
+ try=20
+ {
+ res =3D Complex.doSelect(sql);
+ }=20
+ catch (Exception ex)
+ { // We got an error executing the request!
+ if(retry)
+ {
+ Logger.Log("We got an exception executing SQL, Will flush cache!", =
LogLevel.Error);
+ Logger.Log("Statement was: " + sql, LogLevel.Error);
+ ViewCache.Instance().FlushAll();
+ GetSQLDataTable(parametros, false);
+ }
+ else
+ {
+ Logger.Log("We got an exception executing SQL again, Raising Error!=
", LogLevel.Error);
+ Logger.Log("Final Statement was: " + sql, LogLevel.Error); =09
+ throw ex;
+ }
+ =09
+ }
+
if(find > -1) {
Complex.doCommand(dropTable);
}
@@ -447,9 +473,9 @@
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: vars[]=3D" + var2.Text + ",=
" + var2.Type,LogLevel.Trace);
}
- Logger.Log("ViewTools: call of BuildTempTable",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;
}
@@ -461,7 +487,7 @@
=20
Query.Remove(Query.Length-2,2);
Query.Append(" ");
- Logger.Log("Select Query: " + Query.ToString() ,LogLevel.Tra=
ce);
+ //Logger.Log("Select Query: " + Query.ToString() ,LogLevel.T=
race);
return Query.ToString();
}
=20
@@ -636,10 +662,17 @@
{
DataRow objRow;
object[] objArray;
- StringBuilder Query =3D new StringBuilder();
- =09
+
objRow =3D Params.Rows[0];
+
+ string res =3D ViewCache.Instance().GetCachedStatement(objRow) ;
+ if( res !=3D null )
+ { // We got the cached datatable result. lets return that and not con=
struct a new one again.
+ return res;
+ }
+
objArray =3D objRow.ItemArray;
+ StringBuilder Query =3D new StringBuilder();
=09
string[] dataRowColumns =3D new string [objArray.Length];
=20
@@ -703,8 +736,12 @@
Query.Append(";\n");
Query.Append("SELECT * FROM " + TempTable + " where row between "+ i=
nicio.ToString() + " and " + limite.ToString());
}
- //Logger.Log("Query=3D" + Query.ToString(),LogLevel.Trace);
- return Query.ToString();
+
+ res =3D Query.ToString();
+ //Logger.Log("Query=3D" + res,LogLevel.Trace);
+ ViewCache.Instance().AddStatement(objRow, res);
+
+ return res;
}
=09
private string GetGroupingFilters(string[] strParams)
Added: humano2/branches/caching/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/branches/caching/components/viewTools/viewCache.cs 2005-05-30=
01:11:31 UTC (rev 1194)
+++ humano2/branches/caching/components/viewTools/viewCache.cs 2005-05-30=
03:15:08 UTC (rev 1195)
@@ -0,0 +1,90 @@
+//
+// 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.
+//
+// $Id: /humano2/local/core/db/cache.cs 119 2005-03-27T08:59:44.479824Z =
marijn $
+//
+
+using System;
+using System.Text;
+using System.Data;
+
+using Humano2.Core;
+
+namespace Humano2.Components.ViewTools=20
+{
+ public class ViewCache
+ {
+ /// <summary>
+ /// Constructor
+ /// </summary>
+ protected ViewCache() {
+ databaseStatementCache =3D new CacheDictionary();
+ =09
+ }
+ private CacheDictionary databaseStatementCache =3D null;
+
+ private static ViewCache instance =3D null;
+
+ /// <summary>
+ /// Get an instance of the viewCache
+ /// </summary>
+ /// <returns>the viewCache</returns>
+ public static ViewCache Instance() {
+ // Uses "Lazy initialization"
+ if( instance =3D=3D null ) {
+ instance =3D new ViewCache();
+ }
+ return instance;
+ }
+
+ public string GetCachedStatement(DataRow dr)
+ {
+ int rowHash =3D genStableHashKey(dr);
+ string res =3D (string) databaseStatementCache[rowHash];
+ /* if(res =3D=3D null)=20
+ {
+ Logger.Log("GetCachedStatement: MISS!", LogLevel.Trace);
+ }
+ else=20
+ {
+ Logger.Log("GetCachedStatement: HIT!", LogLevel.Trace);
+ } */
+ return res;
+ }
+
+ public void AddStatement(DataRow dr, string statement)
+ {
+ int rowHash =3D genStableHashKey(dr);
+ databaseStatementCache.Add(rowHash, statement);
+ }
+
+ private int genStableHashKey(DataRow dr)
+ {
+ StringBuilder res =3D new StringBuilder();
+ int colCount =3D dr.Table.Columns.Count;
+ for(int c =3D 0; c < colCount; c++)
+ {
+ res.Append(Convert.ToString(dr[c]));
+ }
+ string str =3D res.ToString();
+ int code =3D str.GetHashCode();
+
+ //Logger.Log("genStableHashKey: " + str + " =3D " + code, LogLevel.Tr=
ace);
+
+ return code;
+ }
+
+ ///<summary>Clean the cache. Resetting it to Empty.</summary>
+ public void FlushAll()=20
+ {
+ databaseStatementCache =3D new CacheDictionary(); =09
+ }
+
+ }
+}
Property changes on: humano2/branches/caching/components/viewTools/viewCa=
che.cs
___________________________________________________________________
Name: svn:mime-type
+ text/cpp
Modified: humano2/branches/caching/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/branches/caching/components/webTools/Adapter.cs 2005-05-30 01=
:11:31 UTC (rev 1194)
+++ humano2/branches/caching/components/webTools/Adapter.cs 2005-05-30 03=
:15:08 UTC (rev 1195)
@@ -1037,6 +1037,8 @@
/// </summary>
/// <param name=3D"classId">The id of the class</param>
/// <returns>The name of class</returns>
+ /// <param name=3D"classId">The id of the class</param>
+ /// <returns>The name of class</returns>
public string GetClassNameById(int classId)
{
=20
Modified: humano2/branches/caching/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/branches/caching/core/db/absCrud.cs 2005-05-30 01:11:31 UTC (=
rev 1194)
+++ humano2/branches/caching/core/db/absCrud.cs 2005-05-30 03:15:08 UTC (=
rev 1195)
@@ -59,7 +59,6 @@
virtual public string AttributeTypeMapping(string name)
{
string res =3D "";
- Logger.Log("AttributeTypeMapping. name=3D " + name, LogLevel=
.Trace);
if(attMap[name] =3D=3D null) //This is not a basic type
{
res =3D findSqlTypeForAttribute(attMap,name);
@@ -68,6 +67,7 @@
{
res =3D attMap[name]; =20
}
+ //Logger.Log("AttributeTypeMapping. name=3D " + name + " res=
=3D " + res, LogLevel.Trace);
return res;
}
=09
Modified: humano2/branches/caching/web/portal/site/instance.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/branches/caching/web/portal/site/instance.aspx.cs 2005-05-30 =
01:11:31 UTC (rev 1194)
+++ humano2/branches/caching/web/portal/site/instance.aspx.cs 2005-05-30 =
03:15:08 UTC (rev 1195)
@@ -113,7 +113,7 @@
=20
=20
=20
- Logger.Log("createXmlASP: BEGIN",LogLevel.Trace);
+ //Logger.Log("createXmlASP: BEGIN",LogLevel.Trace);
=20
//Generamos el XML con la informacion de la entidad pedida=20
=09
@@ -228,7 +228,7 @@
data +=3D "</data>\n";
}
=20
- Logger.Log("createXmlASP: data(before)=3D" + data,Lo=
gLevel.Trace);
+ //Logger.Log("createXmlASP: data(before)=3D" + data,=
LogLevel.Trace);
//Construimos el Xml
string swXml =3D "";
swXml +=3D "<?xml version=3D\"1.0\" encoding=3D\"UTF=
-8\"?>";
@@ -249,8 +249,8 @@
swXml +=3D "</page>";
=20
//Logger.Log("createXmlASP: structure=3D" + structur=
e,LogLevel.Trace);
- Logger.Log("createXmlASP: clearDateTime(data)=3D" + =
clearDateTimeData(data),LogLevel.Trace);
- Logger.Log("swXml: " + swXml ,LogLevel.Trace);
+ //Logger.Log("createXmlASP: clearDateTime(data)=3D" =
+ clearDateTimeData(data),LogLevel.Trace);
+ //Logger.Log("swXml: " + swXml ,LogLevel.Trace);
return swXml;
=20
}
@@ -274,7 +274,7 @@
dateClearedData =3D dateClearedData.Replace("]",">"); =
=20
// NO SACAR: Ensucia los campos TEXT!! dateClearedData =3D=
dateClearedData.Replace(" ",""); //trim
dateClearedData =3D dateClearedData.Trim();
- Logger.Log("\n\n[clearDateTimeData ]: " + dateClearedDat=
a, LogLevel.Trace);
+ //Logger.Log("\n\n[clearDateTimeData ]: " + dateClearedD=
ata, LogLevel.Trace);
return dateClearedData;
}
=20
|
|
From: <sv...@de...> - 2005-05-30 01:11:34
|
Author: marijn Date: 2005-05-29 21:11:31 -0400 (Sun, 29 May 2005) New Revision: 1194 Added: humano2/branches/caching/ Log: * A branch for viewtools sql statement caching. Copied: humano2/branches/caching (from rev 1193, humano2/trunk) |
|
From: <sv...@de...> - 2005-05-30 01:10:03
|
Author: marijn Date: 2005-05-29 21:10:01 -0400 (Sun, 29 May 2005) New Revision: 1193 Removed: humano2/branches/caching/ Log: Needs to be a copy of trunk ofcourse. Not a new directory. |
|
From: <sv...@de...> - 2005-05-30 01:09:10
|
Author: marijn Date: 2005-05-29 21:09:06 -0400 (Sun, 29 May 2005) New Revision: 1192 Added: humano2/branches/caching/ Log: * A branch for viewtools sql statement caching. |
|
From: <sv...@de...> - 2005-05-29 00:18:15
|
Author: marijn Date: 2005-05-28 20:18:15 -0400 (Sat, 28 May 2005) New Revision: 1191 Removed: humano2/branches/dynviews/ Log: * Deleting obsolete branches. |
|
From: <sv...@de...> - 2005-05-29 00:17:08
|
Author: marijn Date: 2005-05-28 20:17:08 -0400 (Sat, 28 May 2005) New Revision: 1190 Removed: humano2/branches/formulas/ Log: * Deleting obsolete branches. |
|
From: <sv...@de...> - 2005-05-29 00:16:04
|
Author: marijn Date: 2005-05-28 20:15:59 -0400 (Sat, 28 May 2005) New Revision: 1189 Removed: humano2/branches/cleanup/ Log: * Deleting obsolete branch. |
|
From: <sv...@de...> - 2005-05-27 22:46:10
|
Author: pcamacho
Date: 2005-05-27 18:45:53 -0400 (Fri, 27 May 2005)
New Revision: 1188
Modified:
humano2/branches/fileupload/core/db/mssql/mssqlCrud.cs
humano2/branches/fileupload/core/db/pgsql/pgsqlCrud.cs
humano2/branches/fileupload/web/portal/site/readXslt.aspx
humano2/branches/fileupload/web/portal/site/xsl/file.xsl
Log:
ADD: first step: the name of file attribute can be stored after clicking =
on browse (creation of an instance).
Modified: humano2/branches/fileupload/core/db/mssql/mssqlCrud.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/branches/fileupload/core/db/mssql/mssqlCrud.cs 2005-05-27 22:=
32:53 UTC (rev 1187)
+++ humano2/branches/fileupload/core/db/mssql/mssqlCrud.cs 2005-05-27 22:=
45:53 UTC (rev 1188)
@@ -46,6 +46,7 @@
map.Add( "numeric", "numeric" );
map.Add( "boolean", "boolean" );
map.Add( "dateTime", "datetime" );
+ map.Add( "file", "varchar" );=20
return map;
}
=09
Modified: humano2/branches/fileupload/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/branches/fileupload/core/db/pgsql/pgsqlCrud.cs 2005-05-27 22:=
32:53 UTC (rev 1187)
+++ humano2/branches/fileupload/core/db/pgsql/pgsqlCrud.cs 2005-05-27 22:=
45:53 UTC (rev 1188)
@@ -46,8 +46,7 @@
map.Add( "numeric", "numeric" );
map.Add( "boolean", "boolean" );
map.Add( "dateTime", "timestamp" );
-
- //map.Add( "file", "varchar" ); // does not work anyway.
+ map.Add( "file", "varchar" );=20
//map.Add( "image", "varchar" ); // don't work anyway.
return map;
} =09
Modified: humano2/branches/fileupload/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/branches/fileupload/web/portal/site/readXslt.aspx 2005-05-27 =
22:32:53 UTC (rev 1187)
+++ humano2/branches/fileupload/web/portal/site/readXslt.aspx 2005-05-27 =
22:45:53 UTC (rev 1188)
@@ -44,6 +44,13 @@
else return "no date";
}
</script>
+ <script language=3D"Javascript"> <!-- Little function fo=
r attribute file -->
+ function FileAttUpdateHidden(value,inputId)
+ {
+ var inputRef =3D document.getElementById(inputId=
);
+ inputRef.value =3D value;
+ }
+ </script>
=20
</head>
<body style=3D"MARGIN: 10px" text=3D"#000000" vLink=3D"#000=
000" aLink=3D"#000000" link=3D"#000000" bgColor=3D"#ffffff">
Modified: humano2/branches/fileupload/web/portal/site/xsl/file.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/branches/fileupload/web/portal/site/xsl/file.xsl 2005-05-27 2=
2:32:53 UTC (rev 1187)
+++ humano2/branches/fileupload/web/portal/site/xsl/file.xsl 2005-05-27 2=
2:45:53 UTC (rev 1188)
@@ -4,20 +4,27 @@
<xsl:param name=3D"idEntity" select=3D"$idEntity"/>
<xsl:variable name=3D"data" select=3D"/page/classInstance/data/file[id=
_entity=3D$idEntity]/data"/>
<xsl:variable name=3D"path" select=3D"/page/classInstance/structure/fi=
le[id_entity=3D$idEntity]/path"/>
+ <xsl:variable name=3D"sysAttName" select=3D"/page/classInstance/=
structure/attribute[id_entity=3D$idEntity]/sysAttName"/>
=09
<xsl:choose>=09
<xsl:when test=3D"/page/flagaction=3D'Read'">=09
- <a href=3D"{$path}{$data}"><xsl:value-of select=3D"$data"/></a>
+ <a href=3D""><xsl:value-of select=3D"$data"/></a>
</xsl:when>
- =09
<xsl:when test=3D"/page/flagaction=3D'Update'">
- <input name=3D"file" value=3D"{$data}" type=3D"file" />
+ <input name=3D"{$sysAttName}" value=3D"{$data}" type=3D"=
file" onchange=3D"FileAttUpdateHidden(this.value,'hidden{$sysAttName}');"=
/>
+ <input type=3D"hidden" name=3D"{$sysAttName}" id=3D"hidd=
en{$sysAttName}" />
</xsl:when>
-=09
<xsl:when test=3D"/page/flagaction=3D'Create'">
- <input name=3D"file" type=3D"file"/>
+ <input name=3D"{$sysAttName}file" type=3D"file" onchange=
=3D"FileAttUpdateHidden(this.value,'hidden{$sysAttName}');"/>
+ <input type=3D"hidden" name=3D"{$sysAttName}" id=3D"hidd=
en{$sysAttName}" />
</xsl:when>
</xsl:choose>
+ <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
+ allInputsToCheck.Add(aInputToCheck);
+ </script>
+ </xsl:if>
</xsl:template>
</xsl:stylesheet>
=20
|
|
From: <sv...@de...> - 2005-05-27 22:32:53
|
Author: marijn Date: 2005-05-27 18:32:53 -0400 (Fri, 27 May 2005) New Revision: 1187 Modified: humano2/trunk/core/config.cs Log: * Marcar trunk como beta4. Modified: humano2/trunk/core/config.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/config.cs 2005-05-27 22:32:27 UTC (rev 1186) +++ humano2/trunk/core/config.cs 2005-05-27 22:32:53 UTC (rev 1187) @@ -26,7 +26,7 @@ // The Version of the Humano2 core code const int major =3D 5; const int minor =3D 0; - const string patch =3D "beta3"; + const string patch =3D "beta4"; =09 // Contains the instance, once instanced. private static Config instance =3D null; |
|
From: <sv...@de...> - 2005-05-27 22:32:27
|
Author: pcamacho
Date: 2005-05-27 18:32:27 -0400 (Fri, 27 May 2005)
New Revision: 1186
Modified:
humano2/trunk/web/portal/site/xsl/leftbar.xsl
Log:
FIX: title of leftbar in portal has been removed.
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-27 22:06:32 UTC=
(rev 1185)
+++ humano2/trunk/web/portal/site/xsl/leftbar.xsl 2005-05-27 22:32:27 UTC=
(rev 1186)
@@ -12,10 +12,6 @@
</head>
<body>
<form id=3D"Form1" method=3D"post" runat=3D"server">
- <span class=3D"title">
- Views available:
- </span>
- =20
<script language=3D"Javascript">
//Creates the tree
var tree =3D new WebFXTree('');
|
|
From: <sv...@de...> - 2005-05-27 22:06:44
|
Author: marijn Date: 2005-05-27 18:06:32 -0400 (Fri, 27 May 2005) New Revision: 1185 Added: humano2/tags/5.0.beta3/ Log: * Marking trunk as 5.0.beta3 . Copied: humano2/tags/5.0.beta3 (from rev 1184, humano2/trunk) |
|
From: <sv...@de...> - 2005-05-27 22:00:13
|
Author: pcamacho
Date: 2005-05-27 18:00:10 -0400 (Fri, 27 May 2005)
New Revision: 1184
Modified:
humano2/trunk/web/builder/site/foldermanagement.aspx.cs
Log:
FIX: When trying to create a new folder (builder) the list of existing fo=
lders was not appearing.
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-27 21=
:32:51 UTC (rev 1183)
+++ humano2/trunk/web/builder/site/foldermanagement.aspx.cs 2005-05-27 22=
:00:10 UTC (rev 1184)
@@ -465,7 +465,7 @@
string strHtml =3D "";
=09
=09
- if(action =3D=3D CNS_CREATE && action =3D=3D CNS_NOTHING)
+ if(action =3D=3D CNS_CREATE || action =3D=3D CNS_NOTHING)
{
strHtml =3D String.Format("<option value=3D\"0\" selected>---No Fold=
er---</option>");
}
@@ -483,10 +483,12 @@
=20
foreach(DataRow row in dtResult.Rows)
{
- //Don't allow a folder to be a child of one of its desce=
ndants and himself
+ //Don't allow a folder to be a child of one of its desce=
ndants and himself or (case of update only)
adapter dbAdapter =3D userCred.CoreAdapter;
- if(!dbAdapter.IsDescendantOfFolder(folderId, Convert.ToInt32(row["id=
_entity"]))
- && folderId !=3D Convert.ToInt32(row["id_entity"]) )=
=20
+ if( (!dbAdapter.IsDescendantOfFolder(folderId, Convert.ToInt32(r=
ow["id_entity"]))
+ && folderId !=3D Convert.ToInt32(row["id_ent=
ity"])
+ && action =3D=3D CNS_UPDATE)=20
+ )=20
{
absCrud crud =3D Factory.Crud();
absComplex complex =3D crud.GetCore().Complex;
@@ -497,6 +499,11 @@
}
strHtml +=3D "<option value=3D\"" + row["id_entity"]=
+ "\" " + selected +">" + row["folderName"] + "</option>";
}
+ =20
+ if (action !=3D CNS_UPDATE) //Creation no filter
+ {
+ strHtml +=3D "<option value=3D\"" + row["id_entity"]=
+ "\">" + row["folderName"] + "</option>";
+ }
}
Response.Write(strHtml);
}
|
|
From: <sv...@de...> - 2005-05-27 21:32:51
|
Author: marijn
Date: 2005-05-27 17:32:51 -0400 (Fri, 27 May 2005)
New Revision: 1183
Modified:
humano2/trunk/web/portal/site/topbar.aspx.cs
humano2/trunk/web/portal/site/xsl/topbar.xsl
Log:
* Changing the reporting system so that it reports the system version.
Modified: humano2/trunk/web/portal/site/topbar.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/topbar.aspx.cs 2005-05-27 21:26:46 UTC =
(rev 1182)
+++ humano2/trunk/web/portal/site/topbar.aspx.cs 2005-05-27 21:32:51 UTC =
(rev 1183)
@@ -65,6 +65,7 @@
xmlString +=3D "<UserName><![CDATA[" + userCred.UserName + "]]></User=
Name>";
xmlString +=3D "<DomainName><![CDATA[" + userCred.DomainNames[0] + "]=
]></DomainName>";
xmlString +=3D "<Session><![CDATA[" + Cookies.Get(WebConst.SessionCoo=
kie) + "]]></Session>";
+ xmlString +=3D "<Version><![CDATA[" + Humano2.Core.Config.Instance().=
GetVersion() + "]]></Version>";
xmlString +=3D "</Current-Info>";
=20
xmlString+=3D"<classes>";
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-27 21:26:46 UTC =
(rev 1182)
+++ humano2/trunk/web/portal/site/xsl/topbar.xsl 2005-05-27 21:32:51 UTC =
(rev 1183)
@@ -120,11 +120,12 @@
<script language=3D"javascript">
<![CDATA[
h2_ASimg=3D new Image;
- var login =3D "]]><xsl:value-of disable-output-escaping=3D"yes" sel=
ect=3D"Page/Current-Info/UserName"/><![CDATA[" // hay que obtener
+ var email =3D "]]><xsl:value-of disable-output-escaping=3D"yes" sel=
ect=3D"Page/Current-Info/UserName"/><![CDATA[" // hay que obtener
var domain =3D "]]><xsl:value-of disable-output-escaping=3D"yes" se=
lect=3D"Page/Current-Info/DomainName"/><![CDATA[" // hay que obtener
- var h2session =3D "]]><xsl:value-of disable-output-escaping=3D"yes"=
select=3D"Page/Current-Info/Session"/><![CDATA[" // Cookie que se setea =
en login-0000.aspx
+ var h2session =3D "]]><xsl:value-of disable-output-escaping=3D"yes"=
select=3D"Page/Current-Info/Session"/><![CDATA["=20
+ var version =3D "]]><xsl:value-of disable-output-escaping=3D"yes" s=
elect=3D"Page/Current-Info/Version"/><![CDATA["
var server =3D self.location.hostname // parametro de servidor
- h2_ASimg.src =3D "http://humano2.crmfacil.com/userTrack/index.asp?v=
ersion=3D50b2&login=3D" + login +"&domain=3D" + domain +"&server=3D" + se=
rver+"&h2session=3D" + h2session=20
+ h2_ASimg.src =3D "http://humano2.crmfacil.com/userTrack/index.asp?v=
ersion=3D"+ version +"&email=3D" + email +"&domain=3D" + domain +"&server=
=3D" + server+"&h2session=3D" + h2session=20
=09
]]>
</script>
|
|
From: <sv...@de...> - 2005-05-27 21:26:49
|
Author: pcamacho
Date: 2005-05-27 17:26:46 -0400 (Fri, 27 May 2005)
New Revision: 1182
Modified:
humano2/trunk/web/portal/site/leftbar.aspx.cs
Log:
FIX: the leftbar was crashing when they was no folder.
Modified: humano2/trunk/web/portal/site/leftbar.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/leftbar.aspx.cs 2005-05-27 21:07:36 UTC=
(rev 1181)
+++ humano2/trunk/web/portal/site/leftbar.aspx.cs 2005-05-27 21:26:46 UTC=
(rev 1182)
@@ -121,66 +121,65 @@
DataTable DTForm =3D dbAdapter.GenerateViewTools(1200,"0,1203,1202,1=
201",filtro,"","","",0);
=20
xmlString =3D "<folders>" ;
-
- foreach(DataRow Dr in DTFolder.Rows) //Recorre Folders
- {
- xmlString +=3D " <folder>";
- xmlString +=3D " <id>" + Dr["id_entity"] + "</id>";
- xmlString +=3D " <name>" + Dr[1] + "</name>";
- if (Dr[3] !=3D null)
- {
- if (Dr[3].ToString() !=3D "" && Dr[3].ToString() !=3D "0")
- {
- xmlString +=3D " <parent>" + Dr[3] + "</parent>";
- }
+ if(DTFolder !=3D null)
+ {
+ foreach(DataRow Dr in DTFolder.Rows) //Recorre Folde=
rs
+ {
+ xmlString +=3D " <folder>";
+ xmlString +=3D " <id>" + Dr["id_entity"] + "</i=
d>";
+ xmlString +=3D " <name>" + Dr[1] + "</name>";
+ if (Dr[3] !=3D null)
+ {
+ if (Dr[3].ToString() !=3D "" && Dr[3].ToStri=
ng() !=3D "0")
+ {
+ xmlString +=3D " <parent>" + Dr[3] + "<=
/parent>";
+ }
+ else
+ {
+ xmlString +=3D " <parent></parent>";
+ }
+ }
else
{
- xmlString +=3D " <parent></parent>";
- }
- }
- else
- {
- xmlString +=3D " <parent></parent>";
- }
- Forms =3D Convert.ToString(Dr[2]);
-
- if (Forms!=3D"")
- {
- foreach(DataRow Dr2 in DTForm.Select("id_entity in (" + Forms.Trim=
() + ")"))=20
- {
- xmlString +=3D " <form>";
- xmlString +=3D " <id>" + Dr2["id_entity"] + "</id>";
- xmlString +=3D " <classId>" + Dr2[1] + "</classId>";
- xmlString +=3D " <name>" + Dr2[2] + "</name>";
- xmlString +=3D " <type>" + Dr2[3] + "</type>";
- xmlString +=3D " </form>";
- }
-
- foreach(DataRow Dr1 in DTView.Select("id_entity in (" + Forms + ")=
"))=20
- {
- xmlString +=3D " <form>";
- xmlString +=3D " <id>" + Dr1["id_entity"] + "</id>";
- xmlString +=3D " <classId>" + Dr1[1] + "</classId>";
- xmlString +=3D " <name>" + Dr1[2] + "</name>";
- xmlString +=3D " <type></type>";
- xmlString +=3D " </form>";
- }
- foreach(DataRow Dr3 in DTReport.Select("id_entity in (" + Forms + =
")"))=20
- {
- xmlString +=3D " <report>";
- xmlString +=3D " <id>" + Dr3["id_entity"] + "</id>";
- xmlString +=3D " <classId></classId>";
- xmlString +=3D " <name>" + Dr3[1] + "</name>";
- xmlString +=3D " <type></type>";
- xmlString +=3D " </report>";
- }
- }
- xmlString +=3D " </folder>";
- }
-
+ xmlString +=3D " <parent></parent>";
+ }
+ Forms =3D Convert.ToString(Dr[2]);
+ =20
+ if (Forms!=3D"")
+ {
+ foreach(DataRow Dr2 in DTForm.Select("id_ent=
ity in (" + Forms.Trim() + ")"))=20
+ {
+ xmlString +=3D " <form>";
+ xmlString +=3D " <id>" + Dr2["id_entit=
y"] + "</id>";
+ xmlString +=3D " <classId>" + Dr2[1] +=
"</classId>";
+ xmlString +=3D " <name>" + Dr2[2] + "<=
/name>";
+ xmlString +=3D " <type>" + Dr2[3] + "<=
/type>";
+ xmlString +=3D " </form>";
+ }
+ =20
+ foreach(DataRow Dr1 in DTView.Select("id_ent=
ity in (" + Forms + ")"))=20
+ {
+ xmlString +=3D " <form>";
+ xmlString +=3D " <id>" + Dr1["id_entit=
y"] + "</id>";
+ xmlString +=3D " <classId>" + Dr1[1] +=
"</classId>";
+ xmlString +=3D " <name>" + Dr1[2] + "<=
/name>";
+ xmlString +=3D " <type></type>";
+ xmlString +=3D " </form>";
+ }
+ foreach(DataRow Dr3 in DTReport.Select("id_e=
ntity in (" + Forms + ")"))=20
+ {
+ xmlString +=3D " <report>";
+ xmlString +=3D " <id>" + Dr3["id_entit=
y"] + "</id>";
+ xmlString +=3D " <classId></classId>";
+ xmlString +=3D " <name>" + Dr3[1] + "<=
/name>";
+ xmlString +=3D " <type></type>";
+ xmlString +=3D " </report>";
+ }
+ }
+ xmlString +=3D " </folder>";
+ }
+ }
xmlString +=3D "</folders>";
-
-
}=09
=20
//Add the header
|
|
From: <sv...@de...> - 2005-05-27 21:07:42
|
Author: marijn
Date: 2005-05-27 17:07:36 -0400 (Fri, 27 May 2005)
New Revision: 1181
Added:
humano2/trunk/web/portal/site/indexPortalframe.html
Modified:
humano2/trunk/web/portal/site/index.aspx
humano2/trunk/web/portal/site/indexPortal.aspx
Log:
CHANGE:=20
* Adding a right bar page so that it shows information about the proyect
* Changing the style of the center page.
Modified: humano2/trunk/web/portal/site/index.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/index.aspx 2005-05-27 20:30:12 UTC (rev=
1180)
+++ humano2/trunk/web/portal/site/index.aspx 2005-05-27 21:07:36 UTC (rev=
1181)
@@ -13,7 +13,7 @@
<frame src=3D"topbar.aspx" name=3D"topFrame" scrolling=3D"no" framebor=
der=3D"no">
<frameset cols=3D"250,89%" frameborder=3D"no" border=3D"0" framespacin=
g=3D"0">
<frame src=3D"leftbar.aspx" name=3D"leftFrame" scrolling=3D"yes">
- <frame src=3D"indexPortal.aspx" name=3D"mainFrame" scrolling=3D"no">
+ <frame src=3D"indexPortalframe.html" name=3D"mainFrame" scrolling=3D"=
no">
</frameset>
<noframes>Unfortunately, this system requires a browser with frame sup=
port.</noframes>
</frameset>
Modified: humano2/trunk/web/portal/site/indexPortal.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/indexPortal.aspx 2005-05-27 20:30:12 UT=
C (rev 1180)
+++ humano2/trunk/web/portal/site/indexPortal.aspx 2005-05-27 21:07:36 UT=
C (rev 1181)
@@ -1,28 +1,32 @@
<%@ Page language=3D"c#" Codebehind=3D"indexPortal.aspx.cs" AutoEventWir=
eup=3D"false" Inherits=3D"Portal.site.indexPortal" %>
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" >
-<HTML>
- <HEAD>
- <title>Portal Welcome</title>
- <LINK href=3D"css/default.css" rel=3D"stylesheet" type=3D"text/css">
- <LINK href=3D"css/main.css" rel=3D"stylesheet" type=3D"text/css">
- <STYLE>
- a: { color: blue; }
- a:visited { color: darkblue; }
- a:hover { color: red; }
- </STYLE>
- </HEAD>
- <body>
- <form id=3D"Form1" method=3D"post" runat=3D"server">
- <P>Portal version <% Response.Write(showVersion()); %></P>
- <p/>
- <div style=3D"border:solid; margin: 1em; padding: 1em;">
- <P>This is <em>beta</em> software. It <em>will</em> break and have we=
ird behavior.</P>
- <P>When it does, you can help to improve it by <a href=3D"http://deve=
l.humano2.org/trac/newticket" target=3D"_blank">filling out a report in o=
ur bug-tracking system</a>. Please explain in the report what you were do=
ing and where it went wrong. If you leave your email we can contact you f=
or more details if that is necesary.<br/>Thank You!</P>
- </div>
- <div style=3D"border:solid; margin: 1em; padding: 1em;">
- <P>Esto se software <em>beta</em>. Este software <em>tiene</em> bugs =
y comportamiento extraño</P>
- <p>Cuando encuentres un problema, tu puedes ayudar a mejorar el softw=
are <a href=3D"http://devel.humano2.org/trac/newticket" target=3D"_blank"=
>llenando un raporte en nuestro sistema de bugs</a>. Por favor, en el rap=
orte describe que estabas haciendo y que fue mal. Si dejas tu email, pode=
mos contactarte de vuelta si sea necesario.<br/>Gracias!</p>
- </div>
- </form>
- </body>
-</HTML>
+<html>
+<head>
+<meta http-equiv=3D"Content-Type" content=3D"text/html; charset=3Diso-88=
59-1">
+<LINK href=3D"css/default.css" rel=3D"stylesheet" type=3D"text/css">
+<LINK href=3D"css/main.css" rel=3D"stylesheet" type=3D"text/css">
+<style type=3D"text/css">
+<!--
+.style1 {font-family: Arial, Helvetica, sans-serif}
+.style2 {
+ font-size: 24px;
+ font-weight: bold;
+}
+a: { color: blue; }
+a:visited { color: darkblue; }
+a:hover { color: red; }
+-->
+</style>
+</head>
+
+<body>
+<p class=3D"style2">Humano2 <% Response.Write(showVersion()); %></p>
+<p class=3D"style1"><strong>English</strong></p>
+<p class=3D"style1">This is <em>beta </em> software. It <em>will </em> b=
reak and have weird behaviour. When it does, you can help to improve it b=
y <a href=3D"http://devel.humano2.org/trac/newticket">filling out a repor=
t in our bug-tracking system </a>. Please explain in the report what you =
were doing and where it went wrong. If you leave your email we can contac=
t you for more details if that is necessary. </p>
+<p class=3D"style1"><strong>Español</strong></p>
+<p class=3D"style1">Esto se software <em>beta </em>. Este software <em>t=
iene </em> bugs y comportamiento extraño Cuando encuentres un prob=
lema, tu puedes ayudar a mejorar el software <a href=3D"http://devel.huma=
no2.org/trac/newticket">llenando un raporte en nuestro sistema de bugs </=
a>. Por favor, en el raporte describe que estabas haciendo y que fue mal.=
Si dejas tu email, podemos contactarte de vuelta si sea necesario. <br>
+ <br>
+</p>
+<p align=3D"center"> </p>
+</body>
+</html>
Added: humano2/trunk/web/portal/site/indexPortalframe.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/portal/site/indexPortalframe.html 2005-05-27 20:30:=
12 UTC (rev 1180)
+++ humano2/trunk/web/portal/site/indexPortalframe.html 2005-05-27 21:07:=
36 UTC (rev 1181)
@@ -0,0 +1,14 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Frameset//EN" "http://www.w=
3.org/TR/html4/frameset.dtd">
+<html>
+ <head>
+ <meta http-equiv=3D"Content-Type" content=3D"text/html; charset=3Diso-8=
859-1">
+ </head>
+ <frameset rows=3D"*" cols=3D"*,230" framespacing=3D"0" frameborder=3D"=
NO" border=3D"0">
+ <frame src=3D"indexPortal.aspx" name=3D"mainIndexFrame">
+ <frame src=3D"http://www.humano2.com/network/?q=3Dnode/288" name=3D"rig=
htIndexFrame" scrolling=3D"yes" noresize marginwidth=3D"0" marginheight=3D=
"0">
+ </frameset>
+ <noframes>
+ <body>
+ </body>
+ </noframes>
+</html>
|
|
From: <sv...@de...> - 2005-05-27 20:30:21
|
Author: rquilo Date: 2005-05-27 16:30:12 -0400 (Fri, 27 May 2005) New Revision: 1180 Modified: humano2/trunk/web/portal/site/topbar.aspx.cs humano2/trunk/web/portal/site/xsl/topbar.xsl Log: * Added code which allows to centrally track sessions. The information s= ent to the central server is - login (not email) - domain - URL server name (eg, localhost or free.humano2.com) - session ID =20 Modified: humano2/trunk/web/portal/site/topbar.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/topbar.aspx.cs 2005-05-27 20:15:29 UTC = (rev 1179) +++ humano2/trunk/web/portal/site/topbar.aspx.cs 2005-05-27 20:30:12 UTC = (rev 1180) @@ -64,6 +64,7 @@ xmlString +=3D "<Current-Info>"; xmlString +=3D "<UserName><![CDATA[" + userCred.UserName + "]]></User= Name>"; xmlString +=3D "<DomainName><![CDATA[" + userCred.DomainNames[0] + "]= ]></DomainName>"; + xmlString +=3D "<Session><![CDATA[" + Cookies.Get(WebConst.SessionCoo= kie) + "]]></Session>"; xmlString +=3D "</Current-Info>"; =20 xmlString+=3D"<classes>"; 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-27 20:15:29 UTC = (rev 1179) +++ humano2/trunk/web/portal/site/xsl/topbar.xsl 2005-05-27 20:30:12 UTC = (rev 1180) @@ -117,5 +117,17 @@ <td>   </td> </tr> </table> + <script language=3D"javascript"> + <![CDATA[ + h2_ASimg=3D new Image; + var login =3D "]]><xsl:value-of disable-output-escaping=3D"yes" sel= ect=3D"Page/Current-Info/UserName"/><![CDATA[" // hay que obtener + var domain =3D "]]><xsl:value-of disable-output-escaping=3D"yes" se= lect=3D"Page/Current-Info/DomainName"/><![CDATA[" // hay que obtener + var h2session =3D "]]><xsl:value-of disable-output-escaping=3D"yes"= select=3D"Page/Current-Info/Session"/><![CDATA[" // Cookie que se setea = en login-0000.aspx + var server =3D self.location.hostname // parametro de servidor + h2_ASimg.src =3D "http://humano2.crmfacil.com/userTrack/index.asp?v= ersion=3D50b2&login=3D" + login +"&domain=3D" + domain +"&server=3D" + se= rver+"&h2session=3D" + h2session=20 + =09 + ]]> + </script> + =09 </xsl:template> </xsl:stylesheet> |
|
From: <sv...@de...> - 2005-05-27 20:15:31
|
Author: pcamacho
Date: 2005-05-27 16:15:29 -0400 (Fri, 27 May 2005)
New Revision: 1179
Modified:
humano2/branches/fileupload/core/schema/pgsql/pgsql-1-metadata.sql
Log:
CHANGE: the attribute fil eis now visible (appears in the list of attribu=
tes when a class is created / updated).
Modified: humano2/branches/fileupload/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/branches/fileupload/core/schema/pgsql/pgsql-1-metadata.sql 20=
05-05-27 19:58:22 UTC (rev 1178)
+++ humano2/branches/fileupload/core/schema/pgsql/pgsql-1-metadata.sql 20=
05-05-27 20:15:29 UTC (rev 1179)
@@ -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', 't');
+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')=
;
|
|
From: <sv...@de...> - 2005-05-27 19:58:21
|
Author: pcamacho Date: 2005-05-27 15:58:22 -0400 (Fri, 27 May 2005) New Revision: 1178 Added: humano2/branches/fileupload/ Log: ADD: starting new branch for file uploading. Copied: humano2/branches/fileupload (from rev 1177, humano2/trunk) |
|
From: <sv...@de...> - 2005-05-27 19:57:29
|
Author: pcamacho Date: 2005-05-27 15:57:30 -0400 (Fri, 27 May 2005) New Revision: 1177 Removed: humano2/branches/fileupload/ Log: DEL: to do a new branch for "fileupload". |
|
From: <sv...@de...> - 2005-05-27 19:13:25
|
Author: pcamacho
Date: 2005-05-27 15:13:26 -0400 (Fri, 27 May 2005)
New Revision: 1176
Modified:
humano2/trunk/web/builder/site/foldermanagement.aspx.cs
Log:
DEL: remove of unuseful code.
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-27 19=
:07:53 UTC (rev 1175)
+++ humano2/trunk/web/builder/site/foldermanagement.aspx.cs 2005-05-27 19=
:13:26 UTC (rev 1176)
@@ -392,28 +392,7 @@
return retVal;
}
=20
- 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);
=20
- 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)
@@ -484,8 +463,8 @@
{
int domainId =3D userCred.DomainIds[userCred.CurrentDomainIndex];
string strHtml =3D "";
- ArrayList arrFolder =3D null;
=09
+ =09
if(action =3D=3D CNS_CREATE && action =3D=3D CNS_NOTHING)
{
strHtml =3D String.Format("<option value=3D\"0\" selected>---No Fold=
er---</option>");
|
|
From: <sv...@de...> - 2005-05-27 19:07:55
|
Author: pcamacho
Date: 2005-05-27 15:07:53 -0400 (Fri, 27 May 2005)
New Revision: 1175
Modified:
humano2/trunk/core/db/absComplex.cs
humano2/trunk/core/db/mssql/mssqlComplex.cs
humano2/trunk/core/db/pgsql/pgsqlComplex.cs
humano2/trunk/web/builder/site/foldermanagement.aspx.cs
Log:
FIX: in the creation of folder, when updating the name of folder parent w=
as not getted back into the interface.
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-05-27 19:07:09 UTC (rev 1174=
)
+++ humano2/trunk/core/db/absComplex.cs 2005-05-27 19:07:53 UTC (rev 1175=
)
@@ -396,6 +396,9 @@
///</summary>
abstract public int [] GetChildsOfFolder(int folderId);
=20
+ ///<summary>Returns the id of the parent of a folder</summary>
+ abstract public int GetParentOfFolder(int folderId);
+ =20
#endregion
=20
public object doScalar(string query)
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-05-27 19:07:09 UTC (=
rev 1174)
+++ humano2/trunk/core/db/mssql/mssqlComplex.cs 2005-05-27 19:07:53 UTC (=
rev 1175)
@@ -1239,5 +1239,14 @@
return res;
}
=20
+ public override int GetParentOfFolder(int folderId)
+ {
+ string req =3D "select \"folderParent\" from folder where \"=
id_entity\" =3D " + folderId;
+ DataTable dt =3D doSelect(req);
+ int res;
+ res =3D Convert.ToInt32(dt.Rows[0]["folderParent"]);
+ =20
+ return res;
+ }
}
}
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-27 19:07:09 UTC (=
rev 1174)
+++ humano2/trunk/core/db/pgsql/pgsqlComplex.cs 2005-05-27 19:07:53 UTC (=
rev 1175)
@@ -1255,5 +1255,15 @@
=20
return res;
}
+ =20
+ public override int GetParentOfFolder(int folderId)
+ {
+ string req =3D "select \"folderParent\" from folder where \"=
id_entity\" =3D " + folderId;
+ DataTable dt =3D doSelect(req);
+ int res;
+ res =3D Convert.ToInt32(dt.Rows[0]["folderParent"]);
+ =20
+ return res;
+ }
}
}
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-27 19=
:07:09 UTC (rev 1174)
+++ humano2/trunk/web/builder/site/foldermanagement.aspx.cs 2005-05-27 19=
:07:53 UTC (rev 1175)
@@ -509,7 +509,14 @@
if(!dbAdapter.IsDescendantOfFolder(folderId, Convert.ToInt32(row["id=
_entity"]))
&& folderId !=3D Convert.ToInt32(row["id_entity"]) )=
=20
{
- strHtml +=3D String.Format("<option value=3D\"{0}\" =
selected>{1}</option>",row["id_entity"],row["folderName"]);
+ absCrud crud =3D Factory.Crud();
+ absComplex complex =3D crud.GetCore().Complex;
+ string selected =3D "";
+ if(complex.GetParentOfFolder(folderId) =3D=3D Conver=
t.ToInt32(row["id_entity"])) //Preselected option
+ {
+ selected =3D "selected=3D\"\"";
+ }
+ strHtml +=3D "<option value=3D\"" + row["id_entity"]=
+ "\" " + selected +">" + row["folderName"] + "</option>";
}
}
Response.Write(strHtml);
|
