diff --git a/MP-ADM/MP-ADM.csproj b/MP-ADM/MP-ADM.csproj
index cf1c7844..f5343b8f 100644
--- a/MP-ADM/MP-ADM.csproj
+++ b/MP-ADM/MP-ADM.csproj
@@ -600,6 +600,7 @@
+
@@ -935,6 +936,13 @@
cmp_numRow.ascx
+
+ cmp_planSchedule.ascx
+ ASPXCodeBehind
+
+
+ cmp_planSchedule.ascx
+
cmp_planStats_Art.ascx
ASPXCodeBehind
diff --git a/MP-ADM/Planner.aspx b/MP-ADM/Planner.aspx
index 7180c8fe..4ceb4e51 100644
--- a/MP-ADM/Planner.aspx
+++ b/MP-ADM/Planner.aspx
@@ -2,29 +2,13 @@
<%@ Register Src="~/WebUserControls/cmp_planStats.ascx" TagPrefix="uc1" TagName="cmp_planStats" %>
<%@ Register Src="~/WebUserControls/cmp_planApprove.ascx" TagPrefix="uc1" TagName="cmp_planApprove" %>
-<%@ Register Src="~/WebUserControls/cmp_PODL_OUT.ascx" TagPrefix="uc1" TagName="cmp_PODL_OUT" %>
+<%@ Register Src="~/WebUserControls/cmp_planSchedule.ascx" TagPrefix="uc1" TagName="cmp_planSchedule" %>
\ No newline at end of file
diff --git a/MP-ADM/Planner.aspx.cs b/MP-ADM/Planner.aspx.cs
index 4b70f22e..b249cc01 100644
--- a/MP-ADM/Planner.aspx.cs
+++ b/MP-ADM/Planner.aspx.cs
@@ -22,22 +22,34 @@ namespace MP_ADM
}
}
+ private void checkFixPromIn()
+ {
+ // chiama stored x riallineamento prom IN che fossero pending (-10) x chiudere SE processate tutte le prom a valle (promOut con idxODL > 0)
+ DataLayerObj.taPromIn.updProc();
+ }
+
private void Cmp_planApprove_eh_nuovoValore(object sender, EventArgs e)
{
cmp_planStats.doReset();
- cmp_PODL_OUT.resetSelezione();
+ cmp_planSchedule.doReset();
}
private void Cmp_planApprove_eh_resetSelezione(object sender, EventArgs e)
{
cmp_planStats.doReset();
- cmp_PODL_OUT.resetSelezione();
+ cmp_planSchedule.doReset();
}
private void Cmp_planApprove_eh_selValore(object sender, EventArgs e)
{
cmp_planStats.doReset();
- cmp_PODL_OUT.resetSelezione();
+ cmp_planSchedule.doReset();
+ }
+
+ private void cmp_planSchedule_eh_nuovoValore(object sender, EventArgs e)
+ {
+ cmp_planStats.doReset();
+ cmp_planApprove.doUpdate();
}
private void cmp_planStats_eh_reset(object sender, EventArgs e)
@@ -50,18 +62,6 @@ namespace MP_ADM
doRefreshChild();
}
- private void Cmp_PODL_OUT_eh_nuovoValore(object sender, EventArgs e)
- {
- cmp_planStats.doReset();
- cmp_planApprove.doUpdate();
- }
-
- private void toggleVisibility()
- {
- divPromOUT.Visible = !divPromOUT.Visible;
- tgIcon.Attributes["class"] = divPromOUT.Visible ? "fa fa-chevron-up" : "fa fa-chevron-down";
- }
-
#endregion Private Methods
#region Protected Methods
@@ -73,16 +73,11 @@ namespace MP_ADM
cmp_planApprove.CodGruppo = cmp_planStats.CodFase;
cmp_planApprove.IdxMacchina = cmp_planStats.IdxMacchina;
cmp_planApprove.doUpdate();
- cmp_PODL_OUT.CodArticolo = cmp_planStats.CodArticolo;
- cmp_PODL_OUT.CodCliente = cmp_planStats.CodCliente;
- cmp_PODL_OUT.CodGruppo = cmp_planStats.CodFase;
- cmp_PODL_OUT.IdxMacchina = cmp_planStats.IdxMacchina;
- cmp_PODL_OUT.doUpdate();
- }
-
- protected void lbtToggle_Click(object sender, EventArgs e)
- {
- toggleVisibility();
+ cmp_planSchedule.CodArticolo = cmp_planStats.CodArticolo;
+ cmp_planSchedule.CodCliente = cmp_planStats.CodCliente;
+ cmp_planSchedule.CodFase = cmp_planStats.CodFase;
+ cmp_planSchedule.IdxMacchina = cmp_planStats.IdxMacchina;
+ cmp_planSchedule.doUpdate();
}
protected void Page_Load(object sender, EventArgs e)
@@ -90,7 +85,6 @@ namespace MP_ADM
if (!Page.IsPostBack)
{
checkFixPromIn();
- toggleVisibility();
}
checkEnabled();
string codPre = memLayer.ML.CRS("OptAdmKit_CodPre");
@@ -99,13 +93,7 @@ namespace MP_ADM
cmp_planApprove.eh_resetSelezione += Cmp_planApprove_eh_resetSelezione;
cmp_planApprove.eh_selValore += Cmp_planApprove_eh_selValore;
cmp_planApprove.eh_nuovoValore += Cmp_planApprove_eh_nuovoValore;
- cmp_PODL_OUT.eh_nuovoValore += Cmp_PODL_OUT_eh_nuovoValore;
- }
-
- private void checkFixPromIn()
- {
- // chiama stored x riallineamento prom IN che fossero pending (-10) x chiudere SE processate tutte le prom a valle (promOut con idxODL > 0)
- DataLayerObj.taPromIn.updProc();
+ cmp_planSchedule.eh_nuovoValore += cmp_planSchedule_eh_nuovoValore;
}
#endregion Protected Methods
diff --git a/MP-ADM/Planner.aspx.designer.cs b/MP-ADM/Planner.aspx.designer.cs
index f69c71a1..dabd21e7 100644
--- a/MP-ADM/Planner.aspx.designer.cs
+++ b/MP-ADM/Planner.aspx.designer.cs
@@ -51,39 +51,12 @@ namespace MP_ADM
protected global::MP_ADM.WebUserControls.cmp_planApprove cmp_planApprove;
///
- /// Controllo lbtToggle.
+ /// Controllo cmp_planSchedule.
///
///
/// Campo generato automaticamente.
/// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
///
- protected global::System.Web.UI.WebControls.LinkButton lbtToggle;
-
- ///
- /// Controllo tgIcon.
- ///
- ///
- /// Campo generato automaticamente.
- /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
- ///
- protected global::System.Web.UI.HtmlControls.HtmlGenericControl tgIcon;
-
- ///
- /// Controllo divPromOUT.
- ///
- ///
- /// Campo generato automaticamente.
- /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
- ///
- protected global::System.Web.UI.HtmlControls.HtmlGenericControl divPromOUT;
-
- ///
- /// Controllo cmp_PODL_OUT.
- ///
- ///
- /// Campo generato automaticamente.
- /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
- ///
- protected global::MP_ADM.WebUserControls.cmp_PODL_OUT cmp_PODL_OUT;
+ protected global::MP_ADM.WebUserControls.cmp_planSchedule cmp_planSchedule;
}
}
diff --git a/MP-MON/Web.config b/MP-MON/Web.config
index 560b989e..2fa0631d 100644
--- a/MP-MON/Web.config
+++ b/MP-MON/Web.config
@@ -6,384 +6,384 @@
-
+
-
-
-
-
+
+
+
+
-
-
-
+
+
+
-
-
-
-
-
+
+
+
+
+
-
-
-
-
+
+
+
+
-
+
-
-
+
+
-
-
+
+
-
+
-
+
-
-
+
+
-
+
-
+
-
-
-
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
+
+
+
+
+
-
-
-
-
-
-
+
+
+
+
+
+
-
-
-
-
+
+
+
+
-
+
-
+
-
+
-
+