From cff5403c07b0da99f14b1027dd1641b915d279f7 Mon Sep 17 00:00:00 2001 From: "Samuele E. Locatelli" Date: Thu, 20 Dec 2018 17:56:45 +0100 Subject: [PATCH] Update gestione ADM x DONATI: punta su DB IS... --- Jenkinsfile | 2 +- MP-ADM/Web.config | 2 +- MP-ADM/WebUserControls/mod_approvProd.ascx | 8 +- MP-ADM/WebUserControls/mod_approvProd.ascx.cs | 291 ++++---- .../mod_approvProd.ascx.designer.cs | 13 +- MapoDb/DS_ProdTempi.Designer.cs | 699 ------------------ MapoDb/DS_ProdTempi.xsd | 68 -- MapoDb/DS_ProdTempi.xss | 15 +- MapoDb/DataLayer.cs | 2 +- 9 files changed, 175 insertions(+), 925 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index ddd6150f..4f333526 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -18,7 +18,7 @@ pipeline { /* calcolo numero versione... diverso x branch MASTER/DEVELOP */ script { - withEnv(['NEXT_BUILD_NUMBER=1119']) { + withEnv(['NEXT_BUILD_NUMBER=1120']) { // env.versionNumber = VersionNumber(versionNumberString : '6.3.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true) env.versionNumber = VersionNumber(versionNumberString : '6.3.${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-ADM/Web.config b/MP-ADM/Web.config index 23674024..b71b9521 100644 --- a/MP-ADM/Web.config +++ b/MP-ADM/Web.config @@ -27,7 +27,7 @@ - + diff --git a/MP-ADM/WebUserControls/mod_approvProd.ascx b/MP-ADM/WebUserControls/mod_approvProd.ascx index d7c49679..da82e65c 100644 --- a/MP-ADM/WebUserControls/mod_approvProd.ascx +++ b/MP-ADM/WebUserControls/mod_approvProd.ascx @@ -2,9 +2,6 @@
- <%--
- Elenco produzioni da validare -
--%>
@@ -19,7 +16,7 @@ - Nessun record storico trovato + Nessun record produzione trovato @@ -63,9 +60,10 @@