Author: bleny Date: 2012-03-29 11:07:28 +0200 (Thu, 29 Mar 2012) New Revision: 1584 Url: http://forge.codelutin.com/repositories/revision/wao/1584 Log: Anomalie #1040 Filtre synth?\195?\168se ne g?\195?\168re pas les contacts non valid?\195?\169s (V3.3) Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/entity/ContactDAOImpl.java Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/entity/ContactDAOImpl.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/entity/ContactDAOImpl.java 2012-03-29 08:11:29 UTC (rev 1583) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/entity/ContactDAOImpl.java 2012-03-29 09:07:28 UTC (rev 1584) @@ -346,9 +346,7 @@ SortedMap<Date, Integer> actualObservationsMyMonths = new TreeMap<Date,Integer>(); TopiaQuery query = toTopiaQuery(filter); - query.addEquals(query.getMainAlias() + "." + Contact.PROPERTY_STATE, ContactState.OBSERVATION_DONE.ordinal()) - .addEquals(query.getMainAlias() + "." + Contact.PROPERTY_VALIDATION_COMPANY, true) - .addEquals(query.getMainAlias() + "." + Contact.PROPERTY_VALIDATION_PROGRAM, true); + query.addEquals(query.getMainAlias() + "." + Contact.PROPERTY_STATE, ContactState.OBSERVATION_DONE.ordinal()); Range<Date> range = Range.between(monthsPeriod.getFromDate(), monthsPeriod.getThruDate());