Menu
▾
▴
[H2-commits] r1102 - in humano2/trunk/web/builder/site: . js xsl
|
From: <sv...@de...> - 2005-05-19 19:43:35
|
Author: svera
Date: 2005-05-19 15:43:24 -0400 (Thu, 19 May 2005)
New Revision: 1102
Modified:
humano2/trunk/web/builder/site/foldermanagement.aspx
humano2/trunk/web/builder/site/foldermanagement.aspx.cs
humano2/trunk/web/builder/site/js/fn_formsmng.js
humano2/trunk/web/builder/site/xsl/functionindex.xsl
Log:
* Fix some problem with folders
Modified: humano2/trunk/web/builder/site/foldermanagement.aspx
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- humano2/trunk/web/builder/site/foldermanagement.aspx 2005-05-19 18:55=
:38 UTC (rev 1101)
+++ humano2/trunk/web/builder/site/foldermanagement.aspx 2005-05-19 19:43=
:24 UTC (rev 1102)
@@ -20,6 +20,7 @@
<input type=3D"hidden" name=3D"folderid" id=3D"folderid" value=3D"<% =
html_getFolderId(); %>">
<input type=3D"hidden" name=3D"LstAttrib" id=3D"LstAttrib">
<input type=3D"hidden" name=3D"classId" id=3D"classId" value=3D"1400"=
>
+ <input type=3D"hidden" name=3D"first" id=3D"first" value=3D"<% html_g=
etFirst(); %>">
<table width=3D"600" border=3D"0">
<tr>
<td width=3D"131">
@@ -34,7 +35,7 @@
<div align=3D"right">* Folder Father :</div>
</td>
<td width=3D"459">
- <select name=3D"select" size=3D"1" name=3D"folderpar=
ent" id=3D"folderparent" onChange=3D"fn_setFolderParentId(this.options[th=
is.selectedIndex].value);">
+ <select name=3D"select" size=3D"1" id=3D"folderparen=
t" onChange=3D"fn_setFolderParentId(this.options[this.selectedIndex].valu=
e);">
<% html_getFolderParent();%>
</select>
<input type=3D"hidden" id=3D"folderparentid" name=3D=
"folderparentid" value=3D"<% html_getFolderParentId(); %>">
@@ -153,4 +154,4 @@
</table>
</form>
</body>
-</HTML>
+</HTML>
\ No newline at end of file
Modified: humano2/trunk/web/builder/site/foldermanagement.aspx.cs
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- humano2/trunk/web/builder/site/foldermanagement.aspx.cs 2005-05-19 18=
:55:38 UTC (rev 1101)
+++ humano2/trunk/web/builder/site/foldermanagement.aspx.cs 2005-05-19 19=
:43:24 UTC (rev 1102)
@@ -15,6 +15,19 @@
=20
namespace Builder.site
{
+ public struct strct_folderNode
+ {
+ public int idNode;
+ public int idParent;
+ public bool isListable;
+
+ public strct_folderNode(int val1,int val2,bool lst)
+ {
+ this.idNode =3D val1;
+ this.idParent =3D val2;
+ this.isListable =3D lst;
+ }
+ };
/// <summary>
/// Summary description for FormManagement.
/// </summary>
@@ -27,10 +40,12 @@
string folderForms =3D "";
string formType =3D "";
string folderParentId =3D "";
+ string htmlMsgError =3D "";
int ClassId =3D 0;
int folderId =3D 0;
int action =3D 0;
int countElement =3D 1;
+ int first =3D 0;
=20
bool newForm =3D true;
=09
@@ -54,16 +69,22 @@
break;
case CNS_CREATE:
createDbFolder();
+ action =3D CNS_UPDATE;
+ buildListAttribFromFolder(ClassId,folderId,domainId);
break;
case CNS_UPDATE:
if(folderForms !=3D null)
{
- createDbFolder();=09
+ if (checkDataForUpdate(domainId) =3D=3D true)
+ {
+ createDbFolder();=09
+ }
}
buildListAttribFromFolder(ClassId,folderId,domainId);
break;
case CNS_DELETE:
deleteDbFolder(folderId);
+ clearFormData();
break;
default:
break;
@@ -94,6 +115,8 @@
#region my method
private void getRequestParam()
{
+ int modFolderId =3D 0;
+
ClassId =3D Convert.ToInt32( Request["classId"]);
if (Convert.ToInt32( Request["newform"]) > 0)
newForm =3D false;
@@ -106,8 +129,25 @@
folderForms =3D Convert.ToString( Request["LstAttrib"]);
folderId =3D Convert.ToInt32( Request["folderid"]);
folderParentId =3D Convert.ToString( Request["folderparentid"]);
+ modFolderId =3D Convert.ToInt32(Request["modfolderid"]);
+ first =3D Convert.ToInt32(Request["first"]);
+ if (modFolderId > 0 && first =3D=3D 0)
+ {
+ first =3D 1;
+ folderId =3D modFolderId;
+ }
+ if(folderId > 0 && action =3D=3D 0)
+ {
+ action =3D CNS_UPDATE;
+ }
}
-
+ private void clearFormData()
+ {
+ action =3D CNS_NOTHING;
+ folderForms =3D "";
+ folderName =3D "";
+ folderId =3D 0;
+ }
private void createDbFolder()
{
DataTable dt =3D genDataTbl();
@@ -116,7 +156,7 @@
{=20
if(action =3D=3D CNS_CREATE )
{
- userCred.CoreAdapter.CreateForm (1400,dt, userCred);
+ folderId =3D userCred.CoreAdapter.CreateForm (1400,dt, userCred);
}
if (action =3D=3D CNS_UPDATE )
{
@@ -132,10 +172,7 @@
=20
private void UpdateDbFolder(int folderId, DataTable dt,SessionCredenci=
al userCred)
{
- if(action =3D=3D CNS_UPDATE )
- {
- userCred.CoreAdapter.UpdateInstance (folderId,dt, userCred);
- }
+ userCred.CoreAdapter.UpdateInstance (folderId,dt, userCred);
}
=20
private DataTable genDataTbl()
@@ -339,6 +376,35 @@
}
dtResult =3D null;
}
+ private bool checkDataForUpdate(int domainId)
+ {
+ bool retVal =3D false;
+ retVal =3D true;
+ return retVal;
+ }
+
+ private ArrayList getListFolderChilds(int domainId)
+ {
+ int row =3D 0;
+ int pos =3D 0;
+ ArrayList myList =3D new ArrayList();
+ strct_folderNode folderNodes =3D new strct_folderNode(0,0,true);
+
+ string filtro =3D String.Format("1402|2|'0'|1|0;34|4|'{0}'|0|0",domai=
nId);
+ DataTable dtResult =3D userCred.CoreAdapter.GenerateViewTools(1400,"0=
, 1402",filtro,"","","",0);
+ if(dtResult.Rows.Count =3D=3D 0)
+ {
+ return null;
+ }
+ foreach (DataRow dr in dtResult.Rows )
+ {
+ folderNodes.idNode =3D Convert.ToInt32(dr["id_entity"]);
+ folderNodes.idParent =3D Convert.ToInt32(dr["folderParent"]);
+ myList.Add(folderNodes);
+ }
+ return myList;
+ }
+
#endregion
#region html method
public void html_getAttrList(int val)
@@ -387,8 +453,13 @@
}
public void html_getFolderId()
{
- Response.Write(folderId);
+ Response.Write(folderId);
}
+ public void html_getFirst()
+ {
+ Response.Write(first);
+ }
+
public void html_getButtonDelete()
{
string strHtml =3D "<input type=3D\"button\" id=3D\"btnDelete\" ";
@@ -404,13 +475,17 @@
{
int domainId =3D userCred.DomainIds[userCred.CurrentDomainIndex];
string strHtml =3D "";
+ ArrayList arrFolder =3D null;
=09
- if(action =3D=3D CNS_CREATE)
+ if(action =3D=3D CNS_CREATE && action =3D=3D CNS_NOTHING)
{
strHtml =3D String.Format("<option value=3D\"0\" selected>---No Fold=
er---</option>");
- }else{
+ }
+ else
+ {
strHtml =3D String.Format("<option value=3D\"0\">---No Folder---</op=
tion>");
}
+
DataTable dtResult =3D getListFolder(domainId);
if (dtResult =3D=3D null)
{
@@ -418,29 +493,63 @@
return;
}
=20
+ arrFolder =3D getListFolderChilds(domainId);
foreach(DataRow row in dtResult.Rows)
{
- if(folderParentId !=3D null && folderParentId.Length > 0)
+ strHtml +=3D getNextOptionFolder(row,arrFolder,folderId);
+ }
+ Response.Write(strHtml);
+ }
+
+ private string getNextOptionFolder(DataRow row, ArrayList arrFolder, i=
nt folderId)
+ {
+ string strHtml =3D "";
+ int flag =3D 0;
+ =09
+ int id_entity =3D Convert.ToInt32(row["id_entity"]);
+ =09
+ if(folderId =3D=3D id_entity)
+ {
+ return strHtml;
+ }
+ if (arrFolder !=3D null)
+ {
+ for(int pos =3D 0;pos < arrFolder.Count;pos++)
{
- if(Convert.ToInt32(folderParentId) =3D=3D Convert.ToInt32(row["id_e=
ntity"]))
+ if (((strct_folderNode)arrFolder[pos]).idParent =3D=3D folderId)
{
- strHtml +=3D String.Format("<option value=3D\"{0}\" selected>{1}</=
option>",row["id_entity"],row[1]);
+ //((strct_folderNode)arrFolder[pos]).isListable. =3D false;
+ flag =3D 1;
}
- else
+ }
+ }
+ if(folderParentId !=3D null && folderParentId.Length > 0)
+ {
+ if(Convert.ToInt32(folderParentId) =3D=3D id_entity)
+ {
+ if(flag =3D=3D 0)
{
- strHtml +=3D String.Format("<option value=3D\"{0}\">{1}</option>",=
row["id_entity"],row[1]);
+ strHtml =3D String.Format("<option value=3D\"{0}\" selected>{1}</o=
ption>",row["id_entity"],row[1]);
+ return strHtml;
}
- }else{
- strHtml +=3D String.Format("<option value=3D\"{0}\">{1}</option>",r=
ow["id_entity"],row[1]);
}
}
- Response.Write(strHtml);
+ if(flag =3D=3D 0)
+ {
+ strHtml +=3D String.Format("<option value=3D\"{0}\">{1}</option>",ro=
w["id_entity"],row[1]);
+ }
+ return strHtml;
+ }
=20
- }
public void html_getFolderParentId()
{
Response.Write("0");
}
+ public void html_sendMessage()
+ {
+ Response.Write(htmlMsgError);
+ }
+
#endregion=20
}
}
\ No newline at end of file
Modified: humano2/trunk/web/builder/site/js/fn_formsmng.js
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- humano2/trunk/web/builder/site/js/fn_formsmng.js 2005-05-19 18:55:38 =
UTC (rev 1101)
+++ humano2/trunk/web/builder/site/js/fn_formsmng.js 2005-05-19 19:43:24 =
UTC (rev 1102)
@@ -64,15 +64,21 @@
//******************************************************************=
********************=20
function fn_deleteData()
{
- var frm =3D document.formulario;
- var strError =3D "";
+ //var frm =3D document.formulario;
+ //var strError =3D "";
=20
//alert("Antes :: " + document.formulario.opAction.value);
- document.formulario.opAction.setAttribute("value",3);
+ document.formulario.opaction.setAttribute("value",3);// =3D 3; /=
/value",3);
=20
- //alert("Despues :: " + document.formulario.opAction.value);
+ //alert("Despues :: " + document.formulario.opaction.value);
+ //document.formulario.submit();
+ =20
+ //var folderId =3D document.formulario.folderid.value;
+ //var url[] =3D String(document.location).split("?");
+ =20
+ //alert(document.formulario.opaction.value);
+ //document.location =3D "foldermanagement.aspx?opaction=3D3&fold=
erId=3D" + folderId;=20
document.formulario.submit();
- =20
}
=20
//******************************************************************=
********************=20
Modified: humano2/trunk/web/builder/site/xsl/functionindex.xsl
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- humano2/trunk/web/builder/site/xsl/functionindex.xsl 2005-05-19 18:55=
:38 UTC (rev 1101)
+++ humano2/trunk/web/builder/site/xsl/functionindex.xsl 2005-05-19 19:43=
:24 UTC (rev 1102)
@@ -59,7 +59,7 @@
tree.add(folderBranch);
<xsl:for-each select=3D"/vffr/folders/folder">
var titleLink =3D '<xsl:value-of select=3D"name"=
/>';
- var contentLink =3D 'foldermanagement.aspx?folde=
rId=3D<xsl:value-of select=3D"id" />&opaction=3D2';
+ var contentLink =3D 'foldermanagement.aspx?modfo=
lderId=3D<xsl:value-of select=3D"id" />';
folderBranch.add(new WebFXTreeItem(titleLink,con=
tentLink,'','img/webfxtree/view.jpeg'));
</xsl:for-each>
=20
|
