Assegnatore UO 0 può assegnare a tutti gli istruttori

liferay-plugins-sdk-6.2/build.ture.properties

@@ -1,3 +1,5 @@
+# Managed by Liferay IDE (remove this comment to prevent future updates)
+
 app.server.tomcat.lib.global.dir = /home/ture/liferay/portali/paesaggistica/tomcat-7.0.62/lib/ext
 app.server.tomcat.deploy.dir = /home/ture/liferay/portali/paesaggistica/tomcat-7.0.62/webapps
 app.server.parent.dir = /home/ture/liferay/portali/paesaggistica

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=29
+    build.number=30
-    build.date=1632756642323
+    build.date=1632921863898
     build.auto.upgrade=true
 
 ##

liferay-plugins-sdk-6.2/portlets/portos-accesso-atti-portlet/docroot/html/accesso_atti_fe/visualizza-atto.jsp

@@ -1,5 +1,4 @@
 <%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%>
-<%@page import="it.tref.liferay.portos.bo.util.SoggettiUtil"%>
 <%@page import="com.liferay.portal.kernel.portlet.LiferayWindowState"%>
 <%@page import="it.tref.liferay.portos.bo.shared.util.PortletKeys"%>
 <%@page import="it.tref.liferay.portos.accesso.atti.model.RichiestaAccessoAtti"%>
@@ -541,7 +540,7 @@ RichiestaAccessoAtti accettoAtti = RichiestaAccessoAttiLocalServiceUtil.getRichi
 						modelVar="soggetto"
 					>	
 					<%
-						boolean isSoggettoPrincipale = SoggettiUtil.isSoggettoPrincipale(soggetto.getSoggettoId(), dettPratica.getDettPraticaId());
+						boolean isSoggettoPrincipale = dettPratica.isSoggettoPrincipale(soggetto.getSoggettoId());
 					%>
 						
 						<liferay-portlet:renderURL portletName="<%=PortletKeys.SOGGETTI %>" var="detailsURL" windowState="<%=LiferayWindowState.POP_UP.toString() %>">

liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/.classpath

@@ -2,11 +2,6 @@
 <classpath>
 	<classpathentry kind="src" path="docroot/WEB-INF/src"/>
 	<classpathentry kind="src" path="docroot/WEB-INF/service"/>
-	<classpathentry kind="con" path="org.eclipse.jst.server.core.container/com.liferay.ide.eclipse.server.tomcat.runtimeClasspathProvider/Liferay v6.2 CE (Tomcat 7)">
-		<attributes>
-			<attribute name="owner.project.facets" value="jst.web"/>
-		</attributes>
-	</classpathentry>
 	<classpathentry kind="con" path="org.eclipse.jst.j2ee.internal.web.container"/>
 	<classpathentry kind="con" path="org.eclipse.jst.j2ee.internal.module.container"/>
 	<classpathentry kind="con" path="com.liferay.ide.eclipse.server.plugin.container/portlet">
@@ -15,6 +10,15 @@
 		</attributes>
 	</classpathentry>
 	<classpathentry kind="con" path="org.apache.ivyde.eclipse.cpcontainer.IVYDE_CONTAINER/?project=portos-bo-portlet&amp;ivyXmlPath=ivy.xml&amp;confs=*"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/jdk1.7.0_80"/>
+	<classpathentry kind="con" path="org.eclipse.jst.server.core.container/com.liferay.ide.eclipse.server.tomcat.runtimeClasspathProvider/Liferay v6.2 CE (Tomcat 7)">
+		<attributes>
+			<attribute name="owner.project.facets" value="jst.web"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/jdk1.7.0_80">
+		<attributes>
+			<attribute name="owner.project.facets" value="java"/>
+		</attributes>
+	</classpathentry>
 	<classpathentry kind="output" path="docroot/WEB-INF/classes"/>
 </classpath>

liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/.settings/org.eclipse.ltk.core.refactoring.prefs

@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+org.eclipse.ltk.core.refactoring.enable.project.refactoring.history=false

liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/META-INF/custom_jsps/html/taglib/ui/form_navigator/page.jsp

@@ -66,7 +66,7 @@ if (Validator.isNotNull(historyKey)) {
 
 	<c:choose>
 		<c:when test='<%= displayStyle.equals("panel") %>'>
-			<liferay-ui:panel-container accordion="<%= true %>" extended="<%= true %>" id="tabs" persistState="<%= true %>">
+			<liferay-ui:panel-container accordion="true" extended="true" id="tabs" persistState="true">
 				<%@ include file="/html/taglib/ui/form_navigator/sections.jspf" %>
 			</liferay-ui:panel-container>
 

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

@@ -93,6 +93,10 @@ public interface DettPratica extends DettPraticaModel, PersistedModel {
 		throws com.liferay.portal.kernel.exception.PortalException,
 			com.liferay.portal.kernel.exception.SystemException;
 
+	public boolean hasSoggettoPrincipale(java.lang.String tipologiaSoggetto)
+		throws com.liferay.portal.kernel.exception.PortalException,
+			com.liferay.portal.kernel.exception.SystemException;
+
 	public boolean isAsseverazioneDomandaRecommendedByTipoSoggetto(
 		java.lang.String tipoSoggetto);
 
@@ -101,6 +105,9 @@ public interface DettPratica extends DettPraticaModel, PersistedModel {
 		throws com.liferay.portal.kernel.exception.PortalException,
 			com.liferay.portal.kernel.exception.SystemException;
 
+	public boolean isCollaudatorePresent()
+		throws com.liferay.portal.kernel.exception.SystemException;
+
 	public boolean isCollaudatoreRequired();
 
 	public boolean isRequiredTerna(java.lang.String codiceDoc,
@@ -108,6 +115,15 @@ public interface DettPratica extends DettPraticaModel, PersistedModel {
 		java.util.List<it.tref.liferay.portos.bo.model.Soggetto> committenti)
 		throws com.liferay.portal.kernel.exception.SystemException;
 
+	public boolean isSoggettoPrincipale(long soggettoId)
+		throws com.liferay.portal.kernel.exception.PortalException,
+			com.liferay.portal.kernel.exception.SystemException;
+
+	public boolean isSoggettoPrincipale(java.lang.String codiceFiscale,
+		java.lang.String tipologiaSoggetto)
+		throws com.liferay.portal.kernel.exception.PortalException,
+			com.liferay.portal.kernel.exception.SystemException;
+
 	public java.util.List<java.lang.String> notCompletedSection(
 		java.lang.String section)
 		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/DettPraticaClp.java

@@ -8556,6 +8556,30 @@ public class DettPraticaClp extends BaseModelImpl<DettPratica>
 		}
 	}
 
+	@Override
+	public boolean isSoggettoPrincipale(java.lang.String codiceFiscale,
+		java.lang.String tipologiaSoggetto) {
+		try {
+			String methodName = "isSoggettoPrincipale";
+
+			Class<?>[] parameterTypes = new Class<?>[] {
+					java.lang.String.class, java.lang.String.class
+				};
+
+			Object[] parameterValues = new Object[] {
+					codiceFiscale, tipologiaSoggetto
+				};
+
+			Boolean returnObj = (Boolean)invokeOnRemoteModel(methodName,
+					parameterTypes, parameterValues);
+
+			return returnObj;
+		}
+		catch (Exception e) {
+			throw new UnsupportedOperationException(e);
+		}
+	}
+
 	@Override
 	public boolean allAsseverazioniCompleted() {
 		try {
@@ -8632,6 +8656,25 @@ public class DettPraticaClp extends BaseModelImpl<DettPratica>
 		}
 	}
 
+	@Override
+	public boolean isSoggettoPrincipale(long soggettoId) {
+		try {
+			String methodName = "isSoggettoPrincipale";
+
+			Class<?>[] parameterTypes = new Class<?>[] { long.class };
+
+			Object[] parameterValues = new Object[] { soggettoId };
+
+			Boolean returnObj = (Boolean)invokeOnRemoteModel(methodName,
+					parameterTypes, parameterValues);
+
+			return returnObj;
+		}
+		catch (Exception e) {
+			throw new UnsupportedOperationException(e);
+		}
+	}
+
 	@Override
 	public boolean isRequiredTerna(java.lang.String codiceDoc,
 		java.util.List<it.tref.liferay.portos.bo.model.Soggetto> ditte,
@@ -8811,6 +8854,25 @@ public class DettPraticaClp extends BaseModelImpl<DettPratica>
 		}
 	}
 
+	@Override
+	public boolean hasSoggettoPrincipale(java.lang.String tipologiaSoggetto) {
+		try {
+			String methodName = "hasSoggettoPrincipale";
+
+			Class<?>[] parameterTypes = new Class<?>[] { java.lang.String.class };
+
+			Object[] parameterValues = new Object[] { tipologiaSoggetto };
+
+			Boolean returnObj = (Boolean)invokeOnRemoteModel(methodName,
+					parameterTypes, parameterValues);
+
+			return returnObj;
+		}
+		catch (Exception e) {
+			throw new UnsupportedOperationException(e);
+		}
+	}
+
 	@Override
 	public java.lang.String getMiddleDescription() {
 		try {
@@ -8925,6 +8987,26 @@ public class DettPraticaClp extends BaseModelImpl<DettPratica>
 		}
 	}
 
+	@Override
+	public boolean isAsseverazioneDomandaRequiredByTipoSoggetto(
+		java.lang.String tipoSoggetto) {
+		try {
+			String methodName = "isAsseverazioneDomandaRequiredByTipoSoggetto";
+
+			Class<?>[] parameterTypes = new Class<?>[] { java.lang.String.class };
+
+			Object[] parameterValues = new Object[] { tipoSoggetto };
+
+			Boolean returnObj = (Boolean)invokeOnRemoteModel(methodName,
+					parameterTypes, parameterValues);
+
+			return returnObj;
+		}
+		catch (Exception e) {
+			throw new UnsupportedOperationException(e);
+		}
+	}
+
 	@Override
 	public java.lang.String getFullDescription() {
 		try {
@@ -8945,14 +9027,13 @@ public class DettPraticaClp extends BaseModelImpl<DettPratica>
 	}
 
 	@Override
-	public boolean isAsseverazioneDomandaRequiredByTipoSoggetto(
+	public boolean isCollaudatorePresent() {
-		java.lang.String tipoSoggetto) {
 		try {
-			String methodName = "isAsseverazioneDomandaRequiredByTipoSoggetto";
+			String methodName = "isCollaudatorePresent";
 
-			Class<?>[] parameterTypes = new Class<?>[] { java.lang.String.class };
+			Class<?>[] parameterTypes = new Class<?>[] {  };
 
-			Object[] parameterValues = new Object[] { tipoSoggetto };
+			Object[] parameterValues = new Object[] {  };
 
 			Boolean returnObj = (Boolean)invokeOnRemoteModel(methodName,
 					parameterTypes, parameterValues);

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

@@ -8345,6 +8345,13 @@ public class DettPraticaWrapper implements DettPratica,
 		return _dettPratica.hasRichiediAsseverazioni(userId);
 	}
 
+	@Override
+	public boolean hasSoggettoPrincipale(java.lang.String tipologiaSoggetto)
+		throws com.liferay.portal.kernel.exception.PortalException,
+			com.liferay.portal.kernel.exception.SystemException {
+		return _dettPratica.hasSoggettoPrincipale(tipologiaSoggetto);
+	}
+
 	@Override
 	public boolean isAsseverazioneDomandaRecommendedByTipoSoggetto(
 		java.lang.String tipoSoggetto) {
@@ -8359,6 +8366,12 @@ public class DettPraticaWrapper implements DettPratica,
 		return _dettPratica.isAsseverazioneDomandaRequiredByTipoSoggetto(tipoSoggetto);
 	}
 
+	@Override
+	public boolean isCollaudatorePresent()
+		throws com.liferay.portal.kernel.exception.SystemException {
+		return _dettPratica.isCollaudatorePresent();
+	}
+
 	@Override
 	public boolean isCollaudatoreRequired() {
 		return _dettPratica.isCollaudatoreRequired();
@@ -8372,6 +8385,22 @@ public class DettPraticaWrapper implements DettPratica,
 		return _dettPratica.isRequiredTerna(codiceDoc, ditte, committenti);
 	}
 
+	@Override
+	public boolean isSoggettoPrincipale(long soggettoId)
+		throws com.liferay.portal.kernel.exception.PortalException,
+			com.liferay.portal.kernel.exception.SystemException {
+		return _dettPratica.isSoggettoPrincipale(soggettoId);
+	}
+
+	@Override
+	public boolean isSoggettoPrincipale(java.lang.String codiceFiscale,
+		java.lang.String tipologiaSoggetto)
+		throws com.liferay.portal.kernel.exception.PortalException,
+			com.liferay.portal.kernel.exception.SystemException {
+		return _dettPratica.isSoggettoPrincipale(codiceFiscale,
+			tipologiaSoggetto);
+	}
+
 	@Override
 	public java.util.List<java.lang.String> notCompletedSection(
 		java.lang.String section)

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

@@ -94,6 +94,13 @@ public interface IntPratica extends IntPraticaModel, PersistedModel {
 		it.tref.liferay.portos.bo.model.DocPratica docPratica)
 		throws com.liferay.portal.kernel.exception.SystemException;
 
+	public boolean isCommittenteAndDitta()
+		throws com.liferay.portal.kernel.exception.SystemException;
+
+	public boolean isTitolareInCommittenti()
+		throws com.liferay.portal.kernel.exception.PortalException,
+			com.liferay.portal.kernel.exception.SystemException;
+
 	public boolean praticaCanAbort(long userId)
 		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

@@ -1603,6 +1603,25 @@ public class IntPraticaClp extends BaseModelImpl<IntPratica>
 		}
 	}
 
+	@Override
+	public boolean isCommittenteAndDitta() {
+		try {
+			String methodName = "isCommittenteAndDitta";
+
+			Class<?>[] parameterTypes = new Class<?>[] {  };
+
+			Object[] parameterValues = new Object[] {  };
+
+			Boolean returnObj = (Boolean)invokeOnRemoteModel(methodName,
+					parameterTypes, parameterValues);
+
+			return returnObj;
+		}
+		catch (Exception e) {
+			throw new UnsupportedOperationException(e);
+		}
+	}
+
 	@Override
 	public boolean praticaHasFineLavoriPaymentPending() {
 		try {
@@ -1736,6 +1755,25 @@ public class IntPraticaClp extends BaseModelImpl<IntPratica>
 		}
 	}
 
+	@Override
+	public boolean isTitolareInCommittenti() {
+		try {
+			String methodName = "isTitolareInCommittenti";
+
+			Class<?>[] parameterTypes = new Class<?>[] {  };
+
+			Object[] parameterValues = new Object[] {  };
+
+			Boolean returnObj = (Boolean)invokeOnRemoteModel(methodName,
+					parameterTypes, parameterValues);
+
+			return returnObj;
+		}
+		catch (Exception e) {
+			throw new UnsupportedOperationException(e);
+		}
+	}
+
 	@Override
 	public boolean praticaCanEditCollaudo(java.lang.String userScreenName) {
 		try {
@@ -1972,22 +2010,13 @@ public class IntPraticaClp extends BaseModelImpl<IntPratica>
 	}
 
 	@Override
-	public boolean isAllRequiredValid(java.lang.String codiceDoc,
+	public boolean praticaCanAddCollaudo(java.lang.String userScreenName) {
-		java.util.List<java.lang.String> signatures,
-		java.util.List<java.lang.String> tipologiaSoggetti,
-		it.tref.liferay.portos.bo.model.DocPratica docPratica) {
 		try {
-			String methodName = "isAllRequiredValid";
+			String methodName = "praticaCanAddCollaudo";
 
-			Class<?>[] parameterTypes = new Class<?>[] {
+			Class<?>[] parameterTypes = new Class<?>[] { java.lang.String.class };
-					java.lang.String.class, java.util.List.class,
-					java.util.List.class,
-					it.tref.liferay.portos.bo.model.DocPratica.class
-				};
 
-			Object[] parameterValues = new Object[] {
+			Object[] parameterValues = new Object[] { userScreenName };
-					codiceDoc, signatures, tipologiaSoggetti, docPratica
-				};
 
 			Boolean returnObj = (Boolean)invokeOnRemoteModel(methodName,
 					parameterTypes, parameterValues);
@@ -2000,13 +2029,22 @@ public class IntPraticaClp extends BaseModelImpl<IntPratica>
 	}
 
 	@Override
-	public boolean praticaCanAddCollaudo(java.lang.String userScreenName) {
+	public boolean isAllRequiredValid(java.lang.String codiceDoc,
+		java.util.List<java.lang.String> signatures,
+		java.util.List<java.lang.String> tipologiaSoggetti,
+		it.tref.liferay.portos.bo.model.DocPratica docPratica) {
 		try {
-			String methodName = "praticaCanAddCollaudo";
+			String methodName = "isAllRequiredValid";
 
-			Class<?>[] parameterTypes = new Class<?>[] { java.lang.String.class };
+			Class<?>[] parameterTypes = new Class<?>[] {
+					java.lang.String.class, java.util.List.class,
+					java.util.List.class,
+					it.tref.liferay.portos.bo.model.DocPratica.class
+				};
 
-			Object[] parameterValues = new Object[] { userScreenName };
+			Object[] parameterValues = new Object[] {
+					codiceDoc, signatures, tipologiaSoggetti, docPratica
+				};
 
 			Boolean returnObj = (Boolean)invokeOnRemoteModel(methodName,
 					parameterTypes, parameterValues);

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

@@ -1356,6 +1356,19 @@ public class IntPraticaWrapper implements IntPratica, ModelWrapper<IntPratica> {
 			tipologiaSoggetti, docPratica);
 	}
 
+	@Override
+	public boolean isCommittenteAndDitta()
+		throws com.liferay.portal.kernel.exception.SystemException {
+		return _intPratica.isCommittenteAndDitta();
+	}
+
+	@Override
+	public boolean isTitolareInCommittenti()
+		throws com.liferay.portal.kernel.exception.PortalException,
+			com.liferay.portal.kernel.exception.SystemException {
+		return _intPratica.isTitolareInCommittenti();
+	}
+
 	@Override
 	public boolean praticaCanAbort(long userId)
 		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/SoggettoLocalService.java

@@ -763,6 +763,11 @@ public interface SoggettoLocalService extends BaseLocalService,
 		throws com.liferay.portal.kernel.exception.PortalException,
 			com.liferay.portal.kernel.exception.SystemException;
 
+	@Transactional(propagation = Propagation.SUPPORTS, readOnly = true)
+	public boolean isCommittenteAndDitta(
+		java.util.List<it.tref.liferay.portos.bo.model.Soggetto> committenti,
+		java.util.List<it.tref.liferay.portos.bo.model.Soggetto> ditte);
+
 	public void updatePrincipale(long dettPraticaId,
 		java.lang.String codiceFiscale, java.lang.String tipologiaSoggetto)
 		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/service/SoggettoLocalServiceClp.java

@@ -541,50 +541,56 @@ public class SoggettoLocalServiceClp implements SoggettoLocalService {
 
 		_methodParameterTypes90 = new String[] { "long" };
 
-		_methodName91 = "updatePrincipale";
+		_methodName91 = "isCommittenteAndDitta";
 
 		_methodParameterTypes91 = new String[] {
-				"long", "java.lang.String", "java.lang.String"
+				"java.util.List", "java.util.List"
 			};
 
-		_methodName92 = "completeInvalidation";
+		_methodName92 = "updatePrincipale";
 
-		_methodParameterTypes92 = new String[] { "long" };
+		_methodParameterTypes92 = new String[] {
+				"long", "java.lang.String", "java.lang.String"
+			};
 
-		_methodName93 = "getSoggettiSostituitiIds";
+		_methodName93 = "completeInvalidation";
 
 		_methodParameterTypes93 = new String[] { "long" };
 
-		_methodName94 = "validaSoggetto";
+		_methodName94 = "getSoggettiSostituitiIds";
 
-		_methodParameterTypes94 = new String[] { "long", "long" };
+		_methodParameterTypes94 = new String[] { "long" };
 
-		_methodName95 = "invalidaSoggetto";
+		_methodName95 = "validaSoggetto";
 
 		_methodParameterTypes95 = new String[] { "long", "long" };
 
-		_methodName96 = "invalidaESostituisciSoggetto";
+		_methodName96 = "invalidaSoggetto";
+
+		_methodParameterTypes96 = new String[] { "long", "long" };
 
-		_methodParameterTypes96 = new String[] { "long", "long", "long" };
+		_methodName97 = "invalidaESostituisciSoggetto";
 
-		_methodName97 = "allegaFileModifica";
+		_methodParameterTypes97 = new String[] { "long", "long", "long" };
 
-		_methodParameterTypes97 = new String[] {
+		_methodName98 = "allegaFileModifica";
+
+		_methodParameterTypes98 = new String[] {
 				"long", "long", "long", "byte[][]", "java.lang.String",
 				"java.lang.String", "com.liferay.portal.service.ServiceContext"
 			};
 
-		_methodName98 = "getSoggettiByIntPraticaId_DtRimozioneNull";
+		_methodName99 = "getSoggettiByIntPraticaId_DtRimozioneNull";
 
-		_methodParameterTypes98 = new String[] { "long" };
+		_methodParameterTypes99 = new String[] { "long" };
 
-		_methodName99 = "getTipologieSoggetti";
+		_methodName100 = "getTipologieSoggetti";
 
-		_methodParameterTypes99 = new String[] {  };
+		_methodParameterTypes100 = new String[] {  };
 
-		_methodName100 = "getAmbitiProfessionali";
+		_methodName101 = "getAmbitiProfessionali";
 
-		_methodParameterTypes100 = new String[] {  };
+		_methodParameterTypes101 = new String[] {  };
 	}
 
 	@Override
@@ -4267,14 +4273,44 @@ public class SoggettoLocalServiceClp implements SoggettoLocalService {
 		return (java.util.List<java.lang.Long>)ClpSerializer.translateOutput(returnObj);
 	}
 
+	@Override
+	public boolean isCommittenteAndDitta(
+		java.util.List<it.tref.liferay.portos.bo.model.Soggetto> committenti,
+		java.util.List<it.tref.liferay.portos.bo.model.Soggetto> ditte) {
+		Object returnObj = null;
+
+		try {
+			returnObj = _invokableLocalService.invokeMethod(_methodName91,
+					_methodParameterTypes91,
+					new Object[] {
+						ClpSerializer.translateInput(committenti),
+						
+					ClpSerializer.translateInput(ditte)
+					});
+		}
+		catch (Throwable t) {
+			t = ClpSerializer.translateThrowable(t);
+
+			if (t instanceof RuntimeException) {
+				throw (RuntimeException)t;
+			}
+			else {
+				throw new RuntimeException(t.getClass().getName() +
+					" is not a valid exception");
+			}
+		}
+
+		return ((Boolean)returnObj).booleanValue();
+	}
+
 	@Override
 	public void updatePrincipale(long dettPraticaId,
 		java.lang.String codiceFiscale, java.lang.String tipologiaSoggetto)
 		throws com.liferay.portal.kernel.exception.PortalException,
 			com.liferay.portal.kernel.exception.SystemException {
 		try {
-			_invokableLocalService.invokeMethod(_methodName91,
+			_invokableLocalService.invokeMethod(_methodName92,
-				_methodParameterTypes91,
+				_methodParameterTypes92,
 				new Object[] {
 					dettPraticaId,
 					
@@ -4308,8 +4344,8 @@ public class SoggettoLocalServiceClp implements SoggettoLocalService {
 	public void completeInvalidation(long intPraticaId)
 		throws com.liferay.portal.kernel.exception.SystemException {
 		try {
-			_invokableLocalService.invokeMethod(_methodName92,
+			_invokableLocalService.invokeMethod(_methodName93,
-				_methodParameterTypes92, new Object[] { intPraticaId });
+				_methodParameterTypes93, new Object[] { intPraticaId });
 		}
 		catch (Throwable t) {
 			t = ClpSerializer.translateThrowable(t);
@@ -4335,8 +4371,8 @@ public class SoggettoLocalServiceClp implements SoggettoLocalService {
 		Object returnObj = null;
 
 		try {
-			returnObj = _invokableLocalService.invokeMethod(_methodName93,
+			returnObj = _invokableLocalService.invokeMethod(_methodName94,
-					_methodParameterTypes93, new Object[] { intPraticaId });
+					_methodParameterTypes94, new Object[] { intPraticaId });
 		}
 		catch (Throwable t) {
 			t = ClpSerializer.translateThrowable(t);
@@ -4365,8 +4401,8 @@ public class SoggettoLocalServiceClp implements SoggettoLocalService {
 		Object returnObj = null;
 
 		try {
-			returnObj = _invokableLocalService.invokeMethod(_methodName94,
+			returnObj = _invokableLocalService.invokeMethod(_methodName95,
-					_methodParameterTypes94,
+					_methodParameterTypes95,
 					new Object[] { soggettoId, dettPraticaId });
 		}
 		catch (Throwable t) {
@@ -4400,8 +4436,8 @@ public class SoggettoLocalServiceClp implements SoggettoLocalService {
 		Object returnObj = null;
 
 		try {
-			returnObj = _invokableLocalService.invokeMethod(_methodName95,
+			returnObj = _invokableLocalService.invokeMethod(_methodName96,
-					_methodParameterTypes95,
+					_methodParameterTypes96,
 					new Object[] { soggettoId, dettPraticaIdRimozione });
 		}
 		catch (Throwable t) {
@@ -4435,8 +4471,8 @@ public class SoggettoLocalServiceClp implements SoggettoLocalService {
 		Object returnObj = null;
 
 		try {
-			returnObj = _invokableLocalService.invokeMethod(_methodName96,
+			returnObj = _invokableLocalService.invokeMethod(_methodName97,
-					_methodParameterTypes96,
+					_methodParameterTypes97,
 					new Object[] {
 						soggettoId,
 						
@@ -4478,8 +4514,8 @@ public class SoggettoLocalServiceClp implements SoggettoLocalService {
 		Object returnObj = null;
 
 		try {
-			returnObj = _invokableLocalService.invokeMethod(_methodName97,
+			returnObj = _invokableLocalService.invokeMethod(_methodName98,
-					_methodParameterTypes97,
+					_methodParameterTypes98,
 					new Object[] {
 						soggettoId,
 						
@@ -4526,8 +4562,8 @@ public class SoggettoLocalServiceClp implements SoggettoLocalService {
 		Object returnObj = null;
 
 		try {
-			returnObj = _invokableLocalService.invokeMethod(_methodName98,
+			returnObj = _invokableLocalService.invokeMethod(_methodName99,
-					_methodParameterTypes98, new Object[] { intPraticaId });
+					_methodParameterTypes99, new Object[] { intPraticaId });
 		}
 		catch (Throwable t) {
 			t = ClpSerializer.translateThrowable(t);
@@ -4553,8 +4589,8 @@ public class SoggettoLocalServiceClp implements SoggettoLocalService {
 		Object returnObj = null;
 
 		try {
-			returnObj = _invokableLocalService.invokeMethod(_methodName99,
+			returnObj = _invokableLocalService.invokeMethod(_methodName100,
-					_methodParameterTypes99, new Object[] {  });
+					_methodParameterTypes100, new Object[] {  });
 		}
 		catch (Throwable t) {
 			t = ClpSerializer.translateThrowable(t);
@@ -4576,8 +4612,8 @@ public class SoggettoLocalServiceClp implements SoggettoLocalService {
 		Object returnObj = null;
 
 		try {
-			returnObj = _invokableLocalService.invokeMethod(_methodName100,
+			returnObj = _invokableLocalService.invokeMethod(_methodName101,
-					_methodParameterTypes100, new Object[] {  });
+					_methodParameterTypes101, new Object[] {  });
 		}
 		catch (Throwable t) {
 			t = ClpSerializer.translateThrowable(t);
@@ -4795,4 +4831,6 @@ public class SoggettoLocalServiceClp implements SoggettoLocalService {
 	private String[] _methodParameterTypes99;
 	private String _methodName100;
 	private String[] _methodParameterTypes100;
+	private String _methodName101;
+	private String[] _methodParameterTypes101;
 }

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

@@ -1043,6 +1043,12 @@ public class SoggettoLocalServiceUtil {
 		return getService().findIntPraticaBySoggettoId(soggettoId);
 	}
 
+	public static boolean isCommittenteAndDitta(
+		java.util.List<it.tref.liferay.portos.bo.model.Soggetto> committenti,
+		java.util.List<it.tref.liferay.portos.bo.model.Soggetto> ditte) {
+		return getService().isCommittenteAndDitta(committenti, ditte);
+	}
+
 	public static void updatePrincipale(long dettPraticaId,
 		java.lang.String codiceFiscale, java.lang.String tipologiaSoggetto)
 		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/service/SoggettoLocalServiceWrapper.java

@@ -1087,6 +1087,13 @@ public class SoggettoLocalServiceWrapper implements SoggettoLocalService,
 		return _soggettoLocalService.findIntPraticaBySoggettoId(soggettoId);
 	}
 
+	@Override
+	public boolean isCommittenteAndDitta(
+		java.util.List<it.tref.liferay.portos.bo.model.Soggetto> committenti,
+		java.util.List<it.tref.liferay.portos.bo.model.Soggetto> ditte) {
+		return _soggettoLocalService.isCommittenteAndDitta(committenti, ditte);
+	}
+
 	@Override
 	public void updatePrincipale(long dettPraticaId,
 		java.lang.String codiceFiscale, java.lang.String tipologiaSoggetto)

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

@@ -1,123 +0,0 @@
-package it.tref.liferay.portos.bo.util;
-
-import it.tref.liferay.portos.bo.model.DettPratica;
-import it.tref.liferay.portos.bo.model.IntPratica;
-import it.tref.liferay.portos.bo.model.Soggetto;
-import it.tref.liferay.portos.bo.service.DettPraticaLocalServiceUtil;
-import it.tref.liferay.portos.bo.service.DettPraticaServiceUtil;
-import it.tref.liferay.portos.bo.service.IntPraticaServiceUtil;
-import it.tref.liferay.portos.bo.service.SoggettoLocalServiceUtil;
-import it.tref.liferay.portos.bo.service.SoggettoServiceUtil;
-import it.tref.liferay.portos.bo.shared.util.TipoSoggettoUtil;
-
-import java.util.List;
-
-import com.liferay.portal.kernel.exception.PortalException;
-import com.liferay.portal.kernel.exception.SystemException;
-import com.liferay.portal.kernel.util.Validator;
-import com.liferay.portal.model.User;
-import com.liferay.portal.service.UserLocalServiceUtil;
-
-public class SoggettiUtil {
-
-	public static boolean isCommittenteAndDitta(long intPraticaId) throws SystemException {
-
-		List<Soggetto> ditte = SoggettoLocalServiceUtil.getValidTmpByDettPratica_TipologiaSoggetto(intPraticaId,
-				TipoSoggettoUtil.DITTA);
-		List<Soggetto> committenti = SoggettoLocalServiceUtil.getValidTmpByDettPratica_TipologiaSoggetto(intPraticaId,
-				TipoSoggettoUtil.COMMITTENTE);
-		return isCommittenteAndDitta(committenti, ditte);
-	}
-
-	public static boolean isCommittenteAndDitta(List<Soggetto> committenti, List<Soggetto> ditte) {
-
-		for (Soggetto committente : committenti) {
-			for (Soggetto ditta : ditte) {
-				if (ditta.getCodiceFiscale().equalsIgnoreCase(committente.getCodiceFiscale())) {
-					return true;
-				}
-			}
-		}
-		return false;
-	}
-
-	public static boolean isTitolareInCommittenti(long intPraticaId) throws SystemException, PortalException {
-
-		IntPratica intPratica = IntPraticaServiceUtil.getIntPratica(intPraticaId);
-		User titolareUser = UserLocalServiceUtil.getUserById(intPratica.getUserId());
-		String codiceFiscaleTitolare = titolareUser.getScreenName();
-		List<Soggetto> committenti = SoggettoServiceUtil.getValidTmpByIntPratica_TipologiaSoggetto(intPraticaId,
-				TipoSoggettoUtil.COMMITTENTE);
-		for (Soggetto soggetto : committenti) {
-			if (codiceFiscaleTitolare.equalsIgnoreCase(soggetto.getCodiceFiscale())) {
-				return true;
-			}
-		}
-		return false;
-	}
-
-	public static boolean isSoggettoPrincipale(long soggettoId, long dettPraticaId) throws PortalException,
-			SystemException {
-
-		Soggetto soggetto = SoggettoServiceUtil.getSoggetto(soggettoId);
-		return isSoggettoPrincipale(soggetto.getCodiceFiscale(), soggetto.getTipologiaSoggetto(), dettPraticaId);
-	}
-
-	public static boolean isSoggettoPrincipale(String codiceFiscale, String tipologiaSoggetto, long dettPraticaId)
-			throws PortalException, SystemException {
-
-		DettPratica dettPratica = DettPraticaLocalServiceUtil.getDettPratica(dettPraticaId);
-		switch (tipologiaSoggetto) {
-			case TipoSoggettoUtil.COMMITTENTE:
-				return codiceFiscale.equalsIgnoreCase(dettPratica.getCodiceFiscalePrincipaleCommittente());
-			case TipoSoggettoUtil.COLLAUDATORE:
-				return codiceFiscale.equalsIgnoreCase(dettPratica.getCodiceFiscalePrincipaleCollaudatore());
-			case TipoSoggettoUtil.DIRETTORE_LAVORI:
-				return codiceFiscale.equalsIgnoreCase(dettPratica.getCodiceFiscalePrincipaleDirettoreLavori());
-			case TipoSoggettoUtil.PROGETTISTA:
-				return codiceFiscale.equalsIgnoreCase(dettPratica.getCodiceFiscalePrincipaleProgettista());
-			case TipoSoggettoUtil.GEOLOGO:
-				return codiceFiscale.equalsIgnoreCase(dettPratica.getCodiceFiscalePrincipaleGeologo());
-			case TipoSoggettoUtil.DITTA:
-				return codiceFiscale.equalsIgnoreCase(dettPratica.getCodiceFiscalePrincipaleDitta());
-			case TipoSoggettoUtil.ARCHEOLOGO:
-				return codiceFiscale.equalsIgnoreCase(dettPratica.getCodiceFiscalePrincipaleArcheologo());
-			default:
-				return false;
-		}
-	}
-
-	public static boolean hasSoggettoPrincipale(long dettPraticaId, String tipologiaSoggetto) throws PortalException,
-			SystemException {
-
-		DettPratica dettPratica = DettPraticaServiceUtil.getDettPratica(dettPraticaId);
-		switch (tipologiaSoggetto) {
-			case TipoSoggettoUtil.COMMITTENTE:
-				return Validator.isNotNull(dettPratica.getCodiceFiscalePrincipaleCommittente());
-			case TipoSoggettoUtil.COLLAUDATORE:
-				return Validator.isNotNull(dettPratica.getCodiceFiscalePrincipaleCollaudatore());
-			case TipoSoggettoUtil.DIRETTORE_LAVORI:
-				return Validator.isNotNull(dettPratica.getCodiceFiscalePrincipaleDirettoreLavori());
-			case TipoSoggettoUtil.PROGETTISTA:
-				return Validator.isNotNull(dettPratica.getCodiceFiscalePrincipaleProgettista());
-			case TipoSoggettoUtil.GEOLOGO:
-				return Validator.isNotNull(dettPratica.getCodiceFiscalePrincipaleGeologo());
-			case TipoSoggettoUtil.DITTA:
-				return Validator.isNotNull(dettPratica.getCodiceFiscalePrincipaleDitta());
-			default:
-				return false;
-		}
-	}
-
-	public static boolean isCollaudatorePresent(long dettPraticaId) throws SystemException {
-		List<Soggetto> soggettiInseriti = SoggettoLocalServiceUtil.findByDettPratica(dettPraticaId);
-		boolean collaudatorePresente = false;
-		for (Soggetto soggetto : soggettiInseriti) {
-			if (soggetto.getTipologiaSoggetto().equals(TipoSoggettoUtil.COLLAUDATORE)) {
-				collaudatorePresente = true;
-				break;
-			}
-		}
-		return collaudatorePresente;
-	}
-}

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

@@ -17,7 +17,6 @@ import it.tref.liferay.portos.bo.service.IntPraticaLocalServiceUtil;
 import it.tref.liferay.portos.bo.service.SoggettoLocalServiceUtil;
 import it.tref.liferay.portos.bo.service.TerritorioLocalServiceUtil;
 import it.tref.liferay.portos.bo.shared.util.TipoSoggettoUtil;
-import it.tref.liferay.portos.bo.util.SoggettiUtil;
 
 import java.io.Serializable;
 import java.util.Locale;
@@ -64,7 +63,7 @@ public class AsseverazioneImpl extends AsseverazioneBaseImpl {
 	}
 
 	@Override
-	public String getModello() throws SystemException{
+	public String getModello() throws SystemException {
 
 		String modello = StringPool.BLANK;
 		switch (this.getTipologia()) {
@@ -99,7 +98,7 @@ public class AsseverazioneImpl extends AsseverazioneBaseImpl {
 	}
 
 	@Override
-	public boolean hasCambioStatoAsseverazione(long userId) throws PortalException, SystemException  {
+	public boolean hasCambioStatoAsseverazione(long userId) throws PortalException, SystemException {
 
 		DettPratica dettPratica = DettPraticaLocalServiceUtil.getDettPratica(getDettPraticaId());
 		return dettPratica.getStatus() == WorkflowConstants.STATUS_DRAFT
@@ -108,14 +107,14 @@ public class AsseverazioneImpl extends AsseverazioneBaseImpl {
 	}
 
 	@Override
-	public boolean hasGestisciFileAsseverazione(long userId) throws PortalException, SystemException  {
+	public boolean hasGestisciFileAsseverazione(long userId) throws PortalException, SystemException {
 
 		DettPratica dettPratica = DettPraticaLocalServiceUtil.getDettPratica(getDettPraticaId());
 		return dettPratica.getUserId() == userId && dettPratica.getStatus() == WorkflowConstants.STATUS_DRAFT;
 	}
 
 	@Override
-	public String retrieveText(String codiceFiscale) throws PortalException, SystemException{
+	public String retrieveText(String codiceFiscale) throws PortalException, SystemException {
 
 		if (!codiceFiscale.equalsIgnoreCase(getCodiceFiscale())) {
 			return StringPool.BLANK;
@@ -140,8 +139,7 @@ public class AsseverazioneImpl extends AsseverazioneBaseImpl {
 			case TipoSoggettoUtil.DIRETTORE_LAVORI:
 				params = new Object[] {
 						soggetto.getDescrizioneCompleta(),
-						(SoggettiUtil.isSoggettoPrincipale(soggetto.getSoggettoId(), dettPratica.getDettPraticaId())
+						(dettPratica.isSoggettoPrincipale(soggetto.getSoggettoId()) ? "Principale" : StringPool.BLANK)
-								? "Principale" : StringPool.BLANK)
 								+ (Validator.isNull(soggetto.getAmbitoProfessione()) ? StringPool.BLANK : (soggetto
 										.getAmbitoProfessione().equalsIgnoreCase("ambitoProf-altro") ? soggetto
 										.getAmbitoAttivita() : LanguageUtil.get(Locale.ITALIAN, "label-ambito-"
@@ -153,8 +151,8 @@ public class AsseverazioneImpl extends AsseverazioneBaseImpl {
 						soggetto.getCodiceFiscale().toUpperCase() + " - " + soggetto.getLegaleRap(),
 						soggetto.getDenominazione()
 								+ StringPool.SPACE
-								+ (SoggettiUtil.isSoggettoPrincipale(soggetto.getSoggettoId(),
+								+ (dettPratica.isSoggettoPrincipale(soggetto.getSoggettoId()) ? "Principale"
-										dettPratica.getDettPraticaId()) ? "Principale" : StringPool.BLANK)
+										: StringPool.BLANK)
 								+ StringPool.SPACE
 								+ (Validator.isNull(soggetto.getAmbitoProfessione()) ? StringPool.BLANK : (soggetto
 										.getAmbitoProfessione().equalsIgnoreCase("ambitoProf-altro") ? soggetto
@@ -168,8 +166,7 @@ public class AsseverazioneImpl extends AsseverazioneBaseImpl {
 				Territorio territorio = TerritorioLocalServiceUtil.getTerritorio(intPratica.getTerritorioId());
 				params = new Object[] {
 						soggetto.getDescrizioneCompleta(),
-						(SoggettiUtil.isSoggettoPrincipale(soggetto.getSoggettoId(), dettPratica.getDettPraticaId())
+						(dettPratica.isSoggettoPrincipale(soggetto.getSoggettoId()) ? "Principale" : StringPool.BLANK)
-								? "Principale" : StringPool.BLANK)
 								+ (Validator.isNull(soggetto.getAmbitoProfessione()) ? StringPool.BLANK : (soggetto
 										.getAmbitoProfessione().equalsIgnoreCase("ambitoProf-altro") ? soggetto
 										.getAmbitoAttivita() : LanguageUtil.get(Locale.ITALIAN, "label-ambito-"

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

@@ -21,6 +21,7 @@ import it.tref.liferay.portos.bo.service.DocPraticaLocalServiceUtil;
 import it.tref.liferay.portos.bo.service.IntPraticaLocalServiceUtil;
 import it.tref.liferay.portos.bo.service.IntPraticaServiceUtil;
 import it.tref.liferay.portos.bo.service.SoggettoLocalServiceUtil;
+import it.tref.liferay.portos.bo.service.SoggettoServiceUtil;
 import it.tref.liferay.portos.bo.shared.bean.FirmeBean;
 import it.tref.liferay.portos.bo.shared.util.Constants;
 import it.tref.liferay.portos.bo.shared.util.FirmeUtil;
@@ -28,7 +29,6 @@ import it.tref.liferay.portos.bo.shared.util.SezioniUtil;
 import it.tref.liferay.portos.bo.shared.util.TipoIntegrazioneUtil;
 import it.tref.liferay.portos.bo.shared.util.TipoSoggettoUtil;
 import it.tref.liferay.portos.bo.util.DelegheUtil;
-import it.tref.liferay.portos.bo.util.SoggettiUtil;
 
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
@@ -559,6 +559,29 @@ public class DettPraticaImpl extends DettPraticaBaseImpl {
 				&& getStatus() == WorkflowConstants.STATUS_DRAFT;
 	}
 
+	@Override
+	public boolean hasSoggettoPrincipale(String tipologiaSoggetto) throws PortalException, SystemException {
+
+		switch (tipologiaSoggetto) {
+			case TipoSoggettoUtil.ARCHEOLOGO:
+				return Validator.isNotNull(getCodiceFiscalePrincipaleArcheologo());
+			case TipoSoggettoUtil.COMMITTENTE:
+				return Validator.isNotNull(getCodiceFiscalePrincipaleCommittente());
+			case TipoSoggettoUtil.COLLAUDATORE:
+				return Validator.isNotNull(getCodiceFiscalePrincipaleCollaudatore());
+			case TipoSoggettoUtil.DIRETTORE_LAVORI:
+				return Validator.isNotNull(getCodiceFiscalePrincipaleDirettoreLavori());
+			case TipoSoggettoUtil.PROGETTISTA:
+				return Validator.isNotNull(getCodiceFiscalePrincipaleProgettista());
+			case TipoSoggettoUtil.GEOLOGO:
+				return Validator.isNotNull(getCodiceFiscalePrincipaleGeologo());
+			case TipoSoggettoUtil.DITTA:
+				return Validator.isNotNull(getCodiceFiscalePrincipaleDitta());
+			default:
+				return false;
+		}
+	}
+
 	@Override
 	public boolean isAsseverazioneDomandaRecommendedByTipoSoggetto(String tipoSoggetto) {
 
@@ -633,6 +656,17 @@ public class DettPraticaImpl extends DettPraticaBaseImpl {
 		return false;
 	}
 
+	@Override
+	public boolean isCollaudatorePresent() throws SystemException {
+
+		for (Soggetto soggetto : SoggettoLocalServiceUtil.findByDettPratica(getDettPraticaId())) {
+			if (soggetto.getTipologiaSoggetto().equals(TipoSoggettoUtil.COLLAUDATORE)) {
+				return true;
+			}
+		}
+		return false;
+	}
+
 	@Override
 	public boolean isCollaudatoreRequired() {
 
@@ -644,16 +678,46 @@ public class DettPraticaImpl extends DettPraticaBaseImpl {
 			throws SystemException {
 
 		if (codiceDoc.equals(DocumentiPraticaUtil.TIPOLOGIA_ALLEGATO_A17)) {
-			if (SoggettiUtil.isCommittenteAndDitta(committenti, ditte)
+			if (SoggettoLocalServiceUtil.isCommittenteAndDitta(committenti, ditte) && isCollaudatorePresent()) {
-					&& SoggettiUtil.isCollaudatorePresent(getDettPraticaId())) {
 				return true;
-			} else if (SoggettiUtil.isCommittenteAndDitta(committenti, ditte) && isCollaudatoreRequired()) {
+			} else if (SoggettoLocalServiceUtil.isCommittenteAndDitta(committenti, ditte) && isCollaudatoreRequired()) {
 				return true;
 			}
 		}
 		return false;
 	}
 
+	@Override
+	public boolean isSoggettoPrincipale(long soggettoId) throws PortalException, SystemException {
+
+		Soggetto soggetto = SoggettoServiceUtil.getSoggetto(soggettoId);
+		return isSoggettoPrincipale(soggetto.getCodiceFiscale(), soggetto.getTipologiaSoggetto());
+	}
+
+	@Override
+	public boolean isSoggettoPrincipale(String codiceFiscale, String tipologiaSoggetto) throws PortalException,
+			SystemException {
+
+		switch (tipologiaSoggetto) {
+			case TipoSoggettoUtil.ARCHEOLOGO:
+				return codiceFiscale.equalsIgnoreCase(getCodiceFiscalePrincipaleArcheologo());
+			case TipoSoggettoUtil.COMMITTENTE:
+				return codiceFiscale.equalsIgnoreCase(getCodiceFiscalePrincipaleCommittente());
+			case TipoSoggettoUtil.COLLAUDATORE:
+				return codiceFiscale.equalsIgnoreCase(getCodiceFiscalePrincipaleCollaudatore());
+			case TipoSoggettoUtil.DIRETTORE_LAVORI:
+				return codiceFiscale.equalsIgnoreCase(getCodiceFiscalePrincipaleDirettoreLavori());
+			case TipoSoggettoUtil.PROGETTISTA:
+				return codiceFiscale.equalsIgnoreCase(getCodiceFiscalePrincipaleProgettista());
+			case TipoSoggettoUtil.GEOLOGO:
+				return codiceFiscale.equalsIgnoreCase(getCodiceFiscalePrincipaleGeologo());
+			case TipoSoggettoUtil.DITTA:
+				return codiceFiscale.equalsIgnoreCase(getCodiceFiscalePrincipaleDitta());
+			default:
+				return false;
+		}
+	}
+
 	private List<String> notCompletedAnagrafeSoggetti() throws PortalException, SystemException {
 
 		long intPraticaId = getIntPraticaId();
@@ -702,7 +766,7 @@ public class DettPraticaImpl extends DettPraticaBaseImpl {
 				soggettiRichiesti.add(TipoSoggettoUtil.COMMITTENTE);
 				break;
 		}
-		boolean isDelegaCommittente = SoggettiUtil.isTitolareInCommittenti(intPraticaId)
+		boolean isDelegaCommittente = intPratica.isTitolareInCommittenti()
 				|| Validator.isNotNull(getCodiceFiscaleDelegatoCommittente());
 		if (!isDelegaCommittente) {
 			notCompleted.add("delega-committente");

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

@@ -34,6 +34,7 @@ import it.tref.liferay.portos.bo.service.FineLavoriLocalServiceUtil;
 import it.tref.liferay.portos.bo.service.FineLavoriServiceUtil;
 import it.tref.liferay.portos.bo.service.ProvinciaLocalServiceUtil;
 import it.tref.liferay.portos.bo.service.SoggettoLocalServiceUtil;
+import it.tref.liferay.portos.bo.service.SoggettoServiceUtil;
 import it.tref.liferay.portos.bo.service.TerritorioLocalServiceUtil;
 import it.tref.liferay.portos.bo.shared.util.Constants;
 import it.tref.liferay.portos.bo.shared.util.StatoPraticaConstants;
@@ -57,6 +58,7 @@ import com.liferay.portal.kernel.util.LocaleUtil;
 import com.liferay.portal.kernel.util.StringPool;
 import com.liferay.portal.kernel.util.Validator;
 import com.liferay.portal.kernel.workflow.WorkflowConstants;
+import com.liferay.portal.service.UserLocalServiceUtil;
 
 /**
  * The extended model implementation for the IntPratica service. Represents a row in the
@@ -317,6 +319,30 @@ public class IntPraticaImpl extends IntPraticaBaseImpl {
 		return true;
 	}
 
+	@Override
+	public boolean isCommittenteAndDitta() throws SystemException {
+
+		List<Soggetto> ditte = SoggettoLocalServiceUtil.getValidTmpByDettPratica_TipologiaSoggetto(getIntPraticaId(),
+				TipoSoggettoUtil.DITTA);
+		List<Soggetto> committenti = SoggettoLocalServiceUtil.getValidTmpByDettPratica_TipologiaSoggetto(
+				getIntPraticaId(), TipoSoggettoUtil.COMMITTENTE);
+		return SoggettoLocalServiceUtil.isCommittenteAndDitta(committenti, ditte);
+	}
+
+	@Override
+	public boolean isTitolareInCommittenti() throws PortalException, SystemException {
+
+		String codiceFiscaleTitolare = UserLocalServiceUtil.getUserById(getUserId()).getScreenName();
+		List<Soggetto> committenti = SoggettoServiceUtil.getValidTmpByIntPratica_TipologiaSoggetto(getIntPraticaId(),
+				TipoSoggettoUtil.COMMITTENTE);
+		for (Soggetto soggetto : committenti) {
+			if (codiceFiscaleTitolare.equalsIgnoreCase(soggetto.getCodiceFiscale())) {
+				return true;
+			}
+		}
+		return false;
+	}
+
 	@Override
 	public boolean praticaCanAbort(long userId) throws SystemException {
 

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

@@ -551,50 +551,56 @@ public class SoggettoLocalServiceClpInvoker {
 
 		_methodParameterTypes248 = new String[] { "long" };
 
-		_methodName249 = "updatePrincipale";
+		_methodName249 = "isCommittenteAndDitta";
 
 		_methodParameterTypes249 = new String[] {
-				"long", "java.lang.String", "java.lang.String"
+				"java.util.List", "java.util.List"
 			};
 
-		_methodName250 = "completeInvalidation";
+		_methodName250 = "updatePrincipale";
 
-		_methodParameterTypes250 = new String[] { "long" };
+		_methodParameterTypes250 = new String[] {
+				"long", "java.lang.String", "java.lang.String"
+			};
 
-		_methodName251 = "getSoggettiSostituitiIds";
+		_methodName251 = "completeInvalidation";
 
 		_methodParameterTypes251 = new String[] { "long" };
 
-		_methodName252 = "validaSoggetto";
+		_methodName252 = "getSoggettiSostituitiIds";
 
-		_methodParameterTypes252 = new String[] { "long", "long" };
+		_methodParameterTypes252 = new String[] { "long" };
 
-		_methodName253 = "invalidaSoggetto";
+		_methodName253 = "validaSoggetto";
 
 		_methodParameterTypes253 = new String[] { "long", "long" };
 
-		_methodName254 = "invalidaESostituisciSoggetto";
+		_methodName254 = "invalidaSoggetto";
 
-		_methodParameterTypes254 = new String[] { "long", "long", "long" };
+		_methodParameterTypes254 = new String[] { "long", "long" };
 
-		_methodName255 = "allegaFileModifica";
+		_methodName255 = "invalidaESostituisciSoggetto";
 
-		_methodParameterTypes255 = new String[] {
+		_methodParameterTypes255 = new String[] { "long", "long", "long" };
+
+		_methodName256 = "allegaFileModifica";
+
+		_methodParameterTypes256 = new String[] {
 				"long", "long", "long", "byte[][]", "java.lang.String",
 				"java.lang.String", "com.liferay.portal.service.ServiceContext"
 			};
 
-		_methodName256 = "getSoggettiByIntPraticaId_DtRimozioneNull";
+		_methodName257 = "getSoggettiByIntPraticaId_DtRimozioneNull";
 
-		_methodParameterTypes256 = new String[] { "long" };
+		_methodParameterTypes257 = new String[] { "long" };
 
-		_methodName257 = "getTipologieSoggetti";
+		_methodName258 = "getTipologieSoggetti";
 
-		_methodParameterTypes257 = new String[] {  };
+		_methodParameterTypes258 = new String[] {  };
 
-		_methodName258 = "getAmbitiProfessionali";
+		_methodName259 = "getAmbitiProfessionali";
 
-		_methodParameterTypes258 = new String[] {  };
+		_methodParameterTypes259 = new String[] {  };
 	}
 
 	public Object invokeMethod(String name, String[] parameterTypes,
@@ -1389,45 +1395,51 @@ public class SoggettoLocalServiceClpInvoker {
 
 		if (_methodName249.equals(name) &&
 				Arrays.deepEquals(_methodParameterTypes249, parameterTypes)) {
-			SoggettoLocalServiceUtil.updatePrincipale(((Long)arguments[0]).longValue(),
+			return SoggettoLocalServiceUtil.isCommittenteAndDitta((java.util.List<it.tref.liferay.portos.bo.model.Soggetto>)arguments[0],
-				(java.lang.String)arguments[1], (java.lang.String)arguments[2]);
+				(java.util.List<it.tref.liferay.portos.bo.model.Soggetto>)arguments[1]);
-
-			return null;
 		}
 
 		if (_methodName250.equals(name) &&
 				Arrays.deepEquals(_methodParameterTypes250, parameterTypes)) {
-			SoggettoLocalServiceUtil.completeInvalidation(((Long)arguments[0]).longValue());
+			SoggettoLocalServiceUtil.updatePrincipale(((Long)arguments[0]).longValue(),
+				(java.lang.String)arguments[1], (java.lang.String)arguments[2]);
 
 			return null;
 		}
 
 		if (_methodName251.equals(name) &&
 				Arrays.deepEquals(_methodParameterTypes251, parameterTypes)) {
-			return SoggettoLocalServiceUtil.getSoggettiSostituitiIds(((Long)arguments[0]).longValue());
+			SoggettoLocalServiceUtil.completeInvalidation(((Long)arguments[0]).longValue());
+
+			return null;
 		}
 
 		if (_methodName252.equals(name) &&
 				Arrays.deepEquals(_methodParameterTypes252, parameterTypes)) {
-			return SoggettoLocalServiceUtil.validaSoggetto(((Long)arguments[0]).longValue(),
+			return SoggettoLocalServiceUtil.getSoggettiSostituitiIds(((Long)arguments[0]).longValue());
-				((Long)arguments[1]).longValue());
 		}
 
 		if (_methodName253.equals(name) &&
 				Arrays.deepEquals(_methodParameterTypes253, parameterTypes)) {
-			return SoggettoLocalServiceUtil.invalidaSoggetto(((Long)arguments[0]).longValue(),
+			return SoggettoLocalServiceUtil.validaSoggetto(((Long)arguments[0]).longValue(),
 				((Long)arguments[1]).longValue());
 		}
 
 		if (_methodName254.equals(name) &&
 				Arrays.deepEquals(_methodParameterTypes254, parameterTypes)) {
+			return SoggettoLocalServiceUtil.invalidaSoggetto(((Long)arguments[0]).longValue(),
+				((Long)arguments[1]).longValue());
+		}
+
+		if (_methodName255.equals(name) &&
+				Arrays.deepEquals(_methodParameterTypes255, parameterTypes)) {
 			return SoggettoLocalServiceUtil.invalidaESostituisciSoggetto(((Long)arguments[0]).longValue(),
 				((Long)arguments[1]).longValue(),
 				((Long)arguments[2]).longValue());
 		}
 
-		if (_methodName255.equals(name) &&
+		if (_methodName256.equals(name) &&
-				Arrays.deepEquals(_methodParameterTypes255, parameterTypes)) {
+				Arrays.deepEquals(_methodParameterTypes256, parameterTypes)) {
 			return SoggettoLocalServiceUtil.allegaFileModifica(((Long)arguments[0]).longValue(),
 				((Long)arguments[1]).longValue(),
 				((Long)arguments[2]).longValue(), (byte[])arguments[3],
@@ -1435,18 +1447,18 @@ public class SoggettoLocalServiceClpInvoker {
 				(com.liferay.portal.service.ServiceContext)arguments[6]);
 		}
 
-		if (_methodName256.equals(name) &&
-				Arrays.deepEquals(_methodParameterTypes256, parameterTypes)) {
-			return SoggettoLocalServiceUtil.getSoggettiByIntPraticaId_DtRimozioneNull(((Long)arguments[0]).longValue());
-		}
-
 		if (_methodName257.equals(name) &&
 				Arrays.deepEquals(_methodParameterTypes257, parameterTypes)) {
-			return SoggettoLocalServiceUtil.getTipologieSoggetti();
+			return SoggettoLocalServiceUtil.getSoggettiByIntPraticaId_DtRimozioneNull(((Long)arguments[0]).longValue());
 		}
 
 		if (_methodName258.equals(name) &&
 				Arrays.deepEquals(_methodParameterTypes258, parameterTypes)) {
+			return SoggettoLocalServiceUtil.getTipologieSoggetti();
+		}
+
+		if (_methodName259.equals(name) &&
+				Arrays.deepEquals(_methodParameterTypes259, parameterTypes)) {
 			return SoggettoLocalServiceUtil.getAmbitiProfessionali();
 		}
 
@@ -1657,4 +1669,6 @@ public class SoggettoLocalServiceClpInvoker {
 	private String[] _methodParameterTypes257;
 	private String _methodName258;
 	private String[] _methodParameterTypes258;
+	private String _methodName259;
+	private String[] _methodParameterTypes259;
 }

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

@@ -9,6 +9,7 @@
 package it.tref.liferay.portos.bo.service.impl;
 
 import it.mwg.sismica.bo.shared.bean.CarichiLavoroBean;
+import it.mwg.sismica.bo.shared.util.Generics;
 import it.mwg.sismica.bo.shared.util.UnitaOperativeUtil;
 import it.mwg.sismica.bo.util.CarichiLavoroUtil;
 import it.mwg.sismica.bo.util.SismicaUtil;
@@ -39,6 +40,8 @@ import java.util.Set;
 import java.util.TreeMap;
 import java.util.TreeSet;
 
+import org.apache.commons.lang.StringUtils;
+
 import com.liferay.portal.NoSuchWorkflowInstanceLinkException;
 import com.liferay.portal.kernel.bean.PortletBeanLocatorUtil;
 import com.liferay.portal.kernel.dao.orm.DynamicQuery;
@@ -419,8 +422,8 @@ public class ControlloPraticaLocalServiceImpl extends ControlloPraticaLocalServi
 		ControlloPratica controlloPratica = getControlloPratica(controlloPraticaId);
 		int unitaOperativa = intPraticaLocalService.getIntPratica(controlloPratica.getIntPraticaId())
 				.getUnitaOperativa();
-		long companyId = controlloPratica.getCompanyId();
+		long roleId = RoleLocalServiceUtil.getRole(controlloPratica.getCompanyId(), Constants.ROLE_NAME_ISTRUTTORE)
-		long roleId = RoleLocalServiceUtil.getRole(companyId, Constants.ROLE_NAME_ISTRUTTORE).getRoleId();
+				.getRoleId();
 		List<UserGroupRole> userGroupRoles = UserGroupRoleLocalServiceUtil.getUserGroupRolesByGroupAndRole(
 				controlloPratica.getGroupId(), roleId);
 		List<JSONObject> istruttori = new ArrayList<>();
@@ -443,9 +446,13 @@ public class ControlloPraticaLocalServiceImpl extends ControlloPraticaLocalServi
 		Map<String, JSONObject> ordinati = new TreeMap<>();
 		for (UserGroupRole userGroupRole : userGroupRoles) {
 			User user = userGroupRole.getUser();
-			if (UnitaOperativeUtil.getUnitaOperative(user).contains(unitaOperativa)) {
+			List<Integer> uo = UnitaOperativeUtil.getUnitaOperative(user);
+			if ((unitaOperativa == 0) || uo.contains(unitaOperativa)) {
 				JSONObject istruttore = JSONFactoryUtil.createJSONObject();
-				istruttore.put("label", user.getFullName().toUpperCase());
+				istruttore.put(
+						"label",
+						Generics.capitalizeFull(user.getFullName()) + " (u.o. "
+								+ StringUtils.join(uo, StringPool.COMMA_AND_SPACE) + StringPool.CLOSE_PARENTHESIS);
 				istruttore.put("value", user.getUserId());
 				istruttore.put("default", false);
 				ordinati.put((user.getLastName() + user.getFirstName()).toUpperCase(), istruttore);

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

@@ -16,7 +16,6 @@ import it.tref.liferay.portos.bo.model.DocPratica;
 import it.tref.liferay.portos.bo.model.Soggetto;
 import it.tref.liferay.portos.bo.service.base.SoggettoLocalServiceBaseImpl;
 import it.tref.liferay.portos.bo.shared.util.TipoSoggettoUtil;
-import it.tref.liferay.portos.bo.util.SoggettiUtil;
 
 import java.util.Collections;
 import java.util.Date;
@@ -143,7 +142,8 @@ public class SoggettoLocalServiceImpl extends SoggettoLocalServiceBaseImpl {
 		soggetto.setSoggettoSostituitoId(soggettoSostituitoId);
 		soggetto.setTmp(tmp);
 		soggetto = soggettoPersistence.update(soggetto);
-		if (!SoggettiUtil.hasSoggettoPrincipale(dettPraticaId, soggetto.getTipologiaSoggetto())) {
+		DettPratica dettPratica = dettPraticaLocalService.getDettPratica(dettPraticaId);
+		if (!dettPratica.hasSoggettoPrincipale(soggetto.getTipologiaSoggetto())) {
 			updatePrincipale(soggetto.getDettPraticaId(), soggetto.getCodiceFiscale(), soggetto.getTipologiaSoggetto());
 		}
 		return soggetto;
@@ -1103,8 +1103,9 @@ public class SoggettoLocalServiceImpl extends SoggettoLocalServiceBaseImpl {
 	}
 
 	@Override
-	public int countByUserId_CodiceFiscale_TipologiaSoggetto(long userId, String codiceFiscale, String tipologiaSoggetto)
+	public int
-			throws SystemException {
+			countByUserId_CodiceFiscale_TipologiaSoggetto(long userId, String codiceFiscale, String tipologiaSoggetto)
+					throws SystemException {
 
 		return soggettoPersistence.countByUserId_CodiceFiscale_TipologiaSoggetto(userId, codiceFiscale,
 				tipologiaSoggetto);
@@ -1122,6 +1123,18 @@ public class SoggettoLocalServiceImpl extends SoggettoLocalServiceBaseImpl {
 		return soggettoPersistence.findWithDynamicQuery(dynamicQuerySoggetti);
 	}
 
+	public boolean isCommittenteAndDitta(List<Soggetto> committenti, List<Soggetto> ditte) {
+
+		for (Soggetto committente : committenti) {
+			for (Soggetto ditta : ditte) {
+				if (ditta.getCodiceFiscale().equalsIgnoreCase(committente.getCodiceFiscale())) {
+					return true;
+				}
+			}
+		}
+		return false;
+	}
+
 	@Override
 	public void updatePrincipale(long dettPraticaId, String codiceFiscale, String tipologiaSoggetto)
 			throws PortalException, SystemException {
@@ -1163,7 +1176,8 @@ public class SoggettoLocalServiceImpl extends SoggettoLocalServiceBaseImpl {
 
 		Soggetto soggetto = soggettoPersistence.findByPrimaryKey(soggettoId);
 		soggetto.setDettPraticaIdRimozione(0L);
-		if (!SoggettiUtil.hasSoggettoPrincipale(dettPraticaId, soggetto.getTipologiaSoggetto())) {
+		DettPratica dettPratica = dettPraticaLocalService.getDettPratica(dettPraticaId);
+		if (!dettPratica.hasSoggettoPrincipale(soggetto.getTipologiaSoggetto())) {
 			updatePrincipale(dettPraticaId, soggetto.getCodiceFiscale(), soggetto.getTipologiaSoggetto());
 		}
 		return updateSoggetto(soggetto);
@@ -1176,7 +1190,8 @@ public class SoggettoLocalServiceImpl extends SoggettoLocalServiceBaseImpl {
 		Soggetto soggetto = soggettoPersistence.findByPrimaryKey(soggettoId);
 		// setto solo il dettPraticaRimozione. La rimozione diventa definitiva al completamento della variante
 		soggetto.setDettPraticaIdRimozione(dettPraticaIdRimozione);
-		if (SoggettiUtil.isSoggettoPrincipale(soggetto.getSoggettoId(), dettPraticaIdRimozione)) {
+		DettPratica dettPratica = dettPraticaLocalService.getDettPratica(dettPraticaIdRimozione);
+		if (dettPratica.isSoggettoPrincipale(soggetto.getSoggettoId())) {
 			updatePrincipale(dettPraticaIdRimozione, StringPool.BLANK, soggetto.getTipologiaSoggetto());
 		}
 		return updateSoggetto(soggetto);
@@ -1211,7 +1226,8 @@ public class SoggettoLocalServiceImpl extends SoggettoLocalServiceBaseImpl {
 			invalidaESostituisciSoggetto(soggetto.getSoggettoSostituitoId(), soggetto.getDettPraticaId(),
 					soggetto.getSoggettoId());
 		}
-		if (!SoggettiUtil.hasSoggettoPrincipale(soggetto.getDettPraticaId(), soggetto.getTipologiaSoggetto())) {
+		DettPratica dettPratica = dettPraticaLocalService.getDettPratica(soggetto.getDettPraticaId());
+		if (!dettPratica.hasSoggettoPrincipale(soggetto.getTipologiaSoggetto())) {
 			updatePrincipale(soggetto.getDettPraticaId(), soggetto.getCodiceFiscale(), soggetto.getTipologiaSoggetto());
 		}
 		soggetto = updateSoggetto(soggetto);

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=3429
+    build.number=3435
-    build.date=1632908453878
+    build.date=1632930765406
     build.auto.upgrade=true
 
 ##

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

@@ -1,214 +1,197 @@
-<%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%>
-<%@page import="it.tref.liferay.portos.bo.shared.util.ActionKeys"%>
-<%@page import="it.tref.liferay.portos.bo.service.permission.IntPraticaPermission"%>
-<%@page import="java.util.ArrayList"%>
 <%@page import="com.liferay.portlet.documentlibrary.util.DLUtil"%>
-<%@page import="com.liferay.portal.kernel.repository.model.FileEntry"%>
 <%@page import="com.liferay.portlet.documentlibrary.service.DLAppLocalServiceUtil"%>
+<%@page import="com.liferay.portal.kernel.repository.model.FileEntry"%>
+<%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%>
 <%@page import="com.liferay.portal.kernel.portlet.LiferayWindowState"%>
-<%@ include file="/html/doc_aggiuntiva/init.jsp" %>
+<%@page import="it.tref.liferay.portos.bo.service.permission.IntPraticaPermission"%>
-
+<%@page import="it.tref.liferay.portos.bo.shared.util.ActionKeys"%>
+<%@page import="java.util.ArrayList"%>
+<%@include file="/html/doc_aggiuntiva/init.jsp"%>
 <%
-	long intPraticaId = ParamUtil.getLong(request, "intPraticaId");
+long intPraticaId = ParamUtil.getLong(request, "intPraticaId");
-	long dettPraticaId = ParamUtil.getLong(request, "dettPraticaId");
+long dettPraticaId = ParamUtil.getLong(request, "dettPraticaId");
-	boolean inBO = ParamUtil.getBoolean(request,"inBO");
+boolean inBO = ParamUtil.getBoolean(request,"inBO");
-	
+IntPratica intPratica = IntPraticaLocalServiceUtil.getIntPratica(intPraticaId);
-	IntPratica intPratica = IntPraticaLocalServiceUtil.getIntPratica(intPraticaId);
+Territorio territorio = TerritorioLocalServiceUtil.getTerritorio(intPratica.getTerritorioId());
-	Territorio territorio = TerritorioLocalServiceUtil.getTerritorio(intPratica.getTerritorioId());
+long territorioGroupId = territorio.getGroupId();
-	long territorioGroupId = territorio.getGroupId();
 %>
-
+<c:if test="<%= user.getUserId() == intPratica.getUserId()
-<c:if test="<%= user.getUserId() == intPratica.getUserId() || IntPraticaPermission.contains(permissionChecker, territorioGroupId, ActionKeys.DOC_AGGIUNTIVA) %>">
+		|| IntPraticaPermission.contains(permissionChecker, territorioGroupId, ActionKeys.DOC_AGGIUNTIVA) %>">
-
 	<div class="container-fluid">
 		<div class="row">
-			<div class="col-sm-12 col-md-12 fascicolo-doc-aggiuntiva-tab">
+			<div class="col-sm-12 fascicolo-doc-aggiuntiva-tab">
-				<liferay-portlet:renderURL var="addDocAggiuntiva" windowState="<%=LiferayWindowState.POP_UP.toString() %>">
+				<liferay-portlet:renderURL var="addDocAggiuntiva"
+						windowState="<%= LiferayWindowState.POP_UP.toString() %>">
 					<liferay-portlet:param name="mvcPath" value="/html/doc_aggiuntiva/edit_doc.jsp"/>
-					<liferay-portlet:param name="intPraticaId" value="<%=String.valueOf(intPraticaId) %>"/>
+					<liferay-portlet:param name="intPraticaId" value="<%= String.valueOf(intPraticaId) %>"/>
-					<liferay-portlet:param name="dettPraticaId" value="<%=String.valueOf(dettPraticaId) %>"/>
+					<liferay-portlet:param name="dettPraticaId" value="<%= String.valueOf(dettPraticaId) %>"/>
-					<liferay-portlet:param name="backURL" value="<%=currentURL %>"/>
+					<liferay-portlet:param name="backURL" value="<%= currentURL %>"/>
 				</liferay-portlet:renderURL>
 				<div class="text-right">
-				
 					<liferay-portlet:resourceURL var="downloadAllURL" id="downloadAll">
 						<liferay-portlet:param name="intPraticaId" value="<%= String.valueOf(intPraticaId) %>" />
 					</liferay-portlet:resourceURL>
-					
+					<liferay-ui:icon-menu showWhenSingleIcon="false" extended="false" showExpanded="true"
-					
+							cssClass="inline_toolbar" >
-					<liferay-ui:icon-menu showWhenSingleIcon="false" extended="false" showExpanded="true" cssClass="inline_toolbar" >
 						<c:if test="<%= inBO %>">
 							<span class="tooltip-info" title="Aggiungi Documentazione">
-								<aui:button useDialog="true" id='<%=renderResponse.getNamespace()+"add-doc-aggiuntiva"%>' icon="fa fa-plus" href="<%=addDocAggiuntiva%>" cssClass="btn btn-primary btn-action"/>
+								<aui:button useDialog="true" icon="fa fa-plus"
+										id='<%= renderResponse.getNamespace() + "add-doc-aggiuntiva" %>'
+										href="<%=addDocAggiuntiva%>" cssClass="btn btn-primary btn-action" />
 							</span>
 							<c:if test="<%= DocAggiuntivaServiceUtil.countByIntPratica(intPraticaId) > 0 %>">
 								<span class="tooltip-info" title="Download">
-									<aui:button id='<%=renderResponse.getNamespace()+"download_all"%>' icon="fa fa-download" href="<%=downloadAllURL%>" cssClass="btn btn-primary btn-action"/>
+									<aui:button id='<%= renderResponse.getNamespace() + "download_all" %>'
+											icon="fa fa-download" href="<%= downloadAllURL %>"
+											cssClass="btn btn-primary btn-action" />
 								</span>
 							</c:if>
 						</c:if>
 						<c:if test="<%= !inBO %>">
-							<c:if test="<%= DocAggiuntivaServiceUtil.countByIntPraticaFeVisible(intPraticaId, true) > 0 %>">
+							<c:if test="<%= DocAggiuntivaServiceUtil
+									.countByIntPraticaFeVisible(intPraticaId, true) > 0 %>">
 								<span class="tooltip-info" title="Download">
-									<aui:button id='<%=renderResponse.getNamespace()+"download_all"%>' icon="fa fa-download" href="<%=downloadAllURL%>" cssClass="btn btn-primary btn-action"/>
+									<aui:button id='<%= renderResponse.getNamespace() + "download_all" %>'
+											icon="fa fa-download" href="<%= downloadAllURL %>"
+											cssClass="btn btn-primary btn-action"/>
 								</span>
 							</c:if>
 						</c:if>
 					</liferay-ui:icon-menu>
-					
 				</div>
 			</div>
 		</div>
 		<div class="row">
 			<%
-				List<DocAggiuntiva> resultList = new ArrayList<DocAggiuntiva>();
+			List<DocAggiuntiva> resultList = new ArrayList<DocAggiuntiva>();
-				int count = 0;
+			int count = 0;
-				if(inBO){
+			if (inBO) {
-				  resultList = DocAggiuntivaLocalServiceUtil.findByIntPratica(intPraticaId, QueryUtil.ALL_POS, QueryUtil.ALL_POS, null);
+				resultList = DocAggiuntivaLocalServiceUtil.findByIntPratica(intPraticaId, QueryUtil.ALL_POS,
-				  count = DocAggiuntivaLocalServiceUtil.countByIntPratica(intPraticaId);
+						QueryUtil.ALL_POS, null);
-				} else {
+				count = DocAggiuntivaLocalServiceUtil.countByIntPratica(intPraticaId);
-				  resultList = DocAggiuntivaLocalServiceUtil.findByIntPraticaFeVisible(intPraticaId, true, QueryUtil.ALL_POS, QueryUtil.ALL_POS, null);
+			} else {
-				  count = DocAggiuntivaLocalServiceUtil.countByIntPraticaFeVisible(intPraticaId, true);
+				resultList = DocAggiuntivaLocalServiceUtil.findByIntPraticaFeVisible(intPraticaId, true,
-				}
+						QueryUtil.ALL_POS, QueryUtil.ALL_POS, null);
+				count = DocAggiuntivaLocalServiceUtil.countByIntPraticaFeVisible(intPraticaId, true);
+			}
 			%>
-			<liferay-ui:search-container
+			<liferay-ui:search-container emptyResultsMessage="no-entries-were-found" orderByType="asc"
-				emptyResultsMessage="no-entries-were-found" 
+					orderByCol="createDate">
-				orderByType="asc" orderByCol="createDate"
+				<liferay-ui:search-container-results results="<%= resultList %>" total="<%= count %>" />
-			>
+				<liferay-ui:search-container-row className="it.tref.liferay.portos.bo.model.DocAggiuntiva"
-				
+						modelVar="docAggiuntiva">
-				<liferay-ui:search-container-results
+					<liferay-ui:search-container-column-text cssClass="text-nowrap" name="Data"
-					results="<%= resultList %>"
+							value="<%= dateFormatDate.format(docAggiuntiva.getCreateDate()) %>" />
-					total="<%= count %>"
-				>
-				</liferay-ui:search-container-results>
-				
-				<liferay-ui:search-container-row 
-					className="it.tref.liferay.portos.bo.model.DocAggiuntiva"				
-					modelVar="docAggiuntiva"
-				>
-					<liferay-ui:search-container-column-text cssClass="text-nowrap" name="Data" value="<%= dateFormatDate.format(docAggiuntiva.getCreateDate()) %>" />
 					<c:if test="<%= inBO %>">
 						<liferay-ui:search-container-column-text cssClass="text-center" name="Visibile in FE" >
 							<%
-								String clazz = StringPool.BLANK;
+							String clazz = StringPool.BLANK;
-								if(docAggiuntiva.getFeVisible()){
+							if (docAggiuntiva.getFeVisible()) {
-								  clazz = "fa fa-check-square txt-green";
+								clazz = "fa fa-check-square txt-green";
-								}
+							}
 							%>
 							<span><i class="relative <%= clazz %>"></i></span>
 						</liferay-ui:search-container-column-text>
 					</c:if>
 					<liferay-ui:search-container-column-text name="File" value="<%= docAggiuntiva.getFileName() %>" />
 					<liferay-ui:search-container-column-text property="descrizione" name="Descrizione"/>
-					
 					<liferay-ui:search-container-column-text name="actions" cssClass="text-nowrap text-center">
-						<%
+						<liferay-ui:icon-menu cssClass="menu_button_activity text-center" icon="" showExpanded="true"
-							boolean showExpanded = false;
+								showWhenSingleIcon="true">
-							if(!inBO){
-							  showExpanded = true;  
-							}
-						%>
-						<liferay-ui:icon-menu cssClass="menu_button_activity text-center" icon="" showExpanded="<%= true %>" showWhenSingleIcon="<%= true %>">
 							<%
-								if(Validator.isNotNull(docAggiuntiva.getFileEntryId())){
+							if (Validator.isNotNull(docAggiuntiva.getFileEntryId())) {
 							%>
-								<liferay-portlet:renderURL var="previewURL" windowState="<%= LiferayWindowState.POP_UP.toString() %>">
+								<liferay-portlet:renderURL var="previewURL"
-									<liferay-portlet:param name="fileEntryId" value="<%= String.valueOf(docAggiuntiva.getFileEntryId()) %>" />
+										windowState="<%= LiferayWindowState.POP_UP.toString() %>">
-									<liferay-portlet:param name="mvcPath" value="/html/common/preview_file_entry.jsp" />
+									<liferay-portlet:param name="fileEntryId"
+											value="<%= String.valueOf(docAggiuntiva.getFileEntryId()) %>" />
+									<liferay-portlet:param name="mvcPath"
+											value="/html/common/preview_file_entry.jsp" />
 									<c:if test="<%= inBO %>">
-										<liferay-portlet:param name="redirect" value='<%= currentURL+"#_1_WAR_portosboportlet_tab=_1_WAR_portosboportlet_page_doc_aggiuntiva" %>'/>
+										<liferay-portlet:param name="redirect"
+												value='<%= currentURL + "#_1_WAR_portosboportlet_tab=_1_WAR_portosboportlet_page_doc_aggiuntiva" %>' />
 									</c:if>
 								</liferay-portlet:renderURL>
 								<div title="Visualizza" class="tooltip-info" style="display: inline-block;">
-									<liferay-ui:icon id='<%=renderResponse.getNamespace()+"open_"+docAggiuntiva.getDocAggiuntivaId() %>' linkCssClass="btn btn-rounded btn-action" iconCssClass="fa fa-clipboard" message="" url="<%=previewURL%>" useDialog="true"/>
+									<liferay-ui:icon message="" url="<%= previewURL %>" useDialog="true"
+											id='<%= renderResponse.getNamespace() + "open_"
+													+ docAggiuntiva.getDocAggiuntivaId() %>'
+											linkCssClass="btn btn-rounded btn-action" iconCssClass="fa fa-clipboard" />
 								</div>
 								<%
-									FileEntry fileEntry = DLAppLocalServiceUtil.getFileEntry(docAggiuntiva.getFileEntryId());
+								FileEntry fileEntry = DLAppLocalServiceUtil.getFileEntry(docAggiuntiva.getFileEntryId());
-									String downloadUrl = DLUtil.getPreviewURL(fileEntry, fileEntry.getLatestFileVersion(), themeDisplay, "&download=true");
+								String downloadUrl = DLUtil.getPreviewURL(fileEntry, fileEntry.getLatestFileVersion(),
+										themeDisplay, "&download=true");
 								%>
 								<div title="Scarica" class="tooltip-info" style="display: inline-block;">
-									<liferay-ui:icon  message="" id='<%=renderResponse.getNamespace()+"download_"+docAggiuntiva.getDocAggiuntivaId() %>' linkCssClass="btn btn-rounded btn-action" iconCssClass="fa fa-download" url="<%=downloadUrl%>"/>													
+									<liferay-ui:icon message="" linkCssClass="btn btn-rounded btn-action"
+											id='<%= renderResponse.getNamespace() + "download_"
+													+ docAggiuntiva.getDocAggiuntivaId() %>'
+											iconCssClass="fa fa-download" url="<%= downloadUrl %>" />
 								</div>
-								
 								<c:if test="<%= inBO %>">
 									<liferay-portlet:actionURL var="deleteUrl" name="deleteDocAggiuntiva">
-										<liferay-portlet:param name="docAggiuntivaId" value="<%=String.valueOf(docAggiuntiva.getDocAggiuntivaId())%>" />
+										<liferay-portlet:param name="docAggiuntivaId"
+												value="<%= String.valueOf(docAggiuntiva.getDocAggiuntivaId()) %>" />
 									</liferay-portlet:actionURL>
 									<div title="Elimina" class="tooltip-info" style="display: inline-block;">
-										<liferay-ui:icon  message="" id='<%="delete_"+docAggiuntiva.getDocAggiuntivaId() %>' linkCssClass="btn btn-rounded btn-action" iconCssClass="fa fa-trash" url="javascript:void(0)"/>
+										<liferay-ui:icon message="" linkCssClass="btn btn-rounded btn-action"
+												id='<%="delete_" + docAggiuntiva.getDocAggiuntivaId() %>'
+												iconCssClass="fa fa-trash" url="javascript:void(0)" />
 									</div>
-									<aui:script  use="aui-base,aui-io-request">
+									<aui:script use="aui-base,aui-io-request">
-			
+									A.one('<%= "#" + renderResponse.getNamespace() + "delete_" + docAggiuntiva.getDocAggiuntivaId() %>').on(
-											A.one('<%="#"+renderResponse.getNamespace()+"delete_"+docAggiuntiva.getDocAggiuntivaId() %>').on(
+										'click',
-													'click',
+										function (event) {
-													function(event) {
+											event.preventDefault();
-														event.preventDefault();
+											if (confirm("Sei sicuro di voler elminare il file?")) {
-														if(confirm("Sei sicuro di voler elminare il file?")){
+												A.io.request('<%=deleteUrl%>', {
-															A.io.request(
+													on: {
-																	'<%=deleteUrl%>',
+														failure: function () {
-																{
+															alert('impossibile rimuovere il documento!');
-																	on: {
+														},
-																		failure: function() {
+														success: function (event, id, obj) {
-																			alert('impossibile rimuovere il documento!');
+															window.parent.Liferay.fire('doc_aggiuntiva-open');
-																		},
+															Liferay.Portlet.refresh("#p_p_id<portlet:namespace/>");
-																		success: function(event, id, obj) {
+														},
-																			window.parent.Liferay.fire('doc_aggiuntiva-open');
+													},
-																			Liferay.Portlet.refresh("#p_p_id<portlet:namespace/>");
+												});
-																		}
+											}
-																	}
+										});
-																}
-															);
-														}
-													}
-												);
-											
 										</aui:script>
-									
 								</c:if>
 							<%
-								}
+							}
 							%>
 						</liferay-ui:icon-menu>
 					</liferay-ui:search-container-column-text>
-					
 				</liferay-ui:search-container-row>
-			
 				<liferay-ui:search-iterator paginate="false" />
 			</liferay-ui:search-container>
-			
 		</div>
 	</div>
 	<aui:script use="aui-base">
-		Liferay.fire('doc_aggiuntiva-ready');
+	Liferay.fire('doc_aggiuntiva-ready');
 	</aui:script>
-	
 	<script type="text/javascript">
-		YUI().use(
+	YUI().use('aui-tooltip', function (Y) {
-			  'aui-tooltip',
+		new Y.TooltipDelegate({
-			  function(Y) {
+			trigger: '.tooltip-info',
-			    new Y.TooltipDelegate(
+			position: 'top',
-			      {
+			cssClass: 'tooltip-help',
-			    	  trigger: '.tooltip-info',
+			html: true,
-				      position: 'top',
+			opacity: 1,
-				      cssClass: 'tooltip-help',
+		});
-				      html: true,
+	});
-				      opacity: 1
-			      }
-			    );
-			  }
-			);
 	</script>
-	
 </c:if>
-
+<c:if test="<%= user.getUserId() != intPratica.getUserId() &&
-<c:if test="<%= user.getUserId() != intPratica.getUserId() && !IntPraticaPermission.contains(permissionChecker, territorioGroupId, ActionKeys.DOC_AGGIUNTIVA) %>">
+		!IntPraticaPermission.contains(permissionChecker, territorioGroupId, ActionKeys.DOC_AGGIUNTIVA) %>">
-
 	<div class="container-fluid">
 		<div class="row">
 			<div class="alert alert-info">
-				<liferay-ui:message key="resource-not-allowed"></liferay-ui:message>
+				<liferay-ui:message key="resource-not-allowed" />
 			</div>
 		</div>
 	</div>
-
 </c:if>

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

@@ -1,56 +1,37 @@
 <%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%>
 <%@page import="com.liferay.portal.kernel.portlet.LiferayWindowState"%>
 <%@ include file="/html/fascicolo/init.jsp" %>
-<liferay-util:include page="/html/fascicolo/navigator/header.jsp" servletContext="<%=application %>"/>
+<liferay-util:include page="/html/fascicolo/navigator/header.jsp" servletContext="<%= application %>"/>
-<h2 class="fasciolo_page_title"><liferay-ui:message key="page_co_dati"></liferay-ui:message></h2>
+<h2 class="fasciolo_page_title"><liferay-ui:message key="page_co_dati" /></h2>
-
 <%
-	IntPratica intPratica = (IntPratica)request.getAttribute("bean.intPratica");
+IntPratica intPratica = (IntPratica) request.getAttribute("bean.intPratica");
-	long intPraticaId = intPratica.getIntPraticaId();
+long intPraticaId = intPratica.getIntPraticaId();
 %>
-
+<liferay-ui:search-container emptyResultsMessage="no-entries-were-found" orderByType="desc" orderByCol="createDate">
-<liferay-ui:search-container	
-	emptyResultsMessage="no-entries-were-found" 
-	orderByType="desc" orderByCol="createDate"
->
-
 	<liferay-ui:search-container-results
-		results="<%= CollaudoLocalServiceUtil.findByIntPraticaId_Completata(intPraticaId, true, QueryUtil.ALL_POS, QueryUtil.ALL_POS, null) %>"
+			results="<%= CollaudoLocalServiceUtil.findByIntPraticaId_Completata(intPraticaId, true, QueryUtil.ALL_POS,
-		total="<%= CollaudoLocalServiceUtil.countByIntPraticaId_Completata(intPraticaId, true) %>"
+					QueryUtil.ALL_POS, null) %>"
-	>
+			total="<%= CollaudoLocalServiceUtil.countByIntPraticaId_Completata(intPraticaId, true) %>" />
-	</liferay-ui:search-container-results>
+	<liferay-ui:search-container-row className="it.tref.liferay.portos.bo.model.Collaudo" modelVar="collaudo">
-
+		<liferay-ui:search-container-column-text name="Data" cssClass="text-nowrap"
-	
+				value='<%= Validator.isNull(collaudo.getDataEffettuazione()) ? StringPool.BLANK
-	<liferay-ui:search-container-row 
+						: dateFormatDateTime.format(collaudo.getDataEffettuazione()) %>' />
-		className="it.tref.liferay.portos.bo.model.Collaudo"	
+		<liferay-ui:search-container-column-text cssClass="text-nowrap" name="Committente"
-		modelVar="collaudo"
+				value="<%= collaudo.getCodiceFiscaleDelegato().toUpperCase() %>"/>
-	>
+		<liferay-ui:search-container-column-text cssClass="text-nowrap" name="Tipologia"
-		<liferay-ui:search-container-column-text name="Data" cssClass="text-nowrap" value='<%= Validator.isNotNull(collaudo.getDataEffettuazione()) ? dateFormatDateTime.format(collaudo.getDataEffettuazione()) : ""%>' />
+				value='<%= collaudo.getParziale() ? "Parziale" : "Totale" %>'/>
-		<liferay-ui:search-container-column-text cssClass="text-nowrap" name="Committente" value="<%= collaudo.getCodiceFiscaleDelegato().toUpperCase() %>"/>
-		<liferay-ui:search-container-column-text cssClass="text-nowrap" name="Tipologia" value='<%= collaudo.getParziale() ? "Parziale" : "Totale" %>'/>
-		
 		<liferay-ui:search-container-column-text>
-			
+			<liferay-portlet:renderURL var="viewDettagliCollaudoURL"
-			<liferay-portlet:renderURL var="viewDettagliCollaudoURL" windowState="<%= LiferayWindowState.POP_UP.toString() %>">
+					windowState="<%= LiferayWindowState.POP_UP.toString() %>">
 				<liferay-portlet:param name="mvcPath" value="/html/fascicolo/navigator/view_dettagli_collaudo.jsp"/>
-				<liferay-portlet:param name="collaudoId" value="<%=String.valueOf(collaudo.getCollaudoId())%>" />
+				<liferay-portlet:param name="collaudoId" value="<%= String.valueOf(collaudo.getCollaudoId()) %>" />
 			</liferay-portlet:renderURL>
-			
+			<liferay-ui:icon-menu showWhenSingleIcon="false" extended="false" showExpanded="true"
-			<liferay-ui:icon-menu showWhenSingleIcon="<%= false %>" extended="false" showExpanded="true" cssClass="inline_toolbar displ_inline_block txt text-center" >
+					cssClass="inline_toolbar displ_inline_block txt text-center" >
-			
+				<liferay-ui:icon iconCssClass="fa fa-info-circle" message="detail" useDialog="true"
-				<liferay-ui:icon
+						linkCssClass="btn btn-action d-inline-block" url="<%=viewDettagliCollaudoURL%>" />
-					iconCssClass="fa fa-info-circle"
-					message="detail"
-					linkCssClass="btn btn-action d-inline-block"
-					url="<%=viewDettagliCollaudoURL%>"
-					useDialog="<%= true %>"
-				/>
-				
 			</liferay-ui:icon-menu>
-		
 	</liferay-ui:search-container-column-text>
-		
 	</liferay-ui:search-container-row>
-
+	<liferay-ui:search-iterator paginate="false" />
-	<liferay-ui:search-iterator paginate="<%= false %>" />
 </liferay-ui:search-container>

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

@@ -1,65 +1,42 @@
 <%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%>
-<%@page import="it.tref.liferay.portos.bo.shared.util.PortletKeys"%>
-<%@page import="com.liferay.portal.kernel.servlet.ServletContextPool"%>
-<%@page import="java.util.ArrayList"%>
 <%@page import="com.liferay.portal.kernel.portlet.LiferayWindowState"%>
-<%@page import="it.tref.liferay.portos.bo.shared.util.TipoIntegrazioneUtil"%>
+<%@page import="it.tref.liferay.portos.bo.shared.util.PortletKeys"%>
-<%@ include file="/html/fascicolo/init.jsp" %>
+<%@include file="/html/fascicolo/init.jsp"%>
-
+<liferay-util:include page="/html/fascicolo/navigator/header.jsp" servletContext="<%= application %>"/>
-<liferay-util:include page="/html/fascicolo/navigator/header.jsp" servletContext="<%=application %>"/>
+<h2 class="fasciolo_page_title"><liferay-ui:message key="page_fl_allegati" /></h2>
-<h2 class="fasciolo_page_title"><liferay-ui:message key="page_fl_allegati"></liferay-ui:message></h2>
-
 <%
-	IntPratica intPratica = (IntPratica)request.getAttribute("bean.intPratica");
+IntPratica intPratica = (IntPratica) request.getAttribute("bean.intPratica");
-	long intPraticaId = intPratica.getIntPraticaId();
+long intPraticaId = intPratica.getIntPraticaId();
 %>
-
+<liferay-ui:search-container emptyResultsMessage="no-entries-were-found" orderByType="desc" orderByCol="createDate">
-<liferay-ui:search-container	
-	emptyResultsMessage="no-entries-were-found" 
-	orderByType="desc" orderByCol="createDate"
->
-
 	<liferay-ui:search-container-results
-		results="<%= FineLavoriLocalServiceUtil.findByIntPraticaId_Completata(intPraticaId, true, QueryUtil.ALL_POS, QueryUtil.ALL_POS, null) %>"
+			results="<%= FineLavoriLocalServiceUtil.findByIntPraticaId_Completata(intPraticaId, true,
-		total="<%= FineLavoriLocalServiceUtil.countByIntPraticaId_Completata(intPraticaId, true) %>"
+					QueryUtil.ALL_POS, QueryUtil.ALL_POS, null) %>"
-	>
+			total="<%= FineLavoriLocalServiceUtil.countByIntPraticaId_Completata(intPraticaId, true) %>" />
-	</liferay-ui:search-container-results>
+	<liferay-ui:search-container-row className="it.tref.liferay.portos.bo.model.FineLavori" modelVar="fineLavori">
-
+		<liferay-ui:search-container-column-text name="Data" cssClass="text-nowrap"
-	
+				value='<%= Validator.isNull(fineLavori.getDataEffettuazione()) ? StringPool.BLANK
-	<liferay-ui:search-container-row 
+						: dateFormatDateTime.format(fineLavori.getDataEffettuazione()) %>' />
-		className="it.tref.liferay.portos.bo.model.FineLavori"	
+		<liferay-ui:search-container-column-text cssClass="text-nowrap" name="Direttore Lavori"
-		modelVar="fineLavori"
+				value="<%= fineLavori.getCodiceFiscaleDelegato().toUpperCase() %>"/>
-	>
+		<liferay-ui:search-container-column-text cssClass="text-nowrap" name="Tipologia"
-		<liferay-ui:search-container-column-text name="Data" cssClass="text-nowrap" value='<%= Validator.isNotNull(fineLavori.getDataEffettuazione()) ? dateFormatDateTime.format(fineLavori.getDataEffettuazione()) : ""%>' />
+				value='<%= fineLavori.getParziale() ? "Parziale" : "Totale" %>'/>
-		<liferay-ui:search-container-column-text cssClass="text-nowrap" name="Direttore Lavori" value="<%= fineLavori.getCodiceFiscaleDelegato().toUpperCase() %>"/>
-		<liferay-ui:search-container-column-text cssClass="text-nowrap" name="Tipologia" value='<%= fineLavori.getParziale() ? "Parziale" : "Totale" %>'/>
-		
 		<liferay-ui:search-container-column-text>
-			
+			<liferay-portlet:renderURL var="viewDettagliFineLavoriURL" portletName="<%= PortletKeys.ALLEGATI %>"
-			<liferay-portlet:renderURL var="viewDettagliFineLavoriURL" windowState="<%= LiferayWindowState.POP_UP.toString() %>" portletName='<%=PortletKeys.ALLEGATI %>'>
+					windowState="<%= LiferayWindowState.POP_UP.toString() %>">
 				<liferay-portlet:param name="mvcPath" value="/html/allegatipratica/view_accordion.jsp"/>
-				<liferay-portlet:param name="classPk" value="<%=String.valueOf(fineLavori.getFineLavoriId())%>" />
+				<liferay-portlet:param name="classPk" value="<%= String.valueOf(fineLavori.getFineLavoriId()) %>" />
-				<liferay-portlet:param name="className" value="<%=String.valueOf(FineLavori.class.getName())%>" />
+				<liferay-portlet:param name="className" value="<%= String.valueOf(FineLavori.class.getName()) %>" />
 				<liferay-portlet:param name="comingFrom" value="page_fine_lavori"/>
 				<liferay-portlet:param name="tipoAllegati" value="allegati_fine_lavori"/>
 				<liferay-portlet:param name="full" value="false"/>
 			</liferay-portlet:renderURL>
-			
+			<liferay-ui:icon-menu showWhenSingleIcon="false" extended="false" showExpanded="true"
-			<liferay-ui:icon-menu showWhenSingleIcon="<%= false %>" extended="false" showExpanded="true" cssClass="inline_toolbar displ_inline_block txt text-center" >
+					cssClass="inline_toolbar displ_inline_block txt text-center" >
-			
+				<liferay-ui:icon iconCssClass="fa fa-info-circle" message="detail" useDialog="true"
-				<liferay-ui:icon
+						linkCssClass="btn btn-action d-inline-block" url="<%=viewDettagliFineLavoriURL%>" />
-					iconCssClass="fa fa-info-circle"
-					message="detail"
-					linkCssClass="btn btn-action d-inline-block"
-					url="<%=viewDettagliFineLavoriURL%>"
-					useDialog="<%= true %>"
-				/>
-				
 			</liferay-ui:icon-menu>
-		
+		</liferay-ui:search-container-column-text>
-	</liferay-ui:search-container-column-text>
-		
 	</liferay-ui:search-container-row>
-
+	<liferay-ui:search-iterator paginate="false" />
-	<liferay-ui:search-iterator paginate="<%= false %>" />
 </liferay-ui:search-container>

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

@@ -1,56 +1,38 @@
 <%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%>
 <%@page import="com.liferay.portal.kernel.portlet.LiferayWindowState"%>
 <%@ include file="/html/fascicolo/init.jsp" %>
-<liferay-util:include page="/html/fascicolo/navigator/header.jsp" servletContext="<%=application %>"/>
+<liferay-util:include page="/html/fascicolo/navigator/header.jsp" servletContext="<%= application %>"/>
-<h2 class="fasciolo_page_title"><liferay-ui:message key="page_fl_dati"></liferay-ui:message></h2>
+<h2 class="fasciolo_page_title"><liferay-ui:message key="page_fl_dati" /></h2>
-
 <%
-	IntPratica intPratica = (IntPratica)request.getAttribute("bean.intPratica");
+IntPratica intPratica = (IntPratica) request.getAttribute("bean.intPratica");
-	long intPraticaId = intPratica.getIntPraticaId();
+long intPraticaId = intPratica.getIntPraticaId();
 %>
-
+<liferay-ui:search-container emptyResultsMessage="no-entries-were-found" orderByType="desc" orderByCol="createDate">
-<liferay-ui:search-container	
-	emptyResultsMessage="no-entries-were-found" 
-	orderByType="desc" orderByCol="createDate"
->
-
 	<liferay-ui:search-container-results
-		results="<%= FineLavoriLocalServiceUtil.findByIntPraticaId_Completata(intPraticaId, true, QueryUtil.ALL_POS, QueryUtil.ALL_POS, null) %>"
+			results="<%= FineLavoriLocalServiceUtil.findByIntPraticaId_Completata(intPraticaId, true,
-		total="<%= FineLavoriLocalServiceUtil.countByIntPraticaId_Completata(intPraticaId, true) %>"
+					QueryUtil.ALL_POS, QueryUtil.ALL_POS, null) %>"
-	>
+			total="<%= FineLavoriLocalServiceUtil.countByIntPraticaId_Completata(intPraticaId, true) %>" />
-	</liferay-ui:search-container-results>
+	<liferay-ui:search-container-row className="it.tref.liferay.portos.bo.model.FineLavori" modelVar="fineLavori">
-
+		<liferay-ui:search-container-column-text name="Data" cssClass="text-nowrap"
-	
+				value='<%= Validator.isNull(fineLavori.getDataEffettuazione()) ? StringPool.BLANK
-	<liferay-ui:search-container-row 
+						: dateFormatDateTime.format(fineLavori.getDataEffettuazione()) %>' />
-		className="it.tref.liferay.portos.bo.model.FineLavori"	
+		<liferay-ui:search-container-column-text cssClass="text-nowrap" name="Direttore Lavori"
-		modelVar="fineLavori"
+				value="<%= fineLavori.getCodiceFiscaleDelegato().toUpperCase() %>"/>
-	>
+		<liferay-ui:search-container-column-text cssClass="text-nowrap" name="Tipologia"
-		<liferay-ui:search-container-column-text name="Data" cssClass="text-nowrap" value='<%= Validator.isNotNull(fineLavori.getDataEffettuazione()) ? dateFormatDateTime.format(fineLavori.getDataEffettuazione()) : ""%>' />
+				value='<%= fineLavori.getParziale() ? "Parziale" : "Totale" %>'/>
-		<liferay-ui:search-container-column-text cssClass="text-nowrap" name="Direttore Lavori" value="<%= fineLavori.getCodiceFiscaleDelegato().toUpperCase() %>"/>
-		<liferay-ui:search-container-column-text cssClass="text-nowrap" name="Tipologia" value='<%= fineLavori.getParziale() ? "Parziale" : "Totale" %>'/>
-		
 		<liferay-ui:search-container-column-text>
-			
+			<liferay-portlet:renderURL var="viewDettagliFineLavoriURL"
-			<liferay-portlet:renderURL var="viewDettagliFineLavoriURL" windowState="<%= LiferayWindowState.POP_UP.toString() %>">
+					windowState="<%= LiferayWindowState.POP_UP.toString() %>">
 				<liferay-portlet:param name="mvcPath" value="/html/fascicolo/navigator/view_dettagli_fine-lavori.jsp"/>
-				<liferay-portlet:param name="fineLavoriId" value="<%=String.valueOf(fineLavori.getFineLavoriId())%>" />
+				<liferay-portlet:param name="fineLavoriId"
+						value="<%= String.valueOf(fineLavori.getFineLavoriId())%>" />
 			</liferay-portlet:renderURL>
-			
+			<liferay-ui:icon-menu showWhenSingleIcon="false" extended="false" showExpanded="true"
-			<liferay-ui:icon-menu showWhenSingleIcon="<%= false %>" extended="false" showExpanded="true" cssClass="inline_toolbar displ_inline_block txt text-center" >
+					cssClass="inline_toolbar displ_inline_block txt text-center">
-			
+				<liferay-ui:icon iconCssClass="fa fa-info-circle" message="detail" useDialog="true"
-				<liferay-ui:icon
+						linkCssClass="btn btn-action d-inline-block" url="<%= viewDettagliFineLavoriURL %>" />
-					iconCssClass="fa fa-info-circle"
-					message="detail"
-					linkCssClass="btn btn-action d-inline-block"
-					url="<%=viewDettagliFineLavoriURL%>"
-					useDialog="<%= true %>"
-				/>
-				
 			</liferay-ui:icon-menu>
-		
 	</liferay-ui:search-container-column-text>
-		
 	</liferay-ui:search-container-row>
-
+	<liferay-ui:search-iterator paginate="false" />
-	<liferay-ui:search-iterator paginate="<%= false %>" />
 </liferay-ui:search-container>

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

@@ -1,84 +1,63 @@
 <%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%>
-<%@page import="it.tref.liferay.portos.bo.shared.util.TipoSoggettoUtil"%>
-<%@page import="it.tref.liferay.portos.bo.shared.util.PortletKeys"%>
-<%@page import="com.liferay.portal.kernel.servlet.ServletContextPool"%>
-<%@page import="java.util.ArrayList"%>
 <%@page import="com.liferay.portal.kernel.portlet.LiferayWindowState"%>
+<%@page import="it.tref.liferay.portos.bo.shared.util.PortletKeys"%>
 <%@page import="it.tref.liferay.portos.bo.shared.util.TipoIntegrazioneUtil"%>
-<%@ include file="/html/fascicolo/init.jsp" %>
+<%@page import="it.tref.liferay.portos.bo.shared.util.TipoSoggettoUtil"%>
-
+<%@include file="/html/fascicolo/init.jsp"%>
-<liferay-util:include page="/html/fascicolo/navigator/header.jsp" servletContext="<%=application %>"/>
+<liferay-util:include page="/html/fascicolo/navigator/header.jsp" servletContext="<%= application %>"/>
-<h2 class="fasciolo_page_title"><liferay-ui:message key="page_in_allegati"></liferay-ui:message></h2>
+<h2 class="fasciolo_page_title"><liferay-ui:message key="page_in_allegati" /></h2>
-
 <%
-	IntPratica intPratica = (IntPratica)request.getAttribute("bean.intPratica");
+IntPratica intPratica = (IntPratica)request.getAttribute("bean.intPratica");
-	long intPraticaId = intPratica.getIntPraticaId();
+long intPraticaId = intPratica.getIntPraticaId();
 %>
-
+<liferay-ui:search-container emptyResultsMessage="no-entries-were-found"  orderByType="desc" orderByCol="createDate">
-<liferay-ui:search-container	
-	emptyResultsMessage="no-entries-were-found" 
-	orderByType="desc" orderByCol="createDate"
->
-
 	<liferay-ui:search-container-results
-		results="<%= DettPraticaServiceUtil.findCompletedByIntPraticaAndTipoPratica(intPraticaId, Arrays.asList(TipoIntegrazioneUtil.RICHIESTA_INTEGRAZIONE))%>"
+			results="<%= DettPraticaServiceUtil.findCompletedByIntPraticaAndTipoPratica(intPraticaId,
-		total="<%= DettPraticaServiceUtil.countCompletedByIntPraticaAndTipoPratica(intPraticaId, Arrays.asList(TipoIntegrazioneUtil.RICHIESTA_INTEGRAZIONE)) %>"
+					Arrays.asList(TipoIntegrazioneUtil.RICHIESTA_INTEGRAZIONE))%>"
-	>
+			total="<%= DettPraticaServiceUtil.countCompletedByIntPraticaAndTipoPratica(intPraticaId,
-	</liferay-ui:search-container-results>
+					Arrays.asList(TipoIntegrazioneUtil.RICHIESTA_INTEGRAZIONE)) %>" />
-	
+	<liferay-ui:search-container-row className="it.tref.liferay.portos.bo.model.DettPratica" modelVar="integrazione">
-	
+		<liferay-ui:search-container-column-text name="Data" cssClass="text-nowrap"
-	<liferay-ui:search-container-row 
+				value="<%= Validator.isNull(integrazione.getDataEffettuazione()) ? StringPool.BLANK
-		className="it.tref.liferay.portos.bo.model.DettPratica"	
+						: dateFormatDate.format(integrazione.getDataEffettuazione()) %>" />
-		modelVar="integrazione"
+		<liferay-ui:search-container-column-text cssClass="text-center" name="#"
-	>
+				value='<%= "<strong>" + integrazione.getIntegrazione() + "</strong>" %>'/>
-		<liferay-ui:search-container-column-text name="Data" cssClass="text-nowrap" value="<%= Validator.isNotNull(integrazione.getDataEffettuazione()) ? dateFormatDate.format(integrazione.getDataEffettuazione()) : StringPool.BLANK %>" />
+		<liferay-ui:search-container-column-text cssClass="text-nowrap" name="Pratica"
-		<liferay-ui:search-container-column-text cssClass="text-center" name="#" value='<%= "<strong>"+integrazione.getIntegrazione()+"</strong>" %>'/>
+				value="<%= integrazione.getTitle(locale) %>"/>
-		<liferay-ui:search-container-column-text cssClass="text-nowrap" name="Pratica" value="<%= integrazione.getTitle(locale) %>"/>
 		<liferay-ui:search-container-column-text cssClass="text-left" name="Committenti">
-		<% 
+			<%
 			StringBuilder builder = new StringBuilder();
-			List<Soggetto> committenti =  SoggettoServiceUtil.getValidByIntPratica_TipologiaSoggetto(intPraticaId, TipoSoggettoUtil.COMMITTENTE);
+			List<Soggetto> committenti =  SoggettoServiceUtil
-			for(Soggetto committente : committenti){
+					.getValidByIntPratica_TipologiaSoggetto(intPraticaId, TipoSoggettoUtil.COMMITTENTE);
-			  builder.append(committente.getDescrizioneCompleta())
+			for (Soggetto committente : committenti) {
-			  			.append(StringPool.COMMA_AND_SPACE).append("<br>");
+				if (builder.length() > 0) {
+					builder.append(",<br/>");
+				}
+				builder.append(committente.getDescrizioneCompleta());
 			}
-			if(builder.length()>0)
-			  builder.setLength(builder.length()-6);
-			
 			out.print(builder.toString());
-		%>
+			%>
 		</liferay-ui:search-container-column-text>
-		
 		<liferay-ui:search-container-column-text cssClass="text-center">
 			<%
-				String buttonId = "allegatoInButton_"+index;
+			String buttonId = "allegatoInButton_" + index;
-				String contentId = "allegatoInContent_"+index;
+			String contentId = "allegatoInContent_" + index;
-				String titleId = "Allegati Integrazione #"+integrazione.getDettPraticaId();
+			String titleId = "Allegati Integrazione #" + integrazione.getDettPraticaId();
 			%>
-		
+			<liferay-portlet:renderURL var="viewDettagliIntegrazioniURL"
-			<liferay-portlet:renderURL var="viewDettagliIntegrazioniURL" windowState="<%= LiferayWindowState.POP_UP.toString() %>" portletName='<%=PortletKeys.ALLEGATI %>'>
+					windowState="<%= LiferayWindowState.POP_UP.toString() %>" portletName="<%=PortletKeys.ALLEGATI %>">
 				<liferay-portlet:param name="mvcPath" value="/html/allegatipratica/view_accordion.jsp"/>
 				<liferay-portlet:param name="classPk" value="<%= String.valueOf(integrazione.getDettPraticaId()) %>"/>
 				<liferay-portlet:param name="className" value="<%= DettPratica.class.getName() %>"/>
 				<liferay-portlet:param name="comingFrom" value="page_in_allegati"/>
 				<liferay-portlet:param name="full" value="false"/>
 			</liferay-portlet:renderURL>
-				
+			<liferay-ui:icon-menu showWhenSingleIcon="false" extended="false" showExpanded="true"
-			<liferay-ui:icon-menu showWhenSingleIcon="<%= false %>" extended="false" showExpanded="true" cssClass="inline_toolbar displ_inline_block txt text-center" >
+					cssClass="inline_toolbar displ_inline_block txt text-center" >
-				
+				<liferay-ui:icon iconCssClass="fa fa-info-circle" message="detail" useDialog="true"
-				<liferay-ui:icon
+						linkCssClass="btn btn-action d-inline-block" url="<%= viewDettagliIntegrazioniURL %>" />
-					iconCssClass="fa fa-info-circle"
-					message="detail"
-					linkCssClass="btn btn-action d-inline-block"
-					url="<%= viewDettagliIntegrazioniURL %>"
-					useDialog="<%= true %>"
-				/>
 			</liferay-ui:icon-menu>
-	
 		</liferay-ui:search-container-column-text>
-			
-		
 	</liferay-ui:search-container-row>
-
+	<liferay-ui:search-iterator paginate="false" />
-	<liferay-ui:search-iterator paginate="<%= false %>" />
 </liferay-ui:search-container>

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

@@ -46,67 +46,58 @@ request.setAttribute("tabs1", "Tab_TaskMieiRuoli");
 %>
 <!-- Funzione per esportare la ricerca -->
 <liferay-portlet:resourceURL id="exportRicercaMieiRuoli" var="exportRicercaMieiRuoliURL">
-	<liferay-portlet:param name="dataRichiestaInizio" value="<%=dataRichiestaInizio %>"/>
+	<liferay-portlet:param name="dataRichiestaInizio" value="<%= dataRichiestaInizio %>"/>
-	<liferay-portlet:param name="dataRichiestaFine" value="<%=dataRichiestaFine %>"/>
+	<liferay-portlet:param name="dataRichiestaFine" value="<%= dataRichiestaFine %>"/>
-	<liferay-portlet:param name="numeroProgetto" value="<%=numeroProgetto %>"/>
+	<liferay-portlet:param name="numeroProgetto" value="<%= numeroProgetto %>"/>
-	<liferay-portlet:param name="protocollo" value="<%=protocollo %>"/>
+	<liferay-portlet:param name="protocollo" value="<%= protocollo %>"/>
-	<liferay-portlet:param name="tipoPratica" value="<%=tipoPratica %>"/>
+	<liferay-portlet:param name="tipoPratica" value="<%= tipoPratica %>"/>
-	<liferay-portlet:param name="statoPratica" value="<%=statoPratica %>"/>
+	<liferay-portlet:param name="statoPratica" value="<%= statoPratica %>"/>
-	<liferay-portlet:param name="committente" value="<%=committente %>"/>
+	<liferay-portlet:param name="committente" value="<%= committente %>"/>
-	<liferay-portlet:param name="soggettiInterconnessi" value="<%=soggettiInterconnessi %>"/>
+	<liferay-portlet:param name="soggettiInterconnessi" value="<%= soggettiInterconnessi %>"/>
-	<liferay-portlet:param name="istruttore" value="<%=istruttore %>"/>
+	<liferay-portlet:param name="istruttore" value="<%= istruttore %>"/>
-	<liferay-portlet:param name="ufficio" value="<%=ufficio %>"/>
+	<liferay-portlet:param name="ufficio" value="<%= ufficio %>"/>
-	<liferay-portlet:param name="comune" value="<%=comuneSearch %>"/>
+	<liferay-portlet:param name="comune" value="<%= comuneSearch %>"/>
-	<liferay-portlet:param name="tipoAttivita" value="<%=tipoAttivita %>"/>
+	<liferay-portlet:param name="tipoAttivita" value="<%= tipoAttivita %>"/>
-	<liferay-portlet:param name="tipoProcedura" value="<%=tipoProcedura %>"/>
+	<liferay-portlet:param name="tipoProcedura" value="<%= tipoProcedura %>"/>
-	<liferay-portlet:param name="ordinaPer" value="<%=ordinaPer %>"/>
+	<liferay-portlet:param name="ordinaPer" value="<%= ordinaPer %>"/>
-	<liferay-portlet:param name="ordinaTipo" value="<%=ordinaTipo %>"/>
+	<liferay-portlet:param name="ordinaTipo" value="<%= ordinaTipo %>"/>
 	<liferay-portlet:param name="searchForExport" value="true"/>
 	<liferay-portlet:param name="<%= Constants.CMD %>" value="exportRicercaMieiRuoli"/>
 </liferay-portlet:resourceURL>
-
 <div class="row-fluid" style="margin-top:10px;">
 	<div class="span10"></div>
 	<div class="span2">
 		<aui:button-row cssClass="margin-top-0">
-			<liferay-ui:icon linkCssClass="btn btn-action btn-primary pull-right" iconCssClass="fa fa-floppy-o" message="Esporta Ricerca" label="<%= true %>" url="<%= exportRicercaMieiRuoliURL %>" target="_blank" />				
+			<liferay-ui:icon linkCssClass="btn btn-action btn-primary pull-right" iconCssClass="fa fa-floppy-o"
+					message="Esporta Ricerca" label="true" url="<%= exportRicercaMieiRuoliURL %>" target="_blank" />
 		</aui:button-row>
 	</div>
 </div>
-
+<liferay-ui:search-container emptyResultsMessage="no-entries-were-found" iteratorURL="<%= iteratorURL %>"
-<liferay-ui:search-container	
+		orderByType="<%= orderByType %>" orderByCol="<%= orderByCol %>">
-	emptyResultsMessage="no-entries-were-found" 
-	iteratorURL="<%= iteratorURL %>"
-	orderByType="<%= orderByType %>" orderByCol="<%= orderByCol %>" 
->
 	<%
-		List<ControlloPratica> listaControlloPratica = new ArrayList<ControlloPratica>(); 
+	List<ControlloPratica> listaControlloPratica = new ArrayList<ControlloPratica>();
-		Hits hits = ControlloPraticaAdvancedSearch.searchTaskMieiRuoli(request, user,  searchContainer.getStart(), searchContainer.getEnd());
+	Hits hits = ControlloPraticaAdvancedSearch.searchTaskMieiRuoli(request, user, searchContainer.getStart(),
-	
+			searchContainer.getEnd());
-		for (Document doc : hits.toList()) {
+	for (Document doc : hits.toList()) {
-
+		String controlloPraticaId = doc.get("controlloPraticaId");
-	        String controlloPraticaId = doc.get("controlloPraticaId");
+		if (Validator.isNotNull(controlloPraticaId)) {
-	        if (Validator.isNotNull(controlloPraticaId)) {
+			ControlloPratica controlloPratica =	ControlloPraticaLocalServiceUtil
-
+					.fetchControlloPratica(GetterUtil.getLong(controlloPraticaId));
-	          ControlloPratica controlloPratica =
+			if (Validator.isNotNull(controlloPratica)) {
-	              ControlloPraticaLocalServiceUtil.fetchControlloPratica(GetterUtil.getLong(controlloPraticaId));
-	          if (Validator.isNotNull(controlloPratica)) {
 				listaControlloPratica.add(controlloPratica);
-	          }else{
+			} else {
 				Indexer indexer = IndexerRegistryUtil.getIndexer(IntPratica.class);
 				indexer.delete(company.getCompanyId(), doc.getUID());
-			  }
+			}
-	        }
+		}
-
+	}
-	      }
+	searchContainer.setTotal(hits.getLength());
-			
-		searchContainer.setTotal(hits.getLength());
-	
 	%>
 	<liferay-ui:search-container-results results="<%= listaControlloPratica %>" />
-    <liferay-ui:search-container-row className="it.tref.liferay.portos.bo.model.ControlloPratica"
+	<liferay-ui:search-container-row className="it.tref.liferay.portos.bo.model.ControlloPratica"
-    		modelVar="controlloPratica">
+			modelVar="controlloPratica">
-		<%@ include file="/html/gestioneattivita/view_columns.jspf" %>
+		<%@include file="/html/gestioneattivita/view_columns.jspf"%>
 	</liferay-ui:search-container-row>
 	<liferay-ui:search-iterator paginate="true" />
 </liferay-ui:search-container>

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=176
+    build.number=177
-    build.date=1631535776275
+    build.date=1632921903647
     build.auto.upgrade=true
 
 ##

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

@@ -13,8 +13,8 @@
 ##
 
     build.namespace=DA
-    build.number=11
+    build.number=12
-    build.date=1631869742186
+    build.date=1632922531750
     build.auto.upgrade=true
 
 ##

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

@@ -1,572 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-
-<taglib xmlns="http://java.sun.com/xml/ns/javaee"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-jsptaglibrary_2_1.xsd"
-    version="2.1">
-    
-  <description>JSTL 1.2 core library</description>
-  <display-name>JSTL core</display-name>
-  <tlib-version>1.2</tlib-version>
-  <short-name>c</short-name>
-  <uri>http://java.sun.com/jsp/jstl/core</uri>
-
-  <validator>
-    <description>
-        Provides core validation features for JSTL tags.
-    </description>
-    <validator-class>
-        org.apache.taglibs.standard.tlv.JstlCoreTLV
-    </validator-class>
-  </validator>
-
-  <tag>
-    <description>
-        Catches any Throwable that occurs in its body and optionally
-        exposes it.
-    </description>
-    <name>catch</name>
-    <tag-class>org.apache.taglibs.standard.tag.common.core.CatchTag</tag-class>
-    <body-content>JSP</body-content>
-    <attribute>
-        <description>
-Name of the exported scoped variable for the
-exception thrown from a nested action. The type of the
-scoped variable is the type of the exception thrown.
-        </description>
-        <name>var</name>
-        <required>false</required>
-        <rtexprvalue>false</rtexprvalue>
-    </attribute>
-  </tag>
-
-  <tag>
-    <description>
-	Simple conditional tag that establishes a context for
-	mutually exclusive conditional operations, marked by
-	&lt;when&gt; and &lt;otherwise&gt;
-    </description>
-    <name>choose</name>
-    <tag-class>com.liferay.taglib.core.ChooseTag</tag-class>
-    <body-content>JSP</body-content>
-  </tag>
-
-  <tag>
-    <description>
-	Simple conditional tag, which evalutes its body if the
-	supplied condition is true and optionally exposes a Boolean
-	scripting variable representing the evaluation of this condition
-    </description>
-    <name>if</name>
-    <tag-class>com.liferay.taglib.core.IfTag</tag-class>
-    <body-content>JSP</body-content>
-    <attribute>
-        <description>
-The test condition that determines whether or
-not the body content should be processed.
-        </description>
-        <name>test</name>
-        <required>true</required>
-        <rtexprvalue>true</rtexprvalue>
-	<type>boolean</type>
-    </attribute>
-    <attribute>
-        <description>
-Name of the exported scoped variable for the
-resulting value of the test condition. The type
-of the scoped variable is Boolean.        
-        </description>
-        <name>var</name>
-        <required>false</required>
-        <rtexprvalue>false</rtexprvalue>
-    </attribute>
-    <attribute>
-        <description>
-Scope for var.
-        </description>
-        <name>scope</name>
-        <required>false</required>
-        <rtexprvalue>false</rtexprvalue>
-    </attribute>
-  </tag>
-
-  <tag>
-    <description>
-        Retrieves an absolute or relative URL and exposes its contents
-        to either the page, a String in 'var', or a Reader in 'varReader'.
-    </description>
-    <name>import</name>
-    <tag-class>org.apache.taglibs.standard.tag.rt.core.ImportTag</tag-class>
-    <tei-class>org.apache.taglibs.standard.tei.ImportTEI</tei-class>
-    <body-content>JSP</body-content>
-    <attribute>
-        <description>
-The URL of the resource to import.
-        </description>
-        <name>url</name>
-        <required>true</required>
-        <rtexprvalue>true</rtexprvalue>
-    </attribute>
-    <attribute>
-        <description>
-Name of the exported scoped variable for the
-resource's content. The type of the scoped
-variable is String.
-        </description>
-        <name>var</name>
-        <required>false</required>
-        <rtexprvalue>false</rtexprvalue>
-    </attribute>
-    <attribute>
-        <description>
-Scope for var.
-        </description>
-        <name>scope</name>
-        <required>false</required>
-        <rtexprvalue>false</rtexprvalue>
-    </attribute>
-    <attribute>
-        <description>
-Name of the exported scoped variable for the
-resource's content. The type of the scoped
-variable is Reader.
-        </description>
-        <name>varReader</name>
-        <required>false</required>
-        <rtexprvalue>false</rtexprvalue>
-    </attribute>
-    <attribute>
-        <description>
-Name of the context when accessing a relative
-URL resource that belongs to a foreign
-context.
-        </description>
-        <name>context</name>
-        <required>false</required>
-        <rtexprvalue>true</rtexprvalue>
-    </attribute>
-    <attribute>
-        <description>
-Character encoding of the content at the input
-resource.
-        </description>
-        <name>charEncoding</name>
-        <required>false</required>
-        <rtexprvalue>true</rtexprvalue>
-    </attribute>
-  </tag>
-
-  <tag>
-    <description>
-	The basic iteration tag, accepting many different
-        collection types and supporting subsetting and other
-        functionality
-    </description>
-    <name>forEach</name>
-    <tag-class>org.apache.taglibs.standard.tag.rt.core.ForEachTag</tag-class>
-    <tei-class>org.apache.taglibs.standard.tei.ForEachTEI</tei-class>
-    <body-content>JSP</body-content>
-    <attribute>
-        <description>
-Collection of items to iterate over.
-        </description>
-	<name>items</name>
-	<required>false</required>
-	<rtexprvalue>true</rtexprvalue>
-	<type>java.lang.Object</type>
-        <deferred-value>
-	    <type>java.lang.Object</type>
-        </deferred-value>
-    </attribute>
-    <attribute>
-        <description>
-If items specified:
-Iteration begins at the item located at the
-specified index. First item of the collection has
-index 0.
-If items not specified:
-Iteration begins with index set at the value
-specified.
-        </description>
-	<name>begin</name>
-	<required>false</required>
-	<rtexprvalue>true</rtexprvalue>
-	<type>int</type>
-    </attribute>
-    <attribute>
-        <description>
-If items specified:
-Iteration ends at the item located at the
-specified index (inclusive).
-If items not specified:
-Iteration ends when index reaches the value
-specified.
-        </description>
-	<name>end</name>
-	<required>false</required>
-	<rtexprvalue>true</rtexprvalue>
-	<type>int</type>
-    </attribute>
-    <attribute>
-        <description>
-Iteration will only process every step items of
-the collection, starting with the first one.
-        </description>
-	<name>step</name>
-	<required>false</required>
-	<rtexprvalue>true</rtexprvalue>
-	<type>int</type>
-    </attribute>
-    <attribute>
-        <description>
-Name of the exported scoped variable for the
-current item of the iteration. This scoped
-variable has nested visibility. Its type depends
-on the object of the underlying collection.
-        </description>
-	<name>var</name>
-	<required>false</required>
-	<rtexprvalue>false</rtexprvalue>
-    </attribute>
-    <attribute>
-        <description>
-Name of the exported scoped variable for the
-status of the iteration. Object exported is of type
-javax.servlet.jsp.jstl.core.LoopTagStatus. This scoped variable has nested
-visibility.
-        </description>
-	<name>varStatus</name>
-	<required>false</required>
-	<rtexprvalue>false</rtexprvalue>
-    </attribute>
-  </tag>
-
-  <tag>
-    <description>
-	Iterates over tokens, separated by the supplied delimeters
-    </description>
-    <name>forTokens</name>
-    <tag-class>org.apache.taglibs.standard.tag.rt.core.ForTokensTag</tag-class>
-    <body-content>JSP</body-content>
-    <attribute>
-        <description>
-String of tokens to iterate over.
-        </description>
-	<name>items</name>
-	<required>true</required>
-	<rtexprvalue>true</rtexprvalue>
-	<type>java.lang.String</type>
-        <deferred-value>
-	    <type>java.lang.String</type>
-        </deferred-value>
-    </attribute>
-    <attribute>
-        <description>
-The set of delimiters (the characters that
-separate the tokens in the string).
-        </description>
-	<name>delims</name>
-	<required>true</required>
-	<rtexprvalue>true</rtexprvalue>
-	<type>java.lang.String</type>
-    </attribute>
-    <attribute>
-        <description>
-Iteration begins at the token located at the
-specified index. First token has index 0.
-        </description>
-	<name>begin</name>
-	<required>false</required>
-	<rtexprvalue>true</rtexprvalue>
-	<type>int</type>
-    </attribute>
-    <attribute>
-        <description>
-Iteration ends at the token located at the
-specified index (inclusive).
-        </description>
-	<name>end</name>
-	<required>false</required>
-	<rtexprvalue>true</rtexprvalue>
-	<type>int</type>
-    </attribute>
-    <attribute>
-        <description>
-Iteration will only process every step tokens
-of the string, starting with the first one.
-        </description>
-	<name>step</name>
-	<required>false</required>
-	<rtexprvalue>true</rtexprvalue>
-	<type>int</type>
-    </attribute>
-    <attribute>
-        <description>
-Name of the exported scoped variable for the
-current item of the iteration. This scoped
-variable has nested visibility.
-        </description>
-	<name>var</name>
-	<required>false</required>
-	<rtexprvalue>false</rtexprvalue>
-    </attribute>
-    <attribute>
-        <description>
-Name of the exported scoped variable for the
-status of the iteration. Object exported is of
-type
-javax.servlet.jsp.jstl.core.LoopTag
-Status. This scoped variable has nested
-visibility.
-        </description>
-	<name>varStatus</name>
-	<required>false</required>
-	<rtexprvalue>false</rtexprvalue>
-    </attribute>
-  </tag>
-
-  <tag>
-    <description>
-        Like &lt;%= ... &gt;, but for expressions.
-    </description> 
-    <name>out</name>
-    <tag-class>org.apache.taglibs.standard.tag.rt.core.OutTag</tag-class>
-    <body-content>JSP</body-content>
-    <attribute>
-        <description>
-Expression to be evaluated.
-        </description>
-        <name>value</name>
-        <required>true</required>
-        <rtexprvalue>true</rtexprvalue>
-    </attribute>
-    <attribute>
-        <description>
-Default value if the resulting value is null.
-        </description>
-        <name>default</name>
-        <required>false</required>
-        <rtexprvalue>true</rtexprvalue>
-    </attribute>
-    <attribute>
-        <description>
-Determines whether characters &lt;,&gt;,&amp;,'," in the
-resulting string should be converted to their
-corresponding character entity codes. Default value is
-true.
-        </description>
-        <name>escapeXml</name>
-        <required>false</required>
-        <rtexprvalue>true</rtexprvalue>
-    </attribute>
-  </tag>
-
-
-  <tag>
-    <description>
-        Subtag of &lt;choose&gt; that follows &lt;when&gt; tags
-        and runs only if all of the prior conditions evaluated to
-        'false'
-    </description>
-    <name>otherwise</name>
-    <tag-class>com.liferay.taglib.core.OtherwiseTag</tag-class>
-    <body-content>JSP</body-content>
-  </tag>
-
-  <tag>
-    <description>
-        Adds a parameter to a containing 'import' tag's URL.
-    </description>
-    <name>param</name>
-    <tag-class>org.apache.taglibs.standard.tag.rt.core.ParamTag</tag-class>
-    <body-content>JSP</body-content>
-    <attribute>
-        <description>
-Name of the query string parameter.
-        </description>
-        <name>name</name>
-        <required>true</required>
-        <rtexprvalue>true</rtexprvalue>
-    </attribute>
-    <attribute>
-        <description>
-Value of the parameter.
-        </description>
-        <name>value</name>
-        <required>false</required>
-        <rtexprvalue>true</rtexprvalue>
-    </attribute>
-  </tag>
-
-  <tag>
-    <description>
-        Redirects to a new URL.
-    </description>
-    <name>redirect</name>
-    <tag-class>org.apache.taglibs.standard.tag.rt.core.RedirectTag</tag-class>
-    <body-content>JSP</body-content>
-    <attribute>
-        <description>
-The URL of the resource to redirect to.
-        </description>
-        <name>url</name>
-        <required>false</required>
-        <rtexprvalue>true</rtexprvalue>
-    </attribute>
-    <attribute>
-        <description>
-Name of the context when redirecting to a relative URL
-resource that belongs to a foreign context.
-        </description>
-        <name>context</name>
-        <required>false</required>
-        <rtexprvalue>true</rtexprvalue>
-    </attribute>
-  </tag>
-
-  <tag>
-    <description>
-        Removes a scoped variable (from a particular scope, if specified).
-    </description>
-    <name>remove</name>
-    <tag-class>org.apache.taglibs.standard.tag.common.core.RemoveTag</tag-class>
-    <body-content>empty</body-content>
-    <attribute>
-        <description>
-Name of the scoped variable to be removed.
-        </description>
-        <name>var</name>
-        <required>true</required>
-        <rtexprvalue>false</rtexprvalue>
-    </attribute>
-    <attribute>
-        <description>
-Scope for var.
-        </description>
-        <name>scope</name>
-        <required>false</required>
-        <rtexprvalue>false</rtexprvalue>
-    </attribute>
-  </tag>
-
- <tag>
-    <description>
-        Sets the result of an expression evaluation in a 'scope'
-    </description>
-    <name>set</name>
-    <tag-class>org.apache.taglibs.standard.tag.rt.core.SetTag</tag-class>
-    <body-content>JSP</body-content>
-    <attribute>
-        <description>
-Name of the exported scoped variable to hold the value
-specified in the action. The type of the scoped variable is
-whatever type the value expression evaluates to.
-        </description>
-        <name>var</name>
-        <required>false</required>
-        <rtexprvalue>false</rtexprvalue>
-    </attribute>
-    <attribute>
-        <description>
-Expression to be evaluated.
-        </description>
-        <name>value</name>
-        <required>false</required>
-        <rtexprvalue>true</rtexprvalue>
-        <deferred-value>
-	    <type>java.lang.Object</type>
-        </deferred-value>
-    </attribute>
-    <attribute>
-        <description>
-Target object whose property will be set. Must evaluate to
-a JavaBeans object with setter property property, or to a
-java.util.Map object.
-        </description>
-        <name>target</name>
-        <required>false</required>
-        <rtexprvalue>true</rtexprvalue>
-    </attribute>
-    <attribute>
-        <description>
-Name of the property to be set in the target object.
-        </description>
-        <name>property</name>
-        <required>false</required>
-        <rtexprvalue>true</rtexprvalue>
-    </attribute>
-    <attribute>
-        <description>
-Scope for var.
-        </description>
-        <name>scope</name>
-        <required>false</required>
-        <rtexprvalue>false</rtexprvalue>
-    </attribute>
-  </tag>
-
-  <tag>
-    <description>
-        Creates a URL with optional query parameters.
-    </description>
-    <name>url</name>
-    <tag-class>org.apache.taglibs.standard.tag.rt.core.UrlTag</tag-class>
-    <body-content>JSP</body-content>
-    <attribute>
-        <description>
-Name of the exported scoped variable for the
-processed url. The type of the scoped variable is
-String.
-        </description>
-        <name>var</name>
-        <required>false</required>
-        <rtexprvalue>false</rtexprvalue>
-    </attribute>
-    <attribute>
-        <description>
-Scope for var.
-        </description>
-        <name>scope</name>
-        <required>false</required>
-        <rtexprvalue>false</rtexprvalue>
-    </attribute>
-    <attribute>
-        <description>
-URL to be processed.
-        </description>
-        <name>value</name>
-        <required>false</required>
-        <rtexprvalue>true</rtexprvalue>
-    </attribute>
-    <attribute>
-        <description>
-Name of the context when specifying a relative URL
-resource that belongs to a foreign context.
-        </description>
-        <name>context</name>
-        <required>false</required>
-        <rtexprvalue>true</rtexprvalue>
-    </attribute>
-  </tag>
-
-  <tag>
-    <description>
-	Subtag of &lt;choose&gt; that includes its body if its
-	condition evalutes to 'true'
-    </description>
-    <name>when</name>
-    <tag-class>com.liferay.taglib.core.WhenTag</tag-class>
-    <body-content>JSP</body-content>
-    <attribute>
-        <description>
-The test condition that determines whether or not the
-body content should be processed.
-        </description>
-        <name>test</name>
-        <required>true</required>
-        <rtexprvalue>true</rtexprvalue>
-	<type>boolean</type>
-    </attribute>
-  </tag>
-
-</taglib>

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

@@ -1,4 +1,4 @@
-package it.mwg.sismica.bo.shared.util;
+package it.mwg.sismica.fe.util;
 
 import it.tref.liferay.portos.bo.shared.bean.FirmeBean;
 import it.tref.liferay.portos.bo.shared.util.FirmeUtil;
@@ -32,9 +32,9 @@ import com.liferay.portal.kernel.util.Validator;
 import com.liferay.portal.model.Company;
 import com.liferay.portal.service.CompanyLocalServiceUtil;
 
-public class ValidazionePraticaConstants {
+public class ValidazionePraticaUtil {
 
-	private static final Log _log = LogFactoryUtil.getLog(ValidazionePraticaConstants.class);
+	private static final Log _log = LogFactoryUtil.getLog(ValidazionePraticaUtil.class);
 
 	private static Set<String> extractSigns(long companyId, String fileName, byte[] fileBytes) throws IOException,
 			PortalException, SystemException {

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

@@ -1,7 +1,7 @@
 package it.tref.liferay.portos.fe.portlet;
 
 import it.mwg.sismica.bo.shared.util.AsseverazioniUtil;
-import it.mwg.sismica.bo.shared.util.ValidazionePraticaConstants;
+import it.mwg.sismica.fe.util.ValidazionePraticaUtil;
 import it.tref.liferay.portos.bo.model.Asseverazione;
 import it.tref.liferay.portos.bo.model.Collaudo;
 import it.tref.liferay.portos.bo.model.Comune;
@@ -39,7 +39,6 @@ import it.tref.liferay.portos.bo.shared.util.TipoIntegrazioneUtil;
 import it.tref.liferay.portos.bo.shared.util.TipoSoggettoUtil;
 import it.tref.liferay.portos.bo.util.DelegheUtil;
 import it.tref.liferay.portos.bo.util.MailUtil;
-import it.tref.liferay.portos.bo.util.SoggettiUtil;
 import it.tref.liferay.portos.fe.util.ReportFascicoloUtil;
 import it.tref.liferay.portos.mailmanager.shared.model.FileAttachment;
 import it.tref.liferay.portos.report.shared.constants.ReportConstants;
@@ -1310,7 +1309,8 @@ public class FascicoloFePortlet extends MVCPortlet {
 		DettPratica dettCheck = DettPraticaLocalServiceUtil.fetchDettPratica(dettPraticaId);
 		boolean disabledCollaudoStatico = false;
 		if (dettCheck != null) {
-			disabledCollaudoStatico = SoggettiUtil.isCommittenteAndDitta(dettCheck.getIntPraticaId());
+			IntPratica intCheck = IntPraticaLocalServiceUtil.getIntPratica(dettPratica.getIntPraticaId());
+			disabledCollaudoStatico = intCheck.isCommittenteAndDitta();
 		}
 		boolean collaudoStatico = ParamUtil.getBoolean(request, "collaudoStatico");
 		if (disabledCollaudoStatico) {
@@ -1754,7 +1754,7 @@ public class FascicoloFePortlet extends MVCPortlet {
 				} else {
 					jsonFirmatari = FirmeUtil.serialize(firmeBean);
 				}
-				boolean isSigned = ValidazionePraticaConstants.isAllegatoSignedBySubjects(sourceFileName, content,
+				boolean isSigned = ValidazionePraticaUtil.isAllegatoSignedBySubjects(sourceFileName, content,
 						serviceContext.getCompanyId(), codiciFiscaliValidi, jsonFirmatari);
 				if (isSigned) {
 					IntPraticaLocalServiceUtil.allegaFileAnnullamento(intPraticaId, content, sourceFileName,
@@ -1823,7 +1823,7 @@ public class FascicoloFePortlet extends MVCPortlet {
 			}
 			if (SessionErrors.isEmpty(request)) {
 				byte[] content = FileUtil.getBytes(file);
-				boolean isSignedByTitolare = ValidazionePraticaConstants.isAsseverazioneSignedByOwner(sourceFileName,
+				boolean isSignedByTitolare = ValidazionePraticaUtil.isAsseverazioneSignedByOwner(sourceFileName,
 						content, serviceContext.getCompanyId(), asseverazione.getCodiceFiscale(), StringPool.BLANK);
 				if (isSignedByTitolare) {
 					AsseverazioneServiceUtil.allegaFileAsseverazione(asseverazioneId, content, sourceFileName,
@@ -1831,7 +1831,7 @@ public class FascicoloFePortlet extends MVCPortlet {
 				} else {
 					SessionErrors.add(request, "error.geniocivilefe.asseverazione.allegato.firma.valid");
 					// Impostazione parametri di rendering per messaggio di errore.
-					List<String> firmatari = ValidazionePraticaConstants.gatherSignatures(sourceFileName, content,
+					List<String> firmatari = ValidazionePraticaUtil.gatherSignatures(sourceFileName, content,
 							serviceContext.getCompanyId(), StringPool.BLANK);
 					String firme = StringUtils.join(firmatari, StringPool.COMMA_AND_SPACE).toLowerCase();
 					dettagliFirme = "<br>Firma richiesta [" + asseverazione.getCodiceFiscale() + "]<br>Firme trovate ["

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

@@ -1,6 +1,6 @@
 package it.tref.liferay.portos.fe.portlet;
 
-import it.mwg.sismica.bo.shared.util.ValidazionePraticaConstants;
+import it.mwg.sismica.fe.util.ValidazionePraticaUtil;
 import it.tref.liferay.portos.bo.model.Comune;
 import it.tref.liferay.portos.bo.model.DettPratica;
 import it.tref.liferay.portos.bo.model.DocPratica;
@@ -276,7 +276,7 @@ public class SoggettiPraticaPortlet extends MVCPortlet {
 			// quella del TITOLARE DIGITALE DELLA PRATICA.
 			if (TipoSoggettoUtil.COMMITTENTE.equals(soggetto.getTipologiaSoggetto())) {
 				String[] titolare = new String[] { dettPratica.getCodiceFiscaleDelegatoCommittente() };
-				isSigned = ValidazionePraticaConstants.isAllegatoSignedBySubjects(sourceFileName, content,
+				isSigned = ValidazionePraticaUtil.isAllegatoSignedBySubjects(sourceFileName, content,
 						serviceContext.getCompanyId(), Arrays.asList(titolare), jsonFirmatari);
 			} else {
 				List<Soggetto> soggettiValidi = SoggettoServiceUtil.getValidTmpByIntPratica(intPraticaId);
@@ -287,7 +287,7 @@ public class SoggettiPraticaPortlet extends MVCPortlet {
 						codiciFiscaliValidi.add(valido.getCodiceFiscale());
 					}
 				}
-				isSigned = ValidazionePraticaConstants.isAllegatoSignedBySubjectsAndPerson(sourceFileName, content,
+				isSigned = ValidazionePraticaUtil.isAllegatoSignedBySubjectsAndPerson(sourceFileName, content,
 						serviceContext.getCompanyId(), codiciFiscaliValidi, soggetto.getCodiceFiscale(), jsonFirmatari);
 			}
 			if (!isSigned) {

liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/html/fascicolofe/navigator/common/save_actions.jspf

@@ -266,10 +266,6 @@ String script =
 					</liferay-util:include>
 				</c:if>
 			</c:if>
-			<%
-			System.out.println("##### dettPratica.hasAsseverazioneAttiva(" + user.getUserId() + ") = "
-					+ dettPratica.hasAsseverazioneAttiva(user.getUserId()));
-			%>
 			<c:if test="<%= dettPratica.hasAsseverazioneAttiva(user.getUserId()) %>">
 				<liferay-ui:icon id="<%= buttonAsseverazioneId %>" iconCssClass="fa fa-save" message="Assevera" url="#"
 					linkCssClass="btn btn-primary" />

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

@@ -4,7 +4,6 @@
 <%@page import="it.tref.liferay.portos.bo.shared.util.PortletKeys"%>
 <%@page import="it.tref.liferay.portos.bo.shared.util.TipoIntegrazioneUtil"%>
 <%@page import="it.tref.liferay.portos.bo.service.SoggettoServiceUtil"%>
-<%@page import="it.tref.liferay.portos.bo.util.SoggettiUtil"%>
 <%@page import="it.tref.liferay.portos.bo.util.DelegheUtil"%>
 <%@page import="it.tref.liferay.portos.bo.model.Soggetto"%>
 <%@page import="com.liferay.portal.kernel.workflow.WorkflowConstants"%>
@@ -36,7 +35,7 @@ request.setAttribute("bean.dettPratica",dettPratica);
 boolean disabledInput = !dettPratica.hasDelegaCompilazioneDomanda(user.getUserId())
 		|| TipoIntegrazioneUtil.VARIAZIONE_SOGGETTO.equals(dettPratica.getTipoIntegrazione())
 		|| TipoIntegrazioneUtil.RICHIESTA_INTEGRAZIONE.equals(dettPratica.getTipoIntegrazione());
-boolean disabledCollaudoStatico = SoggettiUtil.isCommittenteAndDitta(dettPratica.getIntPraticaId());
+boolean disabledCollaudoStatico = intPratica.isCommittenteAndDitta();
 boolean isGeoEditable = TipoIntegrazioneUtil.VARIANTE.equalsIgnoreCase(dettPratica.getTipoIntegrazione())
 		|| TipoIntegrazioneUtil.RICHIESTA_INTEGRAZIONE.equalsIgnoreCase(dettPratica.getTipoIntegrazione());
 boolean enabledByIntegrazione = dettPratica.hasDelegaCompilazioneDomanda(user.getUserId())

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

@@ -22,7 +22,6 @@
 <%@page import="it.tref.liferay.portos.bo.shared.util.TipoIntegrazioneUtil"%>
 <%@page import="it.tref.liferay.portos.bo.shared.util.TipoSoggettoUtil"%>
 <%@page import="it.tref.liferay.portos.bo.util.DelegheUtil"%>
-<%@page import="it.tref.liferay.portos.bo.util.SoggettiUtil"%>
 <%@page import="java.text.DateFormat"%>
 <%@page import="java.util.ArrayList"%>
 <%@page import="java.util.HashMap"%>
@@ -86,8 +85,7 @@ dataMap.put("id", PortletKeys.SOGGETTI + "_dialogEditSoggetto");
 					<liferay-ui:search-container-row className="it.tref.liferay.portos.bo.model.Soggetto"
 							modelVar="soggetto">
 						<%
-						boolean isSoggettoPrincipale = SoggettiUtil.isSoggettoPrincipale(soggetto.getSoggettoId(),
+						boolean isSoggettoPrincipale = dettPratica.isSoggettoPrincipale(soggetto.getSoggettoId());
-								dettPratica.getDettPraticaId());
 						%>
 						<liferay-ui:search-container-column-text name="Stato" cssClass="text-center">
 							<%
@@ -358,8 +356,7 @@ dataMap.put("id", PortletKeys.SOGGETTI + "_dialogEditSoggetto");
 					<liferay-ui:search-container-row className="it.tref.liferay.portos.bo.model.Soggetto"
 							modelVar="soggetto">
 						<%
-						boolean isSoggettoPrincipale = SoggettiUtil.isSoggettoPrincipale(soggetto.getSoggettoId(),
+						boolean isSoggettoPrincipale = dettPratica.isSoggettoPrincipale(soggetto.getSoggettoId());
-								dettPratica.getDettPraticaId());
 						%>
 						<liferay-portlet:renderURL portletName="<%= PortletKeys.SOGGETTI %>" var="detailsURL"
 								windowState="<%= LiferayWindowState.POP_UP.toString() %>">
@@ -515,7 +512,7 @@ dataMap.put("id", PortletKeys.SOGGETTI + "_dialogEditSoggetto");
 										}
 										%>
 									</ul>
-									<c:if test="<%= !SoggettiUtil.isTitolareInCommittenti(intPratica.getIntPraticaId()) %>">
+									<c:if test="<%= !intPratica.isTitolareInCommittenti() %>">
 										<%
 										User titolareUser = UserLocalServiceUtil.getUserById(intPratica.getUserId());
 										%>
@@ -714,7 +711,7 @@ dataMap.put("id", PortletKeys.SOGGETTI + "_dialogEditSoggetto");
 </div>
 <aui:script use="aui-base">
 Liferay.fire('soggetti-ready', {
-	isCommittenteAndDitta: <%= SoggettiUtil.isCommittenteAndDitta(dettPratica.getIntPraticaId()) %>,
+	isCommittenteAndDitta: <%= intPratica.isCommittenteAndDitta() %>,
 });
 </aui:script>
 <liferay-portlet:actionURL var="makePrincipaleURL" name="makePrincipale">

liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/html/soggettipratica/view_valida_fino.jsp

@@ -48,8 +48,7 @@ boolean inBO = ParamUtil.getBoolean(request, "inBO", false);
 					<liferay-ui:search-container-row className="it.tref.liferay.portos.bo.model.Soggetto"
 							modelVar="soggetto">
 						<%
-						boolean isSoggettoPrincipale = SoggettiUtil.isSoggettoPrincipale(soggetto.getSoggettoId(),
+						boolean isSoggettoPrincipale = dettPratica.isSoggettoPrincipale(soggetto.getSoggettoId());
-								dettPratica.getDettPraticaId());
 						%>
 						<liferay-ui:search-container-column-text name="Stato">
 							<%
@@ -213,8 +212,7 @@ boolean inBO = ParamUtil.getBoolean(request, "inBO", false);
 					<liferay-ui:search-container-row className="it.tref.liferay.portos.bo.model.Soggetto"
 							modelVar="soggetto">
 						<%
-						boolean isSoggettoPrincipale = SoggettiUtil.isSoggettoPrincipale(soggetto.getSoggettoId(),
+						boolean isSoggettoPrincipale = dettPratica.isSoggettoPrincipale(soggetto.getSoggettoId());
-								dettPratica.getDettPraticaId());
 						%>
 						<liferay-portlet:renderURL var="detailsURL"
 								windowState="<%= LiferayWindowState.POP_UP.toString() %>">
@@ -306,8 +304,7 @@ boolean inBO = ParamUtil.getBoolean(request, "inBO", false);
 										}
 										%>
 									</ul>
-									<c:if test="<%= !SoggettiUtil.isTitolareInCommittenti(
+									<c:if test="<%= !intPratica.isTitolareInCommittenti() %>">
-											intPratica.getIntPraticaId()) %>">
 										<%
 										User titolareUser = UserLocalServiceUtil.getUserById(intPratica.getUserId());
 										%>
@@ -507,6 +504,6 @@ boolean inBO = ParamUtil.getBoolean(request, "inBO", false);
 </div>
 <aui:script use="aui-base">
 Liferay.fire('soggetti-ready', {
-	isCommittenteAndDitta: <%= SoggettiUtil.isCommittenteAndDitta(dettPratica.getIntPraticaId()) %>,
+	isCommittenteAndDitta: <%= intPratica.isCommittenteAndDitta() %>,
 });
 </aui:script>

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

@@ -13,8 +13,8 @@
 ##
 
     build.namespace=portos_kaleo_controller
-    build.number=13
+    build.number=14
-    build.date=1631285439550
+    build.date=1632922613931
     build.auto.upgrade=true
 
 ##

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

@@ -13,8 +13,8 @@
 ##
 
     build.namespace=portos_Kaleo
-    build.number=20
+    build.number=21
-    build.date=1631718661033
+    build.date=1632922646927
     build.auto.upgrade=true
 
 ##

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

@@ -13,8 +13,8 @@
 ##
 
     build.namespace=portos_Mail
-    build.number=87
+    build.number=88
-    build.date=1632402791172
+    build.date=1632922791272
     build.auto.upgrade=true
 
 ##

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

@@ -13,8 +13,8 @@
 ##
 
     build.namespace=portos_maintenance
-    build.number=43
+    build.number=44
-    build.date=1631870287519
+    build.date=1632922838322
     build.auto.upgrade=true
 
 ##

liferay-plugins-sdk-6.2/portlets/portos-maintenance-portlet/docroot/WEB-INF/tld/c.tld

@@ -1,572 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-
-<taglib xmlns="http://java.sun.com/xml/ns/javaee"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-jsptaglibrary_2_1.xsd"
-    version="2.1">
-    
-  <description>JSTL 1.2 core library</description>
-  <display-name>JSTL core</display-name>
-  <tlib-version>1.2</tlib-version>
-  <short-name>c</short-name>
-  <uri>http://java.sun.com/jsp/jstl/core</uri>
-
-  <validator>
-    <description>
-        Provides core validation features for JSTL tags.
-    </description>
-    <validator-class>
-        org.apache.taglibs.standard.tlv.JstlCoreTLV
-    </validator-class>
-  </validator>
-
-  <tag>
-    <description>
-        Catches any Throwable that occurs in its body and optionally
-        exposes it.
-    </description>
-    <name>catch</name>
-    <tag-class>org.apache.taglibs.standard.tag.common.core.CatchTag</tag-class>
-    <body-content>JSP</body-content>
-    <attribute>
-        <description>
-Name of the exported scoped variable for the
-exception thrown from a nested action. The type of the
-scoped variable is the type of the exception thrown.
-        </description>
-        <name>var</name>
-        <required>false</required>
-        <rtexprvalue>false</rtexprvalue>
-    </attribute>
-  </tag>
-
-  <tag>
-    <description>
-	Simple conditional tag that establishes a context for
-	mutually exclusive conditional operations, marked by
-	&lt;when&gt; and &lt;otherwise&gt;
-    </description>
-    <name>choose</name>
-    <tag-class>com.liferay.taglib.core.ChooseTag</tag-class>
-    <body-content>JSP</body-content>
-  </tag>
-
-  <tag>
-    <description>
-	Simple conditional tag, which evalutes its body if the
-	supplied condition is true and optionally exposes a Boolean
-	scripting variable representing the evaluation of this condition
-    </description>
-    <name>if</name>
-    <tag-class>com.liferay.taglib.core.IfTag</tag-class>
-    <body-content>JSP</body-content>
-    <attribute>
-        <description>
-The test condition that determines whether or
-not the body content should be processed.
-        </description>
-        <name>test</name>
-        <required>true</required>
-        <rtexprvalue>true</rtexprvalue>
-	<type>boolean</type>
-    </attribute>
-    <attribute>
-        <description>
-Name of the exported scoped variable for the
-resulting value of the test condition. The type
-of the scoped variable is Boolean.        
-        </description>
-        <name>var</name>
-        <required>false</required>
-        <rtexprvalue>false</rtexprvalue>
-    </attribute>
-    <attribute>
-        <description>
-Scope for var.
-        </description>
-        <name>scope</name>
-        <required>false</required>
-        <rtexprvalue>false</rtexprvalue>
-    </attribute>
-  </tag>
-
-  <tag>
-    <description>
-        Retrieves an absolute or relative URL and exposes its contents
-        to either the page, a String in 'var', or a Reader in 'varReader'.
-    </description>
-    <name>import</name>
-    <tag-class>org.apache.taglibs.standard.tag.rt.core.ImportTag</tag-class>
-    <tei-class>org.apache.taglibs.standard.tei.ImportTEI</tei-class>
-    <body-content>JSP</body-content>
-    <attribute>
-        <description>
-The URL of the resource to import.
-        </description>
-        <name>url</name>
-        <required>true</required>
-        <rtexprvalue>true</rtexprvalue>
-    </attribute>
-    <attribute>
-        <description>
-Name of the exported scoped variable for the
-resource's content. The type of the scoped
-variable is String.
-        </description>
-        <name>var</name>
-        <required>false</required>
-        <rtexprvalue>false</rtexprvalue>
-    </attribute>
-    <attribute>
-        <description>
-Scope for var.
-        </description>
-        <name>scope</name>
-        <required>false</required>
-        <rtexprvalue>false</rtexprvalue>
-    </attribute>
-    <attribute>
-        <description>
-Name of the exported scoped variable for the
-resource's content. The type of the scoped
-variable is Reader.
-        </description>
-        <name>varReader</name>
-        <required>false</required>
-        <rtexprvalue>false</rtexprvalue>
-    </attribute>
-    <attribute>
-        <description>
-Name of the context when accessing a relative
-URL resource that belongs to a foreign
-context.
-        </description>
-        <name>context</name>
-        <required>false</required>
-        <rtexprvalue>true</rtexprvalue>
-    </attribute>
-    <attribute>
-        <description>
-Character encoding of the content at the input
-resource.
-        </description>
-        <name>charEncoding</name>
-        <required>false</required>
-        <rtexprvalue>true</rtexprvalue>
-    </attribute>
-  </tag>
-
-  <tag>
-    <description>
-	The basic iteration tag, accepting many different
-        collection types and supporting subsetting and other
-        functionality
-    </description>
-    <name>forEach</name>
-    <tag-class>org.apache.taglibs.standard.tag.rt.core.ForEachTag</tag-class>
-    <tei-class>org.apache.taglibs.standard.tei.ForEachTEI</tei-class>
-    <body-content>JSP</body-content>
-    <attribute>
-        <description>
-Collection of items to iterate over.
-        </description>
-	<name>items</name>
-	<required>false</required>
-	<rtexprvalue>true</rtexprvalue>
-	<type>java.lang.Object</type>
-        <deferred-value>
-	    <type>java.lang.Object</type>
-        </deferred-value>
-    </attribute>
-    <attribute>
-        <description>
-If items specified:
-Iteration begins at the item located at the
-specified index. First item of the collection has
-index 0.
-If items not specified:
-Iteration begins with index set at the value
-specified.
-        </description>
-	<name>begin</name>
-	<required>false</required>
-	<rtexprvalue>true</rtexprvalue>
-	<type>int</type>
-    </attribute>
-    <attribute>
-        <description>
-If items specified:
-Iteration ends at the item located at the
-specified index (inclusive).
-If items not specified:
-Iteration ends when index reaches the value
-specified.
-        </description>
-	<name>end</name>
-	<required>false</required>
-	<rtexprvalue>true</rtexprvalue>
-	<type>int</type>
-    </attribute>
-    <attribute>
-        <description>
-Iteration will only process every step items of
-the collection, starting with the first one.
-        </description>
-	<name>step</name>
-	<required>false</required>
-	<rtexprvalue>true</rtexprvalue>
-	<type>int</type>
-    </attribute>
-    <attribute>
-        <description>
-Name of the exported scoped variable for the
-current item of the iteration. This scoped
-variable has nested visibility. Its type depends
-on the object of the underlying collection.
-        </description>
-	<name>var</name>
-	<required>false</required>
-	<rtexprvalue>false</rtexprvalue>
-    </attribute>
-    <attribute>
-        <description>
-Name of the exported scoped variable for the
-status of the iteration. Object exported is of type
-javax.servlet.jsp.jstl.core.LoopTagStatus. This scoped variable has nested
-visibility.
-        </description>
-	<name>varStatus</name>
-	<required>false</required>
-	<rtexprvalue>false</rtexprvalue>
-    </attribute>
-  </tag>
-
-  <tag>
-    <description>
-	Iterates over tokens, separated by the supplied delimeters
-    </description>
-    <name>forTokens</name>
-    <tag-class>org.apache.taglibs.standard.tag.rt.core.ForTokensTag</tag-class>
-    <body-content>JSP</body-content>
-    <attribute>
-        <description>
-String of tokens to iterate over.
-        </description>
-	<name>items</name>
-	<required>true</required>
-	<rtexprvalue>true</rtexprvalue>
-	<type>java.lang.String</type>
-        <deferred-value>
-	    <type>java.lang.String</type>
-        </deferred-value>
-    </attribute>
-    <attribute>
-        <description>
-The set of delimiters (the characters that
-separate the tokens in the string).
-        </description>
-	<name>delims</name>
-	<required>true</required>
-	<rtexprvalue>true</rtexprvalue>
-	<type>java.lang.String</type>
-    </attribute>
-    <attribute>
-        <description>
-Iteration begins at the token located at the
-specified index. First token has index 0.
-        </description>
-	<name>begin</name>
-	<required>false</required>
-	<rtexprvalue>true</rtexprvalue>
-	<type>int</type>
-    </attribute>
-    <attribute>
-        <description>
-Iteration ends at the token located at the
-specified index (inclusive).
-        </description>
-	<name>end</name>
-	<required>false</required>
-	<rtexprvalue>true</rtexprvalue>
-	<type>int</type>
-    </attribute>
-    <attribute>
-        <description>
-Iteration will only process every step tokens
-of the string, starting with the first one.
-        </description>
-	<name>step</name>
-	<required>false</required>
-	<rtexprvalue>true</rtexprvalue>
-	<type>int</type>
-    </attribute>
-    <attribute>
-        <description>
-Name of the exported scoped variable for the
-current item of the iteration. This scoped
-variable has nested visibility.
-        </description>
-	<name>var</name>
-	<required>false</required>
-	<rtexprvalue>false</rtexprvalue>
-    </attribute>
-    <attribute>
-        <description>
-Name of the exported scoped variable for the
-status of the iteration. Object exported is of
-type
-javax.servlet.jsp.jstl.core.LoopTag
-Status. This scoped variable has nested
-visibility.
-        </description>
-	<name>varStatus</name>
-	<required>false</required>
-	<rtexprvalue>false</rtexprvalue>
-    </attribute>
-  </tag>
-
-  <tag>
-    <description>
-        Like &lt;%= ... &gt;, but for expressions.
-    </description> 
-    <name>out</name>
-    <tag-class>org.apache.taglibs.standard.tag.rt.core.OutTag</tag-class>
-    <body-content>JSP</body-content>
-    <attribute>
-        <description>
-Expression to be evaluated.
-        </description>
-        <name>value</name>
-        <required>true</required>
-        <rtexprvalue>true</rtexprvalue>
-    </attribute>
-    <attribute>
-        <description>
-Default value if the resulting value is null.
-        </description>
-        <name>default</name>
-        <required>false</required>
-        <rtexprvalue>true</rtexprvalue>
-    </attribute>
-    <attribute>
-        <description>
-Determines whether characters &lt;,&gt;,&amp;,'," in the
-resulting string should be converted to their
-corresponding character entity codes. Default value is
-true.
-        </description>
-        <name>escapeXml</name>
-        <required>false</required>
-        <rtexprvalue>true</rtexprvalue>
-    </attribute>
-  </tag>
-
-
-  <tag>
-    <description>
-        Subtag of &lt;choose&gt; that follows &lt;when&gt; tags
-        and runs only if all of the prior conditions evaluated to
-        'false'
-    </description>
-    <name>otherwise</name>
-    <tag-class>com.liferay.taglib.core.OtherwiseTag</tag-class>
-    <body-content>JSP</body-content>
-  </tag>
-
-  <tag>
-    <description>
-        Adds a parameter to a containing 'import' tag's URL.
-    </description>
-    <name>param</name>
-    <tag-class>org.apache.taglibs.standard.tag.rt.core.ParamTag</tag-class>
-    <body-content>JSP</body-content>
-    <attribute>
-        <description>
-Name of the query string parameter.
-        </description>
-        <name>name</name>
-        <required>true</required>
-        <rtexprvalue>true</rtexprvalue>
-    </attribute>
-    <attribute>
-        <description>
-Value of the parameter.
-        </description>
-        <name>value</name>
-        <required>false</required>
-        <rtexprvalue>true</rtexprvalue>
-    </attribute>
-  </tag>
-
-  <tag>
-    <description>
-        Redirects to a new URL.
-    </description>
-    <name>redirect</name>
-    <tag-class>org.apache.taglibs.standard.tag.rt.core.RedirectTag</tag-class>
-    <body-content>JSP</body-content>
-    <attribute>
-        <description>
-The URL of the resource to redirect to.
-        </description>
-        <name>url</name>
-        <required>false</required>
-        <rtexprvalue>true</rtexprvalue>
-    </attribute>
-    <attribute>
-        <description>
-Name of the context when redirecting to a relative URL
-resource that belongs to a foreign context.
-        </description>
-        <name>context</name>
-        <required>false</required>
-        <rtexprvalue>true</rtexprvalue>
-    </attribute>
-  </tag>
-
-  <tag>
-    <description>
-        Removes a scoped variable (from a particular scope, if specified).
-    </description>
-    <name>remove</name>
-    <tag-class>org.apache.taglibs.standard.tag.common.core.RemoveTag</tag-class>
-    <body-content>empty</body-content>
-    <attribute>
-        <description>
-Name of the scoped variable to be removed.
-        </description>
-        <name>var</name>
-        <required>true</required>
-        <rtexprvalue>false</rtexprvalue>
-    </attribute>
-    <attribute>
-        <description>
-Scope for var.
-        </description>
-        <name>scope</name>
-        <required>false</required>
-        <rtexprvalue>false</rtexprvalue>
-    </attribute>
-  </tag>
-
- <tag>
-    <description>
-        Sets the result of an expression evaluation in a 'scope'
-    </description>
-    <name>set</name>
-    <tag-class>org.apache.taglibs.standard.tag.rt.core.SetTag</tag-class>
-    <body-content>JSP</body-content>
-    <attribute>
-        <description>
-Name of the exported scoped variable to hold the value
-specified in the action. The type of the scoped variable is
-whatever type the value expression evaluates to.
-        </description>
-        <name>var</name>
-        <required>false</required>
-        <rtexprvalue>false</rtexprvalue>
-    </attribute>
-    <attribute>
-        <description>
-Expression to be evaluated.
-        </description>
-        <name>value</name>
-        <required>false</required>
-        <rtexprvalue>true</rtexprvalue>
-        <deferred-value>
-	    <type>java.lang.Object</type>
-        </deferred-value>
-    </attribute>
-    <attribute>
-        <description>
-Target object whose property will be set. Must evaluate to
-a JavaBeans object with setter property property, or to a
-java.util.Map object.
-        </description>
-        <name>target</name>
-        <required>false</required>
-        <rtexprvalue>true</rtexprvalue>
-    </attribute>
-    <attribute>
-        <description>
-Name of the property to be set in the target object.
-        </description>
-        <name>property</name>
-        <required>false</required>
-        <rtexprvalue>true</rtexprvalue>
-    </attribute>
-    <attribute>
-        <description>
-Scope for var.
-        </description>
-        <name>scope</name>
-        <required>false</required>
-        <rtexprvalue>false</rtexprvalue>
-    </attribute>
-  </tag>
-
-  <tag>
-    <description>
-        Creates a URL with optional query parameters.
-    </description>
-    <name>url</name>
-    <tag-class>org.apache.taglibs.standard.tag.rt.core.UrlTag</tag-class>
-    <body-content>JSP</body-content>
-    <attribute>
-        <description>
-Name of the exported scoped variable for the
-processed url. The type of the scoped variable is
-String.
-        </description>
-        <name>var</name>
-        <required>false</required>
-        <rtexprvalue>false</rtexprvalue>
-    </attribute>
-    <attribute>
-        <description>
-Scope for var.
-        </description>
-        <name>scope</name>
-        <required>false</required>
-        <rtexprvalue>false</rtexprvalue>
-    </attribute>
-    <attribute>
-        <description>
-URL to be processed.
-        </description>
-        <name>value</name>
-        <required>false</required>
-        <rtexprvalue>true</rtexprvalue>
-    </attribute>
-    <attribute>
-        <description>
-Name of the context when specifying a relative URL
-resource that belongs to a foreign context.
-        </description>
-        <name>context</name>
-        <required>false</required>
-        <rtexprvalue>true</rtexprvalue>
-    </attribute>
-  </tag>
-
-  <tag>
-    <description>
-	Subtag of &lt;choose&gt; that includes its body if its
-	condition evalutes to 'true'
-    </description>
-    <name>when</name>
-    <tag-class>com.liferay.taglib.core.WhenTag</tag-class>
-    <body-content>JSP</body-content>
-    <attribute>
-        <description>
-The test condition that determines whether or not the
-body content should be processed.
-        </description>
-        <name>test</name>
-        <required>true</required>
-        <rtexprvalue>true</rtexprvalue>
-	<type>boolean</type>
-    </attribute>
-  </tag>
-
-</taglib>

liferay-plugins-sdk-6.2/portlets/portos-report-engine-portlet/.classpath

@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 	<classpathentry kind="src" path="docroot/WEB-INF/src"/>
+	<classpathentry kind="src" path="docroot/WEB-INF/service"/>
 	<classpathentry kind="con" path="org.eclipse.jst.server.core.container/com.liferay.ide.eclipse.server.tomcat.runtimeClasspathProvider/Liferay v6.2 CE (Tomcat 7)">
 		<attributes>
 			<attribute name="owner.project.facets" value="jst.web"/>
@@ -8,12 +9,8 @@
 	</classpathentry>
 	<classpathentry kind="con" path="org.eclipse.jst.j2ee.internal.web.container"/>
 	<classpathentry kind="con" path="org.eclipse.jst.j2ee.internal.module.container"/>
-	<classpathentry kind="con" path="com.liferay.ide.eclipse.server.plugin.container/portlet">
-		<attributes>
-			<attribute name="org.eclipse.jst.component.nondependency" value=""/>
-		</attributes>
-	</classpathentry>
 	<classpathentry kind="con" path="org.apache.ivyde.eclipse.cpcontainer.IVYDE_CONTAINER/?project=portos-report-engine-portlet&amp;ivyXmlPath=ivy.xml&amp;confs=*"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/jdk1.7.0_80"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+	<classpathentry kind="con" path="com.liferay.ide.eclipse.server.plugin.container/portlet"/>
 	<classpathentry kind="output" path="docroot/WEB-INF/classes"/>
 </classpath>

liferay-plugins-sdk-6.2/portlets/portos-report-engine-portlet/.settings/org.eclipse.wst.common.project.facet.core.xml

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <faceted-project>
   <runtime name="Liferay v6.2 CE (Tomcat 7)"/>
-  <fixed facet="jst.web"/>
   <fixed facet="wst.jsdt.web"/>
   <fixed facet="java"/>
+  <fixed facet="jst.web"/>
   <installed facet="java" version="1.7"/>
   <installed facet="jst.web" version="3.0"/>
   <installed facet="liferay.portlet" version="6.0"/>

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

@@ -16,5 +16,4 @@ public class PortosReportConstant {
 	public static final String CMD_PDF = "pdf";
 	public static final String CMD_EXCEL = "excel";
 	public static final String CMD_WORD = "word";
-
 }

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

@@ -1,7 +1,5 @@
 package it.tref.portos.report.engine.util;
 
-import it.tref.liferay.portos.bo.service.IntPraticaLocalServiceUtil;
-
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Calendar;
@@ -13,7 +11,8 @@ import java.util.Map;
 import java.util.Set;
 import java.util.concurrent.TimeUnit;
 
-import com.liferay.portal.kernel.exception.SystemException;
+import org.omg.CORBA.SystemException;
+
 import com.liferay.portal.kernel.log.Log;
 import com.liferay.portal.kernel.log.LogFactoryUtil;
 
@@ -31,7 +30,6 @@ public class ReportEngineServiceUtil {
 	}
 
 	/**
-	 *
 	 * Pratiche aperte alla data in input
 	 *
 	 * @param dateMax
@@ -54,8 +52,9 @@ public class ReportEngineServiceUtil {
 		String tipoDocumentoApprovato = co ? "CO" : "AU";
 		try {
 
-			returnedList = IntPraticaLocalServiceUtil.reportPraticheVidimate(calendarStart.getTime(), dateMax, groupId,
+			// returnedList = IntPraticaLocalServiceUtil.reportPraticheVidimate(calendarStart.getTime(), dateMax,
-					type);
+			// groupId,
+			// type);
 			for (Object[] tmp : returnedList) {
 				if (tmp.length == 8) {
 					Long avvisoid = (Long) tmp[0];
@@ -154,13 +153,12 @@ public class ReportEngineServiceUtil {
 			throws SystemException {
 		Map<Long, List<ReportTempisticheBean>> map = new HashMap<Long, List<ReportTempisticheBean>>();
 		Map<String, Long> returnedMap = new HashMap<String, Long>();
-		List<Object[]> returnedList;
+		List<Object[]> returnedList = new ArrayList<>();
 		boolean co = type.equalsIgnoreCase("Depositi a controllo obbligatorio");
-
 		String tipoDocumentoApprovato = co ? "CO" : "AU";
 		try {
-			returnedList = IntPraticaLocalServiceUtil.reportTempisticheIstruttorieAvvisiAutorizzazioni(dateMin,
+			// returnedList = IntPraticaLocalServiceUtil.reportTempisticheIstruttorieAvvisiAutorizzazioni(dateMin,
-					dateMax, groupId, type);
+			// dateMax, groupId, type);
 			for (Object[] tmp : returnedList) {
 				if (tmp.length == 7) {
 					Long avvisoid = (Long) tmp[0];
@@ -494,7 +492,6 @@ public class ReportEngineServiceUtil {
 	}
 
 	/**
-	 *
 	 * @param dataEnd
 	 * @param dataStart
 	 * @return

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

@@ -13,8 +13,8 @@
 ##
 
     build.namespace=portos_report
-    build.number=24
+    build.number=27
-    build.date=1630407095253
+    build.date=1632924679303
     build.auto.upgrade=true
 
 ##

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=34
+    build.number=35
-    build.date=1631888828391
+    build.date=1632924732787
     build.auto.upgrade=true
 
 ##

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

@@ -6,8 +6,5 @@
 	<classpathentry kind="lib" path="/home/ture/liferay/portali/paesaggistica/tomcat-7.0.62/lib/ext/portlet.jar"/>
 	<classpathentry kind="lib" path="/home/ture/liferay/portali/paesaggistica/tomcat-7.0.62/lib/servlet-api.jar"/>
 	<classpathentry kind="lib" path="/home/ture/liferay/portali/paesaggistica/tomcat-7.0.62/lib/jsp-api.jar"/>
-	<classpathentry kind="lib" path="lib/httpclient.jar"/>
-	<classpathentry kind="lib" path="lib/httpcore.jar"/>
-	<classpathentry kind="lib" path="lib/httpmime.jar"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>

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

@@ -0,0 +1,17 @@
+package it.mwg.sismica.bo.shared.util;
+
+public class Generics {
+
+	public static String capitalizeFull(String str) {
+
+		int length = str.length();
+		StringBuilder sb = new StringBuilder(length);
+		boolean capital = true;
+		for (int i = 0; i < length; i++) {
+			char c = str.charAt(i);
+			sb.append(capital ? Character.toTitleCase(c) : Character.toLowerCase(c));
+			capital = (c == ' ');
+		}
+		return sb.toString();
+	}
+}

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

@@ -8,6 +8,7 @@ import java.util.List;
 import com.liferay.portal.model.User;
 
 public class UnitaOperativeUtil {
+
 	public static List<Integer> getUnitaOperative(User user) {
 
 		List<Integer> ret = new ArrayList<>();

liferay-plugins-sdk-6.2/webs/portos-kaleo-web/docroot/WEB-INF/src/service.properties

@@ -13,8 +13,8 @@
 ##
 
     build.namespace=Kaleo
-    build.number=65
+    build.number=66
-    build.date=1632757654758
+    build.date=1632922684894
     build.auto.upgrade=true
 
 ##