diff --git a/GPW_Admin/WebUserControls/mod_reviewTimbrature.ascx b/GPW_Admin/WebUserControls/mod_reviewTimbrature.ascx index 535a294..83b2031 100644 --- a/GPW_Admin/WebUserControls/mod_reviewTimbrature.ascx +++ b/GPW_Admin/WebUserControls/mod_reviewTimbrature.ascx @@ -4,10 +4,7 @@ <%@ Register Src="mod_periodoAnalisi.ascx" TagName="mod_periodoAnalisi" TagPrefix="uc2" %> <%@ Register Src="mod_elencoTimbr.ascx" TagName="mod_elencoTimbr" TagPrefix="uc3" %> <%@ Register Src="mod_commAttivitaDesk.ascx" TagName="mod_commAttivitaDesk" TagPrefix="uc4" %> -<% if (false) - { %> - -<% } %> +
diff --git a/GPW_Commesse/WebUserControls/mod_TagCloudProgetti.ascx b/GPW_Commesse/WebUserControls/mod_TagCloudProgetti.ascx index 8e78fb4..f9b206f 100644 --- a/GPW_Commesse/WebUserControls/mod_TagCloudProgetti.ascx +++ b/GPW_Commesse/WebUserControls/mod_TagCloudProgetti.ascx @@ -1,7 +1,6 @@ <%@ Control Language="C#" AutoEventWireup="true" CodeBehind="mod_TagCloudProgetti.ascx.cs" Inherits="GPW_Commesse.WebUserControls.mod_TagCloudProgetti" %> <%@ Register Src="~/WebUserControls/cmp_toggle.ascx" TagPrefix="uc1" TagName="cmp_toggle" %> -
- +
diff --git a/GPW_Commesse/WebUserControls/mod_TagCloudProgetti.ascx.cs b/GPW_Commesse/WebUserControls/mod_TagCloudProgetti.ascx.cs index 6bc308e..d807e56 100644 --- a/GPW_Commesse/WebUserControls/mod_TagCloudProgetti.ascx.cs +++ b/GPW_Commesse/WebUserControls/mod_TagCloudProgetti.ascx.cs @@ -40,7 +40,11 @@ namespace GPW_Commesse.WebUserControls { get { - bool answ = memLayer.ML.BoolSessionObj("showAddNewRec"); + bool answ = true; + if (memLayer.ML.isInSessionObject("showAddNewRec")) + { + answ = memLayer.ML.BoolSessionObj("showAddNewRec"); + } return answ; } set diff --git a/GPW_Commesse/WebUserControls/mod_commUtLog.ascx b/GPW_Commesse/WebUserControls/mod_commUtLog.ascx index 7b73e8d..89987e3 100644 --- a/GPW_Commesse/WebUserControls/mod_commUtLog.ascx +++ b/GPW_Commesse/WebUserControls/mod_commUtLog.ascx @@ -5,6 +5,8 @@ <%@ Register Src="mod_commUtMancTimbr.ascx" TagName="mod_commUtMancTimbr" TagPrefix="uc4" %> <%@ Register Src="mod_elencoTimbr.ascx" TagName="mod_elencoTimbr" TagPrefix="uc5" %> <%@ Register Src="mod_TagCloudProgetti.ascx" TagName="mod_TagCloudProgetti" TagPrefix="uc6" %> +<%@ Register Src="~/WebUserControls/cmp_toggle.ascx" TagPrefix="uc2" TagName="cmp_toggle" %> + @@ -17,8 +19,8 @@
-
- +
+ Sel globale:
diff --git a/GPW_Commesse/WebUserControls/mod_commUtLog.ascx.cs b/GPW_Commesse/WebUserControls/mod_commUtLog.ascx.cs index 7760e4d..b31d856 100644 --- a/GPW_Commesse/WebUserControls/mod_commUtLog.ascx.cs +++ b/GPW_Commesse/WebUserControls/mod_commUtLog.ascx.cs @@ -34,7 +34,7 @@ namespace GPW_Commesse.WebUserControls { get { - return chkShowBoth.Checked; + return cmp_toggle.toggleValue; } } public string cssClassProgetti @@ -113,6 +113,12 @@ namespace GPW_Commesse.WebUserControls mod_TagCloudProgetti1.eh_newVal += new EventHandler(mod_TagCloudProgetti1_eh_newVal); mod_TagCloudProgetti1.eh_refresh += mod_TagCloudProgetti1_eh_refresh; mod_periodoAnalisi1.eh_doUpdate += mod_periodoAnalisi1_eh_doUpdate; + cmp_toggle.ehToggle += Cmp_toggle_ehToggle; + } + + private void Cmp_toggle_ehToggle(object sender, EventArgs e) + { + showPanels(); } void mod_TagCloudProgetti1_eh_refresh(object sender, EventArgs e) @@ -475,9 +481,5 @@ namespace GPW_Commesse.WebUserControls return answ; } - protected void chkShowBoth_CheckedChanged(object sender, EventArgs e) - { - showPanels(); - } } } \ No newline at end of file diff --git a/GPW_Commesse/WebUserControls/mod_commUtLog.ascx.designer.cs b/GPW_Commesse/WebUserControls/mod_commUtLog.ascx.designer.cs index 84feaf5..20185d2 100644 --- a/GPW_Commesse/WebUserControls/mod_commUtLog.ascx.designer.cs +++ b/GPW_Commesse/WebUserControls/mod_commUtLog.ascx.designer.cs @@ -51,13 +51,13 @@ namespace GPW_Commesse.WebUserControls protected global::mod_periodoAnalisi mod_periodoAnalisi1; /// - /// Controllo chkShowBoth. + /// Controllo cmp_toggle. /// /// /// Campo generato automaticamente. /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. /// - protected global::System.Web.UI.WebControls.CheckBox chkShowBoth; + protected global::GPW_Commesse.WebUserControls.cmp_toggle cmp_toggle; /// /// Controllo divSx. diff --git a/GPW_Data/DS_Applicazione.Designer.cs b/GPW_Data/DS_Applicazione.Designer.cs index faec144..ce82880 100644 --- a/GPW_Data/DS_Applicazione.Designer.cs +++ b/GPW_Data/DS_Applicazione.Designer.cs @@ -1310,12 +1310,12 @@ namespace GPW_data { private global::System.Data.DataColumn columnh_lav; - private global::System.Data.DataColumn columnh_giust; - private global::System.Data.DataColumn columnminLav; private global::System.Data.DataColumn columnminOrd; + private global::System.Data.DataColumn columnminNonLav; + private global::System.Data.DataColumn columnminStra; private global::System.Data.DataColumn columnminPerm; @@ -1326,24 +1326,30 @@ namespace GPW_data { private global::System.Data.DataColumn columnminFest; + private global::System.Data.DataColumn columnminCassa; + + private global::System.Data.DataColumn columnmin104; + + private global::System.Data.DataColumn columnminMpp; + + private global::System.Data.DataColumn columnminArcoPres; + private global::System.Data.DataColumn columnisOkTim; private global::System.Data.DataColumn columnisOkApp; - private global::System.Data.DataColumn columnisOkLav; - - private global::System.Data.DataColumn columnisOk; - - private global::System.Data.DataColumn columnminNonLav; - - private global::System.Data.DataColumn columnminArcoPres; - private global::System.Data.DataColumn columnblock; private global::System.Data.DataColumn columnchkFunCod; private global::System.Data.DataColumn columnchkFunRes; + private global::System.Data.DataColumn columnisOk; + + private global::System.Data.DataColumn columnisOkLav; + + private global::System.Data.DataColumn columnh_giust; + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] public TimbratureExplDataTable() { @@ -1473,14 +1479,6 @@ namespace GPW_data { } } - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] - public global::System.Data.DataColumn h_giustColumn { - get { - return this.columnh_giust; - } - } - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] public global::System.Data.DataColumn minLavColumn { @@ -1497,6 +1495,14 @@ namespace GPW_data { } } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public global::System.Data.DataColumn minNonLavColumn { + get { + return this.columnminNonLav; + } + } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] public global::System.Data.DataColumn minStraColumn { @@ -1537,6 +1543,38 @@ namespace GPW_data { } } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public global::System.Data.DataColumn minCassaColumn { + get { + return this.columnminCassa; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public global::System.Data.DataColumn min104Column { + get { + return this.columnmin104; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public global::System.Data.DataColumn minMppColumn { + get { + return this.columnminMpp; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public global::System.Data.DataColumn minArcoPresColumn { + get { + return this.columnminArcoPres; + } + } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] public global::System.Data.DataColumn isOkTimColumn { @@ -1553,38 +1591,6 @@ namespace GPW_data { } } - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] - public global::System.Data.DataColumn isOkLavColumn { - get { - return this.columnisOkLav; - } - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] - public global::System.Data.DataColumn isOkColumn { - get { - return this.columnisOk; - } - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] - public global::System.Data.DataColumn minNonLavColumn { - get { - return this.columnminNonLav; - } - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] - public global::System.Data.DataColumn minArcoPresColumn { - get { - return this.columnminArcoPres; - } - } - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] public global::System.Data.DataColumn blockColumn { @@ -1609,6 +1615,30 @@ namespace GPW_data { } } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public global::System.Data.DataColumn isOkColumn { + get { + return this.columnisOk; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public global::System.Data.DataColumn isOkLavColumn { + get { + return this.columnisOkLav; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public global::System.Data.DataColumn h_giustColumn { + get { + return this.columnh_giust; + } + } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] [global::System.ComponentModel.Browsable(false)] @@ -1659,23 +1689,26 @@ namespace GPW_data { System.DateTime entrata_4, System.DateTime uscita_4, double h_lav, - double h_giust, int minLav, int minOrd, + int minNonLav, int minStra, int minPerm, int minFer, int minMal, int minFest, + int minCassa, + int min104, + int minMpp, + int minArcoPres, bool isOkTim, bool isOkApp, - int isOkLav, - int isOk, - int minNonLav, - int minArcoPres, bool block, string chkFunCod, - string chkFunRes) { + string chkFunRes, + int isOk, + int isOkLav, + double h_giust) { TimbratureExplRow rowTimbratureExplRow = ((TimbratureExplRow)(this.NewRow())); object[] columnValuesArray = new object[] { dataLav, @@ -1690,23 +1723,26 @@ namespace GPW_data { entrata_4, uscita_4, h_lav, - h_giust, minLav, minOrd, + minNonLav, minStra, minPerm, minFer, minMal, minFest, + minCassa, + min104, + minMpp, + minArcoPres, isOkTim, isOkApp, - isOkLav, - isOk, - minNonLav, - minArcoPres, block, chkFunCod, - chkFunRes}; + chkFunRes, + isOk, + isOkLav, + h_giust}; rowTimbratureExplRow.ItemArray = columnValuesArray; this.Rows.Add(rowTimbratureExplRow); return rowTimbratureExplRow; @@ -1749,23 +1785,26 @@ namespace GPW_data { this.columnentrata_4 = base.Columns["entrata_4"]; this.columnuscita_4 = base.Columns["uscita_4"]; this.columnh_lav = base.Columns["h_lav"]; - this.columnh_giust = base.Columns["h_giust"]; this.columnminLav = base.Columns["minLav"]; this.columnminOrd = base.Columns["minOrd"]; + this.columnminNonLav = base.Columns["minNonLav"]; this.columnminStra = base.Columns["minStra"]; this.columnminPerm = base.Columns["minPerm"]; this.columnminFer = base.Columns["minFer"]; this.columnminMal = base.Columns["minMal"]; this.columnminFest = base.Columns["minFest"]; + this.columnminCassa = base.Columns["minCassa"]; + this.columnmin104 = base.Columns["min104"]; + this.columnminMpp = base.Columns["minMpp"]; + this.columnminArcoPres = base.Columns["minArcoPres"]; this.columnisOkTim = base.Columns["isOkTim"]; this.columnisOkApp = base.Columns["isOkApp"]; - this.columnisOkLav = base.Columns["isOkLav"]; - this.columnisOk = base.Columns["isOk"]; - this.columnminNonLav = base.Columns["minNonLav"]; - this.columnminArcoPres = base.Columns["minArcoPres"]; this.columnblock = base.Columns["block"]; this.columnchkFunCod = base.Columns["chkFunCod"]; this.columnchkFunRes = base.Columns["chkFunRes"]; + this.columnisOk = base.Columns["isOk"]; + this.columnisOkLav = base.Columns["isOkLav"]; + this.columnh_giust = base.Columns["h_giust"]; } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] @@ -1795,12 +1834,12 @@ namespace GPW_data { base.Columns.Add(this.columnuscita_4); this.columnh_lav = new global::System.Data.DataColumn("h_lav", typeof(double), null, global::System.Data.MappingType.Element); base.Columns.Add(this.columnh_lav); - this.columnh_giust = new global::System.Data.DataColumn("h_giust", typeof(double), null, global::System.Data.MappingType.Element); - base.Columns.Add(this.columnh_giust); this.columnminLav = new global::System.Data.DataColumn("minLav", typeof(int), null, global::System.Data.MappingType.Element); base.Columns.Add(this.columnminLav); this.columnminOrd = new global::System.Data.DataColumn("minOrd", typeof(int), null, global::System.Data.MappingType.Element); base.Columns.Add(this.columnminOrd); + this.columnminNonLav = new global::System.Data.DataColumn("minNonLav", typeof(int), null, global::System.Data.MappingType.Element); + base.Columns.Add(this.columnminNonLav); this.columnminStra = new global::System.Data.DataColumn("minStra", typeof(int), null, global::System.Data.MappingType.Element); base.Columns.Add(this.columnminStra); this.columnminPerm = new global::System.Data.DataColumn("minPerm", typeof(int), null, global::System.Data.MappingType.Element); @@ -1811,37 +1850,42 @@ namespace GPW_data { base.Columns.Add(this.columnminMal); this.columnminFest = new global::System.Data.DataColumn("minFest", typeof(int), null, global::System.Data.MappingType.Element); base.Columns.Add(this.columnminFest); + this.columnminCassa = new global::System.Data.DataColumn("minCassa", typeof(int), null, global::System.Data.MappingType.Element); + base.Columns.Add(this.columnminCassa); + this.columnmin104 = new global::System.Data.DataColumn("min104", typeof(int), null, global::System.Data.MappingType.Element); + base.Columns.Add(this.columnmin104); + this.columnminMpp = new global::System.Data.DataColumn("minMpp", typeof(int), null, global::System.Data.MappingType.Element); + base.Columns.Add(this.columnminMpp); + this.columnminArcoPres = new global::System.Data.DataColumn("minArcoPres", typeof(int), null, global::System.Data.MappingType.Element); + base.Columns.Add(this.columnminArcoPres); this.columnisOkTim = new global::System.Data.DataColumn("isOkTim", typeof(bool), null, global::System.Data.MappingType.Element); base.Columns.Add(this.columnisOkTim); this.columnisOkApp = new global::System.Data.DataColumn("isOkApp", typeof(bool), null, global::System.Data.MappingType.Element); base.Columns.Add(this.columnisOkApp); - this.columnisOkLav = new global::System.Data.DataColumn("isOkLav", typeof(int), null, global::System.Data.MappingType.Element); - base.Columns.Add(this.columnisOkLav); - this.columnisOk = new global::System.Data.DataColumn("isOk", typeof(int), null, global::System.Data.MappingType.Element); - base.Columns.Add(this.columnisOk); - this.columnminNonLav = new global::System.Data.DataColumn("minNonLav", typeof(int), null, global::System.Data.MappingType.Element); - base.Columns.Add(this.columnminNonLav); - this.columnminArcoPres = new global::System.Data.DataColumn("minArcoPres", typeof(int), null, global::System.Data.MappingType.Element); - base.Columns.Add(this.columnminArcoPres); this.columnblock = new global::System.Data.DataColumn("block", typeof(bool), null, global::System.Data.MappingType.Element); base.Columns.Add(this.columnblock); this.columnchkFunCod = new global::System.Data.DataColumn("chkFunCod", typeof(string), null, global::System.Data.MappingType.Element); base.Columns.Add(this.columnchkFunCod); this.columnchkFunRes = new global::System.Data.DataColumn("chkFunRes", typeof(string), null, global::System.Data.MappingType.Element); base.Columns.Add(this.columnchkFunRes); + this.columnisOk = new global::System.Data.DataColumn("isOk", typeof(int), null, global::System.Data.MappingType.Element); + base.Columns.Add(this.columnisOk); + this.columnisOkLav = new global::System.Data.DataColumn("isOkLav", typeof(int), null, global::System.Data.MappingType.Element); + base.Columns.Add(this.columnisOkLav); + this.columnh_giust = new global::System.Data.DataColumn("h_giust", typeof(double), null, global::System.Data.MappingType.Element); + base.Columns.Add(this.columnh_giust); this.Constraints.Add(new global::System.Data.UniqueConstraint("Constraint1", new global::System.Data.DataColumn[] { this.columndataLav, this.columnidxDipendente}, true)); this.columndataLav.AllowDBNull = false; this.columnidxDipendente.AllowDBNull = false; this.columnCognomeNome.MaxLength = 100; - this.columnh_giust.ReadOnly = true; - this.columnminStra.ReadOnly = true; - this.columnisOkLav.ReadOnly = true; - this.columnisOk.ReadOnly = true; this.columnminArcoPres.ReadOnly = true; this.columnchkFunCod.MaxLength = 50; this.columnchkFunRes.MaxLength = 50; + this.columnisOk.ReadOnly = true; + this.columnisOkLav.ReadOnly = true; + this.columnh_giust.ReadOnly = true; } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] @@ -9609,22 +9653,6 @@ namespace GPW_data { } } - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] - public double h_giust { - get { - try { - return ((double)(this[this.tableTimbratureExpl.h_giustColumn])); - } - catch (global::System.InvalidCastException e) { - throw new global::System.Data.StrongTypingException("Il valore della colonna \'h_giust\' nella tabella \'TimbratureExpl\' è DBNull.", e); - } - } - set { - this[this.tableTimbratureExpl.h_giustColumn] = value; - } - } - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] public int minLav { @@ -9657,6 +9685,22 @@ namespace GPW_data { } } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public int minNonLav { + get { + try { + return ((int)(this[this.tableTimbratureExpl.minNonLavColumn])); + } + catch (global::System.InvalidCastException e) { + throw new global::System.Data.StrongTypingException("Il valore della colonna \'minNonLav\' nella tabella \'TimbratureExpl\' è DBNull.", e); + } + } + set { + this[this.tableTimbratureExpl.minNonLavColumn] = value; + } + } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] public int minStra { @@ -9737,6 +9781,70 @@ namespace GPW_data { } } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public int minCassa { + get { + try { + return ((int)(this[this.tableTimbratureExpl.minCassaColumn])); + } + catch (global::System.InvalidCastException e) { + throw new global::System.Data.StrongTypingException("Il valore della colonna \'minCassa\' nella tabella \'TimbratureExpl\' è DBNull.", e); + } + } + set { + this[this.tableTimbratureExpl.minCassaColumn] = value; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public int min104 { + get { + try { + return ((int)(this[this.tableTimbratureExpl.min104Column])); + } + catch (global::System.InvalidCastException e) { + throw new global::System.Data.StrongTypingException("Il valore della colonna \'min104\' nella tabella \'TimbratureExpl\' è DBNull.", e); + } + } + set { + this[this.tableTimbratureExpl.min104Column] = value; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public int minMpp { + get { + try { + return ((int)(this[this.tableTimbratureExpl.minMppColumn])); + } + catch (global::System.InvalidCastException e) { + throw new global::System.Data.StrongTypingException("Il valore della colonna \'minMpp\' nella tabella \'TimbratureExpl\' è DBNull.", e); + } + } + set { + this[this.tableTimbratureExpl.minMppColumn] = value; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public int minArcoPres { + get { + try { + return ((int)(this[this.tableTimbratureExpl.minArcoPresColumn])); + } + catch (global::System.InvalidCastException e) { + throw new global::System.Data.StrongTypingException("Il valore della colonna \'minArcoPres\' nella tabella \'TimbratureExpl\' è DBNull.", e); + } + } + set { + this[this.tableTimbratureExpl.minArcoPresColumn] = value; + } + } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] public bool isOkTim { @@ -9769,70 +9877,6 @@ namespace GPW_data { } } - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] - public int isOkLav { - get { - try { - return ((int)(this[this.tableTimbratureExpl.isOkLavColumn])); - } - catch (global::System.InvalidCastException e) { - throw new global::System.Data.StrongTypingException("Il valore della colonna \'isOkLav\' nella tabella \'TimbratureExpl\' è DBNull.", e); - } - } - set { - this[this.tableTimbratureExpl.isOkLavColumn] = value; - } - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] - public int isOk { - get { - try { - return ((int)(this[this.tableTimbratureExpl.isOkColumn])); - } - catch (global::System.InvalidCastException e) { - throw new global::System.Data.StrongTypingException("Il valore della colonna \'isOk\' nella tabella \'TimbratureExpl\' è DBNull.", e); - } - } - set { - this[this.tableTimbratureExpl.isOkColumn] = value; - } - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] - public int minNonLav { - get { - try { - return ((int)(this[this.tableTimbratureExpl.minNonLavColumn])); - } - catch (global::System.InvalidCastException e) { - throw new global::System.Data.StrongTypingException("Il valore della colonna \'minNonLav\' nella tabella \'TimbratureExpl\' è DBNull.", e); - } - } - set { - this[this.tableTimbratureExpl.minNonLavColumn] = value; - } - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] - public int minArcoPres { - get { - try { - return ((int)(this[this.tableTimbratureExpl.minArcoPresColumn])); - } - catch (global::System.InvalidCastException e) { - throw new global::System.Data.StrongTypingException("Il valore della colonna \'minArcoPres\' nella tabella \'TimbratureExpl\' è DBNull.", e); - } - } - set { - this[this.tableTimbratureExpl.minArcoPresColumn] = value; - } - } - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] public bool block { @@ -9881,6 +9925,54 @@ namespace GPW_data { } } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public int isOk { + get { + try { + return ((int)(this[this.tableTimbratureExpl.isOkColumn])); + } + catch (global::System.InvalidCastException e) { + throw new global::System.Data.StrongTypingException("Il valore della colonna \'isOk\' nella tabella \'TimbratureExpl\' è DBNull.", e); + } + } + set { + this[this.tableTimbratureExpl.isOkColumn] = value; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public int isOkLav { + get { + try { + return ((int)(this[this.tableTimbratureExpl.isOkLavColumn])); + } + catch (global::System.InvalidCastException e) { + throw new global::System.Data.StrongTypingException("Il valore della colonna \'isOkLav\' nella tabella \'TimbratureExpl\' è DBNull.", e); + } + } + set { + this[this.tableTimbratureExpl.isOkLavColumn] = value; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public double h_giust { + get { + try { + return ((double)(this[this.tableTimbratureExpl.h_giustColumn])); + } + catch (global::System.InvalidCastException e) { + throw new global::System.Data.StrongTypingException("Il valore della colonna \'h_giust\' nella tabella \'TimbratureExpl\' è DBNull.", e); + } + } + set { + this[this.tableTimbratureExpl.h_giustColumn] = value; + } + } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] public bool IsCognomeNomeNull() { @@ -10001,18 +10093,6 @@ namespace GPW_data { this[this.tableTimbratureExpl.h_lavColumn] = global::System.Convert.DBNull; } - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] - public bool Ish_giustNull() { - return this.IsNull(this.tableTimbratureExpl.h_giustColumn); - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] - public void Seth_giustNull() { - this[this.tableTimbratureExpl.h_giustColumn] = global::System.Convert.DBNull; - } - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] public bool IsminLavNull() { @@ -10037,6 +10117,18 @@ namespace GPW_data { this[this.tableTimbratureExpl.minOrdColumn] = global::System.Convert.DBNull; } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public bool IsminNonLavNull() { + return this.IsNull(this.tableTimbratureExpl.minNonLavColumn); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public void SetminNonLavNull() { + this[this.tableTimbratureExpl.minNonLavColumn] = global::System.Convert.DBNull; + } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] public bool IsminStraNull() { @@ -10097,6 +10189,54 @@ namespace GPW_data { this[this.tableTimbratureExpl.minFestColumn] = global::System.Convert.DBNull; } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public bool IsminCassaNull() { + return this.IsNull(this.tableTimbratureExpl.minCassaColumn); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public void SetminCassaNull() { + this[this.tableTimbratureExpl.minCassaColumn] = global::System.Convert.DBNull; + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public bool Ismin104Null() { + return this.IsNull(this.tableTimbratureExpl.min104Column); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public void Setmin104Null() { + this[this.tableTimbratureExpl.min104Column] = global::System.Convert.DBNull; + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public bool IsminMppNull() { + return this.IsNull(this.tableTimbratureExpl.minMppColumn); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public void SetminMppNull() { + this[this.tableTimbratureExpl.minMppColumn] = global::System.Convert.DBNull; + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public bool IsminArcoPresNull() { + return this.IsNull(this.tableTimbratureExpl.minArcoPresColumn); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public void SetminArcoPresNull() { + this[this.tableTimbratureExpl.minArcoPresColumn] = global::System.Convert.DBNull; + } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] public bool IsisOkTimNull() { @@ -10121,54 +10261,6 @@ namespace GPW_data { this[this.tableTimbratureExpl.isOkAppColumn] = global::System.Convert.DBNull; } - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] - public bool IsisOkLavNull() { - return this.IsNull(this.tableTimbratureExpl.isOkLavColumn); - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] - public void SetisOkLavNull() { - this[this.tableTimbratureExpl.isOkLavColumn] = global::System.Convert.DBNull; - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] - public bool IsisOkNull() { - return this.IsNull(this.tableTimbratureExpl.isOkColumn); - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] - public void SetisOkNull() { - this[this.tableTimbratureExpl.isOkColumn] = global::System.Convert.DBNull; - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] - public bool IsminNonLavNull() { - return this.IsNull(this.tableTimbratureExpl.minNonLavColumn); - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] - public void SetminNonLavNull() { - this[this.tableTimbratureExpl.minNonLavColumn] = global::System.Convert.DBNull; - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] - public bool IsminArcoPresNull() { - return this.IsNull(this.tableTimbratureExpl.minArcoPresColumn); - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] - public void SetminArcoPresNull() { - this[this.tableTimbratureExpl.minArcoPresColumn] = global::System.Convert.DBNull; - } - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] public bool IsblockNull() { @@ -10204,6 +10296,42 @@ namespace GPW_data { public void SetchkFunResNull() { this[this.tableTimbratureExpl.chkFunResColumn] = global::System.Convert.DBNull; } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public bool IsisOkNull() { + return this.IsNull(this.tableTimbratureExpl.isOkColumn); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public void SetisOkNull() { + this[this.tableTimbratureExpl.isOkColumn] = global::System.Convert.DBNull; + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public bool IsisOkLavNull() { + return this.IsNull(this.tableTimbratureExpl.isOkLavColumn); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public void SetisOkLavNull() { + this[this.tableTimbratureExpl.isOkLavColumn] = global::System.Convert.DBNull; + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public bool Ish_giustNull() { + return this.IsNull(this.tableTimbratureExpl.h_giustColumn); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public void Seth_giustNull() { + this[this.tableTimbratureExpl.h_giustColumn] = global::System.Convert.DBNull; + } } /// @@ -17033,23 +17161,26 @@ SELECT dataOra, idxDipendente, entrata, IPv4, CodTipoTimb, Approv FROM Timbratur tableMapping.ColumnMappings.Add("entrata_4", "entrata_4"); tableMapping.ColumnMappings.Add("uscita_4", "uscita_4"); tableMapping.ColumnMappings.Add("h_lav", "h_lav"); - tableMapping.ColumnMappings.Add("h_giust", "h_giust"); tableMapping.ColumnMappings.Add("minLav", "minLav"); tableMapping.ColumnMappings.Add("minOrd", "minOrd"); + tableMapping.ColumnMappings.Add("minNonLav", "minNonLav"); tableMapping.ColumnMappings.Add("minStra", "minStra"); tableMapping.ColumnMappings.Add("minPerm", "minPerm"); tableMapping.ColumnMappings.Add("minFer", "minFer"); tableMapping.ColumnMappings.Add("minMal", "minMal"); tableMapping.ColumnMappings.Add("minFest", "minFest"); + tableMapping.ColumnMappings.Add("minCassa", "minCassa"); + tableMapping.ColumnMappings.Add("min104", "min104"); + tableMapping.ColumnMappings.Add("minMpp", "minMpp"); + tableMapping.ColumnMappings.Add("minArcoPres", "minArcoPres"); tableMapping.ColumnMappings.Add("isOkTim", "isOkTim"); tableMapping.ColumnMappings.Add("isOkApp", "isOkApp"); - tableMapping.ColumnMappings.Add("isOkLav", "isOkLav"); - tableMapping.ColumnMappings.Add("isOk", "isOk"); - tableMapping.ColumnMappings.Add("minNonLav", "minNonLav"); - tableMapping.ColumnMappings.Add("minArcoPres", "minArcoPres"); tableMapping.ColumnMappings.Add("block", "block"); tableMapping.ColumnMappings.Add("chkFunCod", "chkFunCod"); tableMapping.ColumnMappings.Add("chkFunRes", "chkFunRes"); + tableMapping.ColumnMappings.Add("isOk", "isOk"); + tableMapping.ColumnMappings.Add("isOkLav", "isOkLav"); + tableMapping.ColumnMappings.Add("h_giust", "h_giust"); this._adapter.TableMappings.Add(tableMapping); this._adapter.DeleteCommand = new global::System.Data.SqlClient.SqlCommand(); this._adapter.DeleteCommand.Connection = this.Connection; @@ -17065,25 +17196,28 @@ SELECT dataOra, idxDipendente, entrata, IPv4, CodTipoTimb, Approv FROM Timbratur "LL) OR ([uscita_3] = @Original_uscita_3)) AND ((@IsNull_entrata_4 = 1 AND [entra" + "ta_4] IS NULL) OR ([entrata_4] = @Original_entrata_4)) AND ((@IsNull_uscita_4 = " + "1 AND [uscita_4] IS NULL) OR ([uscita_4] = @Original_uscita_4)) AND ((@IsNull_h_" + - "lav = 1 AND [h_lav] IS NULL) OR ([h_lav] = @Original_h_lav)) AND ((@IsNull_h_giu" + - "st = 1 AND [h_giust] IS NULL) OR ([h_giust] = @Original_h_giust)) AND ((@IsNull_" + - "minLav = 1 AND [minLav] IS NULL) OR ([minLav] = @Original_minLav)) AND ((@IsNull" + - "_minOrd = 1 AND [minOrd] IS NULL) OR ([minOrd] = @Original_minOrd)) AND ((@IsNul" + - "l_minNonLav = 1 AND [minNonLav] IS NULL) OR ([minNonLav] = @Original_minNonLav))" + - " AND ((@IsNull_minStra = 1 AND [minStra] IS NULL) OR ([minStra] = @Original_minS" + - "tra)) AND ((@IsNull_minPerm = 1 AND [minPerm] IS NULL) OR ([minPerm] = @Original" + - "_minPerm)) AND ((@IsNull_minFer = 1 AND [minFer] IS NULL) OR ([minFer] = @Origin" + - "al_minFer)) AND ((@IsNull_minMal = 1 AND [minMal] IS NULL) OR ([minMal] = @Origi" + - "nal_minMal)) AND ((@IsNull_minFest = 1 AND [minFest] IS NULL) OR ([minFest] = @O" + - "riginal_minFest)) AND ((@IsNull_minArcoPres = 1 AND [minArcoPres] IS NULL) OR ([" + - "minArcoPres] = @Original_minArcoPres)) AND ((@IsNull_isOkTim = 1 AND [isOkTim] I" + - "S NULL) OR ([isOkTim] = @Original_isOkTim)) AND ((@IsNull_isOkApp = 1 AND [isOkA" + - "pp] IS NULL) OR ([isOkApp] = @Original_isOkApp)) AND ([isOkLav] = @Original_isOk" + - "Lav) AND ((@IsNull_isOk = 1 AND [isOk] IS NULL) OR ([isOk] = @Original_isOk)) AN" + - "D ((@IsNull_block = 1 AND [block] IS NULL) OR ([block] = @Original_block)) AND (" + - "(@IsNull_chkFunCod = 1 AND [chkFunCod] IS NULL) OR ([chkFunCod] = @Original_chkF" + - "unCod)) AND ((@IsNull_chkFunRes = 1 AND [chkFunRes] IS NULL) OR ([chkFunRes] = @" + - "Original_chkFunRes)))"; + "lav = 1 AND [h_lav] IS NULL) OR ([h_lav] = @Original_h_lav)) AND ((@IsNull_minLa" + + "v = 1 AND [minLav] IS NULL) OR ([minLav] = @Original_minLav)) AND ((@IsNull_minO" + + "rd = 1 AND [minOrd] IS NULL) OR ([minOrd] = @Original_minOrd)) AND ((@IsNull_min" + + "NonLav = 1 AND [minNonLav] IS NULL) OR ([minNonLav] = @Original_minNonLav)) AND " + + "((@IsNull_minStra = 1 AND [minStra] IS NULL) OR ([minStra] = @Original_minStra))" + + " AND ((@IsNull_minPerm = 1 AND [minPerm] IS NULL) OR ([minPerm] = @Original_minP" + + "erm)) AND ((@IsNull_minFer = 1 AND [minFer] IS NULL) OR ([minFer] = @Original_mi" + + "nFer)) AND ((@IsNull_minMal = 1 AND [minMal] IS NULL) OR ([minMal] = @Original_m" + + "inMal)) AND ((@IsNull_minFest = 1 AND [minFest] IS NULL) OR ([minFest] = @Origin" + + "al_minFest)) AND ((@IsNull_minCassa = 1 AND [minCassa] IS NULL) OR ([minCassa] =" + + " @Original_minCassa)) AND ((@IsNull_min104 = 1 AND [min104] IS NULL) OR ([min104" + + "] = @Original_min104)) AND ((@IsNull_minMpp = 1 AND [minMpp] IS NULL) OR ([minMp" + + "p] = @Original_minMpp)) AND ((@IsNull_minArcoPres = 1 AND [minArcoPres] IS NULL)" + + " OR ([minArcoPres] = @Original_minArcoPres)) AND ((@IsNull_isOkTim = 1 AND [isOk" + + "Tim] IS NULL) OR ([isOkTim] = @Original_isOkTim)) AND ((@IsNull_isOkApp = 1 AND " + + "[isOkApp] IS NULL) OR ([isOkApp] = @Original_isOkApp)) AND ((@IsNull_block = 1 A" + + "ND [block] IS NULL) OR ([block] = @Original_block)) AND ((@IsNull_chkFunCod = 1 " + + "AND [chkFunCod] IS NULL) OR ([chkFunCod] = @Original_chkFunCod)) AND ((@IsNull_c" + + "hkFunRes = 1 AND [chkFunRes] IS NULL) OR ([chkFunRes] = @Original_chkFunRes)) AN" + + "D ((@IsNull_isOk = 1 AND [isOk] IS NULL) OR ([isOk] = @Original_isOk)) AND ([isO" + + "kLav] = @Original_isOkLav) AND ((@IsNull_h_giust = 1 AND [h_giust] IS NULL) OR (" + + "[h_giust] = @Original_h_giust)))"; this._adapter.DeleteCommand.CommandType = global::System.Data.CommandType.Text; this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_dataLav", global::System.Data.SqlDbType.Date, 0, global::System.Data.ParameterDirection.Input, 0, 0, "dataLav", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_idxDipendente", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "idxDipendente", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); @@ -17107,8 +17241,6 @@ SELECT dataOra, idxDipendente, entrata, IPv4, CodTipoTimb, Approv FROM Timbratur this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_uscita_4", global::System.Data.SqlDbType.DateTime, 0, global::System.Data.ParameterDirection.Input, 0, 0, "uscita_4", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_h_lav", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "h_lav", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_h_lav", global::System.Data.SqlDbType.Float, 0, global::System.Data.ParameterDirection.Input, 0, 0, "h_lav", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); - this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_h_giust", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "h_giust", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); - this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_h_giust", global::System.Data.SqlDbType.Float, 0, global::System.Data.ParameterDirection.Input, 0, 0, "h_giust", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_minLav", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "minLav", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_minLav", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "minLav", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_minOrd", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "minOrd", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); @@ -17125,25 +17257,33 @@ SELECT dataOra, idxDipendente, entrata, IPv4, CodTipoTimb, Approv FROM Timbratur this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_minMal", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "minMal", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_minFest", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "minFest", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_minFest", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "minFest", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); + this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_minCassa", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "minCassa", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); + this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_minCassa", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "minCassa", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); + this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_min104", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "min104", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); + this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_min104", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "min104", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); + this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_minMpp", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "minMpp", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); + this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_minMpp", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "minMpp", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_minArcoPres", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "minArcoPres", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_minArcoPres", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "minArcoPres", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_isOkTim", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "isOkTim", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_isOkTim", global::System.Data.SqlDbType.Bit, 0, global::System.Data.ParameterDirection.Input, 0, 0, "isOkTim", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_isOkApp", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "isOkApp", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_isOkApp", global::System.Data.SqlDbType.Bit, 0, global::System.Data.ParameterDirection.Input, 0, 0, "isOkApp", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); - this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_isOkLav", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "isOkLav", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); - this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_isOk", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "isOk", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); - this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_isOk", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "isOk", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_block", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "block", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_block", global::System.Data.SqlDbType.Bit, 0, global::System.Data.ParameterDirection.Input, 0, 0, "block", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_chkFunCod", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "chkFunCod", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_chkFunCod", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "chkFunCod", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_chkFunRes", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "chkFunRes", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_chkFunRes", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "chkFunRes", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); + this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_isOk", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "isOk", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); + this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_isOk", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "isOk", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); + this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_isOkLav", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "isOkLav", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); + this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_h_giust", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "h_giust", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); + this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_h_giust", global::System.Data.SqlDbType.Float, 0, global::System.Data.ParameterDirection.Input, 0, 0, "h_giust", 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 [TimbratureExpl] ([dataLav], [idxDipendente], [CognomeNome], [entrata_1], [uscita_1], [entrata_2], [uscita_2], [entrata_3], [uscita_3], [entrata_4], [uscita_4], [h_lav], [minLav], [minOrd], [minNonLav], [minStra], [minPerm], [minFer], [minMal], [minFest], [isOkTim], [isOkApp], [block], [chkFunCod], [chkFunRes]) VALUES (@dataLav, @idxDipendente, @CognomeNome, @entrata_1, @uscita_1, @entrata_2, @uscita_2, @entrata_3, @uscita_3, @entrata_4, @uscita_4, @h_lav, @minLav, @minOrd, @minNonLav, @minStra, @minPerm, @minFer, @minMal, @minFest, @isOkTim, @isOkApp, @block, @chkFunCod, @chkFunRes); -SELECT dataLav, idxDipendente, CognomeNome, entrata_1, uscita_1, entrata_2, uscita_2, entrata_3, uscita_3, entrata_4, uscita_4, h_lav, h_giust, minLav, minOrd, minNonLav, minStra, minPerm, minFer, minMal, minFest, minArcoPres, isOkTim, isOkApp, isOkLav, isOk, block, chkFunCod, chkFunRes FROM TimbratureExpl WHERE (dataLav = @dataLav) AND (idxDipendente = @idxDipendente)"; + this._adapter.InsertCommand.CommandText = @"INSERT INTO [TimbratureExpl] ([dataLav], [idxDipendente], [CognomeNome], [entrata_1], [uscita_1], [entrata_2], [uscita_2], [entrata_3], [uscita_3], [entrata_4], [uscita_4], [h_lav], [minLav], [minOrd], [minNonLav], [minStra], [minPerm], [minFer], [minMal], [minFest], [minCassa], [min104], [minMpp], [isOkTim], [isOkApp], [block], [chkFunCod], [chkFunRes]) VALUES (@dataLav, @idxDipendente, @CognomeNome, @entrata_1, @uscita_1, @entrata_2, @uscita_2, @entrata_3, @uscita_3, @entrata_4, @uscita_4, @h_lav, @minLav, @minOrd, @minNonLav, @minStra, @minPerm, @minFer, @minMal, @minFest, @minCassa, @min104, @minMpp, @isOkTim, @isOkApp, @block, @chkFunCod, @chkFunRes); +SELECT dataLav, idxDipendente, CognomeNome, entrata_1, uscita_1, entrata_2, uscita_2, entrata_3, uscita_3, entrata_4, uscita_4, h_lav, minLav, minOrd, minNonLav, minStra, minPerm, minFer, minMal, minFest, minCassa, min104, minMpp, minArcoPres, isOkTim, isOkApp, block, chkFunCod, chkFunRes, isOk, isOkLav, h_giust FROM TimbratureExpl WHERE (dataLav = @dataLav) AND (idxDipendente = @idxDipendente)"; this._adapter.InsertCommand.CommandType = global::System.Data.CommandType.Text; this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@dataLav", global::System.Data.SqlDbType.Date, 0, global::System.Data.ParameterDirection.Input, 0, 0, "dataLav", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@idxDipendente", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "idxDipendente", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); @@ -17165,6 +17305,9 @@ SELECT dataLav, idxDipendente, CognomeNome, entrata_1, uscita_1, entrata_2, usci this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@minFer", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "minFer", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@minMal", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "minMal", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@minFest", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "minFest", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@minCassa", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "minCassa", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@min104", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "min104", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@minMpp", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "minMpp", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@isOkTim", global::System.Data.SqlDbType.Bit, 0, global::System.Data.ParameterDirection.Input, 0, 0, "isOkTim", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@isOkApp", global::System.Data.SqlDbType.Bit, 0, global::System.Data.ParameterDirection.Input, 0, 0, "isOkApp", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@block", global::System.Data.SqlDbType.Bit, 0, global::System.Data.ParameterDirection.Input, 0, 0, "block", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); @@ -17178,43 +17321,47 @@ SELECT dataLav, idxDipendente, CognomeNome, entrata_1, uscita_1, entrata_2, usci "uscita_3] = @uscita_3, [entrata_4] = @entrata_4, [uscita_4] = @uscita_4, [h_lav]" + " = @h_lav, [minLav] = @minLav, [minOrd] = @minOrd, [minNonLav] = @minNonLav, [mi" + "nStra] = @minStra, [minPerm] = @minPerm, [minFer] = @minFer, [minMal] = @minMal," + - " [minFest] = @minFest, [isOkTim] = @isOkTim, [isOkApp] = @isOkApp, [block] = @bl" + - "ock, [chkFunCod] = @chkFunCod, [chkFunRes] = @chkFunRes WHERE (([dataLav] = @Ori" + - "ginal_dataLav) AND ([idxDipendente] = @Original_idxDipendente) AND ((@IsNull_Cog" + - "nomeNome = 1 AND [CognomeNome] IS NULL) OR ([CognomeNome] = @Original_CognomeNom" + - "e)) AND ((@IsNull_entrata_1 = 1 AND [entrata_1] IS NULL) OR ([entrata_1] = @Orig" + - "inal_entrata_1)) AND ((@IsNull_uscita_1 = 1 AND [uscita_1] IS NULL) OR ([uscita_" + - "1] = @Original_uscita_1)) AND ((@IsNull_entrata_2 = 1 AND [entrata_2] IS NULL) O" + - "R ([entrata_2] = @Original_entrata_2)) AND ((@IsNull_uscita_2 = 1 AND [uscita_2]" + - " IS NULL) OR ([uscita_2] = @Original_uscita_2)) AND ((@IsNull_entrata_3 = 1 AND " + - "[entrata_3] IS NULL) OR ([entrata_3] = @Original_entrata_3)) AND ((@IsNull_uscit" + - "a_3 = 1 AND [uscita_3] IS NULL) OR ([uscita_3] = @Original_uscita_3)) AND ((@IsN" + - "ull_entrata_4 = 1 AND [entrata_4] IS NULL) OR ([entrata_4] = @Original_entrata_4" + - ")) AND ((@IsNull_uscita_4 = 1 AND [uscita_4] IS NULL) OR ([uscita_4] = @Original" + - "_uscita_4)) AND ((@IsNull_h_lav = 1 AND [h_lav] IS NULL) OR ([h_lav] = @Original" + - "_h_lav)) AND ((@IsNull_h_giust = 1 AND [h_giust] IS NULL) OR ([h_giust] = @Origi" + - "nal_h_giust)) AND ((@IsNull_minLav = 1 AND [minLav] IS NULL) OR ([minLav] = @Ori" + - "ginal_minLav)) AND ((@IsNull_minOrd = 1 AND [minOrd] IS NULL) OR ([minOrd] = @Or" + - "iginal_minOrd)) AND ((@IsNull_minNonLav = 1 AND [minNonLav] IS NULL) OR ([minNon" + - "Lav] = @Original_minNonLav)) AND ((@IsNull_minStra = 1 AND [minStra] IS NULL) OR" + - " ([minStra] = @Original_minStra)) AND ((@IsNull_minPerm = 1 AND [minPerm] IS NUL" + - "L) OR ([minPerm] = @Original_minPerm)) AND ((@IsNull_minFer = 1 AND [minFer] IS " + - "NULL) OR ([minFer] = @Original_minFer)) AND ((@IsNull_minMal = 1 AND [minMal] IS" + - " NULL) OR ([minMal] = @Original_minMal)) AND ((@IsNull_minFest = 1 AND [minFest]" + - " IS NULL) OR ([minFest] = @Original_minFest)) AND ((@IsNull_minArcoPres = 1 AND " + - "[minArcoPres] IS NULL) OR ([minArcoPres] = @Original_minArcoPres)) AND ((@IsNull" + - "_isOkTim = 1 AND [isOkTim] IS NULL) OR ([isOkTim] = @Original_isOkTim)) AND ((@I" + - "sNull_isOkApp = 1 AND [isOkApp] IS NULL) OR ([isOkApp] = @Original_isOkApp)) AND" + - " ([isOkLav] = @Original_isOkLav) AND ((@IsNull_isOk = 1 AND [isOk] IS NULL) OR (" + - "[isOk] = @Original_isOk)) AND ((@IsNull_block = 1 AND [block] IS NULL) OR ([bloc" + - "k] = @Original_block)) AND ((@IsNull_chkFunCod = 1 AND [chkFunCod] IS NULL) OR (" + - "[chkFunCod] = @Original_chkFunCod)) AND ((@IsNull_chkFunRes = 1 AND [chkFunRes] " + - "IS NULL) OR ([chkFunRes] = @Original_chkFunRes)));\r\nSELECT dataLav, idxDipendent" + - "e, CognomeNome, entrata_1, uscita_1, entrata_2, uscita_2, entrata_3, uscita_3, e" + - "ntrata_4, uscita_4, h_lav, h_giust, minLav, minOrd, minNonLav, minStra, minPerm," + - " minFer, minMal, minFest, minArcoPres, isOkTim, isOkApp, isOkLav, isOk, block, c" + - "hkFunCod, chkFunRes FROM TimbratureExpl WHERE (dataLav = @dataLav) AND (idxDipen" + - "dente = @idxDipendente)"; + " [minFest] = @minFest, [minCassa] = @minCassa, [min104] = @min104, [minMpp] = @m" + + "inMpp, [isOkTim] = @isOkTim, [isOkApp] = @isOkApp, [block] = @block, [chkFunCod]" + + " = @chkFunCod, [chkFunRes] = @chkFunRes WHERE (([dataLav] = @Original_dataLav) A" + + "ND ([idxDipendente] = @Original_idxDipendente) AND ((@IsNull_CognomeNome = 1 AND" + + " [CognomeNome] IS NULL) OR ([CognomeNome] = @Original_CognomeNome)) AND ((@IsNul" + + "l_entrata_1 = 1 AND [entrata_1] IS NULL) OR ([entrata_1] = @Original_entrata_1))" + + " AND ((@IsNull_uscita_1 = 1 AND [uscita_1] IS NULL) OR ([uscita_1] = @Original_u" + + "scita_1)) AND ((@IsNull_entrata_2 = 1 AND [entrata_2] IS NULL) OR ([entrata_2] =" + + " @Original_entrata_2)) AND ((@IsNull_uscita_2 = 1 AND [uscita_2] IS NULL) OR ([u" + + "scita_2] = @Original_uscita_2)) AND ((@IsNull_entrata_3 = 1 AND [entrata_3] IS N" + + "ULL) OR ([entrata_3] = @Original_entrata_3)) AND ((@IsNull_uscita_3 = 1 AND [usc" + + "ita_3] IS NULL) OR ([uscita_3] = @Original_uscita_3)) AND ((@IsNull_entrata_4 = " + + "1 AND [entrata_4] IS NULL) OR ([entrata_4] = @Original_entrata_4)) AND ((@IsNull" + + "_uscita_4 = 1 AND [uscita_4] IS NULL) OR ([uscita_4] = @Original_uscita_4)) AND " + + "((@IsNull_h_lav = 1 AND [h_lav] IS NULL) OR ([h_lav] = @Original_h_lav)) AND ((@" + + "IsNull_minLav = 1 AND [minLav] IS NULL) OR ([minLav] = @Original_minLav)) AND ((" + + "@IsNull_minOrd = 1 AND [minOrd] IS NULL) OR ([minOrd] = @Original_minOrd)) AND (" + + "(@IsNull_minNonLav = 1 AND [minNonLav] IS NULL) OR ([minNonLav] = @Original_minN" + + "onLav)) AND ((@IsNull_minStra = 1 AND [minStra] IS NULL) OR ([minStra] = @Origin" + + "al_minStra)) AND ((@IsNull_minPerm = 1 AND [minPerm] IS NULL) OR ([minPerm] = @O" + + "riginal_minPerm)) AND ((@IsNull_minFer = 1 AND [minFer] IS NULL) OR ([minFer] = " + + "@Original_minFer)) AND ((@IsNull_minMal = 1 AND [minMal] IS NULL) OR ([minMal] =" + + " @Original_minMal)) AND ((@IsNull_minFest = 1 AND [minFest] IS NULL) OR ([minFes" + + "t] = @Original_minFest)) AND ((@IsNull_minCassa = 1 AND [minCassa] IS NULL) OR (" + + "[minCassa] = @Original_minCassa)) AND ((@IsNull_min104 = 1 AND [min104] IS NULL)" + + " OR ([min104] = @Original_min104)) AND ((@IsNull_minMpp = 1 AND [minMpp] IS NULL" + + ") OR ([minMpp] = @Original_minMpp)) AND ((@IsNull_minArcoPres = 1 AND [minArcoPr" + + "es] IS NULL) OR ([minArcoPres] = @Original_minArcoPres)) AND ((@IsNull_isOkTim =" + + " 1 AND [isOkTim] IS NULL) OR ([isOkTim] = @Original_isOkTim)) AND ((@IsNull_isOk" + + "App = 1 AND [isOkApp] IS NULL) OR ([isOkApp] = @Original_isOkApp)) AND ((@IsNull" + + "_block = 1 AND [block] IS NULL) OR ([block] = @Original_block)) AND ((@IsNull_ch" + + "kFunCod = 1 AND [chkFunCod] IS NULL) OR ([chkFunCod] = @Original_chkFunCod)) AND" + + " ((@IsNull_chkFunRes = 1 AND [chkFunRes] IS NULL) OR ([chkFunRes] = @Original_ch" + + "kFunRes)) AND ((@IsNull_isOk = 1 AND [isOk] IS NULL) OR ([isOk] = @Original_isOk" + + ")) AND ([isOkLav] = @Original_isOkLav) AND ((@IsNull_h_giust = 1 AND [h_giust] I" + + "S NULL) OR ([h_giust] = @Original_h_giust)));\r\nSELECT dataLav, idxDipendente, Co" + + "gnomeNome, entrata_1, uscita_1, entrata_2, uscita_2, entrata_3, uscita_3, entrat" + + "a_4, uscita_4, h_lav, minLav, minOrd, minNonLav, minStra, minPerm, minFer, minMa" + + "l, minFest, minCassa, min104, minMpp, minArcoPres, isOkTim, isOkApp, block, chkF" + + "unCod, chkFunRes, isOk, isOkLav, h_giust FROM TimbratureExpl WHERE (dataLav = @d" + + "ataLav) AND (idxDipendente = @idxDipendente)"; this._adapter.UpdateCommand.CommandType = global::System.Data.CommandType.Text; this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@dataLav", global::System.Data.SqlDbType.Date, 0, global::System.Data.ParameterDirection.Input, 0, 0, "dataLav", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@idxDipendente", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "idxDipendente", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); @@ -17236,6 +17383,9 @@ SELECT dataLav, idxDipendente, CognomeNome, entrata_1, uscita_1, entrata_2, usci this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@minFer", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "minFer", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@minMal", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "minMal", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@minFest", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "minFest", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@minCassa", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "minCassa", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@min104", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "min104", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@minMpp", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "minMpp", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@isOkTim", global::System.Data.SqlDbType.Bit, 0, global::System.Data.ParameterDirection.Input, 0, 0, "isOkTim", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@isOkApp", global::System.Data.SqlDbType.Bit, 0, global::System.Data.ParameterDirection.Input, 0, 0, "isOkApp", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@block", global::System.Data.SqlDbType.Bit, 0, global::System.Data.ParameterDirection.Input, 0, 0, "block", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); @@ -17263,8 +17413,6 @@ SELECT dataLav, idxDipendente, CognomeNome, entrata_1, uscita_1, entrata_2, usci this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_uscita_4", global::System.Data.SqlDbType.DateTime, 0, global::System.Data.ParameterDirection.Input, 0, 0, "uscita_4", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_h_lav", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "h_lav", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_h_lav", global::System.Data.SqlDbType.Float, 0, global::System.Data.ParameterDirection.Input, 0, 0, "h_lav", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); - this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_h_giust", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "h_giust", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); - this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_h_giust", global::System.Data.SqlDbType.Float, 0, global::System.Data.ParameterDirection.Input, 0, 0, "h_giust", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_minLav", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "minLav", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_minLav", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "minLav", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_minOrd", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "minOrd", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); @@ -17281,21 +17429,29 @@ SELECT dataLav, idxDipendente, CognomeNome, entrata_1, uscita_1, entrata_2, usci this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_minMal", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "minMal", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_minFest", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "minFest", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_minFest", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "minFest", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); + this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_minCassa", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "minCassa", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); + this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_minCassa", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "minCassa", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); + this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_min104", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "min104", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); + this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_min104", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "min104", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); + this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_minMpp", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "minMpp", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); + this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_minMpp", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "minMpp", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_minArcoPres", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "minArcoPres", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_minArcoPres", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "minArcoPres", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_isOkTim", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "isOkTim", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_isOkTim", global::System.Data.SqlDbType.Bit, 0, global::System.Data.ParameterDirection.Input, 0, 0, "isOkTim", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_isOkApp", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "isOkApp", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_isOkApp", global::System.Data.SqlDbType.Bit, 0, global::System.Data.ParameterDirection.Input, 0, 0, "isOkApp", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); - this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_isOkLav", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "isOkLav", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); - this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_isOk", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "isOk", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); - this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_isOk", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "isOk", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_block", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "block", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_block", global::System.Data.SqlDbType.Bit, 0, global::System.Data.ParameterDirection.Input, 0, 0, "block", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_chkFunCod", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "chkFunCod", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_chkFunCod", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "chkFunCod", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_chkFunRes", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "chkFunRes", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_chkFunRes", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "chkFunRes", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); + this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_isOk", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "isOk", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); + this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_isOk", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "isOk", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); + this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_isOkLav", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "isOkLav", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); + this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_h_giust", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "h_giust", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); + this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_h_giust", global::System.Data.SqlDbType.Float, 0, global::System.Data.ParameterDirection.Input, 0, 0, "h_giust", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] @@ -17311,7 +17467,7 @@ SELECT dataLav, idxDipendente, CognomeNome, entrata_1, uscita_1, entrata_2, usci this._commandCollection = new global::System.Data.SqlClient.SqlCommand[8]; this._commandCollection[0] = new global::System.Data.SqlClient.SqlCommand(); this._commandCollection[0].Connection = this.Connection; - this._commandCollection[0].CommandText = "SELECT * FROM TimbratureExpl"; + this._commandCollection[0].CommandText = "SELECT *\r\nFROM TimbratureExpl"; this._commandCollection[0].CommandType = global::System.Data.CommandType.Text; this._commandCollection[1] = new global::System.Data.SqlClient.SqlCommand(); this._commandCollection[1].Connection = this.Connection; @@ -17599,7 +17755,6 @@ SELECT dataLav, idxDipendente, CognomeNome, entrata_1, uscita_1, entrata_2, usci global::System.Nullable Original_entrata_4, global::System.Nullable Original_uscita_4, global::System.Nullable Original_h_lav, - global::System.Nullable Original_h_giust, global::System.Nullable Original_minLav, global::System.Nullable Original_minOrd, global::System.Nullable Original_minNonLav, @@ -17608,14 +17763,18 @@ SELECT dataLav, idxDipendente, CognomeNome, entrata_1, uscita_1, entrata_2, usci global::System.Nullable Original_minFer, global::System.Nullable Original_minMal, global::System.Nullable Original_minFest, + global::System.Nullable Original_minCassa, + global::System.Nullable Original_min104, + global::System.Nullable Original_minMpp, global::System.Nullable Original_minArcoPres, global::System.Nullable Original_isOkTim, global::System.Nullable Original_isOkApp, - int Original_isOkLav, - global::System.Nullable Original_isOk, global::System.Nullable Original_block, string Original_chkFunCod, - string Original_chkFunRes) { + string Original_chkFunRes, + global::System.Nullable Original_isOk, + int Original_isOkLav, + global::System.Nullable Original_h_giust) { this.Adapter.DeleteCommand.Parameters[0].Value = ((System.DateTime)(Original_dataLav)); this.Adapter.DeleteCommand.Parameters[1].Value = ((int)(Original_idxDipendente)); if ((Original_CognomeNome == null)) { @@ -17698,134 +17857,158 @@ SELECT dataLav, idxDipendente, CognomeNome, entrata_1, uscita_1, entrata_2, usci this.Adapter.DeleteCommand.Parameters[20].Value = ((object)(1)); this.Adapter.DeleteCommand.Parameters[21].Value = global::System.DBNull.Value; } - if ((Original_h_giust.HasValue == true)) { + if ((Original_minLav.HasValue == true)) { this.Adapter.DeleteCommand.Parameters[22].Value = ((object)(0)); - this.Adapter.DeleteCommand.Parameters[23].Value = ((double)(Original_h_giust.Value)); + this.Adapter.DeleteCommand.Parameters[23].Value = ((int)(Original_minLav.Value)); } else { this.Adapter.DeleteCommand.Parameters[22].Value = ((object)(1)); this.Adapter.DeleteCommand.Parameters[23].Value = global::System.DBNull.Value; } - if ((Original_minLav.HasValue == true)) { + if ((Original_minOrd.HasValue == true)) { this.Adapter.DeleteCommand.Parameters[24].Value = ((object)(0)); - this.Adapter.DeleteCommand.Parameters[25].Value = ((int)(Original_minLav.Value)); + this.Adapter.DeleteCommand.Parameters[25].Value = ((int)(Original_minOrd.Value)); } else { this.Adapter.DeleteCommand.Parameters[24].Value = ((object)(1)); this.Adapter.DeleteCommand.Parameters[25].Value = global::System.DBNull.Value; } - if ((Original_minOrd.HasValue == true)) { + if ((Original_minNonLav.HasValue == true)) { this.Adapter.DeleteCommand.Parameters[26].Value = ((object)(0)); - this.Adapter.DeleteCommand.Parameters[27].Value = ((int)(Original_minOrd.Value)); + this.Adapter.DeleteCommand.Parameters[27].Value = ((int)(Original_minNonLav.Value)); } else { this.Adapter.DeleteCommand.Parameters[26].Value = ((object)(1)); this.Adapter.DeleteCommand.Parameters[27].Value = global::System.DBNull.Value; } - if ((Original_minNonLav.HasValue == true)) { + if ((Original_minStra.HasValue == true)) { this.Adapter.DeleteCommand.Parameters[28].Value = ((object)(0)); - this.Adapter.DeleteCommand.Parameters[29].Value = ((int)(Original_minNonLav.Value)); + this.Adapter.DeleteCommand.Parameters[29].Value = ((int)(Original_minStra.Value)); } else { this.Adapter.DeleteCommand.Parameters[28].Value = ((object)(1)); this.Adapter.DeleteCommand.Parameters[29].Value = global::System.DBNull.Value; } - if ((Original_minStra.HasValue == true)) { + if ((Original_minPerm.HasValue == true)) { this.Adapter.DeleteCommand.Parameters[30].Value = ((object)(0)); - this.Adapter.DeleteCommand.Parameters[31].Value = ((int)(Original_minStra.Value)); + this.Adapter.DeleteCommand.Parameters[31].Value = ((int)(Original_minPerm.Value)); } else { this.Adapter.DeleteCommand.Parameters[30].Value = ((object)(1)); this.Adapter.DeleteCommand.Parameters[31].Value = global::System.DBNull.Value; } - if ((Original_minPerm.HasValue == true)) { + if ((Original_minFer.HasValue == true)) { this.Adapter.DeleteCommand.Parameters[32].Value = ((object)(0)); - this.Adapter.DeleteCommand.Parameters[33].Value = ((int)(Original_minPerm.Value)); + this.Adapter.DeleteCommand.Parameters[33].Value = ((int)(Original_minFer.Value)); } else { this.Adapter.DeleteCommand.Parameters[32].Value = ((object)(1)); this.Adapter.DeleteCommand.Parameters[33].Value = global::System.DBNull.Value; } - if ((Original_minFer.HasValue == true)) { + if ((Original_minMal.HasValue == true)) { this.Adapter.DeleteCommand.Parameters[34].Value = ((object)(0)); - this.Adapter.DeleteCommand.Parameters[35].Value = ((int)(Original_minFer.Value)); + this.Adapter.DeleteCommand.Parameters[35].Value = ((int)(Original_minMal.Value)); } else { this.Adapter.DeleteCommand.Parameters[34].Value = ((object)(1)); this.Adapter.DeleteCommand.Parameters[35].Value = global::System.DBNull.Value; } - if ((Original_minMal.HasValue == true)) { + if ((Original_minFest.HasValue == true)) { this.Adapter.DeleteCommand.Parameters[36].Value = ((object)(0)); - this.Adapter.DeleteCommand.Parameters[37].Value = ((int)(Original_minMal.Value)); + this.Adapter.DeleteCommand.Parameters[37].Value = ((int)(Original_minFest.Value)); } else { this.Adapter.DeleteCommand.Parameters[36].Value = ((object)(1)); this.Adapter.DeleteCommand.Parameters[37].Value = global::System.DBNull.Value; } - if ((Original_minFest.HasValue == true)) { + if ((Original_minCassa.HasValue == true)) { this.Adapter.DeleteCommand.Parameters[38].Value = ((object)(0)); - this.Adapter.DeleteCommand.Parameters[39].Value = ((int)(Original_minFest.Value)); + this.Adapter.DeleteCommand.Parameters[39].Value = ((int)(Original_minCassa.Value)); } else { this.Adapter.DeleteCommand.Parameters[38].Value = ((object)(1)); this.Adapter.DeleteCommand.Parameters[39].Value = global::System.DBNull.Value; } - if ((Original_minArcoPres.HasValue == true)) { + if ((Original_min104.HasValue == true)) { this.Adapter.DeleteCommand.Parameters[40].Value = ((object)(0)); - this.Adapter.DeleteCommand.Parameters[41].Value = ((int)(Original_minArcoPres.Value)); + this.Adapter.DeleteCommand.Parameters[41].Value = ((int)(Original_min104.Value)); } else { this.Adapter.DeleteCommand.Parameters[40].Value = ((object)(1)); this.Adapter.DeleteCommand.Parameters[41].Value = global::System.DBNull.Value; } - if ((Original_isOkTim.HasValue == true)) { + if ((Original_minMpp.HasValue == true)) { this.Adapter.DeleteCommand.Parameters[42].Value = ((object)(0)); - this.Adapter.DeleteCommand.Parameters[43].Value = ((bool)(Original_isOkTim.Value)); + this.Adapter.DeleteCommand.Parameters[43].Value = ((int)(Original_minMpp.Value)); } else { this.Adapter.DeleteCommand.Parameters[42].Value = ((object)(1)); this.Adapter.DeleteCommand.Parameters[43].Value = global::System.DBNull.Value; } - if ((Original_isOkApp.HasValue == true)) { + if ((Original_minArcoPres.HasValue == true)) { this.Adapter.DeleteCommand.Parameters[44].Value = ((object)(0)); - this.Adapter.DeleteCommand.Parameters[45].Value = ((bool)(Original_isOkApp.Value)); + this.Adapter.DeleteCommand.Parameters[45].Value = ((int)(Original_minArcoPres.Value)); } else { this.Adapter.DeleteCommand.Parameters[44].Value = ((object)(1)); this.Adapter.DeleteCommand.Parameters[45].Value = global::System.DBNull.Value; } - this.Adapter.DeleteCommand.Parameters[46].Value = ((int)(Original_isOkLav)); - if ((Original_isOk.HasValue == true)) { - this.Adapter.DeleteCommand.Parameters[47].Value = ((object)(0)); - this.Adapter.DeleteCommand.Parameters[48].Value = ((int)(Original_isOk.Value)); + if ((Original_isOkTim.HasValue == true)) { + this.Adapter.DeleteCommand.Parameters[46].Value = ((object)(0)); + this.Adapter.DeleteCommand.Parameters[47].Value = ((bool)(Original_isOkTim.Value)); } else { - this.Adapter.DeleteCommand.Parameters[47].Value = ((object)(1)); - this.Adapter.DeleteCommand.Parameters[48].Value = global::System.DBNull.Value; + this.Adapter.DeleteCommand.Parameters[46].Value = ((object)(1)); + this.Adapter.DeleteCommand.Parameters[47].Value = global::System.DBNull.Value; + } + if ((Original_isOkApp.HasValue == true)) { + this.Adapter.DeleteCommand.Parameters[48].Value = ((object)(0)); + this.Adapter.DeleteCommand.Parameters[49].Value = ((bool)(Original_isOkApp.Value)); + } + else { + this.Adapter.DeleteCommand.Parameters[48].Value = ((object)(1)); + this.Adapter.DeleteCommand.Parameters[49].Value = global::System.DBNull.Value; } if ((Original_block.HasValue == true)) { - this.Adapter.DeleteCommand.Parameters[49].Value = ((object)(0)); - this.Adapter.DeleteCommand.Parameters[50].Value = ((bool)(Original_block.Value)); + this.Adapter.DeleteCommand.Parameters[50].Value = ((object)(0)); + this.Adapter.DeleteCommand.Parameters[51].Value = ((bool)(Original_block.Value)); } else { - this.Adapter.DeleteCommand.Parameters[49].Value = ((object)(1)); - this.Adapter.DeleteCommand.Parameters[50].Value = global::System.DBNull.Value; + this.Adapter.DeleteCommand.Parameters[50].Value = ((object)(1)); + this.Adapter.DeleteCommand.Parameters[51].Value = global::System.DBNull.Value; } if ((Original_chkFunCod == null)) { - this.Adapter.DeleteCommand.Parameters[51].Value = ((object)(1)); - this.Adapter.DeleteCommand.Parameters[52].Value = global::System.DBNull.Value; + this.Adapter.DeleteCommand.Parameters[52].Value = ((object)(1)); + this.Adapter.DeleteCommand.Parameters[53].Value = global::System.DBNull.Value; } else { - this.Adapter.DeleteCommand.Parameters[51].Value = ((object)(0)); - this.Adapter.DeleteCommand.Parameters[52].Value = ((string)(Original_chkFunCod)); + this.Adapter.DeleteCommand.Parameters[52].Value = ((object)(0)); + this.Adapter.DeleteCommand.Parameters[53].Value = ((string)(Original_chkFunCod)); } if ((Original_chkFunRes == null)) { - this.Adapter.DeleteCommand.Parameters[53].Value = ((object)(1)); - this.Adapter.DeleteCommand.Parameters[54].Value = global::System.DBNull.Value; + this.Adapter.DeleteCommand.Parameters[54].Value = ((object)(1)); + this.Adapter.DeleteCommand.Parameters[55].Value = global::System.DBNull.Value; } else { - this.Adapter.DeleteCommand.Parameters[53].Value = ((object)(0)); - this.Adapter.DeleteCommand.Parameters[54].Value = ((string)(Original_chkFunRes)); + this.Adapter.DeleteCommand.Parameters[54].Value = ((object)(0)); + this.Adapter.DeleteCommand.Parameters[55].Value = ((string)(Original_chkFunRes)); + } + if ((Original_isOk.HasValue == true)) { + this.Adapter.DeleteCommand.Parameters[56].Value = ((object)(0)); + this.Adapter.DeleteCommand.Parameters[57].Value = ((int)(Original_isOk.Value)); + } + else { + this.Adapter.DeleteCommand.Parameters[56].Value = ((object)(1)); + this.Adapter.DeleteCommand.Parameters[57].Value = global::System.DBNull.Value; + } + this.Adapter.DeleteCommand.Parameters[58].Value = ((int)(Original_isOkLav)); + if ((Original_h_giust.HasValue == true)) { + this.Adapter.DeleteCommand.Parameters[59].Value = ((object)(0)); + this.Adapter.DeleteCommand.Parameters[60].Value = ((double)(Original_h_giust.Value)); + } + else { + this.Adapter.DeleteCommand.Parameters[59].Value = ((object)(1)); + this.Adapter.DeleteCommand.Parameters[60].Value = global::System.DBNull.Value; } global::System.Data.ConnectionState previousConnectionState = this.Adapter.DeleteCommand.Connection.State; if (((this.Adapter.DeleteCommand.Connection.State & global::System.Data.ConnectionState.Open) @@ -17868,6 +18051,9 @@ SELECT dataLav, idxDipendente, CognomeNome, entrata_1, uscita_1, entrata_2, usci global::System.Nullable minFer, global::System.Nullable minMal, global::System.Nullable minFest, + global::System.Nullable minCassa, + global::System.Nullable min104, + global::System.Nullable minMpp, global::System.Nullable isOkTim, global::System.Nullable isOkApp, global::System.Nullable block, @@ -17983,35 +18169,53 @@ SELECT dataLav, idxDipendente, CognomeNome, entrata_1, uscita_1, entrata_2, usci else { this.Adapter.InsertCommand.Parameters[19].Value = global::System.DBNull.Value; } - if ((isOkTim.HasValue == true)) { - this.Adapter.InsertCommand.Parameters[20].Value = ((bool)(isOkTim.Value)); + if ((minCassa.HasValue == true)) { + this.Adapter.InsertCommand.Parameters[20].Value = ((int)(minCassa.Value)); } else { this.Adapter.InsertCommand.Parameters[20].Value = global::System.DBNull.Value; } - if ((isOkApp.HasValue == true)) { - this.Adapter.InsertCommand.Parameters[21].Value = ((bool)(isOkApp.Value)); + if ((min104.HasValue == true)) { + this.Adapter.InsertCommand.Parameters[21].Value = ((int)(min104.Value)); } else { this.Adapter.InsertCommand.Parameters[21].Value = global::System.DBNull.Value; } - if ((block.HasValue == true)) { - this.Adapter.InsertCommand.Parameters[22].Value = ((bool)(block.Value)); + if ((minMpp.HasValue == true)) { + this.Adapter.InsertCommand.Parameters[22].Value = ((int)(minMpp.Value)); } else { this.Adapter.InsertCommand.Parameters[22].Value = global::System.DBNull.Value; } - if ((chkFunCod == null)) { + if ((isOkTim.HasValue == true)) { + this.Adapter.InsertCommand.Parameters[23].Value = ((bool)(isOkTim.Value)); + } + else { this.Adapter.InsertCommand.Parameters[23].Value = global::System.DBNull.Value; } - else { - this.Adapter.InsertCommand.Parameters[23].Value = ((string)(chkFunCod)); + if ((isOkApp.HasValue == true)) { + this.Adapter.InsertCommand.Parameters[24].Value = ((bool)(isOkApp.Value)); } - if ((chkFunRes == null)) { + else { this.Adapter.InsertCommand.Parameters[24].Value = global::System.DBNull.Value; } + if ((block.HasValue == true)) { + this.Adapter.InsertCommand.Parameters[25].Value = ((bool)(block.Value)); + } else { - this.Adapter.InsertCommand.Parameters[24].Value = ((string)(chkFunRes)); + this.Adapter.InsertCommand.Parameters[25].Value = global::System.DBNull.Value; + } + if ((chkFunCod == null)) { + this.Adapter.InsertCommand.Parameters[26].Value = global::System.DBNull.Value; + } + else { + this.Adapter.InsertCommand.Parameters[26].Value = ((string)(chkFunCod)); + } + if ((chkFunRes == null)) { + this.Adapter.InsertCommand.Parameters[27].Value = global::System.DBNull.Value; + } + else { + this.Adapter.InsertCommand.Parameters[27].Value = ((string)(chkFunRes)); } global::System.Data.ConnectionState previousConnectionState = this.Adapter.InsertCommand.Connection.State; if (((this.Adapter.InsertCommand.Connection.State & global::System.Data.ConnectionState.Open) @@ -18054,6 +18258,9 @@ SELECT dataLav, idxDipendente, CognomeNome, entrata_1, uscita_1, entrata_2, usci global::System.Nullable minFer, global::System.Nullable minMal, global::System.Nullable minFest, + global::System.Nullable minCassa, + global::System.Nullable min104, + global::System.Nullable minMpp, global::System.Nullable isOkTim, global::System.Nullable isOkApp, global::System.Nullable block, @@ -18071,7 +18278,6 @@ SELECT dataLav, idxDipendente, CognomeNome, entrata_1, uscita_1, entrata_2, usci global::System.Nullable Original_entrata_4, global::System.Nullable Original_uscita_4, global::System.Nullable Original_h_lav, - global::System.Nullable Original_h_giust, global::System.Nullable Original_minLav, global::System.Nullable Original_minOrd, global::System.Nullable Original_minNonLav, @@ -18080,14 +18286,18 @@ SELECT dataLav, idxDipendente, CognomeNome, entrata_1, uscita_1, entrata_2, usci global::System.Nullable Original_minFer, global::System.Nullable Original_minMal, global::System.Nullable Original_minFest, + global::System.Nullable Original_minCassa, + global::System.Nullable Original_min104, + global::System.Nullable Original_minMpp, global::System.Nullable Original_minArcoPres, global::System.Nullable Original_isOkTim, global::System.Nullable Original_isOkApp, - int Original_isOkLav, - global::System.Nullable Original_isOk, global::System.Nullable Original_block, string Original_chkFunCod, - string Original_chkFunRes) { + string Original_chkFunRes, + global::System.Nullable Original_isOk, + int Original_isOkLav, + global::System.Nullable Original_h_giust) { this.Adapter.UpdateCommand.Parameters[0].Value = ((System.DateTime)(dataLav)); this.Adapter.UpdateCommand.Parameters[1].Value = ((int)(idxDipendente)); if ((CognomeNome == null)) { @@ -18198,246 +18408,288 @@ SELECT dataLav, idxDipendente, CognomeNome, entrata_1, uscita_1, entrata_2, usci else { this.Adapter.UpdateCommand.Parameters[19].Value = global::System.DBNull.Value; } - if ((isOkTim.HasValue == true)) { - this.Adapter.UpdateCommand.Parameters[20].Value = ((bool)(isOkTim.Value)); + if ((minCassa.HasValue == true)) { + this.Adapter.UpdateCommand.Parameters[20].Value = ((int)(minCassa.Value)); } else { this.Adapter.UpdateCommand.Parameters[20].Value = global::System.DBNull.Value; } - if ((isOkApp.HasValue == true)) { - this.Adapter.UpdateCommand.Parameters[21].Value = ((bool)(isOkApp.Value)); + if ((min104.HasValue == true)) { + this.Adapter.UpdateCommand.Parameters[21].Value = ((int)(min104.Value)); } else { this.Adapter.UpdateCommand.Parameters[21].Value = global::System.DBNull.Value; } - if ((block.HasValue == true)) { - this.Adapter.UpdateCommand.Parameters[22].Value = ((bool)(block.Value)); + if ((minMpp.HasValue == true)) { + this.Adapter.UpdateCommand.Parameters[22].Value = ((int)(minMpp.Value)); } else { this.Adapter.UpdateCommand.Parameters[22].Value = global::System.DBNull.Value; } - if ((chkFunCod == null)) { + if ((isOkTim.HasValue == true)) { + this.Adapter.UpdateCommand.Parameters[23].Value = ((bool)(isOkTim.Value)); + } + else { this.Adapter.UpdateCommand.Parameters[23].Value = global::System.DBNull.Value; } - else { - this.Adapter.UpdateCommand.Parameters[23].Value = ((string)(chkFunCod)); + if ((isOkApp.HasValue == true)) { + this.Adapter.UpdateCommand.Parameters[24].Value = ((bool)(isOkApp.Value)); } - if ((chkFunRes == null)) { + else { this.Adapter.UpdateCommand.Parameters[24].Value = global::System.DBNull.Value; } - else { - this.Adapter.UpdateCommand.Parameters[24].Value = ((string)(chkFunRes)); + if ((block.HasValue == true)) { + this.Adapter.UpdateCommand.Parameters[25].Value = ((bool)(block.Value)); } - this.Adapter.UpdateCommand.Parameters[25].Value = ((System.DateTime)(Original_dataLav)); - this.Adapter.UpdateCommand.Parameters[26].Value = ((int)(Original_idxDipendente)); + else { + this.Adapter.UpdateCommand.Parameters[25].Value = global::System.DBNull.Value; + } + if ((chkFunCod == null)) { + this.Adapter.UpdateCommand.Parameters[26].Value = global::System.DBNull.Value; + } + else { + this.Adapter.UpdateCommand.Parameters[26].Value = ((string)(chkFunCod)); + } + if ((chkFunRes == null)) { + this.Adapter.UpdateCommand.Parameters[27].Value = global::System.DBNull.Value; + } + else { + this.Adapter.UpdateCommand.Parameters[27].Value = ((string)(chkFunRes)); + } + this.Adapter.UpdateCommand.Parameters[28].Value = ((System.DateTime)(Original_dataLav)); + this.Adapter.UpdateCommand.Parameters[29].Value = ((int)(Original_idxDipendente)); if ((Original_CognomeNome == null)) { - this.Adapter.UpdateCommand.Parameters[27].Value = ((object)(1)); - this.Adapter.UpdateCommand.Parameters[28].Value = global::System.DBNull.Value; + this.Adapter.UpdateCommand.Parameters[30].Value = ((object)(1)); + this.Adapter.UpdateCommand.Parameters[31].Value = global::System.DBNull.Value; } else { - this.Adapter.UpdateCommand.Parameters[27].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[28].Value = ((string)(Original_CognomeNome)); + this.Adapter.UpdateCommand.Parameters[30].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[31].Value = ((string)(Original_CognomeNome)); } if ((Original_entrata_1.HasValue == true)) { - this.Adapter.UpdateCommand.Parameters[29].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[30].Value = ((System.DateTime)(Original_entrata_1.Value)); + this.Adapter.UpdateCommand.Parameters[32].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[33].Value = ((System.DateTime)(Original_entrata_1.Value)); } else { - this.Adapter.UpdateCommand.Parameters[29].Value = ((object)(1)); - this.Adapter.UpdateCommand.Parameters[30].Value = global::System.DBNull.Value; + this.Adapter.UpdateCommand.Parameters[32].Value = ((object)(1)); + this.Adapter.UpdateCommand.Parameters[33].Value = global::System.DBNull.Value; } if ((Original_uscita_1.HasValue == true)) { - this.Adapter.UpdateCommand.Parameters[31].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[32].Value = ((System.DateTime)(Original_uscita_1.Value)); + this.Adapter.UpdateCommand.Parameters[34].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[35].Value = ((System.DateTime)(Original_uscita_1.Value)); } else { - this.Adapter.UpdateCommand.Parameters[31].Value = ((object)(1)); - this.Adapter.UpdateCommand.Parameters[32].Value = global::System.DBNull.Value; + this.Adapter.UpdateCommand.Parameters[34].Value = ((object)(1)); + this.Adapter.UpdateCommand.Parameters[35].Value = global::System.DBNull.Value; } if ((Original_entrata_2.HasValue == true)) { - this.Adapter.UpdateCommand.Parameters[33].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[34].Value = ((System.DateTime)(Original_entrata_2.Value)); + this.Adapter.UpdateCommand.Parameters[36].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[37].Value = ((System.DateTime)(Original_entrata_2.Value)); } else { - this.Adapter.UpdateCommand.Parameters[33].Value = ((object)(1)); - this.Adapter.UpdateCommand.Parameters[34].Value = global::System.DBNull.Value; + this.Adapter.UpdateCommand.Parameters[36].Value = ((object)(1)); + this.Adapter.UpdateCommand.Parameters[37].Value = global::System.DBNull.Value; } if ((Original_uscita_2.HasValue == true)) { - this.Adapter.UpdateCommand.Parameters[35].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[36].Value = ((System.DateTime)(Original_uscita_2.Value)); + this.Adapter.UpdateCommand.Parameters[38].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[39].Value = ((System.DateTime)(Original_uscita_2.Value)); } else { - this.Adapter.UpdateCommand.Parameters[35].Value = ((object)(1)); - this.Adapter.UpdateCommand.Parameters[36].Value = global::System.DBNull.Value; + this.Adapter.UpdateCommand.Parameters[38].Value = ((object)(1)); + this.Adapter.UpdateCommand.Parameters[39].Value = global::System.DBNull.Value; } if ((Original_entrata_3.HasValue == true)) { - this.Adapter.UpdateCommand.Parameters[37].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[38].Value = ((System.DateTime)(Original_entrata_3.Value)); + this.Adapter.UpdateCommand.Parameters[40].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[41].Value = ((System.DateTime)(Original_entrata_3.Value)); } else { - this.Adapter.UpdateCommand.Parameters[37].Value = ((object)(1)); - this.Adapter.UpdateCommand.Parameters[38].Value = global::System.DBNull.Value; + this.Adapter.UpdateCommand.Parameters[40].Value = ((object)(1)); + this.Adapter.UpdateCommand.Parameters[41].Value = global::System.DBNull.Value; } if ((Original_uscita_3.HasValue == true)) { - this.Adapter.UpdateCommand.Parameters[39].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[40].Value = ((System.DateTime)(Original_uscita_3.Value)); + this.Adapter.UpdateCommand.Parameters[42].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[43].Value = ((System.DateTime)(Original_uscita_3.Value)); } else { - this.Adapter.UpdateCommand.Parameters[39].Value = ((object)(1)); - this.Adapter.UpdateCommand.Parameters[40].Value = global::System.DBNull.Value; + this.Adapter.UpdateCommand.Parameters[42].Value = ((object)(1)); + this.Adapter.UpdateCommand.Parameters[43].Value = global::System.DBNull.Value; } if ((Original_entrata_4.HasValue == true)) { - this.Adapter.UpdateCommand.Parameters[41].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[42].Value = ((System.DateTime)(Original_entrata_4.Value)); + this.Adapter.UpdateCommand.Parameters[44].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[45].Value = ((System.DateTime)(Original_entrata_4.Value)); } else { - this.Adapter.UpdateCommand.Parameters[41].Value = ((object)(1)); - this.Adapter.UpdateCommand.Parameters[42].Value = global::System.DBNull.Value; + this.Adapter.UpdateCommand.Parameters[44].Value = ((object)(1)); + this.Adapter.UpdateCommand.Parameters[45].Value = global::System.DBNull.Value; } if ((Original_uscita_4.HasValue == true)) { - this.Adapter.UpdateCommand.Parameters[43].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[44].Value = ((System.DateTime)(Original_uscita_4.Value)); + this.Adapter.UpdateCommand.Parameters[46].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[47].Value = ((System.DateTime)(Original_uscita_4.Value)); } else { - this.Adapter.UpdateCommand.Parameters[43].Value = ((object)(1)); - this.Adapter.UpdateCommand.Parameters[44].Value = global::System.DBNull.Value; + this.Adapter.UpdateCommand.Parameters[46].Value = ((object)(1)); + this.Adapter.UpdateCommand.Parameters[47].Value = global::System.DBNull.Value; } if ((Original_h_lav.HasValue == true)) { - this.Adapter.UpdateCommand.Parameters[45].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[46].Value = ((double)(Original_h_lav.Value)); + this.Adapter.UpdateCommand.Parameters[48].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[49].Value = ((double)(Original_h_lav.Value)); } else { - this.Adapter.UpdateCommand.Parameters[45].Value = ((object)(1)); - this.Adapter.UpdateCommand.Parameters[46].Value = global::System.DBNull.Value; - } - if ((Original_h_giust.HasValue == true)) { - this.Adapter.UpdateCommand.Parameters[47].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[48].Value = ((double)(Original_h_giust.Value)); - } - else { - this.Adapter.UpdateCommand.Parameters[47].Value = ((object)(1)); - this.Adapter.UpdateCommand.Parameters[48].Value = global::System.DBNull.Value; + this.Adapter.UpdateCommand.Parameters[48].Value = ((object)(1)); + this.Adapter.UpdateCommand.Parameters[49].Value = global::System.DBNull.Value; } if ((Original_minLav.HasValue == true)) { - this.Adapter.UpdateCommand.Parameters[49].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[50].Value = ((int)(Original_minLav.Value)); + this.Adapter.UpdateCommand.Parameters[50].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[51].Value = ((int)(Original_minLav.Value)); } else { - this.Adapter.UpdateCommand.Parameters[49].Value = ((object)(1)); - this.Adapter.UpdateCommand.Parameters[50].Value = global::System.DBNull.Value; + this.Adapter.UpdateCommand.Parameters[50].Value = ((object)(1)); + this.Adapter.UpdateCommand.Parameters[51].Value = global::System.DBNull.Value; } if ((Original_minOrd.HasValue == true)) { - this.Adapter.UpdateCommand.Parameters[51].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[52].Value = ((int)(Original_minOrd.Value)); + this.Adapter.UpdateCommand.Parameters[52].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[53].Value = ((int)(Original_minOrd.Value)); } else { - this.Adapter.UpdateCommand.Parameters[51].Value = ((object)(1)); - this.Adapter.UpdateCommand.Parameters[52].Value = global::System.DBNull.Value; + this.Adapter.UpdateCommand.Parameters[52].Value = ((object)(1)); + this.Adapter.UpdateCommand.Parameters[53].Value = global::System.DBNull.Value; } if ((Original_minNonLav.HasValue == true)) { - this.Adapter.UpdateCommand.Parameters[53].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[54].Value = ((int)(Original_minNonLav.Value)); + this.Adapter.UpdateCommand.Parameters[54].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[55].Value = ((int)(Original_minNonLav.Value)); } else { - this.Adapter.UpdateCommand.Parameters[53].Value = ((object)(1)); - this.Adapter.UpdateCommand.Parameters[54].Value = global::System.DBNull.Value; + this.Adapter.UpdateCommand.Parameters[54].Value = ((object)(1)); + this.Adapter.UpdateCommand.Parameters[55].Value = global::System.DBNull.Value; } if ((Original_minStra.HasValue == true)) { - this.Adapter.UpdateCommand.Parameters[55].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[56].Value = ((int)(Original_minStra.Value)); + this.Adapter.UpdateCommand.Parameters[56].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[57].Value = ((int)(Original_minStra.Value)); } else { - this.Adapter.UpdateCommand.Parameters[55].Value = ((object)(1)); - this.Adapter.UpdateCommand.Parameters[56].Value = global::System.DBNull.Value; + this.Adapter.UpdateCommand.Parameters[56].Value = ((object)(1)); + this.Adapter.UpdateCommand.Parameters[57].Value = global::System.DBNull.Value; } if ((Original_minPerm.HasValue == true)) { - this.Adapter.UpdateCommand.Parameters[57].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[58].Value = ((int)(Original_minPerm.Value)); + this.Adapter.UpdateCommand.Parameters[58].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[59].Value = ((int)(Original_minPerm.Value)); } else { - this.Adapter.UpdateCommand.Parameters[57].Value = ((object)(1)); - this.Adapter.UpdateCommand.Parameters[58].Value = global::System.DBNull.Value; + this.Adapter.UpdateCommand.Parameters[58].Value = ((object)(1)); + this.Adapter.UpdateCommand.Parameters[59].Value = global::System.DBNull.Value; } if ((Original_minFer.HasValue == true)) { - this.Adapter.UpdateCommand.Parameters[59].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[60].Value = ((int)(Original_minFer.Value)); + this.Adapter.UpdateCommand.Parameters[60].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[61].Value = ((int)(Original_minFer.Value)); } else { - this.Adapter.UpdateCommand.Parameters[59].Value = ((object)(1)); - this.Adapter.UpdateCommand.Parameters[60].Value = global::System.DBNull.Value; + this.Adapter.UpdateCommand.Parameters[60].Value = ((object)(1)); + this.Adapter.UpdateCommand.Parameters[61].Value = global::System.DBNull.Value; } if ((Original_minMal.HasValue == true)) { - this.Adapter.UpdateCommand.Parameters[61].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[62].Value = ((int)(Original_minMal.Value)); + this.Adapter.UpdateCommand.Parameters[62].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[63].Value = ((int)(Original_minMal.Value)); } else { - this.Adapter.UpdateCommand.Parameters[61].Value = ((object)(1)); - this.Adapter.UpdateCommand.Parameters[62].Value = global::System.DBNull.Value; + this.Adapter.UpdateCommand.Parameters[62].Value = ((object)(1)); + this.Adapter.UpdateCommand.Parameters[63].Value = global::System.DBNull.Value; } if ((Original_minFest.HasValue == true)) { - this.Adapter.UpdateCommand.Parameters[63].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[64].Value = ((int)(Original_minFest.Value)); + this.Adapter.UpdateCommand.Parameters[64].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[65].Value = ((int)(Original_minFest.Value)); } else { - this.Adapter.UpdateCommand.Parameters[63].Value = ((object)(1)); - this.Adapter.UpdateCommand.Parameters[64].Value = global::System.DBNull.Value; + this.Adapter.UpdateCommand.Parameters[64].Value = ((object)(1)); + this.Adapter.UpdateCommand.Parameters[65].Value = global::System.DBNull.Value; + } + if ((Original_minCassa.HasValue == true)) { + this.Adapter.UpdateCommand.Parameters[66].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[67].Value = ((int)(Original_minCassa.Value)); + } + else { + this.Adapter.UpdateCommand.Parameters[66].Value = ((object)(1)); + this.Adapter.UpdateCommand.Parameters[67].Value = global::System.DBNull.Value; + } + if ((Original_min104.HasValue == true)) { + this.Adapter.UpdateCommand.Parameters[68].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[69].Value = ((int)(Original_min104.Value)); + } + else { + this.Adapter.UpdateCommand.Parameters[68].Value = ((object)(1)); + this.Adapter.UpdateCommand.Parameters[69].Value = global::System.DBNull.Value; + } + if ((Original_minMpp.HasValue == true)) { + this.Adapter.UpdateCommand.Parameters[70].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[71].Value = ((int)(Original_minMpp.Value)); + } + else { + this.Adapter.UpdateCommand.Parameters[70].Value = ((object)(1)); + this.Adapter.UpdateCommand.Parameters[71].Value = global::System.DBNull.Value; } if ((Original_minArcoPres.HasValue == true)) { - this.Adapter.UpdateCommand.Parameters[65].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[66].Value = ((int)(Original_minArcoPres.Value)); - } - else { - this.Adapter.UpdateCommand.Parameters[65].Value = ((object)(1)); - this.Adapter.UpdateCommand.Parameters[66].Value = global::System.DBNull.Value; - } - if ((Original_isOkTim.HasValue == true)) { - this.Adapter.UpdateCommand.Parameters[67].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[68].Value = ((bool)(Original_isOkTim.Value)); - } - else { - this.Adapter.UpdateCommand.Parameters[67].Value = ((object)(1)); - this.Adapter.UpdateCommand.Parameters[68].Value = global::System.DBNull.Value; - } - if ((Original_isOkApp.HasValue == true)) { - this.Adapter.UpdateCommand.Parameters[69].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[70].Value = ((bool)(Original_isOkApp.Value)); - } - else { - this.Adapter.UpdateCommand.Parameters[69].Value = ((object)(1)); - this.Adapter.UpdateCommand.Parameters[70].Value = global::System.DBNull.Value; - } - this.Adapter.UpdateCommand.Parameters[71].Value = ((int)(Original_isOkLav)); - if ((Original_isOk.HasValue == true)) { this.Adapter.UpdateCommand.Parameters[72].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[73].Value = ((int)(Original_isOk.Value)); + this.Adapter.UpdateCommand.Parameters[73].Value = ((int)(Original_minArcoPres.Value)); } else { this.Adapter.UpdateCommand.Parameters[72].Value = ((object)(1)); this.Adapter.UpdateCommand.Parameters[73].Value = global::System.DBNull.Value; } - if ((Original_block.HasValue == true)) { + if ((Original_isOkTim.HasValue == true)) { this.Adapter.UpdateCommand.Parameters[74].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[75].Value = ((bool)(Original_block.Value)); + this.Adapter.UpdateCommand.Parameters[75].Value = ((bool)(Original_isOkTim.Value)); } else { this.Adapter.UpdateCommand.Parameters[74].Value = ((object)(1)); this.Adapter.UpdateCommand.Parameters[75].Value = global::System.DBNull.Value; } - if ((Original_chkFunCod == null)) { + if ((Original_isOkApp.HasValue == true)) { + this.Adapter.UpdateCommand.Parameters[76].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[77].Value = ((bool)(Original_isOkApp.Value)); + } + else { this.Adapter.UpdateCommand.Parameters[76].Value = ((object)(1)); this.Adapter.UpdateCommand.Parameters[77].Value = global::System.DBNull.Value; } - else { - this.Adapter.UpdateCommand.Parameters[76].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[77].Value = ((string)(Original_chkFunCod)); + if ((Original_block.HasValue == true)) { + this.Adapter.UpdateCommand.Parameters[78].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[79].Value = ((bool)(Original_block.Value)); } - if ((Original_chkFunRes == null)) { + else { this.Adapter.UpdateCommand.Parameters[78].Value = ((object)(1)); this.Adapter.UpdateCommand.Parameters[79].Value = global::System.DBNull.Value; } + if ((Original_chkFunCod == null)) { + this.Adapter.UpdateCommand.Parameters[80].Value = ((object)(1)); + this.Adapter.UpdateCommand.Parameters[81].Value = global::System.DBNull.Value; + } else { - this.Adapter.UpdateCommand.Parameters[78].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[79].Value = ((string)(Original_chkFunRes)); + this.Adapter.UpdateCommand.Parameters[80].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[81].Value = ((string)(Original_chkFunCod)); + } + if ((Original_chkFunRes == null)) { + this.Adapter.UpdateCommand.Parameters[82].Value = ((object)(1)); + this.Adapter.UpdateCommand.Parameters[83].Value = global::System.DBNull.Value; + } + else { + this.Adapter.UpdateCommand.Parameters[82].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[83].Value = ((string)(Original_chkFunRes)); + } + if ((Original_isOk.HasValue == true)) { + this.Adapter.UpdateCommand.Parameters[84].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[85].Value = ((int)(Original_isOk.Value)); + } + else { + this.Adapter.UpdateCommand.Parameters[84].Value = ((object)(1)); + this.Adapter.UpdateCommand.Parameters[85].Value = global::System.DBNull.Value; + } + this.Adapter.UpdateCommand.Parameters[86].Value = ((int)(Original_isOkLav)); + if ((Original_h_giust.HasValue == true)) { + this.Adapter.UpdateCommand.Parameters[87].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[88].Value = ((double)(Original_h_giust.Value)); + } + else { + this.Adapter.UpdateCommand.Parameters[87].Value = ((object)(1)); + this.Adapter.UpdateCommand.Parameters[88].Value = global::System.DBNull.Value; } global::System.Data.ConnectionState previousConnectionState = this.Adapter.UpdateCommand.Connection.State; if (((this.Adapter.UpdateCommand.Connection.State & global::System.Data.ConnectionState.Open) @@ -18478,6 +18730,9 @@ SELECT dataLav, idxDipendente, CognomeNome, entrata_1, uscita_1, entrata_2, usci global::System.Nullable minFer, global::System.Nullable minMal, global::System.Nullable minFest, + global::System.Nullable minCassa, + global::System.Nullable min104, + global::System.Nullable minMpp, global::System.Nullable isOkTim, global::System.Nullable isOkApp, global::System.Nullable block, @@ -18495,7 +18750,6 @@ SELECT dataLav, idxDipendente, CognomeNome, entrata_1, uscita_1, entrata_2, usci global::System.Nullable Original_entrata_4, global::System.Nullable Original_uscita_4, global::System.Nullable Original_h_lav, - global::System.Nullable Original_h_giust, global::System.Nullable Original_minLav, global::System.Nullable Original_minOrd, global::System.Nullable Original_minNonLav, @@ -18504,15 +18758,19 @@ SELECT dataLav, idxDipendente, CognomeNome, entrata_1, uscita_1, entrata_2, usci global::System.Nullable Original_minFer, global::System.Nullable Original_minMal, global::System.Nullable Original_minFest, + global::System.Nullable Original_minCassa, + global::System.Nullable Original_min104, + global::System.Nullable Original_minMpp, global::System.Nullable Original_minArcoPres, global::System.Nullable Original_isOkTim, global::System.Nullable Original_isOkApp, - int Original_isOkLav, - global::System.Nullable Original_isOk, global::System.Nullable Original_block, string Original_chkFunCod, - string Original_chkFunRes) { - return this.Update(Original_dataLav, Original_idxDipendente, CognomeNome, entrata_1, uscita_1, entrata_2, uscita_2, entrata_3, uscita_3, entrata_4, uscita_4, h_lav, minLav, minOrd, minNonLav, minStra, minPerm, minFer, minMal, minFest, isOkTim, isOkApp, block, chkFunCod, chkFunRes, Original_dataLav, Original_idxDipendente, Original_CognomeNome, Original_entrata_1, Original_uscita_1, Original_entrata_2, Original_uscita_2, Original_entrata_3, Original_uscita_3, Original_entrata_4, Original_uscita_4, Original_h_lav, Original_h_giust, Original_minLav, Original_minOrd, Original_minNonLav, Original_minStra, Original_minPerm, Original_minFer, Original_minMal, Original_minFest, Original_minArcoPres, Original_isOkTim, Original_isOkApp, Original_isOkLav, Original_isOk, Original_block, Original_chkFunCod, Original_chkFunRes); + string Original_chkFunRes, + global::System.Nullable Original_isOk, + int Original_isOkLav, + global::System.Nullable Original_h_giust) { + return this.Update(Original_dataLav, Original_idxDipendente, CognomeNome, entrata_1, uscita_1, entrata_2, uscita_2, entrata_3, uscita_3, entrata_4, uscita_4, h_lav, minLav, minOrd, minNonLav, minStra, minPerm, minFer, minMal, minFest, minCassa, min104, minMpp, isOkTim, isOkApp, block, chkFunCod, chkFunRes, Original_dataLav, Original_idxDipendente, Original_CognomeNome, Original_entrata_1, Original_uscita_1, Original_entrata_2, Original_uscita_2, Original_entrata_3, Original_uscita_3, Original_entrata_4, Original_uscita_4, Original_h_lav, Original_minLav, Original_minOrd, Original_minNonLav, Original_minStra, Original_minPerm, Original_minFer, Original_minMal, Original_minFest, Original_minCassa, Original_min104, Original_minMpp, Original_minArcoPres, Original_isOkTim, Original_isOkApp, Original_block, Original_chkFunCod, Original_chkFunRes, Original_isOk, Original_isOkLav, Original_h_giust); } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] diff --git a/GPW_Data/DS_Applicazione.xsd b/GPW_Data/DS_Applicazione.xsd index a3ea245..cc4f60d 100644 --- a/GPW_Data/DS_Applicazione.xsd +++ b/GPW_Data/DS_Applicazione.xsd @@ -213,7 +213,7 @@ SELECT dataOra, idxDipendente, entrata, IPv4, CodTipoTimb, Approv FROM Timbratur - DELETE FROM [TimbratureExpl] WHERE (([dataLav] = @Original_dataLav) AND ([idxDipendente] = @Original_idxDipendente) AND ((@IsNull_CognomeNome = 1 AND [CognomeNome] IS NULL) OR ([CognomeNome] = @Original_CognomeNome)) AND ((@IsNull_entrata_1 = 1 AND [entrata_1] IS NULL) OR ([entrata_1] = @Original_entrata_1)) AND ((@IsNull_uscita_1 = 1 AND [uscita_1] IS NULL) OR ([uscita_1] = @Original_uscita_1)) AND ((@IsNull_entrata_2 = 1 AND [entrata_2] IS NULL) OR ([entrata_2] = @Original_entrata_2)) AND ((@IsNull_uscita_2 = 1 AND [uscita_2] IS NULL) OR ([uscita_2] = @Original_uscita_2)) AND ((@IsNull_entrata_3 = 1 AND [entrata_3] IS NULL) OR ([entrata_3] = @Original_entrata_3)) AND ((@IsNull_uscita_3 = 1 AND [uscita_3] IS NULL) OR ([uscita_3] = @Original_uscita_3)) AND ((@IsNull_entrata_4 = 1 AND [entrata_4] IS NULL) OR ([entrata_4] = @Original_entrata_4)) AND ((@IsNull_uscita_4 = 1 AND [uscita_4] IS NULL) OR ([uscita_4] = @Original_uscita_4)) AND ((@IsNull_h_lav = 1 AND [h_lav] IS NULL) OR ([h_lav] = @Original_h_lav)) AND ((@IsNull_h_giust = 1 AND [h_giust] IS NULL) OR ([h_giust] = @Original_h_giust)) AND ((@IsNull_minLav = 1 AND [minLav] IS NULL) OR ([minLav] = @Original_minLav)) AND ((@IsNull_minOrd = 1 AND [minOrd] IS NULL) OR ([minOrd] = @Original_minOrd)) AND ((@IsNull_minNonLav = 1 AND [minNonLav] IS NULL) OR ([minNonLav] = @Original_minNonLav)) AND ((@IsNull_minStra = 1 AND [minStra] IS NULL) OR ([minStra] = @Original_minStra)) AND ((@IsNull_minPerm = 1 AND [minPerm] IS NULL) OR ([minPerm] = @Original_minPerm)) AND ((@IsNull_minFer = 1 AND [minFer] IS NULL) OR ([minFer] = @Original_minFer)) AND ((@IsNull_minMal = 1 AND [minMal] IS NULL) OR ([minMal] = @Original_minMal)) AND ((@IsNull_minFest = 1 AND [minFest] IS NULL) OR ([minFest] = @Original_minFest)) AND ((@IsNull_minArcoPres = 1 AND [minArcoPres] IS NULL) OR ([minArcoPres] = @Original_minArcoPres)) AND ((@IsNull_isOkTim = 1 AND [isOkTim] IS NULL) OR ([isOkTim] = @Original_isOkTim)) AND ((@IsNull_isOkApp = 1 AND [isOkApp] IS NULL) OR ([isOkApp] = @Original_isOkApp)) AND ([isOkLav] = @Original_isOkLav) AND ((@IsNull_isOk = 1 AND [isOk] IS NULL) OR ([isOk] = @Original_isOk)) AND ((@IsNull_block = 1 AND [block] IS NULL) OR ([block] = @Original_block)) AND ((@IsNull_chkFunCod = 1 AND [chkFunCod] IS NULL) OR ([chkFunCod] = @Original_chkFunCod)) AND ((@IsNull_chkFunRes = 1 AND [chkFunRes] IS NULL) OR ([chkFunRes] = @Original_chkFunRes))) + DELETE FROM [TimbratureExpl] WHERE (([dataLav] = @Original_dataLav) AND ([idxDipendente] = @Original_idxDipendente) AND ((@IsNull_CognomeNome = 1 AND [CognomeNome] IS NULL) OR ([CognomeNome] = @Original_CognomeNome)) AND ((@IsNull_entrata_1 = 1 AND [entrata_1] IS NULL) OR ([entrata_1] = @Original_entrata_1)) AND ((@IsNull_uscita_1 = 1 AND [uscita_1] IS NULL) OR ([uscita_1] = @Original_uscita_1)) AND ((@IsNull_entrata_2 = 1 AND [entrata_2] IS NULL) OR ([entrata_2] = @Original_entrata_2)) AND ((@IsNull_uscita_2 = 1 AND [uscita_2] IS NULL) OR ([uscita_2] = @Original_uscita_2)) AND ((@IsNull_entrata_3 = 1 AND [entrata_3] IS NULL) OR ([entrata_3] = @Original_entrata_3)) AND ((@IsNull_uscita_3 = 1 AND [uscita_3] IS NULL) OR ([uscita_3] = @Original_uscita_3)) AND ((@IsNull_entrata_4 = 1 AND [entrata_4] IS NULL) OR ([entrata_4] = @Original_entrata_4)) AND ((@IsNull_uscita_4 = 1 AND [uscita_4] IS NULL) OR ([uscita_4] = @Original_uscita_4)) AND ((@IsNull_h_lav = 1 AND [h_lav] IS NULL) OR ([h_lav] = @Original_h_lav)) AND ((@IsNull_minLav = 1 AND [minLav] IS NULL) OR ([minLav] = @Original_minLav)) AND ((@IsNull_minOrd = 1 AND [minOrd] IS NULL) OR ([minOrd] = @Original_minOrd)) AND ((@IsNull_minNonLav = 1 AND [minNonLav] IS NULL) OR ([minNonLav] = @Original_minNonLav)) AND ((@IsNull_minStra = 1 AND [minStra] IS NULL) OR ([minStra] = @Original_minStra)) AND ((@IsNull_minPerm = 1 AND [minPerm] IS NULL) OR ([minPerm] = @Original_minPerm)) AND ((@IsNull_minFer = 1 AND [minFer] IS NULL) OR ([minFer] = @Original_minFer)) AND ((@IsNull_minMal = 1 AND [minMal] IS NULL) OR ([minMal] = @Original_minMal)) AND ((@IsNull_minFest = 1 AND [minFest] IS NULL) OR ([minFest] = @Original_minFest)) AND ((@IsNull_minCassa = 1 AND [minCassa] IS NULL) OR ([minCassa] = @Original_minCassa)) AND ((@IsNull_min104 = 1 AND [min104] IS NULL) OR ([min104] = @Original_min104)) AND ((@IsNull_minMpp = 1 AND [minMpp] IS NULL) OR ([minMpp] = @Original_minMpp)) AND ((@IsNull_minArcoPres = 1 AND [minArcoPres] IS NULL) OR ([minArcoPres] = @Original_minArcoPres)) AND ((@IsNull_isOkTim = 1 AND [isOkTim] IS NULL) OR ([isOkTim] = @Original_isOkTim)) AND ((@IsNull_isOkApp = 1 AND [isOkApp] IS NULL) OR ([isOkApp] = @Original_isOkApp)) AND ((@IsNull_block = 1 AND [block] IS NULL) OR ([block] = @Original_block)) AND ((@IsNull_chkFunCod = 1 AND [chkFunCod] IS NULL) OR ([chkFunCod] = @Original_chkFunCod)) AND ((@IsNull_chkFunRes = 1 AND [chkFunRes] IS NULL) OR ([chkFunRes] = @Original_chkFunRes)) AND ((@IsNull_isOk = 1 AND [isOk] IS NULL) OR ([isOk] = @Original_isOk)) AND ([isOkLav] = @Original_isOkLav) AND ((@IsNull_h_giust = 1 AND [h_giust] IS NULL) OR ([h_giust] = @Original_h_giust))) @@ -237,8 +237,6 @@ SELECT dataOra, idxDipendente, entrata, IPv4, CodTipoTimb, Approv FROM Timbratur - - @@ -255,28 +253,36 @@ SELECT dataOra, idxDipendente, entrata, IPv4, CodTipoTimb, Approv FROM Timbratur + + + + + + - - - + + + + + - INSERT INTO [TimbratureExpl] ([dataLav], [idxDipendente], [CognomeNome], [entrata_1], [uscita_1], [entrata_2], [uscita_2], [entrata_3], [uscita_3], [entrata_4], [uscita_4], [h_lav], [minLav], [minOrd], [minNonLav], [minStra], [minPerm], [minFer], [minMal], [minFest], [isOkTim], [isOkApp], [block], [chkFunCod], [chkFunRes]) VALUES (@dataLav, @idxDipendente, @CognomeNome, @entrata_1, @uscita_1, @entrata_2, @uscita_2, @entrata_3, @uscita_3, @entrata_4, @uscita_4, @h_lav, @minLav, @minOrd, @minNonLav, @minStra, @minPerm, @minFer, @minMal, @minFest, @isOkTim, @isOkApp, @block, @chkFunCod, @chkFunRes); -SELECT dataLav, idxDipendente, CognomeNome, entrata_1, uscita_1, entrata_2, uscita_2, entrata_3, uscita_3, entrata_4, uscita_4, h_lav, h_giust, minLav, minOrd, minNonLav, minStra, minPerm, minFer, minMal, minFest, minArcoPres, isOkTim, isOkApp, isOkLav, isOk, block, chkFunCod, chkFunRes FROM TimbratureExpl WHERE (dataLav = @dataLav) AND (idxDipendente = @idxDipendente) + INSERT INTO [TimbratureExpl] ([dataLav], [idxDipendente], [CognomeNome], [entrata_1], [uscita_1], [entrata_2], [uscita_2], [entrata_3], [uscita_3], [entrata_4], [uscita_4], [h_lav], [minLav], [minOrd], [minNonLav], [minStra], [minPerm], [minFer], [minMal], [minFest], [minCassa], [min104], [minMpp], [isOkTim], [isOkApp], [block], [chkFunCod], [chkFunRes]) VALUES (@dataLav, @idxDipendente, @CognomeNome, @entrata_1, @uscita_1, @entrata_2, @uscita_2, @entrata_3, @uscita_3, @entrata_4, @uscita_4, @h_lav, @minLav, @minOrd, @minNonLav, @minStra, @minPerm, @minFer, @minMal, @minFest, @minCassa, @min104, @minMpp, @isOkTim, @isOkApp, @block, @chkFunCod, @chkFunRes); +SELECT dataLav, idxDipendente, CognomeNome, entrata_1, uscita_1, entrata_2, uscita_2, entrata_3, uscita_3, entrata_4, uscita_4, h_lav, minLav, minOrd, minNonLav, minStra, minPerm, minFer, minMal, minFest, minCassa, min104, minMpp, minArcoPres, isOkTim, isOkApp, block, chkFunCod, chkFunRes, isOk, isOkLav, h_giust FROM TimbratureExpl WHERE (dataLav = @dataLav) AND (idxDipendente = @idxDipendente) @@ -298,6 +304,9 @@ SELECT dataLav, idxDipendente, CognomeNome, entrata_1, uscita_1, entrata_2, usci + + + @@ -308,14 +317,15 @@ SELECT dataLav, idxDipendente, CognomeNome, entrata_1, uscita_1, entrata_2, usci - SELECT * FROM TimbratureExpl + SELECT * +FROM TimbratureExpl - UPDATE [TimbratureExpl] SET [dataLav] = @dataLav, [idxDipendente] = @idxDipendente, [CognomeNome] = @CognomeNome, [entrata_1] = @entrata_1, [uscita_1] = @uscita_1, [entrata_2] = @entrata_2, [uscita_2] = @uscita_2, [entrata_3] = @entrata_3, [uscita_3] = @uscita_3, [entrata_4] = @entrata_4, [uscita_4] = @uscita_4, [h_lav] = @h_lav, [minLav] = @minLav, [minOrd] = @minOrd, [minNonLav] = @minNonLav, [minStra] = @minStra, [minPerm] = @minPerm, [minFer] = @minFer, [minMal] = @minMal, [minFest] = @minFest, [isOkTim] = @isOkTim, [isOkApp] = @isOkApp, [block] = @block, [chkFunCod] = @chkFunCod, [chkFunRes] = @chkFunRes WHERE (([dataLav] = @Original_dataLav) AND ([idxDipendente] = @Original_idxDipendente) AND ((@IsNull_CognomeNome = 1 AND [CognomeNome] IS NULL) OR ([CognomeNome] = @Original_CognomeNome)) AND ((@IsNull_entrata_1 = 1 AND [entrata_1] IS NULL) OR ([entrata_1] = @Original_entrata_1)) AND ((@IsNull_uscita_1 = 1 AND [uscita_1] IS NULL) OR ([uscita_1] = @Original_uscita_1)) AND ((@IsNull_entrata_2 = 1 AND [entrata_2] IS NULL) OR ([entrata_2] = @Original_entrata_2)) AND ((@IsNull_uscita_2 = 1 AND [uscita_2] IS NULL) OR ([uscita_2] = @Original_uscita_2)) AND ((@IsNull_entrata_3 = 1 AND [entrata_3] IS NULL) OR ([entrata_3] = @Original_entrata_3)) AND ((@IsNull_uscita_3 = 1 AND [uscita_3] IS NULL) OR ([uscita_3] = @Original_uscita_3)) AND ((@IsNull_entrata_4 = 1 AND [entrata_4] IS NULL) OR ([entrata_4] = @Original_entrata_4)) AND ((@IsNull_uscita_4 = 1 AND [uscita_4] IS NULL) OR ([uscita_4] = @Original_uscita_4)) AND ((@IsNull_h_lav = 1 AND [h_lav] IS NULL) OR ([h_lav] = @Original_h_lav)) AND ((@IsNull_h_giust = 1 AND [h_giust] IS NULL) OR ([h_giust] = @Original_h_giust)) AND ((@IsNull_minLav = 1 AND [minLav] IS NULL) OR ([minLav] = @Original_minLav)) AND ((@IsNull_minOrd = 1 AND [minOrd] IS NULL) OR ([minOrd] = @Original_minOrd)) AND ((@IsNull_minNonLav = 1 AND [minNonLav] IS NULL) OR ([minNonLav] = @Original_minNonLav)) AND ((@IsNull_minStra = 1 AND [minStra] IS NULL) OR ([minStra] = @Original_minStra)) AND ((@IsNull_minPerm = 1 AND [minPerm] IS NULL) OR ([minPerm] = @Original_minPerm)) AND ((@IsNull_minFer = 1 AND [minFer] IS NULL) OR ([minFer] = @Original_minFer)) AND ((@IsNull_minMal = 1 AND [minMal] IS NULL) OR ([minMal] = @Original_minMal)) AND ((@IsNull_minFest = 1 AND [minFest] IS NULL) OR ([minFest] = @Original_minFest)) AND ((@IsNull_minArcoPres = 1 AND [minArcoPres] IS NULL) OR ([minArcoPres] = @Original_minArcoPres)) AND ((@IsNull_isOkTim = 1 AND [isOkTim] IS NULL) OR ([isOkTim] = @Original_isOkTim)) AND ((@IsNull_isOkApp = 1 AND [isOkApp] IS NULL) OR ([isOkApp] = @Original_isOkApp)) AND ([isOkLav] = @Original_isOkLav) AND ((@IsNull_isOk = 1 AND [isOk] IS NULL) OR ([isOk] = @Original_isOk)) AND ((@IsNull_block = 1 AND [block] IS NULL) OR ([block] = @Original_block)) AND ((@IsNull_chkFunCod = 1 AND [chkFunCod] IS NULL) OR ([chkFunCod] = @Original_chkFunCod)) AND ((@IsNull_chkFunRes = 1 AND [chkFunRes] IS NULL) OR ([chkFunRes] = @Original_chkFunRes))); -SELECT dataLav, idxDipendente, CognomeNome, entrata_1, uscita_1, entrata_2, uscita_2, entrata_3, uscita_3, entrata_4, uscita_4, h_lav, h_giust, minLav, minOrd, minNonLav, minStra, minPerm, minFer, minMal, minFest, minArcoPres, isOkTim, isOkApp, isOkLav, isOk, block, chkFunCod, chkFunRes FROM TimbratureExpl WHERE (dataLav = @dataLav) AND (idxDipendente = @idxDipendente) + UPDATE [TimbratureExpl] SET [dataLav] = @dataLav, [idxDipendente] = @idxDipendente, [CognomeNome] = @CognomeNome, [entrata_1] = @entrata_1, [uscita_1] = @uscita_1, [entrata_2] = @entrata_2, [uscita_2] = @uscita_2, [entrata_3] = @entrata_3, [uscita_3] = @uscita_3, [entrata_4] = @entrata_4, [uscita_4] = @uscita_4, [h_lav] = @h_lav, [minLav] = @minLav, [minOrd] = @minOrd, [minNonLav] = @minNonLav, [minStra] = @minStra, [minPerm] = @minPerm, [minFer] = @minFer, [minMal] = @minMal, [minFest] = @minFest, [minCassa] = @minCassa, [min104] = @min104, [minMpp] = @minMpp, [isOkTim] = @isOkTim, [isOkApp] = @isOkApp, [block] = @block, [chkFunCod] = @chkFunCod, [chkFunRes] = @chkFunRes WHERE (([dataLav] = @Original_dataLav) AND ([idxDipendente] = @Original_idxDipendente) AND ((@IsNull_CognomeNome = 1 AND [CognomeNome] IS NULL) OR ([CognomeNome] = @Original_CognomeNome)) AND ((@IsNull_entrata_1 = 1 AND [entrata_1] IS NULL) OR ([entrata_1] = @Original_entrata_1)) AND ((@IsNull_uscita_1 = 1 AND [uscita_1] IS NULL) OR ([uscita_1] = @Original_uscita_1)) AND ((@IsNull_entrata_2 = 1 AND [entrata_2] IS NULL) OR ([entrata_2] = @Original_entrata_2)) AND ((@IsNull_uscita_2 = 1 AND [uscita_2] IS NULL) OR ([uscita_2] = @Original_uscita_2)) AND ((@IsNull_entrata_3 = 1 AND [entrata_3] IS NULL) OR ([entrata_3] = @Original_entrata_3)) AND ((@IsNull_uscita_3 = 1 AND [uscita_3] IS NULL) OR ([uscita_3] = @Original_uscita_3)) AND ((@IsNull_entrata_4 = 1 AND [entrata_4] IS NULL) OR ([entrata_4] = @Original_entrata_4)) AND ((@IsNull_uscita_4 = 1 AND [uscita_4] IS NULL) OR ([uscita_4] = @Original_uscita_4)) AND ((@IsNull_h_lav = 1 AND [h_lav] IS NULL) OR ([h_lav] = @Original_h_lav)) AND ((@IsNull_minLav = 1 AND [minLav] IS NULL) OR ([minLav] = @Original_minLav)) AND ((@IsNull_minOrd = 1 AND [minOrd] IS NULL) OR ([minOrd] = @Original_minOrd)) AND ((@IsNull_minNonLav = 1 AND [minNonLav] IS NULL) OR ([minNonLav] = @Original_minNonLav)) AND ((@IsNull_minStra = 1 AND [minStra] IS NULL) OR ([minStra] = @Original_minStra)) AND ((@IsNull_minPerm = 1 AND [minPerm] IS NULL) OR ([minPerm] = @Original_minPerm)) AND ((@IsNull_minFer = 1 AND [minFer] IS NULL) OR ([minFer] = @Original_minFer)) AND ((@IsNull_minMal = 1 AND [minMal] IS NULL) OR ([minMal] = @Original_minMal)) AND ((@IsNull_minFest = 1 AND [minFest] IS NULL) OR ([minFest] = @Original_minFest)) AND ((@IsNull_minCassa = 1 AND [minCassa] IS NULL) OR ([minCassa] = @Original_minCassa)) AND ((@IsNull_min104 = 1 AND [min104] IS NULL) OR ([min104] = @Original_min104)) AND ((@IsNull_minMpp = 1 AND [minMpp] IS NULL) OR ([minMpp] = @Original_minMpp)) AND ((@IsNull_minArcoPres = 1 AND [minArcoPres] IS NULL) OR ([minArcoPres] = @Original_minArcoPres)) AND ((@IsNull_isOkTim = 1 AND [isOkTim] IS NULL) OR ([isOkTim] = @Original_isOkTim)) AND ((@IsNull_isOkApp = 1 AND [isOkApp] IS NULL) OR ([isOkApp] = @Original_isOkApp)) AND ((@IsNull_block = 1 AND [block] IS NULL) OR ([block] = @Original_block)) AND ((@IsNull_chkFunCod = 1 AND [chkFunCod] IS NULL) OR ([chkFunCod] = @Original_chkFunCod)) AND ((@IsNull_chkFunRes = 1 AND [chkFunRes] IS NULL) OR ([chkFunRes] = @Original_chkFunRes)) AND ((@IsNull_isOk = 1 AND [isOk] IS NULL) OR ([isOk] = @Original_isOk)) AND ([isOkLav] = @Original_isOkLav) AND ((@IsNull_h_giust = 1 AND [h_giust] IS NULL) OR ([h_giust] = @Original_h_giust))); +SELECT dataLav, idxDipendente, CognomeNome, entrata_1, uscita_1, entrata_2, uscita_2, entrata_3, uscita_3, entrata_4, uscita_4, h_lav, minLav, minOrd, minNonLav, minStra, minPerm, minFer, minMal, minFest, minCassa, min104, minMpp, minArcoPres, isOkTim, isOkApp, block, chkFunCod, chkFunRes, isOk, isOkLav, h_giust FROM TimbratureExpl WHERE (dataLav = @dataLav) AND (idxDipendente = @idxDipendente) @@ -337,6 +347,9 @@ SELECT dataLav, idxDipendente, CognomeNome, entrata_1, uscita_1, entrata_2, usci + + + @@ -364,8 +377,6 @@ SELECT dataLav, idxDipendente, CognomeNome, entrata_1, uscita_1, entrata_2, usci - - @@ -382,21 +393,29 @@ SELECT dataLav, idxDipendente, CognomeNome, entrata_1, uscita_1, entrata_2, usci + + + + + + - - - + + + + + @@ -415,23 +434,26 @@ SELECT dataLav, idxDipendente, CognomeNome, entrata_1, uscita_1, entrata_2, usci - + + + + + - - - - + + + @@ -2716,7 +2738,7 @@ SELECT DataOra, evento, commento FROM RegistroEventi WHERE (DataOra = @DataOra) - + @@ -2740,7 +2762,7 @@ SELECT DataOra, evento, commento FROM RegistroEventi WHERE (DataOra = @DataOra) - + @@ -2761,20 +2783,20 @@ SELECT DataOra, evento, commento FROM RegistroEventi WHERE (DataOra = @DataOra) - - + + + + + + - - - - @@ -2790,10 +2812,13 @@ SELECT DataOra, evento, commento FROM RegistroEventi WHERE (DataOra = @DataOra) + + + - + @@ -2831,7 +2856,7 @@ SELECT DataOra, evento, commento FROM RegistroEventi WHERE (DataOra = @DataOra) - + @@ -2959,7 +2984,7 @@ SELECT DataOra, evento, commento FROM RegistroEventi WHERE (DataOra = @DataOra) - + @@ -3052,7 +3077,7 @@ SELECT DataOra, evento, commento FROM RegistroEventi WHERE (DataOra = @DataOra) - + @@ -3097,7 +3122,7 @@ SELECT DataOra, evento, commento FROM RegistroEventi WHERE (DataOra = @DataOra) - + @@ -3111,7 +3136,7 @@ SELECT DataOra, evento, commento FROM RegistroEventi WHERE (DataOra = @DataOra) - + @@ -3161,7 +3186,7 @@ SELECT DataOra, evento, commento FROM RegistroEventi WHERE (DataOra = @DataOra) - + @@ -3194,7 +3219,7 @@ SELECT DataOra, evento, commento FROM RegistroEventi WHERE (DataOra = @DataOra) - + @@ -3214,7 +3239,7 @@ SELECT DataOra, evento, commento FROM RegistroEventi WHERE (DataOra = @DataOra) - + @@ -3235,7 +3260,7 @@ SELECT DataOra, evento, commento FROM RegistroEventi WHERE (DataOra = @DataOra) - + @@ -3271,7 +3296,7 @@ SELECT DataOra, evento, commento FROM RegistroEventi WHERE (DataOra = @DataOra) - + @@ -3296,7 +3321,7 @@ SELECT DataOra, evento, commento FROM RegistroEventi WHERE (DataOra = @DataOra) - + @@ -3312,7 +3337,7 @@ SELECT DataOra, evento, commento FROM RegistroEventi WHERE (DataOra = @DataOra) - + @@ -3333,7 +3358,7 @@ SELECT DataOra, evento, commento FROM RegistroEventi WHERE (DataOra = @DataOra) - + @@ -3396,7 +3421,7 @@ SELECT DataOra, evento, commento FROM RegistroEventi WHERE (DataOra = @DataOra) - + @@ -3444,7 +3469,7 @@ SELECT DataOra, evento, commento FROM RegistroEventi WHERE (DataOra = @DataOra) - + @@ -3485,7 +3510,7 @@ SELECT DataOra, evento, commento FROM RegistroEventi WHERE (DataOra = @DataOra) - + @@ -3597,12 +3622,12 @@ SELECT DataOra, evento, commento FROM RegistroEventi WHERE (DataOra = @DataOra) - - - - - - + + + + + + \ No newline at end of file diff --git a/GPW_Data/DS_Applicazione.xss b/GPW_Data/DS_Applicazione.xss index ef4f7cc..166321d 100644 --- a/GPW_Data/DS_Applicazione.xss +++ b/GPW_Data/DS_Applicazione.xss @@ -4,27 +4,27 @@ Changes to this file may cause incorrect behavior and will be lost if the code is regenerated. --> - + - + - - - + + + - - - - - + + + + + - - - - - - + + + + + + @@ -39,7 +39,7 @@ - + 1234 diff --git a/Jenkinsfile b/Jenkinsfile index 0ebb01d..1831a4a 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -10,7 +10,7 @@ pipeline { steps { /* calcolo numero versione... diverso x branch MASTER/DEVELOP */ script { - withEnv(['NEXT_BUILD_NUMBER=4105']) { + withEnv(['NEXT_BUILD_NUMBER=4107']) { // env.versionNumber = VersionNumber(versionNumberString : '2.6.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true) env.versionNumber = VersionNumber(versionNumberString : '2.6.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true, overrideBuildsAllTime: '${NEXT_BUILD_NUMBER}') env.APP_NAME = 'GPW'