diff --git a/Projects/WebGIM/GIM_data/DS_applicazione.xsd b/Projects/WebGIM/GIM_data/DS_applicazione.xsd index 49ad6e3..fdb6539 100644 --- a/Projects/WebGIM/GIM_data/DS_applicazione.xsd +++ b/Projects/WebGIM/GIM_data/DS_applicazione.xsd @@ -545,8 +545,7 @@ 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, isFermoSiNo + SELECT * FROM v_intervExp ORDER BY numIntMtz DESC @@ -585,63 +584,70 @@ 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 (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 (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 (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 (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 (richiesta BETWEEN @inizio AND @fine) ORDER BY numIntMtz DESC - - - - - - - - + - dbo.stp_vie_getByPeriodoSearch + dbo.stp_IME_getByIdx + + + + + + + + + + + dbo.stp_IME_getByIdxCausale + + + + + + + + + + + dbo.stp_IME_getByIdxImpianto + + + + + + + + + + + dbo.stp_IME_getByIdxMacchina + + + + + + + + + + + dbo.stp_IME_getByPeriodo + + + + + + + + + + + + dbo.stp_IME_getByPeriodoSearch @@ -688,10 +694,10 @@ ORDER BY numIntMtz DESC - + - dbo.sp_updateIntervento + dbo.stp_IntMtz_update @@ -701,16 +707,17 @@ ORDER BY numIntMtz DESC + - + - dbo.sp_updateInterventoFull + dbo.stp_IntMtz_updateFull @@ -722,6 +729,7 @@ ORDER BY numIntMtz DESC + @@ -2165,6 +2173,8 @@ FROM v_mtzProgExp + + @@ -2381,7 +2391,7 @@ FROM v_mtzProgExp - + @@ -2466,7 +2476,7 @@ FROM v_mtzProgExp - + @@ -2491,7 +2501,7 @@ FROM v_mtzProgExp - + @@ -2525,7 +2535,7 @@ FROM v_mtzProgExp - + @@ -2603,7 +2613,7 @@ FROM v_mtzProgExp - + @@ -2783,22 +2793,22 @@ FROM v_mtzProgExp - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + \ 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 b85f523..04f0499 100644 --- a/Projects/WebGIM/GIM_data/DS_applicazione.xss +++ b/Projects/WebGIM/GIM_data/DS_applicazione.xss @@ -13,7 +13,7 @@ - + @@ -92,7 +92,7 @@ 579 - 826 + 780 579 diff --git a/Projects/WebGIM/GIM_data/DS_applicazione1.Designer.cs b/Projects/WebGIM/GIM_data/DS_applicazione1.Designer.cs index c896554..fefe514 100644 --- a/Projects/WebGIM/GIM_data/DS_applicazione1.Designer.cs +++ b/Projects/WebGIM/GIM_data/DS_applicazione1.Designer.cs @@ -3477,6 +3477,10 @@ namespace GIM_data { private global::System.Data.DataColumn columnisFermoSiNo; + private global::System.Data.DataColumn columnscheduled; + + private global::System.Data.DataColumn columnisExt; + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] public v_intervExpDataTable() { @@ -3750,6 +3754,22 @@ 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 scheduledColumn { + get { + return this.columnscheduled; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + public global::System.Data.DataColumn isExtColumn { + get { + return this.columnisExt; + } + } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] [global::System.ComponentModel.Browsable(false)] @@ -3816,7 +3836,9 @@ namespace GIM_data { string nomeMacchina, string DescrStato, string descrCausale, - string isFermoSiNo) { + string isFermoSiNo, + bool scheduled, + bool isExt) { v_intervExpRow rowv_intervExpRow = ((v_intervExpRow)(this.NewRow())); object[] columnValuesArray = new object[] { null, @@ -3848,7 +3870,9 @@ namespace GIM_data { nomeMacchina, DescrStato, descrCausale, - isFermoSiNo}; + isFermoSiNo, + scheduled, + isExt}; if ((parentAnagAmbitoGuastoRowByFK_InterventiMtz_AnagAmbitoGuasto != null)) { columnValuesArray[6] = parentAnagAmbitoGuastoRowByFK_InterventiMtz_AnagAmbitoGuasto[0]; } @@ -3920,6 +3944,8 @@ namespace GIM_data { this.columnDescrStato = base.Columns["DescrStato"]; this.columndescrCausale = base.Columns["descrCausale"]; this.columnisFermoSiNo = base.Columns["isFermoSiNo"]; + this.columnscheduled = base.Columns["scheduled"]; + this.columnisExt = base.Columns["isExt"]; } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] @@ -3985,6 +4011,10 @@ namespace GIM_data { 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.columnscheduled = new global::System.Data.DataColumn("scheduled", typeof(bool), null, global::System.Data.MappingType.Element); + base.Columns.Add(this.columnscheduled); + this.columnisExt = new global::System.Data.DataColumn("isExt", typeof(bool), null, global::System.Data.MappingType.Element); + base.Columns.Add(this.columnisExt); this.Constraints.Add(new global::System.Data.UniqueConstraint("Constraint1", new global::System.Data.DataColumn[] { this.columnnumIntMtz}, true)); this.columnnumIntMtz.AutoIncrement = true; @@ -4021,6 +4051,7 @@ namespace GIM_data { this.columndescrCausale.MaxLength = 50; this.columnisFermoSiNo.ReadOnly = true; this.columnisFermoSiNo.MaxLength = 2; + this.columnisExt.AllowDBNull = false; } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] @@ -11586,6 +11617,33 @@ namespace GIM_data { } } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + public bool scheduled { + get { + try { + return ((bool)(this[this.tablev_intervExp.scheduledColumn])); + } + catch (global::System.InvalidCastException e) { + throw new global::System.Data.StrongTypingException("The value for column \'scheduled\' in table \'v_intervExp\' is DBNull.", e); + } + } + set { + this[this.tablev_intervExp.scheduledColumn] = value; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + public bool isExt { + get { + return ((bool)(this[this.tablev_intervExp.isExtColumn])); + } + set { + this[this.tablev_intervExp.isExtColumn] = value; + } + } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] public AnagAmbitoGuastoRow AnagAmbitoGuastoRow { @@ -11810,6 +11868,18 @@ namespace GIM_data { 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 bool IsscheduledNull() { + return this.IsNull(this.tablev_intervExp.scheduledColumn); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + public void SetscheduledNull() { + this[this.tablev_intervExp.scheduledColumn] = global::System.Convert.DBNull; + } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] public InterventoOpMtzRow[] GetInterventoOpMtzRows() { @@ -18321,6 +18391,8 @@ namespace GIM_data.DS_applicazioneTableAdapters { tableMapping.ColumnMappings.Add("DescrStato", "DescrStato"); tableMapping.ColumnMappings.Add("descrCausale", "descrCausale"); tableMapping.ColumnMappings.Add("isFermoSiNo", "isFermoSiNo"); + tableMapping.ColumnMappings.Add("scheduled", "scheduled"); + tableMapping.ColumnMappings.Add("isExt", "isExt"); this._adapter.TableMappings.Add(tableMapping); } @@ -18337,40 +18409,42 @@ namespace GIM_data.DS_applicazioneTableAdapters { this._commandCollection = new global::System.Data.SqlClient.SqlCommand[12]; 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, isFermoSiNo -FROM v_intervExp -ORDER BY numIntMtz DESC"; + this._commandCollection[0].CommandText = "SELECT *\r\nFROM v_intervExp\r\nORDER 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, 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[1].CommandText = "dbo.stp_IME_getByIdx"; + this._commandCollection[1].CommandType = global::System.Data.CommandType.StoredProcedure; + this._commandCollection[1].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@RETURN_VALUE", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.ReturnValue, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[1].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@numIntMtz", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 10, 0, null, 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, 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[2].CommandText = "dbo.stp_IME_getByIdxCausale"; + this._commandCollection[2].CommandType = global::System.Data.CommandType.StoredProcedure; + this._commandCollection[2].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@RETURN_VALUE", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.ReturnValue, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[2].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@idxCausale", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 10, 0, null, 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, 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[3].CommandText = "dbo.stp_IME_getByIdxImpianto"; + this._commandCollection[3].CommandType = global::System.Data.CommandType.StoredProcedure; + this._commandCollection[3].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@RETURN_VALUE", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.ReturnValue, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[3].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@idxImpianto", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 10, 0, null, 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, 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[4].CommandText = "dbo.stp_IME_getByIdxMacchina"; + this._commandCollection[4].CommandType = global::System.Data.CommandType.StoredProcedure; + this._commandCollection[4].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@RETURN_VALUE", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.ReturnValue, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[4].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@idxMacchina", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 10, 0, null, 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, 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, "", "", "")); + this._commandCollection[5].CommandText = "dbo.stp_IME_getByPeriodo"; + this._commandCollection[5].CommandType = global::System.Data.CommandType.StoredProcedure; + this._commandCollection[5].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@RETURN_VALUE", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.ReturnValue, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[5].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@inizio", global::System.Data.SqlDbType.DateTime, 8, global::System.Data.ParameterDirection.Input, 23, 3, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[5].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@fine", global::System.Data.SqlDbType.DateTime, 8, global::System.Data.ParameterDirection.Input, 23, 3, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._commandCollection[6] = new global::System.Data.SqlClient.SqlCommand(); this._commandCollection[6].Connection = this.Connection; - this._commandCollection[6].CommandText = "dbo.stp_vie_getByPeriodoSearch"; + this._commandCollection[6].CommandText = "dbo.stp_IME_getByPeriodoSearch"; this._commandCollection[6].CommandType = global::System.Data.CommandType.StoredProcedure; this._commandCollection[6].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@RETURN_VALUE", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.ReturnValue, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._commandCollection[6].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@inizio", global::System.Data.SqlDbType.DateTime, 8, global::System.Data.ParameterDirection.Input, 23, 3, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); @@ -18405,7 +18479,7 @@ ORDER BY numIntMtz DESC"; this._commandCollection[8].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@idxStatoNew", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.InputOutput, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._commandCollection[9] = new global::System.Data.SqlClient.SqlCommand(); this._commandCollection[9].Connection = this.Connection; - this._commandCollection[9].CommandText = "dbo.sp_updateIntervento"; + this._commandCollection[9].CommandText = "dbo.stp_IntMtz_update"; this._commandCollection[9].CommandType = global::System.Data.CommandType.StoredProcedure; this._commandCollection[9].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@RETURN_VALUE", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.ReturnValue, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._commandCollection[9].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_numIntMtz", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); @@ -18415,11 +18489,12 @@ ORDER BY numIntMtz DESC"; this._commandCollection[9].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@isPreventivabile", global::System.Data.SqlDbType.Bit, 1, global::System.Data.ParameterDirection.Input, 1, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._commandCollection[9].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@descrizioneIntervento", global::System.Data.SqlDbType.NVarChar, 2500, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._commandCollection[9].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@isFermo", global::System.Data.SqlDbType.Bit, 1, global::System.Data.ParameterDirection.Input, 1, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[9].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@isExt", global::System.Data.SqlDbType.Bit, 1, global::System.Data.ParameterDirection.Input, 1, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._commandCollection[9].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@idxAmbito", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._commandCollection[9].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@idxCausale", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._commandCollection[10] = new global::System.Data.SqlClient.SqlCommand(); this._commandCollection[10].Connection = this.Connection; - this._commandCollection[10].CommandText = "dbo.sp_updateInterventoFull"; + this._commandCollection[10].CommandText = "dbo.stp_IntMtz_updateFull"; this._commandCollection[10].CommandType = global::System.Data.CommandType.StoredProcedure; this._commandCollection[10].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@RETURN_VALUE", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.ReturnValue, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._commandCollection[10].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_numIntMtz", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); @@ -18431,6 +18506,7 @@ ORDER BY numIntMtz DESC"; this._commandCollection[10].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@matr", global::System.Data.SqlDbType.NVarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._commandCollection[10].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@guasto", global::System.Data.SqlDbType.DateTime, 8, global::System.Data.ParameterDirection.Input, 23, 3, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._commandCollection[10].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@isFermo", global::System.Data.SqlDbType.Bit, 1, global::System.Data.ParameterDirection.Input, 1, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[10].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@isExt", global::System.Data.SqlDbType.Bit, 1, global::System.Data.ParameterDirection.Input, 1, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._commandCollection[10].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@idxImpianto", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._commandCollection[10].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@idxMacchina", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._commandCollection[10].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@idxAmbito", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); @@ -18476,9 +18552,14 @@ ORDER BY numIntMtz DESC"; [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")] [global::System.ComponentModel.DataObjectMethodAttribute(global::System.ComponentModel.DataObjectMethodType.Select, false)] - public virtual DS_applicazione.v_intervExpDataTable getByIdx(int numIntMtz) { + public virtual DS_applicazione.v_intervExpDataTable getByIdx(global::System.Nullable numIntMtz) { this.Adapter.SelectCommand = this.CommandCollection[1]; - this.Adapter.SelectCommand.Parameters[0].Value = ((int)(numIntMtz)); + if ((numIntMtz.HasValue == true)) { + this.Adapter.SelectCommand.Parameters[1].Value = ((int)(numIntMtz.Value)); + } + else { + this.Adapter.SelectCommand.Parameters[1].Value = global::System.DBNull.Value; + } DS_applicazione.v_intervExpDataTable dataTable = new DS_applicazione.v_intervExpDataTable(); this.Adapter.Fill(dataTable); return dataTable; @@ -18491,10 +18572,10 @@ ORDER BY numIntMtz DESC"; public virtual DS_applicazione.v_intervExpDataTable getByIdxCausale(global::System.Nullable idxCausale) { this.Adapter.SelectCommand = this.CommandCollection[2]; if ((idxCausale.HasValue == true)) { - this.Adapter.SelectCommand.Parameters[0].Value = ((int)(idxCausale.Value)); + this.Adapter.SelectCommand.Parameters[1].Value = ((int)(idxCausale.Value)); } else { - this.Adapter.SelectCommand.Parameters[0].Value = global::System.DBNull.Value; + this.Adapter.SelectCommand.Parameters[1].Value = global::System.DBNull.Value; } DS_applicazione.v_intervExpDataTable dataTable = new DS_applicazione.v_intervExpDataTable(); this.Adapter.Fill(dataTable); @@ -18505,9 +18586,14 @@ ORDER BY numIntMtz DESC"; [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")] [global::System.ComponentModel.DataObjectMethodAttribute(global::System.ComponentModel.DataObjectMethodType.Select, false)] - public virtual DS_applicazione.v_intervExpDataTable getByIdxImpianto(int idxImpianto) { + public virtual DS_applicazione.v_intervExpDataTable getByIdxImpianto(global::System.Nullable idxImpianto) { this.Adapter.SelectCommand = this.CommandCollection[3]; - this.Adapter.SelectCommand.Parameters[0].Value = ((int)(idxImpianto)); + if ((idxImpianto.HasValue == true)) { + this.Adapter.SelectCommand.Parameters[1].Value = ((int)(idxImpianto.Value)); + } + else { + this.Adapter.SelectCommand.Parameters[1].Value = global::System.DBNull.Value; + } DS_applicazione.v_intervExpDataTable dataTable = new DS_applicazione.v_intervExpDataTable(); this.Adapter.Fill(dataTable); return dataTable; @@ -18517,9 +18603,14 @@ ORDER BY numIntMtz DESC"; [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")] [global::System.ComponentModel.DataObjectMethodAttribute(global::System.ComponentModel.DataObjectMethodType.Select, false)] - public virtual DS_applicazione.v_intervExpDataTable getByIdxMacchina(int idxMacchina) { + public virtual DS_applicazione.v_intervExpDataTable getByIdxMacchina(global::System.Nullable idxMacchina) { this.Adapter.SelectCommand = this.CommandCollection[4]; - this.Adapter.SelectCommand.Parameters[0].Value = ((int)(idxMacchina)); + if ((idxMacchina.HasValue == true)) { + this.Adapter.SelectCommand.Parameters[1].Value = ((int)(idxMacchina.Value)); + } + else { + this.Adapter.SelectCommand.Parameters[1].Value = global::System.DBNull.Value; + } DS_applicazione.v_intervExpDataTable dataTable = new DS_applicazione.v_intervExpDataTable(); this.Adapter.Fill(dataTable); return dataTable; @@ -18529,10 +18620,20 @@ ORDER BY numIntMtz DESC"; [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")] [global::System.ComponentModel.DataObjectMethodAttribute(global::System.ComponentModel.DataObjectMethodType.Select, false)] - public virtual DS_applicazione.v_intervExpDataTable getByPeriodo(System.DateTime inizio, System.DateTime fine) { + public virtual DS_applicazione.v_intervExpDataTable getByPeriodo(global::System.Nullable inizio, global::System.Nullable fine) { this.Adapter.SelectCommand = this.CommandCollection[5]; - this.Adapter.SelectCommand.Parameters[0].Value = ((System.DateTime)(inizio)); - this.Adapter.SelectCommand.Parameters[1].Value = ((System.DateTime)(fine)); + if ((inizio.HasValue == true)) { + this.Adapter.SelectCommand.Parameters[1].Value = ((System.DateTime)(inizio.Value)); + } + else { + this.Adapter.SelectCommand.Parameters[1].Value = global::System.DBNull.Value; + } + if ((fine.HasValue == true)) { + this.Adapter.SelectCommand.Parameters[2].Value = ((System.DateTime)(fine.Value)); + } + else { + this.Adapter.SelectCommand.Parameters[2].Value = global::System.DBNull.Value; + } DS_applicazione.v_intervExpDataTable dataTable = new DS_applicazione.v_intervExpDataTable(); this.Adapter.Fill(dataTable); return dataTable; @@ -18742,7 +18843,7 @@ ORDER BY numIntMtz DESC"; [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")] - public virtual int sp_updateIntervento(global::System.Nullable Original_numIntMtz, global::System.Nullable idxStato, global::System.Nullable inizioIntervento, global::System.Nullable fineIntervento, global::System.Nullable isPreventivabile, string descrizioneIntervento, global::System.Nullable isFermo, global::System.Nullable idxAmbito, global::System.Nullable idxCausale) { + public virtual int updateIntervento(global::System.Nullable Original_numIntMtz, global::System.Nullable idxStato, global::System.Nullable inizioIntervento, global::System.Nullable fineIntervento, global::System.Nullable isPreventivabile, string descrizioneIntervento, global::System.Nullable isFermo, global::System.Nullable isExt, global::System.Nullable idxAmbito, global::System.Nullable idxCausale) { global::System.Data.SqlClient.SqlCommand command = this.CommandCollection[9]; if ((Original_numIntMtz.HasValue == true)) { command.Parameters[1].Value = ((int)(Original_numIntMtz.Value)); @@ -18786,18 +18887,24 @@ ORDER BY numIntMtz DESC"; else { command.Parameters[7].Value = global::System.DBNull.Value; } - if ((idxAmbito.HasValue == true)) { - command.Parameters[8].Value = ((int)(idxAmbito.Value)); + if ((isExt.HasValue == true)) { + command.Parameters[8].Value = ((bool)(isExt.Value)); } else { command.Parameters[8].Value = global::System.DBNull.Value; } - if ((idxCausale.HasValue == true)) { - command.Parameters[9].Value = ((int)(idxCausale.Value)); + if ((idxAmbito.HasValue == true)) { + command.Parameters[9].Value = ((int)(idxAmbito.Value)); } else { command.Parameters[9].Value = global::System.DBNull.Value; } + if ((idxCausale.HasValue == true)) { + command.Parameters[10].Value = ((int)(idxCausale.Value)); + } + else { + command.Parameters[10].Value = global::System.DBNull.Value; + } global::System.Data.ConnectionState previousConnectionState = command.Connection.State; if (((command.Connection.State & global::System.Data.ConnectionState.Open) != global::System.Data.ConnectionState.Open)) { @@ -18818,7 +18925,7 @@ ORDER BY numIntMtz DESC"; [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")] - public virtual int sp_updateInterventoFull( + public virtual int updateInterventoFull( global::System.Nullable Original_numIntMtz, global::System.Nullable idxStato, global::System.Nullable inizioIntervento, @@ -18828,6 +18935,7 @@ ORDER BY numIntMtz DESC"; string matr, global::System.Nullable guasto, global::System.Nullable isFermo, + global::System.Nullable isExt, global::System.Nullable idxImpianto, global::System.Nullable idxMacchina, global::System.Nullable idxAmbito, @@ -18891,54 +18999,60 @@ ORDER BY numIntMtz DESC"; else { command.Parameters[9].Value = global::System.DBNull.Value; } - if ((idxImpianto.HasValue == true)) { - command.Parameters[10].Value = ((int)(idxImpianto.Value)); + if ((isExt.HasValue == true)) { + command.Parameters[10].Value = ((bool)(isExt.Value)); } else { command.Parameters[10].Value = global::System.DBNull.Value; } - if ((idxMacchina.HasValue == true)) { - command.Parameters[11].Value = ((int)(idxMacchina.Value)); + if ((idxImpianto.HasValue == true)) { + command.Parameters[11].Value = ((int)(idxImpianto.Value)); } else { command.Parameters[11].Value = global::System.DBNull.Value; } - if ((idxAmbito.HasValue == true)) { - command.Parameters[12].Value = ((int)(idxAmbito.Value)); + if ((idxMacchina.HasValue == true)) { + command.Parameters[12].Value = ((int)(idxMacchina.Value)); } else { command.Parameters[12].Value = global::System.DBNull.Value; } - if ((idxPriorita.HasValue == true)) { - command.Parameters[13].Value = ((int)(idxPriorita.Value)); + if ((idxAmbito.HasValue == true)) { + command.Parameters[13].Value = ((int)(idxAmbito.Value)); } else { command.Parameters[13].Value = global::System.DBNull.Value; } - if ((descrizione == null)) { + if ((idxPriorita.HasValue == true)) { + command.Parameters[14].Value = ((int)(idxPriorita.Value)); + } + else { command.Parameters[14].Value = global::System.DBNull.Value; } - else { - command.Parameters[14].Value = ((string)(descrizione)); - } - if ((idxTipo.HasValue == true)) { - command.Parameters[15].Value = ((int)(idxTipo.Value)); - } - else { + if ((descrizione == null)) { command.Parameters[15].Value = global::System.DBNull.Value; } - if ((idxCausale.HasValue == true)) { - command.Parameters[16].Value = ((int)(idxCausale.Value)); + else { + command.Parameters[15].Value = ((string)(descrizione)); + } + if ((idxTipo.HasValue == true)) { + command.Parameters[16].Value = ((int)(idxTipo.Value)); } else { command.Parameters[16].Value = global::System.DBNull.Value; } - if ((presaInCarico.HasValue == true)) { - command.Parameters[17].Value = ((System.DateTime)(presaInCarico.Value)); + if ((idxCausale.HasValue == true)) { + command.Parameters[17].Value = ((int)(idxCausale.Value)); } else { command.Parameters[17].Value = global::System.DBNull.Value; } + if ((presaInCarico.HasValue == true)) { + command.Parameters[18].Value = ((System.DateTime)(presaInCarico.Value)); + } + else { + command.Parameters[18].Value = global::System.DBNull.Value; + } global::System.Data.ConnectionState previousConnectionState = command.Connection.State; if (((command.Connection.State & global::System.Data.ConnectionState.Open) != global::System.Data.ConnectionState.Open)) { diff --git a/Projects/WebGIM/GIM_data/bin/GIM_data.dll b/Projects/WebGIM/GIM_data/bin/GIM_data.dll index 0632bed..b4a53a4 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/bin/SteamWare.dll b/Projects/WebGIM/GIM_data/bin/SteamWare.dll index 31d002c..08c3b6a 100644 Binary files a/Projects/WebGIM/GIM_data/bin/SteamWare.dll and b/Projects/WebGIM/GIM_data/bin/SteamWare.dll differ diff --git a/Projects/WebGIM/GIM_site/WebUserControls/mod_dettInt_default.ascx b/Projects/WebGIM/GIM_site/WebUserControls/mod_dettInt_default.ascx index 97357e8..c0a2000 100644 --- a/Projects/WebGIM/GIM_site/WebUserControls/mod_dettInt_default.ascx +++ b/Projects/WebGIM/GIM_site/WebUserControls/mod_dettInt_default.ascx @@ -63,6 +63,10 @@
+ + +
+
@@ -253,6 +257,12 @@
+
+ + +
+ +
@@ -390,7 +400,7 @@
- + @@ -399,6 +409,7 @@ + diff --git a/Projects/WebGIM/GIM_site/WebUserControls/mod_dettInt_full.ascx b/Projects/WebGIM/GIM_site/WebUserControls/mod_dettInt_full.ascx index fc04952..43de633 100644 --- a/Projects/WebGIM/GIM_site/WebUserControls/mod_dettInt_full.ascx +++ b/Projects/WebGIM/GIM_site/WebUserControls/mod_dettInt_full.ascx @@ -72,6 +72,12 @@
+
+ + +
+ +
@@ -207,7 +213,7 @@ + UpdateMethod="updateInterventoFull" OnUpdated="ods_full_Updated"> @@ -218,6 +224,7 @@ + diff --git a/Projects/WebGIM/GIM_site/WebUserControls/mod_dettaglioIntervento.ascx b/Projects/WebGIM/GIM_site/WebUserControls/mod_dettaglioIntervento.ascx index 8ce415f..d2eb8bb 100644 --- a/Projects/WebGIM/GIM_site/WebUserControls/mod_dettaglioIntervento.ascx +++ b/Projects/WebGIM/GIM_site/WebUserControls/mod_dettaglioIntervento.ascx @@ -9,10 +9,6 @@ <%@ Register Src="~/WebUserControls/mod_dettInt_default.ascx" TagPrefix="uc1" TagName="mod_dettInt_default" %> <%@ Register Src="~/WebUserControls/mod_dettInt_full.ascx" TagPrefix="uc1" TagName="mod_dettInt_full" %> - - - -
diff --git a/Projects/WebGIM/GIM_site/WebUserControls/mod_elencoRichieste.ascx b/Projects/WebGIM/GIM_site/WebUserControls/mod_elencoRichieste.ascx index 743efdd..59efcec 100644 --- a/Projects/WebGIM/GIM_site/WebUserControls/mod_elencoRichieste.ascx +++ b/Projects/WebGIM/GIM_site/WebUserControls/mod_elencoRichieste.ascx @@ -92,7 +92,13 @@ - + + + + + + + diff --git a/Projects/WebGIM/GIM_site/bin/GIM_data.dll b/Projects/WebGIM/GIM_site/bin/GIM_data.dll index 0632bed..b4a53a4 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 da70a5e..da969b1 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/bin/SteamWare.dll b/Projects/WebGIM/GIM_site/bin/SteamWare.dll index 31d002c..08c3b6a 100644 Binary files a/Projects/WebGIM/GIM_site/bin/SteamWare.dll and b/Projects/WebGIM/GIM_site/bin/SteamWare.dll differ