diff --git a/MP-TAB/DettaglioMacchina.aspx.designer.cs b/MP-TAB/DettaglioMacchina.aspx.designer.cs index b4fae73e..e0a4e180 100644 --- a/MP-TAB/DettaglioMacchina.aspx.designer.cs +++ b/MP-TAB/DettaglioMacchina.aspx.designer.cs @@ -1,10 +1,10 @@ //------------------------------------------------------------------------------ -// -// Codice generato da uno strumento. +// +// This code was generated by a tool. // -// Le modifiche a questo file possono causare un comportamento non corretto e verranno perse se -// il codice viene rigenerato. -// +// Changes to this file may cause incorrect behavior and will be lost if +// the code is regenerated. +// //------------------------------------------------------------------------------ namespace MoonProTablet @@ -15,74 +15,74 @@ namespace MoonProTablet { /// - /// Controllo mod_dettMacchina1. + /// mod_dettMacchina1 control. /// /// - /// Campo generato automaticamente. - /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. /// protected global::MoonProTablet.WebUserControls.mod_dettMacchina mod_dettMacchina1; /// - /// Controllo lbtGrp03. + /// lbtGrp03 control. /// /// - /// Campo generato automaticamente. - /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. /// protected global::System.Web.UI.WebControls.LinkButton lbtGrp03; /// - /// Controllo mod_dettaglioProd2. + /// mod_dettaglioProd2 control. /// /// - /// Campo generato automaticamente. - /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. /// protected global::MoonProTablet.WebUserControls.mod_dettaglioProd mod_dettaglioProd2; /// - /// Controllo cmp_goPrint. + /// cmp_goPrint control. /// /// - /// Campo generato automaticamente. - /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. /// protected global::MoonProTablet.WebUserControls.cmp_goPrint cmp_goPrint; /// - /// Controllo mod_confProd1. + /// mod_confProd1 control. /// /// - /// Campo generato automaticamente. - /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. /// protected global::MoonProTablet.WebUserControls.mod_confProd mod_confProd1; /// - /// Controllo hlScarti. + /// hlScarti control. /// /// - /// Campo generato automaticamente. - /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. /// protected global::System.Web.UI.WebControls.HyperLink hlScarti; /// - /// Controllo hlControlli. + /// hlControlli control. /// /// - /// Campo generato automaticamente. - /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. /// protected global::System.Web.UI.WebControls.HyperLink hlControlli; /// - /// Controllo mod_directLinks. + /// mod_directLinks control. /// /// - /// Campo generato automaticamente. - /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. /// protected global::MoonProTablet.WebUserControls.mod_directLinks mod_directLinks; } diff --git a/MP-TAB/MP-TAB.csproj b/MP-TAB/MP-TAB.csproj index 62440d0e..76c95240 100644 --- a/MP-TAB/MP-TAB.csproj +++ b/MP-TAB/MP-TAB.csproj @@ -505,10 +505,8 @@ - - @@ -541,8 +539,6 @@ PreserveNewest - - Designer @@ -682,8 +678,6 @@ - - diff --git a/MapoDb/DS_SheetTech.Designer.cs b/MapoDb/DS_SheetTech.Designer.cs index d7fc1145..91cd4530 100644 --- a/MapoDb/DS_SheetTech.Designer.cs +++ b/MapoDb/DS_SheetTech.Designer.cs @@ -1,10 +1,10 @@ //------------------------------------------------------------------------------ // -// Il codice è stato generato da uno strumento. -// Versione runtime:4.0.30319.42000 +// This code was generated by a tool. +// Runtime Version:4.0.30319.42000 // -// Le modifiche apportate a questo file possono provocare un comportamento non corretto e andranno perse se -// il codice viene rigenerato. +// Changes to this file may cause incorrect behavior and will be lost if +// the code is regenerated. // //------------------------------------------------------------------------------ @@ -955,6 +955,8 @@ namespace MapoDb { private global::System.Data.DataColumn columnDescTipo; + private global::System.Data.DataColumn columnValueRead; + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] public ST_ActualRowDataTable() { @@ -1092,6 +1094,14 @@ namespace MapoDb { } } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public global::System.Data.DataColumn ValueReadColumn { + get { + return this.columnValueRead; + } + } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] [global::System.ComponentModel.Browsable(false)] @@ -1129,7 +1139,7 @@ namespace MapoDb { [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] - public ST_ActualRowRow AddST_ActualRowRow(ST_ActualRow parentST_ActualRowByFK_ST_ActualRows_ST_Actual, string Label, int Oggetto, int Num, string CodGruppo, string CodTipo, string Value, string CheckType, bool Required, string ExtCode, string Note, string DescGruppo, string DescTipo) { + public ST_ActualRowRow AddST_ActualRowRow(ST_ActualRow parentST_ActualRowByFK_ST_ActualRows_ST_Actual, string Label, int Oggetto, int Num, string CodGruppo, string CodTipo, string Value, string CheckType, bool Required, string ExtCode, string Note, string DescGruppo, string DescTipo, string ValueRead) { ST_ActualRowRow rowST_ActualRowRow = ((ST_ActualRowRow)(this.NewRow())); object[] columnValuesArray = new object[] { null, @@ -1144,7 +1154,8 @@ namespace MapoDb { ExtCode, Note, DescGruppo, - DescTipo}; + DescTipo, + ValueRead}; if ((parentST_ActualRowByFK_ST_ActualRows_ST_Actual != null)) { columnValuesArray[0] = parentST_ActualRowByFK_ST_ActualRows_ST_Actual[0]; } @@ -1192,6 +1203,7 @@ namespace MapoDb { this.columnNote = base.Columns["Note"]; this.columnDescGruppo = base.Columns["DescGruppo"]; this.columnDescTipo = base.Columns["DescTipo"]; + this.columnValueRead = base.Columns["ValueRead"]; } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] @@ -1223,6 +1235,8 @@ namespace MapoDb { base.Columns.Add(this.columnDescGruppo); this.columnDescTipo = new global::System.Data.DataColumn("DescTipo", typeof(string), null, global::System.Data.MappingType.Element); base.Columns.Add(this.columnDescTipo); + this.columnValueRead = new global::System.Data.DataColumn("ValueRead", typeof(string), null, global::System.Data.MappingType.Element); + base.Columns.Add(this.columnValueRead); this.Constraints.Add(new global::System.Data.UniqueConstraint("Constraint1", new global::System.Data.DataColumn[] { this.columnIdxST, this.columnLabel, @@ -1245,9 +1259,12 @@ namespace MapoDb { this.columnExtCode.MaxLength = 2147483647; this.columnNote.AllowDBNull = false; this.columnNote.MaxLength = 500; + this.columnDescGruppo.AllowDBNull = false; this.columnDescGruppo.MaxLength = 250; this.columnDescTipo.AllowDBNull = false; this.columnDescTipo.MaxLength = 50; + this.columnValueRead.ReadOnly = true; + this.columnValueRead.MaxLength = 250; this.ExtendedProperties.Add("Generator_TablePropName", "_ST_ActualRow"); this.ExtendedProperties.Add("Generator_UserTableName", "ST_ActualRow"); } @@ -3169,7 +3186,7 @@ namespace MapoDb { return ((int)(this[this.tableST_Actual.NumRowColumn])); } catch (global::System.InvalidCastException e) { - throw new global::System.Data.StrongTypingException("Il valore della colonna \'NumRow\' nella tabella \'ST_Actual\' è DBNull.", e); + throw new global::System.Data.StrongTypingException("The value for column \'NumRow\' in table \'ST_Actual\' is DBNull.", e); } } set { @@ -3351,12 +3368,7 @@ namespace MapoDb { [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] public string DescGruppo { get { - try { - return ((string)(this[this.tableST_ActualRow.DescGruppoColumn])); - } - catch (global::System.InvalidCastException e) { - throw new global::System.Data.StrongTypingException("Il valore della colonna \'DescGruppo\' nella tabella \'ST_ActualRow\' è DBNull.", e); - } + return ((string)(this[this.tableST_ActualRow.DescGruppoColumn])); } set { this[this.tableST_ActualRow.DescGruppoColumn] = value; @@ -3374,6 +3386,22 @@ namespace MapoDb { } } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public string ValueRead { + get { + if (this.IsValueReadNull()) { + return null; + } + else { + return ((string)(this[this.tableST_ActualRow.ValueReadColumn])); + } + } + set { + this[this.tableST_ActualRow.ValueReadColumn] = value; + } + } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] public ST_ActualRow ST_ActualRow { @@ -3387,14 +3415,14 @@ namespace MapoDb { [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] - public bool IsDescGruppoNull() { - return this.IsNull(this.tableST_ActualRow.DescGruppoColumn); + public bool IsValueReadNull() { + return this.IsNull(this.tableST_ActualRow.ValueReadColumn); } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] - public void SetDescGruppoNull() { - this[this.tableST_ActualRow.DescGruppoColumn] = global::System.Convert.DBNull; + public void SetValueReadNull() { + this[this.tableST_ActualRow.ValueReadColumn] = global::System.Convert.DBNull; } } @@ -4593,6 +4621,7 @@ namespace MapoDb.DS_SheetTechTableAdapters { tableMapping.ColumnMappings.Add("Note", "Note"); tableMapping.ColumnMappings.Add("DescGruppo", "DescGruppo"); tableMapping.ColumnMappings.Add("DescTipo", "DescTipo"); + tableMapping.ColumnMappings.Add("ValueRead", "ValueRead"); this._adapter.TableMappings.Add(tableMapping); this._adapter.DeleteCommand = new global::System.Data.SqlClient.SqlCommand(); this._adapter.DeleteCommand.Connection = this.Connection; @@ -4666,7 +4695,8 @@ SELECT IdxST, Label, Oggetto, Num, CodGruppo, CodTipo, Value, CheckType, Require this._commandCollection[0] = new global::System.Data.SqlClient.SqlCommand(); this._commandCollection[0].Connection = this.Connection; this._commandCollection[0].CommandText = "SELECT DescGruppo, DescTipo, IdxST, Label, Oggetto, Num, CodGruppo, CodTip" + - "o, Value, CheckType, Required, ExtCode, Note\r\nFROM v_ST_AR"; + "o, Value, CheckType, Required, ExtCode, Note, ValueRead\r\nFROM v_ST_AR" + + ""; this._commandCollection[0].CommandType = global::System.Data.CommandType.Text; this._commandCollection[1] = new global::System.Data.SqlClient.SqlCommand(); this._commandCollection[1].Connection = this.Connection; @@ -7757,39 +7787,38 @@ SELECT CodTempl, Label, Oggetto, Num, CodGruppo, CodTipo, Value, CheckType, Requ } if (((this._sT_ActualRowTableAdapter != null) && (this.MatchTableAdapterConnection(this._sT_ActualRowTableAdapter.Connection) == false))) { - throw new global::System.ArgumentException("Tutti gli oggetti TableAdapter gestiti da TableAdapterManager devono utilizzare l" + - "a stessa stringa di connessione."); + throw new global::System.ArgumentException("All TableAdapters managed by a TableAdapterManager must use the same connection s" + + "tring."); } if (((this._sT_CheckTableAdapter != null) && (this.MatchTableAdapterConnection(this._sT_CheckTableAdapter.Connection) == false))) { - throw new global::System.ArgumentException("Tutti gli oggetti TableAdapter gestiti da TableAdapterManager devono utilizzare l" + - "a stessa stringa di connessione."); + throw new global::System.ArgumentException("All TableAdapters managed by a TableAdapterManager must use the same connection s" + + "tring."); } if (((this._sT_AnagGruppiTableAdapter != null) && (this.MatchTableAdapterConnection(this._sT_AnagGruppiTableAdapter.Connection) == false))) { - throw new global::System.ArgumentException("Tutti gli oggetti TableAdapter gestiti da TableAdapterManager devono utilizzare l" + - "a stessa stringa di connessione."); + throw new global::System.ArgumentException("All TableAdapters managed by a TableAdapterManager must use the same connection s" + + "tring."); } if (((this._sT_AnagTipiTableAdapter != null) && (this.MatchTableAdapterConnection(this._sT_AnagTipiTableAdapter.Connection) == false))) { - throw new global::System.ArgumentException("Tutti gli oggetti TableAdapter gestiti da TableAdapterManager devono utilizzare l" + - "a stessa stringa di connessione."); + throw new global::System.ArgumentException("All TableAdapters managed by a TableAdapterManager must use the same connection s" + + "tring."); } if (((this._sT_TemplateTableAdapter != null) && (this.MatchTableAdapterConnection(this._sT_TemplateTableAdapter.Connection) == false))) { - throw new global::System.ArgumentException("Tutti gli oggetti TableAdapter gestiti da TableAdapterManager devono utilizzare l" + - "a stessa stringa di connessione."); + throw new global::System.ArgumentException("All TableAdapters managed by a TableAdapterManager must use the same connection s" + + "tring."); } if (((this._sT_TemplateRowsTableAdapter != null) && (this.MatchTableAdapterConnection(this._sT_TemplateRowsTableAdapter.Connection) == false))) { - throw new global::System.ArgumentException("Tutti gli oggetti TableAdapter gestiti da TableAdapterManager devono utilizzare l" + - "a stessa stringa di connessione."); + throw new global::System.ArgumentException("All TableAdapters managed by a TableAdapterManager must use the same connection s" + + "tring."); } global::System.Data.IDbConnection workConnection = this.Connection; if ((workConnection == null)) { - throw new global::System.ApplicationException("TableAdapterManager non contiene informazioni di connessione. Impostare la propri" + - "età TableAdapter di ciascun oggetto TableAdapterManager su un\'istanza TableAdapt" + - "er valida."); + throw new global::System.ApplicationException("TableAdapterManager contains no connection information. Set each TableAdapterMana" + + "ger TableAdapter property to a valid TableAdapter instance."); } bool workConnOpened = false; if (((workConnection.State & global::System.Data.ConnectionState.Broken) @@ -7802,8 +7831,8 @@ SELECT CodTempl, Label, Oggetto, Num, CodGruppo, CodTipo, Value, CheckType, Requ } global::System.Data.IDbTransaction workTransaction = workConnection.BeginTransaction(); if ((workTransaction == null)) { - throw new global::System.ApplicationException("Impossibile avviare la transazione. La connessione dati corrente non supporta le " + - "transazioni oppure lo stato corrente non consente l\'avvio della transazione."); + throw new global::System.ApplicationException("The transaction cannot begin. The current data connection does not support transa" + + "ctions or the current state is not allowing the transaction to begin."); } global::System.Collections.Generic.List allChangedRows = new global::System.Collections.Generic.List(); global::System.Collections.Generic.List allAddedRows = new global::System.Collections.Generic.List(); diff --git a/MapoDb/DS_SheetTech.xsd b/MapoDb/DS_SheetTech.xsd index 476c3cef..c4042113 100644 --- a/MapoDb/DS_SheetTech.xsd +++ b/MapoDb/DS_SheetTech.xsd @@ -135,7 +135,7 @@ SELECT IdxST, Label, Oggetto, Num, CodGruppo, CodTipo, Value, CheckType, Require - SELECT DescGruppo, DescTipo, IdxST, Label, Oggetto, Num, CodGruppo, CodTipo, Value, CheckType, Required, ExtCode, Note + SELECT DescGruppo, DescTipo, IdxST, Label, Oggetto, Num, CodGruppo, CodTipo, Value, CheckType, Required, ExtCode, Note, ValueRead FROM v_ST_AR @@ -185,6 +185,7 @@ SELECT IdxST, Label, Oggetto, Num, CodGruppo, CodTipo, Value, CheckType, Require + @@ -271,7 +272,7 @@ SELECT IdxST, Label, Oggetto, Num, CodGruppo, CodTipo, Value, CheckType, Require - + dbo.stp_ST_AR_PasteAll @@ -283,7 +284,7 @@ SELECT IdxST, Label, Oggetto, Num, CodGruppo, CodTipo, Value, CheckType, Require - + dbo.stp_ST_AR_UpdateVal @@ -679,7 +680,7 @@ SELECT CodTempl, Label, Oggetto, Num, CodGruppo, CodTipo, Value, CheckType, Requ - + @@ -725,7 +726,7 @@ SELECT CodTempl, Label, Oggetto, Num, CodGruppo, CodTipo, Value, CheckType, Requ - + @@ -781,7 +782,7 @@ SELECT CodTempl, Label, Oggetto, Num, CodGruppo, CodTipo, Value, CheckType, Requ - + @@ -795,10 +796,17 @@ SELECT CodTempl, Label, Oggetto, Num, CodGruppo, CodTipo, Value, CheckType, Requ + + + + + + + - + @@ -838,7 +846,7 @@ SELECT CodTempl, Label, Oggetto, Num, CodGruppo, CodTipo, Value, CheckType, Requ - + @@ -866,7 +874,7 @@ SELECT CodTempl, Label, Oggetto, Num, CodGruppo, CodTipo, Value, CheckType, Requ - + @@ -886,7 +894,7 @@ SELECT CodTempl, Label, Oggetto, Num, CodGruppo, CodTipo, Value, CheckType, Requ - + @@ -906,7 +914,7 @@ SELECT CodTempl, Label, Oggetto, Num, CodGruppo, CodTipo, Value, CheckType, Requ - + @@ -1005,11 +1013,11 @@ SELECT CodTempl, Label, Oggetto, Num, CodGruppo, CodTipo, Value, CheckType, Requ - - - - - + + + + + \ No newline at end of file diff --git a/MapoDb/DS_SheetTech.xss b/MapoDb/DS_SheetTech.xss index b14c8e8b..037f56a9 100644 --- a/MapoDb/DS_SheetTech.xss +++ b/MapoDb/DS_SheetTech.xss @@ -4,78 +4,78 @@ Changes to this file may cause incorrect behavior and will be lost if the code is regenerated. --> - + - - - - - - - + + + + + + + - 454 - 741 + 222 + 544 - 454 - 805 + 222 + 608 - + - 1193 - 352 + 1000 + 155 - 1193 - 426 + 1000 + 229 - + - 991 - 335 + 799 + 138 - 991 - 443 + 799 + 246 - 999 - 443 + 807 + 246 - + - 945 - 572 + 753 + 375 - 999 - 572 + 807 + 375 - + - 727 - 566 + 535 + 332 - 653 - 566 + 461 + 332 diff --git a/MapoDb/MapoDb.csproj b/MapoDb/MapoDb.csproj index 0e678b82..dc004634 100644 --- a/MapoDb/MapoDb.csproj +++ b/MapoDb/MapoDb.csproj @@ -371,8 +371,6 @@ DS_Utility.xsd - - SettingsSingleFileGenerator @@ -425,10 +423,6 @@ - - - -