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 2a0448834d79db0c7454ad77e3e6d998d79afeda Author: Kevin Morin <morin@codelutin.com> Date: Tue Apr 26 14:30:34 2016 +0200 on fait un check pour vérifier que le poids est là (fixes #8278) --- .../tutti/service/catches/multipost/MultiPostImportService.java | 9 +++++---- .../src/main/resources/i18n/tutti-service_en_GB.properties | 1 + .../src/main/resources/i18n/tutti-service_fr_FR.properties | 1 + 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/multipost/MultiPostImportService.java b/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/multipost/MultiPostImportService.java index a195229..efa78af 100644 --- a/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/multipost/MultiPostImportService.java +++ b/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/multipost/MultiPostImportService.java @@ -99,6 +99,7 @@ import java.util.LinkedHashMap; import java.util.LinkedList; import java.util.List; import java.util.Map; +import java.util.Objects; import java.util.TreeMap; import java.util.function.Supplier; @@ -1362,9 +1363,6 @@ public class MultiPostImportService extends AbstractTuttiService implements Mult } if (copySize) { - // this means first to delete any existing such frequencies -// saveFrequencyMethod.saveSpeciesBatchFrequency(speciesBatchId, new ArrayList<>()); - float step = getStep(lengthStepCaracteristic); Map<Float, SpeciesBatchFrequency> frequencies = new TreeMap<>(); @@ -1395,12 +1393,15 @@ public class MultiPostImportService extends AbstractTuttiService implements Mult // increment the number of the frequency frequency.setNumber(frequency.getNumber() + 1); - if (copyWeight && individualObservationBatch.getWeight() != null) { + if (copyWeight) { + // there should always be a weight if we must copy the weight + Objects.requireNonNull(individualObservationBatch.getWeight(), t("tutti.service.multipost.import.noWeight.error")); frequency.setWeight(frequency.getWeight() + individualObservationBatch.getWeight()); } }); + // round the final weights if (copyWeight) { frequencies.values().forEach(frequency -> frequency.setWeight(WeightUnit.KG.round(frequency.getWeight()))); } diff --git a/tutti-service/src/main/resources/i18n/tutti-service_en_GB.properties b/tutti-service/src/main/resources/i18n/tutti-service_en_GB.properties index c48deb5..810d8ea 100644 --- a/tutti-service/src/main/resources/i18n/tutti-service_en_GB.properties +++ b/tutti-service/src/main/resources/i18n/tutti-service_en_GB.properties @@ -211,6 +211,7 @@ tutti.service.multipost.export.frequencies.error= tutti.service.multipost.export.operation.error= tutti.service.multipost.export.weight.error= tutti.service.multipost.export.weights.error= +tutti.service.multipost.import.noWeight.error= tutti.service.multipost.import.wrongOperation.error= tutti.service.multipost.import.wrongSpecies.error= tutti.service.multipost.uncompress.error= diff --git a/tutti-service/src/main/resources/i18n/tutti-service_fr_FR.properties b/tutti-service/src/main/resources/i18n/tutti-service_fr_FR.properties index 6477a24..9b0cc67 100644 --- a/tutti-service/src/main/resources/i18n/tutti-service_fr_FR.properties +++ b/tutti-service/src/main/resources/i18n/tutti-service_fr_FR.properties @@ -253,6 +253,7 @@ tutti.service.multipost.import.attachments.error=Erreur lors de l'import des pi tutti.service.multipost.import.batches.error=Erreur lors de l'import des lots tutti.service.multipost.import.caracteristics.error=Erreur lors de l'import des caractéristiques tutti.service.multipost.import.frequencies.error=Erreur lors de l'import des mensurations +tutti.service.multipost.import.noWeight.error=Une observation n'a pas de poids alors que le mode de recopie est "Tout", ce qui n'est pas valide. tutti.service.multipost.import.operation.error=Erreur lors de l'import des données du trait tutti.service.multipost.import.weights.error=Erreur lors de l'import des poids tutti.service.multipost.import.wrongOperation.error=Opération est impossible<hr/>Les lots que vous essayez d'importer proviennent d'un autre trait \:<br/>%s -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.