From 95cf0988615be5462ca0c3317d9163b42adafa82 Mon Sep 17 00:00:00 2001
From: "Samuele E. Locatelli" <samuele@steamware.net>
Date: Tue, 20 Oct 2020 21:49:23 +0200
Subject: [PATCH 1/2] refresh spazio x kitting unload (6 blocks)

---
 NKC_WF/WebUserControls/cmp_kitting.ascx     |  23 ++--
 NKC_WF/WebUserControls/cmp_kittingBin.ascx  | 111 ++++++++++----------
 NKC_WF/WebUserControls/cmp_kittingCart.ascx |  26 ++---
 NKC_WF/site/Kitting.aspx                    |   8 +-
 4 files changed, 80 insertions(+), 88 deletions(-)

diff --git a/NKC_WF/WebUserControls/cmp_kitting.ascx b/NKC_WF/WebUserControls/cmp_kitting.ascx
index 858f083..fa3afeb 100644
--- a/NKC_WF/WebUserControls/cmp_kitting.ascx
+++ b/NKC_WF/WebUserControls/cmp_kitting.ascx
@@ -3,23 +3,14 @@
 <%@ Register Src="~/WebUserControls/cmp_kittingCart.ascx" TagPrefix="uc1" TagName="cmp_kittingCart" %>
 
 <div class="card text-center border-primary" style="width: 100%;">
-  <h3 class="card-header bg-primary text-uppercase text-light"><%: traduci("BinList") %></h3>
-  <div class="card-body py-1">
-    <div class="row">
-      <div class="col-12 mb-2">
-        <uc1:cmp_kittingBin runat="server" id="cmp_kittingBin" />
-      </div>
+    <h3 class="card-header bg-primary text-uppercase text-light"><%: traduci("BinList") %></h3>
+    <div class="card-body py-1">
+        <uc1:cmp_kittingBin runat="server" ID="cmp_kittingBin" />
     </div>
-  </div>
 </div>
 <div class="card text-center border-success my-2" style="width: 100%;">
-  <h3 class="card-header bg-success text-uppercase"><%: traduci("CartList") %></h3>
-  <div class="card-body py-1">
-    <div class="row">
-      <div class="col-12 mb-2">
-        <uc1:cmp_kittingCart runat="server" id="cmp_kittingCart" />
-      </div>
+    <h3 class="card-header bg-success text-uppercase"><%: traduci("CartList") %></h3>
+    <div class="card-body py-1">
+        <uc1:cmp_kittingCart runat="server" ID="cmp_kittingCart" />
     </div>
-  </div>
-</div>
-
+</div>
\ No newline at end of file
diff --git a/NKC_WF/WebUserControls/cmp_kittingBin.ascx b/NKC_WF/WebUserControls/cmp_kittingBin.ascx
index 6113452..a80051a 100644
--- a/NKC_WF/WebUserControls/cmp_kittingBin.ascx
+++ b/NKC_WF/WebUserControls/cmp_kittingBin.ascx
@@ -1,59 +1,60 @@
 <%@ Control Language="C#" AutoEventWireup="true" CodeBehind="cmp_kittingBin.ascx.cs" Inherits="NKC_WF.WebUserControls.cmp_kittingBin" %>
 
-
 <div class="row">
-  <asp:Repeater runat="server" ID="repBins" DataSourceID="ods">
-    <ItemTemplate>
-      <div class="col-2 mx-1">
-        <div runat="server" id="divBlock" class="row small alert border-thick p-0 pb-2 alert-primary border border-primary" role="alert">
-          <div class="col-12 bg-primary text-light pt-2">
-            <h5>
-              <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">
-               <%: 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">
-               <%: 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") %>
-          </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">
-             <%: 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">
-               <%: 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") %>' />
-          </div>
-        </div>
-      </div>
-    </ItemTemplate>
-  </asp:Repeater>
-  <asp:ObjectDataSource runat="server" ID="ods" OldValuesParameterFormatString="original_{0}" SelectMethod="getByStatus" TypeName="AppData.DS_AppTableAdapters.BinsTableAdapter">
-    <SelectParameters>
-      <asp:Parameter DefaultValue="True" Name="Fillup" Type="Boolean" />
-      <asp:Parameter DefaultValue="False" Name="Complete" Type="Boolean" />
-      <asp:Parameter DefaultValue="True" Name="Painted" Type="Boolean" />
-      <asp:Parameter DefaultValue="True" Name="OnKitStation" Type="Boolean" />
-    </SelectParameters>
-  </asp:ObjectDataSource>
+    <asp:Repeater runat="server" ID="repBins" DataSourceID="ods">
+        <ItemTemplate>
+            <div class="col-2">
+                <div runat="server" id="divBlock" class="row small alert border-thick m-0 px-0 pb-2 alert-primary border border-primary" role="alert">
+                    <div class="col-12 bg-primary text-light pt-2">
+                        <h5>
+                            <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">
+                        <%: 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">
+                        <%: 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") %>
+                    </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">
+                        <%: 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">
+                        <%: 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") %>' />
+                    </div>
+                </div>
+            </div>
+        </ItemTemplate>
+    </asp:Repeater>
+    <asp:ObjectDataSource runat="server" ID="ods" OldValuesParameterFormatString="original_{0}" SelectMethod="getByStatus" TypeName="AppData.DS_AppTableAdapters.BinsTableAdapter">
+        <SelectParameters>
+            <asp:Parameter DefaultValue="True" Name="Fillup" Type="Boolean" />
+            <asp:Parameter DefaultValue="False" Name="Complete" Type="Boolean" />
+            <asp:Parameter DefaultValue="True" Name="Painted" Type="Boolean" />
+            <asp:Parameter DefaultValue="True" Name="OnKitStation" Type="Boolean" />
+        </SelectParameters>
+    </asp:ObjectDataSource>
 </div>
\ No newline at end of file
diff --git a/NKC_WF/WebUserControls/cmp_kittingCart.ascx b/NKC_WF/WebUserControls/cmp_kittingCart.ascx
index db93d66..81d296f 100644
--- a/NKC_WF/WebUserControls/cmp_kittingCart.ascx
+++ b/NKC_WF/WebUserControls/cmp_kittingCart.ascx
@@ -3,74 +3,74 @@
 <div class="row">
     <asp:Repeater runat="server" ID="repCarts" DataSourceID="ods">
         <ItemTemplate>
-            <div class="col-2 mx-1">
+            <div class="col-2">
                 <div runat="server" id="divBlock" class='<%# "row small alert border-thick p-0 pb-2 border " + getCssByNums(Eval("NumPzWaiting"),Eval("NumPzBinAvail"),Eval("OtherQtyWait"),Eval("OtherQtyCur")) %>' role="alert">
                     <div class="col-12 bg-success text-light pt-2">
                         <h5>
                             <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">
-                         <%: traduci("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">
-                         <%: traduci("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">
-                         <%: traduci("DestPlant") %>
+                        <%: 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">
-                         <%: traduci("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> <%: traduci("CncParts") %> </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">
-                         <%: traduci("Wait") %>
+                        <%: traduci("Wait") %>
                         <asp:Label runat="server" ID="lblWait" CssClass="font-weight-bold" Text='<%# Eval("NumPzWaiting") %>' />
                     </div>
                     <div class="col-4 text-center">
-                         <%: traduci("Ready") %>
+                        <%: traduci("Ready") %>
                         <asp:Label runat="server" ID="Label3" CssClass="font-weight-bold" Text='<%# Eval("NumPzBinAvail") %>' />
                     </div>
                     <div class="col-4 text-right">
-                         <%: traduci("Cart") %>
+                        <%: 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">
-                         <%: traduci("OtherParts") %>
+                        <%: 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">
-                         <%: traduci("Wait") %>
+                        <%: 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">
-                         <%: traduci("Cart") %>
+                        <%: traduci("Cart") %>
                         <asp:Label runat="server" ID="Label9" CssClass="font-weight-bold" Text='<%# Eval("OtherQtyCur") %>' />
                     </div>
                 </div>
@@ -78,4 +78,4 @@
         </ItemTemplate>
     </asp:Repeater>
     <asp:ObjectDataSource ID="ods" runat="server" OldValuesParameterFormatString="original_{0}" SelectMethod="GetData" TypeName="AppData.DS_AppTableAdapters.CartOnKitTableAdapter"></asp:ObjectDataSource>
-</div>
+</div>
\ No newline at end of file
diff --git a/NKC_WF/site/Kitting.aspx b/NKC_WF/site/Kitting.aspx
index 5b39a2d..516eafc 100644
--- a/NKC_WF/site/Kitting.aspx
+++ b/NKC_WF/site/Kitting.aspx
@@ -6,11 +6,11 @@
 <asp:Content ID="Content1" ContentPlaceHolderID="MainContent" runat="server">
     <asp:UpdatePanel runat="server" ID="UpdatePanel2" UpdateMode="Conditional">
         <ContentTemplate>
-            <asp:Timer ID="timerKitting" runat="server" Interval="1000" OnTick="timerKitting_Tick"></asp:Timer>
-            <div class="m-2">
-                <uc1:cmp_kitReqRunning runat="server" ID="cmp_kitReqRunning" enableSuspend="true" showFull="true" showTitle="false"/>
+            <asp:Timer ID="timerKitting" runat="server" Interval="100000" OnTick="timerKitting_Tick"></asp:Timer>
+            <div class="m-1">
+                <uc1:cmp_kitReqRunning runat="server" ID="cmp_kitReqRunning" enableSuspend="true" showFull="true" showTitle="false" />
                 <uc1:cmp_kitting runat="server" ID="cmp_kitting" />
             </div>
         </ContentTemplate>
     </asp:UpdatePanel>
-</asp:Content>
+</asp:Content>
\ No newline at end of file

From b3a82b9ab51f361f2c82a2bc3290d2e4c64491e1 Mon Sep 17 00:00:00 2001
From: "Samuele E. Locatelli" <samuele@steamware.net>
Date: Tue, 20 Oct 2020 21:49:36 +0200
Subject: [PATCH 2/2] new rel 373

---
 Jenkinsfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index cf73f02..1dc2fe1 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -11,7 +11,7 @@ pipeline {
       steps {
       /* calcolo numero versione... diverso x branch MASTER/DEVELOP */
       script {
-        withEnv(['NEXT_BUILD_NUMBER=372']) {
+        withEnv(['NEXT_BUILD_NUMBER=373']) {
           // env.versionNumber = VersionNumber(versionNumberString : '1.2.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2019-07-01', skipFailedBuilds: true)
           env.versionNumber = VersionNumber(versionNumberString : '1.2.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2019-07-01', skipFailedBuilds: true, overrideBuildsAllTime: '${NEXT_BUILD_NUMBER}')
           env.versionNumberBeta = VersionNumber(versionNumberString : '1.2.${BUILD_DATE_FORMATTED, "yyMM"}-beta.${BUILDS_ALL_TIME}', projectStartDate : '2019-07-01', skipFailedBuilds: true, overrideBuildsAllTime: '${NEXT_BUILD_NUMBER}')