diff --git a/CMS-SC-Data/DS_Applicazione.Designer.cs b/CMS-SC-Data/DS_Applicazione.Designer.cs index 6d357d4..9a4f3f2 100644 --- a/CMS-SC-Data/DS_Applicazione.Designer.cs +++ b/CMS-SC-Data/DS_Applicazione.Designer.cs @@ -2924,6 +2924,16 @@ namespace CMS_SC_Data { private global::System.Data.DataColumn columnUserCreazione; + private global::System.Data.DataColumn columnNumSchede; + + private global::System.Data.DataColumn columnNumMisReq; + + private global::System.Data.DataColumn columnNumMisEff; + + private global::System.Data.DataColumn columnStato; + + private global::System.Data.DataColumn columnDescrMacchina; + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] public ElencoDossierDataTable() { @@ -2989,6 +2999,46 @@ namespace CMS_SC_Data { } } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + public global::System.Data.DataColumn NumSchedeColumn { + get { + return this.columnNumSchede; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + public global::System.Data.DataColumn NumMisReqColumn { + get { + return this.columnNumMisReq; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + public global::System.Data.DataColumn NumMisEffColumn { + get { + return this.columnNumMisEff; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + public global::System.Data.DataColumn StatoColumn { + get { + return this.columnStato; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + public global::System.Data.DataColumn DescrMacchinaColumn { + get { + return this.columnDescrMacchina; + } + } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] [global::System.ComponentModel.Browsable(false)] @@ -3026,13 +3076,18 @@ namespace CMS_SC_Data { [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] - public ElencoDossierRow AddElencoDossierRow(ElencoMacchineCNRow parentElencoMacchineCNRowByFK_ElencoDossier_ElencoMacchineCN, System.DateTime DataCreazione, string UserCreazione) { + public ElencoDossierRow AddElencoDossierRow(ElencoMacchineCNRow parentElencoMacchineCNRowByFK_ElencoDossier_ElencoMacchineCN, System.DateTime DataCreazione, string UserCreazione, int NumSchede, int NumMisReq, int NumMisEff, string Stato, string DescrMacchina) { ElencoDossierRow rowElencoDossierRow = ((ElencoDossierRow)(this.NewRow())); object[] columnValuesArray = new object[] { null, null, DataCreazione, - UserCreazione}; + UserCreazione, + NumSchede, + NumMisReq, + NumMisEff, + Stato, + DescrMacchina}; if ((parentElencoMacchineCNRowByFK_ElencoDossier_ElencoMacchineCN != null)) { columnValuesArray[1] = parentElencoMacchineCNRowByFK_ElencoDossier_ElencoMacchineCN[0]; } @@ -3069,6 +3124,11 @@ namespace CMS_SC_Data { this.columnMatricola = base.Columns["Matricola"]; this.columnDataCreazione = base.Columns["DataCreazione"]; this.columnUserCreazione = base.Columns["UserCreazione"]; + this.columnNumSchede = base.Columns["NumSchede"]; + this.columnNumMisReq = base.Columns["NumMisReq"]; + this.columnNumMisEff = base.Columns["NumMisEff"]; + this.columnStato = base.Columns["Stato"]; + this.columnDescrMacchina = base.Columns["DescrMacchina"]; } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] @@ -3082,6 +3142,16 @@ namespace CMS_SC_Data { base.Columns.Add(this.columnDataCreazione); this.columnUserCreazione = new global::System.Data.DataColumn("UserCreazione", typeof(string), null, global::System.Data.MappingType.Element); base.Columns.Add(this.columnUserCreazione); + this.columnNumSchede = new global::System.Data.DataColumn("NumSchede", typeof(int), null, global::System.Data.MappingType.Element); + base.Columns.Add(this.columnNumSchede); + this.columnNumMisReq = new global::System.Data.DataColumn("NumMisReq", typeof(int), null, global::System.Data.MappingType.Element); + base.Columns.Add(this.columnNumMisReq); + this.columnNumMisEff = new global::System.Data.DataColumn("NumMisEff", typeof(int), null, global::System.Data.MappingType.Element); + base.Columns.Add(this.columnNumMisEff); + this.columnStato = new global::System.Data.DataColumn("Stato", typeof(string), null, global::System.Data.MappingType.Element); + base.Columns.Add(this.columnStato); + this.columnDescrMacchina = new global::System.Data.DataColumn("DescrMacchina", typeof(string), null, global::System.Data.MappingType.Element); + base.Columns.Add(this.columnDescrMacchina); this.Constraints.Add(new global::System.Data.UniqueConstraint("Constraint1", new global::System.Data.DataColumn[] { this.columnIdxDossier}, true)); this.columnIdxDossier.AutoIncrement = true; @@ -3093,6 +3163,13 @@ namespace CMS_SC_Data { this.columnMatricola.AllowDBNull = false; this.columnMatricola.MaxLength = 50; this.columnUserCreazione.MaxLength = 50; + this.columnNumSchede.ReadOnly = true; + this.columnNumMisReq.ReadOnly = true; + this.columnNumMisEff.ReadOnly = true; + this.columnStato.AllowDBNull = false; + this.columnStato.MaxLength = 50; + this.columnDescrMacchina.ReadOnly = true; + this.columnDescrMacchina.MaxLength = 103; } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] @@ -4714,6 +4791,81 @@ namespace CMS_SC_Data { } } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + public int NumSchede { + get { + try { + return ((int)(this[this.tableElencoDossier.NumSchedeColumn])); + } + catch (global::System.InvalidCastException e) { + throw new global::System.Data.StrongTypingException("The value for column \'NumSchede\' in table \'ElencoDossier\' is DBNull.", e); + } + } + set { + this[this.tableElencoDossier.NumSchedeColumn] = value; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + public int NumMisReq { + get { + try { + return ((int)(this[this.tableElencoDossier.NumMisReqColumn])); + } + catch (global::System.InvalidCastException e) { + throw new global::System.Data.StrongTypingException("The value for column \'NumMisReq\' in table \'ElencoDossier\' is DBNull.", e); + } + } + set { + this[this.tableElencoDossier.NumMisReqColumn] = value; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + public int NumMisEff { + get { + try { + return ((int)(this[this.tableElencoDossier.NumMisEffColumn])); + } + catch (global::System.InvalidCastException e) { + throw new global::System.Data.StrongTypingException("The value for column \'NumMisEff\' in table \'ElencoDossier\' is DBNull.", e); + } + } + set { + this[this.tableElencoDossier.NumMisEffColumn] = value; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + public string Stato { + get { + return ((string)(this[this.tableElencoDossier.StatoColumn])); + } + set { + this[this.tableElencoDossier.StatoColumn] = value; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + public string DescrMacchina { + get { + try { + return ((string)(this[this.tableElencoDossier.DescrMacchinaColumn])); + } + catch (global::System.InvalidCastException e) { + throw new global::System.Data.StrongTypingException("The value for column \'DescrMacchina\' in table \'ElencoDossier\' is DBNull.", e); + } + } + set { + this[this.tableElencoDossier.DescrMacchinaColumn] = value; + } + } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] public ElencoMacchineCNRow ElencoMacchineCNRow { @@ -4749,6 +4901,54 @@ namespace CMS_SC_Data { this[this.tableElencoDossier.UserCreazioneColumn] = global::System.Convert.DBNull; } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + public bool IsNumSchedeNull() { + return this.IsNull(this.tableElencoDossier.NumSchedeColumn); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + public void SetNumSchedeNull() { + this[this.tableElencoDossier.NumSchedeColumn] = global::System.Convert.DBNull; + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + public bool IsNumMisReqNull() { + return this.IsNull(this.tableElencoDossier.NumMisReqColumn); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + public void SetNumMisReqNull() { + this[this.tableElencoDossier.NumMisReqColumn] = global::System.Convert.DBNull; + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + public bool IsNumMisEffNull() { + return this.IsNull(this.tableElencoDossier.NumMisEffColumn); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + public void SetNumMisEffNull() { + this[this.tableElencoDossier.NumMisEffColumn] = global::System.Convert.DBNull; + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + public bool IsDescrMacchinaNull() { + return this.IsNull(this.tableElencoDossier.DescrMacchinaColumn); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + public void SetDescrMacchinaNull() { + this[this.tableElencoDossier.DescrMacchinaColumn] = global::System.Convert.DBNull; + } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] public SchemaCollMaccRow[] GetSchemaCollMaccRows() { @@ -9272,42 +9472,12 @@ SELECT CodScheda, Vers, CodMisura, MinPar, MaxPar, LIVal, LSVal FROM ValidVal WH tableMapping.ColumnMappings.Add("Matricola", "Matricola"); tableMapping.ColumnMappings.Add("DataCreazione", "DataCreazione"); tableMapping.ColumnMappings.Add("UserCreazione", "UserCreazione"); + tableMapping.ColumnMappings.Add("NumSchede", "NumSchede"); + tableMapping.ColumnMappings.Add("NumMisReq", "NumMisReq"); + tableMapping.ColumnMappings.Add("NumMisEff", "NumMisEff"); + tableMapping.ColumnMappings.Add("Stato", "Stato"); + tableMapping.ColumnMappings.Add("DescrMacchina", "DescrMacchina"); this._adapter.TableMappings.Add(tableMapping); - this._adapter.DeleteCommand = new global::System.Data.SqlClient.SqlCommand(); - this._adapter.DeleteCommand.Connection = this.Connection; - this._adapter.DeleteCommand.CommandText = @"DELETE FROM [dbo].[ElencoDossier] WHERE (([IdxDossier] = @Original_IdxDossier) AND ([Matricola] = @Original_Matricola) AND ((@IsNull_DataCreazione = 1 AND [DataCreazione] IS NULL) OR ([DataCreazione] = @Original_DataCreazione)) AND ((@IsNull_UserCreazione = 1 AND [UserCreazione] IS NULL) OR ([UserCreazione] = @Original_UserCreazione)))"; - this._adapter.DeleteCommand.CommandType = global::System.Data.CommandType.Text; - this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_IdxDossier", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "IdxDossier", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); - this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_Matricola", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "Matricola", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); - this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_DataCreazione", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "DataCreazione", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); - this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_DataCreazione", global::System.Data.SqlDbType.DateTime, 0, global::System.Data.ParameterDirection.Input, 0, 0, "DataCreazione", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); - this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_UserCreazione", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "UserCreazione", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); - this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_UserCreazione", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "UserCreazione", 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].[ElencoDossier] ([Matricola], [DataCreazione], [UserCreazione])" + - " VALUES (@Matricola, @DataCreazione, @UserCreazione);\r\nSELECT IdxDossier, Matric" + - "ola, DataCreazione, UserCreazione FROM ElencoDossier WHERE (IdxDossier = SCOPE_I" + - "DENTITY())"; - this._adapter.InsertCommand.CommandType = global::System.Data.CommandType.Text; - this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Matricola", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "Matricola", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@DataCreazione", global::System.Data.SqlDbType.DateTime, 0, global::System.Data.ParameterDirection.Input, 0, 0, "DataCreazione", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@UserCreazione", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "UserCreazione", 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].[ElencoDossier] SET [Matricola] = @Matricola, [DataCreazione] = @DataCreazione, [UserCreazione] = @UserCreazione WHERE (([IdxDossier] = @Original_IdxDossier) AND ([Matricola] = @Original_Matricola) AND ((@IsNull_DataCreazione = 1 AND [DataCreazione] IS NULL) OR ([DataCreazione] = @Original_DataCreazione)) AND ((@IsNull_UserCreazione = 1 AND [UserCreazione] IS NULL) OR ([UserCreazione] = @Original_UserCreazione))); -SELECT IdxDossier, Matricola, DataCreazione, UserCreazione FROM ElencoDossier WHERE (IdxDossier = @IdxDossier)"; - this._adapter.UpdateCommand.CommandType = global::System.Data.CommandType.Text; - this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Matricola", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "Matricola", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@DataCreazione", global::System.Data.SqlDbType.DateTime, 0, global::System.Data.ParameterDirection.Input, 0, 0, "DataCreazione", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@UserCreazione", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "UserCreazione", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_IdxDossier", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "IdxDossier", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); - this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_Matricola", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "Matricola", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); - this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_DataCreazione", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "DataCreazione", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); - this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_DataCreazione", global::System.Data.SqlDbType.DateTime, 0, global::System.Data.ParameterDirection.Input, 0, 0, "DataCreazione", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); - this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_UserCreazione", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "UserCreazione", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); - this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_UserCreazione", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "UserCreazione", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); - this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IdxDossier", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 0, 0, "IdxDossier", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] @@ -9323,8 +9493,7 @@ SELECT IdxDossier, Matricola, DataCreazione, UserCreazione FROM ElencoDossier WH 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 IdxDossier, Matricola, DataCreazione, UserCreazione FROM dbo.ElencoDossier" + - ""; + this._commandCollection[0].CommandText = "SELECT *\r\nFROM v_ElencoDossier"; this._commandCollection[0].CommandType = global::System.Data.CommandType.Text; this._commandCollection[1] = new global::System.Data.SqlClient.SqlCommand(); this._commandCollection[1].Connection = this.Connection; @@ -9359,189 +9528,6 @@ SELECT IdxDossier, Matricola, DataCreazione, UserCreazione FROM ElencoDossier WH 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")] - public virtual int Update(DS_Applicazione.ElencoDossierDataTable dataTable) { - return this.Adapter.Update(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")] - public virtual int Update(DS_Applicazione dataSet) { - return this.Adapter.Update(dataSet, "ElencoDossier"); - } - - [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 Update(global::System.Data.DataRow dataRow) { - return this.Adapter.Update(new global::System.Data.DataRow[] { - dataRow}); - } - - [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 Update(global::System.Data.DataRow[] dataRows) { - return this.Adapter.Update(dataRows); - } - - [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.Delete, true)] - public virtual int Delete(int Original_IdxDossier, string Original_Matricola, global::System.Nullable Original_DataCreazione, string Original_UserCreazione) { - this.Adapter.DeleteCommand.Parameters[0].Value = ((int)(Original_IdxDossier)); - if ((Original_Matricola == null)) { - throw new global::System.ArgumentNullException("Original_Matricola"); - } - else { - this.Adapter.DeleteCommand.Parameters[1].Value = ((string)(Original_Matricola)); - } - if ((Original_DataCreazione.HasValue == true)) { - this.Adapter.DeleteCommand.Parameters[2].Value = ((object)(0)); - this.Adapter.DeleteCommand.Parameters[3].Value = ((System.DateTime)(Original_DataCreazione.Value)); - } - else { - this.Adapter.DeleteCommand.Parameters[2].Value = ((object)(1)); - this.Adapter.DeleteCommand.Parameters[3].Value = global::System.DBNull.Value; - } - if ((Original_UserCreazione == null)) { - this.Adapter.DeleteCommand.Parameters[4].Value = ((object)(1)); - this.Adapter.DeleteCommand.Parameters[5].Value = global::System.DBNull.Value; - } - else { - this.Adapter.DeleteCommand.Parameters[4].Value = ((object)(0)); - this.Adapter.DeleteCommand.Parameters[5].Value = ((string)(Original_UserCreazione)); - } - global::System.Data.ConnectionState previousConnectionState = this.Adapter.DeleteCommand.Connection.State; - if (((this.Adapter.DeleteCommand.Connection.State & global::System.Data.ConnectionState.Open) - != global::System.Data.ConnectionState.Open)) { - this.Adapter.DeleteCommand.Connection.Open(); - } - try { - int returnValue = this.Adapter.DeleteCommand.ExecuteNonQuery(); - return returnValue; - } - finally { - if ((previousConnectionState == global::System.Data.ConnectionState.Closed)) { - this.Adapter.DeleteCommand.Connection.Close(); - } - } - } - - [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.Insert, true)] - public virtual int Insert(string Matricola, global::System.Nullable DataCreazione, string UserCreazione) { - if ((Matricola == null)) { - throw new global::System.ArgumentNullException("Matricola"); - } - else { - this.Adapter.InsertCommand.Parameters[0].Value = ((string)(Matricola)); - } - if ((DataCreazione.HasValue == true)) { - this.Adapter.InsertCommand.Parameters[1].Value = ((System.DateTime)(DataCreazione.Value)); - } - else { - this.Adapter.InsertCommand.Parameters[1].Value = global::System.DBNull.Value; - } - if ((UserCreazione == null)) { - this.Adapter.InsertCommand.Parameters[2].Value = global::System.DBNull.Value; - } - else { - this.Adapter.InsertCommand.Parameters[2].Value = ((string)(UserCreazione)); - } - 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)) { - this.Adapter.InsertCommand.Connection.Open(); - } - try { - int returnValue = this.Adapter.InsertCommand.ExecuteNonQuery(); - return returnValue; - } - finally { - if ((previousConnectionState == global::System.Data.ConnectionState.Closed)) { - this.Adapter.InsertCommand.Connection.Close(); - } - } - } - - [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 Matricola, global::System.Nullable DataCreazione, string UserCreazione, int Original_IdxDossier, string Original_Matricola, global::System.Nullable Original_DataCreazione, string Original_UserCreazione, int IdxDossier) { - if ((Matricola == null)) { - throw new global::System.ArgumentNullException("Matricola"); - } - else { - this.Adapter.UpdateCommand.Parameters[0].Value = ((string)(Matricola)); - } - if ((DataCreazione.HasValue == true)) { - this.Adapter.UpdateCommand.Parameters[1].Value = ((System.DateTime)(DataCreazione.Value)); - } - else { - this.Adapter.UpdateCommand.Parameters[1].Value = global::System.DBNull.Value; - } - if ((UserCreazione == null)) { - this.Adapter.UpdateCommand.Parameters[2].Value = global::System.DBNull.Value; - } - else { - this.Adapter.UpdateCommand.Parameters[2].Value = ((string)(UserCreazione)); - } - this.Adapter.UpdateCommand.Parameters[3].Value = ((int)(Original_IdxDossier)); - if ((Original_Matricola == null)) { - throw new global::System.ArgumentNullException("Original_Matricola"); - } - else { - this.Adapter.UpdateCommand.Parameters[4].Value = ((string)(Original_Matricola)); - } - if ((Original_DataCreazione.HasValue == true)) { - this.Adapter.UpdateCommand.Parameters[5].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[6].Value = ((System.DateTime)(Original_DataCreazione.Value)); - } - else { - this.Adapter.UpdateCommand.Parameters[5].Value = ((object)(1)); - this.Adapter.UpdateCommand.Parameters[6].Value = global::System.DBNull.Value; - } - if ((Original_UserCreazione == null)) { - this.Adapter.UpdateCommand.Parameters[7].Value = ((object)(1)); - this.Adapter.UpdateCommand.Parameters[8].Value = global::System.DBNull.Value; - } - else { - this.Adapter.UpdateCommand.Parameters[7].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[8].Value = ((string)(Original_UserCreazione)); - } - this.Adapter.UpdateCommand.Parameters[9].Value = ((int)(IdxDossier)); - 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)) { - this.Adapter.UpdateCommand.Connection.Open(); - } - try { - int returnValue = this.Adapter.UpdateCommand.ExecuteNonQuery(); - return returnValue; - } - finally { - if ((previousConnectionState == global::System.Data.ConnectionState.Closed)) { - this.Adapter.UpdateCommand.Connection.Close(); - } - } - } - - [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 Matricola, global::System.Nullable DataCreazione, string UserCreazione, int Original_IdxDossier, string Original_Matricola, global::System.Nullable Original_DataCreazione, string Original_UserCreazione) { - return this.Update(Matricola, DataCreazione, UserCreazione, Original_IdxDossier, Original_Matricola, Original_DataCreazione, Original_UserCreazione, Original_IdxDossier); - } - [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")] @@ -10310,12 +10296,18 @@ SELECT IdxDossier, CodScheda, Vers, NumScheda, Descrizione FROM SchemaCollMacc W [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 IdxDossier, CodScheda, Vers, NumScheda, Descrizione FROM dbo.SchemaCollMac" + "c"; 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_SCM_getByDossier"; + 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("@IdxDossier", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] @@ -10342,6 +10334,23 @@ SELECT IdxDossier, CodScheda, Vers, NumScheda, Descrizione FROM SchemaCollMacc W 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_Applicazione.SchemaCollMaccDataTable getByDossier(global::System.Nullable IdxDossier) { + this.Adapter.SelectCommand = this.CommandCollection[1]; + if ((IdxDossier.HasValue == true)) { + this.Adapter.SelectCommand.Parameters[1].Value = ((int)(IdxDossier.Value)); + } + else { + this.Adapter.SelectCommand.Parameters[1].Value = global::System.DBNull.Value; + } + DS_Applicazione.SchemaCollMaccDataTable dataTable = new DS_Applicazione.SchemaCollMaccDataTable(); + 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")] @@ -10531,8 +10540,6 @@ SELECT IdxDossier, CodScheda, Vers, NumScheda, Descrizione FROM SchemaCollMacc W private ValidValTableAdapter _validValTableAdapter; - private ElencoDossierTableAdapter _elencoDossierTableAdapter; - private MisureTableAdapter _misureTableAdapter; private SchemaCollMaccTableAdapter _schemaCollMaccTableAdapter; @@ -10636,20 +10643,6 @@ SELECT IdxDossier, CodScheda, Vers, NumScheda, Descrizione FROM SchemaCollMacc W } } - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] - [global::System.ComponentModel.EditorAttribute("Microsoft.VSDesigner.DataSource.Design.TableAdapterManagerPropertyEditor, Microso" + - "ft.VSDesigner, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3" + - "a", "System.Drawing.Design.UITypeEditor")] - public ElencoDossierTableAdapter ElencoDossierTableAdapter { - get { - return this._elencoDossierTableAdapter; - } - set { - this._elencoDossierTableAdapter = value; - } - } - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] [global::System.ComponentModel.EditorAttribute("Microsoft.VSDesigner.DataSource.Design.TableAdapterManagerPropertyEditor, Microso" + @@ -10721,10 +10714,6 @@ SELECT IdxDossier, CodScheda, Vers, NumScheda, Descrizione FROM SchemaCollMacc W && (this._validValTableAdapter.Connection != null))) { return this._validValTableAdapter.Connection; } - if (((this._elencoDossierTableAdapter != null) - && (this._elencoDossierTableAdapter.Connection != null))) { - return this._elencoDossierTableAdapter.Connection; - } if (((this._misureTableAdapter != null) && (this._misureTableAdapter.Connection != null))) { return this._misureTableAdapter.Connection; @@ -10764,9 +10753,6 @@ SELECT IdxDossier, CodScheda, Vers, NumScheda, Descrizione FROM SchemaCollMacc W if ((this._validValTableAdapter != null)) { count = (count + 1); } - if ((this._elencoDossierTableAdapter != null)) { - count = (count + 1); - } if ((this._misureTableAdapter != null)) { count = (count + 1); } @@ -10811,15 +10797,6 @@ SELECT IdxDossier, CodScheda, Vers, NumScheda, Descrizione FROM SchemaCollMacc W allChangedRows.AddRange(updatedRows); } } - if ((this._elencoDossierTableAdapter != null)) { - global::System.Data.DataRow[] updatedRows = dataSet.ElencoDossier.Select(null, null, global::System.Data.DataViewRowState.ModifiedCurrent); - updatedRows = this.GetRealUpdatedRows(updatedRows, allAddedRows); - if (((updatedRows != null) - && (0 < updatedRows.Length))) { - result = (result + this._elencoDossierTableAdapter.Update(updatedRows)); - allChangedRows.AddRange(updatedRows); - } - } if ((this._anagFasiTableAdapter != null)) { global::System.Data.DataRow[] updatedRows = dataSet.AnagFasi.Select(null, null, global::System.Data.DataViewRowState.ModifiedCurrent); updatedRows = this.GetRealUpdatedRows(updatedRows, allAddedRows); @@ -10899,14 +10876,6 @@ SELECT IdxDossier, CodScheda, Vers, NumScheda, Descrizione FROM SchemaCollMacc W allAddedRows.AddRange(addedRows); } } - if ((this._elencoDossierTableAdapter != null)) { - global::System.Data.DataRow[] addedRows = dataSet.ElencoDossier.Select(null, null, global::System.Data.DataViewRowState.Added); - if (((addedRows != null) - && (0 < addedRows.Length))) { - result = (result + this._elencoDossierTableAdapter.Update(addedRows)); - allAddedRows.AddRange(addedRows); - } - } if ((this._anagFasiTableAdapter != null)) { global::System.Data.DataRow[] addedRows = dataSet.AnagFasi.Select(null, null, global::System.Data.DataViewRowState.Added); if (((addedRows != null) @@ -10997,14 +10966,6 @@ SELECT IdxDossier, CodScheda, Vers, NumScheda, Descrizione FROM SchemaCollMacc W allChangedRows.AddRange(deletedRows); } } - if ((this._elencoDossierTableAdapter != null)) { - global::System.Data.DataRow[] deletedRows = dataSet.ElencoDossier.Select(null, null, global::System.Data.DataViewRowState.Deleted); - if (((deletedRows != null) - && (0 < deletedRows.Length))) { - result = (result + this._elencoDossierTableAdapter.Update(deletedRows)); - allChangedRows.AddRange(deletedRows); - } - } if ((this._anagSchedeTableAdapter != null)) { global::System.Data.DataRow[] deletedRows = dataSet.AnagSchede.Select(null, null, global::System.Data.DataViewRowState.Deleted); if (((deletedRows != null) @@ -11098,11 +11059,6 @@ SELECT IdxDossier, CodScheda, Vers, NumScheda, Descrizione FROM SchemaCollMacc W throw new global::System.ArgumentException("All TableAdapters managed by a TableAdapterManager must use the same connection s" + "tring."); } - if (((this._elencoDossierTableAdapter != null) - && (this.MatchTableAdapterConnection(this._elencoDossierTableAdapter.Connection) == false))) { - throw new global::System.ArgumentException("All TableAdapters managed by a TableAdapterManager must use the same connection s" + - "tring."); - } if (((this._misureTableAdapter != null) && (this.MatchTableAdapterConnection(this._misureTableAdapter.Connection) == false))) { throw new global::System.ArgumentException("All TableAdapters managed by a TableAdapterManager must use the same connection s" + @@ -11199,15 +11155,6 @@ SELECT IdxDossier, CodScheda, Vers, NumScheda, Descrizione FROM SchemaCollMacc W adaptersWithAcceptChangesDuringUpdate.Add(this._validValTableAdapter.Adapter); } } - if ((this._elencoDossierTableAdapter != null)) { - revertConnections.Add(this._elencoDossierTableAdapter, this._elencoDossierTableAdapter.Connection); - this._elencoDossierTableAdapter.Connection = ((global::System.Data.SqlClient.SqlConnection)(workConnection)); - this._elencoDossierTableAdapter.Transaction = ((global::System.Data.SqlClient.SqlTransaction)(workTransaction)); - if (this._elencoDossierTableAdapter.Adapter.AcceptChangesDuringUpdate) { - this._elencoDossierTableAdapter.Adapter.AcceptChangesDuringUpdate = false; - adaptersWithAcceptChangesDuringUpdate.Add(this._elencoDossierTableAdapter.Adapter); - } - } if ((this._misureTableAdapter != null)) { revertConnections.Add(this._misureTableAdapter, this._misureTableAdapter.Connection); this._misureTableAdapter.Connection = ((global::System.Data.SqlClient.SqlConnection)(workConnection)); @@ -11308,10 +11255,6 @@ SELECT IdxDossier, CodScheda, Vers, NumScheda, Descrizione FROM SchemaCollMacc W this._validValTableAdapter.Connection = ((global::System.Data.SqlClient.SqlConnection)(revertConnections[this._validValTableAdapter])); this._validValTableAdapter.Transaction = null; } - if ((this._elencoDossierTableAdapter != null)) { - this._elencoDossierTableAdapter.Connection = ((global::System.Data.SqlClient.SqlConnection)(revertConnections[this._elencoDossierTableAdapter])); - this._elencoDossierTableAdapter.Transaction = null; - } if ((this._misureTableAdapter != null)) { this._misureTableAdapter.Connection = ((global::System.Data.SqlClient.SqlConnection)(revertConnections[this._misureTableAdapter])); this._misureTableAdapter.Transaction = null; diff --git a/CMS-SC-Data/DS_Applicazione.xsd b/CMS-SC-Data/DS_Applicazione.xsd index 96146ef..5eaa549 100644 --- a/CMS-SC-Data/DS_Applicazione.xsd +++ b/CMS-SC-Data/DS_Applicazione.xsd @@ -756,55 +756,14 @@ SELECT CodScheda, Vers, CodMisura, MinPar, MaxPar, LIVal, LSVal FROM ValidVal WH - - - - DELETE FROM [dbo].[ElencoDossier] WHERE (([IdxDossier] = @Original_IdxDossier) AND ([Matricola] = @Original_Matricola) AND ((@IsNull_DataCreazione = 1 AND [DataCreazione] IS NULL) OR ([DataCreazione] = @Original_DataCreazione)) AND ((@IsNull_UserCreazione = 1 AND [UserCreazione] IS NULL) OR ([UserCreazione] = @Original_UserCreazione))) - - - - - - - - - - - - - INSERT INTO [dbo].[ElencoDossier] ([Matricola], [DataCreazione], [UserCreazione]) VALUES (@Matricola, @DataCreazione, @UserCreazione); -SELECT IdxDossier, Matricola, DataCreazione, UserCreazione FROM ElencoDossier WHERE (IdxDossier = SCOPE_IDENTITY()) - - - - - - - + - - SELECT IdxDossier, Matricola, DataCreazione, UserCreazione FROM dbo.ElencoDossier + + SELECT * +FROM v_ElencoDossier - - - UPDATE [dbo].[ElencoDossier] SET [Matricola] = @Matricola, [DataCreazione] = @DataCreazione, [UserCreazione] = @UserCreazione WHERE (([IdxDossier] = @Original_IdxDossier) AND ([Matricola] = @Original_Matricola) AND ((@IsNull_DataCreazione = 1 AND [DataCreazione] IS NULL) OR ([DataCreazione] = @Original_DataCreazione)) AND ((@IsNull_UserCreazione = 1 AND [UserCreazione] IS NULL) OR ([UserCreazione] = @Original_UserCreazione))); -SELECT IdxDossier, Matricola, DataCreazione, UserCreazione FROM ElencoDossier WHERE (IdxDossier = @IdxDossier) - - - - - - - - - - - - - - @@ -812,6 +771,11 @@ SELECT IdxDossier, Matricola, DataCreazione, UserCreazione FROM ElencoDossier WH + + + + + @@ -991,7 +955,19 @@ SELECT IdxDossier, CodScheda, Vers, NumScheda, Descrizione FROM SchemaCollMacc W - + + + + + dbo.stp_SCM_getByDossier + + + + + + + + @@ -1239,6 +1215,23 @@ SELECT IdxDossier, CodScheda, Vers, NumScheda, Descrizione FROM SchemaCollMacc W + + + + + + + + + + + + + + + + + diff --git a/CMS-SC-Data/DS_Applicazione.xss b/CMS-SC-Data/DS_Applicazione.xss index f037fa6..2bb5658 100644 --- a/CMS-SC-Data/DS_Applicazione.xss +++ b/CMS-SC-Data/DS_Applicazione.xss @@ -13,9 +13,9 @@ - + - + @@ -81,12 +81,12 @@ - 1150 + 1126 203 - 1150 - 273 + 1126 + 251 @@ -106,7 +106,7 @@ 834 - 445 + 464 834 @@ -129,12 +129,12 @@ - 1092 - 328 + 1068 + 306 969 - 328 + 306 diff --git a/CMS-SC-Data/bin/Debug/CMS-SC-Data.dll b/CMS-SC-Data/bin/Debug/CMS-SC-Data.dll index deff625..6ef9982 100644 Binary files a/CMS-SC-Data/bin/Debug/CMS-SC-Data.dll and b/CMS-SC-Data/bin/Debug/CMS-SC-Data.dll differ diff --git a/CMS-SC-Data/bin/Debug/SteamWare.dll b/CMS-SC-Data/bin/Debug/SteamWare.dll index 6dca924..03c2b8f 100644 Binary files a/CMS-SC-Data/bin/Debug/SteamWare.dll and b/CMS-SC-Data/bin/Debug/SteamWare.dll differ diff --git a/CMS-SC-Data/bin/Release/CMS-SC-Data.dll b/CMS-SC-Data/bin/Release/CMS-SC-Data.dll index d659425..c4cfb22 100644 Binary files a/CMS-SC-Data/bin/Release/CMS-SC-Data.dll and b/CMS-SC-Data/bin/Release/CMS-SC-Data.dll differ diff --git a/CMS-SC-Data/obj/Debug/CMS-SC-Data.dll b/CMS-SC-Data/obj/Debug/CMS-SC-Data.dll index deff625..6ef9982 100644 Binary files a/CMS-SC-Data/obj/Debug/CMS-SC-Data.dll and b/CMS-SC-Data/obj/Debug/CMS-SC-Data.dll differ diff --git a/CMS-SC-Data/obj/Debug/TempPE/DS_Applicazione.Designer.cs.dll b/CMS-SC-Data/obj/Debug/TempPE/DS_Applicazione.Designer.cs.dll index c8249d7..e74cf26 100644 Binary files a/CMS-SC-Data/obj/Debug/TempPE/DS_Applicazione.Designer.cs.dll and b/CMS-SC-Data/obj/Debug/TempPE/DS_Applicazione.Designer.cs.dll differ diff --git a/CMS-SC-Data/obj/Debug/TempPE/DS_Utility.Designer.cs.dll b/CMS-SC-Data/obj/Debug/TempPE/DS_Utility.Designer.cs.dll index 2beb2d2..83da923 100644 Binary files a/CMS-SC-Data/obj/Debug/TempPE/DS_Utility.Designer.cs.dll and b/CMS-SC-Data/obj/Debug/TempPE/DS_Utility.Designer.cs.dll differ diff --git a/CMS-SC-Data/obj/Release/CMS-SC-Data.dll b/CMS-SC-Data/obj/Release/CMS-SC-Data.dll index d659425..c4cfb22 100644 Binary files a/CMS-SC-Data/obj/Release/CMS-SC-Data.dll and b/CMS-SC-Data/obj/Release/CMS-SC-Data.dll differ diff --git a/CMS-SC-Data/obj/Release/TempPE/DS_Applicazione.Designer.cs.dll b/CMS-SC-Data/obj/Release/TempPE/DS_Applicazione.Designer.cs.dll index 464c3cd..78e2639 100644 Binary files a/CMS-SC-Data/obj/Release/TempPE/DS_Applicazione.Designer.cs.dll and b/CMS-SC-Data/obj/Release/TempPE/DS_Applicazione.Designer.cs.dll differ diff --git a/CMS_SC/CMS_SC.csproj b/CMS_SC/CMS_SC.csproj index 3bbee1b..51c1a1f 100644 --- a/CMS_SC/CMS_SC.csproj +++ b/CMS_SC/CMS_SC.csproj @@ -344,7 +344,9 @@ + + @@ -636,6 +638,13 @@ mod_DettScheda.ascx + + mod_elencoDossiers.ascx + ASPXCodeBehind + + + mod_elencoDossiers.ascx + mod_elencoRichResetUtenti.ascx ASPXCodeBehind @@ -643,6 +652,13 @@ mod_elencoRichResetUtenti.ascx + + mod_elencoSchedeDossier.ascx + ASPXCodeBehind + + + mod_elencoSchedeDossier.ascx + mod_enrollByAuthKey.ascx ASPXCodeBehind diff --git a/CMS_SC/ElencoSchede.aspx b/CMS_SC/ElencoSchede.aspx index 01725c9..c635bcf 100644 --- a/CMS_SC/ElencoSchede.aspx +++ b/CMS_SC/ElencoSchede.aspx @@ -1,44 +1,40 @@ <%@ Page Title="" Language="C#" MasterPageFile="~/Bootstrap.Master" AutoEventWireup="true" CodeBehind="ElencoSchede.aspx.cs" Inherits="CMS_SC.ElencoSchede" %> -<%@ Register Src="~/WebUserControls/mod_SchemaCollFamMacc.ascx" TagPrefix="uc1" TagName="mod_SchemaCollFamMacc" %> +<%--<%@ Register Src="~/WebUserControls/mod_SchemaCollFamMacc.ascx" TagPrefix="uc1" TagName="mod_SchemaCollFamMacc" %>--%> <%@ Register Src="~/WebUserControls/mod_righePag.ascx" TagName="mod_righePag" TagPrefix="uc1" %> -<%@ Register Src="~/WebUserControls/mod_selSchedaUrl.ascx" TagPrefix="uc1" TagName="mod_selSchedaUrl" %> -<%@ Register Src="~/WebUserControls/mod_selFamMaccUrl.ascx" TagPrefix="uc1" TagName="mod_selFamMaccUrl" %> -<%@ Register Src="~/WebUserControls/mod_autocompleteShort.ascx" TagPrefix="uc1" TagName="mod_autocompleteShort" %> +<%@ Register Src="~/WebUserControls/mod_elencoDossiers.ascx" TagPrefix="uc1" TagName="mod_elencoDossiers" %> +<%@ Register Src="~/WebUserControls/mod_elencoSchedeDossier.ascx" TagPrefix="uc1" TagName="mod_elencoSchedeDossier" %> + + - elenco con filtro su macchina e posso editare... creando da famiglia o selezionando da elenco... - -
    -
  • macchina x cui salvare (a dx?) e che filtra
    • -
  • fam macchina + scheda vers (a sx?)
    • -
  • eventuale elenco di schede di quella macchina già presenti...
    • -
-
- - -
-
- - - -
-
- - -
-
-
-
-
-
- <%----%> +
+
+
+
+
+
+
+ + +
+
+ + +
+
+
+
+ +
+
+
diff --git a/CMS_SC/ElencoSchede.aspx.cs b/CMS_SC/ElencoSchede.aspx.cs index 4de7aab..7c7419d 100644 --- a/CMS_SC/ElencoSchede.aspx.cs +++ b/CMS_SC/ElencoSchede.aspx.cs @@ -16,11 +16,15 @@ namespace CMS_SC { ((Bootstrap)this.Master).showSearch = true; mod_righePag.numRowPag = 20; - //mod_SchemaCollFamMacc.pageSize = mod_righePag.numRowPag; - presetChk(); - fixChkFilt(); + mod_elencoDossiers.pageSize = mod_righePag.numRowPag; } mod_righePag.eh_newNum += mod_righePag_eh_newNum; + mod_elencoDossiers.eh_selezioneValore += mod_elencoDossiers_eh_selezioneValore; + } + + void mod_elencoDossiers_eh_selezioneValore(object sender, EventArgs e) + { + mod_elencoSchedeDossier.idxDossier = mod_elencoDossiers.idxDossier.ToString(); } /// /// url base area services @@ -29,11 +33,6 @@ namespace CMS_SC { return string.Format("/{0}/WS_data.asmx/{1}", memLayer.ML.confReadString("serviceUrl"), method); } - private void presetChk() - { - chkFilFamMacc.Checked = memLayer.ML.BoolSessionObj("filtByFamMac"); - chkFiltCodSchedaVers.Checked = memLayer.ML.BoolSessionObj("filtByScheda"); - } /// /// wrapper traduzione /// @@ -43,65 +42,10 @@ namespace CMS_SC { return user_std.UtSn.Traduci(lemma); } - /// - /// sistema i controlli checkbox di filtraggio - /// - private void fixChkFilt() - { - // sistemo scritta e visibilità da stato filtrato... - if (chkFilFamMacc.Checked) - { - chkFilFamMacc.Text = traduci("ShowAllFamMacc"); - } - else - { - chkFilFamMacc.Text = traduci("SelFamMacc"); - } - if (chkFiltCodSchedaVers.Checked) - { - chkFiltCodSchedaVers.Text = traduci("ShowAllSched"); - } - else - { - chkFiltCodSchedaVers.Text = traduci("SelSched"); - } - memLayer.ML.setSessionVal("filtByFamMac", chkFilFamMacc.Checked); - memLayer.ML.setSessionVal("filtByScheda", chkFiltCodSchedaVers.Checked); - mod_selFamMaccUrl.Visible = chkFilFamMacc.Checked; - mod_selSchedaUrl.Visible = chkFiltCodSchedaVers.Checked; - //mod_SchemaCollFamMacc.doUpdate(); - } void mod_righePag_eh_newNum(object sender, EventArgs e) { - //mod_SchemaCollFamMacc.pageSize = mod_righePag.numRowPag; - } - - protected void chkFiltCodSchedaVers_CheckedChanged(object sender, EventArgs e) - { - fixChkFilt(); - } - - protected void chkFilFamMacc_CheckedChanged(object sender, EventArgs e) - { - fixChkFilt(); - } - /// - /// verifica se si possano aggiungere nuovi record ovvero se selezionata famiglia e scheda... - /// - public bool addNewEnabled - { - get - { - bool answ = false; - try - { - answ = (memLayer.ML.QSS("CodSchedaVers") != "") && (memLayer.ML.QSS("CodFam") != "") && memLayer.ML.BoolSessionObj("filtByFamMac") && memLayer.ML.BoolSessionObj("filtByScheda"); - } - catch - { } - return answ; - } + mod_elencoDossiers.pageSize = mod_righePag.numRowPag; } } diff --git a/CMS_SC/ElencoSchede.aspx.designer.cs b/CMS_SC/ElencoSchede.aspx.designer.cs index 0831347..b682511 100644 --- a/CMS_SC/ElencoSchede.aspx.designer.cs +++ b/CMS_SC/ElencoSchede.aspx.designer.cs @@ -13,49 +13,13 @@ namespace CMS_SC { public partial class ElencoSchede { /// - /// mod_autocompleteShort control. + /// mod_elencoDossiers control. /// /// /// Auto-generated field. /// To modify move field declaration from designer file to code-behind file. /// - protected global::CMS_SC.WebUserControls.mod_autocompleteShort mod_autocompleteShort; - - /// - /// chkFilFamMacc control. - /// - /// - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. - /// - protected global::System.Web.UI.WebControls.CheckBox chkFilFamMacc; - - /// - /// mod_selFamMaccUrl control. - /// - /// - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. - /// - protected global::CMS_SC.WebUserControls.mod_selFamMaccUrl mod_selFamMaccUrl; - - /// - /// chkFiltCodSchedaVers control. - /// - /// - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. - /// - protected global::System.Web.UI.WebControls.CheckBox chkFiltCodSchedaVers; - - /// - /// mod_selSchedaUrl control. - /// - /// - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. - /// - protected global::CMS_SC.WebUserControls.mod_selSchedaUrl mod_selSchedaUrl; + protected global::CMS_SC.WebUserControls.mod_elencoDossiers mod_elencoDossiers; /// /// mod_righePag control. @@ -65,5 +29,50 @@ namespace CMS_SC { /// To modify move field declaration from designer file to code-behind file. /// protected global::mod_righePag mod_righePag; + + /// + /// ddlSelFamMacc control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.DropDownList ddlSelFamMacc; + + /// + /// odsFamMacc control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.ObjectDataSource odsFamMacc; + + /// + /// ddlSelScheda control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.DropDownList ddlSelScheda; + + /// + /// odsScheda control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.ObjectDataSource odsScheda; + + /// + /// mod_elencoSchedeDossier control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::CMS_SC.WebUserControls.mod_elencoSchedeDossier mod_elencoSchedeDossier; } } diff --git a/CMS_SC/WebUserControls/mod_elencoDossiers.ascx b/CMS_SC/WebUserControls/mod_elencoDossiers.ascx new file mode 100644 index 0000000..c3e200b --- /dev/null +++ b/CMS_SC/WebUserControls/mod_elencoDossiers.ascx @@ -0,0 +1,41 @@ +<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="mod_elencoDossiers.ascx.cs" Inherits="CMS_SC.WebUserControls.mod_elencoDossiers" %> + + + + + + + + <%: traduci("Reset") %> + + + + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/CMS_SC/WebUserControls/mod_elencoDossiers.ascx.cs b/CMS_SC/WebUserControls/mod_elencoDossiers.ascx.cs new file mode 100644 index 0000000..5eb49da --- /dev/null +++ b/CMS_SC/WebUserControls/mod_elencoDossiers.ascx.cs @@ -0,0 +1,96 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Web; +using System.Web.UI; +using System.Web.UI.WebControls; +using CMS_SC_Data; +using SteamWare; + +namespace CMS_SC.WebUserControls +{ + public partial class mod_elencoDossiers : System.Web.UI.UserControl + { + /// + /// selezione valore in DettScheda + /// + public event EventHandler eh_selezioneValore; + /// + /// sollevo evento selezione + /// + protected void raiseEvent() + { + // sollevo evento nuovo valore... + if (eh_selezioneValore != null) + { + eh_selezioneValore(this, new EventArgs()); + } + } + protected void Page_Load(object sender, EventArgs e) + { + + } + /// + /// dimensione pagina grid view + /// + public int pageSize + { + get + { + return grView.PageSize; + } + set + { + grView.PageSize = value; + } + } + /// + /// dossier selezionato + /// + public int idxDossier + { + get + { + int answ = 0; + try + { + answ = Convert.ToInt32(grView.SelectedDataKey["IdxDossier"]); + } + catch + { } + return answ; + } + } + /// + /// selezione scheda... + /// + /// + /// + protected void grView_SelectedIndexChanged(object sender, EventArgs e) + { + raiseEvent(); + } + protected void btnReset_Click(object sender, EventArgs e) + { + resetSelezione(); + } + /// + /// resetto selezione + /// + private void resetSelezione() + { + grView.SelectedIndex = -1; + grView.DataBind(); + raiseEvent(); + } + /// + /// wrapper traduzione + /// + /// + /// + public string traduci(string lemma) + { + return user_std.UtSn.Traduci(lemma); + } + } +} \ No newline at end of file diff --git a/CMS_SC/WebUserControls/mod_elencoDossiers.ascx.designer.cs b/CMS_SC/WebUserControls/mod_elencoDossiers.ascx.designer.cs new file mode 100644 index 0000000..beab91b --- /dev/null +++ b/CMS_SC/WebUserControls/mod_elencoDossiers.ascx.designer.cs @@ -0,0 +1,33 @@ +//------------------------------------------------------------------------------ +// +// This code was generated by a tool. +// +// Changes to this file may cause incorrect behavior and will be lost if +// the code is regenerated. +// +//------------------------------------------------------------------------------ + +namespace CMS_SC.WebUserControls { + + + public partial class mod_elencoDossiers { + + /// + /// grView control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.GridView grView; + + /// + /// ods control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.ObjectDataSource ods; + } +} diff --git a/CMS_SC/WebUserControls/mod_elencoSchedeDossier.ascx b/CMS_SC/WebUserControls/mod_elencoSchedeDossier.ascx new file mode 100644 index 0000000..0762766 --- /dev/null +++ b/CMS_SC/WebUserControls/mod_elencoSchedeDossier.ascx @@ -0,0 +1,43 @@ +<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="mod_elencoSchedeDossier.ascx.cs" Inherits="CMS_SC.WebUserControls.mod_elencoSchedeDossier" %> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/CMS_SC/WebUserControls/mod_elencoSchedeDossier.ascx.cs b/CMS_SC/WebUserControls/mod_elencoSchedeDossier.ascx.cs new file mode 100644 index 0000000..739441c --- /dev/null +++ b/CMS_SC/WebUserControls/mod_elencoSchedeDossier.ascx.cs @@ -0,0 +1,94 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Web; +using System.Web.UI; +using System.Web.UI.WebControls; +using CMS_SC_Data; +using SteamWare; + +namespace CMS_SC.WebUserControls +{ + public partial class mod_elencoSchedeDossier : System.Web.UI.UserControl + { + /// + /// selezione valore in DettScheda + /// + public event EventHandler eh_selezioneValore; + /// + /// sollevo evento selezione + /// + protected void raiseEvent() + { + // sollevo evento nuovo valore... + if (eh_selezioneValore != null) + { + eh_selezioneValore(this, new EventArgs()); + } + } + protected void Page_Load(object sender, EventArgs e) + { + + } + /// + /// dimensione pagina grid view + /// + public int pageSize + { + get + { + return grView.PageSize; + } + set + { + grView.PageSize = value; + } + } + /// + /// dossier selezionato + /// + public string idxDossier + { + get + { + return hfIdxDossier.Value; + } + set + { + hfIdxDossier.Value = value; + grView.DataBind(); + } + } + /// + /// selezione scheda... + /// + /// + /// + protected void grView_SelectedIndexChanged(object sender, EventArgs e) + { + raiseEvent(); + } + protected void btnReset_Click(object sender, EventArgs e) + { + resetSelezione(); + } + /// + /// resetto selezione + /// + private void resetSelezione() + { + grView.SelectedIndex = -1; + grView.DataBind(); + raiseEvent(); + } + /// + /// wrapper traduzione + /// + /// + /// + public string traduci(string lemma) + { + return user_std.UtSn.Traduci(lemma); + } + } +} \ No newline at end of file diff --git a/CMS_SC/WebUserControls/mod_elencoSchedeDossier.ascx.designer.cs b/CMS_SC/WebUserControls/mod_elencoSchedeDossier.ascx.designer.cs new file mode 100644 index 0000000..f548c19 --- /dev/null +++ b/CMS_SC/WebUserControls/mod_elencoSchedeDossier.ascx.designer.cs @@ -0,0 +1,42 @@ +//------------------------------------------------------------------------------ +// +// This code was generated by a tool. +// +// Changes to this file may cause incorrect behavior and will be lost if +// the code is regenerated. +// +//------------------------------------------------------------------------------ + +namespace CMS_SC.WebUserControls { + + + public partial class mod_elencoSchedeDossier { + + /// + /// grView control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.GridView grView; + + /// + /// ods control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.ObjectDataSource ods; + + /// + /// hfIdxDossier control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.HiddenField hfIdxDossier; + } +} diff --git a/CMS_SC/WebUserControls/mod_lemmiVocab.ascx b/CMS_SC/WebUserControls/mod_lemmiVocab.ascx index 300dae0..c4769e5 100644 --- a/CMS_SC/WebUserControls/mod_lemmiVocab.ascx +++ b/CMS_SC/WebUserControls/mod_lemmiVocab.ascx @@ -13,7 +13,7 @@ --%> - + diff --git a/CMS_SC/WebUserControls/mod_vocabolario.ascx b/CMS_SC/WebUserControls/mod_vocabolario.ascx index b1bf07b..143fa72 100644 --- a/CMS_SC/WebUserControls/mod_vocabolario.ascx +++ b/CMS_SC/WebUserControls/mod_vocabolario.ascx @@ -19,7 +19,7 @@ --%> - + diff --git a/CMS_SC/bin/CMS-SC-Data.dll b/CMS_SC/bin/CMS-SC-Data.dll index d659425..6ef9982 100644 Binary files a/CMS_SC/bin/CMS-SC-Data.dll and b/CMS_SC/bin/CMS-SC-Data.dll differ diff --git a/CMS_SC/bin/CMS_SC.dll b/CMS_SC/bin/CMS_SC.dll index 58fbbed..ba853f6 100644 Binary files a/CMS_SC/bin/CMS_SC.dll and b/CMS_SC/bin/CMS_SC.dll differ diff --git a/CMS_SC/bin/SteamWare.dll b/CMS_SC/bin/SteamWare.dll index 6b81885..03c2b8f 100644 Binary files a/CMS_SC/bin/SteamWare.dll and b/CMS_SC/bin/SteamWare.dll differ diff --git a/VersGen/bin/Debug/VersGen.dll b/VersGen/bin/Debug/VersGen.dll index 5c81836..c9764b3 100644 Binary files a/VersGen/bin/Debug/VersGen.dll and b/VersGen/bin/Debug/VersGen.dll differ