diff --git a/ETS-WS/ETS-WS.suo b/ETS-WS/ETS-WS.suo index 5421e90..4d91382 100644 Binary files a/ETS-WS/ETS-WS.suo and b/ETS-WS/ETS-WS.suo differ diff --git a/ETS-WS/ETS-WS/WebUserControls/mod_archivioDocumenti.ascx b/ETS-WS/ETS-WS/WebUserControls/mod_archivioDocumenti.ascx index 95ed4dc..cdd17a8 100644 --- a/ETS-WS/ETS-WS/WebUserControls/mod_archivioDocumenti.ascx +++ b/ETS-WS/ETS-WS/WebUserControls/mod_archivioDocumenti.ascx @@ -76,7 +76,11 @@ SortParameterName="SortExpression" EnableCaching="true" CacheDuration="5"> <%--EnableCaching="true" CacheDuration="30" SortParameterName="SortExpression" --%> - + + diff --git a/ETS-WS/ETS-WS/WebUserControls/mod_filtroRicerca.ascx.cs b/ETS-WS/ETS-WS/WebUserControls/mod_filtroRicerca.ascx.cs index 590b98a..735a380 100644 --- a/ETS-WS/ETS-WS/WebUserControls/mod_filtroRicerca.ascx.cs +++ b/ETS-WS/ETS-WS/WebUserControls/mod_filtroRicerca.ascx.cs @@ -120,7 +120,14 @@ namespace ETS_WS.WebUserControls /// private void displayResults() { - lblTotRec.Text = utils.obj.taDoc.getBySearch_Count_only(utils.obj.StringSessionObj("srcCommessa"), utils.obj.StringSessionObj("srcFase"), utils.obj.StringSessionObj("srcFonte"), utils.obj.StringSessionObj("srcInOut"), txtSearchAll.Text.Trim()).ToString(); + DateTime inizio = Convert.ToDateTime(utils.obj.StringSessionObj("_inizio")); + DateTime fine = Convert.ToDateTime(utils.obj.StringSessionObj("_fine")); + 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 ricercaLibera = txtSearchAll.Text.Trim(); + lblTotRec.Text = utils.obj.taDoc.getBySearch_Count_only(inizio, fine, commessa, fase, fonte, InOut, ricercaLibera).ToString(); } /// diff --git a/ETS-WS/ETS-WS/bin/ETS-WS.dll b/ETS-WS/ETS-WS/bin/ETS-WS.dll index 675013b..acd6051 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 3c4a5ad..1e35a5d 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 d2da696..0e786ec 100644 --- a/ETS_Data/DS_WebScip.Designer.cs +++ b/ETS_Data/DS_WebScip.Designer.cs @@ -4480,6 +4480,8 @@ SELECT idxFile, Nome, fullPath, userId, NrProtocollo, Numero, Anno, DataRic, Dat this._commandCollection[1].CommandText = "dbo.stp_tbDocs_getBySearch"; 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("@Commessa", global::System.Data.SqlDbType.NVarChar, 10, 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("@Fase", 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("@Fonte", global::System.Data.SqlDbType.NVarChar, 100, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); @@ -4490,6 +4492,8 @@ SELECT idxFile, Nome, fullPath, userId, NrProtocollo, Numero, Anno, DataRic, Dat this._commandCollection[2].CommandText = "dbo.stp_tbDocs_getBySearch_Count"; this._commandCollection[2].CommandType = global::System.Data.CommandType.StoredProcedure; this._commandCollection[2].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[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("@Fonte", global::System.Data.SqlDbType.NVarChar, 100, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); @@ -4503,6 +4507,8 @@ SELECT idxFile, Nome, fullPath, userId, NrProtocollo, Numero, Anno, DataRic, Dat this._commandCollection[3].CommandText = "dbo.stp_tbDocs_getBySearch_Count_only"; this._commandCollection[3].CommandType = global::System.Data.CommandType.StoredProcedure; this._commandCollection[3].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[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("@Fonte", global::System.Data.SqlDbType.NVarChar, 100, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); @@ -4513,6 +4519,8 @@ SELECT idxFile, Nome, fullPath, userId, NrProtocollo, Numero, Anno, DataRic, Dat this._commandCollection[4].CommandText = "dbo.stp_tbDocs_getBySearch_paged"; this._commandCollection[4].CommandType = global::System.Data.CommandType.StoredProcedure; this._commandCollection[4].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[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("@Fonte", global::System.Data.SqlDbType.NVarChar, 100, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); @@ -4568,37 +4576,49 @@ SELECT idxFile, Nome, fullPath, userId, NrProtocollo, Numero, Anno, DataRic, Dat [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_WebScip.tbDocumentiDataTable getBySearch(string Commessa, string Fase, string Fonte, string InOut, string searchAll) { + public virtual DS_WebScip.tbDocumentiDataTable getBySearch(global::System.Nullable inizio, global::System.Nullable fine, string Commessa, string Fase, string Fonte, string InOut, string searchAll) { this.Adapter.SelectCommand = this.CommandCollection[1]; - if ((Commessa == null)) { + if ((inizio.HasValue == true)) { + this.Adapter.SelectCommand.Parameters[1].Value = ((System.DateTime)(inizio.Value)); + } + else { this.Adapter.SelectCommand.Parameters[1].Value = global::System.DBNull.Value; } - else { - this.Adapter.SelectCommand.Parameters[1].Value = ((string)(Commessa)); + if ((fine.HasValue == true)) { + this.Adapter.SelectCommand.Parameters[2].Value = ((System.DateTime)(fine.Value)); } - if ((Fase == null)) { + else { this.Adapter.SelectCommand.Parameters[2].Value = global::System.DBNull.Value; } - else { - this.Adapter.SelectCommand.Parameters[2].Value = ((string)(Fase)); - } - if ((Fonte == null)) { + if ((Commessa == null)) { this.Adapter.SelectCommand.Parameters[3].Value = global::System.DBNull.Value; } else { - this.Adapter.SelectCommand.Parameters[3].Value = ((string)(Fonte)); + this.Adapter.SelectCommand.Parameters[3].Value = ((string)(Commessa)); } - if ((InOut == null)) { + if ((Fase == null)) { this.Adapter.SelectCommand.Parameters[4].Value = global::System.DBNull.Value; } else { - this.Adapter.SelectCommand.Parameters[4].Value = ((string)(InOut)); + this.Adapter.SelectCommand.Parameters[4].Value = ((string)(Fase)); } - if ((searchAll == null)) { + if ((Fonte == null)) { this.Adapter.SelectCommand.Parameters[5].Value = global::System.DBNull.Value; } else { - this.Adapter.SelectCommand.Parameters[5].Value = ((string)(searchAll)); + this.Adapter.SelectCommand.Parameters[5].Value = ((string)(Fonte)); + } + if ((InOut == null)) { + this.Adapter.SelectCommand.Parameters[6].Value = global::System.DBNull.Value; + } + else { + this.Adapter.SelectCommand.Parameters[6].Value = ((string)(InOut)); + } + if ((searchAll == null)) { + this.Adapter.SelectCommand.Parameters[7].Value = global::System.DBNull.Value; + } + else { + this.Adapter.SelectCommand.Parameters[7].Value = ((string)(searchAll)); } DS_WebScip.tbDocumentiDataTable dataTable = new DS_WebScip.tbDocumentiDataTable(); this.Adapter.Fill(dataTable); @@ -4609,55 +4629,67 @@ SELECT idxFile, Nome, fullPath, userId, NrProtocollo, Numero, Anno, DataRic, Dat [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_WebScip.tbDocumentiDataTable getBySearch_paged(string Commessa, string Fase, string Fonte, string InOut, string searchAll, global::System.Nullable startRowIndex, global::System.Nullable maximumRows, string SortExpression) { + public virtual DS_WebScip.tbDocumentiDataTable getBySearch_paged(global::System.Nullable inizio, global::System.Nullable fine, string Commessa, string Fase, string Fonte, string InOut, string searchAll, global::System.Nullable startRowIndex, global::System.Nullable maximumRows, string SortExpression) { this.Adapter.SelectCommand = this.CommandCollection[4]; - if ((Commessa == null)) { + if ((inizio.HasValue == true)) { + this.Adapter.SelectCommand.Parameters[1].Value = ((System.DateTime)(inizio.Value)); + } + else { this.Adapter.SelectCommand.Parameters[1].Value = global::System.DBNull.Value; } - else { - this.Adapter.SelectCommand.Parameters[1].Value = ((string)(Commessa)); + if ((fine.HasValue == true)) { + this.Adapter.SelectCommand.Parameters[2].Value = ((System.DateTime)(fine.Value)); } - if ((Fase == null)) { + else { this.Adapter.SelectCommand.Parameters[2].Value = global::System.DBNull.Value; } - else { - this.Adapter.SelectCommand.Parameters[2].Value = ((string)(Fase)); - } - if ((Fonte == null)) { + if ((Commessa == null)) { this.Adapter.SelectCommand.Parameters[3].Value = global::System.DBNull.Value; } else { - this.Adapter.SelectCommand.Parameters[3].Value = ((string)(Fonte)); + this.Adapter.SelectCommand.Parameters[3].Value = ((string)(Commessa)); } - if ((InOut == null)) { + if ((Fase == null)) { this.Adapter.SelectCommand.Parameters[4].Value = global::System.DBNull.Value; } else { - this.Adapter.SelectCommand.Parameters[4].Value = ((string)(InOut)); + this.Adapter.SelectCommand.Parameters[4].Value = ((string)(Fase)); } - if ((searchAll == null)) { + if ((Fonte == null)) { this.Adapter.SelectCommand.Parameters[5].Value = global::System.DBNull.Value; } else { - this.Adapter.SelectCommand.Parameters[5].Value = ((string)(searchAll)); + this.Adapter.SelectCommand.Parameters[5].Value = ((string)(Fonte)); } - if ((startRowIndex.HasValue == true)) { - this.Adapter.SelectCommand.Parameters[6].Value = ((int)(startRowIndex.Value)); - } - else { + if ((InOut == null)) { this.Adapter.SelectCommand.Parameters[6].Value = global::System.DBNull.Value; } - if ((maximumRows.HasValue == true)) { - this.Adapter.SelectCommand.Parameters[7].Value = ((int)(maximumRows.Value)); - } else { + this.Adapter.SelectCommand.Parameters[6].Value = ((string)(InOut)); + } + if ((searchAll == null)) { this.Adapter.SelectCommand.Parameters[7].Value = global::System.DBNull.Value; } - if ((SortExpression == null)) { - this.Adapter.SelectCommand.Parameters[8].Value = global::System.DBNull.Value; + else { + this.Adapter.SelectCommand.Parameters[7].Value = ((string)(searchAll)); + } + if ((startRowIndex.HasValue == true)) { + this.Adapter.SelectCommand.Parameters[8].Value = ((int)(startRowIndex.Value)); } else { - this.Adapter.SelectCommand.Parameters[8].Value = ((string)(SortExpression)); + this.Adapter.SelectCommand.Parameters[8].Value = global::System.DBNull.Value; + } + if ((maximumRows.HasValue == true)) { + this.Adapter.SelectCommand.Parameters[9].Value = ((int)(maximumRows.Value)); + } + else { + this.Adapter.SelectCommand.Parameters[9].Value = global::System.DBNull.Value; + } + if ((SortExpression == null)) { + this.Adapter.SelectCommand.Parameters[10].Value = global::System.DBNull.Value; + } + else { + this.Adapter.SelectCommand.Parameters[10].Value = ((string)(SortExpression)); } DS_WebScip.tbDocumentiDataTable dataTable = new DS_WebScip.tbDocumentiDataTable(); this.Adapter.Fill(dataTable); @@ -5627,55 +5659,67 @@ SELECT idxFile, Nome, fullPath, userId, NrProtocollo, Numero, Anno, DataRic, Dat [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")] - public virtual object getBySearch_Count(string Commessa, string Fase, string Fonte, string InOut, string searchAll, global::System.Nullable startRowIndex, global::System.Nullable maximumRows, string SortExpression) { + public virtual object getBySearch_Count(global::System.Nullable inizio, global::System.Nullable fine, string Commessa, string Fase, string Fonte, string InOut, string searchAll, global::System.Nullable startRowIndex, global::System.Nullable maximumRows, string SortExpression) { global::System.Data.SqlClient.SqlCommand command = this.CommandCollection[2]; - if ((Commessa == null)) { + if ((inizio.HasValue == true)) { + command.Parameters[1].Value = ((System.DateTime)(inizio.Value)); + } + else { command.Parameters[1].Value = global::System.DBNull.Value; } - else { - command.Parameters[1].Value = ((string)(Commessa)); + if ((fine.HasValue == true)) { + command.Parameters[2].Value = ((System.DateTime)(fine.Value)); } - if ((Fase == null)) { + else { command.Parameters[2].Value = global::System.DBNull.Value; } - else { - command.Parameters[2].Value = ((string)(Fase)); - } - if ((Fonte == null)) { + if ((Commessa == null)) { command.Parameters[3].Value = global::System.DBNull.Value; } else { - command.Parameters[3].Value = ((string)(Fonte)); + command.Parameters[3].Value = ((string)(Commessa)); } - if ((InOut == null)) { + if ((Fase == null)) { command.Parameters[4].Value = global::System.DBNull.Value; } else { - command.Parameters[4].Value = ((string)(InOut)); + command.Parameters[4].Value = ((string)(Fase)); } - if ((searchAll == null)) { + if ((Fonte == null)) { command.Parameters[5].Value = global::System.DBNull.Value; } else { - command.Parameters[5].Value = ((string)(searchAll)); + command.Parameters[5].Value = ((string)(Fonte)); } - if ((startRowIndex.HasValue == true)) { - command.Parameters[6].Value = ((int)(startRowIndex.Value)); - } - else { + if ((InOut == null)) { command.Parameters[6].Value = global::System.DBNull.Value; } - if ((maximumRows.HasValue == true)) { - command.Parameters[7].Value = ((int)(maximumRows.Value)); - } else { + command.Parameters[6].Value = ((string)(InOut)); + } + if ((searchAll == null)) { command.Parameters[7].Value = global::System.DBNull.Value; } - if ((SortExpression == null)) { - command.Parameters[8].Value = global::System.DBNull.Value; + else { + command.Parameters[7].Value = ((string)(searchAll)); + } + if ((startRowIndex.HasValue == true)) { + command.Parameters[8].Value = ((int)(startRowIndex.Value)); } else { - command.Parameters[8].Value = ((string)(SortExpression)); + command.Parameters[8].Value = global::System.DBNull.Value; + } + if ((maximumRows.HasValue == true)) { + command.Parameters[9].Value = ((int)(maximumRows.Value)); + } + else { + command.Parameters[9].Value = global::System.DBNull.Value; + } + if ((SortExpression == null)) { + command.Parameters[10].Value = global::System.DBNull.Value; + } + else { + command.Parameters[10].Value = ((string)(SortExpression)); } global::System.Data.ConnectionState previousConnectionState = command.Connection.State; if (((command.Connection.State & global::System.Data.ConnectionState.Open) @@ -5703,37 +5747,49 @@ SELECT idxFile, Nome, fullPath, userId, NrProtocollo, Numero, Anno, DataRic, Dat [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")] - public virtual object getBySearch_Count_only(string Commessa, string Fase, string Fonte, string InOut, string searchAll) { + public virtual object getBySearch_Count_only(global::System.Nullable inizio, global::System.Nullable fine, string Commessa, string Fase, string Fonte, string InOut, string searchAll) { global::System.Data.SqlClient.SqlCommand command = this.CommandCollection[3]; - if ((Commessa == null)) { + if ((inizio.HasValue == true)) { + command.Parameters[1].Value = ((System.DateTime)(inizio.Value)); + } + else { command.Parameters[1].Value = global::System.DBNull.Value; } - else { - command.Parameters[1].Value = ((string)(Commessa)); + if ((fine.HasValue == true)) { + command.Parameters[2].Value = ((System.DateTime)(fine.Value)); } - if ((Fase == null)) { + else { command.Parameters[2].Value = global::System.DBNull.Value; } - else { - command.Parameters[2].Value = ((string)(Fase)); - } - if ((Fonte == null)) { + if ((Commessa == null)) { command.Parameters[3].Value = global::System.DBNull.Value; } else { - command.Parameters[3].Value = ((string)(Fonte)); + command.Parameters[3].Value = ((string)(Commessa)); } - if ((InOut == null)) { + if ((Fase == null)) { command.Parameters[4].Value = global::System.DBNull.Value; } else { - command.Parameters[4].Value = ((string)(InOut)); + command.Parameters[4].Value = ((string)(Fase)); } - if ((searchAll == null)) { + if ((Fonte == null)) { command.Parameters[5].Value = global::System.DBNull.Value; } else { - command.Parameters[5].Value = ((string)(searchAll)); + command.Parameters[5].Value = ((string)(Fonte)); + } + if ((InOut == null)) { + command.Parameters[6].Value = global::System.DBNull.Value; + } + else { + command.Parameters[6].Value = ((string)(InOut)); + } + if ((searchAll == null)) { + command.Parameters[7].Value = global::System.DBNull.Value; + } + else { + command.Parameters[7].Value = ((string)(searchAll)); } global::System.Data.ConnectionState previousConnectionState = command.Connection.State; if (((command.Connection.State & global::System.Data.ConnectionState.Open) diff --git a/ETS_Data/DS_WebScip.xsd b/ETS_Data/DS_WebScip.xsd index 2e60675..1c3ac7d 100644 --- a/ETS_Data/DS_WebScip.xsd +++ b/ETS_Data/DS_WebScip.xsd @@ -341,6 +341,8 @@ SELECT idxFile, Nome, fullPath, userId, NrProtocollo, Numero, Anno, DataRic, Dat dbo.stp_tbDocs_getBySearch + + @@ -356,6 +358,8 @@ SELECT idxFile, Nome, fullPath, userId, NrProtocollo, Numero, Anno, DataRic, Dat dbo.stp_tbDocs_getBySearch_Count + + @@ -374,6 +378,8 @@ SELECT idxFile, Nome, fullPath, userId, NrProtocollo, Numero, Anno, DataRic, Dat dbo.stp_tbDocs_getBySearch_Count_only + + @@ -389,6 +395,8 @@ SELECT idxFile, Nome, fullPath, userId, NrProtocollo, Numero, Anno, DataRic, Dat dbo.stp_tbDocs_getBySearch_paged + + @@ -487,7 +495,7 @@ SELECT idxFase, codFase, descrizione, folderName FROM AnagFasi WHERE (idxFase = - + dbo.stp_fasi_Delete @@ -498,7 +506,7 @@ SELECT idxFase, codFase, descrizione, folderName FROM AnagFasi WHERE (idxFase = - + dbo.stp_fasi_Update @@ -593,7 +601,7 @@ SELECT idxTag, tag FROM AnagTags WHERE (idxTag = @idxTag) - + @@ -665,7 +673,7 @@ SELECT idxTag, tag FROM AnagTags WHERE (idxTag = @idxTag) - + @@ -825,7 +833,7 @@ SELECT idxTag, tag FROM AnagTags WHERE (idxTag = @idxTag) - + @@ -853,7 +861,7 @@ SELECT idxTag, tag FROM AnagTags WHERE (idxTag = @idxTag) - + diff --git a/ETS_Data/DS_WebScip.xss b/ETS_Data/DS_WebScip.xss index 991839e..418cf92 100644 --- a/ETS_Data/DS_WebScip.xss +++ b/ETS_Data/DS_WebScip.xss @@ -7,9 +7,9 @@ - - - + + + \ No newline at end of file