From f8fdc1673023f0d08a6d729a82b4ee33da5a4b1e Mon Sep 17 00:00:00 2001
From: "Samuele E. Locatelli" <samuele@steamware.net>
Date: Mon, 27 Jan 2020 12:29:36 +0100
Subject: [PATCH 1/2] FIX indice riga sheets

---
 Jenkinsfile                                  | 2 +-
 NKC_WF/WebUserControls/cmp_BP_sheetList.ascx | 4 ++--
 NKC_WF/site/BatchPreview.aspx                | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index 1b74429..8590fd1 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -17,7 +17,7 @@ pipeline {
 
       /* calcolo numero versione... diverso x branch MASTER/DEVELOP */
       script {
-        withEnv(['NEXT_BUILD_NUMBER=229']) {
+        withEnv(['NEXT_BUILD_NUMBER=230']) {
           // 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_BP_sheetList.ascx b/NKC_WF/WebUserControls/cmp_BP_sheetList.ascx
index f67efa8..24b8188 100644
--- a/NKC_WF/WebUserControls/cmp_BP_sheetList.ascx
+++ b/NKC_WF/WebUserControls/cmp_BP_sheetList.ascx
@@ -15,10 +15,10 @@
         <asp:LinkButton ID="lbtReset" runat="server" OnClick="lbtReset_Click" CssClass="btn btn-sm btn-primary" Visible="true" ToolTip="Reset"><i class="fa fa-refresh"></i></asp:LinkButton>
       </HeaderTemplate>
       <ItemTemplate>
-        <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>
+        <asp:LinkButton ID="lbSelect" runat="server" CausesValidation="False" CommandName="Select" 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="#" ReadOnly="True" SortExpression="StackIndex" />
+    <asp:BoundField DataField="SheetIndex" HeaderText="#" ReadOnly="True" SortExpression="SheetIndex" />
     <asp:TemplateField HeaderText="Material" SortExpression="MatExtCode">
       <ItemTemplate>
         <div class="row">
diff --git a/NKC_WF/site/BatchPreview.aspx b/NKC_WF/site/BatchPreview.aspx
index 0b0a6f6..c2b578e 100644
--- a/NKC_WF/site/BatchPreview.aspx
+++ b/NKC_WF/site/BatchPreview.aspx
@@ -15,7 +15,7 @@
     <div class="col-9 px-0">
       <h3>Batch preview</h3>
       <asp:Label runat="server" ID="lblOut" txt="..." />
-      <uc1:cmp_slider runat="server" id="cmp_slider" minVal="0" maxVal="100" />
+      <uc1:cmp_slider runat="server" id="cmp_slider" />
       <uc1:cmp_MU_svgViewer runat="server" id="cmp_MU_svgViewer" />
     </div>
     <div class="col-2 pl-0 small">

From 416738d9d3db828769bf653fe0cc9c5d9a77bf10 Mon Sep 17 00:00:00 2001
From: "Samuele E. Locatelli" <samuele@steamware.net>
Date: Mon, 27 Jan 2020 13:00:45 +0100
Subject: [PATCH 2/2] Fix visualizzazione tempi > 999 sec

---
 Jenkinsfile                                     | 2 +-
 NKC_WF/Controllers/BatchProcController.cs       | 4 ++--
 NKC_WF/WebUserControls/cmp_BP_sheetList.ascx.cs | 2 +-
 NKC_WF/site/BatchPreview.aspx.cs                | 5 +++++
 4 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index 8590fd1..d8be51b 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -17,7 +17,7 @@ pipeline {
 
       /* calcolo numero versione... diverso x branch MASTER/DEVELOP */
       script {
-        withEnv(['NEXT_BUILD_NUMBER=230']) {
+        withEnv(['NEXT_BUILD_NUMBER=231']) {
           // 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/Controllers/BatchProcController.cs b/NKC_WF/Controllers/BatchProcController.cs
index 214d022..ad115a1 100644
--- a/NKC_WF/Controllers/BatchProcController.cs
+++ b/NKC_WF/Controllers/BatchProcController.cs
@@ -260,14 +260,14 @@ namespace NKC_WF.Controllers
               {
                 // resetto le precedenti elaborazioni: elimino dati child MA NON il batch...
                 DataLayer.man.taBL.resetTree(rispNest.BatchID);
+                // SALVO info riguardo al batch completato
+                DataLayer.man.taBL.updateStatus(rispNest.BatchID, bStatus, rispNest.EnvNum, (decimal)rispNest.EstimatedWorktime / 60);
                 // salvo info riguardo ai vari Bunk / Sheets / Items...
                 ComLib.updateBunksFromNesting(rispNest.BatchID, rispNest.BunkList);
                 // salvo info x CART & BINS previsti
                 ComLib.updateBinsFromNesting(rispNest.BatchID, rispNest.BinList);
                 ComLib.updateCartsFromNesting(rispNest.BatchID, rispNest.CartList);
               }
-              // SALVO info riguardo al batch completato
-              DataLayer.man.taBL.updateStatus(rispNest.BatchID, bStatus, rispNest.EnvNum, (decimal)rispNest.EstimatedWorktime / 60);
               // registro OK
               answ = "OK";
             }
diff --git a/NKC_WF/WebUserControls/cmp_BP_sheetList.ascx.cs b/NKC_WF/WebUserControls/cmp_BP_sheetList.ascx.cs
index d2b1885..0ef10ba 100644
--- a/NKC_WF/WebUserControls/cmp_BP_sheetList.ascx.cs
+++ b/NKC_WF/WebUserControls/cmp_BP_sheetList.ascx.cs
@@ -91,7 +91,7 @@ namespace NKC_WF.WebUserControls
     {
       int totSec = 0;
       string answ = "";
-      int.TryParse(_timeSec.ToString(), out totSec);
+      int.TryParse(_timeSec.ToString().Replace(".",""), out totSec);
       int numMin = totSec / 60;
       int numSec = totSec - (60 * numMin);
       answ = $"{numMin:00}:{numSec:00}";
diff --git a/NKC_WF/site/BatchPreview.aspx.cs b/NKC_WF/site/BatchPreview.aspx.cs
index 16168fc..584e525 100644
--- a/NKC_WF/site/BatchPreview.aspx.cs
+++ b/NKC_WF/site/BatchPreview.aspx.cs
@@ -14,6 +14,11 @@ namespace NKC_WF.site
     {
       if (!Page.IsPostBack)
       {
+        cmp_slider.selValue = 0;
+        //cmp_BP_bunkList.selIndex = 0;
+        //cmp_BP_sheetList.BunkId = cmp_BP_bunkList.BunkIdSel;
+        //cmp_BP_sheetList.selIndex = 0;
+        //cmp_MU_svgViewer.SheetId = cmp_BP_sheetList.SheetIdSel;
         doUpdate();
       }
       cmp_BP_bunkList.eh_doRefresh += Cmp_BP_bunkList_eh_doRefresh;