Aggiunta campi a servlet mappe

liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/liferay-portlet.xml

@@ -160,6 +160,15 @@
 		<footer-portlet-javascript>/js/main.js?v=2</footer-portlet-javascript>
 		<css-class-wrapper>portos-administration-portlet</css-class-wrapper>
 	</portlet>
+	<portlet>
+		<portlet-name>mappe-configurazione</portlet-name>
+		<icon>/icon.png</icon>
+		<control-panel-entry-category>configuration</control-panel-entry-category>
+		<control-panel-entry-weight>1.1</control-panel-entry-weight>
+		<header-portlet-css>/css/main.css?v=1</header-portlet-css>
+		<footer-portlet-javascript>/js/main.js?v=1</footer-portlet-javascript>
+		<css-class-wrapper>mappe-configurazione-portlet</css-class-wrapper>
+	</portlet>
 	<portlet>
 		<portlet-name>ricerca-posizione</portlet-name>
 		<icon>/icon.png</icon>

liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/portlet.xml

@@ -387,6 +387,38 @@
 			<role-name>user</role-name>
 		</security-role-ref>
 	</portlet>
+	<portlet>
+		<portlet-name>mappe-configurazione</portlet-name>
+		<display-name>Configurazione plugin mappe</display-name>
+		<portlet-class>it.mwg.sismica.bo.portlet.MappeConfigurazionePortlet</portlet-class>
+		<init-param>
+			<name>view-template</name>
+			<value>/html/mappe/configurazione/view.jsp</value>
+		</init-param>
+		<expiration-cache>0</expiration-cache>
+		<supports>
+			<mime-type>text/html</mime-type>
+			<portlet-mode>view</portlet-mode>
+		</supports>
+		<resource-bundle>content.Language</resource-bundle>
+		<portlet-info>
+			<title>Configurazione plugin mappe</title>
+			<short-title>Configurazione mappe</short-title>
+			<keywords></keywords>
+		</portlet-info>
+		<security-role-ref>
+			<role-name>administrator</role-name>
+		</security-role-ref>
+		<security-role-ref>
+			<role-name>guest</role-name>
+		</security-role-ref>
+		<security-role-ref>
+			<role-name>power-user</role-name>
+		</security-role-ref>
+		<security-role-ref>
+			<role-name>user</role-name>
+		</security-role-ref>
+	</portlet>
 	<portlet>
 		<portlet-name>ricerca-posizione</portlet-name>
 		<display-name>Ricerca per posizione</display-name>

liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/mwg/sismica/bo/util/MappeUtil.java

@@ -74,7 +74,7 @@ public class MappeUtil {
 					.append(request.getServerName());
 			if ((request.isSecure() && (request.getServerPort() != Http.HTTPS_PORT))
 					|| (!request.isSecure() && (request.getServerPort() != Http.HTTP_PORT))) {
-				cb.append(StringPool.COLON).append(request.getServerPort());
+				cb.append(':').append(request.getServerPort());
 			}
 			cb.append(request.getContextPath()).append(request.getServletPath()).append("/mappe/list?");
 			if (0 == comuneId) {
@@ -82,12 +82,11 @@ public class MappeUtil {
 			} else {
 				cb.append("c=").append(comuneId);
 			}
-			_log.info("cb = " + cb);
 			url = ConfigurazioneLocalServiceUtil
 					.findByC_ChiaveString(companyId, ConfigurazioneConstants.MAPPE_URL_IFRAME_RICERCA)
 					.replace("{{PROVINCIA}}", siglaProvincia).replace("{{COD_BELFIORE}}", codiceBelfiore)
 					.replace("{{URL}}", urlEncode(cb.toString()))
-					+ StringPool.AMPERSAND + getAuth(companyId, request.getServerName());
+					+ '&' + getAuth(companyId, request.getServerName());
 		}
 		return url;
 	}

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

@@ -331,3 +331,8 @@ label-integrazione-13 = Variante
 ricerca-posizione = Ricerca per posizione
 ricerca-indirizzo = Ricerca per indirizzo
 ricerca-progetto = Ricerca per progetto
+
+conf.sismica.mappe.secret = Segreto condiviso
+conf.sismica.mappe.iframe.url.fe = Url iframe Front End
+conf.sismica.mappe.iframe.url.bo = Url iframe Back Office
+conf.sismica.mappe.iframe.url.ricerca = Url iframe Ricerca

liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/mwg/sismica/bo/bean/MappeBean.java

@@ -3,6 +3,8 @@ package it.mwg.sismica.bo.bean;
 public class MappeBean {
 
 	private String comune;
+	private String nomeComune;
+	private String provincia;
 	private String numeroProgetto;
 	private String descrizione;
 	private String estremiCatastali;
@@ -35,11 +37,21 @@ public class MappeBean {
 		return lng;
 	}
 
+	public String getNomeComune() {
+
+		return nomeComune;
+	}
+
 	public String getNumeroProgetto() {
 
 		return numeroProgetto;
 	}
 
+	public String getProvincia() {
+
+		return provincia;
+	}
+
 	public String getUrl() {
 
 		return url;
@@ -70,11 +82,21 @@ public class MappeBean {
 		this.lng = lng;
 	}
 
+	public void setNomeComune(String nomeComune) {
+
+		this.nomeComune = nomeComune;
+	}
+
 	public void setNumeroProgetto(String numeroProgetto) {
 
 		this.numeroProgetto = numeroProgetto;
 	}
 
+	public void setProvincia(String provincia) {
+
+		this.provincia = provincia;
+	}
+
 	public void setUrl(String url) {
 
 		this.url = url;

liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/mwg/sismica/bo/portlet/MappeConfigurazionePortlet.java

@@ -0,0 +1,30 @@
+package it.mwg.sismica.bo.portlet;
+
+import it.tref.liferay.portos.bo.service.ConfigurazioneLocalServiceUtil;
+import it.tref.liferay.portos.bo.shared.util.ConfigurazioneConstants;
+
+import java.util.Arrays;
+
+import javax.portlet.ActionRequest;
+import javax.portlet.ActionResponse;
+
+import com.liferay.portal.kernel.exception.PortalException;
+import com.liferay.portal.kernel.exception.SystemException;
+import com.liferay.portal.kernel.util.ParamUtil;
+import com.liferay.portal.service.ServiceContext;
+import com.liferay.portal.service.ServiceContextFactory;
+import com.liferay.util.bridges.mvc.MVCPortlet;
+
+public class MappeConfigurazionePortlet extends MVCPortlet {
+
+	public void salvaImpostazioni(ActionRequest request, ActionResponse response) throws PortalException,
+			SystemException {
+
+		ServiceContext serviceContext = ServiceContextFactory.getInstance(request);
+		for (String campo : Arrays.asList(ConfigurazioneConstants.MAPPE_SHARED_SECRET,
+				ConfigurazioneConstants.MAPPE_URL_IFRAME_FE, ConfigurazioneConstants.MAPPE_URL_IFRAME_BO,
+				ConfigurazioneConstants.MAPPE_URL_IFRAME_RICERCA)) {
+			ConfigurazioneLocalServiceUtil.storeConfig(campo, ParamUtil.getString(request, campo), serviceContext);
+		}
+	}
+}

liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/mwg/sismica/bo/search/IntPraticaAdvancedSearch.java

@@ -84,7 +84,6 @@ public class IntPraticaAdvancedSearch {
 			booleanQuery.add(termQuery, BooleanClauseOccur.MUST);
 			// Condizioni aggiuntive
 			query(request, user, booleanQuery, searchContext);
-
 			hits = SearchEngineUtil.search(searchContext, booleanQuery);
 			logResults(user, booleanQuery, hits);
 		} catch (SearchException | ParseException e) {

liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/mwg/sismica/bo/servlet/MappeServlet.java

@@ -4,10 +4,12 @@ import it.mwg.sismica.bo.bean.MappeBean;
 import it.tref.liferay.portos.bo.model.Comune;
 import it.tref.liferay.portos.bo.model.DettPratica;
 import it.tref.liferay.portos.bo.model.IntPratica;
+import it.tref.liferay.portos.bo.model.Provincia;
 import it.tref.liferay.portos.bo.model.Territorio;
 import it.tref.liferay.portos.bo.service.ComuneLocalServiceUtil;
 import it.tref.liferay.portos.bo.service.DettPraticaLocalServiceUtil;
 import it.tref.liferay.portos.bo.service.IntPraticaLocalServiceUtil;
+import it.tref.liferay.portos.bo.service.ProvinciaLocalServiceUtil;
 import it.tref.liferay.portos.bo.service.TerritorioLocalServiceUtil;
 import it.tref.liferay.portos.bo.shared.util.FascicoloURLUtil;
 
@@ -109,7 +111,10 @@ public class MappeServlet extends HttpServlet {
 				try {
 					Territorio territorio = TerritorioLocalServiceUtil.getTerritorio(pratica.getTerritorioId());
 					Comune comune = ComuneLocalServiceUtil.getComune(territorio.getComuneId());
+					Provincia provincia = ProvinciaLocalServiceUtil.fetchByC_C(companyId, comune.getCodiceProvincia());
 					bean.setComune(comune.getCodiceBelfiore());
+					bean.setNomeComune(comune.getDenominazione());
+					bean.setProvincia(provincia.getSigla());
 					bean.setNumeroProgetto(pratica.getNumeroProgetto());
 					bean.setDescrizione(dett.getDescLongIntervento());
 					bean.setEstremiCatastali(dett.getEstremiCatastali());

liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/asset/ControlloPraticaAssetRenderer.java

@@ -76,7 +76,7 @@ public class ControlloPraticaAssetRenderer extends BaseAssetRenderer {
 	public String getURLViewInContext(LiferayPortletRequest liferayPortletRequest,
 			LiferayPortletResponse liferayPortletResponse, String noSuchEntryRedirect) throws Exception {
 
-		return FascicoloURLUtil.getFascicoloViewURL(_entry.getCompanyId(), _entry.getIntPraticaId());
+		return FascicoloURLUtil.getFascicoloBOViewURL(_entry.getCompanyId(), _entry.getIntPraticaId());
 	}
 
 	@Override

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

@@ -2,9 +2,7 @@ package it.tref.liferay.portos.bo.portlet;
 
 import it.mwg.sismica.bo.util.ManutenzioneDatabase;
 import it.mwg.sismica.bo.util.SismicaUtil;
-import it.tref.liferay.portos.bo.service.ConfigurazioneLocalServiceUtil;
 import it.tref.liferay.portos.bo.service.IntPraticaLocalServiceUtil;
-import it.tref.liferay.portos.bo.shared.util.ConfigurazioneConstants;
 
 import java.sql.SQLException;
 import java.util.ArrayList;
@@ -16,8 +14,6 @@ import javax.portlet.ActionResponse;
 
 import com.liferay.portal.kernel.exception.PortalException;
 import com.liferay.portal.kernel.exception.SystemException;
-import com.liferay.portal.kernel.log.Log;
-import com.liferay.portal.kernel.log.LogFactoryUtil;
 import com.liferay.portal.kernel.util.ParamUtil;
 import com.liferay.portal.kernel.util.Validator;
 import com.liferay.portal.kernel.util.WebKeys;
@@ -28,27 +24,7 @@ import com.liferay.util.bridges.mvc.MVCPortlet;
 
 public class PaesaggisticaAdministrationPortlet extends MVCPortlet {
 
-	private static final Log _log = LogFactoryUtil.getLog(PaesaggisticaAdministrationPortlet.class);
+	public void mostraConfigurazione(ActionRequest request, ActionResponse response) throws SystemException {
-
-	public void impostazioniMappe(ActionRequest actionRequest, ActionResponse actionResponse) throws PortalException,
-			SystemException {
-
-		String urlIframeFE = ParamUtil.getString(actionRequest, "urlIframeFE");
-		String urlIframeBO = ParamUtil.getString(actionRequest, "urlIframeBO");
-		String urlIframeRicerca = ParamUtil.getString(actionRequest, "urlIframeRicerca");
-		String sharedSecret = ParamUtil.getString(actionRequest, "sharedSecret");
-		ServiceContext serviceContext = ServiceContextFactory.getInstance(actionRequest);
-		ConfigurazioneLocalServiceUtil.storeConfig(ConfigurazioneConstants.MAPPE_URL_IFRAME_FE, urlIframeFE,
-				serviceContext);
-		ConfigurazioneLocalServiceUtil.storeConfig(ConfigurazioneConstants.MAPPE_URL_IFRAME_BO, urlIframeBO,
-				serviceContext);
-		ConfigurazioneLocalServiceUtil.storeConfig(ConfigurazioneConstants.MAPPE_URL_IFRAME_RICERCA, urlIframeRicerca,
-				serviceContext);
-		ConfigurazioneLocalServiceUtil.storeConfig(ConfigurazioneConstants.MAPPE_SHARED_SECRET, sharedSecret,
-				serviceContext);
-	}
-
-	public void mostraConfigurazione(ActionRequest actionRequest, ActionResponse actionResponse) throws SystemException {
 
 		List<String> esito = new ArrayList<String>();
 		esito.add("<h3>Env:</h3>");
@@ -59,38 +35,37 @@ public class PaesaggisticaAdministrationPortlet extends MVCPortlet {
 		for (Map.Entry<Object, Object> entry : System.getProperties().entrySet()) {
 			esito.add(entry.getKey() + "=" + entry.getValue());
 		}
-		actionResponse.setRenderParameter("esito", esito.toArray(new String[esito.size()]));
+		response.setRenderParameter("esito", esito.toArray(new String[esito.size()]));
 	}
 
-	public void reIndexFasciolo(ActionRequest actionRequest, ActionResponse actionResponse) throws PortalException,
+	public void reIndexFasciolo(ActionRequest request, ActionResponse response) throws PortalException, SystemException {
-			SystemException {
 
-		ThemeDisplay themeDisplay = (ThemeDisplay) actionRequest.getAttribute(WebKeys.THEME_DISPLAY);
+		ThemeDisplay themeDisplay = (ThemeDisplay) request.getAttribute(WebKeys.THEME_DISPLAY);
-		long intPraticaId = ParamUtil.getLong(actionRequest, "intPraticaId");
+		long intPraticaId = ParamUtil.getLong(request, "intPraticaId");
 		if (Validator.isNotNull(intPraticaId)) {
 			IntPraticaLocalServiceUtil.reIndexFasciolo(intPraticaId, themeDisplay.getCompanyId());
 		}
-		String numeroProgetto = ParamUtil.getString(actionRequest, "numeroProgetto");
+		String numeroProgetto = ParamUtil.getString(request, "numeroProgetto");
 		if (Validator.isNotNull(numeroProgetto)) {
 			IntPraticaLocalServiceUtil.reIndexFasciolo(numeroProgetto, themeDisplay.getCompanyId());
 		}
 	}
 
-	public void reIndexFascicoli(ActionRequest actionRequest, ActionResponse actionResponse) {
+	public void reIndexFascicoli(ActionRequest request, ActionResponse response) {
 
-		ThemeDisplay themeDisplay = (ThemeDisplay) actionRequest.getAttribute(WebKeys.THEME_DISPLAY);
+		ThemeDisplay themeDisplay = (ThemeDisplay) request.getAttribute(WebKeys.THEME_DISPLAY);
 		List<String> esito = null;
 		esito = SismicaUtil.reIndexFascicoli(themeDisplay.getCompanyId());
 		if (esito != null)
-			actionResponse.setRenderParameter("esito", esito.toArray(new String[esito.size()]));
+			response.setRenderParameter("esito", esito.toArray(new String[esito.size()]));
 	}
 
-	public void manutenzioneDatabase(ActionRequest actionRequest, ActionResponse actionResponse)
+	public void manutenzioneDatabase(ActionRequest request, ActionResponse response) throws PortalException,
-			throws PortalException, SystemException, SQLException {
+			SystemException, SQLException {
 
-		String mode = ParamUtil.getString(actionRequest, "mode");
+		String mode = ParamUtil.getString(request, "mode");
-		ServiceContext serviceContext = ServiceContextFactory.getInstance(actionRequest);
+		ServiceContext serviceContext = ServiceContextFactory.getInstance(request);
 		List<String> esito = ManutenzioneDatabase.pulisci(serviceContext, mode);
-		actionResponse.setRenderParameter("esito", esito.toArray(new String[esito.size()]));
+		response.setRenderParameter("esito", esito.toArray(new String[esito.size()]));
 	}
 }

liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/startup/KaleoListenereStartupAction.java

@@ -25,7 +25,6 @@ public class KaleoListenereStartupAction extends ModelListenerStartupAction {
 				new ModelListenerWrapper("portos-kaleo-web", KaleoInstanceToken.class.getName(),
 						KaleoInstanceTokenModelListener.class.getName()),
 				new ModelListenerWrapper("portos-kaleo-web", KaleoLog.class.getName(),
-						KaleoLogModelListener.class.getName())
+						KaleoLogModelListener.class.getName()) };
-		};
 	}
 }

liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/html/gestioneattivitaistruttore/action_button.jsp

@@ -38,7 +38,8 @@ if (workflowInstanceLink == null) {
 <liferay-ui:icon-menu icon="" showWhenSingleIcon="false" showExpanded="true" cssClass="menu_button_activity">
 	<div title='<%= LanguageUtil.get(pageContext,"workflow-action-open-pratica") %>' class="tooltip-info">
 		<liferay-ui:icon iconCssClass="fa fa-folder-open" linkCssClass="btn btn-action" target="_blank" message=""
-				url="<%= FascicoloURLUtil.getFascicoloViewURL(intPratica.getCompanyId(), intPratica.getIntPraticaId()) %>" />
+				url="<%= FascicoloURLUtil.getFascicoloBOViewURL(intPratica.getCompanyId(),
+						intPratica.getIntPraticaId()) %>" />
 	</div>
 	<c:if test="<%= !listaTask.isEmpty() %>">
 		<%

liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/html/gestionefirme/avvisi_actions.jsp

@@ -47,7 +47,7 @@ boolean inUnitaOperativa = unitaOperativeUtente.contains(intPratica.getUnitaOper
 	</span>
 </c:if>
 <% 
-String urlDettaglioPratica = FascicoloURLUtil.getFascicoloViewURL(avviso.getCompanyId(), avviso.getIntPraticaId());
+String urlDettaglioPratica = FascicoloURLUtil.getFascicoloBOViewURL(avviso.getCompanyId(), avviso.getIntPraticaId());
 %>
 <span class="tooltip-info" title="Apri Pratica">
 	<%

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

@@ -0,0 +1,32 @@
+<%@page import="it.tref.liferay.portos.bo.shared.util.ConfigurazioneConstants"%>
+<%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%>
+<%@include file="/html/init.jsp"%>
+<%
+long companyId = company.getCompanyId();
+String urlIframeFE = ConfigurazioneServiceUtil.findByC_ChiaveString(companyId,
+		ConfigurazioneConstants.MAPPE_URL_IFRAME_FE);
+String urlIframeBO = ConfigurazioneServiceUtil.findByC_ChiaveString(companyId,
+		ConfigurazioneConstants.MAPPE_URL_IFRAME_BO);
+String urlIframeRicerca = ConfigurazioneServiceUtil.findByC_ChiaveString(companyId,
+		ConfigurazioneConstants.MAPPE_URL_IFRAME_RICERCA);
+String sharedSecret = ConfigurazioneServiceUtil.findByC_ChiaveString(companyId,
+		ConfigurazioneConstants.MAPPE_SHARED_SECRET);
+%>
+<liferay-portlet:actionURL name="salvaImpostazioni" var="salvaImpostazioniUrl" />
+<h2>Configurazione plugin mappe</h2>
+<aui:form method="post" action="<%= salvaImpostazioniUrl %>" inlineLabels="false" name="edit" id="edit">
+	<%
+	for (String campo : Arrays.asList(ConfigurazioneConstants.MAPPE_SHARED_SECRET,
+			ConfigurazioneConstants.MAPPE_URL_IFRAME_FE, ConfigurazioneConstants.MAPPE_URL_IFRAME_BO,
+			ConfigurazioneConstants.MAPPE_URL_IFRAME_RICERCA)) {
+	%>
+		<aui:row>
+			<aui:input type="text" cssClass="span12" name="<%= campo %>"
+					value="<%= ConfigurazioneLocalServiceUtil.findByC_ChiaveString(companyId, campo) %>" />
+		</aui:row>
+	<%
+	}
+	%>
+	<aui:button type="submit" value="save" />
+</aui:form>
+

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

@@ -7,32 +7,12 @@
 <%@include file="/html/paesaggistica_administration/init.jsp"%>
 <%
 SimpleDateFormat simpleDateTimeFormat = new SimpleDateFormat("dd/MM/yyyy HH:mm:ss");
-long companyId = company.getCompanyId();
-String urlIframeFE = ConfigurazioneServiceUtil.findByC_ChiaveString(companyId, ConfigurazioneConstants.MAPPE_URL_IFRAME_FE);
-String urlIframeBO = ConfigurazioneServiceUtil.findByC_ChiaveString(companyId, ConfigurazioneConstants.MAPPE_URL_IFRAME_BO);
-String urlIframeRicerca = ConfigurazioneServiceUtil.findByC_ChiaveString(companyId, ConfigurazioneConstants.MAPPE_URL_IFRAME_RICERCA);
-String sharedSecret = ConfigurazioneServiceUtil.findByC_ChiaveString(companyId, ConfigurazioneConstants.MAPPE_SHARED_SECRET);
 %>
 <hr style="margin: 0" />
-<liferay-portlet:actionURL name="impostazioniMappe" var="impostazioniMappeURL" />
 <liferay-portlet:actionURL name="reIndexFasciolo" var="reIndexFascicoloURL" />
 <liferay-portlet:actionURL name="reIndexFascicoli" var="reIndexFascicoliURL" />
 <liferay-portlet:actionURL name="mostraConfigurazione" var="mostraConfigurazioneURL" />
 <liferay-portlet:actionURL name="manutenzioneDatabase" var="manutenzioneDatabaseURL" />
-<div class="row-fluid" style="margin-top: 10px">
-	<div class="span6">
-		<div style="font-weight: bold; font-size: 18px; margin-bottom: 10px;">Impostazioni sistema mappe</div>
-		<aui:form action="<%= impostazioniMappeURL %>" method="post" name="fmImpostazioniMappe">
-			<div>
-				<aui:input type="text" cssClass="span12" name="sharedSecret" label="Segreto condiviso" value="<%= sharedSecret %>"/>
-				<aui:input type="text" cssClass="span12" name="urlIframeFE" label="Url iframe Front End" value="<%= urlIframeFE %>"/>
-				<aui:input type="text" cssClass="span12" name="urlIframeBO" label="Url iframe Back Office" value="<%= urlIframeBO %>"/>
-				<aui:input type="text" cssClass="span12" name="urlIframeRicerca" label="Url iframe Ricerca" value="<%= urlIframeRicerca %>"/>
-				<aui:button type="submit" value="save" />
-			</div>
-		</aui:form>
-	</div>
-</div>
 <div class="row-fluid" style="margin-top: 10px">
 	<div class="span6">
 		<div style="font-weight: bold; font-size: 18px; margin-bottom: 10px;">Form per reindicizzare un

liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/html/fascicolofe/edit_modal_fascicolo.jsp

@@ -6,16 +6,16 @@ String formName = ParamUtil.getString(request, "formName", "fm");
 %>
 <div class="container-fluid add-new-project">
 	<div class="row">
-		<div class="col-sm-12 col-md-12">
+		<div class="col-sm-12">
 			<div class="module-group">
 				<div class="container-fluid">
 					<div class="row add-new-project__row">
-						<div class="col-xs-6 col-sm-6 col-md-6 add-new-project__provincia">
+						<div class="col-xs-6 add-new-project__provincia">
 							<aui:select name="provincia" label="Provincia" showEmptyOption="false"
 									showRequiredLabel="true">
 							</aui:select>
 						</div>
-						<div class="col-xs-6 col-sm-6 col-md-6 add-new-project__comune" >
+						<div class="col-xs-6 add-new-project__comune" >
 							<aui:select name="comune" label="Comune" showEmptyOption="false" showRequiredLabel="true"
 									helpMessage="Nel caso di interventi estesi nel territorio e comprendenti più comuni, verrà evidenziato il comune in cui l'intervento è territorialmente prevalente"
 									disabled="true">

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

@@ -320,7 +320,7 @@ function duplicati(input) {
 										<aui:row>
 											<div class="col-xs-12 col-md-6">
 												<div class="container-fluid">
-													<div class="row <%= hide10 --%>">
+													<div class="row <%= hide10 %>">
 														<div class="col-xs-12">
 															<aui:input disabled="<%=disabledInput && !enabledByIntegrazione %>"  name="descLongIntervento"
 																	label="desc-long-intervento"/>
@@ -654,86 +654,10 @@ function duplicati(input) {
     box-shadow: inset 0 1px 1px rgb(0 0 0 / 8%), 0 0 8px rgb(102 175 233 / 60%);
 }
 </style>
-
+<script>
-<script type="text/javascript" >
-
-Liferay.on('mapIt-ready',function(event) {
-	Liferay.Portal.Tabs.show('<portlet:namespace/>tabs1', ['mappe-bbcc', 'mappe-openstreetmap'], 'mappe-bbcc');
-	if (('' == $('#<portlet:namespace/>lat').val().trim())
-			|| ('' == $('#<portlet:namespace/>long').val().trim())) {
-		localize(false);
-	}
-	var isActivable = <%= !disabledInput && !isGeoEditable %>;
-	if (isActivable) {
-		AUI().one('#<portlet:namespace/>localizzaBtn').set('disabled', false).removeClass('disabled');
-		AUI().one('#_<%= PortletKeys.MAPIT %>_container_btn .bloccamap').set('disabled', false).removeClass('disabled');
-	}
-});
-
-function localize(showAlert) {
-
-	AUI().use('aui-io-request', function(A) {
-		var district = AUI().one("#<portlet:namespace/>provincia");
-			city = AUI().one("#<portlet:namespace/>comune");
-			address = AUI().one("#<portlet:namespace/>via");
-		var localization = [address.val().toLowerCase().split(" ").join("+"),
-							city.val().toLowerCase().split(" ").join("+"),
-							district.val().toLowerCase().split(" ").join("+")];
-		var url = "https://nominatim.openstreetmap.org/search?format=json&addressdetails=0&q="+
-					localization.join("+");
-		A.io.request(url, {
-			dataType: 'json',
-			on: {
-				success: function() {
-					var response = this.get('responseData');
-					if (response.length == 0) {
-						if (showAlert) {
-							alert('Spiacenti... Nessun risultato per i dati immessi');
-						}
-					} else if (response && response[0]) {
-						Liferay.fire(
-							'geolocation-ready',
-							{
-								latitude: response[0].lat,
-								longitude : response[0].lon,
-								fullAddress : address.val() != ""
-							}
-						);
-					}
-				},
-			}
-		});
-
-	});
-}
 
 AUI().ready(function(A){
-	//checkIfDisableSistemiCostruttivi();
 	checkIfDisableInfrastrutture();
-	//checkCollaudoStatico();
-});
-
-function checkIfDisableSistemiCostruttivi(){
-	var interventoLocale = AUI().one("#<portlet:namespace/>tcRiparazioneInterventoLocaleCheckbox"),
-		miglioramentoSismico = AUI().one("#<portlet:namespace/>tcMiglioramentoSismicoCheckbox"),
-		adeguamentoSismico = AUI().one("#<portlet:namespace/>tcAdeguamentoSismicoCheckbox"),
-		nuovaCostruzione = AUI().one("#<portlet:namespace/>tc-nuova-costruzioneCheckbox");
-	if(interventoLocale.attr("checked") && !nuovaCostruzione.attr("checked") && !miglioramentoSismico.attr("checked") && !adeguamentoSismico.attr("checked")){
-		disableInput('#descrizione_componenti_costruttive');
-	} else {
-		enableInput('#descrizione_componenti_costruttive');
-	}
-}
-
-$('#<portlet:namespace/>long, #<portlet:namespace/>lat').on('change', function() {
-	if ($('#<portlet:namespace/>long').val() != '' && $('#<portlet:namespace/>lat').val() != '') {
-		var latitude = parseFloat($('#<portlet:namespace/>lat').val());
-		var longitude = parseFloat($('#<portlet:namespace/>long').val());
-		$('#<portlet:namespace/>lat_hidden').val(latitude);
-		$('#<portlet:namespace/>long_hidden').val(longitude);
-		var zoom = mapItMap.getCurrentZoom();
-		updateCoords(latitude, longitude, zoom, true, true);
-	}
 });
 
 $('#sistemi_costruttivi input').on('change', function() {
@@ -745,7 +669,6 @@ $('#sistemi_costruttivi input').on('change', function() {
 			enableDisableChk('.costruzioni_esistenti ul input[type="checkbox"]', 'not_enable', false);
 		}
 	}
-	//ADT BUG FE ID = 23
 	if($('#<portlet:namespace/>tc-nuova-costruzioneCheckbox').prop('checked')||
 			$('#<portlet:namespace/>tcAdeguamentoSismicoCheckbox').prop('checked')||
 			$('#<portlet:namespace/>tcMiglioramentoSismicoCheckbox').prop('checked')){
@@ -754,7 +677,6 @@ $('#sistemi_costruttivi input').on('change', function() {
 	} else if ($('#<portlet:namespace/>tcRiparazioneInterventoLocaleCheckbox').prop('checked')) {
 		enableDisableChk('#<portlet:namespace/>collaudoStaticoCheckbox', 'not_enable', false);
 	}
-	//checkIfDisableSistemiCostruttivi();
 });
 
 function checkIfDisableInfrastrutture(){
@@ -782,37 +704,21 @@ $('#destinazioneinazione input[type="radio"]').on('click', function() {
 	}, 100);
 });
 
-</script>
+Liferay.provide(window, 'enableInput', function (elem) {
-
+	AUI().all(elem + " input").each(function (item) {
-<script type="text/javascript" >
-	Liferay.provide(
-			window,
-			'enableInput',
-			function(elem) {
-				AUI().all(elem+" input").each(
-						function(item){
 		if (!<%= disabledInput %>) {
 			item.set('disabled', false);
 			item.removeClass('disabled');
 		}
 	});
-			}
+});
-		);
+
-
+Liferay.provide(window, 'disableInput', function (elem) {
-	Liferay.provide(
+	AUI().all(elem + " input").each(function (item) {
-			window,
-			'disableInput',
-			function(elem) {
-				AUI().all(elem+" input").each(
-					function(item){
 		item.addClass('disabled');
 		item.set('disabled', true);
 	});
-			}
+});
-		);
-</script>
-<!-- ADT BUG FE ID = 23  -->
-<script type="text/javascript" >
 
 $('#<portlet:namespace/>lavoriPubbliciCheckbox, #<portlet:namespace/>intervFinPubCheckbox').change(function () {
 	var _this = $(this);
@@ -825,15 +731,8 @@ $('#<portlet:namespace/>lavoriPubbliciCheckbox, #<portlet:namespace/>intervFinPu
 		'tcAltriInterventi'
 	];
 	if (_this.is(":checked")) {
-		/*$.each(toDisable, function(index, val) {
-			enableDisableChk('#<portlet:namespace/>'+val+'Checkbox', 'not_enable', true);
-		});*/
-		
 		enableDisableChk('.excludeOther[data-cont="viarch"] input[type="checkbox"]', 'not_enable', false);
 	} else {
-		/*$.each(toDisable, function(index, val) {
-			enableDisableChk('#<portlet:namespace/>'+val+'Checkbox', 'not_enable', false);
-		});*/
 		enableDisableChk('.excludeOther[data-cont="viarch"] input[type="checkbox"]', 'not_enable', true);
 	}
 });
@@ -907,30 +806,6 @@ $('#<portlet:namespace/>collaudoStaticoCheckbox').change(function () {
 		$('#<portlet:namespace/>tc-nuova-costruzioneCheckbox').removeAttr("disabled");
 	}
 });
-function checkCollaudoStatico(){
-	var interventoLocale = AUI().one("#<portlet:namespace/>tcRiparazioneInterventoLocaleCheckbox"),
-	miglioramentoSismico = AUI().one("#<portlet:namespace/>tcMiglioramentoSismicoCheckbox"),
-	adeguamentoSismico = AUI().one("#<portlet:namespace/>tcAdeguamentoSismicoCheckbox"),
-	nuovaCostruzione = AUI().one("#<portlet:namespace/>tc-nuova-costruzioneCheckbox"),
-	collaudostatico = AUI().one("#<portlet:namespace/>collaudoStaticoCheckbox");
-
-	if(collaudostatico.attr("checked") ){
-		enableDisableChk('#<portlet:namespace/>tc-nuova-costruzioneCheckbox', 'not_enable', true);
-		enableDisableChk('#<portlet:namespace/>tcInterventiCheckbox', 'enable', true);
-		enableDisableChk('#<portlet:namespace/>tcAdeguamentoSismicoCheckbox', 'not_enable', true);
-		enableDisableChk('#<portlet:namespace/>tcMiglioramentoSismicoCheckbox', 'not_enable', true);
-		
-		$('#<portlet:namespace/>tcRiparazioneInterventoLocaleCheckbox').removeAttr("disabled");
-		$('#<portlet:namespace/>tcRiparazioneInterventoLocaleCheckbox').removeClass('disabled');
-	}
-	if(nuovaCostruzione.attr("checked")||
-	adeguamentoSismico.attr("checked")||
-	miglioramentoSismico.attr("checked")){		
-		enableDisableChk('#<portlet:namespace/>collaudoStaticoCheckbox', 'not_enable', true);
-	} else if (interventoLocale.attr("checked")) {
-		$('#<portlet:namespace/>collaudoStaticoCheckbox').removeAttr('disabled');
-	}
-}
 
 $("#<portlet:namespace/>interventoVoceP7").on("keypress keyup blur",function (event) {    
 	if (event.which == 43) {
@@ -950,7 +825,6 @@ function enableDisableChk(obj, action, disable){
 		$(obj).attr('checked', false);
 		$(obj).prev('input[type="hidden"]').val(false);
 	}
-	
 	if (disable) {
 		$(obj).attr("disabled", true);
 		$(obj).prop("disabled", true);
@@ -959,5 +833,4 @@ function enableDisableChk(obj, action, disable){
 		$(obj).prop("disabled", false);
 	}	
 }
-
 </script>

liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/html/fascicolofe/view.jsp

@@ -24,9 +24,8 @@ String keywords = StringPool.BLANK;
 		<liferay-util:param name="title" value="INFORMAZIONI" />
 		<liferay-util:param name="message" value="<%= helpMessage %>" />
 	</liferay-util:include>
-	<br>
+	<br />
 </c:if>
-
 <div class="navbar-container">
 	<c:if test="<%= isProgetti %>">
 		<liferay-util:include page="/html/fascicolofe/toolbar.jsp" servletContext="<%= application %>" />

liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/html/fascicolofe/view_fascicolo_dettagli.jsp

@@ -1,53 +1,29 @@
 <%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%>
+<%@page import="com.liferay.portal.kernel.bean.BeanPropertiesUtil"%>
+<%@page import="com.liferay.portal.kernel.servlet.ServletContextPool"%>
 <%@page import="it.mwg.sismica.bo.shared.util.DelegheUtil"%>
+<%@page import="it.mwg.sismica.bo.util.MappeUtil" %>
+<%@page import="it.tref.liferay.portos.bo.model.DettPratica"%>
 <%@page import="it.tref.liferay.portos.bo.model.DocPratica"%>
-<%@page import="it.tref.liferay.portos.bo.service.DocPraticaLocalServiceUtil"%>
-<%@page import="it.tref.liferay.portos.bo.service.DettPraticaLocalServiceUtil"%>
-<%@page import="com.liferay.portal.kernel.servlet.ServletContextPool"%>
-<%@page import="it.tref.liferay.portos.bo.shared.util.PagamentoConstants"%>
-<%@page import="java.text.NumberFormat"%>
-<%@page import="java.math.BigDecimal"%>
 <%@page import="it.tref.liferay.portos.bo.shared.util.PortletKeys"%>
-<%@page import="java.util.Date"%>
+<%@page import="it.tref.liferay.portos.bo.service.ComuneLocalServiceUtil"%>
+<%@page import="it.tref.liferay.portos.bo.service.DettPraticaLocalServiceUtil"%>
+<%@page import="it.tref.liferay.portos.bo.service.DocPraticaLocalServiceUtil"%>
 <%@page import="it.tref.liferay.portos.bo.service.IntPraticaLocalServiceUtil"%>
-<%@page import="it.tref.liferay.portos.bo.service.DettPraticaServiceUtil"%>
-<%@page import="com.liferay.portal.kernel.util.KeyValuePair"%>
 <%@page import="it.tref.liferay.portos.bo.service.ProvinciaLocalServiceUtil"%>
-<%@page import="it.tref.liferay.portos.bo.service.ComuneLocalServiceUtil"%>
+<%@page import="it.tref.liferay.portos.bo.service.SoggettoLocalServiceUtil"%>
 <%@page import="it.tref.liferay.portos.bo.service.TerritorioLocalServiceUtil"%>
-<%@page import="it.tref.liferay.portos.bo.model.Provincia"%>
+<%@page import="java.util.Date"%>
-<%@page import="it.tref.liferay.portos.bo.model.Comune"%>
-<%@page import="it.tref.liferay.portos.bo.model.Territorio"%>
-<%@page import="it.tref.liferay.portos.bo.model.IntPratica"%>
-<%@page import="it.tref.liferay.portos.bo.model.DettPratica"%>
-<%@page import="java.util.ArrayList"%>
 <%@page import="java.util.regex.Pattern"%>
-<%@page import="com.liferay.portal.kernel.bean.BeanPropertiesUtil"%>
-<%@page import="it.tref.liferay.portos.bo.shared.util.PortletKeys"%>
 <%@ include file="/html/fascicolofe/init.jsp" %>
-
-
-<%@page import="com.liferay.portal.service.UserLocalServiceUtil"%>
-<%@page import="it.tref.liferay.portos.bo.service.SoggettoLocalServiceUtil"%>
-<%@page import="it.tref.liferay.portos.bo.model.Soggetto"%>
-<%@page import="it.tref.liferay.portos.bo.service.IntPraticaLocalServiceUtil"%>
-<%@page import="it.tref.liferay.portos.bo.model.IntPratica"%>
-<%@page import="it.tref.liferay.portos.bo.service.DelegaServiceUtil"%>
-<%@page import="java.util.ArrayList"%>
-<%@page import="com.liferay.portal.kernel.util.KeyValuePair"%>
-<%@page import="com.liferay.portal.kernel.portlet.LiferayWindowState"%>
-<%@page import="it.mwg.sismica.bo.util.MappeUtil" %>
-
-
 <%
-	long intPraticaId = ParamUtil.getLong(request, "intPraticaId", 0l);
+long intPraticaId = ParamUtil.getLong(request, "intPraticaId", 0);
-	long dettPraticaId = ParamUtil.getLong(request, "dettPraticaId", 0l);
+long dettPraticaId = ParamUtil.getLong(request, "dettPraticaId", 0);
-	
 DettPratica dettPratica = null;
 IntPratica intPratica = null;
-	if(intPraticaId !=0l ){
+if (intPraticaId != 0) {
 	intPratica = IntPraticaLocalServiceUtil.getIntPratica(intPraticaId);
-	  if(dettPraticaId != 0l){
+	if (dettPraticaId != 0) {
 		dettPratica = DettPraticaLocalServiceUtil.getDettPratica(dettPraticaId);
 	} else {
 		dettPratica = DettPraticaLocalServiceUtil.getLastEditableByIntPratica(intPraticaId);
@@ -57,35 +33,29 @@
 		dettPraticaId = dettPratica.getDettPraticaId();
 	}
 }
-	
 Territorio territorio = TerritorioLocalServiceUtil.getTerritorio(intPratica.getTerritorioId());
 Comune comune = ComuneLocalServiceUtil.getComune(territorio.getComuneId());
 Provincia provincia = ProvinciaLocalServiceUtil.fetchByC_C(territorio.getCompanyId(), territorio.getCodiceProvincia());
-	
+String urlIframeMappe = MappeUtil.getUrlBo(request, dettPratica, comune, true);
-	String urlIframeMappe = MappeUtil.getUrlFe(request, dettPratica, comune, true);
+String hide1 = (intPratica.getTipoProcedura().equalsIgnoreCase(Constants.PROCEDURA_Q1)
-	
+		|| intPratica.getTipoProcedura().equalsIgnoreCase(Constants.PROCEDURA_P1) ? "hideSection" : StringPool.BLANK);
-	String hide1 = (intPratica.getTipoProcedura().equals(Constants.PROCEDURA_Q1) || intPratica.getTipoProcedura().equals(Constants.PROCEDURA_P1) ? "hideSection" : "");
+String hide3 = (intPratica.getTipoProcedura().equalsIgnoreCase(Constants.PROCEDURA_Q3)
-	String hide3 = (intPratica.getTipoProcedura().equals(Constants.PROCEDURA_Q3) || intPratica.getTipoProcedura().equals(Constants.PROCEDURA_P3) ? "hideSection" : "");
+		|| intPratica.getTipoProcedura().equalsIgnoreCase(Constants.PROCEDURA_P3) ? "hideSection" : StringPool.BLANK);
-	String hide8 = (intPratica.getTipoProcedura().equals(Constants.PROCEDURA_Q8) || intPratica.getTipoProcedura().equals(Constants.PROCEDURA_P8) ? "hideSection" : "");
+String hide8 = (intPratica.getTipoProcedura().equalsIgnoreCase(Constants.PROCEDURA_Q8)
-	String hide9 = (intPratica.getTipoProcedura().equals(Constants.PROCEDURA_Q9) || intPratica.getTipoProcedura().equals(Constants.PROCEDURA_P9) ? "hideSection" : "");
+		|| intPratica.getTipoProcedura().equalsIgnoreCase(Constants.PROCEDURA_P8) ? "hideSection" : StringPool.BLANK);
-	String hide10 = (intPratica.getTipoProcedura().equals(Constants.PROCEDURA_Q10) || intPratica.getTipoProcedura().equals(Constants.PROCEDURA_P10) ? "hideSection" : "");
+String hide9 = (intPratica.getTipoProcedura().equalsIgnoreCase(Constants.PROCEDURA_Q9)
-
+		|| intPratica.getTipoProcedura().equalsIgnoreCase(Constants.PROCEDURA_P9) ? "hideSection" : StringPool.BLANK);
+String hide10 = (intPratica.getTipoProcedura().equalsIgnoreCase(Constants.PROCEDURA_Q10)
+		|| intPratica.getTipoProcedura().equalsIgnoreCase(Constants.PROCEDURA_P10) ? "hideSection" : StringPool.BLANK);
 %>
-
 <liferay-ui:error key="error-download-pdf-domanda" message="error-download-pdf-domanda" />
-
 <liferay-portlet:actionURL name="salvaStampaPratica" var="salvaStampaPraticaURL">
 	<liferay-portlet:param name="intPraticaId" value="<%= String.valueOf(intPraticaId) %>" />
 	<liferay-portlet:param name="mvcPath" value="/html/fascicolofe/view_fascicolo_dettagli.jsp" />
 </liferay-portlet:actionURL>
-
-<%-- <aui:form name="fm_salvaStampa" action="<%=salvaStampaPraticaURL %>" method="post"> --%>
-<%-- 	<aui:button cssClass="pull-right" type="submit"  value="Stampa" icon="icon-print" iconAlign="left"/> --%>
-<%-- </aui:form> --%>
-
 <liferay-ui:panel-container extended="true" id="outerPanelContainer">
 	<div class="row <%= hide8 %> <%= hide10 %>">
-		<div class="col-sm-12 col-md-12">
+		<div class="col-sm-12">
 			<div class="module-group">
 				<liferay-ui:panel extended="false" defaultState="open" collapsible="false" title="dett-principali" >
 					<div class="container-fluid">
@@ -109,29 +79,27 @@
 									<%= LanguageUtil.get(pageContext, "sanatoria-edilizia-326") %>
 								</div>
 							</div>
-							
 							<div class="row">
-								<div class="col-sm-12 col-md-12">
+								<div class="col-sm-12">
 									<div class="fascicolo_header_row"></div>
 								</div>
 							</div>
 						</c:if>
-						
 						<div class="<%= hide9 %>">
 							<c:if test="<%= intPratica.getTipoRichiesta() == Constants.LIEVE_ENTITA %>">
 								<div class="row">
 									<div class="col-sm-12">
-										<%= LanguageUtil.get(pageContext, "intervento-voce-p7") %> <span class=""><%=dettPratica.getInterventoVoceP7()%></span>
+										<%= LanguageUtil.get(pageContext, "intervento-voce-p7") %>
+										<span class=""><%= dettPratica.getInterventoVoceP7() %></span>
 									</div>
 								</div>
 							</c:if>
-							
 							<div class="row <%= hide1 %>">
-								<div class="col-sm-12 col-md-12">
+								<div class="col-sm-12">
 									<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-12 col-md-12">
+								<div class="col-sm-12">
 									<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") %>
 									<br />
@@ -139,7 +107,7 @@
 								</div>
 							</div>
 							<div class="row <%= hide1 %> <%= hide3 %>">
-								<div class="col-sm-12 col-md-12">
+								<div class="col-sm-12">
 									<div class="fascicolo_header_row"></div>
 								</div>
 							</div>
@@ -163,50 +131,50 @@
 								</div>
 							</div>
 							<div class="row <%= hide1 %>">
-								<div class="col-sm-12 col-md-12">
+								<div class="col-sm-12">
 									<div class="fascicolo_header_row"></div>
 								</div>
 							</div>
 							<div class="row">
-								<div class="col-sm-12 col-md-12">
+								<div class="col-sm-12">
 									<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-12 col-md-12">
+								<div class="col-sm-12">
 									<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>
-								<c:if test='<%= !dettPratica.getEstremiPratCom().equalsIgnoreCase("") %>'>
+								<c:if test='<%= !dettPratica.getEstremiPratCom().isEmpty() %>'>
-									<div class="col-sm-12 col-md-12">
+									<div class="col-sm-12">
 										<%= LanguageUtil.get(pageContext, "estremi-prat-com") %>
 										<%= BeanPropertiesUtil.getString(dettPratica, "estremiPratCom") %>
 									</div>
 								</c:if>
-								<div class="col-sm-12 col-md-12 <%= hide1 %> <%= hide3 %>">
+								<div class="col-sm-12 <%= hide1 %> <%= hide3 %>">
 									<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-12 col-md-12 <%= hide1 %> <%= hide3 %>">
+								<div class="col-sm-12 <%= hide1 %> <%= hide3 %>">
 									<strong><span class='<%= BeanPropertiesUtil.getBoolean(dettPratica, "nominaImpresa") ? "fa fa-check-circle-o txt-green" : "fa fa-circle-o" %>'></span></strong>
 									<%= LanguageUtil.get(pageContext, "nomina-impresa") %>
 								</div>
-								<div class="col-sm-12 col-md-12 <%= hide1 %> <%= hide3 %>">
+								<div class="col-sm-12 <%= hide1 %> <%= hide3 %>">
 									<strong><span class='<%= BeanPropertiesUtil.getBoolean(dettPratica, "normLavoriNoDirettore") ? "fa fa-check-circle-o txt-green" : "fa fa-circle-o" %>'></span></strong>
 									<%= LanguageUtil.get(pageContext, "norm-lavori-no-direttore") %>
 								</div>
-								<div class="col-sm-12 col-md-12 <%= hide1 %> <%= hide3 %>">
+								<div class="col-sm-12 <%= hide1 %> <%= hide3 %>">
 									<strong><span class='<%= BeanPropertiesUtil.getBoolean(dettPratica, "nominaDirettoreLavori") ? "fa fa-check-circle-o txt-green" : "fa fa-circle-o" %>'></span></strong>
 									<%= LanguageUtil.get(pageContext, "nomina-direttore-lavori") %>
 								</div>
-								<div class="col-sm-12 col-md-12 <%= hide1 %> <%= hide3 %>">
+								<div class="col-sm-12 <%= hide1 %> <%= hide3 %>">
 									<strong><span class='<%= BeanPropertiesUtil.getBoolean(dettPratica, "noCollaudo") ? "fa fa-check-circle-o txt-green" : "fa fa-circle-o" %>'></span></strong>
 									<%= LanguageUtil.get(pageContext, "no-collaudo") %>
 								</div>
-								<div class="col-sm-12 col-md-12 <%= hide1 %> <%= hide3 %>">
+								<div class="col-sm-12 <%= hide1 %> <%= hide3 %>">
 									<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 <%= hide1 %> <%= hide3 %>">
+								<div class="col-sm-12 <%= hide1 %> <%= hide3 %>">
 									<strong><span class='<%= BeanPropertiesUtil.getBoolean(dettPratica, "nominaCollaudatore") ? "fa fa-check-circle-o txt-green" : "fa fa-circle-o" %>'></span></strong>
 									<%= LanguageUtil.get(pageContext, "nomina-collaudatore") %>
 								</div>
@@ -217,9 +185,8 @@
 			</div>
 		</div>
 	</div>
-
 	<div class="row <%= hide10 %>">
-		<div class="col-sm-12 col-md-12">
+		<div class="col-sm-12">
 			<div class="module-group">
 				<liferay-ui:panel extended="false" defaultState="open" collapsible="false" title="fascicolo_title_descrizione" >
 					<div class="prog-description">
@@ -229,20 +196,18 @@
 			</div>
 		</div>
 	</div>
-
-
 	<div class="row">
-		<div class="col-sm-12 col-md-12">
+		<div class="col-sm-12">
 			<div class="module-group">
 				<liferay-ui:panel extended="false" defaultState="open" collapsible="false" title="fascicolo_title_dettagli" >
 					<div class="container-fluid">
 						<div class="row">
-							<div class="col-sm-12 col-md-12">
+							<div class="col-sm-12">
 								<div class="fascicolo_header_row">Ubicazione</div>
 							</div>
 						</div>
 						<div class="row">
-							<div class="col-xs-12 col-sm-12 col-md-6 col-lg-6">
+							<div class="col-xs-12 col-md-6">
 								<div class="container-fluid">
 									<div class="row">
 										<div class="col-sm-6 col-md-3">
@@ -316,29 +281,25 @@
 											<strong><%= BeanPropertiesUtil.getString(dettPratica, "dcAllegato") %></strong>
 										</div>
 									</div>
-
-
 								</div>
 							</div>
-							<div class="col-xs-12 col-sm-12 col-md-6 col-lg-6 <%= hide1 %>">
+							<div class="col-xs-12 col-md-6 <%= hide1 %>">
 								<div class="container-fluid">
 									<div class="row cont_maps">
 										<%
 										String[] geolocalization = BeanPropertiesUtil.getString(dettPratica, "localizzazioneGeografica","").split(Pattern.quote("|"));
 										%>
-			                           <div class="col-xs-12 col-sm-12 col-md-6 col-lg-6">
+										<div class="col-xs-12 col-md-6">
 											<aui:input name="lat" label="" type="hidden"
 														value='<%= geolocalization.length > 0 ? geolocalization[0] : StringPool.BLANK %>' />
 										</div>
-			                           <div class="col-xs-12  col-sm-12 col-md-6 col-lg-6">
+										<div class="col-xs-12 col-md-6">
 										<aui:input name="long" label="" type="hidden"
 											value='<%= geolocalization.length > 1 ? geolocalization[1] : StringPool.BLANK %>' />
 										</div>
 										<aui:input type="hidden" name="geoIsEditable" value="false" label="" />
-			                           <liferay-ui:tabs names="mappe-bbcc,mappe-openstreetmap" refresh="false" value="mappe-openstreetmap">
-											<liferay-ui:section>
 										<div class="col-xs-12">
-													<!-- Integrazione geoportal -->
+											<%-- Integrazione geoportal --%>
 											<div class="container-fluid">
 												<div class="row">
 													<div class="col-xs-12">
@@ -346,15 +307,8 @@
 													</div>
 												</div>
 											</div>
+											<%-- /Integrazione geoportal --%>
 										</div>
-											</liferay-ui:section>
-											
-											<liferay-ui:section>
-												<div style="border:none;width:100%;height:700px">
-													<liferay-portlet:runtime portletName="<%= PortletKeys.MAPIT %>" queryString='<%= "mapitNamespace=" + renderResponse.getNamespace() %>' />
-												</div>
-											</liferay-ui:section>
-										</liferay-ui:tabs>
 									</div>
 								</div>
 							</div>
@@ -364,9 +318,8 @@
 			</div>
 		</div>
 	</div>
-	
 	<div class="row <%= hide1 %>">
-		<div class="col-sm-12 col-md-12">
+		<div class="col-sm-12">
 			<div class="module-group">
 				<liferay-ui:panel extended="false" defaultState="open" collapsible="false" title="dp" >
 					<div class="container-fluid">
@@ -409,17 +362,15 @@
 			</div>
 		</div>
 	</div>
-	
 	<div class="row <%= hide1 %> <%= hide10 %>">
-		<div class="col-sm-12 col-md-12">
+		<div class="col-sm-12">
 			<div class="module-group">
 				<liferay-ui:panel extended="false" defaultState="open" collapsible="false" title="destinazione" >
 					<div class="container-fluid">
 						<div class="row">
-							<div class="col-sm-12 col-md-12">
+							<div class="col-sm-12">
 								<%
 									String label = BeanPropertiesUtil.getString(dettPratica, "destinazione");
-									
 									String uso = "";
 									String title = "";
 									if(label.length() > 1){
@@ -443,7 +394,7 @@
 		</div>
 	</div>
 	<div class="row <%= hide1 %> <%= hide10 %>">
-		<div class="col-sm-12 col-md-12">
+		<div class="col-sm-12">
 			<div class="module-group">
 				<liferay-ui:panel extended="false" defaultState="open" collapsible="false" title="fascicolo_title_intervento" >
 					<div class="container-fluid">
@@ -481,9 +432,8 @@
 			</div>
 		</div>
 	</div>
-		
 	<div class="row <%= hide1 %> <%= hide10 %>">
-		<div class="col-sm-12 col-md-12">
+		<div class="col-sm-12">
 			<div class="module-group">
 				<liferay-ui:panel extended="false" defaultState="open" collapsible="false" title="fascicolo_title_tipologia_costruttiva" >
 					<div class="container-fluid">
@@ -536,7 +486,7 @@
 							</div>
 						</div>
 						<div class="row">
-							<div class="col-sm-12 col-md-12">
+							<div class="col-sm-12">
 								<strong><span class='<%= BeanPropertiesUtil.getBoolean(dettPratica, "tcAltro") ? "fa fa-check-circle-o txt-green" : "fa fa-circle-o" %>'></span></strong>
 								<%= LanguageUtil.get(pageContext, "tc-altro") %></br>
 								<span style="margin-left:20px"><strong><%= BeanPropertiesUtil.getString(dettPratica, "tcAltroDescrizione") %></strong></span>
@@ -549,7 +499,7 @@
 	</div>
 
 	<div class="row">
-		<div class="col-sm-12 col-md-12 anagrafica-soggetti">
+		<div class="col-sm-12 anagrafica-soggetti">
 			<div class="module-group">
 				<liferay-ui:panel extended="false" defaultState="open" collapsible="false" title="fascicolo_title_soggetti" >
 					<% boolean inBO = true; %>
@@ -563,7 +513,7 @@
 	</div>
 
 	<div class="row">
-		<div class="col-sm-12 col-md-12">
+		<div class="col-sm-12">
 			<div class="module-group">
 				<liferay-ui:panel extended="false" defaultState="open" collapsible="false" title="Dati Metrici Descrittivi" >
 					<div class="container-fluid">
@@ -599,7 +549,6 @@
 									<strong><%= LanguageUtil.get(pageContext,
 															"de-interrati-" + deInterrati) %></strong>
 								</c:if>
-								
 							</div>
 							<div class="col-sm-6 col-md-4">
 								<%= LanguageUtil.get(pageContext, "de-superficie") %>:
@@ -661,7 +610,10 @@
 								<%= LanguageUtil.get(pageContext, "de-posizione-edificio") %>:
 							</div>
 							<div class="col-sm-6 col-md-2">
-								<% String dePosizioneEdificio = BeanPropertiesUtil.getString(dettPratica, "dePosizioneEdificio"); %>
+								<%
+								String dePosizioneEdificio = BeanPropertiesUtil.getString(dettPratica,
+										"dePosizioneEdificio");
+								%>
 								<c:if test="<%= Validator.isNotNull(dePosizioneEdificio) %>">
 									<strong><%= LanguageUtil.get(pageContext,
 											"de-posizione-edificio-" + dePosizioneEdificio) %></strong>
@@ -693,216 +645,212 @@
 		</div>
 	</div>
 	<div class="row">
-		<div class="col-sm-12 col-md-12">
+		<div class="col-sm-12">
 			<div class="module-group">
 				<liferay-ui:panel extended="false" defaultState="open" collapsible="false" title='<%= LanguageUtil.get(pageContext, "dcc") %>' >
 					<div class="container-fluid">
 						<div class="row">
-							<div class="col-sm-12 col-md-12">
+							<div class="col-sm-12">
 								<div class="fascicolo_header_row"><%= LanguageUtil.get(pageContext, "dcc-strutture-ele") %></div>
 							</div>
 						</div>
 						<div class="row">
-							<div class="col-sm-12 col-md-12" >
+							<div class="col-sm-12" >
 								<%= LanguageUtil.get(pageContext, "dcc-strutture-ele-murature") %>:
 							</div>
 						</div>
 						<div class="row">
-							<div class="col-sm-6 col-md-6" >
+							<div class="col-sm-6" >
 								<strong><span class='<%= BeanPropertiesUtil.getBoolean(dettPratica, "dccStruttureEleMuraturePietrame") ? "fa fa-check-circle-o txt-green" : "fa fa-circle-o" %>'></span></strong>
 								<%= LanguageUtil.get(pageContext, "dcc-strutture-ele-murature-pietrame") %>
 							</div>
-							<div class="col-sm-6 col-md-6" >
+							<div class="col-sm-6" >
 								<strong><span class='<%= BeanPropertiesUtil.getBoolean(dettPratica, "dccStruttureEleMuratureLaterizio") ? "fa fa-check-circle-o txt-green" : "fa fa-circle-o" %>'></span></strong>
 								<%= LanguageUtil.get(pageContext, "dcc-strutture-ele-murature-laterizio") %>
 							</div>
 						</div>
 						<div class="row">
-							<div class="col-sm-6 col-md-6" >
+							<div class="col-sm-6" >
 								<strong><span class='<%= BeanPropertiesUtil.getBoolean(dettPratica, "dccStruttureEleMuratureMisto") ? "fa fa-check-circle-o txt-green" : "fa fa-circle-o" %>'></span></strong>
 								<%= LanguageUtil.get(pageContext, "dcc-strutture-ele-murature-misto") %>
 							</div>
-							<div class="col-sm-6 col-md-6" >
+							<div class="col-sm-6" >
 								<strong><span class='<%= BeanPropertiesUtil.getBoolean(dettPratica, "dccStruttureEleMuratureStoriche") ? "fa fa-check-circle-o txt-green" : "fa fa-circle-o" %>'></span></strong>
 								<%= LanguageUtil.get(pageContext, "dcc-strutture-ele-murature-storiche") %>
 							</div>
 						</div>
 						<div class="separator"></div>
 						<div class="row">
-							<div class="col-sm-12 col-md-12">
+							<div class="col-sm-12">
 								<%= LanguageUtil.get(pageContext, "dcc-strutture-ele-misto") %>:
 							</div>
 						</div>
 						<div class="row">
-							<div class="col-sm-6 col-md-6" >
+							<div class="col-sm-6" >
 								<strong><span class='<%= BeanPropertiesUtil.getBoolean(dettPratica, "dccStruttureEleMistoCA") ? "fa fa-check-circle-o txt-green" : "fa fa-circle-o" %>'></span></strong>
 								<%= LanguageUtil.get(pageContext, "dcc-strutture-ele-misto-c-a") %>
 							</div>
-							<div class="col-sm-6 col-md-6" >
+							<div class="col-sm-6" >
 								<strong><span class='<%= BeanPropertiesUtil.getBoolean(dettPratica, "dccStruttureEleMistoAcciaio") ? "fa fa-check-circle-o txt-green" : "fa fa-circle-o" %>'></span></strong>
 								<%= LanguageUtil.get(pageContext, "dcc-strutture-ele-misto-acciaio") %>
 							</div>
-							<div class="col-sm-6 col-md-6" >
+							<div class="col-sm-6" >
 								<strong><span class='<%= BeanPropertiesUtil.getBoolean(dettPratica, "dccStruttureEleMistoMuratura") ? "fa fa-check-circle-o txt-green" : "fa fa-circle-o" %>'></span></strong>
 								<%= LanguageUtil.get(pageContext, "dcc-strutture-ele-misto-muratura") %>
 							</div>
-							<div class="col-sm-6 col-md-6" >
+							<div class="col-sm-6" >
 								<strong><span class='<%= BeanPropertiesUtil.getBoolean(dettPratica, "dccStruttureEleMistoLegno") ? "fa fa-check-circle-o txt-green" : "fa fa-circle-o" %>'></span></strong>
 								<%= LanguageUtil.get(pageContext, "dcc-strutture-ele-misto-legno") %>
 							</div>
-							<div class="col-sm-6 col-md-6" >
+							<div class="col-sm-6" >
 								<strong><span class='<%= BeanPropertiesUtil.getBoolean(dettPratica, "dccStruttureEleMistoLegno") ? "fa fa-check-circle-o txt-green" : "fa fa-circle-o" %>'></span></strong>
 								<%= LanguageUtil.get(pageContext, "dcc-strutture-ele-misto-prefabbricato") %>
 							</div>
-							<div class="col-sm-6 col-md-6" >
+							<div class="col-sm-6" >
 								<strong><span class='<%= BeanPropertiesUtil.getBoolean(dettPratica, "dccStruttureEleAltro") ? "fa fa-check-circle-o txt-green" : "fa fa-circle-o" %>'></span></strong>
 								<%= LanguageUtil.get(pageContext, "dcc-strutture-ele-misto-altro") %>
 								<span style="margin-left:20px"><strong><%= BeanPropertiesUtil.getString(dettPratica, "dccStruttureEleAltroDescrizione") %></strong></span>
 							</div>
 						</div>
-						
 						<div class="row">
-							<div class="col-sm-12 col-md-12">
+							<div class="col-sm-12">
 								<div class="fascicolo_header_row"><%= LanguageUtil.get(pageContext, "dcc-orizzontamenti") %></div>
 							</div>
 						</div>
 						<div class="row">
-							<div class="col-sm-6 col-md-6" >
+							<div class="col-sm-6" >
 								<strong><span class='<%= BeanPropertiesUtil.getBoolean(dettPratica, "dccOrizzontamentiCAAcciaio") ? "fa fa-check-circle-o txt-green" : "fa fa-circle-o" %>'></span></strong>
 								<%= LanguageUtil.get(pageContext, "dcc-orizzontamenti-c-a-acciaio") %>
 							</div>
-							<div class="col-sm-6 col-md-6" >
+							<div class="col-sm-6" >
 								<strong><span class='<%= BeanPropertiesUtil.getBoolean(dettPratica, "dccOrizzontamentiLegno") ? "fa fa-check-circle-o txt-green" : "fa fa-circle-o" %>'></span></strong>
 								<%= LanguageUtil.get(pageContext, "dcc-orizzontamenti-legno") %>
 							</div>
-							<div class="col-sm-6 col-md-6" >
+							<div class="col-sm-6" >
 								<strong><span class='<%= BeanPropertiesUtil.getBoolean(dettPratica, "dccOrizzontamentiLegnoCA") ? "fa fa-check-circle-o txt-green" : "fa fa-circle-o" %>'></span></strong>
 								<%= LanguageUtil.get(pageContext, "dcc-orizzontamenti-legno-c-a") %>
 							</div>
-							<div class="col-sm-6 col-md-6" >
+							<div class="col-sm-6" >
 								<strong><span class='<%= BeanPropertiesUtil.getBoolean(dettPratica, "dccOrizzontamentiLamieraGrecata") ? "fa fa-check-circle-o txt-green" : "fa fa-circle-o" %>'></span></strong>
 								<%= LanguageUtil.get(pageContext, "dcc-orizzontamenti-lamiera-grecata") %>
 							</div>
-							<div class="col-sm-6 col-md-6" >
+							<div class="col-sm-6" >
 								<strong><span class='<%= BeanPropertiesUtil.getBoolean(dettPratica, "dccOrizzontamentiVolte") ? "fa fa-check-circle-o txt-green" : "fa fa-circle-o" %>'></span></strong>
 								<%= LanguageUtil.get(pageContext, "dcc-orizzontamenti-volte") %>
 							</div>
-							<div class="col-sm-6 col-md-6" >
+							<div class="col-sm-6" >
 								<strong><span class='<%= BeanPropertiesUtil.getBoolean(dettPratica, "dccOrizzontamentiAltro") ? "fa fa-check-circle-o txt-green" : "fa fa-circle-o" %>'></span></strong>
 								<%= LanguageUtil.get(pageContext, "dcc-orizzontamenti-altro") %>
 								<span style="margin-left:20px"><strong><%= BeanPropertiesUtil.getString(dettPratica, "dccOrizzontamentiAltroDescrizione") %></strong></span>
 							</div>
 						</div>
-						
 						<div class="row">
-							<div class="col-sm-12 col-md-12">
+							<div class="col-sm-12">
 								<div class="fascicolo_header_row"><%= LanguageUtil.get(pageContext, "dcc-copertura") %></div>
 							</div>
 						</div>
 						<div class="row">
-							<div class="col-sm-6 col-md-6" >
+							<div class="col-sm-6" >
 								<strong><span class='<%= BeanPropertiesUtil.getBoolean(dettPratica, "dccCoperturaCAAcciaio") ? "fa fa-check-circle-o txt-green" : "fa fa-circle-o" %>'></span></strong>
 								<%= LanguageUtil.get(pageContext, "dcc-copertura-c-a-acciaio") %>
 							</div>
-							<div class="col-sm-6 col-md-6" >
+							<div class="col-sm-6" >
 								<strong><span class='<%= BeanPropertiesUtil.getBoolean(dettPratica, "dccCoperturaLegno") ? "fa fa-check-circle-o txt-green" : "fa fa-circle-o" %>'></span></strong>
 								<%= LanguageUtil.get(pageContext, "dcc-copertura-legno") %>
 							</div>
-							<div class="col-sm-6 col-md-6" >
+							<div class="col-sm-6" >
 								<strong><span class='<%= BeanPropertiesUtil.getBoolean(dettPratica, "dccCoperturaLegnoCA") ? "fa fa-check-circle-o txt-green" : "fa fa-circle-o" %>'></span></strong>
 								<%= LanguageUtil.get(pageContext, "dcc-copertura-legno-c-a") %>
 							</div>
-							<div class="col-sm-6 col-md-6" >
+							<div class="col-sm-6" >
 								<strong><span class='<%= BeanPropertiesUtil.getBoolean(dettPratica, "dccCoperturaLamieraGrecata") ? "fa fa-check-circle-o txt-green" : "fa fa-circle-o" %>'></span></strong>
 								<%= LanguageUtil.get(pageContext, "dcc-copertura-lamiera-grecata") %>
 							</div>
-							<div class="col-sm-6 col-md-6" >
+							<div class="col-sm-6" >
 								<strong><span class='<%= BeanPropertiesUtil.getBoolean(dettPratica, "dccCoperturaPannelli") ? "fa fa-check-circle-o txt-green" : "fa fa-circle-o" %>'></span></strong>
 								<%= LanguageUtil.get(pageContext, "dcc-copertura-pannelli") %>
 							</div>
-							<div class="col-sm-6 col-md-6" >
+							<div class="col-sm-6" >
 								<strong><span class='<%= BeanPropertiesUtil.getBoolean(dettPratica, "dccCoperturaPVCTelonati") ? "fa fa-check-circle-o txt-green" : "fa fa-circle-o" %>'></span></strong>
 								<%= LanguageUtil.get(pageContext, "dcc-copertura-p-v-c-telonati") %>
 							</div>
-							<div class="col-sm-6 col-md-6" >
+							<div class="col-sm-6" >
 								<strong><span class='<%= BeanPropertiesUtil.getBoolean(dettPratica, "dccCoperturaLeggere") ? "fa fa-check-circle-o txt-green" : "fa fa-circle-o" %>'></span></strong>
 								<%= LanguageUtil.get(pageContext, "dcc-copertura-leggere") %>
 							</div>
-							<div class="col-sm-6 col-md-6" >
+							<div class="col-sm-6" >
 								<strong><span class='<%= BeanPropertiesUtil.getBoolean(dettPratica, "dccCoperturaAltro") ? "fa fa-check-circle-o txt-green" : "fa fa-circle-o" %>'></span></strong>
 								<%= LanguageUtil.get(pageContext, "dcc-copertura-altro") %>
 								<span style="margin-left:20px"><strong><%= BeanPropertiesUtil.getString(dettPratica, "dccCoperturaAltroDesrizione") %></strong></span>
 							</div>
 						</div>
-						
 						<div class="row">
-							<div class="col-sm-12 col-md-12">
+							<div class="col-sm-12">
 								<div class="fascicolo_header_row"><%= LanguageUtil.get(pageContext, "dcc-elem-non-strut") %></div>
 							</div>
 						</div>
 						<div class="row">
-							<div class="col-sm-6 col-md-6" >
+							<div class="col-sm-6" >
 								<strong><span class='<%= BeanPropertiesUtil.getBoolean(dettPratica, "dccElemNonStrutLaterizio") ? "fa fa-check-circle-o txt-green" : "fa fa-circle-o" %>'></span></strong>
 								<%= LanguageUtil.get(pageContext, "dcc-elem-non-strut-laterizio") %>
 							</div>
-							<div class="col-sm-6 col-md-6" >
+							<div class="col-sm-6" >
 								<strong><span class='<%= BeanPropertiesUtil.getBoolean(dettPratica, "dccElemNonStrutCartongesso") ? "fa fa-check-circle-o txt-green" : "fa fa-circle-o" %>'></span></strong>
 								<%= LanguageUtil.get(pageContext, "dcc-elem-non-strut-cartongesso") %>
 							</div>
-							<div class="col-sm-6 col-md-6" >
+							<div class="col-sm-6" >
 								<strong><span class='<%= BeanPropertiesUtil.getBoolean(dettPratica, "dccElemNonStrutCalcestruzzo") ? "fa fa-check-circle-o txt-green" : "fa fa-circle-o" %>'></span></strong>
 								<%= LanguageUtil.get(pageContext, "dcc-elem-non-strut-calcestruzzo") %>
 							</div>
-							<div class="col-sm-6 col-md-6" >
+							<div class="col-sm-6" >
 								<strong><span class='<%= BeanPropertiesUtil.getBoolean(dettPratica, "dccElemNonStrutLegno") ? "fa fa-check-circle-o txt-green" : "fa fa-circle-o" %>'></span></strong>
 								<%= LanguageUtil.get(pageContext, "dcc-elem-non-strut-legno") %>
 							</div>
-							<div class="col-sm-12 col-md-12" >
+							<div class="col-sm-12" >
 								<strong><span class='<%= BeanPropertiesUtil.getBoolean(dettPratica, "dccElemNonStrutAltro") ? "fa fa-check-circle-o txt-green" : "fa fa-circle-o" %>'></span></strong>
 								<%= LanguageUtil.get(pageContext, "dcc-elem-non-strut-altro") %>
 								<span style="margin-left:20px"><strong><%= BeanPropertiesUtil.getString(dettPratica, "dccElemNonStrutAltroDescrizione") %></strong></span>
 							</div>
 						</div>
-						
 						<div class="row">
-							<div class="col-sm-12 col-md-12">
+							<div class="col-sm-12">
 								<div class="fascicolo_header_row"><%= LanguageUtil.get(pageContext, "dcc-opere-di-rinforzo") %></div>
 							</div>
 						</div>
 						<div class="row">
-							<div class="col-sm-6 col-md-6" >
+							<div class="col-sm-6" >
 								<strong><span class='<%= BeanPropertiesUtil.getBoolean(dettPratica, "dccOpereDiRinforzoInsCatene") ? "fa fa-check-circle-o txt-green" : "fa fa-circle-o" %>'></span></strong>
 								<%= LanguageUtil.get(pageContext, "dcc-opere-di-rinforzo-ins-catene") %>
 							</div>
-							<div class="col-sm-6 col-md-6" >
+							<div class="col-sm-6" >
 								<strong><span class='<%= BeanPropertiesUtil.getBoolean(dettPratica, "dccOpereDiRinforzoInsCordoli") ? "fa fa-check-circle-o txt-green" : "fa fa-circle-o" %>'></span></strong>
 								<%= LanguageUtil.get(pageContext, "dcc-opere-di-rinforzo-ins-cordoli") %>
 							</div>
-							<div class="col-sm-6 col-md-6" >
+							<div class="col-sm-6" >
 								<strong><span class='<%= BeanPropertiesUtil.getBoolean(dettPratica, "dccOpereDiRinforzoIniArmate") ? "fa fa-check-circle-o txt-green" : "fa fa-circle-o" %>'></span></strong>
 								<%= LanguageUtil.get(pageContext, "dcc-opere-di-rinforzo-ini-armate") %>
 							</div>
-							<div class="col-sm-6 col-md-6" >
+							<div class="col-sm-6" >
 								<strong><span class='<%= BeanPropertiesUtil.getBoolean(dettPratica, "dccOpereDiRinforzoPlaccaggi") ? "fa fa-check-circle-o txt-green" : "fa fa-circle-o" %>'></span></strong>
 								<%= LanguageUtil.get(pageContext, "dcc-opere-di-rinforzo-placcaggi") %>
 							</div>
-							<div class="col-sm-6 col-md-6" >
+							<div class="col-sm-6" >
 								<strong><span class='<%= BeanPropertiesUtil.getBoolean(dettPratica, "dccOpereDiRinforzoIrrSolai") ? "fa fa-check-circle-o txt-green" : "fa fa-circle-o" %>'></span></strong>
 								<%= LanguageUtil.get(pageContext, "dcc-opere-di-rinforzo-irr-solai") %>
 							</div>
-							<div class="col-sm-6 col-md-6" >
+							<div class="col-sm-6" >
 								<strong><span class='<%= BeanPropertiesUtil.getBoolean(dettPratica, "dccOpereDiRinforzoRinforziFRP") ? "fa fa-check-circle-o txt-green" : "fa fa-circle-o" %>'></span></strong>
 								<%= LanguageUtil.get(pageContext, "dcc-opere-di-rinforzo-rinforzi-f-r-p") %>
 							</div>
-							<div class="col-sm-6 col-md-6" >
+							<div class="col-sm-6" >
 								<strong><span class='<%= BeanPropertiesUtil.getBoolean(dettPratica, "dccOpereDiRinforzoTelaiECerchiature") ? "fa fa-check-circle-o txt-green" : "fa fa-circle-o" %>'></span></strong>
 								<%= LanguageUtil.get(pageContext, "dcc-opere-di-rinforzo-telai-e-cerchiature") %>
 							</div>
-							<div class="col-sm-6 col-md-6" >
+							<div class="col-sm-6" >
 								<strong><span class='<%= BeanPropertiesUtil.getBoolean(dettPratica, "dccOpereDiRinforzoInsRompitratta") ? "fa fa-check-circle-o txt-green" : "fa fa-circle-o" %>'></span></strong>
 								<%= LanguageUtil.get(pageContext, "dcc-opere-di-rinforzo-ins-rompitratta") %>
 							</div>
-							<div class="col-sm-12 col-md-12" >
+							<div class="col-sm-12" >
 								<strong><span class='<%= BeanPropertiesUtil.getBoolean(dettPratica, "dccOpereDiRinforzoAltro") ? "fa fa-check-circle-o txt-green" : "fa fa-circle-o" %>'></span></strong>
 								<%= LanguageUtil.get(pageContext, "dcc-opere-di-rinforzo-altro") %>
 								<span style="margin-left:20px"><strong><%= BeanPropertiesUtil.getString(dettPratica, "dccOpereDiRinforzoAltroDescrizione") %></strong></span>
@@ -914,30 +862,30 @@
 		</div>
 	</div>
 	<div class="row">
-		<div class="col-sm-12 col-md-12">
+		<div class="col-sm-12">
 			<div class="module-group">
 				<liferay-ui:panel extended="false" defaultState="open" collapsible="false" title='<%= LanguageUtil.get(pageContext, "di") %>' >
 					<div class="container-fluid">
 						<div class="row">
-							<div class="col-sm-12 col-md-12">
+							<div class="col-sm-12">
 								<div class="fascicolo_header_row"><%= LanguageUtil.get(pageContext, "de-inf") %></div>
 							</div>
 						</div>
 						<div class="row">
-							<div class="col-xs-12 col-sm-4 col-md-3 col-lg-3">
+							<div class="col-xs-12 col-sm-4 col-md-3">
 								<strong><%= LanguageUtil.get(pageContext, "de-inf-stradale") %></strong>
 							</div>
-							<div class="col-xs-12 col-sm-8 col-md-9 col-lg-9">
+							<div class="col-xs-12 col-sm-8 col-md-9">
 								<div class="row">
-									<div class="col-sm-4 col-md-4" >
+									<div class="col-sm-4" >
 										<strong><span class='<%= BeanPropertiesUtil.getBoolean(dettPratica, "deInfStradalePonte") ? "fa fa-check-circle-o txt-green" : "fa fa-circle-o" %>'></span></strong>
 										<%= LanguageUtil.get(pageContext, "de-inf-stradale-ponte") %>
 									</div>
-									<div class="col-sm-4 col-md-4" >
+									<div class="col-sm-4" >
 										<strong><span class='<%= BeanPropertiesUtil.getBoolean(dettPratica, "deInfStradaleStrada") ? "fa fa-check-circle-o txt-green" : "fa fa-circle-o" %>'></span></strong>
 										<%= LanguageUtil.get(pageContext, "de-inf-stradale-strada") %>
 									</div>
-									<div class="col-sm-4 col-md-4" >
+									<div class="col-sm-4" >
 										<strong><span class='<%= BeanPropertiesUtil.getBoolean(dettPratica, "deInfStradaleAltro") ? "fa fa-check-circle-o txt-green" : "fa fa-circle-o" %>'></span></strong>
 										<%= LanguageUtil.get(pageContext, "de-inf-stradale-altro") %>
 									</div>
@@ -945,20 +893,20 @@
 							</div>
 						</div>
 						<div class="row">
-							<div class="col-xs-12 col-sm-4 col-md-3 col-lg-3">
+							<div class="col-xs-12 col-sm-4 col-md-3">
 								<strong><%= LanguageUtil.get(pageContext, "de-inf-idraulica") %></strong>
 							</div>
-							<div class="col-xs-12 col-sm-8 col-md-9 col-lg-9">
+							<div class="col-xs-12 col-sm-8 col-md-9">
 								<div class="row">
-									<div class="col-sm-4 col-md-4" >
+									<div class="col-sm-4" >
 										<strong><span class='<%= BeanPropertiesUtil.getBoolean(dettPratica, "deInfIdraulicaLong") ? "fa fa-check-circle-o txt-green" : "fa fa-circle-o" %>'></span></strong>
 										<%= LanguageUtil.get(pageContext, "de-inf-idraulica-long") %>
 									</div>
-									<div class="col-sm-4 col-md-4" >
+									<div class="col-sm-4" >
 										<strong><span class='<%= BeanPropertiesUtil.getBoolean(dettPratica, "deInfIdraulicaTrasv") ? "fa fa-check-circle-o txt-green" : "fa fa-circle-o" %>'></span></strong>
 											<%= LanguageUtil.get(pageContext, "de-inf-idraulica-trasv") %>
 									</div>
-									<div class="col-sm-4 col-md-4" >
+									<div class="col-sm-4" >
 										<strong><span class='<%= BeanPropertiesUtil.getBoolean(dettPratica, "deInfIdraulicaAltro") ? "fa fa-check-circle-o txt-green" : "fa fa-circle-o" %>'></span></strong>
 											<%= LanguageUtil.get(pageContext, "de-inf-idraulica-altro") %>
 									</div>
@@ -966,20 +914,20 @@
 							</div>
 						</div>
 						<div class="row">
-							<div class="col-xs-12 col-sm-4 col-md-3 col-lg-3">
+							<div class="col-xs-12 col-sm-4 col-md-3">
 								<strong><%= LanguageUtil.get(pageContext, "de-inf-opera-acc") %></strong>
 							</div>
-							<div class="col-xs-12 col-sm-8 col-md-9 col-lg-9">
+							<div class="col-xs-12 col-sm-8 col-md-9">
 								<div class="row">
-									<div class="col-sm-4 col-md-4" >
+									<div class="col-sm-4" >
 										<strong><span class='<%= BeanPropertiesUtil.getBoolean(dettPratica, "deInfOperaAccStradale") ? "fa fa-check-circle-o txt-green" : "fa fa-circle-o" %>'></span></strong>
 										<%= LanguageUtil.get(pageContext, "de-inf-opera-acc-stradale") %>
 									</div>
-									<div class="col-sm-4 col-md-4" >
+									<div class="col-sm-4" >
 										<strong><span class='<%= BeanPropertiesUtil.getBoolean(dettPratica, "deInfOperaAccIdraulica") ? "fa fa-check-circle-o txt-green" : "fa fa-circle-o" %>'></span></strong>
 										<%= LanguageUtil.get(pageContext, "de-inf-opera-acc-idraulica") %>
 									</div>
-									<div class="col-sm-4 col-md-4" >
+									<div class="col-sm-4" >
 										<strong><span class='<%= BeanPropertiesUtil.getBoolean(dettPratica, "deInfOperaAccAltro") ? "fa fa-check-circle-o txt-green" : "fa fa-circle-o" %>'></span></strong>
 										<%= LanguageUtil.get(pageContext, "de-inf-opera-acc-altro") %>
 									</div>
@@ -987,10 +935,10 @@
 							</div>
 						</div>
 						<div class="row">
-							<div class="col-xs-12 col-sm-4 col-md-3 col-lg-3">
+							<div class="col-xs-12 col-sm-4 col-md-3">
 								<strong><%= LanguageUtil.get(pageContext, "de-inf-altra-infrastruttura") %></strong>
 							</div>
-							<div class="col-xs-12 col-sm-8 col-md-9 col-lg-9">
+							<div class="col-xs-12 col-sm-8 col-md-9">
 								<strong><span class='<%= BeanPropertiesUtil.getBoolean(dettPratica, "deInfAltro") ? "fa fa-check-circle-o txt-green" : "fa fa-circle-o" %>'></span></strong>
 								<%= LanguageUtil.get(pageContext, "de-inf-altro") %>
 								<span style="margin-left:20px"><strong><%= BeanPropertiesUtil.getString(dettPratica, "deInfAltroDesc") %></strong></span>
@@ -1002,7 +950,7 @@
 		</div>
 	</div>
 	<div class="row">
-		<div class="col-sm-12 col-md-12">
+		<div class="col-sm-12">
 			<div class="module-group">
 				<liferay-ui:panel extended="false" defaultState="open" collapsible="false" title='<%= LanguageUtil.get(pageContext, "geo") %>' >
 
@@ -1018,12 +966,8 @@
 					OrderByComparator orderByComparator = OrderByComparatorFactoryUtil.create("portos_bo_Delega", orderByCol, "asc".equals(orderByType));
 					DisplayTerms displayTerms = new DisplayTerms(renderRequest);
 				%>
-			
 				<div class="gestione-deleghe" id="<portlet:namespace />gestione-deleghe">
-				
 				<liferay-ui:search-container displayTerms="<%= displayTerms %>" emptyResultsMessage="no-entries-were-found" orderByCol="<%= orderByCol %>" orderByType="<%= orderByType %>">
-							
-					
 					<liferay-ui:search-container-results>
 						<%
 						results = DelegaLocalServiceUtil.findByDettPratica_Tipologia_InEsito(dettPraticaId,new String[]{DelegheUtil.TIPO_GEOLOGO},new String[]{DelegheUtil.STATO_ESEGUITA} ,QueryUtil.ALL_POS, QueryUtil.ALL_POS, orderByComparator);
@@ -1032,31 +976,33 @@
 						pageContext.setAttribute("total", total);
 						%>
 					</liferay-ui:search-container-results>
-					
 					<liferay-ui:search-container-row className="it.tref.liferay.portos.bo.model.Delega" keyProperty="delegaId" modelVar="delega">
-						
 						<liferay-ui:search-container-column-text name="Soggetto" orderable="true" >
 							<%
-								if(SoggettoLocalServiceUtil.countValidByIntPratica_CodiceFiscale(intPraticaId, delega.getCodiceFiscale())>0){
+								if (SoggettoLocalServiceUtil.countValidByIntPratica_CodiceFiscale(intPraticaId,
-								  List<Soggetto> soggetti = SoggettoLocalServiceUtil.findByIntPratica_CodiceFiscale(intPraticaId, delega.getCodiceFiscale());
+										delega.getCodiceFiscale()) > 0) {
+									List<Soggetto> soggetti = SoggettoLocalServiceUtil.findByIntPratica_CodiceFiscale(
+											intPraticaId, delega.getCodiceFiscale());
 									for (Soggetto soggetto : soggetti) {
-								    out.print("<div>"+soggetto.getDescrizioneCompleta()+" "+LanguageUtil.get(pageContext, "gc-soggetto-"+soggetto.getTipologiaSoggetto())+"</div>");
+										out.print("<div>");
+										out.print(soggetto.getDescrizioneCompleta());
+										out.print(" ");
+										out.print(LanguageUtil.get(pageContext, "gc-soggetto-"
+												+ soggetto.getTipologiaSoggetto()));
+										out.print("</div>");
 									}
 								}
-							
 							%>
 						</liferay-ui:search-container-column-text>
 						<liferay-ui:search-container-column-text name="tipologia" orderable="true" >
-							<liferay-ui:message key='<%="label-deleghe-tipologia-"+delega.getTipologia() %>'></liferay-ui:message>
+							<liferay-ui:message key='<%= "label-deleghe-tipologia-" + delega.getTipologia() %>' />
 						</liferay-ui:search-container-column-text>
 						<liferay-ui:search-container-column-date name="attiva-dal" property="createDate" orderable="true" />
 						<liferay-ui:search-container-column-date name="chiusa-il" property="dtEsito" orderable="true" />
 						<liferay-ui:search-container-column-text name="status" orderable="true" >
-							<liferay-ui:message key='<%="label-deleghe-status-"+delega.getEsito() %>'></liferay-ui:message>
+							<liferay-ui:message key='<%= "label-deleghe-status-" + delega.getEsito() %>' />
 						</liferay-ui:search-container-column-text>
-				
 						<liferay-ui:search-container-column-text name="File" cssClass="text-center">
-								
 								<%
 									String downloadUrl=null;
 									long docPraticaId =0l;
@@ -1069,23 +1015,12 @@
 								<c:if test="<%= Validator.isNotNull(downloadUrl) %>">
 									<liferay-ui:icon linkCssClass="btn btn-action" iconCssClass="fa fa-download" message="Download" url="<%= downloadUrl %>" />
 								</c:if>
-								
-								
-												
 						</liferay-ui:search-container-column-text>
-			
 					</liferay-ui:search-container-row>
-					
 					<liferay-ui:search-iterator paginate="false" />
 				</liferay-ui:search-container>
-			
 				</div>
 			</c:if>
-					
-			<!-- ************************************************************************************************************* -->
-			<!-- ************************************************************************************************************* -->
-
-
 					<div class="container-fluid">
 						<div class="row">
 							<div class="col-sm-6 col-md-4">
@@ -1098,11 +1033,10 @@
 								<c:if test="<%= Validator.isNotNull(geoDate) %>">
 									<strong><%= dateFormatDate.format(geoDate) %></strong>
 								</c:if>
-								
 							</div>
 						</div>
 						<div class="row">
-							<div class="col-sm-12 col-md-12">
+							<div class="col-sm-12">
 								<div class="fascicolo_header_row"><%= LanguageUtil.get(pageContext, "geo-scheda-title") %></div>
 							</div>
 						</div>
@@ -1337,17 +1271,17 @@
 		</div>
 	</div>
 	<div class="row">
-		<div class="col-sm-12 col-md-12">
+		<div class="col-sm-12">
 			<div class="module-group allegati-dettagli">
 				<liferay-ui:panel extended="false" defaultState="open" collapsible="false" title="Allegati Geologici" >
 					<div class="row" id="<portlet:namespace />allegati-geologica-table">
 						<div class="col-md-12">
 							<liferay-util:include page="/html/allegatipratica/view_accordion.jsp" servletContext="<%= application %>">
-								<liferay-util:param name="classPk" value="<%= String.valueOf(dettPraticaId) %>"></liferay-util:param>
+								<liferay-util:param name="classPk" value="<%= String.valueOf(dettPraticaId) %>" />
 								<liferay-util:param name="className" value="<%= DettPratica.class.getName() %>" />
-								<liferay-util:param name="tipoAllegati" value="allegati_geologici"></liferay-util:param>
+								<liferay-util:param name="tipoAllegati" value="allegati_geologici" />
-								<liferay-util:param name="comingFrom" value="view_fascicolo_dettagli"></liferay-util:param>
+								<liferay-util:param name="comingFrom" value="view_fascicolo_dettagli" />
-								<liferay-util:param name="full" value="true"></liferay-util:param>
+								<liferay-util:param name="full" value="true" />
 							</liferay-util:include>
 						</div>
 					</div>
@@ -1356,16 +1290,16 @@
 		</div>
 	</div>
 	<div class="row">
-		<div class="col-sm-12 col-md-12">
+		<div class="col-sm-12">
 			<div class="module-group allegati-dettagli">
 				<liferay-ui:panel extended="false" defaultState="open" collapsible="false" title="Allegati Domanda" >
 					<div class="row" id="<portlet:namespace />allegati-table">
 						<div class="col-md-12">
 							<liferay-util:include page="/html/allegatipratica/view_accordion.jsp" servletContext="<%= application %>">
-								<liferay-util:param name="classPk" value="<%= String.valueOf(dettPraticaId) %>"></liferay-util:param>
+								<liferay-util:param name="classPk" value="<%= String.valueOf(dettPraticaId) %>" />
 								<liferay-util:param name="className" value="<%= DettPratica.class.getName() %>" />
-								<liferay-util:param name="comingFrom" value="view_fascicolo_dettagli"></liferay-util:param>
+								<liferay-util:param name="comingFrom" value="view_fascicolo_dettagli" />
-								<liferay-util:param name="full" value="true"></liferay-util:param>
+								<liferay-util:param name="full" value="true" />
 							</liferay-util:include>
 						</div>
 					</div>
@@ -1374,15 +1308,14 @@
 		</div>
 	</div>
 	<div class="row">
-		<div class="col-sm-12 col-md-12">
+		<div class="col-sm-12">
 			<div class="module-group sezione-pagamenti">
 				<liferay-ui:panel extended="false" defaultState="open" collapsible="false" title="fascicolo_title_pagamenti">
 					<liferay-util:include page="/html/pagamenti/view_panel_pagamenti.jsp" servletContext='<%= ServletContextPool.get("portos-bo-portlet") %>'>
-						<liferay-util:param name="dettPraticaId" value="<%= String.valueOf(dettPraticaId) %>"></liferay-util:param>
+						<liferay-util:param name="dettPraticaId" value="<%= String.valueOf(dettPraticaId) %>" />
 					</liferay-util:include>
 				</liferay-ui:panel>
 			</div>
 		</div>
 	</div>
-
 </liferay-ui:panel-container>

liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/html/fascicolofe/view_fascicolo_riepilogo.jsp

@@ -56,7 +56,7 @@ String hide10 = (intPratica.getTipoProcedura().equals(Constants.PROCEDURA_Q10)
 %>
 <div class="container-fluid fascicolo-header">
 	<div class="row">
-		<div class="col-sm-2 col-md-2">
+		<div class="col-sm-2">
 			<span class="bg-success img-thumbnail"
 					style="width: 80px;height: 80px; font-size: 70px; line-height: 70px; vertical-align: middle; text-align: center;">
 				<c:if test="<%= Constants.TIPO_PRATICA_AUTORIZZAZIONE.equals(intPratica.getTipoPratica()) %>">
@@ -73,10 +73,10 @@ String hide10 = (intPratica.getTipoProcedura().equals(Constants.PROCEDURA_Q10)
 						title="fascicolo_title_dettagli">
 					<div class="container-fluid">
 						<div class="row">
-							<div class="col-sm-2 col-md-2">
+							<div class="col-sm-2">
 								Validità
 							</div>
-							<div class="col-sm-4 col-md-4">
+							<div class="col-sm-4">
 								<strong>
 									<%
 									if (intPratica.getValidata()) {
@@ -91,26 +91,26 @@ String hide10 = (intPratica.getTipoProcedura().equals(Constants.PROCEDURA_Q10)
 									%>
 								</strong>
 							</div>
-							<div class="col-sm-2 col-md-2">
+							<div class="col-sm-2">
 								Istruttore:
 							</div>
-							<div class="col-sm-4 col-md-4">
+							<div class="col-sm-4">
 								<strong><%= name %></strong>
 							</div>
 						</div>
 						<div class="row">
-							<div class="col-sm-2 col-md-2">
+							<div class="col-sm-2">
 								Tipologia:
 							</div>
-							<div class="col-sm-4 col-md-4">
+							<div class="col-sm-4">
 								<strong>
 									<%= LanguageUtil.get(pageContext, "tipo-pratica-" + intPratica.getTipoPratica()) %>
 								</strong>
 							</div>
-							<div class="col-sm-2 col-md-2">
+							<div class="col-sm-2">
 								Stato:
 							</div>
-							<div class="col-sm-4 col-md-4">
+							<div class="col-sm-4">
 								<strong>
 									<%= LanguageUtil.get(pageContext, PraticaUtil.getStatoPraticaLabel(
 											intPratica.getStatoPratica(), intPratica.getTipoProcedura())) %>
@@ -128,82 +128,68 @@ String hide10 = (intPratica.getTipoProcedura().equals(Constants.PROCEDURA_Q10)
 				<liferay-ui:panel extended="false" defaultState="open" collapsible="false"
 						title="fascicolo_title_progetti">
 					<div class="col-sm-6 col-md-3">
-						<%
+						<c:choose>
-						if (nVarianti == 0) {
+							<c:when test="<%= nVarianti == 0 %>">
-						%>
+								Varianti<strong><span class="fa fa-circle-o" style="color:orange"></span>
+								non presentate</strong>
+							</c:when>
+							<c:when test="<%= nVarianti == 1 %>">
+								Variante<strong><span class="fa fa-check" style="color:green"></span>
+								presentata 1 volta</strong>
+							</c:when>
+							<c:otherwise>
 								Varianti
-							<strong><span class="fa fa-circle-o" style="color:orange"></span> non presentate</strong>
+								<strong><span class="fa fa-check" style="color:green"></span>
-						<%
+								presentate <%= nVarianti %> volte</strong>
-						} else if (nVarianti == 1) { %>
+							</c:otherwise>
-							Variante
+						</c:choose>
-							<strong><span class="fa fa-check" style="color:green"></span> presentata 1 volta</strong>
-						<%
-						} else {
-						%>
-							Varianti
-							<strong>
-								<span class="fa fa-check" style="color:green"></span> presentate <%= nVarianti %> volte
-							</strong>
-						<% } %>
 					</div>
 					<div class="col-sm-6 col-md-3">
-						Cambio soggetti
+						Cambio soggetti<strong>
-						<%
+							<c:choose>
-						if (nCambioSoggetti == 0) {
+								<c:when test="<%= nCambioSoggetti == 0 %>">
-						%>
+									<span class="fa fa-circle-o" style="color:orange"></span> non presentato
-							<strong><span class="fa fa-circle-o" style="color:orange"></span> non presentato</strong>
+								</c:when>
-						<%
+								<c:when test="<%= nCambioSoggetti == 1 %>">
-						} else if (nCambioSoggetti == 1) {
+									<span class="fa fa-check" style="color:green"></span> presentato 1 volta
-						%>
+								</c:when>
-							<strong><span class="fa fa-check" style="color:green"></span> presentato 1 volta</strong>
+								<c:otherwise>
-						<%
-						} else {
-						%>
-							<strong>
 									<span class="fa fa-check" style="color:green"></span>
 									presentato <%= nCambioSoggetti %> volte
+								</c:otherwise>
+							</c:choose>
 						</strong>
-						<%
-						}
-						%>
 					</div>
 					<div class="col-sm-6 col-md-3">
-						Fine Lavori
+						Fine Lavori<strong>
-						<%
+							<c:choose>
-						if (nFineLavori == 0) {
+								<c:when test="<%= nFineLavori == 0 %>">
-						%>
+									<span class="fa fa-close txt-red"></span> non presentata
-							<strong><span class="fa fa-close txt-red"></span> non presentata</strong>
+								</c:when>
-						<%
+								<c:when test="<%= nFineLavori == 1 %>">
-						} else if (nFineLavori == 1 ) {
+									<span class="fa fa-check txt-green"></span> presentata 1 volta
-						%>
+								</c:when>
-							<strong><span class="fa fa-check txt-green"></span> presentata 1 volta</strong>
+								<c:otherwise>
-						<%
-						} else {
-						%>
-							<strong>
 									<span class="fa fa-check txt-green"></span> presentata <%= nFineLavori %> volte
+								</c:otherwise>
+							</c:choose>
 						</strong>
-						<% } %>
 					</div>
 					<div class="col-sm-6 col-md-3">
-						Collaudo
+						Collaudo<strong>
-						<%
+							<c:choose>
-						if (nCollaudo == 0 ) {
+								<c:when test="<%= nCollaudo == 0 %>">
-						%>
+									<span class="fa fa-close" style="color:red"></span> non presentato
-							<strong><span class="fa fa-close" style="color:red"></span> non presentato</strong>
+								</c:when>
-						<%
+								<c:when test="<%= nCollaudo == 1 %>">
-						} else if (nCollaudo == 1 ) {
+									<span class="fa fa-check" style="color:green"></span> presentato 1 volta
-						%>
+								</c:when>
-							<strong><span class="fa fa-check" style="color:green"></span> presentato 1 volta</strong>
+								<c:otherwise>
-						<%
+									<span class="fa fa-check" style="color:green"></span>
-						} else {
+									presentato <%= nCollaudo %> volte
-						%>
+								</c:otherwise>
-							<strong>
+							</c:choose>
-								<span class="fa fa-check" style="color:green"></span> Presentato <%= nCollaudo %> volte
 						</strong>
-						<%
-						}
-						%>
 					</div>
 				</liferay-ui:panel>
 			</div>
@@ -291,7 +277,7 @@ String hide10 = (intPratica.getTipoProcedura().equals(Constants.PROCEDURA_Q10)
 						%>
 						<c:if test="<%= !committenti.isEmpty() %>">
 							<div class="row">
-								<div class="col-sm-12 col-md-12">
+								<div class="col-sm-12">
 									<div class="fascicolo_header_row">
 										<%= LanguageUtil.get(pageContext, "gc-soggetto-02") %>:
 									</div>
@@ -337,7 +323,7 @@ String hide10 = (intPratica.getTipoProcedura().equals(Constants.PROCEDURA_Q10)
 						%>
 						<c:if test="<%= !progettisti.isEmpty() %>">
 							<div class="row">
-								<div class="col-sm-12 col-md-12">
+								<div class="col-sm-12">
 									<div class="fascicolo_header_row">
 										<%= LanguageUtil.get(pageContext, "gc-soggetto-06") %>:
 									</div>
@@ -369,7 +355,7 @@ String hide10 = (intPratica.getTipoProcedura().equals(Constants.PROCEDURA_Q10)
 								intPraticaId, TipoSoggettoUtil.DIRETTORE_LAVORI);
 						%>
 						<div class="row">
-							<div class="col-sm-12 col-md-12">
+							<div class="col-sm-12">
 								<div class="fascicolo_header_row">
 									<%= LanguageUtil.get(pageContext, "gc-soggetto-03") %>:
 								</div>
@@ -415,59 +401,59 @@ String hide10 = (intPratica.getTipoProcedura().equals(Constants.PROCEDURA_Q10)
 						title="fascicolo_title_ubicazione">
 					<div class="container-fluid">
 						<div class="row <%= hide1 %>">
-							<div class="col-sm-6 col-md-6">
+							<div class="col-sm-6">
 								<%= LanguageUtil.get(pageContext, "livello-di-tutela") %>
 							</div>
-							<div class="col-sm-6 col-md-6">
+							<div class="col-sm-6">
 								<%= BeanPropertiesUtil.getString(dettPratica, "livelloDiTutela") %>
 							</div>
 						</div>
 						<div class="row <%= hide1 %>">
-							<div class="col-sm-6 col-md-6">
+							<div class="col-sm-6">
 								<%= LanguageUtil.get(pageContext, "paesaggio-locale") %>
 							</div>
-							<div class="col-sm-6 col-md-6">
+							<div class="col-sm-6">
 								<%= BeanPropertiesUtil.getString(dettPratica, "paesaggioLocale") %>
 							</div>
 						</div>
 						<div class="row <%= hide1 %>">
-							<div class="col-sm-6 col-md-6">
+							<div class="col-sm-6">
 								<%= LanguageUtil.get(pageContext, "vincoli") %>
 							</div>
-							<div class="col-sm-6 col-md-6">
+							<div class="col-sm-6">
 								<%= BeanPropertiesUtil.getString(dettPratica, "vincoli") %>
 							</div>
 						</div>
 						<hr>
 						<div class="row">
-							<div class="col-sm-6 col-md-6">
+							<div class="col-sm-6">
 								<%= LanguageUtil.get(pageContext, "dp-dc-prov") %>
 							</div>
-							<div class="col-sm-6 col-md-6">
+							<div class="col-sm-6">
 								<strong><%= BeanPropertiesUtil.getString(provincia, "provincia")%></strong>
 							</div>
 						</div>
 						<div class="row">
-							<div class="col-sm-6 col-md-6">
+							<div class="col-sm-6">
 								<%= LanguageUtil.get(pageContext, "dp-dc-comune") %>
 							</div>
-							<div class="col-sm-6 col-md-6">
+							<div class="col-sm-6">
 								<strong><%= BeanPropertiesUtil.getString(comune, "denominazione")%></strong>
 							</div>
 						</div>
 						<div class="row">
-							<div class="col-sm-6 col-md-6">
+							<div class="col-sm-6">
 								<%= LanguageUtil.get(pageContext, "dp-dc-loc") %>
 							</div>
-							<div class="col-sm-6 col-md-6">
+							<div class="col-sm-6">
 								<strong><%= BeanPropertiesUtil.getString(dettPratica, "localita") %></strong>
 							</div>
 						</div>
 						<div class="row">
-							<div class="col-sm-6 col-md-6">
+							<div class="col-sm-6">
 								<%= LanguageUtil.get(pageContext, "dp-dc-via") %>
 							</div>
-							<div class="col-sm-6 col-md-6">
+							<div class="col-sm-6">
 								<strong><%= BeanPropertiesUtil.getString(dettPratica, "via") %></strong>
 							</div>
 						</div>
@@ -487,10 +473,10 @@ String hide10 = (intPratica.getTipoProcedura().equals(Constants.PROCEDURA_Q10)
 							</div>
 						</div>
 						<div class="row">
-							<div class="col-sm-6 col-md-6">
+							<div class="col-sm-6">
 								<%= LanguageUtil.get(pageContext, "estremi-prat-com") %>
 							</div>
-							<div class="col-sm-6 col-md-6">
+							<div class="col-sm-6">
 								<strong><%= BeanPropertiesUtil.getString(dettPratica, "estremiPratCom") %></strong>
 							</div>
 						</div>

liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/html/pareregeologo/actions.jsp

@@ -25,7 +25,7 @@ if (searchContainer != null) {
 <liferay-ui:icon-menu icon="" showWhenSingleIcon="true" showExpanded="true" cssClass="menu_button_activity">
 	<div title='<%= LanguageUtil.get(pageContext,"fascicolo-action-open-pratica") %>' class="tooltip-info">
 		<liferay-ui:icon iconCssClass="fa fa-eye" linkCssClass="btn btn-action" target="_blank" message="" label="true"
-				url="<%= FascicoloURLUtil.getFascicoloViewURL(parere.getCompanyId(), parere.getIntPraticaId()) %>" />
+				url="<%= FascicoloURLUtil.getFascicoloBOViewURL(parere.getCompanyId(), parere.getIntPraticaId()) %>" />
 	</div>
 	<c:if test="<%= tabs1 == 1 %>">
 		<%

liferay-plugins-sdk-6.2/shared/portos-bo-shared/.classpath

@@ -6,5 +6,6 @@
 	<classpathentry kind="lib" path="/home/ture/liferay/portali/paesaggistica/tomcat-7.0.62/lib/ext/portlet.jar"/>
 	<classpathentry kind="lib" path="/home/ture/liferay/portali/paesaggistica/tomcat-7.0.62/lib/servlet-api.jar"/>
 	<classpathentry kind="lib" path="/home/ture/liferay/portali/paesaggistica/tomcat-7.0.62/lib/jsp-api.jar"/>
+	<classpathentry kind="lib" path="/portos-bo-portlet/docroot/WEB-INF/lib/portos-bo-portlet-service.jar"/>
 	<classpathentry kind="output" path="classes"/>
 </classpath>

liferay-plugins-sdk-6.2/shared/portos-bo-shared/src/it/tref/liferay/portos/bo/shared/bean/CronostoriaBean.java

@@ -20,6 +20,7 @@ public class CronostoriaBean implements Serializable {
 
 	public CronostoriaBean(Date dataEvento, String tipoEvento, String testoEvento, String tipoLink,
 			CronostoriaLink... links) {
+
 		super();
 		this.dataEvento = dataEvento;
 		this.tipoEvento = tipoEvento;
@@ -30,6 +31,7 @@ public class CronostoriaBean implements Serializable {
 
 	public CronostoriaBean(Date dataEvento, String tipoEvento, String testoEvento, String tipoLink, String classPK,
 			String className, CronostoriaLink... links) {
+
 		super();
 		this.dataEvento = dataEvento;
 		this.tipoEvento = tipoEvento;
@@ -41,59 +43,72 @@ public class CronostoriaBean implements Serializable {
 	}
 
 	public Date getDataEvento() {
+
 		return dataEvento;
 	}
 
 	public void setDataEvento(Date dataEvento) {
+
 		this.dataEvento = dataEvento;
 	}
 
 	public String getTipoEvento() {
+
 		return tipoEvento;
 	}
 
 	public void setTipoEvento(String tipoEvento) {
+
 		this.tipoEvento = tipoEvento;
 	}
 
 	public String getTestoEvento() {
+
 		return testoEvento;
 	}
 
 	public void setTestoEvento(String testoEvento) {
+
 		this.testoEvento = testoEvento;
 	}
 
 	public List<CronostoriaLink> getLinks() {
+
 		return links;
 	}
 
 	public void setLinks(List<CronostoriaLink> links) {
+
 		this.links = links;
 	}
 
 	public String getTipoLink() {
+
 		return tipoLink;
 	}
 
 	public void setTipoLink(String tipoLink) {
+
 		this.tipoLink = tipoLink;
 	}
 
 	public String getClassPK() {
+
 		return classPK;
 	}
 
 	public void setClassPK(String classPK) {
+
 		this.classPK = classPK;
 	}
 
 	public String getClassName() {
+
 		return className;
 	}
 
 	public void setClassName(String className) {
+
 		this.className = className;
 	}
-
 }

liferay-plugins-sdk-6.2/shared/portos-bo-shared/src/it/tref/liferay/portos/bo/shared/bean/IstruttoreBean.java

@@ -1,6 +1,7 @@
 package it.tref.liferay.portos.bo.shared.bean;
 
 public class IstruttoreBean implements Comparable<IstruttoreBean> {
+
 	private long idIstruttore;
 	private String denominazione;
 

liferay-plugins-sdk-6.2/shared/portos-bo-shared/src/it/tref/liferay/portos/bo/shared/protocollo/model/Fascicolo.java

@@ -3,30 +3,33 @@ package it.tref.liferay.portos.bo.shared.protocollo.model;
 public class Fascicolo {
 
 	private int anno;
-
 	private int numero;
 
-	public Fascicolo() {
+	public Fascicolo() {}
-	}
 
 	public Fascicolo(int anno, int numero) {
+
 		this.anno = anno;
 		this.numero = numero;
 	}
 
 	public int getAnno() {
+
 		return anno;
 	}
 
 	public void setAnno(int anno) {
+
 		this.anno = anno;
 	}
 
 	public int getNumero() {
+
 		return numero;
 	}
 
 	public void setNumero(int numero) {
+
 		this.numero = numero;
 	}
 

liferay-plugins-sdk-6.2/shared/portos-bo-shared/src/it/tref/liferay/portos/bo/shared/protocollo/model/Protocollo.java

@@ -4,7 +4,9 @@ import java.util.Date;
 import java.util.List;
 
 public class Protocollo {
+
 	public enum TipoProtocollo {
+
 		INGRESSO, USCITA
 	}
 

liferay-plugins-sdk-6.2/shared/portos-bo-shared/src/it/tref/liferay/portos/bo/shared/util/FascicoloURLUtil.java

@@ -10,12 +10,6 @@ import com.liferay.portal.service.CompanyLocalServiceUtil;
 
 public class FascicoloURLUtil {
 
-	@Deprecated
-	public static String getFascicoloViewURL(long companyId, long intPraticaId) throws PortalException, SystemException {
-
-		return getFascicoloBOViewURL(companyId, intPraticaId);
-	}
-
 	public static String getFascicoloFEViewURL(long companyId, long intPraticaId, String mvcPath, String queryString)
 			throws PortalException, SystemException {