From dc9990fdc36e33469020747288654db2ba14931e Mon Sep 17 00:00:00 2001
From: "Samuele E. Locatelli" <samuele@steamware.net>
Date: Tue, 24 Sep 2019 16:57:23 +0200
Subject: [PATCH] Completato review pagina LOADING

---
 Jenkinsfile                                      | 2 +-
 NKC_WF/WebUserControls/cmp_stackNextloading.ascx | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index c18200f..9f3d87a 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -17,7 +17,7 @@ pipeline {
 
       /* calcolo numero versione... diverso x branch MASTER/DEVELOP */
       script {
-        withEnv(['NEXT_BUILD_NUMBER=109']) {
+        withEnv(['NEXT_BUILD_NUMBER=111']) {
           // env.versionNumber = VersionNumber(versionNumberString : '0.6.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2019-07-01', skipFailedBuilds: true)
           env.versionNumber = VersionNumber(versionNumberString : '0.6.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2019-07-01', skipFailedBuilds: true, overrideBuildsAllTime: '${NEXT_BUILD_NUMBER}')
           env.APP_NAME = 'NKC'
diff --git a/NKC_WF/WebUserControls/cmp_stackNextloading.ascx b/NKC_WF/WebUserControls/cmp_stackNextloading.ascx
index 75874b6..5dd81ee 100644
--- a/NKC_WF/WebUserControls/cmp_stackNextloading.ascx
+++ b/NKC_WF/WebUserControls/cmp_stackNextloading.ascx
@@ -18,12 +18,12 @@
     <asp:TemplateField>
       <ItemTemplate>
         <div class="row border border-success rounded">
-          <div class="col-4 text-left text-secondary" runat="server" visible='<%# Eval("NumSheets").ToString() == Eval("NumSheetsPrinted").ToString()  %>'>
+          <div class="col-4 text-left text-secondary" runat="server" visible='<%# Eval("NumSheets").ToString() == Eval("NumSheetsWorked").ToString()  %>'>
             <b>PREVIOUS</b> BUNK: <b>
               <asp:Label ID="Label1" runat="server" Text='<%# Eval("StackDtmx") %>' /></b>
             (<asp:Label ID="Label2" runat="server" Text='<%# Eval("StackIndex") %>' />/2)
           </div>
-          <div class="col-4 text-left text-success" runat="server" visible='<%# Eval("NumSheets").ToString() != Eval("NumSheetsPrinted").ToString()  %>'>
+          <div class="col-4 text-left text-success" runat="server" visible='<%# Eval("NumSheets").ToString() != Eval("NumSheetsWorked").ToString()  %>'>
             <b>CURRENT</b> BUNK: <b>
               <asp:Label ID="StackIDLabel" runat="server" Text='<%# Eval("StackDtmx") %>' /></b>
             (<asp:Label ID="StackIndexLabel" runat="server" Text='<%# Eval("StackIndex") %>' />/2)
@@ -33,11 +33,11 @@
               <asp:Label ID="NumSheetsPrintedLabel" runat="server" Text='<%# Eval("NumSheetsPrinted") %>' /></b> | worked: <b>
                 <asp:Label ID="NumSheetsWorkedLabel" runat="server" Text='<%# Eval("NumSheetsWorked") %>' /></b>
           </div>
-          <div class="col-4 text-right text-secondary" runat="server" visible='<%# Eval("NumSheets").ToString() == Eval("NumSheetsPrinted").ToString()  %>'>
+          <div class="col-4 text-right text-secondary" runat="server" visible='<%# Eval("NumSheets").ToString() == Eval("NumSheetsWorked").ToString()  %>'>
             Items: <b>
               <asp:Label ID="lblNumItems" runat="server" Text='<%# Eval("NumItems") %>' /></b>
           </div>
-          <div class="col-4 text-right text-success" runat="server" visible='<%# Eval("NumSheets").ToString() != Eval("NumSheetsPrinted").ToString()  %>'>
+          <div class="col-4 text-right text-success" runat="server" visible='<%# Eval("NumSheets").ToString() != Eval("NumSheetsWorked").ToString()  %>'>
             Items: <b>
               <asp:Label ID="Label3" runat="server" Text='<%# Eval("NumItems") %>' /></b>
           </div>