diff --git a/liferay-plugins-sdk-6.2/portlets/portos-audit-portlet/.tern-project b/liferay-plugins-sdk-6.2/portlets/portos-audit-portlet/.tern-project
new file mode 100644
index 00000000..a185ba0d
--- /dev/null
+++ b/liferay-plugins-sdk-6.2/portlets/portos-audit-portlet/.tern-project
@@ -0,0 +1 @@
+{"ide":{"scriptPaths":[]},"plugins":{"aui":{},"liferay":{},"yui":{}},"libs":["ecma5","browser"]}
\ No newline at end of file
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/mwg/sismica/bo/util/MappeUtil.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/mwg/sismica/bo/util/MappeUtil.java
index e8856541..8ceaa64a 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/mwg/sismica/bo/util/MappeUtil.java
+++ b/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,
- PortalException, SystemException {
+ public static String getUrlFe(HttpServletRequest request, DettPratica dettPratica, Comune comune)
+ 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,
- ConfigurazioneConstants.MAPPE_URL_IFRAME_FE).replace("{{COD_BELFIORE}}",
- urlEncode(comune.getCodiceBelfiore()));
+ String url = baseUrl.replace("{{COD_BELFIORE}}", urlEncode(comune.getCodiceBelfiore())).replace(
+ "{{ESTREMI_CAT}}", urlEncode(dettPratica.getEstremiCatastali()));
String query = StringPool.BLANK;
String[] parti = StringUtils.split(url, StringPool.QUESTION);
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/content/Language.properties b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/content/Language.properties
index 9ebb7acc..9ba5639d 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/content/Language.properties
+++ b/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 [ 1 ]
-distanza-tooltip = 1: Distanza ortodromica espressa in metri
+distanza = Distanza [A]
+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
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/content/Portal.properties b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/content/Portal.properties
index 70e0702c..5e59ec50 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/content/Portal.properties
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/content/Portal.properties
@@ -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
\ No newline at end of file
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/mwg/sismica/bo/portlet/RicercaPosizionePortlet.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/mwg/sismica/bo/portlet/RicercaPosizionePortlet.java
index d6a51b8f..15f0c4a8 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/mwg/sismica/bo/portlet/RicercaPosizionePortlet.java
+++ b/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 campi = new ArrayList() {
{
+ 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 {
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/impl/CollaudoImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/impl/CollaudoImpl.java
index eee4601e..a6882d67 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/impl/CollaudoImpl.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/impl/CollaudoImpl.java
@@ -43,14 +43,14 @@ import com.liferay.portal.kernel.util.Validator;
public class CollaudoImpl extends CollaudoBaseImpl {
/*
* NOTE FOR DEVELOPERS:
- *
+ *
* Never reference this class directly. All methods that expect a collaudo
* model instance should use the {@link
* it.tref.liferay.portos.bo.model.Collaudo} interface instead.
*/
/**
- *
+ *
*/
private static final long serialVersionUID = -6015747485641141721L;
private static final Log _log = LogFactoryUtil.getLog(CollaudoImpl.class);
@@ -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();
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/impl/DelegaImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/impl/DelegaImpl.java
index fb76a0e3..b6d0a0bf 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/impl/DelegaImpl.java
+++ b/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;
@@ -38,7 +37,7 @@ import com.liferay.portal.kernel.util.Validator;
public class DelegaImpl extends DelegaBaseImpl {
/*
* NOTE FOR DEVELOPERS:
- *
+ *
* Never reference this class directly. All methods that expect a delega
* model instance should use the {@link
* it.tref.liferay.portos.bo.model.Delega} interface instead.
@@ -46,8 +45,9 @@ public class DelegaImpl extends DelegaBaseImpl {
public DelegaImpl() {
}
+ @Override
public Map getDichiarazioniMap() {
- JSONDeserializer> deserializer= JSONFactoryUtil.createJSONDeserializer();
+ JSONDeserializer> deserializer = JSONFactoryUtil.createJSONDeserializer();
String dichiarazioni = getDichiarazioni();
if (Validator.isNull(dichiarazioni)) {
dichiarazioni = "{}";
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/impl/FineLavoriImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/impl/FineLavoriImpl.java
index bc4f817c..9753c4e1 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/impl/FineLavoriImpl.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/impl/FineLavoriImpl.java
@@ -43,7 +43,7 @@ import com.liferay.portal.kernel.util.Validator;
public class FineLavoriImpl extends FineLavoriBaseImpl {
/*
* NOTE FOR DEVELOPERS:
- *
+ *
* Never reference this class directly. All methods that expect a fine
* lavori model instance should use the {@link
* it.tref.liferay.portos.bo.model.FineLavori} interface instead.
@@ -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();
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/impl/PagamentoImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/impl/PagamentoImpl.java
index 569f3b0d..7acfeb5f 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/impl/PagamentoImpl.java
+++ b/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
- * "portos_bo_Pagamento" database table, with each column mapped to a property of this
- * class.
+ * The extended model implementation for the Pagamento service. Represents a row
+ * in the "portos_bo_Pagamento" database table, with each column
+ * mapped to a property of this class.
*
*
- * Helper methods and all application logic should be put in this class. Whenever methods are added,
- * rerun ServiceBuilder to copy their definitions into the
- * {@link it.tref.liferay.portos.bo.model.Pagamento} interface.
+ * Helper methods and all application logic should be put in this class.
+ * Whenever methods are added, rerun ServiceBuilder to copy their definitions
+ * into the {@link it.tref.liferay.portos.bo.model.Pagamento} interface.
*
*
* @author Davide Barbagallo, 3F Consulting
*/
public class PagamentoImpl extends PagamentoBaseImpl {
- /*
- * NOTE FOR DEVELOPERS:
- *
- * Never reference this class directly. All methods that expect a pagamento model instance should
- * use the {@link it.tref.liferay.portos.bo.model.Pagamento} interface instead.
- */
- public PagamentoImpl() {}
+ /*
+ * NOTE FOR DEVELOPERS:
+ *
+ * Never reference this class directly. All methods that expect a pagamento
+ * model instance should use the {@link
+ * it.tref.liferay.portos.bo.model.Pagamento} interface instead.
+ */
+ public PagamentoImpl() {
+ }
- public String getDownloadUrl(ThemeDisplay themeDisplay) throws PortalException, SystemException {
- if (Validator.isNull(getFileEntryId())) {
- return null;
- }
+ @Override
+ public String getDownloadUrl(ThemeDisplay themeDisplay) throws PortalException, SystemException {
+ if (Validator.isNull(getFileEntryId())) {
+ return null;
+ }
- FileEntry fileEntry = DLAppLocalServiceUtil.getFileEntry(getFileEntryId());
- return DLUtil.getPreviewURL(fileEntry, fileEntry.getFileVersion(), themeDisplay, "&download=true");
+ FileEntry fileEntry = DLAppLocalServiceUtil.getFileEntry(getFileEntryId());
+ return DLUtil.getPreviewURL(fileEntry, fileEntry.getFileVersion(), themeDisplay, "&download=true");
- }
+ }
- public String getImportoString() {
- String importo = getImporto();
- BigDecimal importoVal;
- if (Validator.isNotNull(importo)) {
- importoVal = new BigDecimal(importo);
- } else {
- importoVal = new BigDecimal(0.00);
- }
- return NumberFormat.getCurrencyInstance(Locale.ITALY).format(importoVal);
- }
+ @Override
+ public String getImportoString() {
+ String importo = getImporto();
+ BigDecimal importoVal;
+ if (Validator.isNotNull(importo)) {
+ importoVal = new BigDecimal(importo);
+ } else {
+ importoVal = new BigDecimal(0.00);
+ }
+ return NumberFormat.getCurrencyInstance(Locale.ITALY).format(importoVal);
+ }
}
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/impl/SorteggioImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/impl/SorteggioImpl.java
index 1acb4a96..fbd7b2b1 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/impl/SorteggioImpl.java
+++ b/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
- * "portos_bo_Sorteggio" database table, with each column mapped to a property of this
- * class.
+ * The extended model implementation for the Sorteggio service. Represents a row
+ * in the "portos_bo_Sorteggio" database table, with each column
+ * mapped to a property of this class.
*
*
- * Helper methods and all application logic should be put in this class. Whenever methods are added,
- * rerun ServiceBuilder to copy their definitions into the
- * {@link it.tref.liferay.portos.bo.model.Sorteggio} interface.
+ * Helper methods and all application logic should be put in this class.
+ * Whenever methods are added, rerun ServiceBuilder to copy their definitions
+ * into the {@link it.tref.liferay.portos.bo.model.Sorteggio} interface.
*
*
* @author Davide Barbagallo, 3F Consulting
*/
public class SorteggioImpl extends SorteggioBaseImpl {
- /*
- * NOTE FOR DEVELOPERS:
- *
- * Never reference this class directly. All methods that expect a sorteggio model instance should
- * use the {@link it.tref.liferay.portos.bo.model.Sorteggio} interface instead.
- */
- public SorteggioImpl() {}
+ /*
+ * NOTE FOR DEVELOPERS:
+ *
+ * Never reference this class directly. All methods that expect a sorteggio
+ * model instance should use the {@link
+ * it.tref.liferay.portos.bo.model.Sorteggio} interface instead.
+ */
+ public SorteggioImpl() {
+ }
-
- public boolean mesePrecedenteToBoolean() {
- if (Validator.isNull(getMesePrecedente())) {
- return false;
- }
- return Boolean.parseBoolean(getMesePrecedente());
- }
+ @Override
+ public boolean mesePrecedenteToBoolean() {
+ if (Validator.isNull(getMesePrecedente())) {
+ return false;
+ }
+ return Boolean.parseBoolean(getMesePrecedente());
+ }
}
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/listener/SoggettoModelListener.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/listener/SoggettoModelListener.java
index 95260147..0da95e6f 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/listener/SoggettoModelListener.java
+++ b/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 {
- private static final Log _log = LogFactoryUtil.getLog(SoggettoModelListener.class);
+ private static final Log _log = LogFactoryUtil.getLog(SoggettoModelListener.class);
- @Override
- public void onAfterUpdate(Soggetto model) throws ModelListenerException {
+ @Override
+ public void onAfterUpdate(Soggetto model) throws ModelListenerException {
- try {
+ try {
- Indexer indexer = IndexerRegistryUtil.getIndexer(IntPratica.class);
- indexer.reindex(IntPratica.class.getName(), model.getIntPraticaId());
+ Indexer indexer = IndexerRegistryUtil.getIndexer(IntPratica.class);
+ indexer.reindex(IntPratica.class.getName(), model.getIntPraticaId());
- if (_log.isDebugEnabled()) {
- _log.debug("DettPraticaModelListener - Chiamato Reindex IntPraticaId : " + model.getIntPraticaId());
- }
- } catch (SearchException e) {
- _log.error(e, e);
- }
+ if (_log.isDebugEnabled()) {
+ _log.debug("DettPraticaModelListener - Chiamato Reindex IntPraticaId : "
+ + model.getIntPraticaId());
+ }
+ } catch (SearchException e) {
+ _log.error(e, e);
+ }
- super.onAfterUpdate(model);
- }
+ super.onAfterUpdate(model);
+ }
}
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/portlet/PaesaggisticaAdministrationPortlet.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/portlet/PaesaggisticaAdministrationPortlet.java
index 55b1a686..8b3f5c78 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/portlet/PaesaggisticaAdministrationPortlet.java
+++ b/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 esito = new ArrayList();
+ List esito = new ArrayList();
esito.add("
Env:
");
for (Map.Entry entry : System.getenv().entrySet()) {
esito.add(entry.getKey() + "=" + entry.getValue());
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/IntPraticaLocalServiceImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/IntPraticaLocalServiceImpl.java
index 6648f3e8..b8e38270 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/IntPraticaLocalServiceImpl.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/IntPraticaLocalServiceImpl.java
@@ -843,25 +843,21 @@ public class IntPraticaLocalServiceImpl extends IntPraticaLocalServiceBaseImpl {
return dynamicQuery;
}
- @Override
public int countByPosizione(double lat, double lng, int raggio) throws SystemException {
List lista = findByPosizione(lat, lng, raggio);
return lista.size();
}
- @Override
public List findByPosizione(double lat, double lng, int raggio) throws SystemException {
return findByPosizione(lat, lng, raggio, QueryUtil.ALL_POS, QueryUtil.ALL_POS);
}
- @Override
public List findByPosizione(double lat, double lng, int raggio, int start, int end)
throws SystemException {
DynamicQuery query = queryPosizione();
List trovate = new ArrayList<>();
for (IntPratica pratica : (List) intPraticaPersistence.findWithDynamicQuery(query)) {
- int distanza = pratica.calcolaDistanzaOrtodromica(lat, lng);
- if (distanza <= raggio) {
+ if (pratica.calcolaDistanzaOrtodromica(lat, lng) <= raggio) {
trovate.add(pratica);
}
}
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/service.properties b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/service.properties
index 451f768d..b7438d0f 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/service.properties
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/service.properties
@@ -13,8 +13,8 @@
##
build.namespace=portos_bo
- build.number=2888
- build.date=1613383377126
+ build.number=2899
+ build.date=1614848453383
build.auto.upgrade=true
##
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/html/fascicolo/navigator/page_dettagli_principali.jsp b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/html/fascicolo/navigator/page_dettagli_principali.jsp
index 11405853..ea0ec353 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/html/fascicolo/navigator/page_dettagli_principali.jsp
+++ b/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="com.liferay.portal.kernel.bean.BeanPropertiesUtil"%>
-<%@ include file="/html/fascicolo/init.jsp" %>
+<%@page import="java.util.regex.Pattern"%>
+<%@include file="/html/fascicolo/init.jsp"%>
<%
- long dettPraticaId = ParamUtil.getLong(request, "dettPraticaId", 0l);
- DettPratica dettPratica;
- if(Validator.isNotNull(dettPraticaId)) {
- dettPratica = DettPraticaLocalServiceUtil.getDettPratica(dettPraticaId);
- } else {
- dettPratica = (DettPratica)request.getAttribute("bean.dettPratica.lastData");
- }
- IntPratica intPratica = (IntPratica)request.getAttribute("bean.intPratica");
- if(intPratica == null){
- intPratica = IntPraticaServiceUtil.getIntPratica(dettPratica.getIntPraticaId());
- }
- Territorio territorio = TerritorioLocalServiceUtil.getTerritorio(intPratica.getTerritorioId());
- Comune comune = ComuneLocalServiceUtil.getComune(territorio.getComuneId());
- Provincia provincia = ProvinciaLocalServiceUtil.fetchByC_C(territorio.getCompanyId(), territorio.getCodiceProvincia());
- boolean isDisabledMap = ParamUtil.getBoolean(request, "isDisabledMap", false);
+long dettPraticaId = ParamUtil.getLong(request, "dettPraticaId", 0L);
+DettPratica dettPratica;
+if (Validator.isNotNull(dettPraticaId)) {
+ dettPratica = DettPraticaLocalServiceUtil.getDettPratica(dettPraticaId);
+} else {
+ dettPratica = (DettPratica) request.getAttribute("bean.dettPratica.lastData");
+}
+IntPratica intPratica = (IntPratica) request.getAttribute("bean.intPratica");
+if (Validator.isNull(intPratica)) {
+ intPratica = IntPraticaServiceUtil.getIntPratica(dettPratica.getIntPraticaId());
+}
+Territorio territorio = TerritorioLocalServiceUtil.getTerritorio(intPratica.getTerritorioId());
+Comune comune = ComuneLocalServiceUtil.getComune(territorio.getComuneId());
+Provincia provincia = ProvinciaLocalServiceUtil.fetchByC_C(territorio.getCompanyId(), territorio.getCodiceProvincia());
+boolean isDisabledMap = ParamUtil.getBoolean(request, "isDisabledMap", false);
+String urlIframeMappe = MappeUtil.getUrlBo(request, dettPratica, comune);
%>
-
+
-
-
-
-
-
\ No newline at end of file
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-log-portlet/.tern-project b/liferay-plugins-sdk-6.2/portlets/portos-log-portlet/.tern-project
new file mode 100644
index 00000000..a185ba0d
--- /dev/null
+++ b/liferay-plugins-sdk-6.2/portlets/portos-log-portlet/.tern-project
@@ -0,0 +1 @@
+{"ide":{"scriptPaths":[]},"plugins":{"aui":{},"liferay":{},"yui":{}},"libs":["ecma5","browser"]}
\ No newline at end of file