Aggiornamento campi back office

liferay-plugins-sdk-6.2/hooks/portos-p7m-preview-hook/ivy.xml

@@ -7,7 +7,7 @@
 	xsi:noNamespaceSchemaLocation="http://ant.apache.org/ivy/schemas/ivy.xsd"
 >
 	<info module="portos-p7m-preview-hook" organisation="com.liferay">
-		<extends extendType="configurations,description,info" location="${sdk.dir}/ivy.xml" module="com.liferay.sdk" organisation="com.liferay" revision="latest.integration" />
+		<extends extendType="configurations,description,info" location="../../ivy.xml" module="com.liferay.sdk" organisation="com.liferay" revision="latest.integration" />
 	</info>
 
 	<dependencies defaultconf="default">

liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/AllegatoManualePersistenceImpl.java

@@ -45,6 +45,7 @@ import it.tref.liferay.portos.bo.NoSuchAllegatoManualeException;
 import it.tref.liferay.portos.bo.model.AllegatoManuale;
 import it.tref.liferay.portos.bo.model.impl.AllegatoManualeImpl;
 import it.tref.liferay.portos.bo.model.impl.AllegatoManualeModelImpl;
+import it.tref.liferay.portos.bo.service.persistence.AllegatoManualePersistence;
 
 import java.io.Serializable;
 

liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/AsseverazionePersistenceImpl.java

@@ -46,6 +46,7 @@ import it.tref.liferay.portos.bo.NoSuchAsseverazioneException;
 import it.tref.liferay.portos.bo.model.Asseverazione;
 import it.tref.liferay.portos.bo.model.impl.AsseverazioneImpl;
 import it.tref.liferay.portos.bo.model.impl.AsseverazioneModelImpl;
+import it.tref.liferay.portos.bo.service.persistence.AsseverazionePersistence;
 
 import java.io.Serializable;
 

liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/AvvisoPersistenceImpl.java

@@ -46,6 +46,7 @@ import it.tref.liferay.portos.bo.NoSuchAvvisoException;
 import it.tref.liferay.portos.bo.model.Avviso;
 import it.tref.liferay.portos.bo.model.impl.AvvisoImpl;
 import it.tref.liferay.portos.bo.model.impl.AvvisoModelImpl;
+import it.tref.liferay.portos.bo.service.persistence.AvvisoPersistence;
 
 import java.io.Serializable;
 

liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/CollaudoPersistenceImpl.java

@@ -45,6 +45,7 @@ import it.tref.liferay.portos.bo.NoSuchCollaudoException;
 import it.tref.liferay.portos.bo.model.Collaudo;
 import it.tref.liferay.portos.bo.model.impl.CollaudoImpl;
 import it.tref.liferay.portos.bo.model.impl.CollaudoModelImpl;
+import it.tref.liferay.portos.bo.service.persistence.CollaudoPersistence;
 
 import java.io.Serializable;
 

liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/ComunePersistenceImpl.java

@@ -46,6 +46,7 @@ import it.tref.liferay.portos.bo.NoSuchComuneException;
 import it.tref.liferay.portos.bo.model.Comune;
 import it.tref.liferay.portos.bo.model.impl.ComuneImpl;
 import it.tref.liferay.portos.bo.model.impl.ComuneModelImpl;
+import it.tref.liferay.portos.bo.service.persistence.ComunePersistence;
 
 import java.io.Serializable;
 

liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/ComunicazionePersistenceImpl.java

@@ -45,6 +45,7 @@ import it.tref.liferay.portos.bo.NoSuchComunicazioneException;
 import it.tref.liferay.portos.bo.model.Comunicazione;
 import it.tref.liferay.portos.bo.model.impl.ComunicazioneImpl;
 import it.tref.liferay.portos.bo.model.impl.ComunicazioneModelImpl;
+import it.tref.liferay.portos.bo.service.persistence.ComunicazionePersistence;
 
 import java.io.Serializable;
 

liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/ConfigurazionePersistenceImpl.java

@@ -45,6 +45,7 @@ import it.tref.liferay.portos.bo.NoSuchConfigurazioneException;
 import it.tref.liferay.portos.bo.model.Configurazione;
 import it.tref.liferay.portos.bo.model.impl.ConfigurazioneImpl;
 import it.tref.liferay.portos.bo.model.impl.ConfigurazioneModelImpl;
+import it.tref.liferay.portos.bo.service.persistence.ConfigurazionePersistence;
 
 import java.io.Serializable;
 

liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/ControlloPraticaPersistenceImpl.java

@@ -45,6 +45,7 @@ import it.tref.liferay.portos.bo.NoSuchControlloPraticaException;
 import it.tref.liferay.portos.bo.model.ControlloPratica;
 import it.tref.liferay.portos.bo.model.impl.ControlloPraticaImpl;
 import it.tref.liferay.portos.bo.model.impl.ControlloPraticaModelImpl;
+import it.tref.liferay.portos.bo.service.persistence.ControlloPraticaPersistence;
 
 import java.io.Serializable;
 

liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/DelegaPersistenceImpl.java

@@ -46,6 +46,7 @@ import it.tref.liferay.portos.bo.NoSuchDelegaException;
 import it.tref.liferay.portos.bo.model.Delega;
 import it.tref.liferay.portos.bo.model.impl.DelegaImpl;
 import it.tref.liferay.portos.bo.model.impl.DelegaModelImpl;
+import it.tref.liferay.portos.bo.service.persistence.DelegaPersistence;
 
 import java.io.Serializable;
 

liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/DettPraticaPersistenceImpl.java

@@ -45,6 +45,7 @@ import it.tref.liferay.portos.bo.NoSuchDettPraticaException;
 import it.tref.liferay.portos.bo.model.DettPratica;
 import it.tref.liferay.portos.bo.model.impl.DettPraticaImpl;
 import it.tref.liferay.portos.bo.model.impl.DettPraticaModelImpl;
+import it.tref.liferay.portos.bo.service.persistence.DettPraticaPersistence;
 
 import java.io.Serializable;
 

liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/DocAggiuntivaPersistenceImpl.java

@@ -45,6 +45,7 @@ import it.tref.liferay.portos.bo.NoSuchDocAggiuntivaException;
 import it.tref.liferay.portos.bo.model.DocAggiuntiva;
 import it.tref.liferay.portos.bo.model.impl.DocAggiuntivaImpl;
 import it.tref.liferay.portos.bo.model.impl.DocAggiuntivaModelImpl;
+import it.tref.liferay.portos.bo.service.persistence.DocAggiuntivaPersistence;
 
 import java.io.Serializable;
 

liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/DocPraticaPersistenceImpl.java

@@ -46,6 +46,7 @@ import it.tref.liferay.portos.bo.NoSuchDocPraticaException;
 import it.tref.liferay.portos.bo.model.DocPratica;
 import it.tref.liferay.portos.bo.model.impl.DocPraticaImpl;
 import it.tref.liferay.portos.bo.model.impl.DocPraticaModelImpl;
+import it.tref.liferay.portos.bo.service.persistence.DocPraticaPersistence;
 
 import java.io.Serializable;
 

liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/FineLavoriPersistenceImpl.java

@@ -45,6 +45,7 @@ import it.tref.liferay.portos.bo.NoSuchFineLavoriException;
 import it.tref.liferay.portos.bo.model.FineLavori;
 import it.tref.liferay.portos.bo.model.impl.FineLavoriImpl;
 import it.tref.liferay.portos.bo.model.impl.FineLavoriModelImpl;
+import it.tref.liferay.portos.bo.service.persistence.FineLavoriPersistence;
 
 import java.io.Serializable;
 

liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/HistoryWorkflowActionPersistenceImpl.java

@@ -42,6 +42,7 @@ import it.tref.liferay.portos.bo.NoSuchHistoryWorkflowActionException;
 import it.tref.liferay.portos.bo.model.HistoryWorkflowAction;
 import it.tref.liferay.portos.bo.model.impl.HistoryWorkflowActionImpl;
 import it.tref.liferay.portos.bo.model.impl.HistoryWorkflowActionModelImpl;
+import it.tref.liferay.portos.bo.service.persistence.HistoryWorkflowActionPersistence;
 
 import java.io.Serializable;
 

liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/IUVPersistenceImpl.java

@@ -46,6 +46,7 @@ import it.tref.liferay.portos.bo.NoSuchIUVException;
 import it.tref.liferay.portos.bo.model.IUV;
 import it.tref.liferay.portos.bo.model.impl.IUVImpl;
 import it.tref.liferay.portos.bo.model.impl.IUVModelImpl;
+import it.tref.liferay.portos.bo.service.persistence.IUVPersistence;
 
 import java.io.Serializable;
 

liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/InfoFascicoloPersistenceImpl.java

@@ -45,6 +45,7 @@ import it.tref.liferay.portos.bo.NoSuchInfoFascicoloException;
 import it.tref.liferay.portos.bo.model.InfoFascicolo;
 import it.tref.liferay.portos.bo.model.impl.InfoFascicoloImpl;
 import it.tref.liferay.portos.bo.model.impl.InfoFascicoloModelImpl;
+import it.tref.liferay.portos.bo.service.persistence.InfoFascicoloPersistence;
 
 import java.io.Serializable;
 

liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/IntPraticaPersistenceImpl.java

@@ -48,6 +48,7 @@ import it.tref.liferay.portos.bo.NoSuchIntPraticaException;
 import it.tref.liferay.portos.bo.model.IntPratica;
 import it.tref.liferay.portos.bo.model.impl.IntPraticaImpl;
 import it.tref.liferay.portos.bo.model.impl.IntPraticaModelImpl;
+import it.tref.liferay.portos.bo.service.persistence.IntPraticaPersistence;
 
 import java.io.Serializable;
 

liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/PagamentoPersistenceImpl.java

@@ -46,6 +46,7 @@ import it.tref.liferay.portos.bo.NoSuchPagamentoException;
 import it.tref.liferay.portos.bo.model.Pagamento;
 import it.tref.liferay.portos.bo.model.impl.PagamentoImpl;
 import it.tref.liferay.portos.bo.model.impl.PagamentoModelImpl;
+import it.tref.liferay.portos.bo.service.persistence.PagamentoPersistence;
 
 import java.io.Serializable;
 

liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/ParereGeologoPersistenceImpl.java

@@ -45,6 +45,7 @@ import it.tref.liferay.portos.bo.NoSuchParereGeologoException;
 import it.tref.liferay.portos.bo.model.ParereGeologo;
 import it.tref.liferay.portos.bo.model.impl.ParereGeologoImpl;
 import it.tref.liferay.portos.bo.model.impl.ParereGeologoModelImpl;
+import it.tref.liferay.portos.bo.service.persistence.ParereGeologoPersistence;
 
 import java.io.Serializable;
 

liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/ProvinciaPersistenceImpl.java

@@ -43,6 +43,7 @@ import it.tref.liferay.portos.bo.NoSuchProvinciaException;
 import it.tref.liferay.portos.bo.model.Provincia;
 import it.tref.liferay.portos.bo.model.impl.ProvinciaImpl;
 import it.tref.liferay.portos.bo.model.impl.ProvinciaModelImpl;
+import it.tref.liferay.portos.bo.service.persistence.ProvinciaPersistence;
 
 import java.io.Serializable;
 

liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/SoggettoPersistenceImpl.java

@@ -45,6 +45,7 @@ import it.tref.liferay.portos.bo.NoSuchSoggettoException;
 import it.tref.liferay.portos.bo.model.Soggetto;
 import it.tref.liferay.portos.bo.model.impl.SoggettoImpl;
 import it.tref.liferay.portos.bo.model.impl.SoggettoModelImpl;
+import it.tref.liferay.portos.bo.service.persistence.SoggettoPersistence;
 
 import java.io.Serializable;
 

liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/SorteggioPersistenceImpl.java

@@ -45,6 +45,7 @@ import it.tref.liferay.portos.bo.NoSuchSorteggioException;
 import it.tref.liferay.portos.bo.model.Sorteggio;
 import it.tref.liferay.portos.bo.model.impl.SorteggioImpl;
 import it.tref.liferay.portos.bo.model.impl.SorteggioModelImpl;
+import it.tref.liferay.portos.bo.service.persistence.SorteggioPersistence;
 
 import java.io.Serializable;
 

liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/StoricoSoggettoPraticaPersistenceImpl.java

@@ -42,6 +42,7 @@ import it.tref.liferay.portos.bo.NoSuchStoricoSoggettoPraticaException;
 import it.tref.liferay.portos.bo.model.StoricoSoggettoPratica;
 import it.tref.liferay.portos.bo.model.impl.StoricoSoggettoPraticaImpl;
 import it.tref.liferay.portos.bo.model.impl.StoricoSoggettoPraticaModelImpl;
+import it.tref.liferay.portos.bo.service.persistence.StoricoSoggettoPraticaPersistence;
 
 import java.io.Serializable;
 

liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/TempisticaPersistenceImpl.java

@@ -45,6 +45,7 @@ import it.tref.liferay.portos.bo.NoSuchTempisticaException;
 import it.tref.liferay.portos.bo.model.Tempistica;
 import it.tref.liferay.portos.bo.model.impl.TempisticaImpl;
 import it.tref.liferay.portos.bo.model.impl.TempisticaModelImpl;
+import it.tref.liferay.portos.bo.service.persistence.TempisticaPersistence;
 
 import java.io.Serializable;
 

liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/TerritorioPersistenceImpl.java

@@ -44,6 +44,7 @@ import it.tref.liferay.portos.bo.NoSuchTerritorioException;
 import it.tref.liferay.portos.bo.model.Territorio;
 import it.tref.liferay.portos.bo.model.impl.TerritorioImpl;
 import it.tref.liferay.portos.bo.model.impl.TerritorioModelImpl;
+import it.tref.liferay.portos.bo.service.persistence.TerritorioPersistence;
 
 import java.io.Serializable;
 

liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/UtentePortosPersistenceImpl.java

@@ -43,6 +43,7 @@ import it.tref.liferay.portos.bo.NoSuchUtentePortosException;
 import it.tref.liferay.portos.bo.model.UtentePortos;
 import it.tref.liferay.portos.bo.model.impl.UtentePortosImpl;
 import it.tref.liferay.portos.bo.model.impl.UtentePortosModelImpl;
+import it.tref.liferay.portos.bo.service.persistence.UtentePortosPersistence;
 
 import java.io.Serializable;
 

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=2717
+    build.number=2718
-    build.date=1604566642501
+    build.date=1605541032487
     build.auto.upgrade=true
 
 ##

liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/html/fascicolo/navigator/header.jsp

@@ -36,6 +36,11 @@
 		<div class="col-sm-10 col-md-10">
 			<liferay-ui:panel extended="false" defaultState="open" collapsible="false" title="fascicolo_title_dettagli">
 				<div class="container-fluid">
+					<div class="row">
+						<div class="col-xs-12">
+							<strong><%= LanguageUtil.get(pageContext, "tipo_procedura_" + intPratica.getTipoProcedura()) %></strong>
+						</div>
+					</div>
 					<div class="row">
 						<div class="col-sm-2 col-md-2">Validità</div>
 						<div class="col-sm-4 col-md-4">

liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/html/fascicolo/navigator/page_dettagli_principali.jsp

@@ -1,3 +1,4 @@
+<%@page import="it.tref.liferay.portos.bo.util.Constants"%>
 <%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%>
 <%@page import="it.tref.liferay.portos.bo.shared.util.TipoIntegrazioneUtil"%>
 <%@page import="it.tref.liferay.portos.bo.util.AzioniPraticheUtil"%>
@@ -50,93 +51,80 @@
 		            </div>
 	        	</c:if>
 			
-				<liferay-ui:panel extended="false" defaultState="open" collapsible="false" title="fascicolo_title_decreto_min" >
+				<liferay-ui:panel extended="false" defaultState="open" collapsible="false" title="dp" >
 					<div class="container-fluid">
 						<div class="row">
 							<div class="col-sm-6 col-md-3">
-								<%= LanguageUtil.get(pageContext, "dp-zona-sismica") %>
+								<%= LanguageUtil.get(pageContext, "dp-livello-di-tutela") %>
 							</div>
 							<div class="col-sm-6 col-md-3">
-								<%= BeanPropertiesUtil.getString(territorio, "zona") %>
+								<%= dettPratica.getLivelloDiTutela() %>
 							</div>
 							<div class="col-sm-6 col-md-3">
 								<%= LanguageUtil.get(pageContext, "dp-paesaggio-locale") %>
 							</div>
 							<div class="col-sm-6 col-md-3">
-								<%= BeanPropertiesUtil.getString(territorio, "fascia") %>
+								<%= dettPratica.getPaesaggioLocale() %>
 							</div>
 						</div>
+						<c:if test="<%= intPratica.getTipoProcedura().equalsIgnoreCase(Constants.PROCEDURA_P9) %>">
 							<div class="row">
-							<div class="col-sm-12 col-md-12">
+								<div class="col-sm-12">
-								<div class="fascicolo_header_row"><%= LanguageUtil.get(pageContext, "dp-sensi") %></div>	
+									<div class="fascicolo_header_row"><%= LanguageUtil.get(pageContext, "sanatoria-edilizia") %></div>	
 								</div>
 							</div>
 							<div class="row">
-							<c:if test="<%= AzioniPraticheUtil.isDeposito(intPratica.getIntPraticaId()) %>">
+								<div class="col-sm-12">
-								<div class="col-sm-6 col-md-6">
+									<strong><span class='<%=dettPratica.getSanatoriaEdilizia47() ? "fa fa-check-circle-o txt-green" : "fa fa-circle-o" %>'></span></strong>
-									<strong><span class='<%=BeanPropertiesUtil.getBoolean(dettPratica, "normDpr01Dep") ? "fa fa-check-circle-o txt-green" : "fa fa-circle-o" %>'></span></strong>
+									<%= LanguageUtil.get(pageContext, "sanatoria-edilizia-47") %>
-									<%= LanguageUtil.get(pageContext, "norm-dpr01-dep") %>
 								</div>
-								<div class="col-sm-6 col-md-6">
+								<div class="col-sm-12">
-									<strong><span class='<%=BeanPropertiesUtil.getBoolean(dettPratica, "normDpr02Dep") ? "fa fa-check-circle-o txt-green" : "fa fa-circle-o" %>'></span></strong>
+									<strong><span class='<%=dettPratica.getSanatoriaEdilizia724() ? "fa fa-check-circle-o txt-green" : "fa fa-circle-o" %>'></span></strong>
-									<%= LanguageUtil.get(pageContext, "norm-dpr02-dep") %>
+									<%= LanguageUtil.get(pageContext, "sanatoria-edilizia-724") %>
 								</div>
-							</c:if>
+								<div class="col-sm-12">
-							<c:if test="<%= AzioniPraticheUtil.isAutorizzazione(intPratica.getIntPraticaId()) %>">
+									<strong><span class='<%=dettPratica.getSanatoriaEdilizia326() ? "fa fa-check-circle-o txt-green" : "fa fa-circle-o" %>'></span></strong>
-								<div class="col-sm-6 col-md-6">
+									<%= LanguageUtil.get(pageContext, "sanatoria-edilizia-326") %>
-									<strong><span class='<%=BeanPropertiesUtil.getBoolean(dettPratica, "normDpr01Aut") ? "fa fa-check-circle-o txt-green" : "fa fa-circle-o" %>'></span></strong>
-									<%= LanguageUtil.get(pageContext, "norm-dpr01-aut") %>
 								</div>
-								<div class="col-sm-6 col-md-6">
-									<strong><span class='<%=BeanPropertiesUtil.getBoolean(dettPratica, "normDpr02Aut") ? "fa fa-check-circle-o txt-green" : "fa fa-circle-o" %>'></span></strong>
-									<%= LanguageUtil.get(pageContext, "norm-dpr02-aut") %>
 							</div>
 						</c:if>
 					</div>
+				</liferay-ui:panel>
+				<liferay-ui:panel  extended="false" defaultState="open" collapsible="false" title="Normativa">
+					<div class="container-fluid">
 						<div class="row">
 							<div class="col-sm-12 col-md-12">
-								<div class="fascicolo_header_row"><%= LanguageUtil.get(pageContext, "dp-rispetto") %></div>	
+								<div class="fascicolo_header_row"></div>	
 							</div>
 						</div>
 						<div class="row">
-							<div class="col-sm-6 col-md-6">
+							<div class="col-xs-12">
-								<strong><span class='<%=BeanPropertiesUtil.getBoolean(dettPratica, "normDm2018") ? "fa fa-check-circle-o txt-green" : "fa fa-circle-o" %>'></span></strong>
+								<strong><span class='<%= dettPratica.getNormLavoriInProprio() ? "fa fa-check-circle-o txt-green" : "fa fa-circle-o" %>'></span></strong>
-								<%= LanguageUtil.get(pageContext, "norm-dm2018") %>
+								<%= LanguageUtil.get(pageContext, "norm-lavori-in-proprio") %>
-							</div>
-							<div class="col-sm-6 col-md-6">
-								<strong><span class='<%=BeanPropertiesUtil.getBoolean(dettPratica, "normDm01") ? "fa fa-check-circle-o txt-green" : "fa fa-circle-o" %>'></span></strong>
-								<%= LanguageUtil.get(pageContext, "norm-dm01") %>
-							</div>
-							<%-- <div class="col-sm-6 col-md-6">
-								<strong><span class='<%=BeanPropertiesUtil.getBoolean(dettPratica, "normDm02") ? "fa fa-check-circle-o txt-green" : "fa fa-circle-o" %>'></span></strong>
-								D.M. 14/09/2005
-							</div> --%>
-							<div class="col-sm-6 col-md-6">
-								<strong><span class='<%=BeanPropertiesUtil.getBoolean(dettPratica, "normDm02") ? "fa fa-check-circle-o txt-green" : "fa fa-circle-o" %>'></span></strong>
-								<%= LanguageUtil.get(pageContext, "norm-dm02") %>
-							</div>
 							</div>
-						<div class="row">
+							<div class="col-xs-12">
-							<div class="col-sm-12 col-md-12">
+								<strong><span class='<%= dettPratica.getNormLavoriNoDirettore() ? "fa fa-check-circle-o txt-green" : "fa fa-circle-o" %>'></span></strong>
-								<div class="fascicolo_header_row"><%= LanguageUtil.get(pageContext, "dp-normativa") %>:</div>	
+								<%= LanguageUtil.get(pageContext, "norm-lavori-no-direttore") %>
 							</div>
+							<div class="col-xs-12">
+								<strong><span class='<%= dettPratica.getLavoriPubblici() ? "fa fa-check-circle-o txt-green" : "fa fa-circle-o" %>'></span></strong>
+								<%= LanguageUtil.get(pageContext, "lavori-pubblici") %>
 							</div>
-						<div class="row">
+							<div class="col-xs-12">
-							<div class="col-sm-6 col-md-6">
+								<strong><span class='<%= dettPratica.getNormEsenteBollo() ? "fa fa-check-circle-o txt-green" : "fa fa-circle-o" %>'></span></strong>
-								<strong><span class='<%=BeanPropertiesUtil.getBoolean(dettPratica, "normDm03") ? "fa fa-check-circle-o txt-green" : "fa fa-circle-o" %>'></span></strong>
+								<%= LanguageUtil.get(pageContext, "norm-esente-bollo") %>
-								<%= LanguageUtil.get(pageContext, "norm-dm03") %>
 							</div>
-							<div class="col-sm-6 col-md-6">
+							<div class="col-xs-12">
-								<strong><span class='<%=BeanPropertiesUtil.getBoolean(dettPratica, "normDprg01") ? "fa fa-check-circle-o txt-green" : "fa fa-circle-o" %>'></span></strong>
+								<strong><span class='<%= dettPratica.getNormEsenteSpese() ? "fa fa-check-circle-o txt-green" : "fa fa-circle-o" %>'></span></strong>
-								<%= LanguageUtil.get(pageContext, "norm-dprg01") %>
+								<%= LanguageUtil.get(pageContext, "norm-esente-spese") %>
 							</div>						
-							<div class="col-sm-6 col-md-6">
+							<div class="col-xs-12">
-								<strong><span class='<%=BeanPropertiesUtil.getBoolean(dettPratica, "normDprg02") ? "fa fa-check-circle-o txt-green" : "fa fa-circle-o" %>'></span></strong>
+								<strong><span class='<%= dettPratica.getCollaudoStatico() ? "fa fa-check-circle-o txt-green" : "fa fa-circle-o" %>'></span></strong>
-								<%= LanguageUtil.get(pageContext, "norm-dprg02") %>
+								<%= LanguageUtil.get(pageContext, "collaudo-statico") %>
 							</div>
-							<div class="col-sm-6 col-md-6">
+							<div class="col-xs-12">
-								<strong><span class='<%=BeanPropertiesUtil.getBoolean(dettPratica, "normAnr") ? "fa fa-check-circle-o txt-green" : "fa fa-circle-o" %>'></span></strong>
+								<strong><span class='<%= dettPratica.getNoCollaudo() ? "fa fa-check-circle-o txt-green" : "fa fa-circle-o" %>'></span></strong>
-								<%= LanguageUtil.get(pageContext, "norm-anr") %>
+								<%= LanguageUtil.get(pageContext, "no-collaudo") %>
 							</div>				
 						</div>
 						<div class="row">
@@ -145,31 +133,9 @@
 							</div>
 						</div>
 						<div class="row">
-							<div class="col-sm-6 col-md-6">
+							<div class="col-xs-12">
-								<strong><span class='<%=BeanPropertiesUtil.getBoolean(dettPratica, "normLavoriInProprio") ? "fa fa-check-circle-o txt-green" : "fa fa-circle-o" %>'></span></strong>
-								<%= LanguageUtil.get(pageContext, "norm-lavori-in-proprio") %>
-							</div>
-							<div class="col-sm-6 col-md-6">
-								<strong><span class='<%=BeanPropertiesUtil.getBoolean(dettPratica, "lavoriPubblici") ? "fa fa-check-circle-o txt-green" : "fa fa-circle-o" %>'></span></strong>
-								<%= LanguageUtil.get(pageContext, "lavori-pubblici") %>
-							</div>
-							<div class="col-sm-6 col-md-6">
-								<strong><span class='<%=BeanPropertiesUtil.getBoolean(dettPratica, "normEsenteBollo") ? "fa fa-check-circle-o txt-green" : "fa fa-circle-o" %>'></span></strong>
-								<%= LanguageUtil.get(pageContext, "norm-esente-bollo") %>
-							</div>
-							<div class="col-sm-6 col-md-6">
-								<strong><span class='<%=BeanPropertiesUtil.getBoolean(dettPratica, "normEsenteSpese") ? "fa fa-check-circle-o txt-green" : "fa fa-circle-o" %>'></span></strong>
-								<%= LanguageUtil.get(pageContext, "norm-esente-spese") %>
-							</div>
-							
-							<div class="col-sm-6 col-md-6">
-								<strong><span class='<%=BeanPropertiesUtil.getBoolean(dettPratica, "collaudoStatico") ? "fa fa-check-circle-o txt-green" : "fa fa-circle-o" %>'></span></strong>
-								<%= LanguageUtil.get(pageContext, "collaudo-statico") %>
-							</div>
-							
-							<div class="col-sm-12 col-md-12">
 								<div class="container-regolamento">
-									<strong><span class='<%=BeanPropertiesUtil.getBoolean(dettPratica, "normArt3com3") ? "fa fa-check-circle-o txt-green" : "fa fa-circle-o" %>' style="margin-right: 10px;"></span></strong>
+									<strong><span class='<%= dettPratica.getNormArt3com3() ? "fa fa-check-circle-o txt-green" : "fa fa-circle-o" %>' style="margin-right: 10px;"></span></strong>
 									<p style="display: inline;"><%= LanguageUtil.get(pageContext, "norm-art3com3") %>:</p>
 									<ul style="padding-left:20px; list-style: initial;">
 										<li><%= LanguageUtil.get(pageContext, "norm-art3com3_1") %>;</li> 
@@ -179,9 +145,9 @@
 									</ul>	
 								</div>
 							</div>
-							<div class="col-sm-12 col-md-12">
+							<div class="col-xs-12">
 								<div class="container-regolamento" style="display: inline-block;vertical-align: top;">
-									<strong><span class='<%=BeanPropertiesUtil.getBoolean(dettPratica, "normArt3com4") ? "fa fa-check-circle-o txt-green" : "fa fa-circle-o" %>' style="margin-right: 10px;"></span></strong>
+									<strong><span class='<%= dettPratica.getNormArt3com4() ? "fa fa-check-circle-o txt-green" : "fa fa-circle-o" %>' style="margin-right: 10px;"></span></strong>
 									<p style="display: inline;"><%= LanguageUtil.get(pageContext, "norm-art3com4") %></p>	
 								</div>
 							</div>
@@ -192,23 +158,14 @@
 							</div>
 						</div>
 						<div class="row">
-							<div class="col-sm-6 col-md-6">
+							<div class="col-xs-12">
-								<strong><span class='<%=BeanPropertiesUtil.getBoolean(dettPratica, "suap") ? "fa fa-check-circle-o txt-green" : "fa fa-circle-o" %>'></span></strong>
+								<%= LanguageUtil.get(pageContext, "estremi-prat-com") %>:
-								<%= LanguageUtil.get(pageContext, "suap") %>
+								<%= dettPratica.getEstremiPratCom() %>
-							</div>
-						</div>
-						<div class="row">
-							<div class="col-sm-6 col-md-6">
-								<strong><span class='<%=BeanPropertiesUtil.getBoolean(dettPratica, "intervFinPub") ? "fa fa-check-circle-o txt-green" : "fa fa-circle-o" %>'></span></strong>
-								<%= LanguageUtil.get(pageContext, "interv-fin-pub") %>
-							</div>
-						</div>
-						<div class="row">
-							<div class="col-sm-6 col-md-4">
-								<%=LanguageUtil.get(pageContext, "interv-fin-pub-desc") %>:
 							</div>											
-							<div class="col-sm-6 col-md-2">
+							<div class="col-xs-12">
-								<strong><%= BeanPropertiesUtil.getString(dettPratica, "intervFinPubDesc") %></strong>
+								<strong><span class='<%= dettPratica.getIntervFinPub() ? "fa fa-check-circle-o txt-green" : "fa fa-circle-o" %>'></span></strong>
+								<%= LanguageUtil.get(pageContext, "interv-fin-pub") %>:
+								<%= dettPratica.getIntervFinPubDesc() %>
 							</div>
 						</div>
 					</div>
@@ -369,6 +326,53 @@
 			</div>
 		</div>
 	</div>
+	<div class="row">
+		<div class="col-sm-12 col-md-12">
+			<div class="module-group">
+				<liferay-ui:panel extended="false" defaultState="open" collapsible="false" title="fascicolo_title_intervento" >
+					<div class="container-fluid">
+						<div class="row">
+							<div class="col-xs-12">
+								<strong><span class='<%=dettPratica.getTcNuovaCostruzione() ? "fa fa-check-circle-o txt-green" : "fa fa-circle-o" %>'></span></strong>
+								<%=LanguageUtil.get(pageContext, "tc-nuova-costruzione") %>
+							</div>
+							<div class="col-xs-12">
+								<strong><span class='<%=dettPratica.getTcNuovaCostruzionePertinenza() ? "fa fa-check-circle-o txt-green" : "fa fa-circle-o" %>'></span></strong>
+								<%=LanguageUtil.get(pageContext, "tc-nuova-costruzione-pertinenza") %>
+							</div>
+							<div class="col-xs-12">
+								<strong><span class='<%=dettPratica.getTcCostruzioniEsistenti() ? "fa fa-check-circle-o txt-green" : "fa fa-circle-o" %>'></span></strong>
+								<%=LanguageUtil.get(pageContext, "tc-costruzioni-esistenti") %>
+							</div>
+							<div class="col-xs-12">
+								<strong><span class='<%=dettPratica.getTcManutOrdStraord() ? "fa fa-check-circle-o txt-green" : "fa fa-circle-o" %>'></span></strong>
+								<%=LanguageUtil.get(pageContext, "tc-manut-ord-rest-dem") %>
+							</div>
+							<div class="col-xs-12">
+								<strong><span class='<%=dettPratica.getTcInterventoOpereEscavazione() ? "fa fa-check-circle-o txt-green" : "fa fa-circle-o" %>'></span></strong>
+								<%=LanguageUtil.get(pageContext, "tc-intervento-opere-escavazione") %>
+							</div>
+							<div class="col-xs-12">
+								<strong><span class='<%=dettPratica.getTcViarch() ? "fa fa-check-circle-o txt-green" : "fa fa-circle-o" %>'></span></strong>
+								<%=LanguageUtil.get(pageContext, "tc-viarch	") %>
+							</div>
+							<div class="col-xs-12">
+								<strong><span class='<%=dettPratica.getTcOperaA25() ? "fa fa-check-circle-o txt-green" : "fa fa-circle-o" %>'></span></strong>
+								<%=LanguageUtil.get(pageContext, "tc-opera-a25") %>
+							</div>
+							<div class="col-xs-12">
+								<strong><span class='<%=dettPratica.getTcAltriInterventi() ? "fa fa-check-circle-o txt-green" : "fa fa-circle-o" %>'></span></strong>
+								<%=LanguageUtil.get(pageContext, "tc-altro-intervento") %>
+								<c:if test="<%= dettPratica.getTcAltriInterventi() %>">
+									: <strong><%= dettPratica.getTcAltriInterventiDesc() %></strong>
+								</c:if>
+							</div>
+						</div>
+					</div>
+				</liferay-ui:panel>
+			</div>
+		</div>
+	</div>
 	<div class="row">
 		<div class="col-sm-12 col-md-12">
 			<div class="module-group">
@@ -436,31 +440,4 @@
 			</div>
 		</div>
 	</div>
-	<div class="row">
-		<div class="col-sm-12 col-md-12">
-			<div class="module-group">
-				<liferay-ui:panel extended="false" defaultState="open" collapsible="false" title="fascicolo_title_intervento" >
-					<div class="container-fluid">
-						<div class="row">
-							<div class="col-xs-12">
-								<strong><span class='<%=BeanPropertiesUtil.getBoolean(dettPratica, "tcNuovaCostruzione") ? "fa fa-check-circle-o txt-green" : "fa fa-circle-o" %>'></span></strong>
-								<%=LanguageUtil.get(pageContext, "tc-nuova-costruzione") %>
-							</div>
-							<div class="col-xs-12">
-								<strong><span class='<%=BeanPropertiesUtil.getBoolean(dettPratica, "tcCostruzioniEsistenti") ? "fa fa-check-circle-o txt-green" : "fa fa-circle-o" %>'></span></strong>
-								<%=LanguageUtil.get(pageContext, "tc-costruzioni-esistenti") %>
-							</div>
-							<div class="col-xs-12">
-								<strong><span class='<%=BeanPropertiesUtil.getBoolean(dettPratica, "tcCostruzioniEsistenti") ? "fa fa-check-circle-o txt-green" : "fa fa-circle-o" %>'></span></strong>
-								<%=LanguageUtil.get(pageContext, "tc-manut-ord-rest-dem") %>
-							</div>
-							<div class="col-xs-12">
-								<span><strong><%=BeanPropertiesUtil.getString(dettPratica, "tcAltroDescrizione") %></strong></span>
-							</div>
-						</div>
-					</div>
-				</liferay-ui:panel>
-			</div>
-		</div>
-	</div>
 </div>

liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/html/fascicolo/navigator/page_riepilogo.jsp

@@ -1,3 +1,5 @@
+<%@page import="it.tref.liferay.portos.bo.util.Constants"%>
+<%@page import="it.tref.liferay.portos.bo.shared.protocollo.model.Protocollo.TipoProtocollo"%>
 <%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%>
 <%@page import="com.liferay.portal.service.UserLocalServiceUtil"%>
 <%@page import="com.liferay.portal.model.User"%>
@@ -138,94 +140,99 @@
 			</div>
 		</div>
 	</div>
-	
 	<div class="row">
 		<div class="col-sm-12 col-md-12">
 			<div class="module-group">
-				<liferay-ui:panel extended="false" defaultState="open" collapsible="false" title="fascicolo_title_tipologia_costruttiva" >
+				<liferay-ui:panel extended="false" defaultState="open" collapsible="false" title="dp" >
 					<div class="container-fluid">
 						<div class="row">
-							<div class="col-sm-3 col-md-3">
+							<div class="col-sm-6">
-								<strong><span class='<%=BeanPropertiesUtil.getBoolean(dettPratica, "tcInCA") ? "fa fa-check-circle-o txt-green" : "fa fa-circle-o" %>'></span></strong>
+								<%= LanguageUtil.get(pageContext, "dp-paesaggio-locale") %>
-								<%=LanguageUtil.get(pageContext, "tc-in-ca") %>
-							</div>
-							<div class="col-sm-3 col-md-3">
-								<strong><span class='<%=BeanPropertiesUtil.getBoolean(dettPratica, "tcInOpera") ? "fa fa-check-circle-o txt-green" : "fa fa-circle-o" %>'></span></strong>
-								<%=LanguageUtil.get(pageContext, "tc-in-opera") %>
 							</div>
-							<div class="col-sm-3 col-md-3">
+							<div class="col-sm-6">
-								<strong><span class='<%=BeanPropertiesUtil.getBoolean(dettPratica, "tcPrefabbricato") ? "fa fa-check-circle-o txt-green" : "fa fa-circle-o" %>'></span></strong>
+								<%=dettPratica.getPaesaggioLocale()%>
-								<%=LanguageUtil.get(pageContext, "tc-prefabbricato") %>
 							</div>
 						</div>
 						<div class="row">
-							<div class="col-sm-3 col-md-3">
+							<div class="col-sm-6">
-								<strong><span class='<%=BeanPropertiesUtil.getBoolean(dettPratica, "tcInAcciaio") ? "fa fa-check-circle-o txt-green" : "fa fa-circle-o" %>'></span></strong>
+								<%= LanguageUtil.get(pageContext, "dp-livello-di-tutela") %>
-								<%=LanguageUtil.get(pageContext, "tc-in-acciaio") %>
 							</div>
-							<div class="col-sm-3 col-md-3">
+							<div class="col-sm-6">
-								<strong><span class='<%=BeanPropertiesUtil.getBoolean(dettPratica, "tcMista") ? "fa fa-check-circle-o txt-green" : "fa fa-circle-o" %>'></span></strong>
+								<%=dettPratica.getLivelloDiTutela()%>
-								<%=LanguageUtil.get(pageContext, "tc-mista") %>
 							</div>
 						</div>
 						<div class="row">
-							<div class="col-sm-3 col-md-3">
+							<div class="col-sm-6">
-								<strong><span class='<%=BeanPropertiesUtil.getBoolean(dettPratica, "tcInMuratura") ? "fa fa-check-circle-o txt-green" : "fa fa-circle-o" %>'></span></strong>
+								<%= LanguageUtil.get(pageContext, "dp-vincoli") %>
-								<%=LanguageUtil.get(pageContext, "tc-in-muratura") %>
-							</div>
-							<div class="col-sm-3 col-md-3">
-								<strong><span class='<%=BeanPropertiesUtil.getBoolean(dettPratica, "tcInMuraturaOrdinaria") ? "fa fa-check-circle-o txt-green" : "fa fa-circle-o" %>'></span></strong>
-								<%=LanguageUtil.get(pageContext, "tc-in-muratura-ordinaria") %>
 							</div>
-							<div class="col-sm-3 col-md-3">
+							<div class="col-sm-6">
-								<strong><span class='<%=BeanPropertiesUtil.getBoolean(dettPratica, "tcInMuraturaArmata") ? "fa fa-check-circle-o txt-green" : "fa fa-circle-o" %>'></span></strong>
+								<%=dettPratica.getVincoli()%>
-								<%=LanguageUtil.get(pageContext, "tc-in-muratura-armata") %>
-							</div>
-							<div class="col-sm-3 col-md-3">
-								<strong><span class='<%=BeanPropertiesUtil.getBoolean(dettPratica, "tcInMuraturaMista") ? "fa fa-check-circle-o txt-green" : "fa fa-circle-o" %>'></span></strong>
-								<%=LanguageUtil.get(pageContext, "tc-mista") %>
 							</div>
 						</div>
+						<c:if test="<%=intPratica.getTipoProcedura().equals(Constants.PROCEDURA_P9)%>">
 							<div class="row">
-							<div class="col-sm-3 col-md-3">
+								<div class="col-sm-6">
-								<strong><span class='<%=BeanPropertiesUtil.getBoolean(dettPratica, "tcInLegno") ? "fa fa-check-circle-o txt-green" : "fa fa-circle-o" %>'></span></strong>
+									<%= LanguageUtil.get(pageContext, "sanatoria-edilizia") %>
-								<%=LanguageUtil.get(pageContext, "tc-in-legno") %>
-							</div>
 								</div>
-						<div class="row">
+								<div class="col-sm-6">
-							<div class="col-sm-3 col-md-3">
+									<c:if test="<%= dettPratica.getSanatoriaEdilizia47() %>">
-								<strong><span class='<%=BeanPropertiesUtil.getBoolean(dettPratica, "tcAltro") ? "fa fa-check-circle-o txt-green" : "fa fa-circle-o" %>'></span></strong>
+										<%= LanguageUtil.get(pageContext, "sanatoria-edilizia-47") %><br/>
-								<%=LanguageUtil.get(pageContext, "tc-altro") %>
+									</c:if>
-							</div>
+									<c:if test="<%= dettPratica.getSanatoriaEdilizia724() %>">
-							<div class="col-sm-9 col-md-9">
+										<%= LanguageUtil.get(pageContext, "sanatoria-edilizia-724") %><br/>
-								<span><strong><%=BeanPropertiesUtil.getString(dettPratica, "tcAltroDescrizione") %></strong></span>
+									</c:if>
+									<c:if test="<%= dettPratica.getSanatoriaEdilizia326() %>">
+										<%= LanguageUtil.get(pageContext, "sanatoria-edilizia-326") %>
+									</c:if>
 								</div>
 							</div>
+						</c:if>
 					</div>
 				</liferay-ui:panel>
 			</div>
 		</div>
 	</div>	
+
 	<div class="row">
 		<div class="col-sm-12 col-md-12">
 			<div class="module-group">
 				<liferay-ui:panel extended="false" defaultState="open" collapsible="false" title="fascicolo_title_intervento" >
 					<div class="container-fluid">
 						<div class="row">
-							<div class="col-xs-12">
+							<div class="col-sm-12">
-								<strong><span class='<%=BeanPropertiesUtil.getBoolean(dettPratica, "tcNuovaCostruzione") ? "fa fa-check-circle-o txt-green" : "fa fa-circle-o" %>'></span></strong>
+								<strong><span class='<%=dettPratica.getTcNuovaCostruzione() ? "fa fa-check-circle-o txt-green" : "fa fa-circle-o" %>'></span></strong>
 								<%=LanguageUtil.get(pageContext, "tc-nuova-costruzione") %>
 							</div>
-							<div class="col-xs-12">
+							<div class="col-sm-12">
-								<strong><span class='<%=BeanPropertiesUtil.getBoolean(dettPratica, "tcCostruzioniEsistenti") ? "fa fa-check-circle-o txt-green" : "fa fa-circle-o" %>'></span></strong>
+								<strong><span class='<%=dettPratica.getTcNuovaCostruzionePertinenza() ? "fa fa-check-circle-o txt-green" : "fa fa-circle-o" %>'></span></strong>
+								<%=LanguageUtil.get(pageContext, "tc-nuova-costruzione-pertinenza") %>
+							</div>
+							<div class="col-sm-12">
+								<strong><span class='<%=dettPratica.getTcCostruzioniEsistenti() ? "fa fa-check-circle-o txt-green" : "fa fa-circle-o" %>'></span></strong>
 								<%=LanguageUtil.get(pageContext, "tc-costruzioni-esistenti") %>
 							</div>
-							<div class="col-xs-12">
+							<div class="col-sm-12">
-								<strong><span class='<%=BeanPropertiesUtil.getBoolean(dettPratica, "tcCostruzioniEsistenti") ? "fa fa-check-circle-o txt-green" : "fa fa-circle-o" %>'></span></strong>
+								<strong><span class='<%=dettPratica.getTcManutOrdStraord() ? "fa fa-check-circle-o txt-green" : "fa fa-circle-o" %>'></span></strong>
 								<%=LanguageUtil.get(pageContext, "tc-manut-ord-rest-dem") %>
 							</div>
-							<div class="col-xs-12">
+							<div class="col-sm-12">
-								<span><strong><%=BeanPropertiesUtil.getString(dettPratica, "tcAltroDescrizione") %></strong></span>
+								<strong><span class='<%=dettPratica.getTcInterventoOpereEscavazione() ? "fa fa-check-circle-o txt-green" : "fa fa-circle-o" %>'></span></strong>
+								<%=LanguageUtil.get(pageContext, "tc-intervento-opere-escavazione") %>
+							</div>
+							<div class="col-sm-12">
+								<strong><span class='<%=dettPratica.getTcViarch() ? "fa fa-check-circle-o txt-green" : "fa fa-circle-o" %>'></span></strong>
+								<%=LanguageUtil.get(pageContext, "tc-viarch") %>
+							</div>
+							<div class="col-sm-12">
+								<strong><span class='<%=dettPratica.getTcOperaA25() ? "fa fa-check-circle-o txt-green" : "fa fa-circle-o" %>'></span></strong>
+								<%=LanguageUtil.get(pageContext, "tc-opera-a25") %>
+							</div>
+							<div class="col-sm-12">
+								<strong><span class='<%=dettPratica.getTcAltriInterventi() ? "fa fa-check-circle-o txt-green" : "fa fa-circle-o" %>'></span></strong>
+								<%=LanguageUtil.get(pageContext, "tc-altro-intervento") %>
+								<c:if test="<%= dettPratica.getTcAltriInterventi() %>">
+									: <strong><%= dettPratica.getTcAltriInterventiDesc() %></strong>
+								</c:if>
 							</div>
 						</div>
 					</div>

liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/html/fascicolo/view.jsp

@@ -394,8 +394,8 @@ String dtSorteggioNullo = "2020-03-05 11:12:18.006";
 				%>
 				
 				Territorio: <strong><%= comune.getDenominazione() %> <%= (lastDettPratica == null || lastDettPratica.getLocalita().isEmpty()) ? "" : "(Loc. "+lastDettPratica.getLocalita()+" ) " %>- <%= provincia.getProvincia() %></strong><br>
-				Tipo procedura: <strong><%= intPratica.getTipoProcedura() %></strong><br>
+				Localizzazione: <strong><%= lastDettPratica == null ? "" : lastDettPratica.getVia() %></strong><br>
-				Localizzazione: <strong><%= lastDettPratica == null ? "" : lastDettPratica.getVia() %></strong><br><br>
+				<strong><%= LanguageUtil.get(pageContext, "tipo_procedura_" + intPratica.getTipoProcedura()) %></strong><br><br>
 				<%= lastDettPratica == null ? "" : lastDettPratica.getDescLongIntervento() %>
 				
 			</liferay-ui:search-container-column-text>

liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/html/fascicolofe/view_fascicolo_columns_generic.jspf

@@ -300,8 +300,8 @@
 			Provincia provincia = ProvinciaLocalServiceUtil.fetchByC_C(themeDisplay.getCompanyId(), comune.getCodiceProvincia());
 		%>
 		Territorio: <strong><%= comune.getDenominazione() %> <%= !lastDettPratica.getLocalita().isEmpty() ? "(Loc. "+lastDettPratica.getLocalita()+" ) " : "" %>- <%= provincia.getProvincia() %></strong><br>
-		Tipo procedura: <strong><%= intPratica.getTipoProcedura() %></strong><br>
+		Localizzazione: <strong><%= lastDettPratica.getVia() %></strong><br>
-		Localizzazione: <strong><%= lastDettPratica.getVia() %></strong><br><br>
+		<strong><%= LanguageUtil.get(pageContext, "tipo_procedura_" + intPratica.getTipoProcedura()) %></strong><br><br>
 		<%= lastDettPratica.getDescLongIntervento() %>
 	</liferay-ui:search-container-column-text>
 	<c:if test="<%=isDeleghe || isProgetti || isAltriProgetti%>">

liferay-plugins-sdk-6.2/shared/portos-firma-shared/.gitignore

@@ -0,0 +1 @@
+/classes/

liferay-plugins-sdk-6.2/shared/portos-firma-shared/.project

@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>portos-firma-shared</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+	</natures>
+</projectDescription>