From 8bfbe7b2f58d32ae540bcde6557bc3c9124aef32 Mon Sep 17 00:00:00 2001 From: "Samuele E. Locatelli" Date: Sat, 23 Jan 2021 09:45:08 +0100 Subject: [PATCH] fix selezione approvazione --- MP-ADM/BaseUserControl.cs | 9 + MP-ADM/Planner.aspx.cs | 23 +- MP-ADM/WebUserControls/cmp_planApprove.ascx | 304 ++++++++++-------- .../WebUserControls/cmp_planApprove.ascx.cs | 15 +- .../cmp_planApprove.ascx.designer.cs | 18 +- 5 files changed, 198 insertions(+), 171 deletions(-) diff --git a/MP-ADM/BaseUserControl.cs b/MP-ADM/BaseUserControl.cs index f9161331..dcd38e18 100644 --- a/MP-ADM/BaseUserControl.cs +++ b/MP-ADM/BaseUserControl.cs @@ -174,6 +174,15 @@ namespace MP_ADM return answ; } + public string min2hour(object minutes) + { + string answ = ""; + double minDbl = 0; + double.TryParse($"{minutes}", out minDbl); + answ = $"{minDbl / 60:N2}"; + return answ; + } + /// /// formatta in minuti/sec partendo da min.cent /// diff --git a/MP-ADM/Planner.aspx.cs b/MP-ADM/Planner.aspx.cs index 5c267dc4..1259caf4 100644 --- a/MP-ADM/Planner.aspx.cs +++ b/MP-ADM/Planner.aspx.cs @@ -20,20 +20,16 @@ namespace MP_ADM } } - private void cmp_planApprove_eh_ucev(object sender, EventArgs e) + private void Cmp_planApprove_eh_resetSelezione(object sender, EventArgs e) { - // se trovo evento select/reset mostro/nascondo dettagli... - ucEvent evento = (ucEvent)e; - switch (evento.tipoEvento) - { - case ucEvType.ReqUpdateParent: - cmp_planStats.doReset(); - mod_gestPromODL_OUT.resetSelezione(); - break; + cmp_planStats.doReset(); + mod_gestPromODL_OUT.resetSelezione(); + } - default: - break; - } + private void Cmp_planApprove_eh_selValore(object sender, EventArgs e) + { + cmp_planStats.doReset(); + mod_gestPromODL_OUT.resetSelezione(); } private void cmp_planStats_eh_reset(object sender, EventArgs e) @@ -80,7 +76,8 @@ namespace MP_ADM string codPre = memLayer.ML.CRS("OptAdmKit_CodPre"); cmp_planStats.eh_reset += cmp_planStats_eh_reset; cmp_planStats.eh_selVal += cmp_planStats_eh_selVal; - cmp_planApprove.eh_ucev += cmp_planApprove_eh_ucev; + cmp_planApprove.eh_resetSelezione += Cmp_planApprove_eh_resetSelezione; + cmp_planApprove.eh_selValore += Cmp_planApprove_eh_selValore; } #endregion Protected Methods diff --git a/MP-ADM/WebUserControls/cmp_planApprove.ascx b/MP-ADM/WebUserControls/cmp_planApprove.ascx index abf78da9..a9d99751 100644 --- a/MP-ADM/WebUserControls/cmp_planApprove.ascx +++ b/MP-ADM/WebUserControls/cmp_planApprove.ascx @@ -2,177 +2,197 @@ <%@ Register Src="~/WebUserControls/cmp_numRow.ascx" TagPrefix="uc1" TagName="cmp_numRow" %>
-
-
- - - - -
-
-
-
-
Da Confermare
-
-
-
-
-
-
Tot PEZZI (num)
-
- - -
+
+ + + + +
+
+
+
+
Approvazione
+
+
+
+
+
+
Tot PEZZI (num)
+
+ +
-
-
-
Tot Tempo (ore)
-
- -
+
+
+
+
Tot Tempo (ore)
+
+
-
- -
+
+
+
-
-
-
- - - - - - - - - - - - - - - - -
-
- +
+
+
+
+
+
+
Selezione
+
+
+ + + + + + + + + + + + + + + + +
+
+ +
+
+ +
-
- -
-
- - - - - - - - - -
-
- -
-
- cod. + + + + + + + + + +
+
+ +
+
+ cod. +
+
+ +
-
- + + + + + + +
+ +
+ +
-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + <%-- + --%> + + + + + <%-- + + --%> + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - + + + + + + + + + + + + + +
+
+ +
-
-
- +
+
+
+
+
Comandi
+
+
+
+ APPROVA e PIANIFICA
approvazione e pianificazione richieste selezionate
- -
-
-
- Macchina - - - - - - - +
- +
+
+ Macchina + + + + + + + +
+ RAGGRUPPA SELEZIONATE
Creazione nuovo ordine raggruppato dalle richieste e quantità selezionate
- -
-
- <%--SPLIT RICHIESTA + +
+
+ <%--SPLIT RICHIESTA ...con split deve chiedere NUM PEZZI e va a creare promessa splittata approvata (lasciando il rimanente "a monte" da approvare e/o splittare...--%> +
-
- -
diff --git a/MP-ADM/WebUserControls/cmp_planApprove.ascx.cs b/MP-ADM/WebUserControls/cmp_planApprove.ascx.cs index 8be8e959..a72eeb48 100644 --- a/MP-ADM/WebUserControls/cmp_planApprove.ascx.cs +++ b/MP-ADM/WebUserControls/cmp_planApprove.ascx.cs @@ -7,7 +7,7 @@ using System.Web.UI.WebControls; namespace MP_ADM.WebUserControls { - public partial class cmp_planApprove : SteamWare.UserControl + public partial class cmp_planApprove : BaseUserControl { #region Private Fields @@ -140,15 +140,16 @@ namespace MP_ADM.WebUserControls lblOreTot.Text = $"{tempoMinTot / 60:N2}"; // controllo SE abilitare il crea gruppo o split... divSplitOdl.Visible = numOrd == 1; - divConfirm.Visible = numOrd > 0; + divCmd.Visible = numOrd > 0; + //divConfirm.Visible = numOrd > 0; divCreaGrp.Visible = (numOrd > 1) && (ElArticoli.Count == 1) && CodGruppo != ""; // sistemo dimensione div divData.Attributes.Remove("class"); divCmd.Attributes.Remove("class"); - if (divConfirm.Visible) + if (divCmd.Visible) { - divData.Attributes.Add("class", "col-9"); - divCmd.Attributes.Add("class", "col-3"); + divData.Attributes.Add("class", "col-9 pr-1"); + divCmd.Attributes.Add("class", "col-3 pl-1"); } else { @@ -167,7 +168,7 @@ namespace MP_ADM.WebUserControls { grView.SelectedIndex = -1; grView.DataBind(); - raiseEvent(SteamWare.ucEvType.Reset); + raiseReset(); } private void reportUpdate() @@ -176,7 +177,7 @@ namespace MP_ADM.WebUserControls grView.SelectedIndex = -1; grView.DataBind(); // segnalo update - raiseEvent(SteamWare.ucEvType.ReqUpdateParent); + raiseSelNew(); } private void toggleVisibility() diff --git a/MP-ADM/WebUserControls/cmp_planApprove.ascx.designer.cs b/MP-ADM/WebUserControls/cmp_planApprove.ascx.designer.cs index 1b8c7b5b..8e6f18f8 100644 --- a/MP-ADM/WebUserControls/cmp_planApprove.ascx.designer.cs +++ b/MP-ADM/WebUserControls/cmp_planApprove.ascx.designer.cs @@ -131,6 +131,15 @@ namespace MP_ADM.WebUserControls /// protected global::System.Web.UI.WebControls.ObjectDataSource odsPromIN; + /// + /// Controllo cmp_numRow. + /// + /// + /// 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_numRow cmp_numRow; + /// /// Controllo divCmd. /// @@ -202,14 +211,5 @@ namespace MP_ADM.WebUserControls /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. /// protected global::System.Web.UI.HtmlControls.HtmlGenericControl divSplitOdl; - - /// - /// Controllo cmp_numRow. - /// - /// - /// 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_numRow cmp_numRow; } }