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 8dadd72f..08eefb3c 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/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 0b541b5e..85f22502 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 8dadd72f..08eefb3c 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/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 f63c8cf9..f00eade6 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 @@ -539,22 +539,6 @@ public class ControlloPraticaLocalServiceImpl extends ControlloPraticaLocalServi private static String jsonViarch = null; -// private static String getJsonViarch() { -// -// if (jsonViarch == null) { -// JSONArray esito = JSONFactoryUtil.createJSONArray(); -// esito.put(etichettaEsito("Attiva VIArch", StatoPraticaConstants.CONFORME)); -// 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(); -// } -// return jsonViarch; -// } private static String getJsonViarch() { if (jsonViarch == null) { @@ -563,7 +547,7 @@ public class ControlloPraticaLocalServiceImpl extends ControlloPraticaLocalServi esito.put(etichettaEsito("Concludi VIArch", StatoPraticaConstants.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("Preavviso di Parere Contrario", StatoPraticaConstants.PREAVVISO_CONTRARIO)); esito.put(etichettaEsito("Autorizzazione Negata", StatoPraticaConstants.NON_CONFORME)); JSONObject json = JSONFactoryUtil.createJSONObject(); json.put("esito", esito); 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 c9f58f4e..b6215963 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=3684 - build.date=1740411615078 + build.number=3686 + build.date=1740564155942 build.auto.upgrade=true ## 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 8a61ef0c..8225ecae 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,8 +24,6 @@ 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/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 0b541b5e..85f22502 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 8dadd72f..08eefb3c 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/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 d13dad93..69a2eab3 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 @@ -98,8 +98,7 @@ 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.PREAVVISO_PARERE_CONTRARIO, StatoPraticaConstants.NEGATA); + StatoPraticaConstants.PERIZIA_SANZIONE, StatoPraticaConstants.DECRETO_SANZIONE); private static final List LOG_TYPES = Arrays.asList(WorkflowLog.TASK_ASSIGN, WorkflowLog.TASK_COMPLETION, WorkflowLog.TASK_UPDATE, WorkflowLog.TRANSITION); @@ -178,7 +177,6 @@ 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 7a86fe43..1cd2454e 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 @@ -103,41 +103,14 @@ public class RenderFormTaskPortletAction extends BaseStrutsPortletAction { if (transitionName != null && transitionName.equalsIgnoreCase("registra-esito")) { 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");