Egalware/NKC
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'release/AddHistorySelectDetail_02'

Browse Source
This commit is contained in:
Samuele Locatelli
2025-04-23 19:23:56 +02:00
parent 3da5992cbb e16d3001e2
commit 25885bbf4c
8 changed files with 93 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files
NKC_WF/WebUserControls/cmp_batchDetail.ascx
+2 -1
View File
@@ -75,6 +75,7 @@
</div>
</ItemTemplate>
</asp:FormView>
<asp:CheckBox runat="server" ID="chkActEnab" Checked="true" Visible="false" />
<asp:HiddenField ID="hfBatchId" runat="server" />
<asp:ObjectDataSource ID="ods" runat="server" OldValuesParameterFormatString="original_{0}" SelectMethod="getByKey" TypeName="AppData.DS_AppTableAdapters.BatchListTableAdapter">
<SelectParameters>
@@ -84,4 +85,4 @@
<uc1:cmp_batchDetailMongo runat="server" ID="cmp_batchDetailMongo" showInline="true" />
<div runat="server" id="divSplit">
<uc1:cmp_batchDetailSplit runat="server" ID="cmp_batchDetailSplit" BtnEnabled='<%# BtnActEnab %>' />
</div>
</div>
NKC_WF/WebUserControls/cmp_batchDetail.ascx.cs
+17 -2
View File
@@ -33,7 +33,17 @@ namespace NKC_WF.WebUserControls
/// <summary>
/// Abilitazione azioni button-based
/// </summary>
public bool BtnActEnab { get; set; } = true;
public bool BtnActEnab
{
get
{
return chkActEnab.Checked;
}
set
{
chkActEnab.Checked = value;
}
}
/// <summary>
/// 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;
}
NKC_WF/WebUserControls/cmp_batchDetail.ascx.designer.cs
Generated
+9
View File
@@ -23,6 +23,15 @@ namespace NKC_WF.WebUserControls
/// </remarks>
protected global::System.Web.UI.WebControls.FormView frmView;
/// <summary>
/// chkActEnab control.
/// </summary>
/// <remarks>
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::System.Web.UI.WebControls.CheckBox chkActEnab;
/// <summary>
/// hfBatchId control.
/// </summary>
NKC_WF/WebUserControls/cmp_batchDetailSplit.ascx
+17 -16
View File
@@ -14,9 +14,10 @@
<div class="row">
<div class="col-4">
<asp:Label runat="server" ID="lblWarnChange" Visible='<%# enabIsChanged %>'><i class="fa fa-exclamation-triangle fa-2x text-warning" aria-hidden="true"></i> Split Needed?</asp:Label>
<asp:CheckBox runat="server" ID="chkActEnab" Checked="true" Visible="false" />
</div>
<div class="col-4">
<asp:LinkButton runat="server" ID="lbtBalance" CssClass="btn btn-success btn-block" OnClick="lbtBalance_Click" ToolTip="Balance on active Machines" Visible='<%# BtnEnabled %>'>
<asp:LinkButton runat="server" ID="lbtBalance" CssClass="btn btn-success btn-block" OnClick="lbtBalance_Click" ToolTip="Balance on active Machines">
<b><%: traduci("BatchSplit") %></b> <i class="fa fa-balance-scale" aria-hidden="true"></i>
</asp:LinkButton>
</div>
@@ -41,7 +42,7 @@
<div runat="server" id="divHeadNe01" class="card-header py-1">
<div class="row">
<div class="col-6 text-left">
<asp:LinkButton runat="server" ID="lbtToggle01" CssClass="btn btn-sm btn-dark" OnClick="lbtToggle01_Click" Visible='<%# BtnEnabled %>'>
<asp:LinkButton runat="server" ID="lbtToggle01" CssClass="btn btn-sm btn-dark" OnClick="lbtToggle01_Click">
<b>NE01</b>
</asp:LinkButton>
<asp:Label runat="server" ID="lblTime01" />
@@ -51,13 +52,13 @@
<div class="col-6 text-right">
<div class="input-group input-group-sm">
<div class="input-group-prepend">
<asp:LinkButton runat="server" ID="lbtOrdRemAll01" CssClass="btn btn-danger" OnClick="lbtOrdRemAll_Click" CommandArgument="NE01" ToolTip="Remove All"><i class="fa fa-star-o" aria-hidden="true" Visible='<%# BtnEnabled %>'></i></asp:LinkButton>
<asp:LinkButton runat="server" ID="lbtOrdRem01" CssClass="btn btn-dark" OnClick="lbtOrdRem_Click" CommandArgument="NE01" ToolTip="Remove 1"><i class="fa fa-minus" aria-hidden="true" Visible='<%# BtnEnabled %>'></i></asp:LinkButton>
<asp:LinkButton runat="server" ID="lbtOrdRemAll01" CssClass="btn btn-danger" OnClick="lbtOrdRemAll_Click" CommandArgument="NE01" ToolTip="Remove All"><i class="fa fa-star-o" aria-hidden="true"></i></asp:LinkButton>
<asp:LinkButton runat="server" ID="lbtOrdRem01" CssClass="btn btn-dark" OnClick="lbtOrdRem_Click" CommandArgument="NE01" ToolTip="Remove 1"><i class="fa fa-minus" aria-hidden="true"></i></asp:LinkButton>
</div>
<asp:Label runat="server" ID="lblRat01" CssClass="form-control text-right"></asp:Label>
<div class="input-group-append">
<asp:LinkButton runat="server" ID="lbtOrdAdd01" CssClass="btn btn-dark" OnClick="lbtOrdAdd_Click" CommandArgument="NE01" ToolTip="Add 1"><i class="fa fa-plus" aria-hidden="true" Visible='<%# BtnEnabled %>'></i></asp:LinkButton>
<asp:LinkButton runat="server" ID="lbtOrdAddAll01" CssClass="btn btn-success" OnClick="lbtOrdAddAll_Click" CommandArgument="NE01" ToolTip="Add All"><i class="fa fa-star" aria-hidden="true" Visible='<%# BtnEnabled %>'></i></asp:LinkButton>
<asp:LinkButton runat="server" ID="lbtOrdAdd01" CssClass="btn btn-dark" OnClick="lbtOrdAdd_Click" CommandArgument="NE01" ToolTip="Add 1"><i class="fa fa-plus" aria-hidden="true"></i></asp:LinkButton>
<asp:LinkButton runat="server" ID="lbtOrdAddAll01" CssClass="btn btn-success" OnClick="lbtOrdAddAll_Click" CommandArgument="NE01" ToolTip="Add All"><i class="fa fa-star" aria-hidden="true" ></i></asp:LinkButton>
</div>
</div>
</div>
@@ -74,7 +75,7 @@
<div runat="server" id="divHeadNe02" class="card-header py-1">
<div class="row">
<div class="col-6 text-left">
<asp:LinkButton runat="server" ID="lbtToggle02" CssClass="btn btn-sm btn-dark" OnClick="lbtToggle02_Click" Visible='<%# BtnEnabled %>'>
<asp:LinkButton runat="server" ID="lbtToggle02" CssClass="btn btn-sm btn-dark" OnClick="lbtToggle02_Click">
<b>NE02</b>
</asp:LinkButton>
<asp:Label runat="server" ID="lblTime02" />
@@ -84,13 +85,13 @@
<div class="col-6">
<div class="input-group input-group-sm">
<div class="input-group-prepend">
<asp:LinkButton runat="server" ID="lbtOrdRemAll02" CssClass="btn btn-danger" OnClick="lbtOrdRemAll_Click" CommandArgument="NE02" ToolTip="Remove All"><i class="fa fa-star-o" aria-hidden="true" Visible='<%# BtnEnabled %>'></i></asp:LinkButton>
<asp:LinkButton runat="server" ID="lbtOrdRem02" CssClass="btn btn-dark" OnClick="lbtOrdRem_Click" CommandArgument="NE02" ToolTip="Remove 1"><i class="fa fa-minus" aria-hidden="true" Visible='<%# BtnEnabled %>'></i></asp:LinkButton>
<asp:LinkButton runat="server" ID="lbtOrdRemAll02" CssClass="btn btn-danger" OnClick="lbtOrdRemAll_Click" CommandArgument="NE02" ToolTip="Remove All"><i class="fa fa-star-o" aria-hidden="true"></i></asp:LinkButton>
<asp:LinkButton runat="server" ID="lbtOrdRem02" CssClass="btn btn-dark" OnClick="lbtOrdRem_Click" CommandArgument="NE02" ToolTip="Remove 1"><i class="fa fa-minus" aria-hidden="true"></i></asp:LinkButton>
</div>
<asp:Label runat="server" ID="lblRat02" TextMode="Number" CssClass="form-control text-right"></asp:Label>
<div class="input-group-append">
<asp:LinkButton runat="server" ID="lbtOrdAdd02" CssClass="btn btn-dark" OnClick="lbtOrdAdd_Click" CommandArgument="NE02" ToolTip="Add 1"><i class="fa fa-plus" aria-hidden="true" Visible='<%# BtnEnabled %>'></i></asp:LinkButton>
<asp:LinkButton runat="server" ID="lbtOrdAddAll02" CssClass="btn btn-success" OnClick="lbtOrdAddAll_Click" CommandArgument="NE02" ToolTip="Add All"><i class="fa fa-star" aria-hidden="true" Visible='<%# BtnEnabled %>'></i></asp:LinkButton>
<asp:LinkButton runat="server" ID="lbtOrdAdd02" CssClass="btn btn-dark" OnClick="lbtOrdAdd_Click" CommandArgument="NE02" ToolTip="Add 1"><i class="fa fa-plus" aria-hidden="true"></i></asp:LinkButton>
<asp:LinkButton runat="server" ID="lbtOrdAddAll02" CssClass="btn btn-success" OnClick="lbtOrdAddAll_Click" CommandArgument="NE02" ToolTip="Add All"><i class="fa fa-star" aria-hidden="true"></i></asp:LinkButton>
</div>
</div>
</div>
@@ -107,7 +108,7 @@
<div runat="server" id="divHeadNe03" class="card-header py-1">
<div class="row">
<div class="col-6 text-left">
<asp:LinkButton runat="server" ID="lbtToggle03" CssClass="btn btn-sm btn-dark" OnClick="lbtToggle03_Click" Visible='<%# BtnEnabled %>'>
<asp:LinkButton runat="server" ID="lbtToggle03" CssClass="btn btn-sm btn-dark" OnClick="lbtToggle03_Click">
<b>NE03</b>
</asp:LinkButton>
<asp:Label runat="server" ID="lblTime03" />
@@ -117,13 +118,13 @@
<div class="col-6">
<div class="input-group input-group-sm">
<div class="input-group-prepend">
<asp:LinkButton runat="server" ID="lbtOrdRemAll03" CssClass="btn btn-danger" OnClick="lbtOrdRemAll_Click" CommandArgument="NE03" ToolTip="Remove All"><i class="fa fa-star-o" aria-hidden="true" Visible='<%# BtnEnabled %>'></i></asp:LinkButton>
<asp:LinkButton runat="server" ID="lbtOrdRem03" CssClass="btn btn-dark" OnClick="lbtOrdRem_Click" CommandArgument="NE03" ToolTip="Remove 1"><i class="fa fa-minus" aria-hidden="true" Visible='<%# BtnEnabled %>'></i></asp:LinkButton>
<asp:LinkButton runat="server" ID="lbtOrdRemAll03" CssClass="btn btn-danger" OnClick="lbtOrdRemAll_Click" CommandArgument="NE03" ToolTip="Remove All"><i class="fa fa-star-o" aria-hidden="true"></i></asp:LinkButton>
<asp:LinkButton runat="server" ID="lbtOrdRem03" CssClass="btn btn-dark" OnClick="lbtOrdRem_Click" CommandArgument="NE03" ToolTip="Remove 1"><i class="fa fa-minus" aria-hidden="true"></i></asp:LinkButton>
</div>
<asp:Label runat="server" ID="lblRat03" TextMode="Number" CssClass="form-control text-right"></asp:Label>
<div class="input-group-append">
<asp:LinkButton runat="server" ID="lbtOrdAdd03" CssClass="btn btn-dark" OnClick="lbtOrdAdd_Click" CommandArgument="NE03" ToolTip="Add 1"><i class="fa fa-plus" aria-hidden="true" Visible='<%# BtnEnabled %>'></i></asp:LinkButton>
<asp:LinkButton runat="server" ID="lbtOrdAddAll03" CssClass="btn btn-success" OnClick="lbtOrdAddAll_Click" CommandArgument="NE03" ToolTip="Add All"><i class="fa fa-star" aria-hidden="true" Visible='<%# BtnEnabled %>'></i></asp:LinkButton>
<asp:LinkButton runat="server" ID="lbtOrdAdd03" CssClass="btn btn-dark" OnClick="lbtOrdAdd_Click" CommandArgument="NE03" ToolTip="Add 1"><i class="fa fa-plus" aria-hidden="true"></i></asp:LinkButton>
<asp:LinkButton runat="server" ID="lbtOrdAddAll03" CssClass="btn btn-success" OnClick="lbtOrdAddAll_Click" CommandArgument="NE03" ToolTip="Add All"><i class="fa fa-star" aria-hidden="true"></i></asp:LinkButton>
</div>
</div>
</div>
NKC_WF/WebUserControls/cmp_batchDetailSplit.ascx.cs
+37 -23
View File
@@ -44,7 +44,17 @@ namespace NKC_WF.WebUserControls
/// <summary>
/// Abilitazione azioni button-based
/// </summary>
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
/// </summary>
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()
NKC_WF/WebUserControls/cmp_batchDetailSplit.ascx.designer.cs
Generated
+9
View File
@@ -86,6 +86,15 @@ namespace NKC_WF.WebUserControls
/// </remarks>
protected global::System.Web.UI.WebControls.Label lblWarnChange;
/// <summary>
/// chkActEnab control.
/// </summary>
/// <remarks>
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::System.Web.UI.WebControls.CheckBox chkActEnab;
/// <summary>
/// lbtBalance control.
/// </summary>
NKC_WF/WebUserControls/cmp_batchList.ascx
+1 -1
View File
@@ -4,7 +4,7 @@
<asp:HiddenField runat="server" ID="hfLastSelRow" />
<asp:HiddenField runat="server" ID="hfCreatePng" />
<asp:CheckBox runat="server" ID="chkActEnab" Checked="true" Enabled="false" />
<asp:CheckBox runat="server" ID="chkActEnab" Checked="true" Visible="false" />
<asp:UpdatePanel ID="updPanelDetail" runat="server" UpdateMode="Conditional">
<ContentTemplate>
<div class="row">
NKC_WF/site/OrderHistory.aspx
+1 -1
View File
@@ -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" %>
<asp:Content ID="Content1" ContentPlaceHolderID="MainContent" runat="server">