Port servlet mappe da Paesaggistica

liferay-plugins-sdk-6.2/hooks/portos-p7m-preview-hook/docroot/WEB-INF/src/it/tref/liferay/portlet/p7mpreview/P7mPreview.java

@@ -1,5 +1,7 @@
 package it.tref.liferay.portlet.p7mpreview;
 
+import java.util.List;
+
 import com.liferay.portal.kernel.lar.PortletDataContext;
 import com.liferay.portal.kernel.log.Log;
 import com.liferay.portal.kernel.log.LogFactoryUtil;
@@ -8,53 +10,42 @@ import com.liferay.portal.kernel.repository.model.FileVersion;
 import com.liferay.portal.kernel.xml.Element;
 import com.liferay.portlet.documentlibrary.util.DLPreviewableProcessor;
 
-import java.util.List;
-
 public class P7mPreview extends DLPreviewableProcessor {
 	Log _log = LogFactoryUtil.getLog(P7mPreview.class);
 
 	@Override
-	public void afterPropertiesSet() throws Exception {
+	public void afterPropertiesSet() throws Exception {}
-		// TODO Auto-generated method stub
-
-	}
 
 	@Override
 	public boolean isSupported(String mimeType) {
+
 		_log.info("isSupported(\"" + mimeType + "\"");
-		// TODO Auto-generated method stub
 		return false;
 	}
 
 	@Override
 	protected void doExportGeneratedFiles(PortletDataContext portletDataContext, FileEntry fileEntry,
-			Element fileEntryElement) throws Exception {
+			Element fileEntryElement) throws Exception {}
-		// TODO Auto-generated method stub
-
-	}
 
 	@Override
 	protected void doImportGeneratedFiles(PortletDataContext portletDataContext, FileEntry fileEntry,
-			FileEntry importedFileEntry, Element fileEntryElement) throws Exception {
+			FileEntry importedFileEntry, Element fileEntryElement) throws Exception {}
-		// TODO Auto-generated method stub
-
-	}
 
 	@Override
 	protected List<Long> getFileVersionIds() {
-		// TODO Auto-generated method stub
+
 		return null;
 	}
 
 	@Override
 	protected String getPreviewType(FileVersion fileVersion) {
-		// TODO Auto-generated method stub
+
 		return null;
 	}
 
 	@Override
 	protected String getThumbnailType(FileVersion fileVersion) {
-		// TODO Auto-generated method stub
+
 		return null;
 	}
 

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

@@ -13,8 +13,8 @@
 ##
 
     build.namespace=portos_atti
-    build.number=26
+    build.number=27
-    build.date=1629993357414
+    build.date=1636989706590
     build.auto.upgrade=true
 
 ##

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

@@ -183,6 +183,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

@@ -435,6 +435,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/tref/liferay/portos/bo/model/DettPratica.java

@@ -39,6 +39,18 @@ public interface DettPratica extends DettPraticaModel, PersistedModel {
 		throws com.liferay.portal.kernel.exception.PortalException,
 			com.liferay.portal.kernel.exception.SystemException;
 
+	public java.lang.String getUrlMappeBo(
+		javax.servlet.http.HttpServletRequest request,
+		it.tref.liferay.portos.bo.model.Comune comune, boolean readOnly)
+		throws com.liferay.portal.kernel.exception.PortalException,
+			com.liferay.portal.kernel.exception.SystemException;
+
+	public java.lang.String getUrlMappeFe(
+		javax.servlet.http.HttpServletRequest request,
+		it.tref.liferay.portos.bo.model.Comune comune, boolean readOnly)
+		throws com.liferay.portal.kernel.exception.PortalException,
+			com.liferay.portal.kernel.exception.SystemException;
+
 	public java.util.Set<java.lang.String> getTipiSoggettiAsseveranti()
 		throws com.liferay.portal.kernel.exception.PortalException,
 			com.liferay.portal.kernel.exception.SystemException;

liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/DettPraticaClp.java

@@ -8279,6 +8279,30 @@ public class DettPraticaClp extends BaseModelImpl<DettPratica>
 		}
 	}
 
+	@Override
+	public java.lang.String getUrlMappeBo(
+		javax.servlet.http.HttpServletRequest request,
+		it.tref.liferay.portos.bo.model.Comune comune, boolean readOnly) {
+		try {
+			String methodName = "getUrlMappeBo";
+
+			Class<?>[] parameterTypes = new Class<?>[] {
+					javax.servlet.http.HttpServletRequest.class,
+					it.tref.liferay.portos.bo.model.Comune.class, boolean.class
+				};
+
+			Object[] parameterValues = new Object[] { request, comune, readOnly };
+
+			java.lang.String returnObj = (java.lang.String)invokeOnRemoteModel(methodName,
+					parameterTypes, parameterValues);
+
+			return returnObj;
+		}
+		catch (Exception e) {
+			throw new UnsupportedOperationException(e);
+		}
+	}
+
 	@Override
 	public java.lang.String serializeToVersioningPage() {
 		try {
@@ -8336,6 +8360,30 @@ public class DettPraticaClp extends BaseModelImpl<DettPratica>
 		}
 	}
 
+	@Override
+	public java.lang.String getUrlMappeFe(
+		javax.servlet.http.HttpServletRequest request,
+		it.tref.liferay.portos.bo.model.Comune comune, boolean readOnly) {
+		try {
+			String methodName = "getUrlMappeFe";
+
+			Class<?>[] parameterTypes = new Class<?>[] {
+					javax.servlet.http.HttpServletRequest.class,
+					it.tref.liferay.portos.bo.model.Comune.class, boolean.class
+				};
+
+			Object[] parameterValues = new Object[] { request, comune, readOnly };
+
+			java.lang.String returnObj = (java.lang.String)invokeOnRemoteModel(methodName,
+					parameterTypes, parameterValues);
+
+			return returnObj;
+		}
+		catch (Exception e) {
+			throw new UnsupportedOperationException(e);
+		}
+	}
+
 	@Override
 	public java.util.Set<it.tref.liferay.portos.bo.model.Soggetto> getSoggettiAsseveranti() {
 		try {

liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/DettPraticaWrapper.java

@@ -8090,6 +8090,24 @@ public class DettPraticaWrapper implements DettPratica,
 		return _dettPratica.getSoggettiAsseveranti();
 	}
 
+	@Override
+	public java.lang.String getUrlMappeBo(
+		javax.servlet.http.HttpServletRequest request,
+		it.tref.liferay.portos.bo.model.Comune comune, boolean readOnly)
+		throws com.liferay.portal.kernel.exception.PortalException,
+			com.liferay.portal.kernel.exception.SystemException {
+		return _dettPratica.getUrlMappeBo(request, comune, readOnly);
+	}
+
+	@Override
+	public java.lang.String getUrlMappeFe(
+		javax.servlet.http.HttpServletRequest request,
+		it.tref.liferay.portos.bo.model.Comune comune, boolean readOnly)
+		throws com.liferay.portal.kernel.exception.PortalException,
+			com.liferay.portal.kernel.exception.SystemException {
+		return _dettPratica.getUrlMappeFe(request, comune, readOnly);
+	}
+
 	@Override
 	public java.util.Set<java.lang.String> getTipiSoggettiAsseveranti()
 		throws com.liferay.portal.kernel.exception.PortalException,

liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/util/AvvisoUtil.java

@@ -171,7 +171,6 @@ public class AvvisoUtil {
 
 	public static boolean isStatoPraticaValidoNuovoAvviso(String statoPratica) {
 
-		// TODO: In attesa di specifiche su stati validi
 		return getAllTipoDocumento().containsKey(statoPratica);
 	}
 }

liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/util/DelegheUtil.java

@@ -119,7 +119,6 @@ public class DelegheUtil {
 	public static boolean hasDelegaDeleteFile(long userId, long docPraticaId, boolean sezioneGeologica)
 			throws PortalException, SystemException {
 
-		// TODO completare e controllare
 		DocPratica docPratica = DocPraticaLocalServiceUtil.getDocPratica(docPraticaId);
 		boolean controllo = ValidazionePraticaUtil.praticaIsEditable(docPratica.getClassPk());
 		DettPratica dettPratica = DettPraticaLocalServiceUtil.getDettPratica(docPratica.getClassPk());
@@ -139,7 +138,6 @@ public class DelegheUtil {
 
 	public static boolean hasCambioStatoDelega(long userId, long delegaId) throws PortalException, SystemException {
 
-		// TODO completare e controllare
 		boolean controllo = true;
 		Delega delega = DelegaLocalServiceUtil.getDelega(delegaId);
 		IntPratica dettPratica = IntPraticaLocalServiceUtil.getIntPratica(delega.getIntPraticaId());
@@ -154,7 +152,6 @@ public class DelegheUtil {
 
 	public static boolean hasCreazioneDelega(long userId, long intPraticaId) throws PortalException, SystemException {
 
-		// TODO completare e controllare
 		boolean controllo = true;
 		IntPratica intPratica = IntPraticaLocalServiceUtil.getIntPratica(intPraticaId);
 		if (intPratica.getUserId() == userId) {

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

@@ -0,0 +1,104 @@
+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;
+	private Double lat;
+	private Double lng;
+	private String url;
+
+	public String getComune() {
+
+		return comune;
+	}
+
+	public String getDescrizione() {
+
+		return descrizione;
+	}
+
+	public String getEstremiCatastali() {
+
+		return estremiCatastali;
+	}
+
+	public Double getLat() {
+
+		return lat;
+	}
+
+	public Double getLng() {
+
+		return lng;
+	}
+
+	public String getNomeComune() {
+
+		return nomeComune;
+	}
+
+	public String getNumeroProgetto() {
+
+		return numeroProgetto;
+	}
+
+	public String getProvincia() {
+
+		return provincia;
+	}
+
+	public String getUrl() {
+
+		return url;
+	}
+
+	public void setComune(String comune) {
+
+		this.comune = comune;
+	}
+
+	public void setDescrizione(String descrizione) {
+
+		this.descrizione = descrizione;
+	}
+
+	public void setEstremiCatastali(String estremiCatastali) {
+
+		this.estremiCatastali = estremiCatastali;
+	}
+
+	public void setLat(Double lat) {
+
+		this.lat = lat;
+	}
+
+	public void setLng(Double lng) {
+
+		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/servlet/MappeServlet.java

@@ -0,0 +1,137 @@
+package it.mwg.sismica.bo.servlet;
+
+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;
+
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServlet;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import org.apache.commons.lang.StringUtils;
+
+import com.liferay.portal.kernel.dao.orm.DynamicQuery;
+import com.liferay.portal.kernel.dao.orm.QueryUtil;
+import com.liferay.portal.kernel.dao.orm.RestrictionsFactoryUtil;
+import com.liferay.portal.kernel.exception.PortalException;
+import com.liferay.portal.kernel.exception.SystemException;
+import com.liferay.portal.kernel.json.JSONFactoryUtil;
+import com.liferay.portal.kernel.json.JSONSerializer;
+import com.liferay.portal.kernel.log.Log;
+import com.liferay.portal.kernel.log.LogFactoryUtil;
+import com.liferay.portal.kernel.servlet.HttpHeaders;
+import com.liferay.portal.kernel.servlet.ServletResponseUtil;
+import com.liferay.portal.kernel.util.ContentTypes;
+import com.liferay.portal.kernel.util.ParamUtil;
+import com.liferay.portal.kernel.util.StringPool;
+import com.liferay.portal.kernel.util.Validator;
+import com.liferay.portal.util.PortalUtil;
+
+@SuppressWarnings("serial")
+public class MappeServlet extends HttpServlet {
+
+	public static final String CODICE_PROVINCIA = "p";
+	public static final String COMUNE_ID = "c";
+
+	private static final JSONSerializer serializer = JSONFactoryUtil.createJSONSerializer().exclude("*.class");
+	private static final Log _log = LogFactoryUtil.getLog(MappeServlet.class);
+
+	@Override
+	protected void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
+
+		switch (request.getPathInfo()) {
+			case "/list":
+				String codiceProvincia = ParamUtil.getString(request, CODICE_PROVINCIA);
+				long comuneId = ParamUtil.getLong(request, COMUNE_ID);
+				_log.info("p=" + codiceProvincia + "&c=" + comuneId);
+				if (Validator.isNull(codiceProvincia) && (0 == comuneId)) {
+					response.sendError(HttpServletResponse.SC_BAD_REQUEST, request.getRequestURI());
+				} else {
+					long companyId = PortalUtil.getCompanyId(request);
+					response.setContentType(ContentTypes.APPLICATION_JSON);
+					response.setCharacterEncoding(StringPool.UTF8);
+					String filename = (0 == comuneId ? "P-" + codiceProvincia : "C-" + comuneId) + ".json";
+					response.setHeader(HttpHeaders.CONTENT_DISPOSITION, "inline; filename=\"" + filename
+							+ StringPool.QUOTE);
+					ServletResponseUtil.write(response,
+							serializer.serializeDeep(getPratiche(companyId, codiceProvincia, comuneId)));
+				}
+				break;
+			default:
+				response.sendError(HttpServletResponse.SC_NOT_FOUND, request.getRequestURI());
+		}
+	}
+
+	private static List<MappeBean> getPratiche(long companyId, String codiceProvincia, long comuneId) {
+
+		List<MappeBean> result = new ArrayList<>();
+		try {
+			Set<Long> territori = new HashSet<>();
+			List<Comune> comuni = Collections.<Comune> emptyList();
+			if (0 == comuneId) {
+				comuni = ComuneLocalServiceUtil.findByC_CP(companyId, codiceProvincia);
+			} else {
+				try {
+					comuni = Arrays.<Comune> asList(ComuneLocalServiceUtil.getComune(comuneId));
+				} catch (PortalException e) {}
+			}
+			for (Comune comune : comuni) {
+				for (Territorio territorio : TerritorioLocalServiceUtil.findByComuneId(comune.getComuneId(),
+						QueryUtil.ALL_POS, QueryUtil.ALL_POS)) {
+					territori.add(territorio.getTerritorioId());
+				}
+			}
+			DynamicQuery dq = IntPraticaLocalServiceUtil.dynamicQuery();
+			dq.add(RestrictionsFactoryUtil.in("territorioId", territori));
+			dq.add(RestrictionsFactoryUtil.ne("numeroProgetto", StringPool.BLANK));
+			dq.add(RestrictionsFactoryUtil.isNotNull("numeroProgetto"));
+			@SuppressWarnings("unchecked")
+			List<IntPratica> pratiche = IntPraticaLocalServiceUtil.dynamicQuery(dq);
+			for (IntPratica pratica : pratiche) {
+				DettPratica dett = DettPraticaLocalServiceUtil.getLastCompletedByIntPratica(pratica.getIntPraticaId());
+				MappeBean bean = new MappeBean();
+				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());
+					String[] coordinate = StringUtils.split(dett.getLocalizzazioneGeografica(), '|');
+					if (coordinate.length > 1) {
+						bean.setLat(Double.valueOf(coordinate[0]));
+						bean.setLng(Double.valueOf(coordinate[1]));
+					}
+					if (Validator.isNotNull(bean.getEstremiCatastali()) || Validator.isNotNull(bean.getLng())) {
+						bean.setUrl(FascicoloURLUtil.getFascicoloBOViewURL(companyId, pratica.getIntPraticaId()));
+						result.add(bean);
+					}
+				} catch (PortalException e) {}
+			}
+		} catch (SystemException e) {
+			e.printStackTrace();
+		}
+		return result;
+	}
+}

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

@@ -1,5 +1,6 @@
 package it.mwg.sismica.bo.util;
 
+import it.mwg.sismica.bo.shared.util.Generics;
 import it.tref.liferay.portos.bo.model.Comune;
 import it.tref.liferay.portos.bo.model.DettPratica;
 import it.tref.liferay.portos.bo.model.IntPratica;
@@ -10,8 +11,6 @@ import it.tref.liferay.portos.bo.service.IntPraticaLocalServiceUtil;
 import it.tref.liferay.portos.bo.service.ProvinciaLocalServiceUtil;
 import it.tref.liferay.portos.bo.shared.util.ConfigurazioneConstants;
 
-import java.io.UnsupportedEncodingException;
-import java.net.URLEncoder;
 import java.util.Date;
 
 import javax.servlet.http.HttpServletRequest;
@@ -30,11 +29,10 @@ import com.liferay.portal.kernel.util.WebKeys;
 import com.liferay.portal.theme.ThemeDisplay;
 
 public class MappeUtil {
-
 	private static final Log _log = LogFactoryUtil.getLog(MappeUtil.class);
 
 	public static String getUrlFe(HttpServletRequest request, DettPratica dettPratica, Comune comune, boolean readOnly)
-			throws UnsupportedEncodingException, PortalException, SystemException {
+			throws PortalException, SystemException {
 
 		ThemeDisplay td = (ThemeDisplay) request.getAttribute(WebKeys.THEME_DISPLAY);
 		long companyId = td.getCompanyId();
@@ -44,7 +42,7 @@ public class MappeUtil {
 	}
 
 	public static String getUrlBo(HttpServletRequest request, DettPratica dettPratica, Comune comune, boolean readOnly)
-			throws UnsupportedEncodingException, PortalException, SystemException {
+			throws PortalException, SystemException {
 
 		ThemeDisplay td = (ThemeDisplay) request.getAttribute(WebKeys.THEME_DISPLAY);
 		long companyId = td.getCompanyId();
@@ -86,14 +84,14 @@ public class MappeUtil {
 			url = ConfigurazioneLocalServiceUtil
 					.findByC_ChiaveString(companyId, ConfigurazioneConstants.MAPPE_URL_IFRAME_RICERCA)
 					.replace("{{PROVINCIA}}", siglaProvincia).replace("{{COD_BELFIORE}}", codiceBelfiore)
-					.replace("{{URL}}", urlEncode(cb.toString()))
+					.replace("{{URL}}", Generics.urlEncode(cb.toString()))
 					+ StringPool.AMPERSAND + getAuth(companyId, request.getServerName());
 		}
 		return url;
 	}
 
 	private static String getUrlComune(HttpServletRequest request, String baseUrl, DettPratica dettPratica,
-			Comune comune, boolean readOnly) throws UnsupportedEncodingException, PortalException, SystemException {
+			Comune comune, boolean readOnly) throws PortalException, SystemException {
 
 		ThemeDisplay td = (ThemeDisplay) request.getAttribute(WebKeys.THEME_DISPLAY);
 		long companyId = td.getCompanyId();
@@ -103,7 +101,7 @@ public class MappeUtil {
 		String lng = StringPool.BLANK;
 		String numeroProgetto = StringPool.BLANK;
 		if (Validator.isNotNull(dettPratica)) {
-			estremiCatastali = urlEncode(dettPratica.getEstremiCatastali());
+			estremiCatastali = Generics.urlEncode(dettPratica.getEstremiCatastali());
 			String localizzazione = dettPratica.getLocalizzazioneGeografica();
 			if (Validator.isNotNull(localizzazione)) {
 				String[] coordinate = StringUtils.split(localizzazione, StringPool.PIPE);
@@ -119,7 +117,7 @@ public class MappeUtil {
 		String url = baseUrl;
 		url = url
 				.replace("{{COD_BELFIORE}}",
-						Validator.isNull(comune) ? StringPool.BLANK : urlEncode(comune.getCodiceBelfiore()))
+						Validator.isNull(comune) ? StringPool.BLANK : Generics.urlEncode(comune.getCodiceBelfiore()))
 				.replace("{{ESTREMI_CAT}}", estremiCatastali).replace("{{LAT}}", lat).replace("{{LNG}}", lng)
 				.replace("{{IDPRATICA}}", intPraticaId).replace("{{NPRATICA}}", numeroProgetto)
 				.replace("{{READONLY}}", String.valueOf(readOnly));
@@ -145,14 +143,4 @@ public class MappeUtil {
 		String auth = DigestUtils.sha256Hex(date + sharedSecret + serverName);
 		return "date=" + date + "&auth=" + auth;
 	}
-
-	private static String urlEncode(String str) {
-		String encoded;
-		try {
-			encoded = URLEncoder.encode(str, StringPool.UTF8);
-		} catch (UnsupportedEncodingException e) {
-			encoded = str;
-		}
-		return encoded;
-	}
 }

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

@@ -56,8 +56,6 @@ public class CollaudoImpl extends CollaudoBaseImpl {
 			}
 			sb.append("n. ");
 			if (Validator.isNotNull(getProtocollo())) {
-				// TODO da decidere che data, per adesso si mette quella di creazione il numero protocollo sbagliato
-				// dovrebbe essere il primo
 				sb.append(intPratica.getNumeroProgetto()).append(" del ")
 						.append(FastDateFormatFactoryUtil.getDate(locale).format(intPratica.getDtPratica()))
 						.append(" - id ").append(intPratica.getIntPraticaId());

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

@@ -8,6 +8,7 @@
 
 package it.tref.liferay.portos.bo.model.impl;
 
+
 /**
  * The extended model implementation for the Comune service. Represents a row in the "portos_amm_Comune"
  * database table, with each column mapped to a property of this class.

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

@@ -8,6 +8,8 @@
 
 package it.tref.liferay.portos.bo.model.impl;
 
+import it.mwg.sismica.bo.util.MappeUtil;
+import it.tref.liferay.portos.bo.model.Comune;
 import it.tref.liferay.portos.bo.model.IntPratica;
 import it.tref.liferay.portos.bo.model.Soggetto;
 import it.tref.liferay.portos.bo.service.DelegaLocalServiceUtil;
@@ -32,6 +34,8 @@ import java.util.Locale;
 import java.util.Map;
 import java.util.Set;
 
+import javax.servlet.http.HttpServletRequest;
+
 import org.apache.commons.lang.ArrayUtils;
 import org.codehaus.jettison.json.JSONObject;
 
@@ -771,6 +775,20 @@ public class DettPraticaImpl extends DettPraticaBaseImpl {
 		return soggettiAsseveranti;
 	}
 
+	@Override
+	public String getUrlMappeBo(HttpServletRequest request, Comune comune, boolean readOnly) throws PortalException,
+			SystemException {
+
+		return MappeUtil.getUrlBo(request, this, comune, readOnly);
+	}
+
+	@Override
+	public String getUrlMappeFe(HttpServletRequest request, Comune comune, boolean readOnly) throws PortalException,
+			SystemException {
+
+		return MappeUtil.getUrlFe(request, this, comune, readOnly);
+	}
+
 	@Override
 	public Set<String> getTipiSoggettiAsseveranti() throws PortalException, SystemException {
 
@@ -801,8 +819,6 @@ public class DettPraticaImpl extends DettPraticaBaseImpl {
 			}
 			sb.append("n. ");
 			if (Validator.isNotNull(getProtocollo())) {
-				// TODO da decidere che data, per adesso si mette quella di creazione il numero protocollo sbagliato
-				// dovrebbe essere il primo
 				sb.append(intPratica.getNumeroProgetto()).append(" del ").append(sdf.format(intPratica.getDtPratica()));
 			} else {
 				if (Validator.isNotNull(intPratica.getNumeroProgetto())) {

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

@@ -57,8 +57,6 @@ public class FineLavoriImpl extends FineLavoriBaseImpl {
 			}
 			sb.append("n. ");
 			if (Validator.isNotNull(getProtocollo())) {
-				// TODO da decidere che data, per adesso si mette quella di creazione il numero protocollo
-				// sbagliato dovrebbe essere il primo
 				sb.append(intPratica.getNumeroProgetto()).append(" del ")
 						.append(FastDateFormatFactoryUtil.getDate(locale).format(intPratica.getDtPratica()))
 						.append(" - id ").append(intPratica.getIntPraticaId());

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

@@ -10,7 +10,6 @@ package it.tref.liferay.portos.bo.model.impl;
 
 import com.liferay.portal.kernel.language.LanguageUtil;
 import com.liferay.portal.kernel.util.LocaleUtil;
-import com.liferay.portal.kernel.util.StringPool;
 import com.liferay.portal.kernel.util.Validator;
 
 /**
@@ -37,7 +36,7 @@ public class SoggettoImpl extends SoggettoBaseImpl {
 		StringBuilder sb = new StringBuilder(LanguageUtil.get(LocaleUtil.ITALIAN, "gc-soggetto-"
 				+ getTipologiaSoggetto()));
 		if (Validator.isNotNull(getAmbitoProfessione())) {
-			sb.append(StringPool.SPACE).append(StringPool.DASH).append(StringPool.SPACE);
+			sb.append(" - ");
 			if (getAmbitoProfessione().equalsIgnoreCase("ambitoProf-altro")) {
 				sb.append(getAmbitoAttivita());
 			} else {
@@ -51,15 +50,15 @@ public class SoggettoImpl extends SoggettoBaseImpl {
 	public String getDescrizioneCompleta() {
 
 		StringBuilder descrizione = new StringBuilder();
-		descrizione.append(getCodiceFiscale().toUpperCase()).append(StringPool.SPACE).append(StringPool.DASH);
+		descrizione.append(getCodiceFiscale().toUpperCase()).append(" -");
 		if (Validator.isNotNull(getCognome())) {
-			descrizione.append(StringPool.SPACE).append(getCognome());
+			descrizione.append(' ').append(getCognome());
 		}
 		if (Validator.isNotNull(getNome())) {
-			descrizione.append(StringPool.SPACE).append(getNome());
+			descrizione.append(' ').append(getNome());
 		}
 		if (Validator.isNotNull(getDenominazione())) {
-			descrizione.append(StringPool.SPACE).append(getDenominazione());
+			descrizione.append(' ').append(getDenominazione());
 		}
 		return descrizione.toString();
 	}
@@ -69,13 +68,13 @@ public class SoggettoImpl extends SoggettoBaseImpl {
 
 		StringBuilder descrizione = new StringBuilder();
 		if (Validator.isNotNull(getCognome())) {
-			descrizione.append(StringPool.SPACE).append(getCognome());
+			descrizione.append(' ').append(getCognome());
 		}
 		if (Validator.isNotNull(getNome())) {
-			descrizione.append(StringPool.SPACE).append(getNome());
+			descrizione.append(' ').append(getNome());
 		}
 		if (Validator.isNotNull(getDenominazione())) {
-			descrizione.append(StringPool.SPACE).append(getDenominazione());
+			descrizione.append(' ').append(getDenominazione());
 		}
 		return descrizione.toString();
 	}
@@ -83,7 +82,7 @@ public class SoggettoImpl extends SoggettoBaseImpl {
 	@Override
 	public String getDescrizioneRuolo() {
 
-		return getDescrizioneCompleta() + StringPool.SPACE + StringPool.DASH + StringPool.SPACE
+		return getDescrizioneCompleta() + " - "
 				+ LanguageUtil.get(LocaleUtil.getSiteDefault(), "gc-soggetto-" + getTipologiaSoggetto());
 	}
 
@@ -93,6 +92,6 @@ public class SoggettoImpl extends SoggettoBaseImpl {
 		if (Validator.isNotNull(getDenominazione())) {
 			return getDenominazione();
 		}
-		return getNome() + StringPool.SPACE + getCognome();
+		return getNome() + ' ' + getCognome();
 	}
 }

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

@@ -50,7 +50,6 @@ public class KaleoInstanceTokenModelListener extends BaseModelListener<KaleoInst
 	public void onAfterAddAssociation(Object classPK, String associationClassName, Object associationClassPK)
 			throws ModelListenerException {
 
-		// TODO Auto-generated method stub
 		super.onAfterAddAssociation(classPK, associationClassName, associationClassPK);
 	}
 
@@ -62,10 +61,8 @@ public class KaleoInstanceTokenModelListener extends BaseModelListener<KaleoInst
 			cp = ControlloPraticaLocalServiceUtil.getControlloPratica(model.getClassPK());
 			this.gestioneWFVarianti(cp, model);
 		} catch (PortalException | SystemException e) {
-			// TODO Auto-generated catch block
 			e.printStackTrace();
 		}
-		// TODO Auto-generated method stub
 		super.onAfterCreate(model);
 	}
 
@@ -139,7 +136,6 @@ public class KaleoInstanceTokenModelListener extends BaseModelListener<KaleoInst
 	public void onAfterRemoveAssociation(Object classPK, String associationClassName, Object associationClassPK)
 			throws ModelListenerException {
 
-		// TODO Auto-generated method stub
 		super.onAfterRemoveAssociation(classPK, associationClassName, associationClassPK);
 	}
 
@@ -147,21 +143,18 @@ public class KaleoInstanceTokenModelListener extends BaseModelListener<KaleoInst
 	public void onBeforeAddAssociation(Object classPK, String associationClassName, Object associationClassPK)
 			throws ModelListenerException {
 
-		// TODO Auto-generated method stub
 		super.onBeforeAddAssociation(classPK, associationClassName, associationClassPK);
 	}
 
 	@Override
 	public void onBeforeCreate(KaleoInstanceToken model) throws ModelListenerException {
 
-		// TODO Auto-generated method stub
 		super.onBeforeCreate(model);
 	}
 
 	@Override
 	public void onBeforeRemove(KaleoInstanceToken model) throws ModelListenerException {
 
-		// TODO Auto-generated method stub
 		super.onBeforeRemove(model);
 	}
 
@@ -169,14 +162,12 @@ public class KaleoInstanceTokenModelListener extends BaseModelListener<KaleoInst
 	public void onBeforeRemoveAssociation(Object classPK, String associationClassName, Object associationClassPK)
 			throws ModelListenerException {
 
-		// TODO Auto-generated method stub
 		super.onBeforeRemoveAssociation(classPK, associationClassName, associationClassPK);
 	}
 
 	@Override
 	public void onBeforeUpdate(KaleoInstanceToken model) throws ModelListenerException {
 
-		// TODO Auto-generated method stub
 		super.onBeforeUpdate(model);
 	}
 }

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

@@ -46,7 +46,6 @@ public class KaleoLogModelListener extends BaseModelListener<KaleoLog> {
 	public void onAfterAddAssociation(Object classPK, String associationClassName, Object associationClassPK)
 			throws ModelListenerException {
 
-		// TODO Auto-generated method stub
 		super.onAfterAddAssociation(classPK, associationClassName, associationClassPK);
 	}
 
@@ -77,14 +76,12 @@ public class KaleoLogModelListener extends BaseModelListener<KaleoLog> {
 	public void onAfterRemoveAssociation(Object classPK, String associationClassName, Object associationClassPK)
 			throws ModelListenerException {
 
-		// TODO Auto-generated method stub
 		super.onAfterRemoveAssociation(classPK, associationClassName, associationClassPK);
 	}
 
 	@Override
 	public void onAfterUpdate(KaleoLog model) throws ModelListenerException {
 
-		// TODO Auto-generated method stub
 		super.onAfterUpdate(model);
 	}
 
@@ -92,21 +89,18 @@ public class KaleoLogModelListener extends BaseModelListener<KaleoLog> {
 	public void onBeforeAddAssociation(Object classPK, String associationClassName, Object associationClassPK)
 			throws ModelListenerException {
 
-		// TODO Auto-generated method stub
 		super.onBeforeAddAssociation(classPK, associationClassName, associationClassPK);
 	}
 
 	@Override
 	public void onBeforeCreate(KaleoLog model) throws ModelListenerException {
 
-		// TODO Auto-generated method stub
 		super.onBeforeCreate(model);
 	}
 
 	@Override
 	public void onBeforeRemove(KaleoLog model) throws ModelListenerException {
 
-		// TODO Auto-generated method stub
 		super.onBeforeRemove(model);
 	}
 
@@ -114,14 +108,12 @@ public class KaleoLogModelListener extends BaseModelListener<KaleoLog> {
 	public void onBeforeRemoveAssociation(Object classPK, String associationClassName, Object associationClassPK)
 			throws ModelListenerException {
 
-		// TODO Auto-generated method stub
 		super.onBeforeRemoveAssociation(classPK, associationClassName, associationClassPK);
 	}
 
 	@Override
 	public void onBeforeUpdate(KaleoLog model) throws ModelListenerException {
 
-		// TODO Auto-generated method stub
 		super.onBeforeUpdate(model);
 	}
 }

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

@@ -36,14 +36,12 @@ public class KaleoTaskInstanceTokenModelListener extends BaseModelListener<Kaleo
 	public void onAfterAddAssociation(Object classPK, String associationClassName, Object associationClassPK)
 			throws ModelListenerException {
 
-		// TODO Auto-generated method stub
 		super.onAfterAddAssociation(classPK, associationClassName, associationClassPK);
 	}
 
 	@Override
 	public void onAfterCreate(KaleoTaskInstanceToken model) throws ModelListenerException {
 
-		// TODO Auto-generated method stub
 		super.onAfterCreate(model);
 	}
 
@@ -68,7 +66,6 @@ public class KaleoTaskInstanceTokenModelListener extends BaseModelListener<Kaleo
 	public void onAfterRemoveAssociation(Object classPK, String associationClassName, Object associationClassPK)
 			throws ModelListenerException {
 
-		// TODO Auto-generated method stub
 		super.onAfterRemoveAssociation(classPK, associationClassName, associationClassPK);
 	}
 
@@ -76,21 +73,18 @@ public class KaleoTaskInstanceTokenModelListener extends BaseModelListener<Kaleo
 	public void onBeforeAddAssociation(Object classPK, String associationClassName, Object associationClassPK)
 			throws ModelListenerException {
 
-		// TODO Auto-generated method stub
 		super.onBeforeAddAssociation(classPK, associationClassName, associationClassPK);
 	}
 
 	@Override
 	public void onBeforeCreate(KaleoTaskInstanceToken model) throws ModelListenerException {
 
-		// TODO Auto-generated method stub
 		super.onBeforeCreate(model);
 	}
 
 	@Override
 	public void onBeforeRemove(KaleoTaskInstanceToken model) throws ModelListenerException {
 
-		// TODO Auto-generated method stub
 		super.onBeforeRemove(model);
 	}
 
@@ -98,14 +92,12 @@ public class KaleoTaskInstanceTokenModelListener extends BaseModelListener<Kaleo
 	public void onBeforeRemoveAssociation(Object classPK, String associationClassName, Object associationClassPK)
 			throws ModelListenerException {
 
-		// TODO Auto-generated method stub
 		super.onBeforeRemoveAssociation(classPK, associationClassName, associationClassPK);
 	}
 
 	@Override
 	public void onBeforeUpdate(KaleoTaskInstanceToken model) throws ModelListenerException {
 
-		// TODO Auto-generated method stub
 		super.onBeforeUpdate(model);
 	}
 }

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

@@ -174,7 +174,6 @@ public class GestioneAttivitaPortlet extends MVCPortlet {
 			if (lastWorkflowTask != null && lastWorkflowTask.getWorkflowTaskId() == workflowTaskId
 					&& !lastWorkflowTask.getWorkflowTaskAssignees().isEmpty()) {
 				Role role = null;
-				// TODO listare meglio
 				switch (lastWorkflowTask.getName().toLowerCase()) {
 					case WorkflowConstants.WORKFLOW_TASKNAME_ASSEGNAZIONE:
 						role = RoleLocalServiceUtil.getRole(serviceContext.getCompanyId(),

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

@@ -4,10 +4,8 @@ import it.mwg.sismica.bo.util.AllegatiUtil;
 import it.mwg.sismica.bo.util.ManutenzioneDatabase;
 import it.mwg.sismica.bo.util.SismicaUtil;
 import it.mwg.sismica.bo.util.SorteggioPraticaUtil;
-import it.tref.liferay.portos.bo.service.ConfigurazioneLocalServiceUtil;
 import it.tref.liferay.portos.bo.service.ConfigurazioneServiceUtil;
 import it.tref.liferay.portos.bo.service.IntPraticaLocalServiceUtil;
-import it.tref.liferay.portos.bo.shared.util.ConfigurazioneConstants;
 
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
@@ -35,24 +33,6 @@ public class SismicaAdministrationPortlet extends MVCPortlet {
 
 	private static final Log _log = LogFactoryUtil.getLog(SismicaAdministrationPortlet.class);
 
-	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>();
 
@@ -60,7 +40,6 @@ public class SismicaAdministrationPortlet extends MVCPortlet {
 		for (Map.Entry<String, String> entry : System.getenv().entrySet()) {
 			esito.add(entry.getKey() + StringPool.EQUAL + entry.getValue());
 		}
-
 		esito.add("<h3>Properties</h3>");
 		for (Map.Entry<Object, Object> entry : System.getProperties().entrySet()) {
 			esito.add(entry.getKey() + StringPool.EQUAL + entry.getValue());
@@ -69,12 +48,8 @@ public class SismicaAdministrationPortlet extends MVCPortlet {
 	}
 
 	public void generaDocumenti(ActionRequest actionRequest, ActionResponse actionResponse) {
-		// ThemeDisplay td = (ThemeDisplay) actionRequest.getAttribute(WebKeys.THEME_DISPLAY);
+
 		List<String> esito = new ArrayList<>();
-		// try {
-		// } catch (PortalException | SystemException e) {
-		// esito.add("Errore durante l'invio " + e.getMessage());
-		// }
 		actionResponse.setRenderParameter("esito", esito.toArray(new String[esito.size()]));
 	}
 
@@ -83,6 +58,7 @@ public class SismicaAdministrationPortlet extends MVCPortlet {
 	}
 
 	public void resetFirme(ActionRequest actionRequest, ActionResponse actionResponse) {
+
 		ThemeDisplay td = (ThemeDisplay) actionRequest.getAttribute(WebKeys.THEME_DISPLAY);
 		String numeroProgetto = ParamUtil.getString(actionRequest, "numeroProgetto");
 		List<String> esito = new ArrayList<>();
@@ -95,6 +71,7 @@ public class SismicaAdministrationPortlet extends MVCPortlet {
 	}
 
 	public void trasformaFLC(ActionRequest actionRequest, ActionResponse actionResponse) {
+
 		ThemeDisplay td = (ThemeDisplay) actionRequest.getAttribute(WebKeys.THEME_DISPLAY);
 		String numeroPratica = ParamUtil.getString(actionRequest, "numeroPratica");
 		String tipoDaRiaprire = ParamUtil.getString(actionRequest, "tipoDaRiaprire");
@@ -124,6 +101,7 @@ public class SismicaAdministrationPortlet extends MVCPortlet {
 	}
 
 	public void reIndexFascicoli(ActionRequest actionRequest, ActionResponse actionResponse) {
+
 		ThemeDisplay themeDisplay = (ThemeDisplay) actionRequest.getAttribute(WebKeys.THEME_DISPLAY);
 		List<String> esito = null;
 		esito = SismicaUtil.reIndexFascicoli(themeDisplay.getCompanyId());
@@ -132,6 +110,7 @@ public class SismicaAdministrationPortlet extends MVCPortlet {
 	}
 
 	public void lanciaSorteggio(ActionRequest actionRequest, ActionResponse actionResponse) {
+
 		ThemeDisplay themeDisplay = (ThemeDisplay) actionRequest.getAttribute(WebKeys.THEME_DISPLAY);
 		List<String> esito = null;
 		_log.info("Sorteggio lanciato manualmente");
@@ -147,6 +126,7 @@ public class SismicaAdministrationPortlet extends MVCPortlet {
 
 	public void manutenzioneDatabase(ActionRequest actionRequest, ActionResponse actionResponse)
 			throws PortalException, SystemException {
+
 		String mode = ParamUtil.getString(actionRequest, "mode");
 		ServiceContext serviceContext = ServiceContextFactory.getInstance(actionRequest);
 		List<String> esito = ManutenzioneDatabase.pulisci(serviceContext, mode);
@@ -154,6 +134,7 @@ public class SismicaAdministrationPortlet extends MVCPortlet {
 	}
 
 	public void inviaAvviso(ActionRequest actionRequest, ActionResponse actionResponse) throws SystemException {
+
 		SismicaUtil.inviaAvviso(actionRequest, actionResponse);
 	}
 
@@ -163,13 +144,9 @@ public class SismicaAdministrationPortlet extends MVCPortlet {
 		ServiceContext serviceContext = ServiceContextFactory.getInstance(actionRequest);
 		serviceContext.setScopeGroupId(-1L);
 		serviceContext.setCompanyId(serviceContext.getCompanyId());
-
 		SimpleDateFormat sdf = new SimpleDateFormat("dd/MM/yyyy");
-
 		Date dataProssimoSorteggio = ParamUtil.getDate(actionRequest, "dataProssimoSorteggio", sdf);
-
 		ConfigurazioneServiceUtil.storeConfig("conf.geniocivile.sorteggio.data.prossimo.sorteggio",
 				sdf.format(dataProssimoSorteggio), serviceContext);
-
 	}
 }

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

@@ -56,7 +56,6 @@ public class SchedulerEstrazioneFirme implements MessageListener {
 			try {
 				for (Company company : CompanyLocalServiceUtil.getCompanies()) {
 					// campo abilitazione scheduler
-					// TODO creare la configurazione aggiuntiva per lo scheduler estrazione firme
 					boolean condition = Boolean.parseBoolean(ConfigurazioneLocalServiceUtil.findByC_ChiaveString(
 							company.getCompanyId(), ConfigurazioneConstants.SCHEDULER_FIRMA_DOCUMENTO));
 					if (condition) {

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

@@ -458,7 +458,6 @@ public class SchedulerInvioDocumento implements MessageListener {
 	private void gestioneTempistica(Avviso avviso, ControlloPratica controlloPratica) throws SystemException,
 			PortalException {
 
-		// FIXME la tempistica non va bene mette le date sbagliate
 		String tipoDocumento = avviso.getTipoDocumento();
 		Date dtInvio = avviso.getDtInvio();
 		if (tipoDocumento.equals(StatoPraticaConstants.SOTTOPOSTA_A_PARERE)) {

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

@@ -442,7 +442,6 @@ public class AsseverazioneLocalServiceImpl extends AsseverazioneLocalServiceBase
 
 		Asseverazione asseverazione = getAsseverazione(asseverazioneId);
 		DettPratica dettPratica = dettPraticaLocalService.getLastEditableByIntPratica(asseverazione.getIntPraticaId());
-		// TODO forse dobbiamo mettere i permesssi ma non mi pare sicuro.
 		FileEntry fileEntry = null;
 		if (asseverazione.getEsito().equalsIgnoreCase(AsseverazioniUtil.STATO_ASSEGNATA)) {
 			long defaultFolderId = configurazioneLocalService.findByC_ChiaveLong(serviceContext.getCompanyId(),

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

@@ -311,7 +311,6 @@ public class ControlloPraticaLocalServiceImpl extends ControlloPraticaLocalServi
 			codiceFiscale = GestioneFirmeUtil.getCodiceFiscaleFirma(controlloPratica.getCompanyId(),
 					controlloPratica.getGroupId(), statoPratica);
 		}
-		// TODO Da riempire
 		String jsonParameters = StringPool.BLANK;
 		avvisoLocalService.createStandardAvvisoPratica(controlloPratica.getIntPraticaId(), statoPratica,
 				jsonParameters, dettPratica.getDettPraticaId(), DettPratica.class.getName(), serviceContext,
@@ -522,12 +521,6 @@ public class ControlloPraticaLocalServiceImpl extends ControlloPraticaLocalServi
 		return result;
 	}
 
-	/*
-	 * TODO Controllare bene il processo. Ci deve essere un modo per capire se sono pratiche da importare o nuove. A mio
-	 * parere (scuti) dovrebbe essere: if
-	 * (TipoIntegrazioneUtil.RICHIESTA_INTEGRAZIONE.equalsIgnoreCase(dettPratica.getTipoIntegrazione())) { return
-	 * "portos1_integrazioni"; } else { return "portos1_esito"; }
-	 */
 	@Override
 	public String getReturnValueScriptIniziale(long controlloPraticaId) throws PortalException, SystemException {
 

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

@@ -229,7 +229,6 @@ public class DettPraticaServiceImpl extends DettPraticaServiceBaseImpl {
 	@Override
 	public DettPratica fetchDettPratica(long dettPraticaId) throws SystemException {
 
-		// TODO permessi
 		return dettPraticaLocalService.fetchDettPratica(dettPraticaId);
 	}
 

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

@@ -225,7 +225,6 @@ public class DocPraticaLocalServiceImpl extends DocPraticaLocalServiceBaseImpl {
 		Territorio territorio = territorioPersistence.fetchByPrimaryKey(intPratica.getTerritorioId());
 		long companyId = territorio.getCompanyId();
 		long groupId = territorio.getGroupId();
-		// TODO forse è meglio ragionare con un'altra logica per i permessi
 		User user = userLocalService.getRoleUsers(
 				RoleLocalServiceUtil.getRole(intPratica.getCompanyId(), RoleConstants.ADMINISTRATOR).getRoleId())
 				.get(0);

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

@@ -43,7 +43,6 @@ public class DocPraticaServiceImpl extends DocPraticaServiceBaseImpl {
 			boolean aggiornato, String jsonFirmatari, long intPraticaIdRimozione, long dettPraticaIdRimozione,
 			Date dtDataRimozione, ServiceContext serviceContext) throws PortalException, SystemException {
 
-		// TODO aggiungere controlli di permessi di aggiunta file!!!!
 		return docPraticaLocalService.addDocPratica(userId, className, classPk, intPraticaId, dlFileEntry, fileName,
 				version, praticaValidata, descLong, tipologia, sha256, aggiornato, jsonFirmatari,
 				dettPraticaIdRimozione, dtDataRimozione, serviceContext);
@@ -52,14 +51,12 @@ public class DocPraticaServiceImpl extends DocPraticaServiceBaseImpl {
 	@Override
 	public DocPratica getDocPratica(long docPraticaId) throws PortalException, SystemException {
 
-		// TODO permessi
 		return docPraticaLocalService.getDocPratica(docPraticaId);
 	}
 
 	@Override
 	public int countByClassPk_Tipologia(long classPk, String tipologia) throws SystemException {
 
-		// TODO permessi
 		return docPraticaLocalService.countByClassPk_Tipologia(classPk, tipologia);
 	}
 
@@ -67,7 +64,6 @@ public class DocPraticaServiceImpl extends DocPraticaServiceBaseImpl {
 	public List<DocPratica> findByClassPk_Tipologia(long dettPratica, String tipologia, int start, int end)
 			throws SystemException {
 
-		// TODO permessi
 		return docPraticaLocalService.findByClassPk_Tipologia(dettPratica, tipologia, start, end);
 	}
 
@@ -75,7 +71,6 @@ public class DocPraticaServiceImpl extends DocPraticaServiceBaseImpl {
 	public List<DocPratica> findByIntPratica_Tipologia(long intPraticaId, String tipologia, int start, int end)
 			throws SystemException {
 
-		// TODO permessi
 		return docPraticaLocalService.findByIntPratica_Tipologia(intPraticaId, tipologia, start, end);
 	}
 
@@ -101,7 +96,6 @@ public class DocPraticaServiceImpl extends DocPraticaServiceBaseImpl {
 	@Override
 	public List<DocPratica> getValidByIntPratica(long intPraticaId) throws SystemException {
 
-		// TODO permessi
 		return docPraticaLocalService.getValidByIntPratica(intPraticaId);
 	}
 
@@ -109,7 +103,6 @@ public class DocPraticaServiceImpl extends DocPraticaServiceBaseImpl {
 	public List<DocPratica> getValidByIntPratica_Tipologia(long intPraticaId, String tipologia, int start, int end)
 			throws SystemException {
 
-		// TODO permessi
 		return docPraticaLocalService.getValidByIntPratica_Tipologia(intPraticaId, tipologia, start, end);
 	}
 
@@ -117,21 +110,18 @@ public class DocPraticaServiceImpl extends DocPraticaServiceBaseImpl {
 	public List<DocPratica> getValidTmpByIntPratica_Tipologia(long intPraticaId, String tipologia, int start, int end)
 			throws SystemException {
 
-		// TODO permessi
 		return docPraticaLocalService.getValidTmpByIntPratica_Tipologia(intPraticaId, tipologia, start, end);
 	}
 
 	@Override
 	public List<DocPratica> getInvalidByIntPratica(long intPraticaId) throws SystemException {
 
-		// TODO permessi
 		return docPraticaLocalService.getInvalidByIntPratica(intPraticaId);
 	}
 
 	@Override
 	public List<DocPratica> getInvalidTmpByIntPratica(long intPraticaId) throws SystemException {
 
-		// TODO permessi
 		return docPraticaLocalService.getInvalidTmpByIntPratica(intPraticaId);
 	}
 

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

@@ -498,10 +498,6 @@ public class IntPraticaLocalServiceImpl extends IntPraticaLocalServiceBaseImpl {
 		// sostituisci int pratica
 		intPratica.setUserId(soggettoId);
 		intPratica.setUserName(newUser.getFullName());
-		/*
-		 * TODO: verificare che sia veramente come implementato sotto oppure bisogna cambiare il titolare anche di tutti
-		 * i dettPratica
-		 */
 		DettPratica dettPratica = dettPraticaLocalService.getLastCompletedByIntPratica(intPraticaId);
 		dettPratica.setCodiceFiscaleDelegatoCommittente(newUser.getScreenName());
 		dettPraticaLocalService.updateDettPratica(dettPratica);
@@ -528,7 +524,6 @@ public class IntPraticaLocalServiceImpl extends IntPraticaLocalServiceBaseImpl {
 	@Override
 	public IntPratica updateIntPraticaSorteggio(long intPraticaId, Date dtSorteggio) throws SystemException {
 
-		// TODO vedere se va cambiato lo stato
 		return updateIntPraticaSorteggio(intPraticaId, dtSorteggio, null);
 	}
 
@@ -754,7 +749,6 @@ public class IntPraticaLocalServiceImpl extends IntPraticaLocalServiceBaseImpl {
 	@Override
 	public List<IntPratica> search(List<Long> groupIds, int start, int end) throws SystemException {
 
-		// TODO Modificare tramite Indexer
 		DynamicQuery dynamicQuery = intPraticaLocalService.dynamicQuery();
 		dynamicQuery.add(RestrictionsFactoryUtil.isNotNull("dtPratica"));
 		dynamicQuery.add(RestrictionsFactoryUtil.ne("statoPratica", StatoPraticaConstants.ANNULLATA));
@@ -764,7 +758,6 @@ public class IntPraticaLocalServiceImpl extends IntPraticaLocalServiceBaseImpl {
 	@Override
 	public int countSearch(List<Long> groupIds) throws SystemException {
 
-		// TODO Modificare tramite Indexer
 		DynamicQuery dynamicQuery = intPraticaLocalService.dynamicQuery();
 		dynamicQuery.add(RestrictionsFactoryUtil.isNotNull("dtPratica"));
 		dynamicQuery.add(RestrictionsFactoryUtil.ne("statoPratica", StatoPraticaConstants.ANNULLATA));
@@ -776,7 +769,6 @@ public class IntPraticaLocalServiceImpl extends IntPraticaLocalServiceBaseImpl {
 	public List<IntPratica> searchWithIntPraticaId(List<Long> groupIds, long intPraticaId, int start, int end)
 			throws SystemException {
 
-		// TODO Modificare tramite Indexer
 		DynamicQuery dynamicQuery = intPraticaLocalService.dynamicQuery();
 		dynamicQuery.add(RestrictionsFactoryUtil.eq("intPraticaId", intPraticaId));
 		dynamicQuery.add(RestrictionsFactoryUtil.isNotNull("dtPratica"));
@@ -787,7 +779,6 @@ public class IntPraticaLocalServiceImpl extends IntPraticaLocalServiceBaseImpl {
 	@Override
 	public int countSearchWithIntPraticaId(List<Long> groupIds, long intPraticaId) throws SystemException {
 
-		// TODO Modificare tramite Indexer
 		DynamicQuery dynamicQuery = intPraticaLocalService.dynamicQuery();
 		dynamicQuery.add(RestrictionsFactoryUtil.eq("intPraticaId", intPraticaId));
 		dynamicQuery.add(RestrictionsFactoryUtil.isNotNull("dtPratica"));

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

@@ -50,7 +50,6 @@ public class IntPraticaServiceImpl extends IntPraticaServiceBaseImpl {
 	@Override
 	public IntPratica getIntPratica(long intPraticaId) throws PortalException, SystemException {
 
-		// TODO: Permessi
 		return intPraticaLocalService.getIntPratica(intPraticaId);
 	}
 
@@ -96,16 +95,12 @@ public class IntPraticaServiceImpl extends IntPraticaServiceBaseImpl {
 	@Override
 	public List<IntPratica> search(List<Long> groupIds, int start, int end) throws SystemException {
 
-		// TODO Modificare tramite Indexer
-		// TODO Aggiungere controllo permessi
 		return intPraticaLocalService.search(groupIds, start, end);
 	}
 
 	@Override
 	public int countSearch(List<Long> groupIds) throws SystemException {
 
-		// TODO Modificare tramite Indexer
-		// TODO Aggiungere controllo permessi
 		return intPraticaLocalService.countSearch(groupIds);
 	}
 

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

@@ -112,7 +112,7 @@ public class ParereGeologoLocalServiceImpl extends ParereGeologoLocalServiceBase
 			}
 			return updateParereGeologo(parereGeologo);
 		} else {
-			// TODO error chi sta compilando non è il geologo designato o il geologo non esiste.
+			// chi sta compilando non è il geologo designato o il geologo non esiste.
 			return parereGeologo;
 		}
 	}

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

@@ -74,7 +74,6 @@ public class ParereGeologoServiceImpl extends ParereGeologoServiceBaseImpl {
 	@Override
 	public List<ParereGeologo> findByIntPraticaId(long intPraticaId, int start, int end) throws SystemException {
 
-		// TODO permessi
 		return parereGeologoLocalService.findByIntPraticaId(intPraticaId, start, end);
 	}
 
@@ -82,28 +81,24 @@ public class ParereGeologoServiceImpl extends ParereGeologoServiceBaseImpl {
 	public List<ParereGeologo> findByIntPraticaId_GeologoId(long intPraticaId, long geologoUserId, int start, int end)
 			throws SystemException {
 
-		// TODO permessi
 		return parereGeologoLocalService.findByIntPraticaId_GeologoId(intPraticaId, geologoUserId, start, end);
 	}
 
 	@Override
 	public int countByIntPraticaId_GeologoId(long intPraticaId, long geologoUserId) throws SystemException {
 
-		// TODO permessi
 		return parereGeologoLocalService.countByIntPraticaId_GeologoId(intPraticaId, geologoUserId);
 	}
 
 	@Override
 	public List<ParereGeologo> findByGeologoId(long geologoUserId, int start, int end) throws SystemException {
 
-		// TODO permessi
 		return parereGeologoLocalService.findByGeologoId(geologoUserId, start, end);
 	}
 
 	@Override
 	public int countByGeologoId(long geologoUserId) throws SystemException {
 
-		// TODO permessi
 		return parereGeologoLocalService.countByGeologoId(geologoUserId);
 	}
 }

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

@@ -240,7 +240,6 @@ public class SoggettoLocalServiceImpl extends SoggettoLocalServiceBaseImpl {
 		soggetto.setIntPraticaIdRimozione(intPraticaIdRimozione);
 		soggetto.setDettPraticaIdRimozione(dettPraticaIdRimozione);
 		soggetto.setDtDataRimozione(dtDataRimozione);
-		// TODO aggiornare
 		soggetto.setSoggettoSostituitoId(0l);
 		soggetto.setOldSoggettoId(oldSoggettoId);
 		soggetto.setTmp(tmp);

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

@@ -62,7 +62,6 @@ public class SoggettoServiceImpl extends SoggettoServiceBaseImpl {
 			long intPraticaIdRimozione, long dettPraticaIdRimozione, Date dtDataRimozione, long soggettoSostituitoId,
 			long oldSoggettoId, boolean tmp, ServiceContext serviceContext) throws PortalException, SystemException {
 
-		// TODO: permessi
 		return soggettoLocalService.addSoggetto(userId, dettPraticaId, intPraticaId, nome, cognome, codiceFiscale,
 				codiceFiscaleDelegato, dataNascita, provinciaNascita, comuneNascita, comuneDomicilio,
 				comuneDomicilioEstero, provinciaDomicilio, viaDomicilio, numeroCivicoDomicilio, capDomicilio,
@@ -77,14 +76,12 @@ public class SoggettoServiceImpl extends SoggettoServiceBaseImpl {
 	@Override
 	public Soggetto deleteSoggetto(Soggetto soggetto) throws PortalException, SystemException {
 
-		// TODO: permessi
 		return soggettoLocalService.deleteSoggetto(soggetto);
 	}
 
 	@Override
 	public Soggetto deleteSoggetto(long soggettoId) throws PortalException, SystemException {
 
-		// TODO: permessi
 		return soggettoLocalService.deleteSoggetto(soggettoId);
 	}
 
@@ -103,7 +100,6 @@ public class SoggettoServiceImpl extends SoggettoServiceBaseImpl {
 			Date dtDataRimozione, long soggettoSostituitoId, long oldSoggettoId, boolean tmp,
 			ServiceContext serviceContext) throws PortalException, SystemException {
 
-		// TODO: permessi
 		return soggettoLocalService.updateSoggetto(userId, soggettoId, dettPraticaId, intPraticaId, nome, cognome,
 				codiceFiscale, codiceFiscaleDelegato, dataNascita, provinciaNascita, comuneNascita, comuneDomicilio,
 				comuneDomicilioEstero, provinciaDomicilio, viaDomicilio, numeroCivicoDomicilio, capDomicilio,
@@ -126,7 +122,6 @@ public class SoggettoServiceImpl extends SoggettoServiceBaseImpl {
 	public List<Soggetto> findByIntPratica_TipologiaSoggetto(long intPraticaId, String tipologiaSoggetto)
 			throws SystemException {
 
-		// TODO: permessi
 		return soggettoLocalService.findByIntPratica_TipologiaSoggetto(intPraticaId, tipologiaSoggetto);
 	}
 
@@ -134,7 +129,6 @@ public class SoggettoServiceImpl extends SoggettoServiceBaseImpl {
 	public List<Soggetto> findByDettPratica_TipologiaSoggetto(long dettPraticaId, String tipologiaSoggetto)
 			throws SystemException {
 
-		// TODO: permessi
 		return soggettoLocalService.findByDettPratica_TipologiaSoggetto(dettPraticaId, tipologiaSoggetto);
 	}
 
@@ -142,7 +136,6 @@ public class SoggettoServiceImpl extends SoggettoServiceBaseImpl {
 	public List<Soggetto> findByIntPratica_TipologiaSoggetto_Rimosso(long intPraticaId, String tipologiaSoggetto,
 			boolean rimosso) throws SystemException {
 
-		// TODO: permessi
 		return soggettoLocalService
 				.findByIntPratica_TipologiaSoggetto_Rimosso(intPraticaId, tipologiaSoggetto, rimosso);
 	}
@@ -245,21 +238,18 @@ public class SoggettoServiceImpl extends SoggettoServiceBaseImpl {
 	@Override
 	public List<Soggetto> findByIntPratica(long intPraticaId) throws SystemException {
 
-		// TODO: permessi
 		return soggettoLocalService.findByIntPratica(intPraticaId);
 	}
 
 	@Override
 	public int countByIntPratica(long intPraticaId) throws SystemException {
 
-		// TODO: permessi
 		return soggettoLocalService.countByIntPratica(intPraticaId);
 	}
 
 	@Override
 	public List<Soggetto> findByDettPratica(long dettPraticaId) throws SystemException {
 
-		// TODO: permessi
 		return soggettoLocalService.findByDettPratica(dettPraticaId);
 	}
 
@@ -274,7 +264,6 @@ public class SoggettoServiceImpl extends SoggettoServiceBaseImpl {
 			String sourceFileName, String jsonFirmatari, ServiceContext serviceContext) throws SystemException,
 			PortalException {
 
-		// TODO permessi
 		return soggettoLocalService.allegaFileModifica(soggettoId, userId, intPraticaId, content, sourceFileName,
 				jsonFirmatari, serviceContext);
 	}

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

@@ -275,7 +275,6 @@ public class SorteggioLocalServiceImpl extends SorteggioLocalServiceBaseImpl {
 	@Override
 	public Sorteggio findByIntPratica(long intPraticaId) throws SystemException {
 
-		// XXX verificare se torna uno o piu
 		List<Sorteggio> sorteggis = sorteggioPersistence.findByIntPraticaId(intPraticaId);
 		return sorteggis != null && !sorteggis.isEmpty() ? sorteggis.get(0) : null;
 	}

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -32,7 +32,6 @@ public class RoleUpdateAction extends SimpleAction {
 	public void run(String[] ids) throws ActionException {
 
 		for (String companyId : ids) {
-			// TODO aggiunta di tutti i ruoli
 			try {
 				Role role = RoleLocalServiceUtil.fetchRole(Long.valueOf(companyId), Constants.ROLE_NAME_GEOLOGO);
 				if (Validator.isNull(role)) {

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

@@ -243,7 +243,7 @@ public abstract class PagamentiUtil {
 				long irisPagamentoId = PagamentoLocalServiceUtil.createPagamentoId();
 				currentURL = StringUtil.replaceLast(currentURL, "/0", StringPool.SLASH + irisPagamentoId);
 				String auth = HttpUtil.getParameter(currentURL, "p_auth", false);
-				// XXX Se non li rimuovi non funziona più
+				// Se non li rimuovi non funziona più
 				Map<String, String[]> parameters = HttpUtil.getParameterMap(HttpUtil.getQueryString(currentURL));
 				for (String key : parameters.keySet()) {
 					currentURL = HttpUtil.removeParameter(currentURL, key);

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=2735
+    build.number=2741
-    build.date=1636717649195
+    build.date=1637055953976
     build.auto.upgrade=true
 
 ##

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

@@ -1,2 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<web-app xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://java.sun.com/xml/ns/javaee" xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd" id="WebApp_ID" version="2.5"/>
+<web-app xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xmlns="http://java.sun.com/xml/ns/javaee"
+	xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd"
+	id="WebApp_ID" version="2.5">
+	<servlet>
+		<servlet-name>MappeServlet</servlet-name>
+		<servlet-class>it.mwg.sismica.bo.servlet.MappeServlet</servlet-class>
+	</servlet>
+	<servlet-mapping>
+		<servlet-name>MappeServlet</servlet-name>
+		<url-pattern>/mappe/*</url-pattern>
+	</servlet-mapping>
+</web-app>

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

@@ -23,7 +23,6 @@
 	IntPratica intPratica = IntPraticaLocalServiceUtil
 			.getIntPratica(intPraticaId);
 
-	// TODO: definire quando ....
 	boolean isWorkFlowSospendibile = WorkflowUtil
 			.isWorkflowDisattivabile(intPraticaId);
 	boolean isWorkFlowAvviabile = WorkflowUtil

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

@@ -29,7 +29,7 @@ DettPratica dettPraticaLastData = DettPraticaLocalServiceUtil.getLastCompletedBy
 
 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
+request.setAttribute("bean.dettPratica.lastData", DettPraticaLocalServiceUtil.getLastCompletedByIntPratica(intPratica.getIntPraticaId()));
 
 %>
 

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/sismica_administration/view.jsp

@@ -7,12 +7,8 @@
 <%@page import="java.util.Map"%>
 <%@ include file="/html/sismica_administration/init.jsp"%>
 <%
-long companyId = company.getCompanyId();
+String dataSorteggio = ConfigurazioneLocalServiceUtil.findByC_ChiaveString(company.getCompanyId(),
-String dataSorteggio = ConfigurazioneLocalServiceUtil.findByC_ChiaveString(companyId, ConfigurazioneConstants.DATE_ULTIMO_SORTEGGIO);
+		ConfigurazioneConstants.DATE_ULTIMO_SORTEGGIO);
-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-ui:error key="operazione-non-supportata" message="Operazione non supportata" />
 <liferay-ui:error key="invia-avviso-tipo-obbligatorio" message="Nessun tipo di avviso selezionato" />
@@ -49,18 +45,6 @@ String sharedSecret = ConfigurazioneServiceUtil.findByC_ChiaveString(companyId,
 			</div>
 		</aui:form>
 	</div>
-	<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="Salva" />
-			</div>
-		</aui:form>
-	</div>
 </div>
 
 <hr style="margin: 0" />

liferay-plugins-sdk-6.2/portlets/portos-calendar-appointments-portlet/docroot/WEB-INF/src/it/tref/portos/calendar/appointments/service/impl/DisponibilitaServiceImpl.java

@@ -1,13 +1,9 @@
 /**
- * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
+ * Copyright (c) 2000-present Liferay, Inc. All rights reserved. This library is free software; you can redistribute it
- *
+ * and/or modify it under the terms of the GNU Lesser General Public License as published by the Free Software
- * This library is free software; you can redistribute it and/or modify it under the terms of the
+ * Foundation; either version 2.1 of the License, or (at your option) any later version. This library is distributed in
- * GNU Lesser General Public License as published by the Free Software Foundation; either version
+ * the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * 2.1 of the License, or (at your option) any later version.
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
- *
- * This library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without
- * even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
  */
 
 package it.tref.portos.calendar.appointments.service.impl;
@@ -46,15 +42,12 @@ import com.liferay.portal.service.UserLocalServiceUtil;
 
 /**
  * The implementation of the disponibilita remote service.
- *
  * <p>
- * All custom service methods should be put in this class. Whenever methods are added, rerun
+ * All custom service methods should be put in this class. Whenever methods are added, rerun ServiceBuilder to copy
- * ServiceBuilder to copy their definitions into the
+ * their definitions into the {@link it.tref.portos.calendar.appointments.service.DisponibilitaService} interface.
- * {@link it.tref.portos.calendar.appointments.service.DisponibilitaService} interface.
- *
  * <p>
- * This is a remote service. Methods of this service are expected to have security checks based on
+ * This is a remote service. Methods of this service are expected to have security checks based on the propagated JAAS
- * the propagated JAAS credentials because this service can be accessed remotely.
+ * credentials because this service can be accessed remotely.
  * </p>
  *
  * @author 3F Consulting
@@ -63,41 +56,44 @@ import com.liferay.portal.service.UserLocalServiceUtil;
  */
 public class DisponibilitaServiceImpl extends DisponibilitaServiceBaseImpl {
 	/*
-	 * NOTE FOR DEVELOPERS:
+	 * NOTE FOR DEVELOPERS: Never reference this interface directly. Always use {@link
-	 * 
+	 * it.tref.portos.calendar.appointments.service.DisponibilitaServiceUtil} to access the disponibilita remote
-	 * Never reference this interface directly. Always use {@link
+	 * service.
-	 * it.tref.portos.calendar.appointments.service.DisponibilitaServiceUtil} to access the
-	 * disponibilita remote service.
 	 */
 
 	private static Log _log = LogFactoryUtil.getLog(DisponibilitaServiceImpl.class);
 
+	@Override
 	public Disponibilita addDisponibilita(long userId, long funzionarioId, Date startDate, Date endDate, long presidio,
 			ServiceContext serviceContext) throws SystemException, PortalException {
-		return disponibilitaLocalService.addDisponibilita(userId, funzionarioId, startDate, endDate, presidio, serviceContext);
+		return disponibilitaLocalService.addDisponibilita(userId, funzionarioId, startDate, endDate, presidio,
+				serviceContext);
 	}
 
+	@Override
 	public List<Disponibilita> addDisponibilitaGenerale(long presidio, long userId, Date dataInizioDisponibilita,
-			Date dataFineDisponibilita, String giornoSettimana, String oraInizioDisponibilita, String oraFineDisponibilita,
+			Date dataFineDisponibilita, String giornoSettimana, String oraInizioDisponibilita,
-			ServiceContext serviceContext) throws SystemException, PortalException {
+			String oraFineDisponibilita, ServiceContext serviceContext) throws SystemException, PortalException {
 
 		// ciclo su tutti i funzionari e chiamo il service su ogniuno di essi
 		List<Funzionario> funzionari = new ArrayList<Funzionario>();
-//		List<Funzionario> funzionari = funzionarioLocalService.findByPresidio(presidio);
+		// List<Funzionario> funzionari = funzionarioLocalService.findByPresidio(presidio);
 		List<Disponibilita> listDisponibilita = new ArrayList<>(funzionari.size());
 
 		long funzionarioId;
 
 		for (Funzionario funzionario : funzionari) {
 			funzionarioId = funzionario.getFunzionarioId();
-			listDisponibilita.add(disponibilitaLocalService.addDisponibilita(userId, funzionarioId, dataInizioDisponibilita,
+			listDisponibilita.add(disponibilitaLocalService.addDisponibilita(userId, funzionarioId,
-					dataFineDisponibilita, presidio, serviceContext));
+					dataInizioDisponibilita, dataFineDisponibilita, presidio, serviceContext));
 		}
 
 		return listDisponibilita;
 	}
 
-	public String verifyDisponibilitaByDateHour(String presidio, String date,String[] oreInizio, String idFunzionario) throws SystemException, ParseException {
+	@Override
+	public String verifyDisponibilitaByDateHour(String presidio, String date, String[] oreInizio, String idFunzionario)
+			throws SystemException, ParseException {
 
 		JSONObject json = JSONFactoryUtil.createJSONObject();
 		JSONArray array = JSONFactoryUtil.createJSONArray();
@@ -116,12 +112,10 @@ public class DisponibilitaServiceImpl extends DisponibilitaServiceBaseImpl {
 
 			Date dateVerify = formatDateTime(oraInizio, dateVerifyTemp);
 
+			List<Prenotazione> lista = PrenotazioneLocalServiceUtil.findByDateHourFunzionario(dateVerify,
+					Long.parseLong(idFunzionario), org.getGroupId());
 
-			List<Prenotazione> lista = 
+			if (lista.isEmpty()) {
-					PrenotazioneLocalServiceUtil.findByDateHourFunzionario(
-							dateVerify, Long.parseLong(idFunzionario), org.getGroupId());
-			
-			if(lista.isEmpty()){
 				jsonFiglio.put("disponibile", true);
 			} else {
 				jsonFiglio.put("disponibile", false);
@@ -130,60 +124,41 @@ public class DisponibilitaServiceImpl extends DisponibilitaServiceBaseImpl {
 			array.put(jsonFiglio);
 		}
 
-		json.put("slot",array);
+		json.put("slot", array);
 
 		return json.toString();
 	}
 
-	
+	@Override
 	public String getDisponibilitaByDate(String presidio, String date) throws SystemException, ParseException {
-		// TODO permessi
-
 
 		Organization organization = OrganizationLocalServiceUtil.fetchOrganization(Long.valueOf(presidio));
-		
 		List<User> userDefinitivo = new ArrayList<User>();
-		
 		try {
-		
+			if (organization != null) {
-			if(organization != null){
 				List<User> users = UserLocalServiceUtil.getOrganizationUsers(Long.valueOf(presidio));
-				
 				for (User user : users) {
-					
 					Role portosSupporto = RoleLocalServiceUtil.getRole(organization.getCompanyId(), "portos_supporto");
-					
+					Role portosIstruttore = RoleLocalServiceUtil.getRole(organization.getCompanyId(),
-					Role portosIstruttore = RoleLocalServiceUtil.getRole(organization.getCompanyId(), "portos_calendario");
+							"portos_calendario");
-					
+					if (!UserLocalServiceUtil.hasRoleUser(portosSupporto.getRoleId(), user.getUserId())) {
-					if(!UserLocalServiceUtil.hasRoleUser(portosSupporto.getRoleId(), user.getUserId())){
+						boolean isIstruttore = UserGroupRoleLocalServiceUtil.hasUserGroupRole(user.getUserId(),
-						
+								organization.getGroupId(), portosIstruttore.getRoleId());
-						boolean isIstruttore = UserGroupRoleLocalServiceUtil.hasUserGroupRole(
+						if (isIstruttore) {
-								user.getUserId(), organization.getGroupId(), portosIstruttore.getRoleId());
-						
-						
-						if(isIstruttore){
 							userDefinitivo.add(user);
 						}
 					}
 				}
-	
 			}
-
+		} catch (NumberFormatException | PortalException | SystemException e) {
-		} catch (NumberFormatException | SystemException e) {
+			_log.error(e, e);
-			_log.error(e,e);
-		} catch (PortalException e) {
-			_log.error(e,e);
 		}
-
 		Date startDate = new SimpleDateFormat("dd/MM/yyyy").parse(date);
-		
 		SimpleDateFormat sdf = new SimpleDateFormat("HH:mm");
-
 		JSONArray json = JSONFactoryUtil.createJSONArray();
 		for (User funzionario : userDefinitivo) {
-
+			List<Disponibilita> disponibilitaByFunzionario = disponibilitaLocalService
-			List<Disponibilita> disponibilitaByFunzionario =
+					.findByFunzionarioStartAndPresidio(funzionario.getUserId(), startDate, organization.getGroupId());
-					disponibilitaLocalService.findByFunzionarioStartAndPresidio(funzionario.getUserId(), startDate, organization.getGroupId());
 			if (disponibilitaByFunzionario.isEmpty()) {
 				continue;
 			}

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

@@ -13,8 +13,8 @@
 ##
 
     build.namespace=portos_calendar_appointments
-    build.number=174
+    build.number=176
-    build.date=1602593587481
+    build.date=1636988959145
     build.auto.upgrade=true
 
 ##

liferay-plugins-sdk-6.2/portlets/portos-calendar-appointments-portlet/ivy.xml.MD5

@@ -1 +1 @@
-76d0533b883f0f5314585308586d9d83
+4c011c888941fe61afd3a1627c1f69ff

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

@@ -62,7 +62,6 @@ public class AllegatiPraticaPortlet extends MVCPortlet {
 		long docPraticaId = ParamUtil.getLong(actionRequest, "docPraticaId");
 		String comingFrom = ParamUtil.getString(actionRequest, "comingFrom");
 		ServiceContext serviceContext = ServiceContextFactory.getInstance(actionRequest);
-		// TODO rivedere assolutamente il controllo
 		boolean controllo = false;
 		if (comingFrom.equalsIgnoreCase("page_fine_lavori") || comingFrom.equalsIgnoreCase("page_collaudo")) {
 			controllo = true;
@@ -128,7 +127,6 @@ public class AllegatiPraticaPortlet extends MVCPortlet {
 					long intPraticaIdRimozione = 0L;
 					long dettPraticaIdRimozione = 0L;
 					Date dtDataRimozione = null;
-					// TODO attenzione perche' questo controllo potrebbe non andare bene per integrazioni e varianti
 					boolean isUnivoco = DocumentiPraticaUtil.getDocUnivoci().contains(tipologia);
 					if (isUnivoco && DocPraticaLocalServiceUtil.countByClassPk_Tipologia(classPk, tipologia) > 0) {
 						SessionErrors.add(actionRequest, "error.geniocivilefe.allegato.univoco");
@@ -160,7 +158,6 @@ public class AllegatiPraticaPortlet extends MVCPortlet {
 		long docPraticaId = ParamUtil.getLong(actionRequest, "docPraticaId");
 		String comingFrom = ParamUtil.getString(actionRequest, "comingFrom");
 		ServiceContext serviceContext = ServiceContextFactory.getInstance(actionRequest);
-		// TODO rivedere assolutamente il controllo
 		boolean controllo = false;
 		if (comingFrom.equalsIgnoreCase("page_fine_lavori") || comingFrom.equalsIgnoreCase("page_collaudo")
 				|| comingFrom.equalsIgnoreCase("edit_soggetto")) {
@@ -180,7 +177,6 @@ public class AllegatiPraticaPortlet extends MVCPortlet {
 		long docPraticaId = ParamUtil.getLong(actionRequest, "docPraticaId");
 		String comingFrom = ParamUtil.getString(actionRequest, "comingFrom");
 		ServiceContext serviceContext = ServiceContextFactory.getInstance(actionRequest);
-		// TODO rivedere assolutamente il controllo
 		boolean controllo = false;
 		if (comingFrom.equalsIgnoreCase("page_fine_lavori") || comingFrom.equalsIgnoreCase("page_collaudo")) {
 			controllo = true;

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

@@ -930,7 +930,6 @@ public class FascicoloFePortlet extends MVCPortlet {
 				"codiceFiscaleDelegatoCollaudoEnabled");
 		String codiceFiscaleDelegatoCollaudo = isCodiceFiscaleDelegatoCollaudoAuthorized ? ParamUtil.getString(request,
 				"codiceFiscaleDelegatoCollaudo") : StringPool.BLANK;
-		// FIXME A che serve???
 		String codiceRuoloDelegato = ParamUtil.getString(request, "codiceRuoloDelegato");
 		boolean inizioLavoriContestualeOpera = ParamUtil.getBoolean(request, "inizioLavoriContestualeOpera");
 		long pagamentoId = ParamUtil.getLong(request, "pagamentoId");

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

@@ -1,5 +1,15 @@
 package it.tref.liferay.portos.fe.portlet;
 
+import it.tref.liferay.portos.bo.model.ParereGeologo;
+import it.tref.liferay.portos.bo.service.ParereGeologoLocalServiceUtil;
+import it.tref.liferay.portos.bo.service.ParereGeologoServiceUtil;
+import it.tref.liferay.portos.bo.util.MailUtil;
+
+import java.io.File;
+
+import javax.portlet.ActionRequest;
+import javax.portlet.ActionResponse;
+
 import com.liferay.portal.kernel.exception.PortalException;
 import com.liferay.portal.kernel.log.Log;
 import com.liferay.portal.kernel.log.LogFactoryUtil;
@@ -14,75 +24,53 @@ import com.liferay.portal.service.ServiceContextFactory;
 import com.liferay.portal.util.PortalUtil;
 import com.liferay.util.bridges.mvc.MVCPortlet;
 
-import it.tref.liferay.portos.bo.model.ParereGeologo;
-import it.tref.liferay.portos.bo.service.ParereGeologoLocalServiceUtil;
-import it.tref.liferay.portos.bo.service.ParereGeologoServiceUtil;
-import it.tref.liferay.portos.bo.util.MailUtil;
-
-import java.io.File;
-
-import javax.portlet.ActionRequest;
-import javax.portlet.ActionResponse;
-
-/**
- * Portlet implementation class FascicoloFePortlet
- */
 public class ParereGeologoPortlet extends MVCPortlet {
 
-  private static Log _log = LogFactoryUtil.getLog(ParereGeologoPortlet.class);
+	private static Log _log = LogFactoryUtil.getLog(ParereGeologoPortlet.class);
-
+
-  public void aggiornaParere(ActionRequest actionRequest, ActionResponse actionResponse) {
+	public void aggiornaParere(ActionRequest actionRequest, ActionResponse actionResponse) {
-
+
-    String parere = ParamUtil.getString(actionRequest, "parere");
+		String parere = ParamUtil.getString(actionRequest, "parere");
-    long intPraticaId = ParamUtil.getLong(actionRequest, "intPratica");
+		long intPraticaId = ParamUtil.getLong(actionRequest, "intPratica");
-    long parereGeologoId = ParamUtil.getLong(actionRequest, "parereGeologoId");
+		long parereGeologoId = ParamUtil.getLong(actionRequest, "parereGeologoId");
-
+		UploadPortletRequest uploadRequest = PortalUtil.getUploadPortletRequest(actionRequest);
-    UploadPortletRequest uploadRequest = PortalUtil.getUploadPortletRequest(actionRequest);
+		ServiceContext serviceContext;
-
+		try {
-    ServiceContext serviceContext;
+			ParereGeologo parereGeologo = ParereGeologoLocalServiceUtil.getParereGeologo(parereGeologoId);
-    try {
+			if (Validator.isNotNull(parereGeologo.getParere())) {
-      ParereGeologo parereGeologo = ParereGeologoLocalServiceUtil.getParereGeologo(parereGeologoId);
+				SessionErrors.add(actionRequest, "error-update-parere-geologo");
-      // TODO parere andrà rimosso se andrà implementata la modifica
+				return;
-      if (Validator.isNotNull(parereGeologo.getParere())) {
+			}
-        SessionErrors.add(actionRequest, "error-update-parere-geologo");
+			serviceContext = ServiceContextFactory.getInstance(actionRequest);
-        return;
+			byte[] content = null;
-      }
+			String fileName = uploadRequest.getFileName("docFile");
-     
+			File file = uploadRequest.getFile("docFile");
-      serviceContext = ServiceContextFactory.getInstance(actionRequest);
+			if (Validator.isNotNull(fileName) && file != null) {
-      byte[] content = null;
+				// lunghezza fissata a 200
-
+				if (fileName.length() > 200) {
-      String fileName = uploadRequest.getFileName("docFile");
+					SessionErrors.add(actionRequest, "error.geniocivilebo.pareregeologo.allegato.length.valid");
-      File file = uploadRequest.getFile("docFile");
+				}
-
+			}
-      if (Validator.isNotNull(fileName) && file != null) {
+			if (!SessionErrors.isEmpty(actionRequest)) {
-        // lunghezza fissata a 200
+				PortalUtil.copyRequestParameters(actionRequest, actionResponse);
-        if (fileName.length() > 200) {
+			} else {
-          SessionErrors.add(actionRequest, "error.geniocivilebo.pareregeologo.allegato.length.valid");
+				if (Validator.isNotNull(intPraticaId)) {
-        }
+					content = FileUtil.getBytes(file);
-      }
+				}
-
+			}
-      if (!SessionErrors.isEmpty(actionRequest)) {
+			_log.info("Aggiorna il parere per la intPratica " + intPraticaId + " il parere è: \n" + parere);
-        PortalUtil.copyRequestParameters(actionRequest, actionResponse);
+			if (Validator.isNull(parereGeologo.getParere())) {
-      } else {
+				ParereGeologoServiceUtil
-        if (Validator.isNotNull(intPraticaId)) {
+						.updateParereGeologo(parereGeologoId, parere, content, fileName, serviceContext);
-          content = FileUtil.getBytes(file);
+				// ADT: INVIO NOTIFICA PARERE ALL ISTRUTTORE
-        }
+				MailUtil.invioNotificaIstruttoreByGeologo(parereGeologoId, serviceContext);
-      }
+			} else {
-
+				throw new PortalException("parere già espresso");
-      _log.info("Aggiorna il parere per la intPratica " + intPraticaId + " il parere è: \n" + parere);
+			}
-      if (Validator.isNull(parereGeologo.getParere())) {
+			SessionMessages.add(actionRequest, "success-update-parere-geologo");
-        ParereGeologoServiceUtil.updateParereGeologo(parereGeologoId, parere, content, fileName, serviceContext);
+		} catch (Exception e) {
-        //ADT: INVIO NOTIFICA PARERE ALL ISTRUTTORE
+			_log.error(e, e);
-        MailUtil.invioNotificaIstruttoreByGeologo(parereGeologoId,serviceContext);
+			SessionErrors.add(actionRequest, "error-update-parere-geologo");
-        
+		}
-      } else {
+	}
-        throw new PortalException("parere già espresso");
-      }
-      SessionMessages.add(actionRequest, "success-update-parere-geologo");
-    } catch (Exception e) {
-      _log.error(e, e);
-      SessionErrors.add(actionRequest, "error-update-parere-geologo");
-    }
-
-  }
 }

liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/fe/util/ReportFascicoloUtil.java

@@ -1219,8 +1219,6 @@ public class ReportFascicoloUtil {
 		sb.append("n. ");
 		sb.append(intPratica.getNumeroProgetto());
 		SimpleDateFormat sdf = new SimpleDateFormat("dd/MM/yyyy");
-		// TODO da decidere che data, per adesso si mette quella di creazione il numero protocollo sbagliato dovrebbe
-		// essere il primo
 		sb.append(" del ");
 		sb.append(sdf.format(intPratica.getDtPratica()));
 		return sb.toString();

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

@@ -1,106 +1,94 @@
 <%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%>
-
 <%@include file="/html/fascicolofe/init.jsp" %>
-	
+<liferay-ui:panel title="filters" defaultState="closed" collapsible="true" extended="false" persistState="true"
-	<liferay-ui:panel title="filters" defaultState="closed"
+		id='<%= renderResponse.getNamespace() + scopeGroupId + "ricercaSaiPanel" %>'>
-		id='<%= renderResponse.getNamespace() + scopeGroupId + "ricercaSaiPanel" %>'
+	<div class="container-fluid" style="padding: 15px;">
-		collapsible="<%= true %>" extended="<%= false %>" persistState="<%= true %>">
+		<div class="row">
-
+			<div class="col-xs-12 col-md-3">
-				  <div class="container-fluid" style="padding: 15px;">
+				<aui:input type="text" name="numeroProgetto" label="Numero Progetto"/>
-                        <div class="row">
+			</div>
-                            <div class="col-xs-12  col-sm-12 col-md-3 col-lg-3">
+			<div class="col-xs-12 col-md-3">
-                                <aui:input type="text" name="numeroProgetto" label="Numero Progetto"/>
+				<aui:input type="text" name="protocollo" label="Protocollo"/>
-                            </div>
+			</div>
-                            <div class="col-xs-12  col-sm-12 col-md-3 col-lg-3">
+			<div class="col-xs-12 col-md-3">
-                                <aui:input type="text" name="protocollo" label="Protocollo"/>
+				<aui:select name="tipoPratica" label="Tipo Pratica">
-                            </div>
+					<aui:option value="-1">Seleziona il tipo di pratica</aui:option>
-                            <div class="col-xs-12  col-sm-12 col-md-3 col-lg-3">
+					<aui:option value="01"><liferay-ui:message key="deposito"/></aui:option>
-                                <aui:select name="tipoPratica" label="Tipo Pratica">
+					<aui:option value="02"><liferay-ui:message key="autorizzazione"/></aui:option>
-									<aui:option value="-1">Seleziona il tipo di pratica</aui:option> 
+					<aui:option value="03"><liferay-ui:message key="sanatoria"/></aui:option>
-									<aui:option value="01"><liferay-ui:message key="deposito"/></aui:option>
+				</aui:select>
-									<aui:option value="02"><liferay-ui:message key="autorizzazione"/></aui:option>
+			</div>
-									<aui:option value="03"><liferay-ui:message key="sanatoria"/></aui:option>
+			<div class="col-xs-12 col-md-3">
-								</aui:select>
+				<aui:select name="statoPratica" label="Stato Pratica">
-                            </div>
+					<aui:option value="-1">Stato Pratica</aui:option>
-                            <div class="col-xs-12  col-sm-12 col-md-3 col-lg-3">
+					<aui:option value="AL"><liferay-ui:message key="annullata"/></aui:option>
-                                <aui:select name="statoPratica" label="Stato Pratica">
+					<aui:option value="CL"><liferay-ui:message key="collaudo"/></aui:option>
-									<aui:option value="-1">Stato Pratica</aui:option> 
+					<aui:option value="CO"><liferay-ui:message key="conforme"/></aui:option>
-									<aui:option value="AL"><liferay-ui:message key="annullata"/></aui:option>
+					<aui:option value="sospesa"><liferay-ui:message key="sospesa"/></aui:option>
-									<aui:option value="CL"><liferay-ui:message key="collaudo"/></aui:option>
+					<aui:option value="FL"><liferay-ui:message key="fine lavori"/></aui:option>
-									<aui:option value="CO"><liferay-ui:message key="conforme"/></aui:option>
+					<aui:option value="CP"><liferay-ui:message key="collaudo parziale"/></aui:option>
-									<aui:option value="sospesa"><liferay-ui:message key="sospesa"/></aui:option>
+					<aui:option value="FP"><liferay-ui:message key="fine lavori parziali"/></aui:option>
-									<aui:option value="FL"><liferay-ui:message key="fine lavori"/></aui:option>
+					<aui:option value="VA"><liferay-ui:message key="variata"/></aui:option>
-									<aui:option value="CP"><liferay-ui:message key="collaudo parziale"/></aui:option>
+					<aui:option value="VI"><liferay-ui:message key="vidimata"/></aui:option>
-									<aui:option value="FP"><liferay-ui:message key="fine lavori parziali"/></aui:option>
+					<aui:option value="NC"><liferay-ui:message key="nonConforme"/></aui:option>
-									<aui:option value="VA"><liferay-ui:message key="variata"/></aui:option>
+					<aui:option value="IN"><liferay-ui:message key="integrazione in corso"/></aui:option>
-									<aui:option value="VI"><liferay-ui:message key="vidimata"/></aui:option>
+					<aui:option value="RI"><liferay-ui:message key="rifiutata"/></aui:option>
-									<aui:option value="NC"><liferay-ui:message key="nonConforme"/></aui:option>
+					<aui:option value="SO"><liferay-ui:message key="sorteggiata"/></aui:option>
-									<aui:option value="IN"><liferay-ui:message key="integrazione in corso"/></aui:option>
+					<aui:option value="SP"><liferay-ui:message key="sottoposta a parere"/></aui:option>
-									<aui:option value="RI"><liferay-ui:message key="rifiutata"/></aui:option>
+					<aui:option value="IC"><liferay-ui:message key="in compilazione"/></aui:option>
-									<aui:option value="SO"><liferay-ui:message key="sorteggiata"/></aui:option>
+				</aui:select>
-									<aui:option value="SP"><liferay-ui:message key="sottoposta a parere"/></aui:option>
+			</div>
-									<aui:option value="IC"><liferay-ui:message key="in compilazione"/></aui:option>
+		</div>
-								</aui:select>
+		<div class="row">
-                            </div>
+			<div class="col-xs-12">
-                        </div>
+				<aui:input label="Descrizione Intervento" name="descIntervento" type="textarea" placeholder="" />
-                       <div class="row">
+			</div>
-							<div class="col-xs-12  col-sm-12 col-md-12 col-lg-12">
+		</div>
-								<aui:input
+		<div class="row">
-									label="Descrizione Intervento"
+			<div class="col-xs-12 col-md-4">
-									name="descIntervento" type="textarea" placeholder="" />
+				<aui:input type="text" name="committente" label="Committente"/>
-							</div>
+			</div>
-						</div>
+			<div class="col-xs-12 col-md-4">
-						
+				<aui:input type="text" name="soggettiInterconnessi" label="Soggetti Interconnessi"/>
-						<div class="row">
+			</div>
-                           <div class="col-xs-12  col-sm-12 col-md-4 col-lg-4">
+			<div class="col-xs-12 col-md-4">
-                               <aui:input type="text" name="committente" label="Committente"/>
+			</div>
-                           </div>
+		</div>
-                           
+		<div class="row">
-                           <div class="col-xs-12  col-sm-12 col-md-4 col-lg-4">
+			<div class="col-xs-12 col-md-4">
-                               <aui:input type="text" name="soggettiInterconnessi" label="Soggetti Interconnessi"/>
+					<aui:field-wrapper label="Data richiesta da" inlineField="true">
-                           </div>
+					<liferay-util:include page="/html/common/input_date_time.jsp" servletContext="<%= application %>">
-                           <div class="col-xs-12  col-sm-12 col-md-4 col-lg-4">
+						<liferay-util:param name="field" value="dataRichiestaInizio" />
-                           </div>
+					</liferay-util:include>
-                        </div>   
+				</aui:field-wrapper>
-						
+				<aui:field-wrapper label="a" inlineField="true">
-					 	<div class="row">
+					<liferay-util:include page="/html/common/input_date_time.jsp" servletContext="<%= application %>">
-                           <div class="col-xs-12  col-sm-12 col-md-4 col-lg-4">
+						<liferay-util:param name="field" value="dataRichiestaFine" />
-                          		<aui:field-wrapper label="Data richiesta da" inlineField="<%= true %>">
+					</liferay-util:include>
-									<liferay-util:include page="/html/common/input_date_time.jsp" servletContext="<%= application %>">
+				</aui:field-wrapper>
-										<liferay-util:param name="field" value="dataRichiestaInizio" />
+			</div>
-									</liferay-util:include>
+			<div class="col-xs-12 col-md-4">
-								</aui:field-wrapper>
+				<div class="row">
-								<aui:field-wrapper label="a" inlineField="<%= true %>">
+					<div class="col-xs-12 col-md-6">
-									<liferay-util:include page="/html/common/input_date_time.jsp" servletContext="<%= application %>">
+						<aui:select name="ordinaPer" label="Ordina Per">
-										<liferay-util:param name="field" value="dataRichiestaFine" />
+							<aui:option value="numeroProgetto">Numero Progetto</aui:option>
-									</liferay-util:include>
+							<aui:option value="protocollo">Protocollo</aui:option>
-								</aui:field-wrapper>
+							<aui:option selected="true" value="dataCreazione">Data Creazione</aui:option>
-                           </div>
+						</aui:select>
-                           <div class="col-xs-12  col-sm-12 col-md-4 col-lg-4">
-                           		<div class="row">
-                           			<div class="col-xs-12  col-sm-12 col-md-6 col-lg-6">
-                           				<aui:select name="ordinaPer" label="Ordina Per">
-                          					<aui:option value="numeroProgetto">Numero Progetto</aui:option>
-                          					<aui:option value="protocollo">Protocollo</aui:option>
-                          					<aui:option selected="true" value="dataCreazione">Data Creazione</aui:option>
-                          				</aui:select>
-                           			</div>
-                           			<div class="col-xs-12  col-sm-12 col-md-6 col-lg-6">
-                           				<aui:select name="ordinaTipo" label="Tipo Ordine">
-                          					<aui:option selected="true" value="asc">Asc</aui:option>
-                          					<aui:option value="dec">Dec</aui:option>
-                          				</aui:select>
-                           			</div>
-                           		</div>
-                        	</div>
-                       </div>
-                       
-                       <div class="row">
-                       		<div class="col-xs-12  col-sm-12 col-md-4 col-lg-4">
-		                        <aui:button type="submit" value="search" />
-                       		</div>
-                       </div> 
 					</div>
-		
+					<div class="col-xs-12 col-md-6">
-	</liferay-ui:panel>
+						<aui:select name="ordinaTipo" label="Tipo Ordine">
-	
+							<aui:option selected="true" value="asc">Asc</aui:option>
+							<aui:option value="dec">Dec</aui:option>
+						</aui:select>
+					</div>
+				</div>
+			</div>
+		</div>
+		<div class="row">
+			<div class="col-xs-12 col-md-4">
+				<aui:button type="submit" value="search" />
+			</div>
+		</div>
+	</div>
+</liferay-ui:panel>

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

@@ -23,7 +23,6 @@
 <%@page import="it.tref.liferay.portos.bo.model.DettPratica"%>
 <%@page import="java.util.ArrayList"%>
 <%@page import="com.liferay.portal.kernel.util.KeyValuePair"%>
-<%@page import="it.mwg.sismica.bo.util.MappeUtil" %>
 <%@ include file="/html/fascicolofe/init.jsp"%>
 
 <%
@@ -55,7 +54,7 @@ boolean isNewVariante = ParamUtil.getBoolean(request, "isNewVariante");
 boolean isDisabled = disabledInput && !enabledByIntegrazione;
 
 String displayStyle = proceduraC ? "display:none" : StringPool.BLANK;
-String urlIframeMappe = MappeUtil.getUrlFe(request, dettPratica, comune, disabledInput || isGeoEditable);
+String urlIframeMappe = dettPratica.getUrlMappeFe(request, comune, disabledInput || isGeoEditable);
 %>
 
 <liferay-util:include page="/html/fascicolofe/navigator/header.jsp" servletContext="<%= application %>">

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

@@ -1,49 +1,33 @@
 <%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%>
-<%@page import="com.liferay.portal.kernel.util.ArrayUtil"%>
+<%@include file="/html/fascicolofe/init.jsp"%>
-<%@page import="com.liferay.portal.kernel.portlet.LiferayWindowState"%>
-<%@page import="com.liferay.portal.kernel.util.Validator"%>
-<%@page import="com.liferay.portal.kernel.util.StringUtil"%>
-<%@page import="com.liferay.portal.kernel.language.LanguageUtil"%>
-
-<%@include file="/html/fascicolofe/init.jsp" %>
 <%
 String formName = "fm_fascicolo";
 String buttonId = "saveAndCloseButton";
 %>
-
 <liferay-portlet:renderURL var="editUrl" >
-	<liferay-portlet:param name="mvcPath" value="/html/fascicolofe/edit_fascicolo.jsp"/>
+	<liferay-portlet:param name="mvcPath" value="/html/fascicolofe/edit_fascicolo.jsp" />
 </liferay-portlet:renderURL>
-
 <liferay-portlet:actionURL var="addFascicoloURL" name="addFascicolo">
-	<liferay-portlet:param name="successURL" value="<%=editUrl %>"/>
+	<liferay-portlet:param name="successURL" value="<%= editUrl %>" />
 </liferay-portlet:actionURL>
-
+<aui:nav-bar >
-	<aui:nav-bar >	
+	<aui:nav collapsible="false">
-		<aui:nav collapsible="false">	
+		<aui:nav-item id="<%= buttonId %>" iconCssClass="fa fa-plus" label="add-fascicolo" title="add-fascicolo"
-			<aui:nav-item 
+				href='javascript:void(0)' />
-				id="<%=buttonId %>"				
+	</aui:nav>
-				iconCssClass="fa fa-plus"
+</aui:nav-bar>
-				label="add-fascicolo"
-				title="add-fascicolo"
-				href='javascript:void(0)'
-			 />				 		 		 
-		</aui:nav>		
-	</aui:nav-bar>
-
 <aui:form name="<%= formName %>" method="post" action="<%= addFascicoloURL %>">
-	<div id='<%=renderResponse.getNamespace()+"saveAndCloseDiv" %>' class="hide" >	
+	<div id='<%= renderResponse.getNamespace() + "saveAndCloseDiv" %>' class="hide" >
-		<liferay-util:include page="/html/fascicolofe/edit_modal_fascicolo.jsp" servletContext="<%= application %>" >	
+		<liferay-util:include page="/html/fascicolofe/edit_modal_fascicolo.jsp" servletContext="<%= application %>">
-			<liferay-util:param name="formName" value="<%= formName %>"></liferay-util:param>
+			<liferay-util:param name="formName" value="<%= formName %>" />
 		</liferay-util:include>
 	</div>
 	<liferay-util:include page="/html/common/submit_window.jsp" servletContext="<%= application %>" >
-		<liferay-util:param name="formName" value="<%= formName %>"></liferay-util:param>
+		<liferay-util:param name="formName" value="<%= formName %>" />
-		<liferay-util:param name="titolo" value="Creazione Nuovo Progetto"></liferay-util:param>
+		<liferay-util:param name="titolo" value="Creazione Nuovo Progetto" />
-		<liferay-util:param name="buttonId" value="<%=buttonId %>"></liferay-util:param>
+		<liferay-util:param name="buttonId" value="<%= buttonId %>" />
-		<liferay-util:param name="buttonConferma" value="Crea"></liferay-util:param>
+		<liferay-util:param name="buttonConferma" value="Crea" />
-		<liferay-util:param name="width" value="750"></liferay-util:param>
+		<liferay-util:param name="width" value="750" />
-<%-- 		<liferay-util:param name="height" value="350"></liferay-util:param>		 --%>
+		<liferay-util:param name="buttonBar" value="false" />
-		<liferay-util:param name="buttonBar" value="false"></liferay-util:param>
 	</liferay-util:include>
 </aui:form>

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

@@ -5,9 +5,7 @@
 <%@page import="it.tref.liferay.portos.bo.service.FineLavoriServiceUtil"%>
 <%@page import="it.tref.liferay.portos.bo.service.CollaudoServiceUtil"%>
 <%@ include file="/html/fascicolofe/init.jsp" %>
-
 <liferay-portlet:renderURL varImpl="searchURL" copyCurrentRenderParameters="<%= false %>"  />
-
 <%
 
 boolean doSearch = true;
@@ -110,20 +108,14 @@ String keywords = StringPool.BLANK;
 			<liferay-util:param name="orderByType" value="<%= orderByType %>"></liferay-util:param>
 			<liferay-util:param name="orderByCol" value="<%= orderByCol %>"></liferay-util:param>
 		</liferay-util:include>
-				
-			
 	</c:if>
 	<c:if test="<%=isArchivioProgetti %>">
-		
 		<%
 			List<IntPratica> listaIntPratica = new ArrayList<IntPratica>();
 			Hits hits =	IntPraticaAdvancedSearch.searchArchivioProgetti(request, user, start, end);
-			
 			for (Document doc : hits.toList()) {
-	
 		        String intPraticaId = doc.get("intPraticaId");
 		        if (Validator.isNotNull(intPraticaId)) {
-	
 		          IntPratica intPratica = IntPraticaLocalServiceUtil.fetchIntPratica(GetterUtil.getLong(intPraticaId));
 		          if (Validator.isNotNull(intPratica)) {
 		            listaIntPratica.add(intPratica);
@@ -132,18 +124,14 @@ String keywords = StringPool.BLANK;
 		            indexer.delete(company.getCompanyId(), doc.getUID());
 		          }
 		        }
-	
 		      }
-		
 			request.setAttribute("results", listaIntPratica);
 			request.setAttribute("count", hits.getLength());
 		%>
-		
 		<liferay-util:include page="/html/fascicolofe/view_fascicolo_columns.jsp" servletContext="<%= application %>">
 			<liferay-util:param name="orderByType" value="<%= orderByType %>"></liferay-util:param>
 			<liferay-util:param name="orderByCol" value="<%= orderByCol %>"></liferay-util:param>
 		</liferay-util:include>
-		
 	</c:if>
 	<c:if test="<%=isDeleghe %>">
 		<div class="module-group">

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

@@ -1,86 +1,67 @@
 <%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%>
 <%@page import="it.tref.liferay.portos.bo.service.IntPraticaServiceUtil"%>
 <%@page import="it.tref.liferay.portos.bo.model.IntPratica"%>
-<%@ include file="/html/fascicolofe/init.jsp" %>
+<%@include file="/html/fascicolofe/init.jsp"%>
-
 <%
-	String toolbarItem = ParamUtil.getString(request, "toolbarItem", "view-riepilogo");
+String toolbarItem = ParamUtil.getString(request, "toolbarItem", "view-riepilogo");
-	String backURL = ParamUtil.getString(request, "backURL");
+String backURL = ParamUtil.getString(request, "backURL");
-	String jspActionPage = ParamUtil.getString(request, "jspActionPage","/html/fascicolofe/fascicolo_action.jsp");
+String jspActionPage = ParamUtil.getString(request, "jspActionPage","/html/fascicolofe/fascicolo_action.jsp");
-	
+long intPraticaId = ParamUtil.getLong(request, "intPraticaId", 0l);
-	long intPraticaId = ParamUtil.getLong(request, "intPraticaId", 0l);
+IntPratica intPratica = IntPraticaServiceUtil.getIntPratica(intPraticaId);
-	IntPratica intPratica = IntPraticaServiceUtil.getIntPratica(intPraticaId);
+String intPraticaTitle = Validator.isNotNull(intPratica) ? intPratica.getTitle(locale,false) : "Dettagli Fascicolo - protocollo n°XXX - Progetto n°YYY";
-	String intPraticaTitle = Validator.isNotNull(intPratica) ? intPratica.getTitle(locale,false) : "Dettagli Fascicolo - protocollo n°XXX - Progetto n°YYY";
-	
 %>
-
+<liferay-portlet:renderURL var="viewProgettiURL" />
-	<liferay-portlet:renderURL var="viewProgettiURL" />
+<liferay-ui:header title="<%= intPraticaTitle %>" localizeTitle="false"
-	
+		backURL="<%= Validator.isNull(backURL) ? viewProgettiURL : backURL %>" />
-	<liferay-ui:header 
-	    title="<%=intPraticaTitle%>"
-	    localizeTitle="<%= false %>"
-	    backURL="<%= Validator.isNotNull(backURL) ? backURL : viewProgettiURL %>"
-	/>
-
 <aui:nav cssClass="nav-tabs">
-		
 	<portlet:renderURL var="viewRiepilogoURL">
 		<portlet:param name="toolbarItem" value= "view-riepilogo" />
-		<portlet:param name="mvcPath" value="/html/fascicolofe/view_fascicolo.jsp"></portlet:param>
+		<portlet:param name="mvcPath" value="/html/fascicolofe/view_fascicolo.jsp" />
 		<portlet:param name="intPraticaId" value="<%=String.valueOf(intPraticaId)%>" />
-		<portlet:param name="backURL" value="<%=backURL %>"></portlet:param>
+		<portlet:param name="backURL" value="<%=backURL %>" />
 	</portlet:renderURL>
-
 	<aui:nav-item href="<%= viewRiepilogoURL %>" label="view-riepilogo"
-		selected='<%= toolbarItem.equals("view-riepilogo") %>' />
+			selected='<%= toolbarItem.equals("view-riepilogo") %>' />
-
 	<portlet:renderURL var="viewStoricoURL">
 		<portlet:param name="toolbarItem" value="view-storico" />
-		<portlet:param name="mvcPath" value="/html/fascicolofe/view_fascicolo.jsp"></portlet:param>
+		<portlet:param name="mvcPath" value="/html/fascicolofe/view_fascicolo.jsp" />
 		<portlet:param name="intPraticaId" value="<%=String.valueOf(intPraticaId)%>" />
-		<portlet:param name="backURL" value="<%=backURL %>"></portlet:param>
+		<portlet:param name="backURL" value="<%=backURL %>" />
 	</portlet:renderURL>
-
 	<aui:nav-item href="<%= viewStoricoURL %>" label="view-storico"
-		selected='<%= toolbarItem.equals("view-storico") %>' />
+			selected='<%= toolbarItem.equals("view-storico") %>' />
-	
 	<portlet:renderURL var="viewDettagliURL">
 		<portlet:param name="toolbarItem" value= "view-dettagli" />
-		<portlet:param name="mvcPath" value="/html/fascicolofe/view_fascicolo.jsp"></portlet:param>
+		<portlet:param name="mvcPath" value="/html/fascicolofe/view_fascicolo.jsp" />
 		<portlet:param name="intPraticaId" value="<%=String.valueOf(intPraticaId)%>" />
-		<portlet:param name="backURL" value="<%=backURL %>"></portlet:param>
+		<portlet:param name="backURL" value="<%=backURL %>" />
 	</portlet:renderURL>
-
 	<aui:nav-item href="<%= viewDettagliURL %>" label="view-dettagli"
-		selected='<%= toolbarItem.equals("view-dettagli") %>' />
+			selected='<%= toolbarItem.equals("view-dettagli") %>' />
-
 	<portlet:renderURL var="viewComunicazioniURL">
 		<portlet:param name="toolbarItem" value= "view-comunicazioni" />
-		<portlet:param name="mvcPath" value="/html/fascicolofe/view_fascicolo.jsp"></portlet:param>
+		<portlet:param name="mvcPath" value="/html/fascicolofe/view_fascicolo.jsp" />
 		<portlet:param name="intPraticaId" value="<%=String.valueOf(intPraticaId)%>" />
-		<portlet:param name="backURL" value="<%=backURL %>"></portlet:param>
+		<portlet:param name="backURL" value="<%=backURL %>" />
 	</portlet:renderURL>
-
 	<aui:nav-item href="<%= viewComunicazioniURL %>" label="view-comunicazioni"
-		selected='<%= toolbarItem.equals("view-comunicazioni") %>' />
+			selected='<%= toolbarItem.equals("view-comunicazioni") %>' />
-		
 	<portlet:renderURL var="viewDocAggiuntivaURL">
 		<portlet:param name="toolbarItem" value= "view-docaggiuntiva" />
-		<portlet:param name="mvcPath" value="/html/fascicolofe/view_fascicolo.jsp"></portlet:param>
+		<portlet:param name="mvcPath" value="/html/fascicolofe/view_fascicolo.jsp" />
 		<portlet:param name="intPraticaId" value="<%=String.valueOf(intPraticaId)%>" />
-		<portlet:param name="backURL" value="<%=backURL %>"></portlet:param>
+		<portlet:param name="backURL" value="<%=backURL %>" />
 	</portlet:renderURL>
-
 	<aui:nav-item href="<%= viewDocAggiuntivaURL %>" label="view-docaggiuntiva"
-		selected='<%= toolbarItem.equals("view-docaggiuntiva") %>' />
+			selected='<%= toolbarItem.equals("view-docaggiuntiva") %>' />
-		
 </aui:nav>
 <br>
 <c:choose>
 	<c:when test='<%= toolbarItem.equals("view-riepilogo") %>'>
-		<liferay-util:include page="/html/fascicolofe/view_fascicolo_riepilogo.jsp" servletContext="<%= application %>">
+		<liferay-util:include page="/html/fascicolofe/view_fascicolo_riepilogo.jsp"
-			<liferay-util:param name="jspActionPage" value="<%=jspActionPage %>"></liferay-util:param>
+				servletContext="<%= application %>">
-			<liferay-util:param name="intPraticaId" value="<%=String.valueOf(intPraticaId)%>" />
+			<liferay-util:param name="jspActionPage" value="<%= jspActionPage %>" />
+			<liferay-util:param name="intPraticaId" value="<%= String.valueOf(intPraticaId)%>" />
 		</liferay-util:include>
 	</c:when>
 	<c:when test='<%= toolbarItem.equals("view-storico") %>'>
@@ -94,12 +75,14 @@
 		</liferay-util:include>
 	</c:when>
 	<c:when test='<%= toolbarItem.equals("view-comunicazioni") %>'>
-		<liferay-util:include page="/html/fascicolofe/view_fascicolo_comunicazioni.jsp" servletContext="<%= application %>">
+		<liferay-util:include page="/html/fascicolofe/view_fascicolo_comunicazioni.jsp"
+				servletContext="<%= application %>">
 			<liferay-util:param name="intPraticaId" value="<%=String.valueOf(intPraticaId)%>" />
 		</liferay-util:include>
 	</c:when>
 	<c:when test='<%= toolbarItem.equals("view-docaggiuntiva") %>'>
-		<liferay-util:include page="/html/fascicolofe/view_fascicolo_docaggiuntiva.jsp" servletContext="<%= application %>">
+		<liferay-util:include page="/html/fascicolofe/view_fascicolo_docaggiuntiva.jsp"
+				servletContext="<%= application %>">
 			<liferay-util:param name="intPraticaId" value="<%=String.valueOf(intPraticaId)%>" />
 		</liferay-util:include>
 	</c:when>

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

@@ -1,118 +1,108 @@
 <%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%>
-
+<%@page import="com.liferay.portal.kernel.bean.BeanPropertiesUtil"%>
-<%@page import="it.tref.liferay.portos.bo.util.PraticaUtil"%>
+<%@page import="com.liferay.portal.kernel.servlet.ServletContextPool"%>
+<%@page import="com.liferay.portal.service.UserLocalServiceUtil"%>
+<%@page import="it.mwg.sismica.bo.shared.util.Generics"%>
+<%@page import="it.tref.liferay.portos.bo.model.DettPratica"%>
 <%@page import="it.tref.liferay.portos.bo.service.CollaudoLocalServiceUtil"%>
-<%@page import="it.tref.liferay.portos.bo.service.FineLavoriLocalServiceUtil"%>
-<%@page import="it.tref.liferay.portos.bo.shared.util.TipoIntegrazioneUtil"%>
 <%@page import="it.tref.liferay.portos.bo.service.DettPraticaLocalServiceUtil"%>
-<%@page import="it.tref.liferay.portos.bo.service.DettPraticaLocalService"%>
+<%@page import="it.tref.liferay.portos.bo.service.DettPraticaServiceUtil"%>
-<%@page import="it.tref.liferay.portos.bo.shared.util.StatoPraticaConstants"%>
+<%@page import="it.tref.liferay.portos.bo.service.FineLavoriLocalServiceUtil"%>
-<%@page import="com.liferay.portal.service.UserLocalServiceUtil"%>
+<%@page import="it.tref.liferay.portos.bo.service.IntPraticaLocalServiceUtil"%>
+<%@page import="it.tref.liferay.portos.bo.service.SoggettoLocalServiceUtil"%>
 <%@page import="it.tref.liferay.portos.bo.service.SoggettoServiceUtil"%>
-<%@page import="com.liferay.portal.kernel.servlet.ServletContextPool"%>
+<%@page import="it.tref.liferay.portos.bo.shared.util.TipoIntegrazioneUtil"%>
-<%@page import="it.tref.liferay.portos.bo.model.Pagamento"%>
-<%@page import="it.tref.liferay.portos.bo.shared.util.PagamentoConstants"%>
-<%@page import="it.tref.liferay.portos.bo.util.PagamentiCommonUtil"%>
-<%@page import="java.math.BigDecimal"%>
-<%@page import="java.text.NumberFormat"%>
-<%@page import="it.tref.liferay.portos.bo.model.Soggetto"%>
 <%@page import="it.tref.liferay.portos.bo.shared.util.TipoSoggettoUtil"%>
-<%@page import="it.tref.liferay.portos.bo.service.SoggettoLocalServiceUtil"%>
+<%@page import="it.tref.liferay.portos.bo.util.PraticaUtil"%>
-<%@page import="it.tref.liferay.portos.bo.shared.util.PortletKeys"%>
-<%@page import="java.util.Date"%>
-<%@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.TerritorioLocalServiceUtil"%>
-<%@page import="it.tref.liferay.portos.bo.model.Provincia"%>
-<%@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"%>
+<%@include file="/html/fascicolofe/init.jsp"%>
-<%@ include file="/html/fascicolofe/init.jsp" %>
-
 <%
-	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;
-	DettPratica dettPratica = null;
+IntPratica intPratica = null;
-	IntPratica intPratica = null;
+if (intPraticaId != 0) {
-	if(intPraticaId!=0l){
+	intPratica = IntPraticaLocalServiceUtil.getIntPratica(intPraticaId);
-	  intPratica = IntPraticaLocalServiceUtil.getIntPratica(intPraticaId);	 	  
+	dettPratica = DettPraticaServiceUtil.getLastEditableByIntPratica(intPraticaId);
-	  dettPratica = DettPraticaServiceUtil.getLastEditableByIntPratica(intPraticaId);
+	if (dettPratica == null) {
-	  if(dettPratica==null){
+		dettPratica = DettPraticaServiceUtil.getLastCompletedByIntPratica(intPraticaId);
-	    dettPratica  = DettPraticaServiceUtil.getLastCompletedByIntPratica(intPraticaId);
-	  }
-	  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 name = StringPool.MINUS;
-	if(intPratica.getStatusByUserId() != 0) {
-		name = UserLocalServiceUtil.getUser(intPratica.getStatusByUserId()).getFullName();
 	}
-	
+	dettPraticaId = dettPratica.getDettPraticaId();
-	int nVarianti = DettPraticaLocalServiceUtil.countCompletedByIntPraticaAndTipoPratica(intPraticaId, Arrays.asList(new String[]{TipoIntegrazioneUtil.VARIANTE}));
+}
-	int nCambioSoggetti = DettPraticaLocalServiceUtil.countCompletedByIntPraticaAndTipoPratica(intPraticaId, Arrays.asList(new String[]{TipoIntegrazioneUtil.VARIAZIONE_SOGGETTO}));
+Territorio territorio = TerritorioLocalServiceUtil.getTerritorio(intPratica.getTerritorioId());
-	int nFineLavori = FineLavoriLocalServiceUtil.countByIntPraticaId_Completata(intPraticaId, true);
+Comune comune = ComuneLocalServiceUtil.getComune(territorio.getComuneId());
-	int nCollaudo = CollaudoLocalServiceUtil.countByIntPraticaId_Completata(intPraticaId, true);
+Provincia provincia = ProvinciaLocalServiceUtil.fetchByC_C(territorio.getCompanyId(), territorio.getCodiceProvincia());
+String name = StringPool.MINUS;
+if (intPratica.getStatusByUserId() != 0) {
+	name = Generics.capitalizeFull(UserLocalServiceUtil.getUser(intPratica.getStatusByUserId()).getFullName());
+}
+int nVarianti = DettPraticaLocalServiceUtil.countCompletedByIntPraticaAndTipoPratica(intPraticaId, Arrays.asList(TipoIntegrazioneUtil.VARIANTE));
+int nCambioSoggetti = DettPraticaLocalServiceUtil.countCompletedByIntPraticaAndTipoPratica(intPraticaId, Arrays.asList(TipoIntegrazioneUtil.VARIAZIONE_SOGGETTO));
+int nFineLavori = FineLavoriLocalServiceUtil.countByIntPraticaId_Completata(intPraticaId, true);
+int nCollaudo = CollaudoLocalServiceUtil.countByIntPraticaId_Completata(intPraticaId, true);
+String urlIframeMappe = dettPratica.getUrlMappeBo(request, comune, true);
 %>
-
 <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;"> 
+			<span class="bg-success img-thumbnail"
-				<c:if test="<%=Constants.TIPO_PRATICA_AUTORIZZAZIONE.equalsIgnoreCase(intPratica.getTipoPratica()) %>">
+					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()) %>">
 					A
 				</c:if>
-				<c:if test="<%=Constants.TIPO_PRATICA_DEPOSITO .equalsIgnoreCase(intPratica.getTipoPratica()) %>">
+				<c:if test="<%= Constants.TIPO_PRATICA_DEPOSITO .equals(intPratica.getTipoPratica()) %>">
 					D
 				</c:if>
 			</span>
 		</div>
-		<div class="col-sm-10 col-md-10">
+		<div class="col-sm-10">
 			<div class="module-group">
-				<liferay-ui:panel extended="false" defaultState="open" collapsible="false" title="fascicolo_title_dettagli" >
+				<liferay-ui:panel extended="false" defaultState="open" collapsible="false"
+						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()) { %>
+									<%
-									<span class="fa fa-check" style="color:green"></span>
+									if (intPratica.getValidata()) {
-								<% }else { %>
+									%>
-									<span class="fa fa-times" style="color:red"></span>
+										<span class="fa fa-check" style="color:green"></span>
-								<% } %>
+									<%
+									} else {
+									%>
+										<span class="fa fa-times" style="color:red"></span>
+									<%
+									}
+									%>
 								</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>
+								<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)) %></strong>
+								<strong>
+									<%= LanguageUtil.get(pageContext, PraticaUtil.getStatoPraticaLabel(
+											intPratica.getStatoPratica(), intPratica)) %>
+								</strong>
 							</div>
 						</div>
 					</div>
@@ -121,87 +111,124 @@
 		</div>
 	</div>
 	<div class="row">
-		<div class="col-sm-8 col-md-8">
+		<div class="col-sm-8">
 			<div class="module-group">
-				<liferay-ui:panel extended="false" defaultState="open" collapsible="false" title="fascicolo_title_progetti" >
+				<liferay-ui:panel extended="false" defaultState="open" collapsible="false"
+						title="fascicolo_title_progetti" >
 					<div class="col-sm-6 col-md-3">
-						<% if(nVarianti == 0 ) { %>
+						<c:choose>
-							Varianti <strong><span class="fa fa-circle-o" style="color:orange"></span> Non presentate</strong>
+							<c:when test="<%= nVarianti == 0 %>">
-						<% } else if(nVarianti == 1 ) { %>
+								Varianti <strong><span class="fa fa-circle-o" style="color:orange"></span>
-							Variante <strong><span class="fa fa-check" style="color:green"></span> Presentata <%=nVarianti %> volta</strong>
+								Non presentate</strong>
-						<% } else { %>
+							</c:when>
-							Varianti <strong><span class="fa fa-check" style="color:green"></span> Presentate <%=nVarianti %> volte</strong>
+							<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-check" style="color:green"></span>
+								Presentate <%=nVarianti %> volte</strong>
+							</c:otherwise>
+						</c:choose>
 					</div>
-					
 					<div class="col-sm-6 col-md-3">
-						<% if(nCambioSoggetti == 0 ) { %>
+						Cambio soggetti <strong>
-							Cambio soggetti <strong><span class="fa fa-circle-o" style="color:orange"></span> Non presentata</strong>
+							<c:choose>
-						<% } else if(nCambioSoggetti == 1 ) { %>
+								<c:when test="<%= nCambioSoggetti == 0 %>">
-							Cambio soggetti <strong><span class="fa fa-check" style="color:green"></span> Presentata <%=nCambioSoggetti %> volta</strong>
+									<span class="fa fa-circle-o" style="color:orange"></span> Non presentato
-						<% } else { %>
+								</c:when>
-							Cambio soggetti <strong><span class="fa fa-check" style="color:green"></span> Presentata <%=nCambioSoggetti %> volte</strong>
+								<c:when test="<%= nCambioSoggetti == 1 %>">
-						<% } %>
+									<span class="fa fa-check" style="color:green"></span> Presentato 1 volta
+								</c:when>
+								<c:otherwise>
+									<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">
-						<% if(nFineLavori == 0 ) { %>
+						Fine Lavori <strong>
-							Fine Lavori <strong><span class="fa fa-close txt-red"></span> Non presentata</strong>
+							<c:choose>
-						<% } else if(nVarianti == 1 ) { %>
+								<c:when test="<%= nFineLavori == 0 %>">
-							Fine Lavori <strong><span class="fa fa-check txt-green"></span> Presentata <%=nFineLavori %> volta</strong>
+									<span class="fa fa-close txt-red"></span> Non presentata
-						<% } else { %>
+								</c:when>
-							Fine Lavori <strong><span class="fa fa-check txt-green"></span> Presentata <%=nFineLavori %> volte</strong>
+								<c:when test="<%= nFineLavori == 1 %>">
-						<% } %>
+									Fine Lavori <strong><span class="fa fa-check txt-green"></span> Presentata 1 volta
+								</c:when>
+								<c:otherwise>
+									Fine Lavori <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">
-						<% if(nCollaudo == 0 ) { %>
+						Collaudo <strong>
-							Collaudo <strong><span class="fa fa-close" style="color:red"></span> Non presentato</strong>
+							<c:choose>
-						<% } else if(nCollaudo == 1 ) { %>
+								<c:when test="<%= nCollaudo == 0 %>">
-							Collaudo <strong><span class="fa fa-check" style="color:green"></span> Presentato <%=nFineLavori %> volta</strong>
+									<span class="fa fa-close" style="color:red"></span> Non presentato
-						<% } else { %>
+								</c:when>
-							Collaudo <strong><span class="fa fa-check" style="color:green"></span> Presentato <%=nFineLavori %> volte</strong>
+								<c:when test="<%= nCollaudo == 1 %>">
-						<% } %>
+									<span class="fa fa-check" style="color:green"></span> Presentato 1 volta
+								</c:when>
+								<c:otherwise>
+									<span class="fa fa-check" style="color:green"></span>
+									Presentato <%= nCollaudo %> volte
+								</c:otherwise>
+							</c:choose>
+						</strong>
 					</div>
 				</liferay-ui:panel>
 			</div>
-			
 			<div class="module-group">
 				<liferay-ui:panel extended="false" defaultState="open" collapsible="false" title="fascicolo_title_descrizione" >
 					<div class="prog-description">
-						<%=BeanPropertiesUtil.getString(dettPratica, "descLongIntervento") %>
+						<%= BeanPropertiesUtil.getString(dettPratica, "descLongIntervento") %>
 					</div>
 				</liferay-ui:panel>
 			</div>
-						
 			<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-sm-6 col-md-6">
+							<div class="col-sm-6">
-								<strong><span class='<%=BeanPropertiesUtil.getBoolean(dettPratica, "tcNuovaCostruzione") ? "fa fa-check-circle-o txt-green" : "fa fa-circle-o" %>'></span></strong>
+								<strong><span
-								<%=LanguageUtil.get(pageContext, "tc-nuova-costruzione") %>
+										class='<%= BeanPropertiesUtil.getBoolean(dettPratica, "tcNuovaCostruzione")
+												? "fa fa-check-circle-o txt-green"
+												: "fa fa-circle-o" %>'></span></strong>
+								<%= LanguageUtil.get(pageContext, "tc-nuova-costruzione") %>
 							</div>
 							<%
-                       			boolean checked = 
+							boolean checked =
-									BeanPropertiesUtil.getBoolean(dettPratica, "tcAdeguamentoSismico") ||
+								BeanPropertiesUtil.getBoolean(dettPratica, "tcAdeguamentoSismico") ||
-									BeanPropertiesUtil.getBoolean(dettPratica, "tcMiglioramentoSismico") || 
+								BeanPropertiesUtil.getBoolean(dettPratica, "tcMiglioramentoSismico") ||
-									BeanPropertiesUtil.getBoolean(dettPratica, "tcRiparazioneInterventoLocale");
+								BeanPropertiesUtil.getBoolean(dettPratica, "tcRiparazioneInterventoLocale");
-                       		%>
+							%>
-							<div class="col-sm-6 col-md-6">
+							<div class="col-sm-6">
 								<strong><span class='<%=checked ? "fa fa-check-circle-o txt-green" : "fa fa-circle-o" %>'></span></strong>
 								<%=LanguageUtil.get(pageContext, "tc-interventi-esistenti") %>
-								<ul style="padding-left: 15px;">
+								<ul style="padding-left:15px">
 									<li>
-										<strong><span class='<%=BeanPropertiesUtil.getBoolean(dettPratica, "tcAdeguamentoSismico") ? "fa fa-check-circle-o txt-green" : "fa fa-circle-o" %>'></span></strong>
+										<strong><span class='<%= BeanPropertiesUtil.getBoolean(dettPratica,
-										<%=LanguageUtil.get(pageContext, "tc-adeguamento-sismico") %>
+														"tcAdeguamentoSismico")
-										
+												? "fa fa-check-circle-o txt-green"
+												: "fa fa-circle-o" %>'></span></strong>
+										<%= LanguageUtil.get(pageContext, "tc-adeguamento-sismico") %>
 									</li>
 									<li>
-										<strong><span class='<%=BeanPropertiesUtil.getBoolean(dettPratica, "tcMiglioramentoSismico") ? "fa fa-check-circle-o txt-green" : "fa fa-circle-o" %>'></span></strong>
+										<strong><span class='<%= BeanPropertiesUtil.getBoolean(dettPratica,
-										<%=LanguageUtil.get(pageContext, "tc-miglioramento-sismico") %>
+														"tcMiglioramentoSismico")
+												? "fa fa-check-circle-o txt-green"
+												: "fa fa-circle-o" %>'></span></strong>
+										<%= LanguageUtil.get(pageContext, "tc-miglioramento-sismico") %>
 									</li>
 									<li>
-										<strong><span class='<%=BeanPropertiesUtil.getBoolean(dettPratica, "tcRiparazioneInterventoLocale") ? "fa fa-check-circle-o txt-green" : "fa fa-circle-o" %>'></span></strong>
+										<strong><span class='<%= BeanPropertiesUtil.getBoolean(dettPratica,
-										<%=LanguageUtil.get(pageContext, "tc-riparazione-intervento-locale") %>
+														"tcRiparazioneInterventoLocale")
+												? "fa fa-check-circle-o txt-green"
+												: "fa fa-circle-o" %>'></span></strong>
+										<%= LanguageUtil.get(pageContext, "tc-riparazione-intervento-locale") %>
 									</li>
 								</ul>
 							</div>
@@ -209,21 +236,24 @@
 					</div>
 				</liferay-ui:panel>
 			</div>
-			
 			<div class="module-group">
-				<liferay-ui:panel extended="false" defaultState="open" collapsible="false" title="fascicolo_title_soggetti" >
+				<liferay-ui:panel extended="false" defaultState="open" collapsible="false"
+						title="fascicolo_title_soggetti">
 					<div class="container-fluid">
 						<%
-							List<Soggetto> committenti = SoggettoLocalServiceUtil.getValidByIntPratica_TipologiaSoggetto(intPraticaId, TipoSoggettoUtil.COMMITTENTE);
+						List<Soggetto> committenti = SoggettoLocalServiceUtil.getValidByIntPratica_TipologiaSoggetto(
+								intPraticaId, TipoSoggettoUtil.COMMITTENTE);
 						%>
 						<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>	
+									<div class="fascicolo_header_row">
+										<%=LanguageUtil.get(pageContext, "gc-soggetto-02") %>:
+									</div>
 								</div>
 							</div>
 							<%
-								Soggetto committente = committenti.get(0);
+							Soggetto committente = committenti.get(0);
 							%>
 							<div class="row">
 								<c:if test="<%= Validator.isNotNull(committente.getDenominazione()) %>">
@@ -239,13 +269,13 @@
 										Nome:
 									</div>
 									<div class="col-sm-6 col-md-3">
-										<strong><%= committente.getNome() %></strong>
+										<strong><%= Generics.capitalizeFull(committente.getNome()) %></strong>
 									</div>
 									<div class="col-sm-6 col-md-3">
 										Cognome:
 									</div>
 									<div class="col-sm-6 col-md-3">
-										<strong><%= committente.getCognome() %></strong>
+										<strong><%= Generics.capitalizeFull(committente.getCognome()) %></strong>
 									</div>
 									<div class="col-sm-6 col-md-3">
 										Codice Fiscale:
@@ -257,12 +287,15 @@
 							</div>
 						</c:if>
 						<%
-							List<Soggetto> progettisti = SoggettoLocalServiceUtil.getValidByIntPratica_TipologiaSoggetto(intPraticaId, TipoSoggettoUtil.PROGETTISTA);
+						List<Soggetto> progettisti = SoggettoLocalServiceUtil.getValidByIntPratica_TipologiaSoggetto(
+								intPraticaId, TipoSoggettoUtil.PROGETTISTA);
 						%>
 						<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>
+									<div class="fascicolo_header_row">
+										<%=LanguageUtil.get(pageContext, "gc-soggetto-06") %>:
+									</div>
 								</div>
 							</div>
 							<div class="row">
@@ -270,13 +303,13 @@
 									Nome:
 								</div>
 								<div class="col-sm-6 col-md-3">
-									<strong><%= progettisti.get(0).getNome() %></strong>
+									<strong><%= Generics.capitalizeFull(progettisti.get(0).getNome()) %></strong>
 								</div>
 								<div class="col-sm-6 col-md-3">
 									Cognome:
 								</div>
 								<div class="col-sm-6 col-md-3">
-									<strong><%= progettisti.get(0).getCognome() %></strong>
+									<strong><%= Generics.capitalizeFull(progettisti.get(0).getCognome()) %></strong>
 								</div>
 								<div class="col-sm-6 col-md-3">
 									Codice Fiscale:
@@ -287,11 +320,14 @@
 							</div>
 						</c:if>
 						<%
-							List<Soggetto> direttori = SoggettoServiceUtil.getValidByIntPratica_TipologiaSoggetto(intPraticaId, TipoSoggettoUtil.DIRETTORE_LAVORI);
+						List<Soggetto> direttori = SoggettoServiceUtil.getValidByIntPratica_TipologiaSoggetto(
+								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>
+								<div class="fascicolo_header_row">
+									<%= LanguageUtil.get(pageContext, "gc-soggetto-03") %>:
+								</div>
 							</div>
 						</div>
 						<c:if test="<%= !direttori.isEmpty() %>">
@@ -300,13 +336,13 @@
 									Nome:
 								</div>
 								<div class="col-sm-6 col-md-3">
-									<strong><%= direttori.get(0).getNome() %></strong>
+									<strong><%= Generics.capitalizeFull(direttori.get(0).getNome()) %></strong>
 								</div>
 								<div class="col-sm-6 col-md-3">
 									Cognome:
 								</div>
 								<div class="col-sm-6 col-md-3">
-									<strong><%= direttori.get(0).getCognome() %></strong>
+									<strong><%= Generics.capitalizeFull(direttori.get(0).getCognome()) %></strong>
 								</div>
 								<div class="col-sm-6 col-md-3">
 									Codice Fiscale:
@@ -320,68 +356,71 @@
 				</liferay-ui:panel>
 			</div>
 			<div class="module-group sezione-pagamenti">
-				<liferay-ui:panel extended="false" defaultState="open" collapsible="false" title="fascicolo_title_pagamenti" >
+				<liferay-ui:panel extended="false" defaultState="open" collapsible="false"
-					<liferay-util:include page="/html/pagamenti/view_panel_pagamenti.jsp" servletContext='<%= ServletContextPool.get("portos-bo-portlet") %>'>
+						title="fascicolo_title_pagamenti">
-						<liferay-util:param name="dettPraticaId" value="<%= String.valueOf(dettPraticaId) %>"></liferay-util:param>
+					<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:include>
 				</liferay-ui:panel>
 			</div>
 		</div>
-		<div class="col-sm-4 col-md-4">
+		<div class="col-sm-4">
 			<div class="module-group">
-				<liferay-ui:panel extended="false" defaultState="open" collapsible="false" title="fascicolo_title_ubicazione" >
+				<liferay-ui:panel extended="false" defaultState="open" collapsible="false"
+						title="fascicolo_title_ubicazione">
 					<div class="container-fluid">
 						<div class="row">
-							<div class="col-sm-6 col-md-6">
+							<div class="col-sm-6">
 								<%= LanguageUtil.get(pageContext, "dp-zona-sismica") %>
 							</div>
-							<div class="col-sm-6 col-md-6">
+							<div class="col-sm-6">
 								<strong><%= BeanPropertiesUtil.getString(territorio, "zona") %>
 							</div>
-							<div class="col-sm-6 col-md-6">
+							<div class="col-sm-6">
 								<%= LanguageUtil.get(pageContext, "dp-fascia-pericolosita") %>
 							</div>
-							<div class="col-sm-6 col-md-6">
+							<div class="col-sm-6">
 								<strong><%= BeanPropertiesUtil.getString(territorio, "fascia") %></strong>
 							</div>
-							<div class="col-sm-6 col-md-6">
+							<div class="col-sm-6">
 								<%= LanguageUtil.get(pageContext, "ag") %>
 							</div>
-							<div class="col-sm-6 col-md-6">
+							<div class="col-sm-6">
 								<strong><%= BeanPropertiesUtil.getString(dettPratica, "ag") %></strong>
 							</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>
+								<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>
+								<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>
+								<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>
+								<strong><%= BeanPropertiesUtil.getString(dettPratica, "via") %></strong>
 							</div>
 						</div>
 						<hr>
@@ -390,14 +429,13 @@
 								<%= LanguageUtil.get(pageContext, "dc-foglio") %>
 							</div>
 							<div class="col-sm-6 col-md-3">
-								<strong><strong><%=BeanPropertiesUtil.getString(dettPratica, "dcFoglio") %></strong></strong>
+								<strong><%= BeanPropertiesUtil.getString(dettPratica, "dcFoglio") %></strong>
 							</div>
 							<div class="col-sm-6 col-md-3">
 								<%= LanguageUtil.get(pageContext, "dc-allegato") %>
 							</div>
 							<div class="col-sm-6 col-md-3">
-						
+								<strong><%= BeanPropertiesUtil.getString(dettPratica, "dcAllegato") %></strong>
-								<strong><%=BeanPropertiesUtil.getString(dettPratica, "dcAllegato") %></strong>
 							</div>
 						</div>
 						<div class="row">
@@ -406,26 +444,27 @@
 							</div>
 							<div class="col-sm-6 col-md-3">
 								<%
-									String[] particelle= BeanPropertiesUtil.getString(dettPratica, "dcParticelle").split(Pattern.quote("|"));
+								String[] particelle= BeanPropertiesUtil.getString(dettPratica, "dcParticelle").split(
+										Pattern.quote(StringPool.PIPE));
 								%>
-								<div class="col-md-3 col-sm-3 col-xs-6 no-padding-left">
+								<div class="col-md-3 col-xs-6 no-padding-left">
-									<span><strong><%=particelle.length>0?particelle[0]:StringPool.BLANK %></strong></span>
+									<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-md-3 col-xs-6">
-									<span><strong><%=particelle.length>1?particelle[1]:StringPool.BLANK %></strong></span>
+									<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-md-3 col-xs-6">
-									<span><strong><%=particelle.length>2?particelle[2]:StringPool.BLANK %></strong></span>
+									<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-md-3 col-xs-6 no-padding-right">
-									<span><strong><%=particelle.length>3?particelle[3]:StringPool.BLANK %></strong></span>
+									<span><strong><%= particelle.length > 3 ? particelle[3] : StringPool.BLANK %></strong></span>
 								</div>
 							</div>
 							<div class="col-sm-6 col-md-3">
 								<%= LanguageUtil.get(pageContext, "estremi-prat-com") %>
 							</div>
 							<div class="col-sm-6 col-md-3">
-								<strong><%=BeanPropertiesUtil.getString(dettPratica, "estremiPratCom") %></strong>
+								<strong><%= BeanPropertiesUtil.getString(dettPratica, "estremiPratCom") %></strong>
 							</div>
 						</div>
 						<div class="row">
@@ -438,56 +477,40 @@
 								</div>
 							</c:if>
 						</div>
-						
 						<div class="row">
 							<div class="col-sm-6 col-md-3">
 								<%= LanguageUtil.get(pageContext, "contesto-paesaggistico") %>
 							</div>
 							<div class="col-sm-6 col-md-9">
-								<strong><%= BeanPropertiesUtil.getString(dettPratica, "contestoPaesaggistico") %></strong>
+								<strong><%= Generics.nl2br(BeanPropertiesUtil.getString(dettPratica, "contestoPaesaggistico")) %></strong>
 							</div>
 						</div>
-						
 						<div class="row">
 							<div class="col-sm-6 col-md-3">
 								<%= LanguageUtil.get(pageContext, "livello-di-tutela") %>
 							</div>
 							<div class="col-sm-6 col-md-9">
-								<strong><%= BeanPropertiesUtil.getString(dettPratica, "livelloDiTutela") %></strong>
+								<strong><%= Generics.nl2br(BeanPropertiesUtil.getString(dettPratica, "livelloDiTutela")) %></strong>
 							</div>
 						</div>
-						
 						<div class="row">
 							<div class="col-sm-6 col-md-3">
 								<%= LanguageUtil.get(pageContext, "vincoli") %>
 							</div>
 							<div class="col-sm-6 col-md-9">
-								<strong><%= BeanPropertiesUtil.getString(dettPratica, "vincoli") %></strong>
+								<strong><%= Generics.nl2br(BeanPropertiesUtil.getString(dettPratica, "vincoli")) %></strong>
 							</div>
 						</div>
-						
-						
 						<div class="row">
-							<div class="col-md-12">
+							<%-- Integrazione geoportal --%>
-								<%
+							<div class="col-xs-12">
-		                       		String[] geolocalization = BeanPropertiesUtil.getString(dettPratica, "localizzazioneGeografica","").split(Pattern.quote("|"));
+								<iframe src="<%= urlIframeMappe %>" style="border:none;width:100%;height:700px"></iframe>
-		                       	%>
-	                           <div class="col-xs-12 col-sm-12 col-md-6 col-lg-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">
-	                               <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-portlet:runtime portletName="5_WAR_trefmapitmapportlet" />
 							</div>
+							<%-- /Integrazione geoportal --%>
 						</div>
 					</div>
 				</liferay-ui:panel>
 			</div>
 		</div>
 	</div>
-	
 </div>

liferay-plugins-sdk-6.2/portlets/portos-firma-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/firma/util/FirmaGetUtil.java

@@ -139,7 +139,6 @@ public class FirmaGetUtil {
 			risposta.setObj(tokenTest);
 			risposta.setRisposta(RispostaCostanti.OK);
 		} else {
-			// TODO da migliorare per sicurezza e poi modificare a giro
 			risposta.setObj(codiceFiscale);
 			risposta.setRisposta(RispostaCostanti.OK);
 		}
@@ -156,8 +155,6 @@ public class FirmaGetUtil {
 			String tokenTest = jxPortletPreferences.getValue("tokenTest", StringPool.BLANK);
 			risposta.setObj(tokenTest);
 			risposta.setRisposta(RispostaCostanti.OK);
-		} else {
-			// TODO
 		}
 		return risposta;
 	}

liferay-plugins-sdk-6.2/portlets/portos-report-engine-portlet/docroot/WEB-INF/src/it/tref/portos/report/engine/util/ReportTempisticheBean.java

@@ -9,18 +9,14 @@ public class ReportTempisticheBean {
 	private Date dtinviosignal;
 	private Date dtinvio;
 	private String tipoDocumento;
-	private Date  dtavviso;
+	private Date dtavviso;
 	private String statoPratica;
 
+	public ReportTempisticheBean() {}
+
+	public ReportTempisticheBean(long intpraticaid, long avvisoId, long classpk, Date dtinviosignal, Date dtinvio,
+			String tipoDocumento, Date dtavviso, String statoPratica) {
 
-	public ReportTempisticheBean() {
-		super();
-		// TODO Auto-generated constructor stub
-	}
-	public ReportTempisticheBean(long intpraticaid, long avvisoId,
-			long classpk, Date dtinviosignal, Date dtinvio,
-			String tipoDocumento, Date dtavviso,String statoPratica) {
-		super();
 		this.intpraticaid = intpraticaid;
 		this.avvisoId = avvisoId;
 		this.classpk = classpk;
@@ -28,59 +24,91 @@ public class ReportTempisticheBean {
 		this.dtinvio = dtinvio;
 		this.tipoDocumento = tipoDocumento;
 		this.dtavviso = dtavviso;
-		this.statoPratica=statoPratica;
+		this.statoPratica = statoPratica;
 	}
+
 	public long getAvvisoId() {
+
 		return avvisoId;
 	}
+
 	public void setAvvisoId(long avvisoId) {
+
 		this.avvisoId = avvisoId;
 	}
+
 	public long getIntpraticaid() {
+
 		return intpraticaid;
 	}
+
 	public void setIntpraticaid(long intpraticaid) {
+
 		this.intpraticaid = intpraticaid;
 	}
+
 	public long getClasspk() {
+
 		return classpk;
 	}
+
 	public void setClasspk(long classpk) {
+
 		this.classpk = classpk;
 	}
+
 	public Date getDtinviosignal() {
+
 		return dtinviosignal;
 	}
+
 	public void setDtinviosignal(Date dtinviosignal) {
+
 		this.dtinviosignal = dtinviosignal;
 	}
+
 	public Date getDtinvio() {
+
 		return dtinvio;
 	}
+
 	public void setDtinvio(Date dtinvio) {
+
 		this.dtinvio = dtinvio;
 	}
+
 	public String getTipoDocumento() {
+
 		return tipoDocumento;
 	}
+
 	public void setTipoDocumento(String tipoDocumento) {
+
 		this.tipoDocumento = tipoDocumento;
 	}
+
 	public Date getDtavviso() {
+
 		return dtavviso;
 	}
+
 	public void setDtavviso(Date dtavviso) {
+
 		this.dtavviso = dtavviso;
 	}
+
 	@Override
 	public int hashCode() {
+
 		final int prime = 31;
 		int result = 1;
 		result = prime * result + (int) (avvisoId ^ (avvisoId >>> 32));
 		return result;
 	}
+
 	@Override
 	public boolean equals(Object obj) {
+
 		if (this == obj)
 			return true;
 		if (obj == null)
@@ -92,13 +120,14 @@ public class ReportTempisticheBean {
 			return false;
 		return true;
 	}
+
 	public String getStatoPratica() {
+
 		return statoPratica;
 	}
+
 	public void setStatoPratica(String statoPratica) {
+
 		this.statoPratica = statoPratica;
 	}
-	
-	
-	
 }

liferay-plugins-sdk-6.2/shared/portos-bo-shared/src/it/mwg/sismica/bo/shared/util/Generics.java

@@ -1,5 +1,10 @@
 package it.mwg.sismica.bo.shared.util;
 
+import java.io.UnsupportedEncodingException;
+import java.net.URLEncoder;
+
+import com.liferay.portal.kernel.util.StringPool;
+
 public class Generics {
 
 	public static String capitalizeFull(String str) {
@@ -19,4 +24,15 @@ public class Generics {
 
 		return str == null ? null : str.replace("\n", "<br/>");
 	}
+
+	public static String urlEncode(String str) {
+
+		String encoded;
+		try {
+			encoded = URLEncoder.encode(str, StringPool.UTF8);
+		} catch (UnsupportedEncodingException e) {
+			encoded = str;
+		}
+		return encoded;
+	}
 }