Fix preview file entry

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

@@ -191,10 +191,13 @@ public class ManutenzioneDatabase {
 			}
 			clearCache();
 			_log.info("Elaborazione completata correttamente.");
-		} else if (mode.contains("!Integrazioni!")) {
+		}
+		if (mode.contains("!Integrazioni!")) {
 			SismicaUtil.integrazioniScadute();
-		} else {
+		}
-			esitoLog(esito, "Nessun comando");
+		if (mode.startsWith("!Workflow!")) {
+			String[] pezzi = StringUtil.split(mode, '!');
+			esito.addAll(SismicaUtil.aggiungiWorkflow(pezzi[2], pezzi[3]));
 		}
 		return esito;
 	}
@@ -346,7 +349,7 @@ public class ManutenzioneDatabase {
 			int rimossi = 0;
 			fileEntries = DLAppServiceUtil.getFileEntries(repositoryId, folderId, start, start + SLICE);
 			for (FileEntry fileEntry : fileEntries) {
-				String[] parti = StringUtil.split(fileEntry.getTitle(), StringPool.UNDERLINE);
+				String[] parti = StringUtil.split(fileEntry.getTitle(), '_');
 				String strId1 = parti[0];
 				String tipo = StringPool.BLANK;
 				String strId2 = StringPool.BLANK;

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

@@ -175,8 +175,10 @@ public class SismicaUtil {
 		return null;
 	}
 
-	public static void integrazioniScadute() throws SystemException, PortalException {
+	public static List<String> integrazioniScadute() throws SystemException, PortalException {
-		final int giorniScadenza = 120;
+		List<String> esito = new ArrayList<>();
+
+		final int giorniScadenza = 30;
 		final long taskId = 21642;
 		final String taskName = "Esito";
 		final long nodeId = 21639;
@@ -210,121 +212,158 @@ public class SismicaUtil {
 			}
 			if (Validator.isNotNull(dtUltimoAvviso) && dtUltimoAvviso.before(inizio)) {
 				scadute++;
-				List<ControlloPratica> controlli = ControlloPraticaLocalServiceUtil
+				esito.addAll(riassegnaAlTecnico(pratica, comment, validCurrentNodeName, taskId, taskName,
-						.findByIntPraticaId_Status(pratica.getIntPraticaId(),
+						nodeId, nodeName));
-								WorkflowConstants.STATUS_TASK_APPROVAZIONE_ESITO_ISTRUTTORIA);
+			}
-				if (1 == controlli.size()) {
+		}
-					ControlloPratica controllo = controlli.get(0);
+		esitoLog(esito, "Pratiche con richiesta di integrazione " + pratiche.size() + ", scadute " + scadute);
-					long companyId = controllo.getCompanyId();
+		return esito;
-					long groupId = controllo.getGroupId();
+	}
-					long tecnicoUserId = pratica.getStatusByUserId();
+
-
+	private static List<String> riassegnaAlTecnico(IntPratica pratica, String comment,
-					WorkflowInstanceLink instanceLink = WorkflowInstanceLinkLocalServiceUtil
+			String validCurrentNodeName, long taskId, String taskName, long nodeId, String nodeName)
-							.getWorkflowInstanceLink(companyId, groupId, ControlloPratica.class.getName(),
+			throws SystemException, PortalException {
-									controllo.getPrimaryKey());
+		List<String> esito = new ArrayList<>();
-					KaleoInstance instance = KaleoInstanceLocalServiceUtil.getKaleoInstance(instanceLink
+		List<ControlloPratica> controlli = ControlloPraticaLocalServiceUtil.findByIntPraticaId_Status(
-							.getWorkflowInstanceId());
+				pratica.getIntPraticaId(), WorkflowConstants.STATUS_TASK_APPROVAZIONE_ESITO_ISTRUTTORIA);
-
+		if (1 == controlli.size()) {
-					KaleoInstanceToken instanceToken = KaleoInstanceTokenLocalServiceUtil
+			ControlloPratica controllo = controlli.get(0);
-							.getKaleoInstanceToken(instance.getRootKaleoInstanceTokenId());
+			long companyId = controllo.getCompanyId();
-
+			long groupId = controllo.getGroupId();
-					if (validCurrentNodeName.equals(instanceToken.getCurrentKaleoNodeName())) {
+			long tecnicoUserId = pratica.getStatusByUserId();
-
+
-						Role adminRole = RoleLocalServiceUtil.getRole(companyId, RoleConstants.ADMINISTRATOR);
+			WorkflowInstanceLink instanceLink = WorkflowInstanceLinkLocalServiceUtil.getWorkflowInstanceLink(
-						User adminUser = UserLocalServiceUtil.getRoleUsers(adminRole.getRoleId(), 0, 1)
+					companyId, groupId, ControlloPratica.class.getName(), controllo.getPrimaryKey());
-								.get(0);
+			KaleoInstance instance = KaleoInstanceLocalServiceUtil.getKaleoInstance(instanceLink
-						ServiceContext scAdmin = new ServiceContext();
+					.getWorkflowInstanceId());
-						scAdmin.setCompanyId(companyId);
+			KaleoInstanceToken instanceToken = KaleoInstanceTokenLocalServiceUtil
-						scAdmin.setScopeGroupId(groupId);
+					.getKaleoInstanceToken(instance.getRootKaleoInstanceTokenId());
-						scAdmin.setUserId(adminUser.getUserId());
+
-
+			if (Validator.isNull(validCurrentNodeName)
-						ServiceContext scTecnico = new ServiceContext();
+					|| validCurrentNodeName.equals(instanceToken.getCurrentKaleoNodeName())) {
-						scTecnico.setCompanyId(companyId);
+				Date adesso = new Date();
-						scTecnico.setScopeGroupId(groupId);
+
-						scTecnico.setUserId(tecnicoUserId);
+				Role adminRole = RoleLocalServiceUtil.getRole(companyId, RoleConstants.ADMINISTRATOR);
-
+				User adminUser = UserLocalServiceUtil.getRoleUsers(adminRole.getRoleId(), 0, 1).get(0);
-						List<KaleoTaskInstanceToken> taskInstanceTokens = KaleoTaskInstanceTokenLocalServiceUtil
+
-								.getKaleoTaskInstanceTokens(instance.getKaleoInstanceId(), true, 0, 1,
+				ServiceContext scAdmin = new ServiceContext();
-										OrderByComparatorFactoryUtil.create("KaleoTaskInstanceToken",
+				scAdmin.setCompanyId(companyId);
-												"kaleoTaskInstanceTokenId", false), scTecnico);
+				scAdmin.setScopeGroupId(groupId);
-						if (taskInstanceTokens.size() > 0) {
+				scAdmin.setUserId(adminUser.getUserId());
-							@SuppressWarnings("unchecked")
+
-							Map<String, Serializable> workflowContext = (Map<String, Serializable>) JSONFactoryUtil
+				ServiceContext scTecnico = new ServiceContext();
-									.deserialize(taskInstanceTokens.get(0).getWorkflowContext());
+				scTecnico.setCompanyId(companyId);
-							long definitionId = taskInstanceTokens.get(0).getKaleoDefinitionId();
+				scTecnico.setScopeGroupId(groupId);
-							User tecnicoUser = UserLocalServiceUtil.getUser(tecnicoUserId);
+				scTecnico.setUserId(tecnicoUserId);
-
+
-							KaleoTaskInstanceToken taskInstanceToken = KaleoTaskInstanceTokenLocalServiceUtil
+				List<KaleoTaskInstanceToken> taskInstanceTokens = KaleoTaskInstanceTokenLocalServiceUtil
-									.createKaleoTaskInstanceToken(CounterLocalServiceUtil.increment());
+						.getKaleoTaskInstanceTokens(instance.getKaleoInstanceId(), true, 0, 1,
-							taskInstanceToken.setGroupId(groupId);
+								OrderByComparatorFactoryUtil.create("KaleoTaskInstanceToken",
-							taskInstanceToken.setCompanyId(companyId);
+										"kaleoTaskInstanceTokenId", false), scTecnico);
-							taskInstanceToken.setUserId(adminUser.getUserId());
+				if (taskInstanceTokens.size() > 0) {
-							taskInstanceToken.setUserName(adminUser.getFullName());
+					@SuppressWarnings("unchecked")
-							taskInstanceToken.setCreateDate(adesso);
+					Map<String, Serializable> workflowContext = (Map<String, Serializable>) JSONFactoryUtil
-							taskInstanceToken.setModifiedDate(adesso);
+							.deserialize(taskInstanceTokens.get(0).getWorkflowContext());
-							taskInstanceToken.setKaleoDefinitionId(definitionId);
+					long definitionId = taskInstanceTokens.get(0).getKaleoDefinitionId();
-							taskInstanceToken.setKaleoInstanceId(instance.getKaleoInstanceId());
+					User tecnicoUser = UserLocalServiceUtil.getUser(tecnicoUserId);
-							taskInstanceToken
+
-									.setKaleoInstanceTokenId(instanceToken.getKaleoInstanceTokenId());
+					KaleoTaskInstanceToken taskInstanceToken = KaleoTaskInstanceTokenLocalServiceUtil
-							taskInstanceToken.setKaleoTaskId(taskId);
+							.createKaleoTaskInstanceToken(CounterLocalServiceUtil.increment());
-							taskInstanceToken.setKaleoTaskName(taskName);
+					taskInstanceToken.setGroupId(groupId);
-							taskInstanceToken.setClassName(ControlloPratica.class.getName());
+					taskInstanceToken.setCompanyId(companyId);
-							taskInstanceToken.setClassPK(controllo.getPrimaryKey());
+					taskInstanceToken.setUserId(adminUser.getUserId());
-							taskInstanceToken.setWorkflowContext(JSONFactoryUtil.serialize(workflowContext));
+					taskInstanceToken.setUserName(adminUser.getFullName());
-
+					taskInstanceToken.setCreateDate(adesso);
-							KaleoTaskAssignmentInstanceLocalServiceUtil.addKaleoTaskAssignmentInstance(
+					taskInstanceToken.setModifiedDate(adesso);
-									groupId, taskInstanceToken, User.class.getName(), tecnicoUserId, scAdmin);
+					taskInstanceToken.setKaleoDefinitionId(definitionId);
-							KaleoTaskInstanceTokenLocalServiceUtil
+					taskInstanceToken.setKaleoInstanceId(instance.getKaleoInstanceId());
-									.updateKaleoTaskInstanceToken(taskInstanceToken);
+					taskInstanceToken.setKaleoInstanceTokenId(instanceToken.getKaleoInstanceTokenId());
-
+					taskInstanceToken.setKaleoTaskId(taskId);
-							KaleoLog log = KaleoLogLocalServiceUtil.createKaleoLog(CounterLocalServiceUtil
+					taskInstanceToken.setKaleoTaskName(taskName);
-									.increment());
+					taskInstanceToken.setClassName(ControlloPratica.class.getName());
-							log.setUserId(adminUser.getUserId());
+					taskInstanceToken.setClassPK(controllo.getPrimaryKey());
-							log.setUserName(adminUser.getFullName());
+					taskInstanceToken.setWorkflowContext(JSONFactoryUtil.serialize(workflowContext));
-							log.setCompanyId(companyId);
+
-							log.setCreateDate(adesso);
+					KaleoTaskAssignmentInstanceLocalServiceUtil.addKaleoTaskAssignmentInstance(groupId,
-							log.setModifiedDate(adesso);
+							taskInstanceToken, User.class.getName(), tecnicoUserId, scAdmin);
-							log.setKaleoClassName(KaleoNode.class.getName());
+					KaleoTaskInstanceTokenLocalServiceUtil.updateKaleoTaskInstanceToken(taskInstanceToken);
-							log.setKaleoClassPK(nodeId);
+
-							log.setKaleoDefinitionId(definitionId);
+					KaleoLog log = KaleoLogLocalServiceUtil.createKaleoLog(CounterLocalServiceUtil
-							log.setKaleoInstanceId(instance.getKaleoInstanceId());
+							.increment());
-							log.setKaleoInstanceTokenId(instanceToken.getKaleoInstanceTokenId());
+					log.setUserId(adminUser.getUserId());
-							log.setKaleoTaskInstanceTokenId(taskInstanceToken.getKaleoTaskInstanceTokenId());
+					log.setUserName(adminUser.getFullName());
-							log.setKaleoNodeName(nodeName);
+					log.setCompanyId(companyId);
-							log.setCurrentAssigneeClassName(User.class.getName());
+					log.setCreateDate(adesso);
-							log.setCurrentAssigneeClassPK(tecnicoUserId);
+					log.setModifiedDate(adesso);
-							log.setType(LogType.TASK_ASSIGNMENT.name());
+					log.setKaleoClassName(KaleoNode.class.getName());
-							log.setComment(comment);
+					log.setKaleoClassPK(nodeId);
-							log.setStartDate(adesso);
+					log.setKaleoDefinitionId(definitionId);
-							log.setWorkflowContext(JSONFactoryUtil.serialize(workflowContext));
+					log.setKaleoInstanceId(instance.getKaleoInstanceId());
-							KaleoLogLocalServiceUtil.updateKaleoLog(log);
+					log.setKaleoInstanceTokenId(instanceToken.getKaleoInstanceTokenId());
-
+					log.setKaleoTaskInstanceTokenId(taskInstanceToken.getKaleoTaskInstanceTokenId());
-							instanceToken.setCurrentKaleoNodeId(nodeId);
+					log.setKaleoNodeName(nodeName);
-							instanceToken.setCurrentKaleoNodeName(nodeName);
+					log.setCurrentAssigneeClassName(User.class.getName());
-							KaleoInstanceTokenLocalServiceUtil.updateKaleoInstanceToken(instanceToken);
+					log.setCurrentAssigneeClassPK(tecnicoUserId);
-
+					log.setType(LogType.TASK_ASSIGNMENT.name());
-							_log.info("Integrazione scaduta da "
+					log.setComment(comment);
-									+ (daysBetween(dtUltimoAvviso, adesso) - giorniScadenza)
+					log.setStartDate(adesso);
-									+ " giorni. Workflow instance " + instance.getKaleoInstanceId()
+					log.setWorkflowContext(JSONFactoryUtil.serialize(workflowContext));
+					KaleoLogLocalServiceUtil.updateKaleoLog(log);
+
+					instanceToken.setCurrentKaleoNodeId(nodeId);
+					instanceToken.setCurrentKaleoNodeName(nodeName);
+					KaleoInstanceTokenLocalServiceUtil.updateKaleoInstanceToken(instanceToken);
+
+					esitoLog(
+							esito,
+							"Riassegnato workflow instance " + instance.getKaleoInstanceId()
 									+ " per pratica " + pratica.getNumeroProgetto() + " ("
 									+ pratica.getIntPraticaId() + "), istruttore "
 									+ tecnicoUser.getFullName());
-						} else {
-							_log.info("Errore su integrazione. Pratica " + pratica.getNumeroProgetto() + " ("
-									+ pratica.getIntPraticaId() + "), controllo "
-									+ controllo.getControlloPraticaId() + ", taskInstanceToken = "
-									+ taskInstanceTokens.size());
-						}
-					}
 				} else {
-					_log.info("Errore su integrazione. Pratica " + pratica.getNumeroProgetto() + " ("
+					esitoLog(esito, "Errore su integrazione. Pratica " + pratica.getNumeroProgetto() + " ("
-							+ pratica.getIntPraticaId() + ") l'integrazione è scaduta da "
+							+ pratica.getIntPraticaId() + "), controllo " + controllo.getControlloPraticaId()
-							+ (daysBetween(dtUltimoAvviso, adesso) - giorniScadenza) + ", controlli "
+							+ ", taskInstanceToken = " + taskInstanceTokens.size());
-							+ controlli.size());
 				}
+			} else {
+				esitoLog(esito, "Nome nodo corrente non valido: " + instanceToken.getCurrentKaleoNodeName());
 			}
+		} else {
+			esitoLog(
+					esito,
+					"Errore su integrazione. Pratica " + pratica.getNumeroProgetto() + " ("
+							+ pratica.getIntPraticaId() + "), numero di controlli = " + controlli.size());
+		}
+		return esito;
+	}
+
+	public static List<String> aggiungiWorkflow(String numeroProgetto, String mode) throws SystemException,
+			PortalException {
+		List<String> esito = new ArrayList<>();
+
+		IntPratica pratica = IntPraticaLocalServiceUtil.findByNumeroProgetto(numeroProgetto);
+		if (Validator.isNull(pratica)) {
+			esitoLog(esito, "Progetto " + numeroProgetto + " non trovato");
+		} else {
+			String comment = "Workflow riassegnato dal sistema";
+			long taskId;
+			String taskName;
+			long nodeId;
+			String nodeName;
+
+			switch (mode) {
+			case "Esito":
+				taskId = 21642;
+				taskName = "Esito";
+				nodeId = 21639;
+				nodeName = "Esito";
+				break;
+			default:
+				return esitoLog(esito, "Nome nodo non corretto: " + mode);
+			}
+			esito.addAll(riassegnaAlTecnico(pratica, comment, null, taskId, taskName, nodeId, nodeName));
 		}
-		_log.info("Pratiche con richiesta di integrazione " + pratiche.size() + ", scadute " + scadute);
+		return esito;
 	}
 
 	public static long daysBetween(String start, String end) throws ParseException {
@@ -1697,4 +1736,10 @@ public class SismicaUtil {
 		serviceContext.setUserId(intPratica.getUserId());
 		return serviceContext;
 	}
+
+	private static List<String> esitoLog(List<String> esito, String msg) {
+		esito.add(msg);
+		_log.info(msg);
+		return esito;
+	}
 }

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

@@ -88,7 +88,7 @@ public class GestioneAttivitaPortlet extends MVCPortlet {
 		String statoPratica = ParamUtil.getString(actionRequest, "statoPratica");
 		String committente = ParamUtil.getString(actionRequest, "committente");
 		String soggettiInterconnessi = ParamUtil.getString(actionRequest, "soggettiInterconnessi");
-		//ADT BUG BO ID = 8
+		// ADT BUG BO ID = 8
 		String istruttore = ParamUtil.getString(actionRequest, "istruttore");
 		String dataRichiestaInizio = ParamUtil.getString(actionRequest, "dataRichiestaInizio");
 		String dataRichiestaFine = ParamUtil.getString(actionRequest, "dataRichiestaFine");
@@ -102,20 +102,20 @@ public class GestioneAttivitaPortlet extends MVCPortlet {
 		actionResponse.setRenderParameter("tabs1", tabs1);
 		actionResponse.setRenderParameter("numeroProgetto", numeroProgetto);
 		actionResponse.setRenderParameter("protocollo", protocollo);
-		
+
-		//ADT - BUG-11 Aggiunta filtro ricerca
+		// ADT - BUG-11 Aggiunta filtro ricerca
-		if(Validator.isNotNull(tipoPratica)){
+		if (Validator.isNotNull(tipoPratica)) {
-			if("co".equalsIgnoreCase(tipoPratica)){
+			if ("co".equalsIgnoreCase(tipoPratica)) {
 				tipoPratica = Constants.TIPO_PRATICA_DEPOSITO;
 				actionResponse.setRenderParameter("controlloObbligatorio", Boolean.TRUE.toString());
-			} else if("sorteggio".equalsIgnoreCase(tipoPratica)){
+			} else if ("sorteggio".equalsIgnoreCase(tipoPratica)) {
 				tipoPratica = Constants.TIPO_PRATICA_DEPOSITO;
 				actionResponse.setRenderParameter("sorteggiata", Boolean.TRUE.toString());
 			}
-			
+
 			actionResponse.setRenderParameter("tipoPratica", tipoPratica);
 		}
-		
+
 		actionResponse.setRenderParameter("statoPratica", statoPratica);
 		actionResponse.setRenderParameter("committente", committente);
 		actionResponse.setRenderParameter("soggettiInterconnessi", soggettiInterconnessi);
@@ -126,20 +126,20 @@ public class GestioneAttivitaPortlet extends MVCPortlet {
 		if (dataRichiestaInizio != null && !dataRichiestaInizio.equals("")) {
 			String[] dataRichiestaInizioSplitted = dataRichiestaInizio.split("/");
 
-			int mounth = Integer.valueOf(dataRichiestaInizioSplitted[1]) -1;
+			int mounth = Integer.valueOf(dataRichiestaInizioSplitted[1]) - 1;
 
 			actionResponse.setRenderParameter("dataRichiestaInizioDay", dataRichiestaInizioSplitted[0]);
-			actionResponse.setRenderParameter("dataRichiestaInizioMonth", mounth+"");
+			actionResponse.setRenderParameter("dataRichiestaInizioMonth", mounth + "");
 			actionResponse.setRenderParameter("dataRichiestaInizioYear", dataRichiestaInizioSplitted[2]);
 		}
 
 		if (dataRichiestaFine != null && !dataRichiestaFine.equals("")) {
 			String[] dataRichiestaFineSplitted = dataRichiestaFine.split("/");
 
-			int mounth = Integer.valueOf(dataRichiestaFineSplitted[1]) -1;
+			int mounth = Integer.valueOf(dataRichiestaFineSplitted[1]) - 1;
 
 			actionResponse.setRenderParameter("dataRichiestaFineDay", dataRichiestaFineSplitted[0]);
-			actionResponse.setRenderParameter("dataRichiestaFineMonth", mounth+"");
+			actionResponse.setRenderParameter("dataRichiestaFineMonth", mounth + "");
 			actionResponse.setRenderParameter("dataRichiestaFineYear", dataRichiestaFineSplitted[2]);
 		}
 
@@ -158,7 +158,8 @@ public class GestioneAttivitaPortlet extends MVCPortlet {
 		long istruttoreId = ParamUtil.getLong(actionRequest, "istruttoreId");
 		try {
 			IntPratica intPratica = IntPraticaServiceUtil.getIntPratica(intPraticaId);
-			if (Validator.isNotNull(intPratica.getStatusByUserId()) && intPratica.getStatusByUserId() != istruttoreId) {
+			if (Validator.isNotNull(intPratica.getStatusByUserId())
+					&& intPratica.getStatusByUserId() != istruttoreId) {
 				IntPraticaServiceUtil.cambiaIstruttore(intPraticaId, controlloPraticaId, istruttoreId);
 			} else {
 				throw new SystemException("cambio istruttore non possibile");
@@ -169,35 +170,45 @@ public class GestioneAttivitaPortlet extends MVCPortlet {
 		}
 	}
 
-	// public void assegnamiTask(ActionRequest actionRequest, ActionResponse actionResponse) {
+	// public void assegnamiTask(ActionRequest actionRequest, ActionResponse
+	// actionResponse) {
 	//
-	// long controlloPraticaId = ParamUtil.getLong(actionRequest, "controlloPraticaId");
+	// long controlloPraticaId = ParamUtil.getLong(actionRequest,
+	// "controlloPraticaId");
 	// long workflowTaskId = ParamUtil.getLong(actionRequest, "workflowTaskId");
 	//
 	//
 	// try {
-	// ServiceContext serviceContext = ServiceContextFactory.getInstance(actionRequest);
+	// ServiceContext serviceContext =
+	// ServiceContextFactory.getInstance(actionRequest);
 	// ControlloPratica controlloPratica =
 	// ControlloPraticaLocalServiceUtil.getControlloPratica(controlloPraticaId);
 	//
 	// IntPratica intPratica =
 	// IntPraticaLocalServiceUtil.getIntPratica(controlloPratica.getIntPraticaId());
-	// Territorio territorio = TerritorioLocalServiceUtil.getTerritorio(intPratica.getTerritorioId());
+	// Territorio territorio =
+	// TerritorioLocalServiceUtil.getTerritorio(intPratica.getTerritorioId());
 	// IntPraticaPermission.check(PermissionThreadLocal.getPermissionChecker(),
 	// territorio.getGroupId(),
 	// ActionKeys.ASSEGNA_A_ME);
 	//
 	//
 	// WorkflowTask lastWorkflowTask =
-	// WorkflowUtil.getLastTask(controlloPratica.getCompanyId(), controlloPratica.getGroupId(), null,
+	// WorkflowUtil.getLastTask(controlloPratica.getCompanyId(),
+	// controlloPratica.getGroupId(), null,
 	// controlloPratica);
-	// if (lastWorkflowTask != null && lastWorkflowTask.getWorkflowTaskId() == workflowTaskId
+	// if (lastWorkflowTask != null && lastWorkflowTask.getWorkflowTaskId() ==
+	// workflowTaskId
 	// && !lastWorkflowTask.getWorkflowTaskAssignees().isEmpty()) {
 	// boolean assegnazionePossibile = false;
-	// for (WorkflowTaskAssignee workflowTaskAssignee : lastWorkflowTask.getWorkflowTaskAssignees()) {
+	// for (WorkflowTaskAssignee workflowTaskAssignee :
-	// if (workflowTaskAssignee.getAssigneeClassName().equalsIgnoreCase(Role.class.getName())
+	// lastWorkflowTask.getWorkflowTaskAssignees()) {
-	// && UserGroupRoleLocalServiceUtil.hasUserGroupRole(serviceContext.getUserId(),
+	// if
-	// controlloPratica.getGroupId(), workflowTaskAssignee.getAssigneeClassPK(), true)) {
+	// (workflowTaskAssignee.getAssigneeClassName().equalsIgnoreCase(Role.class.getName())
+	// &&
+	// UserGroupRoleLocalServiceUtil.hasUserGroupRole(serviceContext.getUserId(),
+	// controlloPratica.getGroupId(), workflowTaskAssignee.getAssigneeClassPK(),
+	// true)) {
 	// assegnazionePossibile = true;
 	// }
 	// }
@@ -207,7 +218,8 @@ public class GestioneAttivitaPortlet extends MVCPortlet {
 	// workflowTaskId, serviceContext.getUserId(), StringPool.BLANK, null,
 	// WorkflowUtil.getWorkflowContext(controlloPratica));
 	// } else {
-	// throw new SystemException("assegnazione task non possibile per il ruolo");
+	// throw new
+	// SystemException("assegnazione task non possibile per il ruolo");
 	// }
 	// } else {
 	// throw new SystemException("assegnazione task non possibile");
@@ -225,14 +237,15 @@ public class GestioneAttivitaPortlet extends MVCPortlet {
 
 		try {
 			ServiceContext serviceContext = ServiceContextFactory.getInstance(actionRequest);
-			ControlloPratica controlloPratica = ControlloPraticaLocalServiceUtil.getControlloPratica(controlloPraticaId);
+			ControlloPratica controlloPratica = ControlloPraticaLocalServiceUtil
-			IntPratica intPratica = IntPraticaLocalServiceUtil.getIntPratica(controlloPratica.getIntPraticaId());
+					.getControlloPratica(controlloPraticaId);
+			IntPratica intPratica = IntPraticaLocalServiceUtil.getIntPratica(controlloPratica
+					.getIntPraticaId());
 			Territorio territorio = TerritorioLocalServiceUtil.getTerritorio(intPratica.getTerritorioId());
 			IntPraticaPermission.check(PermissionThreadLocal.getPermissionChecker(), territorio.getGroupId(),
 					ActionKeys.ASSEGNA_AL_RUOLO);
-			WorkflowTask lastWorkflowTask =
+			WorkflowTask lastWorkflowTask = WorkflowUtil.getLastTask(controlloPratica.getCompanyId(),
-					WorkflowUtil.getLastTask(controlloPratica.getCompanyId(), controlloPratica.getGroupId(), null,
+					controlloPratica.getGroupId(), null, controlloPratica);
-							controlloPratica);
 			if (lastWorkflowTask != null && lastWorkflowTask.getWorkflowTaskId() == workflowTaskId
 					&& !lastWorkflowTask.getWorkflowTaskAssignees().isEmpty()) {
 				Role role = null;
@@ -251,8 +264,9 @@ public class GestioneAttivitaPortlet extends MVCPortlet {
 					break;
 				}
 
-				WorkflowTaskManagerUtil.assignWorkflowTaskToRole(controlloPratica.getCompanyId(), serviceContext.getUserId(),
+				WorkflowTaskManagerUtil.assignWorkflowTaskToRole(controlloPratica.getCompanyId(),
-						workflowTaskId, role.getRoleId(), StringPool.BLANK, null, WorkflowUtil.getWorkflowContext(controlloPratica));
+						serviceContext.getUserId(), workflowTaskId, role.getRoleId(), StringPool.BLANK, null,
+						WorkflowUtil.getWorkflowContext(controlloPratica));
 			} else {
 				throw new SystemException("riassegnare al ruolo non possibile");
 			}
@@ -293,8 +307,9 @@ public class GestioneAttivitaPortlet extends MVCPortlet {
 			serviceContext.setCreateDate(new Date());
 			serviceContext.setModifiedDate(new Date());
 			if (ParereGeologoLocalServiceUtil.countByIntPraticaIdParereVuoto(intPraticaId) == 0) {
-				ParereGeologo parereGeologo=ParereGeologoServiceUtil.addParereGeologo(geologoId, intPraticaId, dettPraticaId, serviceContext);
+				ParereGeologo parereGeologo = ParereGeologoServiceUtil.addParereGeologo(geologoId,
-				//ADT: aggiunta notifica geologo
+						intPraticaId, dettPraticaId, serviceContext);
+				// ADT: aggiunta notifica geologo
 				MailUtil.invioNotificaGeologo(parereGeologo, serviceContext);
 			} else {
 				throw new PortalException("parere geologo gia presente");
@@ -312,20 +327,22 @@ public class GestioneAttivitaPortlet extends MVCPortlet {
 		long intPraticaId = ParamUtil.getLong(actionRequest, "intPraticaId");
 		long controlloPraticaId = ParamUtil.getLong(actionRequest, "controlloPraticaId");
 		long lastDettPraticaId = ParamUtil.getLong(actionRequest, "lastDettPraticaId");
-		ControlloPratica controlloPratica = ControlloPraticaLocalServiceUtil.getControlloPratica(controlloPraticaId);
+		ControlloPratica controlloPratica = ControlloPraticaLocalServiceUtil
+				.getControlloPratica(controlloPraticaId);
 		IntPratica intPratica = IntPraticaLocalServiceUtil.getIntPratica(intPraticaId);
 		if (lastDettPraticaId != controlloPratica.getDettPraticaId()
 				&& intPratica.getStatusByUserId() == serviceContext.getUserId()) {
-			//ADT: BUG ID=5
+			// ADT: BUG ID=5
-			ControlloPraticaLocalServiceUtil.addPraticheAlControlloVarianti(controlloPraticaId, lastDettPraticaId,serviceContext);
+			ControlloPraticaLocalServiceUtil.addPraticheAlControlloVarianti(controlloPraticaId,
+					lastDettPraticaId, serviceContext);
 		} else {
 			SessionErrors.add(actionRequest, "error-aggiunta-pratiche-al-controllo");
 		}
 	}
 
 	@Override
-	public void serveResource(ResourceRequest resourceRequest, ResourceResponse resourceResponse) throws IOException,
+	public void serveResource(ResourceRequest resourceRequest, ResourceResponse resourceResponse)
-	PortletException {
+			throws IOException, PortletException {
 
 		ThemeDisplay themeDisplay = (ThemeDisplay) resourceRequest.getAttribute(WebKeys.THEME_DISPLAY);
 		Locale locale = themeDisplay.getLocale();
@@ -344,19 +361,21 @@ public class GestioneAttivitaPortlet extends MVCPortlet {
 			csv = exportToCSV(locale, resourceRequest, true, user);
 		} else if (cmd.equals("po")) {
 			csv = exportToCSV(locale, resourceRequest, false, user);
-		} else if (cmd.equals("exportRicercaMieAttivita") || cmd.equals("exportRicercaMieiRuoli") || cmd.equals("exportRicercaAltreAttivita") || cmd.equals("exportRicercaAttivitaConcluse")) {
+		} else if (cmd.equals("exportRicercaMieAttivita") || cmd.equals("exportRicercaMieiRuoli")
+				|| cmd.equals("exportRicercaAltreAttivita") || cmd.equals("exportRicercaAttivitaConcluse")) {
 			csv = exportSearch(locale, resourceRequest, user, cmd);
-		} 
+		}
-		//ADT BUG BO ID= 1 SEZIONE ATTIVIT<EFBFBD>
+		// ADT BUG BO ID= 1 SEZIONE ATTIVIT<EFBFBD>
 		if ("comuniForUfficio".equals(id)) {
 			String ufficio = ParamUtil.getString(resourceRequest, "ufficioId");
 			JSONArray jsonArray = JSONFactoryUtil.createJSONArray();
 			List<Comune> comuni;
 			if (Validator.isNotNull(ufficio) && !ufficio.equals("0")) {
 				try {
-					if(!ufficio.equals("-1")){
+					if (!ufficio.equals("-1")) {
 						long ufficioId = Long.parseLong(ufficio);
-						comuni = ComuneLocalServiceUtil.getComuniForOrganizationByUserIdUfficioId(user.getUserId(), ufficioId);
+						comuni = ComuneLocalServiceUtil.getComuniForOrganizationByUserIdUfficioId(
+								user.getUserId(), ufficioId);
 						for (Comune comune : comuni) {
 							JSONObject jsonObject = JSONFactoryUtil.createJSONObject();
 							jsonObject.put("comuneId", comune.getComuneId());
@@ -379,13 +398,12 @@ public class GestioneAttivitaPortlet extends MVCPortlet {
 
 				}
 
-
 				catch (Exception e) {
 					// TODO Auto-generated catch block
 					e.printStackTrace();
 				}
 
-			} 
+			}
 
 		}
 		ServletResponseUtil.sendFile(request, response, "export_pratiche.csv", csv.getBytes(StringPool.UTF8),
@@ -394,7 +412,6 @@ public class GestioneAttivitaPortlet extends MVCPortlet {
 		// super.serveResource(resourceRequest, resourceResponse);
 	}
 
-
 	private String exportSearch(Locale locale, ResourceRequest resourceRequest, User user, String cmd) {
 
 		HttpServletRequest httpRequest = PortalUtil.getHttpServletRequest(resourceRequest);
@@ -406,14 +423,14 @@ public class GestioneAttivitaPortlet extends MVCPortlet {
 
 			Hits hits = null;
 
-			if(cmd.equals("exportRicercaMieAttivita")){
+			if (cmd.equals("exportRicercaMieAttivita")) {
-				hits = ControlloPraticaAdvancedSearch.searchMieiTask(httpRequest, user,  -1, -1);
+				hits = ControlloPraticaAdvancedSearch.searchMieiTask(httpRequest, user, -1, -1);
-			} else if(cmd.equals("exportRicercaMieiRuoli")){
+			} else if (cmd.equals("exportRicercaMieiRuoli")) {
-				hits = ControlloPraticaAdvancedSearch.searchTaskMieiRuoli(httpRequest, user,  -1, -1);
+				hits = ControlloPraticaAdvancedSearch.searchTaskMieiRuoli(httpRequest, user, -1, -1);
-			} else if(cmd.equals("exportRicercaAltreAttivita")){
+			} else if (cmd.equals("exportRicercaAltreAttivita")) {
-				hits = ControlloPraticaAdvancedSearch.searchAltriTask(httpRequest, user,  -1, -1);
+				hits = ControlloPraticaAdvancedSearch.searchAltriTask(httpRequest, user, -1, -1);
-			} else if(cmd.equals("exportRicercaAttivitaConcluse")){
+			} else if (cmd.equals("exportRicercaAttivitaConcluse")) {
-				hits = ControlloPraticaAdvancedSearch.searchTaskConclusi(httpRequest, user,  -1, -1);
+				hits = ControlloPraticaAdvancedSearch.searchTaskConclusi(httpRequest, user, -1, -1);
 			}
 
 			for (Document doc : hits.toList()) {
@@ -421,8 +438,8 @@ public class GestioneAttivitaPortlet extends MVCPortlet {
 				String controlloPraticaId = doc.get("controlloPraticaId");
 				if (Validator.isNotNull(controlloPraticaId)) {
 
-					ControlloPratica controlloPratica =
+					ControlloPratica controlloPratica = ControlloPraticaLocalServiceUtil
-							ControlloPraticaLocalServiceUtil.fetchControlloPratica(GetterUtil.getLong(controlloPraticaId));
+							.fetchControlloPratica(GetterUtil.getLong(controlloPraticaId));
 					if (Validator.isNotNull(controlloPratica)) {
 						lista.add(controlloPratica);
 					}
@@ -430,60 +447,72 @@ public class GestioneAttivitaPortlet extends MVCPortlet {
 
 			}
 
-			sb.append(CSVUtil.encode(LanguageUtil.get(getPortletConfig(), locale, "label.scadenzegeniocivile.attivita")));
+			sb.append(CSVUtil.encode(LanguageUtil.get(getPortletConfig(), locale,
+					"label.scadenzegeniocivile.attivita")));
 			sb.append(StringPool.SEMICOLON);
-			sb.append(CSVUtil.encode(LanguageUtil.get(getPortletConfig(), locale, "label.scadenzegeniocivile.esito")));
+			sb.append(CSVUtil.encode(LanguageUtil.get(getPortletConfig(), locale,
+					"label.scadenzegeniocivile.esito")));
 			sb.append(StringPool.SEMICOLON);
-			
+
-			//ADT - BUG-13 Aggiunta colonna Data Esito
+			// ADT - BUG-13 Aggiunta colonna Data Esito
-			//Bug 33264
+			// Bug 33264
-			if(cmd.equals("exportRicercaAttivitaConcluse")){
+			if (cmd.equals("exportRicercaAttivitaConcluse")) {
-				sb.append(CSVUtil.encode(LanguageUtil.get(getPortletConfig(), locale, "label.scadenzegeniocivile.dataesito")));
+				sb.append(CSVUtil.encode(LanguageUtil.get(getPortletConfig(), locale,
+						"label.scadenzegeniocivile.dataesito")));
 				sb.append(StringPool.SEMICOLON);
 			}
-			
+
-			sb.append(CSVUtil.encode(LanguageUtil.get(getPortletConfig(), locale, "label.scadenzegeniocivile.sorteggiata")));
+			sb.append(CSVUtil.encode(LanguageUtil.get(getPortletConfig(), locale,
+					"label.scadenzegeniocivile.sorteggiata")));
 			sb.append(StringPool.SEMICOLON);
-			sb.append(CSVUtil.encode(LanguageUtil.get(getPortletConfig(), locale, "label.scadenzegeniocivile.pratica")));
+			sb.append(CSVUtil.encode(LanguageUtil.get(getPortletConfig(), locale,
+					"label.scadenzegeniocivile.pratica")));
 			sb.append(StringPool.SEMICOLON);
-			sb.append(CSVUtil.encode(LanguageUtil.get(getPortletConfig(), locale, "label.scadenzegeniocivile.istruttore")));
+			sb.append(CSVUtil.encode(LanguageUtil.get(getPortletConfig(), locale,
+					"label.scadenzegeniocivile.istruttore")));
 			sb.append(StringPool.SEMICOLON);
-			sb.append(CSVUtil.encode(LanguageUtil.get(getPortletConfig(), locale, "label.scadenzegeniocivile.provenienza")));
+			sb.append(CSVUtil.encode(LanguageUtil.get(getPortletConfig(), locale,
+					"label.scadenzegeniocivile.provenienza")));
 			sb.append(StringPool.SEMICOLON);
-			sb.append(CSVUtil.encode(LanguageUtil.get(getPortletConfig(), locale, "label.scadenzegeniocivile.avvioprocedimento")));
+			sb.append(CSVUtil.encode(LanguageUtil.get(getPortletConfig(), locale,
+					"label.scadenzegeniocivile.avvioprocedimento")));
 			sb.append(StringPool.SEMICOLON);
-			sb.append(CSVUtil.encode(LanguageUtil.get(getPortletConfig(), locale, "label.scadenzegeniocivile.provincia")));
+			sb.append(CSVUtil.encode(LanguageUtil.get(getPortletConfig(), locale,
+					"label.scadenzegeniocivile.provincia")));
 			sb.append(StringPool.SEMICOLON);
-			sb.append(CSVUtil.encode(LanguageUtil.get(getPortletConfig(), locale, "label.scadenzegeniocivile.gg")));
+			sb.append(CSVUtil.encode(LanguageUtil.get(getPortletConfig(), locale,
+					"label.scadenzegeniocivile.gg")));
 			sb.append(StringPool.SEMICOLON);
 
 			sb.append(StringPool.NEW_LINE);
 
-
 			SimpleDateFormat sdf = new SimpleDateFormat("dd/MM/yyyy");
 
 			for (ControlloPratica controlloPratica : lista) {
 
-				IntPratica intPratica = IntPraticaLocalServiceUtil.fetchIntPratica(controlloPratica.getIntPraticaId());
+				IntPratica intPratica = IntPraticaLocalServiceUtil.fetchIntPratica(controlloPratica
+						.getIntPraticaId());
 
-				Territorio territorio = TerritorioLocalServiceUtil.fetchTerritorio(intPratica.getTerritorioId());
+				Territorio territorio = TerritorioLocalServiceUtil.fetchTerritorio(intPratica
+						.getTerritorioId());
 				Comune comune = ComuneLocalServiceUtil.fetchComune(territorio.getComuneId());
 
-				Provincia provincia =
+				Provincia provincia = ProvinciaLocalServiceUtil.fetchByC_C(territorio.getCompanyId(),
-						ProvinciaLocalServiceUtil.fetchByC_C(territorio.getCompanyId(), territorio.getCodiceProvincia());
+						territorio.getCodiceProvincia());
 
 				// Informazioni relative al workflow
-				WorkflowInstanceLink workflowInstanceLink =
+				WorkflowInstanceLink workflowInstanceLink = WorkflowInstanceLinkLocalServiceUtil
-						WorkflowInstanceLinkLocalServiceUtil.fetchWorkflowInstanceLink(controlloPratica.getCompanyId(),
+						.fetchWorkflowInstanceLink(controlloPratica.getCompanyId(),
-								controlloPratica.getGroupId(), ControlloPratica.class.getName(), controlloPratica.getPrimaryKey());
+								controlloPratica.getGroupId(), ControlloPratica.class.getName(),
+								controlloPratica.getPrimaryKey());
 
 				long workflowInstanceId = workflowInstanceLink.getWorkflowInstanceId();
-				WorkflowInstance workflowInstance =
+				WorkflowInstance workflowInstance = WorkflowInstanceManagerUtil.getWorkflowInstance(
-						WorkflowInstanceManagerUtil.getWorkflowInstance(controlloPratica.getCompanyId(), workflowInstanceId);
+						controlloPratica.getCompanyId(), workflowInstanceId);
 
-				List<WorkflowTask> listaTask =
+				List<WorkflowTask> listaTask = WorkflowTaskManagerUtil.getWorkflowTasksByWorkflowInstance(
-						WorkflowTaskManagerUtil.getWorkflowTasksByWorkflowInstance(controlloPratica.getCompanyId(), null,
+						controlloPratica.getCompanyId(), null, workflowInstance.getWorkflowInstanceId(),
-								workflowInstance.getWorkflowInstanceId(), false, QueryUtil.ALL_POS, QueryUtil.ALL_POS, null);
+						false, QueryUtil.ALL_POS, QueryUtil.ALL_POS, null);
 
 				WorkflowTask task = null;
 				if (listaTask != null && !listaTask.isEmpty()) {
@@ -493,30 +522,33 @@ public class GestioneAttivitaPortlet extends MVCPortlet {
 				String taskName = StringPool.BLANK;
 				if (task != null) {
 					User userTask = UserLocalServiceUtil.fetchUser(task.getAssigneeUserId());
-					//Bug 33264
+					// Bug 33264
 					taskName = LanguageUtil.get(getPortletConfig(), locale, task.getName());
 					if (userTask != null) {
 						taskName += " (" + userTask.getFullName() + ")";
 					}
 				} else {
-					//Bug 33264
+					// Bug 33264
 					taskName = LanguageUtil.get(getPortletConfig(), locale, workflowInstance.getState());
 				}
 				sb.append(CSVUtil.encode(taskName));
 				sb.append(StringPool.SEMICOLON);
 
-				String tipoEsito = ControlloPraticaLocalServiceUtil.getTipoEsito(controlloPratica.getControlloPraticaId());
+				String tipoEsito = ControlloPraticaLocalServiceUtil.getTipoEsito(controlloPratica
+						.getControlloPraticaId());
 				sb.append(CSVUtil.encode(tipoEsito));
 				sb.append(StringPool.SEMICOLON);
-				
+
-				//ADT - BUG-13 Aggiunta colonna Data Esito
+				// ADT - BUG-13 Aggiunta colonna Data Esito
-				//Bug 33264
+				// Bug 33264
-				if(cmd.equals("exportRicercaAttivitaConcluse")){
+				if (cmd.equals("exportRicercaAttivitaConcluse")) {
-					sb.append(CSVUtil.encode(controlloPratica.getStatusDate() != null ? sdf.format(controlloPratica.getStatusDate()) : "" ));
+					sb.append(CSVUtil.encode(controlloPratica.getStatusDate() != null ? sdf
+							.format(controlloPratica.getStatusDate()) : ""));
 					sb.append(StringPool.SEMICOLON);
 				}
 
-				boolean sorteggiata = SorteggioLocalServiceUtil.findByIntPratica(intPratica.getIntPraticaId()) != null;
+				boolean sorteggiata = SorteggioLocalServiceUtil
+						.findByIntPratica(intPratica.getIntPraticaId()) != null;
 				sb.append(CSVUtil.encode((sorteggiata) ? "Si" : "No"));
 				sb.append(StringPool.SEMICOLON);
 
@@ -537,9 +569,9 @@ public class GestioneAttivitaPortlet extends MVCPortlet {
 				sb.append(StringPool.SEMICOLON);
 
 				StringBuilder provenienzaLabel = new StringBuilder();
-				WorkflowTask workflowTask =
+				WorkflowTask workflowTask = WorkflowUtil.getLastCompletedTask(
-						WorkflowUtil.getLastCompletedTask(controlloPratica.getCompanyId(), controlloPratica.getGroupId(), null,
+						controlloPratica.getCompanyId(), controlloPratica.getGroupId(), null,
-								controlloPratica);
+						controlloPratica);
 
 				if (workflowTask != null) {
 					User approvatore = UserLocalServiceUtil.fetchUser(workflowTask.getAssigneeUserId());
@@ -597,38 +629,45 @@ public class GestioneAttivitaPortlet extends MVCPortlet {
 		List<ControlloPratica> listaControlloPratica = new ArrayList<ControlloPratica>();
 
 		if (dirigente) {
-			listaControlloPratica =
+			listaControlloPratica = ControlloPraticaAdvancedSearch.searchTaskPerEsportazioneDirigente(
-					ControlloPraticaAdvancedSearch.searchTaskPerEsportazioneDirigente(httpRequest, user, QueryUtil.ALL_POS,
+					httpRequest, user, QueryUtil.ALL_POS, QueryUtil.ALL_POS);
-							QueryUtil.ALL_POS);
 		} else {
-			listaControlloPratica =
+			listaControlloPratica = ControlloPraticaAdvancedSearch.searchTaskPerEsportazionePO(httpRequest,
-					ControlloPraticaAdvancedSearch.searchTaskPerEsportazionePO(httpRequest, user, QueryUtil.ALL_POS,
+					user, QueryUtil.ALL_POS, QueryUtil.ALL_POS);
-							QueryUtil.ALL_POS);
 		}
 
-		sb.append(CSVUtil.encode(LanguageUtil.get(getPortletConfig(), locale, "label.scadenzegeniocivile.attivita")));
+		sb.append(CSVUtil.encode(LanguageUtil.get(getPortletConfig(), locale,
+				"label.scadenzegeniocivile.attivita")));
 		sb.append(StringPool.SEMICOLON);
-		sb.append(CSVUtil.encode(LanguageUtil.get(getPortletConfig(), locale, "label.scadenzegeniocivile.esito")));
+		sb.append(CSVUtil.encode(LanguageUtil.get(getPortletConfig(), locale,
+				"label.scadenzegeniocivile.esito")));
 		sb.append(StringPool.SEMICOLON);
-		
+
-		//ADT - BUG-13 Aggiunta colonna Data Esito
+		// ADT - BUG-13 Aggiunta colonna Data Esito
-		//Bug 33264
+		// Bug 33264
-		if("Tab_TaskCompletati".equals(currentTab)){
+		if ("Tab_TaskCompletati".equals(currentTab)) {
-			sb.append(CSVUtil.encode(LanguageUtil.get(getPortletConfig(), locale, "label.scadenzegeniocivile.dataesito")));
+			sb.append(CSVUtil.encode(LanguageUtil.get(getPortletConfig(), locale,
+					"label.scadenzegeniocivile.dataesito")));
 			sb.append(StringPool.SEMICOLON);
 		}
-		
+
-		sb.append(CSVUtil.encode(LanguageUtil.get(getPortletConfig(), locale, "label.scadenzegeniocivile.sorteggiata")));
+		sb.append(CSVUtil.encode(LanguageUtil.get(getPortletConfig(), locale,
+				"label.scadenzegeniocivile.sorteggiata")));
 		sb.append(StringPool.SEMICOLON);
-		sb.append(CSVUtil.encode(LanguageUtil.get(getPortletConfig(), locale, "label.scadenzegeniocivile.pratica")));
+		sb.append(CSVUtil.encode(LanguageUtil.get(getPortletConfig(), locale,
+				"label.scadenzegeniocivile.pratica")));
 		sb.append(StringPool.SEMICOLON);
-		sb.append(CSVUtil.encode(LanguageUtil.get(getPortletConfig(), locale, "label.scadenzegeniocivile.istruttore")));
+		sb.append(CSVUtil.encode(LanguageUtil.get(getPortletConfig(), locale,
+				"label.scadenzegeniocivile.istruttore")));
 		sb.append(StringPool.SEMICOLON);
-		sb.append(CSVUtil.encode(LanguageUtil.get(getPortletConfig(), locale, "label.scadenzegeniocivile.provenienza")));
+		sb.append(CSVUtil.encode(LanguageUtil.get(getPortletConfig(), locale,
+				"label.scadenzegeniocivile.provenienza")));
 		sb.append(StringPool.SEMICOLON);
-		sb.append(CSVUtil.encode(LanguageUtil.get(getPortletConfig(), locale, "label.scadenzegeniocivile.avvioprocedimento")));
+		sb.append(CSVUtil.encode(LanguageUtil.get(getPortletConfig(), locale,
+				"label.scadenzegeniocivile.avvioprocedimento")));
 		sb.append(StringPool.SEMICOLON);
-		sb.append(CSVUtil.encode(LanguageUtil.get(getPortletConfig(), locale, "label.scadenzegeniocivile.provincia")));
+		sb.append(CSVUtil.encode(LanguageUtil.get(getPortletConfig(), locale,
+				"label.scadenzegeniocivile.provincia")));
 		sb.append(StringPool.SEMICOLON);
 		sb.append(CSVUtil.encode(LanguageUtil.get(getPortletConfig(), locale, "label.scadenzegeniocivile.gg")));
 		sb.append(StringPool.SEMICOLON);
@@ -641,26 +680,29 @@ public class GestioneAttivitaPortlet extends MVCPortlet {
 
 			for (ControlloPratica controlloPratica : listaControlloPratica) {
 
-				IntPratica intPratica = IntPraticaLocalServiceUtil.fetchIntPratica(controlloPratica.getIntPraticaId());
+				IntPratica intPratica = IntPraticaLocalServiceUtil.fetchIntPratica(controlloPratica
+						.getIntPraticaId());
 
-				Territorio territorio = TerritorioLocalServiceUtil.fetchTerritorio(intPratica.getTerritorioId());
+				Territorio territorio = TerritorioLocalServiceUtil.fetchTerritorio(intPratica
+						.getTerritorioId());
 				Comune comune = ComuneLocalServiceUtil.fetchComune(territorio.getComuneId());
 
-				Provincia provincia =
+				Provincia provincia = ProvinciaLocalServiceUtil.fetchByC_C(territorio.getCompanyId(),
-						ProvinciaLocalServiceUtil.fetchByC_C(territorio.getCompanyId(), territorio.getCodiceProvincia());
+						territorio.getCodiceProvincia());
 
 				// Informazioni relative al workflow
-				WorkflowInstanceLink workflowInstanceLink =
+				WorkflowInstanceLink workflowInstanceLink = WorkflowInstanceLinkLocalServiceUtil
-						WorkflowInstanceLinkLocalServiceUtil.fetchWorkflowInstanceLink(controlloPratica.getCompanyId(),
+						.fetchWorkflowInstanceLink(controlloPratica.getCompanyId(),
-								controlloPratica.getGroupId(), ControlloPratica.class.getName(), controlloPratica.getPrimaryKey());
+								controlloPratica.getGroupId(), ControlloPratica.class.getName(),
+								controlloPratica.getPrimaryKey());
 
 				long workflowInstanceId = workflowInstanceLink.getWorkflowInstanceId();
-				WorkflowInstance workflowInstance =
+				WorkflowInstance workflowInstance = WorkflowInstanceManagerUtil.getWorkflowInstance(
-						WorkflowInstanceManagerUtil.getWorkflowInstance(controlloPratica.getCompanyId(), workflowInstanceId);
+						controlloPratica.getCompanyId(), workflowInstanceId);
 
-				List<WorkflowTask> listaTask =
+				List<WorkflowTask> listaTask = WorkflowTaskManagerUtil.getWorkflowTasksByWorkflowInstance(
-						WorkflowTaskManagerUtil.getWorkflowTasksByWorkflowInstance(controlloPratica.getCompanyId(), null,
+						controlloPratica.getCompanyId(), null, workflowInstance.getWorkflowInstanceId(),
-								workflowInstance.getWorkflowInstanceId(), false, QueryUtil.ALL_POS, QueryUtil.ALL_POS, null);
+						false, QueryUtil.ALL_POS, QueryUtil.ALL_POS, null);
 
 				WorkflowTask task = null;
 				if (listaTask != null && !listaTask.isEmpty()) {
@@ -680,18 +722,20 @@ public class GestioneAttivitaPortlet extends MVCPortlet {
 				sb.append(CSVUtil.encode(taskName));
 				sb.append(StringPool.SEMICOLON);
 
-				String tipoEsito = ControlloPraticaLocalServiceUtil.getTipoEsito(controlloPratica.getControlloPraticaId());
+				String tipoEsito = ControlloPraticaLocalServiceUtil.getTipoEsito(controlloPratica
+						.getControlloPraticaId());
 				sb.append(CSVUtil.encode(tipoEsito));
 				sb.append(StringPool.SEMICOLON);
 
-				//ADT - BUG-13 Aggiunta colonna Data Esito
+				// ADT - BUG-13 Aggiunta colonna Data Esito
-				//Bug 33264
+				// Bug 33264
-				if("Tab_TaskCompletati".equals(currentTab)){
+				if ("Tab_TaskCompletati".equals(currentTab)) {
 					sb.append(CSVUtil.encode(sdf.format(controlloPratica.getStatusDate())));
 					sb.append(StringPool.SEMICOLON);
 				}
-				
+
-				boolean sorteggiata = SorteggioLocalServiceUtil.findByIntPratica(intPratica.getIntPraticaId()) != null;
+				boolean sorteggiata = SorteggioLocalServiceUtil
+						.findByIntPratica(intPratica.getIntPraticaId()) != null;
 				sb.append(CSVUtil.encode((sorteggiata) ? "Si" : "No"));
 				sb.append(StringPool.SEMICOLON);
 
@@ -712,9 +756,9 @@ public class GestioneAttivitaPortlet extends MVCPortlet {
 				sb.append(StringPool.SEMICOLON);
 
 				StringBuilder provenienzaLabel = new StringBuilder();
-				WorkflowTask workflowTask =
+				WorkflowTask workflowTask = WorkflowUtil.getLastCompletedTask(
-						WorkflowUtil.getLastCompletedTask(controlloPratica.getCompanyId(), controlloPratica.getGroupId(), null,
+						controlloPratica.getCompanyId(), controlloPratica.getGroupId(), null,
-								controlloPratica);
+						controlloPratica);
 
 				if (workflowTask != null) {
 					User approvatore = UserLocalServiceUtil.fetchUser(workflowTask.getAssigneeUserId());

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=2520
+    build.number=2523
-    build.date=1605540160967
+    build.date=1605800527040
     build.auto.upgrade=true
 
 ##

liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/html/common/preview_file_entry.jsp

@@ -216,6 +216,8 @@ boolean enableCommentRatings = false;
 										<div class="alert alert-info">
 											<liferay-ui:message key="generating-preview-will-take-a-few-minutes" />
 										</div>
+										<div class="loading-animation"></div>
+										<script>setTimeout(function() { window.location.reload(1)}, 1500);</script>
 									</c:when>
 									<c:otherwise>
 										<div class="alert alert-info">									

liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/html/common/preview_file_entry.jsp

@@ -215,6 +215,8 @@ boolean enableCommentRatings = false;
 										<div class="alert alert-info">
 											<liferay-ui:message key="generating-preview-will-take-a-few-minutes" />
 										</div>
+										<div class="loading-animation"></div>
+										<script>setTimeout(function() { window.location.reload(1)}, 1500);</script>
 									</c:when>
 									<c:otherwise>
 										<div class="alert alert-info">									

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

@@ -225,7 +225,7 @@
 			boolean canAddIntegrazione = ValidazionePraticaUtil.praticaCanAddIntegrazione(intPratica.getIntPraticaId());
 			boolean canEditIntegrazione = ValidazionePraticaUtil.praticaCanEditIntegrazione(intPratica.getIntPraticaId());
 			boolean canDeleteIntegrazione = ValidazionePraticaUtil.praticaCanDeleteIntegrazione(intPratica.getIntPraticaId());
-		%>		
+		%>
 		<c:if test="<%= intPratica.getUserId()==user.getUserId() && (canAddIntegrazione || canEditIntegrazione || canDeleteIntegrazione  )%>">
 			<c:if test="<%= !intPratica.getSospesa() %>">
 				<div class="separator"></div>