diff --git a/liferay-plugins-sdk-6.2/dist/portos-audit-shared-6.2.0.1.jar b/liferay-plugins-sdk-6.2/dist/portos-audit-shared-6.2.0.1.jar
index 872233d9..1e307ff5 100644
Binary files a/liferay-plugins-sdk-6.2/dist/portos-audit-shared-6.2.0.1.jar and b/liferay-plugins-sdk-6.2/dist/portos-audit-shared-6.2.0.1.jar differ
diff --git a/liferay-plugins-sdk-6.2/dist/portos-kaleo-shared-6.2.0.1.jar b/liferay-plugins-sdk-6.2/dist/portos-kaleo-shared-6.2.0.1.jar
index 8f650fb9..a2ad83f9 100644
Binary files a/liferay-plugins-sdk-6.2/dist/portos-kaleo-shared-6.2.0.1.jar and b/liferay-plugins-sdk-6.2/dist/portos-kaleo-shared-6.2.0.1.jar differ
diff --git a/liferay-plugins-sdk-6.2/dist/portos-mail-manager-shared-6.2.0.1.jar b/liferay-plugins-sdk-6.2/dist/portos-mail-manager-shared-6.2.0.1.jar
index 5cb21045..d5dbced2 100644
Binary files a/liferay-plugins-sdk-6.2/dist/portos-mail-manager-shared-6.2.0.1.jar and b/liferay-plugins-sdk-6.2/dist/portos-mail-manager-shared-6.2.0.1.jar differ
diff --git a/liferay-plugins-sdk-6.2/dist/portos-report-shared-6.2.0.1.jar b/liferay-plugins-sdk-6.2/dist/portos-report-shared-6.2.0.1.jar
index 9864564e..0d429312 100644
Binary files a/liferay-plugins-sdk-6.2/dist/portos-report-shared-6.2.0.1.jar and b/liferay-plugins-sdk-6.2/dist/portos-report-shared-6.2.0.1.jar differ
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/lib/portos-bo-portlet-service.jar b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/lib/portos-bo-portlet-service.jar
index 89a8953c..b14cfcda 100644
Binary files a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/lib/portos-bo-portlet-service.jar and b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/lib/portos-bo-portlet-service.jar differ
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 02c377b4..c70f72a5 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
@@ -13,6 +13,7 @@ import java.util.List;
import java.util.Properties;
import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletRequestWrapper;
import com.liferay.portal.kernel.exception.SystemException;
import com.liferay.portal.kernel.log.Log;
@@ -91,7 +92,7 @@ public class IntPraticaAdvancedSearch {
}
public static Hits searchAltriProgetti(HttpServletRequest request, User user, int start, int end) {
-
+
SearchContext searchContext = SearchContextFactory.getInstance(request);
searchContext.setKeywords(OVERRIDE_KEYWORDS.toString());
searchContext.setAttribute("paginationType", "more");
@@ -516,11 +517,23 @@ public class IntPraticaAdvancedSearch {
private static void queryTipoProcedura(HttpServletRequest request, BooleanQuery booleanQuery,
SearchContext searchContext) throws ParseException {
String tipoProcedura = ParamUtil.getString(request, PortosIndexField.TIPO_PROCEDURA);
+ // EVOLUTIVA per filtro ospedaliera
+// Boolean praticaOspedaliera = ParamUtil.getBoolean(request, "praticaospedaliera");
if (Validator.isNotNull(tipoProcedura)) {
- TermQuery termQuery = TermQueryFactoryUtil.create(searchContext, PortosIndexField.TIPO_PROCEDURA,
- tipoProcedura);
- if (Validator.isNotNull(termQuery)) {
- booleanQuery.add(termQuery, BooleanClauseOccur.MUST);
+ if("H".equals(tipoProcedura)){
+ _log.debug("tipoProcedura: "+tipoProcedura);
+ tipoProcedura = "B";
+ TermQuery ospedalieraTermQuery = TermQueryFactoryUtil.create(searchContext, "praticaospedaliera",
+ "true");
+ if (Validator.isNotNull(ospedalieraTermQuery)) {
+ booleanQuery.add(ospedalieraTermQuery, BooleanClauseOccur.MUST);
+ }
+ }else{
+ TermQuery termQuery = TermQueryFactoryUtil.create(searchContext, PortosIndexField.TIPO_PROCEDURA,
+ tipoProcedura);
+ if (Validator.isNotNull(termQuery)) {
+ booleanQuery.add(termQuery, BooleanClauseOccur.MUST);
+ }
}
}
}
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 8a0ce843..29f7c130 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
@@ -162,6 +162,10 @@ public class IntPraticaIndexer extends BaseIndexer {
if (tipoProcedura.equalsIgnoreCase(Constants.PROCEDURA_B1))
tipoProcedura = Constants.PROCEDURA_B;
document.addKeyword(PortosIndexField.TIPO_PROCEDURA, tipoProcedura);
+ if(intPratica.isPraticaOspedaliera()){
+ _log.debug("Adding praticaOspedaliera Index on intpratica " + intPratica.getIntPraticaId());
+ document.addKeyword("praticaospedaliera", intPratica.isPraticaOspedaliera());
+ }
}
// Gestione pratica aperta/chiusa fine lavori
if (intPraticaFromDB.getCollaudoTotale()) {
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/portlet/FascicoloPortlet.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/portlet/FascicoloPortlet.java
index 13701bbe..9acf3523 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/portlet/FascicoloPortlet.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/portlet/FascicoloPortlet.java
@@ -240,6 +240,7 @@ public class FascicoloPortlet extends MVCPortlet {
String protocollo = actionRequest.getParameter("protocollo");
// String tipoPratica = actionRequest.getParameter("tipoPratica");
String tipoProcedura = actionRequest.getParameter("tipoProcedura");
+// String praticaospedaliera = String.valueOf(ParamUtil.getBoolean(actionRequest, "praticaospedaliera"));
String statoPratica = actionRequest.getParameter("statoPratica");
String committente = actionRequest.getParameter("committente");
String descInterventoSearch = actionRequest.getParameter("descIntervento");
@@ -277,7 +278,7 @@ public class FascicoloPortlet extends MVCPortlet {
actionResponse.setRenderParameter("praticaAperta", praticaAperta);
actionResponse.setRenderParameter("descIntervento", descInterventoSearch);
actionResponse.setRenderParameter("protocollo", protocollo);
- // actionResponse.setRenderParameter("tipoPratica", tipoPratica);
+// actionResponse.setRenderParameter("praticaospedaliera", praticaospedaliera);
actionResponse.setRenderParameter("tipoProcedura", tipoProcedura);
actionResponse.setRenderParameter("statoPratica", statoPratica);
actionResponse.setRenderParameter("committente", committente);
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 3bab147c..d81131a9 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=2984
- build.date=1716935320632
+ build.number=2985
+ build.date=1722424256719
build.auto.upgrade=true
##
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/html/fascicolo/advanced_search.jsp b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/html/fascicolo/advanced_search.jsp
index 00b80b64..2a501b50 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/html/fascicolo/advanced_search.jsp
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/html/fascicolo/advanced_search.jsp
@@ -39,6 +39,7 @@
INTERVENTO A (Autorizzazione)
INTERVENTO B (Deposito)
INTERVENTO C (Privo di rilevanza)
+ INTERVENTO H (Ospedaliera)
@@ -228,7 +229,6 @@ var getComuni = function(provinciaId, comuneId, comuneValue) {
A.ready(function(){
-
A.one(".provinciaSelect").on('change', function(event){
var provinciaId = event.currentTarget.get('value'),
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 a5000175..7cc3dacd 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
@@ -50,6 +50,7 @@
String numeroProgettoSearch = ParamUtil.getString(request, "numeroProgetto");
String protocolloSearch = ParamUtil.getString(request, "protocollo");
String tipoPraticaSearch = ParamUtil.getString(request, "tipoPratica");
+String tipoProceduraSearch = ParamUtil.getString(request, "tipoProcedura");
String statoPraticaSearch = ParamUtil.getString(request, "statoPratica");
String descInterventoSearch = ParamUtil.getString(request, "descIntervento");
String committenteSearch = ParamUtil.getString(request, "committente");
@@ -74,6 +75,7 @@ PortletURL iteratorURL = liferayPortletResponse.createRenderURL();
iteratorURL.setParameter("numeroProgetto", numeroProgettoSearch);
iteratorURL.setParameter("protocollo", protocolloSearch);
iteratorURL.setParameter("tipoPratica", tipoPraticaSearch);
+iteratorURL.setParameter("tipoProcedura", tipoProceduraSearch);
iteratorURL.setParameter("statoPratica", statoPraticaSearch);
iteratorURL.setParameter("descIntervento", descInterventoSearch);
iteratorURL.setParameter("committente", committenteSearch);
@@ -130,6 +132,7 @@ String dtSorteggioNullo = "2020-03-05 11:12:18.006";
+