diff --git a/Jenkinsfile b/Jenkinsfile index 7bfaf521..de2a739e 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -12,7 +12,7 @@ pipeline { steps { /* calcolo numero versione... diverso x branch MASTER/DEVELOP */ script { - withEnv(['NEXT_BUILD_NUMBER=1323']) { + withEnv(['NEXT_BUILD_NUMBER=1324']) { // env.versionNumber = VersionNumber(versionNumberString : '6.11.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true) env.versionNumber = VersionNumber(versionNumberString : '6.11.${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-TAB/WebUserControls/mod_confProd.ascx b/MP-TAB/WebUserControls/mod_confProd.ascx index f9bcb2ca..4b46d432 100644 --- a/MP-TAB/WebUserControls/mod_confProd.ascx +++ b/MP-TAB/WebUserControls/mod_confProd.ascx @@ -1,13 +1,6 @@ <%@ Control Language="C#" AutoEventWireup="true" CodeBehind="mod_confProd.ascx.cs" Inherits="MoonProTablet.WebUserControls.mod_confProd" %> - -
diff --git a/MP-TAB/WebUserControls/mod_confProd.ascx.cs b/MP-TAB/WebUserControls/mod_confProd.ascx.cs index 0fba6094..020aaac0 100644 --- a/MP-TAB/WebUserControls/mod_confProd.ascx.cs +++ b/MP-TAB/WebUserControls/mod_confProd.ascx.cs @@ -172,13 +172,11 @@ namespace MoonProTablet.WebUserControls { get { - bool answ = false; - bool.TryParse(hfShowInnov.Value, out answ); - return answ; + return divInnovazioni.Visible; } set { - hfShowInnov.Value = $"{value}"; + divInnovazioni.Visible = value; } } @@ -322,11 +320,6 @@ namespace MoonProTablet.WebUserControls divInnovazioni.Visible = showConf; if (showConf) { -#if false - // continuo update - lbtSalva.Visible = showConf; - lblUpdating.Visible = !showConf; -#endif try { updatePzBuoni(); diff --git a/MP-TAB/WebUserControls/mod_confProd.ascx.designer.cs b/MP-TAB/WebUserControls/mod_confProd.ascx.designer.cs index bdd6cd25..8d089051 100644 --- a/MP-TAB/WebUserControls/mod_confProd.ascx.designer.cs +++ b/MP-TAB/WebUserControls/mod_confProd.ascx.designer.cs @@ -14,15 +14,6 @@ namespace MoonProTablet.WebUserControls public partial class mod_confProd { - /// - /// Controllo hfShowInnov. - /// - /// - /// Campo generato automaticamente. - /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. - /// - protected global::System.Web.UI.WebControls.HiddenField hfShowInnov; - /// /// Controllo lblConfProd. ///