Author: bleny Date: 2012-12-24 11:21:47 +0100 (Mon, 24 Dec 2012) New Revision: 1634 Url: http://forge.codelutin.com/projects/wao/repository/revisions/1634 Log: fixes #1900 Dans la synth?\195?\168se sur le taux de r?\195?\169alisation, le calcul de l'indicateur est erron?\195?\169 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 2012-11-22 21:45:18 UTC (rev 1633) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceSynthesisImpl.java 2012-12-24 10:21:47 UTC (rev 1634) @@ -71,6 +71,7 @@ import java.util.Set; import java.util.SortedMap; import java.util.TreeMap; +import java.util.TreeSet; /** * ServiceSynthesisImpl @@ -309,24 +310,23 @@ Pair<SortedMap<Date, Integer>, SortedMap<Date, Integer>> res = getDataSampling(filter); + PeriodDates monthsPeriod = new PeriodDates(filter.getPeriod().getFromDate(), filter.getPeriod().getThruDate()); + int totalNumberOfRealized = 0; int totalNumberOfPlanned = 0; - for (Map.Entry<Date, Integer> entry : res.getRight().entrySet()) { - // res.get(1) contains number of realized - // while res.get(0) contains planned + for (Date month : monthsPeriod.getMonths()) { - Date date = entry.getKey(); - // both variables will contains planned and realized at the same date - Integer numberOfPlanned = res.getLeft().get(date); - Integer numberOfRealized = entry.getValue(); + // both variables will contains planned and realized at the same month + Integer numberOfPlanned = res.getLeft().get(month); + Integer numberOfRealized = res.getRight().get(month); totalNumberOfPlanned += numberOfPlanned == null ? 0 : numberOfPlanned; totalNumberOfRealized += numberOfRealized == null ? 0 : numberOfRealized; if (log.isDebugEnabled()) { log.debug(String.format( - "at month %s:number of planed %s (%s), number of realized %s (%s)", - date, + "at month %s: number of planed %s (%s), number of realized %s (%s)", + month, numberOfPlanned, totalNumberOfPlanned, numberOfRealized, totalNumberOfRealized)); }