From 2384d6aa22509b28fb84b04e24f526395760b6b7 Mon Sep 17 00:00:00 2001
From: marcoalderighi <m.alderighi@nextmind.it>
Date: Wed, 24 May 2023 10:49:01 +0200
Subject: [PATCH] - fix bottone CAMBIA STATO in BO - fixes AOP

---
 .../portos/advanced/operation/util/AdvancedOperationUtil.java | 4 +++-
 .../portos-advanced-operation-portlet/docroot/html/view.jsp   | 3 ++-
 .../docroot/html/fascicolo/fascicolo_actions.jsp              | 2 +-
 .../portos-bo-portlet/docroot/html/fascicolo/view.jsp         | 2 +-
 .../html/fascicolofe/view_fascicolo_columns_generic.jspf      | 2 +-
 5 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/liferay-plugins-sdk-6.2/portlets/portos-advanced-operation-portlet/docroot/WEB-INF/src/it/nextmind/liferay/portos/advanced/operation/util/AdvancedOperationUtil.java b/liferay-plugins-sdk-6.2/portlets/portos-advanced-operation-portlet/docroot/WEB-INF/src/it/nextmind/liferay/portos/advanced/operation/util/AdvancedOperationUtil.java
index a8cf0963..f23544f9 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-advanced-operation-portlet/docroot/WEB-INF/src/it/nextmind/liferay/portos/advanced/operation/util/AdvancedOperationUtil.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-advanced-operation-portlet/docroot/WEB-INF/src/it/nextmind/liferay/portos/advanced/operation/util/AdvancedOperationUtil.java
@@ -225,7 +225,9 @@ public class AdvancedOperationUtil {
 			WorkflowTask task = WorkflowUtil.getLastTask(
 					controlloPratica.getCompanyId(),
 					controlloPratica.getGroupId(), null, controlloPratica);
-			return task.isCompleted();
+			if(Validator.isNotNull(task)){
+				return task.isCompleted();
+			}
 		} catch (PortalException | SystemException e) {
 			_log.error(e, e);
 		}
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-advanced-operation-portlet/docroot/html/view.jsp b/liferay-plugins-sdk-6.2/portlets/portos-advanced-operation-portlet/docroot/html/view.jsp
index cbcbcea6..36a933c9 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-advanced-operation-portlet/docroot/html/view.jsp
+++ b/liferay-plugins-sdk-6.2/portlets/portos-advanced-operation-portlet/docroot/html/view.jsp
@@ -673,7 +673,7 @@
 										<liferay-ui:search-container emptyResultsMessage="no-entries">
 											<liferay-ui:search-container-results
 												results="<%= ControlloPraticaLocalServiceUtil.findByIntPratica(intPraticaId) %>"
-												total="<%= ControlloPraticaLocalServiceUtil.countByIntPratica(intPraticaId) %>"
+												total="<%= ControlloPraticaLocalServiceUtil.findByIntPratica(intPraticaId).size() %>"
 											/>
 											<liferay-ui:search-container-row 
 												className="it.tref.liferay.portos.bo.model.ControlloPratica" 
@@ -716,6 +716,7 @@
 <div id ='<%= renderResponse.getNamespace()+"confirmationModalDiv" %>' class="hide" style="display:block;">
 </div>
 
+
 <aui:script use="event-valuechange,aui-modal,aui-io-request">
 
 <% if(Validator.isNotNull(intPratica)){ %>
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/html/fascicolo/fascicolo_actions.jsp b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/html/fascicolo/fascicolo_actions.jsp
index 577baa19..333691d6 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/html/fascicolo/fascicolo_actions.jsp
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/html/fascicolo/fascicolo_actions.jsp
@@ -85,7 +85,7 @@ long territorioGroupId = territorio.getGroupId();
 		</liferay-util:include>
 	</c:if>
 <c:if test="<%= !intPratica.isSospesa() %>">
-	<c:if test="<%= statiPossibili.isEmpty() && IntPraticaPermission.contains(permissionChecker, territorioGroupId, ActionKeys.CAMBIO_STATO) %>">
+	<c:if test="<%= !statiPossibili.isEmpty() && IntPraticaPermission.contains(permissionChecker, territorioGroupId, ActionKeys.CAMBIO_STATO) %>">
 		<liferay-util:include page="/html/fascicolo/actions/action_cambia_stato_pratica.jsp" servletContext="<%= application %>" >
 			<liferay-util:param name="intPraticaId" value="<%=String.valueOf(intPratica.getIntPraticaId()) %>"></liferay-util:param>
 			<liferay-util:param name="buttonIdCambiaStato" value="<%=buttonIdCambiaStato %>"></liferay-util:param>
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 bc898a72..a5000175 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
@@ -231,7 +231,7 @@ String dtSorteggioNullo = "2020-03-05 11:12:18.006";
 				</div>
 				<div class="flex-center" style="flex: 0 0 auto;">
 					<c:if test="<%= intPratica.isPraticaOspedaliera() %>">											
-			          	<span class="display-inline-block bordered-2x border-circle bg-green txt-bold tooltip-info" title="Pratica Ospedaliera" style="padding: 5px;margin-right:5px;margin-top:5px;width: 100%;">
+			          	<span class="display-inline-block bordered-2x border-circle bg-green txt-bold tooltip-info" title="Pratica Ospedaliera" style="padding: 5px;margin-right:5px;margin-top:5px;width: 35px;">
 			          		H
 			          	</span>
 					</c:if>
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/html/fascicolofe/view_fascicolo_columns_generic.jspf b/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/html/fascicolofe/view_fascicolo_columns_generic.jspf
index 03da4c95..31efe62b 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/html/fascicolofe/view_fascicolo_columns_generic.jspf
+++ b/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/html/fascicolofe/view_fascicolo_columns_generic.jspf
@@ -94,7 +94,7 @@
 		</div>
 		<div class="flex-center" style="flex: 0 0 auto;">
 			<c:if test="<%= intPratica.isPraticaOspedaliera() %>">											
-	          	<span class="display-inline-block bordered-2x border-circle bg-green txt-bold tooltip-info" title="Pratica Ospedaliera" style="padding: 5px;margin-right:5px;margin-top:5px;width: 100%;">
+	          	<span class="display-inline-block bordered-2x border-circle bg-green txt-bold tooltip-info" title="Pratica Ospedaliera" style="padding: 5px;margin-right:5px;margin-top:5px;width: 35px;">
 	          		H
 	          	</span>
 			</c:if>