branch release/4.2.3 created (now 80fabee)
This is an automated email from the git hooks/post-receive script. New change to branch release/4.2.3 in repository wao. See http://git.codelutin.com/wao.git at 80fabee dans la branche de release, on fixe la version du pom This branch includes the following new commits: new 1be7c27 Pour le calcul des jours de mers, on se base sur tous les contacts de la ligne et pas seulement ceux sur la période sinon il manque les marées commencées avant le premier mois (fixes #6246) new fcc403b Correction d'une NPE si un plan comporte un mois sans effort (fixes #6249) new 80fabee dans la branche de release, on fixe la version du pom The 3 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 80fabee9a08c560888c8e4243c138e5ef6e93642 Author: Brendan Le Ny <bleny@codelutin.com> Date: Mon Dec 15 16:12:41 2014 +0100 dans la branche de release, on fixe la version du pom commit fcc403b21aa4e498cac3c0395b55a3cb67e24f05 Author: Brendan Le Ny <bleny@codelutin.com> Date: Mon Dec 8 11:51:56 2014 +0100 Correction d'une NPE si un plan comporte un mois sans effort (fixes #6249) commit 1be7c274e39ad0d6f1ff7bf02cb24e763241816a Author: Brendan Le Ny <bleny@codelutin.com> Date: Mon Dec 8 14:35:09 2014 +0100 Pour le calcul des jours de mers, on se base sur tous les contacts de la ligne et pas seulement ceux sur la période sinon il manque les marées commencées avant le premier mois (fixes #6246) -- 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 release/4.2.3 in repository wao. See http://git.codelutin.com/wao.git commit 1be7c274e39ad0d6f1ff7bf02cb24e763241816a Author: Brendan Le Ny <bleny@codelutin.com> Date: Mon Dec 8 14:35:09 2014 +0100 Pour le calcul des jours de mers, on se base sur tous les contacts de la ligne et pas seulement ceux sur la période sinon il manque les marées commencées avant le premier mois (fixes #6246) --- .../wao/services/service/ObsMerSamplingPlanService.java | 15 ++------------- 1 file changed, 2 insertions(+), 13 deletions(-) diff --git a/wao-services/src/main/java/fr/ifremer/wao/services/service/ObsMerSamplingPlanService.java b/wao-services/src/main/java/fr/ifremer/wao/services/service/ObsMerSamplingPlanService.java index 7884a16..8d447f7 100644 --- a/wao-services/src/main/java/fr/ifremer/wao/services/service/ObsMerSamplingPlanService.java +++ b/wao-services/src/main/java/fr/ifremer/wao/services/service/ObsMerSamplingPlanService.java @@ -29,7 +29,6 @@ import com.google.common.collect.Sets; import fr.ifremer.wao.ContactsFilter; import fr.ifremer.wao.SampleRowsFilter; import fr.ifremer.wao.WaoTechnicalException; -import fr.ifremer.wao.WaoUtils; import fr.ifremer.wao.entity.Contact; import fr.ifremer.wao.entity.ContactState; import fr.ifremer.wao.entity.ContactTopiaDao; @@ -45,7 +44,6 @@ import org.nuiton.csv.ExportModel; import java.io.InputStream; import java.util.Collection; -import java.util.Date; import java.util.LinkedHashSet; import java.util.List; import java.util.Locale; @@ -111,16 +109,11 @@ public class ObsMerSamplingPlanService extends SamplingPlanService { samplingPlanCacheKey.getOptionalCompanyId(), sampleRowsFilter); - // begin of month - Date periodFrom = sampleRowsFilter.getPeriodFrom(); - // end of month - Date periodTo = WaoUtils.getEndOfMonth(sampleRowsFilter.getPeriodTo()); - ContactTopiaDao contactDao = getContactDao(); for (SampleRow sampleRow : sampleRows) { - Collection<Contact> doneObservations = getDoneObservations(sampleRow, periodFrom, periodTo); + Collection<Contact> doneObservations = getDoneObservations(sampleRow); long sampleRowContactCounts = contactDao.forSampleRowEquals(sampleRow).count(); @@ -142,16 +135,12 @@ public class ObsMerSamplingPlanService extends SamplingPlanService { * Permet d'obtenir pour une période donnée toutes les observations réalisées. Cela forme * une base de travail pour calculer le réalisé en jours de mers */ - protected Collection<Contact> getDoneObservations(SampleRow sampleRow, Date periodFrom, Date periodTo) { + protected Collection<Contact> getDoneObservations(SampleRow sampleRow) { ContactsFilter contactFilter = new ContactsFilter(); contactFilter.getSampleRowFilter().setSampleRowIds(ImmutableSet.of(sampleRow.getTopiaId())); - contactFilter.setFilterOnObservationBeginDate(true); - contactFilter.setPeriodFrom(periodFrom); - contactFilter.setPeriodTo(periodTo); - contactFilter.setContactStates(ImmutableSet.of(ContactState.OBSERVATION_DONE)); // on exclue les contacts qui sont invalidés par le programme contactFilter.setProgramAcceptations(Sets.newHashSet(true, null)); -- 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 release/4.2.3 in repository wao. See http://git.codelutin.com/wao.git commit fcc403b21aa4e498cac3c0395b55a3cb67e24f05 Author: Brendan Le Ny <bleny@codelutin.com> Date: Mon Dec 8 11:51:56 2014 +0100 Correction d'une NPE si un plan comporte un mois sans effort (fixes #6249) --- .../ifremer/wao/services/service/SamplingPlan.java | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/wao-services/src/main/java/fr/ifremer/wao/services/service/SamplingPlan.java b/wao-services/src/main/java/fr/ifremer/wao/services/service/SamplingPlan.java index 809bb86..47eb232 100644 --- a/wao-services/src/main/java/fr/ifremer/wao/services/service/SamplingPlan.java +++ b/wao-services/src/main/java/fr/ifremer/wao/services/service/SamplingPlan.java @@ -133,15 +133,17 @@ public abstract class SamplingPlan implements Iterable<SamplingPlan.SamplingPlan int expected = 0; int real = 0; int estimated = 0; - for (Effort effort : efforts) { - if (effort.getExpected() != null) { - expected += effort.getExpected(); - } - if (effort.getEstimated() != null) { - estimated += effort.getEstimated(); - } - if (effort.getReal() != null) { - real += effort.getReal(); + if (efforts != null) { + for (Effort effort : efforts) { + if (effort.getExpected() != null) { + expected += effort.getExpected(); + } + if (effort.getEstimated() != null) { + estimated += effort.getEstimated(); + } + if (effort.getReal() != null) { + real += effort.getReal(); + } } } return new Effort(expected, real, estimated); -- 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 release/4.2.3 in repository wao. See http://git.codelutin.com/wao.git commit 80fabee9a08c560888c8e4243c138e5ef6e93642 Author: Brendan Le Ny <bleny@codelutin.com> Date: Mon Dec 15 16:12:41 2014 +0100 dans la branche de release, on fixe la version du pom --- pom.xml | 2 +- wao-persistence/pom.xml | 2 +- wao-services/pom.xml | 2 +- wao-web/pom.xml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pom.xml b/pom.xml index 2f03948..b16c287 100644 --- a/pom.xml +++ b/pom.xml @@ -10,7 +10,7 @@ <groupId>fr.ifremer</groupId> <artifactId>wao</artifactId> - <version>4.2.2</version> + <version>4.2.3</version> <packaging>pom</packaging> <name>Wao</name> diff --git a/wao-persistence/pom.xml b/wao-persistence/pom.xml index 71cf277..9b185ff 100644 --- a/wao-persistence/pom.xml +++ b/wao-persistence/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>wao</artifactId> - <version>4.2.2</version> + <version>4.2.3</version> </parent> <artifactId>wao-persistence</artifactId> diff --git a/wao-services/pom.xml b/wao-services/pom.xml index 41febd9..f9ecf12 100644 --- a/wao-services/pom.xml +++ b/wao-services/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>wao</artifactId> - <version>4.2.2</version> + <version>4.2.3</version> </parent> <artifactId>wao-services</artifactId> diff --git a/wao-web/pom.xml b/wao-web/pom.xml index 47051d2..5cbb6ed 100644 --- a/wao-web/pom.xml +++ b/wao-web/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>wao</artifactId> - <version>4.2.2</version> + <version>4.2.3</version> </parent> <artifactId>wao-web</artifactId> -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
participants (1)
-
codelutin.com scm