diff --git a/Jenkinsfile b/Jenkinsfile index bd0d213..20fd476 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -17,7 +17,7 @@ pipeline { /* calcolo numero versione... diverso x branch MASTER/DEVELOP */ script { - withEnv(['NEXT_BUILD_NUMBER=128']) { + withEnv(['NEXT_BUILD_NUMBER=129']) { // 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_acts.ascx b/PUB/WebUserContols/mod_ER_acts.ascx index 8c6b9c4..ec41ccb 100644 --- a/PUB/WebUserContols/mod_ER_acts.ascx +++ b/PUB/WebUserContols/mod_ER_acts.ascx @@ -2,24 +2,24 @@ - + + + + - + - - - - | <%# Eval("classe") %> | <%# Eval("descrAzione") %> + + + + | <%# Eval("classe") %>| <%# Eval("descrAzione") %> + + <%# Eval("dataRif","{0:ddd dd.MM.yyyy, HH:mm:ss}") %> - <%# Eval("attore") %> + - - <%# Eval("attore") %> - - - <%# Eval("dataRif","{0:ddd dd.MM.yyyy, HH:mm:ss}") %> - - - <%# Eval("messaggio") %> + + <%# Eval("messaggio") %> diff --git a/PUB/WebUserContols/mod_ER_detail.ascx b/PUB/WebUserContols/mod_ER_detail.ascx index 102bf04..b8964fa 100644 --- a/PUB/WebUserContols/mod_ER_detail.ascx +++ b/PUB/WebUserContols/mod_ER_detail.ascx @@ -104,7 +104,6 @@ - Registro attivitÃ