From e16d3001e25e989e832c5a4adc7d7ead361788ee Mon Sep 17 00:00:00 2001 From: Samuele Locatelli Date: Wed, 23 Apr 2025 19:22:46 +0200 Subject: [PATCH] Esteso gestione controlli abilitazione buttons per CSV man e disabilitazione in history page --- NKC_WF/WebUserControls/cmp_batchDetail.ascx | 3 +- .../WebUserControls/cmp_batchDetail.ascx.cs | 19 +++++- .../cmp_batchDetail.ascx.designer.cs | 9 +++ .../WebUserControls/cmp_batchDetailSplit.ascx | 33 +++++----- .../cmp_batchDetailSplit.ascx.cs | 60 ++++++++++++------- .../cmp_batchDetailSplit.ascx.designer.cs | 9 +++ NKC_WF/WebUserControls/cmp_batchList.ascx | 2 +- NKC_WF/site/OrderHistory.aspx | 2 +- 8 files changed, 93 insertions(+), 44 deletions(-) diff --git a/NKC_WF/WebUserControls/cmp_batchDetail.ascx b/NKC_WF/WebUserControls/cmp_batchDetail.ascx index 8878989..de453af 100644 --- a/NKC_WF/WebUserControls/cmp_batchDetail.ascx +++ b/NKC_WF/WebUserControls/cmp_batchDetail.ascx @@ -75,6 +75,7 @@ + @@ -84,4 +85,4 @@
-
\ No newline at end of file + diff --git a/NKC_WF/WebUserControls/cmp_batchDetail.ascx.cs b/NKC_WF/WebUserControls/cmp_batchDetail.ascx.cs index 095b002..65485b0 100644 --- a/NKC_WF/WebUserControls/cmp_batchDetail.ascx.cs +++ b/NKC_WF/WebUserControls/cmp_batchDetail.ascx.cs @@ -33,7 +33,17 @@ namespace NKC_WF.WebUserControls /// /// Abilitazione azioni button-based /// - public bool BtnActEnab { get; set; } = true; + public bool BtnActEnab + { + get + { + return chkActEnab.Checked; + } + set + { + chkActEnab.Checked = value; + } + } /// /// verifica possibilità avvio TASK x presenza task NON chiusi @@ -162,7 +172,7 @@ namespace NKC_WF.WebUserControls DLMan.taEL.deteteByParent("", bRow.EnvNum); // cerco se ci siano batch descendant... var childBatch = DLMan.taBL.getDescendByKey(BatchId); - if(childBatch!=null && childBatch.Count>0) + if (childBatch != null && childBatch.Count > 0) { foreach (var item in childBatch) { @@ -286,6 +296,11 @@ namespace NKC_WF.WebUserControls protected void Page_Load(object sender, EventArgs e) { + if (!Page.IsPostBack) + { + // sistemo buttons + cmp_batchDetailSplit.BtnEnabled = BtnActEnab; + } cmp_batchDetailSplit.eh_doReset += Cmp_batchDetailSplit_eh_doReset; } diff --git a/NKC_WF/WebUserControls/cmp_batchDetail.ascx.designer.cs b/NKC_WF/WebUserControls/cmp_batchDetail.ascx.designer.cs index 6b0df7d..d5a7955 100644 --- a/NKC_WF/WebUserControls/cmp_batchDetail.ascx.designer.cs +++ b/NKC_WF/WebUserControls/cmp_batchDetail.ascx.designer.cs @@ -23,6 +23,15 @@ namespace NKC_WF.WebUserControls /// protected global::System.Web.UI.WebControls.FormView frmView; + /// + /// chkActEnab control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.CheckBox chkActEnab; + /// /// hfBatchId control. /// diff --git a/NKC_WF/WebUserControls/cmp_batchDetailSplit.ascx b/NKC_WF/WebUserControls/cmp_batchDetailSplit.ascx index c37715b..935cb25 100644 --- a/NKC_WF/WebUserControls/cmp_batchDetailSplit.ascx +++ b/NKC_WF/WebUserControls/cmp_batchDetailSplit.ascx @@ -14,9 +14,10 @@
Split Needed? +
- + <%: traduci("BatchSplit") %>
@@ -41,7 +42,7 @@
- + NE01 @@ -51,13 +52,13 @@
- - + +
- - + +
@@ -74,7 +75,7 @@
- + NE02 @@ -84,13 +85,13 @@
- - + +
- - + +
@@ -107,7 +108,7 @@
- + NE03 @@ -117,13 +118,13 @@
- - + +
- - + +
diff --git a/NKC_WF/WebUserControls/cmp_batchDetailSplit.ascx.cs b/NKC_WF/WebUserControls/cmp_batchDetailSplit.ascx.cs index 5eb9b65..d1ed762 100644 --- a/NKC_WF/WebUserControls/cmp_batchDetailSplit.ascx.cs +++ b/NKC_WF/WebUserControls/cmp_batchDetailSplit.ascx.cs @@ -44,7 +44,17 @@ namespace NKC_WF.WebUserControls /// /// Abilitazione azioni button-based /// - public bool BtnEnabled { get; set; } = true; + public bool BtnEnabled + { + get + { + return chkActEnab.Checked; + } + set + { + chkActEnab.Checked = value; + } + } public bool isSplitted { @@ -618,7 +628,7 @@ namespace NKC_WF.WebUserControls ///
private void checkDisplayMode() { - var splitEnab = (BatchIsAncestor && CurrBatchStatus <= BatchStatus.EstimationDone && numEnabled > 0); + var splitEnab = BtnEnabled && (BatchIsAncestor && CurrBatchStatus <= BatchStatus.EstimationDone && numEnabled > 0); // se non suddiviso --> indico rosso! double tmpTime = totTime01 + totTime02 + totTime03; string baseCssClass = "btn btn-success btn-block"; @@ -707,31 +717,35 @@ namespace NKC_WF.WebUserControls private void fixEnabled() { + lbtToggle01.Enabled = BtnEnabled; + lbtToggle02.Enabled = BtnEnabled; + lbtToggle03.Enabled = BtnEnabled; lblWarnChange.Visible = enabIsChanged; - lbtToggle01.CssClass = enable01 ? "btn btn-sm btn-primary" : "btn btn-sm btn-secondary"; - lbtToggle02.CssClass = enable02 ? "btn btn-sm btn-primary" : "btn btn-sm btn-secondary"; - lbtToggle03.CssClass = enable03 ? "btn btn-sm btn-primary" : "btn btn-sm btn-secondary"; - lbtOrdAdd01.CssClass = movEnabled && enable01 ? "btn btn-success px-3" : "btn btn-secondary px-3 disabled"; - lbtOrdAdd02.CssClass = movEnabled && enable02 ? "btn btn-success px-3" : "btn btn-secondary px-3 disabled"; - lbtOrdAdd03.CssClass = movEnabled && enable03 ? "btn btn-success px-3" : "btn btn-secondary px-3 disabled"; - lbtOrdRem01.CssClass = movEnabled && enable01 ? "btn btn-danger px-3" : "btn btn-secondary px-3 disabled"; - lbtOrdRem02.CssClass = movEnabled && enable02 ? "btn btn-danger px-3" : "btn btn-secondary px-3 disabled"; - lbtOrdRem03.CssClass = movEnabled && enable03 ? "btn btn-danger px-3" : "btn btn-secondary px-3 disabled"; - lbtOrdRemAll01.CssClass = movEnabled && enable01 ? "btn btn-primary" : "btn btn-secondary disabled"; - lbtOrdRemAll02.CssClass = movEnabled && enable02 ? "btn btn-primary" : "btn btn-secondary disabled"; - lbtOrdRemAll03.CssClass = movEnabled && enable03 ? "btn btn-primary" : "btn btn-secondary disabled"; - lbtOrdAddAll01.CssClass = movEnabled && enable01 ? "btn btn-primary" : "btn btn-secondary disabled"; - lbtOrdAddAll02.CssClass = movEnabled && enable02 ? "btn btn-primary" : "btn btn-secondary disabled"; - lbtOrdAddAll03.CssClass = movEnabled && enable03 ? "btn btn-primary" : "btn btn-secondary disabled"; - cmp_orderExtListNE01.enableMove = enable01 && movEnabled; - cmp_orderExtListNE02.enableMove = enable02 && movEnabled; - cmp_orderExtListNE03.enableMove = enable03 && movEnabled; + string secCss = BtnEnabled ? "btn btn-sm btn-secondary" : "btn btn-sm btn-secondary disabled"; + lbtToggle01.CssClass = BtnEnabled && enable01 ? "btn btn-sm btn-primary" : secCss; + lbtToggle02.CssClass = BtnEnabled && enable02 ? "btn btn-sm btn-primary" : secCss; + lbtToggle03.CssClass = BtnEnabled && enable03 ? "btn btn-sm btn-primary" : secCss; + lbtOrdAdd01.CssClass = BtnEnabled && movEnabled && enable01 ? "btn btn-success px-3" : "btn btn-secondary px-3 disabled"; + lbtOrdAdd02.CssClass = BtnEnabled && movEnabled && enable02 ? "btn btn-success px-3" : "btn btn-secondary px-3 disabled"; + lbtOrdAdd03.CssClass = BtnEnabled && movEnabled && enable03 ? "btn btn-success px-3" : "btn btn-secondary px-3 disabled"; + lbtOrdRem01.CssClass = BtnEnabled && movEnabled && enable01 ? "btn btn-danger px-3" : "btn btn-secondary px-3 disabled"; + lbtOrdRem02.CssClass = BtnEnabled && movEnabled && enable02 ? "btn btn-danger px-3" : "btn btn-secondary px-3 disabled"; + lbtOrdRem03.CssClass = BtnEnabled && movEnabled && enable03 ? "btn btn-danger px-3" : "btn btn-secondary px-3 disabled"; + lbtOrdRemAll01.CssClass = BtnEnabled && movEnabled && enable01 ? "btn btn-primary" : "btn btn-secondary disabled"; + lbtOrdRemAll02.CssClass = BtnEnabled && movEnabled && enable02 ? "btn btn-primary" : "btn btn-secondary disabled"; + lbtOrdRemAll03.CssClass = BtnEnabled && movEnabled && enable03 ? "btn btn-primary" : "btn btn-secondary disabled"; + lbtOrdAddAll01.CssClass = BtnEnabled && movEnabled && enable01 ? "btn btn-primary" : "btn btn-secondary disabled"; + lbtOrdAddAll02.CssClass = BtnEnabled && movEnabled && enable02 ? "btn btn-primary" : "btn btn-secondary disabled"; + lbtOrdAddAll03.CssClass = BtnEnabled && movEnabled && enable03 ? "btn btn-primary" : "btn btn-secondary disabled"; + cmp_orderExtListNE01.enableMove = BtnEnabled && enable01 && movEnabled; + cmp_orderExtListNE02.enableMove = BtnEnabled && enable02 && movEnabled; + cmp_orderExtListNE03.enableMove = BtnEnabled && enable03 && movEnabled; divHeadNe01.Attributes.Remove("class"); divHeadNe02.Attributes.Remove("class"); divHeadNe03.Attributes.Remove("class"); - divHeadNe01.Attributes.Add("class", enable01 ? "card-header bg-dark text-light py-1" : "card-header py-1"); - divHeadNe02.Attributes.Add("class", enable02 ? "card-header bg-dark text-light py-1" : "card-header py-1"); - divHeadNe03.Attributes.Add("class", enable03 ? "card-header bg-dark text-light py-1" : "card-header py-1"); + divHeadNe01.Attributes.Add("class", BtnEnabled && enable01 ? "card-header bg-dark text-light py-1" : "card-header py-1"); + divHeadNe02.Attributes.Add("class", BtnEnabled && enable02 ? "card-header bg-dark text-light py-1" : "card-header py-1"); + divHeadNe03.Attributes.Add("class", BtnEnabled && enable03 ? "card-header bg-dark text-light py-1" : "card-header py-1"); } private void fixRatio() diff --git a/NKC_WF/WebUserControls/cmp_batchDetailSplit.ascx.designer.cs b/NKC_WF/WebUserControls/cmp_batchDetailSplit.ascx.designer.cs index 5e66d14..c255556 100644 --- a/NKC_WF/WebUserControls/cmp_batchDetailSplit.ascx.designer.cs +++ b/NKC_WF/WebUserControls/cmp_batchDetailSplit.ascx.designer.cs @@ -86,6 +86,15 @@ namespace NKC_WF.WebUserControls /// protected global::System.Web.UI.WebControls.Label lblWarnChange; + /// + /// chkActEnab control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.CheckBox chkActEnab; + /// /// lbtBalance control. /// diff --git a/NKC_WF/WebUserControls/cmp_batchList.ascx b/NKC_WF/WebUserControls/cmp_batchList.ascx index bc625ac..f9b00ad 100644 --- a/NKC_WF/WebUserControls/cmp_batchList.ascx +++ b/NKC_WF/WebUserControls/cmp_batchList.ascx @@ -4,7 +4,7 @@ - +
diff --git a/NKC_WF/site/OrderHistory.aspx b/NKC_WF/site/OrderHistory.aspx index e43aeda..8dd5a2f 100644 --- a/NKC_WF/site/OrderHistory.aspx +++ b/NKC_WF/site/OrderHistory.aspx @@ -1,4 +1,4 @@ -<%@ Page Title="" Language="C#" MasterPageFile="~/SiteContent.master" AutoEventWireup="true" CodeBehind="OrderHistory.aspx.cs" Inherits="NKC_WF.site.OrderHistory" %> +<%@ Page Title="" Language="C#" MasterPageFile="~/Site.master" AutoEventWireup="true" CodeBehind="OrderHistory.aspx.cs" Inherits="NKC_WF.site.OrderHistory" %> <%@ Register Src="~/WebUserControls/cmp_batchList.ascx" TagPrefix="uc1" TagName="cmp_batchList" %>