diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/lib/portos-bo-portlet-service.jar b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/lib/portos-bo-portlet-service.jar index 60c76835..029edd89 100644 Binary files a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/lib/portos-bo-portlet-service.jar and b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/lib/portos-bo-portlet-service.jar differ 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 dc54e419..18cf2f3a 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 @@ -110,7 +110,7 @@ public class ValidazionePraticaUtil { IntPratica intPratica = IntPraticaServiceUtil.getIntPratica(intPraticaId); return !intPratica.isSospesa() && !intPratica.isAnnullata() && !canEditPratica(intPraticaId) && !praticaHasVarianteInProgress(intPraticaId) && !praticaHasRichiestaIntegrazioneAttiva(intPraticaId) - && !praticaHasIntegrazioneInProgress(intPraticaId) && !praticaHasFineLavoriInProgress(intPraticaId) + && !praticaHasIntegrazioneInProgress(intPraticaId) && !praticaHasFineLavoriDateDefined(intPraticaId) && !praticaHasCollaudoInProgress(intPraticaId); } @@ -274,7 +274,13 @@ public class ValidazionePraticaUtil { FineLavori fineLavori = FineLavoriServiceUtil.getLastEditable(intPraticaId); return Validator.isNotNull(fineLavori); } + + public static boolean praticaHasFineLavoriDateDefined(long intPraticaId) throws SystemException, PortalException { + FineLavori fineLavori = FineLavoriServiceUtil.getLastEditable(intPraticaId); + return Validator.isNotNull(fineLavori) && fineLavori.isCompletata() && fineLavori.isParziale(); + } + public static boolean praticaHasFineLavoriPaymentPending(long intPraticaId) throws SystemException, PortalException { FineLavori fineLavori = FineLavoriServiceUtil.getLastEditable(intPraticaId); @@ -812,10 +818,11 @@ public class ValidazionePraticaUtil { DLPresente = true; } } - if (!DLPresente || !dettPratica.isLavoriPubblici() || IntPraticaLocalServiceUtil.getIntPratica(intPraticaId).isPraticaOspedaliera()) { + if (!DLPresente && dettPratica.isLavoriPubblici() && !IntPraticaLocalServiceUtil.getIntPratica(intPraticaId).isPraticaOspedaliera()) { firmeFiltrate.remove(TipoSoggettoUtil.DIRETTORE_LAVORI); } - if (!isAllRequiredValid(doc.getTipologia(), dettPratica.getIntPraticaId(), signatures, firmeFiltrate, + if (dettPratica.getNormArt3com3() || + !isAllRequiredValid(doc.getTipologia(), dettPratica.getIntPraticaId(), signatures, firmeFiltrate, doc)) { notCompleted.add(doc.getTipologia() + " firme obbligatorie mancanti"); } 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 79768ead..88dfb12e 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=2921 - build.date=1695208689116 + build.number=2924 + build.date=1697020011966 build.auto.upgrade=true ## diff --git a/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/WEB-INF/lib/portos-bo-portlet-service.jar b/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/WEB-INF/lib/portos-bo-portlet-service.jar index 8dd1676c..029edd89 100644 Binary files a/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/WEB-INF/lib/portos-bo-portlet-service.jar and b/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/WEB-INF/lib/portos-bo-portlet-service.jar differ diff --git a/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/WEB-INF/lib/portos-report-shared.jar b/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/WEB-INF/lib/portos-report-shared.jar index e79e6878..f31e9a28 100644 Binary files a/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/WEB-INF/lib/portos-report-shared.jar and b/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/WEB-INF/lib/portos-report-shared.jar differ 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 f010b170..e54f5197 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 @@ -729,14 +729,14 @@ function duplicati(input) { name="tcMiglioramentoSismico" label="tc-miglioramento-sismico" /> <% String tcRiparazioneInterventoLocalClass = ""; - if(!isPraticaOspedaliera){ + if(isPraticaOspedaliera){ tcRiparazioneInterventoLocalClass = "hide"; } %>
  • + cssClass="<%= tcRiparazioneInterventoLocalClass %>" wrapperCssClass="<%= tcRiparazioneInterventoLocalClass %>" />