Merge branch 'release/2023.2'

aggiunto renderparameter per intpraticaid

.gitignore

@@ -24,3 +24,4 @@ liferay-plugins-sdk-6.2/portlets/portos-advanced-operation-portlet/.classpath
 liferay-plugins-sdk-6.2/portlets/portos-advanced-operation-portlet/.project
 liferay-plugins-sdk-6.2/portlets/portos-advanced-operation-portlet/.tern-project
 *.MD5
+service-classes

liferay-plugins-sdk-6.2/portlets/portos-advanced-operation-portlet/build.xml

@@ -2,5 +2,6 @@
 <!DOCTYPE project>
 
 <project name="portos-advanced-operation-portlet" basedir="." default="deploy">
+	<property name="import.shared" value="portos-report-shared,portos-bo-shared" />
 	<import file="../build-common-portlet.xml" />
 </project>

liferay-plugins-sdk-6.2/portlets/portos-advanced-operation-portlet/docroot/WEB-INF/src/it/nextmind/liferay/portos/advanced/operation/portlet/AdvancedOperationPortlet.java

@@ -5,26 +5,30 @@ import com.liferay.portal.kernel.exception.SystemException;
 import com.liferay.portal.kernel.log.Log;
 import com.liferay.portal.kernel.log.LogFactoryUtil;
 import com.liferay.portal.kernel.servlet.SessionErrors;
+import com.liferay.portal.kernel.util.ArrayUtil;
+import com.liferay.portal.kernel.util.DateFormatFactoryUtil;
 import com.liferay.portal.kernel.util.ParamUtil;
 import com.liferay.portal.kernel.util.Validator;
 import com.liferay.portal.kernel.util.WebKeys;
 import com.liferay.portal.kernel.workflow.WorkflowConstants;
-import com.liferay.portal.service.UserLocalServiceUtil;
 import com.liferay.portal.theme.ThemeDisplay;
 import com.liferay.portal.util.PortalUtil;
 import com.liferay.util.bridges.mvc.MVCPortlet;
 
-import java.util.Date;
-import java.util.List;
-
 import it.nextmind.liferay.portos.advanced.operation.util.AdvancedOperationUtil;
+import it.tref.liferay.portos.bo.model.ControlloPratica;
 import it.tref.liferay.portos.bo.model.DettPratica;
 import it.tref.liferay.portos.bo.model.DocPratica;
 import it.tref.liferay.portos.bo.model.IntPratica;
+import it.tref.liferay.portos.bo.service.ControlloPraticaLocalServiceUtil;
 import it.tref.liferay.portos.bo.service.DettPraticaLocalServiceUtil;
 import it.tref.liferay.portos.bo.service.DocPraticaLocalServiceUtil;
 import it.tref.liferay.portos.bo.service.IntPraticaLocalServiceUtil;
 
+import java.util.Arrays;
+import java.util.Date;
+import java.util.List;
+
 import javax.portlet.ActionRequest;
 import javax.portlet.ActionResponse;
 
@@ -32,20 +36,62 @@ public class AdvancedOperationPortlet extends MVCPortlet {
 
 	private static final Log _log = LogFactoryUtil.getLog(AdvancedOperationPortlet.class);
 	
+	public void deleteControlloPratica(ActionRequest actionRequest, ActionResponse actionResponse) throws Exception{
+
+		_checkIfUserIsCompanyAdmin(actionRequest);
+		
+		long intPraticaId = ParamUtil.getLong(actionRequest, "intPraticaId", 0L);
+		if (intPraticaId != 0L) {
+			List<ControlloPratica> controlloPraticaList = 
+					ControlloPraticaLocalServiceUtil.findByIntPratica(intPraticaId);
+			if(_log.isDebugEnabled()){
+				_log.debug("AdvancedOperationPortlet --- There are " + controlloPraticaList.size() +" ControlloPratica");
+			}
+			for(ControlloPratica cp : controlloPraticaList){
+				if(_log.isDebugEnabled()){
+					_log.debug("AdvancedOperationPortlet --- Cycling... ControlloPraticaID " + cp.getCompanyId()
+						+ " Status " + cp.getStatus());
+				}
+				if(ArrayUtil.contains(AdvancedOperationUtil.STATUS_ARRAY, cp.getStatus())){
+					_log.info("AdvancedOperationPortlet --- Deleting ControlloPratica " + cp.getControlloPraticaId() + 
+						" with Status " + cp.getStatus() +" of IntPraticaId " + intPraticaId);
+					ControlloPraticaLocalServiceUtil.deleteControlloPratica(cp);
+				}
+			}
+		}
+		actionResponse.setRenderParameter("intPraticaId", String.valueOf(intPraticaId));
+	}
+	
+	public void reindexPratica(ActionRequest actionRequest, ActionResponse actionResponse) throws Exception{
+
+		_checkIfUserIsCompanyAdmin(actionRequest);
+		
+		ThemeDisplay themeDisplay = (ThemeDisplay) actionRequest.getAttribute(WebKeys.THEME_DISPLAY);
+		
+		long intPraticaId = ParamUtil.getLong(actionRequest, "intPraticaId", 0L);
+		if (intPraticaId != 0L) {
+			_log.info("AdvancedOperationPortlet --- Reindexing fascicolo of IntPraticaId " + intPraticaId);
+			IntPraticaLocalServiceUtil.reIndexFasciolo(intPraticaId, themeDisplay.getCompanyId());
+		}
+		actionResponse.setRenderParameter("intPraticaId", String.valueOf(intPraticaId));
+	}	
+	
 	public void cambiaDataInizioLavori(ActionRequest actionRequest, ActionResponse actionResponse) throws Exception{
 
 		_checkIfUserIsCompanyAdmin(actionRequest);
 
 		long intPraticaId = ParamUtil.getLong(actionRequest, "intPraticaId", -1L);
-		Date dataInizioLavoriOpera = ParamUtil.getDate(actionRequest, "dataInizioLavoriOperaInput", null);
+		Date dataInizioLavoriOpera = ParamUtil.getDate(actionRequest, "dataInizioLavoriOperaInput",
+				DateFormatFactoryUtil.getSimpleDateFormat("yyyy-MM-dd"), null);
 		IntPratica intPratica = IntPraticaLocalServiceUtil.fetchIntPratica(intPraticaId);
-		
+		_log.info("AdvancedOperationPortlet --- Changing DataInizioLavori on DettPraticas of IntPraticaId" + intPraticaId);
 		List<DettPratica> dettPraticaListWithInizioLavori = AdvancedOperationUtil.fetchDettPraticaListWithInizioLavori(intPratica);
 		for(DettPratica dettPratica : dettPraticaListWithInizioLavori){
 			dettPratica.setDataInizioLavoriOpera(dataInizioLavoriOpera);
 			dettPratica.setModifiedDate(new Date());
 			DettPraticaLocalServiceUtil.updateDettPratica(dettPratica);
 		}
+		actionResponse.setRenderParameter("intPraticaId", String.valueOf(intPraticaId));
 	}
 
 	public void fixNormLavoriInProprio(ActionRequest actionRequest, ActionResponse actionResponse) throws Exception{
@@ -56,6 +102,7 @@ public class AdvancedOperationPortlet extends MVCPortlet {
 		boolean normLavoriInProprioFlag = ParamUtil.getBoolean(actionRequest, "normLavoriInProprioFlag");
 
 		List<DettPratica> dettPraticaList = DettPraticaLocalServiceUtil.findByIntPraticaId(intPraticaId);
+		_log.info("AdvancedOperationPortlet --- Fixing NormLavoriInProprio flag of IntPraticaId " + intPraticaId);
 		for(DettPratica dettPratica : dettPraticaList){
 			if(dettPratica.getNormLavoriInProprio() == normLavoriInProprioFlag){
 				dettPratica.setNormLavoriInProprio(!normLavoriInProprioFlag);
@@ -63,6 +110,7 @@ public class AdvancedOperationPortlet extends MVCPortlet {
 				DettPraticaLocalServiceUtil.updateDettPratica(dettPratica);
 			}
 		}
+		actionResponse.setRenderParameter("intPraticaId", String.valueOf(intPraticaId));
 	}
 
 	public void fixCollaudoStatico(ActionRequest actionRequest, ActionResponse actionResponse) throws Exception{
@@ -73,6 +121,7 @@ public class AdvancedOperationPortlet extends MVCPortlet {
 		boolean collaudoStaticoFlag = ParamUtil.getBoolean(actionRequest, "collaudoStaticoFlag");
 
 		List<DettPratica> dettPraticaList = DettPraticaLocalServiceUtil.findByIntPraticaId(intPraticaId);
+		_log.info("AdvancedOperationPortlet --- Fixing CollaudoStatico flag of IntPraticaId " + intPraticaId);
 		for(DettPratica dettPratica : dettPraticaList){
 			if(dettPratica.getCollaudoStatico() == collaudoStaticoFlag){
 				dettPratica.setCollaudoStatico(!collaudoStaticoFlag);
@@ -80,6 +129,7 @@ public class AdvancedOperationPortlet extends MVCPortlet {
 				DettPraticaLocalServiceUtil.updateDettPratica(dettPratica);
 			}
 		}
+		actionResponse.setRenderParameter("intPraticaId", String.valueOf(intPraticaId));
 	}
 
 	public void fixStatusPratica(ActionRequest actionRequest, ActionResponse actionResponse) throws Exception{
@@ -90,10 +140,17 @@ public class AdvancedOperationPortlet extends MVCPortlet {
 		IntPratica intPratica = IntPraticaLocalServiceUtil.fetchIntPratica(intPraticaId);
 
 		if(WorkflowConstants.STATUS_DRAFT == intPratica.getStatus()){
-			IntPraticaLocalServiceUtil.updateStatus(intPraticaId, WorkflowConstants.STATUS_PENDING);
+			_log.info("AdvancedOperationPortlet --- Fixing StatusPratica (From DRAFT to PENDING) "
+					+ "of IntPraticaId " + intPraticaId);
+			intPratica.setStatus(WorkflowConstants.STATUS_PENDING);
+			intPratica.setModifiedDate(new Date());
+			IntPraticaLocalServiceUtil.updateIntPratica(intPratica);
 		} else {
+			_log.info("AdvancedOperationPortlet --- Impossible operation: Fixing StatusPratica (From DRAFT to PENDING) "
+					+ "of IntPraticaId " + intPraticaId);
 			SessionErrors.add(actionRequest, "operazione-impossibile");
 		}
+		actionResponse.setRenderParameter("intPraticaId", String.valueOf(intPraticaId));
 	}
 
 	public void ripristinaPraticaVidimata(ActionRequest actionRequest, ActionResponse actionResponse) throws Exception{
@@ -104,11 +161,14 @@ public class AdvancedOperationPortlet extends MVCPortlet {
 		IntPratica intPratica = IntPraticaLocalServiceUtil.fetchIntPratica(intPraticaId);
 
 		if(WorkflowConstants.STATUS_INCOMPLETE == intPratica.getStatus()){
+			_log.info("AdvancedOperationPortlet --- Recovering Pratica Vidimata (INCOMPLETE ==> DRAFT) "
+					+ "with IntPraticaId " + intPraticaId);
 			_ripristinaPratica(intPratica, WorkflowConstants.STATUS_DRAFT);
 		} else {
 			SessionErrors.add(actionRequest, "operazione-impossibile");
 			throw new Exception("This Pratica is not in status=5, action RIPRISTINA is not available");
 		}
+		actionResponse.setRenderParameter("intPraticaId", String.valueOf(intPraticaId));
 	}
 
 	public void ripristinaPraticaConforme(ActionRequest actionRequest, ActionResponse actionResponse) throws Exception{
@@ -119,11 +179,14 @@ public class AdvancedOperationPortlet extends MVCPortlet {
 		IntPratica intPratica = IntPraticaLocalServiceUtil.fetchIntPratica(intPraticaId);
 		
 		if(WorkflowConstants.STATUS_INCOMPLETE == intPratica.getStatus()){
+			_log.info("AdvancedOperationPortlet --- Recovering Pratica Vidimata (INCOMPLETE ==> APPROVED) "
+					+ "with IntPraticaId " + intPraticaId);
 			_ripristinaPratica(intPratica, WorkflowConstants.STATUS_APPROVED);
 		} else {
 			SessionErrors.add(actionRequest, "operazione-impossibile");
 			throw new Exception("This Pratica is not in status=5, action RIPRISTINA is not available");
 		}
+		actionResponse.setRenderParameter("intPraticaId", String.valueOf(intPraticaId));
 	}
 
 	public void deleteDocPratica(ActionRequest actionRequest, ActionResponse actionResponse) throws Exception{
@@ -133,9 +196,14 @@ public class AdvancedOperationPortlet extends MVCPortlet {
 		long intPraticaId = ParamUtil.getLong(actionRequest, "intPraticaId", -1L);
 
 		List<DocPratica> docPraticaOrfani = AdvancedOperationUtil.getDocPraticaOrfani(intPraticaId);
+		_log.info("AdvancedOperationPortlet --- Deleting Documenti Orfani "
+				+ "of IntPraticaId " + intPraticaId);
 		for(DocPratica docPratica : docPraticaOrfani){
+			_log.info("AdvancedOperationPortlet --- Deleting Documento Orfan " + docPratica.getDocPraticaId()
+					+ " of IntPraticaId " + intPraticaId);
 			DocPraticaLocalServiceUtil.deleteDocPratica(docPratica);
 		}
+		actionResponse.setRenderParameter("intPraticaId", String.valueOf(intPraticaId));
 	}
 
 	public void findIntPratica(ActionRequest actionRequest, ActionResponse actionResponse) throws Exception{

liferay-plugins-sdk-6.2/portlets/portos-advanced-operation-portlet/docroot/WEB-INF/src/it/nextmind/liferay/portos/advanced/operation/util/AdvancedOperationUtil.java

@@ -1,18 +1,28 @@
 package it.nextmind.liferay.portos.advanced.operation.util;
 
 import com.liferay.portal.kernel.dao.orm.DynamicQuery;
+import com.liferay.portal.kernel.dao.orm.QueryUtil;
 import com.liferay.portal.kernel.dao.orm.RestrictionsFactoryUtil;
+import com.liferay.portal.kernel.exception.PortalException;
 import com.liferay.portal.kernel.exception.SystemException;
 import com.liferay.portal.kernel.log.Log;
 import com.liferay.portal.kernel.log.LogFactoryUtil;
 import com.liferay.portal.kernel.util.Validator;
 import com.liferay.portal.kernel.workflow.WorkflowConstants;
+import com.liferay.portal.kernel.workflow.WorkflowTask;
+import com.liferay.portal.kernel.workflow.WorkflowTaskManagerUtil;
+import com.liferay.portal.model.WorkflowInstanceLink;
+import com.liferay.portal.service.WorkflowInstanceLinkLocalServiceUtil;
 
+import it.tref.liferay.portos.bo.model.ControlloPratica;
 import it.tref.liferay.portos.bo.model.DettPratica;
 import it.tref.liferay.portos.bo.model.DocPratica;
 import it.tref.liferay.portos.bo.model.IntPratica;
+import it.tref.liferay.portos.bo.service.ControlloPraticaLocalServiceUtil;
 import it.tref.liferay.portos.bo.service.DettPraticaLocalServiceUtil;
 import it.tref.liferay.portos.bo.service.DocPraticaLocalServiceUtil;
+import it.tref.liferay.portos.bo.shared.util.Constants;
+import it.tref.liferay.portos.bo.shared.util.StatoPraticaConstants;
 
 import java.util.ArrayList;
 import java.util.Date;
@@ -20,7 +30,73 @@ import java.util.List;
 
 public class AdvancedOperationUtil {
 	
+	public static final int[] STATUS_ARRAY = 
+		{WorkflowConstants.STATUS_DRAFT, WorkflowConstants.STATUS_INACTIVE, WorkflowConstants.STATUS_PENDING};
 	
+	public static boolean isNotWorkflowManuallyStarted(IntPratica intPratica){
+		switch (intPratica.getStatoPratica()) {
+		case StatoPraticaConstants.VIDIMATA :
+		case StatoPraticaConstants.AUTORIZZATA:
+		case StatoPraticaConstants.CONFORME:	
+			return true;
+		default:
+			return false;
+		}
+	}
+
+	public static boolean hasControlloPratica_ProceduraC(IntPratica intPratica){
+		if(Constants.PROCEDURA_C.equalsIgnoreCase(intPratica.getTipoProcedura())){
+			try{
+				long intPraticaId = intPratica.getIntPraticaId();
+				for(int i : STATUS_ARRAY){
+					List<ControlloPratica> controlloPraticas = 
+							ControlloPraticaLocalServiceUtil.findByIntPraticaId_Status(intPraticaId, i);
+					if(!controlloPraticas.isEmpty()){
+						return true;
+					}
+				}
+			} catch (SystemException e){
+				_log.error(e,e);
+				return false;
+			}
+		}
+		return false;
+	}
+	
+	public static List<WorkflowTask> getListaTask(IntPratica intPratica) {
+		if(Validator.isNull(intPratica)){
+			return null;
+		}
+		try {
+			ControlloPratica controlloPratica = null;
+			List<ControlloPratica> controlloPraticaList = 
+					ControlloPraticaLocalServiceUtil.findByIntPraticaId_Status(intPratica.getIntPraticaId(), intPratica.getStatus());
+			if(controlloPraticaList.size() > 1){
+				for(ControlloPratica cp : controlloPraticaList){
+					if(Validator.isNull(controlloPratica) || cp.getCreateDate().after(controlloPratica.getCreateDate())) {
+						controlloPratica = cp;
+					}
+				}
+			} else if(controlloPraticaList.size() == 1){
+				controlloPratica = controlloPraticaList.get(0);
+			} else {
+				return null;
+			}
+			WorkflowInstanceLink workflowInstanceLink = WorkflowInstanceLinkLocalServiceUtil.fetchWorkflowInstanceLink(
+					controlloPratica.getCompanyId(),controlloPratica.getGroupId(), ControlloPratica.class.getName(), 
+					controlloPratica.getPrimaryKey());
+			List<WorkflowTask> listaTask = null;
+			if (workflowInstanceLink == null) {
+				return null;
+			} else {
+				return listaTask = WorkflowTaskManagerUtil.getWorkflowTasksByWorkflowInstance(controlloPratica.getCompanyId(), null,
+						workflowInstanceLink.getWorkflowInstanceId(), false, QueryUtil.ALL_POS, QueryUtil.ALL_POS, null);
+			}
+		} catch (SystemException | PortalException e){
+			_log.error(e,e);
+			return null;
+		}
+	}
 
 	public static boolean isPraticaAnnullata(IntPratica intPratica){
 		if(Validator.isNotNull(intPratica)){
@@ -34,7 +110,8 @@ public class AdvancedOperationUtil {
 		try {
 			List<DocPratica> docPraticaList = DocPraticaLocalServiceUtil.findByIntPratica(intPraticaId);
 			for(DocPratica docPratica : docPraticaList){
-				if(Validator.isNull(DettPraticaLocalServiceUtil.fetchDettPratica(docPratica.getClassPk()))){
+				if(Validator.isNull(DettPraticaLocalServiceUtil.fetchDettPratica(docPratica.getClassPk()))
+						&& DettPratica.class.getName().equals(docPratica.getClassName())){
 					docPraticaOrfaniList.add(docPratica);
 				}
 			}

liferay-plugins-sdk-6.2/portlets/portos-advanced-operation-portlet/docroot/css/main.css

@@ -0,0 +1,10 @@
+
+
+.title-text{
+	font-weight: bold;
+}
+
+
+#impersonaSoggettiBtn{
+	cursor: pointer;
+}

liferay-plugins-sdk-6.2/portlets/portos-advanced-operation-portlet/docroot/html/view.jsp

@@ -1,3 +1,25 @@
+<%@page import="com.liferay.portal.service.UserLocalServiceUtil"%>
+<%@page import="com.liferay.portal.model.User"%>
+<%@page import="com.liferay.portal.kernel.portlet.LiferayWindowState"%>
+<%@page import="javax.portlet.PortletMode"%>
+<%@page import="com.liferay.portal.util.PortletKeys"%>
+<%@page import="javax.portlet.PortletRequest"%>
+<%@page import="javax.portlet.PortletURL"%>
+<%@page import="com.liferay.portal.model.Group"%>
+<%@page import="com.liferay.portlet.PortletURLFactoryUtil"%>
+<%@page import="com.liferay.portal.service.LayoutLocalServiceUtil"%>
+<%@page import="com.liferay.portal.model.GroupConstants"%>
+<%@page import="com.liferay.portal.service.GroupLocalServiceUtil"%>
+<%@page import="it.tref.liferay.portos.bo.model.ControlloPratica"%>
+<%@page import="it.tref.liferay.portos.bo.service.ControlloPraticaLocalServiceUtil"%>
+<%@page import="com.liferay.portal.service.WorkflowInstanceLinkLocalServiceUtil"%>
+<%@page import="com.liferay.portal.model.WorkflowInstanceLink"%>
+<%@page import="com.liferay.portal.kernel.workflow.WorkflowTask"%>
+<%@page import="it.tref.liferay.portos.bo.service.DettPraticaLocalServiceUtil"%>
+<%@page import="it.tref.liferay.portos.bo.model.DettPratica"%>
+<%@page import="it.tref.liferay.portos.bo.util.SoggettiUtil"%>
+<%@page import="it.tref.liferay.portos.bo.service.SoggettoLocalServiceUtil"%>
+<%@page import="com.liferay.portal.kernel.language.LanguageUtil"%>
 <%@page import="com.liferay.portal.kernel.util.DateFormatFactoryUtil"%>
 <%@page import="java.util.Date"%>
 <%@page import="com.liferay.portal.util.PortalUtil"%>
@@ -66,21 +88,15 @@
 		<aui:row style="margin-top: 10px" id="praticaAdminDiv">
 			<aui:row id="praticaRecapDiv">
 				<aui:row>
-					<liferay-security:doAsURL 
-						doAsUserId="<%= intPratica.getUserId() %>"
-						var="impersonateUserURL">
-					</liferay-security:doAsURL>
 					<aui:col span="3">
 						<p style="font-size: 30px; margin: 20px 0;">
 							<b>Pratica:</b>  <%= intPraticaId %> 
-							<liferay-ui:icon 
-								image="impersonate_user"
-								target="_blank"
-								url="<%= impersonateUserURL %>">
-							</liferay-ui:icon>
 						</p>
 					</aui:col>
 				</aui:row>
+				<aui:row>
+					<div class="module-group">
+						<liferay-ui:panel title="DETTAGLI" collapsible="false" extended="true"> 
 							<aui:row>
 								<aui:col span="2">
 									<p><b>Numero Progetto:</b>  <%= intPratica.getNumeroProgetto() %></p>
@@ -130,9 +146,10 @@
 									%>
 									<aui:form action="<%= cambiaDataInizioLavoriURL %>" method="post" name="cambiaDataInizioLavori">
 										<div style="display:flex;">
+											<p><b>Data inizio Lavori Opera:</b></p>
 											<aui:input 
 												name="dataInizioLavoriOperaInput" 
-									label="Data inizio Lavori Opera"
+												label=""
 												inlineLabel="left"
 												type="date"
 												value='<%= DateFormatFactoryUtil.getSimpleDateFormat("yyyy-MM-dd").format(dataInizioLavoriOpera) %>'>
@@ -150,10 +167,11 @@
 							 	</aui:row>
 						 	<% } %>
 						 	<aui:row>
+						 		<div style="display:flex;">
 									<% if(AdvancedOperationUtil.hasDettPratica(intPraticaId)){ 
 											boolean normLavoriInProprioFlag = AdvancedOperationUtil.getNormLavoriInProprioFlag(intPraticaId);
 									%>
-					<aui:col span="3">
+									<div style="margin-right: 50px;">
 										<liferay-portlet:actionURL 
 											name="fixNormLavoriInProprio" 
 											var="fixNormLavoriInProprioURL" >
@@ -172,13 +190,13 @@
 												value="<%= AdvancedOperationUtil.getLavoriInEconomiaBtnLabel(normLavoriInProprioFlag) %>" 
 												onClick='<%= functionLavori %>'/>
 										</aui:form>
-					</aui:col>
+									</div>
 									<% } %>
 									
 									<% if(AdvancedOperationUtil.hasDettPratica(intPraticaId)){ 
 											boolean collaudoStaticoFlag = AdvancedOperationUtil.getCollaudoStaticoFlag(intPraticaId);
 									%>
-					<aui:col span="3">
+									<div style="margin-right: 50px;">
 										<liferay-portlet:actionURL 
 											name="fixCollaudoStatico" 
 											var="fixCollaudoStaticoURL" >
@@ -197,11 +215,11 @@
 												value="<%= AdvancedOperationUtil.getCollaudoStaticoBtnLabel(collaudoStaticoFlag) %>" 
 												onClick='<%= functionCollaudoStatico %>'/>
 										</aui:form>
-					</aui:col>
+									</div>
 									<% } %>
 									
 									<% if(AdvancedOperationUtil.isStatoPraticaIN(intPratica)){ %>
-					<aui:col span="3">
+									<div style="margin-right: 50px;">
 										<liferay-portlet:actionURL 
 											name="fixStatusPratica" 
 											var="fixStatusPraticaURL" >
@@ -221,11 +239,36 @@
 												>
 											</aui:button>
 										</aui:form>
-					</aui:col>
+									</div>
+									<% } %>
+									
+									<% if(AdvancedOperationUtil.hasControlloPratica_ProceduraC(intPratica) && 
+											AdvancedOperationUtil.isNotWorkflowManuallyStarted(intPratica)){ %>
+									<div style="margin-right: 50px;">
+										<liferay-portlet:actionURL 
+											name="deleteControlloPratica" 
+											var="deleteControlloPraticaURL" >
+											<liferay-portlet:param name="intPraticaId" value="<%= String.valueOf(intPraticaId) %>"/>
+											<liferay-portlet:param name="mvcPath" value="/html/view.jsp"/>
+										</liferay-portlet:actionURL>
+										<%
+											String functionControlloPratica = "javascript:"+renderResponse.getNamespace()+"openConfirmationDialog('"+renderResponse.getNamespace()+"deleteControlloPratica','Sei sicuro di voler eliminare questo ControlloPratica ed il relativo WorkFlow?')";
+										%>
+										<aui:form action="<%= deleteControlloPraticaURL %>" method="post" name="deleteControlloPratica">
+											<aui:button 
+												type="button" 
+												cssClass="btn-primary"
+												name="deleteControlloPraticaBtn" 
+												onClick='<%= functionControlloPratica %>'
+												value="Elimina WorkFlow"
+												>
+											</aui:button>
+										</aui:form>
+									</div>
 									<% } %>
 									
 									<% if(AdvancedOperationUtil.isPraticaAnnullata(intPratica)){ %>
-					<aui:col span="3">
+									<div style="margin-right: 50px;">
 										<liferay-portlet:actionURL 
 											name="ripristinaPraticaVidimata" 
 											var="ripristinaPraticaVidimataURL" >
@@ -245,8 +288,8 @@
 												>
 											</aui:button>
 										</aui:form>
-					</aui:col>
-					<aui:col span="3">
+									</div>
+									<div style="margin-right: 50px;">
 										<liferay-portlet:actionURL 
 											name="ripristinaPraticaConforme" 
 											var="ripristinaPraticaConformeURL" >
@@ -266,11 +309,180 @@
 												>
 											</aui:button>
 										</aui:form>
-					</aui:col>
+									</div>
+									<% } %>
+								</div>
+							</aui:row>
+						</liferay-ui:panel>
+					</div>
+					<div class="module-group">
+					 	<liferay-ui:panel title="REINDICIZZAZIONE" extended="true" collapsible="false">
+							<aui:row>
+								<liferay-portlet:actionURL 
+									name="reindexPratica" 
+									var="reindexPraticaURL" >
+									<liferay-portlet:param name="intPraticaId" value="<%= String.valueOf(intPraticaId) %>"/>
+									<liferay-portlet:param name="mvcPath" value="/html/view.jsp"/>
+								</liferay-portlet:actionURL>
+								<%
+									String functionReindex = "javascript:"+renderResponse.getNamespace()+"openConfirmationDialog('"+renderResponse.getNamespace()+"reindexPratica','Sei sicuro di voler reindicizzare questa pratica?')";
+								%>
+								<aui:form action="<%= reindexPraticaURL %>" method="post" name="reindexPratica">
+									<aui:button 
+										type="button" 
+										cssClass="btn-primary"
+										name="reindexPraticaBtn" 
+										onClick='<%= functionReindex %>'
+										value="Reindicizza Pratica"
+										>
+									</aui:button>
+								</aui:form>
+							</aui:row>
+						</liferay-ui:panel>
+					</div>
+					<div class="module-group">
+					 	<liferay-ui:panel title="IMPERSONAMENTO" extended="true" collapsible="false">
+							<aui:row>
+								<div style="display:flex;">
+									<liferay-security:doAsURL 
+										doAsUserId="<%= intPratica.getUserId() %>"
+										var="impersonateUserURL">
+									</liferay-security:doAsURL>
+									<div style=" margin-right: 15px;">
+										<p><b>Impersona titolare:</b></p>
+									</div>
+									<liferay-ui:icon 
+										image="impersonate_user"
+										target="_blank"
+										url="<%= impersonateUserURL %>">
+									</liferay-ui:icon>
+								</div>
+							</aui:row>
+							<% if(SoggettoLocalServiceUtil.countByIntPratica(intPraticaId) > 1){ %>
+								<aui:row>
+									<div style="display:flex;">
+										<div style=" margin-right: 15px;">
+											<p><b>Impersona soggetti:</b></p>
+										</div>
+										<liferay-ui:icon 
+											id="impersonaSoggettiBtn"
+											image="team_icon"
+											message="Visualizza Soggetti"
+											target="_blank"
+											>
+										</liferay-ui:icon>
+									</div>
+								</aui:row>
+								<aui:row>
+									<div id="sc-soggetti-da-impersonare" class="hide">
+										<liferay-ui:search-container emptyResultsMessage="Nessun soggetto disponibile">
+											<liferay-ui:search-container-results
+												results="<%= SoggettoLocalServiceUtil.findByIntPratica(intPraticaId) %>"
+												total="<%= SoggettoLocalServiceUtil.countByIntPratica(intPraticaId) %>"
+											/>
+											<liferay-ui:search-container-row className="it.tref.liferay.portos.bo.model.Soggetto" modelVar="soggetto">
+												<liferay-security:doAsURL 
+													doAsUserId="<%= soggetto.getUserId() %>"
+													var="impersonateSoggettoURL">
+												</liferay-security:doAsURL>
+												<liferay-ui:search-container-column-text name="RUOLO">
+													<%= soggetto.getFullTipologiaSoggetto() %>
+												</liferay-ui:search-container-column-text>
+												<liferay-ui:search-container-column-text name="DENOMINAZIONE">
+													<%= soggetto.getDescrizioneCompleta() %>
+												</liferay-ui:search-container-column-text>
+												<liferay-ui:search-container-column-text name="AGGIUNTO DA">
+													<%
+													DettPratica adding = DettPraticaLocalServiceUtil.fetchDettPratica(soggetto.getDettPraticaId());
+													if (adding != null) {
+														out.print(adding.getFullDescription());
+													}
+													%>
+												</liferay-ui:search-container-column-text>
+												<liferay-ui:search-container-column-text name="IMPERSONA" cssClass="text-center text-nowrap">
+													<liferay-ui:icon 
+														image="impersonate_user"
+														message="Impersona Soggetto"
+														target="_blank"
+														url="<%= impersonateSoggettoURL %>" 
+													>
+													</liferay-ui:icon>
+												</liferay-ui:search-container-column-text>
+											</liferay-ui:search-container-row>
+											<liferay-ui:search-iterator paginate="false" />
+										</liferay-ui:search-container>
+									</div>
+								</aui:row>
 							<% } %>
+						</liferay-ui:panel>
+					</div>
+					<div class="module-group">
+						<%
+							List<WorkflowTask> listaTask = AdvancedOperationUtil.getListaTask(intPratica);
+							if(Validator.isNotNull(listaTask) && !listaTask.isEmpty()){
+						%>
+					 	<liferay-ui:panel title="GESTIONE ATTIVITÀ" extended="true" collapsible="false">
+							<aui:row>
+								<div style="display:flex;">
+									<div style=" margin-right: 15px;">
+										<p><b>Gestisci ultima attività:</b></p>
+									</div>
+									<%
+										Group controlPanelGroup = GroupLocalServiceUtil.getGroup(company.getCompanyId(), GroupConstants.CONTROL_PANEL);
+										long controlPanelPlid = LayoutLocalServiceUtil.getDefaultPlid(controlPanelGroup.getGroupId(),true);
+										PortletURL workflowTaskURL = PortletURLFactoryUtil.create(request, PortletKeys.MY_WORKFLOW_TASKS,
+												controlPanelPlid, PortletRequest.RENDER_PHASE);
+										workflowTaskURL.setParameter("struts_action", "/my_workflow_tasks/edit_workflow_task");
+										workflowTaskURL.setParameter("workflowTaskId", String.valueOf(listaTask.get(0).getWorkflowTaskId()));
+										workflowTaskURL.setPortletMode(PortletMode.VIEW);
+										workflowTaskURL.setWindowState(LiferayWindowState.POP_UP);
+									%>
+									<div title='<%= LanguageUtil.get(pageContext,"workflow-action-manage") %>' class="tooltip-info">
+										<liferay-ui:icon 
+											useDialog="true" 
+											image="action_right"
+											message="Gestisci Attività"
+											url='<%= workflowTaskURL.toString() + "&controlPanelCategory=my" %>' 
+										/>
+									</div>
+								</div>
+							</aui:row>
+								<%
+									if(intPratica.getStatusByUserId() != 0L ){
+										User tecnico = UserLocalServiceUtil.fetchUser(intPratica.getStatusByUserId());
+										if (Validator.isNotNull(tecnico)) {
+										
+								%>
+									<aui:row>
+										<div style="display:flex;">
+											<liferay-security:doAsURL 
+												doAsUserId="<%= tecnico.getUserId() %>"
+												var="impersonateIstruttoreURL">
+											</liferay-security:doAsURL>
+											<div style=" margin-right: 15px;">
+												<p><b>Impersona Istruttore:</b></p>
+											</div>
+											<liferay-ui:icon 
+												image="impersonate_user"
+												target="_blank"	
+												message="Impersona Istruttore"
+												url="<%= impersonateIstruttoreURL %>">
+											</liferay-ui:icon>
+										</div>
 									</aui:row>
+								<%	
+										}
+									}
+								%>
+						</liferay-ui:panel>
+						<%
+							}
+						%>
+					</div>
 				</aui:row>
 				<aui:row id="docPraticaDiv">
+					<div class="module-group">
+						<liferay-ui:panel title="DOCUMENTI ORFANI" collapsible="false" extended="true"> 
 						<% 
 							List<DocPratica> docPraticaList = DocPraticaLocalServiceUtil.findByIntPratica(intPraticaId);
 						%>
@@ -339,11 +551,14 @@
 									</aui:button-row>
 								</aui:form>
 							</aui:row>
+						</liferay-ui:panel>
+					</div>
 					<%
 						}
 					%>
 				</aui:row>
 			</aui:row>
+		</aui:row>
 	<% } %>
 </aui:container>
 
@@ -357,6 +572,18 @@
 
 <aui:script use="event-valuechange,aui-modal,aui-io-request">
 
+<% if(Validator.isNotNull(intPratica)){ %>
+	A.one('#impersonaSoggettiBtn').on('click', function(){
+		var soggettoDiv = A.one('#sc-soggetti-da-impersonare');
+		if(soggettoDiv.hasClass('hide')){
+			soggettoDiv.show();
+		} else {
+			soggettoDiv.hide();
+		}
+		
+	});
+<% } %>
+
 	A.one('#<portlet:namespace />intPraticaId').on('valuechange', function(e){
 		if(e.newVal <= 0 ){
 			A.one('#<portlet:namespace />numeroProgetto').attr('disabled', false);

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

@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><project-modules id="moduleCoreId" project-version="1.5.0">
-    <wb-module deploy-name="portos-bo-portlet">
-        <wb-resource deploy-path="/" source-path="/docroot" tag="defaultRootSource"/>
-        <wb-resource deploy-path="/WEB-INF/classes" source-path="/docroot/WEB-INF/src"/>
-        <wb-resource deploy-path="/WEB-INF/classes" source-path="/docroot/WEB-INF/service"/>
-        <dependent-module archiveName="portos-kaleo-portlet-service.jar" deploy-path="/WEB-INF/lib" handle="module:/classpath/lib/portos-kaleo-portlet/docroot/WEB-INF/lib/portos-kaleo-portlet-service.jar">
-            <dependency-type>uses</dependency-type>
-        </dependent-module>
-        <dependent-module archiveName="portos-mail-manager-portlet-service.jar" deploy-path="/WEB-INF/lib" handle="module:/classpath/lib/portos-mail-manager-portlet/docroot/WEB-INF/lib/portos-mail-manager-portlet-service.jar">
-            <dependency-type>uses</dependency-type>
-        </dependent-module>
-        <property name="context-root" value="portos-bo-portlet"/>
-        <property name="java-output-path" value="/portos-bo-portlet/docroot/WEB-INF/classes"/>
-    </wb-module>
-</project-modules>

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

@@ -685,7 +685,6 @@ public class FascicoloFePortlet extends MVCPortlet {
 			response.sendRedirect(successURL);
 		} else if ("domanda".equalsIgnoreCase(cmd)) {
 			saveDatiDettPratica(dettPraticaId, request, response);
-
 		} else {
 			throw new SystemException("operazione non gestita (" + cmd + StringPool.CLOSE_PARENTHESIS);
 		}