pareri endoprocedimentali

liferay-plugins-sdk-6.2/webs/portos-kaleo-web/docroot/META-INF/custom_jsps/html/portlet/workflow_tasks/workflow_task_action.jsp

@@ -29,6 +29,8 @@ String randomId = StringPool.BLANK;
 String closeRedirect = ParamUtil.getString(request, "closeRedirect");
 boolean canPortosAssegnatore = (Boolean) request.getAttribute("canPortosAssegnatore");
 boolean canRemoveUO = (Boolean) request.getAttribute("canRemoveUO");
+boolean canRegistraEsito = (Boolean) request.getAttribute("canRegistraEsito");
+
 ResultRow row = (ResultRow) request.getAttribute(WebKeys.SEARCH_CONTAINER_RESULT_ROW);
 String viewFullContentURLString = ParamUtil.getString(request, "viewFullContentURLString");
 viewFullContentURLString = viewFullContentURLString.replaceAll("^http[s]{0,1}://[^/]+", "");
@@ -93,10 +95,20 @@ long[] pooledActorsIds = WorkflowTaskManagerUtil.getPooledActorsIds(company.getC
 			data.put("href-validation", validationURL);
 			data.put("href-render-form", renderFormURL);
 			%>
+			
+			<c:if test="<%= canRegistraEsito %>">
 				<liferay-ui:icon iconCssClass="icon-random" id='<%= randomId + transitionName + "taskChangeStatusLink" %>'
 					linkCssClass='<%= "workflow-task-" + randomId
 							+ " task-change-status-link btn btn-large button_custom" %>'
 					message="<%= message %>" method="get" url="<%= editURL %>" data="<%= data %>" />
+			</c:if>
+			<c:if test="<%= !canRegistraEsito %>">
+				<div>
+				<br />
+				<b>Attenzione</b><br />
+				<p>Non è possibile registrare un esito se ci sono pareri endoprocedimentali in corso. Concludere prima i pareri</p>
+				</div>
+			</c:if>
 		<%
 		}
 		%>

liferay-plugins-sdk-6.2/webs/portos-kaleo-web/docroot/WEB-INF/src/com/liferay/portal/workflow/kaleo/service/persistence/KaleoActionPersistenceImpl.java

@@ -42,7 +42,6 @@ import com.liferay.portal.workflow.kaleo.NoSuchActionException;
 import com.liferay.portal.workflow.kaleo.model.KaleoAction;
 import com.liferay.portal.workflow.kaleo.model.impl.KaleoActionImpl;
 import com.liferay.portal.workflow.kaleo.model.impl.KaleoActionModelImpl;
-import com.liferay.portal.workflow.kaleo.service.persistence.KaleoActionPersistence;
 
 import java.io.Serializable;
 

liferay-plugins-sdk-6.2/webs/portos-kaleo-web/docroot/WEB-INF/src/com/liferay/portal/workflow/kaleo/service/persistence/KaleoConditionPersistenceImpl.java

@@ -41,7 +41,6 @@ import com.liferay.portal.workflow.kaleo.NoSuchConditionException;
 import com.liferay.portal.workflow.kaleo.model.KaleoCondition;
 import com.liferay.portal.workflow.kaleo.model.impl.KaleoConditionImpl;
 import com.liferay.portal.workflow.kaleo.model.impl.KaleoConditionModelImpl;
-import com.liferay.portal.workflow.kaleo.service.persistence.KaleoConditionPersistence;
 
 import java.io.Serializable;
 

liferay-plugins-sdk-6.2/webs/portos-kaleo-web/docroot/WEB-INF/src/com/liferay/portal/workflow/kaleo/service/persistence/KaleoDefinitionPersistenceImpl.java

@@ -43,7 +43,6 @@ import com.liferay.portal.workflow.kaleo.NoSuchDefinitionException;
 import com.liferay.portal.workflow.kaleo.model.KaleoDefinition;
 import com.liferay.portal.workflow.kaleo.model.impl.KaleoDefinitionImpl;
 import com.liferay.portal.workflow.kaleo.model.impl.KaleoDefinitionModelImpl;
-import com.liferay.portal.workflow.kaleo.service.persistence.KaleoDefinitionPersistence;
 
 import java.io.Serializable;
 

liferay-plugins-sdk-6.2/webs/portos-kaleo-web/docroot/WEB-INF/src/com/liferay/portal/workflow/kaleo/service/persistence/KaleoInstancePersistenceImpl.java

@@ -43,7 +43,6 @@ import com.liferay.portal.workflow.kaleo.NoSuchInstanceException;
 import com.liferay.portal.workflow.kaleo.model.KaleoInstance;
 import com.liferay.portal.workflow.kaleo.model.impl.KaleoInstanceImpl;
 import com.liferay.portal.workflow.kaleo.model.impl.KaleoInstanceModelImpl;
-import com.liferay.portal.workflow.kaleo.service.persistence.KaleoInstancePersistence;
 
 import java.io.Serializable;
 

liferay-plugins-sdk-6.2/webs/portos-kaleo-web/docroot/WEB-INF/src/com/liferay/portal/workflow/kaleo/service/persistence/KaleoInstanceTokenPersistenceImpl.java

@@ -43,7 +43,6 @@ import com.liferay.portal.workflow.kaleo.NoSuchInstanceTokenException;
 import com.liferay.portal.workflow.kaleo.model.KaleoInstanceToken;
 import com.liferay.portal.workflow.kaleo.model.impl.KaleoInstanceTokenImpl;
 import com.liferay.portal.workflow.kaleo.model.impl.KaleoInstanceTokenModelImpl;
-import com.liferay.portal.workflow.kaleo.service.persistence.KaleoInstanceTokenPersistence;
 
 import java.io.Serializable;
 

liferay-plugins-sdk-6.2/webs/portos-kaleo-web/docroot/WEB-INF/src/com/liferay/portal/workflow/kaleo/service/persistence/KaleoLogPersistenceImpl.java

@@ -43,7 +43,6 @@ import com.liferay.portal.workflow.kaleo.NoSuchLogException;
 import com.liferay.portal.workflow.kaleo.model.KaleoLog;
 import com.liferay.portal.workflow.kaleo.model.impl.KaleoLogImpl;
 import com.liferay.portal.workflow.kaleo.model.impl.KaleoLogModelImpl;
-import com.liferay.portal.workflow.kaleo.service.persistence.KaleoLogPersistence;
 
 import java.io.Serializable;
 

liferay-plugins-sdk-6.2/webs/portos-kaleo-web/docroot/WEB-INF/src/com/liferay/portal/workflow/kaleo/service/persistence/KaleoNodePersistenceImpl.java

@@ -42,7 +42,6 @@ import com.liferay.portal.workflow.kaleo.NoSuchNodeException;
 import com.liferay.portal.workflow.kaleo.model.KaleoNode;
 import com.liferay.portal.workflow.kaleo.model.impl.KaleoNodeImpl;
 import com.liferay.portal.workflow.kaleo.model.impl.KaleoNodeModelImpl;
-import com.liferay.portal.workflow.kaleo.service.persistence.KaleoNodePersistence;
 
 import java.io.Serializable;
 

liferay-plugins-sdk-6.2/webs/portos-kaleo-web/docroot/WEB-INF/src/com/liferay/portal/workflow/kaleo/service/persistence/KaleoNotificationPersistenceImpl.java

@@ -42,7 +42,6 @@ import com.liferay.portal.workflow.kaleo.NoSuchNotificationException;
 import com.liferay.portal.workflow.kaleo.model.KaleoNotification;
 import com.liferay.portal.workflow.kaleo.model.impl.KaleoNotificationImpl;
 import com.liferay.portal.workflow.kaleo.model.impl.KaleoNotificationModelImpl;
-import com.liferay.portal.workflow.kaleo.service.persistence.KaleoNotificationPersistence;
 
 import java.io.Serializable;
 

liferay-plugins-sdk-6.2/webs/portos-kaleo-web/docroot/WEB-INF/src/com/liferay/portal/workflow/kaleo/service/persistence/KaleoNotificationRecipientPersistenceImpl.java

@@ -41,7 +41,6 @@ import com.liferay.portal.workflow.kaleo.NoSuchNotificationRecipientException;
 import com.liferay.portal.workflow.kaleo.model.KaleoNotificationRecipient;
 import com.liferay.portal.workflow.kaleo.model.impl.KaleoNotificationRecipientImpl;
 import com.liferay.portal.workflow.kaleo.model.impl.KaleoNotificationRecipientModelImpl;
-import com.liferay.portal.workflow.kaleo.service.persistence.KaleoNotificationRecipientPersistence;
 
 import java.io.Serializable;
 

liferay-plugins-sdk-6.2/webs/portos-kaleo-web/docroot/WEB-INF/src/com/liferay/portal/workflow/kaleo/service/persistence/KaleoTaskAssignmentInstancePersistenceImpl.java

@@ -42,7 +42,6 @@ import com.liferay.portal.workflow.kaleo.NoSuchTaskAssignmentInstanceException;
 import com.liferay.portal.workflow.kaleo.model.KaleoTaskAssignmentInstance;
 import com.liferay.portal.workflow.kaleo.model.impl.KaleoTaskAssignmentInstanceImpl;
 import com.liferay.portal.workflow.kaleo.model.impl.KaleoTaskAssignmentInstanceModelImpl;
-import com.liferay.portal.workflow.kaleo.service.persistence.KaleoTaskAssignmentInstancePersistence;
 
 import java.io.Serializable;
 

liferay-plugins-sdk-6.2/webs/portos-kaleo-web/docroot/WEB-INF/src/com/liferay/portal/workflow/kaleo/service/persistence/KaleoTaskAssignmentPersistenceImpl.java

@@ -42,7 +42,6 @@ import com.liferay.portal.workflow.kaleo.NoSuchTaskAssignmentException;
 import com.liferay.portal.workflow.kaleo.model.KaleoTaskAssignment;
 import com.liferay.portal.workflow.kaleo.model.impl.KaleoTaskAssignmentImpl;
 import com.liferay.portal.workflow.kaleo.model.impl.KaleoTaskAssignmentModelImpl;
-import com.liferay.portal.workflow.kaleo.service.persistence.KaleoTaskAssignmentPersistence;
 
 import java.io.Serializable;
 

liferay-plugins-sdk-6.2/webs/portos-kaleo-web/docroot/WEB-INF/src/com/liferay/portal/workflow/kaleo/service/persistence/KaleoTaskInstanceTokenPersistenceImpl.java

@@ -42,7 +42,6 @@ import com.liferay.portal.workflow.kaleo.NoSuchTaskInstanceTokenException;
 import com.liferay.portal.workflow.kaleo.model.KaleoTaskInstanceToken;
 import com.liferay.portal.workflow.kaleo.model.impl.KaleoTaskInstanceTokenImpl;
 import com.liferay.portal.workflow.kaleo.model.impl.KaleoTaskInstanceTokenModelImpl;
-import com.liferay.portal.workflow.kaleo.service.persistence.KaleoTaskInstanceTokenPersistence;
 
 import java.io.Serializable;
 

liferay-plugins-sdk-6.2/webs/portos-kaleo-web/docroot/WEB-INF/src/com/liferay/portal/workflow/kaleo/service/persistence/KaleoTaskPersistenceImpl.java

@@ -41,7 +41,6 @@ import com.liferay.portal.workflow.kaleo.NoSuchTaskException;
 import com.liferay.portal.workflow.kaleo.model.KaleoTask;
 import com.liferay.portal.workflow.kaleo.model.impl.KaleoTaskImpl;
 import com.liferay.portal.workflow.kaleo.model.impl.KaleoTaskModelImpl;
-import com.liferay.portal.workflow.kaleo.service.persistence.KaleoTaskPersistence;
 
 import java.io.Serializable;
 

liferay-plugins-sdk-6.2/webs/portos-kaleo-web/docroot/WEB-INF/src/com/liferay/portal/workflow/kaleo/service/persistence/KaleoTimerInstanceTokenPersistenceImpl.java

@@ -41,7 +41,6 @@ import com.liferay.portal.workflow.kaleo.NoSuchTimerInstanceTokenException;
 import com.liferay.portal.workflow.kaleo.model.KaleoTimerInstanceToken;
 import com.liferay.portal.workflow.kaleo.model.impl.KaleoTimerInstanceTokenImpl;
 import com.liferay.portal.workflow.kaleo.model.impl.KaleoTimerInstanceTokenModelImpl;
-import com.liferay.portal.workflow.kaleo.service.persistence.KaleoTimerInstanceTokenPersistence;
 
 import java.io.Serializable;
 

liferay-plugins-sdk-6.2/webs/portos-kaleo-web/docroot/WEB-INF/src/com/liferay/portal/workflow/kaleo/service/persistence/KaleoTimerPersistenceImpl.java

@@ -42,7 +42,6 @@ import com.liferay.portal.workflow.kaleo.NoSuchTimerException;
 import com.liferay.portal.workflow.kaleo.model.KaleoTimer;
 import com.liferay.portal.workflow.kaleo.model.impl.KaleoTimerImpl;
 import com.liferay.portal.workflow.kaleo.model.impl.KaleoTimerModelImpl;
-import com.liferay.portal.workflow.kaleo.service.persistence.KaleoTimerPersistence;
 
 import java.io.Serializable;
 

liferay-plugins-sdk-6.2/webs/portos-kaleo-web/docroot/WEB-INF/src/com/liferay/portal/workflow/kaleo/service/persistence/KaleoTransitionPersistenceImpl.java

@@ -42,7 +42,6 @@ import com.liferay.portal.workflow.kaleo.NoSuchTransitionException;
 import com.liferay.portal.workflow.kaleo.model.KaleoTransition;
 import com.liferay.portal.workflow.kaleo.model.impl.KaleoTransitionImpl;
 import com.liferay.portal.workflow.kaleo.model.impl.KaleoTransitionModelImpl;
-import com.liferay.portal.workflow.kaleo.service.persistence.KaleoTransitionPersistence;
 
 import java.io.Serializable;
 

liferay-plugins-sdk-6.2/webs/portos-kaleo-web/docroot/WEB-INF/src/it/tref/liferay/portos/kaleo/hook/struts/EditWorkflowTaskAction.java

@@ -3,8 +3,10 @@ package it.tref.liferay.portos.kaleo.hook.struts;
 import it.mwg.sismica.bo.shared.util.UnitaOperativeUtil;
 import it.tref.liferay.portos.bo.model.ControlloPratica;
 import it.tref.liferay.portos.bo.model.IntPratica;
+import it.tref.liferay.portos.bo.model.ParereGeologo;
 import it.tref.liferay.portos.bo.service.ControlloPraticaLocalServiceUtil;
 import it.tref.liferay.portos.bo.service.IntPraticaLocalServiceUtil;
+import it.tref.liferay.portos.bo.service.ParereGeologoLocalServiceUtil;
 import it.tref.liferay.portos.bo.shared.util.Constants;
 import it.tref.liferay.portos.bo.shared.util.StatoPraticaConstants;
 import it.tref.liferay.portos.bo.util.PraticaUtil;
@@ -404,6 +406,16 @@ public class EditWorkflowTaskAction extends BaseStrutsPortletAction {
 				&& rootToken.getCurrentKaleoNodeName().equalsIgnoreCase("Assegnazione");
 		renderRequest.setAttribute("canPortosAssegnatore", canPortosAssegnatore);
 		renderRequest.setAttribute("canRemoveUO", canRemoveUO);
+		
+		long intPraticaId = controllo.getIntPraticaId();
+		boolean canRegistraEsito = true;
+		for (ParereGeologo parere : ParereGeologoLocalServiceUtil.findByIntPraticaId(intPraticaId, QueryUtil.ALL_POS, QueryUtil.ALL_POS)) {
+			if (Validator.isNull(parere.getDtCompilazione()) && Validator.isNull(parere.getDtAnnullamento())) {
+				canRegistraEsito = false;
+				break;
+			}
+		}
+		renderRequest.setAttribute("canRegistraEsito", canRegistraEsito);
 		return originalStrutsPortletAction.render(originalStrutsPortletAction, portletConfig, renderRequest,
 				renderResponse);
 	}

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

@@ -13,8 +13,8 @@
 ##
 
     build.namespace=Kaleo
-    build.number=69
+    build.number=70
-    build.date=1634550959519
+    build.date=1634820540061
     build.auto.upgrade=true
 
 ##