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

Merge remote-tracking branch 'GitlabSteamware/feature/translation' into develop

Browse Source
This commit is contained in:
Samuele E. Locatelli
2020-08-11 12:15:40 +02:00
parent cbecb539e8 57f20d0720
commit abce987d1c
4 changed files with 26 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files
NKC_WF/WebUserControls/cmp_batchDetail.ascx
+1 -1
View File
@@ -5,7 +5,7 @@
<ItemTemplate>
<div class="row small">
<div class="col-9">
<h3>Batch Detail</h3>
<h3> # <%: traduci ("BatchDetail") %></h3>
</div>
<div class="col-3">
<asp:LinkButton runat="server" ID="lbtSendEstim" CssClass="btn btn-sm btn-block btn-info" OnClick="lbtSendEstim_Click" OnClientClick='return confirm("Send to Estimation?")' Visible='<%# (checkStatus(Eval("Status"), NKC_SDK.BatchStatus.Errors) || checkStatus(Eval("Status"), NKC_SDK.BatchStatus.Imported)) && canStartNew() %>'>Send to Estimation</asp:LinkButton>
NKC_WF/WebUserControls/cmp_kittingBin.ascx
+5 -5
View File
@@ -11,36 +11,36 @@
<asp:Label runat="server" ID="lblTitle" Text='<%# $"<b>B{Eval("BinIndex")}</b> | {Eval("BinDtmxProc")}" %>' CssClass="text-uppercase" /></h5>
</div>
<div class="col-4 text-left">
CNC:
# <%: traduci("Cnc") %>
</div>
<div class="col-8 text-right">
<b>
<asp:Label ID="MatExtCodeLabel" runat="server" Text='<%# Eval("CreationDate","{0:yyyy-MM-dd HH:mm}") %>' /></b>
</div>
<div class="col-4 text-left">
Paint:
# <%: traduci("Paint") %>
</div>
<div class="col-8 text-right">
<b>
<asp:Label ID="Label2" runat="server" Text='<%# Eval("PaintDate","{0:yyyy-MM-dd HH:mm}") %>' /></b>
</div>
<div class="col-4 text-left">
# <%: traduci("OnKitting") %>
On Kitting:
</div>
<div class="col-8 text-right">
<b>
<asp:Label ID="Label3" runat="server" Text='<%# Eval("KittingStart","{0:yyyy-MM-dd HH:mm}") %>' /></b>
</div>
<div class="col-4 text-left">
Part:
# <%: traduci("Part") %>
</div>
<div class="col-8 text-right">
<b>
<asp:Label ID="Label1" runat="server" Text='<%# Eval("ItemExtCode") %>' /></b>
</div>
<div class="col-4 text-left">
Qty:
# <%: traduci("Qty") %>
</div>
<div class="col-8 text-right">
<b><asp:Label ID="lblTotItemLoad" runat="server" Text='<%# Eval("TotItemLoad") %>' /></b> / <asp:Label ID="lblTotItem" runat="server" Text='<%# Eval("TotItem") %>' />
NKC_WF/WebUserControls/cmp_kittingCart.ascx
+19 -20
View File
@@ -10,69 +10,68 @@
<asp:Label runat="server" ID="lblTitle" Text='<%# $"<b>C{Eval("CartIndex")}</b> | {Eval("CartDtmx")}" %>' CssClass="text-uppercase" /></h5>
</div>
<div class="col-6 text-left">
Order:
# <%: traduci("Order") %>
</div>
<div class="col-6 text-right">
<b>
<asp:Label ID="MatExtCodeLabel" runat="server" Text='<%# Eval("OrderExtCode") %>' /></b>
</div>
<div class="col-6 text-left">
Model:
# <%: traduci("Model") %>
</div>
<div class="col-6 text-right">
<b>
<asp:Label ID="Label2" runat="server" Text='<%# Eval("ModelCode") %>' /></b>
</div>
<div class="col-6 text-left">
Dest Plant:
# <%: traduci("DestPlant") %>
</div>
<div class="col-6 text-right">
<b>
<asp:Label ID="Label5" runat="server" Text='<%# Eval("DestPlant") %>' /></b>
</div>
<div class="col-6 text-left border-bottom border-success">
Kit #:
# <%: traduci("Kit") %>
</div>
<div class="col-6 text-right border-bottom border-success">
<b>
<asp:Label ID="Label1" runat="server" Text='<%# Eval("KitQty") %>' /></b>
</div>
<div class="col-6 text-left">
<b>CNC Parts #:</b>
<b># <%: traduci("CncParts") %> </b>
</div>
<div class="col-6 text-right">
<b>
<asp:Label ID="lblPartsTot" runat="server" Text='<%# Eval("TotItem") %>' /></b>
</div>
<div class="col-4 text-left pr-0">
Wait:
<asp:Label runat="server" ID="lblWait" CssClass="font-weight-bold" Text='<%# Eval("NumPzWaiting") %>' />
<div class="col-4 text-left">
# <%: traduci("Wait") %>
<asp:Label runat="server" ID="lblWait" CssClass="font-weight-bold" Text='<%# Eval("NumPzWaiting") %>' />
</div>
<div class="col-4 text-center px-0">
Ready:
<asp:Label runat="server" ID="Label3" CssClass="font-weight-bold" Text='<%# Eval("NumPzBinAvail") %>' />
<div class="col-4 text-center">
# <%: traduci("Ready") %>
<asp:Label runat="server" ID="Label3" CssClass="font-weight-bold" Text='<%# Eval("NumPzBinAvail") %>' />
</div>
<div class="col-4 text-right pl-0">
Cart:
<asp:Label runat="server" ID="Label4" CssClass="font-weight-bold" Text='<%# Eval("TotItemCart") %>' />
<div class="col-4 text-right">
# <%: traduci("Cart") %>
<asp:Label runat="server" ID="Label4" CssClass="font-weight-bold" Text='<%# Eval("TotItemCart") %>' />
</div>
<div class="col-6 text-left border-top border-success">
Other Parts #:
# <%: traduci("OtherParts") %>
</div>
<div class="col-6 text-right border-top border-success">
<b>
<asp:Label ID="Label8" runat="server" Text='<%# Eval("OtherQtyReq") %>' /></b>
</div>
<div class="col-4 text-left">
Wait:
<asp:Label runat="server" ID="Label6" CssClass="font-weight-bold" Text='<%# Eval("OtherQtyWait") %>' />
# <%: traduci("Wait") %>
<asp:Label runat="server" ID="Label6" CssClass="font-weight-bold" Text='<%# Eval("OtherQtyWait") %>' />
</div>
<div class="col-4 text-center">
</div>
<div class="col-4 text-right">
Cart:
<asp:Label runat="server" ID="Label9" CssClass="font-weight-bold" Text='<%# Eval("OtherQtyCur") %>' />
# <%: traduci("Cart") %>
<asp:Label runat="server" ID="Label9" CssClass="font-weight-bold" Text='<%# Eval("OtherQtyCur") %>' />
</div>
</div>
</div>
NKC_WF/WebUserControls/cmp_kittingCart.ascx.cs
+1 -2
View File
@@ -2,11 +2,10 @@
namespace NKC_WF.WebUserControls
{
public partial class cmp_kittingCart : System.Web.UI.UserControl
public partial class cmp_kittingCart : BaseUserControl
{
protected void Page_Load(object sender, EventArgs e)
{
}
public string getCssByNums(object _numWait, object _numReady, object _numOtherWait, object _numOtherReady)