diff --git a/GIM_dataLayer/DS_applicazione.xsd b/GIM_dataLayer/DS_applicazione.xsd index 28db76d..8d347d3 100644 --- a/GIM_dataLayer/DS_applicazione.xsd +++ b/GIM_dataLayer/DS_applicazione.xsd @@ -1821,8 +1821,8 @@ FROM v_mtzProgExp - - SELECT numIntMtz, dataLav, turnoLav, matr, richiesta, codImpianto, nomeImpianto, codMacchina, nomeMacchina, descrizione, inizioIntervento, fineIntervento, descrizioneIntervento, descrCausale, minErogati, ImportoTot, durataMtz, durataOff, guasto, idxStato, idxImpianto, idxMacchina, isFermo, scheduled FROM export.v_allData + + SELECT * FROM export.v_allData @@ -1853,6 +1853,8 @@ FROM v_mtzProgExp + + @@ -2394,7 +2396,7 @@ FROM v_mtzProgExp - + @@ -2479,7 +2481,7 @@ FROM v_mtzProgExp - + @@ -2504,7 +2506,7 @@ FROM v_mtzProgExp - + @@ -2538,7 +2540,7 @@ FROM v_mtzProgExp - + @@ -2613,10 +2615,18 @@ FROM v_mtzProgExp + + + + + + + + - + @@ -2810,22 +2820,22 @@ FROM v_mtzProgExp - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/GIM_dataLayer/DS_applicazione.xss b/GIM_dataLayer/DS_applicazione.xss index b31bbc6..48588e9 100644 --- a/GIM_dataLayer/DS_applicazione.xss +++ b/GIM_dataLayer/DS_applicazione.xss @@ -4,7 +4,7 @@ Changes to this file may cause incorrect behavior and will be lost if the code is regenerated. --> - + diff --git a/GIM_dataLayer/DS_applicazione1.Designer.cs b/GIM_dataLayer/DS_applicazione1.Designer.cs index fb1e3cb..495e426 100644 --- a/GIM_dataLayer/DS_applicazione1.Designer.cs +++ b/GIM_dataLayer/DS_applicazione1.Designer.cs @@ -9061,6 +9061,10 @@ namespace GIM_dataLayer { private global::System.Data.DataColumn columnscheduled; + private global::System.Data.DataColumn columnAmbitoGuasto; + + private global::System.Data.DataColumn columnEsterno; + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] public v_allDataDataTable() { @@ -9286,6 +9290,22 @@ namespace GIM_dataLayer { } } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + public global::System.Data.DataColumn AmbitoGuastoColumn { + get { + return this.columnAmbitoGuasto; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + public global::System.Data.DataColumn EsternoColumn { + get { + return this.columnEsterno; + } + } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] [global::System.ComponentModel.Browsable(false)] @@ -9347,7 +9367,9 @@ namespace GIM_dataLayer { int idxImpianto, int idxMacchina, bool isFermo, - bool scheduled) { + bool scheduled, + string AmbitoGuasto, + bool Esterno) { v_allDataRow rowv_allDataRow = ((v_allDataRow)(this.NewRow())); object[] columnValuesArray = new object[] { numIntMtz, @@ -9373,7 +9395,9 @@ namespace GIM_dataLayer { idxImpianto, idxMacchina, isFermo, - scheduled}; + scheduled, + AmbitoGuasto, + Esterno}; rowv_allDataRow.ItemArray = columnValuesArray; this.Rows.Add(rowv_allDataRow); return rowv_allDataRow; @@ -9427,6 +9451,8 @@ namespace GIM_dataLayer { this.columnidxMacchina = base.Columns["idxMacchina"]; this.columnisFermo = base.Columns["isFermo"]; this.columnscheduled = base.Columns["scheduled"]; + this.columnAmbitoGuasto = base.Columns["AmbitoGuasto"]; + this.columnEsterno = base.Columns["Esterno"]; } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] @@ -9480,6 +9506,10 @@ namespace GIM_dataLayer { base.Columns.Add(this.columnisFermo); this.columnscheduled = new global::System.Data.DataColumn("scheduled", typeof(bool), null, global::System.Data.MappingType.Element); base.Columns.Add(this.columnscheduled); + this.columnAmbitoGuasto = new global::System.Data.DataColumn("AmbitoGuasto", typeof(string), null, global::System.Data.MappingType.Element); + base.Columns.Add(this.columnAmbitoGuasto); + this.columnEsterno = new global::System.Data.DataColumn("Esterno", typeof(bool), null, global::System.Data.MappingType.Element); + base.Columns.Add(this.columnEsterno); this.Constraints.Add(new global::System.Data.UniqueConstraint("Constraint1", new global::System.Data.DataColumn[] { this.columnnumIntMtz}, true)); this.columnnumIntMtz.AllowDBNull = false; @@ -9508,6 +9538,8 @@ namespace GIM_dataLayer { this.columnidxImpianto.AllowDBNull = false; this.columnidxMacchina.AllowDBNull = false; this.columnisFermo.AllowDBNull = false; + this.columnAmbitoGuasto.MaxLength = 50; + this.columnEsterno.AllowDBNull = false; } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] @@ -14202,6 +14234,33 @@ namespace GIM_dataLayer { } } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + public string AmbitoGuasto { + get { + try { + return ((string)(this[this.tablev_allData.AmbitoGuastoColumn])); + } + catch (global::System.InvalidCastException e) { + throw new global::System.Data.StrongTypingException("The value for column \'AmbitoGuasto\' in table \'v_allData\' is DBNull.", e); + } + } + set { + this[this.tablev_allData.AmbitoGuastoColumn] = value; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + public bool Esterno { + get { + return ((bool)(this[this.tablev_allData.EsternoColumn])); + } + set { + this[this.tablev_allData.EsternoColumn] = value; + } + } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] public bool IsdataLavNull() { @@ -14369,6 +14428,18 @@ namespace GIM_dataLayer { public void SetscheduledNull() { this[this.tablev_allData.scheduledColumn] = global::System.Convert.DBNull; } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + public bool IsAmbitoGuastoNull() { + return this.IsNull(this.tablev_allData.AmbitoGuastoColumn); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + public void SetAmbitoGuastoNull() { + this[this.tablev_allData.AmbitoGuastoColumn] = global::System.Convert.DBNull; + } } /// @@ -24731,6 +24802,8 @@ namespace GIM_dataLayer.DS_applicazioneTableAdapters { tableMapping.ColumnMappings.Add("idxMacchina", "idxMacchina"); tableMapping.ColumnMappings.Add("isFermo", "isFermo"); tableMapping.ColumnMappings.Add("scheduled", "scheduled"); + tableMapping.ColumnMappings.Add("AmbitoGuasto", "AmbitoGuasto"); + tableMapping.ColumnMappings.Add("Esterno", "Esterno"); this._adapter.TableMappings.Add(tableMapping); } @@ -24747,7 +24820,7 @@ namespace GIM_dataLayer.DS_applicazioneTableAdapters { this._commandCollection = new global::System.Data.SqlClient.SqlCommand[1]; this._commandCollection[0] = new global::System.Data.SqlClient.SqlCommand(); this._commandCollection[0].Connection = this.Connection; - this._commandCollection[0].CommandText = @"SELECT numIntMtz, dataLav, turnoLav, matr, richiesta, codImpianto, nomeImpianto, codMacchina, nomeMacchina, descrizione, inizioIntervento, fineIntervento, descrizioneIntervento, descrCausale, minErogati, ImportoTot, durataMtz, durataOff, guasto, idxStato, idxImpianto, idxMacchina, isFermo, scheduled FROM export.v_allData"; + this._commandCollection[0].CommandText = "SELECT * FROM export.v_allData"; this._commandCollection[0].CommandType = global::System.Data.CommandType.Text; } diff --git a/GIM_dataLayer/bin/Release/GIM_dataLayer.dll b/GIM_dataLayer/bin/Release/GIM_dataLayer.dll index a95cd74..bb380c1 100644 Binary files a/GIM_dataLayer/bin/Release/GIM_dataLayer.dll and b/GIM_dataLayer/bin/Release/GIM_dataLayer.dll differ diff --git a/GIM_dataLayer/bin/Release/SteamWare.dll b/GIM_dataLayer/bin/Release/SteamWare.dll index 2e4fc8c..48c03b2 100644 Binary files a/GIM_dataLayer/bin/Release/SteamWare.dll and b/GIM_dataLayer/bin/Release/SteamWare.dll differ diff --git a/GIM_dataLayer/obj/Release/DesignTimeResolveAssemblyReferences.cache b/GIM_dataLayer/obj/Release/DesignTimeResolveAssemblyReferences.cache new file mode 100644 index 0000000..962ab81 Binary files /dev/null and b/GIM_dataLayer/obj/Release/DesignTimeResolveAssemblyReferences.cache differ diff --git a/GIM_dataLayer/obj/Release/GIM_dataLayer.csprojResolveAssemblyReference.cache b/GIM_dataLayer/obj/Release/GIM_dataLayer.csprojResolveAssemblyReference.cache index 86b38aa..b4c252d 100644 Binary files a/GIM_dataLayer/obj/Release/GIM_dataLayer.csprojResolveAssemblyReference.cache and b/GIM_dataLayer/obj/Release/GIM_dataLayer.csprojResolveAssemblyReference.cache differ diff --git a/GIM_dataLayer/obj/Release/GIM_dataLayer.dll b/GIM_dataLayer/obj/Release/GIM_dataLayer.dll index a95cd74..bb380c1 100644 Binary files a/GIM_dataLayer/obj/Release/GIM_dataLayer.dll and b/GIM_dataLayer/obj/Release/GIM_dataLayer.dll differ diff --git a/GIM_dataLayer/obj/Release/TempPE/DS_applicazione1.Designer.cs.dll b/GIM_dataLayer/obj/Release/TempPE/DS_applicazione1.Designer.cs.dll index 721629f..8abf28f 100644 Binary files a/GIM_dataLayer/obj/Release/TempPE/DS_applicazione1.Designer.cs.dll and b/GIM_dataLayer/obj/Release/TempPE/DS_applicazione1.Designer.cs.dll differ diff --git a/GIM_site/bin/SteamWare.dll b/GIM_site/bin/SteamWare.dll index 2e4fc8c..48c03b2 100644 Binary files a/GIM_site/bin/SteamWare.dll and b/GIM_site/bin/SteamWare.dll differ diff --git a/VersGen/VersGen.cs b/VersGen/VersGen.cs index 0a90b11..8948beb 100644 --- a/VersGen/VersGen.cs +++ b/VersGen/VersGen.cs @@ -5,7 +5,7 @@ using System.Reflection; -[assembly: AssemblyVersion("1.9.1701.579")] -[assembly: AssemblyFileVersion("1.9.1701.579")] +[assembly: AssemblyVersion("1.9.1701.580")] +[assembly: AssemblyFileVersion("1.9.1701.580")] [assembly: AssemblyCopyright("Steamware © 2006-2017")] [assembly: AssemblyCompany("Steamware")] diff --git a/VersGen/bin/Debug/VersGen.dll b/VersGen/bin/Debug/VersGen.dll index 8a6949b..39d089a 100644 Binary files a/VersGen/bin/Debug/VersGen.dll and b/VersGen/bin/Debug/VersGen.dll differ