Mappe BBCC

liferay-plugins-sdk-6.2/portlets/portos-audit-portlet/.tern-project

@@ -0,0 +1 @@
+{"ide":{"scriptPaths":[]},"plugins":{"aui":{},"liferay":{},"yui":{}},"libs":["ecma5","browser"]}

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

@@ -1,6 +1,7 @@
 package it.mwg.sismica.bo.util;
 
 import it.tref.liferay.portos.bo.model.Comune;
+import it.tref.liferay.portos.bo.model.DettPratica;
 import it.tref.liferay.portos.bo.service.ConfigurazioneLocalServiceUtil;
 import it.tref.liferay.portos.bo.shared.util.ConfigurazioneConstants;
 
@@ -8,6 +9,8 @@ import java.io.UnsupportedEncodingException;
 import java.net.URLEncoder;
 import java.util.Date;
 
+import javax.servlet.http.HttpServletRequest;
+
 import org.apache.commons.codec.digest.DigestUtils;
 import org.apache.commons.lang.StringUtils;
 
@@ -20,18 +23,31 @@ import com.liferay.portal.kernel.util.StringPool;
 public class MappeUtil {
 	private final static Log _log = LogFactoryUtil.getLog(MappeUtil.class);
 
-	public static String getUrlComune(String serverName, Comune comune) throws UnsupportedEncodingException,
+	public static String getUrlFe(HttpServletRequest request, DettPratica dettPratica, Comune comune)
-			PortalException, SystemException {
+			throws UnsupportedEncodingException, PortalException, SystemException {
+		String baseUrl = ConfigurazioneLocalServiceUtil.findByC_ChiaveString(comune.getCompanyId(),
+				ConfigurazioneConstants.MAPPE_URL_IFRAME_FE);
+		return getUrlComune(request, baseUrl, dettPratica, comune);
+	}
+
+	public static String getUrlBo(HttpServletRequest request, DettPratica dettPratica, Comune comune)
+			throws UnsupportedEncodingException, PortalException, SystemException {
+		String baseUrl = ConfigurazioneLocalServiceUtil.findByC_ChiaveString(comune.getCompanyId(),
+				ConfigurazioneConstants.MAPPE_URL_IFRAME_BO);
+		return getUrlComune(request, baseUrl, dettPratica, comune);
+	}
+
+	private static String getUrlComune(HttpServletRequest request, String baseUrl, DettPratica dettPratica,
+			Comune comune) throws UnsupportedEncodingException, PortalException, SystemException {
 		long companyId = comune.getCompanyId();
 
 		String sharedSecret = ConfigurazioneLocalServiceUtil.findByC_ChiaveString(companyId,
 				ConfigurazioneConstants.MAPPE_SHARED_SECRET);
 		long date = new Date().getTime() / 1000;
-		String auth = DigestUtils.sha256Hex(date + sharedSecret + serverName);
+		String auth = DigestUtils.sha256Hex(date + sharedSecret + request.getServerName());
 
-		String url = ConfigurazioneLocalServiceUtil.findByC_ChiaveString(companyId,
+		String url = baseUrl.replace("{{COD_BELFIORE}}", urlEncode(comune.getCodiceBelfiore())).replace(
-				ConfigurazioneConstants.MAPPE_URL_IFRAME_FE).replace("{{COD_BELFIORE}}",
+				"{{ESTREMI_CAT}}", urlEncode(dettPratica.getEstremiCatastali()));
-				urlEncode(comune.getCodiceBelfiore()));
 
 		String query = StringPool.BLANK;
 		String[] parti = StringUtils.split(url, StringPool.QUESTION);

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

@@ -43,8 +43,8 @@ soggetto_title_recapiti = Recapiti
 n-progetto = Numero progetto
 titolare-digitale = Titolare
 tecnico-istruttore = Istruttore
-distanza = Distanza <sup>[ 1 ]</sup>
+distanza = Distanza&nbsp;<sup>[A]</sup>
-distanza-tooltip = 1: Distanza ortodromica espressa in metri
+distanza-tooltip = A: Distanza ortodromica espressa in metri
 
 #Portlet amministazione: il campo deve corrispondere al nome delle relative cartelle in html/tabs
 stato_tabelle = Stato delle Tabelle
@@ -353,3 +353,7 @@ NonApprovato = Non approvato
 
 label-integrazione-05 = Richiesta Integrazione
 label-integrazione-13 = Variante
+
+ricerca-posizione = Ricerca per posizione
+ricerca-indirizzo = Ricerca per indirizzo
+ricerca-progetto = Ricerca per progetto

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

@@ -1280,4 +1280,6 @@ tipo_procedura_P9 = 8) Accertamento di compatibilità paesaggistica per Sanatori
 tipo_procedura_P10 = 9) Certificazione di sussistenza vincoli
 
 sanatoria-edilizia = Sanatoria edilizia
-ricerca-posizione = Ricerca per posizione
+
+mappe-bbcc = Mappe BBCC
+mappe-openstreetmap = OpenStreetmap

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

@@ -1,8 +1,12 @@
 package it.mwg.sismica.bo.portlet;
 
 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.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;
 
@@ -16,6 +20,8 @@ import javax.portlet.PortletException;
 import javax.portlet.ResourceRequest;
 import javax.portlet.ResourceResponse;
 
+import org.apache.commons.lang.StringUtils;
+
 import com.liferay.portal.kernel.exception.PortalException;
 import com.liferay.portal.kernel.exception.SystemException;
 import com.liferay.portal.kernel.json.JSONArray;
@@ -36,6 +42,8 @@ public class RicercaPosizionePortlet extends MVCPortlet {
 	@SuppressWarnings("serial")
 	private static final List<String> campi = new ArrayList<String>() {
 		{
+			add("tabs1");
+			add("numeroProgetto");
 			add("provincia");
 			add("comune");
 			add("via");
@@ -53,6 +61,31 @@ public class RicercaPosizionePortlet extends MVCPortlet {
 		}
 	}
 
+	public void localizzaProgetto(ActionRequest actionRequest, ActionResponse actionResponse)
+			throws IOException, SystemException {
+		String numeroProgetto = ParamUtil.getString(actionRequest, "numeroProgetto");
+		JSONObject object = JSONFactoryUtil.createJSONObject();
+		if (Validator.isNotNull(numeroProgetto)) {
+			IntPratica pratica = IntPraticaLocalServiceUtil.findByNumeroProgetto(numeroProgetto);
+			if (Validator.isNotNull(pratica)) {
+				DettPratica dett = DettPraticaLocalServiceUtil.getLastCompletedByIntPratica(pratica
+						.getIntPraticaId());
+				if (Validator.isNotNull(dett)) {
+					String localizzazione = dett.getLocalizzazioneGeografica();
+					if (Validator.isNotNull(localizzazione)) {
+						String[] parti = StringUtils.split(localizzazione, '|');
+						if (parti.length > 1) {
+							object.put("lat", Double.valueOf(parti[0]));
+							object.put("lng", Double.valueOf(parti[1]));
+						}
+					}
+
+				}
+			}
+		}
+		writeJSON(actionRequest, actionResponse, object);
+	}
+
 	@Override
 	public void serveResource(ResourceRequest resourceRequest, ResourceResponse resourceResponse)
 			throws IOException, PortletException {

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

@@ -58,6 +58,7 @@ public class CollaudoImpl extends CollaudoBaseImpl {
 	public CollaudoImpl() {
 	}
 
+	@Override
 	public String getTitle(Locale locale) {
 
 		StringBuilder sb = new StringBuilder();
@@ -107,11 +108,13 @@ public class CollaudoImpl extends CollaudoBaseImpl {
 
 	}
 
+	@Override
 	public String getTitle() {
 
 		return getTitle(LocaleUtil.getSiteDefault());
 	}
 
+	@Override
 	public String getFullDescription() {
 
 		return getTitle();

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

@@ -15,7 +15,6 @@
 package it.tref.liferay.portos.bo.model.impl;
 
 import java.io.Serializable;
-import java.util.HashMap;
 import java.util.Map;
 
 import com.liferay.portal.kernel.json.JSONDeserializer;
@@ -46,8 +45,9 @@ public class DelegaImpl extends DelegaBaseImpl {
 	public DelegaImpl() {
 	}
 
+	@Override
 	public Map<String, Serializable> getDichiarazioniMap() {
-		JSONDeserializer<Map<String, Serializable>> deserializer= JSONFactoryUtil.createJSONDeserializer();
+		JSONDeserializer<Map<String, Serializable>> deserializer = JSONFactoryUtil.createJSONDeserializer();
 		String dichiarazioni = getDichiarazioni();
 		if (Validator.isNull(dichiarazioni)) {
 			dichiarazioni = "{}";

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

@@ -54,6 +54,7 @@ public class FineLavoriImpl extends FineLavoriBaseImpl {
 	public FineLavoriImpl() {
 	}
 
+	@Override
 	public String getTitle(Locale locale) {
 
 		StringBuilder sb = new StringBuilder();
@@ -103,11 +104,13 @@ public class FineLavoriImpl extends FineLavoriBaseImpl {
 
 	}
 
+	@Override
 	public String getTitle() {
 
 		return getTitle(LocaleUtil.getSiteDefault());
 	}
 
+	@Override
 	public String getFullDescription() {
 
 		return getTitle();

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

@@ -25,45 +25,49 @@ import com.liferay.portlet.documentlibrary.service.DLAppLocalServiceUtil;
 import com.liferay.portlet.documentlibrary.util.DLUtil;
 
 /**
- * The extended model implementation for the Pagamento service. Represents a row in the
+ * The extended model implementation for the Pagamento service. Represents a row
- * "portos_bo_Pagamento" database table, with each column mapped to a property of this
+ * in the "portos_bo_Pagamento" database table, with each column
- * class.
+ * mapped to a property of this class.
  *
  * <p>
- * Helper methods and all application logic should be put in this class. Whenever methods are added,
+ * Helper methods and all application logic should be put in this class.
- * rerun ServiceBuilder to copy their definitions into the
+ * Whenever methods are added, rerun ServiceBuilder to copy their definitions
- * {@link it.tref.liferay.portos.bo.model.Pagamento} interface.
+ * into the {@link it.tref.liferay.portos.bo.model.Pagamento} interface.
  * </p>
  *
  * @author Davide Barbagallo, 3F Consulting
  */
 public class PagamentoImpl extends PagamentoBaseImpl {
-  /*
+	/*
-   * NOTE FOR DEVELOPERS:
+	 * NOTE FOR DEVELOPERS:
-   * 
+	 *
-   * Never reference this class directly. All methods that expect a pagamento model instance should
+	 * Never reference this class directly. All methods that expect a pagamento
-   * use the {@link it.tref.liferay.portos.bo.model.Pagamento} interface instead.
+	 * model instance should use the {@link
-   */
+	 * it.tref.liferay.portos.bo.model.Pagamento} interface instead.
-  public PagamentoImpl() {}
+	 */
+	public PagamentoImpl() {
+	}
 
-  public String getDownloadUrl(ThemeDisplay themeDisplay) throws PortalException, SystemException {
+	@Override
-    if (Validator.isNull(getFileEntryId())) {
+	public String getDownloadUrl(ThemeDisplay themeDisplay) throws PortalException, SystemException {
-      return null;
+		if (Validator.isNull(getFileEntryId())) {
-    }
+			return null;
+		}
 
-    FileEntry fileEntry = DLAppLocalServiceUtil.getFileEntry(getFileEntryId());
+		FileEntry fileEntry = DLAppLocalServiceUtil.getFileEntry(getFileEntryId());
-    return DLUtil.getPreviewURL(fileEntry, fileEntry.getFileVersion(), themeDisplay, "&download=true");
+		return DLUtil.getPreviewURL(fileEntry, fileEntry.getFileVersion(), themeDisplay, "&download=true");
 
-  }
+	}
 
-  public String getImportoString() {
+	@Override
-    String importo = getImporto();
+	public String getImportoString() {
-    BigDecimal importoVal;
+		String importo = getImporto();
-    if (Validator.isNotNull(importo)) {
+		BigDecimal importoVal;
-      importoVal = new BigDecimal(importo);
+		if (Validator.isNotNull(importo)) {
-    } else {
+			importoVal = new BigDecimal(importo);
-      importoVal = new BigDecimal(0.00);
+		} else {
-    }
+			importoVal = new BigDecimal(0.00);
-    return NumberFormat.getCurrencyInstance(Locale.ITALY).format(importoVal);
+		}
-  }
+		return NumberFormat.getCurrencyInstance(Locale.ITALY).format(importoVal);
+	}
 }

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

@@ -15,32 +15,34 @@ package it.tref.liferay.portos.bo.model.impl;
 import com.liferay.portal.kernel.util.Validator;
 
 /**
- * The extended model implementation for the Sorteggio service. Represents a row in the
+ * The extended model implementation for the Sorteggio service. Represents a row
- * "portos_bo_Sorteggio" database table, with each column mapped to a property of this
+ * in the "portos_bo_Sorteggio" database table, with each column
- * class.
+ * mapped to a property of this class.
  *
  * <p>
- * Helper methods and all application logic should be put in this class. Whenever methods are added,
+ * Helper methods and all application logic should be put in this class.
- * rerun ServiceBuilder to copy their definitions into the
+ * Whenever methods are added, rerun ServiceBuilder to copy their definitions
- * {@link it.tref.liferay.portos.bo.model.Sorteggio} interface.
+ * into the {@link it.tref.liferay.portos.bo.model.Sorteggio} interface.
  * </p>
  *
  * @author Davide Barbagallo, 3F Consulting
  */
 public class SorteggioImpl extends SorteggioBaseImpl {
-  /*
+	/*
-   * NOTE FOR DEVELOPERS:
+	 * NOTE FOR DEVELOPERS:
-   * 
+	 *
-   * Never reference this class directly. All methods that expect a sorteggio model instance should
+	 * Never reference this class directly. All methods that expect a sorteggio
-   * use the {@link it.tref.liferay.portos.bo.model.Sorteggio} interface instead.
+	 * model instance should use the {@link
-   */
+	 * it.tref.liferay.portos.bo.model.Sorteggio} interface instead.
-  public SorteggioImpl() {}
+	 */
+	public SorteggioImpl() {
+	}
 
-
+	@Override
-  public boolean mesePrecedenteToBoolean() {
+	public boolean mesePrecedenteToBoolean() {
-    if (Validator.isNull(getMesePrecedente())) {
+		if (Validator.isNull(getMesePrecedente())) {
-      return false;
+			return false;
-    }
+		}
-    return Boolean.parseBoolean(getMesePrecedente());
+		return Boolean.parseBoolean(getMesePrecedente());
-  }
+	}
 }

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

@@ -13,23 +13,24 @@ import com.liferay.portal.model.BaseModelListener;
 
 public class SoggettoModelListener extends BaseModelListener<Soggetto> {
 
-  private static final Log _log = LogFactoryUtil.getLog(SoggettoModelListener.class);
+	private static final Log _log = LogFactoryUtil.getLog(SoggettoModelListener.class);
 
-  @Override
+	@Override
-  public void onAfterUpdate(Soggetto model) throws ModelListenerException {
+	public void onAfterUpdate(Soggetto model) throws ModelListenerException {
 
-    try {
+		try {
 
-      Indexer indexer = IndexerRegistryUtil.getIndexer(IntPratica.class);
+			Indexer indexer = IndexerRegistryUtil.getIndexer(IntPratica.class);
-      indexer.reindex(IntPratica.class.getName(), model.getIntPraticaId());
+			indexer.reindex(IntPratica.class.getName(), model.getIntPraticaId());
 
-      if (_log.isDebugEnabled()) {
+			if (_log.isDebugEnabled()) {
-        _log.debug("DettPraticaModelListener - Chiamato Reindex IntPraticaId : " + model.getIntPraticaId());
+				_log.debug("DettPraticaModelListener - Chiamato Reindex IntPraticaId : "
-      }
+						+ model.getIntPraticaId());
-    } catch (SearchException e) {
+			}
-      _log.error(e, e);
+		} catch (SearchException e) {
-    }
+			_log.error(e, e);
+		}
 
-    super.onAfterUpdate(model);
+		super.onAfterUpdate(model);
-  }
+	}
 }

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

@@ -20,7 +20,6 @@ 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;
-import com.liferay.portal.model.Company;
 import com.liferay.portal.service.ServiceContext;
 import com.liferay.portal.service.ServiceContextFactory;
 import com.liferay.portal.theme.ThemeDisplay;
@@ -36,7 +35,7 @@ public class PaesaggisticaAdministrationPortlet extends MVCPortlet {
 		String sharedSecret = ParamUtil.getString(actionRequest, "sharedSecret");
 
 		ThemeDisplay themeDisplay = (ThemeDisplay) actionRequest.getAttribute(WebKeys.THEME_DISPLAY);
-		Company company = themeDisplay.getCompany();
+		// Company company = themeDisplay.getCompany();
 		ServiceContext serviceContext = ServiceContextFactory.getInstance(actionRequest);
 		ConfigurazioneLocalServiceUtil.storeConfig(ConfigurazioneConstants.MAPPE_URL_IFRAME_FE, urlIframeFE,
 				serviceContext);
@@ -48,8 +47,8 @@ public class PaesaggisticaAdministrationPortlet extends MVCPortlet {
 
 	public void mostraConfigurazione(ActionRequest actionRequest, ActionResponse actionResponse)
 			throws SystemException {
-		List<String> esito = new ArrayList<String>();
 
+		List<String> esito = new ArrayList<String>();
 		esito.add("<h3>Env:</h3>");
 		for (Map.Entry<String, String> entry : System.getenv().entrySet()) {
 			esito.add(entry.getKey() + "=" + entry.getValue());

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

@@ -843,25 +843,21 @@ public class IntPraticaLocalServiceImpl extends IntPraticaLocalServiceBaseImpl {
 		return dynamicQuery;
 	}
 
-	@Override
 	public int countByPosizione(double lat, double lng, int raggio) throws SystemException {
 		List<IntPratica> lista = findByPosizione(lat, lng, raggio);
 		return lista.size();
 	}
 
-	@Override
 	public List<IntPratica> findByPosizione(double lat, double lng, int raggio) throws SystemException {
 		return findByPosizione(lat, lng, raggio, QueryUtil.ALL_POS, QueryUtil.ALL_POS);
 	}
 
-	@Override
 	public List<IntPratica> findByPosizione(double lat, double lng, int raggio, int start, int end)
 			throws SystemException {
 		DynamicQuery query = queryPosizione();
 		List<IntPratica> trovate = new ArrayList<>();
 		for (IntPratica pratica : (List<IntPratica>) intPraticaPersistence.findWithDynamicQuery(query)) {
-			int distanza = pratica.calcolaDistanzaOrtodromica(lat, lng);
+			if (pratica.calcolaDistanzaOrtodromica(lat, lng) <= raggio) {
-			if (distanza <= raggio) {
 				trovate.add(pratica);
 			}
 		}

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

@@ -13,8 +13,8 @@
 ##
 
     build.namespace=portos_bo
-    build.number=2888
+    build.number=2899
-    build.date=1613383377126
+    build.date=1614848453383
     build.auto.upgrade=true
 
 ##

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

@@ -1,56 +1,54 @@
 <%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%>
-<%@page import="it.tref.liferay.portos.bo.util.Constants"%>
+<%@page import="com.liferay.portal.kernel.bean.BeanPropertiesUtil"%>
+<%@page import="it.mwg.sismica.bo.util.MappeUtil"%>
+<%@page import="it.tref.liferay.portos.bo.shared.util.PortletKeys"%>
 <%@page import="it.tref.liferay.portos.bo.shared.util.TipoIntegrazioneUtil"%>
 <%@page import="it.tref.liferay.portos.bo.util.AzioniPraticheUtil"%>
-<%@page import="java.util.regex.Pattern"%>
+<%@page import="it.tref.liferay.portos.bo.util.Constants"%>
 <%@page import="java.util.ArrayList"%>
-<%@page import="com.liferay.portal.kernel.util.KeyValuePair"%>
+<%@page import="java.util.regex.Pattern"%>
-<%@page import="com.liferay.portal.kernel.bean.BeanPropertiesUtil"%>
+<%@include file="/html/fascicolo/init.jsp"%>
-<%@ include file="/html/fascicolo/init.jsp" %>
 <%
-	long dettPraticaId = ParamUtil.getLong(request, "dettPraticaId", 0l);
+long dettPraticaId = ParamUtil.getLong(request, "dettPraticaId", 0L);
-	DettPratica dettPratica;
+DettPratica dettPratica;
-	if(Validator.isNotNull(dettPraticaId)) {
+if (Validator.isNotNull(dettPraticaId)) {
-		dettPratica = DettPraticaLocalServiceUtil.getDettPratica(dettPraticaId);
+	dettPratica = DettPraticaLocalServiceUtil.getDettPratica(dettPraticaId);
-	} else {
+} else {
-		dettPratica = (DettPratica)request.getAttribute("bean.dettPratica.lastData");
+	dettPratica = (DettPratica) request.getAttribute("bean.dettPratica.lastData");
-	}
+}
-	IntPratica intPratica = (IntPratica)request.getAttribute("bean.intPratica");
+IntPratica intPratica = (IntPratica) request.getAttribute("bean.intPratica");
-	if(intPratica == null){
+if (Validator.isNull(intPratica)) {
-	  intPratica = IntPraticaServiceUtil.getIntPratica(dettPratica.getIntPraticaId());
+	intPratica = IntPraticaServiceUtil.getIntPratica(dettPratica.getIntPraticaId());
-	}
+}
-	Territorio territorio = TerritorioLocalServiceUtil.getTerritorio(intPratica.getTerritorioId());
+Territorio territorio = TerritorioLocalServiceUtil.getTerritorio(intPratica.getTerritorioId());
-	Comune comune = ComuneLocalServiceUtil.getComune(territorio.getComuneId());
+Comune comune = ComuneLocalServiceUtil.getComune(territorio.getComuneId());
-	Provincia provincia = ProvinciaLocalServiceUtil.fetchByC_C(territorio.getCompanyId(), territorio.getCodiceProvincia());
+Provincia provincia = ProvinciaLocalServiceUtil.fetchByC_C(territorio.getCompanyId(), territorio.getCodiceProvincia());
-	boolean isDisabledMap =  ParamUtil.getBoolean(request, "isDisabledMap", false);
+boolean isDisabledMap = ParamUtil.getBoolean(request, "isDisabledMap", false);
+String urlIframeMappe = MappeUtil.getUrlBo(request, dettPratica, comune);
 %>
 <c:if test="<%= Validator.isNull(dettPraticaId) %>"> 
-	<liferay-util:include page="/html/fascicolo/navigator/header.jsp" servletContext="<%=application %>"/>
+	<liferay-util:include page="/html/fascicolo/navigator/header.jsp" servletContext="<%= application %>"/>
 </c:if>
-
 <div class="container-fluid">
-
 	<div class="row">
-		<div class="col-sm-12 col-md-12">
+		<div class="col-sm-12">
 			<div class="module-group">
-			
 				<c:if test="<%= AzioniPraticheUtil.isAutorizzazione(intPratica.getIntPraticaId()) && TipoIntegrazioneUtil.VARIANTE.equalsIgnoreCase(dettPratica.getTipoIntegrazione()) %>">
-		        	<div class="module-group">
+					<div class="module-group">
-		                <liferay-ui:panel extended="false" defaultState="open" collapsible="false" title="dp-variante">
+						<liferay-ui:panel extended="false" defaultState="open" collapsible="false" title="dp-variante">
-		                    <div class="container-fluid">
+							<div class="container-fluid">
-		                        <div class="row">
+								<div class="row">
-		                        	<div class="col-sm-6 col-md-3">
+									<div class="col-sm-6 col-md-3">
-										<%= "Variante "+LanguageUtil.get(pageContext, "dp-variante-sostanziale") %>
+										Variante <%= LanguageUtil.get(pageContext, "dp-variante-sostanziale") %>
 									</div>
 									<div class="col-sm-6 col-md-3">
 										<%= BeanPropertiesUtil.getBoolean(dettPratica, "varianteSostanziale") == true ? "SI" : "NO" %>
 									</div>
-		                       	</div>
+								</div>
-		                    </div>
+							</div>
 						</liferay-ui:panel>
-		            </div>
+					</div>
-	        	</c:if>
+				</c:if>
-			
 				<liferay-ui:panel extended="false" defaultState="open" collapsible="false" title="dp" >
 					<div class="container-fluid">
 						<div class="row">
@@ -75,25 +73,25 @@
 							</div>
 							<div class="row">
 								<div class="col-sm-12">
-									<strong><span class='<%=dettPratica.getSanatoriaEdilizia47() ? "fa fa-check-circle-o txt-green" : "fa fa-circle-o" %>'></span></strong>
+									<strong><span class='<%= dettPratica.getSanatoriaEdilizia47() ? "fa fa-check-circle-o txt-green" : "fa fa-circle-o" %>'></span></strong>
 									<%= LanguageUtil.get(pageContext, "sanatoria-edilizia-47") %>
 								</div>
 								<div class="col-sm-12">
-									<strong><span class='<%=dettPratica.getSanatoriaEdilizia724() ? "fa fa-check-circle-o txt-green" : "fa fa-circle-o" %>'></span></strong>
+									<strong><span class='<%= dettPratica.getSanatoriaEdilizia724() ? "fa fa-check-circle-o txt-green" : "fa fa-circle-o" %>'></span></strong>
 									<%= LanguageUtil.get(pageContext, "sanatoria-edilizia-724") %>
 								</div>
 								<div class="col-sm-12">
-									<strong><span class='<%=dettPratica.getSanatoriaEdilizia326() ? "fa fa-check-circle-o txt-green" : "fa fa-circle-o" %>'></span></strong>
+									<strong><span class='<%= dettPratica.getSanatoriaEdilizia326() ? "fa fa-check-circle-o txt-green" : "fa fa-circle-o" %>'></span></strong>
 									<%= LanguageUtil.get(pageContext, "sanatoria-edilizia-326") %>
 								</div>
 							</div>
 						</c:if>
 					</div>
 				</liferay-ui:panel>
-				<liferay-ui:panel  extended="false" defaultState="open" collapsible="false" title="Normativa">
+				<liferay-ui:panel extended="false" defaultState="open" collapsible="false" title="Normativa">
 					<div class="container-fluid">
 						<div class="row">
-							<div class="col-sm-12 col-md-12">
+							<div class="col-sm-12">
 								<div class="fascicolo_header_row"></div>
 							</div>
 						</div>
@@ -128,7 +126,7 @@
 							</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>
@@ -153,7 +151,7 @@
 							</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>
@@ -173,9 +171,8 @@
 			</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_descrizione" >
 					<div class="prog-description">
@@ -185,11 +182,9 @@
 			</div>
 		</div>
 	</div>
-
-
 	<c:if test="<%= !isDisabledMap %>">
 		<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_ubicazione" >
 						<div class="container-fluid">
@@ -239,20 +234,18 @@
 								<div class="col-sm-6 col-md-3">
 									<%= LanguageUtil.get(pageContext, "dc-particelle") %>
 								</div>
-								<%
+								<% String[] particelle= dettPratica.getDcParticelle().split(Pattern.quote("|")); %>
-									String[] particelle= dettPratica.getDcParticelle().split(Pattern.quote("|"));
-								%>
 								<div class="col-sm-6 col-md-3">
-									<div class="col-md-3 col-sm-3 col-xs-6 no-padding-left">
+									<div class="col-sm-3 col-xs-6 no-padding-left">
 										<span><strong><%= particelle.length > 0 ? particelle[0] : StringPool.BLANK %></strong></span>
 									</div>
-									<div class="col-md-3 col-sm-3 col-xs-6">
+									<div class="col-sm-3 col-xs-6">
 										<span><strong><%= particelle.length > 1 ? particelle[1] : StringPool.BLANK %></strong></span>
 									</div>
-									<div class="col-md-3 col-sm-3 col-xs-6">
+									<div class="col-sm-3 col-xs-6">
 										<span><strong><%= particelle.length > 2 ? particelle[2] : StringPool.BLANK %></strong></span>
 									</div>
-									<div class="col-md-3 col-sm-3 col-xs-6 no-padding-right">
+									<div class="col-sm-3 col-xs-6 no-padding-right">
 										<span><strong><%= particelle.length > 3 ? particelle[3] : StringPool.BLANK %></strong></span>
 									</div>
 								</div>
@@ -268,18 +261,34 @@
 								</div>
 							</c:if>
 							<div class="row">
-								<div class="col-md-12">
+								<div class="col-xs-12">
-									<%
+									<% String[] geolocalization = dettPratica.getLocalizzazioneGeografica().split(Pattern.quote("|")); %>
-			                       		String[] geolocalization = dettPratica.getLocalizzazioneGeografica().split(Pattern.quote("|"));
+									<aui:input name="lat" label="" type="hidden"
-			                       	%>
+											value='<%= geolocalization.length > 0 ? geolocalization[0] : StringPool.BLANK %>' />
-		                           <aui:input name="lat" label="" type="hidden"
+									<aui:input name="long" label="" type="hidden" 
-		                           				value='<%=geolocalization.length > 0 ? geolocalization[0] : StringPool.BLANK %>' />
+											value='<%= geolocalization.length > 1 ? geolocalization[1] : StringPool.BLANK %>'/>
-		                           <aui:input name="long" label="" type="hidden" 
+									<aui:input name="zoom" label="" type="hidden" value="16" />
-		                               			value='<%=geolocalization.length > 1 ? geolocalization[1] : StringPool.BLANK %>'/>
+									<aui:input type="hidden" name="geoIsEditable" value="false" label=""/>
-		                           <aui:input type="hidden" name="geoIsEditable" value='<%= false %>' label=""/>
+									<liferay-ui:tabs names="mappe-bbcc,mappe-openstreetmap"	refresh="false">
-		                           
+										<liferay-ui:section>
-		                           <liferay-portlet:runtime portletName="5_WAR_trefmapitmapportlet"  queryString='<%="mapitNamespace="+renderResponse.getNamespace()%>' />
+											<div class="col-xs-12">
-	                           </div>
+												<!-- Integrazione geoportal -->
+												<div class="container-fluid">
+													<div class="row">
+														<div class="col-xs-12">
+															<div style="border:none;width:100%;height:700px">
+																<iframe src="<%= urlIframeMappe %>" style="border:none;width:100%;height:700px"></iframe>
+															</div>
+														</div>
+													</div>
+												</div>
+											</div>
+										</liferay-ui:section>
+										<liferay-ui:section>
+											<liferay-portlet:runtime portletName="<%= PortletKeys.MAPIT %>" queryString='<%= "mapitNamespace=" + renderResponse.getNamespace() %>' />
+										</liferay-ui:section>
+									</liferay-ui:tabs>
+								</div>
 							</div>
 						</div>
 					</liferay-ui:panel>
@@ -288,29 +297,28 @@
 		</div>
 	</c:if>
 	<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="destinazione" >
 					<div class="container-fluid">
 						<div class="row">
-							<div class="col-sm-12 col-md-12">
+							<div class="col-sm-12">
 							<% 
 								String label = dettPratica.getDestinazione();
-								
+								String uso = StringPool.BLANK;
-								String uso = "";
+								String title = StringPool.BLANK;
-								String title = "";
+								if (!label.equals(StringPool.BLANK)) {
-								if (!label.equals("")) {
 									String pref = label.substring(0, 1);
 									if (label.length() > 1) {
-										title = label.substring(0, label.length()-1);
+										title = label.substring(0, label.length() - 1);
-										uso = title.substring(title.length()-1);
+										uso = title.substring(title.length() - 1);
-										out.print(LanguageUtil.get(pageContext, "destinazione-uso-"+uso)+":");
+										out.print(LanguageUtil.get(pageContext, "destinazione-uso-" + uso) + StringPool.COLON);
 										out.newLine();
-										out.print(LanguageUtil.get(pageContext, "destinazione-"+title)+":");
+										out.print(LanguageUtil.get(pageContext, "destinazione-" + title) + StringPool.COLON);
 									}
 								}
 							%>
-							<strong><%=LanguageUtil.get(pageContext, "destinazione-"+ label)%></strong>
+							<strong><%= LanguageUtil.get(pageContext, "destinazione-" + label) %></strong>
 							</div>
 						</div>
 					</div>
@@ -319,42 +327,42 @@
 		</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_intervento" >
 					<div class="container-fluid">
 						<div class="row">
 							<div class="col-xs-12">
-								<strong><span class='<%=dettPratica.getTcNuovaCostruzione() ? "fa fa-check-circle-o txt-green" : "fa fa-circle-o" %>'></span></strong>
+								<strong><span class='<%= dettPratica.getTcNuovaCostruzione() ? "fa fa-check-circle-o txt-green" : "fa fa-circle-o" %>'></span></strong>
-								<%=LanguageUtil.get(pageContext, "tc-nuova-costruzione") %>
+								<%= LanguageUtil.get(pageContext, "tc-nuova-costruzione") %>
 							</div>
 							<div class="col-xs-12">
-								<strong><span class='<%=dettPratica.getTcNuovaCostruzionePertinenza() ? "fa fa-check-circle-o txt-green" : "fa fa-circle-o" %>'></span></strong>
+								<strong><span class='<%= dettPratica.getTcNuovaCostruzionePertinenza() ? "fa fa-check-circle-o txt-green" : "fa fa-circle-o" %>'></span></strong>
-								<%=LanguageUtil.get(pageContext, "tc-nuova-costruzione-pertinenza") %>
+								<%= LanguageUtil.get(pageContext, "tc-nuova-costruzione-pertinenza") %>
 							</div>
 							<div class="col-xs-12">
-								<strong><span class='<%=dettPratica.getTcCostruzioniEsistenti() ? "fa fa-check-circle-o txt-green" : "fa fa-circle-o" %>'></span></strong>
+								<strong><span class='<%= dettPratica.getTcCostruzioniEsistenti() ? "fa fa-check-circle-o txt-green" : "fa fa-circle-o" %>'></span></strong>
-								<%=LanguageUtil.get(pageContext, "tc-costruzioni-esistenti") %>
+								<%= LanguageUtil.get(pageContext, "tc-costruzioni-esistenti") %>
 							</div>
 							<div class="col-xs-12">
-								<strong><span class='<%=dettPratica.getTcManutOrdStraord() ? "fa fa-check-circle-o txt-green" : "fa fa-circle-o" %>'></span></strong>
+								<strong><span class='<%= dettPratica.getTcManutOrdStraord() ? "fa fa-check-circle-o txt-green" : "fa fa-circle-o" %>'></span></strong>
-								<%=LanguageUtil.get(pageContext, "tc-manut-ord-rest-dem") %>
+								<%= LanguageUtil.get(pageContext, "tc-manut-ord-rest-dem") %>
 							</div>
 							<div class="col-xs-12">
-								<strong><span class='<%=dettPratica.getTcInterventoOpereEscavazione() ? "fa fa-check-circle-o txt-green" : "fa fa-circle-o" %>'></span></strong>
+								<strong><span class='<%= dettPratica.getTcInterventoOpereEscavazione() ? "fa fa-check-circle-o txt-green" : "fa fa-circle-o" %>'></span></strong>
-								<%=LanguageUtil.get(pageContext, "tc-intervento-opere-escavazione") %>
+								<%= LanguageUtil.get(pageContext, "tc-intervento-opere-escavazione") %>
 							</div>
 							<div class="col-xs-12">
-								<strong><span class='<%=dettPratica.getTcViarch() ? "fa fa-check-circle-o txt-green" : "fa fa-circle-o" %>'></span></strong>
+								<strong><span class='<%= dettPratica.getTcViarch() ? "fa fa-check-circle-o txt-green" : "fa fa-circle-o" %>'></span></strong>
-								<%=LanguageUtil.get(pageContext, "tc-viarch") %>
+								<%= LanguageUtil.get(pageContext, "tc-viarch") %>
 							</div>
 							<div class="col-xs-12">
-								<strong><span class='<%=dettPratica.getTcOperaA25() ? "fa fa-check-circle-o txt-green" : "fa fa-circle-o" %>'></span></strong>
+								<strong><span class='<%= dettPratica.getTcOperaA25() ? "fa fa-check-circle-o txt-green" : "fa fa-circle-o" %>'></span></strong>
-								<%=LanguageUtil.get(pageContext, "tc-opera-a25") %>
+								<%= LanguageUtil.get(pageContext, "tc-opera-a25") %>
 							</div>
 							<div class="col-xs-12">
-								<strong><span class='<%=dettPratica.getTcAltriInterventi() ? "fa fa-check-circle-o txt-green" : "fa fa-circle-o" %>'></span></strong>
+								<strong><span class='<%= dettPratica.getTcAltriInterventi() ? "fa fa-check-circle-o txt-green" : "fa fa-circle-o" %>'></span></strong>
-								<%=LanguageUtil.get(pageContext, "tc-altro-intervento") %>
+								<%= LanguageUtil.get(pageContext, "tc-altro-intervento") %>
 								<c:if test="<%= dettPratica.getTcAltriInterventi() %>">
 									: <strong><%= dettPratica.getTcAltriInterventiDesc() %></strong>
 								</c:if>
@@ -366,65 +374,65 @@
 		</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_tipologia_costruttiva" >
 					<div class="container-fluid">
 						<div class="row">
-							<div class="col-sm-3 col-md-3">
+							<div class="col-sm-3">
-								<strong><span class='<%=BeanPropertiesUtil.getBoolean(dettPratica, "tcInCA") ? "fa fa-check-circle-o txt-green" : "fa fa-circle-o" %>'></span></strong>
+								<strong><span class='<%= BeanPropertiesUtil.getBoolean(dettPratica, "tcInCA") ? "fa fa-check-circle-o txt-green" : "fa fa-circle-o" %>'></span></strong>
-								<%=LanguageUtil.get(pageContext, "tc-in-ca") %>
+								<%= LanguageUtil.get(pageContext, "tc-in-ca") %>
 							</div>
-							<div class="col-sm-3 col-md-3">
+							<div class="col-sm-3">
-								<strong><span class='<%=BeanPropertiesUtil.getBoolean(dettPratica, "tcInOpera") ? "fa fa-check-circle-o txt-green" : "fa fa-circle-o" %>'></span></strong>
+								<strong><span class='<%= BeanPropertiesUtil.getBoolean(dettPratica, "tcInOpera") ? "fa fa-check-circle-o txt-green" : "fa fa-circle-o" %>'></span></strong>
-								<%=LanguageUtil.get(pageContext, "tc-in-opera") %>
+								<%= LanguageUtil.get(pageContext, "tc-in-opera") %>
 							</div>
-							<div class="col-sm-3 col-md-3">
+							<div class="col-sm-3">
-								<strong><span class='<%=BeanPropertiesUtil.getBoolean(dettPratica, "tcPrefabbricato") ? "fa fa-check-circle-o txt-green" : "fa fa-circle-o" %>'></span></strong>
+								<strong><span class='<%= BeanPropertiesUtil.getBoolean(dettPratica, "tcPrefabbricato") ? "fa fa-check-circle-o txt-green" : "fa fa-circle-o" %>'></span></strong>
-								<%=LanguageUtil.get(pageContext, "tc-prefabbricato") %>
+								<%= LanguageUtil.get(pageContext, "tc-prefabbricato") %>
 							</div>
 						</div>
 						<div class="row">
-							<div class="col-sm-3 col-md-3">
+							<div class="col-sm-3">
-								<strong><span class='<%=BeanPropertiesUtil.getBoolean(dettPratica, "tcInAcciaio") ? "fa fa-check-circle-o txt-green" : "fa fa-circle-o" %>'></span></strong>
+								<strong><span class='<%= BeanPropertiesUtil.getBoolean(dettPratica, "tcInAcciaio") ? "fa fa-check-circle-o txt-green" : "fa fa-circle-o" %>'></span></strong>
-								<%=LanguageUtil.get(pageContext, "tc-in-acciaio") %>
+								<%= LanguageUtil.get(pageContext, "tc-in-acciaio") %>
 							</div>
-							<div class="col-sm-3 col-md-3">
+							<div class="col-sm-3">
-								<strong><span class='<%=BeanPropertiesUtil.getBoolean(dettPratica, "tcMista") ? "fa fa-check-circle-o txt-green" : "fa fa-circle-o" %>'></span></strong>
+								<strong><span class='<%= BeanPropertiesUtil.getBoolean(dettPratica, "tcMista") ? "fa fa-check-circle-o txt-green" : "fa fa-circle-o" %>'></span></strong>
-								<%=LanguageUtil.get(pageContext, "tc-mista") %>
+								<%= LanguageUtil.get(pageContext, "tc-mista") %>
 							</div>
 						</div>
 						<div class="row">
-							<div class="col-sm-3 col-md-3">
+							<div class="col-sm-3">
-								<strong><span class='<%=BeanPropertiesUtil.getBoolean(dettPratica, "tcInMuratura") ? "fa fa-check-circle-o txt-green" : "fa fa-circle-o" %>'></span></strong>
+								<strong><span class='<%= BeanPropertiesUtil.getBoolean(dettPratica, "tcInMuratura") ? "fa fa-check-circle-o txt-green" : "fa fa-circle-o" %>'></span></strong>
-								<%=LanguageUtil.get(pageContext, "tc-in-muratura") %>
+								<%= LanguageUtil.get(pageContext, "tc-in-muratura") %>
 							</div>
-							<div class="col-sm-3 col-md-3">
+							<div class="col-sm-3">
-								<strong><span class='<%=BeanPropertiesUtil.getBoolean(dettPratica, "tcInMuraturaOrdinaria") ? "fa fa-check-circle-o txt-green" : "fa fa-circle-o" %>'></span></strong>
+								<strong><span class='<%= BeanPropertiesUtil.getBoolean(dettPratica, "tcInMuraturaOrdinaria") ? "fa fa-check-circle-o txt-green" : "fa fa-circle-o" %>'></span></strong>
-								<%=LanguageUtil.get(pageContext, "tc-in-muratura-ordinaria") %>
+								<%= LanguageUtil.get(pageContext, "tc-in-muratura-ordinaria") %>
 							</div>
-							<div class="col-sm-3 col-md-3">
+							<div class="col-sm-3">
-								<strong><span class='<%=BeanPropertiesUtil.getBoolean(dettPratica, "tcInMuraturaArmata") ? "fa fa-check-circle-o txt-green" : "fa fa-circle-o" %>'></span></strong>
+								<strong><span class='<%= BeanPropertiesUtil.getBoolean(dettPratica, "tcInMuraturaArmata") ? "fa fa-check-circle-o txt-green" : "fa fa-circle-o" %>'></span></strong>
-								<%=LanguageUtil.get(pageContext, "tc-in-muratura-armata") %>
+								<%= LanguageUtil.get(pageContext, "tc-in-muratura-armata") %>
 							</div>
-							<div class="col-sm-3 col-md-3">
+							<div class="col-sm-3">
-								<strong><span class='<%=BeanPropertiesUtil.getBoolean(dettPratica, "tcInMuraturaMista") ? "fa fa-check-circle-o txt-green" : "fa fa-circle-o" %>'></span></strong>
+								<strong><span class='<%= BeanPropertiesUtil.getBoolean(dettPratica, "tcInMuraturaMista") ? "fa fa-check-circle-o txt-green" : "fa fa-circle-o" %>'></span></strong>
-								<%=LanguageUtil.get(pageContext, "tc-in-muratura-mista") %>
+								<%= LanguageUtil.get(pageContext, "tc-in-muratura-mista") %>
 							</div>
 						</div>
 						<div class="row">
-							<div class="col-sm-3 col-md-3">
+							<div class="col-sm-3">
-								<strong><span class='<%=BeanPropertiesUtil.getBoolean(dettPratica, "tcInLegno") ? "fa fa-check-circle-o txt-green" : "fa fa-circle-o" %>'></span></strong>
+								<strong><span class='<%= BeanPropertiesUtil.getBoolean(dettPratica, "tcInLegno") ? "fa fa-check-circle-o txt-green" : "fa fa-circle-o" %>'></span></strong>
-								<%=LanguageUtil.get(pageContext, "tc-in-legno") %>
+								<%= LanguageUtil.get(pageContext, "tc-in-legno") %>
 							</div>
 						</div>
 						<div class="row">
-							<div class="col-sm-3 col-md-3">
+							<div class="col-sm-3">
-								<strong><span class='<%=BeanPropertiesUtil.getBoolean(dettPratica, "tcAltro") ? "fa fa-check-circle-o txt-green" : "fa fa-circle-o" %>'></span></strong>
+								<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") %>
+								<%= LanguageUtil.get(pageContext, "tc-altro") %>
 							</div>
-							<div class="col-sm-9 col-md-9">
+							<div class="col-sm-9">
-								<span><strong><%=BeanPropertiesUtil.getString(dettPratica, "tcAltroDescrizione") %></strong></span>
+								<span><strong><%= BeanPropertiesUtil.getString(dettPratica, "tcAltroDescrizione") %></strong></span>
 							</div>
 						</div>
 					</div>

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

@@ -3,30 +3,6 @@
 <%@ include file="/html/fascicolo/init.jsp" %>
 
 <%
-/*
-String[] pageRiepilogo = new String[] { "page_riepilogo", "page_dettagli_principali","page_desc_edificio","page_sez_geologica","page_soggetti","page_allegati","page_asseverazioni","page_pagamenti","page_andamento","page_avvisi","page_storico_titolari","page_versioning"};
-String[] pageIntegrazioni = new String[] { "page_in_dettagli","page_in_allegati","page_in_soggetti"};
-String[] pageVarianti = new String[] { "page_va_dettagli","page_va_allegati","page_va_soggetti"};
-String[] pageFineLavori = new String[] { "page_fl_dati","page_fl_allegati","page_fl_pagamenti"};
-String[] pageCollaudi = new String[] { "page_co_dati","page_co_allegati","page_co_pagamenti"};
-String[] pageComunicazioni = new String[] { "page_bo_fe","page_doc_aggiuntiva","page_allegati_manuali"};
-
-long intPraticaId = ParamUtil.getLong(request, "intPraticaId");
-IntPratica intPratica = IntPraticaLocalServiceUtil.getIntPratica(intPraticaId);
-if(intPratica.getStatoPratica().equalsIgnoreCase(StatoPraticaConstants.ANNULLATA)){
-	 pageRiepilogo = new String[] { "page_riepilogo", "page_dettagli_principali","page_desc_edificio","page_sez_geologica","page_soggetti","page_allegati","page_allegati_annullamento","page_asseverazioni","page_pagamenti","page_andamento","page_avvisi","page_storico_titolari","page_versioning"};
-
-}
-String[][] categorySections = { pageRiepilogo,pageIntegrazioni,pageVarianti,pageFineLavori,pageCollaudi,pageComunicazioni};
-
-String[] _CATEGORY_NAMES = { "cat_riepilogo","cat_integrazioni","cat_varianti","cat_fine_lavori","cat_collaudi","cat_comunicazioni"};
-DettPratica dettPraticaLast = DettPraticaLocalServiceUtil.getLastCompletedByIntPratica(intPratica.getIntPraticaId());
-DettPratica dettPraticaLastData = DettPraticaLocalServiceUtil.getLastCompletedByIntPratica(intPratica.getIntPraticaId());
-
-request.setAttribute("bean.intPratica", intPratica);
-request.setAttribute("bean.dettPratica.last", DettPraticaLocalServiceUtil.getLastCompletedByIntPratica(intPratica.getIntPraticaId()));
-request.setAttribute("bean.dettPratica.lastData", DettPraticaLocalServiceUtil.getLastCompletedByIntPratica(intPratica.getIntPraticaId()));////TODO utilizzare getLastdByIntPraticaAndTipoPratica
-*/
 
 String[] pageRiepilogo = new String[] { "page_riepilogo", "page_dettagli_principali","page_desc_edificio","page_sez_geologica","page_soggetti","page_allegati","page_asseverazioni","page_pagamenti","page_andamento","page_avvisi","page_storico_titolari","page_versioning"};
 String[] pageIntegrazioni = new String[] { "page_in_dettagli","page_in_allegati","page_in_soggetti"};
@@ -35,18 +11,18 @@ String[] pageComunicazioni = new String[] { "page_bo_fe","page_doc_aggiuntiva","
 
 long intPraticaId = ParamUtil.getLong(request, "intPraticaId");
 IntPratica intPratica = IntPraticaLocalServiceUtil.getIntPratica(intPraticaId);
-if(intPratica.getStatoPratica().equalsIgnoreCase(StatoPraticaConstants.ANNULLATA)){
+if (intPratica.getStatoPratica().equalsIgnoreCase(StatoPraticaConstants.ANNULLATA)) {
-	 pageRiepilogo = new String[] { "page_riepilogo", "page_dettagli_principali","page_desc_edificio","page_sez_geologica","page_soggetti","page_allegati","page_allegati_annullamento","page_asseverazioni","page_pagamenti","page_andamento","page_avvisi","page_storico_titolari","page_versioning"};
+	pageRiepilogo = new String[] { "page_riepilogo", "page_dettagli_principali","page_desc_edificio","page_sez_geologica","page_soggetti","page_allegati","page_allegati_annullamento","page_asseverazioni","page_pagamenti","page_andamento","page_avvisi","page_storico_titolari","page_versioning"};
 }
 String[][] categorySections = { pageRiepilogo,pageIntegrazioni,pageVarianti,pageComunicazioni};
 
 String[] _CATEGORY_NAMES = { "cat_riepilogo","cat_integrazioni","cat_varianti","cat_comunicazioni"};
 DettPratica dettPraticaLast = DettPraticaLocalServiceUtil.getLastCompletedByIntPratica(intPratica.getIntPraticaId());
-DettPratica dettPraticaLastData = DettPraticaLocalServiceUtil.getLastCompletedByIntPratica(intPratica.getIntPraticaId());
+DettPratica dettPraticaLastData = dettPraticaLast;
 
 request.setAttribute("bean.intPratica", intPratica);
-request.setAttribute("bean.dettPratica.last", DettPraticaLocalServiceUtil.getLastCompletedByIntPratica(intPratica.getIntPraticaId()));
+request.setAttribute("bean.dettPratica.last", dettPraticaLast);
-request.setAttribute("bean.dettPratica.lastData", DettPraticaLocalServiceUtil.getLastCompletedByIntPratica(intPratica.getIntPraticaId()));
+request.setAttribute("bean.dettPratica.lastData", dettPraticaLastData);
 
 %>
 

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

@@ -12,16 +12,21 @@
 <%@page import="javax.portlet.PortletURL"%>
 <%
 
+String numeroProgetto = ParamUtil.getString(request, "numeroProgetto", StringPool.BLANK);
 String codiceProvincia = ParamUtil.getString(request, "provincia", StringPool.BLANK);
 String idComune = ParamUtil.getString(request, "comune", StringPool.BLANK);
 String via = ParamUtil.getString(request, "via", StringPool.BLANK);
 String lat = ParamUtil.getString(request, "lat", StringPool.BLANK);
 String lng = ParamUtil.getString(request, "long", StringPool.BLANK);
 String raggio = ParamUtil.getString(request, "raggio", StringPool.BLANK);
+
 boolean targetBlank = ParamUtil.getBoolean(request, "blank", true);
 String target = (targetBlank ? "_blank" : StringPool.BLANK);
 
 PortletURL iteratorURL = liferayPortletResponse.createRenderURL();
+if (Validator.isNotNull(numeroProgetto)) {
+	iteratorURL.setParameter("numeroProgetto", numeroProgetto);
+}
 if (Validator.isNotNull(codiceProvincia)) {
 	iteratorURL.setParameter("provincia", codiceProvincia);
 }
@@ -47,6 +52,8 @@ boolean showNotes = false;
 int[] raggi = { 500, 1000, 2000, 3000, 5000, 10000 };
 
 %>
+<liferay-portlet:actionURL name="ricerca" var="ricercaURL" />
+<liferay-portlet:actionURL name="localizzaProgetto" var="localizzaProgettoURL" />
 <div class="container-fluid">
 	<div class="row">
 		<div class="module-group">
@@ -54,34 +61,51 @@ int[] raggi = { 500, 1000, 2000, 3000, 5000, 10000 };
 				<div class="container-fluid">
 					<div class="row">
 						<div class="col-xs-6">
-							<liferay-portlet:actionURL name="ricerca" var="ricercaURL" />
 							<aui:form method="POST" name="ricerca" action="<%= ricercaURL %>">
+								<liferay-ui:tabs names="ricerca-indirizzo,ricerca-progetto" refresh="false">
+									<liferay-ui:section>
+										<br/>
+										<div class="row">
+											<div class="col-xs-12 col-md-6">
+												<aui:select name="provincia" label="dp-dc-prov" showEmptyOption="true">
+												</aui:select>
+											</div>
+											<div class="col-xs-12 col-md-6">
+												<aui:select name="comune" label="dp-dc-comune" showEmptyOption="true">
+												</aui:select>
+											</div>
+										</div>
+										<div class="row">
+											<div class="col-xs-12">
+												<aui:input name="via" label="dp-dc-via" />
+											</div>
+										</div>
+										<div class="row">
+											<div class="col-xs-12">
+												<aui:button name="localizzaBtn" cssClass="btn btn-primary pull-right" onClick="localize(true)" value="Localizza"/>
+											</div>
+										</div>
+									</liferay-ui:section>
+									<liferay-ui:section>
+										<br/>
+										<div class="row">
+											<div class="col-xs-12">
+												<aui:input name="numeroProgetto" label="n-progetto" />
+											</div>
+										</div>
+										<div class="row">
+											<div class="col-xs-12">
+												<aui:button name="localizzaProgettoBtn" cssClass="btn btn-primary pull-right" onClick="localizzaProgetto()" value="Localizza"/>
+											</div>
+										</div>
+									</liferay-ui:section>
+								</liferay-ui:tabs>
 								<div class="row">
 									<div class="col-xs-12 col-md-6">
-										<aui:select name="provincia" label="dp-dc-prov" showEmptyOption="true">
+										<aui:input name="lat" label="dp-lat" required="true" />
-										</aui:select>
-									</div>
-									<div class="col-xs-12 col-md-6">
-										<aui:select name="comune" label="dp-dc-comune" showEmptyOption="true">
-										</aui:select>
-									</div>
-								</div>
-								<div class="row">
-									<div class="col-xs-12">
-										<aui:input name="via" label="dp-dc-via" />
-									</div>
-								</div>
-								<div class="row">
-									<div class="col-xs-12">
-										<aui:button name="localizzaBtn" cssClass="btn btn-primary pull-right" onClick="localize(true)" value="Localizza"/>
-									</div>
-								</div>
-								<div class="row">
-									<div class="col-xs-12 col-md-6">
-										<aui:input name="lat" label="dp-lat"/>
 									</div>
 									<div class="col-xs-12 col-md-6">
-										<aui:input name="long" label="dp-long"/>
+										<aui:input name="long" label="dp-long" required="true" />
 									</div>
 								</div>
 								<div class="row">
@@ -187,7 +211,7 @@ int[] raggi = { 500, 1000, 2000, 3000, 5000, 10000 };
 				</liferay-ui:search-container-column-text>
 
 				<liferay-ui:search-container-column-text name="distanza" title="distanza-tooltip" cssClass="text-center">
-					<%= fmt.format(pratica.getDistanzaOrtodromica()) %>
+					<%= numeroProgetto.equals(pratica.getNumeroProgetto()) ? "Riferimento<br/>ricerca" : fmt.format(pratica.getDistanzaOrtodromica()) %>
 				</liferay-ui:search-container-column-text>
 
 				<liferay-ui:search-container-column-text name="n-progetto" href="<%= viewURL %>" target="<%= target %>" cssClass="text-nowrap">
@@ -362,6 +386,30 @@ function localize(showAlert) {
 	});
 }
 
+function localizzaProgetto() {
+	AUI().use('aui-io-request', function(A) {
+		var numeroProgetto = AUI().one('#<portlet:namespace/>numeroProgetto').val().trim();
+		A.io.request('<%= localizzaProgettoURL %>', {
+			dataType: 'json',
+			data: {
+				<portlet:namespace/>numeroProgetto: numeroProgetto,
+			},
+			on: {
+				success: function() {
+					var data = this.get('responseData');
+					console.log(data);
+					if ((undefined == data.lat) || (undefined == data.lng)) {
+						alert('Nessun risultato per i dati immessi');
+					} else {
+						AUI().one('#<portlet:namespace/>lat').val(data.lat);
+						AUI().one('#<portlet:namespace/>long').val(data.lng);
+					}
+				},
+			}
+		});
+	});
+}
+
 YUI().use(
 	'aui-tooltip',
 	function(Y) {

liferay-plugins-sdk-6.2/portlets/portos-deploy-alert-portlet/.tern-project

@@ -0,0 +1 @@
+{"ide":{"scriptPaths":[]},"plugins":{"aui":{},"liferay":{},"yui":{}},"libs":["ecma5","browser"]}

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

@@ -5,15 +5,11 @@
 	<portlet>
 		<portlet-name>1</portlet-name>
 		<icon>/icon.png</icon>
-		<control-panel-entry-category>
+		<control-panel-entry-category>configuration</control-panel-entry-category>
-			configuration
-		</control-panel-entry-category>
 		<control-panel-entry-weight>1.5</control-panel-entry-weight>
 		<control-panel-entry-class>it.tref.liferay.portos.deployalert.control.DeployAlertControl</control-panel-entry-class>
 		<header-portlet-css>/css/main.css</header-portlet-css>
-		<footer-portlet-javascript>
+		<footer-portlet-javascript>/js/main.js</footer-portlet-javascript>
-			/js/main.js
-		</footer-portlet-javascript>
 		<css-class-wrapper>notificator-portlet</css-class-wrapper>
 	</portlet>
 	<role-mapper>

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

@@ -1,12 +1,13 @@
 <?xml version="1.0"?>
 
-<portlet-app xmlns="http://java.sun.com/xml/ns/portlet/portlet-app_2_0.xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/portlet/portlet-app_2_0.xsd http://java.sun.com/xml/ns/portlet/portlet-app_2_0.xsd" version="2.0">
+<portlet-app xmlns="http://java.sun.com/xml/ns/portlet/portlet-app_2_0.xsd"
-		<portlet>
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://java.sun.com/xml/ns/portlet/portlet-app_2_0.xsd http://java.sun.com/xml/ns/portlet/portlet-app_2_0.xsd"
+	version="2.0">
+	<portlet>
 		<portlet-name>1</portlet-name>
 		<display-name>Deploy Alert</display-name>
-		<portlet-class>
+		<portlet-class>it.tref.liferay.portos.deployalert.portlet.NotificatorPortlet</portlet-class>
-			it.tref.liferay.portos.deployalert.portlet.NotificatorPortlet
-		</portlet-class>
 		<init-param>
 			<name>view-template</name>
 			<value>/html/notificator/view.jsp</value>

liferay-plugins-sdk-6.2/portlets/portos-log-portlet/.tern-project

@@ -0,0 +1 @@
+{"ide":{"scriptPaths":[]},"plugins":{"aui":{},"liferay":{},"yui":{}},"libs":["ecma5","browser"]}