+ [IT]Versione testo in Italiano[/IT]
+ [EN]English version text[/EN]
+
{1}", flagList[Lang], Translation);
idx++;
}
- catch
+ catch(Exception exc)
{
+ logger.lg.scriviLog(exc.ToString(), tipoLog.EXCEPTION);
strLenght = 0;
}
}
diff --git a/CMS_SC/bin/CMS-SC-Data.dll b/CMS_SC/bin/CMS-SC-Data.dll
index 0a71bce..cd16849 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 be001c9..1faab28 100644
Binary files a/CMS_SC/bin/SteamWare.dll and b/CMS_SC/bin/SteamWare.dll differ
diff --git a/CMS_SC/sql/Update_3.1.sql b/CMS_SC/sql/Update_3.1.sql
index ea3a13e..42b9067 100644
--- a/CMS_SC/sql/Update_3.1.sql
+++ b/CMS_SC/sql/Update_3.1.sql
@@ -30,7 +30,7 @@ INSERT INTO [dbo].[DettScheda]
VALUES ('FN0001',0,'M0002','File Allegati','FILE','','FCS','')
--- modifica colonna descrizione NVARCHAR(MAX)
+-- modifica colonna Descrizione NVARCHAR(MAX)
ALTER TABLE AnagSchede DROP CONSTRAINT [DF_AnagSchede_Descrizione]
ALTER TABLE AnagSchede ALTER COLUMN Descrizione NVARCHAR(MAX) NOT NULL
ALTER TABLE AnagSchede ADD CONSTRAINT [DF_AnagSchede_Descrizione] DEFAULT ('') FOR [Descrizione]
@@ -38,9 +38,13 @@ ALTER TABLE AnagSchede ADD CONSTRAINT [DF_AnagSchede_Descrizione] DEFAULT ('')
UPDATE AnagSchede SET Descrizione = '[IT]' + Descrizione + '[/IT]' + CHAR(10) + '[EN]' + Descrizione + '[/EN]'
--- modifica colonna NomeMisura NVARCHAR(MAX)
+-- modifica colonna Dettscheda.NomeMisura NVARCHAR(500)
ALTER TABLE Dettscheda ALTER COLUMN NomeMisura NVARCHAR(500) NOT NULL
--aggiorno DETTAGLIO scheda...
UPDATE Dettscheda SET NomeMisura = '[IT]' + NomeMisura + '[/IT]' + CHAR(10) + '[EN]' + NomeMisura + '[/EN]'
+-- modifica colonna SchemaCollFamMacc.Descrizione in NVARCHAR(500)
+ALTER TABLE SchemaCollFamMacc ALTER COLUMN Descrizione NVARCHAR(500) NOT NULL
+--aggiorno DETTAGLIO scheda...
+UPDATE SchemaCollFamMacc SET Descrizione = '[IT]' + Descrizione + '[/IT]' + CHAR(10) + '[EN]' + Descrizione + '[/EN]'
diff --git a/Jenkinsfile b/Jenkinsfile
index 96f3c75..1c443c3 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -11,7 +11,7 @@ pipeline {
/* calcolo numero versione... diverso x branch MASTER/DEVELOP */
script {
- withEnv(['NEXT_BUILD_NUMBER=4190']) {
+ withEnv(['NEXT_BUILD_NUMBER=4195']) {
// env.versionNumber = VersionNumber(versionNumberString : '${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true)
env.versionNumber = VersionNumber(versionNumberString : '${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 939dd50..4082aec 100644
Binary files a/VersGen/bin/Debug/VersGen.dll and b/VersGen/bin/Debug/VersGen.dll differ