diff --git a/ETS-WS/ETS-WS.suo b/ETS-WS/ETS-WS.suo index e41275d..c2dc58c 100644 Binary files a/ETS-WS/ETS-WS.suo and b/ETS-WS/ETS-WS.suo differ diff --git a/ETS-WS/ETS-WS/GestioneDocumenti.aspx b/ETS-WS/ETS-WS/GestioneDocumenti.aspx index c834db9..e2ea342 100644 --- a/ETS-WS/ETS-WS/GestioneDocumenti.aspx +++ b/ETS-WS/ETS-WS/GestioneDocumenti.aspx @@ -7,10 +7,8 @@ <%@ Register Src="WebUserControls/mod_archivioDocumenti.ascx" TagName="mod_archivioDocumenti" TagPrefix="uc1" %> -
+
-
-
diff --git a/ETS-WS/ETS-WS/WebUserControls/mod_archivioDocumenti.ascx b/ETS-WS/ETS-WS/WebUserControls/mod_archivioDocumenti.ascx index 7f29f3f..93ef934 100644 --- a/ETS-WS/ETS-WS/WebUserControls/mod_archivioDocumenti.ascx +++ b/ETS-WS/ETS-WS/WebUserControls/mod_archivioDocumenti.ascx @@ -9,7 +9,7 @@ <% } %> + DataSourceID="ods" DataKeyNames="idxFile" Width="100%" AllowPaging="True"> @@ -64,8 +64,8 @@ - <%--EnableCaching="true" CacheDuration="30" SortParameterName="SortExpression"--%> + OldValuesParameterFormatString="original_{0}" EnablePaging="True" SelectCountMethod="getBySearch_count" SortParameterName="SortExpression" EnableCaching="true" CacheDuration="5"> + <%--EnableCaching="true" CacheDuration="30" SortParameterName="SortExpression" --%> diff --git a/ETS-WS/ETS-WS/WebUserControls/mod_archivioDocumenti.ascx.cs b/ETS-WS/ETS-WS/WebUserControls/mod_archivioDocumenti.ascx.cs index 16be877..eda0cbe 100644 --- a/ETS-WS/ETS-WS/WebUserControls/mod_archivioDocumenti.ascx.cs +++ b/ETS-WS/ETS-WS/WebUserControls/mod_archivioDocumenti.ascx.cs @@ -4,6 +4,7 @@ using System.Linq; using System.Web; using System.Web.UI; using System.Web.UI.WebControls; +using ETS_Data; namespace ETS_WS.WebUserControls { @@ -114,10 +115,28 @@ namespace ETS_WS.WebUserControls return answ; } /// + /// dimensione pagina richiesta + /// + public int pageSize + { + get + { + int answ = 15; + try + { + answ = utils.obj.IntSessionObj("srcPageSize"); + } + catch + { } + return answ; + } + } + /// /// aggiornamento controllo /// public void doUpdate() { + grView.PageSize = pageSize; grView.DataBind(); } } diff --git a/ETS-WS/ETS-WS/WebUserControls/mod_filtroRicerca.ascx b/ETS-WS/ETS-WS/WebUserControls/mod_filtroRicerca.ascx index ca5fd90..fd9f846 100644 --- a/ETS-WS/ETS-WS/WebUserControls/mod_filtroRicerca.ascx +++ b/ETS-WS/ETS-WS/WebUserControls/mod_filtroRicerca.ascx @@ -11,30 +11,30 @@ <% } %>
-
-
+
+
<%--input dati--%> -
+

-
+

-
+

-
+

@@ -42,16 +42,24 @@ ServiceMethod="elencoFontiByDoc" minCharAutocomplete="2" showKey="false" toolTip="Digitare per iniziare ricerca, min 2 char" textEmWidht="15" Visible="false" />
-
+

-
- +
+
+ + + + + + +
diff --git a/ETS-WS/ETS-WS/WebUserControls/mod_filtroRicerca.ascx.cs b/ETS-WS/ETS-WS/WebUserControls/mod_filtroRicerca.ascx.cs index edd650c..9bf1295 100644 --- a/ETS-WS/ETS-WS/WebUserControls/mod_filtroRicerca.ascx.cs +++ b/ETS-WS/ETS-WS/WebUserControls/mod_filtroRicerca.ascx.cs @@ -102,23 +102,7 @@ namespace ETS_WS.WebUserControls //// 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 + /// /// @@ -129,37 +113,7 @@ namespace ETS_WS.WebUserControls { 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... /// @@ -250,5 +204,14 @@ namespace ETS_WS.WebUserControls } tacOggetto.Visible = chkOggetto.Checked; } + + protected void ddlPageSize_SelectedIndexChanged(object sender, EventArgs e) + { + utils.obj.setSessionVal("srcPageSize", ddlPageSize.SelectedValue); + if (eh_reqSearch != null) + { + eh_reqSearch(this, new EventArgs()); + } + } } } \ 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 index 0b477b7..b2e7b2b 100644 --- a/ETS-WS/ETS-WS/WebUserControls/mod_filtroRicerca.ascx.designer.cs +++ b/ETS-WS/ETS-WS/WebUserControls/mod_filtroRicerca.ascx.designer.cs @@ -103,12 +103,21 @@ namespace ETS_WS.WebUserControls { protected global::ETS_WS.WebUserControls.mod_textAutocomplete tacOggetto; /// - /// lblFullPath control. + /// LabelblPageSize control. /// /// /// Auto-generated field. /// To modify move field declaration from designer file to code-behind file. /// - protected global::System.Web.UI.WebControls.Label lblFullPath; + protected global::System.Web.UI.WebControls.Label LabelblPageSize; + + /// + /// ddlPageSize control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.DropDownList ddlPageSize; } } diff --git a/ETS-WS/ETS-WS/bin/ETS-WS.dll b/ETS-WS/ETS-WS/bin/ETS-WS.dll index 73397fb..a98cb7f 100644 Binary files a/ETS-WS/ETS-WS/bin/ETS-WS.dll and b/ETS-WS/ETS-WS/bin/ETS-WS.dll differ diff --git a/ETS-WS/ETS-WS/bin/ETS_Data.dll b/ETS-WS/ETS-WS/bin/ETS_Data.dll index a6b8273..c239779 100644 Binary files a/ETS-WS/ETS-WS/bin/ETS_Data.dll and b/ETS-WS/ETS-WS/bin/ETS_Data.dll differ