diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/lib/util-java.jar b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/lib/util-java.jar deleted file mode 100644 index 1155f26e..00000000 Binary files a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/lib/util-java.jar and /dev/null differ diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/DettPraticaService.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/DettPraticaService.java index 94b9e560..c6a3af41 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/DettPraticaService.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/DettPraticaService.java @@ -306,12 +306,14 @@ public interface DettPraticaService extends BaseService, InvokableService { public it.tref.liferay.portos.bo.model.DettPratica updateEsito( long dettPraticaId, int stato) throws com.liferay.portal.kernel.exception.PortalException, - com.liferay.portal.kernel.exception.SystemException; + com.liferay.portal.kernel.exception.SystemException, + java.io.IOException; public it.tref.liferay.portos.bo.model.DettPratica updateEsitoIntegrazione( long dettPraticaId, int stato) throws com.liferay.portal.kernel.exception.PortalException, - com.liferay.portal.kernel.exception.SystemException; + com.liferay.portal.kernel.exception.SystemException, + java.io.IOException; public it.tref.liferay.portos.bo.model.DettPratica updatePrincipale( long dettPraticaId, java.lang.String codiceFiscale, diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/DettPraticaServiceClp.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/DettPraticaServiceClp.java index 46b60447..ee844d98 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/DettPraticaServiceClp.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/DettPraticaServiceClp.java @@ -1501,7 +1501,8 @@ public class DettPraticaServiceClp implements DettPraticaService { public it.tref.liferay.portos.bo.model.DettPratica updateEsito( long dettPraticaId, int stato) throws com.liferay.portal.kernel.exception.PortalException, - com.liferay.portal.kernel.exception.SystemException { + com.liferay.portal.kernel.exception.SystemException, + java.io.IOException { Object returnObj = null; try { @@ -1520,6 +1521,10 @@ public class DettPraticaServiceClp implements DettPraticaService { throw (com.liferay.portal.kernel.exception.SystemException)t; } + if (t instanceof java.io.IOException) { + throw (java.io.IOException)t; + } + if (t instanceof RuntimeException) { throw (RuntimeException)t; } @@ -1536,7 +1541,8 @@ public class DettPraticaServiceClp implements DettPraticaService { public it.tref.liferay.portos.bo.model.DettPratica updateEsitoIntegrazione( long dettPraticaId, int stato) throws com.liferay.portal.kernel.exception.PortalException, - com.liferay.portal.kernel.exception.SystemException { + com.liferay.portal.kernel.exception.SystemException, + java.io.IOException { Object returnObj = null; try { @@ -1555,6 +1561,10 @@ public class DettPraticaServiceClp implements DettPraticaService { throw (com.liferay.portal.kernel.exception.SystemException)t; } + if (t instanceof java.io.IOException) { + throw (java.io.IOException)t; + } + if (t instanceof RuntimeException) { throw (RuntimeException)t; } diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/DettPraticaServiceUtil.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/DettPraticaServiceUtil.java index a767032d..4c4e43f3 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/DettPraticaServiceUtil.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/DettPraticaServiceUtil.java @@ -436,14 +436,16 @@ public class DettPraticaServiceUtil { public static it.tref.liferay.portos.bo.model.DettPratica updateEsito( long dettPraticaId, int stato) throws com.liferay.portal.kernel.exception.PortalException, - com.liferay.portal.kernel.exception.SystemException { + com.liferay.portal.kernel.exception.SystemException, + java.io.IOException { return getService().updateEsito(dettPraticaId, stato); } public static it.tref.liferay.portos.bo.model.DettPratica updateEsitoIntegrazione( long dettPraticaId, int stato) throws com.liferay.portal.kernel.exception.PortalException, - com.liferay.portal.kernel.exception.SystemException { + com.liferay.portal.kernel.exception.SystemException, + java.io.IOException { return getService().updateEsitoIntegrazione(dettPraticaId, stato); } diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/DettPraticaServiceWrapper.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/DettPraticaServiceWrapper.java index 782d60c4..6d09b31d 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/DettPraticaServiceWrapper.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/DettPraticaServiceWrapper.java @@ -439,7 +439,8 @@ public class DettPraticaServiceWrapper implements DettPraticaService, public it.tref.liferay.portos.bo.model.DettPratica updateEsito( long dettPraticaId, int stato) throws com.liferay.portal.kernel.exception.PortalException, - com.liferay.portal.kernel.exception.SystemException { + com.liferay.portal.kernel.exception.SystemException, + java.io.IOException { return _dettPraticaService.updateEsito(dettPraticaId, stato); } @@ -447,7 +448,8 @@ public class DettPraticaServiceWrapper implements DettPraticaService, public it.tref.liferay.portos.bo.model.DettPratica updateEsitoIntegrazione( long dettPraticaId, int stato) throws com.liferay.portal.kernel.exception.PortalException, - com.liferay.portal.kernel.exception.SystemException { + com.liferay.portal.kernel.exception.SystemException, + java.io.IOException { return _dettPraticaService.updateEsitoIntegrazione(dettPraticaId, stato); } diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/PagamentoLocalService.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/PagamentoLocalService.java index caea00c7..d65f2f90 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/PagamentoLocalService.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/PagamentoLocalService.java @@ -472,7 +472,8 @@ public interface PagamentoLocalService extends BaseLocalService, java.lang.String sourceFileName, com.liferay.portal.service.ServiceContext serviceContext) throws com.liferay.portal.kernel.exception.PortalException, - com.liferay.portal.kernel.exception.SystemException; + com.liferay.portal.kernel.exception.SystemException, + java.io.IOException; public void updatePagamentoManualeFromImport(long pagamentoId, byte[] content, java.lang.String sourceFileName, diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/PagamentoLocalServiceClp.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/PagamentoLocalServiceClp.java index 2c004555..b99488a4 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/PagamentoLocalServiceClp.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/PagamentoLocalServiceClp.java @@ -2184,7 +2184,8 @@ public class PagamentoLocalServiceClp implements PagamentoLocalService { java.lang.String sourceFileName, com.liferay.portal.service.ServiceContext serviceContext) throws com.liferay.portal.kernel.exception.PortalException, - com.liferay.portal.kernel.exception.SystemException { + com.liferay.portal.kernel.exception.SystemException, + java.io.IOException { try { _invokableLocalService.invokeMethod(_methodName53, _methodParameterTypes53, @@ -2209,6 +2210,10 @@ public class PagamentoLocalServiceClp implements PagamentoLocalService { throw (com.liferay.portal.kernel.exception.SystemException)t; } + if (t instanceof java.io.IOException) { + throw (java.io.IOException)t; + } + if (t instanceof RuntimeException) { throw (RuntimeException)t; } diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/PagamentoLocalServiceUtil.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/PagamentoLocalServiceUtil.java index 57e30e29..dfcf4eb7 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/PagamentoLocalServiceUtil.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/PagamentoLocalServiceUtil.java @@ -588,7 +588,8 @@ public class PagamentoLocalServiceUtil { java.lang.String sourceFileName, com.liferay.portal.service.ServiceContext serviceContext) throws com.liferay.portal.kernel.exception.PortalException, - com.liferay.portal.kernel.exception.SystemException { + com.liferay.portal.kernel.exception.SystemException, + java.io.IOException { getService() .updatePagamentoManuale(pagamentoId, content, sourceFileName, serviceContext); diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/PagamentoLocalServiceWrapper.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/PagamentoLocalServiceWrapper.java index 000076c1..c191190b 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/PagamentoLocalServiceWrapper.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/PagamentoLocalServiceWrapper.java @@ -629,7 +629,8 @@ public class PagamentoLocalServiceWrapper implements PagamentoLocalService, java.lang.String sourceFileName, com.liferay.portal.service.ServiceContext serviceContext) throws com.liferay.portal.kernel.exception.PortalException, - com.liferay.portal.kernel.exception.SystemException { + com.liferay.portal.kernel.exception.SystemException, + java.io.IOException { _pagamentoLocalService.updatePagamentoManuale(pagamentoId, content, sourceFileName, serviceContext); } diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/PagamentoService.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/PagamentoService.java index 5b660934..7a3eddc5 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/PagamentoService.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/PagamentoService.java @@ -87,5 +87,6 @@ public interface PagamentoService extends BaseService, InvokableService { java.lang.String sourceFileName, com.liferay.portal.service.ServiceContext serviceContext) throws com.liferay.portal.kernel.exception.PortalException, - com.liferay.portal.kernel.exception.SystemException; + com.liferay.portal.kernel.exception.SystemException, + java.io.IOException; } \ No newline at end of file diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/PagamentoServiceClp.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/PagamentoServiceClp.java index c2b2f040..f3ddef39 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/PagamentoServiceClp.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/PagamentoServiceClp.java @@ -236,7 +236,8 @@ public class PagamentoServiceClp implements PagamentoService { java.lang.String sourceFileName, com.liferay.portal.service.ServiceContext serviceContext) throws com.liferay.portal.kernel.exception.PortalException, - com.liferay.portal.kernel.exception.SystemException { + com.liferay.portal.kernel.exception.SystemException, + java.io.IOException { try { _invokableService.invokeMethod(_methodName6, _methodParameterTypes6, @@ -261,6 +262,10 @@ public class PagamentoServiceClp implements PagamentoService { throw (com.liferay.portal.kernel.exception.SystemException)t; } + if (t instanceof java.io.IOException) { + throw (java.io.IOException)t; + } + if (t instanceof RuntimeException) { throw (RuntimeException)t; } diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/PagamentoServiceUtil.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/PagamentoServiceUtil.java index 241293f5..05ceda17 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/PagamentoServiceUtil.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/PagamentoServiceUtil.java @@ -96,7 +96,8 @@ public class PagamentoServiceUtil { java.lang.String sourceFileName, com.liferay.portal.service.ServiceContext serviceContext) throws com.liferay.portal.kernel.exception.PortalException, - com.liferay.portal.kernel.exception.SystemException { + com.liferay.portal.kernel.exception.SystemException, + java.io.IOException { getService() .updatePagamentoManuale(pagamentoId, content, sourceFileName, serviceContext); diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/PagamentoServiceWrapper.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/PagamentoServiceWrapper.java index 83b862fe..fa270301 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/PagamentoServiceWrapper.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/PagamentoServiceWrapper.java @@ -91,7 +91,8 @@ public class PagamentoServiceWrapper implements PagamentoService, java.lang.String sourceFileName, com.liferay.portal.service.ServiceContext serviceContext) throws com.liferay.portal.kernel.exception.PortalException, - com.liferay.portal.kernel.exception.SystemException { + com.liferay.portal.kernel.exception.SystemException, + java.io.IOException { _pagamentoService.updatePagamentoManuale(pagamentoId, content, sourceFileName, serviceContext); } diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/util/ValidazionePraticaUtil.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/util/ValidazionePraticaUtil.java index 19efec45..4d117277 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/util/ValidazionePraticaUtil.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/util/ValidazionePraticaUtil.java @@ -19,6 +19,7 @@ import it.tref.liferay.portos.bo.service.IntPraticaLocalServiceUtil; import it.tref.liferay.portos.bo.service.IntPraticaServiceUtil; import it.tref.liferay.portos.bo.service.SoggettoLocalServiceUtil; import it.tref.liferay.portos.bo.service.TerritorioLocalServiceUtil; +import it.tref.liferay.portos.bo.service.persistence.AsseverazioneUtil; import it.tref.liferay.portos.bo.shared.bean.FirmeBean; import it.tref.liferay.portos.bo.shared.util.DocumentiPraticaUtil; import it.tref.liferay.portos.bo.shared.util.FirmeUtil; @@ -26,6 +27,7 @@ import it.tref.liferay.portos.bo.shared.util.GenericUtils; import it.tref.liferay.portos.bo.shared.util.StatoPraticaConstants; import it.tref.liferay.portos.bo.shared.util.TipoIntegrazioneUtil; import it.tref.liferay.portos.bo.shared.util.TipoSoggettoUtil; +import it.tref.liferay.portos.bo.util.AsseverazioniUtil; import java.io.IOException; import java.util.ArrayList; @@ -341,10 +343,11 @@ public class ValidazionePraticaUtil { public static boolean asseverazioniIsEnable(long dettPraticaId) throws SystemException, PortalException { DettPratica dettPratica = DettPraticaServiceUtil.getDettPratica(dettPraticaId); - return dettPratica.getStatus() == WorkflowConstants.STATUS_DRAFT - && SoggettoLocalServiceUtil.countValidTmpByIntPratica(dettPratica.getIntPraticaId()) > 0 - && praticaIsCompleta(dettPraticaId) - && !DelegheUtil.hasDelegheCompilazioneAttive(dettPraticaId); + return AsseverazioniUtil.hasAsseverazioniAttive(dettPraticaId) + || (dettPratica.getStatus() == WorkflowConstants.STATUS_DRAFT + && SoggettoLocalServiceUtil.countValidTmpByIntPratica(dettPratica.getIntPraticaId()) > 0 + && praticaIsCompleta(dettPraticaId) && !DelegheUtil + .hasDelegheCompilazioneAttive(dettPraticaId)); } public static boolean pagamentoIsEnable(long dettPraticaId) throws SystemException, PortalException { @@ -500,7 +503,7 @@ public class ValidazionePraticaUtil { IntPratica intPratica = IntPraticaServiceUtil.getIntPratica(dettPratica.getIntPraticaId()); Territorio territorio = TerritorioLocalServiceUtil.getTerritorio(intPratica.getTerritorioId()); boolean ag = true; - if (!territorio.getZona().equalsIgnoreCase("2") && !territorio.getZona().equalsIgnoreCase("4")) { + if (!territorio.getZona().equals("2") && !territorio.getZona().equals("4")) { ag = Validator.isNotNull(dettPratica.getAg()); } @@ -566,7 +569,7 @@ public class ValidazionePraticaUtil { IntPratica intPratica = IntPraticaServiceUtil.getIntPratica(dettPratica.getIntPraticaId()); Territorio territorio = TerritorioLocalServiceUtil.getTerritorio(intPratica.getTerritorioId()); - if (!territorio.getZona().equalsIgnoreCase("2") && !territorio.getZona().equalsIgnoreCase("4") + if (!territorio.getZona().equals("2") && !territorio.getZona().equals("4") && Validator.isNull(dettPratica.getAg())) { notCompleted.add("ag"); } @@ -915,7 +918,7 @@ public class ValidazionePraticaUtil { return true; } - List infrastrutture = Arrays.asList("2", "A4A", "A4B", "A4C", "A4D", "A4E", "A4F", "A5A", + List infrastrutture = Arrays.asList("A4A", "A4B", "A4C", "A4D", "A4E", "A4F", "A5A", "B4A", "B4B", "B4C", "B5A"); // se infrastruttura controllo solo DATI INFRASTRUTTURA boolean infrastruttura = infrastrutture.contains(dettPratica.getDestinazione()); @@ -1016,7 +1019,7 @@ public class ValidazionePraticaUtil { List notCompleted = new ArrayList<>(); - List infrastrutture = Arrays.asList("2", "A4A", "A4B", "A4C", "A4D", "A4E", "A4F", "A5A", + List infrastrutture = Arrays.asList("A4A", "A4B", "A4C", "A4D", "A4E", "A4F", "A5A", "B4A", "B4B", "B4C", "B5A"); // se infrastruttura controllo solo DATI INFRASTRUTTURA boolean infrastruttura = infrastrutture.contains(dettPratica.getDestinazione()); @@ -1147,7 +1150,7 @@ public class ValidazionePraticaUtil { } // List infrastrutture = - // Arrays.asList("2", "A4A", "A4B", "A4C", "A4D", "A4E", "A4F", "A5A", + // Arrays.asList("A4A", "A4B", "A4C", "A4D", "A4E", "A4F", "A5A", // "B4A", "B4B", "B4C", // "B5A"); // boolean infrastruttura = diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/content/Portal.properties b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/content/Portal.properties index 21a864e8..963c6890 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/content/Portal.properties +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/content/Portal.properties @@ -289,7 +289,7 @@ destinazione = Destinazione #destinazione-1 = EDIFICI IN CLASSE D'USO II (anche classe d'uso I per progetti presentati prima del 18/05/2020) destinazione-1 = EDIFICI, INFRASTRUTTURE O ALTRO IN CLASSE D'USO I #destinazione-2 = INFRASTRUTTURE ORDINARIE -destinazione-2 = EDIFICI, INFRASTRUTTURE O ALTRO IN CLASSE D'USO II (anche classe d'uso I per progetti presentati prima del 18/05/2020) +destinazione-2 = EDIFICI, INFRASTRUTTURE O ALTRO IN CLASSE D'USO II (anche classe d'uso I per progetti presentati prima del 20/05/2020) destinazione-uso-1 = EDIFICIO ORDINARIO destinazione-uso-2 = INFRASTRUTTURA O ALTRO ORDINARIO diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/scheduler/VerificaPagamentiScheduler.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/scheduler/VerificaPagamentiScheduler.java index e389fad2..cc22db43 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/scheduler/VerificaPagamentiScheduler.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/scheduler/VerificaPagamentiScheduler.java @@ -6,6 +6,7 @@ import it.tref.liferay.portos.bo.shared.util.PagamentoConstants; import it.tref.liferay.portos.bo.util.PagamentiCommonUtil; import it.tref.liferay.portos.bo.util.PagamentiUtil; +import java.io.IOException; import java.util.Calendar; import java.util.Date; import java.util.List; @@ -24,70 +25,67 @@ import com.liferay.portal.service.CompanyLocalServiceUtil; public class VerificaPagamentiScheduler implements MessageListener { - private static final Log _log = LogFactoryUtil.getLog(VerificaPagamentiScheduler.class); + private static final Log _log = LogFactoryUtil.getLog(VerificaPagamentiScheduler.class); - private static final Lock lock = new ReentrantLock(); + private static final Lock lock = new ReentrantLock(); - private final int SIZE = 10; + private final int SIZE = 10; - // parametro per recupero dei pagamenti IRIS avviati dopo XX minuti - private final int DELAY_IN_MINUTE = 5; + // parametro per recupero dei pagamenti IRIS avviati dopo XX minuti + private final int DELAY_IN_MINUTE = 5; - @Override - public void receive(Message message) throws MessageListenerException { + @Override + public void receive(Message message) throws MessageListenerException { - if (lock.tryLock()) { + if (lock.tryLock()) { - try { - for (Company company : CompanyLocalServiceUtil.getCompanies()) { - boolean irisDisabled = !PagamentiCommonUtil.irisIsEnable(company.getCompanyId()); + try { + for (Company company : CompanyLocalServiceUtil.getCompanies()) { + boolean irisDisabled = !PagamentiCommonUtil.irisIsEnable(company.getCompanyId()); - if (!irisDisabled) { + if (!irisDisabled) { - Calendar calendar = Calendar.getInstance(); - calendar.add(Calendar.MINUTE, -DELAY_IN_MINUTE); - calendar.set(Calendar.SECOND, 0); - calendar.set(Calendar.MILLISECOND, 0); + Calendar calendar = Calendar.getInstance(); + calendar.add(Calendar.MINUTE, -DELAY_IN_MINUTE); + calendar.set(Calendar.SECOND, 0); + calendar.set(Calendar.MILLISECOND, 0); - Date date = calendar.getTime(); + Date date = calendar.getTime(); - int count = - PagamentoLocalServiceUtil.countByMezzo_Utilizzata_CreateDate(PagamentoConstants.MEZZO_IRIS, - PagamentoConstants.UTILIZZATA_IN_CORSO, date); + int count = PagamentoLocalServiceUtil.countByMezzo_Utilizzata_CreateDate( + PagamentoConstants.MEZZO_IRIS, PagamentoConstants.UTILIZZATA_IN_CORSO, date); - if (count > 0) { + if (count > 0) { - for (int cursor = 0; cursor <= count; cursor += SIZE) { + for (int cursor = 0; cursor <= count; cursor += SIZE) { - List pagamenti = - PagamentoLocalServiceUtil.findByMezzo_Utilizzata_CreateDate(PagamentoConstants.MEZZO_IRIS, - PagamentoConstants.UTILIZZATA_IN_CORSO, date, cursor, cursor + SIZE); + List pagamenti = PagamentoLocalServiceUtil + .findByMezzo_Utilizzata_CreateDate(PagamentoConstants.MEZZO_IRIS, + PagamentoConstants.UTILIZZATA_IN_CORSO, date, cursor, cursor + + SIZE); - for (Pagamento pagamento : pagamenti) { - process(pagamento); - } - } - } - } - } - } catch (SystemException e) { - _log.error("Errore", e); - } finally { - lock.unlock(); - } + for (Pagamento pagamento : pagamenti) { + process(pagamento); + } + } + } + } + } + } catch (SystemException e) { + _log.error("Errore", e); + } finally { + lock.unlock(); + } - } - } - - private void process(Pagamento pagamento) { - try { - PagamentiUtil.verificaPagamentoIRIS(pagamento); - } catch (PortalException e) { - _log.error("Errore", e); - } catch (SystemException e) { - _log.error("Errore", e); - } - } + } + } + private void process(Pagamento pagamento) { + try { + PagamentiUtil.verificaPagamentoIRIS(pagamento); + } catch (IOException | PortalException | SystemException e) { + _log.error("Errore", e); + } + } } diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/DettPraticaServiceImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/DettPraticaServiceImpl.java index 38a5770d..a26c052c 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/DettPraticaServiceImpl.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/DettPraticaServiceImpl.java @@ -429,13 +429,13 @@ public class DettPraticaServiceImpl extends DettPraticaServiceBaseImpl { return dettPraticaLocalService.updateCheckPagamenti(dettPraticaId, normEsenteSpese, normEsenteBollo); } - public DettPratica updateEsito(long dettPraticaId, int stato) throws SystemException, PortalException { + public DettPratica updateEsito(long dettPraticaId, int stato) throws IOException,SystemException, PortalException { DettPratica dettPratica = DettPraticaServiceUtil.getDettPratica(dettPraticaId); DettPraticaPermission.check(getPermissionChecker(), dettPratica.getGroupId(), ActionKeys.ADD_ENTRY); return dettPraticaLocalService.updateEsito(dettPraticaId, stato); } - public DettPratica updateEsitoIntegrazione(long dettPraticaId, int stato) throws SystemException, + public DettPratica updateEsitoIntegrazione(long dettPraticaId, int stato) throws IOException,SystemException, PortalException { DettPratica dettPratica = DettPraticaServiceUtil.getDettPratica(dettPraticaId); DettPraticaPermission.check(getPermissionChecker(), dettPratica.getGroupId(), ActionKeys.ADD_ENTRY); diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/PagamentoLocalServiceImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/PagamentoLocalServiceImpl.java index 8ffc32f4..09eeb388 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/PagamentoLocalServiceImpl.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/PagamentoLocalServiceImpl.java @@ -25,6 +25,7 @@ import it.tref.liferay.portos.bo.util.PagamentiCommonUtil; import it.tref.liferay.portos.bo.util.PagamentiUtil; import it.tref.liferay.portos.bo.util.PraticaUtil; +import java.io.IOException; import java.util.Date; import java.util.List; @@ -567,7 +568,7 @@ public class PagamentoLocalServiceImpl extends PagamentoLocalServiceBaseImpl { } public void updatePagamentoManuale(long pagamentoId, byte[] content, String sourceFileName, - ServiceContext serviceContext) throws PortalException, SystemException { + ServiceContext serviceContext) throws IOException, PortalException, SystemException { Pagamento pagamento = pagamentoLocalService.getPagamento(pagamentoId); // if (dettPratica.getPagamentoId() != pagamentoId) { diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/PagamentoServiceImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/PagamentoServiceImpl.java index 8c2bc116..79af8076 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/PagamentoServiceImpl.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/PagamentoServiceImpl.java @@ -12,6 +12,8 @@ package it.tref.liferay.portos.bo.service.impl; +import java.io.IOException; + import it.tref.liferay.portos.bo.model.Collaudo; import it.tref.liferay.portos.bo.model.DettPratica; import it.tref.liferay.portos.bo.model.FineLavori; @@ -30,13 +32,14 @@ import com.liferay.portal.service.ServiceContext; * The implementation of the pagamento remote service. * *

- * All custom service methods should be put in this class. Whenever methods are added, rerun - * ServiceBuilder to copy their definitions into the + * All custom service methods should be put in this class. Whenever methods are + * added, rerun ServiceBuilder to copy their definitions into the * {@link it.tref.liferay.portos.bo.service.PagamentoService} interface. * *

- * This is a remote service. Methods of this service are expected to have security checks based on - * the propagated JAAS credentials because this service can be accessed remotely. + * This is a remote service. Methods of this service are expected to have + * security checks based on the propagated JAAS credentials because this service + * can be accessed remotely. *

* * @author Davide Barbagallo, 3F Consulting @@ -44,87 +47,93 @@ import com.liferay.portal.service.ServiceContext; * @see it.tref.liferay.portos.bo.service.PagamentoServiceUtil */ public class PagamentoServiceImpl extends PagamentoServiceBaseImpl { - /* - * NOTE FOR DEVELOPERS: Never reference this interface directly. Always use {@link - * it.tref.liferay.portos.bo.service.PagamentoServiceUtil} to access the pagamento remote service. - */ - - public void sostituisciPagamento(long pagamentoId, String codiceFiscaleCommittente, String mezzo, String url, - ServiceContext serviceContext) throws PortalException, SystemException { - - Pagamento pagamento = PagamentoLocalServiceUtil.getPagamento(pagamentoId); - long userId = findTitolare(pagamentoId); - - if (getUserId() == userId || DelegheUtil.hasDelegaPagamento(userId, pagamento.getClassPk())) { - pagamentoLocalService.sostituisciPagamento(pagamentoId, codiceFiscaleCommittente, mezzo, url, serviceContext); - } else { - throw new SystemException("pagamento aggiornabile solo da titolare digitale del " + pagamento.getClassName()); - } - } - - public void rigeneraPagamento(long pagamentoId, String codiceFiscaleCommittente, String mezzo, String url, - ServiceContext serviceContext) throws PortalException, SystemException { - - if (PendingPagamentiPermission.contains(getPermissionChecker(), serviceContext.getScopeGroupId(), - ActionKeys.PAGAMENTI_PENDING)) { - // long userId = serviceContext.getUserId(); - // List roles = RoleLocalServiceUtil.getUserRoles(userId); - // boolean isAllowed = false; - // for (Role role : roles) { - // if (role.getTitle().equals("portos_admin")) { - // isAllowed = true; - // } - // } - // if (isAllowed) { - pagamentoLocalService.sostituisciPagamento(pagamentoId, codiceFiscaleCommittente, mezzo, url, serviceContext); - } else { - throw new SystemException("pagamento rigenerabile solo da personale autorizzato"); - } - } - - public void annullaPagamento(long pagamentoId, ServiceContext serviceContext) throws PortalException, SystemException { - - if (PendingPagamentiPermission.contains(getPermissionChecker(), serviceContext.getScopeGroupId(), - ActionKeys.PAGAMENTI_PENDING)) { - pagamentoLocalService.annullaPagamento(pagamentoId); - } else { - throw new SystemException("pagamento annullabile solo da personale autorizzato"); - } - } - - public void updatePagamentoManuale(long pagamentoId, byte[] content, String sourceFileName, - ServiceContext serviceContext) throws PortalException, SystemException { - - Pagamento pagamento = PagamentoLocalServiceUtil.getPagamento(pagamentoId); - long userId = findTitolare(pagamentoId); - - if (getUserId() == userId || DelegheUtil.hasDelegaPagamento(userId, pagamento.getClassPk())) { - pagamentoLocalService.updatePagamentoManuale(pagamentoId, content, sourceFileName, serviceContext); - } else { - throw new SystemException("pagamento manuale aggiornabile solo da titolare digitale del " - + pagamento.getClassName()); - } - - } - - private long findTitolare(long pagamentoId) throws PortalException, SystemException { - - Pagamento pagamento = PagamentoLocalServiceUtil.getPagamento(pagamentoId); - long userId = 0l; - if (DettPratica.class.getName().equals(pagamento.getClassName())) { - DettPratica dettPratica = dettPraticaLocalService.getDettPratica(pagamento.getClassPk()); - userId = dettPratica.getUserId(); - } else if (FineLavori.class.getName().equals(pagamento.getClassName())) { - FineLavori fineLavori = fineLavoriLocalService.getFineLavori(pagamento.getClassPk()); - userId = fineLavori.getUserId(); - } else if (Collaudo.class.getName().equals(pagamento.getClassName())) { - Collaudo collaudo = collaudoLocalService.getCollaudo(pagamento.getClassPk()); - userId = collaudo.getUserId(); - } else { - throw new RuntimeException("unable to replace pagamento for entity type " + pagamento.getClassName() - + " with id " + pagamento.getClassPk()); - } - return userId; - } + /* + * NOTE FOR DEVELOPERS: Never reference this interface directly. Always use + * {@link it.tref.liferay.portos.bo.service.PagamentoServiceUtil} to access + * the pagamento remote service. + */ + + public void sostituisciPagamento(long pagamentoId, String codiceFiscaleCommittente, String mezzo, + String url, ServiceContext serviceContext) throws PortalException, SystemException { + + Pagamento pagamento = PagamentoLocalServiceUtil.getPagamento(pagamentoId); + long userId = findTitolare(pagamentoId); + + if (getUserId() == userId || DelegheUtil.hasDelegaPagamento(userId, pagamento.getClassPk())) { + pagamentoLocalService.sostituisciPagamento(pagamentoId, codiceFiscaleCommittente, mezzo, url, + serviceContext); + } else { + throw new SystemException("pagamento aggiornabile solo da titolare digitale del " + + pagamento.getClassName()); + } + } + + public void rigeneraPagamento(long pagamentoId, String codiceFiscaleCommittente, String mezzo, + String url, ServiceContext serviceContext) throws PortalException, SystemException { + + if (PendingPagamentiPermission.contains(getPermissionChecker(), serviceContext.getScopeGroupId(), + ActionKeys.PAGAMENTI_PENDING)) { + // long userId = serviceContext.getUserId(); + // List roles = RoleLocalServiceUtil.getUserRoles(userId); + // boolean isAllowed = false; + // for (Role role : roles) { + // if (role.getTitle().equals("portos_admin")) { + // isAllowed = true; + // } + // } + // if (isAllowed) { + pagamentoLocalService.sostituisciPagamento(pagamentoId, codiceFiscaleCommittente, mezzo, url, + serviceContext); + } else { + throw new SystemException("pagamento rigenerabile solo da personale autorizzato"); + } + } + + public void annullaPagamento(long pagamentoId, ServiceContext serviceContext) throws PortalException, + SystemException { + + if (PendingPagamentiPermission.contains(getPermissionChecker(), serviceContext.getScopeGroupId(), + ActionKeys.PAGAMENTI_PENDING)) { + pagamentoLocalService.annullaPagamento(pagamentoId); + } else { + throw new SystemException("pagamento annullabile solo da personale autorizzato"); + } + } + + public void updatePagamentoManuale(long pagamentoId, byte[] content, String sourceFileName, + ServiceContext serviceContext) throws IOException, PortalException, SystemException { + + Pagamento pagamento = PagamentoLocalServiceUtil.getPagamento(pagamentoId); + long userId = findTitolare(pagamentoId); + + if (getUserId() == userId || DelegheUtil.hasDelegaPagamento(userId, pagamento.getClassPk())) { + pagamentoLocalService + .updatePagamentoManuale(pagamentoId, content, sourceFileName, serviceContext); + } else { + throw new SystemException("pagamento manuale aggiornabile solo da titolare digitale del " + + pagamento.getClassName()); + } + + } + + private long findTitolare(long pagamentoId) throws PortalException, SystemException { + + Pagamento pagamento = PagamentoLocalServiceUtil.getPagamento(pagamentoId); + long userId = 0l; + if (DettPratica.class.getName().equals(pagamento.getClassName())) { + DettPratica dettPratica = dettPraticaLocalService.getDettPratica(pagamento.getClassPk()); + userId = dettPratica.getUserId(); + } else if (FineLavori.class.getName().equals(pagamento.getClassName())) { + FineLavori fineLavori = fineLavoriLocalService.getFineLavori(pagamento.getClassPk()); + userId = fineLavori.getUserId(); + } else if (Collaudo.class.getName().equals(pagamento.getClassName())) { + Collaudo collaudo = collaudoLocalService.getCollaudo(pagamento.getClassPk()); + userId = collaudo.getUserId(); + } else { + throw new RuntimeException("unable to replace pagamento for entity type " + + pagamento.getClassName() + " with id " + pagamento.getClassPk()); + } + return userId; + } } diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/resource/asseverazioni/costruttore.html b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/resource/asseverazioni/costruttore.html index 37117ce9..1991a9e2 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/resource/asseverazioni/costruttore.html +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/resource/asseverazioni/costruttore.html @@ -17,7 +17,6 @@
  • di aver preso visione del progetto;
    • -
  • di impegnasi a realizzare l’opera così come è descritta nel progetto architettonico e strutturale, a rispettare le indicazioni del direttore dei lavori, le prescrizioni inerenti alla qualità dei materiali impiegati e alla corretta diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/service.properties b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/service.properties index f94c5b28..f4b11ed4 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/service.properties +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/service.properties @@ -13,8 +13,8 @@ ## build.namespace=portos_bo - build.number=2254 - build.date=1589897278985 + build.number=2265 + build.date=1590077289969 build.auto.upgrade=true ## diff --git a/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/fe/portlet/FascicoloFePortlet.java b/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/fe/portlet/FascicoloFePortlet.java index ce58e921..f4f09bf6 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/fe/portlet/FascicoloFePortlet.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/fe/portlet/FascicoloFePortlet.java @@ -1105,7 +1105,7 @@ public class FascicoloFePortlet extends MVCPortlet { } private void asseveraDomanda(ActionRequest actionRequest, ActionResponse actionResponse) - throws NestableException { + throws IOException, NestableException { try { String dichiarazioni = ""; @@ -2416,7 +2416,7 @@ public class FascicoloFePortlet extends MVCPortlet { } public void confermaAsseverazione(ActionRequest actionRequest, ActionResponse actionResponse) - throws PortalException, SystemException { + throws IOException, PortalException, SystemException { ServiceContext serviceContext = ServiceContextFactory.getInstance(actionRequest); long asseverazioneId = ParamUtil.getLong(actionRequest, "asseverazioneId"); @@ -2430,7 +2430,7 @@ public class FascicoloFePortlet extends MVCPortlet { } public void annullaAsseverazioni(ActionRequest actionRequest, ActionResponse actionResponse) - throws PortalException, SystemException { + throws IOException, PortalException, SystemException { ServiceContext serviceContext = ServiceContextFactory.getInstance(actionRequest); long dettPraticaId = ParamUtil.getLong(actionRequest, "dettPraticaId"); @@ -2786,7 +2786,7 @@ public class FascicoloFePortlet extends MVCPortlet { } public void completeDomandaEsente(ActionRequest actionRequest, ActionResponse actionResponse) - throws PortalException, SystemException { + throws IOException, PortalException, SystemException { long dettPraticaId = ParamUtil.getLong(actionRequest, "dettPraticaId"); long fineLavoriId = ParamUtil.getLong(actionRequest, "fineLavoriId"); @@ -2804,7 +2804,7 @@ public class FascicoloFePortlet extends MVCPortlet { } public void completeIntegrazione(ActionRequest actionRequest, ActionResponse actionResponse) - throws PortalException, SystemException { + throws IOException, PortalException, SystemException { long dettPraticaId = ParamUtil.getLong(actionRequest, "dettPraticaId"); @@ -2816,7 +2816,7 @@ public class FascicoloFePortlet extends MVCPortlet { } public void completeCambioSoggetti(ActionRequest actionRequest, ActionResponse actionResponse) - throws PortalException, SystemException { + throws IOException, PortalException, SystemException { long dettPraticaId = ParamUtil.getLong(actionRequest, "dettPraticaId"); diff --git a/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/html/fascicolofe/navigator/domanda/page_dettagli_principali.jsp b/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/html/fascicolofe/navigator/domanda/page_dettagli_principali.jsp index 5538d51b..da18c1c9 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/html/fascicolofe/navigator/domanda/page_dettagli_principali.jsp +++ b/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/html/fascicolofe/navigator/domanda/page_dettagli_principali.jsp @@ -814,7 +814,7 @@ $('#sistemi_costruttivi input').on('change', function(){ function checkIfDisableInfrastrutture(){ var destinazione = AUI().one("#destinazioneinazione input:checked"), - allowedValues = ["2", "A4A","A4B","A4C","A4D","A4E","A4F","A5A","B4A","B4B","B4C","B5A"]; + allowedValues = ["A4A","A4B","A4C","A4D","A4E","A4F","A5A","B4A","B4B","B4C","B5A"]; if( destinazione!=null && allowedValues.indexOf(destinazione.val()) != -1 ){ disableInput('#dati_metrici'); @@ -823,7 +823,8 @@ function checkIfDisableInfrastrutture(){ } else { enableInput('#dati_metrici'); enableInput('#descrizione_componenti_costruttiveContent'); - disableInput('#dati_infrastruttre_altro'); + enableInput('#dati_infrastruttre_altro'); +// disableInput('#dati_infrastruttre_altro'); } }