From c5de7624c8a8840ac5e2446d0343aaf89d1ca58e Mon Sep 17 00:00:00 2001 From: Salvatore La Manna Date: Fri, 1 Jul 2022 15:18:39 +0200 Subject: [PATCH] Corretta provenienza documenti --- jasper/Attestazione Vincoli.jrxml | 4 +- jasper/Autorizzazione.jrxml | 6 +- jasper/Avviso di Non Competenza.jrxml | 2 +- jasper/Cambio Istruttore.jrxml | 6 +- jasper/Mod. A - Presa in carico.jrxml | 4 +- jasper/Preavviso di Parere Contrario.jrxml | 2 +- jasper/Richiesta Integrazione.jrxml | 2 +- jasper/VIArch attivazione.jrxml | 6 +- jasper/VIArch conclusione.jrxml | 6 +- jasper/annullamento.jrxml | 2 +- .../liferay/portos/bo/util/WorkflowUtil.java | 9 ++- .../it/mwg/sismica/bo/util/SismicaUtil.java | 9 +++ .../it/mwg/sismica/bo/util/WorkflowUtil.java | 68 +++++++++++++++++++ .../impl/IntPraticaLocalServiceImpl.java | 3 +- .../html/gestioneattivita/view_columns.jspf | 44 ++++-------- .../portos/fe/portlet/FascicoloFePortlet.java | 13 ++-- .../fe/portlet/RicercaPratichePortlet.java | 5 +- .../html/ricercapratiche/dett_pratica.jsp | 55 ++++++--------- .../docroot/html/ricercapratiche/view.jsp | 2 +- .../workflow_instances/workflow_logs.jspf | 4 +- .../WEB-INF/src/content/Language.properties | 1 - .../src/content/Language_it.properties | 1 - .../hook/struts/EditWorkflowTaskAction.java | 2 - 23 files changed, 152 insertions(+), 104 deletions(-) create mode 100644 liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/mwg/sismica/bo/util/WorkflowUtil.java diff --git a/jasper/Attestazione Vincoli.jrxml b/jasper/Attestazione Vincoli.jrxml index 91afdf9b..d8d450f6 100644 --- a/jasper/Attestazione Vincoli.jrxml +++ b/jasper/Attestazione Vincoli.jrxml @@ -276,7 +276,7 @@ e dell'identità siciliana]]> - + @@ -372,7 +372,7 @@ e dell'identità siciliana]]> - + - + @@ -384,7 +384,7 @@ esaminata la documentazione allegata all’istanza;]]> - + - + - + - + Si comunica inoltre che i termini del procedimento non subiscono variazioni."]]> @@ -324,7 +324,7 @@ e dell'identità siciliana]]> - + @@ -337,7 +337,7 @@ e dell'identità siciliana]]> - + - + - + diff --git a/jasper/Preavviso di Parere Contrario.jrxml b/jasper/Preavviso di Parere Contrario.jrxml index b95cece9..f3b8ea87 100644 --- a/jasper/Preavviso di Parere Contrario.jrxml +++ b/jasper/Preavviso di Parere Contrario.jrxml @@ -346,7 +346,7 @@ Trascorso infruttuosamente tale termine si procederà all’emissione di provved - + - + - + @@ -372,7 +372,7 @@ esaminata la documentazione allegata all’istanza;]]> - + - + - + @@ -372,7 +372,7 @@ esaminata la documentazione allegata all’istanza;]]> - + - + - + diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/util/WorkflowUtil.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/util/WorkflowUtil.java index 080fc752..d5ddfe26 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/util/WorkflowUtil.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/util/WorkflowUtil.java @@ -33,6 +33,7 @@ import com.liferay.portal.kernel.workflow.WorkflowInstance; import com.liferay.portal.kernel.workflow.WorkflowInstanceManagerUtil; import com.liferay.portal.kernel.workflow.WorkflowTask; import com.liferay.portal.kernel.workflow.WorkflowTaskManagerUtil; +import com.liferay.portal.kernel.workflow.comparator.WorkflowComparatorFactoryUtil; import com.liferay.portal.model.User; import com.liferay.portal.model.WorkflowInstanceLink; import com.liferay.portal.service.ServiceContext; @@ -65,7 +66,8 @@ public class WorkflowUtil { } catch (NoSuchWorkflowInstanceLinkException e) {} if (workflowInstance != null) { List listaTmp = WorkflowTaskManagerUtil.getWorkflowTasksByWorkflowInstance(companyId, userId, - workflowInstance.getWorkflowInstanceId(), completed, QueryUtil.ALL_POS, QueryUtil.ALL_POS, null); + workflowInstance.getWorkflowInstanceId(), completed, 0, 1, + WorkflowComparatorFactoryUtil.getTaskCompletionDateComparator(false)); if (!listaTmp.isEmpty()) { return listaTmp.get(0); } @@ -73,8 +75,9 @@ public class WorkflowUtil { return null; } - public static WorkflowTask getLastApprovazioneTask(long companyId, long groupId, Long userId, ControlloPratica bean) - throws PortalException, SystemException { + public static WorkflowTask + getLastApprovazioneTask(long companyId, long groupId, Long userId, ControlloPratica bean) + throws PortalException, SystemException { WorkflowInstanceLink workflowInstanceLink = WorkflowInstanceLinkLocalServiceUtil.getWorkflowInstanceLink( companyId, groupId, ControlloPratica.class.getName(), bean.getPrimaryKey()); diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/mwg/sismica/bo/util/SismicaUtil.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/mwg/sismica/bo/util/SismicaUtil.java index 2ed387db..5c50cdf7 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/mwg/sismica/bo/util/SismicaUtil.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/mwg/sismica/bo/util/SismicaUtil.java @@ -20,6 +20,7 @@ import it.tref.liferay.portos.bo.service.DettPraticaLocalServiceUtil; import it.tref.liferay.portos.bo.service.IntPraticaLocalServiceUtil; import it.tref.liferay.portos.bo.service.TerritorioLocalServiceUtil; import it.tref.liferay.portos.bo.shared.util.StatoPraticaConstants; +import it.tref.liferay.portos.bo.shared.util.TipoIntegrazioneUtil; import it.tref.liferay.portos.bo.util.Constants; import java.io.Serializable; @@ -29,6 +30,7 @@ import java.sql.Statement; import java.text.ParseException; import java.text.SimpleDateFormat; import java.util.ArrayList; +import java.util.Arrays; import java.util.Calendar; import java.util.Date; import java.util.HashMap; @@ -205,6 +207,13 @@ public class SismicaUtil { long taskId, String taskName, long nodeId, String nodeName) throws SystemException, PortalException { List esito = new ArrayList<>(); + // Annulla l'eventuale integrazione presente e non conclusa + DettPratica integrazione = DettPraticaLocalServiceUtil.getLastEditabledByIntPraticaAndTipoPratica( + pratica.getIntPraticaId(), Arrays.asList(TipoIntegrazioneUtil.RICHIESTA_INTEGRAZIONE)); + if (Validator.isNotNull(integrazione)) { + DettPraticaLocalServiceUtil.deleteDettPratica(integrazione); + } + // Riassegna il workflow al tecnico List controlli = ControlloPraticaLocalServiceUtil.findByIntPraticaId_Status( pratica.getIntPraticaId(), WorkflowConstants.STATUS_PENDING); if (1 == controlli.size()) { diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/mwg/sismica/bo/util/WorkflowUtil.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/mwg/sismica/bo/util/WorkflowUtil.java new file mode 100644 index 00000000..1cab4b8a --- /dev/null +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/mwg/sismica/bo/util/WorkflowUtil.java @@ -0,0 +1,68 @@ +package it.mwg.sismica.bo.util; + +import it.mwg.sismica.bo.shared.util.Generics; +import it.tref.liferay.portos.bo.model.ControlloPratica; + +import java.util.Arrays; +import java.util.List; + +import com.liferay.portal.kernel.dao.orm.QueryUtil; +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.StringPool; +import com.liferay.portal.kernel.workflow.WorkflowInstance; +import com.liferay.portal.kernel.workflow.WorkflowInstanceManagerUtil; +import com.liferay.portal.kernel.workflow.WorkflowLog; +import com.liferay.portal.kernel.workflow.WorkflowLogManagerUtil; +import com.liferay.portal.kernel.workflow.WorkflowTask; +import com.liferay.portal.kernel.workflow.WorkflowTaskManagerUtil; +import com.liferay.portal.kernel.workflow.comparator.WorkflowComparatorFactoryUtil; +import com.liferay.portal.model.User; +import com.liferay.portal.model.WorkflowInstanceLink; +import com.liferay.portal.service.UserLocalServiceUtil; +import com.liferay.portal.service.WorkflowInstanceLinkLocalServiceUtil; + +public class WorkflowUtil { + + private static final Log _log = LogFactoryUtil.getLog(WorkflowUtil.class); + + public static String provenienza(ControlloPratica cp) { + + String provenienza = StringPool.DASH; + long companyId = cp.getCompanyId(); + try { + WorkflowInstanceLink link = WorkflowInstanceLinkLocalServiceUtil.getWorkflowInstanceLink(companyId, + cp.getGroupId(), ControlloPratica.class.getName(), cp.getPrimaryKey()); + WorkflowInstance instance = WorkflowInstanceManagerUtil.getWorkflowInstance(companyId, + link.getWorkflowInstanceId()); + List logs = WorkflowLogManagerUtil.getWorkflowLogsByWorkflowInstance(companyId, + instance.getWorkflowInstanceId(), Arrays.asList(WorkflowLog.TASK_ASSIGN), QueryUtil.ALL_POS, + QueryUtil.ALL_POS, WorkflowComparatorFactoryUtil.getLogCreateDateComparator(true)); + String taskName = null; + long userId = 0; + for (WorkflowLog log : logs) { + if (log.getAuditUserId() != 0 && log.getRoleId() == 0 && log.getWorkflowTaskId() != 0) { + WorkflowTask task = WorkflowTaskManagerUtil.getWorkflowTask(companyId, log.getWorkflowTaskId()); + if (task.isCompleted()) { + taskName = task.getName(); + } + if (log.getUserId() != log.getAuditUserId() || task.isCompleted()) { + userId = log.getAuditUserId(); + } + } + } + if (userId != 0) { + User audit = UserLocalServiceUtil.fetchUser(userId); + provenienza = Generics.capitalizeFull(audit.getFullName()); + if (null != taskName) { + provenienza += " (" + taskName + ')'; + } + } + } catch (PortalException | SystemException e) { + _log.error(e, e); + } + return provenienza; + } +} diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/IntPraticaLocalServiceImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/IntPraticaLocalServiceImpl.java index a985902c..9588b2dc 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/IntPraticaLocalServiceImpl.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/IntPraticaLocalServiceImpl.java @@ -93,7 +93,6 @@ import com.liferay.portal.kernel.util.LocaleUtil; import com.liferay.portal.kernel.util.MimeTypesUtil; import com.liferay.portal.kernel.util.StringPool; import com.liferay.portal.kernel.util.Validator; -import com.liferay.portal.kernel.workflow.WorkflowException; import com.liferay.portal.kernel.workflow.WorkflowHandlerRegistryUtil; import com.liferay.portal.kernel.workflow.WorkflowTask; import com.liferay.portal.model.Group; @@ -965,7 +964,7 @@ public class IntPraticaLocalServiceImpl extends IntPraticaLocalServiceBaseImpl { FormLogLocalServiceUtil.addFormLog(lastTask.getWorkflowInstanceId(), 0L, "cambio-istruttore", jsonFormParameters, serviceContext); } catch (Exception e) { - throw new WorkflowException(e); + _log.error(e, e); } } diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/html/gestioneattivita/view_columns.jspf b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/html/gestioneattivita/view_columns.jspf index 793806ba..b3d87bda 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/html/gestioneattivita/view_columns.jspf +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/html/gestioneattivita/view_columns.jspf @@ -11,6 +11,8 @@ <%@page import="com.liferay.portal.model.WorkflowInstanceLink"%> <%@page import="com.liferay.portal.service.UserLocalServiceUtil"%> <%@page import="com.liferay.portal.service.WorkflowInstanceLinkLocalServiceUtil"%> +<%@page import="it.mwg.sismica.bo.shared.util.Generics"%> +<%@page import="it.mwg.sismica.bo.util.WorkflowUtil"%> <%@page import="it.tref.liferay.portos.bo.model.Comune"%> <%@page import="it.tref.liferay.portos.bo.model.ControlloPratica"%> <%@page import="it.tref.liferay.portos.bo.model.DettPratica"%> @@ -27,7 +29,6 @@ <%@page import="it.tref.liferay.portos.bo.service.TerritorioLocalServiceUtil"%> <%@page import="it.tref.liferay.portos.bo.shared.util.StatoPraticaConstants"%> <%@page import="it.tref.liferay.portos.bo.shared.util.TipoIntegrazioneUtil"%> -<%@page import="it.tref.liferay.portos.bo.util.WorkflowUtil"%> <%@page import="it.tref.liferay.portos.kaleo.shared.util.WorkflowConstants"%> <%@page import="java.util.List"%> <% @@ -64,31 +65,33 @@ DettPratica lastDettPratica = DettPraticaLocalServiceUtil.getLastCompletedByIntP %> <% - StringBuilder taskName = new StringBuilder(); if (task != null) { + out.print(LanguageUtil.get(pageContext,task.getName())); User userTask = UserLocalServiceUtil.fetchUser(task.getAssigneeUserId()); - taskName.append(LanguageUtil.get(pageContext,task.getName())); if (userTask != null) { - taskName.append(" (").append(userTask.getFullName()).append(StringPool.CLOSE_PARENTHESIS); + out.print(" ("); + out.print(Generics.capitalizeFull(userTask.getFullName())); + out.print(StringPool.CLOSE_PARENTHESIS); } } else if (workflowInstance != null) { - taskName.append(LanguageUtil.get(pageContext, workflowInstance.getState())); + out.print(LanguageUtil.get(pageContext, workflowInstance.getState())); } if (lastDettPratica != null) { if (lastDettPratica.getTipoIntegrazione() != null) { //BUG BO ID=14: NOME TASK SEZIONE ATTIVITÀ if (lastDettPratica.getTipoIntegrazione().equals(TipoIntegrazioneUtil.RICHIESTA_INTEGRAZIONE)) { - taskName.append(" - Integrazione #").append(lastDettPratica.getIntegrazione()); + out.print(" - Integrazione #"); + out.print(lastDettPratica.getIntegrazione()); } else if (lastDettPratica.getTipoIntegrazione().equals(TipoIntegrazioneUtil.VARIANTE)) { - taskName.append(" - Variante #").append(lastDettPratica.getVarianteNumero()); + out.print(" - Variante #"); + out.print(lastDettPratica.getVarianteNumero()); } } } - if (intPratica.hasRichiestaIntegrazioneAttiva()) { - taskName.append(StringPool.SPACE).append(LanguageUtil.get(pageContext, "in-corso")); + out.print(StringPool.SPACE); + out.print(LanguageUtil.get(pageContext, "in-corso")); } - out.print(taskName); %> @@ -156,27 +159,8 @@ DettPratica lastDettPratica = DettPraticaLocalServiceUtil.getLastCompletedByIntP <% - WorkflowTask workflowTask = WorkflowUtil.getLastCompletedTask(controlloPratica.getCompanyId(), - controlloPratica.getGroupId(), null, controlloPratica); + out.print(WorkflowUtil.provenienza(controlloPratica)); %> - - <% - User approvatore = UserLocalServiceUtil.fetchUser(workflowTask.getAssigneeUserId()); - if (approvatore!=null) { - out.print(approvatore.getFullName()); - } else { - out.print( " ["); - out.print(workflowTask.getAssigneeUserId()); - out.print(StringPool.CLOSE_BRACKET); - } - out.print(" ("); - out.print(workflowTask.getName()); - out.print(StringPool.CLOSE_PARENTHESIS); - %> - - - - - diff --git a/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/fe/portlet/FascicoloFePortlet.java b/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/fe/portlet/FascicoloFePortlet.java index 375409fe..38040957 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/fe/portlet/FascicoloFePortlet.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/fe/portlet/FascicoloFePortlet.java @@ -546,9 +546,14 @@ public class FascicoloFePortlet extends MVCPortlet { if (!isIntegrazione) { throw new SystemException("Impossibile creare integrazione"); } - DettPratica lastDettPratica = DettPraticaLocalServiceUtil.getLastCompletedByIntPratica(intPraticaId); - DettPratica dettPratica = DettPraticaServiceUtil.addDettPraticaClonedToIntPratica(intPraticaId, - lastDettPratica.getDettPraticaId(), TipoIntegrazioneUtil.RICHIESTA_INTEGRAZIONE, serviceContext); + DettPratica dettPratica = DettPraticaLocalServiceUtil.getLastEditabledByIntPraticaAndTipoPratica( + intPraticaId, Arrays.asList(TipoIntegrazioneUtil.RICHIESTA_INTEGRAZIONE)); + if (Validator.isNull(dettPratica)) { + DettPratica lastDettPratica = DettPraticaLocalServiceUtil.getLastCompletedByIntPratica(intPraticaId); + dettPratica = DettPraticaServiceUtil + .addDettPraticaClonedToIntPratica(intPraticaId, lastDettPratica.getDettPraticaId(), + TipoIntegrazioneUtil.RICHIESTA_INTEGRAZIONE, serviceContext); + } successURL = HttpUtil.addParameter(successURL, response.getNamespace() + "dettPraticaId", String.valueOf(dettPratica.getDettPraticaId())); response.sendRedirect(successURL); @@ -566,7 +571,7 @@ public class FascicoloFePortlet extends MVCPortlet { try { long intPraticaId = ParamUtil.getLong(request, "intPraticaId"); DettPratica dettPratica = DettPraticaServiceUtil.getLastEditabledByIntPraticaAndTipoPratica(intPraticaId, - Arrays.asList(new String[] { TipoIntegrazioneUtil.RICHIESTA_INTEGRAZIONE })); + Arrays.asList(TipoIntegrazioneUtil.RICHIESTA_INTEGRAZIONE)); if (Validator.isNull(dettPratica)) { throw new SystemException("no integrazione in progress int fascicolo #" + intPraticaId); } diff --git a/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/fe/portlet/RicercaPratichePortlet.java b/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/fe/portlet/RicercaPratichePortlet.java index f104f80c..8ce92e3e 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/fe/portlet/RicercaPratichePortlet.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/fe/portlet/RicercaPratichePortlet.java @@ -24,7 +24,6 @@ import com.liferay.portal.kernel.servlet.HttpHeaders; import com.liferay.portal.kernel.servlet.SessionErrors; import com.liferay.portal.kernel.util.FileUtil; import com.liferay.portal.kernel.util.ParamUtil; -import com.liferay.portal.kernel.util.StringPool; import com.liferay.portlet.documentlibrary.service.DLAppLocalServiceUtil; import com.liferay.portlet.documentlibrary.service.DLFileEntryLocalServiceUtil; import com.liferay.util.bridges.mvc.MVCPortlet; @@ -92,13 +91,13 @@ public class RicercaPratichePortlet extends MVCPortlet { long fileEntryId = ParamUtil.getLong(resourceRequest, "fileEntryId"); String version = ParamUtil.getString(resourceRequest, "version"); FileEntry fileEntry = DLAppLocalServiceUtil.getFileEntry(fileEntryId); - String fileName = fileEntry.getTitle() + StringPool.PERIOD + fileEntry.getExtension(); + String fileName = fileEntry.getTitle() + '.' + fileEntry.getExtension(); byte[] data = FileUtil.getBytes(DLFileEntryLocalServiceUtil.getFileAsStream(fileEntryId, version, false)); resourceResponse.setContentType(fileEntry.getMimeType()); resourceResponse.addProperty(HttpHeaders.CACHE_CONTROL, "max-age=3600, must-revalidate"); resourceResponse.addProperty(HttpHeaders.CONTENT_DISPOSITION, "attachment; filename=\"" + fileName - + StringPool.QUOTE); + + '"'); resourceResponse.setContentLength(data.length); resourceResponse.getPortletOutputStream().write(data); resourceResponse.getPortletOutputStream().flush(); diff --git a/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/html/ricercapratiche/dett_pratica.jsp b/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/html/ricercapratiche/dett_pratica.jsp index 423728fb..1bdcd02d 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/html/ricercapratiche/dett_pratica.jsp +++ b/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/html/ricercapratiche/dett_pratica.jsp @@ -17,51 +17,36 @@ <%@page import="java.util.List"%> <%@page import="com.liferay.portal.kernel.util.StringUtil"%> <%@page import="com.liferay.portal.kernel.util.ParamUtil"%> - <%@include file="/html/ricercapratiche/init.jsp" %> - -<% - String uuid = ParamUtil.getString(renderRequest, "uuid"); - String numeroProgetto = ParamUtil.getString(renderRequest, "numeroProgetto"); - long avvisoId = ParamUtil.getLong(renderRequest, "avvisoId"); - - String tabNames = "Tab_Dettagli_Pratica,Tab_Allegati_Pratica"; - String redirect = ParamUtil.getString(renderRequest, "redirect"); - - String title = DettPraticaLocalServiceUtil.getDettPratica(dettPraticaId).getTitle(locale); -%> - - - - <% - Avviso avviso = AvvisoLocalServiceUtil.getAvviso(avvisoId); - FileEntry fileEntry = DLAppLocalServiceUtil.getFileEntry(avviso.getFileEntryIdInvio()); - ResourceURL resourceURL = renderResponse.createResourceURL(); - resourceURL.setResourceID("downloadFile"); - resourceURL.setParameter("fileEntryId", String.valueOf(fileEntry.getFileEntryId())); - resourceURL.setParameter("version", String.valueOf(fileEntry.getVersion())); - resourceURL.setParameter("uuid", uuid); - resourceURL.setParameter("numeroProgetto", numeroProgetto); +String uuid = ParamUtil.getString(renderRequest, "uuid"); +String numeroProgetto = ParamUtil.getString(renderRequest, "numeroProgetto"); +long avvisoId = ParamUtil.getLong(renderRequest, "avvisoId"); + +String tabNames = "Tab_Dettagli_Pratica,Tab_Allegati_Pratica"; +String redirect = ParamUtil.getString(renderRequest, "redirect"); + +String title = DettPraticaLocalServiceUtil.getDettPratica(dettPraticaId).getTitle(locale); + +Avviso avviso = AvvisoLocalServiceUtil.getAvviso(avvisoId); +FileEntry fileEntry = DLAppLocalServiceUtil.getFileEntry(avviso.getFileEntryIdInvio()); +ResourceURL resourceURL = renderResponse.createResourceURL(); +resourceURL.setResourceID("downloadFile"); +resourceURL.setParameter("fileEntryId", String.valueOf(fileEntry.getFileEntryId())); +resourceURL.setParameter("version", String.valueOf(fileEntry.getVersion())); +resourceURL.setParameter("uuid", uuid); +resourceURL.setParameter("numeroProgetto", numeroProgetto); %> - +
  - +
- - \ No newline at end of file + diff --git a/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/html/ricercapratiche/view.jsp b/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/html/ricercapratiche/view.jsp index 1026d485..9c77ffe0 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/html/ricercapratiche/view.jsp +++ b/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/html/ricercapratiche/view.jsp @@ -6,7 +6,7 @@ <%@include file="/html/ricercapratiche/init.jsp" %> - + diff --git a/liferay-plugins-sdk-6.2/webs/portos-kaleo-web/docroot/META-INF/custom_jsps/html/portlet/workflow_instances/workflow_logs.jspf b/liferay-plugins-sdk-6.2/webs/portos-kaleo-web/docroot/META-INF/custom_jsps/html/portlet/workflow_instances/workflow_logs.jspf index 5a059b4f..011c8696 100644 --- a/liferay-plugins-sdk-6.2/webs/portos-kaleo-web/docroot/META-INF/custom_jsps/html/portlet/workflow_instances/workflow_logs.jspf +++ b/liferay-plugins-sdk-6.2/webs/portos-kaleo-web/docroot/META-INF/custom_jsps/html/portlet/workflow_instances/workflow_logs.jspf @@ -44,8 +44,7 @@ details. if (workflowLog.getRoleId() != 0) { curRole = RoleLocalServiceUtil.getRole(workflowLog.getRoleId()); actorName = HtmlUtil.escape(curRole.getDescriptiveName()); - } - else if (workflowLog.getUserId() != 0) { + } else if (workflowLog.getUserId() != 0) { curUser = UserLocalServiceUtil.getUser(workflowLog.getUserId()); actorName = HtmlUtil.escape(curUser.getFullName()); } @@ -140,6 +139,7 @@ details. +
diff --git a/liferay-plugins-sdk-6.2/webs/portos-kaleo-web/docroot/WEB-INF/src/content/Language.properties b/liferay-plugins-sdk-6.2/webs/portos-kaleo-web/docroot/WEB-INF/src/content/Language.properties index 39af8759..dbbd2bff 100644 --- a/liferay-plugins-sdk-6.2/webs/portos-kaleo-web/docroot/WEB-INF/src/content/Language.properties +++ b/liferay-plugins-sdk-6.2/webs/portos-kaleo-web/docroot/WEB-INF/src/content/Language.properties @@ -10,6 +10,5 @@ error-portos-kaleo-required = {0} is required ## HOOK -x-assigned-the-task-to-x = Task assigned to {1} x-completed-the-task-x-y={0} completed the task {1} ({2}). x-sent-signal-x=System sent a signal {1}. \ No newline at end of file diff --git a/liferay-plugins-sdk-6.2/webs/portos-kaleo-web/docroot/WEB-INF/src/content/Language_it.properties b/liferay-plugins-sdk-6.2/webs/portos-kaleo-web/docroot/WEB-INF/src/content/Language_it.properties index 1f5d2523..83228c65 100644 --- a/liferay-plugins-sdk-6.2/webs/portos-kaleo-web/docroot/WEB-INF/src/content/Language_it.properties +++ b/liferay-plugins-sdk-6.2/webs/portos-kaleo-web/docroot/WEB-INF/src/content/Language_it.properties @@ -10,6 +10,5 @@ error-portos-kaleo-required = {0} campo obbligatorio ## HOOK -x-assigned-the-task-to-x = L'attività è stata assegnata a {1} x-completed-the-task-x-y={0} ha completato l'attività {1} ({2}). x-sent-signal-x=Il sistema ha inviato un segnale {1}. diff --git a/liferay-plugins-sdk-6.2/webs/portos-kaleo-web/docroot/WEB-INF/src/it/tref/liferay/portos/kaleo/hook/struts/EditWorkflowTaskAction.java b/liferay-plugins-sdk-6.2/webs/portos-kaleo-web/docroot/WEB-INF/src/it/tref/liferay/portos/kaleo/hook/struts/EditWorkflowTaskAction.java index 6af1f50c..d920d14e 100644 --- a/liferay-plugins-sdk-6.2/webs/portos-kaleo-web/docroot/WEB-INF/src/it/tref/liferay/portos/kaleo/hook/struts/EditWorkflowTaskAction.java +++ b/liferay-plugins-sdk-6.2/webs/portos-kaleo-web/docroot/WEB-INF/src/it/tref/liferay/portos/kaleo/hook/struts/EditWorkflowTaskAction.java @@ -417,8 +417,6 @@ public class EditWorkflowTaskAction extends BaseStrutsPortletAction { } } renderRequest.setAttribute("canRegistraEsito", canRegistraEsito); - _log.info("canPortosAssegnatore = " + canPortosAssegnatore + ", canRemoveUO = " + canRemoveUO - + ", canRegistraEsito = " + canRegistraEsito); return originalStrutsPortletAction.render(originalStrutsPortletAction, portletConfig, renderRequest, renderResponse); }