diff --git a/CMS-SC-Data/obj/Debug/CMS-SC-Data.csproj.CoreCompileInputs.cache b/CMS-SC-Data/obj/Debug/CMS-SC-Data.csproj.CoreCompileInputs.cache index 9147403..81395e3 100644 --- a/CMS-SC-Data/obj/Debug/CMS-SC-Data.csproj.CoreCompileInputs.cache +++ b/CMS-SC-Data/obj/Debug/CMS-SC-Data.csproj.CoreCompileInputs.cache @@ -1 +1 @@ -c355ee6932ff22a2f6c7d84b3449927b5b4b5506 +73bbb3de17cae454ab54595b2c5a3ff7389a549e diff --git a/CMS-SC-Data/obj/Debug/CMS-SC-Data.csprojResolveAssemblyReference.cache b/CMS-SC-Data/obj/Debug/CMS-SC-Data.csprojResolveAssemblyReference.cache index 117f1d0..021e0d8 100644 Binary files a/CMS-SC-Data/obj/Debug/CMS-SC-Data.csprojResolveAssemblyReference.cache and b/CMS-SC-Data/obj/Debug/CMS-SC-Data.csprojResolveAssemblyReference.cache differ diff --git a/CMS_SC/Home.aspx b/CMS_SC/Home.aspx index 79e8812..61af624 100644 --- a/CMS_SC/Home.aspx +++ b/CMS_SC/Home.aspx @@ -10,7 +10,6 @@

Gestione Schede Collaudo

-
diff --git a/CMS_SC/WebUserControls/mod_collaudi.ascx.cs b/CMS_SC/WebUserControls/mod_collaudi.ascx.cs index 4e3bbdd..d8d9214 100644 --- a/CMS_SC/WebUserControls/mod_collaudi.ascx.cs +++ b/CMS_SC/WebUserControls/mod_collaudi.ascx.cs @@ -212,7 +212,7 @@ namespace CMS_SC.WebUserControls NumScheda = Convert.ToInt32(grView.SelectedDataKey["NumScheda"]); CodMisura = grView.SelectedDataKey["CodMisura"].ToString(); Fase = grView.SelectedDataKey["Fase"].ToString(); - int.TryParse(grView.SelectedDataKey["Fase"].ToString(), out Rev); + int.TryParse(grView.SelectedDataKey["Rev"].ToString(), out Rev); } catch { } diff --git a/CMS_SC/bin/CMS-SC-Data.dll b/CMS_SC/bin/CMS-SC-Data.dll index 82e832d..828bfb8 100644 Binary files a/CMS_SC/bin/CMS-SC-Data.dll and b/CMS_SC/bin/CMS-SC-Data.dll differ diff --git a/CMS_SC/bin/SteamWare.dll b/CMS_SC/bin/SteamWare.dll index 9371f8b..83a5b0f 100644 Binary files a/CMS_SC/bin/SteamWare.dll and b/CMS_SC/bin/SteamWare.dll differ diff --git a/Jenkinsfile b/Jenkinsfile index cfc0021..3af9463 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -14,7 +14,7 @@ pipeline { /* calcolo numero versione... diverso x branch MASTER/DEVELOP */ script { - withEnv(['NEXT_BUILD_NUMBER=4254']) { + withEnv(['NEXT_BUILD_NUMBER=4255']) { // env.versionNumber = VersionNumber(versionNumberString : '3.2.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true) env.versionNumber = VersionNumber(versionNumberString : '3.2.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true, overrideBuildsAllTime: '${NEXT_BUILD_NUMBER}') env.APP_NAME = 'CMS-SC' diff --git a/VersGen/bin/Debug/VersGen.dll b/VersGen/bin/Debug/VersGen.dll index a8cb7d0..fbcff06 100644 Binary files a/VersGen/bin/Debug/VersGen.dll and b/VersGen/bin/Debug/VersGen.dll differ