Author: fdesbois Date: 2010-07-24 18:09:59 +0000 (Sat, 24 Jul 2010) New Revision: 627 Log: Evo #2369 : - Missing period managment for contacts Modified: trunk/wao-business/src/main/filters/Wao.properties trunk/wao-business/src/main/java/fr/ifremer/wao/WaoQueryBuilder.java Modified: trunk/wao-business/src/main/filters/Wao.properties =================================================================== --- trunk/wao-business/src/main/filters/Wao.properties 2010-07-24 14:57:19 UTC (rev 626) +++ trunk/wao-business/src/main/filters/Wao.properties 2010-07-24 18:09:59 UTC (rev 627) @@ -48,8 +48,8 @@ wao.server.path=localhost:8080/wao ## Version (not necessary to override it) filters no working anymore -wao.version=1.5 -#wao.version=${project.version} +#wao.version=1.5.1 +wao.version=${project.version} ###### Since 1.5 ## Email used when contact is set to BOARDING_DONE state Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/WaoQueryBuilder.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/WaoQueryBuilder.java 2010-07-24 14:57:19 UTC (rev 626) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/WaoQueryBuilder.java 2010-07-24 18:09:59 UTC (rev 627) @@ -21,15 +21,24 @@ */ package fr.ifremer.wao; -import fr.ifremer.wao.bean.*; -import fr.ifremer.wao.entity.*; +import fr.ifremer.wao.bean.BoatFilter; +import fr.ifremer.wao.bean.ContactFilter; +import fr.ifremer.wao.bean.ContactState; +import fr.ifremer.wao.bean.SamplingFilter; +import fr.ifremer.wao.bean.UserFilter; +import fr.ifremer.wao.entity.Company; +import fr.ifremer.wao.entity.SampleRow; +import fr.ifremer.wao.entity.WaoUser; import org.apache.commons.lang.StringUtils; import org.nuiton.topia.framework.TopiaQuery; import org.nuiton.util.PeriodDates; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import java.util.*; +import java.util.ArrayList; +import java.util.Calendar; +import java.util.Date; +import java.util.List; /** * Created: 7 juin 2010 @@ -391,6 +400,7 @@ WaoUser observer = filter.getObserver(); Company company = filter.getCompany(); Date fromDate = filter.getFromDate(); + PeriodDates period = filter.getPeriod(); boolean mammalsObservation = filter.getMammalsObservation(); boolean mammalsCapture = filter.getMammalsCapture(); boolean programAccepted = filter.getProgramAccepted(); @@ -414,6 +424,7 @@ // Ano #2327 : Reset fromDate, don't manage it in applySamplingFilter filter.setFromDate(null); + filter.setPeriod(null); if (filter.isSamplingFiltered() || company != null) { // sampleRowProperty = contactProperty.sampleRowProperty(); @@ -482,13 +493,18 @@ addNotEmpty(contactProperty.commentCoordinator()); } + // PERIOD + if (period != null) { + query.addBetween(contactProperty.topiaCreateDate(), period.getFromDate(), period.getThruDate()); + } // FROM_DATE - if (fromDate != null) { + else if (fromDate != null) { query.addWhere(contactProperty.topiaCreateDate(), TopiaQuery.Op.GE, fromDate); } - // Reinitialize fromDate of the filter, don't know if it's really needed + // Reinitialize fromDate of the filter (previously reset for samplingFilter) filter.setFromDate(fromDate); + filter.setPeriod(period); // ORDER_BY if (StringUtils.isNotEmpty(orderBy)) {