Author: bleny Date: 2010-11-19 18:24:57 +0000 (Fri, 19 Nov 2010) New Revision: 794 Log: synthesis must consider non-validated contacts too Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceSynthesisImpl.java Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceSynthesisImpl.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceSynthesisImpl.java 2010-11-19 18:10:04 UTC (rev 793) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceSynthesisImpl.java 2010-11-19 18:24:57 UTC (rev 794) @@ -412,8 +412,7 @@ WaoQueryBuilder builder = context.newQueryBuilder(); ContactProperty contactProperty = builder.initializeForContact(); TopiaQuery query = builder.applySamplingFilter(filter). - addEquals(contactProperty.state(), ContactState.BOARDING_DONE.ordinal()). - addNullOr(contactProperty.validationProgram(), Op.EQ, Boolean.TRUE); + addEquals(contactProperty.state(), ContactState.BOARDING_DONE.ordinal()); if (filter.getEstimatedTides()) { query.addNullOr(contactProperty.validationCompany(), Op.EQ, Boolean.TRUE); @@ -600,12 +599,10 @@ filter.setPeriod(PeriodDates.createMonthsPeriodFromToday(-3)); } - WaoQueryBuilder builder = context.newQueryBuilder(); ContactProperty contactProperty = builder.initializeForContact(); TopiaQuery query = builder.applySamplingFilter(filter). - addEquals(contactProperty.state(), ContactState.BOARDING_DONE.ordinal()). - addNullOr(contactProperty.validationProgram(), Op.EQ, Boolean.TRUE); + addEquals(contactProperty.state(), ContactState.BOARDING_DONE.ordinal()); if (filter.getEstimatedTides()) { query.addNullOr(contactProperty.validationCompany(), Op.EQ, Boolean.TRUE); @@ -697,10 +694,9 @@ TopiaQuery query = builder.applySamplingFilter(filter). addEquals(contactProperty.state(), ContactState.BOARDING_DONE.ordinal()). - addEquals(contactProperty.validationProgram(), Boolean.TRUE). // Set the results wanted : by company, by reliability, - // get number of each realiability level + // get number of each reliability level setSelect(companyProperty.name(), contactProperty.dataReliabilityOrdinal(), "COUNT(*)"). addGroup(companyProperty.name(), contactProperty.dataReliabilityOrdinal());