From 8d8095ab2d83af40b488d46e48ce8a53ad1f323d Mon Sep 17 00:00:00 2001
From: "Samuele E. Locatelli" <samuele@steamware.net>
Date: Mon, 10 Aug 2020 14:08:08 +0200
Subject: [PATCH] Fix display errore in import

---
 Jenkinsfile                                    | 2 +-
 NKC_WF/WebUserControls/cmp_kitImpCheck.ascx    | 4 +---
 NKC_WF/WebUserControls/cmp_kitImpCheck.ascx.cs | 3 +--
 3 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index 17adf39..24c49f6 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -11,7 +11,7 @@ pipeline {
       steps {
       /* calcolo numero versione... diverso x branch MASTER/DEVELOP */
       script {
-        withEnv(['NEXT_BUILD_NUMBER=314']) {
+        withEnv(['NEXT_BUILD_NUMBER=315']) {
           // env.versionNumber = VersionNumber(versionNumberString : '1.1.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2019-07-01', skipFailedBuilds: true)
           env.versionNumber = VersionNumber(versionNumberString : '1.1.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2019-07-01', skipFailedBuilds: true, overrideBuildsAllTime: '${NEXT_BUILD_NUMBER}')
           env.versionNumberBeta = VersionNumber(versionNumberString : '1.1.${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_kitImpCheck.ascx b/NKC_WF/WebUserControls/cmp_kitImpCheck.ascx
index a2b4c42..981591e 100644
--- a/NKC_WF/WebUserControls/cmp_kitImpCheck.ascx
+++ b/NKC_WF/WebUserControls/cmp_kitImpCheck.ascx
@@ -16,9 +16,7 @@
     <div class="col-6">
         <div class="alert alert-primary">
             <b>Last Action</b><br />
-            <asp:Label runat="server" ID="lblOutTask">
-                # <%: traduci("PositiveAction") %>
-            </asp:Label>
+            <asp:Label runat="server" ID="lblOutTask"></asp:Label>
         </div>
     </div>
     <div class="col-3">
diff --git a/NKC_WF/WebUserControls/cmp_kitImpCheck.ascx.cs b/NKC_WF/WebUserControls/cmp_kitImpCheck.ascx.cs
index a08be3d..6409b12 100644
--- a/NKC_WF/WebUserControls/cmp_kitImpCheck.ascx.cs
+++ b/NKC_WF/WebUserControls/cmp_kitImpCheck.ascx.cs
@@ -157,8 +157,7 @@ namespace NKC_WF.WebUserControls
 
         protected void lbtDoAction_Click(object sender, EventArgs e)
         {
-            // in base a cosa ho in memoria procedo con successivo step, qui FAKE...
-            //if (!imported)
+            // in base a cosa ho in memoria procedo con successivo step
             if (checkOk && !imported)
             {
                 tryImport(false);