diff --git a/GMW/WebUserControls/mod_PostProveMecc.ascx b/GMW/WebUserControls/mod_PostProveMecc.ascx index 957b83ac..b1d48614 100644 --- a/GMW/WebUserControls/mod_PostProveMecc.ascx +++ b/GMW/WebUserControls/mod_PostProveMecc.ascx @@ -78,15 +78,14 @@
-
- <%----%>
- <%: traduci("lbtDeliberaTT") %> + <%: traduci("lbtDeliberaPM") %>
diff --git a/GMW/WebUserControls/mod_PostProveMecc.ascx.cs b/GMW/WebUserControls/mod_PostProveMecc.ascx.cs index 3d68e013..753e18a1 100644 --- a/GMW/WebUserControls/mod_PostProveMecc.ascx.cs +++ b/GMW/WebUserControls/mod_PostProveMecc.ascx.cs @@ -54,11 +54,11 @@ namespace GMW.WebUserControls { get { - return chkDurezza.Checked; + return chkPrMecc.Checked; } set { - chkDurezza.Checked = value; + chkPrMecc.Checked = value; } } /// @@ -221,13 +221,13 @@ namespace GMW.WebUserControls // determino focus a seconda di cosa ho giĆ  in selezione.. if (EsitoPM) { - lbtDeliberaTT.Focus(); + lbtDeliberaPM.Focus(); } else { if (NumTT_Delib != "" || NumTT_NoDelib != "") { - chkDurezza.Focus(); + chkPrMecc.Focus(); } else { @@ -240,13 +240,23 @@ namespace GMW.WebUserControls /// private void updateBtns() { + if (EsitoPM) + { + chkPrMecc.Text = "OK"; + lblChec.Attributes.Remove("class"); + lblChec.Attributes.Add("class", "btn btn-success"); + } + else + { + chkPrMecc.Text = "KO"; + lblChec.Attributes.Remove("class"); + lblChec.Attributes.Add("class", "btn btn-danger"); + } // posso vedere esito PM se ho un numero tratt bool btnVis = (NumTT_Delib != "" || NumTT_NoDelib != ""); divEsitoPM.Visible = btnVis; lbtnResetNoPM.Visible = btnVis; lbtnResetPM.Visible = btnVis; - // posso stampare se ho numero tratt ed EsitoPM.. - btnVis = ((NumTT_Delib != "" || NumTT_NoDelib != "") && EsitoPM); divDelibera.Visible = btnVis; } /// @@ -254,7 +264,7 @@ namespace GMW.WebUserControls /// /// /// - protected void lbtDeliberaTT_Click(object sender, EventArgs e) + protected void lbtDeliberaPM_Click(object sender, EventArgs e) { // salva delibera PM con update string numTratt = ""; @@ -288,20 +298,8 @@ namespace GMW.WebUserControls /// /// /// - protected void chkDurezza_CheckedChanged(object sender, EventArgs e) + protected void chkPrMecc_CheckedChanged(object sender, EventArgs e) { - if (EsitoPM) - { - chkDurezza.Text = "OK"; - lblDurezza.Attributes.Remove("class"); - lblDurezza.Attributes.Add("class", "btn btn-success"); - } - else - { - chkDurezza.Text = "KO"; - lblDurezza.Attributes.Remove("class"); - lblDurezza.Attributes.Add("class", "btn btn-danger"); - } doUpdate(); } /// diff --git a/GMW/WebUserControls/mod_PostProveMecc.ascx.designer.cs b/GMW/WebUserControls/mod_PostProveMecc.ascx.designer.cs index fc45f6e3..56de91fc 100644 --- a/GMW/WebUserControls/mod_PostProveMecc.ascx.designer.cs +++ b/GMW/WebUserControls/mod_PostProveMecc.ascx.designer.cs @@ -85,22 +85,22 @@ namespace GMW.WebUserControls { protected global::System.Web.UI.HtmlControls.HtmlGenericControl divEsitoPM; /// - /// lblDurezza control. + /// lblChec control. /// /// /// Auto-generated field. /// To modify move field declaration from designer file to code-behind file. /// - protected global::System.Web.UI.HtmlControls.HtmlGenericControl lblDurezza; + protected global::System.Web.UI.HtmlControls.HtmlGenericControl lblChec; /// - /// chkDurezza control. + /// chkPrMecc control. /// /// /// Auto-generated field. /// To modify move field declaration from designer file to code-behind file. /// - protected global::System.Web.UI.WebControls.CheckBox chkDurezza; + protected global::System.Web.UI.WebControls.CheckBox chkPrMecc; /// /// divDelibera control. @@ -112,13 +112,13 @@ namespace GMW.WebUserControls { protected global::System.Web.UI.HtmlControls.HtmlGenericControl divDelibera; /// - /// lbtDeliberaTT control. + /// lbtDeliberaPM control. /// /// /// Auto-generated field. /// To modify move field declaration from designer file to code-behind file. /// - protected global::System.Web.UI.WebControls.LinkButton lbtDeliberaTT; + protected global::System.Web.UI.WebControls.LinkButton lbtDeliberaPM; /// /// lblNtNoDelib control. diff --git a/GMW/bin/GMW.dll b/GMW/bin/GMW.dll index 91acd801..25423b2f 100644 Binary files a/GMW/bin/GMW.dll and b/GMW/bin/GMW.dll differ diff --git a/GMW/bin/GMW_data.dll b/GMW/bin/GMW_data.dll index f36e5730..372c1770 100644 Binary files a/GMW/bin/GMW_data.dll and b/GMW/bin/GMW_data.dll differ diff --git a/GMW/bin/SteamWare.dll b/GMW/bin/SteamWare.dll index c06a9602..218a8e71 100644 Binary files a/GMW/bin/SteamWare.dll and b/GMW/bin/SteamWare.dll differ diff --git a/GMW/bin/VersGen.dll b/GMW/bin/VersGen.dll index b521832b..7f0b101b 100644 Binary files a/GMW/bin/VersGen.dll and b/GMW/bin/VersGen.dll differ