Author: bleny Date: 2013-04-23 11:04:36 +0200 (Tue, 23 Apr 2013) New Revision: 1654 Url: http://forge.codelutin.com/projects/wao/repository/revisions/1654 Log: fixes #1901, update synthesis for obsvente now expected observations = value in samplemonth * averageObservationsCount Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/entity/SampleRowDAOImpl.java Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/entity/SampleRowDAOImpl.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/entity/SampleRowDAOImpl.java 2013-04-22 15:56:33 UTC (rev 1653) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/entity/SampleRowDAOImpl.java 2013-04-23 09:04:36 UTC (rev 1654) @@ -246,9 +246,15 @@ String sampleMonthDateProperty = sampleMonthProperty.periodDate(); TopiaQuery query = toTopiaQuery(filter). addLeftJoin(sampleRowProperty.sampleMonth(), sampleMonthProperty.defaultAlias(), false). - setSelect(sampleMonthDateProperty). - addSelect(WaoQueryHelper.format("SUM($1)", sampleMonthProperty.expectedTidesValue())). - addBetween(sampleMonthDateProperty, monthsPeriod.getFromDate(), monthsPeriod.getThruDate()). + setSelect(sampleMonthDateProperty); + + if (filter.getObsProgram() == ObsProgram.OBSVENTE) { + query.addSelect(WaoQueryHelper.format("SUM($1 * $2)", sampleMonthProperty.expectedTidesValue(), sampleRowProperty.averageObservationsCount())); + } else { + query.addSelect(WaoQueryHelper.format("SUM($1)", sampleMonthProperty.expectedTidesValue())); + } + + query.addBetween(sampleMonthDateProperty, monthsPeriod.getFromDate(), monthsPeriod.getThruDate()). addGroup(sampleMonthDateProperty). addOrder(sampleMonthDateProperty);