From 91b77782e3e7b9d0cdb8d98b50ec32ccd715726b Mon Sep 17 00:00:00 2001 From: Mattia Gosetto Date: Mon, 6 Sep 2021 17:21:09 +0200 Subject: [PATCH 1/2] =?UTF-8?q?attivit=C3=A0=20paesaggistica=20campisi?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../org.eclipse.wst.common.component | 6 --- .../portos/bo/util/DocumentiPraticaUtil.java | 14 ++++--- .../bo/util/ValidazionePraticaUtil.java | 2 +- .../impl/AsseverazioneLocalServiceImpl.java | 2 +- .../docroot/WEB-INF/src/service.properties | 4 +- .../org.eclipse.wst.common.component | 4 +- .../domanda/page_dettagli_principali.jsp | 40 +++++++++---------- 7 files changed, 35 insertions(+), 37 deletions(-) diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/.settings/org.eclipse.wst.common.component b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/.settings/org.eclipse.wst.common.component index 88aeccff..46a12de8 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/.settings/org.eclipse.wst.common.component +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/.settings/org.eclipse.wst.common.component @@ -12,12 +12,6 @@ uses - - uses - - - uses - diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/util/DocumentiPraticaUtil.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/util/DocumentiPraticaUtil.java index 195c4274..734aa7a3 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/util/DocumentiPraticaUtil.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/util/DocumentiPraticaUtil.java @@ -250,13 +250,17 @@ public class DocumentiPraticaUtil { /* * if (dettPratica.getNormLavoriInProprio()) { docObbligatori.add(TIPOLOGIA_ALLEGATO_A29); } */ + if (!dettPratica.getTcNoOpereEscavazione() && (!intPratica.getTipoProcedura().equals(Constants.PROCEDURA_Q8) - || !intPratica.getTipoProcedura().equals(Constants.PROCEDURA_P8) - || !intPratica.getTipoProcedura().equals(Constants.PROCEDURA_Q9) - || !intPratica.getTipoProcedura().equals(Constants.PROCEDURA_P9) - || !intPratica.getTipoProcedura().equals(Constants.PROCEDURA_Q10) || !intPratica - .getTipoProcedura().equals(Constants.PROCEDURA_P10))) { + && !intPratica.getTipoProcedura().equals(Constants.PROCEDURA_P8) + && !intPratica.getTipoProcedura().equals(Constants.PROCEDURA_Q9) + && !intPratica.getTipoProcedura().equals(Constants.PROCEDURA_P9) + && !intPratica.getTipoProcedura().equals(Constants.PROCEDURA_Q10) + && !intPratica.getTipoProcedura().equals(Constants.PROCEDURA_P10) + && !intPratica.getTipoProcedura().equals(Constants.PROCEDURA_Q1) + && !intPratica.getTipoProcedura().equals(Constants.PROCEDURA_P1) + )) { docObbligatori.add(TIPOLOGIA_ALLEGATO_A10); } if (richiestoA24(dettPratica)) { 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 0251d6e4..b1e1311e 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 @@ -491,7 +491,7 @@ public class ValidazionePraticaUtil { } boolean tipologiaCostruttiva = dettPratica.getTcNuovaCostruzione() || dettPratica.getTcNuovaCostruzionePertinenza() || dettPratica.getTcCostruzioniEsistenti() - || dettPratica.getTcManutOrdStraord() || dettPratica.getTcAltriInterventi(); + || dettPratica.getTcManutOrdStraord() || dettPratica.getTcAltriInterventi() || dettPratica.getTcNoOpereEscavazione(); if (!tipologiaCostruttiva && !intPratica.getTipoProcedura().equals(Constants.PROCEDURA_P1) && !intPratica.getTipoProcedura().equals(Constants.PROCEDURA_Q1)) { notCompleted.add("Tipologia intervento mancante"); diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/AsseverazioneLocalServiceImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/AsseverazioneLocalServiceImpl.java index fff6ea31..6aec0ba4 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/AsseverazioneLocalServiceImpl.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/AsseverazioneLocalServiceImpl.java @@ -252,7 +252,7 @@ public class AsseverazioneLocalServiceImpl extends AsseverazioneLocalServiceBase } // Dichiarazioni del titolare digitale boolean a27 = dettPratica.getNoCollaudo(); - boolean a27bis = dettPratica.getCollaudoStatico(); + boolean a27bis = dettPratica.getNominaCollaudatore(); boolean a29 = dettPratica.getNormLavoriInProprio(); boolean a29bis = dettPratica.getNominaImpresa(); boolean a30 = dettPratica.getNormLavoriNoDirettore(); 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 18e017b1..11605c30 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=3308 - build.date=1630678547546 + build.number=3313 + build.date=1630941534079 build.auto.upgrade=true ## diff --git a/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/.settings/org.eclipse.wst.common.component b/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/.settings/org.eclipse.wst.common.component index 26b0e067..e1d846ac 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/.settings/org.eclipse.wst.common.component +++ b/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/.settings/org.eclipse.wst.common.component @@ -2,10 +2,10 @@ - + uses - + uses 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 4cb9b02a..6b75bff3 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 @@ -69,14 +69,14 @@ String hide10 = (intPratica.getTipoProcedura().equals(Constants.PROCEDURA_Q10) |
-
+
-
+

<%=LanguageUtil.get(pageContext, "sanatoria-edilizia") %>

@@ -109,24 +109,24 @@ String hide10 = (intPratica.getTipoProcedura().equals(Constants.PROCEDURA_Q10) | -
+
-
+
-
+
-
+

<%= LanguageUtil.get(pageContext, "interv-no-viarch") %>

@@ -149,13 +149,13 @@ String hide10 = (intPratica.getTipoProcedura().equals(Constants.PROCEDURA_Q10) |
-
+
-
+
-
+
-
+
-
+
-
-