diff --git a/CMS_SC/WebUserControls/mod_DettScheda.ascx b/CMS_SC/WebUserControls/mod_DettScheda.ascx index 8ae534f..b608222 100644 --- a/CMS_SC/WebUserControls/mod_DettScheda.ascx +++ b/CMS_SC/WebUserControls/mod_DettScheda.ascx @@ -10,16 +10,13 @@ { document.getElementById("<%=btnUp.ClientID %>").click(); }--%> - if (event.keyCode == 13) // Enter - { - document.getElementById("<%=btnSave.ClientID %>").click(); + if (event.keyCode == 13) // Enter + { + document.getElementById("<%=btnSave.ClientID %>").click(); } }; -<%-- ---%> - @@ -43,18 +40,20 @@ - + <%# traduci("moveMis") %> -
- -
-
- +
+
+ +
+
+ +
diff --git a/CMS_SC/WebUserControls/mod_collaudi.ascx b/CMS_SC/WebUserControls/mod_collaudi.ascx index 7408e4c..054302f 100644 --- a/CMS_SC/WebUserControls/mod_collaudi.ascx +++ b/CMS_SC/WebUserControls/mod_collaudi.ascx @@ -17,10 +17,7 @@ } } -<%-- ---%> - @@ -47,12 +44,15 @@ -
+
<%# contaAllegati(Eval("ValoreMis")) %>
+
+ +
diff --git a/CMS_SC/WebUserControls/mod_listValues.ascx b/CMS_SC/WebUserControls/mod_listValues.ascx index 8fda9d2..d9d163f 100644 --- a/CMS_SC/WebUserControls/mod_listValues.ascx +++ b/CMS_SC/WebUserControls/mod_listValues.ascx @@ -2,7 +2,7 @@ Inherits="CMS_SC.WebUserControls.mod_listValues" %> -
+
diff --git a/CMS_SC/sql/Update_3.1.sql b/CMS_SC/sql/Update_3.1.sql index 86b5e74..536345c 100644 --- a/CMS_SC/sql/Update_3.1.sql +++ b/CMS_SC/sql/Update_3.1.sql @@ -19,3 +19,12 @@ DELETE FROM tblFiles -- creazione scheda x note + files denominata FN-0001 +INSERT INTO [dbo].[ListValues] ([TableName],[FieldName],[value],[label],[ordinal]) +VALUES ('DettScheda', 'TipoValMisura', 'TEXTAREA', 'TEXTAREA', 9) + +INSERT INTO [dbo].[AnagSchede] ([CodScheda],[Vers],[Descrizione],[Path],[FasiEnab],[CodVisib]) +VALUES ('FN0001', 0, 'Scheda allegati + note libere', '', '001#002', 'FCS') +INSERT INTO [dbo].[DettScheda] +VALUES ('FN0001',0,'M0001','Note libere collaudo','TEXTAREA','','FCS','') +INSERT INTO [dbo].[DettScheda] +VALUES ('FN0001',0,'M0002','File Allegati','FILE','','FCS','') diff --git a/Jenkinsfile b/Jenkinsfile index 5e2afdf..ab28972 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -11,7 +11,7 @@ pipeline { /* calcolo numero versione... diverso x branch MASTER/DEVELOP */ script { - withEnv(['NEXT_BUILD_NUMBER=4177']) { + withEnv(['NEXT_BUILD_NUMBER=4180']) { // 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'