From 00befefcab654aaced0263add92cf98e831b13d8 Mon Sep 17 00:00:00 2001
From: "Samuele E. Locatelli" <samuele@steamware.net>
Date: Mon, 24 Aug 2020 20:46:25 +0200
Subject: [PATCH] completata review dettaglio PL e cart

---
 NKC_WF/WebUserControls/cmp_kitReqRunning.ascx | 5 +++--
 NKC_WF/WebUserControls/cmp_kitReqSched.ascx   | 5 +++--
 NKC_WF/site/KitRequestSched.aspx              | 2 +-
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/NKC_WF/WebUserControls/cmp_kitReqRunning.ascx b/NKC_WF/WebUserControls/cmp_kitReqRunning.ascx
index 9e2d4a3..63be5d4 100644
--- a/NKC_WF/WebUserControls/cmp_kitReqRunning.ascx
+++ b/NKC_WF/WebUserControls/cmp_kitReqRunning.ascx
@@ -38,6 +38,7 @@
         <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">
             <HeaderTemplate>
@@ -49,10 +50,10 @@
         </asp:TemplateField>
         <asp:TemplateField HeaderText="Tot Qty #" SortExpression="TotQty">
             <HeaderTemplate>
-                <asp:Label ID="TotNumLabel" runat="server" Text='<%# traduci("TotNum") %>' Visible='<%# showFull %>' />
+                <asp:Label ID="TotNumLabel" runat="server" Text='<%# traduci("RatioReadTot") %>' Visible='<%# showFull %>' />
             </HeaderTemplate>
             <ItemTemplate>
-                <asp:Label ID="TotQtyLabel" runat="server" Text='<%# Eval("TotQty") %>' Visible='<%# showFull %>' />
+                <b><asp:Label ID="TotQtyLabel" runat="server" Text='<%# Eval("TotConf") %>' Visible='<%# showFull %>' /></b> / <asp:Label ID="Label1" runat="server" Text='<%# Eval("TotQty") %>' Visible='<%# showFull %>' />
             </ItemTemplate>
         </asp:TemplateField>
         <asp:TemplateField HeaderText="">
diff --git a/NKC_WF/WebUserControls/cmp_kitReqSched.ascx b/NKC_WF/WebUserControls/cmp_kitReqSched.ascx
index 210ada8..3168779 100644
--- a/NKC_WF/WebUserControls/cmp_kitReqSched.ascx
+++ b/NKC_WF/WebUserControls/cmp_kitReqSched.ascx
@@ -43,6 +43,7 @@
         <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">
             <HeaderTemplate>
@@ -54,10 +55,10 @@
         </asp:TemplateField>
         <asp:TemplateField HeaderText="Tot Qty #" SortExpression="TotQty">
             <HeaderTemplate>
-                <asp:Label ID="TotNumLabel" runat="server" Text='<%# traduci("TotNum") %>' Visible='<%# showFull %>' />
+                <asp:Label ID="Label1" runat="server" Text='<%# traduci("RatioReadTot") %>' Visible='<%# showFull %>' />
             </HeaderTemplate>
             <ItemTemplate>
-                <asp:Label ID="TotQtyLabel" runat="server" Text='<%# Eval("TotQty") %>' Visible='<%# showFull %>' />
+                <b><asp:Label ID="TotQtyLabel" runat="server" Text='<%# Eval("TotConf") %>' Visible='<%# showFull %>' /></b> / <asp:Label ID="Label1" runat="server" Text='<%# Eval("TotQty") %>' Visible='<%# showFull %>' />
             </ItemTemplate>
         </asp:TemplateField>
     </Columns>
diff --git a/NKC_WF/site/KitRequestSched.aspx b/NKC_WF/site/KitRequestSched.aspx
index d37878c..a6749a1 100644
--- a/NKC_WF/site/KitRequestSched.aspx
+++ b/NKC_WF/site/KitRequestSched.aspx
@@ -15,7 +15,7 @@
                         <asp:UpdatePanel runat="server" ID="upnlBCode" UpdateMode="Conditional" ChildrenAsTriggers="true">
                             <ContentTemplate>
                                 <asp:Timer ID="timerLoad" runat="server" Interval="2000" OnTick="timerLoad_Tick"></asp:Timer>
-                                <uc1:cmp_kitReqRunning runat="server" ID="cmp_kitReqRunning" showFull="true" enableSuspend="true" />
+                                <uc1:cmp_kitReqRunning runat="server" ID="cmp_kitReqRunning" showFull="true" enableSuspend="true" showTitle="true" />
                                 <uc1:cmp_kitReqSched runat="server" ID="cmp_kitReqSched" showFull="true" />
                             </ContentTemplate>
                         </asp:UpdatePanel>