From c6469cfeeab7a56aca4b181695cf53bcd505a224 Mon Sep 17 00:00:00 2001
From: Mattia Gosetto <mattia@manifatturaweb.it>
Date: Mon, 21 Jun 2021 16:26:51 +0200
Subject: [PATCH] label e tipi procedura

---
 .../bo/report/builder/builder/ReportAvvisoBeanBuilder.java    | 4 ++--
 .../portos/bo/service/impl/IntPraticaLocalServiceImpl.java    | 4 ----
 .../portos-bo-portlet/docroot/WEB-INF/src/service.properties  | 4 ++--
 .../docroot/html/fascicolofe/edit_modal_fascicolo.jsp         | 2 +-
 .../html/fascicolofe/view_fascicolo_columns_generic.jspf      | 2 +-
 5 files changed, 6 insertions(+), 10 deletions(-)

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<String, String> 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;
 								%>
 								<aui:input label="<%= nomeProcedura %>" name="tipoProcedura"
 										id='<%= "tipo_procedura_" + tipo %>' type="radio" value="<%= tipo %>"
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/html/fascicolofe/view_fascicolo_columns_generic.jspf b/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/html/fascicolofe/view_fascicolo_columns_generic.jspf
index 3caa7067..c2627bec 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/html/fascicolofe/view_fascicolo_columns_generic.jspf
+++ b/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/html/fascicolofe/view_fascicolo_columns_generic.jspf
@@ -305,7 +305,7 @@ if (lastDettPratica == null) {
 			+ StringPool.CLOSE_PARENTHESIS %>
 	- <%= provincia.getProvincia() %></strong><br/>
 	Localizzazione: <strong><%= lastDettPratica.getVia() %></strong><br/>
-	<strong><%= LanguageUtil.get(pageContext, "tipo_procedura_" + intPratica.getTipoProcedura()) %></strong>
+	<strong><%= LanguageUtil.get(pageContext, "label_procedura_" + intPratica.getTipoProcedura()) + ") " + LanguageUtil.get(pageContext, "tipo_procedura_" + intPratica.getTipoProcedura()) %></strong>
 	<br/>
 	<br/>
 	<%= lastDettPratica.getDescLongIntervento() %>