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-06-22 21:16:57
|
Author: pcamacho
Date: 2005-06-22 17:16:59 -0400 (Wed, 22 Jun 2005)
New Revision: 1396
Modified:
humano2/trunk/web/builder/site/xsl/createfolder.xsl
humano2/trunk/web/builder/site/xsl/createform.xsl
humano2/trunk/web/builder/site/xsl/createinterfacetools.xsl
humano2/trunk/web/builder/site/xsl/createreport.xsl
humano2/trunk/web/builder/site/xsl/createview.xsl
Log:
CHANGE:
* still factorizing xsl code...
* bug fix: when deleting a form,folder,view,report, the warning message =
was forgetting=20
"form","folder","view","report".
Modified: humano2/trunk/web/builder/site/xsl/createfolder.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/createfolder.xsl 2005-06-22 20:55:=
20 UTC (rev 1395)
+++ humano2/trunk/web/builder/site/xsl/createfolder.xsl 2005-06-22 21:16:=
59 UTC (rev 1396)
@@ -138,37 +138,10 @@
<xsl:with-param name=3D"title">
</xsl:with-param>
</xsl:call-template>
- <tr align=3D"center">
- <td>
- <table>
- <tr>
- <td class=3D"ContentAlt">
- <div id=3D"CrudButtons1">
- <input type=3D"submit">
- <xsl:attribute name=3D=
"value">
- <xsl:value-of se=
lect=3D"/folder/folderDatas/saveName" />
- </xsl:attribute>
- <xsl:attribute name=3D=
"onclick">
- Form.UpdateSubmi=
tAll();
- </xsl:attribute>
- </input>
- </div>
- </td>
- <td>
- <div id=3D"CrudButtons2">
- <xsl:if test=3D"/folder/=
folderDatas/displayDeleteButton=3D'true'" >
- <input type=3D"submi=
t" value=3D"Delete">
- <xsl:attribute n=
ame=3D"onclick">
- FormDelete()=
;
- </xsl:attribute>
- </input>
- </xsl:if>
- </div>
- </td>
- </tr>
- </table>
- </td>
- </tr>
+ <xsl:call-template name=3D"CreateButtons">
+ <xsl:with-param name=3D"SaveName" select=3D"=
/folder/folderDatas/saveName" />
+ <xsl:with-param name=3D"BoolDelete" select=3D=
"/folder/folderDatas/displayDeleteButton" /> =
=20
+ </xsl:call-template>
<!--######################### End:Buttons ######=
#################################### -->
</table>
<!-- This tag is used to create the inputs hidden to=
send all the data in one pass -->
Modified: humano2/trunk/web/builder/site/xsl/createform.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/createform.xsl 2005-06-22 20:55:20=
UTC (rev 1395)
+++ humano2/trunk/web/builder/site/xsl/createform.xsl 2005-06-22 21:16:59=
UTC (rev 1396)
@@ -168,37 +168,10 @@
<xsl:with-param name=3D"title">
</xsl:with-param>
</xsl:call-template>
- <tr align=3D"center">
- <td>
- <table>
- <tr>
- <td class=3D"ContentAlt">
- <div id=3D"CrudButtons1"=
>
- <input type=3D"submi=
t">
- <xsl:attribute n=
ame=3D"value">
- <xsl:value-o=
f select=3D"/form/formDatas/saveName" />
- </xsl:attribute>
- <xsl:attribute n=
ame=3D"onclick">
- Form.UpdateS=
ubmitAll();
- </xsl:attribute>
- </input>
- </div>
- </td>
- <td>
- <div id=3D"CrudButtons2"=
>
- <xsl:if test=3D"/for=
m/formDatas/displayDeleteButton=3D'true'" >
- <input type=3D"s=
ubmit" value=3D"Delete">
- <xsl:attribu=
te name=3D"onclick">
- FormDele=
te();
- </xsl:attrib=
ute>
- </input>
- </xsl:if>
- </div>
- </td>
- </tr>
- </table>
- </td>
- </tr>
+ <xsl:call-template name=3D"CreateButtons">
+ <xsl:with-param name=3D"SaveName" select=
=3D"/form/formDatas/saveName" />
+ <xsl:with-param name=3D"BoolDelete" sele=
ct=3D"/form/formDatas/displayDeleteButton" /> =
=20
+ </xsl:call-template>
</xsl:if>
<!--######################### End:Buttons ##=
######################################## -->
</table>
Modified: humano2/trunk/web/builder/site/xsl/createinterfacetools.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/createinterfacetools.xsl 2005-06-2=
2 20:55:20 UTC (rev 1395)
+++ humano2/trunk/web/builder/site/xsl/createinterfacetools.xsl 2005-06-2=
2 21:16:59 UTC (rev 1396)
@@ -1,20 +1,20 @@
<xsl:stylesheet version=3D"1.0" xmlns:xsl=3D"http://www.w3.org/1999/XSL/=
Transform">
<!-- $Id$ -->
<xsl:template name=3D"SeparationBar">
- <xsl:param name=3D"title" />
- <tr>
- <td colspan=3D"2">
- <table width=3D"100%" border=3D"0" cellSpacing=3D"0" cellPad=
ding=3D"0">
- <tr>
- <td width=3D"100%" colspan=3D"2" class=3D"separatorL=
ine">
- </td>
- </tr>
- <tr>
- <td class=3D"lev1head" valign=3D"top"><font size=3D"=
2"><xsl:value-of select=3D"$title" /></font></td>
- </tr>
- </table>
- </td>
- </tr>
+ <xsl:param name=3D"title" />
+ <tr>
+ <td colspan=3D"2">
+ <table width=3D"100%" border=3D"0" cellSpacing=3D"0" cel=
lPadding=3D"0">
+ <tr>
+ <td width=3D"100%" colspan=3D"2" class=3D"separa=
torLine">
+ </td>
+ </tr>
+ <tr>
+ <td class=3D"lev1head" valign=3D"top"><font size=
=3D"2"><xsl:value-of select=3D"$title" /></font></td>
+ </tr>
+ </table>
+ </td>
+ </tr>
</xsl:template>
=20
<xsl:template name=3D"BuildLeftAndRightColumn">
@@ -69,4 +69,39 @@
</table>
</xsl:template>
=20
+ <xsl:template name=3D"CreateButtons">
+ <xsl:param name=3D"SaveName" />
+ <xsl:param name=3D"BoolDelete" />
+ <tr align=3D"center">
+ <td>
+ <table>
+ <tr>
+ <td class=3D"ContentAlt">
+ <div id=3D"CrudButtons1">
+ <input type=3D"submit">
+ <xsl:attribute name=3D"value">
+ <xsl:value-of select=3D"$SaveNam=
e" />
+ </xsl:attribute>
+ <xsl:attribute name=3D"onclick">
+ Form.UpdateSubmitAll();
+ </xsl:attribute>
+ </input>
+ </div>
+ </td>
+ <td>
+ <div id=3D"CrudButtons2">
+ <xsl:if test=3D"$BoolDelete=3D'true'" >
+ <input type=3D"submit" value=3D"Dele=
te">
+ <xsl:attribute name=3D"onclick">
+ Form.Delete();
+ </xsl:attribute>
+ </input>
+ </xsl:if>
+ </div>
+ </td>
+ </tr>
+ </table>
+ </td>
+ </tr>
+ </xsl:template>
</xsl:stylesheet>
Modified: humano2/trunk/web/builder/site/xsl/createreport.xsl
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- humano2/trunk/web/builder/site/xsl/createreport.xsl 2005-06-22 20:55:=
20 UTC (rev 1395)
+++ humano2/trunk/web/builder/site/xsl/createreport.xsl 2005-06-22 21:16:=
59 UTC (rev 1396)
@@ -6,12 +6,6 @@
<html>
<head>
<title>Report Edit</title>
- <script language=3D"javascript">
- function ConfirmDelete(userId)
- {
- return confirm("Are you sure you want to remove this=
report?");
- }
- </script>
<!-- For the graphical components -->
<script language=3D"Javascript" src=3D"js/grafcomponents/mis=
c.js"></script>
<script language=3D"javascript" src=3D"js/grafcomponents/tes=
t.js"></script>
@@ -403,37 +397,10 @@
<xsl:with-param name=3D"title">
</xsl:with-param>
</xsl:call-template>
- <tr align=3D"center">
- <td>
- <table>
- <tr>
- <td class=3D"ContentAlt"=
>
- <div id=3D"CrudButto=
ns1">
- <input type=3D"s=
ubmit">
- <xsl:attribu=
te name=3D"value">
- <xsl:val=
ue-of select=3D"/report/reportDatas/saveName" />
- </xsl:attrib=
ute>
- <xsl:attribu=
te name=3D"onclick">
- Form.Upd=
ateSubmitAll();
- </xsl:attrib=
ute>
- </input>
- </div>
- </td>
- <td>
- <div id=3D"CrudButto=
ns2">
- <xsl:if test=3D"=
/report/reportDatas/displayDeleteButton=3D'true'" >
- <input type=3D=
"submit" value=3D"Delete">
- <xsl:att=
ribute name=3D"onclick">
- Form=
Delete();
- </xsl:at=
tribute>
- </input>
- </xsl:if>
- </div>
- </td>
- </tr>
- </table>
- </td>
- </tr>
+ <xsl:call-template name=3D"CreateButtons=
">
+ <xsl:with-param name=3D"SaveName" se=
lect=3D"/report/reportDatas/saveName" />
+ <xsl:with-param name=3D"BoolDelete" =
select=3D"/report/reportDatas/displayDeleteButton" /> =
=20
+ </xsl:call-template>
<!--######################### End:Button=
s ########################################## -->
</xsl:if>
</table>
Modified: humano2/trunk/web/builder/site/xsl/createview.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/createview.xsl 2005-06-22 20:55:20=
UTC (rev 1395)
+++ humano2/trunk/web/builder/site/xsl/createview.xsl 2005-06-22 21:16:59=
UTC (rev 1396)
@@ -6,12 +6,6 @@
<html>
<head>
<title>View Edit</title>
- <script language=3D"javascript">
- function ConfirmDelete(userId)
- {
- return confirm("Are you sure you want to remove this=
view?");
- }
- </script>
<!-- For the graphical components -->
<script language=3D"Javascript" src=3D"js/grafcomponents/mis=
c.js"></script>
<script language=3D"javascript" src=3D"js/grafcomponents/tes=
t.js"></script>
@@ -316,37 +310,10 @@
<xsl:with-param name=3D"title">
</xsl:with-param>
</xsl:call-template>
- <tr>
- <td>
- <table width=3D"100%">
- <tr align=3D"center">
- <td class=3D"Content=
Alt">
- <div id=3D"CrudB=
uttons1">
- <input type=3D=
"submit">
- <xsl:att=
ribute name=3D"value">
- <xsl=
:value-of select=3D"/view/viewDatas/saveName" />
- </xsl:at=
tribute>
- <xsl:att=
ribute name=3D"onclick">
- retu=
rn Form.UpdateSubmitAll();=20
- </xsl:at=
tribute>
- </input>
- </div>
- </td>
- <td>
- <div id=3D"CrudB=
uttons2">
- <xsl:if test=
=3D"/view/viewDatas/displayDeleteButton=3D'true'" >
- <input t=
ype=3D"submit" value=3D"Delete">
- <xsl=
:attribute name=3D"onclick">
- =
FormDelete();
- </xs=
l:attribute>
- </input>
- </xsl:if>
- </div>
- </td>
- </tr>
- </table>
- </td>
- </tr>
+ <xsl:call-template name=3D"CreateBut=
tons">
+ <xsl:with-param name=3D"SaveName=
" select=3D"/view/viewDatas/saveName" />
+ <xsl:with-param name=3D"BoolDele=
te" select=3D"/view/viewDatas/displayDeleteButton" /> =
=20
+ </xsl:call-template>
<!--######################### End:Bu=
ttons ########################################## -->
</xsl:if>
</table>
|
|
From: <sv...@de...> - 2005-06-22 20:55:18
|
Author: marcelo
Date: 2005-06-22 16:55:20 -0400 (Wed, 22 Jun 2005)
New Revision: 1395
Modified:
humano2/trunk/core/schema/pgsql/pgsql-Beta6patch.sql
humano2/trunk/web/portal/site/showView.aspx.cs
Log:
* Modified SQL Patch file, added ; so it does not crash
* Modified showView to add concept of views of type "My things"
Modified: humano2/trunk/core/schema/pgsql/pgsql-Beta6patch.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-Beta6patch.sql 2005-06-22 20:32=
:50 UTC (rev 1394)
+++ humano2/trunk/core/schema/pgsql/pgsql-Beta6patch.sql 2005-06-22 20:55=
:20 UTC (rev 1395)
@@ -1,4 +1,4 @@
-update "view" set "where" =3D '34|8|{(''[DomainId]'',''10'')}|0|0' wher=
e id_entity =3D 1405
+update "view" set "where" =3D '34|8|{(''[DomainId]'',''10'')}|0|0' wher=
e id_entity =3D 1405;
=20
-- For the pertinence properties width and height
alter table pertinence add column widthPertinence Integer;
Modified: humano2/trunk/web/portal/site/showView.aspx.cs
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- humano2/trunk/web/portal/site/showView.aspx.cs 2005-06-22 20:32:50 UT=
C (rev 1394)
+++ humano2/trunk/web/portal/site/showView.aspx.cs 2005-06-22 20:55:20 UT=
C (rev 1395)
@@ -21,6 +21,8 @@
using System.Web.UI.WebControls;
using System.Web.UI.HtmlControls;
=20
+using System.Reflection;
+using System.Reflection.Emit;
using System.Text.RegularExpressions;
=20
using Humano2.Components.WebTools;
@@ -123,7 +125,23 @@
{
viewTable =3D getViewForSearch(iniClass,idAttributes,idOperators,val=
uesToSearch);
}
- =20
+
+ //replaces dynamic session variables
+ Type myType =3D typeof(SessionCredencial);
+ string whereStr =3D viewTable.Rows[0]["where"].ToString();
+
+ FieldInfo[] myFieldInfo =3D myType.GetFields();
+ for(int i=3D0;i<myFieldInfo.Length;i++)
+ {
+ FieldInfo myPropInfo =3D (FieldInfo)myFieldInfo[i];
+ string fieldName =3D myPropInfo.Name;=09
+ whereStr =3D whereStr.Replace("[currrentUser." + fieldName + "]",myP=
ropInfo.GetValue(userCred).ToString());
+ }
+=20
+ =09
+ =09
+ viewTable.Rows[0]["where"] =3D whereStr;
+
// If there are multiple "order" arguments, they should be s=
eperated by ",";
// The framework already puts a "," between multiple "order =
arguments.
Logger.Log("Before ExecViewFromDataTabe. iniClass=3D " + Con=
vert.ToString(iniClass),LogLevel.Trace);
|
|
From: <sv...@de...> - 2005-06-22 20:32:49
|
Author: pcamacho
Date: 2005-06-22 16:32:50 -0400 (Wed, 22 Jun 2005)
New Revision: 1394
Modified:
humano2/trunk/web/builder/site/xsl/createfolder.xsl
humano2/trunk/web/builder/site/xsl/createform.xsl
humano2/trunk/web/builder/site/xsl/createinterfacetools.xsl
humano2/trunk/web/builder/site/xsl/createreport.xsl
humano2/trunk/web/builder/site/xsl/createview.xsl
Log:
CHANGE: following factorization of xsl code for creation of view,folder,r=
eport,form: now all the pair of js columns
are in one place! :)
Modified: humano2/trunk/web/builder/site/xsl/createfolder.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/createfolder.xsl 2005-06-22 20:19:=
19 UTC (rev 1393)
+++ humano2/trunk/web/builder/site/xsl/createfolder.xsl 2005-06-22 20:32:=
50 UTC (rev 1394)
@@ -97,70 +97,14 @@
</table>
</td>
</tr>
- =20
<xsl:call-template name=3D"SeparationBar">
<xsl:with-param name=3D"title">
Items...
</xsl:with-param>
</xsl:call-template>
- =20
<tr>
<td colspan=3D"2">
- <table>
- <tr>
- <td>Available Columns</td>
- <td></td>
- <td>Your Columns</td>
- </tr>
- <tr>
- <td>
- <div id=3D"ColumnsToShowLeft=
" ondblclick=3D"leftColumn.Move(leftColumn.GetSelectedIndex(),rightColumn=
,false);">
- </div>
- </td>
- <td>
- <center>
- <input type=3D"button"=20
- width=3D"20"
- value=3D">>"=20
- onclick =3D "leftCol=
umn.Move(leftColumn.GetSelectedIndex(),rightColumn,false);"></input>
- <br/>
- <input type=3D"button"=20
- width=3D"20"
- value=3D"<<=
;"=20
- onclick =3D "rig=
htColumn.Move(rightColumn.GetSelectedIndex(),leftColumn,true);"></input>
- </center>
- </td>
- <td>
- <div id=3D"ColumnsToShowRigh=
t" ondblclick=3D"rightColumn.Move(rightColumn.GetSelectedIndex(),leftColu=
mn,true);">
- </div>
- </td>
- <td>
- <a href=3D"#" onclick=3D"rig=
htColumn.Top(rightColumn.GetSelectedIndex())">
- <img src=3D"img/upuparro=
w.gif" border=3D"0"/>
- </a>
- <br/>
- <a href=3D"#" onclick=3D"rig=
htColumn.Up(rightColumn.GetSelectedIndex())">
- <img src=3D"img/uparrow.=
gif" border=3D"0" />
- </a>
- <br/>
- <a href=3D"#" onclick=3D"rig=
htColumn.Down(rightColumn.GetSelectedIndex())">
- <img src=3D"img/downarro=
w.gif" border=3D"0" />
- </a>
- <br/>
- <a href=3D"#" onclick=3D"rig=
htColumn.Bottom(rightColumn.GetSelectedIndex())">
- <img src=3D"img/downdown=
arrow.gif" border=3D"0" />
- </a>
- </td>
- <td>
- <input type=3D"button" value=
=3D"SetToDefault"=20
- onclick=3D"leftColumn.Se=
tToDefault();rightColumn.SetToDefault();"></input>
- <br/>
- <!-- Do not forget to enable=
all item of the left list -->
- <input type=3D"button" value=
=3D"RemoveAll" onclick=3D"leftColumn.EnableAll();rightColumn.RemoveAll();=
"></input>
- </td>
- </tr>
- </table>
- =20
+ <xsl:call-template name=3D"BuildLeftAndR=
ightColumn" />
<script>
//First List
var divColumnsToShowLeft =3D Get=
NodeByTagNameAndAttName("div","ColumnsToShowLeft")[0]; =20
Modified: humano2/trunk/web/builder/site/xsl/createform.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/createform.xsl 2005-06-22 20:19:19=
UTC (rev 1393)
+++ humano2/trunk/web/builder/site/xsl/createform.xsl 2005-06-22 20:32:50=
UTC (rev 1394)
@@ -104,55 +104,7 @@
</xsl:call-template>
<tr>
<td class=3D"smallgraytextnolink" colsp=
an=3D"2">
- <table>
- <tr>
- <td>
- <div id=3D"ColumnsToShowLeft=
" ondblclick=3D"leftColumn.Move(leftColumn.GetSelectedIndex(),rightColumn=
,false);">
- </div>
- </td>
- <td>
- <center>
- <input type=3D"button"=20
- width=3D"20"
- value=3D">>"=20
- onclick =3D "leftCol=
umn.Move(leftColumn.GetSelectedIndex(),rightColumn,false);"></input>
- <br/>
- <input type=3D"button"=20
- width=3D"20"
- value=3D"<<=
;"=20
- onclick =3D "rig=
htColumn.Move(rightColumn.GetSelectedIndex(),leftColumn,true);"></input>
- </center>
- </td>
- <td>
- <div id=3D"ColumnsToShowRigh=
t" ondblclick=3D"rightColumn.Move(rightColumn.GetSelectedIndex(),leftColu=
mn,true);">
- </div>
- </td>
- <td>
- <a href=3D"#" onclick=3D"rig=
htColumn.Top(rightColumn.GetSelectedIndex())">
- <img src=3D"img/upuparro=
w.gif" border=3D"0"/>
- </a>
- <br/>
- <a href=3D"#" onclick=3D"rig=
htColumn.Up(rightColumn.GetSelectedIndex())">
- <img src=3D"img/uparrow.=
gif" border=3D"0" />
- </a>
- <br/>
- <a href=3D"#" onclick=3D"rig=
htColumn.Down(rightColumn.GetSelectedIndex())">
- <img src=3D"img/downarro=
w.gif" border=3D"0" />
- </a>
- <br/>
- <a href=3D"#" onclick=3D"rig=
htColumn.Bottom(rightColumn.GetSelectedIndex())">
- <img src=3D"img/downdown=
arrow.gif" border=3D"0" />
- </a>
- </td>
- <td>
- <input type=3D"button" value=
=3D"SetToDefault"=20
- onclick=3D"leftColumn.Se=
tToDefault();rightColumn.SetToDefault();"></input>
- <br/>
- <!-- Do not forget to enable=
all item of the left list -->
- <input type=3D"button" value=
=3D"RemoveAll" onclick=3D"leftColumn.EnableAll();rightColumn.RemoveAll();=
"></input>
- </td>
- </tr>
- </table>
+ <xsl:call-template name=3D"BuildLeft=
AndRightColumn" />
<script>
//First List
var divColumnsToShowLeft =3D Get=
NodeByTagNameAndAttName("div","ColumnsToShowLeft")[0]; =20
Modified: humano2/trunk/web/builder/site/xsl/createinterfacetools.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/createinterfacetools.xsl 2005-06-2=
2 20:19:19 UTC (rev 1393)
+++ humano2/trunk/web/builder/site/xsl/createinterfacetools.xsl 2005-06-2=
2 20:32:50 UTC (rev 1394)
@@ -16,4 +16,57 @@
</td>
</tr>
</xsl:template>
+ =20
+ <xsl:template name=3D"BuildLeftAndRightColumn">
+ <table>
+ <tr>
+ <td>
+ <div id=3D"ColumnsToShowLeft" ondblclick=3D"leftColu=
mn.Move(leftColumn.GetSelectedIndex(),rightColumn,false);">
+ </div>
+ </td>
+ <td>
+ <center>
+ <input type=3D"button"=20
+ width=3D"20"
+ value=3D">>"=20
+ onclick =3D "leftColumn.Move(leftColumn.GetS=
electedIndex(),rightColumn,false);"></input>
+ <br/>
+ <input type=3D"button"=20
+ width=3D"20"
+ value=3D"<<"=20
+ onclick =3D "rightColumn.Move(rightColum=
n.GetSelectedIndex(),leftColumn,true);"></input>
+ </center>
+ </td>
+ <td>
+ <div id=3D"ColumnsToShowRight" ondblclick=3D"rightCo=
lumn.Move(rightColumn.GetSelectedIndex(),leftColumn,true);">
+ </div>
+ </td>
+ <td>
+ <a href=3D"#" onclick=3D"rightColumn.Top(rightColumn=
.GetSelectedIndex())">
+ <img src=3D"img/upuparrow.gif" border=3D"0"/>
+ </a>
+ <br/>
+ <a href=3D"#" onclick=3D"rightColumn.Up(rightColumn.=
GetSelectedIndex())">
+ <img src=3D"img/uparrow.gif" border=3D"0" />
+ </a>
+ <br/>
+ <a href=3D"#" onclick=3D"rightColumn.Down(rightColum=
n.GetSelectedIndex())">
+ <img src=3D"img/downarrow.gif" border=3D"0" />
+ </a>
+ <br/>
+ <a href=3D"#" onclick=3D"rightColumn.Bottom(rightCol=
umn.GetSelectedIndex())">
+ <img src=3D"img/downdownarrow.gif" border=3D"0" =
/>
+ </a>
+ </td>
+ <td>
+ <input type=3D"button" value=3D"SetToDefault"=20
+ onclick=3D"leftColumn.SetToDefault();rightColumn=
.SetToDefault();"></input>
+ <br/>
+ <!-- Do not forget to enable all item of the left li=
st -->
+ <input type=3D"button" value=3D"RemoveAll" onclick=3D=
"leftColumn.EnableAll();rightColumn.RemoveAll();"></input>
+ </td>
+ </tr>
+ </table>
+ </xsl:template>
+ =20
</xsl:stylesheet>
Modified: humano2/trunk/web/builder/site/xsl/createreport.xsl
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- humano2/trunk/web/builder/site/xsl/createreport.xsl 2005-06-22 20:19:=
19 UTC (rev 1393)
+++ humano2/trunk/web/builder/site/xsl/createreport.xsl 2005-06-22 20:32:=
50 UTC (rev 1394)
@@ -342,55 +342,7 @@
</xsl:call-template>
<tr>
<td class=3D"smallgraytextnolink" c=
olspan=3D"2">
- <table>
- <tr>
- <td>
- <div id=3D"ColumnsTo=
ShowLeft" ondblclick=3D"leftColumn.Move(leftColumn.GetSelectedIndex(),rig=
htColumn,false);">
- </div>
- </td>
- <td>
- <center>
- <input type=3D"b=
utton"=20
- width=3D"20"
- value=3D">=
;>"=20
- onclick =3D =
"leftColumn.Move(leftColumn.GetSelectedIndex(),rightColumn,false);"></inp=
ut>
- <br/>
- <input type=3D"=
button"=20
- width=3D=
"20"
- value=3D=
"<<"=20
- onclick =
=3D "rightColumn.Move(rightColumn.GetSelectedIndex(),leftColumn,true);"><=
/input>
- </center>
- </td>
- <td>
- <div id=3D"ColumnsTo=
ShowRight" ondblclick=3D"rightColumn.Move(rightColumn.GetSelectedIndex(),=
leftColumn,true);">
- </div>
- </td>
- <td>
- <a href=3D"#" onclic=
k=3D"rightColumn.Top(rightColumn.GetSelectedIndex())">
- <img src=3D"img/=
upuparrow.gif" border=3D"0"/>
- </a>
- <br/>
- <a href=3D"#" onclic=
k=3D"rightColumn.Up(rightColumn.GetSelectedIndex())">
- <img src=3D"img/=
uparrow.gif" border=3D"0" />
- </a>
- <br/>
- <a href=3D"#" onclic=
k=3D"rightColumn.Down(rightColumn.GetSelectedIndex())">
- <img src=3D"img/=
downarrow.gif" border=3D"0" />
- </a>
- <br/>
- <a href=3D"#" onclic=
k=3D"rightColumn.Bottom(rightColumn.GetSelectedIndex())">
- <img src=3D"img/=
downdownarrow.gif" border=3D"0" />
- </a>
- </td>
- <td>
- <input type=3D"butto=
n" value=3D"SetToDefault"=20
- onclick=3D"leftC=
olumn.SetToDefault();rightColumn.SetToDefault();"></input>
- <br/>
- <!-- Do not forget t=
o enable all item of the left list -->
- <input type=3D"butto=
n" value=3D"RemoveAll" onclick=3D"leftColumn.EnableAll();rightColumn.Remo=
veAll();"></input>
- </td>
- </tr>
- </table>
+ <xsl:call-template name=3D"Build=
LeftAndRightColumn" />
<script>
//First List
var divColumnsToShowLeft =3D=
GetNodeByTagNameAndAttName("div","ColumnsToShowLeft")[0]; =20
@@ -515,7 +467,7 @@
var Form =3D new Form(<xsl:value-of select=3D"/r=
eport/reportDatas/classId" />,"REPORT", infosToSubmit);
</xsl:if>
</script>
- </form>
+ </form>
</body>
</html>
</xsl:template>
Modified: humano2/trunk/web/builder/site/xsl/createview.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/createview.xsl 2005-06-22 20:19:19=
UTC (rev 1393)
+++ humano2/trunk/web/builder/site/xsl/createview.xsl 2005-06-22 20:32:50=
UTC (rev 1394)
@@ -249,57 +249,8 @@
</xsl:call-template>
<tr>
<td class=3D"smallgraytextnolin=
k" colspan=3D"2">
- <table>
- <tr>
- <td>
- <div id=3D"ColumnsTo=
ShowLeft" ondblclick=3D"leftColumn.Move(leftColumn.GetSelectedIndex(),rig=
htColumn,false);">
- </div>
- </td>
- <td>
- <center>
- <input type=3D"b=
utton"=20
- width=3D"20"
- value=3D">=
;>"=20
- onclick =3D =
"leftColumn.Move(leftColumn.GetSelectedIndex(),rightColumn,false);"></inp=
ut>
- <br/>
- <input type=3D"=
button"=20
- width=3D=
"20"
- value=3D=
"<<"=20
- onclick =
=3D "rightColumn.Move(rightColumn.GetSelectedIndex(),leftColumn,true);"><=
/input>
- </center>
- </td>
- <td>
- <div id=3D"ColumnsTo=
ShowRight" ondblclick=3D"rightColumn.Move(rightColumn.GetSelectedIndex(),=
leftColumn,true);">
- </div>
- </td>
- <td>
- <a href=3D"#" onclic=
k=3D"rightColumn.Top(rightColumn.GetSelectedIndex())">
- <img src=3D"img/=
upuparrow.gif" border=3D"0"/>
- </a>
- <br/>
- <a href=3D"#" onclic=
k=3D"rightColumn.Up(rightColumn.GetSelectedIndex())">
- <img src=3D"img/=
uparrow.gif" border=3D"0" />
- </a>
- <br/>
- <a href=3D"#" onclic=
k=3D"rightColumn.Down(rightColumn.GetSelectedIndex())">
- <img src=3D"img/=
downarrow.gif" border=3D"0" />
- </a>
- <br/>
- <a href=3D"#" onclic=
k=3D"rightColumn.Bottom(rightColumn.GetSelectedIndex())">
- <img src=3D"img/=
downdownarrow.gif" border=3D"0" />
- </a>
- </td>
- <td>
- <input type=3D"butto=
n" value=3D"SetToDefault"=20
- onclick=3D"leftC=
olumn.SetToDefault();rightColumn.SetToDefault();"></input>
- <br/>
- <!-- Do not forget t=
o enable all item of the left list -->
- <input type=3D"butto=
n" value=3D"RemoveAll" onclick=3D"leftColumn.EnableAll();rightColumn.Remo=
veAll();"></input>
- </td>
- </tr>
- </table>
+ <xsl:call-template name=3D"B=
uildLeftAndRightColumn" />
<script>
- =20
//First List
var divColumnsToShowLeft=
=3D GetNodeByTagNameAndAttName("div","ColumnsToShowLeft")[0]; =20
=20
|
|
From: <sv...@de...> - 2005-06-22 20:19:16
|
Author: pcamacho
Date: 2005-06-22 16:19:19 -0400 (Wed, 22 Jun 2005)
New Revision: 1393
Modified:
humano2/trunk/web/portal/site/xsl/pertinence.xsl
Log:
FIX: when a class had more than a pert attribute, it was possible to open=
more than one iframe (for pertinence att)=20
at once.
Modified: humano2/trunk/web/portal/site/xsl/pertinence.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/pertinence.xsl 2005-06-22 20:03:46 =
UTC (rev 1392)
+++ humano2/trunk/web/portal/site/xsl/pertinence.xsl 2005-06-22 20:19:19 =
UTC (rev 1393)
@@ -15,10 +15,9 @@
<xsl:choose>=09
<xsl:when test=3D"/page/flagaction=3D'Read'">
<a href=3D"instance.aspx?id_entity=3D{$data}&display=3DreadXslt.=
aspx&action=3Dread" target=3D"_blank">
- <xsl:value-of select=3D"$refData"/>
+ <xsl:value-of select=3D"$refData"/>
</a>
</xsl:when>
- =09
<xsl:when test=3D"/page/flagaction=3D'Update'">
<xsl:if test=3D"string($isEditable)=3D'true'">
<table border=3D"0" cellSpacing=3D"0" cellPadding=3D=
"0" >
@@ -28,10 +27,10 @@
</td>
<td valign=3D"center">
<xsl:if test=3D"not($filterView)">
- <img src=3D"img/arrowDown.gif" borde=
r=3D"0" onclick=3D"CurrentIframe=3D'{concat('frame_',$idEntity)}';toggleI=
Frame('{concat('frame_',$idEntity)}','viewpertinencelist.aspx?idClass=3D{=
$idClass}&idEntity=3D{$idEntity}&sysAttName=3D{$sysAttName}&w=
idth=3D{$widthPertinence}&height=3D{$heightPertinence}');"></img>
+ <img src=3D"img/arrowDown.gif" borde=
r=3D"0" onclick=3D"CloseOpenIframe();CurrentIframe=3D'{concat('frame_',$i=
dEntity)}';toggleIFrame('{concat('frame_',$idEntity)}','viewpertinencelis=
t.aspx?idClass=3D{$idClass}&idEntity=3D{$idEntity}&sysAttName=3D{=
$sysAttName}&width=3D{$widthPertinence}&height=3D{$heightPertinen=
ce}');"></img>
</xsl:if>=20
<xsl:if test=3D"$filterView">
- <img src=3D"img/arrowDown.gif" borde=
r=3D"0" onclick=3D"CurrentIframe=3D'{concat('frame_',$idEntity)}';toggleI=
FrameWithFilter('{concat('frame_',$idEntity)}','viewpertinencelist.aspx?i=
dClass=3D{$idClass}&idEntity=3D{$idEntity}&sysAttName=3D{$sysAttN=
ame}&width=3D{$widthPertinence}&height=3D{$heightPertinence}', '{=
$filterView}');"></img>
+ <img src=3D"img/arrowDown.gif" borde=
r=3D"0" onclick=3D"CloseOpenIframe();CurrentIframe=3D'{concat('frame_',$i=
dEntity)}';toggleIFrameWithFilter('{concat('frame_',$idEntity)}','viewper=
tinencelist.aspx?idClass=3D{$idClass}&idEntity=3D{$idEntity}&sysA=
ttName=3D{$sysAttName}&width=3D{$widthPertinence}&height=3D{$heig=
htPertinence}', '{$filterView}');"></img>
</xsl:if>=20
<img src=3D"img/1x1.gif" border=3D"0" w=
idth=3D"22" heigth=3D"22"></img>
</td>
@@ -57,10 +56,10 @@
</td>
<td valign=3D"center">
<xsl:if test=3D"not($filterView)">
- <img src=3D"img/arrowDown.gif" borde=
r=3D"0" onclick=3D"CurrentIframe=3D'{concat('frame_',$idEntity)}';toggleI=
Frame('{concat('frame_',$idEntity)}','viewpertinencelist.aspx?idClass=3D{=
$idClass}&idEntity=3D{$idEntity}&sysAttName=3D{$sysAttName}&w=
idth=3D{$widthPertinence}&height=3D{$heightPertinence}');"></img>
+ <img src=3D"img/arrowDown.gif" borde=
r=3D"0" onclick=3D"CloseOpenIframe();CurrentIframe=3D'{concat('frame_',$i=
dEntity)}';toggleIFrame('{concat('frame_',$idEntity)}','viewpertinencelis=
t.aspx?idClass=3D{$idClass}&idEntity=3D{$idEntity}&sysAttName=3D{=
$sysAttName}&width=3D{$widthPertinence}&height=3D{$heightPertinen=
ce}');"></img>
</xsl:if>=20
<xsl:if test=3D"$filterView">
- <img src=3D"img/arrowDown.gif" borde=
r=3D"0" onclick=3D"CurrentIframe=3D'{concat('frame_',$idEntity)}';toggleI=
FrameWithFilter('{concat('frame_',$idEntity)}','viewpertinencelist.aspx?i=
dClass=3D{$idClass}&idEntity=3D{$idEntity}&sysAttName=3D{$sysAttN=
ame}&width=3D{$widthPertinence}&height=3D{$heightPertinence}', '{=
$filterView}');"></img>
+ <img src=3D"img/arrowDown.gif" borde=
r=3D"0" onclick=3D"CloseOpenIframe();CurrentIframe=3D'{concat('frame_',$i=
dEntity)}';toggleIFrameWithFilter('{concat('frame_',$idEntity)}','viewper=
tinencelist.aspx?idClass=3D{$idClass}&idEntity=3D{$idEntity}&sysA=
ttName=3D{$sysAttName}&width=3D{$widthPertinence}&height=3D{$heig=
htPertinence}', '{$filterView}');"></img>
</xsl:if>=20
<img src=3D"img/1x1.gif" border=3D"0" w=
idth=3D"22" heigth=3D"22"></img>
</td>
|
|
From: <sv...@de...> - 2005-06-22 20:03:44
|
Author: pcamacho Date: 2005-06-22 16:03:46 -0400 (Wed, 22 Jun 2005) New Revision: 1392 Added: humano2/trunk/web/builder/site/xsl/createinterfacetools.xsl Modified: humano2/trunk/web/builder/site/dataattributedelete.aspx.cs humano2/trunk/web/builder/site/xsl/createfolder.xsl humano2/trunk/web/builder/site/xsl/createform.xsl humano2/trunk/web/builder/site/xsl/createreport.xsl humano2/trunk/web/builder/site/xsl/createview.xsl Log: CHANGE: begin of factorization for the xsl code used in the interface for= creation in builder=20 (folder,form,view,report). The factorized code is only the blue html bar = used to separate parts in interface. Modified: humano2/trunk/web/builder/site/dataattributedelete.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/dataattributedelete.aspx.cs 2005-06-22= 19:43:31 UTC (rev 1391) +++ humano2/trunk/web/builder/site/dataattributedelete.aspx.cs 2005-06-22= 20:03:46 UTC (rev 1392) @@ -7,7 +7,7 @@ // the Free Software Foundation; either version 2 of the License, or // (at your option) any later version. =20 // -// $Id: dataclasscreate.aspx.cs 600 2005-04-08 23:04:22Z marijn $ +// $Id$ // =20 using System; Property changes on: humano2/trunk/web/builder/site/dataattributedelete.a= spx.cs ___________________________________________________________________ Name: svn:keywords + Id Modified: humano2/trunk/web/builder/site/xsl/createfolder.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/createfolder.xsl 2005-06-22 19:43:= 31 UTC (rev 1391) +++ humano2/trunk/web/builder/site/xsl/createfolder.xsl 2005-06-22 20:03:= 46 UTC (rev 1392) @@ -1,5 +1,6 @@ <xsl:stylesheet version=3D"1.0" xmlns:xsl=3D"http://www.w3.org/1999/XSL/= Transform"> -<!-- $Id$ --> + <!-- $Id$ --> + <xsl:include href=3D"createinterfacetools.xsl"/> <xsl:output method=3D"html" /> <xsl:template match=3D"/"> <html> @@ -97,19 +98,11 @@ </td> </tr> =20 - <tr> - <td> - <table width=3D"100%" border=3D"0" cellS= pacing=3D"0" cellPadding=3D"0"> - <tr> - <td width=3D"100%" colspan=3D"2"= class=3D"separatorLine"> - </td> - </tr> - <tr> - <td class=3D"lev1head" valign=3D= "top"><font size=3D"2">Items for Folder</font></td> - </tr> - </table> - </td> - </tr> + <xsl:call-template name=3D"SeparationBar"> + <xsl:with-param name=3D"title"> + Items... + </xsl:with-param> + </xsl:call-template> =20 <tr> <td colspan=3D"2"> @@ -197,16 +190,10 @@ </td> =20 </tr> <!--######################### Buttons ##########= ################################ --> - <tr> - <td colspan=3D"2"> - <table width=3D"100%" border=3D"0" cellS= pacing=3D"0" cellPadding=3D"0"> - <tr> - <td width=3D"100%" colspan=3D"2"= class=3D"separatorLine"> - </td> - </tr> - </table> - </td> - </tr> + <xsl:call-template name=3D"SeparationBar"> + <xsl:with-param name=3D"title"> + </xsl:with-param> + </xsl:call-template> <tr align=3D"center"> <td> <table> Modified: humano2/trunk/web/builder/site/xsl/createform.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/createform.xsl 2005-06-22 19:43:31= UTC (rev 1391) +++ humano2/trunk/web/builder/site/xsl/createform.xsl 2005-06-22 20:03:46= UTC (rev 1392) @@ -1,5 +1,6 @@ <xsl:stylesheet version=3D"1.0" xmlns:xsl=3D"http://www.w3.org/1999/XSL/= Transform"> -<!-- $Id$ --> + <!-- $Id$ --> + <xsl:include href=3D"createinterfacetools.xsl"/> <xsl:output method=3D"html" /> <xsl:template match=3D"/"> <html> @@ -96,21 +97,12 @@ =20 <!-- After load of class --> <xsl:if test=3D"count(/form/classes/class/attrib= utes)!=3D0"> + <xsl:call-template name=3D"SeparationBar"> + <xsl:with-param name=3D"title"> + Columns... + </xsl:with-param> + </xsl:call-template> <tr> - <td colspan=3D"2"> - <table width=3D"100%" border=3D"0" c= ellSpacing=3D"0" cellPadding=3D"0"> - <tr> - <td width=3D"100%" colspan=3D= "2" class=3D"separatorLine"> - </td> - </tr> - <tr> - <td class=3D"lev1head" valig= n=3D"top"><font size=3D"2">Columns...</font></td> - </tr> - </table> - </td> - </tr> - - <tr> <td class=3D"smallgraytextnolink" colsp= an=3D"2"> <table> <tr> @@ -189,22 +181,12 @@ </script> </td> </tr> - =20 + <xsl:call-template name=3D"SeparationBar"> + <xsl:with-param name=3D"title"> + Type + </xsl:with-param> + </xsl:call-template> <tr> - <td colspan=3D"2"> - <table width=3D"100%" border=3D"0" c= ellSpacing=3D"0" cellPadding=3D"0"> - <tr> - <td width=3D"100%" colspan=3D= "2" class=3D"separatorLine"> - </td> - </tr> - <tr> - <td class=3D"lev1head" valig= n=3D"top"><font size=3D"2">Type</font></td> - </tr> - </table> - </td> - </tr> - =20 - <tr> <td align=3D"left"> <select id=3D"formType" name=3D"formT= ype" class=3D"drpdwn2"> <option value=3D"CREATE"> @@ -230,16 +212,10 @@ </tr> =20 <!--######################### Buttons ######= #################################### --> - <tr> - <td colspan=3D"2"> - <table width=3D"100%" border=3D"0" c= ellSpacing=3D"0" cellPadding=3D"0"> - <tr> - <td width=3D"100%" colspan=3D= "2" class=3D"separatorLine"> - </td> - </tr> - </table> - </td> - </tr> + <xsl:call-template name=3D"SeparationBar"> + <xsl:with-param name=3D"title"> + </xsl:with-param> + </xsl:call-template> <tr align=3D"center"> <td> <table> Added: humano2/trunk/web/builder/site/xsl/createinterfacetools.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/createinterfacetools.xsl 2005-06-2= 2 19:43:31 UTC (rev 1391) +++ humano2/trunk/web/builder/site/xsl/createinterfacetools.xsl 2005-06-2= 2 20:03:46 UTC (rev 1392) @@ -0,0 +1,19 @@ +<xsl:stylesheet version=3D"1.0" xmlns:xsl=3D"http://www.w3.org/1999/XSL/= Transform"> + <!-- $Id$ --> + <xsl:template name=3D"SeparationBar"> + <xsl:param name=3D"title" /> + <tr> + <td colspan=3D"2"> + <table width=3D"100%" border=3D"0" cellSpacing=3D"0" cellPad= ding=3D"0"> + <tr> + <td width=3D"100%" colspan=3D"2" class=3D"separatorL= ine"> + </td> + </tr> + <tr> + <td class=3D"lev1head" valign=3D"top"><font size=3D"= 2"><xsl:value-of select=3D"$title" /></font></td> + </tr> + </table> + </td> + </tr> + </xsl:template> +</xsl:stylesheet> Property changes on: humano2/trunk/web/builder/site/xsl/createinterfaceto= ols.xsl ___________________________________________________________________ Name: svn:keywords + Id Modified: humano2/trunk/web/builder/site/xsl/createreport.xsl =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- humano2/trunk/web/builder/site/xsl/createreport.xsl 2005-06-22 19:43:= 31 UTC (rev 1391) +++ humano2/trunk/web/builder/site/xsl/createreport.xsl 2005-06-22 20:03:= 46 UTC (rev 1392) @@ -1,6 +1,6 @@ -<?xml version=3D"1.0" encoding=3D"UTF-8"?> -<!-- $Id$ --> <xsl:stylesheet version=3D"1.0" xmlns:xsl=3D"http://www.w3.org/1999/XSL/= Transform"> + <!-- $Id$ --> + <xsl:include href=3D"createinterfacetools.xsl"/> <xsl:output method=3D"html" /> <xsl:template match=3D"/"> <html> @@ -250,21 +250,12 @@ </tr> <xsl:if test=3D"count(/report/classes/cl= ass/attributes)!=3D0"> <!-- ######################## Filters #= ####################################### --> + <xsl:call-template name=3D"SeparationBar= "> + <xsl:with-param name=3D"title"> + Filters... + </xsl:with-param> + </xsl:call-template> <tr> - <td colspan=3D"2"> - <table width=3D"100%" border=3D"= 0" cellSpacing=3D"0" cellPadding=3D"0"> - <tr> - <td width=3D"100%" colsp= an=3D"2" class=3D"separatorLine"> - </td> - </tr> - <tr> - <td class=3D"lev1head" v= align=3D"top"><font size=3D"2">Filtros...</font></td> - </tr> - </table> - </td> - </tr> - =20 - <tr> <td class=3D"smallgraytextnolink" co= lspan=3D"2"> <table width=3D"100%"> <tr> @@ -286,21 +277,12 @@ <!-- ######################## End filter= s ######################################## --> =20 <!--######################### Perso Colu= mns ################################## --> + <xsl:call-template name=3D"SeparationBar= "> + <xsl:with-param name=3D"title"> + Personalized columns... + </xsl:with-param> + </xsl:call-template> <tr> - <td colspan=3D"2"> - <table width=3D"100%" border=3D"= 0" cellSpacing=3D"0" cellPadding=3D"0"> - <tr> - <td width=3D"100%" colspan=3D= "2" class=3D"separatorLine"> - </td> - </tr> - <tr> - <td class=3D"lev1head" valig= n=3D"top"><font size=3D"2">Personalized columns...</font></td> - </tr> - </table> - </td> - </tr> - =20 - <tr> <td class=3D"smallgraytextnolink" co= lspan=3D"2"> <table> <tr> @@ -325,21 +307,12 @@ <!--######################### Havings ##= ########################################## --> <!-- Commented for now due to a problem = in showview see bug #123 --> <!-- + <xsl:call-template name=3D"SeparationBar= "> + <xsl:with-param name=3D"title"> + Group Filters... + </xsl:with-param> + </xsl:call-template> <tr> - <td colspan=3D"2"> - <table width=3D"100%" border=3D"= 0" cellSpacing=3D"0" cellPadding=3D"0"> - <tr> - <td width=3D"100%" colspan=3D= "2" class=3D"lev1divider"> - <div class=3D"lev1divide= r"><IMG height=3D"9" src=3D"clear2x2.gif" width=3D"100%"/></div> - </td> - </tr> - <tr> - <td class=3D"lev1head" valig= n=3D"top"><font size=3D"2">Group filters...</font></td> - </tr> - </table> - </td> - </tr> - <tr> <td class=3D"smallgraytextnolink" co= lspan=3D"2"> <table> <tr> @@ -362,21 +335,12 @@ <!--######################### END: Havin= gs ####################################### --> =20 <!-- ######################## Group colu= mns ############################## --> + <xsl:call-template name=3D"SeparationBar= "> + <xsl:with-param name=3D"title"> + Group columns... + </xsl:with-param> + </xsl:call-template> <tr> - <td colspan=3D"2"> - <table width=3D"100%" border=3D"= 0" cellSpacing=3D"0" cellPadding=3D"0"> - <tr> - <td width=3D"100%" colspan=3D= "2" class=3D"separatorLine"> - </td> - </tr> - <tr> - <td class=3D"lev1head" valig= n=3D"top"><font size=3D"2">Group columns...</font></td> - </tr> - </table> - </td> - </tr> - =20 - <tr> <td class=3D"smallgraytextnolink" c= olspan=3D"2"> <table> <tr> @@ -456,21 +420,12 @@ <!-- ######################## END: Colum= ns To Show ############################## --> =20 <!--######################### Sort #####= ######################################### --> + <xsl:call-template name=3D"SeparationBar= "> + <xsl:with-param name=3D"title"> + Order... + </xsl:with-param> + </xsl:call-template> <tr> - <td colspan=3D"2"> - <table width=3D"100%" border=3D"= 0" cellSpacing=3D"0" cellPadding=3D"0"> - <tr> - <td width=3D"100%" colspan=3D= "2" class=3D"separatorLine"> - </td> - </tr> - <tr> - <td class=3D"lev1head" valig= n=3D"top"><font size=3D"2">Orden...</font></td> - </tr> - </table> - </td> - </tr> - =20 - <tr> <td class=3D"smallgraytextnolink" co= lspan=3D"2"> <table> <tr> @@ -492,16 +447,10 @@ <!--######################### END: Sort = ########################################## --> =20 <!--######################### Buttons ##= ######################################## --> - <tr> - <td colspan=3D"2"> - <table width=3D"100%" border=3D"= 0" cellSpacing=3D"0" cellPadding=3D"0"> - <tr> - <td width=3D"100%" colsp= an=3D"2" class=3D"separatorLine"> - </td> - </tr> - </table> - </td> - </tr> + <xsl:call-template name=3D"SeparationBar= "> + <xsl:with-param name=3D"title"> + </xsl:with-param> + </xsl:call-template> <tr align=3D"center"> <td> <table> Modified: humano2/trunk/web/builder/site/xsl/createview.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/createview.xsl 2005-06-22 19:43:31= UTC (rev 1391) +++ humano2/trunk/web/builder/site/xsl/createview.xsl 2005-06-22 20:03:46= UTC (rev 1392) @@ -1,6 +1,6 @@ -<?xml version=3D"1.0" encoding=3D"UTF-8"?> -<!-- $Id$ --> <xsl:stylesheet version=3D"1.0" xmlns:xsl=3D"http://www.w3.org/1999/XSL/= Transform"> + <!-- $Id$ --> + <xsl:include href=3D"createinterfacetools.xsl"/> <xsl:output method=3D"html" /> <xsl:template match=3D"/"> <html> @@ -214,21 +214,12 @@ </tr> <xsl:if test=3D"count(/view/classes/= class/attributes)!=3D0"> <!-- ######################## Filter= s ######################################## --> + <xsl:call-template name=3D"Separatio= nBar"> + <xsl:with-param name=3D"title"> + Filters... + </xsl:with-param> + </xsl:call-template> <tr> - <td colspan=3D"2"> - <table width=3D"100%" border= =3D"0" cellSpacing=3D"0" cellPadding=3D"0"> - <tr> - <td width=3D"100%" c= olspan=3D"2" class=3D"separatorLine"> - </td> - </tr> - <tr> - <td class=3D"lev1hea= d" valign=3D"top"><font size=3D"2">Filters...</font></td> - </tr> - </table> - </td> - </tr> - =20 - <tr> <td class=3D"smallgraytextnolink= " colspan=3D"2"> <table width=3D"100%"> <tr> @@ -251,21 +242,12 @@ <!-- ######################## End fi= lters ######################################## --> =20 <!-- ######################## Column= s To Show ############################## --> + <xsl:call-template name=3D"Separatio= nBar"> + <xsl:with-param name=3D"title"> + Columns... + </xsl:with-param> + </xsl:call-template> <tr> - <td colspan=3D"2"> - <table width=3D"100%" border= =3D"0" cellSpacing=3D"0" cellPadding=3D"0"> - <tr> - <td width=3D"100%" c= olspan=3D"2" class=3D"separatorLine"> - </td> - </tr> - <tr> - <td class=3D"lev1hea= d" valign=3D"top"><font size=3D"2">Columns...</font></td> - </tr> - </table> - </td> - </tr> - =20 - <tr> <td class=3D"smallgraytextnolin= k" colspan=3D"2"> <table> <tr> @@ -349,21 +331,12 @@ =20 <!--######################### Sort #= ############################################# --> <!-- Unvailable yet because of a pro= blem in ViewTools --> + <xsl:call-template name=3D"Separatio= nBar"> + <xsl:with-param name=3D"title"> + Order... + </xsl:with-param> + </xsl:call-template> <tr> - <td colspan=3D"2"> - <table width=3D"100%" border= =3D"0" cellSpacing=3D"0" cellPadding=3D"0"> - <tr> - <td width=3D"100%" c= olspan=3D"2" class=3D"separatorLine"> - </td> - </tr> - <tr> - <td class=3D"lev1hea= d" valign=3D"top"><font size=3D"2">Order...</font></td> - </tr> - </table> - </td> - </tr> - =20 - <tr> <td class=3D"smallgraytextnolink= " colspan=3D"2"> <table> <tr> @@ -388,17 +361,11 @@ <!--######################### END: S= ort ########################################## --> =20 <!--######################### Button= s ########################################## --> + <xsl:call-template name=3D"Separatio= nBar"> + <xsl:with-param name=3D"title"> + </xsl:with-param> + </xsl:call-template> <tr> - <td colspan=3D"2"> - <table width=3D"100%" border= =3D"0" cellSpacing=3D"0" cellPadding=3D"0"> - <tr> - <td width=3D"100%" c= olspan=3D"2" class=3D"separatorLine"> - </td> - </tr> - </table> - </td> - </tr> - <tr> <td> <table width=3D"100%"> <tr align=3D"center"> |
|
From: <sv...@de...> - 2005-06-22 19:43:25
|
Author: pcamacho
Date: 2005-06-22 15:43:31 -0400 (Wed, 22 Jun 2005)
New Revision: 1391
Modified:
humano2/trunk/core/schema/pgsql/pgsql-Beta6patch.sql
Log:
CHANGE: add patch for width and height property of pertinence.
Modified: humano2/trunk/core/schema/pgsql/pgsql-Beta6patch.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-Beta6patch.sql 2005-06-22 19:29=
:22 UTC (rev 1390)
+++ humano2/trunk/core/schema/pgsql/pgsql-Beta6patch.sql 2005-06-22 19:43=
:31 UTC (rev 1391)
@@ -1 +1,16 @@
-update "view" set "where" =3D '34|8|{(''[DomainId]'',''10'')}|0|0' wher=
e id_entity =3D 1405
\ No newline at end of file
+update "view" set "where" =3D '34|8|{(''[DomainId]'',''10'')}|0|0' wher=
e id_entity =3D 1405
+
+-- For the pertinence properties width and height
+alter table pertinence add column widthPertinence Integer;
+alter table pertinence add column heightPertinence Integer;
+insert into "entity" ("id_entity","domainId","class","delDate","status"=
) values (157,10,9,NULL,NULL);
+insert into "entity" ("id_entity","domainId","class","delDate","status"=
) values (158,10,9,NULL,NULL);
+
+INSERT INTO "attribute" ("id_entity","classId","sysAttName","attName","=
order","isObligatory","isActive","isSearchable","isEditable","isSelfLooku=
p","isPrimary","isUnique","protection","display") VALUES (157,81,'widthP=
ertinence','width',0,'f','t','f','t','f','f','f','t',null);
+INSERT INTO "attribute" ("id_entity","classId","sysAttName","attName","=
order","isObligatory","isActive","isSearchable","isEditable","isSelfLooku=
p","isPrimary","isUnique","protection","display") VALUES (158,81,'height=
Pertinence','height',0,'f','t','f','t','f','f','f','t',null);
+INSERT INTO "numeric" ("id_entity","decimals","max","min","default") V=
ALUES (157,4,NULL,NULL,200); -- pertinence width
+INSERT INTO "numeric" ("id_entity","decimals","max","min","default") V=
ALUES (158,4,NULL,NULL,200); -- pertinence height
+
+
+
+
|
|
From: <sv...@de...> - 2005-06-22 19:29:17
|
Author: marcelo
Date: 2005-06-22 15:29:22 -0400 (Wed, 22 Jun 2005)
New Revision: 1390
Added:
humano2/trunk/core/schema/pgsql/pgsql-Beta6patch.sql
Log:
* Patch for users who already have the platform installed
Added: humano2/trunk/core/schema/pgsql/pgsql-Beta6patch.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-Beta6patch.sql 2005-06-22 19:08=
:19 UTC (rev 1389)
+++ humano2/trunk/core/schema/pgsql/pgsql-Beta6patch.sql 2005-06-22 19:29=
:22 UTC (rev 1390)
@@ -0,0 +1 @@
+update "view" set "where" =3D '34|8|{(''[DomainId]'',''10'')}|0|0' wher=
e id_entity =3D 1405
\ No newline at end of file
|
|
From: <sv...@de...> - 2005-06-22 19:08:20
|
Author: pcamacho
Date: 2005-06-22 15:08:19 -0400 (Wed, 22 Jun 2005)
New Revision: 1389
Modified:
humano2/trunk/web/builder/site/dataattributedelete.aspx.cs
Log:
FIX: bug #164. For now only it is impossible to delete a primary attribut=
e. Then would be better to check that a=20
class always have a primary attribute.
Modified: humano2/trunk/web/builder/site/dataattributedelete.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/dataattributedelete.aspx.cs 2005-06-22=
17:53:44 UTC (rev 1388)
+++ humano2/trunk/web/builder/site/dataattributedelete.aspx.cs 2005-06-22=
19:08:19 UTC (rev 1389)
@@ -23,12 +23,12 @@
using System.Text;
=20
using Humano2.Core;
+using Humano2.Core.Db;
using Humano2.Components.WebTools;
=20
namespace Builder.site
{
/// <summary>
- /// Summary description for dataclasscreate.
/// </summary>
public class dataAttributeDelete : Humano2.Components.WebTools.basePage=
=20
{
@@ -46,14 +46,23 @@
private void Page_Load(object sender, System.EventArgs e)
{
adapter dbAdapter =3D new adapter();
- int classId =3D Convert.ToInt32(Request.QueryString["classId"]);
+ absCrud crud =3D Factory.Crud();
+ absComplex complex =3D crud.GetCore().Complex;
+ int classId =3D Convert.ToInt32(Request.QueryString["classId=
"]);
=09
int attrId =3D Convert.ToInt32(Request.QueryString["attrId"]);=09
Logger.Log("Deleting Attribute attributeID: " + attrId, LogLevel.Trac=
e);
- dbAdapter.DeleteInstance(attrId, userCred);
- Logger.Log("Deleting Attribute Done", LogLevel.Trace);
-
- Response.Redirect(Html.genAbsoluteUrl("/builder/site/datamain.aspx?op=
=3D"+classId));=09
+ if(!complex.IsPrimary(attrId))
+ {
+ dbAdapter.DeleteInstance(attrId, userCred);
+ Logger.Log("Deleting Attribute Done", LogLevel.Trace);
+ Response.Redirect(Html.genAbsoluteUrl("/builder/site/dat=
amain.aspx?op=3D"+classId));=09
+ }
+ else
+ {
+ Response.Write("<center>Attribute " + attrId + " can not=
be deleted as it is primary.</center>"); =20
+ }
+ =09
} =09
}
}
|
|
From: <sv...@de...> - 2005-06-22 17:53:41
|
Author: marcelo
Date: 2005-06-22 13:53:44 -0400 (Wed, 22 Jun 2005)
New Revision: 1388
Modified:
humano2/trunk/components/formulas/ProcessFormulas.cs
Log:
* Fixed: Errors in formulas which involve attributes of type currency
Modified: humano2/trunk/components/formulas/ProcessFormulas.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/formulas/ProcessFormulas.cs 2005-06-22 17:15=
:13 UTC (rev 1387)
+++ humano2/trunk/components/formulas/ProcessFormulas.cs 2005-06-22 17:53=
:44 UTC (rev 1388)
@@ -976,7 +976,7 @@
if(type=3D=3D"elemento" || type=3D=3D"funcion")
{
nameColumn =3D "column" + i;
- if(typeElement =3D=3D "numeric")
+ if(typeElement =3D=3D "numeric" || typeElement =3D=3D "currency")
typeDB =3D "numeric";
else if(typeElement =3D=3D "date")
typeDB =3D "varchar(20)";
|
|
From: <sv...@de...> - 2005-06-22 17:15:14
|
Author: pcamacho
Date: 2005-06-22 13:15:13 -0400 (Wed, 22 Jun 2005)
New Revision: 1387
Modified:
humano2/trunk/changelog.txt
Log:
CHANGE: update changelog for pertinence improvement (width and height pro=
perty).
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-22 16:02:01 UTC (rev 1386)
+++ humano2/trunk/changelog.txt 2005-06-22 17:15:13 UTC (rev 1387)
@@ -7,6 +7,9 @@
=20
* Portal
* patch to allow viewing well two pertinences attribute columns to th=
e same class. =20
+ =20
+ * Other
+ * pertinence has now width and height property
=20
=3D=3D 5.0.beta6 - 2005-06-03 Revision: 1355 =3D=3D
=20
|
|
From: <sv...@de...> - 2005-06-22 16:01:57
|
Author: pcamacho
Date: 2005-06-22 12:02:01 -0400 (Wed, 22 Jun 2005)
New Revision: 1386
Modified:
humano2/trunk/core/schema/pgsql/pgsql-1-metadata.sql
humano2/trunk/web/portal/site/js/iframe.js
humano2/trunk/web/portal/site/viewpertinencelist.aspx
humano2/trunk/web/portal/site/viewpertinencelist.aspx.cs
humano2/trunk/web/portal/site/xsl/pertinence.xsl
Log:
FIX: bug #191
Now pertinence have a width and height property configurable in the build=
er. Remark: to do the thing work, the height=20
and width have to be set in the iframe and in the listbox of the pertinen=
ce.
Modified: humano2/trunk/core/schema/pgsql/pgsql-1-metadata.sql
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- humano2/trunk/core/schema/pgsql/pgsql-1-metadata.sql 2005-06-22 14:17=
:06 UTC (rev 1385)
+++ humano2/trunk/core/schema/pgsql/pgsql-1-metadata.sql 2005-06-22 16:02=
:01 UTC (rev 1386)
@@ -141,6 +141,8 @@
"parentPertinence" Integer, -- Padre de la relacion.
"visualAttrib" Integer, -- Attributo que se trae desde la tabla fora=
nea. Si es null se trae la llave del metadata
"filterView" Text, -- Un filter sobre los pertinences que se muestr=
an. -- FIXME: Is this the cleanst solution?
+ "widthPertinence" Integer, -- Width to display the pert=
inence
+ "heightPertinence" Integer, -- Height to display
primary key ("id_entity")
);
=20
@@ -390,6 +392,8 @@
INSERT INTO "entity" ("id_entity","domainId","class","delDate","status"=
) VALUES (154,10,8,NULL,NULL);
INSERT INTO "entity" ("id_entity","domainId","class","delDate","status"=
) VALUES (155,10,8,NULL,NULL);
INSERT INTO "entity" ("id_entity","domainId","class","delDate","status"=
) VALUES (156,10,153,NULL,NULL);
+INSERT INTO "entity" ("id_entity","domainId","class","delDate","status"=
) VALUES (157,10,9,NULL,NULL);
+INSERT INTO "entity" ("id_entity","domainId","class","delDate","status"=
) VALUES (158,10,9,NULL,NULL);
=20
=20
INSERT INTO "attribute" ("id_entity","classId","sysAttName","attName","=
order","isObligatory","isActive","isSearchable","isEditable","isSelfLooku=
p","isPrimary","isUnique","protection","display") VALUES (4,1,'parentCla=
ssType','parentId',4,'t','t','f','f','f','f','f','t',null);
@@ -469,6 +473,10 @@
INSERT INTO "attribute" ("id_entity","classId","sysAttName","attName","=
order","isObligatory","isActive","isSearchable","isEditable","isSelfLooku=
p","isPrimary","isUnique","protection","display") VALUES (150,149,'xslt'=
,'xslt',0,'t','t','f','t','f','t','f','t',null);
INSERT INTO "attribute" ("id_entity","classId","sysAttName","attName","=
order","isObligatory","isActive","isSearchable","isEditable","isSelfLooku=
p","isPrimary","isUnique","protection","display") VALUES (151,149,'attTy=
peRef','attTypeRef',0,'t','t','f','t','f','f','f','t',null);
INSERT INTO "attribute" ("id_entity","classId","sysAttName","attName","=
order","isObligatory","isActive","isSearchable","isEditable","isSelfLooku=
p","isPrimary","isUnique","protection","display") VALUES (152,81,'filter=
View','filterView',0,'f','t','f','f','f','f','f','t',null);
+
+INSERT INTO "attribute" ("id_entity","classId","sysAttName","attName","=
order","isObligatory","isActive","isSearchable","isEditable","isSelfLooku=
p","isPrimary","isUnique","protection","display") VALUES (157,81,'widthP=
ertinence','width',0,'f','t','f','t','f','f','f','t',null);
+INSERT INTO "attribute" ("id_entity","classId","sysAttName","attName","=
order","isObligatory","isActive","isSearchable","isEditable","isSelfLooku=
p","isPrimary","isUnique","protection","display") VALUES (158,81,'height=
Pertinence','height',0,'f','t','f','t','f','f','f','t',null);
+
INSERT INTO "attribute" ("id_entity","classId","sysAttName","attName","=
order","isObligatory","isActive","isSearchable","isEditable","isSelfLooku=
p","isPrimary","isUnique","protection","display") VALUES (154,153,'versi=
onItem','versionItem',0,'t','t','f','f','f','t','t','f',null);
INSERT INTO "attribute" ("id_entity","classId","sysAttName","attName","=
order","isObligatory","isActive","isSearchable","isEditable","isSelfLooku=
p","isPrimary","isUnique","protection","display") VALUES (155,153,'versi=
onValue','versionValue',0,'t','t','f','f','f','f','f','f',null);
=20
@@ -486,8 +494,9 @@
INSERT INTO "numeric" ("id_entity","decimals","max","min","default") V=
ALUES (54,0,50, 1, 7); -- text rows
INSERT INTO "numeric" ("id_entity","decimals","max","min","default") V=
ALUES (77,0,NULL,NULL,NULL);
INSERT INTO "numeric" ("id_entity","decimals","max","min","default") V=
ALUES (83,2,10,0,1);
+INSERT INTO "numeric" ("id_entity","decimals","max","min","default") V=
ALUES (157,4,NULL,NULL,200); -- pertinence width
+INSERT INTO "numeric" ("id_entity","decimals","max","min","default") V=
ALUES (158,4,NULL,NULL,200); -- pertinence height
=20
-
INSERT INTO "textline" ("id_entity","maxLength","minLength","dispSize")=
VALUES (16,50,1,20);
INSERT INTO "textline" ("id_entity","maxLength","minLength","dispSize")=
VALUES (18,25,1,25);
INSERT INTO "textline" ("id_entity","maxLength","minLength","dispSize")=
VALUES (19,10,6,20);
Modified: humano2/trunk/web/portal/site/js/iframe.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/iframe.js 2005-06-22 14:17:06 UTC (r=
ev 1385)
+++ humano2/trunk/web/portal/site/js/iframe.js 2005-06-22 16:02:01 UTC (r=
ev 1386)
@@ -19,7 +19,7 @@
return now.getTime();
}
=20
-function toggleIFrame(nframe,urlToLoad)=20
+function toggleIFrame(nframe,urlToLoad)
{
var f =3D document.getElementById(nframe); // The iframe object
urlToLoad +=3D "¤tTime=3D" + currentTime();
Modified: humano2/trunk/web/portal/site/viewpertinencelist.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/viewpertinencelist.aspx 2005-06-22 14:1=
7:06 UTC (rev 1385)
+++ humano2/trunk/web/portal/site/viewpertinencelist.aspx 2005-06-22 16:0=
2:01 UTC (rev 1386)
@@ -1,8 +1,8 @@
<%@ Page language=3D"c#" Codebehind=3D"viewpertinencelist.aspx.cs" AutoE=
ventWireup=3D"false" Inherits=3D"Portal.site.ViewPertinenceList" %>
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" >
<!-- $Id$ -->
-<HTML>
- <HEAD>
+<html>
+ <head>
<title>ViewPertinenceList</title>
<script language=3D"javascript">
function sendData()
@@ -47,7 +47,7 @@
</HEAD>
<body leftMargin=3D"0" topMargin=3D"0" marginheight=3D"0" marginwidth=3D=
"0">
<form id=3D"Form1" method=3D"post" runat=3D"server"> <!-- FIXME: // Wi=
dth and height to be read from attributes -->
- <asp:listbox id=3D"ListBox1" runat=3D"server" style=3D"height:168px;w=
idth:192px;"></asp:listbox>
+ <asp:listbox id=3D"ListBox1" runat=3D"server" style=3D""></asp:listbo=
x>
</form>
</body>
</HTML>
Modified: humano2/trunk/web/portal/site/viewpertinencelist.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/viewpertinencelist.aspx.cs 2005-06-22 1=
4:17:06 UTC (rev 1385)
+++ humano2/trunk/web/portal/site/viewpertinencelist.aspx.cs 2005-06-22 1=
6:02:01 UTC (rev 1386)
@@ -95,27 +95,39 @@
displayColumn =3D "0,"+columnPrimary;
}
=20
- DataTable dtParam =3D this.makeDataTableInViewTools();
- DataRow dr =3D dtParam.NewRow();
- =09
- //dr["columna"] =3D "0,"+columnPrimary;
- dr["columna"] =3D displayColumn;
- =09
- if(filterView !=3D 0)=20
- {
-// dr["filtros"] =3D viewColumn+"|4|'"+filterValue+"'|0|0";
- dr["filtros"] =3D viewFilter;
- }
- =09
- dtParam.Rows.Add(dr); =09
- =09
- dt1 =3D dbAdapter.GetDataTableView(dtParam, idClass);
- =20
- this.ListBox1.DataValueField =3D "id_entity";
- this.ListBox1.DataTextField =3D dt1.Columns[1].ColumnName;//"col"+c=
olumnPrimary;
- this.ListBox1.DataSource =3D dt1;
- this.ListBox1.DataBind();
- this.ListBox1.Items.Add("-- Nothing --");
+ DataTable dtParam =3D this.makeDataTableInViewTools();
+ DataRow dr =3D dtParam.NewRow();
+ =20
+ dr["columna"] =3D displayColumn;
+ =20
+ if(filterView !=3D 0)=20
+ {
+ dr["filtros"] =3D viewFilter;
+ }
+ =20
+ dtParam.Rows.Add(dr); =09
+ =20
+ dt1 =3D dbAdapter.GetDataTableView(dtParam, idClass);
+ =20
+ this.ListBox1.DataValueField =3D "id_entity";
+ this.ListBox1.DataTextField =3D dt1.Columns[1].ColumnNam=
e;//"col"+columnPrimary;
+ this.ListBox1.DataSource =3D dt1;
+ this.ListBox1.DataBind();
+ this.ListBox1.Items.Add("-- Nothing --");
+ =20
+ string width =3D Request["width"];
+ //Adjust width and height
+ if(width.Length > 0)
+ {
+ this.ListBox1.Width =3D Convert.ToInt32(width);
+ }
+ =20
+ string height =3D Request["height"];
+ //Adjust width and height
+ if(height.Length > 0)
+ {
+ this.ListBox1.Height =3D Convert.ToInt32(height);
+ }
}
}
=20
Modified: humano2/trunk/web/portal/site/xsl/pertinence.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/pertinence.xsl 2005-06-22 14:17:06 =
UTC (rev 1385)
+++ humano2/trunk/web/portal/site/xsl/pertinence.xsl 2005-06-22 16:02:01 =
UTC (rev 1386)
@@ -9,7 +9,9 @@
<xsl:variable name=3D"sysAttName" select=3D"/page/classInstance/struct=
ure/attribute[id_entity=3D$idEntity]/sysAttName"/>
<xsl:variable name=3D"isEditable" select=3D"/page/classInstance/=
structure/attribute[id_entity=3D$idEntity]/isEditable"/> =
=09
<xsl:variable name=3D"filterView" select=3D"/page/classInstance/=
structure/pertinence[id_entity=3D$idEntity]/filterView"/> =
=09
- =20
+ <xsl:variable name=3D"widthPertinence" select=3D"/page/classInst=
ance/structure/pertinence[id_entity=3D$idEntity]/widthPertinence"/> =
=09
+ <xsl:variable name=3D"heightPertinence" select=3D"/page/classIns=
tance/structure/pertinence[id_entity=3D$idEntity]/heightPertinence"/> =
=09
+ =20
<xsl:choose>=09
<xsl:when test=3D"/page/flagaction=3D'Read'">
<a href=3D"instance.aspx?id_entity=3D{$data}&display=3DreadXslt.=
aspx&action=3Dread" target=3D"_blank">
@@ -26,10 +28,10 @@
</td>
<td valign=3D"center">
<xsl:if test=3D"not($filterView)">
- <img src=3D"img/arrowDown.gif" borde=
r=3D"0" onclick=3D"CurrentIframe=3D'{concat('frame_',$idEntity)}';toggleI=
Frame('{concat('frame_',$idEntity)}','viewpertinencelist.aspx?idClass=3D{=
$idClass}&idEntity=3D{$idEntity}&sysAttName=3D{$sysAttName}');"><=
/img>
+ <img src=3D"img/arrowDown.gif" borde=
r=3D"0" onclick=3D"CurrentIframe=3D'{concat('frame_',$idEntity)}';toggleI=
Frame('{concat('frame_',$idEntity)}','viewpertinencelist.aspx?idClass=3D{=
$idClass}&idEntity=3D{$idEntity}&sysAttName=3D{$sysAttName}&w=
idth=3D{$widthPertinence}&height=3D{$heightPertinence}');"></img>
</xsl:if>=20
<xsl:if test=3D"$filterView">
- <img src=3D"img/arrowDown.gif" borde=
r=3D"0" onclick=3D"CurrentIframe=3D'{concat('frame_',$idEntity)}';toggleI=
FrameWithFilter('{concat('frame_',$idEntity)}','viewpertinencelist.aspx?i=
dClass=3D{$idClass}&idEntity=3D{$idEntity}&sysAttName=3D{$sysAttN=
ame}', '{$filterView}');"></img>
+ <img src=3D"img/arrowDown.gif" borde=
r=3D"0" onclick=3D"CurrentIframe=3D'{concat('frame_',$idEntity)}';toggleI=
FrameWithFilter('{concat('frame_',$idEntity)}','viewpertinencelist.aspx?i=
dClass=3D{$idClass}&idEntity=3D{$idEntity}&sysAttName=3D{$sysAttN=
ame}&width=3D{$widthPertinence}&height=3D{$heightPertinence}', '{=
$filterView}');"></img>
</xsl:if>=20
<img src=3D"img/1x1.gif" border=3D"0" w=
idth=3D"22" heigth=3D"22"></img>
</td>
@@ -37,7 +39,7 @@
</table>=09
<!--<input type=3D"button" name=3D"aaa" value=3D"Ver=
" onclick=3D"toggleIFrame('{concat('frame_',$idEntity)}','viewpertinencel=
ist.aspx?idClass=3D{$idClass}&idEntity=3D{$idEntity}&sysAttName=3D=
{$sysAttName}');" />-->
<input type=3D"hidden" name=3D"{$sysAttName}" value=3D=
"{$data}"/>
- <iframe scrolling=3D"no" id=3D"{concat('frame_',$idE=
ntity)}" src=3D"" style=3D"visibility: hidden; position:absolute;" width=3D=
"190" height=3D"165" frameborder=3D"0" align=3D"middle"></iframe>
+ <iframe scrolling=3D"no" id=3D"{concat('frame_',$idE=
ntity)}" src=3D"" style=3D"visibility: hidden; position:absolute;" width=3D=
"{$widthPertinence}" height=3D"{$heightPertinence}" frameborder=3D"0" al=
ign=3D"middle"></iframe>
</xsl:if>
=20
<xsl:if test=3D"not(string($isEditable)=3D'true')"> =20
@@ -55,17 +57,17 @@
</td>
<td valign=3D"center">
<xsl:if test=3D"not($filterView)">
- <img src=3D"img/arrowDown.gif" borde=
r=3D"0" onclick=3D"CurrentIframe=3D'{concat('frame_',$idEntity)}';toggleI=
Frame('{concat('frame_',$idEntity)}','viewpertinencelist.aspx?idClass=3D{=
$idClass}&idEntity=3D{$idEntity}&sysAttName=3D{$sysAttName}');"><=
/img>
+ <img src=3D"img/arrowDown.gif" borde=
r=3D"0" onclick=3D"CurrentIframe=3D'{concat('frame_',$idEntity)}';toggleI=
Frame('{concat('frame_',$idEntity)}','viewpertinencelist.aspx?idClass=3D{=
$idClass}&idEntity=3D{$idEntity}&sysAttName=3D{$sysAttName}&w=
idth=3D{$widthPertinence}&height=3D{$heightPertinence}');"></img>
</xsl:if>=20
<xsl:if test=3D"$filterView">
- <img src=3D"img/arrowDown.gif" borde=
r=3D"0" onclick=3D"CurrentIframe=3D'{concat('frame_',$idEntity)}';toggleI=
FrameWithFilter('{concat('frame_',$idEntity)}','viewpertinencelist.aspx?i=
dClass=3D{$idClass}&idEntity=3D{$idEntity}&sysAttName=3D{$sysAttN=
ame}', '{$filterView}');"></img>
+ <img src=3D"img/arrowDown.gif" borde=
r=3D"0" onclick=3D"CurrentIframe=3D'{concat('frame_',$idEntity)}';toggleI=
FrameWithFilter('{concat('frame_',$idEntity)}','viewpertinencelist.aspx?i=
dClass=3D{$idClass}&idEntity=3D{$idEntity}&sysAttName=3D{$sysAttN=
ame}&width=3D{$widthPertinence}&height=3D{$heightPertinence}', '{=
$filterView}');"></img>
</xsl:if>=20
<img src=3D"img/1x1.gif" border=3D"0" w=
idth=3D"22" heigth=3D"22"></img>
</td>
</tr>
</table>=09
<input type=3D"hidden" name=3D"{$sysAttName}" />
- <iframe id=3D"{concat('frame_',$idEntity)}" src=3D""=
style=3D"visibility: hidden; position:absolute;" scrolling=3D"no" width=3D=
"190" height=3D"165" frameborder=3D"0" align=3D"middle" ></iframe>
+ <iframe id=3D"{concat('frame_',$idEntity)}" src=3D""=
style=3D"visibility: hidden; position:absolute;" scrolling=3D"no" width=3D=
"{$widthPertinence}" height=3D"{$heightPertinence}" frameborder=3D"0" ali=
gn=3D"middle" ></iframe>
</xsl:if>
</xsl:when>
</xsl:choose>
|
|
From: <sv...@de...> - 2005-06-22 14:17:06
|
Author: pcamacho
Date: 2005-06-22 10:17:06 -0400 (Wed, 22 Jun 2005)
New Revision: 1385
Modified:
humano2/trunk/components/webTools/Adapter.cs
humano2/trunk/web/builder/site/domainedit.aspx.cs
Log:
FIX: bug #139.
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-21 22:57:33 UTC =
(rev 1384)
+++ humano2/trunk/components/webTools/Adapter.cs 2005-06-22 14:17:06 UTC =
(rev 1385)
@@ -519,6 +519,18 @@
return Convert.ToString(resp);
}
=20
+ ///<summary>Says if the name of a domain already exists</summary=
>
+ ///<param name=3D"name">The name of domain to check</summary>
+ ///<returns>True: the name of domain exists, else returns false<=
/returns>
+ public bool DomainNameExists(string name)
+ {
+ bool res =3D false;
+ string filter =3D "16|4|'"+ name +"'|0|0"; //Filter by the n=
ame to check
+ DataTable dt =3D GenerateViewTools(6,"0,16",filter,"","","",=
0); =20
+ res =3D dt.Rows.Count =3D=3D 1; //If there's a line, the dom=
ain name exists
+ return res;
+ }
+ =20
///<summary>Get the email of a user by it's id_entity</summary>
public string GetDomainNameById(int domainId) {
// Setting view tools to look at class 6 (domains)
Modified: humano2/trunk/web/builder/site/domainedit.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/domainedit.aspx.cs 2005-06-21 22:57:33=
UTC (rev 1384)
+++ humano2/trunk/web/builder/site/domainedit.aspx.cs 2005-06-22 14:17:06=
UTC (rev 1385)
@@ -94,7 +94,6 @@
userList.Items[t].Selected =3D true;
}
}
- =09
}=09
=09
#region Web Form Designer generated code
@@ -123,20 +122,29 @@
ArrayList userIds =3D new ArrayList();
=09
// Make a list of all the domains that are selected.=20
- foreach(ListItem li in userList.Items) {
- if(li.Selected) {
+ foreach(ListItem li in userList.Items)
+ {
+ if(li.Selected)=20
+ {
userIds.Add(li.Value);
}
}
=09
- if(userIds.Count =3D=3D 0) {
+ if(userIds.Count =3D=3D 0)=20
+ {
warnings.Text =3D "A domain has to be associated with at least one u=
ser.";
return;
}
=09
if(domainId =3D=3D 0)=20
{
- userCred.CoreAdapter.CreateDomain(name, userIds);
+ //Check if the domain name already exists, and raise a warning in th=
at case
+ if(userCred.CoreAdapter.DomainNameExists(name))
+ {
+ warnings.Text =3D "The domain name " + name + " alre=
ady exists. Please choose another one.";=20
+ return;
+ }
+ userCred.CoreAdapter.CreateDomain(name, userIds);
}=20
else=20
{
|
|
From: <sv...@de...> - 2005-06-21 22:57:29
|
Author: pcamacho Date: 2005-06-21 18:57:33 -0400 (Tue, 21 Jun 2005) New Revision: 1384 Modified: humano2/trunk/changelog.txt Log: CHANGE: update of changelog file. 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-21 22:51:25 UTC (rev 1383) +++ humano2/trunk/changelog.txt 2005-06-21 22:57:33 UTC (rev 1384) @@ -1,5 +1,13 @@ $Id$ =20 +=3D=3D 5.0.beta7 - 2005-06-03 Revision: 1355 =3D=3D #update this line!! + + * Builder + * Interface for creation of folders, views, reports, and forms are un= der xsl and have the same css / js motor + =20 + * Portal + * patch to allow viewing well two pertinences attribute columns to th= e same class. =20 + =3D=3D 5.0.beta6 - 2005-06-03 Revision: 1355 =3D=3D =20 * Builder |
|
From: <sv...@de...> - 2005-06-21 22:51:27
|
Author: pcamacho
Date: 2005-06-21 18:51:25 -0400 (Tue, 21 Jun 2005)
New Revision: 1383
Modified:
humano2/trunk/web/builder/site/viewmain.aspx.cs
humano2/trunk/web/portal/site/showView.aspx.cs
Log:
FIX:=20
* bug in showView.aspx.cs : a log was causing trouble
* in viewtools, the column 0 was added twice.
Modified: humano2/trunk/web/builder/site/viewmain.aspx.cs
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- humano2/trunk/web/builder/site/viewmain.aspx.cs 2005-06-21 22:29:48 U=
TC (rev 1382)
+++ humano2/trunk/web/builder/site/viewmain.aspx.cs 2005-06-21 22:51:25 U=
TC (rev 1383)
@@ -376,10 +376,7 @@
Logger.Log("No columns for view",LogLevel.Trace);
return null; =20
}
- if (!receivedColumnsStr.StartsWith("0,"))
- {
- receivedColumnsStr =3D "0," + receivedColumnsStr;
- }
+ =09
=20
DataTable dt =3D createViewDataTable();
DataRow dr =3D dt.NewRow();
Modified: humano2/trunk/web/portal/site/showView.aspx.cs
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- humano2/trunk/web/portal/site/showView.aspx.cs 2005-06-21 22:29:48 UT=
C (rev 1382)
+++ humano2/trunk/web/portal/site/showView.aspx.cs 2005-06-21 22:51:25 UT=
C (rev 1383)
@@ -713,8 +713,6 @@
Logger.Log("<<buildPertinenceColumn>>",LogLevel.Trace);
Logger.Log("column: " + col,LogLevel.Trace);
viewTable.Rows[0]["columns"] =3D "0," + col;
- Logger.Log("columns: " + viewTable.Rows[0]["columns"],LogLev=
el.Trace);
- Logger.Log("filtros: " + viewTable.Rows[0]["filtros"],LogLev=
el.Trace);
=20
adapter dbAdapter =3D userCred.CoreAdapter;
DataTable res =3D dbAdapter.ExecViewFromDataTable(iniClass, =
viewTable, idEntity, "", 0, 1);
|
|
From: <sv...@de...> - 2005-06-21 22:29:43
|
Author: pcamacho
Date: 2005-06-21 18:29:48 -0400 (Tue, 21 Jun 2005)
New Revision: 1382
Modified:
humano2/trunk/web/builder/site/xsl/createview.xsl
Log:
FIX: slight bug of css in interface of creation of views.
Modified: humano2/trunk/web/builder/site/xsl/createview.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/createview.xsl 2005-06-21 22:24:15=
UTC (rev 1381)
+++ humano2/trunk/web/builder/site/xsl/createview.xsl 2005-06-21 22:29:48=
UTC (rev 1382)
@@ -353,8 +353,7 @@
<td colspan=3D"2">
<table width=3D"100%" border=
=3D"0" cellSpacing=3D"0" cellPadding=3D"0">
<tr>
- <td width=3D"100%" c=
olspan=3D"2" class=3D"lev1divider">
- <div class=3D"le=
v1divider"><IMG height=3D"9" src=3D"clear2x2.gif" width=3D"100%"/></div>
+ <td width=3D"100%" c=
olspan=3D"2" class=3D"separatorLine">
</td>
</tr>
<tr>
|
|
From: <sv...@de...> - 2005-06-21 22:24:14
|
Author: pcamacho
Date: 2005-06-21 18:24:15 -0400 (Tue, 21 Jun 2005)
New Revision: 1381
Modified:
humano2/trunk/web/builder/site/createreport.aspx.cs
humano2/trunk/web/builder/site/foldermanagement.aspx
humano2/trunk/web/builder/site/foldermanagement.aspx.cs
humano2/trunk/web/builder/site/formmanagement.aspx.cs
humano2/trunk/web/builder/site/js/createinterfacetools.js
humano2/trunk/web/builder/site/js/form.js
humano2/trunk/web/builder/site/xsl/createfolder.xsl
humano2/trunk/web/builder/site/xsl/createform.xsl
humano2/trunk/web/builder/site/xsl/functionindex.xsl
humano2/trunk/web/portal/site/showView.aspx.cs
Log:
FIX: bug #197
All interfaces (for creation of folders, views, reports and forms) are un=
der xsl and use the same js motor. Although=20
still is possible to refactorize code.
Modified: humano2/trunk/web/builder/site/createreport.aspx.cs
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- humano2/trunk/web/builder/site/createreport.aspx.cs 2005-06-21 22:15:=
32 UTC (rev 1380)
+++ humano2/trunk/web/builder/site/createreport.aspx.cs 2005-06-21 22:24:=
15 UTC (rev 1381)
@@ -142,7 +142,6 @@
=20
override protected void OnInit(EventArgs e)
{
- =20
InitializeComponent();
base.OnInit(e);
}
Modified: humano2/trunk/web/builder/site/foldermanagement.aspx
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- humano2/trunk/web/builder/site/foldermanagement.aspx 2005-06-21 22:15=
:32 UTC (rev 1380)
+++ humano2/trunk/web/builder/site/foldermanagement.aspx 2005-06-21 22:24=
:15 UTC (rev 1381)
@@ -1,162 +1,3 @@
<%@ Page language=3D"c#" Codebehind=3D"foldermanagement.aspx.cs" AutoEve=
ntWireup=3D"false" Inherits=3D"Builder.site.foldermanagement" ResponseEnc=
oding=3D"iso-8859-1" %>
<!-- $Id$ -->
-<!DOCTYPE HTML PUBLIC "-//W3C//Dtd HTML 4.01 transitional//EN" "http://w=
ww.w3.org/tr/html4/loose.dtd">
-<HTML>
- <head>
- <title>Folders</title>
- <meta http-equiv=3D"Content-Type" content=3D"text/html; charset=3Diso-=
8859-1">
- <script src=3D"js/functions.js"></script>
- <script language=3D"javascript" src=3D"js/grafcomponents/misc.js"></sc=
ript>
- <script language=3D"javascript" src=3D"js/grafcomponents/test.js"></sc=
ript>
- <script language=3D"Javascript" src=3D"js/grafcomponents/sortedlist.js=
"></script>
- <script language=3D"Javascript" src=3D"js/grafcomponents/sortedgraphic=
allist.js"></script>
- <script language=3D"Javascript" src=3D"js/grafcomponents/radiobuttonex=
pand.js"></script>
- <!-- Load this script before the next one -->
- <script language=3D"Javascript" src=3D"js/form.js"></script>
- <script src=3D"js/fn_formsmng.js"></script>
- <link href=3D"css/createinterface.css" rel=3D"stylesheet" type=3D=
"text/css">
- </head>
- <body>
- <form name=3D"formulario" action=3D"#" method=3D"post">
- <input type=3D"hidden" name=3D"opaction" id=3D"opaction" value=3D"<% =
html_getAction(); %>">
- <input type=3D"hidden" name=3D"folderid" id=3D"folderid" value=3D"<% =
html_getFolderId(); %>">
- <input type=3D"hidden" name=3D"LstAttrib" id=3D"LstAttrib">
- <input type=3D"hidden" name=3D"classId" id=3D"classId" value=3D"1400"=
>
- <input type=3D"hidden" name=3D"first" id=3D"first" value=3D"<% html_g=
etFirst(); %>">
- <table width=3D"100%" class=3D"conttablecenter2">
- <tr>
- <td>
- <table>
- <tr>
- <td class=3D"smallgraytextnolink">
- Folder Name:
- </td>
- <td class=3D"smallgraytextnolink">
- <input id=3D"formName" type=3D"text"=
name=3D"formName" value=3D"<% html_getFolderName(); %>">
- </td>
- </tr>
- <tr>
- <td>
- Folder Father:=20
- </td>
- <td>
- <select name=3D"select" size=3D"1" i=
d=3D"folderparent" onChange=3D"fn_setFolderParentId(this.options[this.sel=
ectedIndex].value);">
- <% html_getFolderParent();%>
- </select>
- <input type=3D"hidden" id=3D"folderp=
arentid" name=3D"folderparentid" value=3D"<% html_getFolderParentId(); %>=
">
- </td>
- </tr>
- </table>
- </td>
- </tr>
- <tr>
- <td>
- <table width=3D"100%" border=3D"0" cellSpacing=3D=
"0" cellPadding=3D"0">
- <tr>
- <td width=3D"100%" colspan=3D"2" class=3D=
"separatorLine">
- </td>
- </tr>
- <tr>
- <td class=3D"lev1head" valign=3D"top"><f=
ont size=3D"2">Items for Folder</font></td>
- </tr>
- </table>
- </td>
- </tr>
-
- <tr>
- <td colspan=3D"2">
- <table>
- <tr>
- <td>Available Columns</td>
- <td></td>
- <td>Your Columns</td>
- </tr>
- <tr>
- <td rowspan=3D"4">
- <div id=3D"ColumnsToShowLeft" ondblc=
lick=3D"leftColumn.Move(leftColumn.GetSelectedIndex(),rightColumn,false);=
" ></div>
- </td>
- <td rowspan=3D"4">
- <input onclick=3D"leftColumn.Move(le=
ftColumn.GetSelectedIndex(),rightColumn,false);" type=3D"button"
- value=3D"Add">
- <br>
- <input onclick=3D"rightColumn.Move(r=
ightColumn.GetSelectedIndex(),leftColumn,true);" type=3D"button"
- value=3D"Remove">
- </td>
- <td rowspan=3D"4">
- <div id=3D"ColumnsToShowRight" ondbl=
click=3D"rightColumn.Move(rightColumn.GetSelectedIndex(),leftColumn,true)=
;"></div>
- </td>
- <td rowspan=3D"4">
- <a onclick=3D"rightColumn.Top(rightC=
olumn.GetSelectedIndex())" href=3D"#">
- <img src=3D"img/upuparrow.gif">
- </a>
- <br>
- <a onclick=3D"rightColumn.Up(rightCo=
lumn.GetSelectedIndex())" href=3D"#">
- <img src=3D"img/uparrow.gif">
- </a>
- <br>
- <a onclick=3D"rightColumn.Down(right=
Column.GetSelectedIndex())" href=3D"#">
- <img src=3D"img/downarrow.gif">
- </a>
- <br>
- <a onclick=3D"rightColumn.Bottom(rig=
htColumn.GetSelectedIndex())" href=3D"#">
- <img src=3D"img/downdownarrow.gi=
f">
- </a>
- </td>
- <td rowspan=3D"4">
- <input onclick=3D"rightColumn.SetToD=
efault();leftColumn.SetToDefault();" type=3D"button" value=3D"SetToDefaul=
t">
- <br>
- <!-- Do not forget to enable all ite=
m of the left list -->
- <input type=3D"button" value=3D"Remo=
veAll" onclick=3D"leftColumn.EnableAll();rightColumn.RemoveAll();">
- </td>
- </tr>
- </table>
- =20
- <script>
- var rightElements =3D new Array(<% html_getA=
ttrList(2); %>);
- var leftElements =3D new Array(<% html_getAt=
trList(1); %>);
- =20
- //First List
- var divColumnsToShowLeft =3D GetNodeByTagNam=
eAndAttName("div","ColumnsToShowLeft")[0]; =20
- var leftColumnParams =3D=20
- {
- selfRefName: "leftColumn",
- itemList: leftElements,
- divReceptor: divColumnsToShowLeft,
- showButtons: false
- }
- =20
- var leftColumn =3D new SortedGraphicalList(l=
eftColumnParams); =20
- =
=20
- //Second List
- var divColumnsToShowRight =3D GetNodeByTagNa=
meAndAttName("div","ColumnsToShowRight")[0]; =20
- var rightColumnParams =3D=20
- {
- selfRefName: "rightColumn",
- itemList: rightElements,
- divReceptor: divColumnsToShowRight,
- showButtons: false
- }
- var rightColumn =3D new SortedGraphicalList(=
rightColumnParams); =20
- </script>
- </td> =20
- </tr>
- <tr>
- <td colspan=3D"2">
- <table width=3D"100%" border=3D"0" cellSpacing=3D=
"0" cellPadding=3D"0">
- <tr>
- <td width=3D"100%" colspan=3D"2" class=3D=
"separatorLine">
- </td>
- </tr>
- </table>
- </td>
- </tr>
- <tr>
- <td>
- <input type=3D"button" onclick=3D"fn_saveData(ri=
ghtColumn);" name=3D"btnSave" value=3D"<% html_getBtnSaveValue(); %>">
- <% html_getButtonDelete(); %>
- </td>
- </tr>
- </table>
- </form>
- </body>
-</HTML>
+<% getContent("xsl/createfolder.xsl"); %>
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-06-21 22=
:15:32 UTC (rev 1380)
+++ humano2/trunk/web/builder/site/foldermanagement.aspx.cs 2005-06-21 22=
:24:15 UTC (rev 1381)
@@ -26,219 +26,241 @@
=20
namespace Builder.site
{
- public struct strct_folderNode
- {
- public int idNode;
- public int idParent;
- public bool isListable;
-
- public strct_folderNode(int val1,int val2,bool lst)
- {
- this.idNode =3D val1;
- this.idParent =3D val2;
- this.isListable =3D lst;
- }
- };
/// <summary>
/// Summary description for FormManagement.
/// </summary>
public class foldermanagement : basePage
{
- string ClassName =3D "";
- string strAttrLeft =3D "";
- string strAttrRigth =3D "";
- string folderName =3D "";
- string folderForms =3D "";
- string formType =3D "";
- string folderParentId =3D "";
- string htmlMsgError =3D "";
- int ClassId =3D 0;
+ string receivedFolderName =3D "";
+ string receivedFolderForms =3D "";
+ string receivedFolderParentId =3D "";
+ =20
int folderId =3D 0;
- int action =3D 0;
- int countElement =3D 1;
- int first =3D 0;
-
- bool newForm =3D true;
- =09
- private const int CNS_NOTHING =3D 0;
- private const int CNS_CREATE =3D 1;
- private const int CNS_UPDATE =3D 2;
- private const int CNS_DELETE =3D 3;
- =09
+ int domainId;
+ =20
private void Page_Load(object sender, System.EventArgs e)
{
- int domainId =3D userCred.DomainIds[userCred.CurrentDomainIndex];
- getRequestParam();
- if(ClassId =3D=3D 0)
- ClassId =3D 1400;
-
- buildListAttrib(ClassId);
-
- switch(action)
- {
- case CNS_NOTHING:
- break;
- case CNS_CREATE:
- createDbFolder();
- action =3D CNS_UPDATE;
- buildListAttribFromFolder(ClassId,folderId,domainId);
- break;
- case CNS_UPDATE:
- if(folderForms !=3D null)
- {
- if (checkDataForUpdate(domainId) =3D=3D true)
- {
- createDbFolder();=09
- }
- }
- buildListAttribFromFolder(ClassId,folderId,domainId);
- break;
- case CNS_DELETE:
- deleteDbFolder(folderId);
- clearFormData();
- break;
- default:
- break;
- }
- }
-
- #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.Load +=3D new System.EventHandler(this.Page_Load);
-
- }
- #endregion
-
- #region my method
- private void getRequestParam()
- {
- int modFolderId =3D 0;
-
- ClassId =3D Convert.ToInt32( Request["classId"]);
- if (Convert.ToInt32( Request["newform"]) > 0)
- newForm =3D false;
- =09
- action =3D Convert.ToInt32( Request["opaction"]);
- ClassName =3D Convert.ToString( Request["ClassName"]);
- folderName =3D Convert.ToString( Request["formName"]);
- ClassId =3D Convert.ToInt32( Request["ClassId"]);
- formType =3D Convert.ToString( Request["formType"]);
- folderForms =3D Convert.ToString( Request["LstAttrib"]);
- folderId =3D Convert.ToInt32( Request["folderid"]);
- folderParentId =3D Convert.ToString( Request["folderparentid"]);
- modFolderId =3D Convert.ToInt32(Request["modfolderid"]);
- first =3D Convert.ToInt32(Request["first"]);
- if (modFolderId > 0 && first =3D=3D 0)
- {
- first =3D 1;
- folderId =3D modFolderId;
- }
- if(folderId > 0 && action =3D=3D 0)
- {
- action =3D CNS_UPDATE;
- }
- }
- private void clearFormData()
- {
- action =3D CNS_NOTHING;
- folderForms =3D "";
- folderName =3D "";
- folderId =3D 0;
- }
- private void createDbFolder()
- {
- DataTable dt =3D genDataTbl();
-
- if(dt !=3D null)=20
+ domainId =3D userCred.DomainIds[userCred.CurrentDomainIndex]=
;
+ folderId =3D Convert.ToInt32(Request["folderId"]);
+ string delete =3D Request["delete"];
+ if(delete =3D=3D "true")
+ {
+ deleteFolder(folderId); =20
+ }
+ =20
+ string receivedCreateUpdate =3D Request["sendCreateUpdate"];
+ if(receivedCreateUpdate =3D=3D "true")
+ {
+ ProcessCreationUpdate(); =20
+ }
+ }
+ =20
+ =20
+ private void ProcessCreationUpdate()
+ {
+ Logger.Log("=3D=3Dfoldermanagement=3D=3D: <<ProcessCreationU=
pdate>>", LogLevel.Trace);
+ =20
+ receivedFolderName =3D Request["sendName"];
+ receivedFolderForms =3D Request["sendColumnsStr"];
+ receivedFolderParentId =3D Request["sendParentFolder"];
+ =20
+ DataTable dt =3D createFolderTable();
+ DataRow dr =3D dt.NewRow();
+ dr["folderName"] =3D receivedFolderName;=20
+ dr["folderForms"] =3D receivedFolderForms;=20
+ dr["folderParent"] =3D receivedFolderParentId;=20
+ dt.Rows.Add(dr);
+ =20
+ //Creates the table now
+ DataTable formTable =3D createFolderTable();
+ =20
+ if(dt !=3D null)=20
{=20
- if(action =3D=3D CNS_CREATE )
+ if(folderId =3D=3D 0)
{
folderId =3D userCred.CoreAdapter.CreateForm (1400,dt, userCred);
sendMessageToUser(UserMessage.CREATEFOLDEROK);
}
- if (action =3D=3D CNS_UPDATE )
+ else
{
UpdateDbFolder(folderId,dt,userCred);
sendMessageToUser(UserMessage.UPDATEFOLDEROK);
}
} =09
- }
-
- private void deleteDbFolder(int folderId)
+ }
+ =20
+ override protected string createXml()
+ {
+ string strXml =3D "";
+ strXml +=3D "<folder>";
+ strXml +=3D "<folderDatas>";
+ strXml +=3D "<id>";
+ strXml +=3D folderId;
+ strXml +=3D "</id>";
+ strXml +=3D "<name>";
+ strXml +=3D getFolderName(folderId);
+ strXml +=3D "</name>";
+ if(folderId =3D=3D 0) //To create=20
+ {
+ strXml +=3D "<saveName>Create</saveName>";
+ strXml +=3D "<displayDeleteButton>false</displ=
ayDeleteButton>";
+ }
+ else //To update=20
+ {
+ strXml +=3D "<saveName>Update</saveName>";
+ strXml +=3D "<displayDeleteButton>true</displa=
yDeleteButton>";
+ strXml +=3D "<params>" + getColumnsForFolder(f=
olderId) + "</params>";
+ }=20
+ strXml +=3D getFolderContent(folderId);
+ strXml +=3D "</folderDatas>";
+ strXml +=3D "</folder>";
+ Logger.Log("XML=3D " + strXml,LogLevel.Trace);
+ return strXml;
+ }
+ =20
+ private string getFolderContent(int folderId)
+ {
+ string strXml =3D "";
+ string filter =3D "";
+ DataTable dt =3D null;
+ =20
+ strXml +=3D "<items>";
+ filter =3D String.Format("34|4|'{0}'|0|0",domainId); //Filte=
r by domain
+ =20
+ //Views
+ dt =3D userCred.CoreAdapter.GenerateViewTools(1011,"0, 1018"=
,filter,"","","",0);
+ foreach(DataRow row in dt.Rows)
+ {
+ strXml +=3D "<item>";
+ strXml +=3D "<type>view</type>";
+ strXml +=3D "<name>" + row["viewName"] + "</name>"; =20
+ strXml +=3D "<id>" + row["id_entity"] + "</id>";
+ strXml +=3D "</item>";
+ }
+ =20
+ //Forms
+ string filterForm =3D String.Format("1201|4|'CREATE'|1|0;34|=
4|'{0}'|0|0",domainId);
+ dt =3D userCred.CoreAdapter.GenerateViewTools(1200,"0, 1202",filterFo=
rm,"","","",0);
+ =20
+ foreach(DataRow row in dt.Rows)
+ {
+ strXml +=3D "<item>";
+ strXml +=3D "<type>form</type>";
+ strXml +=3D "<name>" + row["formName"] + "</name>"; =20
+ strXml +=3D "<id>" + row["id_entity"] + "</id>";
+ strXml +=3D "</item>";
+ }
+ =20
+ //Reports
+ dt =3D userCred.CoreAdapter.GenerateViewTools(1300,"0, 1307"=
,filter,"","","",0);
+ =20
+ foreach(DataRow row in dt.Rows)
+ {
+ strXml +=3D "<item>";
+ strXml +=3D "<type>report</type>";
+ strXml +=3D "<name>" + row["reportName"] + "</name>"; =
=20
+ strXml +=3D "<id>" + row["id_entity"] + "</id>";
+ strXml +=3D "</item>";
+ }
+ =20
+ strXml +=3D"</items>"; =20
+ =20
+ //The possible parent folders
+ strXml +=3D getXmlFolderParent(folderId); =20
+ =20
+ return strXml;
+ }
+ =20
+ private string getColumnsForFolder(int folderId)
+ {
+ string strXml =3D "";
+ strXml +=3D "<items>";
+ //Get the list of columns
+ string filter =3D "0|4|'" + folderId + "'|0|0";
+ DataTable dt =3D userCred.CoreAdapter.GenerateViewTools(140=
0,"0,1403",filter,"","","",0); =20
+ string [] listOfCols =3D Convert.ToString(dt.Rows[0]["folder=
Forms"]).Split(",".ToCharArray());
+ =20
+ string filterDomain =3D String.Format("34|4|'{0}'|0|0",domai=
nId); //Filter by domain;
+ //Get the views
+ //Views
+ dt =3D userCred.CoreAdapter.GenerateViewTools(1011,"0, 1018"=
,filterDomain,"","","",0);
+ foreach(DataRow row in dt.Rows)
+ {
+ string idEntity =3D Convert.ToString(row["id_entity"]);
+ if(Array.IndexOf(listOfCols,idEntity)!=3D-1)
+ {
+ strXml +=3D "<item>";
+ strXml +=3D "<type>view</type>";
+ strXml +=3D "<name>" + row["viewName"] + "</name>"; =
=20
+ strXml +=3D "<id>" + row["id_entity"] + "</id>";
+ strXml +=3D "</item>";
+ }
+ }
+ =20
+ //Forms
+ string filterForm =3D String.Format("1201|4|'CREATE'|1|0;34|=
4|'{0}'|0|0",domainId);
+ dt =3D userCred.CoreAdapter.GenerateViewTools(1200,"0, 1202",filterFo=
rm,"","","",0);
+ foreach(DataRow row in dt.Rows)
+ {
+ string idEntity =3D Convert.ToString(row["id_entity"]);
+ if(Array.IndexOf(listOfCols,idEntity)!=3D-1)
+ {
+ //Logger.Log("form " + row["formName"] + " added", L=
ogLevel.Trace);
+ strXml +=3D "<item>";
+ strXml +=3D "<type>form</type>";
+ strXml +=3D "<name>" + row["formName"] + "</name>"; =
=20
+ strXml +=3D "<id>" + idEntity + "</id>";
+ strXml +=3D "</item>";
+ }
+ Logger.Log("listOfCols.IndexOf(idEntity): " + Array.Inde=
xOf(listOfCols,idEntity),LogLevel.Trace);
+ }
+ =20
+ //Reports
+ dt =3D userCred.CoreAdapter.GenerateViewTools(1300,"0, 1307"=
,filterDomain,"","","",0);
+ foreach(DataRow row in dt.Rows)
+ {
+ string idEntity =3D Convert.ToString(row["id_entity"]);
+ if(Array.IndexOf(listOfCols,idEntity)!=3D-1)
+ {
+ strXml +=3D "<item>";
+ strXml +=3D "<type>report</type>";
+ strXml +=3D "<name>" + row["reportName"] + "</name>"=
; =20
+ strXml +=3D "<id>" + row["id_entity"] + "</id>";
+ strXml +=3D "</item>";
+ }
+ }
+ strXml +=3D "</items>";
+ return strXml;
+ }
+ =20
+ private string getFolderName(int folderId)
+ {
+ Logger.Log("<<getFolderName>>",LogLevel.Trace);
+ Logger.Log("folderId=3D " + folderId,LogLevel.Trace);
+ string filter =3D "0|4|'" + folderId + "'|0|0";
+ DataTable dt =3D userCred.CoreAdapter.GenerateViewTools(140=
0,"0,1401",filter,"","","",0); =20
+ string name =3D "";
+ if(dt.Rows.Count =3D=3D 1)
+ { =20
+ name =3D Convert.ToString(dt.Rows[0]["folderName"]);
+ }
+ else
+ {
+ name =3D ""; =20
+ }
+ return name;
+ }
+ =20
+ private DataTable getListViews(int domainId)
{
- userCred.CoreAdapter.DeleteInstance(folderId,userCred);
- sendMessageToUser(UserMessage.DELETEFOLDEROK);
- }
-
- private void UpdateDbFolder(int folderId, DataTable dt,SessionCredenci=
al userCred)
- {
- userCred.CoreAdapter.UpdateInstance (folderId,dt, userCred);
- }
-
- private DataTable genDataTbl()
- {
- DataTable dt =3D createFolderDataTable();
- DataRow dr =3D dt.NewRow();
- dr["folderName"] =3D folderName;=20
- dr["folderForms"] =3D folderForms;=20
- dr["folderParent"] =3D folderParentId;=20
-
- dt.Rows.Add(dr);
- return dt;
- }
-
- private DataTable createFolderDataTable()
- {
- DataTable dt =3D new DataTable();
- dt.Columns.Add("folderName");
- dt.Columns.Add("folderForms");
- dt.Columns.Add("folderParent");
- return dt;
- }
-
- private void buildListAttrib(int classId)
- {
- int domainId =3D 0;
- domainId =3D Convert.ToInt32(userCred.DomainIds[userCred.CurrentDomai=
nIndex]);
-
- DataTable dtResult =3D userCred.CoreAdapter.GetViewList(domainId);
-
- dtResult =3D getListViews(domainId);
- addListElements(dtResult,"View");
-
- dtResult =3D getListReports(domainId);
- addListElements(dtResult,"Report");
- =09
- //dtResult =3D getListFolder(domainId);
- //addListElements(dtResult,"Folder");
-
- dtResult =3D getListForms(domainId);
- addListElements(dtResult,"Form");
- }
-
- private DataTable getListViews(int domainId)
- {
string filtro =3D String.Format("34|4|'{0}'|0|0",domainId);
DataTable dt =3D userCred.CoreAdapter.GenerateViewTools(1011,"0, 1018=
",filtro,"","","",0);
=09
if (dt.Rows.Count > 0)
{
return dt;
- }else{
+ }else
+ {
return null;
}
}
@@ -250,12 +272,12 @@
if (dt.Rows.Count > 0)
{
return dt;
- }else{
+ }else
+ {
return null;
}
}
=09
- =20
///<summary>
///Get the list of all folders (id,name) from a specific domain
///</summary>
@@ -286,256 +308,88 @@
return null;
}
}
-
- private void addListElements(DataTable dtResult)
+ =20
+ #region Web Form Designer generated code
+ override protected void OnInit(EventArgs e)
{
- foreach(DataRow row in dtResult.Rows)
- {
- if (strAttrLeft.Length > 0)
- {
- strAttrLeft +=3D ",";
- }
- strAttrLeft +=3D String.Format("new ListElement(\"{1}\",\"{0}\",fals=
e)",row["id_entity"],row[1]);
- if (countElement < 4)
- {
- if(strAttrRigth.Length > 0)
- {
- strAttrRigth +=3D ",";
- }
- strAttrRigth +=3D String.Format("new ListElement(\"{1}\",\"{0}\",fa=
lse)",row["id_entity"],row[1]);
- }
- countElement++;
- }
+ //
+ // CODEGEN: This call is required by the ASP.NET Web Form Designer.
+ //
+ InitializeComponent();
+ base.OnInit(e);
}
-
- private void addListElements(DataTable dtResult,string prevText)
- {
- string strText =3D "";
- if(dtResult =3D=3D null)
- {
- return;
- }
- foreach(DataRow row in dtResult.Rows)
- {
- strText =3D String.Format("{0}[{1}]",row[1],prevText);
- if(strAttrLeft.Length > 0)
- {
- strAttrLeft +=3D ",";
- }
- strAttrLeft +=3D String.Format("new ListElement(\"{1}\",\"{0}\",fals=
e)",row["id_entity"],strText);
- if (countElement < 4)
- {
- if(strAttrRigth.Length > 0)
- {
- strAttrRigth +=3D ",";
- }
- strAttrRigth +=3D String.Format("new ListElement(\"{1}\",\"{0}\",fa=
lse)",row["id_entity"],strText);
- }
- countElement++;
- }
+ =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.Load +=3D new System.EventHandler(this.Page_Load);
}
-
- private void buildListAttribFromFolder(int classId,int folderId,int do=
mainId)
- {
- DataTable dtResult =3D null;
- string filtro =3D String.Format("0|4|'{0}'|0|0",folderId);
- string strAttr =3D "";
- strAttrRigth =3D "";
-
- DataTable dtR1 =3D userCred.CoreAdapter.GenerateViewTools(1400,"1401=
,1403, 1402",filtro,"","","",0);
- if (dtR1.Rows.Count > 0)
- {
- strAttr =3D dtR1.Rows[0][1].ToString();
- folderName =3D dtR1.Rows[0][0].ToString();
- folderParentId =3DdtR1.Rows[0][2].ToString();
- }
- string[] argv =3D strAttr.Split(',');
-
- dtResult =3D getListViews(domainId);
- addToRigthList(dtResult,argv,"View");
-
- dtResult =3D getListReports(domainId);
- addToRigthList(dtResult,argv,"Report");
- =09
- //dtResult =3D getListFolder(domainId);
- //addToRigthList(dtResult,argv,"Folder");
-
- dtResult =3D getListForms(domainId);
- addToRigthList(dtResult,argv,"Form");
- }
- //DataTable dtR2 =3D userCred.CoreAdapter.GenerateViewTools(1011,"0,1=
018","","","","",0);
- private void addToRigthList(DataTable dtResult, string[] argv,string s=
trText)
- {
- int flag =3D 0;
- if(dtResult =3D=3D null)
- {
- return;
- }
- foreach(DataRow row in dtResult.Rows)
- {
- flag =3D 0;
- for(int i =3D 0; i < argv.Length;i++)
- {
- if(argv[i].Length > 0)
- {
- if (Convert.ToInt32(argv[i]) =3D=3D Convert.ToInt32(row["id_entity=
"]))
- {
- flag =3D 1;
- }
- }
- }
- if(flag =3D=3D 1)
- {
- string rigthText =3D String.Format("{0}[{1}]",row[1],strText);
- if(strAttrRigth.Length > 0)
- {
- strAttrRigth +=3D ",";
- }
- strAttrRigth +=3D String.Format("new ListElement(\"{1}\",\"{0}\",fa=
lse)",row["id_entity"],rigthText);
- }
- }
- dtResult =3D null;
- }
- private bool checkDataForUpdate(int domainId)
- {
- bool retVal =3D false;
- retVal =3D true;
- return retVal;
- }
-
-
#endregion
- #region html method
- public void html_getAttrList(int val)
- {
- string defStr =3D "new ListElement(\"\",\"\",false)";
- if(val =3D=3D 1)
- {
- if (strAttrLeft.Length > 0)
- {
- Response.Write(strAttrLeft);
- return;
- }
- }else{
- if(strAttrRigth.Length > 0)
- {
- Response.Write(strAttrRigth);
- return;
- }
- }
=20
- Response.Write(defStr);
- }
-
- public void html_getAction()
+ private void deleteFolder(int folderId)
{
- Response.Write(action);
+ userCred.CoreAdapter.DeleteInstance(folderId,userCred);
+ sendMessageToUser(UserMessage.DELETEFOLDEROK);
}
=20
- public void html_getBtnSaveValue()
+ private void UpdateDbFolder(int folderId, DataTable dt,SessionCredenci=
al userCred)
{
- if (this.newForm =3D=3D true)
- {
- Response.Write("Save");
- }else{
- Response.Write("Update");
- }
+ userCred.CoreAdapter.UpdateInstance (folderId,dt, userCred);
}
=20
- public void html_getClassId()
+ private DataTable createFolderTable()
{
- Response.Write(ClassId);
+ DataTable dt =3D new DataTable();
+ dt.Columns.Add("folderName");
+ dt.Columns.Add("folderForms");
+ dt.Columns.Add("folderParent");
+ return dt;
}
- public void html_getFolderName()
- {
- Response.Write(folderName);
- }
- public void html_getFolderId()
- {
- Response.Write(folderId);
- }
- public void html_getFirst()
- {
- Response.Write(first);
- }
=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 "";
- }
- }
+ private string getXmlFolderParent(int folderId)
+ {
+ string strXml =3D ""; =20
+ string filter =3D String.Format("34|4|'{0}'|0|0",domainId);
+ DataTable dt =3D userCred.CoreAdapter.GenerateViewTools(1400,"0, 1401=
",filter,"","","",0);
=20
- if (action =3D=3D CNS_UPDATE)
+ strXml +=3D "<parents>";
+ foreach(DataRow row in dt.Rows)
{
- Response.Write(strHtml);
- }
- }
- public void html_getFolderParent()
- {
- int domainId =3D userCred.DomainIds[userCred.CurrentDomainIndex];
- string strHtml =3D "";
- =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>");
- }
- else
- {
- strHtml =3D String.Format("<option value=3D\"0\">---No Folder---</op=
tion>");
- }
-
- DataTable dtResult =3D getListFolder(domainId);
- if (dtResult =3D=3D null)
- {
- Response.Write(strHtml);
- return;
- }
-
- foreach(DataRow row in dtResult.Rows)
- {
+ =20
//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(r=
ow["id_entity"]))
- && folderId !=3D Convert.ToInt32(row["id_ent=
ity"])
- && action =3D=3D CNS_UPDATE)=20
+ if( (!dbAdapter.IsDescendantOfFolder(folderId, Conve=
rt.ToInt32(row["id_entity"]))
+ && folderId !=3D Convert.ToInt32(row["id_entity"=
])
+ && folderId !=3D 0) //UPDATE=20
)=20
{
absCrud crud =3D Factory.Crud();
absComplex complex =3D crud.GetCore().Complex;
- string selected =3D "";
+ string selected =3D "false";
if(complex.GetParentOfFolder(folderId) =3D=3D Conver=
t.ToInt32(row["id_entity"])) //Preselected option
{
- selected =3D "selected=3D\"\"";
+ selected =3D "true";
}
- strHtml +=3D "<option value=3D\"" + row["id_entity"]=
+ "\" " + selected +">" + row["folderName"] + "</option>";
+ strXml +=3D "<parent>";
+ strXml +=3D "<id>" + row["id_entity"] + "</id>";
+ strXml +=3D "<name>" + row["folderName"] + "</name>"=
;
+ strXml +=3D "<selected>" + selected + "</selected>";
+ strXml +=3D "</parent>";
}
- =20
- if (action !=3D CNS_UPDATE) //Creation no filter
+ if(folderId =3D=3D 0) //CREATE
{
- strHtml +=3D "<option value=3D\"" + row["id_entity"]=
+ "\">" + row["folderName"] + "</option>";
+ strXml +=3D "<parent>";
+ strXml +=3D "<id>" + row["id_entity"] + "</id>";
+ strXml +=3D "<name>" + row["folderName"] + "</name>"=
;
+ strXml +=3D "<selected>false</selected>";
+ strXml +=3D "</parent>";
}
}
- Response.Write(strHtml);
- }
-
- =09
- public void html_getFolderParentId()
- {
- Response.Write("0");
- }
- =09
- #endregion=20
+ strXml +=3D "</parents>";
+ return strXml;
+ }
}
}
Modified: humano2/trunk/web/builder/site/formmanagement.aspx.cs
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- humano2/trunk/web/builder/site/formmanagement.aspx.cs 2005-06-21 22:1=
5:32 UTC (rev 1380)
+++ humano2/trunk/web/builder/site/formmanagement.aspx.cs 2005-06-21 22:2=
4:15 UTC (rev 1381)
@@ -66,7 +66,6 @@
ProcessCreationUpdate();
return;
} =20
- =20
}
=20
override protected string createXml()
@@ -184,7 +183,7 @@
string name =3D "";
if(dt.Rows.Count =3D=3D 1)
{ =20
- name =3DConvert.ToString(dt.Rows[0]["formName"]);
+ name=3DConvert.ToString(dt.Rows[0]["formName"]);
}
else
{
Modified: humano2/trunk/web/builder/site/js/createinterfacetools.js
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- humano2/trunk/web/builder/site/js/createinterfacetools.js 2005-06-21 =
22:15:32 UTC (rev 1380)
+++ humano2/trunk/web/builder/site/js/createinterfacetools.js 2005-06-21 =
22:24:15 UTC (rev 1381)
@@ -39,7 +39,8 @@
}
=20
var i=3D0;
- for(i=3D0;i<sizeAttribsArr;i++)
+ var size =3D attribsArr.length;
+ for(i=3D0;i<size;i++)
{
leftAttribsArr[i] =3D new ListElement(attribsArr[i].GetName(),at=
tribsArr[i].GetValue(),false);
if(i<maxPreSelectedNum)
@@ -68,7 +69,8 @@
var rightAttribsArr =3D new Array();
=20
//The left array first
- for(i=3D0;i<sizeAttribsArr;i++)
+ var size =3D attribsArr.length;
+ for(i=3D0;i<size;i++)
{
var idAtt =3D attribsArr[i].GetValue();
if(IsInArray(idAtt,selectedColumnsArr) =3D=3D true)
Modified: humano2/trunk/web/builder/site/js/form.js
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- humano2/trunk/web/builder/site/js/form.js 2005-06-21 22:15:32 UTC (re=
v 1380)
+++ humano2/trunk/web/builder/site/js/form.js 2005-06-21 22:24:15 UTC (re=
v 1381)
@@ -104,15 +104,21 @@
+"<input type=3D\"hidden\" name=3D\"sendHavingsStr\" value=3D=
\"" + havingsStr + "\"></input>";
} =20
=20
- var sendType =3D document.getElementById("formType").value;
- //alert("sendType:" + sendType);
if (this.type =3D=3D 'FORM')
{
+ var sendType =3D document.getElementById("formType").value;
divSubmitAll.innerHTML +=3D=20
"<input type=3D\"hidden\" name=3D\"sendType\" value=3D\"" + =
sendType + "\"></input>";
} =20
=20
- //alert(divSubmitAll.innerHTML);
+ if (this.type =3D=3D 'FOLDER')
+ {
+ var folderParent =3D document.getElementById("folderParent").val=
ue;
+ //alert(folderParent);
+ divSubmitAll.innerHTML +=3D=20
+ "<input type=3D\"hidden\" name=3D\"sendParentFolder\" value=3D=
\"" + folderParent + "\"></input>";
+ }
+ =20
return true;
}
=20
Modified: humano2/trunk/web/builder/site/xsl/createfolder.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/createfolder.xsl 2005-06-21 22:15:=
32 UTC (rev 1380)
+++ humano2/trunk/web/builder/site/xsl/createfolder.xsl 2005-06-21 22:24:=
15 UTC (rev 1381)
@@ -1,149 +1,269 @@
+<xsl:stylesheet version=3D"1.0" xmlns:xsl=3D"http://www.w3.org/1999/XSL/=
Transform">
<!-- $Id$ -->
-<html>
- <head>
- <title>Folders</title>
- <meta http-equiv=3D"Content-Type" content=3D"text/html; charset=3Diso-=
8859-1">
- <script src=3D"js/functions.js"></script>
- <script language=3D"javascript" src=3D"js/grafcomponents/misc.js"></sc=
ript>
- <script language=3D"javascript" src=3D"js/grafcomponents/test.js"></sc=
ript>
- <script language=3D"Javascript" src=3D"js/grafcomponents/sortedlist.js=
"></script>
- <script language=3D"Javascript" src=3D"js/grafcomponents/sortedgraphic=
allist.js"></script>
- <script language=3D"Javascript" src=3D"js/grafcomponents/radiobuttonex=
pand.js"></script>
- <!-- Load this script before the next one -->
- <script language=3D"Javascript" src=3D"js/form.js"></script>
- <script src=3D"js/fn_formsmng.js"></script>
- <link href=3D"css/createinterface.css" rel=3D"stylesheet" type=3D=
"text/css">
- </head>
- <body>
- <form name=3D"formulario" action=3D"#" method=3D"post">
- <input type=3D"hidden" name=3D"opaction" id=3D"opaction" value=3D"<% =
html_getAction(); %>">
- <input type=3D"hidden" name=3D"folderid" id=3D"folderid" value=3D"<% =
html_getFolderId(); %>">
- <input type=3D"hidden" name=3D"LstAttrib" id=3D"LstAttrib">
- <input type=3D"hidden" name=3D"classId" id=3D"classId" value=3D"1400"=
>
- <input type=3D"hidden" name=3D"first" id=3D"first" value=3D"<% html_g=
etFirst(); %>">
- <table width=3D"100%" class=3D"conttablecenter2">
- <tr>
- <td>
- <table>
- <tr>
- <td class=3D"smallgraytextnolink">
- Folder Name:
- </td>
- <td class=3D"smallgraytextnolink">
- <input id=3D"formName" type=3D"text"=
name=3D"formName" value=3D"<% html_getFolderName(); %>">
- </td>
- </tr>
- <tr>
- <td>
- Folder Father:=20
- </td>
- <td>
- <select name=3D"select" size=3D"1" i=
d=3D"folderparent" onChange=3D"fn_setFolderParentId(this.options[this.sel=
ectedIndex].value);">
- <% html_getFolderParent();%>
- </select>
- <input type=3D"hidden" id=3D"folderp=
arentid" name=3D"folderparentid" value=3D"<% html_getFolderParentId(); %>=
">
- </td>
- </tr>
- </table>
- </td>
- </tr>
- =20
- <tr>
- <td>
- <table width=3D"100%" border=3D"0" cellSpacing=3D=
"0" cellPadding=3D"0">
- <tr>
- <td width=3D"100%" colspan=3D"2" class=3D=
"separatorLine">
- </td>
- </tr>
- <tr>
- <td class=3D"lev1head" valign=3D"top"><f=
ont size=3D"2">Items for Folder</font></td>
- </tr>
- </table>
- </td>
- </tr>
-
- <tr>
- <td colspan=3D"2">
- <table>
- <tr>
- <td>Available Columns</td>
- <td></td>
- <td>Your Columns</td>
- </tr>
- <tr>
- <td rowspan=3D"4">
- <div id=3D"ColumnsToShowLeft" ondblc=
lick=3D"leftColumn.Move(leftColumn.GetSelectedIndex(),rightColumn,false);=
" ></div>
- </td>
- <td rowspan=3D"4">
- <input onclick=3D"leftColumn.Move(le=
ftColumn.GetSelectedIndex(),rightColumn,false);" type=3D"button"
- value=3D"Add">
- <br>
- <input onclick=3D"rightColumn.Move(r=
ightColumn.GetSelectedIndex(),leftColumn,true);" type=3D"button"
- value=3D"Remove">
- </td>
- <td rowspan=3D"4">
- <div id=3D"ColumnsToShowRight" ondbl=
click=3D"rightColumn.Move(rightColumn.GetSelectedIndex(),leftColumn,true)=
;"></div>
- </td>
- <td rowspan=3D"4">
- <a onclick=3D"rightColumn.Top(rightC=
olumn.GetSelectedIndex())" href=3D"#">
- <img src=3D"img/upuparrow.gif">
- </a>
- <br>
- <a onclick=3D"rightColumn.Up(rightCo=
lumn.GetSelectedIndex())" href=3D"#">
- <img src=3D"img/uparrow.gif">
- </a>
- <br>
- <a onclick=3D"rightColumn.Down(right=
Column.GetSelectedIndex())" href=3D"#">
- <img src=3D"img/downarrow.gif">
- </a>
- <br>
- <a onclick=3D"rightColumn.Bottom(rig=
htColumn.GetSelectedIndex())" href=3D"#">
- <img src=3D"img/downdownarrow.gi=
f">
- </a>
- </td>
- <td rowspan=3D"4">
- <input onclick=3D"leftColumn.SetToDe=
fault();rightColumn.SetToDefault()" type=3D"button" value=3D"SetToDefault=
">
- <br>
- <!-- Do not forget to enable all ite=
m of the left list -->
- <input type=3D"button" value=3D"Remo=
veAll" onclick=3D"leftColumn.EnableAll();rightColumn.RemoveAll();">
- </td>
- </tr>
- </table>
+ <xsl:output method=3D"html" />
+ <xsl:template match=3D"/">
+ <html>
+ <head>
+ <title>Folders</title>
+ <script language=3D"Javascript" src=3D"js/grafcomponents=
/misc.js"></script>
+ <script language=3D"javascript" src=3D"js/grafcomponents=
/test.js"></script>
+ <script language=3D"Javascript" src=3D"js/grafcomponents=
/sortedlist.js"></script>
+ <script language=3D"Javascript" src=3D"js/grafcomponents=
/sortedgraphicallist.js"></script>
+ <script language=3D"Javascript" src=3D"js/grafcomponents=
/radiobuttonexpand.js"></script>
+ <script language=3D"Javascript" src=3D"js/grafcomponents=
/inputline.js"></script>
+ <script language=3D"Javascript" src=3D"js/grafcomponents=
/expandform.js"></script>
+ <script language=3D"Javascript" src=3D"js/createinterfac=
etools.js" type=3D"text/javascript"></script>
+ <script language=3D"Javascript" src=3D"js/form.js" type=3D=
"text/javascript"></script>
+ <link href=3D"css/createinterface.css" rel=3D"stylesheet=
" type=3D"text/css"/>
+ <script language=3D"Javascript">
+ ///////////////
+ /// The columns of attributes
+ var itemsArr =3D new Array();
+ var item;
+ var i=3D0;
+ <xsl:for-each select=3D"/folder/folderDatas/items/it=
em"> //Get all attributes
+ <xsl:variable name=3D"classId">
+ <xsl:value-of select=3D"id" />
+ </xsl:variable>
+ var item =3D new ListElement("<xsl:value-of sele=
ct=3D"name" />" + " [" + "<xsl:value-of select=3D"type" />" + "]",
+ "<xsl:value-of selec=
t=3D"id"/>",false);
+ itemsArr[i] =3D item;
+ i++;
+ </xsl:for-each>
+ var sizeItemsArr =3D itemsArr.length;
+ var leftItemsArr =3D new Array();
+ var rightItemsArr =3D new Array();
+ <xsl:if test=3D"/folder/folderDatas/name=3D''"> <!--=
Creation -->
+ var splitColTab =3D BuildColumnsByDefault(itemsA=
rr,4);
+ </xsl:if>
+ <xsl:if test=3D"folder/folderDatas/name!=3D''"> <!--=
Update -->
+ //Columns
+ var folderColumnsArray =3D new Array();
+ var i=3D0;
+ <xsl:for-each select=3D"/folder/folderDatas/para=
ms/items/item">
+ folderColumnsArray[i++] =3D "<xsl:value-of s=
elect=3D"id" />";
+ </xsl:for-each>
+ //alert(reportColumnsArray.length); =20
+ var splitColTab =3D BuildPreselectedColumns(item=
sArr,folderColumnsArray);
+ </xsl:if>
+ leftItemsArr =3D splitColTab["left"];
+ rightItemsArr =3D splitColTab["right"];
+ </script> =20
+ </head>
+ <body>
+ <form name=3D"formulario" action=3D"#" method=3D"post">
+ <table width=3D"100%" class=3D"conttablecenter2">
+ <tr>
+ <td>
+ <table>
+ <tr>
+ <td class=3D"smallgraytextnolink=
">
+ Folder Name:
+ </td>
+ <td class=3D"smallgraytextnolink=
">
+ <input id=3D"folderNameInput=
" type=3D"text" name=3D"folderName" value=3D"">
+ <xsl:if test=3D"/folder/=
folderDatas/name">
+ <xsl:attribute name=3D=
"value">
+ <xsl:value-of se=
lect=3D"/folder/folderDatas/name" />
+ </xsl:attribute>
+ </xsl:if>
+ </input>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ Folder Father:=20
+ </td>
+ <td>
+ <select class=3D"drpdwn2" n=
ame=3D"select" size=3D"1" id=3D"folderParent" >
+ <option value=3D"0">
+ -- Nothing --
+ </option>
+ <xsl:for-each select=3D"=
/folder/folderDatas/parents/parent">
+ <option>
+ <xsl:attribute n=
ame=3D"value">
+ <xsl:value-o=
f select=3D"id" />
+ </xsl:attribute>
+ <xsl:if test=3D"=
selected=3D'true'">
+ <xsl:attribu=
te name=3D"selected" />
+ </xsl:if>
+ <xsl:value-of se=
lect=3D"name" />
+ </option>
+ </xsl:for-each>
+ </select>
+ </td>
+ </tr>
+ </table>
+ </td>
+ </tr>
=20
- <script>
- var rigthElements =3D new Array(<% html_getA=
ttrList(2); %>);
- var leftElements =3D new Array(<% html_getAt=
trList(1); %>);
- =20
- //First List
- var divColumnsToShowLeft =3D GetNodeByTagNam=
eAndAttName("div","ColumnsToShowLeft")[0]; =20
- var leftColumn =3D new SortedGraphicalList(l=
eftElements,
- divC=
olumnsToShowLeft,"leftColumn"); =20
- =
=20
- //Second List
- var divColumnsToShowRight =3D GetNodeByTagNa=
meAndAttName("div","ColumnsToShowRight")[0]; =20
- var rightColumn =3D new SortedGraphicalList(=
rigthElements,
- divC=
olumnsToShowRight,"rightColumn"); =
=20
- =20
- </script>
- </td> =20
- </tr>
- <tr>
- <td colspan=3D"2">
- <table width=3D"100%" border=3D"0" cellSpacing=3D=
"0" cellPadding=3D"0">
- <tr>
- <td width=3D"100%" colspan=3D"2" class=3D=
"separatorLine">
- </td>
- </tr>
- </table>
- </td>
- </tr>
- <tr>
- <td>
- <input type=3D"button" onclick=3D"fn_saveData(ri=
ghtColumn);" name=3D"btnSave" value=3D"<% html_getBtnSaveValue(); %>">
- <% html_getButtonDelete(); %>
- </td>
- </tr>
- </table>
- </form>
- </body>
-</html>
+ <tr>
+ <td>
+ <table width=3D"100%" border=3D"0" cellS=
pacing=3D"0" cellPadding=3D"0">
+ <tr>
+ <td width=3D"100%" colspan=3D"2"=
class=3D"separatorLine">
+ </td>
+ </tr>
+ <tr>
+ <td class=3D"lev1head" valign=3D=
"top"><font size=3D"2">Items for Folder</font></td>
+ </tr>
+ </table>
+ </td>
+ </tr>
+ =20
+ <tr>
+ <td colspan=3D"2">
+ <table>
+ <tr>
+ <td>Available Columns</td>
+ <td></td>
+ <td>Your Columns</td>
+ </tr>
+ <tr>
+ <td>
+ <div id=3D"ColumnsToShowLeft=
" ondblclick=3D"leftColumn.Move(leftColumn.GetSelectedIndex(),rightColumn=
,false);">
+ </div>
+ </td>
+ <td>
+ <center>
+ <input type=3D"button"=20
+ width=3D"20"
+ value=3D">>"=20
+ onclick =3D "leftCol=
umn.Move(leftColumn.GetSelectedIndex(),rightColumn,false);"></input>
+ <br/>
+ <input type=3D"button"=20
+ width=3D"20"
+ value=3D"<<=
;"=20
+ onclick =3D "rig=
htColumn.Move(rightColumn.GetSelectedIndex(),leftColumn,true);"></input>
+ </center>
+ </td>
+ <td>
+ <div id=3D"ColumnsToShowRigh=
t" ondblclick=3D"rightColumn.Move(rightColumn.GetSelectedIndex(),leftColu=
mn,true);">
+ </div>
+ </td>
+ <td>
+ <a href=3D"#" onclick=3D"rig=
htColumn.Top(rightColumn.GetSelectedIndex())">
+ <img src=3D"img/upuparro=
w.gif" border=3D"0"/>
+ </a>
+ <br/>
+ <a href=3D"#" onclick=3D"rig=
htColumn.Up(rightColumn.GetSelectedIndex())">
+ <img src=3D"img/uparrow.=
gif" border=3D"0" />
+ </a>
+ <br/>
+ <a href=3D"#" onclick=3D"rig=
htColumn.Down(rightColumn.GetSelectedIndex())">
+ <img src=3D"img/downarro=
w.gif" border=3D"0" />
+ </a>
+ <br/>
+ <a href=3D"#" onclick=3D"rig=
htColumn.Bottom(rightColumn.GetSelectedIndex())">
+ <img src=3D"img/downdown=
arrow.gif" border=3D"0" />
+ </a>
+ </td>
+ <td>
+ <input type=3D"button" value=
=3D"SetToDefault"=20
+ onclick=3D"leftColumn.Se=
tToDefault();rightColumn.SetToDefault();"></input>
+ <br/>
+ <!-- Do not forget to enable=
all item of the left list -->
+ <input type=3D"button" value=
=3D"RemoveAll" onclick=3D"leftColumn.EnableAll();rightColumn.RemoveAll();=
"></input>
+ </td>
+ </tr>
+ </table>
+ =20
+ <script>
+ //First List
+ var divColumnsToShowLeft =3D Get=
NodeByTagNameAndAttName("div","ColumnsToShowLeft")[0]; =20
+ =20
+ var leftColumnParams =3D=20
+ {
+ selfRefName: "leftColumn",
+ itemList: leftItemsArr,
+ divReceptor: divColumnsToSho=
wLeft,
+ showButtons: false
+ }
+ var leftColumn =3D new SortedGra=
phicalList(leftColumnParams);
+ =
=20
+ //Second List
+ var divColumnsToShowRight =3D Ge=
tNodeByTagNameAndAttName("div","ColumnsToShowRight")[0]; =20
+ var rightColumnParams =3D=20
+ ...
[truncated message content] |
|
From: <sv...@de...> - 2005-06-21 22:15:27
|
Author: marcelo
Date: 2005-06-21 18:15:32 -0400 (Tue, 21 Jun 2005)
New Revision: 1380
Modified:
humano2/trunk/web/builder/site/exeFormByAttribute.aspx.cs
Log:
* Changed error message in formulas
Modified: humano2/trunk/web/builder/site/exeFormByAttribute.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/exeFormByAttribute.aspx.cs 2005-06-21 =
21:57:04 UTC (rev 1379)
+++ humano2/trunk/web/builder/site/exeFormByAttribute.aspx.cs 2005-06-21 =
22:15:32 UTC (rev 1380)
@@ -99,7 +99,7 @@
catch
{
//Se intenta eliminar la tabla temporal, por si hubo un error antes=
...
- Response.Write("Error al Ejecutar la Formula");
+ Response.Write("There was an error while executing the formula");
string sql =3D "DROP table tbltempfx"+attributeId;
try
{
|
|
From: <sv...@de...> - 2005-06-21 21:57:00
|
Author: marcelo
Date: 2005-06-21 17:57:04 -0400 (Tue, 21 Jun 2005)
New Revision: 1379
Modified:
humano2/trunk/components/formulas/ProcessFormulas.cs
humano2/trunk/core/schema/pgsql/pgsql-3-view.sql
humano2/trunk/web/builder/site/exeFormByAttribute.aspx.cs
Log:
* Fixed the formulas which had broken somewhere down the line. Updated t=
he schema so that system and domain classes are displayed when creating a=
n attribute of type pertinence.
Modified: humano2/trunk/components/formulas/ProcessFormulas.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/formulas/ProcessFormulas.cs 2005-06-21 20:25=
:13 UTC (rev 1378)
+++ humano2/trunk/components/formulas/ProcessFormulas.cs 2005-06-21 21:57=
:04 UTC (rev 1379)
@@ -813,7 +813,14 @@
tableName =3D "";
columnName =3D "id_entity1";
//strSearch =3D columnName;
- sql =3D sql.Replace(" FROM", " as col FROM");
+ if (sql.IndexOf(" as \"id_entity1\" FROM ") > 0 )
+ {
+ sql =3D sql.Replace(columnName, "col");
+ }
+ else
+ {
+ sql =3D sql.Replace(" FROM", " as col FROM");
+ }
}
=09
=20
Modified: humano2/trunk/core/schema/pgsql/pgsql-3-view.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-3-view.sql 2005-06-21 20:25:13 =
UTC (rev 1378)
+++ humano2/trunk/core/schema/pgsql/pgsql-3-view.sql 2005-06-21 21:57:04 =
UTC (rev 1379)
@@ -51,7 +51,7 @@
INSERT INTO textline VALUES (1018, NULL, NULL, NULL, NULL);
=20
INSERT INTO "view" ("id_entity","columns","where","idClassView","viewNa=
me") VALUES (1404,'0,1018','1017^66|4|''[to]''|0|0',1011,'Views of a cla=
ss Views');
-INSERT INTO "view" ("id_entity","columns","where","idClassView","viewNa=
me") VALUES (1405,'0,66','34|4|''[DomainId]''|0|0',2,'View of Domain Cla=
ses');
+INSERT INTO "view" ("id_entity","columns","where","idClassView","viewNa=
me") VALUES (1405,'0,66','34|8|{(''[DomainId]'',''10'')}|0|0',2,'View of=
Domain Clases');
=20
UPDATE "pertinence" set "filterView" =3D '1405,DomainId' WHERE id_entity=
=3D 57;
UPDATE "pertinence" set "filterView" =3D '1404,to' WHERE id_entity =3D 7=
1;
Modified: humano2/trunk/web/builder/site/exeFormByAttribute.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/exeFormByAttribute.aspx.cs 2005-06-21 =
20:25:13 UTC (rev 1378)
+++ humano2/trunk/web/builder/site/exeFormByAttribute.aspx.cs 2005-06-21 =
21:57:04 UTC (rev 1379)
@@ -35,7 +35,7 @@
try
{
myform.ExeFxsAtributeWithDt(attributeId,domainId,0,0);
- Response.Write("Ejecutando Formula");
+ Response.Write("Formula successfully executed");
=20
/* Lineas para depurar, ayudaran bastante*/
/*
|
|
From: <sv...@de...> - 2005-06-21 20:25:18
|
Author: marcelo
Date: 2005-06-21 16:25:13 -0400 (Tue, 21 Jun 2005)
New Revision: 1378
Modified:
humano2/trunk/web/builder/site/js/createinterfacetools.js
Log:
* commented alert in ReloadWithClass
Modified: humano2/trunk/web/builder/site/js/createinterfacetools.js
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- humano2/trunk/web/builder/site/js/createinterfacetools.js 2005-06-21 =
14:05:48 UTC (rev 1377)
+++ humano2/trunk/web/builder/site/js/createinterfacetools.js 2005-06-21 =
20:25:13 UTC (rev 1378)
@@ -223,7 +223,7 @@
=20
function ReloadWithClass(page,classId)
{
- alert(classId);
+ //alert(classId);
self.location =3D page + "?classId=3D"+classId;
}
=20
|
|
From: <sv...@de...> - 2005-06-21 18:17:22
|
Author: pcamacho
Date: 2005-06-21 10:05:48 -0400 (Tue, 21 Jun 2005)
New Revision: 1377
Modified:
humano2/trunk/components/webTools/interfacetools.cs
humano2/trunk/web/builder/site/createreport.aspx.cs
humano2/trunk/web/builder/site/formmanagement.aspx.cs
humano2/trunk/web/builder/site/viewmain.aspx.cs
Log:
FIX: bug #216. Now interface for creation of forms only show attributes o=
f class, no attributes of pertinence related=20
class.
Modified: humano2/trunk/components/webTools/interfacetools.cs
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- humano2/trunk/components/webTools/interfacetools.cs 2005-06-21 02:07:=
14 UTC (rev 1376)
+++ humano2/trunk/components/webTools/interfacetools.cs 2005-06-21 14:05:=
48 UTC (rev 1377)
@@ -252,9 +252,10 @@
///Get the attributes of a class
///<param name=3D"classId">The id of class</param>
///<param name=3D"userCred">Session object of user</param>
+ ///<param name=3D"fullPert">True: the id of pertinence att will =
be idatt^destAtt. False only idAtt (used in forms)</param>
///<return>A xml string with the list of attributes for a class<=
/returns>
///</summary>
- public static string GetXmlAttribListForClass(int classId,SessionCrede=
ncial userCred)=20
+ public static string GetXmlAttribListForClass(int classId,SessionCrede=
ncial userCred, bool fullPert)=20
{
string salida=3D"";
int attlogin =3D 0;
@@ -279,13 +280,14 @@
{
string attName =3D Convert.ToString(row["attName"]);
string attType =3D Convert.ToString(row["attType"]);
- if(attType=3D=3D"pertinence")
+ if((attType=3D=3D"pertinence") && fullPert)
{
idatt =3D Convert.ToInt32(row["id_entity"]);
dtpert =3D userCred.CoreAdapter.GetClassesFromPertinence(idatt);
DataRow dr2 =3D dtpert.Rows[0];
idClassRel =3D Convert.ToInt32(dr2["to"].ToString());
=09
+ =20
//For each attribute of pertinence put the id with t=
ogo and=20
// the pertname.attname
int [] listAttId =3D GetAttributeIdListForClass(idCl=
assRel,userCred);
Modified: humano2/trunk/web/builder/site/createreport.aspx.cs
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- humano2/trunk/web/builder/site/createreport.aspx.cs 2005-06-21 02:07:=
14 UTC (rev 1376)
+++ humano2/trunk/web/builder/site/createreport.aspx.cs 2005-06-21 14:05:=
48 UTC (rev 1377)
@@ -129,7 +129,7 @@
//relacionadas...
if(Convert.ToInt32(classId) > 0)
{
- strXml +=3D Interface.GetXmlAttribListForClass(Convert.T=
oInt32(classId),userCred);
+ strXml +=3D Interface.GetXmlAttribListForClass(Convert.T=
oInt32(classId),userCred,true);
}
strXml +=3D Interface.GetClassListForUser(userCred=
);
strXml +=3D "</classes>";
Modified: humano2/trunk/web/builder/site/formmanagement.aspx.cs
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- humano2/trunk/web/builder/site/formmanagement.aspx.cs 2005-06-21 02:0=
7:14 UTC (rev 1376)
+++ humano2/trunk/web/builder/site/formmanagement.aspx.cs 2005-06-21 14:0=
5:48 UTC (rev 1377)
@@ -101,7 +101,7 @@
Logger.Log("classId=3D " + classId,LogLevel.Trace);
if(classId > 0) //A class has been selected
{
- strXml +=3D Interface.GetXmlAttribListForClass(classId,u=
serCred); =20
+ strXml +=3D Interface.GetXmlAttribListForClass(classId,u=
serCred,false); =20
}
strXml +=3D Interface.GetClassListForUser(userCred=
);
strXml +=3D "</classes>";
Modified: humano2/trunk/web/builder/site/viewmain.aspx.cs
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- humano2/trunk/web/builder/site/viewmain.aspx.cs 2005-06-21 02:07:14 U=
TC (rev 1376)
+++ humano2/trunk/web/builder/site/viewmain.aspx.cs 2005-06-21 14:05:48 U=
TC (rev 1377)
@@ -124,7 +124,7 @@
//relacionadas...
if(Convert.ToInt32(classId) > 0)
{
- strXml +=3D Interface.GetXmlAttribListForClass(Convert.T=
oInt32(classId),userCred);
+ strXml +=3D Interface.GetXmlAttribListForClass(Convert.T=
oInt32(classId),userCred,true);
}
strXml +=3D Interface.GetClassListForUser(userCred=
);
strXml +=3D "</classes>";
|
|
From: <sv...@de...> - 2005-06-21 02:07:10
|
Author: marcelo
Date: 2005-06-20 22:07:14 -0400 (Mon, 20 Jun 2005)
New Revision: 1376
Modified:
humano2/trunk/components/viewTools/ViewTools.cs
Log:
FIXED: ticket #211, sorting based on a text field
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-21 01:13:30 U=
TC (rev 1375)
+++ humano2/trunk/components/viewTools/ViewTools.cs 2005-06-21 02:07:14 U=
TC (rev 1376)
@@ -928,17 +928,22 @@
{
order.Append("upper(" + tableName + "." + columnName + ") ");
=20
- parameter =3D parameters[1].ToString();
- if(parameter =3D=3D "0")
- {
- order.Append("asc ");
- }
- else
- {
- order.Append("desc ");
- }
- order.Append(", ");
}
+ else
+ { //Obtain the first 50 chars to sort.
+ order.Append("substring(upper(" + tableName + "." + columnName + ")=
,0,50) ");
+
+ }
+ parameter =3D parameters[1].ToString();
+ if(parameter =3D=3D "0")
+ {
+ order.Append("asc ");
+ }
+ else
+ {
+ order.Append("desc ");
+ }
+ order.Append(", ");
}
order.Remove(order.Length-2,2);
order.Append(" ");
|
|
From: <sv...@de...> - 2005-06-21 01:13:26
|
Author: marcelo
Date: 2005-06-20 21:13:30 -0400 (Mon, 20 Jun 2005)
New Revision: 1375
Modified:
humano2/trunk/web/builder/site/xsl/createform.xsl
humano2/trunk/web/builder/site/xsl/createreport.xsl
Log:
* Changed Form.Delete to FormDelete as the function is actually called.
Modified: humano2/trunk/web/builder/site/xsl/createform.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/createform.xsl 2005-06-21 00:56:29=
UTC (rev 1374)
+++ humano2/trunk/web/builder/site/xsl/createform.xsl 2005-06-21 01:13:30=
UTC (rev 1375)
@@ -262,7 +262,7 @@
<xsl:if test=3D"/for=
m/formDatas/displayDeleteButton=3D'true'" >
<input type=3D"s=
ubmit" value=3D"Delete">
<xsl:attribu=
te name=3D"onclick">
- Form.Del=
ete();
+ FormDele=
te();
</xsl:attrib=
ute>
</input>
</xsl:if>
Modified: humano2/trunk/web/builder/site/xsl/createreport.xsl
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- humano2/trunk/web/builder/site/xsl/createreport.xsl 2005-06-21 00:56:=
29 UTC (rev 1374)
+++ humano2/trunk/web/builder/site/xsl/createreport.xsl 2005-06-21 01:13:=
30 UTC (rev 1375)
@@ -523,7 +523,7 @@
<xsl:if test=3D"=
/report/reportDatas/displayDeleteButton=3D'true'" >
<input type=3D=
"submit" value=3D"Delete">
<xsl:att=
ribute name=3D"onclick">
- Form=
.Delete();
+ Form=
Delete();
</xsl:at=
tribute>
</input>
</xsl:if>
|
|
From: <sv...@de...> - 2005-06-21 00:56:28
|
Author: marcelo Date: 2005-06-20 20:56:29 -0400 (Mon, 20 Jun 2005) New Revision: 1374 Modified: humano2/trunk/web/builder/site/js/fn_formsmng.js humano2/trunk/web/builder/site/js/form.js humano2/trunk/web/builder/site/js/iframe.js humano2/trunk/web/builder/site/js/modelfuncs.js humano2/trunk/web/builder/site/js/tabs.js Log: * Fixed: Several .js files were saved in windows format. This was=20 causing problems with Mono. They were not being read properly and thus=20 javascript error would occur. The files were converted to unix format. Modified: humano2/trunk/web/builder/site/js/fn_formsmng.js =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- humano2/trunk/web/builder/site/js/fn_formsmng.js 2005-06-21 00:37:17 = UTC (rev 1373) +++ humano2/trunk/web/builder/site/js/fn_formsmng.js 2005-06-21 00:56:29 = UTC (rev 1374) @@ -1,106 +1,106 @@ -// -// 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$ =20 - -//**********************************************************************= **************** -function loadClass(ClassValue,ClassName) -{ - //alert(ClassValue + " " + ClassName); - iFrame =3D document.getElementById("FrameTempLoad"); - iFrame.style.visibility=3D'hidden'; - if(ClassValue =3D=3D 0) - { - return; - } - document.formulario.ClassName.value =3D ClassName; - document.formulario.ClassId.value =3D ClassValue; - document.formulario.submit(); - //alert(document.formulario.ClassName.value + " "=20 - //+ document.formulario.ClassId.value); -} - -//**********************************************************************= **************** -function mostrar() -{ - iFrame =3D document.getElementById("FrameTempLoad"); - iFrame.style.width=3D '150px'; - iFrame.style.height=3D '100px'; - iFrame.style.visibility =3D 'visible'; - iFrame.src=3D"combobox_type_entity.aspx"; - //document.all.FrameTempLoad.src=3D"combobox_type_entity.aspx"; // ?= typeent=3D' + strtype_Entity + '&typeEntityFrom=3D' + typeEntityFrom + '&= IntView=3D' + vista + strelem + '"' -} -=20 -//**********************************************************************= ****************=20 -function fn_saveData() -{ - var frm =3D document.formulario; - var strError =3D ""; - =20 - if (frm.formName.value =3D=3D "") - { - strError +=3D "Error, you must insert a name.\n"; - } - =20 - frm.LstAttrib.value =3D ""; - =20 - for( var i =3D 0;i < rightColumn.fSortedList.Length();i++) - { - if(rightColumn.fSortedList.GetItem(i).value !=3D "") - { - frm.LstAttrib.value +=3D rightColumn.fSortedList.GetItem(i).= value; - if(i < rightColumn.fSortedList.Length() -1) - frm.LstAttrib.value +=3D ","; - } - } - =20 - if (strError =3D=3D "") - { - if (frm.opaction.value =3D=3D 0) - { - frm.opaction.value=3D1; - } - frm.submit(); - }else{ - alert(strError); - } -} - -//**********************************************************************= ****************=20 -function fn_deleteData() -{ - //var frm =3D document.formulario; - //var strError =3D ""; - - //alert("Antes :: " + document.formulario.opAction.value); - document.formulario.opaction.setAttribute("value",3);// =3D 3; //val= ue",3); - =20 - //alert("Despues :: " + document.formulario.opaction.value); - //document.formulario.submit(); - =20 - //var folderId =3D document.formulario.folderid.value; - //var url[] =3D String(document.location).split("?"); - =20 - //alert(document.formulario.opaction.value); - //document.location =3D "foldermanagement.aspx?opaction=3D3&folderId= =3D" + folderId;=20 - document.formulario.submit(); -} - -//**********************************************************************= ****************=20 -function fn_setFolderParentId(parentid) -{ - var frm =3D document.formulario; - //alert(parentid); - =20 - if(parentid !=3D null || parentid > 0) - { - frm.folderparentid.value =3D parentid; - } - //alert(frm.folderparent.options[pos].value); =20 -} =20 +// +// 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$ =20 + +//**********************************************************************= **************** +function loadClass(ClassValue,ClassName) +{ + //alert(ClassValue + " " + ClassName); + iFrame =3D document.getElementById("FrameTempLoad"); + iFrame.style.visibility=3D'hidden'; + if(ClassValue =3D=3D 0) + { + return; + } + document.formulario.ClassName.value =3D ClassName; + document.formulario.ClassId.value =3D ClassValue; + document.formulario.submit(); + //alert(document.formulario.ClassName.value + " "=20 + //+ document.formulario.ClassId.value); +} + +//**********************************************************************= **************** +function mostrar() +{ + iFrame =3D document.getElementById("FrameTempLoad"); + iFrame.style.width=3D '150px'; + iFrame.style.height=3D '100px'; + iFrame.style.visibility =3D 'visible'; + iFrame.src=3D"combobox_type_entity.aspx"; + //document.all.FrameTempLoad.src=3D"combobox_type_entity.aspx"; // ?= typeent=3D' + strtype_Entity + '&typeEntityFrom=3D' + typeEntityFrom + '&= IntView=3D' + vista + strelem + '"' +} +=20 +//**********************************************************************= ****************=20 +function fn_saveData() +{ + var frm =3D document.formulario; + var strError =3D ""; + =20 + if (frm.formName.value =3D=3D "") + { + strError +=3D "Error, you must insert a name.\n"; + } + =20 + frm.LstAttrib.value =3D ""; + =20 + for( var i =3D 0;i < rightColumn.fSortedList.Length();i++) + { + if(rightColumn.fSortedList.GetItem(i).value !=3D "") + { + frm.LstAttrib.value +=3D rightColumn.fSortedList.GetItem(i).= value; + if(i < rightColumn.fSortedList.Length() -1) + frm.LstAttrib.value +=3D ","; + } + } + =20 + if (strError =3D=3D "") + { + if (frm.opaction.value =3D=3D 0) + { + frm.opaction.value=3D1; + } + frm.submit(); + }else{ + alert(strError); + } +} + +//**********************************************************************= ****************=20 +function fn_deleteData() +{ + //var frm =3D document.formulario; + //var strError =3D ""; + + //alert("Antes :: " + document.formulario.opAction.value); + document.formulario.opaction.setAttribute("value",3);// =3D 3; //val= ue",3); + =20 + //alert("Despues :: " + document.formulario.opaction.value); + //document.formulario.submit(); + =20 + //var folderId =3D document.formulario.folderid.value; + //var url[] =3D String(document.location).split("?"); + =20 + //alert(document.formulario.opaction.value); + //document.location =3D "foldermanagement.aspx?opaction=3D3&folderId= =3D" + folderId;=20 + document.formulario.submit(); +} + +//**********************************************************************= ****************=20 +function fn_setFolderParentId(parentid) +{ + var frm =3D document.formulario; + //alert(parentid); + =20 + if(parentid !=3D null || parentid > 0) + { + frm.folderparentid.value =3D parentid; + } + //alert(frm.folderparent.options[pos].value); =20 +} =20 Modified: humano2/trunk/web/builder/site/js/form.js =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- humano2/trunk/web/builder/site/js/form.js 2005-06-21 00:37:17 UTC (re= v 1373) +++ humano2/trunk/web/builder/site/js/form.js 2005-06-21 00:56:29 UTC (re= v 1374) @@ -1,165 +1,165 @@ -/* -// -// 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$=20 -*/ - -////////////////////////////////////////////// Form Class //////////////= /////////////////////////////////////////////// -function Form(classId,type,infosToSubmit)=20 -{ - //Fields - this.type =3D type; - this.classId =3D classId; - this.infosToSubmit =3D infosToSubmit; - =20 - //Methods - this.UpdateSubmitAll =3D FormUpdateSubmitAll; - this.Delete =3D FormDelete; -} - -function FormUpdateSubmitAll() -{ - //Get the ReportName - var name =3D this.infosToSubmit.divName.value; //GetNodeByTagNameAnd= AttName("input","reportNameInput")[0]; - //var reportName =3D reportNameInput.value; - =20 - if(name =3D=3D "") - { - alert("You must enter the name."); =20 - return false; - } - =20 - //alert("reportName:" + reportName); - =20 - //Get the classId - var classId =3D this.classId; - //alert("classId:" + classId); - =20 - //Build the columnstr string - //alert(rightColumn); - var i; - var sortedList =3D this.infosToSubmit.rightColumn.fSortedList; - //alert(sortedList.Length()); - var columnsStr =3D ""; - for(i=3D0;i<sortedList.Length();i++) - { - columnsStr +=3D sortedList.GetItem(i).GetValue() + ","; - } - =20 - //Remove the last coma - columnsStr =3D columnsStr;=20 - columnsStr =3D columnsStr.substring(0,columnsStr.length-1); = =20 - //alert("columnsStr:" + columnsStr); - =20 - //Now the sort - //alert("sort SelfRefName:" + sort.GetSelfRefName()); - if(this.type =3D=3D 'REPORT' || this.type =3D=3D 'VIEW') - { - var orderStr =3D this.infosToSubmit.sort.ReturnValues();=20 - } - //alert("orderStr: " + orderStr); - =20 - //The filter - //alert("filter SelfRefName:" + filter.GetSelfRefName()); - if(this.type =3D=3D 'REPORT' || this.type =3D=3D 'VIEW') - { - var whereStr =3D this.infosToSubmit.filter.ReturnValues(); - } - //alert("whereStr: " + whereStr); - =20 - if(this.type =3D=3D 'REPORT') - { - var persoColumnsStr =3D this.infosToSubmit.persoColumns.ReturnVa= lues(); - //var havingsStr =3D this.infosToSubmit.havings.ReturnValues(); = Commented due to bug#123 - var havingsStr =3D ""; - } - =20 - //Update the submit all TD - var divSubmitAll =3D this.infosToSubmit.divSubmitAll; - //alert(divSubmitAll); - divSubmitAll.innerHTML +=3D=20 - "<input type=3D\"hidden\" name=3D\"sendCreateUpdate\" value=3D\"= true\"></input>" - +"<input type=3D\"hidden\" name=3D\"sendClassId\" value=3D\""+ c= lassId +"\"></input>" - +"<input type=3D\"hidden\" name=3D\"sendName\" value=3D\"" + nam= e + "\"></input>" - +"<input type=3D\"hidden\" name=3D\"sendColumnsStr\" value=3D\""= + columnsStr + "\"></input>" - =20 - if(this.type =3D=3D 'REPORT' || this.type=3D=3D'VIEW') - { - divSubmitAll.innerHTML +=3D - "<input type=3D\"hidden\" name=3D\"sendOrderStr\" value=3D\"= " + orderStr + "\"></input>" - +"<input type=3D\"hidden\" name=3D\"sendWhereStr\" value=3D\= "" + whereStr + "\"></input>"; - } - =20 - if (this.type =3D=3D 'REPORT') - { - divSubmitAll.innerHTML +=3D=20 - "<input type=3D\"hidden\" name=3D\"sendPersoColumnsStr\" val= ue=3D\"" + persoColumnsStr + "\"></input>" - +"<input type=3D\"hidden\" name=3D\"sendHavingsStr\" value=3D= \"" + havingsStr + "\"></input>"; - } =20 - =20 - var sendType =3D document.getElementById("formType").value; - //alert("sendType:" + sendType); - if (this.type =3D=3D 'FORM') - { - divSubmitAll.innerHTML +=3D=20 - "<input type=3D\"hidden\" name=3D\"sendType\" value=3D\"" + = sendType + "\"></input>"; - } =20 - =20 - //alert(divSubmitAll.innerHTML); - return true; -} - -function FormDelete() -{ - var msg =3D "Are you sure you want to delete the "; - switch(this.type) - { - case 'VIEW': =20 - msg +=3D "view"; - break; - case 'REPORT': - msg +=3D "report"; =20 - break; - case 'FORM': - msg +=3D "form"; - break; - } - msg +=3D"?"; - =20 - if (confirm(msg)) - { - var id =3D this.infosToSubmit.id; - var name; - switch(this.type) - { - case 'VIEW': =20 - name =3D "viewId"; - break; - case 'REPORT': - name =3D "reportId"; =20 - break; - case 'FORM': - name =3D "formId"; - break; - } - var divSubmitAll =3D GetNodeByTagNameAndAttName("div","SubmitAll= ")[0]; - //alert(divSubmitAll); - divSubmitAll.innerHTML +=3D "<input type=3D\"hidden\" name=3D\"d= elete\" value=3D\"true\"></input>"; - divSubmitAll.innerHTML +=3D "<input type=3D\"hidden\" name=3D\""= + name + "\" value=3D\"" + id + "\"></input>"; - return true; =20 - } - else - { - return false; =20 - } -} - - -////////////////////////////////////////////// END: Form Class /////////= //////////////////////////////////////////////// +/* +// +// 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$=20 +*/ + +////////////////////////////////////////////// Form Class //////////////= /////////////////////////////////////////////// +function Form(classId,type,infosToSubmit)=20 +{ + //Fields + this.type =3D type; + this.classId =3D classId; + this.infosToSubmit =3D infosToSubmit; + =20 + //Methods + this.UpdateSubmitAll =3D FormUpdateSubmitAll; + this.Delete =3D FormDelete; +} + +function FormUpdateSubmitAll() +{ + //Get the ReportName + var name =3D this.infosToSubmit.divName.value; //GetNodeByTagNameAnd= AttName("input","reportNameInput")[0]; + //var reportName =3D reportNameInput.value; + =20 + if(name =3D=3D "") + { + alert("You must enter the name."); =20 + return false; + } + =20 + //alert("reportName:" + reportName); + =20 + //Get the classId + var classId =3D this.classId; + //alert("classId:" + classId); + =20 + //Build the columnstr string + //alert(rightColumn); + var i; + var sortedList =3D this.infosToSubmit.rightColumn.fSortedList; + //alert(sortedList.Length()); + var columnsStr =3D ""; + for(i=3D0;i<sortedList.Length();i++) + { + columnsStr +=3D sortedList.GetItem(i).GetValue() + ","; + } + =20 + //Remove the last coma + columnsStr =3D columnsStr;=20 + columnsStr =3D columnsStr.substring(0,columnsStr.length-1); = =20 + //alert("columnsStr:" + columnsStr); + =20 + //Now the sort + //alert("sort SelfRefName:" + sort.GetSelfRefName()); + if(this.type =3D=3D 'REPORT' || this.type =3D=3D 'VIEW') + { + var orderStr =3D this.infosToSubmit.sort.ReturnValues();=20 + } + //alert("orderStr: " + orderStr); + =20 + //The filter + //alert("filter SelfRefName:" + filter.GetSelfRefName()); + if(this.type =3D=3D 'REPORT' || this.type =3D=3D 'VIEW') + { + var whereStr =3D this.infosToSubmit.filter.ReturnValues(); + } + //alert("whereStr: " + whereStr); + =20 + if(this.type =3D=3D 'REPORT') + { + var persoColumnsStr =3D this.infosToSubmit.persoColumns.ReturnVa= lues(); + //var havingsStr =3D this.infosToSubmit.havings.ReturnValues(); = Commented due to bug#123 + var havingsStr =3D ""; + } + =20 + //Update the submit all TD + var divSubmitAll =3D this.infosToSubmit.divSubmitAll; + //alert(divSubmitAll); + divSubmitAll.innerHTML +=3D=20 + "<input type=3D\"hidden\" name=3D\"sendCreateUpdate\" value=3D\"= true\"></input>" + +"<input type=3D\"hidden\" name=3D\"sendClassId\" value=3D\""+ c= lassId +"\"></input>" + +"<input type=3D\"hidden\" name=3D\"sendName\" value=3D\"" + nam= e + "\"></input>" + +"<input type=3D\"hidden\" name=3D\"sendColumnsStr\" value=3D\""= + columnsStr + "\"></input>" + =20 + if(this.type =3D=3D 'REPORT' || this.type=3D=3D'VIEW') + { + divSubmitAll.innerHTML +=3D + "<input type=3D\"hidden\" name=3D\"sendOrderStr\" value=3D\"= " + orderStr + "\"></input>" + +"<input type=3D\"hidden\" name=3D\"sendWhereStr\" value=3D\= "" + whereStr + "\"></input>"; + } + =20 + if (this.type =3D=3D 'REPORT') + { + divSubmitAll.innerHTML +=3D=20 + "<input type=3D\"hidden\" name=3D\"sendPersoColumnsStr\" val= ue=3D\"" + persoColumnsStr + "\"></input>" + +"<input type=3D\"hidden\" name=3D\"sendHavingsStr\" value=3D= \"" + havingsStr + "\"></input>"; + } =20 + =20 + var sendType =3D document.getElementById("formType").value; + //alert("sendType:" + sendType); + if (this.type =3D=3D 'FORM') + { + divSubmitAll.innerHTML +=3D=20 + "<input type=3D\"hidden\" name=3D\"sendType\" value=3D\"" + = sendType + "\"></input>"; + } =20 + =20 + //alert(divSubmitAll.innerHTML); + return true; +} + +function FormDelete() +{ + var msg =3D "Are you sure you want to delete the "; + switch(this.type) + { + case 'VIEW': =20 + msg +=3D "view"; + break; + case 'REPORT': + msg +=3D "report"; =20 + break; + case 'FORM': + msg +=3D "form"; + break; + } + msg +=3D"?"; + =20 + if (confirm(msg)) + { + var id =3D this.infosToSubmit.id; + var name; + switch(this.type) + { + case 'VIEW': =20 + name =3D "viewId"; + break; + case 'REPORT': + name =3D "reportId"; =20 + break; + case 'FORM': + name =3D "formId"; + break; + } + var divSubmitAll =3D GetNodeByTagNameAndAttName("div","SubmitAll= ")[0]; + //alert(divSubmitAll); + divSubmitAll.innerHTML +=3D "<input type=3D\"hidden\" name=3D\"d= elete\" value=3D\"true\"></input>"; + divSubmitAll.innerHTML +=3D "<input type=3D\"hidden\" name=3D\""= + name + "\" value=3D\"" + id + "\"></input>"; + return true; =20 + } + else + { + return false; =20 + } +} + + +////////////////////////////////////////////// END: Form Class /////////= //////////////////////////////////////////////// Modified: humano2/trunk/web/builder/site/js/iframe.js =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- humano2/trunk/web/builder/site/js/iframe.js 2005-06-21 00:37:17 UTC (= rev 1373) +++ humano2/trunk/web/builder/site/js/iframe.js 2005-06-21 00:56:29 UTC (= rev 1374) @@ -1,80 +1,80 @@ -/* -// 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: iframe.js 1004 2005-05-11 04:29:46Z marcelo $ -*/ -var x,y -var isIE =3D document.all?true:false; -if (!isIE) document.captureEvents(Event.MOUSEMOVE); -document.onmousemove =3D getMousePosition; - -function currentTime(){ - var now =3D new Date(); - return now.getTime(); -} - -function toggleIFrame(nframe,urlToLoad) { - var f =3D document.getElementById(nframe); // The iframe object - urlToLoad +=3D "¤tTime=3D" + currentTime(); - if(f.style.visibility =3D=3D "hidden") { - =20 - if(f.src !=3D urlToLoad) { // If the frame was not loaded yet, load it= again. - f.src =3D urlToLoad; - } =20 - f.style.visibility =3D "visible";=09 - =09 - } else { - f.style.visibility =3D "hidden";=09 - } -=09 - f.style.left=3Dx - 180 - f.style.top =3Dy + 10 - //window.open(urlToLoad); -} - -function toggleIFrameWithFilter(nframe,urlToLoad,filter) {=09 - var arr =3D filter.split(","); // The elemens of the filter. - var n =3D arr[1]; // The name of the element to add. - var v =3D ''; - if (typeof n !=3D 'undefined') { - var elemName =3D "txt_" + attNameDict[n]; - if (typeof document.Form1.elements[elemName] =3D=3D 'undefined')=20 - var elemName =3D attNameDict[n]; - v =3D document.Form1.elements[elemName].value; - urlToLoad +=3D "&" + n + "=3D" + v; - } -=09 - toggleIFrame(nframe,urlToLoad); -} - -function getMousePosition2(e) { -} - -function getMousePosition(e) { - if (!isIE) { - InttxtX =3D window.pageXOffset; - InttxtY =3D window.pageYOffset; - _x =3D e.pageX; - _y =3D e.pageY; - } - if (isIE) { - _x =3D event.clientX + (InttxtX =3D document.body.scrollLeft); - _y =3D event.clientY + (InttxtX =3D document.body.scrollTop); - } - x=3D_x - y=3D_y - =20 - return true; -} - - -function hideIFrame(nframe) { - var f =3D document.getElementById(nframe); // The iframe object - f.style.visibility =3D "hidden";=09 -} \ No newline at end of file +/* +// 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: iframe.js 1004 2005-05-11 04:29:46Z marcelo $ +*/ +var x,y +var isIE =3D document.all?true:false; +if (!isIE) document.captureEvents(Event.MOUSEMOVE); +document.onmousemove =3D getMousePosition; + +function currentTime(){ + var now =3D new Date(); + return now.getTime(); +} + +function toggleIFrame(nframe,urlToLoad) { + var f =3D document.getElementById(nframe); // The iframe object + urlToLoad +=3D "¤tTime=3D" + currentTime(); + if(f.style.visibility =3D=3D "hidden") { + =20 + if(f.src !=3D urlToLoad) { // If the frame was not loaded yet, load it= again. + f.src =3D urlToLoad; + } =20 + f.style.visibility =3D "visible";=09 + =09 + } else { + f.style.visibility =3D "hidden";=09 + } +=09 + f.style.left=3Dx - 180 + f.style.top =3Dy + 10 + //window.open(urlToLoad); +} + +function toggleIFrameWithFilter(nframe,urlToLoad,filter) {=09 + var arr =3D filter.split(","); // The elemens of the filter. + var n =3D arr[1]; // The name of the element to add. + var v =3D ''; + if (typeof n !=3D 'undefined') { + var elemName =3D "txt_" + attNameDict[n]; + if (typeof document.Form1.elements[elemName] =3D=3D 'undefined')=20 + var elemName =3D attNameDict[n]; + v =3D document.Form1.elements[elemName].value; + urlToLoad +=3D "&" + n + "=3D" + v; + } +=09 + toggleIFrame(nframe,urlToLoad); +} + +function getMousePosition2(e) { +} + +function getMousePosition(e) { + if (!isIE) { + InttxtX =3D window.pageXOffset; + InttxtY =3D window.pageYOffset; + _x =3D e.pageX; + _y =3D e.pageY; + } + if (isIE) { + _x =3D event.clientX + (InttxtX =3D document.body.scrollLeft); + _y =3D event.clientY + (InttxtX =3D document.body.scrollTop); + } + x=3D_x + y=3D_y + =20 + return true; +} + + +function hideIFrame(nframe) { + var f =3D document.getElementById(nframe); // The iframe object + f.style.visibility =3D "hidden";=09 +} Modified: humano2/trunk/web/builder/site/js/modelfuncs.js =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- humano2/trunk/web/builder/site/js/modelfuncs.js 2005-06-21 00:37:17 U= TC (rev 1373) +++ humano2/trunk/web/builder/site/js/modelfuncs.js 2005-06-21 00:56:29 U= TC (rev 1374) @@ -1,109 +1,109 @@ -/* -// 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$ -*/ - -// Set the state of the modeling functions -function SetModelState(state) { - //alert("SetModelState :: " + state); - - var topData =3D parent.frames["topdata"]; - - switch(state) { - case "Reset": - btnDisable("cancel"); - btnDisable("properties"); - btnDisable("delClass"); - btnDisable("createAttrib"); - btnDisable("createRule"); - btnEnable("newClass"); - break; - case "ViewClass": - btnDisable("cancel"); - btnEnable("properties"); - btnEnable("createAttrib"); - btnEnable("delClass"); - btnEnable("createRule"); - btnEnable("newClass"); - break; - case "DeleteClass": - btnEnable("cancel"); - btnDisable("properties"); =09 - btnDisable("createAttrib"); - btnDisable("createRule"); - btnDisable("delClass");=09 - btnDisable("newClass"); - break; - case "EditAttribute": - btnEnable("cancel"); - btnDisable("properties"); - btnDisable("createAttrib"); - btnDisable("createRule"); - btnDisable("delClass");=09 - btnDisable("newClass"); - break; - case "EditRule": - btnEnable("cancel"); - btnDisable("properties"); - btnDisable("createAttrib"); - btnDisable("createRule"); - btnDisable("delClass");=09 - btnDisable("newClass"); - break; - default: - alert("SetModelState got an unknown state: " + state); - return; - } - - //alert(topData.document.forms["Form1"].state2); - topData.document.Form1.state2.value =3D state; -} - -// Get the state of the modeling functions. -function GetModelState() { - var topData =3D parent.frames["topdata"]; - return topData.document.Form1.state2.value; -} - -// Set the Id of the class that we are operating on. -function SetClassId(classId) { - //alert("SetClassId called"); - var topData =3D parent.frames["topdata"]; - topData.document.Form1.classId2.value =3D classId; -} - -// Get the id of the class. -function GetClassId() { - var topData =3D parent.frames["topdata"]; -=09 - var strRet =3D topData.document.Form1.classId2.value; - - if (strRet =3D=3D "") - { - return "0"; - }else{ - return strRet; - } -} - -// Enable a button on the operationbar. -function btnEnable(name) { - //alert("btnEnable called: " + name); - var topData =3D parent.frames["topdata"]; - var btn =3D topData.document.getElementById(name); - btn.style.display=3D""; -} - -// Disable a button on the operationbar. -function btnDisable(name) { - var topData =3D parent.frames["topdata"]; - var btn =3D topData.document.getElementById(name); - btn.style.display=3D"none"; -} +/* +// 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$ +*/ + +// Set the state of the modeling functions +function SetModelState(state) { + //alert("SetModelState :: " + state); + + var topData =3D parent.frames["topdata"]; + + switch(state) { + case "Reset": + btnDisable("cancel"); + btnDisable("properties"); + btnDisable("delClass"); + btnDisable("createAttrib"); + btnDisable("createRule"); + btnEnable("newClass"); + break; + case "ViewClass": + btnDisable("cancel"); + btnEnable("properties"); + btnEnable("createAttrib"); + btnEnable("delClass"); + btnEnable("createRule"); + btnEnable("newClass"); + break; + case "DeleteClass": + btnEnable("cancel"); + btnDisable("properties"); =09 + btnDisable("createAttrib"); + btnDisable("createRule"); + btnDisable("delClass");=09 + btnDisable("newClass"); + break; + case "EditAttribute": + btnEnable("cancel"); + btnDisable("properties"); + btnDisable("createAttrib"); + btnDisable("createRule"); + btnDisable("delClass");=09 + btnDisable("newClass"); + break; + case "EditRule": + btnEnable("cancel"); + btnDisable("properties"); + btnDisable("createAttrib"); + btnDisable("createRule"); + btnDisable("delClass");=09 + btnDisable("newClass"); + break; + default: + alert("SetModelState got an unknown state: " + state); + return; + } + + //alert(topData.document.forms["Form1"].state2); + topData.document.Form1.state2.value =3D state; +} + +// Get the state of the modeling functions. +function GetModelState() { + var topData =3D parent.frames["topdata"]; + return topData.document.Form1.state2.value; +} + +// Set the Id of the class that we are operating on. +function SetClassId(classId) { + //alert("SetClassId called"); + var topData =3D parent.frames["topdata"]; + topData.document.Form1.classId2.value =3D classId; +} + +// Get the id of the class. +function GetClassId() { + var topData =3D parent.frames["topdata"]; +=09 + var strRet =3D topData.document.Form1.classId2.value; + + if (strRet =3D=3D "") + { + return "0"; + }else{ + return strRet; + } +} + +// Enable a button on the operationbar. +function btnEnable(name) { + //alert("btnEnable called: " + name); + var topData =3D parent.frames["topdata"]; + var btn =3D topData.document.getElementById(name); + btn.style.display=3D""; +} + +// Disable a button on the operationbar. +function btnDisable(name) { + var topData =3D parent.frames["topdata"]; + var btn =3D topData.document.getElementById(name); + btn.style.display=3D"none"; +} Modified: humano2/trunk/web/builder/site/js/tabs.js =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- humano2/trunk/web/builder/site/js/tabs.js 2005-06-21 00:37:17 UTC (re= v 1373) +++ humano2/trunk/web/builder/site/js/tabs.js 2005-06-21 00:56:29 UTC (re= v 1374) @@ -1,260 +1,260 @@ -/* -// The Humano2 Business solution. -// Copyright (C) 1999,3 Convea Ltd. -// 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$ -*/ -=09 - /* Interchange Tabs on the same page */ - var tmpAttName =3D ""; - function TabChange(tabID, wantcookie, numtabs, newwinheight)=20 - {=09 - var tab0=3Dnull; var tab1=3Dnull; var tab2=3Dnull; var tab3=3Dnull; = var tab4=3Dnull;var tab5=3Dnull;var tab6=3Dnull; - if (document.Form1.attName.value !=3D "") - { - tmpAttName =3D document.Form1.attName.value; - } - =20 - if(newwinheight) - { - frameWidth =3D document.body.clientWidth+6; - frameHeight =3D document.body.clientHeight; =09 - window.resizeTo(frameWidth, newwinheight); - } -=09 - - tab0 =3D document.getElementById('TabA').style; - tab1 =3D document.getElementById('TabB').style; - if(numtabs>2)tab2 =3D document.getElementById('TabC').style; - if(numtabs>3)tab3 =3D document.getElementById('TabD').style; - if(numtabs>4)tab4 =3D document.getElementById('TabE').style; - if(numtabs>5)tab5 =3D document.getElementById('TabF').style; - if(numtabs>6)tab6 =3D document.getElementById('TabG').style; - if (tabID =3D=3D 1)=20 - { - if (tmpAttName !=3D ""){document.Form1.attName.value =3D tmp= AttName; } - if(wantcookie) SetCookie ("ViewTab", "A"); - tab0.visibility =3D "visible";=20 - tab1.visibility =3D "hidden";=20 - if(tab2){tab2.visibility =3D "hidden"; } - if(tab3){tab3.visibility =3D "hidden"; } - if(tab4){tab4.visibility =3D "hidden"; } - if(tab5){tab5.visibility =3D "hidden"; } - if(tab6){tab6.visibility =3D "hidden"; } - } - - if (tabID =3D=3D 2)=20 - { - if(wantcookie) SetCookie ("ViewTab", "B"); - tab0.visibility =3D "hidden";=09 - tab1.visibility =3D "visible";=20 - if(tab2){tab2.visibility =3D "hidden"; } - if(tab3){tab3.visibility =3D "hidden"; } - if(tab4){tab4.visibility =3D "hidden"; } - if(tab5){tab5.visibility =3D "hidden"; } - if(tab6){tab6.visibility =3D "hidden"; } - } - - if (tabID =3D=3D 3)=20 - { - if(wantcookie) SetCookie ("ViewTab", "C"); - tab0.visibility =3D "hidden"; - tab1.visibility =3D "hidden";=09 - if(tab2){tab2.visibility =3D "visible"; } - if(tab3){tab3.visibility =3D "hidden"; } - if(tab4){tab4.visibility =3D "hidden"; } - if(tab5){tab5.visibility =3D "hidden"; } - if(tab6){tab6.visibility =3D "hidden"; } - } - - if (tabID =3D=3D 4)=20 - { - if(wantcookie) SetCookie ("ViewTab", "D"); - tab0.visibility =3D "hidden";=09 - tab1.visibility =3D "hidden"; - if(tab2){tab2.visibility =3D "hidden"; } - if(tab3){tab3.visibility =3D "visible"; } - if(tab4){tab4.visibility =3D "hidden"; } - if(tab5){tab5.visibility =3D "hidden"; } - if(tab6){tab6.visibility =3D "hidden"; } - } - =09 - if (tabID =3D=3D 5)=20 - { - if(wantcookie) SetCookie ("ViewTab", "E"); - tab0.visibility =3D "hidden"; - tab1.visibility =3D "hidden"; - if(tab2){tab2.visibility =3D "hidden"; } - if(tab3){tab3.visibility =3D "hidden"; } - if(tab4){tab4.visibility =3D "visible"; } - if(tab5){tab5.visibility =3D "hidden"; } - if(tab6){tab6.visibility =3D "hidden"; } - } - =09 - if (tabID =3D=3D 6)=20 - { - if(wantcookie) SetCookie ("ViewTab", "F"); - tab0.visibility =3D "hidden"; - tab1.visibility =3D "hidden"; - if(tab2){tab2.visibility =3D "hidden"; } - if(tab3){tab3.visibility =3D "hidden"; } - if(tab4){tab4.visibility =3D "hidden"; } - if(tab5){tab5.visibility =3D "visible"; } - if(tab6){tab6.visibility =3D "hidden"; } - } - - if (tabID =3D=3D 7)=20 - { - if(wantcookie) SetCookie ("ViewTab", "G"); - tab0.visibility =3D "hidden"; - tab1.visibility =3D "hidden"; - if(tab2){tab2.visibility =3D "hidden"; } - if(tab3){tab3.visibility =3D "hidden"; } - if(tab4){tab4.visibility =3D "hidden"; } - if(tab5){tab5.visibility =3D "hidden"; } - if(tab6){tab6.visibility =3D "visible"; } - } - =09 - =09 - return; - } -=09 - /* Switch between tabs that are on a secondary level. */ - function TabChange2(tabID, wantcookie, numtabs, newwinheight)=20 - {=09 - var tab0=3Dnull; var tab1=3Dnull; var tab2=3Dnull; var tab3=3Dnull; = var tab4=3Dnull;var tab5=3Dnull;var tab6=3Dnull; - =09 - if(newwinheight) - { - frameWidth =3D document.body.clientWidth+6; - frameHeight =3D document.body.clientHeight; =09 - window.resizeTo(frameWidth, newwinheight); - } -=09 - - tab0 =3D document.getElementById('TabAA').style; - tab1 =3D document.getElementById('TabBB').style; - if(numtabs>2)tab2 =3D document.getElementById('TabCC').style; - if(numtabs>3)tab3 =3D document.getElementById('TabDD').style; - if(numtabs>4)tab4 =3D document.getElementById('TabEE').style; - if(numtabs>5)tab5 =3D document.getElementById('TabFF').style; - if(numtabs>6)tab6 =3D document.getElementById('TabGG').style; -=09 - if (tabID =3D=3D 1)=20 - { - if(wantcookie) SetCookie ("ViewTab", "AA"); - tab0.visibility =3D "visible";=20 - tab1.visibility =3D "hidden";=20 - if(tab2){tab2.visibility =3D "hidden"; } - if(tab3){tab3.visibility =3D "hidden"; } - if(tab4){tab4.visibility =3D "hidden"; } - if(tab5){tab5.visibility =3D "hidden"; } - if(tab6){tab6.visibility =3D "hidden"; } - } - - if (tabID =3D=3D 2)=20 - { - if(wantcookie) SetCookie ("ViewTab", "BB"); - tab0.visibility =3D "hidden";=09 - tab1.visibility =3D "visible";=20 - if(tab2){tab2.visibility =3D "hidden"; } - if(tab3){tab3.visibility =3D "hidden"; } - if(tab4){tab4.visibility =3D "hidden"; } - if(tab5){tab5.visibility =3D "hidden"; } - if(tab6){tab6.visibility =3D "hidden"; } - } - - if (tabID =3D=3D 3)=20 - { - if(wantcookie) SetCookie ("ViewTab", "CC"); - tab0.visibility =3D "hidden"; - tab1.visibility =3D "hidden";=09 - if(tab2){tab2.visibility =3D "visible"; } - if(tab3){tab3.visibility =3D "hidden"; } - if(tab4){tab4.visibility =3D "hidden"; } - if(tab5){tab5.visibility =3D "hidden"; } - if(tab6){tab6.visibility =3D "hidden"; } - } - - if (tabID =3D=3D 4)=20 - { - if(wantcookie) SetCookie ("ViewTab", "DD"); - tab0.visibility =3D "hidden";=09 - tab1.visibility =3D "hidden"; - if(tab2){tab2.visibility =3D "hidden"; } - if(tab3){tab3.visibility =3D "visible"; } - if(tab4){tab4.visibility =3D "hidden"; } - if(tab5){tab5.visibility =3D "hidden"; } - if(tab6){tab6.visibility =3D "hidden"; } - } - =09 - if (tabID =3D=3D 5)=20 - { - if(wantcookie) SetCookie ("ViewTab", "EE"); - tab0.visibility =3D "hidden"; - tab1.visibility =3D "hidden"; - if(tab2){tab2.visibility =3D "hidden"; } - if(tab3){tab3.visibility =3D "hidden"; } - if(tab4){tab4.visibility =3D "visible"; } - if(tab5){tab5.visibility =3D "hidden"; } - if(tab6){tab6.visibility =3D "hidden"; } - } - =09 - if (tabID =3D=3D 6)=20 - { - if(wantcookie) SetCookie ("ViewTab", "FF"); - tab0.visibility =3D "hidden"; - tab1.visibility =3D "hidden"; - if(tab2){tab2.visibility =3D "hidden"; } - if(tab3){tab3.visibility =3D "hidden"; } - if(tab4){tab4.visibility =3D "hidden"; } - if(tab5){tab5.visibility =3D "visible"; } - if(tab6){tab6.visibility =3D "hidden"; } - } - - if (tabID =3D=3D 7)=20 - { - if(wantcookie) SetCookie ("ViewTab", "GG"); - tab0.visibility =3D "hidden"; - tab1.visibility =3D "hidden"; - if(tab2){tab2.visibility =3D "hidden"; } - if(tab3){tab3.visibility =3D "hidden"; } - if(tab4){tab4.visibility =3D "hidden"; } - if(tab5){tab5.visibility =3D "hidden"; } - if(tab6){tab6.visibility =3D "visible"; } - } - =09 - =09 - return; - } -=09 - function HideLayerMini(accion){ -=09 - if(!document.getElementById('TabAA')) - return - if(!document.getElementById('TabBB')) - return - =20 - var XTabAA =3D document.getElementById('TabAA').style; - var XTabBB =3D document.getElementById('TabBB').style; - var XTabCC =3D document.getElementById('TabCC').style; - - if(!XTabAA && !XTabBB && !XTabCC) - return - =20 - if (accion=3D=3D1){ - XTabAA.visibility =3D "hidden" - XTabBB.visibility =3D "hidden" - XTabCC.visibility =3D "hidden" - }else{ - XTabAA.visibility =3D "visible" - //XTabBB.visibility =3D "visible" - //XTabCC.visibility =3D "visible" - }=09 - } \ No newline at end of file +/* +// The Humano2 Business solution. +// Copyright (C) 1999,3 Convea Ltd. +// 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$ +*/ +=09 + /* Interchange Tabs on the same page */ + var tmpAttName =3D ""; + function TabChange(tabID, wantcookie, numtabs, newwinheight)=20 + {=09 + var tab0=3Dnull; var tab1=3Dnull; var tab2=3Dnull; var tab3=3Dnull; = var tab4=3Dnull;var tab5=3Dnull;var tab6=3Dnull; + if (document.Form1.attName.value !=3D "") + { + tmpAttName =3D document.Form1.attName.value; + } + =20 + if(newwinheight) + { + frameWidth =3D document.body.clientWidth+6; + frameHeight =3D document.body.clientHeight; =09 + window.resizeTo(frameWidth, newwinheight); + } +=09 + + tab0 =3D document.getElementById('TabA').style; + tab1 =3D document.getElementById('TabB').style; + if(numtabs>2)tab2 =3D document.getElementById('TabC').style; + if(numtabs>3)tab3 =3D document.getElementById('TabD').style; + if(numtabs>4)tab4 =3D document.getElementById('TabE').style; + if(numtabs>5)tab5 =3D document.getElementById('TabF').style; + if(numtabs>6)tab6 =3D document.getElementById('TabG').style; + if (tabID =3D=3D 1)=20 + { + if (tmpAttName !=3D ""){document.Form1.attName.value =3D tmp= AttName; } + if(wantcookie) SetCookie ("ViewTab", "A"); + tab0.visibility =3D "visible";=20 + tab1.visibility =3D "hidden";=20 + if(tab2){tab2.visibility =3D "hidden"; } + if(tab3){tab3.visibility =3D "hidden"; } + if(tab4){tab4.visibility =3D "hidden"; } + if(tab5){tab5.visibility =3D "hidden"; } + if(tab6){tab6.visibility =3D "hidden"; } + } + + if (tabID =3D=3D 2)=20 + { + if(wantcookie) SetCookie ("ViewTab", "B"); + tab0.visibility =3D "hidden";=09 + tab1.visibility =3D "visible";=20 + if(tab2){tab2.visibility =3D "hidden"; } + if(tab3){tab3.visibility =3D "hidden"; } + if(tab4){tab4.visibility =3D "hidden"; } + if(tab5){tab5.visibility =3D "hidden"; } + if(tab6){tab6.visibility =3D "hidden"; } + } + + if (tabID =3D=3D 3)=20 + { + if(wantcookie) SetCookie ("ViewTab", "C"); + tab0.visibility =3D "hidden"; + tab1.visibility =3D "hidden";=09 + if(tab2){tab2.visibility =3D "visible"; } + if(tab3){tab3.visibility =3D "hidden"; } + if(tab4){tab4.visibility =3D "hidden"; } + if(tab5){tab5.visibility =3D "hidden"; } + if(tab6){tab6.visibility =3D "hidden"; } + } + + if (tabID =3D=3D 4)=20 + { + if(wantcookie) SetCookie ("ViewTab", "D"); + tab0.visibility =3D "hidden";=09 + tab1.visibility =3D "hidden"; + if(tab2){tab2.visibility =3D "hidden"; } + if(tab3){tab3.visibility =3D "visible"; } + if(tab4){tab4.visibility =3D "hidden"; } + if(tab5){tab5.visibility =3D "hidden"; } + if(tab6){tab6.visibility =3D "hidden"; } + } + =09 + if (tabID =3D=3D 5)=20 + { + if(wantcookie) SetCookie ("ViewTab", "E"); + tab0.visibility =3D "hidden"; + tab1.visibility =3D "hidden"; + if(tab2){tab2.visibility =3D "hidden"; } + if(tab3){tab3.visibility =3D "hidden"; } + if(tab4){tab4.visibility =3D "visible"; } + if(tab5){tab5.visibility =3D "hidden"; } + if(tab6){tab6.visibility =3D "hidden"; } + } + =09 + if (tabID =3D=3D 6)=20 + { + if(wantcookie) SetCookie ("ViewTab", "F"); + tab0.visibility =3D "hidden"; + tab1.visibility =3D "hidden"; + if(tab2){tab2.visibility =3D "hidden"; } + if(tab3){tab3.visibility =3D "hidden"; } + if(tab4){tab4.visibility =3D "hidden"; } + if(tab5){tab5.visibility =3D "visible"; } + if(tab6){tab6.visibility =3D "hidden"; } + } + + if (tabID =3D=3D 7)=20 + { + if(wantcookie) SetCookie ("ViewTab", "G"); + tab0.visibility =3D "hidden"; + tab1.visibility =3D "hidden"; + if(tab2){tab2.visibility =3D "hidden"; } + if(tab3){tab3.visibility =3D "hidden"; } + if(tab4){tab4.visibility =3D "hidden"; } + if(tab5){tab5.visibility =3D "hidden"; } + if(tab6){tab6.visibility =3D "visible"; } + } + =09 + =09 + return; + } +=09 + /* Switch between tabs that are on a secondary level. */ + function TabChange2(tabID, wantcookie, numtabs, newwinheight)=20 + {=09 + var tab0=3Dnull; var tab1=3Dnull; var tab2=3Dnull; var tab3=3Dnull; = var tab4=3Dnull;var tab5=3Dnull;var tab6=3Dnull; + =09 + if(newwinheight) + { + frameWidth =3D document.body.clientWidth+6; + frameHeight =3D document.body.clientHeight; =09 + window.resizeTo(frameWidth, newwinheight); + } +=09 + + tab0 =3D document.getElementById('TabAA').style; + tab1 =3D document.getElementById('TabBB').style; + if(numtabs>2)tab2 =3D document.getElementById('TabCC').style; + if(numtabs>3)tab3 =3D document.getElementById('TabDD').style; + if(numtabs>4)tab4 =3D document.getElementById('TabEE').style; + if(numtabs>5)tab5 =3D document.getElementById('TabFF').style; + if(numtabs>6)tab6 =3D document.getElementById('TabGG').style; +=09 + if (tabID =3D=3D 1)=20 + { + if(wantcookie) SetCookie ("ViewTab", "AA"); + tab0.visibility =3D "visible";=20 + tab1.visibility =3D "hidden";=20 + if(tab2){tab2.visibility =3D "hidden"; } + if(tab3){tab3.visibility =3D "hidden"; } + if(tab4){tab4.visibility =3D "hidden"; } + if(tab5){tab5.visibility =3D "hidden"; } + if(tab6){tab6.visibility =3D "hidden"; } + } + + if (tabID =3D=3D 2)=20 + { + if(wantcookie) SetCookie ("ViewTab", "BB"); + tab0.visibility =3D "hidden";=09 + tab1.visibility =3D "visible";=20 + if(tab2){tab2.visibility =3D "hidden"; } + if(tab3){tab3.visibility =3D "hidden"; } + if(tab4){tab4.visibility =3D "hidden"; } + if(tab5){tab5.visibility =3D "hidden"; } + if(tab6){tab6.visibility =3D "hidden"; } + } + + if (tabID =3D=3D 3)=20 + { + if(wantcookie) SetCookie ("ViewTab", "CC"); + tab0.visibility =3D "hidden"; + tab1.visibility =3D "hidden";=09 + if(tab2){tab2.visibility =3D "visible"; } + if(tab3){tab3.visibility =3D "hidden"; } + if(tab4){tab4.visibility =3D "hidden"; } + if(tab5){tab5.visibility =3D "hidden"; } + if(tab6){tab6.visibility =3D "hidden"; } + } + + if (tabID =3D=3D 4)=20 + { + if(wantcookie) SetCookie ("ViewTab", "DD"); + tab0.visibility =3D "hidden";=09 + tab1.visibility =3D "hidden"; + if(tab2){tab2.visibility =3D "hidden"; } + if(tab3){tab3.visibility =3D "visible"; } + if(tab4){tab4.visibility =3D "hidden"; } + if(tab5){tab5.visibility =3D "hidden"; } + if(tab6){tab6.visibility =3D "hidden"; } + } + =09 + if (tabID =3D=3D 5)=20 + { + if(wantcookie) SetCookie ("ViewTab", "EE"); + tab0.visibility =3D "hidden"; + tab1.visibility =3D "hidden"; + if(tab2){tab2.visibility =3D "hidden"; } + if(tab3){tab3.visibility =3D "hidden"; } + if(tab4){tab4.visibility =3D "visible"; } + if(tab5){tab5.visibility =3D "hidden"; } + if(tab6){tab6.visibility =3D "hidden"; } + } + =09 + if (tabID =3D=3D 6)=20 + { + if(wantcookie) SetCookie ("ViewTab", "FF"); + tab0.visibility =3D "hidden"; + tab1.visibility =3D "hidden"; + if(tab2){tab2.visibility =3D "hidden"; } + if(tab3){tab3.visibility =3D "hidden"; } + if(tab4){tab4.visibility =3D "hidden"; } + if(tab5){tab5.visibility =3D "visible"; } + if(tab6){tab6.visibility =3D "hidden"; } + } + + if (tabID =3D=3D 7)=20 + { + if(wantcookie) SetCookie ("ViewTab", "GG"); + tab0.visibility =3D "hidden"; + tab1.visibility =3D "hidden"; + if(tab2){tab2.visibility =3D "hidden"; } + if(tab3){tab3.visibility =3D "hidden"; } + if(tab4){tab4.visibility =3D "hidden"; } + if(tab5){tab5.visibility =3D "hidden"; } + if(tab6){tab6.visibility =3D "visible"; } + } + =09 + =09 + return; + } +=09 + function HideLayerMini(accion){ +=09 + if(!document.getElementById('TabAA')) + return + if(!document.getElementById('TabBB')) + return + =20 + var XTabAA =3D document.getElementById('TabAA').style; + var XTabBB =3D document.getElementById('TabBB').style; + var XTabCC =3D document.getElementById('TabCC').style; + + if(!XTabAA && !XTabBB && !XTabCC) + return + =20 + if (accion=3D=3D1){ + XTabAA.visibility =3D "hidden" + XTabBB.visibility =3D "hidden" + XTabCC.visibility =3D "hidden" + }else{ + XTabAA.visibility =3D "visible" + //XTabBB.visibility =3D "visible" + //XTabCC.visibility =3D "visible" + }=09 + } |
|
From: <sv...@de...> - 2005-06-21 00:37:16
|
Author: marcelo
Date: 2005-06-20 20:37:17 -0400 (Mon, 20 Jun 2005)
New Revision: 1373
Modified:
humano2/trunk/web/builder/site/xsl/createview.xsl
Log:
* View deletion still caused random javascript errors
Modified: humano2/trunk/web/builder/site/xsl/createview.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/createview.xsl 2005-06-20 23:47:38=
UTC (rev 1372)
+++ humano2/trunk/web/builder/site/xsl/createview.xsl 2005-06-21 00:37:17=
UTC (rev 1373)
@@ -420,7 +420,7 @@
<xsl:if test=
=3D"/view/viewDatas/displayDeleteButton=3D'true'" >
<input t=
ype=3D"submit" value=3D"Delete">
<xsl=
:attribute name=3D"onclick">
- =
Form.Delete();
+ =
FormDelete();
</xs=
l:attribute>
</input>
</xsl:if>
|
|
From: <sv...@de...> - 2005-06-20 23:47:39
|
Author: marcelo
Date: 2005-06-20 19:47:38 -0400 (Mon, 20 Jun 2005)
New Revision: 1372
Modified:
humano2/trunk/web/builder/site/viewmain.aspx.cs
Log:
FIXED: when creating a view 0, has to be the first column. So I created a=
check to make sure it came, added it if it did not.
Modified: humano2/trunk/web/builder/site/viewmain.aspx.cs
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- humano2/trunk/web/builder/site/viewmain.aspx.cs 2005-06-20 23:02:46 U=
TC (rev 1371)
+++ humano2/trunk/web/builder/site/viewmain.aspx.cs 2005-06-20 23:47:38 U=
TC (rev 1372)
@@ -376,7 +376,11 @@
Logger.Log("No columns for view",LogLevel.Trace);
return null; =20
}
- =20
+ if (!receivedColumnsStr.StartsWith("0,"))
+ {
+ receivedColumnsStr =3D "0," + receivedColumnsStr;
+ }
+
DataTable dt =3D createViewDataTable();
DataRow dr =3D dt.NewRow();
dr["idClassView"] =3D receivedClassId;
|
