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

This commit is contained in:
Samuele E. Locatelli
2020-08-11 15:00:39 +02:00
22 changed files with 101 additions and 99 deletions
+3 -2
View File
@@ -15,11 +15,12 @@
<asp:Label runat="server" ID="lblTitle" Text='<%# $"<b>C{Eval("CartIndex")}</b> | {Eval("CartDtmx")}" %>' CssClass="text-uppercase" />
</div>
<div class="col-3">
Picked: <b>
# <%: traduci("Picked") %>
<b>
<asp:Label ID="Label2" runat="server" Text='<%# Eval("NumPicked") %>'></asp:Label></b>
</div>
<div class="col-3">
Total:
# <%: traduci("Total") %>
<asp:Label ID="Label1" runat="server" Text='<%# Eval("NumItems") %>'></asp:Label>
</div>
</div>
+2 -2
View File
@@ -16,11 +16,11 @@
<asp:Label runat="server" ID="lblTitle" Text='<%# $"<b>B{Eval("BinIndex")}</b> | {Eval("BinDtmxProc")}" %>' CssClass="text-uppercase" />
</div>
<div class="col-3 text-left">
Picked: <b>
# <%: traduci("Picked") %><b>
<asp:Label ID="Label2" runat="server" Text='<%# Eval("NumPicked") %>'></asp:Label></b>
</div>
<div class="col-3 text-right">
Total:
# <%: traduci("Total") %>
<asp:Label ID="Label1" runat="server" Text='<%# Eval("NumItems") %>'></asp:Label>
</div>
</div>
+2 -2
View File
@@ -13,11 +13,11 @@
<asp:Label ID="ItemDescLabel" runat="server" Text='<%# Eval("ItemDesc") %>'></asp:Label>
</div>
<div class="col-6 text-left">
Picked: <b>
# <%: traduci("Picked") %> <b>
<asp:Label ID="Label2" runat="server" Text='<%# Eval("NumPicked") %>'></asp:Label></b>
</div>
<div class="col-6">
Total:
# <%: traduci("Total") %>
<asp:Label ID="Label1" runat="server" Text='<%# Eval("NumItems") %>'></asp:Label>
</div>
</div>
+2 -2
View File
@@ -16,11 +16,11 @@
<div class="col-6 text-left">
</div>
<div class="col-3 text-left">
Picked: <b>
# <%: traduci("Picked") %><b>
<asp:Label ID="Label2" runat="server" Text='<%# Eval("NumPicked") %>'></asp:Label></b>
</div>
<div class="col-3 text-right">
Total:
# <%: traduci("Total") %>
<asp:Label ID="Label1" runat="server" Text='<%# Eval("NumItems") %>'></asp:Label>
</div>
</div>
+2 -2
View File
@@ -15,11 +15,11 @@
<asp:Label runat="server" ID="lblTitle" Text='<%# $"<b>C{Eval("CartIndex")}</b> | {Eval("CartDtmx")}" %>' CssClass="text-uppercase" />
</div>
<div class="col-3">
Picked: <b>
# <%: traduci("Picked") %> <b>
<asp:Label ID="Label2" runat="server" Text='<%# Eval("NumPicked") %>'></asp:Label></b>
</div>
<div class="col-3">
Total:
# <%: traduci("Total") %>
<asp:Label ID="Label1" runat="server" Text='<%# Eval("NumItems") %>'></asp:Label>
</div>
</div>
+2 -2
View File
@@ -13,11 +13,11 @@
<asp:Label ID="ItemDescLabel" runat="server" Text='<%# Eval("OtherItemDesc") %>'></asp:Label>
</div>
<div class="col-6 text-left">
Picked: <b>
# <%: traduci("Picked") %><b>
<asp:Label ID="Label2" runat="server" Text='<%# Eval("NumPicked") %>'></asp:Label></b>
</div>
<div class="col-6">
Total:
# <%: traduci("Total") %>
<asp:Label ID="Label1" runat="server" Text='<%# Eval("NumItems") %>'></asp:Label>
</div>
</div>
+4 -2
View File
@@ -16,14 +16,16 @@
<asp:Label ID="MatExtCodeLabel" runat="server" Text='<%# Eval("MatExtCode") %>' /></b>
</div>
<div class="col-4 text-right">
stack: <b>
# <%: traduci("Stack") %>
<b>
<asp:Label ID="StackIndexLabel" runat="server" Text='<%# Eval("StackIndex") %>' /></b>
</div>
<div class="col-8 text-left text-truncate pr-0">
<asp:Label ID="MatDescLabel" runat="server" Text='<%# Eval("MatDesc") %>' />
</div>
<div class="col-4 text-right">
sheet: <b>
# <%: traduci("Sheet") %>
<b>
<asp:Label ID="SheetIndexLabel" runat="server" Text='<%# Eval("SheetIndex") %>' /></b>
</div>
<div class="col-4 text-center">
+1 -1
View File
@@ -11,7 +11,7 @@
<PagerSettings Mode="NumericFirstLast" />
<SelectedRowStyle CssClass="table-info" />
<EmptyDataTemplate>
No Record
# <%: traduci("NoRecord") %>
</EmptyDataTemplate>
<Columns>
<asp:TemplateField HeaderText="Cod" SortExpression="BinDtmx">
+1 -1
View File
@@ -11,7 +11,7 @@
<PagerSettings Mode="NumericFirstLast" />
<SelectedRowStyle CssClass="table-info" />
<EmptyDataTemplate>
No Record
# <%: traduci("NoRecord") %>
</EmptyDataTemplate>
<Columns>
<asp:TemplateField HeaderText="Cod" SortExpression="CartDtmx">
+1 -1
View File
@@ -12,7 +12,7 @@
<hr />
<div class="row">
<div class="col-4">
<h3>Call List</h3>
<h3># <%: traduci("CallList") %></h3>
</div>
<div class="col-8 text-right">
# <%: traduci("FilterStatus") %>
+1 -1
View File
@@ -15,7 +15,7 @@
</div>
<div class="col-6">
<div class="alert alert-primary">
<b>Last Action</b><br />
<b> # <%: traduci("LastAction") %> </b><br />
<asp:Label runat="server" ID="lblOutTask"></asp:Label>
</div>
</div>
@@ -6,14 +6,14 @@
<div class="card">
<div class="card-header text-center bg-success">
<h4>Offline Orders</h4>
<h4># <%: traduci("OfflineOrders") %></h4>
</div>
<div class="card-body">
<uc1:cmp_offOrderDetail runat="server" ID="cmp_offOrderDetail" />
<asp:GridView ID="grView" runat="server" AllowPaging="True" AutoGenerateColumns="False" DataKeyNames="OrdID" DataSourceID="ods" CssClass="table table-sm table-condensed table-striped w-100" AllowSorting="True" OnSelectedIndexChanged="grView_SelectedIndexChanged">
<SelectedRowStyle CssClass="table-info" />
<EmptyDataTemplate>
No Data Available
# <%: traduci("NoDataAvaible") %>
</EmptyDataTemplate>
<Columns>
<asp:TemplateField>
+1 -1
View File
@@ -16,7 +16,7 @@
<PagerSettings Mode="NumericFirstLast" />
<SelectedRowStyle CssClass="table-info" />
<EmptyDataTemplate>
No Record
# <%: traduci("NoRecord") %>
</EmptyDataTemplate>
<Columns>
<asp:TemplateField ShowHeader="false" SortExpression="BatchID">
+1 -1
View File
@@ -4,7 +4,7 @@
<div class="card">
<div class="card-header text-center bg-warning">
<h4>Scrap List (Items to process)</h4>
<h4>#<%: traduci("ScrapList") %></h4>
</div>
<div class="card-body">
<asp:GridView ID="grView" runat="server" AutoGenerateColumns="False" DataKeyNames="ItemID" DataSourceID="ods" AllowPaging="True" CssClass="table table-sm table-condensed table-striped" AllowSorting="true">
+4 -4
View File
@@ -29,19 +29,19 @@
</div>
<div class="row">
<div class="col-md-3 text-center">
Ord:
# <%: traduci("Order") %>
<asp:Label ID="OrderExtCodeLabel" runat="server" Text='<%# Eval("OrderExtCode") %>' />
</div>
<div class="col-md-3 text-center">
Kit:
# <%: traduci("Kit") %>
<asp:Label ID="KitExtCodeLabel" runat="server" Text='<%# Eval("KitExtCode") %>' />
</div>
<div class="col-md-3 text-center">
Cart:
# <%: traduci("Cart") %>
<asp:Label ID="CartDtmxLabel" runat="server" Text='<%# Eval("CartDtmx") %>' />
</div>
<div class="col-md-3 text-center">
Bin:
# <%: traduci("Bin") %>
<asp:Label ID="BinDtmxLabel" runat="server" Text='<%# Eval("BinDtmx") %>' />
</div>
</div>
@@ -6,7 +6,7 @@
<div class="row">
<div class="col-12">
<h3>BUNK BUILDING</h3>
<h3># <%: traduci("BunkBuilding") %></h3>
</div>
<div class="col-12 text-center">
<div class="row mb-1" runat="server" id="divPrint">
@@ -29,4 +29,4 @@
</div>
</div>
</div>
</div>
</div>
+2 -2
View File
@@ -4,7 +4,7 @@
<div class="col-12">
<div runat="server" id="divTitle">
<div class="col-6 pr-0 font-weight-bold">
BUNK List
# <%: traduci("BunkList") %>
</div>
<div class="col-6 pl-0 text-right" runat="server" id="divSelected">
<asp:Label runat="server" ID="lblStack" />
@@ -19,7 +19,7 @@
<PagerSettings Mode="NumericFirstLast" />
<SelectedRowStyle CssClass="table-info" />
<EmptyDataTemplate>
No Record
# <%: traduci("NoRecord") %>
</EmptyDataTemplate>
<Columns>
<asp:TemplateField ShowHeader="False">
+48 -48
View File
@@ -3,53 +3,53 @@
<%@ Register Src="~/WebUserControls/cmp_stackNextloading.ascx" TagPrefix="uc1" TagName="cmp_stackNextloading" %>
<div class="row">
<div class="col-12 shortcuts small" runat="server" id="divSim">
<div class="row table-warning">
<div class="col">
<h3>PROD simul</h3>
</div>
<div class="col">
<asp:LinkButton runat="server" ID="lbtAdvanceProd" class="shortcut" OnClick="lbtAdvanceProd_Click"> <i class="fa fa-wrench shortcut-icon"></i><span class="shortcut-label"><b>ADVANCE</b> prod</span> </asp:LinkButton>
</div>
</div>
</div>
<div class="col-12">
<asp:HiddenField ID="hfBarcode" runat="server" />
<asp:HiddenField ID="hfEnableBCode" runat="server" />
<asp:HiddenField ID="hfStackId" runat="server" />
<asp:Label runat="server" ID="lblLoaded" CssClass="text-success border border-success rounded py-1 px-5 m-2"><%: traduci("StackLoaded") %></asp:Label>
<asp:FormView ID="frmView" runat="server" DataKeyNames="BatchID" DataSourceID="ods" Width="100%" OnDataBound="frmView_DataBound">
<ItemTemplate>
<div class="row border bg-success text-light rounded">
<div class="col-4 text-left">
BATCH: <b>
<asp:Label ID="TaktLabel" runat="server" Text='<%# Eval("Takt") %>' /></b>
<br />
TOT BUNK: <b>
<asp:Label ID="BatchIDLabel" runat="server" Text='<%# Eval("NumStacks") %>' /></b>
</div>
<div class="col-4 text-center">
<b><%: traduci("BatchCurrent") %></b>
<br />
TOT SHEETS: <b>
<asp:Label ID="Label1" runat="server" Text='<%# Eval("NumSheets") %>' /></b>
</div>
<div class="col-4 text-right">
Due Date: <b>
<asp:Label ID="DueDateLabel" runat="server" Text='<%# Eval("DueDate", "{0:ddd yyyy.MM.dd}") %>' /></b>
<br />
TOT ITEMS: <b>
<asp:Label ID="NumStacksLabel" runat="server" Text='<%# Eval("NumItems") %>' /></b>
</div>
<div class="col-12 shortcuts small" runat="server" id="divSim">
<div class="row table-warning">
<div class="col">
<h3># <%: traduci("ProdSimul") %></h3>
</div>
<div class="col">
<asp:LinkButton runat="server" ID="lbtAdvanceProd" class="shortcut" OnClick="lbtAdvanceProd_Click"> <i class="fa fa-wrench shortcut-icon"></i><span class="shortcut-label"><b>ADVANCE</b> prod</span> </asp:LinkButton>
</div>
</div>
</ItemTemplate>
</asp:FormView>
<asp:ObjectDataSource ID="ods" runat="server" OldValuesParameterFormatString="original_{0}" SelectMethod="getNextAvailable" TypeName="AppData.DS_AppTableAdapters.BatchListTableAdapter"></asp:ObjectDataSource>
</div>
<div class="col-12 mt-2">
<uc1:cmp_barcode runat="server" ID="cmp_barcode" />
</div>
<div class="col-12">
<uc1:cmp_stackNextloading runat="server" ID="cmp_stackNextloading" />
</div>
</div>
<div class="col-12">
<asp:HiddenField ID="hfBarcode" runat="server" />
<asp:HiddenField ID="hfEnableBCode" runat="server" />
<asp:HiddenField ID="hfStackId" runat="server" />
<asp:Label runat="server" ID="lblLoaded" CssClass="text-success border border-success rounded py-1 px-5 m-2"><%: traduci("StackLoaded") %></asp:Label>
<asp:FormView ID="frmView" runat="server" DataKeyNames="BatchID" DataSourceID="ods" Width="100%" OnDataBound="frmView_DataBound">
<ItemTemplate>
<div class="row border bg-success text-light rounded">
<div class="col-4 text-left">
# <%: traduci("Batch") %><b>
<asp:Label ID="TaktLabel" runat="server" Text='<%# Eval("Takt") %>' /></b>
<br />
# <%: traduci("TotBunk") %><b>
<asp:Label ID="BatchIDLabel" runat="server" Text='<%# Eval("NumStacks") %>' /></b>
</div>
<div class="col-4 text-center">
<b><%: traduci("BatchCurrent") %></b>
<br />
# <%: traduci("TotSheets") %><b>
<asp:Label ID="Label1" runat="server" Text='<%# Eval("NumSheets") %>' /></b>
</div>
<div class="col-4 text-right">
# <%: traduci("DueDate") %> <b>
<asp:Label ID="DueDateLabel" runat="server" Text='<%# Eval("DueDate", "{0:ddd yyyy.MM.dd}") %>' /></b>
<br />
# <%: traduci("TotItems") %><b>
<asp:Label ID="NumStacksLabel" runat="server" Text='<%# Eval("NumItems") %>' /></b>
</div>
</div>
</ItemTemplate>
</asp:FormView>
<asp:ObjectDataSource ID="ods" runat="server" OldValuesParameterFormatString="original_{0}" SelectMethod="getNextAvailable" TypeName="AppData.DS_AppTableAdapters.BatchListTableAdapter"></asp:ObjectDataSource>
</div>
<div class="col-12 mt-2">
<uc1:cmp_barcode runat="server" ID="cmp_barcode" />
</div>
<div class="col-12">
<uc1:cmp_stackNextloading runat="server" ID="cmp_stackNextloading" />
</div>
</div>
@@ -6,10 +6,10 @@
<EmptyDataTemplate>
<div class="row border border-success rounded">
<div class="col-6 text-left text-success">
<b>NO CURRENT BUNK</b>
<b># <%: traduci("NoCurrentBunk") %></b>
</div>
<div class="col-6 text-right text-secondary">
...waiting
# <%: traduci("Waiting") %>
</div>
</div>
</EmptyDataTemplate>
@@ -18,40 +18,40 @@
<ItemTemplate>
<div class="row border border-success rounded">
<div class="col-12 col-lg-4 text-left text-secondary" runat="server" visible='<%# Eval("NumSheets").ToString() == Eval("NumSheetsWorked").ToString() %>'>
<b>PREVIOUS</b> BUNK: <b>
<b># <%: traduci("Previous") %></b> # <%: traduci("Bunk") %> <b>
<asp:Label ID="Label1" runat="server" Text='<%# Eval("StackDtmx") %>' /></b>
(<asp:Label ID="Label2" runat="server" Text='<%# Eval("StackIndex") %>' />)
</div>
<div class="col-12 col-lg-4 text-left text-success" runat="server" visible='<%# Eval("NumSheets").ToString() != Eval("NumSheetsWorked").ToString() %>'>
<b>CURRENT</b> BUNK: <b>
<b># <%: traduci("Current") %></b># <%: traduci("Bunk") %> <b>
<asp:Label ID="StackIDLabel" runat="server" Text='<%# Eval("StackDtmx") %>' /></b>
(<asp:Label ID="StackIndexLabel" runat="server" Text='<%# Eval("StackIndex") %>' />)
</div>
<div class="col-12 col-lg-5 text-center px-0">
<div class="row textCondens">
<div class="col-3 pr-0">
sheets:<b><asp:Label ID="NumSheetsLabel" runat="server" Text='<%# Eval("NumSheets") %>' /></b>
# <%: traduci("Sheets") %><b><asp:Label ID="NumSheetsLabel" runat="server" Text='<%# Eval("NumSheets") %>' /></b>
</div>
<div class="col-3 px-0">
printed: <b>
# <%: traduci("Printed") %> <b>
<asp:Label ID="NumSheetsPrintedLabel" runat="server" Text='<%# Eval("NumSheetsPrinted") %>' /></b>
</div>
<div class="col-3 px-0">
worked: <b>
# <%: traduci("Worked") %><b>
<asp:Label ID="NumSheetsWorkedLabel" runat="server" Text='<%# Eval("NumSheetsWorked") %>' /></b>
</div>
<div class="col-3 pl-0 text-danger">
To Redo: <b>
# <%: traduci("ToRedo") %> <b>
<asp:Label ID="NumSheetsToRedoLabel" runat="server" Text='<%# Eval("NumSheetsToRedo") %>' /></b>
</div>
</div>
</div>
<div class="col-12 col-lg-3 text-right text-secondary" runat="server" visible='<%# Eval("NumSheets").ToString() == Eval("NumSheetsWorked").ToString() %>'>
Items: <b>
# <%: traduci("Items") %><b>
<asp:Label ID="lblNumItems" runat="server" Text='<%# Eval("NumItems") %>' /></b>
</div>
<div class="col-12 col-lg-3 text-right text-success" runat="server" visible='<%# Eval("NumSheets").ToString() != Eval("NumSheetsWorked").ToString() %>'>
Items: <b>
# <%: traduci("Items") %><b>
<asp:Label ID="Label3" runat="server" Text='<%# Eval("NumItems") %>' /></b>
</div>
</div>
@@ -68,17 +68,17 @@
<ItemTemplate>
<div class="row border border-primary rounded">
<div class="col-12 col-lg-4 text-left text-primary">
<b>NEXT</b> BUNK: <b>
<b># <%: traduci("Next") %></b> # <%: traduci("Bunk") %> <b>
<asp:Label ID="StackIDLabel" runat="server" Text='<%# Eval("StackDtmx") %>' /></b>
(<asp:Label ID="StackIndexLabel" runat="server" Text='<%# Eval("StackIndex") %>' />)
</div>
<div class="col-12 col-lg-4 text-center textCondens">
sheets:<b><asp:Label ID="NumSheetsLabel" runat="server" Text='<%# Eval("NumSheets") %>' /></b> | printed: <b>
# <%: traduci("Sheets") %><b><asp:Label ID="NumSheetsLabel" runat="server" Text='<%# Eval("NumSheets") %>' /></b> | printed: <b>
<asp:Label ID="NumSheetsPrintedLabel" runat="server" Text='<%# Eval("NumSheetsPrinted") %>' /></b> | worked: <b>
<asp:Label ID="NumSheetsWorkedLabel" runat="server" Text='<%# Eval("NumSheetsWorked") %>' /></b>
</div>
<div class="col-12 col-lg-4 text-right text-primary">
Items: <b>
# <%: traduci("Items") %><b>
<asp:Label ID="lblNumItems" runat="server" Text='<%# Eval("NumItems") %>' /></b>
</div>
</div>
@@ -86,10 +86,10 @@
<EmptyDataTemplate>
<div class="row border border-primary rounded">
<div class="col-12 col-lg-6 text-left text-secondary">
<b>NO NEXT BUNK</b>
<b># <%: traduci("NoNextBunk") %></b>
</div>
<div class="col-12 col-lg-6 text-right text-secondary">
BATCH complete
# <%: traduci("BatchComplete") %>
</div>
</div>
</EmptyDataTemplate>
@@ -99,8 +99,7 @@
<asp:ControlParameter ControlID="hfBatchID" DefaultValue="0" Name="BatchID" PropertyName="Value" Type="Int32" />
</SelectParameters>
</asp:ObjectDataSource>
<asp:ObjectDataSource ID="odsNext" runat="server" OldValuesParameterFormatString="original_{0}" SelectMethod="getNext" TypeName="AppData.DS_AppTableAdapters.StackListTableAdapter">
</asp:ObjectDataSource>
<asp:ObjectDataSource ID="odsNext" runat="server" OldValuesParameterFormatString="original_{0}" SelectMethod="getNext" TypeName="AppData.DS_AppTableAdapters.StackListTableAdapter"></asp:ObjectDataSource>
<div class="row">
<div class="col-12">
<asp:LinkButton runat="server" ID="lbtCollectRedoOnEnd" CssClass="btn btn-warning btn-block" OnClick="lbtCollectRedoOnEnd_Click"><i class="fa fa-recycle" aria-hidden="true"></i> <%: traduci("CollectRedoOnEnd") %><i class="fa fa-recycle" aria-hidden="true"></i></asp:LinkButton>
+2 -2
View File
@@ -5,7 +5,7 @@
<div class="col-12">
<div runat="server" id="divTitle">
<div class="col-4 col-lg-6 pr-0 font-weight-bold">
BATCH List
# <%: traduci("BatchList") %>
</div>
<div class="col-8 col-lg-6 pl-0 text-right" runat="server" id="divSelected">
<asp:Label runat="server" ID="lblTakt" />
@@ -20,7 +20,7 @@
<PagerSettings Mode="NumericFirstLast" />
<SelectedRowStyle CssClass="table-info" />
<EmptyDataTemplate>
No Record
# <%: traduci("NoRecord") %>
</EmptyDataTemplate>
<Columns>
<asp:TemplateField ShowHeader="False">
@@ -1,7 +1,7 @@
<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="cmp_validationSummary.ascx.cs" Inherits="NKC_WF.WebUserControls.cmp_validationSummary" %>
<div class="row">
<div class="col-3">
<h4>Validation Summary</h4>
<h4># <%: traduci("ValidationSummary") %></h4>
</div>
<div class="col-3">
<asp:LinkButton runat="server" ID="lbtForceRevali" CssClass="btn btn-sm btn-success btn-block" OnClientClick='return confirm("Are you sure you want to re-evaluate ALL items?")' OnClick="lbtForceRevali_Click"><i class="fa fa-bell" aria-hidden="true"></i> FORCE REVALIDATE </asp:LinkButton>
+1 -1
View File
@@ -2,7 +2,7 @@
<div class="m-5">
<div class="card text-center" style="width: 100%;">
<div class="card-header bg-warning">
<h2>Work In Progress</h2>
<h2># <%: traduci("WorkInProgress") %></h2>
</div>
<div class="card-body">
<img src="../Images/WIP.png" />