From 245901bbd5f7d4e2ef9f1da98425ec9e96d097f9 Mon Sep 17 00:00:00 2001
From: Mattia Gosetto <mattia@manifatturaweb.it>
Date: Thu, 11 Feb 2021 17:14:47 +0100
Subject: [PATCH] modifiche

---
 .../docroot/WEB-INF/src/content/Portal.properties  |  1 +
 .../docroot/WEB-INF/src/service.properties         |  4 ++--
 .../navigator/view_dettagli_dettpratica.jsp        |  2 +-
 .../html/gestionefirme/avvisi_da_firmare.jsp       | 14 ++++++++++++--
 .../html/gestionefirme/avvisi_da_firmare_altri.jsp |  7 ++++++-
 .../docroot/html/gestionefirme/avvisi_firme.jsp    |  7 ++++++-
 6 files changed, 28 insertions(+), 7 deletions(-)

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 2c007d7f..a4ee20db 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
@@ -1156,6 +1156,7 @@ label.avviso.dettaglioPratica =
 label.avviso.progetto = Progetto
 label.avviso.protocollo	= Protocollo
 label.avviso.descrizione = Descrizione
+label.avviso.tipoProcedura = Tipo pratica
 label.avviso.dataAvviso	= Data
 label.avviso.tipoDocumento = Tipo Documento
 label.avviso.documentoBase = Documento
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 6c1c98ea..b3c693cd 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=2868
-    build.date=1613055991617
+    build.number=2869
+    build.date=1613058090959
     build.auto.upgrade=true
 
 ##
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/html/fascicolo/navigator/view_dettagli_dettpratica.jsp b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/html/fascicolo/navigator/view_dettagli_dettpratica.jsp
index d9721aab..291c309e 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/html/fascicolo/navigator/view_dettagli_dettpratica.jsp
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/html/fascicolo/navigator/view_dettagli_dettpratica.jsp
@@ -32,7 +32,7 @@
 	  	<div class="panel panel-default">
 		    <div class="panel-heading">
 		    	<%
-			    	String desc_edificio_id = "collapse_dett_principali"+dettPraticaId;
+			    	String desc_edificio_id = "collapse_desc_edificio_"+dettPraticaId;
 			    %>
 			    <a class="collapse_a collapsed" data-toggle="collapse" href='<%= "#"+desc_edificio_id %>'>
 			      <h4 class="panel-title allegato-group__title">
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/html/gestionefirme/avvisi_da_firmare.jsp b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/html/gestionefirme/avvisi_da_firmare.jsp
index ac987e9c..6dbb9ec2 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/html/gestionefirme/avvisi_da_firmare.jsp
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/html/gestionefirme/avvisi_da_firmare.jsp
@@ -90,13 +90,18 @@ for (Organization organization:organizations) {
 					} else {
 					  intPratica = IntPraticaLocalServiceUtil.getIntPratica(avviso.getIntPraticaId());
 					}
+					
+					String tipoProcedura = "";
+					if(Validator.isNotNull(intPratica))
+						tipoProcedura = LanguageUtil.get(pageContext, "tipo_procedura_" + intPratica.getTipoProcedura());
+					
 					%>
 					<liferay-ui:search-container-column-text name="label.avviso.progetto" 
 						value="<%=intPratica!=null ? intPratica.getNumeroProgetto():StringPool.MINUS %>" cssClass="text-center"/>
 					<liferay-ui:search-container-column-text name="label.avviso.protocollo" 
 						value="<%=dettPratica!=null ?dettPratica.getProtocollo():StringPool.MINUS %>" cssClass="text-center"/>
 					
-					<liferay-ui:search-container-column-text name="label.avviso.descrizione" property="descLong" />
+					<liferay-ui:search-container-column-text name="label.avviso.tipoProcedura" value="<%= tipoProcedura %>" />
 					
 					<liferay-ui:search-container-column-text name="U.O." >
 						<%= intPratica.getUnitaOperativa()  %>
@@ -200,13 +205,18 @@ for (Organization organization:organizations) {
 								
 								
 								}
+								
+								String tipoProcedura = "";
+								if(Validator.isNotNull(intPratica))
+									tipoProcedura = LanguageUtil.get(pageContext, "tipo_procedura_" + intPratica.getTipoProcedura());
+								
 								%>
 							<liferay-ui:search-container-column-text name="label.avviso.progetto" 
 								value="<%=intPratica!=null ? intPratica.getNumeroProgetto():StringPool.MINUS %>" cssClass="text-center" />
 							<liferay-ui:search-container-column-text name="label.avviso.protocollo" 
 								value="<%=dettPratica!=null ?dettPratica.getProtocollo():StringPool.MINUS %>" cssClass="text-center" />
 						
-							<liferay-ui:search-container-column-text name="label.avviso.descrizione" property="descLong" />
+							<liferay-ui:search-container-column-text name="label.avviso.tipoProcedura" value="<%= tipoProcedura %>" />
 							
 							<liferay-ui:search-container-column-text name="U.O." >
 								<%= intPratica.getUnitaOperativa() %>
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/html/gestionefirme/avvisi_da_firmare_altri.jsp b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/html/gestionefirme/avvisi_da_firmare_altri.jsp
index 6ad51bd3..505b97ee 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/html/gestionefirme/avvisi_da_firmare_altri.jsp
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/html/gestionefirme/avvisi_da_firmare_altri.jsp
@@ -75,6 +75,10 @@
 					<% 
 						DettPratica dettPratica = DettPraticaLocalServiceUtil.fetchDettPratica(avviso.getClassPk());
 						IntPratica intPratica =  IntPraticaLocalServiceUtil.fetchIntPratica(avviso.getIntPraticaId());
+						String tipoProcedura = "";
+						if(Validator.isNotNull(intPratica))
+							tipoProcedura = LanguageUtil.get(pageContext, "tipo_procedura_" + intPratica.getTipoProcedura());
+						
 					
 					%>
 					<liferay-ui:search-container-column-text name="label.avviso.progetto" 
@@ -82,7 +86,8 @@
 					<liferay-ui:search-container-column-text name="label.avviso.protocollo" 
 						value="<%=dettPratica!=null ?dettPratica.getProtocollo():StringPool.MINUS %>" cssClass="text-center"/>
 					
-					<liferay-ui:search-container-column-text name="label.avviso.descrizione" property="descLong" />
+					<liferay-ui:search-container-column-text name="label.avviso.tipoProcedura" value="<%= tipoProcedura %>" />
+					
 					<liferay-ui:search-container-column-text name="provincia" >
 						<% long territorioGroupId = TerritorioLocalServiceUtil.getTerritorio(intPratica.getTerritorioId()).getGroupId();
 							long organizationId =	GroupLocalServiceUtil.getGroup(territorioGroupId).getOrganizationId();
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/html/gestionefirme/avvisi_firme.jsp b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/html/gestionefirme/avvisi_firme.jsp
index 914bba3d..44ae85be 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/html/gestionefirme/avvisi_firme.jsp
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/html/gestionefirme/avvisi_firme.jsp
@@ -51,6 +51,11 @@
 								} else {
 								  	intPratica = IntPraticaLocalServiceUtil.getIntPratica(avviso.getIntPraticaId());
 								}
+								
+								String tipoProcedura = "";
+								if(Validator.isNotNull(intPratica))
+									tipoProcedura = LanguageUtil.get(pageContext, "tipo_procedura_" + intPratica.getTipoProcedura());
+								
 							%>
 							
 							<liferay-ui:search-container-column-text name="label.avviso.progetto" 
@@ -58,7 +63,7 @@
 							<liferay-ui:search-container-column-text name="label.avviso.protocollo" 
 								value="<%= Validator.isNotNull(dettPratica) ?  dettPratica.getProtocollo() : StringPool.BLANK %>" cssClass="text-center" />
 						
-							<liferay-ui:search-container-column-text name="label.avviso.descrizione" property="descLong" />
+							<liferay-ui:search-container-column-text name="label.avviso.tipoProcedura" value="<%= tipoProcedura %>" />
 							<liferay-ui:search-container-column-text name="provincia" >
 								<% long territorioGroupId = TerritorioLocalServiceUtil.getTerritorio(intPratica.getTerritorioId()).getGroupId();
 									long organizationId =	GroupLocalServiceUtil.getGroup(territorioGroupId).getOrganizationId();