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 6aff0331..d5c5a1b8 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 @@ -452,6 +452,8 @@ public class ControlloPraticaLocalServiceImpl extends ControlloPraticaLocalServi etichette.put("value", StatoPraticaConstants.INTEGRAZIONE); etichette.put("default", false); jsonArray.put(etichette); + // Settato a "disabled" per poter gestire le limitazioni nel workflow + // nella jsp -render_form_task.jsp etichette = JSONFactoryUtil.createJSONObject(); etichette.put("label", "disabled"); etichette.put("value", StatoPraticaConstants.NON_CONFORME); diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/html/fascicolo/view.jsp b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/html/fascicolo/view.jsp index 10ab0c34..41380a49 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/html/fascicolo/view.jsp +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/html/fascicolo/view.jsp @@ -207,20 +207,19 @@ String dtSorteggioNullo = "2020-03-05 11:12:18.006"; -
+
- - + SP @@ -230,6 +229,13 @@ String dtSorteggioNullo = "2020-03-05 11:12:18.006";
+
+ + + H + + +
<% Sorteggio sorteggio = SorteggioLocalServiceUtil.findByIntPratica(intPratica.getIntPraticaId()); %> diff --git a/liferay-plugins-sdk-6.2/webs/portos-kaleo-web/docroot/META-INF/custom_jsps/html/portlet/workflow_tasks/render_form_task.jsp b/liferay-plugins-sdk-6.2/webs/portos-kaleo-web/docroot/META-INF/custom_jsps/html/portlet/workflow_tasks/render_form_task.jsp index eddcd511..596e8188 100644 --- a/liferay-plugins-sdk-6.2/webs/portos-kaleo-web/docroot/META-INF/custom_jsps/html/portlet/workflow_tasks/render_form_task.jsp +++ b/liferay-plugins-sdk-6.2/webs/portos-kaleo-web/docroot/META-INF/custom_jsps/html/portlet/workflow_tasks/render_form_task.jsp @@ -187,6 +187,8 @@ private void filter(Node node, Map parameters, boolean defaultValue = MapUtil.getBoolean(option, "default"); if (tag.getAttribute("value").equals(valueOption)) { tag.getNextSibling().setText(label); + // Se label è inattivo allora è una pratica ospedaliera e disabilito + // e nascondo l'input relativo al rifiuto della pratica. if("Inattivo".equalsIgnoreCase(label.trim())){ TagNode parent = (TagNode) tag.getParent().getParent(); Attribute disabledAttr = new Attribute(); @@ -196,8 +198,6 @@ private void filter(Node node, Map parameters, classValue += " hidden"; tag.setAttribute("class", classValue); tag.getNextSibling().setText(""); - - } } }