diff --git a/ETS-WS/ETS-WS.suo b/ETS-WS/ETS-WS.suo index 957c41c..438ead4 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 70d058a..0c465e5 100644 --- a/ETS-WS/ETS-WS/WS/AutoCompletamento.asmx.cs +++ b/ETS-WS/ETS-WS/WS/AutoCompletamento.asmx.cs @@ -157,15 +157,26 @@ namespace ETS_WS.WS #region ricerca dati FILTRATA (solo x dati presenti in taDocumenti) [System.Web.Services.WebMethod] - public string[] elencoFontiByDoc(string prefixText, int count) + public string[] elencoFontiByDoc(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_selFontiDataTable tabella = utils.obj.taTDSelFonti.getByLikeSearch(prefixText); + DS_utils.v_tbDocs_selFontiDataTable tabella = utils.obj.taTDSelFonti.getByLikeSearch(inizio, fine, prefixText); // contatore risultati int i = 0; // aggiungo ogni riga... @@ -185,15 +196,26 @@ namespace ETS_WS.WS return suggerimenti.ToArray(); } [System.Web.Services.WebMethod] - public string[] elencoCommesseByDoc(string prefixText, int count) + public string[] elencoCommesseByDoc(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_selCommesseDataTable tabella = utils.obj.taTDSelCommesse.getByLikeSearch(prefixText); + DS_utils.v_tbDocs_selCommesseDataTable tabella = utils.obj.taTDSelCommesse.getByLikeSearch(inizio, fine, prefixText); // contatore risultati int i = 0; // aggiungo ogni riga... @@ -213,16 +235,16 @@ namespace ETS_WS.WS return suggerimenti.ToArray(); } [System.Web.Services.WebMethod] - public string[] elencoFasiByDoc(string prefixText, int count,string contextKey) + 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)); + int charPos = contextKey.IndexOf("#"); + inizio = Convert.ToDateTime(contextKey.Substring(0, charPos)); + fine = Convert.ToDateTime(contextKey.Substring(charPos + 1)); } catch { } diff --git a/ETS-WS/ETS-WS/Web.config b/ETS-WS/ETS-WS/Web.config index caf885e..12c6893 100644 --- a/ETS-WS/ETS-WS/Web.config +++ b/ETS-WS/ETS-WS/Web.config @@ -27,8 +27,8 @@ - - + + diff --git a/ETS-WS/ETS-WS/WebUserControls/mod_filtroRicerca.ascx.cs b/ETS-WS/ETS-WS/WebUserControls/mod_filtroRicerca.ascx.cs index c649789..20b5578 100644 --- a/ETS-WS/ETS-WS/WebUserControls/mod_filtroRicerca.ascx.cs +++ b/ETS-WS/ETS-WS/WebUserControls/mod_filtroRicerca.ascx.cs @@ -135,7 +135,7 @@ namespace ETS_WS.WebUserControls string commessa = utils.obj.StringSessionObj("srcCommessa"); string fase = utils.obj.StringSessionObj("srcFase"); string fonte = utils.obj.StringSessionObj("srcFonte"); - string InOut=utils.obj.StringSessionObj("srcInOut"); + string InOut = utils.obj.StringSessionObj("srcInOut"); string ricercaLibera = txtSearchAll.Text.Trim(); lblTotRec.Text = utils.obj.taDoc.getBySearch_Count_only(inizio, fine, commessa, fase, fonte, InOut, ricercaLibera).ToString(); } @@ -158,6 +158,7 @@ namespace ETS_WS.WebUserControls { if (chkCommessa.Checked) { + tacCommesse.contextKey = string.Format("{0}#{1}", utils.obj.StringSessionObj("_inizio"), utils.obj.StringSessionObj("_fine")); chkCommessa.Text = "Elimina Filtro Commessa"; tacCommesse.setFocus(); } @@ -197,6 +198,7 @@ namespace ETS_WS.WebUserControls { if (chkFonte.Checked) { + tacFonti.contextKey = string.Format("{0}#{1}", utils.obj.StringSessionObj("_inizio"), utils.obj.StringSessionObj("_fine")); chkFonte.Text = "Elimina Filtro Fonte"; tacFonti.setFocus(); } diff --git a/ETS-WS/ETS-WS/bin/ETS-WS.dll b/ETS-WS/ETS-WS/bin/ETS-WS.dll index f2e936b..641883b 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 704c7ed..826a683 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_WebScip.Designer.cs b/ETS_Data/DS_WebScip.Designer.cs index 0e786ec..267c75d 100644 --- a/ETS_Data/DS_WebScip.Designer.cs +++ b/ETS_Data/DS_WebScip.Designer.cs @@ -4495,7 +4495,7 @@ SELECT idxFile, Nome, fullPath, userId, NrProtocollo, Numero, Anno, DataRic, Dat this._commandCollection[2].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[2].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[2].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Commessa", global::System.Data.SqlDbType.NVarChar, 10, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._commandCollection[2].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Fase", global::System.Data.SqlDbType.NVarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[2].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Fase", global::System.Data.SqlDbType.NVarChar, 250, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._commandCollection[2].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Fonte", global::System.Data.SqlDbType.NVarChar, 100, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._commandCollection[2].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@InOut", global::System.Data.SqlDbType.NVarChar, 3, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._commandCollection[2].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@searchAll", global::System.Data.SqlDbType.NVarChar, 250, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); @@ -4510,7 +4510,7 @@ SELECT idxFile, Nome, fullPath, userId, NrProtocollo, Numero, Anno, DataRic, Dat this._commandCollection[3].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[3].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[3].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Commessa", global::System.Data.SqlDbType.NVarChar, 10, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._commandCollection[3].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Fase", global::System.Data.SqlDbType.NVarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[3].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Fase", global::System.Data.SqlDbType.NVarChar, 250, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._commandCollection[3].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Fonte", global::System.Data.SqlDbType.NVarChar, 100, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._commandCollection[3].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@InOut", global::System.Data.SqlDbType.NVarChar, 3, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._commandCollection[3].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@searchAll", global::System.Data.SqlDbType.NVarChar, 250, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); @@ -4522,7 +4522,7 @@ SELECT idxFile, Nome, fullPath, userId, NrProtocollo, Numero, Anno, DataRic, Dat this._commandCollection[4].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[4].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[4].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Commessa", global::System.Data.SqlDbType.NVarChar, 10, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._commandCollection[4].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Fase", global::System.Data.SqlDbType.NVarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[4].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Fase", global::System.Data.SqlDbType.NVarChar, 250, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._commandCollection[4].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Fonte", global::System.Data.SqlDbType.NVarChar, 100, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._commandCollection[4].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@InOut", global::System.Data.SqlDbType.NVarChar, 3, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._commandCollection[4].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@searchAll", global::System.Data.SqlDbType.NVarChar, 250, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); diff --git a/ETS_Data/DS_WebScip.xsd b/ETS_Data/DS_WebScip.xsd index 1c3ac7d..02757e8 100644 --- a/ETS_Data/DS_WebScip.xsd +++ b/ETS_Data/DS_WebScip.xsd @@ -361,7 +361,7 @@ SELECT idxFile, Nome, fullPath, userId, NrProtocollo, Numero, Anno, DataRic, Dat - + @@ -381,7 +381,7 @@ SELECT idxFile, Nome, fullPath, userId, NrProtocollo, Numero, Anno, DataRic, Dat - + @@ -398,7 +398,7 @@ SELECT idxFile, Nome, fullPath, userId, NrProtocollo, Numero, Anno, DataRic, Dat - + @@ -601,7 +601,7 @@ SELECT idxTag, tag FROM AnagTags WHERE (idxTag = @idxTag) - + @@ -673,7 +673,7 @@ SELECT idxTag, tag FROM AnagTags WHERE (idxTag = @idxTag) - + @@ -833,7 +833,7 @@ SELECT idxTag, tag FROM AnagTags WHERE (idxTag = @idxTag) - + @@ -861,7 +861,7 @@ SELECT idxTag, tag FROM AnagTags WHERE (idxTag = @idxTag) - + diff --git a/ETS_Data/DS_utils.Designer.cs b/ETS_Data/DS_utils.Designer.cs index 62251b7..6cf8a5b 100644 --- a/ETS_Data/DS_utils.Designer.cs +++ b/ETS_Data/DS_utils.Designer.cs @@ -4612,7 +4612,9 @@ namespace ETS_Data.DS_utilsTableAdapters { this._commandCollection[1].CommandText = "dbo.stp_tbDocs_Commesse_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("@search", global::System.Data.SqlDbType.NVarChar, 50, global::System.Data.ParameterDirection.Input, 0, 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, 250, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] @@ -4643,13 +4645,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_selCommesseDataTable getByLikeSearch(string search) { + public virtual DS_utils.v_tbDocs_selCommesseDataTable 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_selCommesseDataTable dataTable = new DS_utils.v_tbDocs_selCommesseDataTable(); this.Adapter.Fill(dataTable); @@ -4805,7 +4819,7 @@ namespace ETS_Data.DS_utilsTableAdapters { 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, "", "", "")); + this._commandCollection[1].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@search", global::System.Data.SqlDbType.NVarChar, 250, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] @@ -5008,7 +5022,9 @@ namespace ETS_Data.DS_utilsTableAdapters { this._commandCollection[1].CommandText = "dbo.stp_tbDocs_Fonti_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("@search", global::System.Data.SqlDbType.NVarChar, 50, global::System.Data.ParameterDirection.Input, 0, 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, 250, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] @@ -5039,13 +5055,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_selFontiDataTable getByLikeSearch(string search) { + public virtual DS_utils.v_tbDocs_selFontiDataTable 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_selFontiDataTable dataTable = new DS_utils.v_tbDocs_selFontiDataTable(); this.Adapter.Fill(dataTable); diff --git a/ETS_Data/DS_utils.xsd b/ETS_Data/DS_utils.xsd index 546d80e..c26821e 100644 --- a/ETS_Data/DS_utils.xsd +++ b/ETS_Data/DS_utils.xsd @@ -118,7 +118,9 @@ ORDER BY value dbo.stp_tbDocs_Commesse_likeSearch - + + + @@ -149,7 +151,7 @@ ORDER BY value - + @@ -178,7 +180,9 @@ ORDER BY value dbo.stp_tbDocs_Fonti_likeSearch - + + + diff --git a/ETS_Data/DS_utils.xss b/ETS_Data/DS_utils.xss index b132fea..8cf0704 100644 --- a/ETS_Data/DS_utils.xss +++ b/ETS_Data/DS_utils.xss @@ -9,11 +9,11 @@ - - - - - + + + + +