This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository tutti. See https://gitlab.nuiton.org/codelutin/tutti.git commit c74e5c16722a58ead5846549d0a2f1492b6e5d30 Author: Tony CHEMIT <chemit@codelutin.com> Date: Wed Apr 20 09:58:56 2016 +0200 Si un des max est atteint on ne propose plus de prélever --- .../tutti/service/sampling/IndividualObservationSamplingStatus.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tutti-service/src/main/java/fr/ifremer/tutti/service/sampling/IndividualObservationSamplingStatus.java b/tutti-service/src/main/java/fr/ifremer/tutti/service/sampling/IndividualObservationSamplingStatus.java index 46dcfdb..df0a8e1 100644 --- a/tutti-service/src/main/java/fr/ifremer/tutti/service/sampling/IndividualObservationSamplingStatus.java +++ b/tutti-service/src/main/java/fr/ifremer/tutti/service/sampling/IndividualObservationSamplingStatus.java @@ -64,7 +64,6 @@ public class IndividualObservationSamplingStatus { Objects.requireNonNull(cruiseSamplingData); Objects.requireNonNull(zoneSamplingData); Objects.requireNonNull(fishingOperationSamplingData); - this.needSampling = needSampling; this.individualObservationSamplingContext = individualObservationSamplingContext; this.samplingCountInCruise = cruiseSamplingData.getSamplingCount(); this.individualObservationCountInCruise = cruiseSamplingData.getIndividualObservationCount(); @@ -72,6 +71,8 @@ public class IndividualObservationSamplingStatus { this.individualObservationCountInZone = zoneSamplingData.getIndividualObservationCount(); this.samplingCountInFishingOperation = fishingOperationSamplingData.getSamplingCount(); this.individualObservationCountInFishingOperation = fishingOperationSamplingData.getIndividualObservationCount(); + // on ne peux demander un prélèvement uniquement si la limite n'est pas atteinte + this.needSampling = needSampling && !isOneTotalCountIsAttained(); } public IndividualObservationSamplingContext getIndividualObservationSamplingContext() { -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.