diff --git a/Jenkinsfile b/Jenkinsfile index 63f9cb8..9d5a774 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -17,7 +17,7 @@ pipeline { /* calcolo numero versione... diverso x branch MASTER/DEVELOP */ script { - withEnv(['NEXT_BUILD_NUMBER=125']) { + withEnv(['NEXT_BUILD_NUMBER=126']) { // env.versionNumber = VersionNumber(versionNumberString : '0.9.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true) env.versionNumber = VersionNumber(versionNumberString : '0.9.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true, overrideBuildsAllTime: '${NEXT_BUILD_NUMBER}') env.APP_NAME = 'SOSCONDOMINI' diff --git a/PUB/WebUserContols/mod_ER_detail.ascx b/PUB/WebUserContols/mod_ER_detail.ascx index 3c68a77..de8c007 100644 --- a/PUB/WebUserContols/mod_ER_detail.ascx +++ b/PUB/WebUserContols/mod_ER_detail.ascx @@ -219,13 +219,18 @@
-
Richiesta #<%# Eval("IdxRichiesta") %>
+ Richiesta #<%# Eval("IdxRichiesta") %> + <%# Eval("dataIns","{0:dddd dd.MM.yy HH:mm}") %>
- <%# Eval("stato") %> + +
<%# Eval("stato") %>
condominio <%# Eval("nom_cond") %> (<%# Eval("cod_cond") %>) +
+ inserita da <%# Eval("collaboratore") %> +
@@ -234,29 +239,19 @@
-
+
-
- Richiesta: -
-
- inserita da <%# Eval("collaboratore") %> (<%# Eval("codCollabRich") %>) -
- <%# Eval("dataIns","{0:dddd dd.MM.yyyy HH:mm}") %> -
-
-
-
+
Urgenza
-
+
Area
-
+
Fornitore
@@ -285,7 +280,7 @@
-
+
Registro attivitÃ