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 fadcee039616f7a0216083447f3ca3a1488fd90d Author: Benjamin POUSSIN <poussin@codelutin.com> Date: Thu Jun 23 13:28:00 2016 +0200 fixes #8304 (erreur à la suppression de lots contenant des observations indivuelles) --- .../fr/ifremer/tutti/service/sampling/CruiseSamplingCache.java | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/tutti-service/src/main/java/fr/ifremer/tutti/service/sampling/CruiseSamplingCache.java b/tutti-service/src/main/java/fr/ifremer/tutti/service/sampling/CruiseSamplingCache.java index 8670c37..1d4908d 100644 --- a/tutti-service/src/main/java/fr/ifremer/tutti/service/sampling/CruiseSamplingCache.java +++ b/tutti-service/src/main/java/fr/ifremer/tutti/service/sampling/CruiseSamplingCache.java @@ -240,7 +240,11 @@ public class CruiseSamplingCache implements CruiseCacheAble { Objects.requireNonNull(individualObservationBatch.getSize()); float lengthStep = individualObservationBatch.getSize(); - int lengthStepInMm = Numbers.convertToMm(lengthStep, individualObservationBatch.getLengthStepCaracteristic().getUnit()); + + // don't forget to compute lengthStep with Caracteristic https://forge.codelutin.com/issues/8304 +// int lengthStepInMm = Numbers.convertToMm(lengthStep, individualObservationBatch.getLengthStepCaracteristic().getUnit()); + int lengthStepInMm = individualObservationBatch.getLengthStepCaracteristic().getLengthStepInMm(lengthStep); + CaracteristicQualitativeValue gender = individualObservationBatch.getCaracteristics().getQualitativeValue(sexCaracteristic); @@ -770,7 +774,11 @@ public class CruiseSamplingCache implements CruiseCacheAble { Boolean maturity = getMaturity(individualObservationBatch); + // FIXME poussin 20160623 lengthStepInMm must be compute with next line (like bug 8304 and 8337 ?) + // int lengthStepInMm = individualObservationBatch.getLengthStepCaracteristic().getLengthStepInMm(lengthStep); int lengthStepInMm = Numbers.convertToMm(lengthStep, individualObservationBatch.getLengthStepCaracteristic().getUnit()); + log.error(String.format("DEBUG ###***### computed lengthStep %s but perhaps must be %s", + lengthStepInMm, individualObservationBatch.getLengthStepCaracteristic().getLengthStepInMm(lengthStep))); CaracteristicQualitativeValue gender = individualObservationBatch.getCaracteristics().getQualitativeValue(sexCaracteristic); -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.