From ed47f7bc6fa97d8e9db71f6af00a9389dc624769 Mon Sep 17 00:00:00 2001 From: "Samuele E. Locatelli" Date: Fri, 16 Mar 2018 09:13:34 +0100 Subject: [PATCH] Fix riferimento controlli --- Jenkinsfile | 2 +- MP-Tablet/Web.config | 4 +++- MP-Tablet/WebUserControls/mod_elencoControlli.ascx | 6 +++--- MP-Tablet/WebUserControls/mod_selPeriodo.ascx.cs | 2 +- 4 files changed, 8 insertions(+), 6 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 354b8dbe..1c20f128 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -17,7 +17,7 @@ pipeline { /* calcolo numero versione... diverso x branch MASTER/DEVELOP */ script { - withEnv(['NEXT_BUILD_NUMBER=728']) { + withEnv(['NEXT_BUILD_NUMBER=729']) { // env.versionNumber = VersionNumber(versionNumberString : '5.0.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true) env.versionNumber = VersionNumber(versionNumberString : '5.0.${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-Tablet/Web.config b/MP-Tablet/Web.config index 38b81891..5c9cfa42 100644 --- a/MP-Tablet/Web.config +++ b/MP-Tablet/Web.config @@ -56,12 +56,14 @@ + + - + diff --git a/MP-Tablet/WebUserControls/mod_elencoControlli.ascx b/MP-Tablet/WebUserControls/mod_elencoControlli.ascx index 4ddf1cc2..2e5c901f 100644 --- a/MP-Tablet/WebUserControls/mod_elencoControlli.ascx +++ b/MP-Tablet/WebUserControls/mod_elencoControlli.ascx @@ -24,9 +24,9 @@
-
<%-- --%>
-
-<%-- --%>
+
+
+
Nota: diff --git a/MP-Tablet/WebUserControls/mod_selPeriodo.ascx.cs b/MP-Tablet/WebUserControls/mod_selPeriodo.ascx.cs index cc016701..7fd045f0 100644 --- a/MP-Tablet/WebUserControls/mod_selPeriodo.ascx.cs +++ b/MP-Tablet/WebUserControls/mod_selPeriodo.ascx.cs @@ -323,6 +323,6 @@ namespace MoonProTablet.WebUserControls public event EventHandler eh_doUpdate; #endregion - + } } \ No newline at end of file