From 8dfcc2fb4e38cb153c0f257bfa4219cea2bb774b Mon Sep 17 00:00:00 2001
From: "Samuele E. Locatelli" <samuele@steamware.net>
Date: Tue, 15 Sep 2020 19:13:47 +0200
Subject: [PATCH 1/2] new vers

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

diff --git a/Jenkinsfile b/Jenkinsfile
index 198471f..3aedf95 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -11,7 +11,7 @@ pipeline {
       steps {
       /* calcolo numero versione... diverso x branch MASTER/DEVELOP */
       script {
-        withEnv(['NEXT_BUILD_NUMBER=367']) {
+        withEnv(['NEXT_BUILD_NUMBER=368']) {
           // 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}')

From 2fc720be9299023fc010a182b3b94cee813d6db8 Mon Sep 17 00:00:00 2001
From: "Samuele E. Locatelli" <samuele@steamware.net>
Date: Tue, 15 Sep 2020 19:13:57 +0200
Subject: [PATCH 2/2] Aggiunta idx sheet in pagina LOAD

---
 NKC_WF/WebUserControls/cmp_ML_ShDet.ascx | 143 ++++++++++++-----------
 1 file changed, 75 insertions(+), 68 deletions(-)

diff --git a/NKC_WF/WebUserControls/cmp_ML_ShDet.ascx b/NKC_WF/WebUserControls/cmp_ML_ShDet.ascx
index 208b030..af84ef4 100644
--- a/NKC_WF/WebUserControls/cmp_ML_ShDet.ascx
+++ b/NKC_WF/WebUserControls/cmp_ML_ShDet.ascx
@@ -6,75 +6,82 @@
 <asp:HiddenField runat="server" ID="hfStatusEnd" />
 <asp:HiddenField ID="hfBatchID" runat="server" />
 <asp:FormView ID="frmView" runat="server" Width="100%" DataKeyNames="SheetID" DataSourceID="ods">
-  <ItemTemplate>
-    <div runat="server" id="divBlock" class='<%# "row small alert border-thick px-0 " + getCss(Eval("ShStatus")) %>' role="alert">
-      <div class="col-12">
-        <h5><asp:Label runat="server" ID="lblTitle" Text='<%# getTitle(Eval("ShStatus")) %>' CssClass="text-uppercase" /></h5>
-      </div>
-      <div class="col-8 text-left">
-        <b>
-          <asp:Label ID="MatExtCodeLabel" runat="server" Text='<%# Eval("MatExtCode") %>' /></b>
-      </div>
-      <div class="col-4 text-right">
-          <%: 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">
-          <%: traduci("Sheet") %>
-          <b>
-          <asp:Label ID="SheetIndexLabel" runat="server" Text='<%# Eval("SheetIndex") %>' /></b>
-      </div>
-      <div class="col-4 text-center">
-        L (mm)<br />
-        <asp:Label ID="L_mmLabel" runat="server" Text='<%# Eval("L_mm") %>' />
-      </div>
-      <div class="col-4 text-center">
-        W (mm)<br />
-        <asp:Label ID="W_mmLabel" runat="server" Text='<%# Eval("W_mm") %>' />
-      </div>
-      <div class="col-4 text-center">
-        T (mm)<br />
-        <asp:Label ID="T_mmLabel" runat="server" Text='<%# Eval("T_mm") %>' />
-      </div>
-      <div class="col-2 text-left">
-        <i class="fa fa-qrcode" aria-hidden="true"></i>
-      </div>
-      <div class="col-5 text-right">
-        <asp:Label ID="PrntStartLabel" runat="server" Text='<%# Eval("PrntStart","{0:HH:mm:ss}") %>' />
-      </div>
-      <div class="col-5 text-right">
-        <asp:Label ID="PrntEndLabel" runat="server" Text='<%# Eval("PrntEnd","{0:HH:mm:ss}") %>' />
-      </div>
-      <div class="col-2 text-left">
-        <i class="fa fa-scissors" aria-hidden="true"></i>
-      </div>
-      <div class="col-5 text-right">
-        <asp:Label ID="WrkStartLabel" runat="server" Text='<%# Eval("WrkStart","{0:HH:mm:ss}") %>' />
-      </div>
-      <div class="col-5 text-right">
-        <asp:Label ID="WrkEndLabel" runat="server" Text='<%# Eval("WrkEnd","{0:HH:mm:ss}") %>' />
-      </div>
-      <div class="col-2 text-left">
-        <i class="fa fa-download" aria-hidden="true"></i>
-      </div>
-      <div class="col-5 text-right">
-        <asp:Label ID="UnlStartLabel" runat="server" Text='<%# Eval("UnlStart","{0:HH:mm:ss}") %>' />
-      </div>
-      <div class="col-5 text-right">
-        <asp:Label ID="UnlEndLabel" runat="server" Text='<%# Eval("UnlEnd","{0:HH:mm:ss}") %>' />
-      </div>
-    </div>
+    <ItemTemplate>
+        <div runat="server" id="divBlock" class='<%# "row small alert border-thick px-0 " + getCss(Eval("ShStatus")) %>' role="alert">
+            <div class="col-4 pr-0">
+            </div>
+            <div class="col-4 px-0">
+                <h5>
+                    <asp:Label runat="server" ID="lblTitle" Text='<%# getTitle(Eval("ShStatus")) %>' CssClass="text-uppercase" /></h5>
+            </div>
+            <div class="col-4 pl-0 textCondens text-right">
+                <b>
+                    <asp:Label ID="SheetIDLabel" runat="server" Text='<%# Eval("SheetID") %>' /></b>
+            </div>
+            <div class="col-8 text-left">
+                <b>
+                    <asp:Label ID="MatExtCodeLabel" runat="server" Text='<%# Eval("MatExtCode") %>' /></b>
+            </div>
+            <div class="col-4 text-right">
+                <%: 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">
+                <%: traduci("Sheet") %>
+                <b>
+                    <asp:Label ID="SheetIndexLabel" runat="server" Text='<%# Eval("SheetIndex") %>' /></b>
+            </div>
+            <div class="col-4 text-center">
+                L (mm)<br />
+                <asp:Label ID="L_mmLabel" runat="server" Text='<%# Eval("L_mm") %>' />
+            </div>
+            <div class="col-4 text-center">
+                W (mm)<br />
+                <asp:Label ID="W_mmLabel" runat="server" Text='<%# Eval("W_mm") %>' />
+            </div>
+            <div class="col-4 text-center">
+                T (mm)<br />
+                <asp:Label ID="T_mmLabel" runat="server" Text='<%# Eval("T_mm") %>' />
+            </div>
+            <div class="col-2 text-left">
+                <i class="fa fa-qrcode" aria-hidden="true"></i>
+            </div>
+            <div class="col-5 text-right">
+                <asp:Label ID="PrntStartLabel" runat="server" Text='<%# Eval("PrntStart","{0:HH:mm:ss}") %>' />
+            </div>
+            <div class="col-5 text-right">
+                <asp:Label ID="PrntEndLabel" runat="server" Text='<%# Eval("PrntEnd","{0:HH:mm:ss}") %>' />
+            </div>
+            <div class="col-2 text-left">
+                <i class="fa fa-scissors" aria-hidden="true"></i>
+            </div>
+            <div class="col-5 text-right">
+                <asp:Label ID="WrkStartLabel" runat="server" Text='<%# Eval("WrkStart","{0:HH:mm:ss}") %>' />
+            </div>
+            <div class="col-5 text-right">
+                <asp:Label ID="WrkEndLabel" runat="server" Text='<%# Eval("WrkEnd","{0:HH:mm:ss}") %>' />
+            </div>
+            <div class="col-2 text-left">
+                <i class="fa fa-download" aria-hidden="true"></i>
+            </div>
+            <div class="col-5 text-right">
+                <asp:Label ID="UnlStartLabel" runat="server" Text='<%# Eval("UnlStart","{0:HH:mm:ss}") %>' />
+            </div>
+            <div class="col-5 text-right">
+                <asp:Label ID="UnlEndLabel" runat="server" Text='<%# Eval("UnlEnd","{0:HH:mm:ss}") %>' />
+            </div>
+        </div>
 
-  </ItemTemplate>
+    </ItemTemplate>
 </asp:FormView>
 <asp:ObjectDataSource ID="ods" runat="server" OldValuesParameterFormatString="original_{0}" SelectMethod="getByMLStatus" TypeName="AppData.DS_AppTableAdapters.SheetListTableAdapter">
-  <SelectParameters>
-    <asp:ControlParameter ControlID="hfBatchID" DefaultValue="0" Name="BatchID" PropertyName="Value" Type="Int32" />
-    <asp:ControlParameter ControlID="hfStatus" DefaultValue="-1" Name="ShStatusStart" PropertyName="Value" Type="Int32" />
-    <asp:ControlParameter ControlID="hfStatusEnd" DefaultValue="-1" Name="ShStatusEnd" PropertyName="Value" Type="Int32" />
-  </SelectParameters>
+    <SelectParameters>
+        <asp:ControlParameter ControlID="hfBatchID" DefaultValue="0" Name="BatchID" PropertyName="Value" Type="Int32" />
+        <asp:ControlParameter ControlID="hfStatus" DefaultValue="-1" Name="ShStatusStart" PropertyName="Value" Type="Int32" />
+        <asp:ControlParameter ControlID="hfStatusEnd" DefaultValue="-1" Name="ShStatusEnd" PropertyName="Value" Type="Int32" />
+    </SelectParameters>
 </asp:ObjectDataSource>