Sfoglia il codice sorgente

fixes pratica ospedaliera

feature/fix_soggetti
marcoalderighi 2 anni fa
parent
commit
196a85a95e
  1. BIN
      liferay-plugins-sdk-6.2/dist/portos-bo-shared-6.2.0.1.jar
  2. BIN
      liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/lib/portos-bo-portlet-service.jar
  3. BIN
      liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/lib/portos-bo-shared.jar
  4. 2
      liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/content/Portal.properties
  5. 2
      liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/mwg/sismica/bo/util/ZoneSismicheUtil.java
  6. 2
      liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/portlet/AmministrazionePortlet.java
  7. 4
      liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/service.properties
  8. 3
      liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/html/amministrazione/tabs/comuni/edit.jsp
  9. BIN
      liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/WEB-INF/lib/portos-bo-portlet-service.jar
  10. BIN
      liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/WEB-INF/lib/portos-bo-shared.jar
  11. 2
      liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/fe/util/FascicoloFEUtil.java
  12. 4
      liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/html/fascicolofe/navigator/domanda/page_dettagli_principali.jsp
  13. 1
      liferay-plugins-sdk-6.2/shared/portos-bo-shared/src/it/tref/liferay/portos/bo/shared/util/Constants.java
  14. 2
      liferay-plugins-sdk-6.2/webs/portos-kaleo-web/docroot/META-INF/custom_jsps/html/portlet/workflow_tasks/render_form_task.jsp

BIN
liferay-plugins-sdk-6.2/dist/portos-bo-shared-6.2.0.1.jar vendored

File binario non mostrato.

BIN
liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/lib/portos-bo-portlet-service.jar

File binario non mostrato.

BIN
liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/lib/portos-bo-shared.jar

File binario non mostrato.

2
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-bbcc = Mappe BBCC
mappe-openstreetmap = OpenStreetmap mappe-openstreetmap = OpenStreetmap
pratica-ospedali = P.R. Ospedaliera

2
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<String> aggiornaComuni(long companyId) throws PortalException, SystemException { public List<String> aggiornaComuni(long companyId) throws PortalException, SystemException {
List<String> ret = new ArrayList<>(); List<String> 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, "MENFI", 1, "0,1659"));
ret.add(impostaZona(companyId, "MONTEVAGO", 1, "0,1629")); ret.add(impostaZona(companyId, "MONTEVAGO", 1, "0,1629"));

2
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 denominazione = ParamUtil.getString(actionRequest, "denominazione");
String mailSuap = ParamUtil.getString(actionRequest, "mailSuap"); String mailSuap = ParamUtil.getString(actionRequest, "mailSuap");
String mailSue = ParamUtil.getString(actionRequest, "mailSue"); String mailSue = ParamUtil.getString(actionRequest, "mailSue");
boolean praticaOspedaliera = ParamUtil.getBoolean(actionRequest, "praticaOspedaliera"); boolean praticaOspedaliera = ParamUtil.getBoolean(actionRequest, "praticaOspedali");
boolean provincia = ParamUtil.getBoolean(actionRequest, "provincia"); boolean provincia = ParamUtil.getBoolean(actionRequest, "provincia");
ServiceContext serviceContext = ServiceContextFactory.getInstance(Comune.class.getName(), actionRequest); ServiceContext serviceContext = ServiceContextFactory.getInstance(Comune.class.getName(), actionRequest);
long userId = PortalUtil.getUserId(actionRequest); long userId = PortalUtil.getUserId(actionRequest);

4
liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/service.properties

@ -13,8 +13,8 @@
## ##
build.namespace=portos_bo build.namespace=portos_bo
build.number=2905 build.number=2906
build.date=1683195261012 build.date=1683294189849
build.auto.upgrade=true build.auto.upgrade=true
## ##

3
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())) {
<aui:input name="provincia" /> <aui:input name="provincia" />
<aui:input name="mailSuap" /> <aui:input name="mailSuap" />
<aui:input name="mailSue" /> <aui:input name="mailSue" />
<aui:input name="praticaOspedaliera" /> <aui:input name="praticaOspedali" />
<aui:button-row> <aui:button-row>
<aui:button type="submit" value="save" /> <aui:button type="submit" value="save" />
</aui:button-row> </aui:button-row>
@ -81,6 +81,7 @@ if(Validator.isNotNull(comune.getCodiceProvincia())) {
<liferay-portlet:param name="eventName" value='<%=renderResponse.getNamespace()+"selectProvincia" %>' /> <liferay-portlet:param name="eventName" value='<%=renderResponse.getNamespace()+"selectProvincia" %>' />
<liferay-portlet:param name="mvcPath" value="/html/amministrazione/tabs/province/select_provincia.jsp" /> <liferay-portlet:param name="mvcPath" value="/html/amministrazione/tabs/province/select_provincia.jsp" />
</liferay-portlet:renderURL> </liferay-portlet:renderURL>
<aui:script use="aui-base"> <aui:script use="aui-base">
A.one('#<portlet:namespace />selectProvinciaLink').on('click', function(event) { A.one('#<portlet:namespace />selectProvinciaLink').on('click', function(event) {
Liferay.Util.selectEntity( Liferay.Util.selectEntity(

BIN
liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/WEB-INF/lib/portos-bo-portlet-service.jar

File binario non mostrato.

BIN
liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/WEB-INF/lib/portos-bo-shared.jar

File binario non mostrato.

2
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){ public static String getTipoProceduraString(IntPratica intPratica){
if(Constants.PROCEDURA_B.equals(intPratica.getTipoProcedura()) && intPratica.isPraticaOspedaliera()){ if(Constants.PROCEDURA_B.equals(intPratica.getTipoProcedura()) && intPratica.isPraticaOspedaliera()){
return Constants.PROCEDURA_H; return Constants.PROCEDURA_H_LABEL;
} else { } else {
return intPratica.getTipoProcedura(); return intPratica.getTipoProcedura();
} }

4
liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/html/fascicolofe/navigator/domanda/page_dettagli_principali.jsp

@ -205,6 +205,7 @@ if (!ConfigurazioneLocalServiceUtil.isProduction()) {
</div> </div>
<div class="row row-padding-custom"> <div class="row row-padding-custom">
<div class="col-xs-12"> <div class="col-xs-12">
<c:if test="<%= !isPraticaOspedaliera %>">
<c:if <c:if
test='<%=(disabledInput && !enabledByIntegrazione) || !disabledCollaudoStatico || intPratica.getStatoPratica().equals("")%>'> test='<%=(disabledInput && !enabledByIntegrazione) || !disabledCollaudoStatico || intPratica.getStatoPratica().equals("")%>'>
<aui:input disabled="<%=(disabledInput && !enabledByIntegrazione) || proceduraC%>" <aui:input disabled="<%=(disabledInput && !enabledByIntegrazione) || proceduraC%>"
@ -215,6 +216,7 @@ if (!ConfigurazioneLocalServiceUtil.isProduction()) {
<aui:input name="collaudoStatico" type="checkbox" <aui:input name="collaudoStatico" type="checkbox"
checked="<%=dettPratica.getCollaudoStatico()%>" label="collaudo-statico" disabled="<%=true%>" /> checked="<%=dettPratica.getCollaudoStatico()%>" label="collaudo-statico" disabled="<%=true%>" />
</c:if> </c:if>
</c:if>
</div> </div>
</div> </div>
@ -726,9 +728,11 @@ function duplicati(input) {
<li><aui:input <li><aui:input
disabled="<%=(disabledInput && !enabledByIntegrazione) || !checked || proceduraC%>" disabled="<%=(disabledInput && !enabledByIntegrazione) || !checked || proceduraC%>"
name="tcMiglioramentoSismico" label="tc-miglioramento-sismico" /></li> name="tcMiglioramentoSismico" label="tc-miglioramento-sismico" /></li>
<c:if test="<%= !isPraticaOspedaliera %>">
<li><aui:input <li><aui:input
disabled="<%=(disabledInput && !enabledByIntegrazione) || !checked || proceduraC%>" disabled="<%=(disabledInput && !enabledByIntegrazione) || !checked || proceduraC%>"
name="tcRiparazioneInterventoLocale" label="tc-riparazione-intervento-locale" /></li> name="tcRiparazioneInterventoLocale" label="tc-riparazione-intervento-locale" /></li>
</c:if>
</ul> </ul>
</li> </li>
</ul> </ul>

1
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_B1 = "B1";
public static final String PROCEDURA_C = "C"; public static final String PROCEDURA_C = "C";
public static final String PROCEDURA_H = "OSPEDALIERA"; 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_DEPOSITO = "01";
public static final String TIPO_PRATICA_AUTORIZZAZIONE = "02"; public static final String TIPO_PRATICA_AUTORIZZAZIONE = "02";

2
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 contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%>
<%@page import="com.liferay.portal.kernel.portlet.LiferayWindowState"%> <%@page import="com.liferay.portal.kernel.portlet.LiferayWindowState"%>
<%@page import="com.liferay.portal.kernel.util.LocaleUtil"%> <%@page import="com.liferay.portal.kernel.util.LocaleUtil"%>
@ -17,6 +16,7 @@
<%@page import="org.apache.commons.codec.binary.Hex"%> <%@page import="org.apache.commons.codec.binary.Hex"%>
<%@page import="org.htmlparser.Node"%> <%@page import="org.htmlparser.Node"%>
<%@page import="org.htmlparser.Parser"%> <%@page import="org.htmlparser.Parser"%>
<%@page import="org.htmlparser.Attribute"%>
<%@page import="org.htmlparser.nodes.TagNode"%> <%@page import="org.htmlparser.nodes.TagNode"%>
<%@page import="org.htmlparser.nodes.TextNode"%> <%@page import="org.htmlparser.nodes.TextNode"%>
<%@page import="org.htmlparser.tags.InputTag"%> <%@page import="org.htmlparser.tags.InputTag"%>

Caricamento…
Annulla
Salva