diff --git a/GPW_Admin/WebUserControls/mod_spostaOre.ascx b/GPW_Admin/WebUserControls/mod_spostaOre.ascx index 5f0d0e9..9b7b237 100644 --- a/GPW_Admin/WebUserControls/mod_spostaOre.ascx +++ b/GPW_Admin/WebUserControls/mod_spostaOre.ascx @@ -50,42 +50,46 @@ -
+
-
- -
-
- - - - - - - -
-
- - - - - - - - -
-
- +
+
+
+ +
+
+ + + + + + + +
+
+ + + + + + + + +
+
+ +
+
- +
diff --git a/GPW_Admin/WebUserControls/mod_spostaOre.ascx.designer.cs b/GPW_Admin/WebUserControls/mod_spostaOre.ascx.designer.cs index c147706..07d13a2 100644 --- a/GPW_Admin/WebUserControls/mod_spostaOre.ascx.designer.cs +++ b/GPW_Admin/WebUserControls/mod_spostaOre.ascx.designer.cs @@ -113,15 +113,6 @@ namespace GPW_Admin.WebUserControls /// protected global::System.Web.UI.WebControls.CheckBox chkSoloAncest; - /// - /// Controllo pnlFaseDest. - /// - /// - /// Campo generato automaticamente. - /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. - /// - protected global::System.Web.UI.HtmlControls.HtmlGenericControl pnlFaseDest; - /// /// Controllo btnEnableSposta. /// @@ -131,6 +122,15 @@ namespace GPW_Admin.WebUserControls /// protected global::System.Web.UI.WebControls.Button btnEnableSposta; + /// + /// Controllo pnlFaseDest. + /// + /// + /// Campo generato automaticamente. + /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. + /// + protected global::System.Web.UI.HtmlControls.HtmlGenericControl pnlFaseDest; + /// /// Controllo filtroCliDest. /// diff --git a/Jenkinsfile b/Jenkinsfile index 0f4b139..b9e9fda 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -10,7 +10,7 @@ pipeline { steps { /* calcolo numero versione... diverso x branch MASTER/DEVELOP */ script { - withEnv(['NEXT_BUILD_NUMBER=4136']) { + withEnv(['NEXT_BUILD_NUMBER=4137']) { // env.versionNumber = VersionNumber(versionNumberString : '2.7.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true) env.versionNumber = VersionNumber(versionNumberString : '2.7.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true, overrideBuildsAllTime: '${NEXT_BUILD_NUMBER}') env.APP_NAME = 'GPW'