diff --git a/ETS-WS/ETS-WS/WebShipUtils.cs b/ETS-WS/ETS-WS/WebShipUtils.cs index 493de33..0a5a645 100644 --- a/ETS-WS/ETS-WS/WebShipUtils.cs +++ b/ETS-WS/ETS-WS/WebShipUtils.cs @@ -457,7 +457,7 @@ namespace ETS_WS answ.InOut = riga.InOut; answ.reqProto = riga.isProto; answ.isRed = riga.isRed; - answ.tags = listFromString(riga.tags,"#"); + answ.tags = listFromString(riga.tags, "#"); } catch { } @@ -479,7 +479,18 @@ namespace ETS_WS { get { - return (userIsUserRed || userIsPowerUserRed); + bool answ = false; + // controllo se in sessione + if (utils.obj.isInSessionObject("userCanSeeRed")) + { + answ = utils.obj.BoolSessionObj("userCanSeeRed"); + } + else + { + answ = (userIsUserRed || userIsPowerUserRed); + utils.obj.setSessionVal("userCanSeeRed", answ); + } + return answ; } } /// diff --git a/ETS-WS/ETS-WS/WebUserControls/mod_archivioDocumenti.ascx b/ETS-WS/ETS-WS/WebUserControls/mod_archivioDocumenti.ascx index 4bbabf0..72a903f 100644 --- a/ETS-WS/ETS-WS/WebUserControls/mod_archivioDocumenti.ascx +++ b/ETS-WS/ETS-WS/WebUserControls/mod_archivioDocumenti.ascx @@ -142,6 +142,7 @@ + diff --git a/ETS-WS/ETS-WS/WebUserControls/mod_archivioDocumenti.ascx.cs b/ETS-WS/ETS-WS/WebUserControls/mod_archivioDocumenti.ascx.cs index 25b4098..ce93f92 100644 --- a/ETS-WS/ETS-WS/WebUserControls/mod_archivioDocumenti.ascx.cs +++ b/ETS-WS/ETS-WS/WebUserControls/mod_archivioDocumenti.ascx.cs @@ -29,6 +29,8 @@ namespace ETS_WS.WebUserControls if (!Page.IsPostBack) { showHideEditRecord(false); + bool showRed = WebShipUtils.mng.userCanSeeRed; + utils.obj.setSessionVal("showRed", showRed); } mod_singleFileUpload1.tempArea = WebShipUtils.mng.UserTempPath; mod_singleFileUpload1.eh_fileUploaded += new EventHandler(mod_singleFileUpload1_eh_fileUploaded); diff --git a/ETS-WS/ETS-WS/WebUserControls/mod_filtroRicerca.ascx b/ETS-WS/ETS-WS/WebUserControls/mod_filtroRicerca.ascx index 58ecf22..1d2dff7 100644 --- a/ETS-WS/ETS-WS/WebUserControls/mod_filtroRicerca.ascx +++ b/ETS-WS/ETS-WS/WebUserControls/mod_filtroRicerca.ascx @@ -66,9 +66,6 @@
-
- -
diff --git a/ETS-WS/ETS-WS/WebUserControls/mod_filtroRicerca.ascx.cs b/ETS-WS/ETS-WS/WebUserControls/mod_filtroRicerca.ascx.cs index 4ee0547..b7fd75a 100644 --- a/ETS-WS/ETS-WS/WebUserControls/mod_filtroRicerca.ascx.cs +++ b/ETS-WS/ETS-WS/WebUserControls/mod_filtroRicerca.ascx.cs @@ -154,7 +154,7 @@ namespace ETS_WS.WebUserControls string redattore = utils.emptyToStar(utils.obj.StringSessionObj("srcRedattore")); string ricercaLibera = utils.emptyToStar(txtSearchAll.Text.Trim()); // ricerca! - lblTotRec.Text = utils.obj.taDoc.getBySearch_Count_only(inizio, fine, commessa, fase, fonte, InOut, redattore, ricercaLibera).ToString(); + lblTotRec.Text = utils.obj.taDoc.getBySearch_Count_only(inizio, fine, WebShipUtils.mng.userCanSeeRed, commessa, fase, fonte, InOut, redattore, ricercaLibera).ToString(); } /// @@ -265,23 +265,6 @@ namespace ETS_WS.WebUserControls updateVisual(); } /// - /// imposto visibilità x dati red/non red - /// - /// - /// - protected void chkRed_CheckedChanged(object sender, EventArgs e) - { - if (chkRed.Checked) - { - chkRed.Text = "Public+Red"; - } - else - { - chkRed.Text = "Public"; - } - updateVisual(); - } - /// /// selezionata nuova dim pagina /// /// 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 2e24a6d..c39bc06 100644 --- a/ETS-WS/ETS-WS/WebUserControls/mod_filtroRicerca.ascx.designer.cs +++ b/ETS-WS/ETS-WS/WebUserControls/mod_filtroRicerca.ascx.designer.cs @@ -147,15 +147,6 @@ namespace ETS_WS.WebUserControls { /// protected global::ETS_WS.WebUserControls.mod_textAutocomplete tacRedattore; - /// - /// chkRed control. - /// - /// - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. - /// - protected global::System.Web.UI.WebControls.CheckBox chkRed; - /// /// lblCerca control. /// diff --git a/ETS-WS/ETS-WS/bin/ETS-WS.dll b/ETS-WS/ETS-WS/bin/ETS-WS.dll index 46dcd76..cd2f006 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 1fdc346..54bade5 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 3d585b7..7252eb5 100644 --- a/ETS_Data/DS_WebScip.Designer.cs +++ b/ETS_Data/DS_WebScip.Designer.cs @@ -5899,6 +5899,7 @@ FROM tbDocumenti"; 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("@showRed", global::System.Data.SqlDbType.Bit, 1, global::System.Data.ParameterDirection.Input, 1, 0, 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, 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, "", "", "")); @@ -5915,6 +5916,7 @@ FROM tbDocumenti"; 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("@showRed", global::System.Data.SqlDbType.Bit, 1, global::System.Data.ParameterDirection.Input, 1, 0, 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, 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, "", "", "")); @@ -5928,6 +5930,7 @@ FROM tbDocumenti"; this._commandCollection[5].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[5].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[5].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[5].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@showRed", global::System.Data.SqlDbType.Bit, 1, global::System.Data.ParameterDirection.Input, 1, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._commandCollection[5].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[5].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[5].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, "", "", "")); @@ -6083,7 +6086,7 @@ FROM tbDocumenti"; [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(global::System.Nullable inizio, global::System.Nullable fine, string Commessa, string Fase, string Fonte, string InOut, string Redattore, 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, global::System.Nullable showRed, string Commessa, string Fase, string Fonte, string InOut, string Redattore, string searchAll, global::System.Nullable startRowIndex, global::System.Nullable maximumRows, string SortExpression) { this.Adapter.SelectCommand = this.CommandCollection[5]; if ((inizio.HasValue == true)) { this.Adapter.SelectCommand.Parameters[1].Value = ((System.DateTime)(inizio.Value)); @@ -6097,59 +6100,65 @@ FROM tbDocumenti"; else { this.Adapter.SelectCommand.Parameters[2].Value = global::System.DBNull.Value; } - if ((Commessa == null)) { - this.Adapter.SelectCommand.Parameters[3].Value = global::System.DBNull.Value; + if ((showRed.HasValue == true)) { + this.Adapter.SelectCommand.Parameters[3].Value = ((bool)(showRed.Value)); } else { - this.Adapter.SelectCommand.Parameters[3].Value = ((string)(Commessa)); + this.Adapter.SelectCommand.Parameters[3].Value = global::System.DBNull.Value; } - if ((Fase == null)) { + if ((Commessa == null)) { this.Adapter.SelectCommand.Parameters[4].Value = global::System.DBNull.Value; } else { - this.Adapter.SelectCommand.Parameters[4].Value = ((string)(Fase)); + this.Adapter.SelectCommand.Parameters[4].Value = ((string)(Commessa)); } - if ((Fonte == null)) { + if ((Fase == null)) { this.Adapter.SelectCommand.Parameters[5].Value = global::System.DBNull.Value; } else { - this.Adapter.SelectCommand.Parameters[5].Value = ((string)(Fonte)); + this.Adapter.SelectCommand.Parameters[5].Value = ((string)(Fase)); } - if ((InOut == null)) { + if ((Fonte == null)) { this.Adapter.SelectCommand.Parameters[6].Value = global::System.DBNull.Value; } else { - this.Adapter.SelectCommand.Parameters[6].Value = ((string)(InOut)); + this.Adapter.SelectCommand.Parameters[6].Value = ((string)(Fonte)); } - if ((Redattore == null)) { + if ((InOut == null)) { this.Adapter.SelectCommand.Parameters[7].Value = global::System.DBNull.Value; } else { - this.Adapter.SelectCommand.Parameters[7].Value = ((string)(Redattore)); + this.Adapter.SelectCommand.Parameters[7].Value = ((string)(InOut)); } - if ((searchAll == null)) { + if ((Redattore == null)) { this.Adapter.SelectCommand.Parameters[8].Value = global::System.DBNull.Value; } else { - this.Adapter.SelectCommand.Parameters[8].Value = ((string)(searchAll)); + this.Adapter.SelectCommand.Parameters[8].Value = ((string)(Redattore)); } - if ((startRowIndex.HasValue == true)) { - this.Adapter.SelectCommand.Parameters[9].Value = ((int)(startRowIndex.Value)); - } - else { + if ((searchAll == null)) { this.Adapter.SelectCommand.Parameters[9].Value = global::System.DBNull.Value; } - if ((maximumRows.HasValue == true)) { - this.Adapter.SelectCommand.Parameters[10].Value = ((int)(maximumRows.Value)); + else { + this.Adapter.SelectCommand.Parameters[9].Value = ((string)(searchAll)); + } + if ((startRowIndex.HasValue == true)) { + this.Adapter.SelectCommand.Parameters[10].Value = ((int)(startRowIndex.Value)); } else { this.Adapter.SelectCommand.Parameters[10].Value = global::System.DBNull.Value; } - if ((SortExpression == null)) { - this.Adapter.SelectCommand.Parameters[11].Value = global::System.DBNull.Value; + if ((maximumRows.HasValue == true)) { + this.Adapter.SelectCommand.Parameters[11].Value = ((int)(maximumRows.Value)); } else { - this.Adapter.SelectCommand.Parameters[11].Value = ((string)(SortExpression)); + this.Adapter.SelectCommand.Parameters[11].Value = global::System.DBNull.Value; + } + if ((SortExpression == null)) { + this.Adapter.SelectCommand.Parameters[12].Value = global::System.DBNull.Value; + } + else { + this.Adapter.SelectCommand.Parameters[12].Value = ((string)(SortExpression)); } DS_WebScip.tbDocumentiDataTable dataTable = new DS_WebScip.tbDocumentiDataTable(); this.Adapter.Fill(dataTable); @@ -7165,7 +7174,7 @@ FROM tbDocumenti"; [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(global::System.Nullable inizio, global::System.Nullable fine, string Commessa, string Fase, string Fonte, string InOut, string Redattore, 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, global::System.Nullable showRed, string Commessa, string Fase, string Fonte, string InOut, string Redattore, string searchAll, global::System.Nullable startRowIndex, global::System.Nullable maximumRows, string SortExpression) { global::System.Data.SqlClient.SqlCommand command = this.CommandCollection[3]; if ((inizio.HasValue == true)) { command.Parameters[1].Value = ((System.DateTime)(inizio.Value)); @@ -7179,59 +7188,65 @@ FROM tbDocumenti"; else { command.Parameters[2].Value = global::System.DBNull.Value; } - if ((Commessa == null)) { - command.Parameters[3].Value = global::System.DBNull.Value; + if ((showRed.HasValue == true)) { + command.Parameters[3].Value = ((bool)(showRed.Value)); } else { - command.Parameters[3].Value = ((string)(Commessa)); + command.Parameters[3].Value = global::System.DBNull.Value; } - if ((Fase == null)) { + if ((Commessa == null)) { command.Parameters[4].Value = global::System.DBNull.Value; } else { - command.Parameters[4].Value = ((string)(Fase)); + command.Parameters[4].Value = ((string)(Commessa)); } - if ((Fonte == null)) { + if ((Fase == null)) { command.Parameters[5].Value = global::System.DBNull.Value; } else { - command.Parameters[5].Value = ((string)(Fonte)); + command.Parameters[5].Value = ((string)(Fase)); } - if ((InOut == null)) { + if ((Fonte == null)) { command.Parameters[6].Value = global::System.DBNull.Value; } else { - command.Parameters[6].Value = ((string)(InOut)); + command.Parameters[6].Value = ((string)(Fonte)); } - if ((Redattore == null)) { + if ((InOut == null)) { command.Parameters[7].Value = global::System.DBNull.Value; } else { - command.Parameters[7].Value = ((string)(Redattore)); + command.Parameters[7].Value = ((string)(InOut)); } - if ((searchAll == null)) { + if ((Redattore == null)) { command.Parameters[8].Value = global::System.DBNull.Value; } else { - command.Parameters[8].Value = ((string)(searchAll)); + command.Parameters[8].Value = ((string)(Redattore)); } - if ((startRowIndex.HasValue == true)) { - command.Parameters[9].Value = ((int)(startRowIndex.Value)); - } - else { + if ((searchAll == null)) { command.Parameters[9].Value = global::System.DBNull.Value; } - if ((maximumRows.HasValue == true)) { - command.Parameters[10].Value = ((int)(maximumRows.Value)); + else { + command.Parameters[9].Value = ((string)(searchAll)); + } + if ((startRowIndex.HasValue == true)) { + command.Parameters[10].Value = ((int)(startRowIndex.Value)); } else { command.Parameters[10].Value = global::System.DBNull.Value; } - if ((SortExpression == null)) { - command.Parameters[11].Value = global::System.DBNull.Value; + if ((maximumRows.HasValue == true)) { + command.Parameters[11].Value = ((int)(maximumRows.Value)); } else { - command.Parameters[11].Value = ((string)(SortExpression)); + command.Parameters[11].Value = global::System.DBNull.Value; + } + if ((SortExpression == null)) { + command.Parameters[12].Value = global::System.DBNull.Value; + } + else { + command.Parameters[12].Value = ((string)(SortExpression)); } global::System.Data.ConnectionState previousConnectionState = command.Connection.State; if (((command.Connection.State & global::System.Data.ConnectionState.Open) @@ -7259,7 +7274,7 @@ FROM tbDocumenti"; [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(global::System.Nullable inizio, global::System.Nullable fine, string Commessa, string Fase, string Fonte, string InOut, string Redattore, string searchAll) { + public virtual object getBySearch_Count_only(global::System.Nullable inizio, global::System.Nullable fine, global::System.Nullable showRed, string Commessa, string Fase, string Fonte, string InOut, string Redattore, string searchAll) { global::System.Data.SqlClient.SqlCommand command = this.CommandCollection[4]; if ((inizio.HasValue == true)) { command.Parameters[1].Value = ((System.DateTime)(inizio.Value)); @@ -7273,41 +7288,47 @@ FROM tbDocumenti"; else { command.Parameters[2].Value = global::System.DBNull.Value; } - if ((Commessa == null)) { - command.Parameters[3].Value = global::System.DBNull.Value; + if ((showRed.HasValue == true)) { + command.Parameters[3].Value = ((bool)(showRed.Value)); } else { - command.Parameters[3].Value = ((string)(Commessa)); + command.Parameters[3].Value = global::System.DBNull.Value; } - if ((Fase == null)) { + if ((Commessa == null)) { command.Parameters[4].Value = global::System.DBNull.Value; } else { - command.Parameters[4].Value = ((string)(Fase)); + command.Parameters[4].Value = ((string)(Commessa)); } - if ((Fonte == null)) { + if ((Fase == null)) { command.Parameters[5].Value = global::System.DBNull.Value; } else { - command.Parameters[5].Value = ((string)(Fonte)); + command.Parameters[5].Value = ((string)(Fase)); } - if ((InOut == null)) { + if ((Fonte == null)) { command.Parameters[6].Value = global::System.DBNull.Value; } else { - command.Parameters[6].Value = ((string)(InOut)); + command.Parameters[6].Value = ((string)(Fonte)); } - if ((Redattore == null)) { + if ((InOut == null)) { command.Parameters[7].Value = global::System.DBNull.Value; } else { - command.Parameters[7].Value = ((string)(Redattore)); + command.Parameters[7].Value = ((string)(InOut)); } - if ((searchAll == null)) { + if ((Redattore == null)) { command.Parameters[8].Value = global::System.DBNull.Value; } else { - command.Parameters[8].Value = ((string)(searchAll)); + command.Parameters[8].Value = ((string)(Redattore)); + } + if ((searchAll == null)) { + command.Parameters[9].Value = global::System.DBNull.Value; + } + else { + command.Parameters[9].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 8639e67..941a6e3 100644 --- a/ETS_Data/DS_WebScip.xsd +++ b/ETS_Data/DS_WebScip.xsd @@ -384,6 +384,7 @@ SELECT idxFile, NomeFile, Nome, fullPath, userId, isRed, NrProtocollo, Numero, A + @@ -405,6 +406,7 @@ SELECT idxFile, NomeFile, Nome, fullPath, userId, isRed, NrProtocollo, Numero, A + @@ -423,6 +425,7 @@ SELECT idxFile, NomeFile, Nome, fullPath, userId, isRed, NrProtocollo, Numero, A + @@ -899,7 +902,7 @@ SELECT userId, setName, Commessa, Fase, Fonte, Oggetto, DataRic, DataDoc, path, - + @@ -971,7 +974,7 @@ SELECT userId, setName, Commessa, Fase, Fonte, Oggetto, DataRic, DataDoc, path, - + @@ -1139,7 +1142,7 @@ SELECT userId, setName, Commessa, Fase, Fonte, Oggetto, DataRic, DataDoc, path, - + @@ -1167,7 +1170,7 @@ SELECT userId, setName, Commessa, Fase, Fonte, Oggetto, DataRic, DataDoc, path, - + @@ -1181,7 +1184,7 @@ SELECT userId, setName, Commessa, Fase, Fonte, Oggetto, DataRic, DataDoc, path, - + @@ -1189,7 +1192,7 @@ SELECT userId, setName, Commessa, Fase, Fonte, Oggetto, DataRic, DataDoc, path, - + @@ -1293,8 +1296,8 @@ SELECT userId, setName, Commessa, Fase, Fonte, Oggetto, DataRic, DataDoc, path, - - + + \ No newline at end of file diff --git a/ETS_Data/DS_WebScip.xss b/ETS_Data/DS_WebScip.xss index 198dfa0..f4664a8 100644 --- a/ETS_Data/DS_WebScip.xss +++ b/ETS_Data/DS_WebScip.xss @@ -7,11 +7,11 @@ - + - +