From c472f532d9b2faefe660bf6df0098af47e36c751 Mon Sep 17 00:00:00 2001
From: "Samuele E. Locatelli" <samuele@steamware.net>
Date: Wed, 26 Aug 2020 08:04:51 +0200
Subject: [PATCH] Fix traduzioni dettagli vari

---
 NKC_WF/WebUserControls/cmp_KR_cart.ascx       | 11 ++++-
 NKC_WF/WebUserControls/cmp_cartDetIRK.ascx    | 44 ++++++++++++++-----
 .../cmp_cartDetIRK.ascx.designer.cs           | 18 ++++++++
 NKC_WF/WebUserControls/cmp_kitList.ascx       | 18 +++++++-
 NKC_WF/WebUserControls/cmp_kitReqRunning.ascx | 17 +++++--
 NKC_WF/WebUserControls/cmp_kitReqSched.ascx   | 26 ++++++++---
 NKC_WF/WebUserControls/cmp_kitRunning.ascx    |  4 +-
 7 files changed, 114 insertions(+), 24 deletions(-)

diff --git a/NKC_WF/WebUserControls/cmp_KR_cart.ascx b/NKC_WF/WebUserControls/cmp_KR_cart.ascx
index 535f200..9d88d58 100644
--- a/NKC_WF/WebUserControls/cmp_KR_cart.ascx
+++ b/NKC_WF/WebUserControls/cmp_KR_cart.ascx
@@ -7,7 +7,14 @@
         <asp:BoundField DataField="CartIndex" HeaderText="#" SortExpression="CartIndex" />
         <asp:BoundField DataField="CartDtmx" HeaderText="Cart" ReadOnly="True" SortExpression="CartDtmx" />
         <asp:BoundField DataField="OrderExtCode" HeaderText="Order" SortExpression="OrderExtCode" />
-        <asp:BoundField DataField="FamilyCode" HeaderText="Art" SortExpression="FamilyCode" />
+        <asp:TemplateField HeaderText="Art" SortExpression="FamilyCode">
+            <HeaderTemplate>
+                <asp:label ID="FCHLabel" runat="server" Text='<%# traduci("FamilyCode") %>' />
+            </HeaderTemplate>
+            <ItemTemplate>
+                <asp:Label ID="FamilyCodeLabel" runat="server" Text='<%# Eval("FamilyCode") %>'></asp:Label>
+            </ItemTemplate>
+        </asp:TemplateField>
         <asp:BoundField DataField="Started" HeaderText="Started" ReadOnly="True" SortExpression="Started" />
         <asp:BoundField DataField="Completed" HeaderText="Completed" ReadOnly="True" SortExpression="Completed" />
         <asp:TemplateField ShowHeader="False" ItemStyle-Width="2em">
@@ -18,6 +25,8 @@
                     <asp:HyperLink runat="server" ID="hlShowDetail" Target="_blank" CssClass="btn btn-info"  NavigateUrl='<%# $"~/site/CartDetIRK?CartID={Eval("CartID")}" %>'><i class="fa fa-list-ol" aria-hidden="true"></i></asp:HyperLink>
                 </div>
             </ItemTemplate>
+
+<ItemStyle Width="2em"></ItemStyle>
         </asp:TemplateField>
     </Columns>
 </asp:GridView>
diff --git a/NKC_WF/WebUserControls/cmp_cartDetIRK.ascx b/NKC_WF/WebUserControls/cmp_cartDetIRK.ascx
index 15b8845..95af79b 100644
--- a/NKC_WF/WebUserControls/cmp_cartDetIRK.ascx
+++ b/NKC_WF/WebUserControls/cmp_cartDetIRK.ascx
@@ -1,19 +1,41 @@
 <%@ Control Language="C#" AutoEventWireup="true" CodeBehind="cmp_cartDetIRK.ascx.cs" Inherits="NKC_WF.WebUserControls.cmp_cartDetIRK" %>
 
 
-<asp:HiddenField id="hfCartID" runat="server" />
+<asp:HiddenField ID="hfCartID" runat="server" />
+<asp:DetailsView ID="detView" runat="server" Width="100%" AutoGenerateRows="False" DataSourceID="odsCart">
+    <Fields>
+        <asp:TemplateField SortExpression="OrderExtCode" ShowHeader="false">
+            <ItemTemplate>
+                <div class="row text-center ">
+                    <div class="col-6 ">
+                        order: <asp:Label ID="OrderExtCodeLabel" runat="server" Text='<%# Eval("OrderExtCode") %>' CssClass="h3" />
+                    </div>
+                    <div class="col-6">
+                        cart: <asp:Label ID="CartDtmxLabel" runat="server" Text='<%# Eval("CartDtmx") %>' CssClass="h3" />
+                    </div>
+                </div>
+            </ItemTemplate>
+        </asp:TemplateField>
+    </Fields>
+</asp:DetailsView>
+<asp:ObjectDataSource ID="odsCart" runat="server" OldValuesParameterFormatString="original_{0}" SelectMethod="GetData" TypeName="AppData.DS_AppTableAdapters.CartIRKTableAdapter">
+    <SelectParameters>
+        <asp:ControlParameter ControlID="hfCartID" DefaultValue="0" Name="CartID" PropertyName="Value" Type="Int32" />
+    </SelectParameters>
+</asp:ObjectDataSource>
+
 
 <asp:GridView runat="server" ID="grView" CssClass="table table-sm table-striped small" AutoGenerateColumns="False" DataSourceID="ods">
     <Columns>
-        <asp:BoundField DataField="OrderExtCode" HeaderText="OrderExtCode" SortExpression="OrderExtCode" />
-        <asp:BoundField DataField="CartDtmx" HeaderText="CartDtmx" SortExpression="CartDtmx" />
-        <asp:BoundField DataField="ItemExtCode" HeaderText="ItemExtCode" SortExpression="ItemExtCode" />
-        <asp:BoundField DataField="ItemDesc" HeaderText="ItemDesc" SortExpression="ItemDesc" />
-        <asp:BoundField DataField="ItemNote" HeaderText="ItemNote" SortExpression="ItemNote" />
-        <asp:BoundField DataField="TotReq" HeaderText="TotReq" ReadOnly="True" SortExpression="TotReq" />
-        <asp:BoundField DataField="TotCur" HeaderText="TotCur" ReadOnly="True" SortExpression="TotCur" />
-        <asp:BoundField DataField="MatExtCode" HeaderText="MatExtCode" SortExpression="MatExtCode" />
-        <asp:BoundField DataField="MatDesc" HeaderText="MatDesc" SortExpression="MatDesc" />
+        <%--<asp:BoundField DataField="OrderExtCode" HeaderText="OrderExtCode" SortExpression="OrderExtCode" />
+        <asp:BoundField DataField="CartDtmx" HeaderText="CartDtmx" SortExpression="CartDtmx" />--%>
+        <asp:BoundField DataField="ItemExtCode" HeaderText="Part" SortExpression="ItemExtCode" />
+        <asp:BoundField DataField="ItemDesc" HeaderText="Description" SortExpression="ItemDesc" />
+        <%--<asp:BoundField DataField="ItemNote" HeaderText="ItemNote" SortExpression="ItemNote" />--%>
+        <asp:BoundField DataField="TotReq" HeaderText="Req Qty" ReadOnly="True" SortExpression="TotReq" />
+        <asp:BoundField DataField="TotCur" HeaderText="Scan Qty" ReadOnly="True" SortExpression="TotCur" />
+        <asp:BoundField DataField="MatExtCode" HeaderText="Material" SortExpression="MatExtCode" />
+        <asp:BoundField DataField="MatDesc" HeaderText="Mat Description" SortExpression="MatDesc" />
     </Columns>
 
 </asp:GridView>
@@ -21,4 +43,4 @@
     <SelectParameters>
         <asp:ControlParameter ControlID="hfCartID" DefaultValue="0" Name="CartID" PropertyName="Value" Type="Int32" />
     </SelectParameters>
-</asp:ObjectDataSource>
\ No newline at end of file
+</asp:ObjectDataSource>
diff --git a/NKC_WF/WebUserControls/cmp_cartDetIRK.ascx.designer.cs b/NKC_WF/WebUserControls/cmp_cartDetIRK.ascx.designer.cs
index 0546521..39bf718 100644
--- a/NKC_WF/WebUserControls/cmp_cartDetIRK.ascx.designer.cs
+++ b/NKC_WF/WebUserControls/cmp_cartDetIRK.ascx.designer.cs
@@ -23,6 +23,24 @@ namespace NKC_WF.WebUserControls
         /// </remarks>
         protected global::System.Web.UI.WebControls.HiddenField hfCartID;
 
+        /// <summary>
+        /// Controllo detView.
+        /// </summary>
+        /// <remarks>
+        /// Campo generato automaticamente.
+        /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
+        /// </remarks>
+        protected global::System.Web.UI.WebControls.DetailsView detView;
+
+        /// <summary>
+        /// Controllo odsCart.
+        /// </summary>
+        /// <remarks>
+        /// Campo generato automaticamente.
+        /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
+        /// </remarks>
+        protected global::System.Web.UI.WebControls.ObjectDataSource odsCart;
+
         /// <summary>
         /// Controllo grView.
         /// </summary>
diff --git a/NKC_WF/WebUserControls/cmp_kitList.ascx b/NKC_WF/WebUserControls/cmp_kitList.ascx
index fe6588e..30622c3 100644
--- a/NKC_WF/WebUserControls/cmp_kitList.ascx
+++ b/NKC_WF/WebUserControls/cmp_kitList.ascx
@@ -18,8 +18,22 @@
         <asp:BoundField DataField="StatusDesc" HeaderText="Status" ReadOnly="True" SortExpression="StatusDesc" />
         <asp:BoundField DataField="BatchName" HeaderText="Name" SortExpression="BatchName" />
         <asp:BoundField DataField="ImportDate" HeaderText="Import Date" SortExpression="ImportDate" />
-        <asp:BoundField DataField="NumKit" HeaderText="Kit #" SortExpression="NumKit" />
-        <asp:BoundField DataField="NumParts" HeaderText="Parts #" SortExpression="NumParts" />
+        <asp:TemplateField HeaderText="Unit Qty" SortExpression="NumKit">
+            <HeaderTemplate>
+                <asp:Label ID="NKLabel" runat="server" Text='<%# traduci("NumKit") %>' />
+            </HeaderTemplate>
+            <ItemTemplate>
+                <asp:Label ID="Label1" runat="server" Text='<%# Eval("NumKit") %>' />
+            </ItemTemplate>
+        </asp:TemplateField>
+        <asp:TemplateField HeaderText="Part Qty" SortExpression="NumParts">
+            <HeaderTemplate>
+                <asp:Label ID="NKLabel" runat="server" Text='<%# traduci("NumParts") %>' />
+            </HeaderTemplate>
+            <ItemTemplate>
+                <asp:Label ID="Label2" runat="server" Text='<%# Eval("NumParts") %>' />
+            </ItemTemplate>
+        </asp:TemplateField>
         <asp:BoundField DataField="TotQty" HeaderText="Tot Qty #" SortExpression="TotQty" />
         <asp:TemplateField ShowHeader="False">
             <ItemTemplate>
diff --git a/NKC_WF/WebUserControls/cmp_kitReqRunning.ascx b/NKC_WF/WebUserControls/cmp_kitReqRunning.ascx
index 184a5f7..639ce21 100644
--- a/NKC_WF/WebUserControls/cmp_kitReqRunning.ascx
+++ b/NKC_WF/WebUserControls/cmp_kitReqRunning.ascx
@@ -25,24 +25,35 @@
                     <asp:LinkButton ID="lbtSelect" runat="server" CausesValidation="False" CommandName="Select" CssClass="btn btn-sm btn-info" Visible='<%# showFull %>'><i class="fa fa-search" aria-hidden="true"></i></asp:LinkButton>
                 </div>
             </ItemTemplate>
+
+<ItemStyle Width="2em"></ItemStyle>
         </asp:TemplateField>
         <asp:TemplateField HeaderText="#" SortExpression="PackListID" ItemStyle-Width="5em">
             <ItemTemplate>
                 <div class="text-left">
-                    <asp:Label ID="lblPackListID" runat="server" Text='<%# Bind("PackListID") %>'></asp:Label>
+                    <asp:Label ID="lblPackListID" runat="server" Text='<%# Bind("PackListID") %>' />
                     <asp:HyperLink ID="hlShowMissing" runat="server" Target="_blank" NavigateUrl='<%# $"~/site/PartMIA?PLID={Eval("PackListID")}" %>' CssClass="btn btn-sm btn-warning" ToolTip='<%# traduci("PartMIA") %>' Visible='<%# showFull %>'><i class="fa fa-bug" aria-hidden="true"></i></asp:HyperLink>
                 </div>
             </ItemTemplate>
+
+<ItemStyle Width="5em"></ItemStyle>
         </asp:TemplateField>
         <%--<asp:BoundField DataField="PackListID" HeaderText="#" ReadOnly="True" SortExpression="PackListID" />--%>
         <asp:BoundField DataField="BatchName" HeaderText="Name" SortExpression="Name" />
         <asp:BoundField DataField="StatusDesc" HeaderText="Status" ReadOnly="True" SortExpression="StatusDesc" />
         <%--<asp:BoundField DataField="ImportDate" HeaderText="Import Date" SortExpression="ImportDate" />--%>
         <asp:BoundField DataField="NumCart" HeaderText="Cart #" SortExpression="NumCart" />
-        <asp:BoundField DataField="NumKit" HeaderText="Kit #" SortExpression="NumKit" />
+        <asp:TemplateField SortExpression="NumKit">
+            <HeaderTemplate>
+                <asp:Label ID="NKLabel" runat="server" Text='<%# traduci("NumKit") %>' />
+            </HeaderTemplate>
+            <ItemTemplate>
+                <asp:Label ID="NumKitLabel" runat="server" Text='<%# Eval("NumKit") %>' />
+            </ItemTemplate>
+        </asp:TemplateField>
         <asp:TemplateField HeaderText="Parts n#" SortExpression="NumParts">
             <HeaderTemplate>
-                <asp:Label ID="PartsNumLabel" runat="server" Text='<%# traduci("PartsNum") %>' Visible='<%# showFull %>' />
+                <asp:Label ID="PartsNumLabel" runat="server" Text='<%# traduci("NumParts") %>' Visible='<%# showFull %>' />
             </HeaderTemplate>
             <ItemTemplate>
                 <asp:Label ID="NumPartsLabel" runat="server" Text='<%# Eval("NumParts") %>' Visible='<%# showFull %>' />
diff --git a/NKC_WF/WebUserControls/cmp_kitReqSched.ascx b/NKC_WF/WebUserControls/cmp_kitReqSched.ascx
index 8070619..0134a6e 100644
--- a/NKC_WF/WebUserControls/cmp_kitReqSched.ascx
+++ b/NKC_WF/WebUserControls/cmp_kitReqSched.ascx
@@ -3,7 +3,8 @@
 
 
 
-<h4><asp:Label runat="server" ID="lblTitle"><%: traduci("ScheduledKitReq") %></asp:Label></h4>
+<h4>
+    <asp:Label runat="server" ID="lblTitle"><%: traduci("ScheduledKitReq") %></asp:Label></h4>
 <asp:GridView ID="grView" runat="server" AutoGenerateColumns="False" DataKeyNames="PackListID" DataSourceID="odsKit" Width="100%" CssClass="table table-striped table-sm" OnSelectedIndexChanged="grView_SelectedIndexChanged">
     <HeaderStyle CssClass="default" />
     <PagerStyle CssClass="active GridPager" />
@@ -24,12 +25,16 @@
                     <asp:LinkButton ID="lbtSelect" runat="server" CausesValidation="False" CommandName="Select" CssClass="btn btn-sm btn-info" Visible='<%# showFull %>'><i class="fa fa-search" aria-hidden="true"></i></asp:LinkButton>
                 </div>
             </ItemTemplate>
+
+            <ItemStyle Width="2em"></ItemStyle>
         </asp:TemplateField>
         <asp:TemplateField HeaderText="#" SortExpression="PackListID" ItemStyle-Width="5em">
             <ItemTemplate>
                 <asp:Label ID="lblPackListID" runat="server" Text='<%# Bind("PackListID") %>'></asp:Label>
                 <asp:HyperLink ID="hlShowMissing" runat="server" Target="_blank" NavigateUrl='<%# $"~/site/PartMIA?PLID={Eval("PackListID")}" %>' CssClass="btn btn-sm btn-warning" ToolTip='<%# traduci("PartMIA") %>' Visible='<%# showFull %>'><i class="fa fa-bug" aria-hidden="true"></i></asp:HyperLink>
             </ItemTemplate>
+
+            <ItemStyle Width="5em"></ItemStyle>
         </asp:TemplateField>
         <asp:TemplateField HeaderText="Priority" SortExpression="SchedPrior" ItemStyle-Width="8em">
             <ItemTemplate>
@@ -39,15 +44,24 @@
                 <asp:Label ID="lblSchedPrior" runat="server" Text='<%# Eval("SchedPrior") %>' CssClass="text-center" Width="2em"></asp:Label>
                 <asp:LinkButton ID="lbtDown" runat="server" CommandArgument='<%# Eval("PackListID") %>' CssClass="btn btn-sm btn-primary" OnClick="lbtDown_Click" Visible='<%# checkVisible("last", Eval("SchedPrior")) %>'><i class="fa fa-arrow-down" aria-hidden="true"></i></asp:LinkButton>
             </ItemTemplate>
+
+            <ItemStyle Width="8em"></ItemStyle>
         </asp:TemplateField>
         <asp:BoundField DataField="BatchName" HeaderText="Name" SortExpression="Name" />
         <asp:BoundField DataField="StatusDesc" HeaderText="Status" ReadOnly="True" SortExpression="StatusDesc" />
         <%--<asp:BoundField DataField="ImportDate" HeaderText="Import Date" SortExpression="ImportDate" />--%>
         <asp:BoundField DataField="NumCart" HeaderText="Cart #" SortExpression="NumCart" />
-        <asp:BoundField DataField="NumKit" HeaderText="Kit #" SortExpression="NumKit" />
-        <asp:TemplateField HeaderText="Parts n#" SortExpression="NumParts">
+        <asp:TemplateField SortExpression="NumKit">
             <HeaderTemplate>
-                <asp:Label ID="PartsNumLabel" runat="server" Text='<%# traduci("PartsNum") %>' Visible='<%# showFull %>' />
+                <asp:Label ID="NKLabel" runat="server" Text='<%# traduci("NumKit") %>' />
+            </HeaderTemplate>
+            <ItemTemplate>
+                <asp:Label ID="NumKitLabel" runat="server" Text='<%# Eval("NumKit") %>' />
+            </ItemTemplate>
+        </asp:TemplateField>
+        <asp:TemplateField SortExpression="NumParts">
+            <HeaderTemplate>
+                <asp:Label ID="PartsNumLabel" runat="server" Text='<%# traduci("NumParts") %>' Visible='<%# showFull %>' />
             </HeaderTemplate>
             <ItemTemplate>
                 <asp:Label ID="NumPartsLabel" runat="server" Text='<%# Eval("NumParts") %>' Visible='<%# showFull %>' />
@@ -58,7 +72,9 @@
                 <asp:Label ID="Label1" runat="server" Text='<%# traduci("RatioReadTot") %>' Visible='<%# showFull %>' />
             </HeaderTemplate>
             <ItemTemplate>
-                <b><asp:Label ID="TotQtyLabel" runat="server" Text='<%# Eval("TotConf") %>' Visible='<%# showFull %>' /></b> / <asp:Label ID="Label1" runat="server" Text='<%# Eval("TotQty") %>' Visible='<%# showFull %>' />
+                <b>
+                    <asp:Label ID="TotConfLabel" runat="server" Text='<%# Eval("TotConf") %>' Visible='<%# showFull %>' /></b> /
+                <asp:Label ID="TotQtyLabel" runat="server" Text='<%# Eval("TotQty") %>' Visible='<%# showFull %>' />
             </ItemTemplate>
         </asp:TemplateField>
     </Columns>
diff --git a/NKC_WF/WebUserControls/cmp_kitRunning.ascx b/NKC_WF/WebUserControls/cmp_kitRunning.ascx
index fd892e5..516d64a 100644
--- a/NKC_WF/WebUserControls/cmp_kitRunning.ascx
+++ b/NKC_WF/WebUserControls/cmp_kitRunning.ascx
@@ -7,8 +7,8 @@
             <div class="col-3 col-lg text-center textCondens"><b><asp:Label ID="BatchNameLabel" runat="server" Text='<%# Eval("BatchName") %>' /></b></div>
             <div class="col-3 col-lg text-center textCondens"><b><asp:Label ID="StatusDescLabel" runat="server" Text='<%# Eval("StatusDesc") %>' /></b></div>
             <div class="col-3 col-lg text-center textCondens">Cart #: <b><asp:Label ID="NumKitLabel" runat="server" Text='<%# Eval("NumCart") %>' /></b></div>
-            <div class="col-3 col-lg text-center textCondens">KIT #: <b><asp:Label ID="Label1" runat="server" Text='<%# Eval("NumKit") %>' /></b></div>
-            <div class="col-3 col-lg text-center textCondens">Parts #: <b><asp:Label ID="NumPartsLabel" runat="server" Text='<%# Eval("NumParts") %>' /></b></div>
+            <div class="col-3 col-lg text-center textCondens"><%# traduci("NumKit") %>': <b><asp:Label ID="Label1" runat="server" Text='<%# Eval("NumKit") %>' /></b></div>
+            <div class="col-3 col-lg text-center textCondens"><%# traduci("NumParts") %>': <b><asp:Label ID="NumPartsLabel" runat="server" Text='<%# Eval("NumParts") %>' /></b></div>
             <div class="col-3 col-lg text-center textCondens">Read / Tot #: <b><asp:Label ID="TotConfLabel" runat="server" Text='<%# Eval("TotConf") %>' /></b> / <b><asp:Label ID="TotQtyLabel" runat="server" Text='<%# Eval("TotQty") %>' /></b></div>
         </div>
     </ItemTemplate>