diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/search/IntPraticaAdvancedSearch.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/search/IntPraticaAdvancedSearch.java index 5c4a58c7..2c51961b 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/search/IntPraticaAdvancedSearch.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/search/IntPraticaAdvancedSearch.java @@ -528,6 +528,8 @@ public class IntPraticaAdvancedSearch { termQuery = TermQueryFactoryUtil.create(searchContext, "dtPratica", "0"); else if (statoPratica.equals(StatoPraticaConstants.VARIATA)) termQuery = TermQueryFactoryUtil.create(searchContext, "variata", StringPool.TRUE); + else if(statoPratica.equals(PortosIndexField.ASSEGNATA_AD_ISTRUTTORE)) + termQuery = TermQueryFactoryUtil.create(searchContext, PortosIndexField.ASSEGNATA_AD_ISTRUTTORE, 1L); else if (!statoPratica.equals("-1")) termQuery = TermQueryFactoryUtil.create(searchContext, PortosIndexField.STATO_PRATICA, statoPratica); if (Validator.isNotNull(termQuery)) diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/util/PortosIndexField.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/util/PortosIndexField.java index 0e351b4c..704fbade 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/util/PortosIndexField.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/util/PortosIndexField.java @@ -72,4 +72,5 @@ public class PortosIndexField implements Serializable { public static final String TIPO_PROCEDURA = "tipoProcedura"; public static final String UNITA_OPERATIVA = "unitaOperativa"; public static final String IN_LAVORAZIONE_SUE = "inLavorazioneSue"; + public static final String ASSEGNATA_AD_ISTRUTTORE = "assegnataAdIstruttore"; } \ No newline at end of file diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/indexer/ControlloPraticaIndexer.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/indexer/ControlloPraticaIndexer.java index edba5fac..8998d106 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/indexer/ControlloPraticaIndexer.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/indexer/ControlloPraticaIndexer.java @@ -159,7 +159,11 @@ public class ControlloPraticaIndexer extends BaseIndexer { document.addKeyword(PortosIndexField.ISTRUTTORE_FULL_NAME, userIstruttore.getFullName() .toUpperCase()); } + document.addKeyword(PortosIndexField.ASSEGNATA_AD_ISTRUTTORE, 1L); + }else{ + document.addKeyword(PortosIndexField.ASSEGNATA_AD_ISTRUTTORE, 0L); } + if (intPratica.getUserId() != 0L) { User proprietarioDigitale = UserLocalServiceUtil.fetchUser(intPratica.getUserId()); if (Validator.isNotNull(proprietarioDigitale)) { diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/indexer/IntPraticaIndexer.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/indexer/IntPraticaIndexer.java index 0cc6aabf..644cdf8c 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/indexer/IntPraticaIndexer.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/indexer/IntPraticaIndexer.java @@ -196,13 +196,18 @@ public class IntPraticaIndexer extends BaseIndexer { document.addKeyword(PortosIndexField.ISTRUTTORE_USERNAME, UserLocalServiceUtil.getUser(intPraticaFromDB.getStatusByUserId()).getScreenName() .toUpperCase()); + } if (intPratica.getStatusByUserId() != 0L) { User userIstruttore = UserLocalServiceUtil.fetchUser(intPratica.getStatusByUserId()); if (userIstruttore != null) { document.addText(PortosIndexField.ISTRUTTORE_FULL_NAME, userIstruttore.getFullName()); } + document.addKeyword(PortosIndexField.ASSEGNATA_AD_ISTRUTTORE, 1L); + }else{ + document.addKeyword(PortosIndexField.ASSEGNATA_AD_ISTRUTTORE, 0L); } + if (intPratica.getUserId() != 0L) { User proprietarioDigitale = UserLocalServiceUtil.fetchUser(intPratica.getUserId()); if (proprietarioDigitale != null) { 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 46ccbe0e..49df706b 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=3294 - build.date=1629903256819 + build.number=3295 + build.date=1629962832872 build.auto.upgrade=true ## diff --git a/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/html/fascicolofe/advanced_search.jsp b/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/html/fascicolofe/advanced_search.jsp index e63576fa..bee2007a 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/html/fascicolofe/advanced_search.jsp +++ b/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/html/fascicolofe/advanced_search.jsp @@ -1,3 +1,4 @@ +<%@page import="it.tref.liferay.portos.bo.util.PortosIndexField"%> <%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> <%@page import="it.tref.liferay.portos.bo.service.IntPraticaLocalServiceUtil"%> <%@page import="it.tref.liferay.portos.bo.shared.util.StatoPraticaConstants"%> @@ -31,6 +32,9 @@
Stato Pratica + + +