Modificata lunghezza massima testi di descrizione

liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/.settings/org.eclipse.wst.common.component

@@ -4,13 +4,10 @@
         <wb-resource deploy-path="/WEB-INF/classes" source-path="/docroot/WEB-INF/src"/>
         <wb-resource deploy-path="/WEB-INF/classes" source-path="/docroot/service"/>
         <wb-resource deploy-path="/WEB-INF/classes" source-path="/docroot/WEB-INF/service"/>
-        <dependent-module archiveName="portos-kaleo-portlet-service.jar" deploy-path="/WEB-INF/lib" handle="module:/classpath/lib/portos-kaleo-portlet/docroot/WEB-INF/lib/portos-kaleo-portlet-service.jar">
+        <dependent-module archiveName="hms-taglib-hook-service.jar" deploy-path="/WEB-INF/lib" handle="module:/classpath/lib/hms-taglib-hook/docroot/WEB-INF/lib/hms-taglib-hook-service.jar">
-            <dependency-type>uses</dependency-type>
-        </dependent-module>
-        <dependent-module archiveName="portos-mail-manager-portlet-service.jar" deploy-path="/WEB-INF/lib" handle="module:/classpath/lib/portos-mail-manager-portlet/docroot/WEB-INF/lib/portos-mail-manager-portlet-service.jar">
             <dependency-type>uses</dependency-type>
         </dependent-module>
-        <dependent-module archiveName="hms-taglib-hook-service.jar" deploy-path="/WEB-INF/lib" handle="module:/classpath/lib/hms-taglib-hook/docroot/WEB-INF/lib/hms-taglib-hook-service.jar">
+        <dependent-module archiveName="portos-kaleo-portlet-service.jar" deploy-path="/WEB-INF/lib" handle="module:/classpath/lib/portos-kaleo-portlet/docroot/WEB-INF/lib/portos-kaleo-portlet-service.jar">
             <dependency-type>uses</dependency-type>
         </dependent-module>
         <dependent-module archiveName="portos-mail-manager-portlet-service.jar" deploy-path="/WEB-INF/lib" handle="module:/classpath/lib/portos-mail-manager-portlet/docroot/WEB-INF/lib/portos-mail-manager-portlet-service.jar">

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

@@ -44,6 +44,11 @@ public interface DocPratica extends DocPraticaModel, PersistedModel {
 		throws com.liferay.portal.kernel.exception.PortalException,
 			com.liferay.portal.kernel.exception.SystemException;
 
+	public boolean hasDelegaFirma(long userId, boolean sezioneGeologica,
+		boolean praticaIsEditable)
+		throws com.liferay.portal.kernel.exception.PortalException,
+			com.liferay.portal.kernel.exception.SystemException;
+
 	public boolean hasDelegaDeleteFile(long userId, boolean sezioneGeologica)
 		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/DocPraticaClp.java

@@ -872,6 +872,30 @@ public class DocPraticaClp extends BaseModelImpl<DocPratica>
 		}
 	}
 
+	@Override
+	public boolean hasDelegaFirma(long userId, boolean sezioneGeologica,
+		boolean praticaIsEditable) {
+		try {
+			String methodName = "hasDelegaFirma";
+
+			Class<?>[] parameterTypes = new Class<?>[] {
+					long.class, boolean.class, boolean.class
+				};
+
+			Object[] parameterValues = new Object[] {
+					userId, sezioneGeologica, praticaIsEditable
+				};
+
+			Boolean returnObj = (Boolean)invokeOnRemoteModel(methodName,
+					parameterTypes, parameterValues);
+
+			return returnObj;
+		}
+		catch (Exception e) {
+			throw new UnsupportedOperationException(e);
+		}
+	}
+
 	@Override
 	public boolean hasDelegaFirma(long userId, boolean sezioneGeologica) {
 		try {

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

@@ -904,6 +904,15 @@ public class DocPraticaWrapper implements DocPratica, ModelWrapper<DocPratica> {
 		return _docPratica.hasDelegaFirma(userId, sezioneGeologica);
 	}
 
+	@Override
+	public boolean hasDelegaFirma(long userId, boolean sezioneGeologica,
+		boolean praticaIsEditable)
+		throws com.liferay.portal.kernel.exception.PortalException,
+			com.liferay.portal.kernel.exception.SystemException {
+		return _docPratica.hasDelegaFirma(userId, sezioneGeologica,
+			praticaIsEditable);
+	}
+
 	@Override
 	public boolean hasDelegaDeleteFile(long userId, boolean sezioneGeologica)
 		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/model/IntPratica.java

@@ -184,16 +184,6 @@ public interface IntPratica extends IntPraticaModel, PersistedModel {
 
 	public boolean hasRichiestaIntegrazioneAttiva();
 
-	public void invioMailNotifica(long dettPraticaId, long classPk,
-		java.lang.String className, java.lang.String[] to,
-		java.lang.String[] cc, java.lang.String[] ccn,
-		java.lang.String templateName,
-		com.liferay.portal.kernel.json.JSONObject templateVariables,
-		java.util.List<it.tref.liferay.portos.mailmanager.shared.model.FileAttachment> allegati,
-		com.liferay.portal.service.ServiceContext serviceContext)
-		throws com.liferay.portal.kernel.exception.PortalException,
-			com.liferay.portal.kernel.exception.SystemException;
-
 	public boolean isAllowedAction(java.lang.String action)
 		throws 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/IntPraticaClp.java

@@ -2072,38 +2072,6 @@ public class IntPraticaClp extends BaseModelImpl<IntPratica>
 		}
 	}
 
-	@Override
-	public void invioMailNotifica(long dettPraticaId, long classPk,
-		java.lang.String className, java.lang.String[] to,
-		java.lang.String[] cc, java.lang.String[] ccn,
-		java.lang.String templateName,
-		com.liferay.portal.kernel.json.JSONObject templateVariables,
-		java.util.List<it.tref.liferay.portos.mailmanager.shared.model.FileAttachment> allegati,
-		com.liferay.portal.service.ServiceContext serviceContext) {
-		try {
-			String methodName = "invioMailNotifica";
-
-			Class<?>[] parameterTypes = new Class<?>[] {
-					long.class, long.class, java.lang.String.class,
-					java.lang.String.class, java.lang.String.class,
-					java.lang.String.class, java.lang.String.class,
-					com.liferay.portal.kernel.json.JSONObject.class,
-					java.util.List.class,
-					com.liferay.portal.service.ServiceContext.class
-				};
-
-			Object[] parameterValues = new Object[] {
-					dettPraticaId, classPk, className, to, cc, ccn, templateName,
-					templateVariables, allegati, serviceContext
-				};
-
-			invokeOnRemoteModel(methodName, parameterTypes, parameterValues);
-		}
-		catch (Exception e) {
-			throw new UnsupportedOperationException(e);
-		}
-	}
-
 	@Override
 	public boolean praticaHasFineLavoriInProgress() {
 		try {

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

@@ -1530,20 +1530,6 @@ public class IntPraticaWrapper implements IntPratica, ModelWrapper<IntPratica> {
 		return _intPratica.hasRichiestaIntegrazioneAttiva();
 	}
 
-	@Override
-	public void invioMailNotifica(long dettPraticaId, long classPk,
-		java.lang.String className, java.lang.String[] to,
-		java.lang.String[] cc, java.lang.String[] ccn,
-		java.lang.String templateName,
-		com.liferay.portal.kernel.json.JSONObject templateVariables,
-		java.util.List<it.tref.liferay.portos.mailmanager.shared.model.FileAttachment> allegati,
-		com.liferay.portal.service.ServiceContext serviceContext)
-		throws com.liferay.portal.kernel.exception.PortalException,
-			com.liferay.portal.kernel.exception.SystemException {
-		_intPratica.invioMailNotifica(dettPraticaId, classPk, className, to,
-			cc, ccn, templateName, templateVariables, allegati, serviceContext);
-	}
-
 	@Override
 	public boolean isAllowedAction(java.lang.String action)
 		throws com.liferay.portal.kernel.exception.SystemException {

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

@@ -546,6 +546,16 @@ public interface IntPraticaLocalService extends BaseLocalService,
 	@Transactional(propagation = Propagation.SUPPORTS, readOnly = true)
 	public boolean hasRichiestaIntegrazioneAttiva(long intPraticaId);
 
+	public void invioMailNotifica(long dettPraticaId, long classPk,
+		java.lang.String className, java.lang.String[] to,
+		java.lang.String[] cc, java.lang.String[] ccn,
+		java.lang.String templateName,
+		com.liferay.portal.kernel.json.JSONObject templateVariables,
+		java.util.List<it.tref.liferay.portos.mailmanager.shared.model.FileAttachment> allegati,
+		com.liferay.portal.service.ServiceContext serviceContext)
+		throws com.liferay.portal.kernel.exception.PortalException,
+			com.liferay.portal.kernel.exception.SystemException;
+
 	@Transactional(propagation = Propagation.SUPPORTS, readOnly = true)
 	public com.liferay.portal.kernel.search.Hits searchAltriProgetti(
 		javax.servlet.http.HttpServletRequest request,

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

@@ -354,26 +354,35 @@ public class IntPraticaLocalServiceClp implements IntPraticaLocalService {
 
 		_methodParameterTypes69 = new String[] { "long" };
 
-		_methodName70 = "searchAltriProgetti";
+		_methodName70 = "invioMailNotifica";
 
 		_methodParameterTypes70 = new String[] {
-				"javax.servlet.http.HttpServletRequest",
+				"long", "long", "java.lang.String", "java.lang.String[][]",
-				"com.liferay.portal.model.User", "int", "int"
+				"java.lang.String[][]", "java.lang.String[][]",
+				"java.lang.String", "com.liferay.portal.kernel.json.JSONObject",
+				"java.util.List", "com.liferay.portal.service.ServiceContext"
 			};
 
-		_methodName71 = "searchArchivioProgetti";
+		_methodName71 = "searchAltriProgetti";
 
 		_methodParameterTypes71 = new String[] {
 				"javax.servlet.http.HttpServletRequest",
 				"com.liferay.portal.model.User", "int", "int"
 			};
 
-		_methodName72 = "searchMieiProgetti";
+		_methodName72 = "searchArchivioProgetti";
 
 		_methodParameterTypes72 = new String[] {
 				"javax.servlet.http.HttpServletRequest",
 				"com.liferay.portal.model.User", "int", "int"
 			};
+
+		_methodName73 = "searchMieiProgetti";
+
+		_methodParameterTypes73 = new String[] {
+				"javax.servlet.http.HttpServletRequest",
+				"com.liferay.portal.model.User", "int", "int"
+			};
 	}
 
 	@Override
@@ -2719,6 +2728,62 @@ public class IntPraticaLocalServiceClp implements IntPraticaLocalService {
 		return ((Boolean)returnObj).booleanValue();
 	}
 
+	@Override
+	public void invioMailNotifica(long dettPraticaId, long classPk,
+		java.lang.String className, java.lang.String[] to,
+		java.lang.String[] cc, java.lang.String[] ccn,
+		java.lang.String templateName,
+		com.liferay.portal.kernel.json.JSONObject templateVariables,
+		java.util.List<it.tref.liferay.portos.mailmanager.shared.model.FileAttachment> allegati,
+		com.liferay.portal.service.ServiceContext serviceContext)
+		throws com.liferay.portal.kernel.exception.PortalException,
+			com.liferay.portal.kernel.exception.SystemException {
+		try {
+			_invokableLocalService.invokeMethod(_methodName70,
+				_methodParameterTypes70,
+				new Object[] {
+					dettPraticaId,
+					
+				classPk,
+					
+				ClpSerializer.translateInput(className),
+					
+				ClpSerializer.translateInput(to),
+					
+				ClpSerializer.translateInput(cc),
+					
+				ClpSerializer.translateInput(ccn),
+					
+				ClpSerializer.translateInput(templateName),
+					
+				ClpSerializer.translateInput(templateVariables),
+					
+				ClpSerializer.translateInput(allegati),
+					
+				ClpSerializer.translateInput(serviceContext)
+				});
+		}
+		catch (Throwable t) {
+			t = ClpSerializer.translateThrowable(t);
+
+			if (t instanceof com.liferay.portal.kernel.exception.PortalException) {
+				throw (com.liferay.portal.kernel.exception.PortalException)t;
+			}
+
+			if (t instanceof com.liferay.portal.kernel.exception.SystemException) {
+				throw (com.liferay.portal.kernel.exception.SystemException)t;
+			}
+
+			if (t instanceof RuntimeException) {
+				throw (RuntimeException)t;
+			}
+			else {
+				throw new RuntimeException(t.getClass().getName() +
+					" is not a valid exception");
+			}
+		}
+	}
+
 	@Override
 	public com.liferay.portal.kernel.search.Hits searchAltriProgetti(
 		javax.servlet.http.HttpServletRequest request,
@@ -2726,8 +2791,8 @@ public class IntPraticaLocalServiceClp implements IntPraticaLocalService {
 		Object returnObj = null;
 
 		try {
-			returnObj = _invokableLocalService.invokeMethod(_methodName70,
+			returnObj = _invokableLocalService.invokeMethod(_methodName71,
-					_methodParameterTypes70,
+					_methodParameterTypes71,
 					new Object[] {
 						ClpSerializer.translateInput(request),
 						
@@ -2760,8 +2825,8 @@ public class IntPraticaLocalServiceClp implements IntPraticaLocalService {
 		Object returnObj = null;
 
 		try {
-			returnObj = _invokableLocalService.invokeMethod(_methodName71,
+			returnObj = _invokableLocalService.invokeMethod(_methodName72,
-					_methodParameterTypes71,
+					_methodParameterTypes72,
 					new Object[] {
 						ClpSerializer.translateInput(request),
 						
@@ -2794,8 +2859,8 @@ public class IntPraticaLocalServiceClp implements IntPraticaLocalService {
 		Object returnObj = null;
 
 		try {
-			returnObj = _invokableLocalService.invokeMethod(_methodName72,
+			returnObj = _invokableLocalService.invokeMethod(_methodName73,
-					_methodParameterTypes72,
+					_methodParameterTypes73,
 					new Object[] {
 						ClpSerializer.translateInput(request),
 						
@@ -2966,4 +3031,6 @@ public class IntPraticaLocalServiceClp implements IntPraticaLocalService {
 	private String[] _methodParameterTypes71;
 	private String _methodName72;
 	private String[] _methodParameterTypes72;
+	private String _methodName73;
+	private String[] _methodParameterTypes73;
 }

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

@@ -678,6 +678,20 @@ public class IntPraticaLocalServiceUtil {
 		return getService().hasRichiestaIntegrazioneAttiva(intPraticaId);
 	}
 
+	public static void invioMailNotifica(long dettPraticaId, long classPk,
+		java.lang.String className, java.lang.String[] to,
+		java.lang.String[] cc, java.lang.String[] ccn,
+		java.lang.String templateName,
+		com.liferay.portal.kernel.json.JSONObject templateVariables,
+		java.util.List<it.tref.liferay.portos.mailmanager.shared.model.FileAttachment> allegati,
+		com.liferay.portal.service.ServiceContext serviceContext)
+		throws com.liferay.portal.kernel.exception.PortalException,
+			com.liferay.portal.kernel.exception.SystemException {
+		getService()
+			.invioMailNotifica(dettPraticaId, classPk, className, to, cc, ccn,
+			templateName, templateVariables, allegati, serviceContext);
+	}
+
 	public static com.liferay.portal.kernel.search.Hits searchAltriProgetti(
 		javax.servlet.http.HttpServletRequest request,
 		com.liferay.portal.model.User user, int start, int end) {

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

@@ -746,6 +746,21 @@ public class IntPraticaLocalServiceWrapper implements IntPraticaLocalService,
 		return _intPraticaLocalService.hasRichiestaIntegrazioneAttiva(intPraticaId);
 	}
 
+	@Override
+	public void invioMailNotifica(long dettPraticaId, long classPk,
+		java.lang.String className, java.lang.String[] to,
+		java.lang.String[] cc, java.lang.String[] ccn,
+		java.lang.String templateName,
+		com.liferay.portal.kernel.json.JSONObject templateVariables,
+		java.util.List<it.tref.liferay.portos.mailmanager.shared.model.FileAttachment> allegati,
+		com.liferay.portal.service.ServiceContext serviceContext)
+		throws com.liferay.portal.kernel.exception.PortalException,
+			com.liferay.portal.kernel.exception.SystemException {
+		_intPraticaLocalService.invioMailNotifica(dettPraticaId, classPk,
+			className, to, cc, ccn, templateName, templateVariables, allegati,
+			serviceContext);
+	}
+
 	@Override
 	public com.liferay.portal.kernel.search.Hits searchAltriProgetti(
 		javax.servlet.http.HttpServletRequest request,

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

@@ -379,7 +379,7 @@ create table portos_bo_DettPratica (
 	tcViarch BOOLEAN,
 	tcOperaA25 BOOLEAN,
 	tcAltriInterventi BOOLEAN,
-	tcAltriInterventiDesc VARCHAR(75) null,
+	tcAltriInterventiDesc STRING null,
 	tcInCA BOOLEAN,
 	tcInOpera BOOLEAN,
 	tcPrefabbricato BOOLEAN,

liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/META-INF/portlet-model-hints.xml

@@ -469,7 +469,9 @@
 		<field name="tcViarch" type="boolean" />
 		<field name="tcOperaA25" type="boolean" />
 		<field name="tcAltriInterventi" type="boolean" />
-		<field name="tcAltriInterventiDesc" type="String" />
+		<field name="tcAltriInterventiDesc" type="String">
+			<hint name="max-length">4000</hint>
+		</field>
 		<field name="tcInCA" type="boolean" />
 		<field name="tcInOpera" type="boolean" />
 		<field name="tcPrefabbricato" type="boolean" />

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

@@ -1127,6 +1127,7 @@ label.admingeniocivile.statopratica.sanzione.doc1 = Sanzione pecuniaria doc. 1
 label.admingeniocivile.statopratica.sanzione.doc2 = Sanzione pecuniaria doc. 2
 label.admingeniocivile.statopratica.decretosanzione = Decreto sanzione
 label.admingeniocivile.statopratica.periziasanzione = Perizia sanzione
+label.admingeniocivile.statopratica.avvisomanuale = Avviso manuale
 
 label.firma-doc = Dichiaro di aver preso visione del documento, e di sottoscriverne il contenuto ai sensi del D.Lgs. 82/2005
 label.cambio-soggetti-ok = Cambio Soggetti #{0} completato con successo

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

@@ -1336,18 +1336,17 @@ public class DettPraticaImpl extends DettPraticaBaseImpl {
 		if (getNormArt3com3() && !geologo) {
 			return Collections.emptyList();
 		}
+		if (geologo) {
 			notCompleted.addAll(notCompletedDatiSezionGeologica());
+		}
 		String pericolositaGeomorfologicaPai = getGeoPericolositaGeomorfica();
 		String rischioGeomorfologicoPai = getGeoRischioGeomorfologicoPai();
 		String pericolositaIdraulicaPai = getGeoPericolositaIdraulicaPai();
 		String rischioIdraulicoPai = getGeoRischioIdraulicoPai();
 		if (DocPraticaLocalServiceUtil.getValidTmpByIntPratica_Tipologia(getIntPraticaId(), "A22", QueryUtil.ALL_POS,
 				QueryUtil.ALL_POS).isEmpty()) {
-			if (Validator.isNotNull(pericolositaGeomorfologicaPai)
+			if ("NA".equalsIgnoreCase(pericolositaGeomorfologicaPai) && "NA".equalsIgnoreCase(rischioGeomorfologicoPai)
-					&& pericolositaGeomorfologicaPai.equalsIgnoreCase("NA")
+					&& "NA".equalsIgnoreCase(pericolositaIdraulicaPai) && "NA".equalsIgnoreCase(rischioIdraulicoPai)) {
-					&& Validator.isNotNull(rischioGeomorfologicoPai) && rischioGeomorfologicoPai.equalsIgnoreCase("NA")
-					&& Validator.isNotNull(pericolositaIdraulicaPai) && pericolositaIdraulicaPai.equalsIgnoreCase("NA")
-					&& Validator.isNotNull(rischioIdraulicoPai) && rischioIdraulicoPai.equalsIgnoreCase("NA")) {
 				notCompleted.add("Nessun allegato per A22 - "
 						+ LanguageUtil.get(LocaleUtil.getDefault(), "label-documenti-tipologia-A22"));
 			}

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

@@ -93,11 +93,23 @@ public class DocPraticaImpl extends DocPraticaBaseImpl {
 	@Override
 	public boolean hasDelegaFirma(long userId, boolean sezioneGeologica) throws PortalException, SystemException {
 
+		boolean praticaIsEditable = false;
+		if (DettPratica.class.getName().equals(getClassName())) {
+			DettPratica dettPratica = DettPraticaServiceUtil.getDettPratica(getClassPk());
+			praticaIsEditable = dettPratica.praticaIsEditable();
+		}
+		return hasDelegaFirma(userId, sezioneGeologica, praticaIsEditable);
+	}
+
+	@Override
+	public boolean hasDelegaFirma(long userId, boolean sezioneGeologica, boolean praticaIsEditable)
+			throws PortalException, SystemException {
+
 		boolean controllo = true;
 		DettPratica dettPratica = null;
 		if (DettPratica.class.getName().equals(getClassName())) {
 			dettPratica = DettPraticaServiceUtil.getDettPratica(getClassPk());
-			controllo = dettPratica.praticaIsEditable();
+			controllo = praticaIsEditable;
 		}
 		if (controllo) {
 			User user = UserLocalServiceUtil.getUser(userId);
@@ -134,6 +146,7 @@ public class DocPraticaImpl extends DocPraticaBaseImpl {
 		return controllo;
 	}
 
+	@Override
 	public boolean hasDelegaDeleteFile(long userId, boolean sezioneGeologica) throws PortalException, SystemException {
 
 		// TODO completare e controllare

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

@@ -41,8 +41,6 @@ import it.tref.liferay.portos.bo.shared.util.Constants;
 import it.tref.liferay.portos.bo.shared.util.StatoPraticaConstants;
 import it.tref.liferay.portos.bo.shared.util.TipoIntegrazioneUtil;
 import it.tref.liferay.portos.bo.shared.util.TipoSoggettoUtil;
-import it.tref.liferay.portos.mailmanager.shared.messaging.util.MailManagerUtil;
-import it.tref.liferay.portos.mailmanager.shared.model.FileAttachment;
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -55,8 +53,6 @@ import org.apache.commons.lang.StringUtils;
 
 import com.liferay.portal.kernel.exception.PortalException;
 import com.liferay.portal.kernel.exception.SystemException;
-import com.liferay.portal.kernel.json.JSONObject;
-import com.liferay.portal.kernel.language.LanguageUtil;
 import com.liferay.portal.kernel.log.Log;
 import com.liferay.portal.kernel.log.LogFactoryUtil;
 import com.liferay.portal.kernel.util.HtmlUtil;
@@ -68,7 +64,6 @@ import com.liferay.portal.model.Role;
 import com.liferay.portal.model.User;
 import com.liferay.portal.model.UserGroupRole;
 import com.liferay.portal.service.RoleLocalServiceUtil;
-import com.liferay.portal.service.ServiceContext;
 import com.liferay.portal.service.UserGroupRoleLocalServiceUtil;
 import com.liferay.portal.service.UserLocalServiceUtil;
 
@@ -597,57 +592,6 @@ public class IntPraticaImpl extends IntPraticaBaseImpl {
 				|| StatoPraticaConstants.PERIZIA_SANZIONE.equals(stato);
 	}
 
-	@Override
-	public void invioMailNotifica(long dettPraticaId, long classPk, String className, String[] to, String[] cc,
-			String[] ccn, String templateName, JSONObject templateVariables, List<FileAttachment> allegati,
-			ServiceContext serviceContext) throws PortalException, SystemException {
-
-		DettPratica dettPratica = DettPraticaLocalServiceUtil.fetchDettPratica(dettPraticaId);
-		Territorio territorio = TerritorioLocalServiceUtil.getTerritorio(getTerritorioId());
-		Comune comune = ComuneLocalServiceUtil.getComune(territorio.getComuneId());
-		Provincia provincia = ProvinciaLocalServiceUtil.fetchByC_C(territorio.getCompanyId(),
-				territorio.getCodiceProvincia());
-		User titolaredigitaleUser = UserLocalServiceUtil.getUser(getUserId());
-		List<Soggetto> titolari = SoggettoLocalServiceUtil.getValidByIntPratica_CodiceFiscale(getIntPraticaId(),
-				titolaredigitaleUser.getScreenName());
-		String titolareDigitale = StringPool.BLANK;
-		String titolareDigitaleMail = StringPool.BLANK;
-		String titolareDigitaleRoles = StringPool.BLANK;
-		if (!titolari.isEmpty()) {
-			titolareDigitale = titolari.get(0).getTitle();
-			titolareDigitaleMail = titolari.get(0).getEmail();
-			for (Soggetto titolare : titolari) {
-				titolareDigitaleRoles += LanguageUtil.get(LocaleUtil.ITALIAN,
-						"gc-soggetto-" + titolare.getTipologiaSoggetto())
-						+ StringPool.SPACE;
-			}
-		}
-		String committenteTitle = StringPool.BLANK;
-		String descIntervento = StringPool.BLANK;
-		String tempId = StringPool.BLANK;
-		if (Validator.isNotNull(dettPratica)) {
-			tempId = dettPratica.getTitle();
-			descIntervento = dettPratica.getDescLongIntervento();
-			Soggetto committentePrincipale = SoggettoLocalServiceUtil
-					.getValidByIntPratica_CodiceFiscale_TipologiaSoggetto(getIntPraticaId(),
-							dettPratica.getCodiceFiscalePrincipaleCommittente(), TipoSoggettoUtil.COMMITTENTE);
-			if (Validator.isNotNull(committentePrincipale)) {
-				committenteTitle = committentePrincipale.getTitle();
-			}
-		}
-		templateVariables.put("tempId", tempId);
-		templateVariables.put("praticaNum", getNumeroProgetto());
-		templateVariables.put("titolareDigitale", titolareDigitale);
-		templateVariables.put("titolareDigitaleRoles", titolareDigitaleRoles);
-		templateVariables.put("titolareDigitaleMail", titolareDigitaleMail);
-		templateVariables.put("intervento", descIntervento);
-		templateVariables.put("provincia", provincia.getProvincia());
-		templateVariables.put("comune", comune.getDenominazione());
-		templateVariables.put("committente", committenteTitle);
-		MailManagerUtil.sendMailByTemplatName(className, classPk, templateName, to, cc, ccn, templateVariables,
-				allegati, serviceContext);
-	}
-
 	@Override
 	public boolean isAllowedAction(String action) throws SystemException {
 

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

@@ -94,14 +94,23 @@ public class ParereGeologoImpl extends ParereGeologoBaseImpl {
 			IntPratica intPratica = IntPraticaLocalServiceUtil.getIntPratica(getIntPraticaId());
 			String oggetto;
 			String[] to;
-			if (Validator.isNotNull(getDtApprovazione())) {
+			// Le richieste precedenti l'aggiornamento hanno unitaOperativa = 0
+			if (Validator.isNotNull(getDtApprovazione())
+					|| ((getUnitaOperativa() == 0) && Validator.isNotNull(getDtCompilazione()))) {
 				// notifica parere espresso a istruttore
-				User istruttore = intPratica.recuperaTecnicoIstruttore();
+				Set<String> emails = new HashSet<>();
+				emails.add(intPratica.recuperaTecnicoIstruttore().getEmailAddress());
+				emails.add(UserLocalServiceUtil.getUser(getUserId()).getEmailAddress());
 				User geologo = UserLocalServiceUtil.getUser(getGeologoUserId());
-				User approvatore = UserLocalServiceUtil.getUser(getAssegnatoreUserId());
+				User approvatore = null;
-				to = new String[] { istruttore.getEmailAddress() };
+				if (getApprovatoreUserId() != 0) {
-				oggetto = "Parere endoprocedimentale espresso da " + Generics.capitalizeFull(geologo.getFullName())
+					approvatore = UserLocalServiceUtil.getUser(getApprovatoreUserId());
-						+ ", approvato da " + Generics.capitalizeFull(approvatore.getFullName());
+				}
+				to = emails.toArray(new String[emails.size()]);
+				oggetto = "Parere endoprocedimentale espresso da "
+						+ Generics.capitalizeFull(geologo.getFullName())
+						+ (Validator.isNull(approvatore) ? StringPool.BLANK : ", approvato da "
+								+ Generics.capitalizeFull(approvatore.getFullName()));
 			} else if (Validator.isNotNull(getDtCompilazione())) {
 				// notifica parere da approvare
 				User approvatore = UserLocalServiceUtil.getUser(getAssegnatoreUserId());
@@ -135,6 +144,7 @@ public class ParereGeologoImpl extends ParereGeologoBaseImpl {
 						+ Generics.capitalizeFull(getUserName()) + " a "
 						+ Generics.capitalizeFull(assegnatore.getFullName());
 			}
+			if (to != null) {
 				String[] cc = new String[0];
 				String[] ccn = new String[0];
 				String tipoPratica = StringPool.BLANK;
@@ -159,6 +169,7 @@ public class ParereGeologoImpl extends ParereGeologoBaseImpl {
 				long classPk = getParereGeologoId();
 				MailManagerUtil.sendMailByTemplatName(className, classPk, "NOTIFICA-GEOLOGO", to, cc, ccn,
 						templateVariables, null, serviceContext);
+			}
 		} catch (PortalException | SystemException e) {
 			_log.error("Errore invio mail al geologo - ParereGeologoId=" + getParereGeologoId(), e);
 		}

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

@@ -286,8 +286,8 @@ public class SchedulerInvioDocumento implements MessageListener {
 		serviceContext.setScopeGroupId(avviso.getGroupId());
 		serviceContext.setCompanyId(avviso.getCompanyId());
 		serviceContext.setUserId(avviso.getUserId());
-		intPratica.invioMailNotifica(dettPratica.getDettPraticaId(), avvisoId, Avviso.class.getName(), to, cc, ccn,
+		IntPraticaLocalServiceUtil.invioMailNotifica(dettPratica.getDettPraticaId(), avvisoId, Avviso.class.getName(),
-				"NOTIFICA-SOGGETTI-ATTIVI", templateVariables, null, serviceContext);
+				to, cc, ccn, "NOTIFICA-SOGGETTI-ATTIVI", templateVariables, null, serviceContext);
 		if (null != committentePrincipale) {
 			to = new String[] { committentePrincipale.getEmail() };
 			List<FileAttachment> allegati = new ArrayList<FileAttachment>();
@@ -313,8 +313,9 @@ public class SchedulerInvioDocumento implements MessageListener {
 				fileAttachment.generateFile();
 				allegati.add(fileAttachment);
 			}
-			intPratica.invioMailNotifica(dettPratica.getDettPraticaId(), avvisoId, Avviso.class.getName(), to, cc, ccn,
+			IntPraticaLocalServiceUtil.invioMailNotifica(dettPratica.getDettPraticaId(), avvisoId,
-					"NOTIFICA-SOGGETTI-ATTIVI", templateVariables, allegati, serviceContext);
+					Avviso.class.getName(), to, cc, ccn, "NOTIFICA-SOGGETTI-ATTIVI", templateVariables, allegati,
+					serviceContext);
 			String[] suapEnabled = new String[] { StatoPraticaConstants.CONFORME, StatoPraticaConstants.NON_CONFORME };
 			if ((intPratica.isAutorizzazione() && ArrayUtil.contains(suapEnabled, avviso.getTipoDocumento()))
 					|| (StatoPraticaConstants.VIDIMATA.equals(avviso.getTipoDocumento()))) {
@@ -334,8 +335,9 @@ public class SchedulerInvioDocumento implements MessageListener {
 						FastDateFormatFactoryUtil.getSimpleDateFormat("dd/MM/yyyy HH:mm").format(
 								intPratica.getDtPratica()));
 				if (to.length > 0 && to[0] != StringPool.BLANK) {
-					intPratica.invioMailNotifica(dettPratica.getDettPraticaId(), avvisoId, Avviso.class.getName(), to,
+					IntPraticaLocalServiceUtil.invioMailNotifica(dettPratica.getDettPraticaId(), avvisoId,
-							cc, ccn, "INVIO-SUAP", templateVariables, allegati, serviceContext);
+							Avviso.class.getName(), to, cc, ccn, "INVIO-SUAP", templateVariables, allegati,
+							serviceContext);
 				}
 			}
 		}

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

@@ -363,26 +363,35 @@ public class IntPraticaLocalServiceClpInvoker {
 
 		_methodParameterTypes231 = new String[] { "long" };
 
-		_methodName232 = "searchAltriProgetti";
+		_methodName232 = "invioMailNotifica";
 
 		_methodParameterTypes232 = new String[] {
-				"javax.servlet.http.HttpServletRequest",
+				"long", "long", "java.lang.String", "java.lang.String[][]",
-				"com.liferay.portal.model.User", "int", "int"
+				"java.lang.String[][]", "java.lang.String[][]",
+				"java.lang.String", "com.liferay.portal.kernel.json.JSONObject",
+				"java.util.List", "com.liferay.portal.service.ServiceContext"
 			};
 
-		_methodName233 = "searchArchivioProgetti";
+		_methodName233 = "searchAltriProgetti";
 
 		_methodParameterTypes233 = new String[] {
 				"javax.servlet.http.HttpServletRequest",
 				"com.liferay.portal.model.User", "int", "int"
 			};
 
-		_methodName234 = "searchMieiProgetti";
+		_methodName234 = "searchArchivioProgetti";
 
 		_methodParameterTypes234 = new String[] {
 				"javax.servlet.http.HttpServletRequest",
 				"com.liferay.portal.model.User", "int", "int"
 			};
+
+		_methodName235 = "searchMieiProgetti";
+
+		_methodParameterTypes235 = new String[] {
+				"javax.servlet.http.HttpServletRequest",
+				"com.liferay.portal.model.User", "int", "int"
+			};
 	}
 
 	public Object invokeMethod(String name, String[] parameterTypes,
@@ -837,22 +846,38 @@ public class IntPraticaLocalServiceClpInvoker {
 
 		if (_methodName232.equals(name) &&
 				Arrays.deepEquals(_methodParameterTypes232, parameterTypes)) {
+			IntPraticaLocalServiceUtil.invioMailNotifica(((Long)arguments[0]).longValue(),
+				((Long)arguments[1]).longValue(),
+				(java.lang.String)arguments[2],
+				(java.lang.String[])arguments[3],
+				(java.lang.String[])arguments[4],
+				(java.lang.String[])arguments[5],
+				(java.lang.String)arguments[6],
+				(com.liferay.portal.kernel.json.JSONObject)arguments[7],
+				(java.util.List<it.tref.liferay.portos.mailmanager.shared.model.FileAttachment>)arguments[8],
+				(com.liferay.portal.service.ServiceContext)arguments[9]);
+
+			return null;
+		}
+
+		if (_methodName233.equals(name) &&
+				Arrays.deepEquals(_methodParameterTypes233, parameterTypes)) {
 			return IntPraticaLocalServiceUtil.searchAltriProgetti((javax.servlet.http.HttpServletRequest)arguments[0],
 				(com.liferay.portal.model.User)arguments[1],
 				((Integer)arguments[2]).intValue(),
 				((Integer)arguments[3]).intValue());
 		}
 
-		if (_methodName233.equals(name) &&
+		if (_methodName234.equals(name) &&
-				Arrays.deepEquals(_methodParameterTypes233, parameterTypes)) {
+				Arrays.deepEquals(_methodParameterTypes234, parameterTypes)) {
 			return IntPraticaLocalServiceUtil.searchArchivioProgetti((javax.servlet.http.HttpServletRequest)arguments[0],
 				(com.liferay.portal.model.User)arguments[1],
 				((Integer)arguments[2]).intValue(),
 				((Integer)arguments[3]).intValue());
 		}
 
-		if (_methodName234.equals(name) &&
+		if (_methodName235.equals(name) &&
-				Arrays.deepEquals(_methodParameterTypes234, parameterTypes)) {
+				Arrays.deepEquals(_methodParameterTypes235, parameterTypes)) {
 			return IntPraticaLocalServiceUtil.searchMieiProgetti((javax.servlet.http.HttpServletRequest)arguments[0],
 				(com.liferay.portal.model.User)arguments[1],
 				((Integer)arguments[2]).intValue(),
@@ -1010,4 +1035,6 @@ public class IntPraticaLocalServiceClpInvoker {
 	private String[] _methodParameterTypes233;
 	private String _methodName234;
 	private String[] _methodParameterTypes234;
+	private String _methodName235;
+	private String[] _methodParameterTypes235;
 }

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

@@ -244,7 +244,7 @@ public class CollaudoLocalServiceImpl extends CollaudoLocalServiceBaseImpl {
 		serviceContext.setScopeGroupId(collaudo.getGroupId());
 		serviceContext.setCompanyId(collaudo.getCompanyId());
 		serviceContext.setUserId(collaudo.getUserId());
-		intPratica.invioMailNotifica(0, collaudoId, Collaudo.class.getName(), to, cc, ccn, "NOTIFICA-BO",
+		intPraticaLocalService.invioMailNotifica(0, collaudoId, Collaudo.class.getName(), to, cc, ccn, "NOTIFICA-BO",
 				templateVariables, null, serviceContext);
 	}
 

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

@@ -146,7 +146,7 @@ public class ComunicazioneLocalServiceImpl extends ComunicazioneLocalServiceBase
 		JSONObject templateVariable = JSONFactoryUtil.createJSONObject();
 		templateVariable.put("receiver", receiver);
 		templateVariable.put("link", url);
-		intPratica.invioMailNotifica(0, comunicazioneId, Comunicazione.class.getName(), to, cc, ccn,
+		intPraticaLocalService.invioMailNotifica(0, comunicazioneId, Comunicazione.class.getName(), to, cc, ccn,
 				"INVIO-RICHIESTA-ASSEVERAZIONE", templateVariable, null, serviceContext);
 	}
 
@@ -175,7 +175,7 @@ public class ComunicazioneLocalServiceImpl extends ComunicazioneLocalServiceBase
 		serviceContext.setScopeGroupId(comunicazione.getGroupId());
 		serviceContext.setCompanyId(comunicazione.getCompanyId());
 		serviceContext.setUserId(comunicazione.getUserId());
-		intPratica.invioMailNotifica(0, comunicazioneId, Comunicazione.class.getName(), to, cc, ccn, "NOTIFICA-BO",
+		intPraticaLocalService.invioMailNotifica(0, comunicazioneId, Comunicazione.class.getName(), to, cc, ccn,
-				templateVariables, null, serviceContext);
+				"NOTIFICA-BO", templateVariables, null, serviceContext);
 	}
 }

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

@@ -37,8 +37,6 @@ import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-import java.util.Set;
-import java.util.TreeSet;
 
 import javax.portlet.ActionRequest;
 import javax.portlet.ActionResponse;
@@ -437,13 +435,11 @@ public class DettPraticaLocalServiceImpl extends DettPraticaLocalServiceBaseImpl
 
 	private boolean getBoolean(ActionRequest request, String param) {
 
-		parameters.remove(param);
 		return ParamUtil.getBoolean(request, param);
 	}
 
 	private Date getDate(ActionRequest request, String param, Date defaultValue) {
 
-		parameters.remove(param);
 		if (request.getParameterMap().containsKey(param)) {
 			return ParamUtil.getDate(request, param, DateFormatFactoryUtil.getDate(request.getLocale()));
 		}
@@ -457,7 +453,6 @@ public class DettPraticaLocalServiceImpl extends DettPraticaLocalServiceBaseImpl
 
 	private long getLong(ActionRequest request, String param, long defaultValue) {
 
-		parameters.remove(param);
 		if (request.getParameterMap().containsKey(param)) {
 			return ParamUtil.getLong(request, param);
 		}
@@ -471,37 +466,17 @@ public class DettPraticaLocalServiceImpl extends DettPraticaLocalServiceBaseImpl
 
 	private String getString(ActionRequest request, String param, String defaultValue) {
 
-		parameters.remove(param);
 		if (request.getParameterMap().containsKey(param)) {
 			return ParamUtil.getString(request, param);
 		}
 		return defaultValue;
 	}
 
-	private Set<String> parameters;
-
 	@Override
 	@Indexable(type = IndexableType.REINDEX)
 	public DettPratica aggiornaPratica(ActionRequest request, ActionResponse response) throws PortalException,
 			SystemException {
 
-		parameters = new TreeSet<>(request.getParameterMap().keySet());
-		parameters.remove("asseverazionesSearchContainerPrimaryKeys");
-		parameters.remove("backURL");
-		parameters.remove("backgroundTaskActive");
-		parameters.remove("bozza");
-		parameters.remove("cmd");
-		parameters.remove("comune");
-		parameters.remove("current_tab");
-		parameters.remove("formDate");
-		parameters.remove("geoDtRelazioneDay");
-		parameters.remove("geoDtRelazioneMonth");
-		parameters.remove("geoDtRelazioneYear");
-		parameters.remove("javax.portlet.action");
-		parameters.remove("modifiedSections");
-		parameters.remove("provincia");
-		parameters.remove("successURL");
-		parameters.remove("verifyArea");
 		ServiceContext serviceContext = ServiceContextFactory.getInstance(request);
 		long userId = serviceContext.getUserId();
 		long dettPraticaId = ParamUtilgetLong(request, "dettPraticaId");
@@ -641,7 +616,6 @@ public class DettPraticaLocalServiceImpl extends DettPraticaLocalServiceBaseImpl
 			dp.setVia(getString(request, "via", dp.getVia()));
 			dp.setVincoli(getString(request, "vincoli", dp.getVincoli()));
 		}
-		_log.info("geoDisabledSubmit = " + getBoolean(request, "geoDisabledSubmit"));
 		if (dp.canSaveGeologia(userId) && !getBoolean(request, "geoDisabledSubmit")) {
 			dp.setGeoCategoriaSottosuolo(getString(request, "geoCategoriaSottosuolo"));
 			dp.setGeoCategoriaTopografica(getString(request, "geoCategoriaTopografica"));
@@ -667,11 +641,6 @@ public class DettPraticaLocalServiceImpl extends DettPraticaLocalServiceBaseImpl
 			dp.setGeoRischioGeomorfologicoPai(getString(request, "geoRischioGeomorfologicoPai"));
 			dp.setGeoRischioIdraulicoPai(getString(request, "geoRischioIdraulicoPai"));
 		}
-		for (String param : parameters) {
-			if (!param.endsWith("Checkbox") && !param.startsWith("confirmClose_")) {
-				_log.info("Non gestito: " + param + " = " + ParamUtil.getString(request, param));
-			}
-		}
 		return updateDettPratica(dp);
 	}
 
@@ -852,8 +821,8 @@ public class DettPraticaLocalServiceImpl extends DettPraticaLocalServiceBaseImpl
 		serviceContext.setScopeGroupId(dettPratica.getGroupId());
 		serviceContext.setCompanyId(dettPratica.getCompanyId());
 		serviceContext.setUserId(dettPratica.getUserId());
-		intPratica.invioMailNotifica(dettPraticaId, dettPraticaId, DettPratica.class.getName(), to, cc, ccn,
+		intPraticaLocalService.invioMailNotifica(dettPraticaId, dettPraticaId, DettPratica.class.getName(), to, cc,
-				"NOTIFICA-BO", templateVariables, null, serviceContext);
+				ccn, "NOTIFICA-BO", templateVariables, null, serviceContext);
 	}
 
 	@Override

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

@@ -264,8 +264,8 @@ public class FineLavoriLocalServiceImpl extends FineLavoriLocalServiceBaseImpl {
 		serviceContext.setScopeGroupId(fineLavori.getGroupId());
 		serviceContext.setCompanyId(fineLavori.getCompanyId());
 		serviceContext.setUserId(fineLavori.getUserId());
-		intPratica.invioMailNotifica(0, fineLavoriId, FineLavori.class.getName(), to, cc, ccn, "NOTIFICA-BO",
+		intPraticaLocalService.invioMailNotifica(0, fineLavoriId, FineLavori.class.getName(), to, cc, ccn,
-				templateVariables, null, serviceContext);
+				"NOTIFICA-BO", templateVariables, null, serviceContext);
 	}
 
 	private IntPratica updateIntPraticaStatus(FineLavori fineLavori, long intPraticaId) throws PortalException,

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

@@ -35,10 +35,13 @@ import it.tref.liferay.portos.bo.shared.bean.FirmeBean;
 import it.tref.liferay.portos.bo.shared.util.ConfigurazioneConstants;
 import it.tref.liferay.portos.bo.shared.util.FirmeUtil;
 import it.tref.liferay.portos.bo.shared.util.StatoPraticaConstants;
+import it.tref.liferay.portos.bo.shared.util.TipoSoggettoUtil;
 import it.tref.liferay.portos.bo.util.Constants;
 import it.tref.liferay.portos.bo.util.PraticaUtil;
 import it.tref.liferay.portos.bo.util.WorkflowUtil;
 import it.tref.liferay.portos.kaleo.service.FormLogLocalServiceUtil;
+import it.tref.liferay.portos.mailmanager.shared.messaging.util.MailManagerUtil;
+import it.tref.liferay.portos.mailmanager.shared.model.FileAttachment;
 import it.tref.liferay.portos.report.shared.constants.ReportConstants;
 import it.tref.liferay.portos.report.shared.dto.ReportDto;
 import it.tref.liferay.portos.report.shared.dto.ReportResultDto;
@@ -74,6 +77,7 @@ 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.JSONObject;
 import com.liferay.portal.kernel.json.JSONSerializer;
 import com.liferay.portal.kernel.language.LanguageUtil;
 import com.liferay.portal.kernel.log.Log;
@@ -1204,6 +1208,58 @@ public class IntPraticaLocalServiceImpl extends IntPraticaLocalServiceBaseImpl {
 		return intPratica.hasRichiestaIntegrazioneAttiva();
 	}
 
+	@Override
+	public void invioMailNotifica(long dettPraticaId, long classPk, String className, String[] to, String[] cc,
+			String[] ccn, String templateName, JSONObject templateVariables, List<FileAttachment> allegati,
+			ServiceContext serviceContext) throws PortalException, SystemException {
+
+		DettPratica dettPratica = dettPraticaLocalService.fetchDettPratica(dettPraticaId);
+		long intPraticaId = dettPratica.getIntPraticaId();
+		IntPratica intPratica = getIntPratica(intPraticaId);
+		Territorio territorio = territorioLocalService.getTerritorio(intPratica.getTerritorioId());
+		Comune comune = comuneLocalService.getComune(territorio.getComuneId());
+		Provincia provincia = provinciaLocalService.fetchByC_C(territorio.getCompanyId(),
+				territorio.getCodiceProvincia());
+		User titolaredigitaleUser = userLocalService.getUser(intPratica.getUserId());
+		List<Soggetto> titolari = soggettoLocalService.getValidByIntPratica_CodiceFiscale(intPraticaId,
+				titolaredigitaleUser.getScreenName());
+		String titolareDigitale = StringPool.BLANK;
+		String titolareDigitaleMail = StringPool.BLANK;
+		String titolareDigitaleRoles = StringPool.BLANK;
+		if (!titolari.isEmpty()) {
+			titolareDigitale = titolari.get(0).getTitle();
+			titolareDigitaleMail = titolari.get(0).getEmail();
+			for (Soggetto titolare : titolari) {
+				titolareDigitaleRoles += LanguageUtil.get(LocaleUtil.ITALIAN,
+						"gc-soggetto-" + titolare.getTipologiaSoggetto())
+						+ StringPool.SPACE;
+			}
+		}
+		String committenteTitle = StringPool.BLANK;
+		String descIntervento = StringPool.BLANK;
+		String tempId = StringPool.BLANK;
+		if (Validator.isNotNull(dettPratica)) {
+			tempId = dettPratica.getTitle();
+			descIntervento = dettPratica.getDescLongIntervento();
+			Soggetto committentePrincipale = soggettoLocalService.getValidByIntPratica_CodiceFiscale_TipologiaSoggetto(
+					intPraticaId, dettPratica.getCodiceFiscalePrincipaleCommittente(), TipoSoggettoUtil.COMMITTENTE);
+			if (Validator.isNotNull(committentePrincipale)) {
+				committenteTitle = committentePrincipale.getTitle();
+			}
+		}
+		templateVariables.put("tempId", tempId);
+		templateVariables.put("praticaNum", intPratica.getNumeroProgetto());
+		templateVariables.put("titolareDigitale", titolareDigitale);
+		templateVariables.put("titolareDigitaleRoles", titolareDigitaleRoles);
+		templateVariables.put("titolareDigitaleMail", titolareDigitaleMail);
+		templateVariables.put("intervento", descIntervento);
+		templateVariables.put("provincia", provincia.getProvincia());
+		templateVariables.put("comune", comune.getDenominazione());
+		templateVariables.put("committente", committenteTitle);
+		MailManagerUtil.sendMailByTemplatName(className, classPk, templateName, to, cc, ccn, templateVariables,
+				allegati, serviceContext);
+	}
+
 	@Override
 	public Hits searchAltriProgetti(HttpServletRequest request, User user, int start, int end) {
 

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

@@ -76,7 +76,7 @@ public class ParereGeologoLocalServiceImpl extends ParereGeologoLocalServiceBase
 		long geologoUserId = 0;
 		long assegnatoreUserId = 0;
 		if (unitaOperativa < 0) {
-			unitaOperativa = intPraticaLocalService.getIntPratica(intPraticaId).getUnitaOperativa();
+			unitaOperativa = 0;
 			assegnatoreUserId = serviceContext.getUserId();
 			geologoUserId = userId;
 		} else {
@@ -280,12 +280,15 @@ public class ParereGeologoLocalServiceImpl extends ParereGeologoLocalServiceBase
 
 		DynamicQuery query = dynamicQuery();
 		Junction assegnataNonApprovata = RestrictionsFactoryUtil.conjunction();
+		assegnataNonApprovata.add(RestrictionsFactoryUtil.ne("unitaOperativa", 0));
 		assegnataNonApprovata.add(RestrictionsFactoryUtil.isNotNull("dtAssegnazione"));
 		assegnataNonApprovata.add(RestrictionsFactoryUtil.isNull("dtApprovazione"));
 		Disjunction nonEspressoONonApprovato = RestrictionsFactoryUtil.disjunction();
 		nonEspressoONonApprovato.add(assegnataNonApprovata);
-		nonEspressoONonApprovato.add(RestrictionsFactoryUtil.isNull("dtCompilazione"));
+		// I pareri richiesti prima dell'aggiornamento hanno unitaOperativa = 0
+		nonEspressoONonApprovato.add(RestrictionsFactoryUtil.eq("unitaOperativa", 0));
 		query.add(nonEspressoONonApprovato);
+		query.add(RestrictionsFactoryUtil.isNull("dtCompilazione"));
 		query.add(RestrictionsFactoryUtil.isNull("dtAnnullamento"));
 		return query;
 	}

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=3600
+    build.number=3605
-    build.date=1643195768963
+    build.date=1644937328845
     build.auto.upgrade=true
 
 ##

liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/html/asset/controllopratica/full_content.jsp

@@ -82,8 +82,7 @@ List<ParereGeologo> pareri = ParereGeologoLocalServiceUtil.findByIntPraticaId(in
 			User approvatore = parere.getApprovatoreUserId() == 0 ? null
 					: UserLocalServiceUtil.getUser(parere.getApprovatoreUserId());
 			boolean espresso = Validator.isNotNull(parere.getDtCompilazione())
-					&& (Validator.isNull(parere.getDtAssegnazione())
+					&& (parere.getUnitaOperativa() == 0 || Validator.isNotNull(parere.getDtApprovazione()));
-							|| Validator.isNotNull(parere.getDtApprovazione()));
 	%>
 		<li>
 			<c:choose>
@@ -102,14 +101,19 @@ List<ParereGeologo> pareri = ParereGeologoLocalServiceUtil.findByIntPraticaId(in
 			</c:if>
 			<c:if test="<%= richiedente.getUserId() != parere.getAssegnatoreUserId() %>">
 				Richiesto da <strong><%= Generics.capitalizeFull(richiedente.getFullName()) %></strong>
-				<c:if test="<%= parere.getUnitaOperativa() != 0 %>">
+				<c:choose>
+					<c:when test="<%= parere.getUnitaOperativa() != 0 %>">
 						a <%= assegnatore == null ? "tutti gli assegnatori"
 								: "<strong>" + Generics.capitalizeFull(assegnatore.getFullName()) + "</strong>" %>
 						di U.O. <%= parere.getUnitaOperativa() %>
-				</c:if>
 						<c:if test="<%= Validator.isNotNull(parere.getDtRichista()) %>">
 							in data <%= dateFormatDateTime.format(parere.getDtRichista()) %>
 						</c:if>
+					</c:when>
+					<c:when test="<%= Validator.isNotNull(geologo) %>">
+						a <strong><%= Generics.capitalizeFull(geologo.getFullName()) %></strong>
+					</c:when>
+				</c:choose>
 				<br />
 			</c:if>
 			<c:if test="<%= assegnatore != null && geologo != null %>">
@@ -137,7 +141,8 @@ List<ParereGeologo> pareri = ParereGeologoLocalServiceUtil.findByIntPraticaId(in
 				<br />
 				</c:if>
 			</c:if>
-			<c:if test="<%= Validator.isNotNull(parere.getDtApprovazione()) %>">
+			<c:if test="<%= Validator.isNotNull(parere.getDtApprovazione())
+					&& Validator.isNotNull(approvatore) %>">
 				Approvato da <strong><%= Generics.capitalizeFull(approvatore.getFullName()) %></strong>
 				in data <%= dateFormatDateTime.format(parere.getDtApprovazione()) %>
 				<br />

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

@@ -14,109 +14,96 @@
 <%@page import="com.liferay.portal.kernel.portlet.LiferayWindowState"%>
 <%@page import="com.liferay.portal.service.permission.PortletPermissionUtil"%>
 <%@include file="/html/fascicolo/init.jsp"%>
-
 <%
-	SearchContainer searchContainer = (SearchContainer) request
+SearchContainer searchContainer = (SearchContainer) request.getAttribute("liferay-ui:search:searchContainer");
-			.getAttribute("liferay-ui:search:searchContainer");
+String redirect = ParamUtil.getString(request, "backUrl");
-	String redirect = ParamUtil.getString(request, "backUrl");
+IntPratica intPratica = null;
-	IntPratica intPratica = null;
+boolean showExpanded = true;
-	
+if (searchContainer != null) {
-	boolean showExpanded = true;
-	if (searchContainer != null) {
 	redirect = searchContainer.getIteratorURL().toString();
-
+	ResultRow row = (ResultRow) request.getAttribute(WebKeys.SEARCH_CONTAINER_RESULT_ROW);
-		ResultRow row = (ResultRow) request
-				.getAttribute(WebKeys.SEARCH_CONTAINER_RESULT_ROW);
-
 	intPratica = (IntPratica) row.getObject();
-
 	showExpanded = false;
-	} else {
+} else {
 	long intPraticaId = ParamUtil.getLong(request, "intPraticaId");
 	intPratica = IntPraticaLocalServiceUtil.getIntPratica(intPraticaId);
-	}
+}
-	
+String randomId = StringUtil.randomId();
-	String randomId = StringUtil.randomId();
+String buttonIdCambiaStato = "buttonIdCambiaStato_" + randomId;
-	String buttonIdCambiaStato = "buttonIdCambiaStato_"+randomId; 
+String buttonIdToggleSospensione = "buttonIdToggleSospensione_" + randomId;
-	String buttonIdToggleSospensione = "buttonIdToggleSospensione_"+randomId; 
+String buttonIdCambiaTitolare = "buttonIdCambiaTitolare_" + randomId;
-	String buttonIdCambiaTitolare = "buttonIdCambiaTitolare_"+randomId; 
+String buttonIdToggleWorkflow = "buttonIdToggleWorkflow_" + randomId;
-	String buttonIdToggleWorkflow = "buttonIdToggleWorkflow_"+randomId; 
+String buttonIdSelezionaGeologo = "buttonIdSelezionaGeologo_" + randomId;
-	String buttonIdSelezionaGeologo = "buttonIdSelezionaGeologo_"+randomId; 
+DettPratica lastDettPratica = DettPraticaLocalServiceUtil.getLastCompletedByIntPratica(intPratica.getIntPraticaId());
-	
+Map<String, String[]> changeMap = null;
-	DettPratica lastDettPratica = DettPraticaLocalServiceUtil.getLastCompletedByIntPratica(intPratica.getIntPraticaId());
+if (lastDettPratica == null) {
-	Map<String, String[]> changeMap = null;
-	if (lastDettPratica == null) {
 	changeMap = new HashMap<String, String[]>();
-	} else {
+} else {
 	changeMap = PraticaUtil.getStatusChangeMap(lastDettPratica.getDettPraticaId());
-	}
+}
-	List<String> statiPossibili = ListUtil.toList(changeMap.get(intPratica.getStatoPratica()));
+List<String> statiPossibili = ListUtil.toList(changeMap.get(intPratica.getStatoPratica()));
-	
+Territorio territorio = TerritorioLocalServiceUtil.getTerritorio(intPratica.getTerritorioId());
-	Territorio territorio = TerritorioLocalServiceUtil.getTerritorio(intPratica.getTerritorioId());
+long territorioGroupId = territorio.getGroupId();
-	long territorioGroupId = territorio.getGroupId();
 %>
-
 <portlet:renderURL var="viewEntryURL">
 	<portlet:param name="mvcPath" value="/html/fascicolo/view_fascicolo.jsp" />
 	<portlet:param name="intPraticaId" value="<%=String.valueOf(intPratica.getIntPraticaId())%>" />
 	<portlet:param name="backURL" value="<%=redirect%>" />
 </portlet:renderURL>
-	
+<liferay-ui:icon-menu icon="" showWhenSingleIcon="true" showExpanded="<%= showExpanded %>">
-<liferay-ui:icon-menu icon="" showWhenSingleIcon="<%=true%>" showExpanded="<%=showExpanded%>">
-	
 	<liferay-ui:icon iconCssClass="fa fa-eye" message="view" url="<%=viewEntryURL%>" />
 	<c:if test="<%= IntPraticaPermission.contains(permissionChecker, territorioGroupId, ActionKeys.SOSPENDI_FASCICOLO ) %>">
 		<liferay-ui:icon id="<%=buttonIdToggleSospensione%>" iconCssClass="fa fa-eject fa-rotate-90" message="fascicolo-action-sospendi" url="#" />
 	</c:if>
-	
 	<c:if test="<%=!intPratica.isSospesa() %>">
-		<%if(!statiPossibili.isEmpty() && IntPraticaPermission.contains(permissionChecker, territorioGroupId, ActionKeys.CAMBIO_STATO)){ %>
+		<c:if test="<%= !statiPossibili.isEmpty()
-			<liferay-ui:icon id="<%=buttonIdCambiaStato%>" iconCssClass="fa fa-exchange" message="fascicolo-action-cambia-stato" url="#" />
+				&& IntPraticaPermission.contains(permissionChecker, territorioGroupId, ActionKeys.CAMBIO_STATO) %>">
-		<%} %>
+			<liferay-ui:icon id="<%=buttonIdCambiaStato %>"  iconCssClass="fa fa-exchange"
-		<c:if test="<%= IntPraticaPermission.contains(permissionChecker, territorioGroupId, ActionKeys.CAMBIO_TITOLARE ) %>">
+					message="fascicolo-action-cambia-stato" url="#" />
-			<liferay-ui:icon id="<%=buttonIdCambiaTitolare%>" iconCssClass="fa fa-users" message="fascicolo-action-cambia-titolare" url="#" />
 		</c:if>
-		<c:if test="<%= IntPraticaPermission.contains(permissionChecker, territorioGroupId, ActionKeys.CAMBIO_STATO_WORKFLOW ) %>">
+		<c:if test="<%= IntPraticaPermission
-			<liferay-ui:icon id="<%=buttonIdToggleWorkflow%>" iconCssClass="fa fa-random" message="fascicolo-action-toggle-workflow" url="#" />
+				.contains(permissionChecker, territorioGroupId, ActionKeys.CAMBIO_TITOLARE) %>">
+			<liferay-ui:icon id="<%= buttonIdCambiaTitolare %>" iconCssClass="fa fa-users"
+					message="fascicolo-action-cambia-titolare" url="#" />
 		</c:if>
+		<c:if test="<%= IntPraticaPermission
+				.contains(permissionChecker, territorioGroupId, ActionKeys.CAMBIO_STATO_WORKFLOW) %>">
+			<liferay-ui:icon id="<%= buttonIdToggleWorkflow %>" iconCssClass="fa fa-random"
+					message="fascicolo-action-toggle-workflow" url="#" />
 		</c:if>
-	
-</liferay-ui:icon-menu>
-
-	<c:if test="<%= IntPraticaPermission.contains(permissionChecker, territorioGroupId, ActionKeys.SOSPENDI_FASCICOLO ) %>">
-		<liferay-util:include page="/html/fascicolo/actions/action_toggle_sospensione.jsp" servletContext="<%= application %>" >
-			<liferay-util:param name="intPraticaId" value="<%=String.valueOf(intPratica.getIntPraticaId()) %>"></liferay-util:param>
-			<liferay-util:param name="buttonIdToggleSospensione" value="<%=buttonIdToggleSospensione %>"></liferay-util:param>
-		</liferay-util:include>
 	</c:if>
-
+</liferay-ui:icon-menu>
-<c:if test="<%=!intPratica.isSospesa() %>">
+<c:if test="<%= IntPraticaPermission
-	<%if(!statiPossibili.isEmpty() && IntPraticaPermission.contains(permissionChecker, territorioGroupId, ActionKeys.CAMBIO_STATO)){ %>
+		.contains(permissionChecker, territorioGroupId, ActionKeys.SOSPENDI_FASCICOLO ) %>">
-		<liferay-util:include page="/html/fascicolo/actions/action_cambia_stato_pratica.jsp" servletContext="<%= application %>" >
+	<liferay-util:include page="/html/fascicolo/actions/action_toggle_sospensione.jsp"
-			<liferay-util:param name="intPraticaId" value="<%=String.valueOf(intPratica.getIntPraticaId()) %>"></liferay-util:param>
+			servletContext="<%= application %>">
-			<liferay-util:param name="buttonIdCambiaStato" value="<%=buttonIdCambiaStato %>"></liferay-util:param>
+		<liferay-util:param name="intPraticaId" value="<%=String.valueOf(intPratica.getIntPraticaId()) %>" />
+		<liferay-util:param name="buttonIdToggleSospensione" value="<%=buttonIdToggleSospensione %>" />
 	</liferay-util:include>
-	<%} %>
+</c:if>
-	<!--  
+<c:if test="<%= !intPratica.isSospesa() %>">
-	<c:if test="<%= IntPraticaPermission.contains(permissionChecker, territorioGroupId, ActionKeys.SOSPENDI_FASCICOLO ) %>">
+	<c:if test="<%= !statiPossibili.isEmpty()
-		<liferay-util:include page="/html/fascicolo/actions/action_toggle_sospensione.jsp" servletContext="<%= application %>" >
+			&& IntPraticaPermission.contains(permissionChecker, territorioGroupId, ActionKeys.CAMBIO_STATO) %>">
-			<liferay-util:param name="intPraticaId" value="<%=String.valueOf(intPratica.getIntPraticaId()) %>"></liferay-util:param>
+		<liferay-util:include page="/html/fascicolo/actions/action_cambia_stato_pratica.jsp"
-			<liferay-util:param name="buttonIdToggleSospensione" value="<%=buttonIdToggleSospensione %>"></liferay-util:param>
+				servletContext="<%= application %>">
+			<liferay-util:param name="intPraticaId" value="<%= String.valueOf(intPratica.getIntPraticaId()) %>" />
+			<liferay-util:param name="buttonIdCambiaStato" value="<%= buttonIdCambiaStato %>" />
 		</liferay-util:include>
 	</c:if>
-	-->
+	<c:if test="<%= IntPraticaPermission
-	
+			.contains(permissionChecker, territorioGroupId, ActionKeys.CAMBIO_TITOLARE ) %>">
-	<c:if test="<%= IntPraticaPermission.contains(permissionChecker, territorioGroupId, ActionKeys.CAMBIO_TITOLARE ) %>">
+		<liferay-util:include page="/html/fascicolo/actions/action_cambia_titolare.jsp"
-		<liferay-util:include page="/html/fascicolo/actions/action_cambia_titolare.jsp" servletContext="<%= application %>" >
+				servletContext="<%= application %>">
-			<liferay-util:param name="intPraticaId" value="<%=String.valueOf(intPratica.getIntPraticaId()) %>"></liferay-util:param>
+			<liferay-util:param name="intPraticaId" value="<%= String.valueOf(intPratica.getIntPraticaId()) %>" />
-			<liferay-util:param name="buttonIdCambiaTitolare" value="<%=buttonIdCambiaTitolare %>"></liferay-util:param>
+			<liferay-util:param name="buttonIdCambiaTitolare" value="<%= buttonIdCambiaTitolare %>" />
 		</liferay-util:include>
 	</c:if>
-	
+	<c:if test="<%= IntPraticaPermission
-	<c:if test="<%= IntPraticaPermission.contains(permissionChecker, territorioGroupId, ActionKeys.CAMBIO_STATO_WORKFLOW ) %>">
+			.contains(permissionChecker, territorioGroupId, ActionKeys.CAMBIO_STATO_WORKFLOW ) %>">
-		<liferay-util:include page="/html/fascicolo/actions/action_toggle_workflow.jsp" servletContext="<%= application %>" >
+		<liferay-util:include page="/html/fascicolo/actions/action_toggle_workflow.jsp"
-			<liferay-util:param name="intPraticaId" value="<%=String.valueOf(intPratica.getIntPraticaId()) %>"></liferay-util:param>
+				servletContext="<%= application %>">
-			<liferay-util:param name="buttonIdToggleWorkflow" value="<%=buttonIdToggleWorkflow %>"></liferay-util:param>
+			<liferay-util:param name="intPraticaId" value="<%=String.valueOf(intPratica.getIntPraticaId()) %>" />
+			<liferay-util:param name="buttonIdToggleWorkflow" value="<%=buttonIdToggleWorkflow %>" />
 		</liferay-util:include>
 	</c:if>
 </c:if>

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

@@ -38,11 +38,10 @@ if (workflowInstanceLink == null) {
 }
 long lastDettPraticaId = DettPraticaLocalServiceUtil.getLastCompletedByIntPratica(
 		intPratica.getIntPraticaId()).getDettPraticaId();
-String randomId = StringUtil.randomId();
+String buttonIdCambioIstruttore = "buttonIdCambioIstruttore_" + controlloPratica.getDettPraticaId();
-String buttonIdCambioIstruttore = "buttonIdCambioIstruttore_" + randomId;
+String buttonIdRichiediParere = "buttonIdRichiediParere_" + controlloPratica.getDettPraticaId();
-String buttonIdRichiediParere = "buttonIdRichiediParere_" + randomId;
+String buttonIdAnnullaParere = "buttonIdAnnullaParere_" + controlloPratica.getDettPraticaId();
-String buttonIdAnnullaParere = "buttonIdAnnullaParere_" + randomId;
+String buttonIdAggiungiDettPraticheAlControllo = "buttonIdAggiungiDettPraticheAlControllo_" + controlloPratica.getDettPraticaId();
-String buttonIdAggiungiDettPraticheAlControllo = "buttonIdAggiungiDettPraticheAlControllo_" + randomId;
 Territorio territorio = TerritorioLocalServiceUtil.getTerritorio(intPratica.getTerritorioId());
 long territorioGroupId = territorio.getGroupId();
 %>

liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/html/gestioneattivita/actions/action_annulla_ric_geologo.jsp

@@ -6,10 +6,9 @@
 <%
 long intPraticaId = ParamUtil.getLong(request, "intPraticaId");
 long dettPraticaId = ParamUtil.getLong(request, "dettPraticaId");
-String buttonIdAnnullaRicGeologo = ParamUtil.getString(request, "buttonIdAnnullaRicGeologo");
+String buttonIdAnnullaRicGeologo = ParamUtil.getString(request, "buttonId");
-String randomId = StringUtil.randomId();
+String formNameAnnullaRicGeologo = "formNameAnnullaRicGeologo_" + dettPraticaId;
-String formNameAnnullaRicGeologo = "formNameAnnullaRicGeologo_" + randomId;
+String divIdAnnullaRicGeologo = "divIdAnnullaRicGeologo_" + dettPraticaId;
-String divIdAnnullaRicGeologo = "divIdAnnullaRicGeologo_" + randomId;
 List<ParereGeologo> pareri = ParereGeologoLocalServiceUtil.findByIntPraticaIdInCorso(intPraticaId, QueryUtil.ALL_POS,
 		QueryUtil.ALL_POS);
 %>

liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/html/gestioneattivita/actions/action_seleziona_geologo.jsp

@@ -8,7 +8,7 @@
 <%
 long intPraticaId = ParamUtil.getLong(request, "intPraticaId");
 long dettPraticaId = ParamUtil.getLong(request, "dettPraticaId");
-String buttonIdSelezionaGeologo = ParamUtil.getString(request, "buttonIdSelezionaGeologo");
+String buttonIdSelezionaGeologo = ParamUtil.getString(request, "buttonId");
 String randomId = StringUtil.randomId();
 String formNameSelezionaGeologo = "formNameSelezionaGeologo_" + randomId;
 String divIdSelezionaGeologo = "divIdSelezionaGeologo_" + randomId;
@@ -17,7 +17,9 @@ List<User> geologi = UserLocalServiceUtil.getRoleUsers(role.getRoleId());
 List<ParereGeologo> pareri = ParereGeologoLocalServiceUtil.findByIntPraticaIdInCorso(intPraticaId, QueryUtil.ALL_POS,
 		QueryUtil.ALL_POS);
 for (ParereGeologo parere : pareri) {
+	if (parere.getGeologoUserId() != 0) {
 		geologi.remove(UserLocalServiceUtil.getUser(parere.getGeologoUserId()));
+	}
 }
 %>
 <liferay-portlet:actionURL name="aggiungiRichiestaParere" var="aggiungiRichiestaParereUrl">
@@ -46,7 +48,7 @@ for (ParereGeologo parere : pareri) {
 		<aui:input name="noteRichiedente" type="textarea" />
 	</div>
 	<liferay-util:include page="/html/common/submit_window.jsp" servletContext="<%= application %>">
-		<liferay-util:param name="formName" value="fascicolo-action-seleziona-geologo" />
+		<liferay-util:param name="formName" value="<%= formNameSelezionaGeologo %>" />
 		<liferay-util:param name="titolo" value="Richiedi parere endoprocedimentale" />
 		<liferay-util:param name="buttonId" value="<%= buttonIdSelezionaGeologo %>" />
 		<liferay-util:param name="buttonConferma" value="CONFERMA" />

liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/html/gestioneattivita/view_columns.jspf

@@ -215,8 +215,7 @@ DettPratica lastDettPratica = DettPraticaLocalServiceUtil.getLastCompletedByIntP
 					if (Validator.isNotNull(parere.getDtAnnullamento())) {
 						annullati++;
 					} else if (Validator.isNotNull(parere.getDtCompilazione())
-							&& (Validator.isNull(parere.getDtAssegnazione())
+							&& (parere.getUnitaOperativa() == 0 || Validator.isNotNull(parere.getDtApprovazione()))) {
-									|| Validator.isNotNull(parere.getDtApprovazione()))) {
 						espressi++;
 					}
 				}

liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/.settings/org.eclipse.wst.common.component

@@ -5,9 +5,6 @@
         <dependent-module archiveName="portos-bo-portlet-service.jar" deploy-path="/WEB-INF/lib" handle="module:/classpath/lib/portos-bo-portlet/docroot/WEB-INF/lib/portos-bo-portlet-service.jar">
             <dependency-type>uses</dependency-type>
         </dependent-module>
-        <dependent-module archiveName="portos-bo-portlet-service.jar" deploy-path="/WEB-INF/lib" handle="module:/classpath/lib/portos-bo-portlet/docroot/WEB-INF/lib/portos-bo-portlet-service.jar">
-            <dependency-type>uses</dependency-type>
-        </dependent-module>
         <dependent-module archiveName="hms-taglib-hook-service.jar" deploy-path="/WEB-INF/lib" handle="module:/classpath/lib/hms-taglib-hook/docroot/WEB-INF/lib/hms-taglib-hook-service.jar">
             <dependency-type>uses</dependency-type>
         </dependent-module>

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

@@ -1397,8 +1397,8 @@ public class FascicoloFePortlet extends MVCPortlet {
 			templateVariablesExtra.put("delega",
 					LanguageUtil.get(LocaleUtil.ITALIAN, "label-deleghe-tipologia-" + delega.getTipologia()));
 			templateVariablesExtra.put("link", url);
-			intPratica.invioMailNotifica(delega.getDettPraticaId(), delegaId, Delega.class.getName(), to, cc, ccn,
+			IntPraticaLocalServiceUtil.invioMailNotifica(delega.getDettPraticaId(), delegaId, Delega.class.getName(),
-					"INVIO-DELEGA", templateVariablesExtra, null, serviceContext);
+					to, cc, ccn, "INVIO-DELEGA", templateVariablesExtra, null, serviceContext);
 		} catch (Exception e) {
 			_log.error(e, e);
 			throw new SystemException(e);
@@ -1433,7 +1433,7 @@ public class FascicoloFePortlet extends MVCPortlet {
 			Soggetto soggetto = SoggettoLocalServiceUtil.getValidTmpByIntPratica_CodiceFiscale(
 					asseverazione.getIntPraticaId(), asseverazione.getCodiceFiscale(), 0L).get(0);
 			IntPratica intPratica = IntPraticaLocalServiceUtil.getIntPratica(asseverazione.getIntPraticaId());
-			_log.debug("Sending asseverazione mai to " + soggetto.getEmail());
+			_log.debug("Sending asseverazione mail to " + soggetto.getEmail());
 			String[] to = { soggetto.getEmail() };
 			String[] cc = new String[0];
 			String[] ccn = new String[0];
@@ -1455,7 +1455,7 @@ public class FascicoloFePortlet extends MVCPortlet {
 			fileAttachment.setFileEntryId(asseverazione.getFileEntryId());
 			fileAttachment.generateFile();
 			allegati.add(fileAttachment);
-			intPratica.invioMailNotifica(asseverazione.getDettPraticaId(), asseverazioneId,
+			IntPraticaLocalServiceUtil.invioMailNotifica(asseverazione.getDettPraticaId(), asseverazioneId,
 					Asseverazione.class.getName(), to, cc, ccn, "INVIO-RICHIESTA-ASSEVERAZIONE",
 					templateVariablesExtra, allegati, serviceContext);
 		} catch (Exception e) {
@@ -1486,13 +1486,13 @@ public class FascicoloFePortlet extends MVCPortlet {
 			} else {
 				SessionErrors.add(request, "error.geniocivilefe.pagamento.allegato.is.request");
 			}
-			if (!SessionErrors.isEmpty(request)) {
+			if (SessionErrors.isEmpty(request)) {
-				PortalUtil.copyRequestParameters(request, response);
-			} else {
 				String numeroBollettino = ParamUtil.getString(request, "numeroBollettino");
 				byte[] content = FileUtil.getBytes(file);
 				PagamentoServiceUtil.updatePagamentoManuale(pagamentoId, numeroBollettino, content, sourceFileName,
 						serviceContext);
+			} else {
+				PortalUtil.copyRequestParameters(request, response);
 			}
 		} catch (Exception e) {
 			PortalUtil.copyRequestParameters(request, response);

liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/html/allegatipratica/allegati_action.jsp

@@ -29,7 +29,9 @@ long docPraticaId = ParamUtil.getLong(request, "docPraticaId");
 DocPratica docPratica = DocPraticaServiceUtil.getDocPratica(docPraticaId);
 FirmeBean firme = FirmeUtil.deserialize(docPratica.getJsonFirmatari());
 boolean disabledInput = ParamUtil.getBoolean(request, "disabledInput", false);
-boolean hasDelegaFirma = docPratica.hasDelegaFirma(user.getUserId(), "page_geologica".equalsIgnoreCase(comingFrom));
+boolean praticaIsEditable = ParamUtil.getBoolean(request, "praticaIsEditable", false);
+boolean hasDelegaFirma = docPratica.hasDelegaFirma(user.getUserId(), "page_geologica".equalsIgnoreCase(comingFrom),
+		praticaIsEditable);
 boolean canSignGeoDocs = "page_geologica".equalsIgnoreCase(comingFrom) && hasDelegaFirma;
 %>
 <liferay-ui:icon-menu icon="" showExpanded="true" showWhenSingleIcon="true">

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

@@ -1,3 +1,8 @@
+<%@page import="it.tref.liferay.portos.bo.service.DocPraticaLocalServiceUtil"%>
+<%@page import="com.liferay.portal.kernel.util.MapUtil"%>
+<%@page import="java.util.Date"%>
+<%@page import="java.util.HashMap"%>
+<%@page import="java.util.Map"%>
 <%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%>
 <%@page import="com.liferay.portal.kernel.dao.orm.QueryUtil"%>
 <%@page import="com.liferay.portal.kernel.portlet.LiferayWindowState"%>
@@ -75,6 +80,11 @@ if (Validator.isNotNull(request.getParameter("disabled"))) {
 } else if ("page_collaudo".equalsIgnoreCase(comingFrom)) {
 	disabledInput = disabled;
 }
+Map<String, String> soggetti = new HashMap<String, String>();
+for (Soggetto soggetto : SoggettoLocalServiceUtil.findByIntPratica(intPraticaId)) {
+	soggetti.put(soggetto.getCodiceFiscale().toLowerCase(), soggetto.getNome() + ' ' + soggetto.getCognome());
+}
+Map<Long, Boolean> editables = new HashMap<Long, Boolean>();
 %>
 <c:if test="<%= DettPratica.class.getName().equalsIgnoreCase(className) %>">
 	<liferay-util:include page="/html/fascicolofe/navigator/header.jsp" servletContext="<%= application %>">
@@ -219,6 +229,13 @@ if ("page_geologica".equals(comingFrom)) {
 				<%
 				} else {
 					for (DocPratica docPratica : docPraticas) {
+						if (!editables.containsKey(docPratica.getClassPk())) {
+							DettPratica dp = null;
+							if (DettPratica.class.getName().equals(docPratica.getClassName())) {
+								dp = DettPraticaLocalServiceUtil.fetchDettPratica(docPratica.getClassPk()); 
+							}
+							editables.put(docPratica.getClassPk(), Validator.isNotNull(dp) && dp.praticaIsEditable());
+						}
 						FirmeBean firme = FirmeUtil.deserialize(docPratica.getJsonFirmatari());
 						StringBuilder title = new StringBuilder();
 						String cssIcon = StringPool.BLANK;
@@ -246,14 +263,12 @@ if ("page_geologica".equals(comingFrom)) {
 						if (firme.numeroFirme() > 0) {
 							cssIcon = "fa-check";
 						}
-						title.append("Firma sul file:<ul>").append("<li>").append(testoFirme).append("</li>");
+						title.append("Firma sul file:<ul><li>").append(testoFirme).append("</li>");
 						if (!firme.getFirmeDigitali().isEmpty()) {
 							for (FirmeDetail firma : firme.getFirmeDigitali()) {
-								List<Soggetto> soggetti = SoggettoLocalServiceUtil.findByIntPratica_CodiceFiscale(
+								String nome = soggetti.get(firma.getCfFirmatario().toLowerCase());
-										docPratica.getIntPraticaId(), firma.getCfFirmatario());
+								if (nome != null) {
-								if (soggetti.size() > 0) {
+									title.append("<li>").append(nome).append("</li>");
-									title.append("<li>").append(soggetti.get(0).getNome()).append(StringPool.SPACE)
-											.append(soggetti.get(0).getCognome()).append("</li>");
 								}
 								title.append("<li>").append(firma.getCfFirmatario());
 								if (Validator.isNotNull(firma.getDtFirma())) {
@@ -266,11 +281,9 @@ if ("page_geologica".equals(comingFrom)) {
 						if (!firme.getFirmeApplicativo().isEmpty()) {
 							title.append("Firme da applicativo:<ul>");
 							for (FirmeDetail firma : firme.getFirmeApplicativo()) {
-								List<Soggetto> soggetti = SoggettoLocalServiceUtil.findByIntPratica_CodiceFiscale(
+								String nome = soggetti.get(firma.getCfFirmatario().toLowerCase());
-										docPratica.getIntPraticaId(), firma.getCfFirmatario());
+								if (nome != null) {
-								if (soggetti.size() > 0) {
+									title.append("<li>").append(nome).append("</li>");
-									title.append("<li>").append(soggetti.get(0).getNome()).append(StringPool.SPACE)
-											.append(soggetti.get(0).getCognome()).append("</li>");
 								}
 								title.append("<li>").append(firma.getCfFirmatario());
 								if (Validator.isNotNull(firma.getDtFirma())) {
@@ -284,38 +297,31 @@ if ("page_geologica".equals(comingFrom)) {
 						<div class="nome_file">
 							<div class='<%= inBO ? "col-xs-6" : "col-xs-4" %>'>
 								<%
-								String color = StringPool.BLANK;
+								String color = docPratica.getDettPraticaIdRimozione() == 0 ? "txt-green" : "txt-red";
-								if (Validator.isNotNull(docPratica.getDettPraticaIdRimozione())) {
-									color = "txt-red";
-								} else {
-									color = "txt-green";
-								}
 								%>
 								<i class="fa fa-circle file-icon <%= color %>" aria-hidden="true"></i>
 								<%= docPratica.getDescLong() %>
 							</div>
 							<div class='col-xs-2 <%= inBO ? "hidden" : "" %> asserazioni-body-title'>
 								<%
-								String adding = StringPool.BLANK;
 								if (FineLavori.class.getName().equalsIgnoreCase(className)) {
 									FineLavori fineLavori = FineLavoriLocalServiceUtil.fetchFineLavori(
 											docPratica.getClassPk());
 									if (fineLavori != null) {
-										adding = fineLavori.getFullDescription();
+										out.print(fineLavori.getFullDescription());
 									}
 								} else if (Collaudo.class.getName().equalsIgnoreCase(className)) {
 									Collaudo collaudo = CollaudoLocalServiceUtil.fetchCollaudo(docPratica.getClassPk());
 									if (collaudo != null) {
-										adding = collaudo.getFullDescription();
+										out.print(collaudo.getFullDescription());
 									}
 								} else {
 									DettPratica dp = DettPraticaLocalServiceUtil.fetchDettPratica(
 											docPratica.getClassPk());
 									if (dp != null) {
-										adding = dp.getFullDescription();
+										out.print(dp.getFullDescription());
 									}
 								}
-								out.print(adding);
 								%>
 							</div>
 							<div class='col-xs-2 <%= inBO ? "hidden" : "" %> asserazioni-body-title'>
@@ -394,6 +400,8 @@ if ("page_geologica".equals(comingFrom)) {
 											<liferay-util:param name="className" value="<%= className %>" />
 											<liferay-util:param name="docPraticaId" value="<%= String.valueOf(docPratica
 													.getDocPraticaId()) %>" />
+											<liferay-util:param name="praticaIsEditable"
+													value="<%= String.valueOf(editables.get(docPratica.getClassPk())) %>" />
 											<liferay-util:param name="disabledInput"
 													value="<%= String.valueOf(disabledInput) %>" />
 										</liferay-util:include>

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

@@ -562,12 +562,12 @@ function duplicati(input) {
 										<div class="col-xs-12">
 											<div class="row altro_check">
 												<div class="col-xs-12">
-													<aui:input disabled="<%=disabledInput %>" name="tcAltriInterventi" label="tc-altri-interventi"/>
+													<aui:input disabled="<%= isDisabled %>" name="tcAltriInterventi" label="tc-altri-interventi"/>
 												</div>
 											</div>
 											<div class="row altro_check">
 												<div class="col-xs-12">
-													<aui:input type="textarea" name="tcAltriInterventiDesc" disabled="<%=!dettPratica.getTcAltriInterventi() || disabledInput %>" label=""></aui:input>
+													<aui:input type="textarea" name="tcAltriInterventiDesc" disabled="<%=!dettPratica.getTcAltriInterventi() || isDisabled %>" label="" />
 												</div>
 											</div>
 										</div>

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

@@ -29,6 +29,8 @@
 				value="<%= HtmlUtil.escape(parere.getNoteRichiedente()) %>" />
 		<liferay-ui:search-container-column-text name="note-assegnatore"
 				value="<%= HtmlUtil.escape(parere.getNoteAssegnatore()) %>" />
+		<liferay-ui:search-container-column-text name="data-approvazione"
+				value="<%= Validator.isNull(parere.getDtApprovazione()) ? StringPool.MINUS : dateFormatDate.format(parere.getDtApprovazione()) %>" />
 		<liferay-ui:search-container-column-text name="note-approvatore"
 				value="<%= HtmlUtil.escape(parere.getNoteApprovatore()) %>" />
 		<liferay-ui:search-container-column-text name="Localizzazione" value="<%= intPratica.getIndirizzo() %>" />

liferay-plugins-sdk-6.2/portlets/portos-firma-portlet/.settings/org.eclipse.wst.common.component

@@ -5,9 +5,6 @@
         <dependent-module archiveName="portos-bo-portlet-service.jar" deploy-path="/WEB-INF/lib" handle="module:/classpath/lib/portos-bo-portlet/docroot/WEB-INF/lib/portos-bo-portlet-service.jar">
             <dependency-type>uses</dependency-type>
         </dependent-module>
-        <dependent-module archiveName="portos-bo-portlet-service.jar" deploy-path="/WEB-INF/lib" handle="module:/classpath/lib/portos-bo-portlet/docroot/WEB-INF/lib/portos-bo-portlet-service.jar">
-            <dependency-type>uses</dependency-type>
-        </dependent-module>
         <property name="context-root" value="portos-firma-portlet"/>
         <property name="java-output-path" value="/portos-firma-portlet/docroot/WEB-INF/classes"/>
     </wb-module>

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

@@ -13,8 +13,8 @@
 ##
 
     build.namespace=portos_rep
-    build.number=35
+    build.number=36
-    build.date=1632924732787
+    build.date=1645093778756
     build.auto.upgrade=true
 
 ##

liferay-plugins-sdk-6.2/portlets/sicilia-sue-connector-portlet/.settings/org.eclipse.wst.common.component

@@ -6,9 +6,6 @@
         <dependent-module archiveName="portos-bo-portlet-service.jar" deploy-path="/WEB-INF/lib" handle="module:/classpath/lib/portos-bo-portlet/docroot/WEB-INF/lib/portos-bo-portlet-service.jar">
             <dependency-type>uses</dependency-type>
         </dependent-module>
-        <dependent-module archiveName="portos-bo-portlet-service.jar" deploy-path="/WEB-INF/lib" handle="module:/classpath/lib/portos-bo-portlet/docroot/WEB-INF/lib/portos-bo-portlet-service.jar">
-            <dependency-type>uses</dependency-type>
-        </dependent-module>
         <property name="context-root" value="sicilia-sue-connector-portlet"/>
         <property name="java-output-path" value="/sicilia-sue-connector-portlet/docroot/WEB-INF/classes"/>
     </wb-module>

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

@@ -71,6 +71,7 @@ public class StatoPraticaConstants {
 			put(SANZIONE_DOC2, "label.admingeniocivile.statopratica.sanzione.doc2");
 			put(PERIZIA_SANZIONE, "label.admingeniocivile.statopratica.periziasanzione");
 			put(DECRETO_SANZIONE, "label.admingeniocivile.statopratica.decretosanzione");
+			put(INVIO_AVVISO_MANUALE, "label.admingeniocivile.statopratica.avvisomanuale");
 		}
 	};
 

liferay-plugins-sdk-6.2/webs/portos-kaleo-web/.settings/org.eclipse.wst.common.component

@@ -9,9 +9,6 @@
         <dependent-module archiveName="portos-bo-portlet-service.jar" deploy-path="/WEB-INF/lib" handle="module:/classpath/lib/portos-bo-portlet/docroot/WEB-INF/lib/portos-bo-portlet-service.jar">
             <dependency-type>uses</dependency-type>
         </dependent-module>
-        <dependent-module archiveName="portos-bo-portlet-service.jar" deploy-path="/WEB-INF/lib" handle="module:/classpath/lib/portos-bo-portlet/docroot/WEB-INF/lib/portos-bo-portlet-service.jar">
-            <dependency-type>uses</dependency-type>
-        </dependent-module>
         <property name="context-root" value="portos-kaleo-web"/>
         <property name="java-output-path" value="/portos-kaleo-web/docroot/WEB-INF/classes"/>
     </wb-module>