Sfoglia il codice sorgente

aggiunta ricerca per pratica ospedaliera e fixato filtro tipo procedura

feature/filtro-ospedaliera
Marco Alderighi 5 mesi fa
parent
commit
bdd584fac0
  1. BIN
      liferay-plugins-sdk-6.2/dist/portos-audit-shared-6.2.0.1.jar
  2. BIN
      liferay-plugins-sdk-6.2/dist/portos-kaleo-shared-6.2.0.1.jar
  3. BIN
      liferay-plugins-sdk-6.2/dist/portos-mail-manager-shared-6.2.0.1.jar
  4. BIN
      liferay-plugins-sdk-6.2/dist/portos-report-shared-6.2.0.1.jar
  5. BIN
      liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/lib/portos-bo-portlet-service.jar
  6. 23
      liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/search/IntPraticaAdvancedSearch.java
  7. 4
      liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/indexer/IntPraticaIndexer.java
  8. 3
      liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/portlet/FascicoloPortlet.java
  9. 4
      liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/service.properties
  10. 2
      liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/html/fascicolo/advanced_search.jsp
  11. 3
      liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/html/fascicolo/view.jsp

BIN
liferay-plugins-sdk-6.2/dist/portos-audit-shared-6.2.0.1.jar vendored

File binario non mostrato.

BIN
liferay-plugins-sdk-6.2/dist/portos-kaleo-shared-6.2.0.1.jar vendored

File binario non mostrato.

BIN
liferay-plugins-sdk-6.2/dist/portos-mail-manager-shared-6.2.0.1.jar vendored

File binario non mostrato.

BIN
liferay-plugins-sdk-6.2/dist/portos-report-shared-6.2.0.1.jar vendored

File binario non mostrato.

BIN
liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/lib/portos-bo-portlet-service.jar

File binario non mostrato.

23
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);
}
}
}
}

4
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()) {

3
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);

4
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
##

2
liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/html/fascicolo/advanced_search.jsp

@ -39,6 +39,7 @@
<aui:option value="A">INTERVENTO A (Autorizzazione)</aui:option>
<aui:option value="B">INTERVENTO B (Deposito)</aui:option>
<aui:option value="C">INTERVENTO C (Privo di rilevanza)</aui:option>
<aui:option value="H">INTERVENTO H (Ospedaliera)</aui:option>
</aui:select>
</div>
<div class="col-xs-12 col-sm-12 col-md-3 col-lg-3">
@ -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'),

3
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";
<liferay-portlet:param name="numeroProgetto" value="<%=numeroProgettoSearch %>"/>
<liferay-portlet:param name="protocollo" value="<%=protocolloSearch %>"/>
<liferay-portlet:param name="tipoPratica" value="<%=tipoPraticaSearch %>"/>
<liferay-portlet:param name="tipoProcedura" value="<%=tipoProceduraSearch %>"/>
<liferay-portlet:param name="descIntervento" value="<%=descInterventoSearch %>"/>
<liferay-portlet:param name="statoPratica" value="<%=statoPraticaSearch %>"/>
<liferay-portlet:param name="committente" value="<%=committenteSearch %>"/>

Caricamento…
Annulla
Salva