diff --git a/liferay-plugins-sdk-6.2/dist/portos-bo-shared-6.2.0.1.jar b/liferay-plugins-sdk-6.2/dist/portos-bo-shared-6.2.0.1.jar index 645ff709..94db0c76 100644 Binary files a/liferay-plugins-sdk-6.2/dist/portos-bo-shared-6.2.0.1.jar and b/liferay-plugins-sdk-6.2/dist/portos-bo-shared-6.2.0.1.jar differ 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 13b13b28..a7ad6bcd 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/lib/portos-bo-shared.jar b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/lib/portos-bo-shared.jar index 645ff709..94db0c76 100644 Binary files a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/lib/portos-bo-shared.jar and b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/lib/portos-bo-shared.jar differ 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 691c269c..8fdedc2d 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 @@ -1250,3 +1250,5 @@ tipo-procedura-OSPEDALIERA = - Interventi per il potenziamento della rete ospe mappe-bbcc = Mappe BBCC mappe-openstreetmap = OpenStreetmap + +pratica-ospedali = P.R. Ospedaliera diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/mwg/sismica/bo/util/ZoneSismicheUtil.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/mwg/sismica/bo/util/ZoneSismicheUtil.java index ca7c9246..4fa38156 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/mwg/sismica/bo/util/ZoneSismicheUtil.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/mwg/sismica/bo/util/ZoneSismicheUtil.java @@ -41,7 +41,7 @@ public class ZoneSismicheUtil { public List aggiornaComuni(long companyId) throws PortalException, SystemException { List ret = new ArrayList<>(); - ret.add(aggiungiComune(companyId, "Misiliscemi", "081", "025", "081025", "M432", false, "", "", serviceContext)); + ret.add(aggiungiComune(companyId, "Misiliscemi", "081", "025", "081025", "M432", false, "", "", false, serviceContext)); ret.add(impostaZona(companyId, "MENFI", 1, "0,1659")); ret.add(impostaZona(companyId, "MONTEVAGO", 1, "0,1629")); diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/portlet/AmministrazionePortlet.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/portlet/AmministrazionePortlet.java index 10901031..30cad0d7 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/portlet/AmministrazionePortlet.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/portlet/AmministrazionePortlet.java @@ -180,7 +180,7 @@ public class AmministrazionePortlet extends MVCPortlet { String denominazione = ParamUtil.getString(actionRequest, "denominazione"); String mailSuap = ParamUtil.getString(actionRequest, "mailSuap"); String mailSue = ParamUtil.getString(actionRequest, "mailSue"); - boolean praticaOspedaliera = ParamUtil.getBoolean(actionRequest, "praticaOspedaliera"); + boolean praticaOspedaliera = ParamUtil.getBoolean(actionRequest, "praticaOspedali"); boolean provincia = ParamUtil.getBoolean(actionRequest, "provincia"); ServiceContext serviceContext = ServiceContextFactory.getInstance(Comune.class.getName(), actionRequest); long userId = PortalUtil.getUserId(actionRequest); 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 c307e7c5..26a6270b 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=2905 - build.date=1683195261012 + build.number=2906 + build.date=1683294189849 build.auto.upgrade=true ## diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/html/amministrazione/tabs/comuni/edit.jsp b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/html/amministrazione/tabs/comuni/edit.jsp index df95baae..5dc20a51 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/html/amministrazione/tabs/comuni/edit.jsp +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/html/amministrazione/tabs/comuni/edit.jsp @@ -71,7 +71,7 @@ if(Validator.isNotNull(comune.getCodiceProvincia())) { - + @@ -81,6 +81,7 @@ if(Validator.isNotNull(comune.getCodiceProvincia())) { + A.one('#selectProvinciaLink').on('click', function(event) { Liferay.Util.selectEntity( 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 fe418ea6..a7ad6bcd 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-bo-shared.jar b/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/WEB-INF/lib/portos-bo-shared.jar index 645ff709..94db0c76 100644 Binary files a/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/WEB-INF/lib/portos-bo-shared.jar and b/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/WEB-INF/lib/portos-bo-shared.jar differ diff --git a/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/fe/util/FascicoloFEUtil.java b/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/fe/util/FascicoloFEUtil.java index c96276e6..452b483f 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/fe/util/FascicoloFEUtil.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/fe/util/FascicoloFEUtil.java @@ -17,7 +17,7 @@ public class FascicoloFEUtil { public static String getTipoProceduraString(IntPratica intPratica){ if(Constants.PROCEDURA_B.equals(intPratica.getTipoProcedura()) && intPratica.isPraticaOspedaliera()){ - return Constants.PROCEDURA_H; + return Constants.PROCEDURA_H_LABEL; } else { return intPratica.getTipoProcedura(); } 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 a66fed9e..2750b4ce 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 @@ -205,15 +205,17 @@ if (!ConfigurazioneLocalServiceUtil.isProduction()) {
- - - - - + + + + + + +
@@ -726,9 +728,11 @@ function duplicati(input) {
    • -
    • + +
    • +     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 1b854052..cd40327a 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 @@ -19,6 +19,7 @@ public class Constants implements com.liferay.portal.kernel.util.Constants { public static final String PROCEDURA_B1 = "B1"; public static final String PROCEDURA_C = "C"; public static final String PROCEDURA_H = "OSPEDALIERA"; + public static final String PROCEDURA_H_LABEL = "P.R. OSPEDALIERA"; public static final String TIPO_PRATICA_DEPOSITO = "01"; public static final String TIPO_PRATICA_AUTORIZZAZIONE = "02"; diff --git a/liferay-plugins-sdk-6.2/webs/portos-kaleo-web/docroot/META-INF/custom_jsps/html/portlet/workflow_tasks/render_form_task.jsp b/liferay-plugins-sdk-6.2/webs/portos-kaleo-web/docroot/META-INF/custom_jsps/html/portlet/workflow_tasks/render_form_task.jsp index 596e8188..0c1fe83f 100644 --- a/liferay-plugins-sdk-6.2/webs/portos-kaleo-web/docroot/META-INF/custom_jsps/html/portlet/workflow_tasks/render_form_task.jsp +++ b/liferay-plugins-sdk-6.2/webs/portos-kaleo-web/docroot/META-INF/custom_jsps/html/portlet/workflow_tasks/render_form_task.jsp @@ -1,4 +1,3 @@ -<%@page import="org.htmlparser.Attribute"%> <%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> <%@page import="com.liferay.portal.kernel.portlet.LiferayWindowState"%> <%@page import="com.liferay.portal.kernel.util.LocaleUtil"%> @@ -17,6 +16,7 @@ <%@page import="org.apache.commons.codec.binary.Hex"%> <%@page import="org.htmlparser.Node"%> <%@page import="org.htmlparser.Parser"%> +<%@page import="org.htmlparser.Attribute"%> <%@page import="org.htmlparser.nodes.TagNode"%> <%@page import="org.htmlparser.nodes.TextNode"%> <%@page import="org.htmlparser.tags.InputTag"%>