diff --git a/Projects/ReleaseClienti/Somaschini USA/GIM_site.zip b/Projects/ReleaseClienti/Somaschini USA/GIM_site.zip index 16714e8..a8cb56c 100644 Binary files a/Projects/ReleaseClienti/Somaschini USA/GIM_site.zip and b/Projects/ReleaseClienti/Somaschini USA/GIM_site.zip differ diff --git a/Projects/WebGIM/GIM_data/DS_applicazione.Designer.cs b/Projects/WebGIM/GIM_data/DS_applicazione.Designer.cs index 22f2c97..802827f 100644 --- a/Projects/WebGIM/GIM_data/DS_applicazione.Designer.cs +++ b/Projects/WebGIM/GIM_data/DS_applicazione.Designer.cs @@ -3321,6 +3321,8 @@ namespace GIM_data { private global::System.Data.DataColumn columndescrCausale; + private global::System.Data.DataColumn columnisFermoSiNo; + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] public v_intervExpDataTable() { @@ -3586,6 +3588,14 @@ namespace GIM_data { } } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + public global::System.Data.DataColumn isFermoSiNoColumn { + get { + return this.columnisFermoSiNo; + } + } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] [global::System.ComponentModel.Browsable(false)] @@ -3651,7 +3661,8 @@ namespace GIM_data { string codMacchina, string nomeMacchina, string DescrStato, - string descrCausale) { + string descrCausale, + string isFermoSiNo) { v_intervExpRow rowv_intervExpRow = ((v_intervExpRow)(this.NewRow())); object[] columnValuesArray = new object[] { null, @@ -3682,7 +3693,8 @@ namespace GIM_data { codMacchina, nomeMacchina, DescrStato, - descrCausale}; + descrCausale, + isFermoSiNo}; if ((parentAnagAmbitoGuastoRowByFK_InterventiMtz_AnagAmbitoGuasto != null)) { columnValuesArray[6] = parentAnagAmbitoGuastoRowByFK_InterventiMtz_AnagAmbitoGuasto[0]; } @@ -3753,6 +3765,7 @@ namespace GIM_data { this.columnnomeMacchina = base.Columns["nomeMacchina"]; this.columnDescrStato = base.Columns["DescrStato"]; this.columndescrCausale = base.Columns["descrCausale"]; + this.columnisFermoSiNo = base.Columns["isFermoSiNo"]; } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] @@ -3816,6 +3829,8 @@ namespace GIM_data { base.Columns.Add(this.columnDescrStato); this.columndescrCausale = new global::System.Data.DataColumn("descrCausale", typeof(string), null, global::System.Data.MappingType.Element); base.Columns.Add(this.columndescrCausale); + this.columnisFermoSiNo = new global::System.Data.DataColumn("isFermoSiNo", typeof(string), null, global::System.Data.MappingType.Element); + base.Columns.Add(this.columnisFermoSiNo); this.Constraints.Add(new global::System.Data.UniqueConstraint("Constraint1", new global::System.Data.DataColumn[] { this.columnnumIntMtz}, true)); this.columnnumIntMtz.AutoIncrement = true; @@ -3850,6 +3865,8 @@ namespace GIM_data { this.columnnomeMacchina.MaxLength = 250; this.columnDescrStato.MaxLength = 50; this.columndescrCausale.MaxLength = 50; + this.columnisFermoSiNo.ReadOnly = true; + this.columnisFermoSiNo.MaxLength = 2; } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] @@ -9434,6 +9451,22 @@ namespace GIM_data { } } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + public string isFermoSiNo { + get { + try { + return ((string)(this[this.tablev_intervExp.isFermoSiNoColumn])); + } + catch (global::System.InvalidCastException e) { + throw new global::System.Data.StrongTypingException("The value for column \'isFermoSiNo\' in table \'v_intervExp\' is DBNull.", e); + } + } + set { + this[this.tablev_intervExp.isFermoSiNoColumn] = value; + } + } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] public AnagAmbitoGuastoRow AnagAmbitoGuastoRow { @@ -9646,6 +9679,18 @@ namespace GIM_data { this[this.tablev_intervExp.descrCausaleColumn] = global::System.Convert.DBNull; } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + public bool IsisFermoSiNoNull() { + return this.IsNull(this.tablev_intervExp.isFermoSiNoColumn); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + public void SetisFermoSiNoNull() { + this[this.tablev_intervExp.isFermoSiNoColumn] = global::System.Convert.DBNull; + } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] public InterventoOpMtzRow[] GetInterventoOpMtzRows() { @@ -14723,6 +14768,7 @@ namespace GIM_data.DS_applicazioneTableAdapters { tableMapping.ColumnMappings.Add("nomeMacchina", "nomeMacchina"); tableMapping.ColumnMappings.Add("DescrStato", "DescrStato"); tableMapping.ColumnMappings.Add("descrCausale", "descrCausale"); + tableMapping.ColumnMappings.Add("isFermoSiNo", "isFermoSiNo"); this._adapter.TableMappings.Add(tableMapping); } @@ -14739,35 +14785,34 @@ namespace GIM_data.DS_applicazioneTableAdapters { this._commandCollection = new global::System.Data.SqlClient.SqlCommand[11]; this._commandCollection[0] = new global::System.Data.SqlClient.SqlCommand(); this._commandCollection[0].Connection = this.Connection; - this._commandCollection[0].CommandText = @"SELECT numIntMtz, richiesta, dataLav, turnoLav, matr, guasto, idxAmbito, descrAmbitoGuasto, idxPriorita, descrPriorita, isFermo, idxTipo, descrTipo, idxImpianto, - codImpianto, nomeImpianto, idxMacchina, codMacchina, nomeMacchina, descrizione, idxStato, DescrStato, presaInCarico, inizioIntervento, fineIntervento, - descrizioneIntervento, isPreventivabile, idxCausale, descrCausale -FROM v_intervExp + this._commandCollection[0].CommandText = @"SELECT numIntMtz, richiesta, dataLav, turnoLav, matr, guasto, idxAmbito, descrAmbitoGuasto, idxPriorita, descrPriorita, isFermo, idxTipo, descrTipo, idxImpianto, codImpianto, nomeImpianto, idxMacchina, codMacchina, + nomeMacchina, descrizione, idxStato, DescrStato, presaInCarico, inizioIntervento, fineIntervento, descrizioneIntervento, isPreventivabile, idxCausale, descrCausale, isFermoSiNo +FROM v_intervExp ORDER BY numIntMtz DESC"; this._commandCollection[0].CommandType = global::System.Data.CommandType.Text; this._commandCollection[1] = new global::System.Data.SqlClient.SqlCommand(); this._commandCollection[1].Connection = this.Connection; - this._commandCollection[1].CommandText = @"SELECT DescrStato, codImpianto, codMacchina, dataLav, descrAmbitoGuasto, descrCausale, descrPriorita, descrTipo, descrizione, descrizioneIntervento, fineIntervento, guasto, idxAmbito, idxCausale, idxImpianto, idxMacchina, idxPriorita, idxStato, idxTipo, inizioIntervento, isFermo, isPreventivabile, matr, nomeImpianto, nomeMacchina, numIntMtz, presaInCarico, richiesta, turnoLav FROM v_intervExp WHERE (numIntMtz = @numIntMtz)"; + this._commandCollection[1].CommandText = @"SELECT DescrStato, codImpianto, codMacchina, dataLav, descrAmbitoGuasto, descrCausale, descrPriorita, descrTipo, descrizione, descrizioneIntervento, fineIntervento, guasto, idxAmbito, idxCausale, idxImpianto, idxMacchina, idxPriorita, idxStato, idxTipo, inizioIntervento, isFermo, isFermoSiNo, isPreventivabile, matr, nomeImpianto, nomeMacchina, numIntMtz, presaInCarico, richiesta, turnoLav FROM v_intervExp WHERE (numIntMtz = @numIntMtz)"; this._commandCollection[1].CommandType = global::System.Data.CommandType.Text; this._commandCollection[1].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@numIntMtz", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 0, 0, "numIntMtz", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._commandCollection[2] = new global::System.Data.SqlClient.SqlCommand(); this._commandCollection[2].Connection = this.Connection; - this._commandCollection[2].CommandText = @"SELECT DescrStato, codImpianto, codMacchina, dataLav, descrAmbitoGuasto, descrCausale, descrPriorita, descrTipo, descrizione, descrizioneIntervento, fineIntervento, guasto, idxAmbito, idxCausale, idxImpianto, idxMacchina, idxPriorita, idxStato, idxTipo, inizioIntervento, isFermo, isPreventivabile, matr, nomeImpianto, nomeMacchina, numIntMtz, presaInCarico, richiesta, turnoLav FROM v_intervExp WHERE (idxCausale = @idxCausale)"; + this._commandCollection[2].CommandText = @"SELECT DescrStato, codImpianto, codMacchina, dataLav, descrAmbitoGuasto, descrCausale, descrPriorita, descrTipo, descrizione, descrizioneIntervento, fineIntervento, guasto, idxAmbito, idxCausale, idxImpianto, idxMacchina, idxPriorita, idxStato, idxTipo, inizioIntervento, isFermo, isFermoSiNo, isPreventivabile, matr, nomeImpianto, nomeMacchina, numIntMtz, presaInCarico, richiesta, turnoLav FROM v_intervExp WHERE (idxCausale = @idxCausale)"; this._commandCollection[2].CommandType = global::System.Data.CommandType.Text; this._commandCollection[2].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@idxCausale", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 0, 0, "idxCausale", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._commandCollection[3] = new global::System.Data.SqlClient.SqlCommand(); this._commandCollection[3].Connection = this.Connection; - this._commandCollection[3].CommandText = @"SELECT DescrStato, codImpianto, codMacchina, dataLav, descrAmbitoGuasto, descrCausale, descrPriorita, descrTipo, descrizione, descrizioneIntervento, fineIntervento, guasto, idxAmbito, idxCausale, idxImpianto, idxMacchina, idxPriorita, idxStato, idxTipo, inizioIntervento, isFermo, isPreventivabile, matr, nomeImpianto, nomeMacchina, numIntMtz, presaInCarico, richiesta, turnoLav FROM v_intervExp WHERE (idxImpianto = @idxImpianto) ORDER BY numIntMtz DESC"; + this._commandCollection[3].CommandText = @"SELECT DescrStato, codImpianto, codMacchina, dataLav, descrAmbitoGuasto, descrCausale, descrPriorita, descrTipo, descrizione, descrizioneIntervento, fineIntervento, guasto, idxAmbito, idxCausale, idxImpianto, idxMacchina, idxPriorita, idxStato, idxTipo, inizioIntervento, isFermo, isFermoSiNo, isPreventivabile, matr, nomeImpianto, nomeMacchina, numIntMtz, presaInCarico, richiesta, turnoLav FROM v_intervExp WHERE (idxImpianto = @idxImpianto) ORDER BY numIntMtz DESC"; this._commandCollection[3].CommandType = global::System.Data.CommandType.Text; this._commandCollection[3].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@idxImpianto", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 0, 0, "idxImpianto", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._commandCollection[4] = new global::System.Data.SqlClient.SqlCommand(); this._commandCollection[4].Connection = this.Connection; - this._commandCollection[4].CommandText = @"SELECT DescrStato, codImpianto, codMacchina, dataLav, descrAmbitoGuasto, descrCausale, descrPriorita, descrTipo, descrizione, descrizioneIntervento, fineIntervento, guasto, idxAmbito, idxCausale, idxImpianto, idxMacchina, idxPriorita, idxStato, idxTipo, inizioIntervento, isFermo, isPreventivabile, matr, nomeImpianto, nomeMacchina, numIntMtz, presaInCarico, richiesta, turnoLav FROM v_intervExp WHERE (idxMacchina = @idxMacchina) ORDER BY numIntMtz DESC"; + this._commandCollection[4].CommandText = @"SELECT DescrStato, codImpianto, codMacchina, dataLav, descrAmbitoGuasto, descrCausale, descrPriorita, descrTipo, descrizione, descrizioneIntervento, fineIntervento, guasto, idxAmbito, idxCausale, idxImpianto, idxMacchina, idxPriorita, idxStato, idxTipo, inizioIntervento, isFermo, isFermoSiNo, isPreventivabile, matr, nomeImpianto, nomeMacchina, numIntMtz, presaInCarico, richiesta, turnoLav FROM v_intervExp WHERE (idxMacchina = @idxMacchina) ORDER BY numIntMtz DESC"; this._commandCollection[4].CommandType = global::System.Data.CommandType.Text; this._commandCollection[4].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@idxMacchina", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 0, 0, "idxMacchina", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._commandCollection[5] = new global::System.Data.SqlClient.SqlCommand(); this._commandCollection[5].Connection = this.Connection; - this._commandCollection[5].CommandText = @"SELECT DescrStato, codImpianto, codMacchina, dataLav, descrAmbitoGuasto, descrCausale, descrPriorita, descrTipo, descrizione, descrizioneIntervento, fineIntervento, guasto, idxAmbito, idxCausale, idxImpianto, idxMacchina, idxPriorita, idxStato, idxTipo, inizioIntervento, isFermo, isPreventivabile, matr, nomeImpianto, nomeMacchina, numIntMtz, presaInCarico, richiesta, turnoLav FROM v_intervExp WHERE (richiesta BETWEEN @inizio AND @fine) ORDER BY numIntMtz DESC"; + this._commandCollection[5].CommandText = @"SELECT DescrStato, codImpianto, codMacchina, dataLav, descrAmbitoGuasto, descrCausale, descrPriorita, descrTipo, descrizione, descrizioneIntervento, fineIntervento, guasto, idxAmbito, idxCausale, idxImpianto, idxMacchina, idxPriorita, idxStato, idxTipo, inizioIntervento, isFermo, isFermoSiNo, isPreventivabile, matr, nomeImpianto, nomeMacchina, numIntMtz, presaInCarico, richiesta, turnoLav FROM v_intervExp WHERE (richiesta BETWEEN @inizio AND @fine) ORDER BY numIntMtz DESC"; this._commandCollection[5].CommandType = global::System.Data.CommandType.Text; this._commandCollection[5].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@inizio", global::System.Data.SqlDbType.DateTime, 8, global::System.Data.ParameterDirection.Input, 0, 0, "richiesta", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._commandCollection[5].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@fine", global::System.Data.SqlDbType.DateTime, 8, global::System.Data.ParameterDirection.Input, 0, 0, "richiesta", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); diff --git a/Projects/WebGIM/GIM_data/DS_applicazione.xsd b/Projects/WebGIM/GIM_data/DS_applicazione.xsd index 5352876..51ff53e 100644 --- a/Projects/WebGIM/GIM_data/DS_applicazione.xsd +++ b/Projects/WebGIM/GIM_data/DS_applicazione.xsd @@ -545,10 +545,9 @@ ORDER BY nomeFamMacch - SELECT numIntMtz, richiesta, dataLav, turnoLav, matr, guasto, idxAmbito, descrAmbitoGuasto, idxPriorita, descrPriorita, isFermo, idxTipo, descrTipo, idxImpianto, - codImpianto, nomeImpianto, idxMacchina, codMacchina, nomeMacchina, descrizione, idxStato, DescrStato, presaInCarico, inizioIntervento, fineIntervento, - descrizioneIntervento, isPreventivabile, idxCausale, descrCausale -FROM v_intervExp + SELECT numIntMtz, richiesta, dataLav, turnoLav, matr, guasto, idxAmbito, descrAmbitoGuasto, idxPriorita, descrPriorita, isFermo, idxTipo, descrTipo, idxImpianto, codImpianto, nomeImpianto, idxMacchina, codMacchina, + nomeMacchina, descrizione, idxStato, DescrStato, presaInCarico, inizioIntervento, fineIntervento, descrizioneIntervento, isPreventivabile, idxCausale, descrCausale, isFermoSiNo +FROM v_intervExp ORDER BY numIntMtz DESC @@ -585,12 +584,13 @@ ORDER BY numIntMtz DESC + - SELECT DescrStato, codImpianto, codMacchina, dataLav, descrAmbitoGuasto, descrCausale, descrPriorita, descrTipo, descrizione, descrizioneIntervento, fineIntervento, guasto, idxAmbito, idxCausale, idxImpianto, idxMacchina, idxPriorita, idxStato, idxTipo, inizioIntervento, isFermo, isPreventivabile, matr, nomeImpianto, nomeMacchina, numIntMtz, presaInCarico, richiesta, turnoLav FROM v_intervExp WHERE (numIntMtz = @numIntMtz) + SELECT DescrStato, codImpianto, codMacchina, dataLav, descrAmbitoGuasto, descrCausale, descrPriorita, descrTipo, descrizione, descrizioneIntervento, fineIntervento, guasto, idxAmbito, idxCausale, idxImpianto, idxMacchina, idxPriorita, idxStato, idxTipo, inizioIntervento, isFermo, isFermoSiNo, isPreventivabile, matr, nomeImpianto, nomeMacchina, numIntMtz, presaInCarico, richiesta, turnoLav FROM v_intervExp WHERE (numIntMtz = @numIntMtz) @@ -600,7 +600,7 @@ ORDER BY numIntMtz DESC - SELECT DescrStato, codImpianto, codMacchina, dataLav, descrAmbitoGuasto, descrCausale, descrPriorita, descrTipo, descrizione, descrizioneIntervento, fineIntervento, guasto, idxAmbito, idxCausale, idxImpianto, idxMacchina, idxPriorita, idxStato, idxTipo, inizioIntervento, isFermo, isPreventivabile, matr, nomeImpianto, nomeMacchina, numIntMtz, presaInCarico, richiesta, turnoLav FROM v_intervExp WHERE (idxCausale = @idxCausale) + SELECT DescrStato, codImpianto, codMacchina, dataLav, descrAmbitoGuasto, descrCausale, descrPriorita, descrTipo, descrizione, descrizioneIntervento, fineIntervento, guasto, idxAmbito, idxCausale, idxImpianto, idxMacchina, idxPriorita, idxStato, idxTipo, inizioIntervento, isFermo, isFermoSiNo, isPreventivabile, matr, nomeImpianto, nomeMacchina, numIntMtz, presaInCarico, richiesta, turnoLav FROM v_intervExp WHERE (idxCausale = @idxCausale) @@ -610,7 +610,7 @@ ORDER BY numIntMtz DESC - SELECT DescrStato, codImpianto, codMacchina, dataLav, descrAmbitoGuasto, descrCausale, descrPriorita, descrTipo, descrizione, descrizioneIntervento, fineIntervento, guasto, idxAmbito, idxCausale, idxImpianto, idxMacchina, idxPriorita, idxStato, idxTipo, inizioIntervento, isFermo, isPreventivabile, matr, nomeImpianto, nomeMacchina, numIntMtz, presaInCarico, richiesta, turnoLav FROM v_intervExp WHERE (idxImpianto = @idxImpianto) ORDER BY numIntMtz DESC + SELECT DescrStato, codImpianto, codMacchina, dataLav, descrAmbitoGuasto, descrCausale, descrPriorita, descrTipo, descrizione, descrizioneIntervento, fineIntervento, guasto, idxAmbito, idxCausale, idxImpianto, idxMacchina, idxPriorita, idxStato, idxTipo, inizioIntervento, isFermo, isFermoSiNo, isPreventivabile, matr, nomeImpianto, nomeMacchina, numIntMtz, presaInCarico, richiesta, turnoLav FROM v_intervExp WHERE (idxImpianto = @idxImpianto) ORDER BY numIntMtz DESC @@ -620,7 +620,7 @@ ORDER BY numIntMtz DESC - SELECT DescrStato, codImpianto, codMacchina, dataLav, descrAmbitoGuasto, descrCausale, descrPriorita, descrTipo, descrizione, descrizioneIntervento, fineIntervento, guasto, idxAmbito, idxCausale, idxImpianto, idxMacchina, idxPriorita, idxStato, idxTipo, inizioIntervento, isFermo, isPreventivabile, matr, nomeImpianto, nomeMacchina, numIntMtz, presaInCarico, richiesta, turnoLav FROM v_intervExp WHERE (idxMacchina = @idxMacchina) ORDER BY numIntMtz DESC + SELECT DescrStato, codImpianto, codMacchina, dataLav, descrAmbitoGuasto, descrCausale, descrPriorita, descrTipo, descrizione, descrizioneIntervento, fineIntervento, guasto, idxAmbito, idxCausale, idxImpianto, idxMacchina, idxPriorita, idxStato, idxTipo, inizioIntervento, isFermo, isFermoSiNo, isPreventivabile, matr, nomeImpianto, nomeMacchina, numIntMtz, presaInCarico, richiesta, turnoLav FROM v_intervExp WHERE (idxMacchina = @idxMacchina) ORDER BY numIntMtz DESC @@ -630,7 +630,7 @@ ORDER BY numIntMtz DESC - SELECT DescrStato, codImpianto, codMacchina, dataLav, descrAmbitoGuasto, descrCausale, descrPriorita, descrTipo, descrizione, descrizioneIntervento, fineIntervento, guasto, idxAmbito, idxCausale, idxImpianto, idxMacchina, idxPriorita, idxStato, idxTipo, inizioIntervento, isFermo, isPreventivabile, matr, nomeImpianto, nomeMacchina, numIntMtz, presaInCarico, richiesta, turnoLav FROM v_intervExp WHERE (richiesta BETWEEN @inizio AND @fine) ORDER BY numIntMtz DESC + SELECT DescrStato, codImpianto, codMacchina, dataLav, descrAmbitoGuasto, descrCausale, descrPriorita, descrTipo, descrizione, descrizioneIntervento, fineIntervento, guasto, idxAmbito, idxCausale, idxImpianto, idxMacchina, idxPriorita, idxStato, idxTipo, inizioIntervento, isFermo, isFermoSiNo, isPreventivabile, matr, nomeImpianto, nomeMacchina, numIntMtz, presaInCarico, richiesta, turnoLav FROM v_intervExp WHERE (richiesta BETWEEN @inizio AND @fine) ORDER BY numIntMtz DESC @@ -1846,6 +1846,13 @@ WHERE (idxCausale = @Original_idxCausale) + + + + + + + @@ -2060,7 +2067,7 @@ WHERE (idxCausale = @Original_idxCausale) - + @@ -2230,20 +2237,20 @@ WHERE (idxCausale = @Original_idxCausale) - - - - - - - - - - - - - - + + + + + + + + + + + + + + \ No newline at end of file diff --git a/Projects/WebGIM/GIM_data/DS_applicazione.xss b/Projects/WebGIM/GIM_data/DS_applicazione.xss index 48db8e6..23f0852 100644 --- a/Projects/WebGIM/GIM_data/DS_applicazione.xss +++ b/Projects/WebGIM/GIM_data/DS_applicazione.xss @@ -4,7 +4,7 @@ Changes to this file may cause incorrect behavior and will be lost if the code is regenerated. --> - + diff --git a/Projects/WebGIM/GIM_data/bin/GIM_data.dll b/Projects/WebGIM/GIM_data/bin/GIM_data.dll index ace77cc..5b1ca55 100644 Binary files a/Projects/WebGIM/GIM_data/bin/GIM_data.dll and b/Projects/WebGIM/GIM_data/bin/GIM_data.dll differ diff --git a/Projects/WebGIM/GIM_data/obj/SomaschiniUSA/GIM_data.dll b/Projects/WebGIM/GIM_data/obj/SomaschiniUSA/GIM_data.dll index ace77cc..5b1ca55 100644 Binary files a/Projects/WebGIM/GIM_data/obj/SomaschiniUSA/GIM_data.dll and b/Projects/WebGIM/GIM_data/obj/SomaschiniUSA/GIM_data.dll differ diff --git a/Projects/WebGIM/GIM_data/obj/SomaschiniUSA/TempPE/DS_applicazione.Designer.cs.dll b/Projects/WebGIM/GIM_data/obj/SomaschiniUSA/TempPE/DS_applicazione.Designer.cs.dll index 72c8c17..4d366d9 100644 Binary files a/Projects/WebGIM/GIM_data/obj/SomaschiniUSA/TempPE/DS_applicazione.Designer.cs.dll and b/Projects/WebGIM/GIM_data/obj/SomaschiniUSA/TempPE/DS_applicazione.Designer.cs.dll differ diff --git a/Projects/WebGIM/GIM_site/GIM_site.csproj b/Projects/WebGIM/GIM_site/GIM_site.csproj index 69a9d70..b573503 100644 --- a/Projects/WebGIM/GIM_site/GIM_site.csproj +++ b/Projects/WebGIM/GIM_site/GIM_site.csproj @@ -1358,7 +1358,9 @@ Designer - + + Designer + diff --git a/Projects/WebGIM/GIM_site/Reports/EN/Report_MTBF_MTTR.rdlc b/Projects/WebGIM/GIM_site/Reports/EN/Report_MTBF_MTTR.rdlc index 10fe8be..08f902c 100644 --- a/Projects/WebGIM/GIM_site/Reports/EN/Report_MTBF_MTTR.rdlc +++ b/Projects/WebGIM/GIM_site/Reports/EN/Report_MTBF_MTTR.rdlc @@ -134,7 +134,7 @@ true 0.25cm 0.5cm - referred to the time spent for the actual manutenance of the machine/plant + referred to the time spent for the actual maintenance of the machine/plant 1.75cm diff --git a/Projects/WebGIM/GIM_site/Reports/EN/RichiestaIntervento.rdlc b/Projects/WebGIM/GIM_site/Reports/EN/RichiestaIntervento.rdlc index 2440584..90037a0 100644 --- a/Projects/WebGIM/GIM_site/Reports/EN/RichiestaIntervento.rdlc +++ b/Projects/WebGIM/GIM_site/Reports/EN/RichiestaIntervento.rdlc @@ -1273,7 +1273,7 @@ NnSm5FYXbj0U9rEw82eM2/AEepQw+nBwqUdZYVUfccyIRfdzJgvg7Yd8Bw3nNxCWu9tPWzHeevGbhHPm isFermo 4.5cm - 1.25cm + 2.25cm 11 true - 5.25cm + 3.25cm 0.63492cm =First(Fields!isFermoSiNo.Value) 4.5cm - 4.25cm + 2.25cm 10 true - 1cm + 1.25cm 0.5cm Not Working diff --git a/Projects/WebGIM/GIM_site/Reports/IT/MacchineReparti.rdlc b/Projects/WebGIM/GIM_site/Reports/IT/MacchineReparti.rdlc index c6a033f..a6f39e7 100644 --- a/Projects/WebGIM/GIM_site/Reports/IT/MacchineReparti.rdlc +++ b/Projects/WebGIM/GIM_site/Reports/IT/MacchineReparti.rdlc @@ -863,7 +863,7 @@ 1 true 25.5cm - =Globals.PageNumber & " / " & Globals.TotalPages + =Globals.PageNumber & " di " & Globals.TotalPages 0.05754cm diff --git a/Projects/WebGIM/GIM_site/Reports/IT/RichiestaIntervento.rdlc b/Projects/WebGIM/GIM_site/Reports/IT/RichiestaIntervento.rdlc index 083fed8..ce0da00 100644 --- a/Projects/WebGIM/GIM_site/Reports/IT/RichiestaIntervento.rdlc +++ b/Projects/WebGIM/GIM_site/Reports/IT/RichiestaIntervento.rdlc @@ -242,7 +242,7 @@ NnSm5FYXbj0U9rEw82eM2/AEepQw+nBwqUdZYVUfccyIRfdzJgvg7Yd8Bw3nNxCWu9tPWzHeevGbhHPm true 5.5cm 0.91429cm - Ticket + Richiesta di Intervento @@ -660,7 +660,7 @@ NnSm5FYXbj0U9rEw82eM2/AEepQw+nBwqUdZYVUfccyIRfdzJgvg7Yd8Bw3nNxCWu9tPWzHeevGbhHPm true 1.5cm 0.63492cm - Maint. STOP + Fine intervento 15.5cm @@ -920,7 +920,7 @@ NnSm5FYXbj0U9rEw82eM2/AEepQw+nBwqUdZYVUfccyIRfdzJgvg7Yd8Bw3nNxCWu9tPWzHeevGbhHPm 33 true - REQUESTER + RICHIEDENTE 3cm @@ -936,7 +936,7 @@ NnSm5FYXbj0U9rEw82eM2/AEepQw+nBwqUdZYVUfccyIRfdzJgvg7Yd8Bw3nNxCWu9tPWzHeevGbhHPm true 5.75cm 0.63492cm - Machine + Macchina textbox32 @@ -954,7 +954,7 @@ NnSm5FYXbj0U9rEw82eM2/AEepQw+nBwqUdZYVUfccyIRfdzJgvg7Yd8Bw3nNxCWu9tPWzHeevGbhHPm true 8cm 0.63492cm - Shift + Turno textbox31 @@ -971,7 +971,7 @@ NnSm5FYXbj0U9rEw82eM2/AEepQw+nBwqUdZYVUfccyIRfdzJgvg7Yd8Bw3nNxCWu9tPWzHeevGbhHPm true 1.75cm 0.63492cm - Date + Data 5.75cm @@ -1086,7 +1086,7 @@ NnSm5FYXbj0U9rEw82eM2/AEepQw+nBwqUdZYVUfccyIRfdzJgvg7Yd8Bw3nNxCWu9tPWzHeevGbhHPm true 11.25cm 0.63492cm - Requester code + Matr. richiedente descrPriorita @@ -1155,7 +1155,7 @@ NnSm5FYXbj0U9rEw82eM2/AEepQw+nBwqUdZYVUfccyIRfdzJgvg7Yd8Bw3nNxCWu9tPWzHeevGbhHPm true 1.25cm 0.63492cm - Suggested Event + Evento ipotizzato 8cm @@ -1171,7 +1171,7 @@ NnSm5FYXbj0U9rEw82eM2/AEepQw+nBwqUdZYVUfccyIRfdzJgvg7Yd8Bw3nNxCWu9tPWzHeevGbhHPm true 12.25cm 0.63492cm - Priority + Priorità descrizione @@ -1203,7 +1203,7 @@ NnSm5FYXbj0U9rEw82eM2/AEepQw+nBwqUdZYVUfccyIRfdzJgvg7Yd8Bw3nNxCWu9tPWzHeevGbhHPm true 1.25cm 0.63492cm - Description + Descrizione descrTipo @@ -1235,7 +1235,7 @@ NnSm5FYXbj0U9rEw82eM2/AEepQw+nBwqUdZYVUfccyIRfdzJgvg7Yd8Bw3nNxCWu9tPWzHeevGbhHPm true 14.25cm 0.63492cm - Failure Type + Tipo guasto descrAmbitoGuasto @@ -1268,7 +1268,7 @@ NnSm5FYXbj0U9rEw82eM2/AEepQw+nBwqUdZYVUfccyIRfdzJgvg7Yd8Bw3nNxCWu9tPWzHeevGbhHPm true 6.75cm 0.63492cm - Stop Type + Casuale fermo isFermo @@ -1301,7 +1301,7 @@ NnSm5FYXbj0U9rEw82eM2/AEepQw+nBwqUdZYVUfccyIRfdzJgvg7Yd8Bw3nNxCWu9tPWzHeevGbhHPm true 1cm 0.5cm - Not Working + Macchina ferma codMacchina @@ -1351,7 +1351,7 @@ NnSm5FYXbj0U9rEw82eM2/AEepQw+nBwqUdZYVUfccyIRfdzJgvg7Yd8Bw3nNxCWu9tPWzHeevGbhHPm true 13.75cm 0.63492cm - Plant cod + cod impianto 2.75cm @@ -1367,7 +1367,7 @@ NnSm5FYXbj0U9rEw82eM2/AEepQw+nBwqUdZYVUfccyIRfdzJgvg7Yd8Bw3nNxCWu9tPWzHeevGbhHPm true 13.75cm 0.63492cm - Machine cod + cod macchina nomeMacchina @@ -1417,7 +1417,7 @@ NnSm5FYXbj0U9rEw82eM2/AEepQw+nBwqUdZYVUfccyIRfdzJgvg7Yd8Bw3nNxCWu9tPWzHeevGbhHPm true 5.75cm 0.63492cm - Plant + Reparto textbox11 @@ -1434,7 +1434,7 @@ NnSm5FYXbj0U9rEw82eM2/AEepQw+nBwqUdZYVUfccyIRfdzJgvg7Yd8Bw3nNxCWu9tPWzHeevGbhHPm true 1.75cm 0.63492cm - STOP from + Ferma dalle guasto_1 @@ -1507,7 +1507,7 @@ NnSm5FYXbj0U9rEw82eM2/AEepQw+nBwqUdZYVUfccyIRfdzJgvg7Yd8Bw3nNxCWu9tPWzHeevGbhHPm true 1.5cm 0.63492cm - Maint. START + Inizio intervento 10cm @@ -1529,7 +1529,7 @@ NnSm5FYXbj0U9rEw82eM2/AEepQw+nBwqUdZYVUfccyIRfdzJgvg7Yd8Bw3nNxCWu9tPWzHeevGbhHPm true 0.25cm 15.75cm - MAINTENANCE STAFF + MANUTENZIONE 1.5cm @@ -1620,7 +1620,7 @@ NnSm5FYXbj0U9rEw82eM2/AEepQw+nBwqUdZYVUfccyIRfdzJgvg7Yd8Bw3nNxCWu9tPWzHeevGbhHPm true 0.63492cm - = " Printed " & Format(Globals.ExecutionTime, "yyyy-MM-dd, HH:mm") + = " Stampato " & Format(Globals.ExecutionTime, "yyyy-MM-dd, HH:mm") 0.75cm diff --git a/Projects/WebGIM/GIM_site/Web.config b/Projects/WebGIM/GIM_site/Web.config index c92a64f..240dcfe 100644 --- a/Projects/WebGIM/GIM_site/Web.config +++ b/Projects/WebGIM/GIM_site/Web.config @@ -104,7 +104,7 @@ - + diff --git a/Projects/WebGIM/GIM_site/bin/GIM_data.dll b/Projects/WebGIM/GIM_site/bin/GIM_data.dll index ace77cc..5b1ca55 100644 Binary files a/Projects/WebGIM/GIM_site/bin/GIM_data.dll and b/Projects/WebGIM/GIM_site/bin/GIM_data.dll differ diff --git a/Projects/WebGIM/GIM_site/bin/GIM_site.dll b/Projects/WebGIM/GIM_site/bin/GIM_site.dll index 72352b9..04c213f 100644 Binary files a/Projects/WebGIM/GIM_site/bin/GIM_site.dll and b/Projects/WebGIM/GIM_site/bin/GIM_site.dll differ diff --git a/Projects/WebGIM/GIM_site/obj/SomaschiniUSA/GIM_site.dll b/Projects/WebGIM/GIM_site/obj/SomaschiniUSA/GIM_site.dll index 72352b9..04c213f 100644 Binary files a/Projects/WebGIM/GIM_site/obj/SomaschiniUSA/GIM_site.dll and b/Projects/WebGIM/GIM_site/obj/SomaschiniUSA/GIM_site.dll differ diff --git a/Projects/WebGIM/GIM_site/obj/SomaschiniUSA/RdlCompile.cache b/Projects/WebGIM/GIM_site/obj/SomaschiniUSA/RdlCompile.cache index eff345f..540c8ec 100644 Binary files a/Projects/WebGIM/GIM_site/obj/SomaschiniUSA/RdlCompile.cache and b/Projects/WebGIM/GIM_site/obj/SomaschiniUSA/RdlCompile.cache differ