From e04f70ff92bf6f9dbab078aa55c68f0856c3833f Mon Sep 17 00:00:00 2001
From: "Samuele E. Locatelli" <samuele@steamware.net>
Date: Fri, 7 Dec 2018 19:20:27 +0100
Subject: [PATCH] v 1037 fix x ADM

---
 Jenkinsfile                                | 6 +++---
 MP-ADM/GestKIT.aspx                        | 2 +-
 MP-ADM/WebUserControls/mod_gestKIT.ascx.cs | 3 ++-
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index 2d9f255d..d4ed25f8 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -18,9 +18,9 @@ pipeline {
 
       /* calcolo numero versione... diverso x branch MASTER/DEVELOP */
       script {
-        withEnv(['NEXT_BUILD_NUMBER=1036']) {
-          // env.versionNumber = VersionNumber(versionNumberString : '6.2.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true)
-          env.versionNumber = VersionNumber(versionNumberString : '6.2.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true, overrideBuildsAllTime: '${NEXT_BUILD_NUMBER}')
+        withEnv(['NEXT_BUILD_NUMBER=1037']) {
+          // env.versionNumber = VersionNumber(versionNumberString : '6.3.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true)
+          env.versionNumber = VersionNumber(versionNumberString : '6.3.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true, overrideBuildsAllTime: '${NEXT_BUILD_NUMBER}')
             env.APP_NAME = 'MAPO'
         }
       }				
diff --git a/MP-ADM/GestKIT.aspx b/MP-ADM/GestKIT.aspx
index 0bb1ee1c..1bbfed72 100644
--- a/MP-ADM/GestKIT.aspx
+++ b/MP-ADM/GestKIT.aspx
@@ -7,7 +7,7 @@
 <asp:Content ID="Content2" ContentPlaceHolderID="ContentPlaceHolder1" runat="server">
   <asp:Label runat="server" ID="lblDataImportOut" CssClass="text-danger" />
   <div runat="server" id="divContent">
-    <uc1:mod_gestKIT runat="server" ID="mod_gestKIT" />
+    <uc1:mod_gestKIT runat="server" ID="mod_gestKIT" Visible="false" />
     <hr />
     <uc1:mod_barcode runat="server" ID="mod_barcode" />
     <hr />
diff --git a/MP-ADM/WebUserControls/mod_gestKIT.ascx.cs b/MP-ADM/WebUserControls/mod_gestKIT.ascx.cs
index dda6891f..8ad1532f 100644
--- a/MP-ADM/WebUserControls/mod_gestKIT.ascx.cs
+++ b/MP-ADM/WebUserControls/mod_gestKIT.ascx.cs
@@ -127,7 +127,8 @@ namespace MP_ADM.WebUserControls
     /// <param name="e"></param>
     protected void Page_Load(object sender, EventArgs e)
     {
-      if (!Page.IsPostBack)
+      bool OptAdmKitEnabled = memLayer.ML.CRB("OptAdmKitEnabled");
+      if (!Page.IsPostBack && OptAdmKitEnabled)
       {
         doReset();
       }