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 02f97ea5a418fbb9c533025be3185fc4bd3d9b78 Author: Tony CHEMIT <chemit@codelutin.com> Date: Fri Apr 22 17:23:31 2016 +0200 Gestion de la nullité du quota dans l'algorithme --- .../sampling/IndividualObservationSamplingStatus.java | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) 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 df0a8e1..dd47b50 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 @@ -111,28 +111,31 @@ public class IndividualObservationSamplingStatus { return individualObservationCountInZone; } - public int getTotalSamplingRequiredInCruise() { + public Integer getTotalSamplingRequiredInCruise() { return getCalcifiedPiecesSamplingDefinition().getMaxByLenghtStep(); } - public int getTotalSamplingRequiredInFishingOperation() { + public Integer getTotalSamplingRequiredInFishingOperation() { return getCalcifiedPiecesSamplingDefinition().getOperationLimitation(); } - public int getTotalSamplingRequiredInZone() { + public Integer getTotalSamplingRequiredInZone() { return getCalcifiedPiecesSamplingDefinition().getZoneLimitation(); } public boolean isTotalInCruiseAttained() { - return getTotalSamplingRequiredInCruise() > 0 && getSamplingCountInCruise() >= getTotalSamplingRequiredInCruise(); + Integer totalSamplingRequiredInCruise = getTotalSamplingRequiredInCruise(); + return totalSamplingRequiredInCruise != null && (totalSamplingRequiredInCruise > 0 && getSamplingCountInCruise() >= totalSamplingRequiredInCruise); } public boolean isTotalInFishingOperationAttained() { - return getTotalSamplingRequiredInFishingOperation() > 0 && getSamplingCountInFishingOperation() >= getTotalSamplingRequiredInFishingOperation(); + Integer totalSamplingRequiredInFishingOperation = getTotalSamplingRequiredInFishingOperation(); + return totalSamplingRequiredInFishingOperation != null && (totalSamplingRequiredInFishingOperation > 0 && getSamplingCountInFishingOperation() >= totalSamplingRequiredInFishingOperation); } public boolean isTotalInZoneAttained() { - return getTotalSamplingRequiredInZone() > 0 && getSamplingCountInZone() >= getTotalSamplingRequiredInZone(); + Integer totalSamplingRequiredInZone = getTotalSamplingRequiredInZone(); + return totalSamplingRequiredInZone != null && (totalSamplingRequiredInZone > 0 && getSamplingCountInZone() >= totalSamplingRequiredInZone); } public boolean isOneTotalCountIsAttained() { -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.