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

Merge branch 'release/AddHistorySelectDetail_01'

Browse Source
This commit is contained in:
Samuele Locatelli
2025-04-23 18:00:07 +02:00
parent 638c981d6d ad0879a295
commit 3da5992cbb
8 changed files with 62 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files
NKC_WF/WebUserControls/cmp_batchDetail.ascx
+7 -7
View File
@@ -13,29 +13,29 @@
<asp:LinkButton runat="server" ID="lbtAccept" CssClass="btn btn-sm btn-block btn-success"
OnClick="lbtAccept_Click"
OnClientClick='<%# SteamWare.jsUtils.getCBE("ConfirmAcceptNest") %>'
Visible='<%# checkStatus(Eval("Status"), NKC_SDK.BatchStatus.NestDone) && !checkType(Eval("BatchType"), NKC_SDK.BatchType.Descendant) %>'><%# traduci("AcceptNest") %></asp:LinkButton>
Visible='<%# checkStatus(Eval("Status"), NKC_SDK.BatchStatus.NestDone) && !checkType(Eval("BatchType"), NKC_SDK.BatchType.Descendant) && BtnActEnab %>'><%# traduci("AcceptNest") %></asp:LinkButton>
</div>
<div class="col-3">
<asp:LinkButton runat="server" ID="lbtSendEstim" CssClass="btn btn-sm btn-block btn-info"
OnClick="lbtSendEstim_Click"
OnClientClick='<%# SteamWare.jsUtils.getCBE("ConfirmStartEstim") %>'
Visible='<%# (checkStatus(Eval("Status"), NKC_SDK.BatchStatus.Imported) || checkStatus(Eval("Status"), NKC_SDK.BatchStatus.Errors) || checkStatus(Eval("Status"), NKC_SDK.BatchStatus.ErrorsOnEstim) || checkStatus(Eval("Status"), NKC_SDK.BatchStatus.ErrorsOnNesting)) && canStartNew %>'><%# traduci("SendToEstim") %></asp:LinkButton>
Visible='<%# (checkStatus(Eval("Status"), NKC_SDK.BatchStatus.Imported) || checkStatus(Eval("Status"), NKC_SDK.BatchStatus.Errors) || checkStatus(Eval("Status"), NKC_SDK.BatchStatus.ErrorsOnEstim) || checkStatus(Eval("Status"), NKC_SDK.BatchStatus.ErrorsOnNesting)) && canStartNew && BtnActEnab %>'><%# traduci("SendToEstim") %></asp:LinkButton>
<asp:LinkButton runat="server" ID="lbtStopEstim" CssClass="btn btn-sm btn-block btn-dark"
OnClick="lbtStopEstim_Click"
OnClientClick='<%# SteamWare.jsUtils.getCBE("ConfirmStopEstim") %>'
Visible='<%# checkStatus(Eval("Status"), NKC_SDK.BatchStatus.EstimationRequested) %>'><%# traduci("StopEstim") %></asp:LinkButton>
Visible='<%# checkStatus(Eval("Status"), NKC_SDK.BatchStatus.EstimationRequested) && BtnActEnab %>'><%# traduci("StopEstim") %></asp:LinkButton>
<asp:LinkButton runat="server" ID="lbtSendNesting" CssClass="btn btn-sm btn-block btn-warning"
OnClick="lbtSendNesting_Click"
OnClientClick='<%# SteamWare.jsUtils.getCBE("ConfirmStartNest") %>'
Visible='<%# checkStatus(Eval("Status"), NKC_SDK.BatchStatus.EstimationDone) && !checkType(Eval("BatchType"), NKC_SDK.BatchType.Descendant) && canStartNew && isSplitted %>'><%# traduci("SendToNest") %></asp:LinkButton>
Visible='<%# checkStatus(Eval("Status"), NKC_SDK.BatchStatus.EstimationDone) && !checkType(Eval("BatchType"), NKC_SDK.BatchType.Descendant) && canStartNew && isSplitted && BtnActEnab %>'><%# traduci("SendToNest") %></asp:LinkButton>
<asp:LinkButton runat="server" ID="lbtStopNesting" CssClass="btn btn-sm btn-block btn-dark"
OnClick="lbtStopNesting_Click"
OnClientClick='<%# SteamWare.jsUtils.getCBE("ConfirmStopNest") %>'
Visible='<%# checkStatus(Eval("Status"), NKC_SDK.BatchStatus.NestRequested) %>'><%# traduci("StopNest") %></asp:LinkButton>
Visible='<%# checkStatus(Eval("Status"), NKC_SDK.BatchStatus.NestRequested) && BtnActEnab %>'><%# traduci("StopNest") %></asp:LinkButton>
<asp:LinkButton runat="server" ID="lbtResetNest" CssClass="btn btn-sm btn-block btn-warning"
OnClick="lbtResetNest_Click"
OnClientClick='<%# SteamWare.jsUtils.getCBE("ConfirmResetNest") %>'
Visible='<%# checkStatus(Eval("Status"), NKC_SDK.BatchStatus.NestDone) && !checkType(Eval("BatchType"), NKC_SDK.BatchType.Descendant) %>'><%# traduci("ResetNest") %></asp:LinkButton>
Visible='<%# checkStatus(Eval("Status"), NKC_SDK.BatchStatus.NestDone) && !checkType(Eval("BatchType"), NKC_SDK.BatchType.Descendant) && BtnActEnab %>'><%# traduci("ResetNest") %></asp:LinkButton>
</div>
<div class="col-12">
<div class="row">
@@ -83,5 +83,5 @@
</asp:ObjectDataSource>
<uc1:cmp_batchDetailMongo runat="server" ID="cmp_batchDetailMongo" showInline="true" />
<div runat="server" id="divSplit">
<uc1:cmp_batchDetailSplit runat="server" ID="cmp_batchDetailSplit" />
<uc1:cmp_batchDetailSplit runat="server" ID="cmp_batchDetailSplit" BtnEnabled='<%# BtnActEnab %>' />
</div>
NKC_WF/WebUserControls/cmp_batchDetail.ascx.cs
+6
View File
@@ -29,6 +29,12 @@ namespace NKC_WF.WebUserControls
}
}
/// <summary>
/// Abilitazione azioni button-based
/// </summary>
public bool BtnActEnab { get; set; } = true;
/// <summary>
/// verifica possibilità avvio TASK x presenza task NON chiusi
/// </summary>
NKC_WF/WebUserControls/cmp_batchDetailSplit.ascx
+16 -16
View File
@@ -16,7 +16,7 @@
<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>
</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">
<asp:LinkButton runat="server" ID="lbtBalance" CssClass="btn btn-success btn-block" OnClick="lbtBalance_Click" ToolTip="Balance on active Machines" Visible='<%# BtnEnabled %>'>
<b><%: traduci("BatchSplit") %></b> <i class="fa fa-balance-scale" aria-hidden="true"></i>
</asp:LinkButton>
</div>
@@ -41,7 +41,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">
<asp:LinkButton runat="server" ID="lbtToggle01" CssClass="btn btn-sm btn-dark" OnClick="lbtToggle01_Click" Visible='<%# BtnEnabled %>'>
<b>NE01</b>
</asp:LinkButton>
<asp:Label runat="server" ID="lblTime01" />
@@ -51,13 +51,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"></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>
<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>
</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"></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>
<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>
</div>
</div>
</div>
@@ -74,7 +74,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">
<asp:LinkButton runat="server" ID="lbtToggle02" CssClass="btn btn-sm btn-dark" OnClick="lbtToggle02_Click" Visible='<%# BtnEnabled %>'>
<b>NE02</b>
</asp:LinkButton>
<asp:Label runat="server" ID="lblTime02" />
@@ -84,13 +84,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"></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>
<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>
</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"></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>
<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>
</div>
</div>
</div>
@@ -107,7 +107,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">
<asp:LinkButton runat="server" ID="lbtToggle03" CssClass="btn btn-sm btn-dark" OnClick="lbtToggle03_Click" Visible='<%# BtnEnabled %>'>
<b>NE03</b>
</asp:LinkButton>
<asp:Label runat="server" ID="lblTime03" />
@@ -117,13 +117,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"></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>
<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>
</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"></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>
<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>
</div>
</div>
</div>
NKC_WF/WebUserControls/cmp_batchDetailSplit.ascx.cs
+5
View File
@@ -41,6 +41,11 @@ namespace NKC_WF.WebUserControls
get => codEnabled != codEnabledPrev;
}
/// <summary>
/// Abilitazione azioni button-based
/// </summary>
public bool BtnEnabled { get; set; } = true;
public bool isSplitted
{
get
NKC_WF/WebUserControls/cmp_batchList.ascx
+2 -1
View File
@@ -4,6 +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:UpdatePanel ID="updPanelDetail" runat="server" UpdateMode="Conditional">
<ContentTemplate>
<div class="row">
@@ -74,7 +75,7 @@
<ItemTemplate>
<div class="text-center">
<asp:LinkButton ID="lbRedoEval" runat="server" CausesValidation="False" CommandName="Cancel" CommandArgument='<%# Eval("Takt") %>' CssClass="btn btn-sm btn-info" Visible='<%# listMode== NKC_SDK.BatchListMode.PartsEval %>' ToolTip="Re-Validate single ITEM" OnClick="lbRedoEval_Click" OnClientClick='return confirm("ITEM Re-Validation requested. Are you sure to proceed?")'><i class="fa fa-check-circle-o" aria-hidden="true"></i></asp:LinkButton>
<asp:LinkButton ID="lbSelect" runat="server" CausesValidation="False" CommandName="Select" CommandArgument="" CssClass="btn btn-sm btn-primary" Visible='<%# listMode== NKC_SDK.BatchListMode.Standard %>'><i class="fa fa-search" aria-hidden="true"></i></asp:LinkButton>
<asp:LinkButton ID="lbSelect" runat="server" CausesValidation="False" CommandName="Select" CommandArgument="" CssClass="btn btn-sm btn-primary" Visible='<%# listMode == NKC_SDK.BatchListMode.Standard || listMode == NKC_SDK.BatchListMode.FullHistory %>'><i class="fa fa-search" aria-hidden="true"></i></asp:LinkButton>
</div>
</ItemTemplate>
</asp:TemplateField>
NKC_WF/WebUserControls/cmp_batchList.ascx.cs
+15
View File
@@ -11,6 +11,20 @@ namespace NKC_WF.WebUserControls
{
#region Public Properties
public bool ActionEnab
{
get
{
return chkActEnab.Checked;
}
set
{
chkActEnab.Checked = value;
}
}
public bool deleteEnabled
{
get
@@ -399,6 +413,7 @@ namespace NKC_WF.WebUserControls
// in base al ListMode decido cosa mostrare...
checkFixOds();
checkFixMode();
cmp_batchDetail.BtnActEnab = ActionEnab;
}
cmp_batchDetail.eh_doRefresh += Cmp_batchDetail_eh_doRefresh;
cmp_numRow.eh_doRefresh += Cmp_numRow_eh_doRefresh;
NKC_WF/WebUserControls/cmp_batchList.ascx.designer.cs
Generated
+9
View File
@@ -32,6 +32,15 @@ namespace NKC_WF.WebUserControls
/// </remarks>
protected global::System.Web.UI.WebControls.HiddenField hfCreatePng;
/// <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>
/// updPanelDetail control.
/// </summary>
NKC_WF/site/OrderHistory.aspx
+2 -2
View File
@@ -2,7 +2,7 @@
<%@ Register Src="~/WebUserControls/cmp_batchList.ascx" TagPrefix="uc1" TagName="cmp_batchList" %>
<asp:Content ID="Content1" ContentPlaceHolderID="MainContent" runat="server">
<div class="container">
<div class="container-fluid">
<div class="card" style="width: 100%;">
<div class="card-header">
<h3><%: traduci("OrderHistory") %></h3>
@@ -10,7 +10,7 @@
<div class="card-body">
<div class="row">
<div class="col-12" runat="server" id="divFileList">
<uc1:cmp_batchList runat="server" ID="cmp_batchList" listMode="FullHistory" showSplit="true" forceCreatePng="false"/>
<uc1:cmp_batchList runat="server" ID="cmp_batchList" listMode="FullHistory" showSplit="true" forceCreatePng="false" ActionEnab="false"/>
</div>
</div>
</div>