diff --git a/MP-ADM/MP-ADM.csproj b/MP-ADM/MP-ADM.csproj index 034a54c7..4de6817f 100644 --- a/MP-ADM/MP-ADM.csproj +++ b/MP-ADM/MP-ADM.csproj @@ -633,7 +633,7 @@ - + @@ -1172,12 +1172,12 @@ mod_planCreate.ascx - - mod_planStats.ascx + + cmp_planStats.ascx ASPXCodeBehind - - mod_planStats.ascx + + cmp_planStats.ascx mod_ricercaGenerica.ascx diff --git a/MP-ADM/Planner.aspx b/MP-ADM/Planner.aspx index c011bcee..872c5e34 100644 --- a/MP-ADM/Planner.aspx +++ b/MP-ADM/Planner.aspx @@ -1,13 +1,13 @@ <%@ Page Title="" Language="C#" MasterPageFile="~/WebMasterPages/MoonPro.master" AutoEventWireup="true" CodeBehind="Planner.aspx.cs" Inherits="MP_ADM.Planner" %> -<%@ Register Src="~/WebUserControls/mod_planStats.ascx" TagPrefix="uc1" TagName="mod_planStats" %> +<%@ Register Src="~/WebUserControls/cmp_planStats.ascx" TagPrefix="uc1" TagName="cmp_planStats" %> <%@ Register Src="~/WebUserControls/mod_planCreate.ascx" TagPrefix="uc1" TagName="mod_planCreate" %> <%@ Register Src="~/WebUserControls/mod_gestPromODL_OUT.ascx" TagPrefix="uc1" TagName="mod_gestPromODL_OUT" %>
- +
diff --git a/MP-ADM/Planner.aspx.cs b/MP-ADM/Planner.aspx.cs index 1569e473..376ce6d7 100644 --- a/MP-ADM/Planner.aspx.cs +++ b/MP-ADM/Planner.aspx.cs @@ -20,6 +20,16 @@ namespace MP_ADM } } + private void cmp_planStats_eh_reset(object sender, EventArgs e) + { + doRefreshChild(); + } + + private void cmp_planStats_eh_selVal(object sender, EventArgs e) + { + doRefreshChild(); + } + private void Mod_planCreate_eh_ucev(object sender, EventArgs e) { // se trovo evento select/reset mostro/nascondo dettagli... @@ -27,7 +37,7 @@ namespace MP_ADM switch (evento.tipoEvento) { case ucEvType.ReqUpdateParent: - mod_planStats.doReset(); + cmp_planStats.doReset(); mod_gestPromODL_OUT.resetSelezione(); break; @@ -36,16 +46,6 @@ namespace MP_ADM } } - private void Mod_planStats_eh_reset(object sender, EventArgs e) - { - doRefreshChild(); - } - - private void Mod_planStats_eh_selVal(object sender, EventArgs e) - { - doRefreshChild(); - } - private void toggleVisibility() { divPromOUT.Visible = !divPromOUT.Visible; @@ -58,10 +58,10 @@ namespace MP_ADM protected void doRefreshChild() { - mod_planCreate.CodGruppo = mod_planStats.CodFase; - mod_planCreate.IdxMacchina = mod_planStats.IdxMacchina; - mod_planCreate.CodCliente = mod_planStats.CodCliente; - mod_planCreate.CodArticolo = mod_planStats.CodArticolo; + mod_planCreate.CodGruppo = cmp_planStats.CodFase; + mod_planCreate.IdxMacchina = cmp_planStats.IdxMacchina; + mod_planCreate.CodCliente = cmp_planStats.CodCliente; + mod_planCreate.CodArticolo = cmp_planStats.CodArticolo; mod_planCreate.doUpdate(); } @@ -78,8 +78,8 @@ namespace MP_ADM } checkEnabled(); string codPre = memLayer.ML.CRS("OptAdmKit_CodPre"); - mod_planStats.eh_reset += Mod_planStats_eh_reset; - mod_planStats.eh_selVal += Mod_planStats_eh_selVal; + cmp_planStats.eh_reset += cmp_planStats_eh_reset; + cmp_planStats.eh_selVal += cmp_planStats_eh_selVal; mod_planCreate.eh_ucev += Mod_planCreate_eh_ucev; } diff --git a/MP-ADM/Planner.aspx.designer.cs b/MP-ADM/Planner.aspx.designer.cs index 3c96b134..b3ea35b5 100644 --- a/MP-ADM/Planner.aspx.designer.cs +++ b/MP-ADM/Planner.aspx.designer.cs @@ -31,13 +31,13 @@ namespace MP_ADM { protected global::System.Web.UI.HtmlControls.HtmlGenericControl divContent; /// - /// Controllo mod_planStats. + /// Controllo cmp_planStats. /// /// /// Campo generato automaticamente. /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. /// - protected global::MP_ADM.WebUserControls.mod_planStats mod_planStats; + protected global::MP_ADM.WebUserControls.cmp_planStats cmp_planStats; /// /// Controllo mod_planCreate. diff --git a/MP-ADM/WebUserControls/mod_planStats.ascx b/MP-ADM/WebUserControls/cmp_planStats.ascx similarity index 99% rename from MP-ADM/WebUserControls/mod_planStats.ascx rename to MP-ADM/WebUserControls/cmp_planStats.ascx index 36a9f3a6..bf03d6ef 100644 --- a/MP-ADM/WebUserControls/mod_planStats.ascx +++ b/MP-ADM/WebUserControls/cmp_planStats.ascx @@ -1,4 +1,4 @@ -<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="mod_planStats.ascx.cs" Inherits="MP_ADM.WebUserControls.mod_planStats" %> +<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="cmp_planStats.ascx.cs" Inherits="MP_ADM.WebUserControls.cmp_planStats" %> <%@ Register Src="~/WebUserControls/cmp_planStats_Fasi.ascx" TagPrefix="uc1" TagName="cmp_planStats_Fasi" %> <%@ Register Src="~/WebUserControls/cmp_planStats_Mac.ascx" TagPrefix="uc1" TagName="cmp_planStats_Mac" %> <%@ Register Src="~/WebUserControls/cmp_planStats_Art.ascx" TagPrefix="uc1" TagName="cmp_planStats_Art" %> diff --git a/MP-ADM/WebUserControls/mod_planStats.ascx.cs b/MP-ADM/WebUserControls/cmp_planStats.ascx.cs similarity index 98% rename from MP-ADM/WebUserControls/mod_planStats.ascx.cs rename to MP-ADM/WebUserControls/cmp_planStats.ascx.cs index 48f9d8b5..8db4dfbd 100644 --- a/MP-ADM/WebUserControls/mod_planStats.ascx.cs +++ b/MP-ADM/WebUserControls/cmp_planStats.ascx.cs @@ -4,7 +4,7 @@ using System; namespace MP_ADM.WebUserControls { - public partial class mod_planStats : SteamWare.UserControl + public partial class cmp_planStats : SteamWare.UserControl { #region Public Events diff --git a/MP-ADM/WebUserControls/mod_planStats.ascx.designer.cs b/MP-ADM/WebUserControls/cmp_planStats.ascx.designer.cs similarity index 99% rename from MP-ADM/WebUserControls/mod_planStats.ascx.designer.cs rename to MP-ADM/WebUserControls/cmp_planStats.ascx.designer.cs index 046f4a71..be867d2f 100644 --- a/MP-ADM/WebUserControls/mod_planStats.ascx.designer.cs +++ b/MP-ADM/WebUserControls/cmp_planStats.ascx.designer.cs @@ -11,7 +11,7 @@ namespace MP_ADM.WebUserControls { - public partial class mod_planStats + public partial class cmp_planStats { ///