diff --git a/GMW-RT/bin/GMW-RT.dll b/GMW-RT/bin/GMW-RT.dll index ecd47e96..357d3f23 100644 Binary files a/GMW-RT/bin/GMW-RT.dll and b/GMW-RT/bin/GMW-RT.dll differ diff --git a/GMW-RT/bin/GMW_data.dll b/GMW-RT/bin/GMW_data.dll index cd975d96..381bec96 100644 Binary files a/GMW-RT/bin/GMW_data.dll and b/GMW-RT/bin/GMW_data.dll differ diff --git a/GMW-UT/bin/GMW-UT.dll b/GMW-UT/bin/GMW-UT.dll index 28f8c750..a56321e4 100644 Binary files a/GMW-UT/bin/GMW-UT.dll and b/GMW-UT/bin/GMW-UT.dll differ diff --git a/GMW-UT/bin/GMW_data.dll b/GMW-UT/bin/GMW_data.dll index cd975d96..18536189 100644 Binary files a/GMW-UT/bin/GMW_data.dll and b/GMW-UT/bin/GMW_data.dll differ diff --git a/GMW/WebUserControls/mod_assegnaNC.ascx b/GMW/WebUserControls/mod_assegnaNC.ascx index 42cd958d..97d06b4f 100644 --- a/GMW/WebUserControls/mod_assegnaNC.ascx +++ b/GMW/WebUserControls/mod_assegnaNC.ascx @@ -1,5 +1,7 @@ <%@ Control Language="C#" AutoEventWireup="true" CodeBehind="mod_assegnaNC.ascx.cs" Inherits="GMW.WebUserControls.mod_assegnaNC" %> <%@ Register Src="~/WebUserControls/mod_selPeriodo.ascx" TagPrefix="uc1" TagName="mod_selPeriodo" %> +<%@ Register Src="~/WebUserControls/mod_righePag.ascx" TagPrefix="uc1" TagName="mod_righePag" %> +
@@ -18,6 +20,16 @@
+
+
+ <%: traduci("btnSaveSelUdc") %> + <%: traduci("btnCancel") %> +
+
+ <%: traduci("btnConfermaNC") %> + <%: traduci("btnRistampaNC") %> +
+
@@ -34,11 +46,11 @@ - + + OnCheckedChanged="btnSelAll_Click" CssClass="ctrHeaderPager" AutoPostBack="true" Enabled='<%# editEnabled %>'> @@ -71,9 +83,7 @@ -
-
- <%: traduci("btnSaveSelUdc") %> +
a questo punto diff --git a/GMW/WebUserControls/mod_assegnaNC.ascx.cs b/GMW/WebUserControls/mod_assegnaNC.ascx.cs index cca6e3bf..1620b405 100644 --- a/GMW/WebUserControls/mod_assegnaNC.ascx.cs +++ b/GMW/WebUserControls/mod_assegnaNC.ascx.cs @@ -11,13 +11,26 @@ namespace GMW.WebUserControls { public partial class mod_assegnaNC : System.Web.UI.UserControl { + /// + /// caricamento pagina! + /// + /// + /// protected void Page_Load(object sender, EventArgs e) { mod_selPeriodo.eh_doUpdate += mod_selPeriodo_eh_doUpdate; if (!Page.IsPostBack) { + mod_righePag.numRowPag = memLayer.ML.CRI("_righeDataGridShort"); + grView.PageSize = mod_righePag.numRowPag; fixSelections(); } + mod_righePag.eh_newNum += mod_righePag_eh_newNum; + } + + void mod_righePag_eh_newNum(object sender, EventArgs e) + { + grView.PageSize = mod_righePag.numRowPag; } /// /// sistema selezione da valori db della NC corrente @@ -39,12 +52,35 @@ namespace GMW.WebUserControls intervallo.fine = riga.DataTo; mod_selPeriodo.intervalloAnalisi = intervallo; mod_selPeriodo.doUpdate(false); + // salvo editabilità della NC corrente... + editEnabled = !riga.IsCompl; + // imposto controlli selezione (abilitati o meno) + mod_selPeriodo.editEnabled = editEnabled; + ddlSelTipo.Enabled = editEnabled; + txtSearch.Enabled = editEnabled; + // definisco visibilità buttons completa/stampa in base a stato chiusura + lbConfermaNC.Visible = editEnabled; + lbPrint.Visible = !editEnabled; } catch { } } } /// + /// verifica se edit della NC sia permesso, controllando lo stato da DB (SE NON in sessione) + /// + public bool editEnabled + { + get + { + return memLayer.ML.BoolSessionObj(string.Format("NC_{0}", idxNcSel)); + } + set + { + memLayer.ML.setSessionVal(string.Format("NC_{0}", idxNcSel), value); + } + } + /// /// RicercaSel /// public string NoteNC @@ -79,6 +115,7 @@ namespace GMW.WebUserControls public void doUpdate() { + lbSave.Visible = false; // aggiorna selezione effettuata (numero records, ...) fixSelections(); } @@ -118,7 +155,16 @@ namespace GMW.WebUserControls { ((CheckBox)riga.FindControl("chkSelect")).Checked = isChecked; } - lbSaveSel.Visible = true; + fixShowSalvaSel(true); + } + /// + /// sistemo visualizzazione salvataggio selezioni/cancel... + /// + /// + private void fixShowSalvaSel(bool btnSave) + { + lbSaveSel.Visible = btnSave; + lbCancel.Visible = btnSave; } /// /// salva nuovo filtraggio @@ -130,7 +176,7 @@ namespace GMW.WebUserControls salvaFilt(); } /// - /// salva nelenco selezioni UDC + /// salva elenco selezioni UDC /// /// /// @@ -150,7 +196,54 @@ namespace GMW.WebUserControls } } grView.DataBind(); - lbSaveSel.Visible = false; + fixShowSalvaSel(false); + } + /// + /// annulla modifiche selezione + /// + /// + /// + protected void lbCancel_Click(object sender, EventArgs e) + { + grView.SelectedIndex = -1; + grView.DataBind(); + fixShowSalvaSel(false); + } + /// + /// salva e CONGELA la NC + /// + /// + /// + protected void lbConfermaNC_Click(object sender, EventArgs e) + { + DataProxy.obj.taENC.updCompleta(idxNcSel, true); + fixSelections(); + grView.DataBind(); + } + /// + /// (ri)stampa la NC + /// + /// + /// + protected void lbPrint_Click(object sender, EventArgs e) + { +#if false + // ciclo grView e salvo le righe selezionate, e cancello le EVENTUALI deselezionate + DateTime start; + foreach (GridViewRow riga in grView.Rows) + { + if (((CheckBox)riga.FindControl("chkSelect")).Visible) + { + start = DateTime.Now; + // recupero codice UDC... + string UDC = ((Label)riga.FindControl("lblUDC")).Text; + // chiamo toggle selezione... + DataProxy.obj.taUDC2NC.toggleSel(idxNcSel, UDC, ((CheckBox)riga.FindControl("chkSelect")).Checked); + } + } + grView.DataBind(); + fixShowSalvaSel(false); +#endif } /// /// salvo il nuovo filtraggio... @@ -171,7 +264,7 @@ namespace GMW.WebUserControls protected void chkSelect_CheckedChanged(object sender, EventArgs e) { // mostro pulsante salvataggio... - lbSaveSel.Visible = true; + fixShowSalvaSel(true); } } } \ No newline at end of file diff --git a/GMW/WebUserControls/mod_assegnaNC.ascx.designer.cs b/GMW/WebUserControls/mod_assegnaNC.ascx.designer.cs index 7bf7e1b1..299cab2d 100644 --- a/GMW/WebUserControls/mod_assegnaNC.ascx.designer.cs +++ b/GMW/WebUserControls/mod_assegnaNC.ascx.designer.cs @@ -66,6 +66,42 @@ namespace GMW.WebUserControls { /// protected global::System.Web.UI.WebControls.LinkButton lbSave; + /// + /// lbSaveSel control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.LinkButton lbSaveSel; + + /// + /// lbCancel control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.LinkButton lbCancel; + + /// + /// lbConfermaNC control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.LinkButton lbConfermaNC; + + /// + /// lbPrint control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.LinkButton lbPrint; + /// /// grView control. /// @@ -85,12 +121,12 @@ namespace GMW.WebUserControls { protected global::System.Web.UI.WebControls.ObjectDataSource ods; /// - /// lbSaveSel control. + /// mod_righePag control. /// /// /// Auto-generated field. /// To modify move field declaration from designer file to code-behind file. /// - protected global::System.Web.UI.WebControls.LinkButton lbSaveSel; + protected global::GMW.WebUserControls.mod_righePag mod_righePag; } } diff --git a/GMW/WebUserControls/mod_elencoNC.ascx b/GMW/WebUserControls/mod_elencoNC.ascx index 020290c1..81784651 100644 --- a/GMW/WebUserControls/mod_elencoNC.ascx +++ b/GMW/WebUserControls/mod_elencoNC.ascx @@ -42,7 +42,7 @@   - +
diff --git a/GMW/WebUserControls/mod_elencoNC.ascx.cs b/GMW/WebUserControls/mod_elencoNC.ascx.cs index ca0ac354..635e3082 100644 --- a/GMW/WebUserControls/mod_elencoNC.ascx.cs +++ b/GMW/WebUserControls/mod_elencoNC.ascx.cs @@ -41,6 +41,25 @@ namespace GMW.WebUserControls grView.PageSize = mod_righePag.numRowPag; } /// + /// verifica se edit della NC sia permesso, controllando lo stato da DB (SE NON in sessione) + /// + /// + /// + public bool editEnabNC(object _idxNC) + { + int idxNC = 0; + bool answ = false; + try + { + idxNC = Convert.ToInt32(_idxNC); + DS_Applicazione.ElencoNCRow riga = DataProxy.obj.taENC.getByKey(idxNC)[0]; + answ = !riga.IsCompl; + } + catch + { } + return answ; + } + /// /// idxNC selezionato /// public int idxNcSel @@ -65,7 +84,7 @@ namespace GMW.WebUserControls { try { - int idxNC=Convert.ToInt32(grView.SelectedDataKey["IdxNC"]); + int idxNC = Convert.ToInt32(grView.SelectedDataKey["IdxNC"]); DS_Applicazione.ElencoNCRow riga = DataProxy.obj.taENC.getByKey(idxNC)[0]; lblSel.Text = string.Format("[{3}] Cod: {0} - {1} ({2:yyyy/MM/dd HH:mm})", riga.CodNC, riga.DescrNC, riga.DtCreaz, riga.IdxNC); } diff --git a/GMW/WebUserControls/mod_selPeriodo.ascx.cs b/GMW/WebUserControls/mod_selPeriodo.ascx.cs index b49f60d5..79e0c619 100644 --- a/GMW/WebUserControls/mod_selPeriodo.ascx.cs +++ b/GMW/WebUserControls/mod_selPeriodo.ascx.cs @@ -300,6 +300,24 @@ namespace GMW.WebUserControls { ddlSelPeriodo.SelectedIndex = 0; } + /// + /// imposta editabilità controllo + /// + public bool editEnabled + { + get + { + return ddlSelPeriodo.Enabled; + } + set + { + txtInizio.Enabled = value; + txtFine.Enabled = value; + ddlOraInizio.Enabled = value; + ddlOraFine.Enabled = value; + ddlSelPeriodo.Enabled = value; + } + } #region gestione eventi diff --git a/GMW/bin/GMW.dll b/GMW/bin/GMW.dll index ac4840ea..19b45799 100644 Binary files a/GMW/bin/GMW.dll and b/GMW/bin/GMW.dll differ diff --git a/GMW/bin/GMW_data.dll b/GMW/bin/GMW_data.dll index cd975d96..18536189 100644 Binary files a/GMW/bin/GMW_data.dll and b/GMW/bin/GMW_data.dll differ diff --git a/GMW_data/DS_Applicazione.Designer.cs b/GMW_data/DS_Applicazione.Designer.cs index 5f0edc10..5ed7bef2 100644 --- a/GMW_data/DS_Applicazione.Designer.cs +++ b/GMW_data/DS_Applicazione.Designer.cs @@ -8881,6 +8881,8 @@ namespace GMW_data { private global::System.Data.DataColumn columnDtCreaz; + private global::System.Data.DataColumn columnIsCompl; + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] public ElencoNCDataTable() { @@ -8978,6 +8980,14 @@ namespace GMW_data { } } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + public global::System.Data.DataColumn IsComplColumn { + get { + return this.columnIsCompl; + } + } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] [global::System.ComponentModel.Browsable(false)] @@ -9015,7 +9025,7 @@ namespace GMW_data { [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] - public ElencoNCRow AddElencoNCRow(string CodNC, string DescrNC, string TipoCart, System.DateTime DataFrom, System.DateTime DataTo, string SearchNote, System.DateTime DtCreaz) { + public ElencoNCRow AddElencoNCRow(string CodNC, string DescrNC, string TipoCart, System.DateTime DataFrom, System.DateTime DataTo, string SearchNote, System.DateTime DtCreaz, bool IsCompl) { ElencoNCRow rowElencoNCRow = ((ElencoNCRow)(this.NewRow())); object[] columnValuesArray = new object[] { null, @@ -9025,7 +9035,8 @@ namespace GMW_data { DataFrom, DataTo, SearchNote, - DtCreaz}; + DtCreaz, + IsCompl}; rowElencoNCRow.ItemArray = columnValuesArray; this.Rows.Add(rowElencoNCRow); return rowElencoNCRow; @@ -9063,6 +9074,7 @@ namespace GMW_data { this.columnDataTo = base.Columns["DataTo"]; this.columnSearchNote = base.Columns["SearchNote"]; this.columnDtCreaz = base.Columns["DtCreaz"]; + this.columnIsCompl = base.Columns["IsCompl"]; } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] @@ -9084,6 +9096,8 @@ namespace GMW_data { base.Columns.Add(this.columnSearchNote); this.columnDtCreaz = new global::System.Data.DataColumn("DtCreaz", typeof(global::System.DateTime), null, global::System.Data.MappingType.Element); base.Columns.Add(this.columnDtCreaz); + this.columnIsCompl = new global::System.Data.DataColumn("IsCompl", typeof(bool), null, global::System.Data.MappingType.Element); + base.Columns.Add(this.columnIsCompl); this.Constraints.Add(new global::System.Data.UniqueConstraint("Constraint1", new global::System.Data.DataColumn[] { this.columnIdxNC}, true)); this.columnIdxNC.AutoIncrement = true; @@ -9101,6 +9115,7 @@ namespace GMW_data { this.columnSearchNote.AllowDBNull = false; this.columnSearchNote.MaxLength = 50; this.columnDtCreaz.AllowDBNull = false; + this.columnIsCompl.AllowDBNull = false; } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] @@ -14549,6 +14564,17 @@ namespace GMW_data { } } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + public bool IsCompl { + get { + return ((bool)(this[this.tableElencoNC.IsComplColumn])); + } + set { + this[this.tableElencoNC.IsComplColumn] = value; + } + } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] public bool IsDataFromNull() { @@ -25648,10 +25674,11 @@ SELECT codPostazione, stampante, note, FormatoDtmx FROM ElencoPostazioni WHERE ( tableMapping.ColumnMappings.Add("DataTo", "DataTo"); tableMapping.ColumnMappings.Add("SearchNote", "SearchNote"); tableMapping.ColumnMappings.Add("DtCreaz", "DtCreaz"); + tableMapping.ColumnMappings.Add("IsCompl", "IsCompl"); this._adapter.TableMappings.Add(tableMapping); this._adapter.DeleteCommand = new global::System.Data.SqlClient.SqlCommand(); this._adapter.DeleteCommand.Connection = this.Connection; - this._adapter.DeleteCommand.CommandText = @"DELETE FROM [ElencoNC] WHERE (([IdxNC] = @Original_IdxNC) AND ([CodNC] = @Original_CodNC) AND ([DescrNC] = @Original_DescrNC) AND ([TipoCart] = @Original_TipoCart) AND ((@IsNull_DataFrom = 1 AND [DataFrom] IS NULL) OR ([DataFrom] = @Original_DataFrom)) AND ((@IsNull_DataTo = 1 AND [DataTo] IS NULL) OR ([DataTo] = @Original_DataTo)) AND ([SearchNote] = @Original_SearchNote) AND ([DtCreaz] = @Original_DtCreaz))"; + this._adapter.DeleteCommand.CommandText = @"DELETE FROM [ElencoNC] WHERE (([IdxNC] = @Original_IdxNC) AND ([CodNC] = @Original_CodNC) AND ([DescrNC] = @Original_DescrNC) AND ([TipoCart] = @Original_TipoCart) AND ((@IsNull_DataFrom = 1 AND [DataFrom] IS NULL) OR ([DataFrom] = @Original_DataFrom)) AND ((@IsNull_DataTo = 1 AND [DataTo] IS NULL) OR ([DataTo] = @Original_DataTo)) AND ([SearchNote] = @Original_SearchNote) AND ([DtCreaz] = @Original_DtCreaz) AND ([IsCompl] = @Original_IsCompl))"; this._adapter.DeleteCommand.CommandType = global::System.Data.CommandType.Text; this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_IdxNC", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "IdxNC", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_CodNC", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "CodNC", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); @@ -25663,10 +25690,11 @@ SELECT codPostazione, stampante, note, FormatoDtmx FROM ElencoPostazioni WHERE ( this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_DataTo", global::System.Data.SqlDbType.DateTime, 0, global::System.Data.ParameterDirection.Input, 0, 0, "DataTo", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_SearchNote", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "SearchNote", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_DtCreaz", global::System.Data.SqlDbType.DateTime, 0, global::System.Data.ParameterDirection.Input, 0, 0, "DtCreaz", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); + this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_IsCompl", global::System.Data.SqlDbType.Bit, 0, global::System.Data.ParameterDirection.Input, 0, 0, "IsCompl", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); this._adapter.InsertCommand = new global::System.Data.SqlClient.SqlCommand(); this._adapter.InsertCommand.Connection = this.Connection; - this._adapter.InsertCommand.CommandText = @"INSERT INTO [ElencoNC] ([CodNC], [DescrNC], [TipoCart], [DataFrom], [DataTo], [SearchNote], [DtCreaz]) VALUES (@CodNC, @DescrNC, @TipoCart, @DataFrom, @DataTo, @SearchNote, @DtCreaz); -SELECT IdxNC, CodNC, DescrNC, TipoCart, DataFrom, DataTo, SearchNote, DtCreaz FROM ElencoNC WHERE (IdxNC = SCOPE_IDENTITY())"; + this._adapter.InsertCommand.CommandText = @"INSERT INTO [ElencoNC] ([CodNC], [DescrNC], [TipoCart], [DataFrom], [DataTo], [SearchNote], [DtCreaz], [IsCompl]) VALUES (@CodNC, @DescrNC, @TipoCart, @DataFrom, @DataTo, @SearchNote, @DtCreaz, @IsCompl); +SELECT IdxNC, CodNC, DescrNC, TipoCart, DataFrom, DataTo, SearchNote, DtCreaz, IsCompl FROM ElencoNC WHERE (IdxNC = SCOPE_IDENTITY())"; this._adapter.InsertCommand.CommandType = global::System.Data.CommandType.Text; this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@CodNC", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "CodNC", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@DescrNC", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "DescrNC", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); @@ -25675,10 +25703,11 @@ SELECT IdxNC, CodNC, DescrNC, TipoCart, DataFrom, DataTo, SearchNote, DtCreaz FR this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@DataTo", global::System.Data.SqlDbType.DateTime, 0, global::System.Data.ParameterDirection.Input, 0, 0, "DataTo", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@SearchNote", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "SearchNote", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@DtCreaz", global::System.Data.SqlDbType.DateTime, 0, global::System.Data.ParameterDirection.Input, 0, 0, "DtCreaz", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsCompl", global::System.Data.SqlDbType.Bit, 0, global::System.Data.ParameterDirection.Input, 0, 0, "IsCompl", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._adapter.UpdateCommand = new global::System.Data.SqlClient.SqlCommand(); this._adapter.UpdateCommand.Connection = this.Connection; - this._adapter.UpdateCommand.CommandText = @"UPDATE [ElencoNC] SET [CodNC] = @CodNC, [DescrNC] = @DescrNC, [TipoCart] = @TipoCart, [DataFrom] = @DataFrom, [DataTo] = @DataTo, [SearchNote] = @SearchNote, [DtCreaz] = @DtCreaz WHERE (([IdxNC] = @Original_IdxNC) AND ([CodNC] = @Original_CodNC) AND ([DescrNC] = @Original_DescrNC) AND ([TipoCart] = @Original_TipoCart) AND ((@IsNull_DataFrom = 1 AND [DataFrom] IS NULL) OR ([DataFrom] = @Original_DataFrom)) AND ((@IsNull_DataTo = 1 AND [DataTo] IS NULL) OR ([DataTo] = @Original_DataTo)) AND ([SearchNote] = @Original_SearchNote) AND ([DtCreaz] = @Original_DtCreaz)); -SELECT IdxNC, CodNC, DescrNC, TipoCart, DataFrom, DataTo, SearchNote, DtCreaz FROM ElencoNC WHERE (IdxNC = @IdxNC)"; + this._adapter.UpdateCommand.CommandText = @"UPDATE [ElencoNC] SET [CodNC] = @CodNC, [DescrNC] = @DescrNC, [TipoCart] = @TipoCart, [DataFrom] = @DataFrom, [DataTo] = @DataTo, [SearchNote] = @SearchNote, [DtCreaz] = @DtCreaz, [IsCompl] = @IsCompl WHERE (([IdxNC] = @Original_IdxNC) AND ([CodNC] = @Original_CodNC) AND ([DescrNC] = @Original_DescrNC) AND ([TipoCart] = @Original_TipoCart) AND ((@IsNull_DataFrom = 1 AND [DataFrom] IS NULL) OR ([DataFrom] = @Original_DataFrom)) AND ((@IsNull_DataTo = 1 AND [DataTo] IS NULL) OR ([DataTo] = @Original_DataTo)) AND ([SearchNote] = @Original_SearchNote) AND ([DtCreaz] = @Original_DtCreaz) AND ([IsCompl] = @Original_IsCompl)); +SELECT IdxNC, CodNC, DescrNC, TipoCart, DataFrom, DataTo, SearchNote, DtCreaz, IsCompl FROM ElencoNC WHERE (IdxNC = @IdxNC)"; this._adapter.UpdateCommand.CommandType = global::System.Data.CommandType.Text; this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@CodNC", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "CodNC", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@DescrNC", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "DescrNC", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); @@ -25687,6 +25716,7 @@ SELECT IdxNC, CodNC, DescrNC, TipoCart, DataFrom, DataTo, SearchNote, DtCreaz FR this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@DataTo", global::System.Data.SqlDbType.DateTime, 0, global::System.Data.ParameterDirection.Input, 0, 0, "DataTo", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@SearchNote", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "SearchNote", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@DtCreaz", global::System.Data.SqlDbType.DateTime, 0, global::System.Data.ParameterDirection.Input, 0, 0, "DtCreaz", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsCompl", global::System.Data.SqlDbType.Bit, 0, global::System.Data.ParameterDirection.Input, 0, 0, "IsCompl", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_IdxNC", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "IdxNC", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_CodNC", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "CodNC", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_DescrNC", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "DescrNC", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); @@ -25697,6 +25727,7 @@ SELECT IdxNC, CodNC, DescrNC, TipoCart, DataFrom, DataTo, SearchNote, DtCreaz FR this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_DataTo", global::System.Data.SqlDbType.DateTime, 0, global::System.Data.ParameterDirection.Input, 0, 0, "DataTo", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_SearchNote", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "SearchNote", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_DtCreaz", global::System.Data.SqlDbType.DateTime, 0, global::System.Data.ParameterDirection.Input, 0, 0, "DtCreaz", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); + this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_IsCompl", global::System.Data.SqlDbType.Bit, 0, global::System.Data.ParameterDirection.Input, 0, 0, "IsCompl", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IdxNC", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 0, 0, "IdxNC", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); } @@ -25713,8 +25744,7 @@ SELECT IdxNC, CodNC, DescrNC, TipoCart, DataFrom, DataTo, SearchNote, DtCreaz FR this._commandCollection = new global::System.Data.SqlClient.SqlCommand[9]; this._commandCollection[0] = new global::System.Data.SqlClient.SqlCommand(); this._commandCollection[0].Connection = this.Connection; - this._commandCollection[0].CommandText = "SELECT IdxNC, CodNC, DescrNC, TipoCart, DataFrom, DataTo, SearchNote, DtCreaz FRO" + - "M ElencoNC"; + this._commandCollection[0].CommandText = "SELECT *\r\nFROM ElencoNC"; this._commandCollection[0].CommandType = global::System.Data.CommandType.Text; this._commandCollection[1] = new global::System.Data.SqlClient.SqlCommand(); this._commandCollection[1].Connection = this.Connection; @@ -25877,7 +25907,7 @@ SELECT IdxNC, CodNC, DescrNC, TipoCart, DataFrom, DataTo, SearchNote, DtCreaz FR [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.Delete, true)] - public virtual int Delete(int Original_IdxNC, string Original_CodNC, string Original_DescrNC, string Original_TipoCart, global::System.Nullable Original_DataFrom, global::System.Nullable Original_DataTo, string Original_SearchNote, System.DateTime Original_DtCreaz) { + public virtual int Delete(int Original_IdxNC, string Original_CodNC, string Original_DescrNC, string Original_TipoCart, global::System.Nullable Original_DataFrom, global::System.Nullable Original_DataTo, string Original_SearchNote, System.DateTime Original_DtCreaz, bool Original_IsCompl) { this.Adapter.DeleteCommand.Parameters[0].Value = ((int)(Original_IdxNC)); if ((Original_CodNC == null)) { throw new global::System.ArgumentNullException("Original_CodNC"); @@ -25920,6 +25950,7 @@ SELECT IdxNC, CodNC, DescrNC, TipoCart, DataFrom, DataTo, SearchNote, DtCreaz FR this.Adapter.DeleteCommand.Parameters[8].Value = ((string)(Original_SearchNote)); } this.Adapter.DeleteCommand.Parameters[9].Value = ((System.DateTime)(Original_DtCreaz)); + this.Adapter.DeleteCommand.Parameters[10].Value = ((bool)(Original_IsCompl)); global::System.Data.ConnectionState previousConnectionState = this.Adapter.DeleteCommand.Connection.State; if (((this.Adapter.DeleteCommand.Connection.State & global::System.Data.ConnectionState.Open) != global::System.Data.ConnectionState.Open)) { @@ -25940,7 +25971,7 @@ SELECT IdxNC, CodNC, DescrNC, TipoCart, DataFrom, DataTo, SearchNote, DtCreaz FR [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.Insert, true)] - public virtual int Insert(string CodNC, string DescrNC, string TipoCart, global::System.Nullable DataFrom, global::System.Nullable DataTo, string SearchNote, System.DateTime DtCreaz) { + public virtual int Insert(string CodNC, string DescrNC, string TipoCart, global::System.Nullable DataFrom, global::System.Nullable DataTo, string SearchNote, System.DateTime DtCreaz, bool IsCompl) { if ((CodNC == null)) { throw new global::System.ArgumentNullException("CodNC"); } @@ -25978,6 +26009,7 @@ SELECT IdxNC, CodNC, DescrNC, TipoCart, DataFrom, DataTo, SearchNote, DtCreaz FR this.Adapter.InsertCommand.Parameters[5].Value = ((string)(SearchNote)); } this.Adapter.InsertCommand.Parameters[6].Value = ((System.DateTime)(DtCreaz)); + this.Adapter.InsertCommand.Parameters[7].Value = ((bool)(IsCompl)); global::System.Data.ConnectionState previousConnectionState = this.Adapter.InsertCommand.Connection.State; if (((this.Adapter.InsertCommand.Connection.State & global::System.Data.ConnectionState.Open) != global::System.Data.ConnectionState.Open)) { @@ -26006,6 +26038,7 @@ SELECT IdxNC, CodNC, DescrNC, TipoCart, DataFrom, DataTo, SearchNote, DtCreaz FR global::System.Nullable DataTo, string SearchNote, System.DateTime DtCreaz, + bool IsCompl, int Original_IdxNC, string Original_CodNC, string Original_DescrNC, @@ -26014,6 +26047,7 @@ SELECT IdxNC, CodNC, DescrNC, TipoCart, DataFrom, DataTo, SearchNote, DtCreaz FR global::System.Nullable Original_DataTo, string Original_SearchNote, System.DateTime Original_DtCreaz, + bool Original_IsCompl, int IdxNC) { if ((CodNC == null)) { throw new global::System.ArgumentNullException("CodNC"); @@ -26052,49 +26086,51 @@ SELECT IdxNC, CodNC, DescrNC, TipoCart, DataFrom, DataTo, SearchNote, DtCreaz FR this.Adapter.UpdateCommand.Parameters[5].Value = ((string)(SearchNote)); } this.Adapter.UpdateCommand.Parameters[6].Value = ((System.DateTime)(DtCreaz)); - this.Adapter.UpdateCommand.Parameters[7].Value = ((int)(Original_IdxNC)); + this.Adapter.UpdateCommand.Parameters[7].Value = ((bool)(IsCompl)); + this.Adapter.UpdateCommand.Parameters[8].Value = ((int)(Original_IdxNC)); if ((Original_CodNC == null)) { throw new global::System.ArgumentNullException("Original_CodNC"); } else { - this.Adapter.UpdateCommand.Parameters[8].Value = ((string)(Original_CodNC)); + this.Adapter.UpdateCommand.Parameters[9].Value = ((string)(Original_CodNC)); } if ((Original_DescrNC == null)) { throw new global::System.ArgumentNullException("Original_DescrNC"); } else { - this.Adapter.UpdateCommand.Parameters[9].Value = ((string)(Original_DescrNC)); + this.Adapter.UpdateCommand.Parameters[10].Value = ((string)(Original_DescrNC)); } if ((Original_TipoCart == null)) { throw new global::System.ArgumentNullException("Original_TipoCart"); } else { - this.Adapter.UpdateCommand.Parameters[10].Value = ((string)(Original_TipoCart)); + this.Adapter.UpdateCommand.Parameters[11].Value = ((string)(Original_TipoCart)); } if ((Original_DataFrom.HasValue == true)) { - this.Adapter.UpdateCommand.Parameters[11].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[12].Value = ((System.DateTime)(Original_DataFrom.Value)); + this.Adapter.UpdateCommand.Parameters[12].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[13].Value = ((System.DateTime)(Original_DataFrom.Value)); } else { - this.Adapter.UpdateCommand.Parameters[11].Value = ((object)(1)); - this.Adapter.UpdateCommand.Parameters[12].Value = global::System.DBNull.Value; + this.Adapter.UpdateCommand.Parameters[12].Value = ((object)(1)); + this.Adapter.UpdateCommand.Parameters[13].Value = global::System.DBNull.Value; } if ((Original_DataTo.HasValue == true)) { - this.Adapter.UpdateCommand.Parameters[13].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[14].Value = ((System.DateTime)(Original_DataTo.Value)); + this.Adapter.UpdateCommand.Parameters[14].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[15].Value = ((System.DateTime)(Original_DataTo.Value)); } else { - this.Adapter.UpdateCommand.Parameters[13].Value = ((object)(1)); - this.Adapter.UpdateCommand.Parameters[14].Value = global::System.DBNull.Value; + this.Adapter.UpdateCommand.Parameters[14].Value = ((object)(1)); + this.Adapter.UpdateCommand.Parameters[15].Value = global::System.DBNull.Value; } if ((Original_SearchNote == null)) { throw new global::System.ArgumentNullException("Original_SearchNote"); } else { - this.Adapter.UpdateCommand.Parameters[15].Value = ((string)(Original_SearchNote)); + this.Adapter.UpdateCommand.Parameters[16].Value = ((string)(Original_SearchNote)); } - this.Adapter.UpdateCommand.Parameters[16].Value = ((System.DateTime)(Original_DtCreaz)); - this.Adapter.UpdateCommand.Parameters[17].Value = ((int)(IdxNC)); + this.Adapter.UpdateCommand.Parameters[17].Value = ((System.DateTime)(Original_DtCreaz)); + this.Adapter.UpdateCommand.Parameters[18].Value = ((bool)(Original_IsCompl)); + this.Adapter.UpdateCommand.Parameters[19].Value = ((int)(IdxNC)); global::System.Data.ConnectionState previousConnectionState = this.Adapter.UpdateCommand.Connection.State; if (((this.Adapter.UpdateCommand.Connection.State & global::System.Data.ConnectionState.Open) != global::System.Data.ConnectionState.Open)) { @@ -26115,8 +26151,25 @@ SELECT IdxNC, CodNC, DescrNC, TipoCart, DataFrom, DataTo, SearchNote, DtCreaz FR [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.Update, true)] - public virtual int Update(string CodNC, string DescrNC, string TipoCart, global::System.Nullable DataFrom, global::System.Nullable DataTo, string SearchNote, System.DateTime DtCreaz, int Original_IdxNC, string Original_CodNC, string Original_DescrNC, string Original_TipoCart, global::System.Nullable Original_DataFrom, global::System.Nullable Original_DataTo, string Original_SearchNote, System.DateTime Original_DtCreaz) { - return this.Update(CodNC, DescrNC, TipoCart, DataFrom, DataTo, SearchNote, DtCreaz, Original_IdxNC, Original_CodNC, Original_DescrNC, Original_TipoCart, Original_DataFrom, Original_DataTo, Original_SearchNote, Original_DtCreaz, Original_IdxNC); + public virtual int Update( + string CodNC, + string DescrNC, + string TipoCart, + global::System.Nullable DataFrom, + global::System.Nullable DataTo, + string SearchNote, + System.DateTime DtCreaz, + bool IsCompl, + int Original_IdxNC, + string Original_CodNC, + string Original_DescrNC, + string Original_TipoCart, + global::System.Nullable Original_DataFrom, + global::System.Nullable Original_DataTo, + string Original_SearchNote, + System.DateTime Original_DtCreaz, + bool Original_IsCompl) { + return this.Update(CodNC, DescrNC, TipoCart, DataFrom, DataTo, SearchNote, DtCreaz, IsCompl, Original_IdxNC, Original_CodNC, Original_DescrNC, Original_TipoCart, Original_DataFrom, Original_DataTo, Original_SearchNote, Original_DtCreaz, Original_IsCompl, Original_IdxNC); } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] diff --git a/GMW_data/DS_Applicazione.xsd b/GMW_data/DS_Applicazione.xsd index 755a26da..f5f0f449 100644 --- a/GMW_data/DS_Applicazione.xsd +++ b/GMW_data/DS_Applicazione.xsd @@ -1814,7 +1814,7 @@ SELECT codPostazione, stampante, note, FormatoDtmx FROM ElencoPostazioni WHERE ( - DELETE FROM [ElencoNC] WHERE (([IdxNC] = @Original_IdxNC) AND ([CodNC] = @Original_CodNC) AND ([DescrNC] = @Original_DescrNC) AND ([TipoCart] = @Original_TipoCart) AND ((@IsNull_DataFrom = 1 AND [DataFrom] IS NULL) OR ([DataFrom] = @Original_DataFrom)) AND ((@IsNull_DataTo = 1 AND [DataTo] IS NULL) OR ([DataTo] = @Original_DataTo)) AND ([SearchNote] = @Original_SearchNote) AND ([DtCreaz] = @Original_DtCreaz)) + DELETE FROM [ElencoNC] WHERE (([IdxNC] = @Original_IdxNC) AND ([CodNC] = @Original_CodNC) AND ([DescrNC] = @Original_DescrNC) AND ([TipoCart] = @Original_TipoCart) AND ((@IsNull_DataFrom = 1 AND [DataFrom] IS NULL) OR ([DataFrom] = @Original_DataFrom)) AND ((@IsNull_DataTo = 1 AND [DataTo] IS NULL) OR ([DataTo] = @Original_DataTo)) AND ([SearchNote] = @Original_SearchNote) AND ([DtCreaz] = @Original_DtCreaz) AND ([IsCompl] = @Original_IsCompl)) @@ -1826,13 +1826,14 @@ SELECT codPostazione, stampante, note, FormatoDtmx FROM ElencoPostazioni WHERE ( + - INSERT INTO [ElencoNC] ([CodNC], [DescrNC], [TipoCart], [DataFrom], [DataTo], [SearchNote], [DtCreaz]) VALUES (@CodNC, @DescrNC, @TipoCart, @DataFrom, @DataTo, @SearchNote, @DtCreaz); -SELECT IdxNC, CodNC, DescrNC, TipoCart, DataFrom, DataTo, SearchNote, DtCreaz FROM ElencoNC WHERE (IdxNC = SCOPE_IDENTITY()) + INSERT INTO [ElencoNC] ([CodNC], [DescrNC], [TipoCart], [DataFrom], [DataTo], [SearchNote], [DtCreaz], [IsCompl]) VALUES (@CodNC, @DescrNC, @TipoCart, @DataFrom, @DataTo, @SearchNote, @DtCreaz, @IsCompl); +SELECT IdxNC, CodNC, DescrNC, TipoCart, DataFrom, DataTo, SearchNote, DtCreaz, IsCompl FROM ElencoNC WHERE (IdxNC = SCOPE_IDENTITY()) @@ -1841,19 +1842,21 @@ SELECT IdxNC, CodNC, DescrNC, TipoCart, DataFrom, DataTo, SearchNote, DtCreaz FR + - SELECT IdxNC, CodNC, DescrNC, TipoCart, DataFrom, DataTo, SearchNote, DtCreaz FROM ElencoNC + SELECT * +FROM ElencoNC - UPDATE [ElencoNC] SET [CodNC] = @CodNC, [DescrNC] = @DescrNC, [TipoCart] = @TipoCart, [DataFrom] = @DataFrom, [DataTo] = @DataTo, [SearchNote] = @SearchNote, [DtCreaz] = @DtCreaz WHERE (([IdxNC] = @Original_IdxNC) AND ([CodNC] = @Original_CodNC) AND ([DescrNC] = @Original_DescrNC) AND ([TipoCart] = @Original_TipoCart) AND ((@IsNull_DataFrom = 1 AND [DataFrom] IS NULL) OR ([DataFrom] = @Original_DataFrom)) AND ((@IsNull_DataTo = 1 AND [DataTo] IS NULL) OR ([DataTo] = @Original_DataTo)) AND ([SearchNote] = @Original_SearchNote) AND ([DtCreaz] = @Original_DtCreaz)); -SELECT IdxNC, CodNC, DescrNC, TipoCart, DataFrom, DataTo, SearchNote, DtCreaz FROM ElencoNC WHERE (IdxNC = @IdxNC) + UPDATE [ElencoNC] SET [CodNC] = @CodNC, [DescrNC] = @DescrNC, [TipoCart] = @TipoCart, [DataFrom] = @DataFrom, [DataTo] = @DataTo, [SearchNote] = @SearchNote, [DtCreaz] = @DtCreaz, [IsCompl] = @IsCompl WHERE (([IdxNC] = @Original_IdxNC) AND ([CodNC] = @Original_CodNC) AND ([DescrNC] = @Original_DescrNC) AND ([TipoCart] = @Original_TipoCart) AND ((@IsNull_DataFrom = 1 AND [DataFrom] IS NULL) OR ([DataFrom] = @Original_DataFrom)) AND ((@IsNull_DataTo = 1 AND [DataTo] IS NULL) OR ([DataTo] = @Original_DataTo)) AND ([SearchNote] = @Original_SearchNote) AND ([DtCreaz] = @Original_DtCreaz) AND ([IsCompl] = @Original_IsCompl)); +SELECT IdxNC, CodNC, DescrNC, TipoCart, DataFrom, DataTo, SearchNote, DtCreaz, IsCompl FROM ElencoNC WHERE (IdxNC = @IdxNC) @@ -1862,6 +1865,7 @@ SELECT IdxNC, CodNC, DescrNC, TipoCart, DataFrom, DataTo, SearchNote, DtCreaz FR + @@ -1872,6 +1876,7 @@ SELECT IdxNC, CodNC, DescrNC, TipoCart, DataFrom, DataTo, SearchNote, DtCreaz FR + @@ -1887,6 +1892,7 @@ SELECT IdxNC, CodNC, DescrNC, TipoCart, DataFrom, DataTo, SearchNote, DtCreaz FR + @@ -1957,7 +1963,7 @@ SELECT IdxNC, CodNC, DescrNC, TipoCart, DataFrom, DataTo, SearchNote, DtCreaz FR - + dbo.stp_ENC_updCompleta @@ -1969,7 +1975,7 @@ SELECT IdxNC, CodNC, DescrNC, TipoCart, DataFrom, DataTo, SearchNote, DtCreaz FR - + dbo.stp_ENC_updFilt @@ -1984,7 +1990,7 @@ SELECT IdxNC, CodNC, DescrNC, TipoCart, DataFrom, DataTo, SearchNote, DtCreaz FR - + dbo.stp_ENC_updNome @@ -3226,7 +3232,7 @@ FROM v_UDC_NC - + @@ -3261,10 +3267,11 @@ FROM v_UDC_NC + - + @@ -3409,12 +3416,12 @@ FROM v_UDC_NC - - - - - - + + + + + + \ No newline at end of file diff --git a/GMW_data/DS_Applicazione.xss b/GMW_data/DS_Applicazione.xss index 9bea8f10..658a4648 100644 --- a/GMW_data/DS_Applicazione.xss +++ b/GMW_data/DS_Applicazione.xss @@ -4,7 +4,7 @@ Changes to this file may cause incorrect behavior and will be lost if the code is regenerated. --> - + @@ -26,7 +26,7 @@ - +