+
diff --git a/ETS-WS/ETS-WS/GestioneDocumenti.aspx.cs b/ETS-WS/ETS-WS/GestioneDocumenti.aspx.cs
index e9964e3..0be44d2 100644
--- a/ETS-WS/ETS-WS/GestioneDocumenti.aspx.cs
+++ b/ETS-WS/ETS-WS/GestioneDocumenti.aspx.cs
@@ -14,6 +14,16 @@ namespace ETS_WS
if (!Page.IsPostBack)
{
}
+ mod_filtroRicerca1.eh_reqSearch += new EventHandler(mod_filtroRicerca1_eh_reqSearch);
+ }
+ ///
+ /// chiesta update x aggiornamento criteri ricerca
+ ///
+ ///
+ ///
+ void mod_filtroRicerca1_eh_reqSearch(object sender, EventArgs e)
+ {
+ mod_archivioDocumenti1.doUpdate();
}
}
}
\ No newline at end of file
diff --git a/ETS-WS/ETS-WS/GestioneDocumenti.aspx.designer.cs b/ETS-WS/ETS-WS/GestioneDocumenti.aspx.designer.cs
index dc755f5..96771d0 100644
--- a/ETS-WS/ETS-WS/GestioneDocumenti.aspx.designer.cs
+++ b/ETS-WS/ETS-WS/GestioneDocumenti.aspx.designer.cs
@@ -13,21 +13,21 @@ namespace ETS_WS {
public partial class GestioneDocumenti {
///
- /// mod_gestioneDati1 control.
+ /// mod_filtroRicerca1 control.
///
///
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
///
- protected global::ETS_WS.WebUserControls.mod_gestioneDati mod_gestioneDati1;
+ protected global::ETS_WS.WebUserControls.mod_filtroRicerca mod_filtroRicerca1;
///
- /// mod_gestioneDocumenti1 control.
+ /// mod_archivioDocumenti1 control.
///
///
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
///
- protected global::ETS_WS.WebUserControls.mod_gestioneDocumenti mod_gestioneDocumenti1;
+ protected global::ETS_WS.WebUserControls.mod_archivioDocumenti mod_archivioDocumenti1;
}
}
diff --git a/ETS-WS/ETS-WS/WebUserControls/mod_archivioDocumenti.ascx b/ETS-WS/ETS-WS/WebUserControls/mod_archivioDocumenti.ascx
index db937a6..1eef02c 100644
--- a/ETS-WS/ETS-WS/WebUserControls/mod_archivioDocumenti.ascx
+++ b/ETS-WS/ETS-WS/WebUserControls/mod_archivioDocumenti.ascx
@@ -21,6 +21,7 @@
<%----%>
+
@@ -28,25 +29,22 @@
-
+
+ Target="_blank" NavigateUrl='<%# filePath(Eval("fullPath"), true) %>' />
- <%----%>
-
-
-
+ <%----%>
-
+
+
+ <%----%>
-
-
@@ -65,5 +63,24 @@
--%>
-
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/ETS-WS/ETS-WS/WebUserControls/mod_archivioDocumenti.ascx.cs b/ETS-WS/ETS-WS/WebUserControls/mod_archivioDocumenti.ascx.cs
index 955ea9a..16be877 100644
--- a/ETS-WS/ETS-WS/WebUserControls/mod_archivioDocumenti.ascx.cs
+++ b/ETS-WS/ETS-WS/WebUserControls/mod_archivioDocumenti.ascx.cs
@@ -86,12 +86,39 @@ namespace ETS_WS.WebUserControls
///
/// accoda 2 oggetti in un unica stringa
///
- ///
+ ///
Formato della stringa richiesta (formato x string.format)
+ ///
valori comma delimited
///
///
- public string accoda(object obj1, object obj2)
+ public string accoda(object stringFormat,object[] args)
{
- return string.Format("{0}{1}", obj1, obj2);
+ return string.Format(stringFormat.ToString(), args);
+ }
+ ///
+ /// restituisce stringa del path da filesystem completo
+ ///
+ ///
+ ///
se true in modalità http (path da webserver) se false path completo da filesystem
+ ///
+ public string filePath(object fullPath, object httpMode)
+ {
+ string answ = "";
+ if (Convert.ToBoolean(httpMode))
+ {
+ answ = string.Format("{0}", fullPath.ToString());
+ }
+ else
+ {
+ answ = string.Format("{0}", Server.MapPath(fullPath.ToString()));
+ }
+ return answ;
+ }
+ ///
+ /// aggiornamento controllo
+ ///
+ public void doUpdate()
+ {
+ grView.DataBind();
}
}
}
\ No newline at end of file
diff --git a/ETS-WS/ETS-WS/WebUserControls/mod_filtroRicerca.ascx b/ETS-WS/ETS-WS/WebUserControls/mod_filtroRicerca.ascx
new file mode 100644
index 0000000..aa2a508
--- /dev/null
+++ b/ETS-WS/ETS-WS/WebUserControls/mod_filtroRicerca.ascx
@@ -0,0 +1,56 @@
+<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="mod_filtroRicerca.ascx.cs"
+ Inherits="ETS_WS.WebUserControls.mod_filtroRicerca" %>
+<%@ Register Assembly="AjaxControlToolkit" Namespace="AjaxControlToolkit" TagPrefix="asp" %>
+<%@ Register Src="mod_textAutocomplete.ascx" TagName="mod_textAutocomplete" TagPrefix="uc1" %>
+<% if (false)
+ { %>
+
+
+
+
+
+<% } %>
+
+
+ gestione filtraggi: (a scomparsa?)
+ ricerca libera
+ filtro x commessa|fase|fonte|oggetto?!?
+
+ <%--input dati--%>
+
+ <%--
+
+
+
+
--%>
+
+
+
+
diff --git a/ETS-WS/ETS-WS/WebUserControls/mod_filtroRicerca.ascx.cs b/ETS-WS/ETS-WS/WebUserControls/mod_filtroRicerca.ascx.cs
new file mode 100644
index 0000000..4d8607d
--- /dev/null
+++ b/ETS-WS/ETS-WS/WebUserControls/mod_filtroRicerca.ascx.cs
@@ -0,0 +1,116 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Web;
+using System.Web.UI;
+using System.Web.UI.WebControls;
+using ETS_Data;
+
+namespace ETS_WS.WebUserControls
+{
+ public partial class mod_filtroRicerca : System.Web.UI.UserControl
+ {
+ ///
+ /// evento richiesta salvataggio files
+ ///
+ public event EventHandler eh_reqSearch;
+ ///
+ /// caricamento pagina
+ ///
+ ///
+ ///
+ protected void Page_Load(object sender, EventArgs e)
+ {
+ if (!Page.IsPostBack)
+ {
+ updateVisual();
+ }
+ //tacCommesse.eh_valSelezionato += new EventHandler(tacCommesse_eh_valSelezionato);
+ }
+ ///
+ /// imposto valori secondari
+ ///
+ ///
+ ///
+ void tacCommesse_eh_valSelezionato(object sender, EventArgs e)
+ {
+ updateVisual();
+ }
+ ///
+ /// aggiorna tutti i valori visualizzati
+ ///
+ private void updateVisual()
+ {
+ //// verifico attivazione button submin (ovvero ci sono tutti i valori...)
+ //btnSubmit.Visible = (tacCommesse.valore != "" && tacFasi.valore != "" && tacFonti.label != "" && txtOggetto.Text != "");
+ }
+#if false
+ ///
+ /// fornisce la stringa del path generato dalle selezioni
+ ///
+ protected string pathSel
+ {
+ get
+ {
+ // pulizia char non ammessi...
+ string commessa = utils.cleanPathName(tacCommesse.valore);
+ string fase = utils.cleanPathName(tacFasi.valore);
+ string fonte = utils.cleanPathName(tacFonti.label);
+ string oggetto = utils.cleanPathName(txtOggetto.Text);
+ return string.Format("/{0}/{1}/{2}/{3}/", commessa, fase, fonte, oggetto);
+ }
+ }
+#endif
+
+ ///
+ ///
+ ///
+ ///
+ ///
+ protected void txtOggetto_TextChanged(object sender, EventArgs e)
+ {
+ updateVisual();
+ }
+ ///
+ /// richiesta update
+ ///
+ ///
+ ///
+ protected void btnUpdate_Click(object sender, EventArgs e)
+ {
+ //saveMetaData();
+ // aggiorno
+ updateVisual();
+ }
+#if false
+ ///
+ /// salva in sesione i metadati
+ ///
+ private void saveMetaData()
+ {
+ // salvo i valori dei parametri metadati..
+ string commessa = utils.cleanPathName(tacCommesse.valore);
+ string fase = utils.cleanPathName(tacFasi.valore);
+ string fonte = utils.cleanPathName(tacFonti.label);
+ string oggetto = utils.cleanPathName(txtOggetto.Text);
+ // salvo in sessione i valori selezionati, compreso path complessivo
+ utils.obj.setSessionVal("metaCommessa", commessa);
+ utils.obj.setSessionVal("metaFase", fase);
+ utils.obj.setSessionVal("metaFonte", fonte);
+ utils.obj.setSessionVal("metaOggetto", oggetto);
+ utils.obj.setSessionVal("pathFiles2Arch", pathSel);
+ }
+#endif
+
+ ///
+ /// salvo la ricerca libera...
+ ///
+ ///
+ ///
+ protected void txtSearchAll_TextChanged(object sender, EventArgs e)
+ {
+ // salvo valore selezionato
+ utils.obj.setSessionVal("srcSearchAll", txtSearchAll.Text.Trim());
+ }
+ }
+}
\ No newline at end of file
diff --git a/ETS-WS/ETS-WS/WebUserControls/mod_filtroRicerca.ascx.designer.cs b/ETS-WS/ETS-WS/WebUserControls/mod_filtroRicerca.ascx.designer.cs
new file mode 100644
index 0000000..67f4bc0
--- /dev/null
+++ b/ETS-WS/ETS-WS/WebUserControls/mod_filtroRicerca.ascx.designer.cs
@@ -0,0 +1,42 @@
+//------------------------------------------------------------------------------
+//
+// This code was generated by a tool.
+//
+// Changes to this file may cause incorrect behavior and will be lost if
+// the code is regenerated.
+//
+//------------------------------------------------------------------------------
+
+namespace ETS_WS.WebUserControls {
+
+
+ public partial class mod_filtroRicerca {
+
+ ///
+ /// lblCerca control.
+ ///
+ ///
+ /// Auto-generated field.
+ /// To modify move field declaration from designer file to code-behind file.
+ ///
+ protected global::System.Web.UI.WebControls.Label lblCerca;
+
+ ///
+ /// txtSearchAll control.
+ ///
+ ///
+ /// Auto-generated field.
+ /// To modify move field declaration from designer file to code-behind file.
+ ///
+ protected global::System.Web.UI.WebControls.TextBox txtSearchAll;
+
+ ///
+ /// btnUpdate control.
+ ///
+ ///
+ /// Auto-generated field.
+ /// To modify move field declaration from designer file to code-behind file.
+ ///
+ protected global::System.Web.UI.WebControls.Button btnUpdate;
+ }
+}
diff --git a/ETS-WS/ETS-WS/WebUserControls/mod_gestioneDocumenti.ascx b/ETS-WS/ETS-WS/WebUserControls/mod_gestioneDocumenti.ascx
deleted file mode 100644
index e6d707f..0000000
--- a/ETS-WS/ETS-WS/WebUserControls/mod_gestioneDocumenti.ascx
+++ /dev/null
@@ -1,14 +0,0 @@
-<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="mod_gestioneDocumenti.ascx.cs"
- Inherits="ETS_WS.WebUserControls.mod_gestioneDocumenti" %>
-<%@ Register Src="mod_archivioDocumenti.ascx" TagName="mod_archivioDocumenti" TagPrefix="uc2" %>
-<% if (false)
- { %>
-
-
-
-
-
-<% } %>
-<%@ Register Assembly="AjaxControlToolkit" Namespace="AjaxControlToolkit" TagPrefix="asp" %>
-<%@ Register Src="mod_myTempFile.ascx" TagName="mod_myTempFile" TagPrefix="uc1" %>
-
diff --git a/ETS-WS/ETS-WS/WebUserControls/mod_gestioneDocumenti.ascx.cs b/ETS-WS/ETS-WS/WebUserControls/mod_gestioneDocumenti.ascx.cs
deleted file mode 100644
index 0b251e7..0000000
--- a/ETS-WS/ETS-WS/WebUserControls/mod_gestioneDocumenti.ascx.cs
+++ /dev/null
@@ -1,17 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Web;
-using System.Web.UI;
-using System.Web.UI.WebControls;
-
-namespace ETS_WS.WebUserControls
-{
- public partial class mod_gestioneDocumenti : System.Web.UI.UserControl
- {
- protected void Page_Load(object sender, EventArgs e)
- {
-
- }
- }
-}
\ No newline at end of file
diff --git a/ETS-WS/ETS-WS/WebUserControls/mod_gestioneDocumenti.ascx.designer.cs b/ETS-WS/ETS-WS/WebUserControls/mod_gestioneDocumenti.ascx.designer.cs
deleted file mode 100644
index 372865a..0000000
--- a/ETS-WS/ETS-WS/WebUserControls/mod_gestioneDocumenti.ascx.designer.cs
+++ /dev/null
@@ -1,24 +0,0 @@
-//------------------------------------------------------------------------------
-//
-// This code was generated by a tool.
-//
-// Changes to this file may cause incorrect behavior and will be lost if
-// the code is regenerated.
-//
-//------------------------------------------------------------------------------
-
-namespace ETS_WS.WebUserControls {
-
-
- public partial class mod_gestioneDocumenti {
-
- ///
- /// mod_archivioDocumenti1 control.
- ///
- ///
- /// Auto-generated field.
- /// To modify move field declaration from designer file to code-behind file.
- ///
- protected global::ETS_WS.WebUserControls.mod_archivioDocumenti mod_archivioDocumenti1;
- }
-}
diff --git a/ETS-WS/ETS-WS/WebUserControls/mod_inputDati.ascx b/ETS-WS/ETS-WS/WebUserControls/mod_inputDati.ascx
index 972a264..e7ee80c 100644
--- a/ETS-WS/ETS-WS/WebUserControls/mod_inputDati.ascx
+++ b/ETS-WS/ETS-WS/WebUserControls/mod_inputDati.ascx
@@ -39,7 +39,7 @@
ServiceMethod="elencoFasi" minCharAutocomplete="1" showKey="false" toolTip="Digitare per iniziare ricerca, min 1 char" />