branch develop updated (fadcee0 -> 91c1fe6)
This is an automated email from the git hooks/post-receive script. New change to branch develop in repository tutti. See https://gitlab.nuiton.org/codelutin/tutti.git from fadcee0 fixes #8304 (erreur à la suppression de lots contenant des observations indivuelles) new 11c7ce2 fixes #8304 (erreur à la suppression de lots contenant des observations indivuelles) new 91c1fe6 Merge branch 'develop' of https://gitlab.nuiton.org/codelutin/tutti into develop The 2 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 91c1fe609d2d93c97d9a064a4a264545b991e2d2 Merge: 11c7ce2 fadcee0 Author: Benjamin POUSSIN <poussin@codelutin.com> Date: Thu Jun 23 13:46:45 2016 +0200 Merge branch 'develop' of https://gitlab.nuiton.org/codelutin/tutti into develop commit 11c7ce2de3a156bc6913da75cbfe81d5b024ac93 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) Summary of changes: .../java/fr/ifremer/tutti/service/sampling/CruiseSamplingCache.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -- 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 tutti. See https://gitlab.nuiton.org/codelutin/tutti.git commit 11c7ce2de3a156bc6913da75cbfe81d5b024ac93 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..5a5abb1 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>.
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 91c1fe609d2d93c97d9a064a4a264545b991e2d2 Merge: 11c7ce2 fadcee0 Author: Benjamin POUSSIN <poussin@codelutin.com> Date: Thu Jun 23 13:46:45 2016 +0200 Merge branch 'develop' of https://gitlab.nuiton.org/codelutin/tutti into develop -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
participants (1)
-
codelutin.com scm