From 024ce3cfcf545d45ebb9c97367033896f07b4370 Mon Sep 17 00:00:00 2001
From: marcoalderighi <m.alderighi@nextmind.it>
Date: Wed, 17 May 2023 10:38:42 +0200
Subject: [PATCH] fix funzione Unita Operative  AOP

---
 .../advanced/operation/util/AdvancedOperationUtil.java   | 3 ++-
 .../docroot/html/view.jsp                                | 9 +++++++--
 2 files changed, 9 insertions(+), 3 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 cade4411..98578bdd 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
@@ -113,6 +113,7 @@ public class AdvancedOperationUtil {
 	}
 	
 	public static boolean evalInt_Dett_UserID(IntPratica intPratica){
+		_log.info("lastDettPraticaUserID: "+getLastDettPraticaUserID(intPratica)+" || intPraticaUserID: "+intPratica.getUserId());
 		return getLastDettPraticaUserID(intPratica) == intPratica.getUserId();
 	}
 	
@@ -125,7 +126,7 @@ public class AdvancedOperationUtil {
 		} catch (SystemException e){
 			_log.error(e,e);
 		}
-		return -1;
+		return intPratica.getUserId();
 	}
 	
 //	public static boolean getNormLavoriInProprioFlag(long intPraticaId){
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 002ec25f..505f62c6 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
@@ -36,13 +36,18 @@
 	String numeroProgetto = ParamUtil.getString(request, "numeroProgetto", StringPool.BLANK);
 	boolean isBrokenUO = ParamUtil.getBoolean(request, "brokenUO", false);
 	List<IntPratica> brokenUOList = null;
+	int brokenUOnum = 0;
 	if(isBrokenUO){
 		brokenUOList = AdvancedOperationUtil.getBrokenUOList();
+		brokenUOnum = brokenUOList.size();
+		if(brokenUOnum > 20){
+			brokenUOList = brokenUOList.subList(0, 20);
+		}
 	}
-	
 	IntPratica intPratica = IntPraticaLocalServiceUtil.fetchIntPratica(intPraticaId);
 %>
 
+
 <liferay-portlet:actionURL 
 	name="findIntPratica" 
 	var="findIntPraticaURL" >
@@ -100,7 +105,7 @@
 			<aui:row>
 				<p>
 					<b>Numero IntPratica con problemi di Unità Operativa:</b>
-					<span id="brokenUOnum"><%= brokenUOList.size() %></span>
+					<span id="brokenUOnum"><%= brokenUOnum %></span>
 				</p>
 				<div id="brokenUOList">
 					<liferay-ui:search-container emptyResultsMessage="Nessun soggetto disponibile">