From 92f42955c1b2c8b0ff095082fb22c066f1c268a8 Mon Sep 17 00:00:00 2001 From: marcoalderighi Date: Wed, 3 May 2023 16:59:52 +0200 Subject: [PATCH] - creazione pratica Q11 Ospedaliera - fix disable/enable per checkbox in creazione pratica --- .../build.malde.properties | 18 +- .../WEB-INF/src/content/Portal.properties | 4 +- .../impl/DettPraticaLocalServiceImpl.java | 6 + .../impl/IntPraticaLocalServiceImpl.java | 4 +- .../domanda/page_dettagli_principali.jsp | 197 +++++++++++------- .../portos-fe-portlet/docroot/js/main.js | 2 +- .../portos/bo/shared/util/Constants.java | 3 + 7 files changed, 142 insertions(+), 92 deletions(-) diff --git a/liferay-plugins-sdk-6.2/build.malde.properties b/liferay-plugins-sdk-6.2/build.malde.properties index a6b76a55..1465f892 100644 --- a/liferay-plugins-sdk-6.2/build.malde.properties +++ b/liferay-plugins-sdk-6.2/build.malde.properties @@ -2,13 +2,13 @@ #Managed by Liferay IDE (remove this comment to prevent future updates) #Tue Apr 04 17:33:21 CEST 2023 -app.server.portal.dir = C:\\liferay-sviluppo\\sicilia\\pae\\liferay-portal-6.2-ce-ga6\\tomcat-7.0.62\\webapps\\ROOT -app.server.parent.dir = C:\\liferay-sviluppo\\sicilia\\pae\\liferay-portal-6.2-ce-ga6 -app.server.lib.global.dir = C:\\liferay-sviluppo\\sicilia\\pae\\liferay-portal-6.2-ce-ga6\\tomcat-7.0.62\\lib\\ext -app.server.deploy.dir = C:\\liferay-sviluppo\\sicilia\\pae\\liferay-portal-6.2-ce-ga6\\tomcat-7.0.62\\webapps +app.server.portal.dir = C:\\liferay-sviluppo\\sicilia\\pae\\liferay-portal-6.2-ce-ga6-patched6.2.5\\tomcat-7.0.62\\webapps\\ROOT +app.server.parent.dir = C:\\liferay-sviluppo\\sicilia\\pae\\liferay-portal-6.2-ce-ga6-patched6.2.5 +app.server.lib.global.dir = C:\\liferay-sviluppo\\sicilia\\pae\\liferay-portal-6.2-ce-ga6-patched6.2.5\\tomcat-7.0.62\\lib\\ext +app.server.deploy.dir = C:\\liferay-sviluppo\\sicilia\\pae\\liferay-portal-6.2-ce-ga6-patched6.2.5\\tomcat-7.0.62\\webapps app.server.type = tomcat -app.server.dir = C:\\liferay-sviluppo\\sicilia\\pae\\liferay-portal-6.2-ce-ga6\\tomcat-7.0.62 -app.server.tomcat.dir = C:\\liferay-sviluppo\\sicilia\\pae\\liferay-portal-6.2-ce-ga6\\tomcat-7.0.62 -app.server.tomcat.deploy.dir = C:\\liferay-sviluppo\\sicilia\\pae\\liferay-portal-6.2-ce-ga6\\tomcat-7.0.62\\webapps -app.server.tomcat.portal.dir = C:\\liferay-sviluppo\\sicilia\\pae\\liferay-portal-6.2-ce-ga6\\tomcat-7.0.62\\webapps\\ROOT -app.server.tomcat.lib.global.dir = C:\\liferay-sviluppo\\sicilia\\pae\\liferay-portal-6.2-ce-ga6\\tomcat-7.0.62\\lib\\ext +app.server.dir = C:\\liferay-sviluppo\\sicilia\\pae\\liferay-portal-6.2-ce-ga6-patched6.2.5\\tomcat-7.0.62 +app.server.tomcat.dir = C:\\liferay-sviluppo\\sicilia\\pae\\liferay-portal-6.2-ce-ga6-patched6.2.5\\tomcat-7.0.62 +app.server.tomcat.deploy.dir = C:\\liferay-sviluppo\\sicilia\\pae\\liferay-portal-6.2-ce-ga6-patched6.2.5\\tomcat-7.0.62\\webapps +app.server.tomcat.portal.dir = C:\\liferay-sviluppo\\sicilia\\pae\\liferay-portal-6.2-ce-ga6-patched6.2.5\\tomcat-7.0.62\\webapps\\ROOT +app.server.tomcat.lib.global.dir = C:\\liferay-sviluppo\\sicilia\\pae\\liferay-portal-6.2-ce-ga6-patched6.2.5\\tomcat-7.0.62\\lib\\ext 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 0c871d6c..75b28fd9 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 @@ -247,7 +247,7 @@ dp-normativa = Normativa tecnica di riferimento dp-nuovo-progetto = Nuovo Progetto localita = Località -via = Localizzazione +via = Indirizzo dp-allegato = Allegato dp-particelle = Particelle dp-lat= Latitudine @@ -1366,6 +1366,8 @@ label_procedura_Q9 = 9 tipo_procedura_Q9 = Accertamento di compatibilità paesaggistica per istanze di Condono Edilizio label_procedura_Q10 = 10 tipo_procedura_Q10 = Certificazione di sussistenza vincoli +label_procedura_Q11 = 11 +tipo_procedura_Q11 = Interventi per il potenziamento della rete ospedaliera della Regione Siciliana, emergenza COVID-19 ex ordinanza 25/20 mappe-bbcc = Mappe BBCC mappe-openstreetmap = OpenStreetmap diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/DettPraticaLocalServiceImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/DettPraticaLocalServiceImpl.java index 6f56aa5e..92397c1d 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/DettPraticaLocalServiceImpl.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/DettPraticaLocalServiceImpl.java @@ -139,6 +139,12 @@ public class DettPraticaLocalServiceImpl extends DettPraticaLocalServiceBaseImpl dettPratica.setIntPraticaId(intPratica.getIntPraticaId()); dettPratica.setNormArt3com4(true); dettPratica.setNormArt3com3(true); + if (tipoProcedura.equalsIgnoreCase(Constants.PROCEDURA_Q11)){ + dettPratica.setNormEsenteBollo(true); + dettPratica.setNormEsenteSpese(true); + dettPratica.setLavoriPubblici(true); + dettPratica.setDestinazione("A1A"); + } dettPratica = dettPraticaPersistence.update(dettPratica); return dettPratica; } diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/IntPraticaLocalServiceImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/IntPraticaLocalServiceImpl.java index 0d1c49d7..894a08e3 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/IntPraticaLocalServiceImpl.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/IntPraticaLocalServiceImpl.java @@ -148,7 +148,7 @@ public class IntPraticaLocalServiceImpl extends IntPraticaLocalServiceBaseImpl { tipiProcedure = new LinkedHashMap<>(); for (String tipo : Arrays.asList(Constants.PROCEDURA_Q1, Constants.PROCEDURA_Q2, Constants.PROCEDURA_Q3, Constants.PROCEDURA_Q4, Constants.PROCEDURA_Q5, Constants.PROCEDURA_Q6, Constants.PROCEDURA_Q7, - Constants.PROCEDURA_Q8, Constants.PROCEDURA_Q9, Constants.PROCEDURA_Q10)) { + Constants.PROCEDURA_Q8, Constants.PROCEDURA_Q9, Constants.PROCEDURA_Q10, Constants.PROCEDURA_Q11)) { tipiProcedure.put(tipo, LanguageUtil.get(LocaleUtil.ITALIAN, "tipo_procedura_" + tipo)); } } @@ -1302,7 +1302,7 @@ public class IntPraticaLocalServiceImpl extends IntPraticaLocalServiceBaseImpl { MailManagerUtil.sendMailByTemplatName(className, classPk, templateName, to, cc, ccn, templateVariables, allegati, serviceContext); } - + @Override public Hits searchAltriProgetti(HttpServletRequest request, User user, int start, int end) { 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 374c3e6d..12214662 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 @@ -43,6 +43,7 @@ boolean enabledByIntegrazione = dettPratica.hasDelegaCompilazioneDomanda(user.ge boolean isDisabled = disabledInput && !enabledByIntegrazione; boolean isNewVariante = ParamUtil.getBoolean(request, "isNewVariante"); boolean disableViarch = !dettPratica.getLavoriPubblici() && !dettPratica.getIntervFinPub(); +boolean isPraticaOspedaliera = intPratica.getTipoProcedura().equalsIgnoreCase(Constants.PROCEDURA_Q11); String urlIframeMappe = MappeUtil.getUrlFe(request, dettPratica, comune, (disabledInput || isGeoEditable)); String hide1 = intPratica.getTipoProcedura().equalsIgnoreCase(Constants.PROCEDURA_Q1) || intPratica.getTipoProcedura().equalsIgnoreCase(Constants.PROCEDURA_P1) ? "hideSection" : ""; @@ -54,6 +55,8 @@ String hide9 = intPratica.getTipoProcedura().equalsIgnoreCase(Constants.PROCEDUR || intPratica.getTipoProcedura().equalsIgnoreCase(Constants.PROCEDURA_P9) ? "hideSection" : ""; String hide10 = intPratica.getTipoProcedura().equalsIgnoreCase(Constants.PROCEDURA_Q10) || intPratica.getTipoProcedura().equalsIgnoreCase(Constants.PROCEDURA_P10) ? "hideSection" : ""; +String hide11 = isPraticaOspedaliera ? "hideSection" : ""; + boolean showDiocesi = intPratica.getTipoProcedura().equalsIgnoreCase(Constants.PROCEDURA_Q1) || intPratica.getTipoProcedura().equalsIgnoreCase(Constants.PROCEDURA_Q2); String originMappe = ConfigurazioneLocalServiceUtil.isProduction() ? @@ -115,7 +118,8 @@ String originMappe = ConfigurazioneLocalServiceUtil.isProduction() ?
-
@@ -145,13 +149,15 @@ String originMappe = ConfigurazioneLocalServiceUtil.isProduction() ?
-
-
@@ -185,7 +191,7 @@ String originMappe = ConfigurazioneLocalServiceUtil.isProduction() ? name="estremiPratCom" label="estremi-prat-com"/> -
+
-
+
-
+
- - + +
- - + +
@@ -437,48 +444,62 @@ function duplicati(input) {

A) <%= LanguageUtil.get(pageContext, "destinazione-A") %>

 

1. <%= LanguageUtil.get(pageContext, "destinazione-A1") %>

- - - + + +

 

2. <%= LanguageUtil.get(pageContext, "destinazione-A2") %>

 

- - - - + + + +

 

3. <%= LanguageUtil.get(pageContext, "destinazione-A3") %>

 

- +

 

4. <%= LanguageUtil.get(pageContext, "destinazione-A4") %>

 

- - - - - - + + + + + +

 

5. <%= LanguageUtil.get(pageContext, "destinazione-A5") %>

 

- +

 

@@ -486,52 +507,70 @@ function duplicati(input) {

B) <%= LanguageUtil.get(pageContext, "destinazione-B") %>

 

1. <%= LanguageUtil.get(pageContext, "destinazione-B1") %>

- - - + + +

 

2. <%= LanguageUtil.get(pageContext, "destinazione-B2") %>

 

- - - - - - - - - - + + + + + + + + + +

 

3. <%= LanguageUtil.get(pageContext, "destinazione-B3") %>

 

- - + +

 

4. <%= LanguageUtil.get(pageContext, "destinazione-B4") %>

 

- - - + + +

 

diff --git a/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/js/main.js b/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/js/main.js index ac3c0bbf..bc4b375c 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/js/main.js +++ b/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/js/main.js @@ -42,7 +42,7 @@ function setInitAltroTextArea() { }); } -$('.altro_check input[type=checkbox]').change(function() { +$('.altro_check input[type=checkbox]').not('input[name="normEsenteBollo"]').change(function() { if ($(this).is(':checked')) { $(this).closest(".row").next().find('input, textarea').prop('disabled', false); } else { diff --git a/liferay-plugins-sdk-6.2/shared/portos-bo-shared/src/it/tref/liferay/portos/bo/shared/util/Constants.java b/liferay-plugins-sdk-6.2/shared/portos-bo-shared/src/it/tref/liferay/portos/bo/shared/util/Constants.java index 71942df6..6aa68e16 100644 --- a/liferay-plugins-sdk-6.2/shared/portos-bo-shared/src/it/tref/liferay/portos/bo/shared/util/Constants.java +++ b/liferay-plugins-sdk-6.2/shared/portos-bo-shared/src/it/tref/liferay/portos/bo/shared/util/Constants.java @@ -36,6 +36,7 @@ public class Constants implements com.liferay.portal.kernel.util.Constants { public static final String PROCEDURA_Q8 = "Q8"; public static final String PROCEDURA_Q9 = "Q9"; public static final String PROCEDURA_Q10 = "Q10"; + public static final String PROCEDURA_Q11 = "Q11"; public static final String TIPO_PRATICA_DEPOSITO = "01"; public static final String TIPO_PRATICA_AUTORIZZAZIONE = "02"; @@ -51,6 +52,7 @@ public class Constants implements com.liferay.portal.kernel.util.Constants { public static final int COMPAT_PAESAGGISTICA = 8; public static final int SANATORIE = 9; public static final int VINCOLI = 10; + public static final int OSPEDALIERA = 11; @SuppressWarnings("serial") public static final Map PRATICA_ZONE = new HashMap() { @@ -77,6 +79,7 @@ public class Constants implements com.liferay.portal.kernel.util.Constants { put(PROCEDURA_Q8, TIPO_PRATICA_AUTORIZZAZIONE); put(PROCEDURA_Q9, TIPO_PRATICA_AUTORIZZAZIONE); put(PROCEDURA_Q10, TIPO_PRATICA_AUTORIZZAZIONE); + put(PROCEDURA_Q11, TIPO_PRATICA_AUTORIZZAZIONE); } };