branch develop updated (dfad235 -> 1f3474a)
This is an automated email from the git hooks/post-receive script. New change to branch develop in repository wao. See http://git.codelutin.com/wao.git from dfad235 Corrections pour éviter la notion d'organisation (fixes #6295) new 1f3474a Correction du calcul du réal en jours de mer dans ObsMer The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit 1f3474aeb14051af5fba437f16f00e3dae3073cc Author: Brendan Le Ny <bleny@codelutin.com> Date: Fri Dec 26 11:40:00 2014 +0100 Correction du calcul du réal en jours de mer dans ObsMer Summary of changes: .../java/fr/ifremer/wao/services/service/ObsMerSamplingPlanBuilder.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository wao. See http://git.codelutin.com/wao.git commit 1f3474aeb14051af5fba437f16f00e3dae3073cc Author: Brendan Le Ny <bleny@codelutin.com> Date: Fri Dec 26 11:40:00 2014 +0100 Correction du calcul du réal en jours de mer dans ObsMer --- .../java/fr/ifremer/wao/services/service/ObsMerSamplingPlanBuilder.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/wao-services/src/main/java/fr/ifremer/wao/services/service/ObsMerSamplingPlanBuilder.java b/wao-services/src/main/java/fr/ifremer/wao/services/service/ObsMerSamplingPlanBuilder.java index 261a65d..d18837f 100644 --- a/wao-services/src/main/java/fr/ifremer/wao/services/service/ObsMerSamplingPlanBuilder.java +++ b/wao-services/src/main/java/fr/ifremer/wao/services/service/ObsMerSamplingPlanBuilder.java @@ -176,7 +176,7 @@ public class ObsMerSamplingPlanBuilder { estimated = WaoUtils.sum(estimatedDoneObservationDays); } - Collection<Integer> realDoneObservationDays = estimatedObservationDaysByMonths.asMap().get(month); + Collection<Integer> realDoneObservationDays = realObservationDaysByMonths.asMap().get(month); Integer real = 0; // car realDoneObservationDays peut être null si aucune observation sur le mois if (realDoneObservationDays != null) { real = WaoUtils.sum(realDoneObservationDays); -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
participants (1)
-
codelutin.com scm