diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/report/builder/builder/ReportAvvisoBeanBuilder.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/report/builder/builder/ReportAvvisoBeanBuilder.java index ca1b4c7a..6048ecb9 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/report/builder/builder/ReportAvvisoBeanBuilder.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/report/builder/builder/ReportAvvisoBeanBuilder.java @@ -177,8 +177,8 @@ public class ReportAvvisoBeanBuilder { bean.setDataAvviso(avviso.getModifiedDate()); bean.setTipoPratica(intPratica.getTipoPratica()); bean.setTipoProcedura(intPratica.getTipoProcedura()); - bean.setTipoAutorizzazione(LanguageUtil.get(LocaleUtil.getSiteDefault(), - "tipo_procedura_" + intPratica.getTipoProcedura())); + bean.setTipoAutorizzazione(LanguageUtil.get(LocaleUtil.getSiteDefault(), "label_procedura_" + intPratica.getTipoProcedura()) + ") " + + LanguageUtil.get(LocaleUtil.getSiteDefault(), "tipo_procedura_" + intPratica.getTipoProcedura())); bean.setCodiceUnivoco(uuid); bean.setLavoriDi(dettPratica.getDescLongIntervento()); bean.setNumeroProgetto(intPratica.getNumeroProgetto()); 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 e013d3c2..327f6bd5 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 @@ -146,15 +146,11 @@ public class IntPraticaLocalServiceImpl extends IntPraticaLocalServiceBaseImpl { } private static void putTipoProcedura(String tipo) { - tipiProcedure.put(tipo, LanguageUtil.get(LocaleUtil.ITALIAN, "tipo_procedura_" + tipo)); - - _log.info(LanguageUtil.get(LocaleUtil.ITALIAN, "tipo_procedura_" + tipo)); } @Override public Map getTipiProcedure() { - return tipiProcedure; } 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 8abf9537..fce07dfe 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=3177 - build.date=1624283931035 + build.number=3178 + build.date=1624285445563 build.auto.upgrade=true ## diff --git a/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/html/fascicolofe/edit_modal_fascicolo.jsp b/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/html/fascicolofe/edit_modal_fascicolo.jsp index e7d46848..b416f3d5 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/html/fascicolofe/edit_modal_fascicolo.jsp +++ b/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/html/fascicolofe/edit_modal_fascicolo.jsp @@ -29,7 +29,7 @@ .entrySet()) { String tipo = procedura.getKey(); String label = procedura.getValue(); - String nomeProcedura = LanguageUtil.get(pageContext, "label_procedura_"+tipo) + " " + label; + String nomeProcedura = LanguageUtil.get(pageContext, "label_procedura_"+tipo) + ") " + label; %> - <%= provincia.getProvincia() %>
Localizzazione: <%= lastDettPratica.getVia() %>
- <%= LanguageUtil.get(pageContext, "tipo_procedura_" + intPratica.getTipoProcedura()) %> + <%= LanguageUtil.get(pageContext, "label_procedura_" + intPratica.getTipoProcedura()) + ") " + LanguageUtil.get(pageContext, "tipo_procedura_" + intPratica.getTipoProcedura()) %>

<%= lastDettPratica.getDescLongIntervento() %>