From b0c8c5dddaa211ffe7db975cfd88e18a0e7c4d05 Mon Sep 17 00:00:00 2001 From: Samuele Locatelli Date: Wed, 20 Mar 2024 19:17:01 +0100 Subject: [PATCH] Completo aggiunta gestione AnagTagFasi --- .../WebUserControls/cmp_gestTagFasi.ascx | 45 +++++----- .../WebUserControls/cmp_gestTagFasi.ascx.cs | 89 ++++--------------- GPW_Data/DS_Applicazione.Designer.cs | 31 ++++--- GPW_Data/DS_Applicazione.xsd | 1 + GPW_Data/DataProxy.cs | 3 + 5 files changed, 59 insertions(+), 110 deletions(-) diff --git a/GPW_Admin/WebUserControls/cmp_gestTagFasi.ascx b/GPW_Admin/WebUserControls/cmp_gestTagFasi.ascx index 4f97227..8dce845 100644 --- a/GPW_Admin/WebUserControls/cmp_gestTagFasi.ascx +++ b/GPW_Admin/WebUserControls/cmp_gestTagFasi.ascx @@ -3,7 +3,7 @@
- + @@ -24,23 +24,17 @@ - - - - - - - - - - - - + + + + + + - + @@ -50,23 +44,24 @@ - + - + - - - - + + + + - - - - - + + + + + +
diff --git a/GPW_Admin/WebUserControls/cmp_gestTagFasi.ascx.cs b/GPW_Admin/WebUserControls/cmp_gestTagFasi.ascx.cs index 2ab783a..c36887f 100644 --- a/GPW_Admin/WebUserControls/cmp_gestTagFasi.ascx.cs +++ b/GPW_Admin/WebUserControls/cmp_gestTagFasi.ascx.cs @@ -12,22 +12,25 @@ namespace GPW_Admin.WebUserControls { public partial class cmp_gestTagFasi : BaseUserControl { - #region Public Properties + #region Public Methods - public string gruppoSel + public void doUpdate() { - get - { - string answ = ""; - if (grView.SelectedIndex >= 0) - { - answ = $"{grView.SelectedValue}"; - } - return answ; - } + grView.PageSize = utils.pageSize; + grView.DataBind(); } - #endregion Public Properties + /// + /// resetta la selezione dei valori in caso di modifiche su altri controlli + /// + public void resetSelezione() + { + grView.SelectedIndex = -1; + grView.DataBind(); + raiseReset(); + } + + #endregion Public Methods #region Protected Methods @@ -38,7 +41,7 @@ namespace GPW_Admin.WebUserControls /// protected void btnNew_Click(object sender, EventArgs e) { - DataProxy.DP.taGruppi.insertQuery("_New GROUP", "Descrizione", "", true); + DataProxy.DP.taATF.insertQuery("NEW TAG", "Descrizione", true, ""); resetSelezione(); } @@ -149,65 +152,5 @@ namespace GPW_Admin.WebUserControls } #endregion Protected Methods - - #region Public Methods - - /// - /// determina se sia eliminabile il record (=non usato) - /// - /// - /// - public bool delEnabled(object gruppo) - { - bool answ = true; - // solo se ha diritti scrittura controllo - if (gruppo != null) - { - answ = !hasChildObj($"{gruppo}"); - } - return answ; - } - - public void doUpdate() - { - grView.PageSize = utils.pageSize; - grView.DataBind(); - } - - /// - /// Determina se abbia child obj --> NON eliminabile - /// - /// - /// - public bool hasChildObj(string gruppo) - { - bool answ = false; - string redKey = memLayer.ML.redHash($"gruppoHasChildObj:{gruppo}"); - // cerco inc ache redis... - string rawData = memLayer.ML.getRSV(redKey); - if (rawData == null) - { - int trovati = DataProxy.DP.taVSD.getByGruppo(gruppo, false).Rows.Count; - answ = (trovati > 0); - memLayer.ML.setRSV(redKey, $"{answ}", 60 * 5); - } - else - { - bool.TryParse(rawData, out answ); - } - return answ; - } - - /// - /// resetta la selezione dei valori in caso di modifiche su altri controlli - /// - public void resetSelezione() - { - grView.SelectedIndex = -1; - grView.DataBind(); - raiseReset(); - } - - #endregion Public Methods } } \ No newline at end of file diff --git a/GPW_Data/DS_Applicazione.Designer.cs b/GPW_Data/DS_Applicazione.Designer.cs index acac92f..69ebe76 100644 --- a/GPW_Data/DS_Applicazione.Designer.cs +++ b/GPW_Data/DS_Applicazione.Designer.cs @@ -39869,6 +39869,7 @@ SELECT IdxRegMal, DtInizio, NumGG, CodCert FROM RegistroMalattie WHERE (IdxRegMa this._commandCollection[3].CommandText = "dbo.stp_ATF_updateQuery"; this._commandCollection[3].CommandType = global::System.Data.CommandType.StoredProcedure; this._commandCollection[3].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@RETURN_VALUE", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.ReturnValue, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[3].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@CodTagFase", global::System.Data.SqlDbType.NVarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._commandCollection[3].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Descrizione", global::System.Data.SqlDbType.NVarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._commandCollection[3].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Enabled", global::System.Data.SqlDbType.Bit, 1, global::System.Data.ParameterDirection.Input, 1, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._commandCollection[3].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@CodGruppo", global::System.Data.SqlDbType.NVarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); @@ -39976,31 +39977,37 @@ SELECT IdxRegMal, DtInizio, NumGG, CodCert FROM RegistroMalattie WHERE (IdxRegMa [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")] - public virtual int updateQuery(string Descrizione, global::System.Nullable Enabled, string CodGruppo, string Original_CodTagFase) { + public virtual int updateQuery(string CodTagFase, string Descrizione, global::System.Nullable Enabled, string CodGruppo, string Original_CodTagFase) { global::System.Data.SqlClient.SqlCommand command = this.CommandCollection[3]; - if ((Descrizione == null)) { + if ((CodTagFase == null)) { command.Parameters[1].Value = global::System.DBNull.Value; } else { - command.Parameters[1].Value = ((string)(Descrizione)); + command.Parameters[1].Value = ((string)(CodTagFase)); } - if ((Enabled.HasValue == true)) { - command.Parameters[2].Value = ((bool)(Enabled.Value)); - } - else { + if ((Descrizione == null)) { command.Parameters[2].Value = global::System.DBNull.Value; } - if ((CodGruppo == null)) { - command.Parameters[3].Value = global::System.DBNull.Value; + else { + command.Parameters[2].Value = ((string)(Descrizione)); + } + if ((Enabled.HasValue == true)) { + command.Parameters[3].Value = ((bool)(Enabled.Value)); } else { - command.Parameters[3].Value = ((string)(CodGruppo)); + command.Parameters[3].Value = global::System.DBNull.Value; } - if ((Original_CodTagFase == null)) { + if ((CodGruppo == null)) { command.Parameters[4].Value = global::System.DBNull.Value; } else { - command.Parameters[4].Value = ((string)(Original_CodTagFase)); + command.Parameters[4].Value = ((string)(CodGruppo)); + } + if ((Original_CodTagFase == null)) { + command.Parameters[5].Value = global::System.DBNull.Value; + } + else { + command.Parameters[5].Value = ((string)(Original_CodTagFase)); } global::System.Data.ConnectionState previousConnectionState = command.Connection.State; if (((command.Connection.State & global::System.Data.ConnectionState.Open) diff --git a/GPW_Data/DS_Applicazione.xsd b/GPW_Data/DS_Applicazione.xsd index 95061c3..9f2e8a0 100644 --- a/GPW_Data/DS_Applicazione.xsd +++ b/GPW_Data/DS_Applicazione.xsd @@ -3647,6 +3647,7 @@ FROM v_AnagTagFasi dbo.stp_ATF_updateQuery + diff --git a/GPW_Data/DataProxy.cs b/GPW_Data/DataProxy.cs index 9ba1cca..ad72cae 100644 --- a/GPW_Data/DataProxy.cs +++ b/GPW_Data/DataProxy.cs @@ -27,6 +27,7 @@ namespace GPW_data public static DataProxy DP = new DataProxy(); public DS_ApplicazioneTableAdapters.AnagFasiTableAdapter taAF; + public DS_ApplicazioneTableAdapters.AnagTagFasiTableAdapter taATF; public DS_UtilityTableAdapters.AnagKeyValueTableAdapter taAKV; public DS_ApplicazioneTableAdapters.AnagDevicesTableAdapter taAnagDev; public DS_ApplicazioneTableAdapters.AnagClientiTableAdapter taAnCli; @@ -192,6 +193,7 @@ namespace GPW_data taDip2Ruoli = new DS_ApplicazioneTableAdapters.Dipendenti2RuoliTableAdapter(); taAP = new DS_ApplicazioneTableAdapters.AnagProgettiTableAdapter(); taAF = new DS_ApplicazioneTableAdapters.AnagFasiTableAdapter(); + taATF = new DS_ApplicazioneTableAdapters.AnagTagFasiTableAdapter(); taLCU = new DS_ApplicazioneTableAdapters.v_logCommUtTableAdapter(); taRA = new DS_ApplicazioneTableAdapters.RegAttivitaTableAdapter(); taRAExpl = new DS_ApplicazioneTableAdapters.regAttDayExplTableAdapter(); @@ -233,6 +235,7 @@ namespace GPW_data taDip2Ruoli.Connection.ConnectionString = connGPW; taAP.Connection.ConnectionString = connGPW; taAF.Connection.ConnectionString = connGPW; + taATF.Connection.ConnectionString = connGPW; taLCU.Connection.ConnectionString = connGPW; taRA.Connection.ConnectionString = connGPW; taRAExpl.Connection.ConnectionString = connGPW;