diff --git a/liferay-plugins-sdk-6.2/dist/portos-audit-shared-6.2.0.1.jar b/liferay-plugins-sdk-6.2/dist/portos-audit-shared-6.2.0.1.jar index 3d9d801b..a711c1f5 100644 Binary files a/liferay-plugins-sdk-6.2/dist/portos-audit-shared-6.2.0.1.jar and b/liferay-plugins-sdk-6.2/dist/portos-audit-shared-6.2.0.1.jar differ diff --git a/liferay-plugins-sdk-6.2/dist/portos-bo-shared-6.2.0.1.jar b/liferay-plugins-sdk-6.2/dist/portos-bo-shared-6.2.0.1.jar index d7387179..282179a1 100644 Binary files a/liferay-plugins-sdk-6.2/dist/portos-bo-shared-6.2.0.1.jar and b/liferay-plugins-sdk-6.2/dist/portos-bo-shared-6.2.0.1.jar differ diff --git a/liferay-plugins-sdk-6.2/dist/portos-kaleo-shared-6.2.0.1.jar b/liferay-plugins-sdk-6.2/dist/portos-kaleo-shared-6.2.0.1.jar index 85c7aa57..49ff6dde 100644 Binary files a/liferay-plugins-sdk-6.2/dist/portos-kaleo-shared-6.2.0.1.jar and b/liferay-plugins-sdk-6.2/dist/portos-kaleo-shared-6.2.0.1.jar differ diff --git a/liferay-plugins-sdk-6.2/dist/portos-mail-manager-shared-6.2.0.1.jar b/liferay-plugins-sdk-6.2/dist/portos-mail-manager-shared-6.2.0.1.jar index ba1d2005..742dfe88 100644 Binary files a/liferay-plugins-sdk-6.2/dist/portos-mail-manager-shared-6.2.0.1.jar and b/liferay-plugins-sdk-6.2/dist/portos-mail-manager-shared-6.2.0.1.jar differ diff --git a/liferay-plugins-sdk-6.2/dist/portos-report-shared-6.2.0.1.jar b/liferay-plugins-sdk-6.2/dist/portos-report-shared-6.2.0.1.jar index acd22975..c877ef7e 100644 Binary files a/liferay-plugins-sdk-6.2/dist/portos-report-shared-6.2.0.1.jar and b/liferay-plugins-sdk-6.2/dist/portos-report-shared-6.2.0.1.jar differ diff --git a/liferay-plugins-sdk-6.2/portlets/portos-audit-portlet/.gradle/8.9/checksums/checksums.lock b/liferay-plugins-sdk-6.2/portlets/portos-audit-portlet/.gradle/8.9/checksums/checksums.lock new file mode 100644 index 00000000..32fb2469 Binary files /dev/null and b/liferay-plugins-sdk-6.2/portlets/portos-audit-portlet/.gradle/8.9/checksums/checksums.lock differ diff --git a/liferay-plugins-sdk-6.2/portlets/portos-audit-portlet/.gradle/8.9/dependencies-accessors/gc.properties b/liferay-plugins-sdk-6.2/portlets/portos-audit-portlet/.gradle/8.9/dependencies-accessors/gc.properties new file mode 100644 index 00000000..e69de29b diff --git a/liferay-plugins-sdk-6.2/portlets/portos-audit-portlet/.gradle/8.9/executionHistory/executionHistory.lock b/liferay-plugins-sdk-6.2/portlets/portos-audit-portlet/.gradle/8.9/executionHistory/executionHistory.lock new file mode 100644 index 00000000..c287e34f Binary files /dev/null and b/liferay-plugins-sdk-6.2/portlets/portos-audit-portlet/.gradle/8.9/executionHistory/executionHistory.lock differ diff --git a/liferay-plugins-sdk-6.2/portlets/portos-audit-portlet/.gradle/8.9/fileChanges/last-build.bin b/liferay-plugins-sdk-6.2/portlets/portos-audit-portlet/.gradle/8.9/fileChanges/last-build.bin new file mode 100644 index 00000000..f76dd238 Binary files /dev/null and b/liferay-plugins-sdk-6.2/portlets/portos-audit-portlet/.gradle/8.9/fileChanges/last-build.bin differ diff --git a/liferay-plugins-sdk-6.2/portlets/portos-audit-portlet/.gradle/8.9/fileHashes/fileHashes.lock b/liferay-plugins-sdk-6.2/portlets/portos-audit-portlet/.gradle/8.9/fileHashes/fileHashes.lock new file mode 100644 index 00000000..5bea495d Binary files /dev/null and b/liferay-plugins-sdk-6.2/portlets/portos-audit-portlet/.gradle/8.9/fileHashes/fileHashes.lock differ diff --git a/liferay-plugins-sdk-6.2/portlets/portos-audit-portlet/.gradle/8.9/gc.properties b/liferay-plugins-sdk-6.2/portlets/portos-audit-portlet/.gradle/8.9/gc.properties new file mode 100644 index 00000000..e69de29b diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/.project b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/.project index 57bd417e..5d7c5048 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/.project +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/.project @@ -33,4 +33,15 @@ org.eclipse.jdt.core.javanature org.eclipse.wst.jsdt.core.jsNature + + + 1737018941321 + + 30 + + org.eclipse.core.resources.regexFilterMatcher + node_modules|\.git|__CREATED_BY_JAVA_LANGUAGE_SERVER__ + + + diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/lib/portos-audit-shared.jar b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/lib/portos-audit-shared.jar index 3d9d801b..a711c1f5 100644 Binary files a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/lib/portos-audit-shared.jar and b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/lib/portos-audit-shared.jar differ diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/lib/portos-bo-portlet-service.jar b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/lib/portos-bo-portlet-service.jar index b0293468..3ca914ef 100644 Binary files a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/lib/portos-bo-portlet-service.jar and b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/lib/portos-bo-portlet-service.jar differ diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/lib/portos-bo-shared.jar b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/lib/portos-bo-shared.jar index d7387179..ed9cf8c6 100644 Binary files a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/lib/portos-bo-shared.jar and b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/lib/portos-bo-shared.jar differ diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/lib/portos-kaleo-shared.jar b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/lib/portos-kaleo-shared.jar index 85c7aa57..1cbf1feb 100644 Binary files a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/lib/portos-kaleo-shared.jar and b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/lib/portos-kaleo-shared.jar differ diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/lib/portos-mail-manager-shared.jar b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/lib/portos-mail-manager-shared.jar index ba1d2005..742dfe88 100644 Binary files a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/lib/portos-mail-manager-shared.jar and b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/lib/portos-mail-manager-shared.jar differ diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/lib/portos-report-shared.jar b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/lib/portos-report-shared.jar index acd22975..c877ef7e 100644 Binary files a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/lib/portos-report-shared.jar and b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/lib/portos-report-shared.jar differ diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/ControlloPraticaLocalServiceImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/ControlloPraticaLocalServiceImpl.java index a43b4126..6bcc78be 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/ControlloPraticaLocalServiceImpl.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/ControlloPraticaLocalServiceImpl.java @@ -547,6 +547,8 @@ public class ControlloPraticaLocalServiceImpl extends ControlloPraticaLocalServi esito.put(etichettaEsito("Concludi VIArch", StatoPraticaConstants.NON_CONFORME)); esito.put(etichettaEsito(StatoPraticaConstants.INTEGRAZIONE)); esito.put(etichettaEsito(StatoPraticaConstants.NO_PARERE)); + esito.put(etichettaEsito("Preavviso di Parere Contrario", StatoPraticaConstants.PREAVVISO_PARERE_CONTRARIO)); + esito.put(etichettaEsito("Autorizzazione Negata", StatoPraticaConstants.NEGATA)); JSONObject json = JSONFactoryUtil.createJSONObject(); json.put("esito", esito); jsonViarch = json.toString(); diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/service.properties b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/service.properties index b4ded888..dfae297b 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/service.properties +++ b/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=3679 - build.date=1709032683993 + build.number=3681 + build.date=1736853764242 build.auto.upgrade=true ## diff --git a/liferay-plugins-sdk-6.2/shared/portos-bo-shared/.classpath b/liferay-plugins-sdk-6.2/shared/portos-bo-shared/.classpath index 6e0e0766..65d234cf 100644 --- a/liferay-plugins-sdk-6.2/shared/portos-bo-shared/.classpath +++ b/liferay-plugins-sdk-6.2/shared/portos-bo-shared/.classpath @@ -3,5 +3,6 @@ + diff --git a/liferay-plugins-sdk-6.2/shared/portos-bo-shared/src/it/tref/liferay/portos/bo/shared/util/StatoPraticaConstants.java b/liferay-plugins-sdk-6.2/shared/portos-bo-shared/src/it/tref/liferay/portos/bo/shared/util/StatoPraticaConstants.java index 8225ecae..8a61ef0c 100644 --- a/liferay-plugins-sdk-6.2/shared/portos-bo-shared/src/it/tref/liferay/portos/bo/shared/util/StatoPraticaConstants.java +++ b/liferay-plugins-sdk-6.2/shared/portos-bo-shared/src/it/tref/liferay/portos/bo/shared/util/StatoPraticaConstants.java @@ -24,6 +24,8 @@ public class StatoPraticaConstants { public static final String SOTTOPOSTA_A_PARERE = "SP"; public static final String VARIATA = "VA"; public static final String VIDIMATA = "VI"; + public static final String NEGATA = "NG"; + public static final String PREAVVISO_PARERE_CONTRARIO = "PP"; /* Stati "virtuali" */ public static final String IN_COMPILAZIONE = "IC"; diff --git a/liferay-plugins-sdk-6.2/shared/portos-mail-manager-shared/.gradle/8.9/checksums/checksums.lock b/liferay-plugins-sdk-6.2/shared/portos-mail-manager-shared/.gradle/8.9/checksums/checksums.lock new file mode 100644 index 00000000..84973276 Binary files /dev/null and b/liferay-plugins-sdk-6.2/shared/portos-mail-manager-shared/.gradle/8.9/checksums/checksums.lock differ diff --git a/liferay-plugins-sdk-6.2/shared/portos-mail-manager-shared/.gradle/8.9/dependencies-accessors/gc.properties b/liferay-plugins-sdk-6.2/shared/portos-mail-manager-shared/.gradle/8.9/dependencies-accessors/gc.properties new file mode 100644 index 00000000..e69de29b diff --git a/liferay-plugins-sdk-6.2/shared/portos-mail-manager-shared/.gradle/8.9/executionHistory/executionHistory.lock b/liferay-plugins-sdk-6.2/shared/portos-mail-manager-shared/.gradle/8.9/executionHistory/executionHistory.lock new file mode 100644 index 00000000..8b5a516a Binary files /dev/null and b/liferay-plugins-sdk-6.2/shared/portos-mail-manager-shared/.gradle/8.9/executionHistory/executionHistory.lock differ diff --git a/liferay-plugins-sdk-6.2/shared/portos-mail-manager-shared/.gradle/8.9/fileChanges/last-build.bin b/liferay-plugins-sdk-6.2/shared/portos-mail-manager-shared/.gradle/8.9/fileChanges/last-build.bin new file mode 100644 index 00000000..f76dd238 Binary files /dev/null and b/liferay-plugins-sdk-6.2/shared/portos-mail-manager-shared/.gradle/8.9/fileChanges/last-build.bin differ diff --git a/liferay-plugins-sdk-6.2/shared/portos-mail-manager-shared/.gradle/8.9/fileHashes/fileHashes.lock b/liferay-plugins-sdk-6.2/shared/portos-mail-manager-shared/.gradle/8.9/fileHashes/fileHashes.lock new file mode 100644 index 00000000..d9346045 Binary files /dev/null and b/liferay-plugins-sdk-6.2/shared/portos-mail-manager-shared/.gradle/8.9/fileHashes/fileHashes.lock differ diff --git a/liferay-plugins-sdk-6.2/shared/portos-mail-manager-shared/.gradle/8.9/gc.properties b/liferay-plugins-sdk-6.2/shared/portos-mail-manager-shared/.gradle/8.9/gc.properties new file mode 100644 index 00000000..e69de29b diff --git a/liferay-plugins-sdk-6.2/webs/portos-kaleo-web/.classpath b/liferay-plugins-sdk-6.2/webs/portos-kaleo-web/.classpath index 8190e020..f1143cdd 100644 --- a/liferay-plugins-sdk-6.2/webs/portos-kaleo-web/.classpath +++ b/liferay-plugins-sdk-6.2/webs/portos-kaleo-web/.classpath @@ -1,22 +1,21 @@ - - - + - + - - + + + - + diff --git a/liferay-plugins-sdk-6.2/webs/portos-kaleo-web/.project b/liferay-plugins-sdk-6.2/webs/portos-kaleo-web/.project index 4df778fb..435e109e 100644 --- a/liferay-plugins-sdk-6.2/webs/portos-kaleo-web/.project +++ b/liferay-plugins-sdk-6.2/webs/portos-kaleo-web/.project @@ -35,7 +35,7 @@ - 1676466957723 + 1737018941343 30 diff --git a/liferay-plugins-sdk-6.2/webs/portos-kaleo-web/.settings/org.eclipse.wst.common.project.facet.core.xml b/liferay-plugins-sdk-6.2/webs/portos-kaleo-web/.settings/org.eclipse.wst.common.project.facet.core.xml index 79341bdc..09b6c5dc 100644 --- a/liferay-plugins-sdk-6.2/webs/portos-kaleo-web/.settings/org.eclipse.wst.common.project.facet.core.xml +++ b/liferay-plugins-sdk-6.2/webs/portos-kaleo-web/.settings/org.eclipse.wst.common.project.facet.core.xml @@ -1,9 +1,11 @@ + - + + + - diff --git a/liferay-plugins-sdk-6.2/webs/portos-kaleo-web/docroot/WEB-INF/lib/portos-bo-portlet-service.jar b/liferay-plugins-sdk-6.2/webs/portos-kaleo-web/docroot/WEB-INF/lib/portos-bo-portlet-service.jar index 5eef4ff7..3ca914ef 100644 Binary files a/liferay-plugins-sdk-6.2/webs/portos-kaleo-web/docroot/WEB-INF/lib/portos-bo-portlet-service.jar and b/liferay-plugins-sdk-6.2/webs/portos-kaleo-web/docroot/WEB-INF/lib/portos-bo-portlet-service.jar differ diff --git a/liferay-plugins-sdk-6.2/webs/portos-kaleo-web/docroot/WEB-INF/lib/portos-bo-shared.jar b/liferay-plugins-sdk-6.2/webs/portos-kaleo-web/docroot/WEB-INF/lib/portos-bo-shared.jar index 85b0f032..282179a1 100644 Binary files a/liferay-plugins-sdk-6.2/webs/portos-kaleo-web/docroot/WEB-INF/lib/portos-bo-shared.jar and b/liferay-plugins-sdk-6.2/webs/portos-kaleo-web/docroot/WEB-INF/lib/portos-bo-shared.jar differ diff --git a/liferay-plugins-sdk-6.2/webs/portos-kaleo-web/docroot/WEB-INF/lib/portos-kaleo-shared.jar b/liferay-plugins-sdk-6.2/webs/portos-kaleo-web/docroot/WEB-INF/lib/portos-kaleo-shared.jar index fcca7b2f..49ff6dde 100644 Binary files a/liferay-plugins-sdk-6.2/webs/portos-kaleo-web/docroot/WEB-INF/lib/portos-kaleo-shared.jar and b/liferay-plugins-sdk-6.2/webs/portos-kaleo-web/docroot/WEB-INF/lib/portos-kaleo-shared.jar differ 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 97f73971..d13dad93 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 @@ -21,6 +21,7 @@ import java.io.Serializable; import java.util.Arrays; import java.util.Calendar; import java.util.Date; +import java.util.Enumeration; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -97,7 +98,8 @@ public class EditWorkflowTaskAction extends BaseStrutsPortletAction { private static final List VALORI_AMMESSI = Arrays.asList(StatoPraticaConstants.ANNULLATA, StatoPraticaConstants.CONFORME, StatoPraticaConstants.INTEGRAZIONE, StatoPraticaConstants.NON_CONFORME, StatoPraticaConstants.NO_PARERE, StatoPraticaConstants.PREAVVISO_CONTRARIO, - StatoPraticaConstants.PERIZIA_SANZIONE, StatoPraticaConstants.DECRETO_SANZIONE); + StatoPraticaConstants.PERIZIA_SANZIONE, StatoPraticaConstants.DECRETO_SANZIONE, + StatoPraticaConstants.PREAVVISO_PARERE_CONTRARIO, StatoPraticaConstants.NEGATA); private static final List LOG_TYPES = Arrays.asList(WorkflowLog.TASK_ASSIGN, WorkflowLog.TASK_COMPLETION, WorkflowLog.TASK_UPDATE, WorkflowLog.TRANSITION); @@ -176,6 +178,7 @@ public class EditWorkflowTaskAction extends BaseStrutsPortletAction { || esito.equalsIgnoreCase(StatoPraticaConstants.PREAVVISO_CONTRARIO) || esito.equalsIgnoreCase(StatoPraticaConstants.PERIZIA_SANZIONE) || esito .equalsIgnoreCase(StatoPraticaConstants.DECRETO_SANZIONE)) && testoDocumento.isEmpty())) { +//TODO controllare che 2 siano ammessi _log.error("controllo validazione completamento task registra-esito = " + workflowTaskId + " non riuscito - esito non valorizzato o esito " + StatoPraticaConstants.INTEGRAZIONE + StringPool.SLASH + StatoPraticaConstants.PREAVVISO_CONTRARIO + StringPool.SLASH diff --git a/liferay-plugins-sdk-6.2/webs/portos-kaleo-web/docroot/WEB-INF/src/it/tref/liferay/portos/kaleo/hook/struts/RenderFormTaskPortletAction.java b/liferay-plugins-sdk-6.2/webs/portos-kaleo-web/docroot/WEB-INF/src/it/tref/liferay/portos/kaleo/hook/struts/RenderFormTaskPortletAction.java index d01dfc64..7a86fe43 100644 --- a/liferay-plugins-sdk-6.2/webs/portos-kaleo-web/docroot/WEB-INF/src/it/tref/liferay/portos/kaleo/hook/struts/RenderFormTaskPortletAction.java +++ b/liferay-plugins-sdk-6.2/webs/portos-kaleo-web/docroot/WEB-INF/src/it/tref/liferay/portos/kaleo/hook/struts/RenderFormTaskPortletAction.java @@ -104,13 +104,40 @@ public class RenderFormTaskPortletAction extends BaseStrutsPortletAction { parameters.remove("esito"); parameters.remove("testo_del_documento"); } + + printValues(fieldNameOptions); + _log.info("Questo e parameters"); + for (String key : parameters.keySet()){ + _log.info("Key: "+ key+ " Value: "+ parameters.get(key)); + } + _log.info(" "); + _log.info("Questo e workflowContext"); + for (String key : workflowContext.keySet()){ + _log.info("Key: "+ key+ " Value: "+ workflowContext.get(key)); + } + + + return "/portlet/workflow_tasks/render_form_task.jsp"; } + + private void printValues (Map>> fieldNameOptions){ + _log.info("Questo e fieldNameOptions"); + for (Map.Entry>> entry : fieldNameOptions.entrySet()) { + for (Map option : entry.getValue()) { + for (String key : option.keySet()){ + _log.info("Key: "+ key+ " Value: "+ option.get(key)); + } + } + _log.info(" "); + } + + } @Override public void serveResource(PortletConfig portletConfig, ResourceRequest resourceRequest, ResourceResponse resourceResponse) throws Exception { - + _log.info("serveResource"); ServiceContext serviceContext = ServiceContextFactory.getInstance(resourceRequest); long companyId = PortalUtil.getCompanyId(resourceRequest); long workflowTaskId = ParamUtil.getLong(resourceRequest, "workflowTaskId"); diff --git a/liferay-plugins-sdk-6.2/webs/portos-kaleo-web/docroot/WEB-INF/src/it/tref/liferay/portos/kaleo/util/WorkflowUtil.java b/liferay-plugins-sdk-6.2/webs/portos-kaleo-web/docroot/WEB-INF/src/it/tref/liferay/portos/kaleo/util/WorkflowUtil.java index fe3d3a66..4c6e5925 100644 --- a/liferay-plugins-sdk-6.2/webs/portos-kaleo-web/docroot/WEB-INF/src/it/tref/liferay/portos/kaleo/util/WorkflowUtil.java +++ b/liferay-plugins-sdk-6.2/webs/portos-kaleo-web/docroot/WEB-INF/src/it/tref/liferay/portos/kaleo/util/WorkflowUtil.java @@ -1,36 +1,13 @@ package it.tref.liferay.portos.kaleo.util; -import it.tref.liferay.portos.bo.model.ControlloPratica; -import it.tref.liferay.portos.bo.model.IntPratica; -import it.tref.liferay.portos.bo.service.AvvisoLocalServiceUtil; -import it.tref.liferay.portos.bo.service.ConfigurazioneLocalServiceUtil; -import it.tref.liferay.portos.bo.service.ControlloPraticaLocalServiceUtil; -import it.tref.liferay.portos.bo.service.IntPraticaLocalServiceUtil; -import it.tref.liferay.portos.bo.shared.util.ConfigurazioneConstants; -import it.tref.liferay.portos.bo.util.PraticaUtil; -import it.tref.liferay.portos.kaleo.model.FormLog; -import it.tref.liferay.portos.kaleo.service.FormLogLocalServiceUtil; -import it.tref.liferay.portos.kaleo.shared.util.WorkflowConstants; - -import java.io.Serializable; -import java.util.Collections; -import java.util.Enumeration; -import java.util.HashMap; -import java.util.List; -import java.util.Locale; -import java.util.Map; - -import javax.portlet.PortletRequest; -import javax.servlet.http.HttpServletRequest; - -import org.apache.commons.lang.StringUtils; - import com.liferay.portal.NoSuchWorkflowInstanceLinkException; 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.json.JSONDeserializer; import com.liferay.portal.kernel.json.JSONFactoryUtil; +import com.liferay.portal.kernel.log.Log; +import com.liferay.portal.kernel.log.LogFactoryUtil; import com.liferay.portal.kernel.repository.model.Folder; import com.liferay.portal.kernel.util.Base64; import com.liferay.portal.kernel.util.ContentTypes; @@ -55,6 +32,32 @@ import com.liferay.portal.workflow.kaleo.service.KaleoTaskInstanceTokenLocalServ import com.liferay.portlet.documentlibrary.NoSuchFolderException; import com.liferay.portlet.documentlibrary.service.DLAppLocalServiceUtil; +import it.tref.liferay.portos.bo.model.ControlloPratica; +import it.tref.liferay.portos.bo.model.IntPratica; +import it.tref.liferay.portos.bo.service.AvvisoLocalServiceUtil; +import it.tref.liferay.portos.bo.service.ConfigurazioneLocalServiceUtil; +import it.tref.liferay.portos.bo.service.ControlloPraticaLocalServiceUtil; +import it.tref.liferay.portos.bo.service.IntPraticaLocalServiceUtil; +import it.tref.liferay.portos.bo.shared.util.ConfigurazioneConstants; +import it.tref.liferay.portos.bo.util.PraticaUtil; +import it.tref.liferay.portos.kaleo.hook.struts.RenderFormTaskPortletAction; +import it.tref.liferay.portos.kaleo.model.FormLog; +import it.tref.liferay.portos.kaleo.service.FormLogLocalServiceUtil; +import it.tref.liferay.portos.kaleo.shared.util.WorkflowConstants; + +import java.io.Serializable; +import java.util.Collections; +import java.util.Enumeration; +import java.util.HashMap; +import java.util.List; +import java.util.Locale; +import java.util.Map; + +import javax.portlet.PortletRequest; +import javax.servlet.http.HttpServletRequest; + +import org.apache.commons.lang.StringUtils; + public class WorkflowUtil { public static final String PARAMETER_BASE64 = WorkflowConstants.PREFIX_NAME_ELEMENT_FORM + "base64" @@ -104,6 +107,8 @@ public class WorkflowUtil { return instance.getWorkflowContext(); } + private static final Log _log = LogFactoryUtil.getLog(WorkflowUtil.class); + public static Map executeOnOpenForm(long companyId, long workflowTaskId, long assigneeUserId, String transitionName) throws PortalException, SystemException {