From e3716141291f8bac8cdcb45341bbf3d5808f8d0d Mon Sep 17 00:00:00 2001
From: "Samuele E. Locatelli" <samuele@steamware.net>
Date: Fri, 31 Jan 2020 09:51:34 +0100
Subject: [PATCH 1/2] Fixed elenco BATCH

---
 Jenkinsfile                                   |  2 +-
 NKC_WF/WebUserControls/cmp_stackBuilding.ascx |  8 ++--
 NKC_WF/WebUserControls/cmp_taktList.ascx      | 39 +++++++++++--------
 NKC_WF/site/StackManager.aspx                 |  8 ++--
 4 files changed, 31 insertions(+), 26 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index 6d82d24..7719b9a 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -17,7 +17,7 @@ pipeline {
 
       /* calcolo numero versione... diverso x branch MASTER/DEVELOP */
       script {
-        withEnv(['NEXT_BUILD_NUMBER=242']) {
+        withEnv(['NEXT_BUILD_NUMBER=243']) {
           // env.versionNumber = VersionNumber(versionNumberString : '0.9.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2019-07-01', skipFailedBuilds: true)
           env.versionNumber = VersionNumber(versionNumberString : '0.9.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2019-07-01', skipFailedBuilds: true, overrideBuildsAllTime: '${NEXT_BUILD_NUMBER}')
           env.versionNumberBeta = VersionNumber(versionNumberString : '0.9.${BUILD_DATE_FORMATTED, "yyMM"}-beta.${BUILDS_ALL_TIME}', projectStartDate : '2019-07-01', skipFailedBuilds: true, overrideBuildsAllTime: '${NEXT_BUILD_NUMBER}')
diff --git a/NKC_WF/WebUserControls/cmp_stackBuilding.ascx b/NKC_WF/WebUserControls/cmp_stackBuilding.ascx
index aadb574..c844f20 100644
--- a/NKC_WF/WebUserControls/cmp_stackBuilding.ascx
+++ b/NKC_WF/WebUserControls/cmp_stackBuilding.ascx
@@ -14,10 +14,10 @@
       <div class="col-12 col-lg-6">
 
         <%--<asp:HyperLink runat="server" ID="hlPrint" NavigateUrl="https://qrcode.steamware.net/HOME/QR_site/JSON?val={%27baseUrl%27:%27http://10.74.82.219/StockMan/STEA/Items/Details/{0}?StockItemID={0}%27,%27parameters%27:[%27534%27]}" Target="_blank" CssClass="btn btn-lg btn-success btn-block">--%>
-        <asp:LinkButton runat="server" ID="lbtPrint" CssClass="btn btn-lg btn-success btn-block" OnClick="lbtPrint_Click">
-          <div class="row text-center">
-            <div class="col-8 bigText">PRINT</div>
-            <div class="col-4"><i class="fa fa-print fa-2x" aria-hidden="true"></i></div>
+        <asp:LinkButton runat="server" ID="lbtPrint" CssClass="btn btn-success btn-block" OnClick="lbtPrint_Click">
+          <div class="row text-center bigText">
+            <div class="col-8">PRINT</div>
+            <div class="col-4"><i class="fa fa-print" aria-hidden="true"></i></div>
           </div>
         </asp:LinkButton>
         <%--</asp:HyperLink>--%>
diff --git a/NKC_WF/WebUserControls/cmp_taktList.ascx b/NKC_WF/WebUserControls/cmp_taktList.ascx
index e61ad51..fc2f492 100644
--- a/NKC_WF/WebUserControls/cmp_taktList.ascx
+++ b/NKC_WF/WebUserControls/cmp_taktList.ascx
@@ -31,27 +31,32 @@
             <asp:LinkButton ID="lbSelect" runat="server" CausesValidation="False" CommandName="Select" CssClass="btn btn-sm btn-primary" CommandArgument='<%# Eval("Takt") %>'><i class="fa fa-search" aria-hidden="true"></i></asp:LinkButton>
           </ItemTemplate>
         </asp:TemplateField>
-        <asp:BoundField DataField="Takt" HeaderText="Date" InsertVisible="False" ReadOnly="True" SortExpression="Takt" />
-        <asp:TemplateField HeaderText="Status" SortExpression="Status">
+        <asp:TemplateField HeaderText="Batch Name" SortExpression="Takt">
           <ItemTemplate>
-            <asp:Label ID="lblStatus" runat="server" CssClass='<%# cssByStatus(Eval("Status"))  %>'><%# BStatus(Eval("Status")) %></asp:Label>
-          </ItemTemplate>
-        </asp:TemplateField>
-        <asp:TemplateField HeaderText="Activity" SortExpression="Position">
-          <ItemTemplate>
-            <asp:Label ID="lblPosition" runat="server" Text='<%# BatchPositionStatus(Eval("Position")) %>' />
-          </ItemTemplate>
-          <ItemStyle CssClass="text-right" />
-        </asp:TemplateField>
-        <asp:TemplateField HeaderText="# Stacks" SortExpression="NumStacks">
-          <ItemTemplate>
-            <div runat="server" id="divMain" class='<%# "row mx-1 " + cssByPosition(Eval("Position")) %>'>
-              <div class="col-6 pl-1 text-left">Staks #: <b><%# Eval("NumStacks") %></b> --> <%# Eval("NumSheets") %> Sheets</div>
-              <div class="col-6 pr-1">Orders: <b><%# Eval("NumOrders") %></b> --> <%# Eval("NumItems") %> Items</div>
+            <div class="row">
+              <div class="col-12 col-md-4 col-lg-2">
+                <asp:Label ID="Label1" runat="server" Text='<%# Eval("Takt") %>'></asp:Label>
+              </div>
+              <div class="col-6 col-md-4 col-lg-2">
+                <asp:Label ID="lblStatus" runat="server" CssClass='<%# cssByStatus(Eval("Status"))  %>'><%# BStatus(Eval("Status")) %></asp:Label>
+              </div>
+              <div class="col-6 col-md-4 col-lg-2">
+                <asp:Label ID="lblPosition" runat="server" Text='<%# BatchPositionStatus(Eval("Position")) %>' />
+              </div>
+              <div class="col-12 col-lg-6">
+                <div runat="server" id="divMain" class='<%# "row mx-1 " + cssByPosition(Eval("Position")) %>'>
+                  <div class="col-6 pl-1 text-left">Staks #: <b><%# Eval("NumStacks") %></b> --> <%# Eval("NumSheets") %> Sheets</div>
+                  <div class="col-6 pr-1">Orders: <b><%# Eval("NumOrders") %></b> --> <%# Eval("NumItems") %> Items</div>
+                </div>
+              </div>
             </div>
           </ItemTemplate>
-          <ItemStyle CssClass="text-right" />
         </asp:TemplateField>
+        <%--<asp:TemplateField HeaderText="# Stacks" SortExpression="NumStacks">
+          <ItemTemplate>
+          </ItemTemplate>
+          <ItemStyle CssClass="text-right" />
+        </asp:TemplateField>--%>
       </Columns>
     </asp:GridView>
     <asp:ObjectDataSource ID="ods" runat="server" OldValuesParameterFormatString="original_{0}" SelectMethod="getByMaxPosition" TypeName="AppData.DS_AppTableAdapters.BatchListTableAdapter">
diff --git a/NKC_WF/site/StackManager.aspx b/NKC_WF/site/StackManager.aspx
index 2638348..83a7d60 100644
--- a/NKC_WF/site/StackManager.aspx
+++ b/NKC_WF/site/StackManager.aspx
@@ -8,11 +8,11 @@
 
 <asp:Content ID="Content1" ContentPlaceHolderID="MainContent" runat="server">
   <div class="row">
-    <div class="col-lg-3"></div>
-    <div class="col-12 col-lg-6">
+    <div class="col-lg-2"></div>
+    <div class="col-12 col-lg-8">
       <div class="card" style="width: 100%;">
         <h4 class="card-header text-uppercase text-center"><%: traduci("StackManager") %></h4>
-        <div class="card-body py-1 textCondens">
+        <div class="card-body p-1 textCondens">
           <div class="row">
             <div class="col-12">
               <uc1:cmp_taktList runat="server" ID="cmp_taktList" />
@@ -23,6 +23,6 @@
         </div>
       </div>
     </div>
-    <div class="col-lg-3"></div>
+    <div class="col-lg-2"></div>
   </div>
 </asp:Content>

From f65d227c8883b9ec629300570a0f13f73bb2ab11 Mon Sep 17 00:00:00 2001
From: "Samuele E. Locatelli" <samuele@steamware.net>
Date: Fri, 31 Jan 2020 09:52:51 +0100
Subject: [PATCH 2/2] Fix anche bunk

---
 NKC_WF/WebUserControls/cmp_stackList.ascx | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/NKC_WF/WebUserControls/cmp_stackList.ascx b/NKC_WF/WebUserControls/cmp_stackList.ascx
index e63093d..bda5b84 100644
--- a/NKC_WF/WebUserControls/cmp_stackList.ascx
+++ b/NKC_WF/WebUserControls/cmp_stackList.ascx
@@ -30,12 +30,12 @@
             <asp:LinkButton ID="lbSelect" runat="server" CausesValidation="False" CommandName="Select" CommandArgument='<%# Eval("StackIndex") %>' CssClass="btn btn-sm btn-primary"><i class="fa fa-search" aria-hidden="true"></i></asp:LinkButton>
           </ItemTemplate>
         </asp:TemplateField>
-        <asp:BoundField DataField="StackIndex" HeaderText="Bunk #" ReadOnly="True" SortExpression="StackIndex" />
+        <asp:BoundField DataField="StackIndex" HeaderText="#" ReadOnly="True" SortExpression="StackIndex" />
         <asp:TemplateField HeaderText="Sheets (Prepared / Total)" SortExpression="NumSheets">
           <ItemTemplate>
             <div runat="server" id="divMain" class='<%# "row mx-1 " + cssByPrepared(Eval("NumSheets"),Eval("NumSheetsPrepared")) %>'>
-              <div class="col-9 pl-1 text-left">Sheets: <b><%# Eval("NumSheetsPrepared") %></b> / <%# Eval("NumSheets") %></div>
-              <div class="col-3 pr-1">items: <b><%# Eval("NumItems") %></b></div>
+              <div class="col-6 pl-1 text-left">Sheets: <b><%# Eval("NumSheetsPrepared") %></b> / <%# Eval("NumSheets") %></div>
+              <div class="col-6 pr-1">items: <b><%# Eval("NumItems") %></b></div>
             </div>
           </ItemTemplate>
           <ItemStyle CssClass="text-right" />