From ca39602b4b0dfccef765cb62dc3fc884194546ac Mon Sep 17 00:00:00 2001
From: Mattia Gosetto <mattia@manifatturaweb.it>
Date: Wed, 13 Jan 2021 09:24:55 +0100
Subject: [PATCH] ordinamento funzionante

---
 .../ControlloPraticaAdvancedSearch.java       | 33 ++++++++++---------
 .../docroot/WEB-INF/src/service.properties    |  4 +--
 2 files changed, 20 insertions(+), 17 deletions(-)

diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/search/ControlloPraticaAdvancedSearch.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/search/ControlloPraticaAdvancedSearch.java
index b338728f..74bb7db2 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/search/ControlloPraticaAdvancedSearch.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/search/ControlloPraticaAdvancedSearch.java
@@ -3,6 +3,7 @@ package it.tref.liferay.portos.bo.search;
 import it.tref.liferay.portos.bo.model.ControlloPratica;
 import it.tref.liferay.portos.bo.service.ControlloPraticaLocalServiceUtil;
 import it.tref.liferay.portos.bo.shared.util.StatoPraticaConstants;
+import it.tref.liferay.portos.bo.util.PortosIndexField;
 import it.tref.liferay.portos.bo.util.WorkflowConstants;
 
 import java.text.DateFormat;
@@ -59,7 +60,7 @@ public class ControlloPraticaAdvancedSearch {
 	public static final DateFormat DATE_FORMAT_STRING = new SimpleDateFormat("dd/MM/yyyy");
 
 	public static Hits searchMieiTask(HttpServletRequest request, User user, int start, int end) {
-
+	
 		// Parametro proveniente dalla ricerca
 		int ufficioSearch = ParamUtil.getInteger(request, "ufficio");
 
@@ -70,7 +71,6 @@ public class ControlloPraticaAdvancedSearch {
 		searchContext.setKeywords(OVERRIDE_KEYWORDS.toString());
 
 		if (searchForExport) {
-
 			int maxEnd = GetterUtil.getInteger(PropsUtil.get(PropsKeys.INDEX_FILTER_SEARCH_LIMIT));
 
 			searchContext.setStart(0);
@@ -156,6 +156,7 @@ public class ControlloPraticaAdvancedSearch {
 	}
 
 	public static Hits searchTaskMieiRuoli(HttpServletRequest request, User user, int start, int end) {
+		_log.info("Start "+ start + " End " + end);
 
 		// Parametro proveniente dalla ricerca
 		int ufficioSearch = ParamUtil.getInteger(request, "ufficio");
@@ -182,6 +183,7 @@ public class ControlloPraticaAdvancedSearch {
 
 		// Gestione Ordinamento
 		searchContext.setSorts(getOrderedQuery(request));
+		
 		Hits hits = null;
 		try {
 
@@ -258,10 +260,14 @@ public class ControlloPraticaAdvancedSearch {
 
 			// Condizioni aggiuntive
 			retrieveQuery(request, user, booleanQuery, searchContext);
+			
+			
 
-			if (_log.isDebugEnabled()) {
-				_log.debug("User " + user.getScreenName() + " Request query : " + booleanQuery.toString());
-			}
+			//if (_log.isDebugEnabled()) {
+				//_log.info("User " + user.getScreenName() + " Request query : " + booleanQuery.toString());
+			_log.info("Request " + ParamUtil.getString(request, "ordinaPer"));
+			_log.info("Request " + ParamUtil.getString(request, "ordinaTipo"));
+			//}
 
 			hits = SearchEngineUtil.search(searchContext, booleanQuery);
 
@@ -808,6 +814,8 @@ public class ControlloPraticaAdvancedSearch {
 		// ADT - BUG-11 Aggiunta filtro ricerca
 		String controlloObbligatorioSearch = ParamUtil.getString(request, "controlloObbligatorio");
 		String sorteggiataSearch = ParamUtil.getString(request, "sorteggiata");
+		
+		Integer deltaSearch = ParamUtil.getInteger(request, "delta");
 
 		try {
 
@@ -997,22 +1005,17 @@ public class ControlloPraticaAdvancedSearch {
 				sort.setFieldName(orderField);
 			}
 
-			if (orderField.equals("numeroProgetto")) {
+			if (orderField.equals(PortosIndexField.NUMERO_PROGETTO)) {
 				sort.setType(Sort.INT_TYPE);
-			} else if (orderField.equals("protocollo")) {
-				sort.setType(Sort.LONG_TYPE);
-			} else if (orderField.equals("dataInizioProcedimento")) {
-				sort.setType(Sort.LONG_TYPE);
-			} else if (orderField.equals("taskName")) {
-				sort.setType(Sort.STRING_TYPE);
-			} else if (orderField.equals("tipoPratica")) {
+			} else if (orderField.equals(PortosIndexField.PROTOCOLLO)) {
 				sort.setType(Sort.INT_TYPE);
+			} else if (orderField.equals("dataCreazione")) {
+				sort.setType(Sort.LONG_TYPE);
 			}
-
 		}
 
 		if (orderType != null && !orderType.equals("") && !orderType.equals("-1")) {
-			if (orderType.equals("desc")) {
+			if (orderType.equals("asc")) {
 				sort.setReverse(false);
 			} else {
 				sort.setReverse(true);
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 9cd5f51d..f50c3fbd 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=2806
-    build.date=1610446414177
+    build.number=2816
+    build.date=1610467668291
     build.auto.upgrade=true
 
 ##