diff --git a/Projects/WebGIM/GIM_data/DS_Mag.Designer.cs b/Projects/WebGIM/GIM_data/DS_Mag.Designer.cs index bec6ebe..ce022ec 100644 --- a/Projects/WebGIM/GIM_data/DS_Mag.Designer.cs +++ b/Projects/WebGIM/GIM_data/DS_Mag.Designer.cs @@ -1572,12 +1572,16 @@ namespace GIM_data { private global::System.Data.DataColumn columnCodCostruttore; - private global::System.Data.DataColumn columnCodSomaschini; + private global::System.Data.DataColumn columnCodInterno; private global::System.Data.DataColumn columnQtaMin; private global::System.Data.DataColumn columnQtaLotto; + private global::System.Data.DataColumn columnFamiglia; + + private global::System.Data.DataColumn columnValore; + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] public AnagItemsDataTable() { @@ -1645,9 +1649,9 @@ 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 CodSomaschiniColumn { + public global::System.Data.DataColumn CodInternoColumn { get { - return this.columnCodSomaschini; + return this.columnCodInterno; } } @@ -1667,6 +1671,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 FamigliaColumn { + get { + return this.columnFamiglia; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + public global::System.Data.DataColumn ValoreColumn { + get { + return this.columnValore; + } + } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] [global::System.ComponentModel.Browsable(false)] @@ -1704,16 +1724,18 @@ namespace GIM_data { [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] - public AnagItemsRow AddAnagItemsRow(int idxItem, string Descrizione, string NomeCostruttore, string CodCostruttore, string CodSomaschini, int QtaMin, int QtaLotto) { + public AnagItemsRow AddAnagItemsRow(int idxItem, string Descrizione, string NomeCostruttore, string CodCostruttore, string CodInterno, int QtaMin, int QtaLotto, string Famiglia, decimal Valore) { AnagItemsRow rowAnagItemsRow = ((AnagItemsRow)(this.NewRow())); object[] columnValuesArray = new object[] { idxItem, Descrizione, NomeCostruttore, CodCostruttore, - CodSomaschini, + CodInterno, QtaMin, - QtaLotto}; + QtaLotto, + Famiglia, + Valore}; rowAnagItemsRow.ItemArray = columnValuesArray; this.Rows.Add(rowAnagItemsRow); return rowAnagItemsRow; @@ -1747,9 +1769,11 @@ namespace GIM_data { this.columnDescrizione = base.Columns["Descrizione"]; this.columnNomeCostruttore = base.Columns["NomeCostruttore"]; this.columnCodCostruttore = base.Columns["CodCostruttore"]; - this.columnCodSomaschini = base.Columns["CodSomaschini"]; + this.columnCodInterno = base.Columns["CodInterno"]; this.columnQtaMin = base.Columns["QtaMin"]; this.columnQtaLotto = base.Columns["QtaLotto"]; + this.columnFamiglia = base.Columns["Famiglia"]; + this.columnValore = base.Columns["Valore"]; } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] @@ -1763,12 +1787,16 @@ namespace GIM_data { base.Columns.Add(this.columnNomeCostruttore); this.columnCodCostruttore = new global::System.Data.DataColumn("CodCostruttore", typeof(string), null, global::System.Data.MappingType.Element); base.Columns.Add(this.columnCodCostruttore); - this.columnCodSomaschini = new global::System.Data.DataColumn("CodSomaschini", typeof(string), null, global::System.Data.MappingType.Element); - base.Columns.Add(this.columnCodSomaschini); + this.columnCodInterno = new global::System.Data.DataColumn("CodInterno", typeof(string), null, global::System.Data.MappingType.Element); + base.Columns.Add(this.columnCodInterno); this.columnQtaMin = new global::System.Data.DataColumn("QtaMin", typeof(int), null, global::System.Data.MappingType.Element); base.Columns.Add(this.columnQtaMin); this.columnQtaLotto = new global::System.Data.DataColumn("QtaLotto", typeof(int), null, global::System.Data.MappingType.Element); base.Columns.Add(this.columnQtaLotto); + this.columnFamiglia = new global::System.Data.DataColumn("Famiglia", typeof(string), null, global::System.Data.MappingType.Element); + base.Columns.Add(this.columnFamiglia); + this.columnValore = new global::System.Data.DataColumn("Valore", typeof(decimal), null, global::System.Data.MappingType.Element); + base.Columns.Add(this.columnValore); this.Constraints.Add(new global::System.Data.UniqueConstraint("Constraint1", new global::System.Data.DataColumn[] { this.columnidxItem}, true)); this.columnidxItem.AllowDBNull = false; @@ -1779,10 +1807,13 @@ namespace GIM_data { this.columnNomeCostruttore.MaxLength = 250; this.columnCodCostruttore.AllowDBNull = false; this.columnCodCostruttore.MaxLength = 250; - this.columnCodSomaschini.AllowDBNull = false; - this.columnCodSomaschini.MaxLength = 50; + this.columnCodInterno.AllowDBNull = false; + this.columnCodInterno.MaxLength = 50; this.columnQtaMin.AllowDBNull = false; this.columnQtaLotto.AllowDBNull = false; + this.columnFamiglia.AllowDBNull = false; + this.columnFamiglia.MaxLength = 50; + this.columnValore.AllowDBNull = false; } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] @@ -1926,7 +1957,7 @@ namespace GIM_data { private global::System.Data.DataColumn columnCodCostruttore; - private global::System.Data.DataColumn columnCodSomaschini; + private global::System.Data.DataColumn columnCodInterno; private global::System.Data.DataColumn columnQtaMin; @@ -2019,9 +2050,9 @@ 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 CodSomaschiniColumn { + public global::System.Data.DataColumn CodInternoColumn { get { - return this.columnCodSomaschini; + return this.columnCodInterno; } } @@ -2126,7 +2157,7 @@ namespace GIM_data { [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] - public StatoMagRow AddStatoMagRow(int idxItem, string Famiglia, string Descrizione, string NomeCostruttore, string CodCostruttore, string CodSomaschini, int QtaMin, int QtaLotto, decimal Valore, int Giacenza, string CodLocazione, string DescrLocazione, string Note, System.DateTime dtLastUpd) { + public StatoMagRow AddStatoMagRow(int idxItem, string Famiglia, string Descrizione, string NomeCostruttore, string CodCostruttore, string CodInterno, int QtaMin, int QtaLotto, decimal Valore, int Giacenza, string CodLocazione, string DescrLocazione, string Note, System.DateTime dtLastUpd) { StatoMagRow rowStatoMagRow = ((StatoMagRow)(this.NewRow())); object[] columnValuesArray = new object[] { idxItem, @@ -2134,7 +2165,7 @@ namespace GIM_data { Descrizione, NomeCostruttore, CodCostruttore, - CodSomaschini, + CodInterno, QtaMin, QtaLotto, Valore, @@ -2177,7 +2208,7 @@ namespace GIM_data { this.columnDescrizione = base.Columns["Descrizione"]; this.columnNomeCostruttore = base.Columns["NomeCostruttore"]; this.columnCodCostruttore = base.Columns["CodCostruttore"]; - this.columnCodSomaschini = base.Columns["CodSomaschini"]; + this.columnCodInterno = base.Columns["CodInterno"]; this.columnQtaMin = base.Columns["QtaMin"]; this.columnQtaLotto = base.Columns["QtaLotto"]; this.columnValore = base.Columns["Valore"]; @@ -2201,8 +2232,8 @@ namespace GIM_data { base.Columns.Add(this.columnNomeCostruttore); this.columnCodCostruttore = new global::System.Data.DataColumn("CodCostruttore", typeof(string), null, global::System.Data.MappingType.Element); base.Columns.Add(this.columnCodCostruttore); - this.columnCodSomaschini = new global::System.Data.DataColumn("CodSomaschini", typeof(string), null, global::System.Data.MappingType.Element); - base.Columns.Add(this.columnCodSomaschini); + this.columnCodInterno = new global::System.Data.DataColumn("CodInterno", typeof(string), null, global::System.Data.MappingType.Element); + base.Columns.Add(this.columnCodInterno); this.columnQtaMin = new global::System.Data.DataColumn("QtaMin", typeof(int), null, global::System.Data.MappingType.Element); base.Columns.Add(this.columnQtaMin); this.columnQtaLotto = new global::System.Data.DataColumn("QtaLotto", typeof(int), null, global::System.Data.MappingType.Element); @@ -2232,8 +2263,8 @@ namespace GIM_data { this.columnNomeCostruttore.MaxLength = 250; this.columnCodCostruttore.AllowDBNull = false; this.columnCodCostruttore.MaxLength = 250; - this.columnCodSomaschini.AllowDBNull = false; - this.columnCodSomaschini.MaxLength = 50; + this.columnCodInterno.AllowDBNull = false; + this.columnCodInterno.MaxLength = 50; this.columnQtaMin.AllowDBNull = false; this.columnQtaLotto.AllowDBNull = false; this.columnValore.AllowDBNull = false; @@ -4236,12 +4267,12 @@ namespace GIM_data { [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] - public string CodSomaschini { + public string CodInterno { get { - return ((string)(this[this.tableAnagItems.CodSomaschiniColumn])); + return ((string)(this[this.tableAnagItems.CodInternoColumn])); } set { - this[this.tableAnagItems.CodSomaschiniColumn] = value; + this[this.tableAnagItems.CodInternoColumn] = value; } } @@ -4267,6 +4298,28 @@ namespace GIM_data { } } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + public string Famiglia { + get { + return ((string)(this[this.tableAnagItems.FamigliaColumn])); + } + set { + this[this.tableAnagItems.FamigliaColumn] = value; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + public decimal Valore { + get { + return ((decimal)(this[this.tableAnagItems.ValoreColumn])); + } + set { + this[this.tableAnagItems.ValoreColumn] = value; + } + } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] public MagRicRow[] GetMagRicRows() { @@ -4372,12 +4425,12 @@ namespace GIM_data { [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] - public string CodSomaschini { + public string CodInterno { get { - return ((string)(this[this.tableStatoMag.CodSomaschiniColumn])); + return ((string)(this[this.tableStatoMag.CodInternoColumn])); } set { - this[this.tableStatoMag.CodSomaschiniColumn] = value; + this[this.tableStatoMag.CodInternoColumn] = value; } } @@ -6646,9 +6699,11 @@ namespace GIM_data.DS_MagTableAdapters { tableMapping.ColumnMappings.Add("Descrizione", "Descrizione"); tableMapping.ColumnMappings.Add("NomeCostruttore", "NomeCostruttore"); tableMapping.ColumnMappings.Add("CodCostruttore", "CodCostruttore"); - tableMapping.ColumnMappings.Add("CodSomaschini", "CodSomaschini"); + tableMapping.ColumnMappings.Add("CodSomaschini", "CodInterno"); tableMapping.ColumnMappings.Add("QtaMin", "QtaMin"); tableMapping.ColumnMappings.Add("QtaLotto", "QtaLotto"); + tableMapping.ColumnMappings.Add("Famiglia", "Famiglia"); + tableMapping.ColumnMappings.Add("Valore", "Valore"); this._adapter.TableMappings.Add(tableMapping); this._adapter.DeleteCommand = new global::System.Data.SqlClient.SqlCommand(); this._adapter.DeleteCommand.Connection = this.Connection; @@ -6657,28 +6712,28 @@ namespace GIM_data.DS_MagTableAdapters { this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_idxItem", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "idxItem", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); this._adapter.InsertCommand = new global::System.Data.SqlClient.SqlCommand(); this._adapter.InsertCommand.Connection = this.Connection; - this._adapter.InsertCommand.CommandText = "INSERT INTO [dbo].[AnagItems] ([idxItem], [Descrizione], [NomeCostruttore], [CodC" + - "ostruttore], [CodSomaschini], [QtaMin], [QtaLotto]) VALUES (@idxItem, @Descrizio" + - "ne, @NomeCostruttore, @CodCostruttore, @CodSomaschini, @QtaMin, @QtaLotto)"; + this._adapter.InsertCommand.CommandText = @"INSERT INTO [dbo].[AnagItems] ([Famiglia], [Descrizione], [NomeCostruttore], [CodCostruttore], [CodSomaschini], [QtaMin], [QtaLotto], [Valore]) VALUES (@Famiglia, @Descrizione, @NomeCostruttore, @CodCostruttore, @CodSomaschini, @QtaMin, @QtaLotto, @Valore)"; this._adapter.InsertCommand.CommandType = global::System.Data.CommandType.Text; - this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@idxItem", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "idxItem", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Famiglia", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "Famiglia", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Descrizione", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "Descrizione", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@NomeCostruttore", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "NomeCostruttore", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@CodCostruttore", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "CodCostruttore", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@CodSomaschini", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "CodSomaschini", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@QtaMin", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "QtaMin", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@QtaLotto", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "QtaLotto", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Valore", global::System.Data.SqlDbType.Decimal, 0, global::System.Data.ParameterDirection.Input, 18, 6, "Valore", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._adapter.UpdateCommand = new global::System.Data.SqlClient.SqlCommand(); this._adapter.UpdateCommand.Connection = this.Connection; - this._adapter.UpdateCommand.CommandText = @"UPDATE [dbo].[AnagItems] SET [idxItem] = @idxItem, [Descrizione] = @Descrizione, [NomeCostruttore] = @NomeCostruttore, [CodCostruttore] = @CodCostruttore, [CodSomaschini] = @CodSomaschini, [QtaMin] = @QtaMin, [QtaLotto] = @QtaLotto WHERE (([idxItem] = @Original_idxItem))"; + this._adapter.UpdateCommand.CommandText = @"UPDATE [dbo].[AnagItems] SET [Famiglia] = @Famiglia, [Descrizione] = @Descrizione, [NomeCostruttore] = @NomeCostruttore, [CodCostruttore] = @CodCostruttore, [CodSomaschini] = @CodSomaschini, [QtaMin] = @QtaMin, [QtaLotto] = @QtaLotto, [Valore] = @Valore WHERE (([idxItem] = @Original_idxItem))"; this._adapter.UpdateCommand.CommandType = global::System.Data.CommandType.Text; - this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@idxItem", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "idxItem", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Famiglia", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "Famiglia", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Descrizione", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "Descrizione", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@NomeCostruttore", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "NomeCostruttore", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@CodCostruttore", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "CodCostruttore", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@CodSomaschini", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "CodSomaschini", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@QtaMin", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "QtaMin", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@QtaLotto", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "QtaLotto", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Valore", global::System.Data.SqlDbType.Decimal, 0, global::System.Data.ParameterDirection.Input, 18, 6, "Valore", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_idxItem", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "idxItem", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); } @@ -6692,12 +6747,17 @@ namespace GIM_data.DS_MagTableAdapters { [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] private void InitCommandCollection() { - this._commandCollection = new global::System.Data.SqlClient.SqlCommand[1]; + this._commandCollection = new global::System.Data.SqlClient.SqlCommand[2]; this._commandCollection[0] = new global::System.Data.SqlClient.SqlCommand(); this._commandCollection[0].Connection = this.Connection; - this._commandCollection[0].CommandText = "SELECT idxItem, Descrizione, NomeCostruttore, CodCostruttore, CodSomaschini, QtaM" + - "in, QtaLotto FROM dbo.AnagItems"; + this._commandCollection[0].CommandText = "SELECT *\r\nFROM dbo.AnagItems"; 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 = "dbo.stp_AnItems_getByTag"; + 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("@TagCode", global::System.Data.SqlDbType.NVarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] @@ -6724,6 +6784,23 @@ namespace GIM_data.DS_MagTableAdapters { return dataTable; } + [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")] + [global::System.ComponentModel.DataObjectMethodAttribute(global::System.ComponentModel.DataObjectMethodType.Select, false)] + public virtual DS_Mag.AnagItemsDataTable getByTag(string TagCode) { + this.Adapter.SelectCommand = this.CommandCollection[1]; + if ((TagCode == null)) { + this.Adapter.SelectCommand.Parameters[1].Value = global::System.DBNull.Value; + } + else { + this.Adapter.SelectCommand.Parameters[1].Value = ((string)(TagCode)); + } + DS_Mag.AnagItemsDataTable dataTable = new DS_Mag.AnagItemsDataTable(); + this.Adapter.Fill(dataTable); + return dataTable; + } + [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")] @@ -6779,8 +6856,13 @@ namespace GIM_data.DS_MagTableAdapters { [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.Insert, true)] - public virtual int Insert(int idxItem, string Descrizione, string NomeCostruttore, string CodCostruttore, string CodSomaschini, int QtaMin, int QtaLotto) { - this.Adapter.InsertCommand.Parameters[0].Value = ((int)(idxItem)); + public virtual int Insert(string Famiglia, string Descrizione, string NomeCostruttore, string CodCostruttore, string CodSomaschini, int QtaMin, int QtaLotto, decimal Valore) { + if ((Famiglia == null)) { + throw new global::System.ArgumentNullException("Famiglia"); + } + else { + this.Adapter.InsertCommand.Parameters[0].Value = ((string)(Famiglia)); + } if ((Descrizione == null)) { throw new global::System.ArgumentNullException("Descrizione"); } @@ -6807,6 +6889,7 @@ namespace GIM_data.DS_MagTableAdapters { } this.Adapter.InsertCommand.Parameters[5].Value = ((int)(QtaMin)); this.Adapter.InsertCommand.Parameters[6].Value = ((int)(QtaLotto)); + this.Adapter.InsertCommand.Parameters[7].Value = ((decimal)(Valore)); global::System.Data.ConnectionState previousConnectionState = this.Adapter.InsertCommand.Connection.State; if (((this.Adapter.InsertCommand.Connection.State & global::System.Data.ConnectionState.Open) != global::System.Data.ConnectionState.Open)) { @@ -6827,8 +6910,13 @@ namespace GIM_data.DS_MagTableAdapters { [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.Update, true)] - public virtual int Update(int idxItem, string Descrizione, string NomeCostruttore, string CodCostruttore, string CodSomaschini, int QtaMin, int QtaLotto, int Original_idxItem) { - this.Adapter.UpdateCommand.Parameters[0].Value = ((int)(idxItem)); + public virtual int Update(string Famiglia, string Descrizione, string NomeCostruttore, string CodCostruttore, string CodSomaschini, int QtaMin, int QtaLotto, decimal Valore, int Original_idxItem) { + if ((Famiglia == null)) { + throw new global::System.ArgumentNullException("Famiglia"); + } + else { + this.Adapter.UpdateCommand.Parameters[0].Value = ((string)(Famiglia)); + } if ((Descrizione == null)) { throw new global::System.ArgumentNullException("Descrizione"); } @@ -6855,7 +6943,8 @@ namespace GIM_data.DS_MagTableAdapters { } this.Adapter.UpdateCommand.Parameters[5].Value = ((int)(QtaMin)); this.Adapter.UpdateCommand.Parameters[6].Value = ((int)(QtaLotto)); - this.Adapter.UpdateCommand.Parameters[7].Value = ((int)(Original_idxItem)); + this.Adapter.UpdateCommand.Parameters[7].Value = ((decimal)(Valore)); + this.Adapter.UpdateCommand.Parameters[8].Value = ((int)(Original_idxItem)); global::System.Data.ConnectionState previousConnectionState = this.Adapter.UpdateCommand.Connection.State; if (((this.Adapter.UpdateCommand.Connection.State & global::System.Data.ConnectionState.Open) != global::System.Data.ConnectionState.Open)) { @@ -6871,14 +6960,6 @@ namespace GIM_data.DS_MagTableAdapters { } } } - - [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")] - [global::System.ComponentModel.DataObjectMethodAttribute(global::System.ComponentModel.DataObjectMethodType.Update, true)] - public virtual int Update(string Descrizione, string NomeCostruttore, string CodCostruttore, string CodSomaschini, int QtaMin, int QtaLotto, int Original_idxItem) { - return this.Update(Original_idxItem, Descrizione, NomeCostruttore, CodCostruttore, CodSomaschini, QtaMin, QtaLotto, Original_idxItem); - } } /// @@ -7006,7 +7087,7 @@ namespace GIM_data.DS_MagTableAdapters { tableMapping.ColumnMappings.Add("Descrizione", "Descrizione"); tableMapping.ColumnMappings.Add("NomeCostruttore", "NomeCostruttore"); tableMapping.ColumnMappings.Add("CodCostruttore", "CodCostruttore"); - tableMapping.ColumnMappings.Add("CodSomaschini", "CodSomaschini"); + tableMapping.ColumnMappings.Add("CodSomaschini", "CodInterno"); tableMapping.ColumnMappings.Add("QtaMin", "QtaMin"); tableMapping.ColumnMappings.Add("QtaLotto", "QtaLotto"); tableMapping.ColumnMappings.Add("Valore", "Valore"); @@ -7016,6 +7097,7 @@ namespace GIM_data.DS_MagTableAdapters { tableMapping.ColumnMappings.Add("Note", "Note"); tableMapping.ColumnMappings.Add("dtLastUpd", "dtLastUpd"); tableMapping.ColumnMappings.Add("Famiglia", "Famiglia"); + tableMapping.ColumnMappings.Add("CodInterno", "CodInterno"); this._adapter.TableMappings.Add(tableMapping); } @@ -8674,12 +8756,25 @@ namespace GIM_data.DS_MagTableAdapters { [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] private void InitCommandCollection() { - this._commandCollection = new global::System.Data.SqlClient.SqlCommand[1]; + this._commandCollection = new global::System.Data.SqlClient.SqlCommand[3]; this._commandCollection[0] = new global::System.Data.SqlClient.SqlCommand(); this._commandCollection[0].Connection = this.Connection; this._commandCollection[0].CommandText = "SELECT idxMacchina, idxImpianto, codMacchina, nomeMacchina, modello, matricola, a" + "nno, kgPeso, kwConsumo, funzDal, funzAl FROM dbo.AnagMacchine"; 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 = "dbo.stp_T2M_deleteByTag"; + 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("@Original_TagCode", global::System.Data.SqlDbType.NVarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[1].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_idxMacchina", 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 = "dbo.stp_AM_getByTag"; + 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("@TagCode", global::System.Data.SqlDbType.NVarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] @@ -8706,6 +8801,23 @@ namespace GIM_data.DS_MagTableAdapters { return dataTable; } + [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")] + [global::System.ComponentModel.DataObjectMethodAttribute(global::System.ComponentModel.DataObjectMethodType.Select, false)] + public virtual DS_Mag.AnagMacchineDataTable getByTag(string TagCode) { + this.Adapter.SelectCommand = this.CommandCollection[2]; + if ((TagCode == null)) { + this.Adapter.SelectCommand.Parameters[1].Value = global::System.DBNull.Value; + } + else { + this.Adapter.SelectCommand.Parameters[1].Value = ((string)(TagCode)); + } + DS_Mag.AnagMacchineDataTable dataTable = new DS_Mag.AnagMacchineDataTable(); + this.Adapter.Fill(dataTable); + return dataTable; + } + [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")] @@ -8899,6 +9011,40 @@ namespace GIM_data.DS_MagTableAdapters { } } } + + [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 deleteTag2Macc(string Original_TagCode, global::System.Nullable Original_idxMacchina) { + global::System.Data.SqlClient.SqlCommand command = this.CommandCollection[1]; + if ((Original_TagCode == null)) { + command.Parameters[1].Value = global::System.DBNull.Value; + } + else { + command.Parameters[1].Value = ((string)(Original_TagCode)); + } + if ((Original_idxMacchina.HasValue == true)) { + command.Parameters[2].Value = ((int)(Original_idxMacchina.Value)); + } + else { + command.Parameters[2].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)) { + command.Connection.Open(); + } + int returnValue; + try { + returnValue = command.ExecuteNonQuery(); + } + finally { + if ((previousConnectionState == global::System.Data.ConnectionState.Closed)) { + command.Connection.Close(); + } + } + return returnValue; + } } /// diff --git a/Projects/WebGIM/GIM_data/DS_Mag.xsd b/Projects/WebGIM/GIM_data/DS_Mag.xsd index 368bb68..7b30f6b 100644 --- a/Projects/WebGIM/GIM_data/DS_Mag.xsd +++ b/Projects/WebGIM/GIM_data/DS_Mag.xsd @@ -211,35 +211,38 @@ - INSERT INTO [dbo].[AnagItems] ([idxItem], [Descrizione], [NomeCostruttore], [CodCostruttore], [CodSomaschini], [QtaMin], [QtaLotto]) VALUES (@idxItem, @Descrizione, @NomeCostruttore, @CodCostruttore, @CodSomaschini, @QtaMin, @QtaLotto) + INSERT INTO [dbo].[AnagItems] ([Famiglia], [Descrizione], [NomeCostruttore], [CodCostruttore], [CodSomaschini], [QtaMin], [QtaLotto], [Valore]) VALUES (@Famiglia, @Descrizione, @NomeCostruttore, @CodCostruttore, @CodSomaschini, @QtaMin, @QtaLotto, @Valore) - + + - - SELECT idxItem, Descrizione, NomeCostruttore, CodCostruttore, CodSomaschini, QtaMin, QtaLotto FROM dbo.AnagItems + + SELECT * +FROM dbo.AnagItems - UPDATE [dbo].[AnagItems] SET [idxItem] = @idxItem, [Descrizione] = @Descrizione, [NomeCostruttore] = @NomeCostruttore, [CodCostruttore] = @CodCostruttore, [CodSomaschini] = @CodSomaschini, [QtaMin] = @QtaMin, [QtaLotto] = @QtaLotto WHERE (([idxItem] = @Original_idxItem)) + UPDATE [dbo].[AnagItems] SET [Famiglia] = @Famiglia, [Descrizione] = @Descrizione, [NomeCostruttore] = @NomeCostruttore, [CodCostruttore] = @CodCostruttore, [CodSomaschini] = @CodSomaschini, [QtaMin] = @QtaMin, [QtaLotto] = @QtaLotto, [Valore] = @Valore WHERE (([idxItem] = @Original_idxItem)) - + + @@ -251,11 +254,25 @@ - + + + - + + + + + dbo.stp_AnItems_getByTag + + + + + + + + @@ -274,7 +291,7 @@ FROM dbo.v_StatoMag - + @@ -284,6 +301,7 @@ FROM dbo.v_StatoMag + @@ -631,7 +649,31 @@ FROM AnagTags - + + + + + dbo.stp_T2M_deleteByTag + + + + + + + + + + + + dbo.stp_AM_getByTag + + + + + + + + @@ -698,7 +740,7 @@ FROM AnagTags - + @@ -718,7 +760,7 @@ FROM AnagTags - + @@ -741,7 +783,7 @@ FROM AnagTags - + @@ -752,7 +794,7 @@ FROM AnagTags - + @@ -777,7 +819,7 @@ FROM AnagTags - + @@ -786,10 +828,18 @@ FROM AnagTags + + + + + + + + - + @@ -821,7 +871,7 @@ FROM AnagTags - + @@ -857,7 +907,7 @@ FROM AnagTags - + @@ -884,7 +934,7 @@ FROM AnagTags - + @@ -898,7 +948,7 @@ FROM AnagTags - + @@ -912,7 +962,7 @@ FROM AnagTags - + @@ -953,7 +1003,7 @@ FROM AnagTags - + @@ -1022,13 +1072,13 @@ FROM AnagTags - - - - - - - + + + + + + + \ No newline at end of file diff --git a/Projects/WebGIM/GIM_data/DS_Mag.xss b/Projects/WebGIM/GIM_data/DS_Mag.xss index 618f5dd..fa67cb7 100644 --- a/Projects/WebGIM/GIM_data/DS_Mag.xss +++ b/Projects/WebGIM/GIM_data/DS_Mag.xss @@ -4,18 +4,21 @@ Changes to this file may cause incorrect behavior and will be lost if the code is regenerated. --> - + - - - - - - - + + + + + + + + + + - + 298 @@ -27,7 +30,7 @@ - + 538 @@ -39,7 +42,7 @@ - + 650 @@ -51,27 +54,51 @@ - + - 592 - 502 + 745 + 469 - 592 - 607 + 961 + 469 - + - 705 - 502 + 917 + 593 - 705 - 607 + 961 + 593 + + + + + + + 759 + 660 + + + 687 + 660 + + + + + + + 443 + 673 + + + 529 + 673 diff --git a/Projects/WebGIM/GIM_data/DS_applicazione.xss b/Projects/WebGIM/GIM_data/DS_applicazione.xss index abb0444..a63db69 100644 --- a/Projects/WebGIM/GIM_data/DS_applicazione.xss +++ b/Projects/WebGIM/GIM_data/DS_applicazione.xss @@ -4,17 +4,17 @@ Changes to this file may cause incorrect behavior and will be lost if the code is regenerated. --> - + - + - + - + @@ -108,12 +108,12 @@ - 301 - 225 + 472 + 250 526 - 225 + 250 @@ -149,7 +149,7 @@ 1017 - 557 + 562 1017 diff --git a/Projects/WebGIM/GIM_data/DS_utility.Designer.cs b/Projects/WebGIM/GIM_data/DS_utility.Designer.cs index 43aab88..57ead2f 100644 --- a/Projects/WebGIM/GIM_data/DS_utility.Designer.cs +++ b/Projects/WebGIM/GIM_data/DS_utility.Designer.cs @@ -9876,16 +9876,22 @@ namespace GIM_data.DS_utilityTableAdapters { [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] private void InitCommandCollection() { - this._commandCollection = new global::System.Data.SqlClient.SqlCommand[2]; + this._commandCollection = new global::System.Data.SqlClient.SqlCommand[3]; this._commandCollection[0] = new global::System.Data.SqlClient.SqlCommand(); this._commandCollection[0].Connection = this.Connection; this._commandCollection[0].CommandText = "SELECT * FROM dbo.v_selMacchine"; 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 * FROM dbo.v_selMacchine\r\nwhere conditio=@conditio"; - this._commandCollection[1].CommandType = global::System.Data.CommandType.Text; - this._commandCollection[1].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@conditio", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 0, 0, "conditio", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[1].CommandText = "dbo.stp_VSM_avail4Tag"; + 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("@TagCode", global::System.Data.SqlDbType.NVarChar, 50, global::System.Data.ParameterDirection.Input, 0, 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 * FROM dbo.v_selMacchine\r\nwhere conditio=@conditio"; + this._commandCollection[2].CommandType = global::System.Data.CommandType.Text; + this._commandCollection[2].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@conditio", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 0, 0, "conditio", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] @@ -9916,8 +9922,25 @@ namespace GIM_data.DS_utilityTableAdapters { [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_utility.v_selMacchineDataTable getByConditio(global::System.Nullable conditio) { + public virtual DS_utility.v_selMacchineDataTable avail4tag(string TagCode) { this.Adapter.SelectCommand = this.CommandCollection[1]; + if ((TagCode == null)) { + this.Adapter.SelectCommand.Parameters[1].Value = global::System.DBNull.Value; + } + else { + this.Adapter.SelectCommand.Parameters[1].Value = ((string)(TagCode)); + } + DS_utility.v_selMacchineDataTable dataTable = new DS_utility.v_selMacchineDataTable(); + this.Adapter.Fill(dataTable); + return dataTable; + } + + [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")] + [global::System.ComponentModel.DataObjectMethodAttribute(global::System.ComponentModel.DataObjectMethodType.Select, false)] + public virtual DS_utility.v_selMacchineDataTable getByConditio(global::System.Nullable conditio) { + this.Adapter.SelectCommand = this.CommandCollection[2]; if ((conditio.HasValue == true)) { this.Adapter.SelectCommand.Parameters[0].Value = ((int)(conditio.Value)); } diff --git a/Projects/WebGIM/GIM_data/DS_utility.xsd b/Projects/WebGIM/GIM_data/DS_utility.xsd index 7ba289c..b736153 100644 --- a/Projects/WebGIM/GIM_data/DS_utility.xsd +++ b/Projects/WebGIM/GIM_data/DS_utility.xsd @@ -51,6 +51,17 @@ order by label + + + + dbo.stp_VSM_avail4Tag + + + + + + + @@ -1036,7 +1047,7 @@ ORDER BY label - + @@ -1056,7 +1067,7 @@ ORDER BY label - + @@ -1076,7 +1087,7 @@ ORDER BY label - + diff --git a/Projects/WebGIM/GIM_data/DS_utility.xss b/Projects/WebGIM/GIM_data/DS_utility.xss index 098cb06..d38ecfe 100644 --- a/Projects/WebGIM/GIM_data/DS_utility.xss +++ b/Projects/WebGIM/GIM_data/DS_utility.xss @@ -4,27 +4,27 @@ Changes to this file may cause incorrect behavior and will be lost if the code is regenerated. --> - + - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/Projects/WebGIM/GIM_data/TA_app.cs b/Projects/WebGIM/GIM_data/TA_app.cs index 7444d0b..454567b 100644 --- a/Projects/WebGIM/GIM_data/TA_app.cs +++ b/Projects/WebGIM/GIM_data/TA_app.cs @@ -42,7 +42,7 @@ public class TA_app public GIM_data.DS_MagTableAdapters.SinonimiTagTableAdapter taSinTag; public GIM_data.DS_MagTableAdapters.StatoMagTableAdapter taStatoMag; public GIM_data.DS_MagTableAdapters.Tag2ItemTableAdapter taTag2Item; - public GIM_data.DS_MagTableAdapters.Tag2MaccTableAdapter tatag2Macc; + public GIM_data.DS_MagTableAdapters.Tag2MaccTableAdapter taTag2Macc; #endregion @@ -85,7 +85,7 @@ public class TA_app taSinTag.Connection.ConnectionString = connString; taStatoMag.Connection.ConnectionString = connString; taTag2Item.Connection.ConnectionString = connString; - tatag2Macc.Connection.ConnectionString = connString; + taTag2Macc.Connection.ConnectionString = connString; } protected TA_app() { @@ -128,7 +128,7 @@ public class TA_app taSinTag = new GIM_data.DS_MagTableAdapters.SinonimiTagTableAdapter(); taStatoMag = new GIM_data.DS_MagTableAdapters.StatoMagTableAdapter(); taTag2Item = new GIM_data.DS_MagTableAdapters.Tag2ItemTableAdapter(); - tatag2Macc = new GIM_data.DS_MagTableAdapters.Tag2MaccTableAdapter(); + taTag2Macc = new GIM_data.DS_MagTableAdapters.Tag2MaccTableAdapter(); } /// diff --git a/Projects/WebGIM/GIM_data/bin/GIM_data.dll b/Projects/WebGIM/GIM_data/bin/GIM_data.dll index 53122ee..6baebbd 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 513ead6..29f87fb 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_SinonimiTag.ascx.cs b/Projects/WebGIM/GIM_site/WebUserControls/mod_SinonimiTag.ascx.cs index 8c4a0f2..a75a285 100644 --- a/Projects/WebGIM/GIM_site/WebUserControls/mod_SinonimiTag.ascx.cs +++ b/Projects/WebGIM/GIM_site/WebUserControls/mod_SinonimiTag.ascx.cs @@ -97,7 +97,7 @@ namespace GIM_site.WebUserControls { TagCode = _TagCode.ToString(); trovati += TA_app.obj.taTag2Item.getByTag(TagCode).Rows.Count; - trovati += TA_app.obj.tatag2Macc.getByTag(TagCode).Rows.Count; + trovati += TA_app.obj.taTag2Macc.getByTag(TagCode).Rows.Count; answ = (trovati > 0); } catch diff --git a/Projects/WebGIM/GIM_site/WebUserControls/mod_anagTags.ascx b/Projects/WebGIM/GIM_site/WebUserControls/mod_anagTags.ascx index db32c23..d377079 100644 --- a/Projects/WebGIM/GIM_site/WebUserControls/mod_anagTags.ascx +++ b/Projects/WebGIM/GIM_site/WebUserControls/mod_anagTags.ascx @@ -7,7 +7,7 @@

<%: traduci("GestioneTags") %>

-
+
@@ -86,13 +86,13 @@
-
+
-

<%: traduci("Tag2Item") %>

+

<%: traduci("Macc2Tag") %>

+ +
+
+

<%: traduci("Item2Tag") %>

-
-

<%: traduci("Tag2Macc") %>

- -
diff --git a/Projects/WebGIM/GIM_site/WebUserControls/mod_anagTags.ascx.cs b/Projects/WebGIM/GIM_site/WebUserControls/mod_anagTags.ascx.cs index 9ae9785..9491e0f 100644 --- a/Projects/WebGIM/GIM_site/WebUserControls/mod_anagTags.ascx.cs +++ b/Projects/WebGIM/GIM_site/WebUserControls/mod_anagTags.ascx.cs @@ -106,7 +106,7 @@ namespace GIM_site.WebUserControls { TagCode = _TagCode.ToString(); trovati += TA_app.obj.taTag2Item.getByTag(TagCode).Rows.Count; - trovati += TA_app.obj.tatag2Macc.getByTag(TagCode).Rows.Count; + trovati += TA_app.obj.taTag2Macc.getByTag(TagCode).Rows.Count; answ = (trovati > 0); } catch @@ -127,6 +127,7 @@ namespace GIM_site.WebUserControls { divDetail.Visible = true; mod_tag2Item.TagCode = grView.SelectedDataKey["TagCode"].ToString(); + mod_tag2Macc.TagCode = grView.SelectedDataKey["TagCode"].ToString(); } else { diff --git a/Projects/WebGIM/GIM_site/WebUserControls/mod_anagTags.ascx.designer.cs b/Projects/WebGIM/GIM_site/WebUserControls/mod_anagTags.ascx.designer.cs index 69118bc..f6195b5 100644 --- a/Projects/WebGIM/GIM_site/WebUserControls/mod_anagTags.ascx.designer.cs +++ b/Projects/WebGIM/GIM_site/WebUserControls/mod_anagTags.ascx.designer.cs @@ -48,15 +48,6 @@ namespace GIM_site.WebUserControls { /// protected global::System.Web.UI.HtmlControls.HtmlGenericControl divDetail; - /// - /// mod_tag2Item control. - /// - /// - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. - /// - protected global::GIM_site.WebUserControls.mod_tag2Item mod_tag2Item; - /// /// mod_tag2Macc control. /// @@ -65,5 +56,14 @@ namespace GIM_site.WebUserControls { /// To modify move field declaration from designer file to code-behind file. /// protected global::GIM_site.WebUserControls.mod_tag2Macc mod_tag2Macc; + + /// + /// mod_tag2Item control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::GIM_site.WebUserControls.mod_tag2Item mod_tag2Item; } } diff --git a/Projects/WebGIM/GIM_site/WebUserControls/mod_magRic.ascx b/Projects/WebGIM/GIM_site/WebUserControls/mod_magRic.ascx index db621f2..31b1b7e 100644 --- a/Projects/WebGIM/GIM_site/WebUserControls/mod_magRic.ascx +++ b/Projects/WebGIM/GIM_site/WebUserControls/mod_magRic.ascx @@ -41,7 +41,7 @@ - + @@ -74,13 +74,13 @@ + FilterExpression="Famiglia LIKE '%{0}%' OR Descrizione LIKE '%{0}%' OR NomeCostruttore LIKE '%{0}%' OR CodCostruttore LIKE '%{0}%' OR CodInterno LIKE '%{0}%' OR CodLocazione LIKE '%{0}%' OR DescrLocazione LIKE '%{0}%' OR Note LIKE '%{0}%' " InsertMethod="insertQuery"> - + @@ -97,7 +97,7 @@ - + diff --git a/Projects/WebGIM/GIM_site/WebUserControls/mod_tag2Item.ascx b/Projects/WebGIM/GIM_site/WebUserControls/mod_tag2Item.ascx index 05da2ae..d5822b4 100644 --- a/Projects/WebGIM/GIM_site/WebUserControls/mod_tag2Item.ascx +++ b/Projects/WebGIM/GIM_site/WebUserControls/mod_tag2Item.ascx @@ -4,8 +4,6 @@ -

<%: traduci("Tags2Item") %>

-
<%: traduci("addNewTag2Item") %> @@ -82,7 +80,7 @@
- + @@ -114,8 +112,27 @@ --%> - - + <%----%> + + + <%# traduci("FamigliaDescrizione") %> + + + + + + +
+ +
+ + + + + + + + <%-- @@ -137,7 +154,7 @@ - + diff --git a/Projects/WebGIM/GIM_site/WebUserControls/mod_tag2Item.ascx.cs b/Projects/WebGIM/GIM_site/WebUserControls/mod_tag2Item.ascx.cs index e4ae380..8add24a 100644 --- a/Projects/WebGIM/GIM_site/WebUserControls/mod_tag2Item.ascx.cs +++ b/Projects/WebGIM/GIM_site/WebUserControls/mod_tag2Item.ascx.cs @@ -21,7 +21,7 @@ namespace GIM_site.WebUserControls string answ = "TAGS"; try { - answ = memLayer.ML.StringSessionObj("modoControllo").ToUpper(); + answ = memLayer.ML.StringSessionObj("modoControlloT2I").ToUpper(); } catch { } @@ -29,7 +29,7 @@ namespace GIM_site.WebUserControls } set { - memLayer.ML.setSessionVal("modoControllo", value.ToUpper()); + memLayer.ML.setSessionVal("modoControlloT2I", value.ToUpper()); fixVisualizzazione(); } } @@ -79,7 +79,7 @@ namespace GIM_site.WebUserControls bool showItems; switch (modoControllo) { - case "ITEM": + case "ITEMS": showItems = true; break; case "TAGS": @@ -233,7 +233,7 @@ namespace GIM_site.WebUserControls { TagCode = _TagCode.ToString(); trovati += TA_app.obj.taTag2Item.getByTag(TagCode).Rows.Count; - trovati += TA_app.obj.tatag2Macc.getByTag(TagCode).Rows.Count; + trovati += TA_app.obj.taTag2Macc.getByTag(TagCode).Rows.Count; answ = (trovati > 0); } catch diff --git a/Projects/WebGIM/GIM_site/WebUserControls/mod_tag2Macc.ascx b/Projects/WebGIM/GIM_site/WebUserControls/mod_tag2Macc.ascx index d38283b..fa4e421 100644 --- a/Projects/WebGIM/GIM_site/WebUserControls/mod_tag2Macc.ascx +++ b/Projects/WebGIM/GIM_site/WebUserControls/mod_tag2Macc.ascx @@ -1,4 +1,150 @@ <%@ Control Language="C#" AutoEventWireup="true" CodeBehind="mod_tag2Macc.ascx.cs" Inherits="GIM_site.WebUserControls.mod_tag2Macc" %> +<%@ Register Assembly="AjaxControlToolkit" Namespace="AjaxControlToolkit" TagPrefix="cc1" %> + + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+
+ +
+ <%: traduci("addNewTag2Macc") %> +
+ + + + + + +
-associazione macchine e tags \ No newline at end of file +
+ +
+
+ + + + + + +
+ +
+ + + + + + + + + + + + <%----%> + + + <%-- + + + + + + + + + + + + + --%> + + + + + + + <%----%> + + + + + + + + + + + + + + + + + + + + + + + + +
diff --git a/Projects/WebGIM/GIM_site/WebUserControls/mod_tag2Macc.ascx.cs b/Projects/WebGIM/GIM_site/WebUserControls/mod_tag2Macc.ascx.cs index 6d36c9a..d3e3a45 100644 --- a/Projects/WebGIM/GIM_site/WebUserControls/mod_tag2Macc.ascx.cs +++ b/Projects/WebGIM/GIM_site/WebUserControls/mod_tag2Macc.ascx.cs @@ -4,14 +4,339 @@ using System.Linq; using System.Web; using System.Web.UI; using System.Web.UI.WebControls; +using SteamWare; +using GIM_data; namespace GIM_site.WebUserControls { - public partial class mod_tag2Macc : System.Web.UI.UserControl + public partial class mod_tag2Macc : ApplicationUserControl { - protected void Page_Load(object sender, EventArgs e) + /// + /// modalità controllo: Macc / TAGS + /// + public string modoControllo { + get + { + string answ = "TAGS"; + try + { + answ = memLayer.ML.StringSessionObj("modoControlloT2M").ToUpper(); + } + catch + { } + return answ; + } + set + { + memLayer.ML.setSessionVal("modoControlloT2M", value.ToUpper()); + fixVisualizzazione(); + } + } + /// + /// modalità addNew attiva (...Si/no...) + /// + public bool addNewMacc + { + get + { + bool answ = false; + try + { + answ = memLayer.ML.BoolSessionObj("addNewMacc"); + } + catch + { } + return answ; + } + set + { + memLayer.ML.setSessionVal("addNewMacc", value); + fixAddNewT2M(); + } + } + private void fixAddNewT2M() + { + divAddNew.Visible = addNewMacc; + string btnText = ""; + if (addNewMacc) + { + btnText = "HideAddNew"; + } + else + { + btnText = "ShowAddNew"; + } + btnShowHideAdd.Text = traduci(btnText); + } + + public string TagCode + { + get + { + string answ = ""; + if (hfTagCode.Value != "") + { + answ = hfTagCode.Value.ToUpper(); + } + return answ; + } + set + { + hfTagCode.Value = value.ToUpper(); + } + } + public string IdxMacc + { + get + { + string answ = ""; + if (hfIdxMacc.Value != "") + { + answ = hfIdxMacc.Value.ToUpper(); + } + return answ; + } + set + { + hfIdxMacc.Value = value.ToUpper(); + } + } + + protected override void Page_Load(object sender, EventArgs e) + { + base.Page_Load(sender, e); + bool showMacc = true; + showMacc = fixVisualizzazione(); + fixAddNewT2M(); + } + /// + /// valorizzazione iniziale filtro macchine + /// + /// + /// + protected void listMacchine_DataBound(object sender, EventArgs e) + { + foreach (ListItem item in ((ListBox)sender).Items) + { + item.Selected = true; + } + } + /// + /// salvo elenco macchine selected + /// + /// + /// + protected void listMacchine_SelectedIndexChanged(object sender, EventArgs e) + { + } + private bool fixVisualizzazione() + { + // fix visualizzazione tipo controllo + bool showMacc; + switch (modoControllo) + { + case "MACC": + showMacc = true; + break; + case "TAGS": + default: + showMacc = false; + break; + } + divMacc.Visible = showMacc; + divTags.Visible = !showMacc; + return showMacc; + } + + public event EventHandler eh_resetSelezione; + /// + /// evento dati associati a controllo + /// + /// + /// + protected void grViewMacc_DataBound(object sender, EventArgs e) + { + if (grViewMacc.Rows.Count > 0) + { + LinkButton lb; + // aggiorno gli headers + foreach (TableCell cella in grViewMacc.HeaderRow.Cells) + { + try + { + lb = (LinkButton)cella.Controls[0]; + lb.Text = traduci(lb.Text); + } + catch + { } + } + int totRecord = grViewMacc.Rows.Count + grViewMacc.PageSize * (grViewMacc.PageCount - 1); + lblNumRecMacc.Text = string.Format("{0} records of ~ {1}", grViewMacc.Rows.Count, totRecord); + } + else + { + lblNumRecMacc.Text = ""; + } + } + /// + /// evento dati associati a controllo + /// + /// + /// + protected void grViewTags_DataBound(object sender, EventArgs e) + { + if (grViewTags.Rows.Count > 0) + { + LinkButton lb; + // aggiorno gli headers + foreach (TableCell cella in grViewTags.HeaderRow.Cells) + { + try + { + lb = (LinkButton)cella.Controls[0]; + lb.Text = traduci(lb.Text); + } + catch + { } + } + int totRecord = grViewTags.Rows.Count + grViewTags.PageSize * (grViewTags.PageCount - 1); + lblNumRecTags.Text = string.Format("{0} records of ~ {1}", grViewTags.Rows.Count, totRecord); + } + else + { + lblNumRecTags.Text = ""; + } + } + /// + /// reset delle selezioni + /// + /// + /// + protected void btnReset_Click(object sender, EventArgs e) + { + resetSelezione("TAGS"); + resetSelezione("MACC"); + } + /// + /// resetta la selezione dei valori in caso di modifiche su altri controlli + /// + /// + public void resetSelezione(string quale) + { + switch (quale) + { + case "TAGS": + grViewTags.SelectedIndex = -1; + grViewTags.DataBind(); + break; + case "MACC": + default: + grViewMacc.SelectedIndex = -1; + grViewMacc.DataBind(); + break; + } + if (eh_resetSelezione != null) + { + eh_resetSelezione(this, new EventArgs()); + } + } + /// + /// seleziono valore in editing... + /// + /// + /// + protected void grViewMacc_RowEditing(object sender, GridViewEditEventArgs e) + { + // seleziono la riga corrente... + grViewMacc.SelectedIndex = e.NewEditIndex; + } + /// + /// seleziono valore in editing... + /// + /// + /// + protected void grViewTags_RowEditing(object sender, GridViewEditEventArgs e) + { + // seleziono la riga corrente... + grViewTags.SelectedIndex = e.NewEditIndex; + } + /// + /// gestione evento inserimento nuovo record standard (se ZERO presenti) + /// + /// + /// + protected void btnNewFromEmpty_Click(object sender, EventArgs e) + { +#if false + // reset selezione... + resetSelezione("TAGS"); + resetSelezione("Macc"); + // i primi valori ("0") di default sono "ND"... li inserisco come standard... + TA_app.obj.taAnagTags.Insert(memLayer.ML.confReadString("newTagCode"), memLayer.ML.confReadString("newTagClass"), memLayer.ML.confReadString("newTagDescr")); + grView.DataBind(); +#endif + } + /// + /// verifica se il tag abbia child (= associazioni a macchine o Macc...) + /// + /// + public bool hasChild(object _TagCode) + { + bool answ = false; + int trovati = 0; + string TagCode = ""; + try + { + TagCode = _TagCode.ToString(); + trovati += TA_app.obj.taTag2Macc.getByTag(TagCode).Rows.Count; + answ = (trovati > 0); + } + catch + { } + return answ; + } + /// + /// effettua update grView + /// + public void doUpdate() + { + grViewTags.DataBind(); + grViewMacc.DataBind(); + } + + protected void lbtAddNew_Click(object sender, EventArgs e) + { + // aggiunge tag ad Macc selezionato... + int idxMacc = 0; + try + { + idxMacc = Convert.ToInt32(ddlMacc.SelectedValue); + } + catch + { } + if (idxMacc > 0) + { + TA_app.obj.taTag2Macc.Insert(hfTagCode.Value, idxMacc); + grViewMacc.DataBind(); + ddlMacc.DataBind(); + } + } + + protected void grViewTags_RowDeleted(object sender, GridViewDeletedEventArgs e) + { + } + + protected void grViewMacc_RowDeleted(object sender, GridViewDeletedEventArgs e) + { + ddlMacc.DataBind(); + } + + protected void btnShowHideAdd_Click(object sender, EventArgs e) + { + addNewMacc = !addNewMacc; + fixAddNewT2M(); } } } \ No newline at end of file diff --git a/Projects/WebGIM/GIM_site/WebUserControls/mod_tag2Macc.ascx.designer.cs b/Projects/WebGIM/GIM_site/WebUserControls/mod_tag2Macc.ascx.designer.cs index 8391068..36b964c 100644 --- a/Projects/WebGIM/GIM_site/WebUserControls/mod_tag2Macc.ascx.designer.cs +++ b/Projects/WebGIM/GIM_site/WebUserControls/mod_tag2Macc.ascx.designer.cs @@ -3,15 +3,175 @@ // This code was generated by a tool. // // Changes to this file may cause incorrect behavior and will be lost if -// the code is regenerated. +// the code is regenerated. // //------------------------------------------------------------------------------ -namespace GIM_site.WebUserControls -{ - - - public partial class mod_tag2Macc - { +namespace GIM_site.WebUserControls { + + + public partial class mod_tag2Macc { + + /// + /// hfTagCode control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.HiddenField hfTagCode; + + /// + /// hfIdxMacc control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.HiddenField hfIdxMacc; + + /// + /// divTags control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.HtmlControls.HtmlGenericControl divTags; + + /// + /// grViewTags control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.GridView grViewTags; + + /// + /// lblNumRecTags control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.Label lblNumRecTags; + + /// + /// odsByItem control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.ObjectDataSource odsByItem; + + /// + /// divMacc control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.HtmlControls.HtmlGenericControl divMacc; + + /// + /// btnShowHideAdd control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.Button btnShowHideAdd; + + /// + /// divAddNew control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.HtmlControls.HtmlGenericControl divAddNew; + + /// + /// lbtAddNew control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.LinkButton lbtAddNew; + + /// + /// ddlMacc control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.DropDownList ddlMacc; + + /// + /// odsMaccAvail control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.ObjectDataSource odsMaccAvail; + + /// + /// txtCercaMacchine control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.TextBox txtCercaMacchine; + + /// + /// listMacchine control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.ListBox listMacchine; + + /// + /// odsMacchine control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.ObjectDataSource odsMacchine; + + /// + /// grViewMacc control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.GridView grViewMacc; + + /// + /// lblNumRecMacc control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.Label lblNumRecMacc; + + /// + /// odsByTags control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.ObjectDataSource odsByTags; } } diff --git a/Projects/WebGIM/GIM_site/bin/GIM_data.dll b/Projects/WebGIM/GIM_site/bin/GIM_data.dll index 53122ee..6baebbd 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 ab7d418..9d8c7e1 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 513ead6..29f87fb 100644 Binary files a/Projects/WebGIM/GIM_site/bin/SteamWare.dll and b/Projects/WebGIM/GIM_site/bin/SteamWare.dll differ diff --git a/Projects/WebGIM/GIM_site/bin/VersGen.dll b/Projects/WebGIM/GIM_site/bin/VersGen.dll index adc2407..5a9bea5 100644 Binary files a/Projects/WebGIM/GIM_site/bin/VersGen.dll and b/Projects/WebGIM/GIM_site/bin/VersGen.dll differ diff --git a/Projects/WebGIM/GIM_site/sql/GIM_1.6.256.sql b/Projects/WebGIM/GIM_site/sql/GIM_1.6.256.sql index d7e24f6..1e9a8dc 100644 --- a/Projects/WebGIM/GIM_site/sql/GIM_1.6.256.sql +++ b/Projects/WebGIM/GIM_site/sql/GIM_1.6.256.sql @@ -37,7 +37,7 @@ exec voc.stp_insNewLemma 'TagDescr', 'Descrizione Tag' exec voc.stp_insNewLemma 'Famiglia', 'Famiglia' exec voc.stp_insNewLemma 'NomeCostruttore', 'Nome Costruttore' exec voc.stp_insNewLemma 'CodCostruttore', 'Cod. Costruttore' -exec voc.stp_insNewLemma 'CodSomaschini', 'Cod. Somaschini' +exec voc.stp_insNewLemma 'CodInterno', 'Cod. Somaschini' exec voc.stp_insNewLemma 'QtaMin', 'Qta Min' exec voc.stp_insNewLemma 'QtaLotto', 'Qta Lotto' exec voc.stp_insNewLemma 'Valore', 'Valore' @@ -50,8 +50,13 @@ exec voc.stp_insNewLemma 'MostraRicodifica', 'Mostra Ricodifica' exec voc.stp_insNewLemma 'GestioneTags', 'Elenco Etichette' exec voc.stp_insNewLemma 'GestioneSinonimi', 'Gestione ricodifica Etichette' exec voc.stp_insNewLemma 'TagCodeOrig', 'Etichetta originale import' -exec voc.stp_insNewLemma 'Tag2Macc', 'Macchine associate' -exec voc.stp_insNewLemma 'Tag2Item', 'Item associati' -exec voc.stp_insNewLemma 'Tags2Item', 'Etichette Associate' +exec voc.stp_insNewLemma 'Tag2Macc', 'Etichette associate' +exec voc.stp_insNewLemma 'Macc2Tag', 'Macchine associate' +exec voc.stp_insNewLemma 'Item2Tag', 'Item associati' +exec voc.stp_insNewLemma 'Tag2Item', 'Etichette Associate' exec voc.stp_insNewLemma 'addNewTag2Item', 'Aggiungi Etichetta ad Item' +exec voc.stp_insNewLemma 'FamigliaDescrizione', 'Fam. / Descriz.' +exec voc.stp_insNewLemma 'addNewTag2Macc', 'Associa Macchina' +exec voc.stp_insNewLemma 'HideAddNew', 'Nascondi aggiunta Macchine' +exec voc.stp_insNewLemma 'ShowAddNew', 'Mostra aggiunta Macchine' diff --git a/Projects/WebGIM/VersGen/WebGIM.cs b/Projects/WebGIM/VersGen/WebGIM.cs index 3c08900..c066132 100644 --- a/Projects/WebGIM/VersGen/WebGIM.cs +++ b/Projects/WebGIM/VersGen/WebGIM.cs @@ -5,7 +5,7 @@ using System.Reflection; -[assembly: AssemblyVersion("1.6.258.515")] -[assembly: AssemblyFileVersion("1.6.258.515")] +[assembly: AssemblyVersion("1.6.262.516")] +[assembly: AssemblyFileVersion("1.6.262.516")] [assembly: AssemblyCopyright("Steamware © 2006-2015")] [assembly: AssemblyCompany("Steamware")] diff --git a/Projects/WebGIM/VersGen/WebGIM.tt b/Projects/WebGIM/VersGen/WebGIM.tt index b5bc9eb..2e7905e 100644 --- a/Projects/WebGIM/VersGen/WebGIM.tt +++ b/Projects/WebGIM/VersGen/WebGIM.tt @@ -6,8 +6,8 @@ using System.Reflection; -[assembly: AssemblyVersion("1.6.258.<#= this.RevisionNumber #>")] -[assembly: AssemblyFileVersion("1.6.258.<#= this.RevisionNumber #>")] +[assembly: AssemblyVersion("1.6.262.<#= this.RevisionNumber #>")] +[assembly: AssemblyFileVersion("1.6.262.<#= this.RevisionNumber #>")] [assembly: AssemblyCopyright("Steamware © 2006-<#= DateTime.Now.Year #>")] [assembly: AssemblyCompany("Steamware")] <#+ diff --git a/Projects/WebGIM/VersGen/bin/Debug/VersGen.dll b/Projects/WebGIM/VersGen/bin/Debug/VersGen.dll index adc2407..5a9bea5 100644 Binary files a/Projects/WebGIM/VersGen/bin/Debug/VersGen.dll and b/Projects/WebGIM/VersGen/bin/Debug/VersGen.dll differ