diff --git a/ETS-WS/ETS-WS.suo b/ETS-WS/ETS-WS.suo index 98ea49e..957c41c 100644 Binary files a/ETS-WS/ETS-WS.suo and b/ETS-WS/ETS-WS.suo differ diff --git a/ETS-WS/ETS-WS/WS/AutoCompletamento.asmx.cs b/ETS-WS/ETS-WS/WS/AutoCompletamento.asmx.cs index fd5f0bb..70d058a 100644 --- a/ETS-WS/ETS-WS/WS/AutoCompletamento.asmx.cs +++ b/ETS-WS/ETS-WS/WS/AutoCompletamento.asmx.cs @@ -213,15 +213,26 @@ namespace ETS_WS.WS return suggerimenti.ToArray(); } [System.Web.Services.WebMethod] - public string[] elencoFasiByDoc(string prefixText, int count) + public string[] elencoFasiByDoc(string prefixText, int count,string contextKey) { + // leggo dalla session utente i valori periodo desiderati... + DateTime inizio = DateTime.Now.AddYears(-1); + DateTime fine = DateTime.Now; + try + { + int charPos=contextKey.IndexOf("#"); + inizio = Convert.ToDateTime(contextKey.Substring(0,charPos)); + fine = Convert.ToDateTime(contextKey.Substring(charPos+1)); + } + catch + { } // inizializzo risposta List suggerimenti = new List(); // proseguo SOLO SE min "MinCharAutocomplete" char... if (count >= Convert.ToInt32(ConfigurationManager.AppSettings.Get("MinCharAutocomplete"))) { // elenco candidati - DS_utils.v_tbDocs_selFasiDataTable tabella = utils.obj.taTDSelFasi.getByLikeSearch(prefixText); + DS_utils.v_tbDocs_selFasiDataTable tabella = utils.obj.taTDSelFasi.getByLikeSearch(inizio, fine, prefixText); // contatore risultati int i = 0; // aggiungo ogni riga... diff --git a/ETS-WS/ETS-WS/WebUserControls/mod_archivioDocumenti.ascx.cs b/ETS-WS/ETS-WS/WebUserControls/mod_archivioDocumenti.ascx.cs index d452ad7..1e4ce32 100644 --- a/ETS-WS/ETS-WS/WebUserControls/mod_archivioDocumenti.ascx.cs +++ b/ETS-WS/ETS-WS/WebUserControls/mod_archivioDocumenti.ascx.cs @@ -125,7 +125,14 @@ namespace ETS_WS.WebUserControls /// public void doUpdate() { - grView.DataBind(); + try + { + grView.DataBind(); + } + catch(Exception exc) + { + + } } /// /// restituisce una stringa di max "maxChar caratteri tenendo gli ultimi lastChar diff --git a/ETS-WS/ETS-WS/WebUserControls/mod_filtroRicerca.ascx.cs b/ETS-WS/ETS-WS/WebUserControls/mod_filtroRicerca.ascx.cs index faacbec..c649789 100644 --- a/ETS-WS/ETS-WS/WebUserControls/mod_filtroRicerca.ascx.cs +++ b/ETS-WS/ETS-WS/WebUserControls/mod_filtroRicerca.ascx.cs @@ -177,6 +177,7 @@ namespace ETS_WS.WebUserControls { if (chkFase.Checked) { + tacFasi.contextKey = string.Format("{0}#{1}", utils.obj.StringSessionObj("_inizio"), utils.obj.StringSessionObj("_fine")); chkFase.Text = "Elimina Filtro Fasi"; tacFasi.setFocus(); } diff --git a/ETS-WS/ETS-WS/WebUserControls/mod_textAutocomplete.ascx.cs b/ETS-WS/ETS-WS/WebUserControls/mod_textAutocomplete.ascx.cs index 008415f..3532926 100644 --- a/ETS-WS/ETS-WS/WebUserControls/mod_textAutocomplete.ascx.cs +++ b/ETS-WS/ETS-WS/WebUserControls/mod_textAutocomplete.ascx.cs @@ -200,5 +200,19 @@ namespace ETS_WS.WebUserControls { txtValue.Focus(); } + /// + /// permette di apssare altri parametri di contesto al metodo invocato x autocomplete + /// + public string contextKey + { + get + { + return txtValueAce.ContextKey; + } + set + { + txtValueAce.ContextKey = value; + } + } } } \ No newline at end of file diff --git a/ETS-WS/ETS-WS/bin/ETS-WS.dll b/ETS-WS/ETS-WS/bin/ETS-WS.dll index a0992fe..f2e936b 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 e6ed063..704c7ed 100644 Binary files a/ETS-WS/ETS-WS/bin/ETS_Data.dll and b/ETS-WS/ETS-WS/bin/ETS_Data.dll differ diff --git a/ETS_Data/DS_utils.Designer.cs b/ETS_Data/DS_utils.Designer.cs index 2a3355b..62251b7 100644 --- a/ETS_Data/DS_utils.Designer.cs +++ b/ETS_Data/DS_utils.Designer.cs @@ -1,7 +1,7 @@ //------------------------------------------------------------------------------ // // This code was generated by a tool. -// Runtime Version:4.0.30319.17626 +// Runtime Version:4.0.30319.17929 // // Changes to this file may cause incorrect behavior and will be lost if // the code is regenerated. @@ -4803,6 +4803,8 @@ namespace ETS_Data.DS_utilsTableAdapters { this._commandCollection[1].CommandText = "dbo.stp_tbDocs_Fasi_likeSearch"; this._commandCollection[1].CommandType = global::System.Data.CommandType.StoredProcedure; this._commandCollection[1].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@RETURN_VALUE", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.ReturnValue, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[1].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@inizio", global::System.Data.SqlDbType.DateTime, 8, global::System.Data.ParameterDirection.Input, 23, 3, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[1].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@fine", global::System.Data.SqlDbType.DateTime, 8, global::System.Data.ParameterDirection.Input, 23, 3, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._commandCollection[1].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@search", global::System.Data.SqlDbType.NVarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); } @@ -4834,13 +4836,25 @@ namespace ETS_Data.DS_utilsTableAdapters { [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")] [global::System.ComponentModel.DataObjectMethodAttribute(global::System.ComponentModel.DataObjectMethodType.Select, false)] - public virtual DS_utils.v_tbDocs_selFasiDataTable getByLikeSearch(string search) { + public virtual DS_utils.v_tbDocs_selFasiDataTable getByLikeSearch(global::System.Nullable inizio, global::System.Nullable fine, string search) { this.Adapter.SelectCommand = this.CommandCollection[1]; - if ((search == null)) { - this.Adapter.SelectCommand.Parameters[1].Value = global::System.DBNull.Value; + if ((inizio.HasValue == true)) { + this.Adapter.SelectCommand.Parameters[1].Value = ((System.DateTime)(inizio.Value)); } else { - this.Adapter.SelectCommand.Parameters[1].Value = ((string)(search)); + this.Adapter.SelectCommand.Parameters[1].Value = global::System.DBNull.Value; + } + if ((fine.HasValue == true)) { + this.Adapter.SelectCommand.Parameters[2].Value = ((System.DateTime)(fine.Value)); + } + else { + this.Adapter.SelectCommand.Parameters[2].Value = global::System.DBNull.Value; + } + if ((search == null)) { + this.Adapter.SelectCommand.Parameters[3].Value = global::System.DBNull.Value; + } + else { + this.Adapter.SelectCommand.Parameters[3].Value = ((string)(search)); } DS_utils.v_tbDocs_selFasiDataTable dataTable = new DS_utils.v_tbDocs_selFasiDataTable(); this.Adapter.Fill(dataTable); diff --git a/ETS_Data/DS_utils.xsd b/ETS_Data/DS_utils.xsd index 1843651..546d80e 100644 --- a/ETS_Data/DS_utils.xsd +++ b/ETS_Data/DS_utils.xsd @@ -147,6 +147,8 @@ ORDER BY value dbo.stp_tbDocs_Fasi_likeSearch + + @@ -249,7 +251,7 @@ ORDER BY value - + @@ -269,7 +271,7 @@ ORDER BY value - + @@ -283,7 +285,7 @@ ORDER BY value - + @@ -297,7 +299,7 @@ ORDER BY value - + @@ -307,7 +309,7 @@ ORDER BY value - + @@ -327,7 +329,7 @@ ORDER BY value - + @@ -347,7 +349,7 @@ ORDER BY value - + @@ -367,7 +369,7 @@ ORDER BY value - + @@ -387,7 +389,7 @@ ORDER BY value - + diff --git a/ETS_Data/DS_utils.xss b/ETS_Data/DS_utils.xss index 2816032..b132fea 100644 --- a/ETS_Data/DS_utils.xss +++ b/ETS_Data/DS_utils.xss @@ -10,11 +10,11 @@ - + - + + - \ No newline at end of file