This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository tutti. See http://git.codelutin.com/tutti.git commit c2df16459ca54097cf1a472114ff917c5ccf414d Author: Tony CHEMIT <chemit@codelutin.com> Date: Mon Sep 21 09:53:02 2015 +0200 Convertir en kilogrammes le poids de sous échantillon lors de l'import bigfin (See #7539) --- .../main/java/fr/ifremer/tutti/service/bigfin/BigfinImportService.java | 1 + .../java/fr/ifremer/tutti/service/bigfin/BigfinImportService2Test.java | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/tutti-service/src/main/java/fr/ifremer/tutti/service/bigfin/BigfinImportService.java b/tutti-service/src/main/java/fr/ifremer/tutti/service/bigfin/BigfinImportService.java index 658dc26..e7aa422 100644 --- a/tutti-service/src/main/java/fr/ifremer/tutti/service/bigfin/BigfinImportService.java +++ b/tutti-service/src/main/java/fr/ifremer/tutti/service/bigfin/BigfinImportService.java @@ -524,6 +524,7 @@ public class BigfinImportService extends AbstractTuttiService { // si présence d'une seule valeur, mettre cette valeur dans le champ "Poids sous échantillon" if (notNullWeightsSize == 1) { float weight = CollectionUtils.get(notNullWeights, 0); + weight = Weights.roundKiloGram(weight / 1000); batch.setWeight(weight); persistenceService.saveSpeciesBatch(batch); } diff --git a/tutti-service/src/test/java/fr/ifremer/tutti/service/bigfin/BigfinImportService2Test.java b/tutti-service/src/test/java/fr/ifremer/tutti/service/bigfin/BigfinImportService2Test.java index ae3a37d..51b3606 100644 --- a/tutti-service/src/test/java/fr/ifremer/tutti/service/bigfin/BigfinImportService2Test.java +++ b/tutti-service/src/test/java/fr/ifremer/tutti/service/bigfin/BigfinImportService2Test.java @@ -374,7 +374,7 @@ public class BigfinImportService2Test { Assert.assertEquals(1, sampleCategories.size()); Assert.assertTrue(sampleCategories.contains(311)); // Vrac Assert.assertEquals(4, allSpeciesBatchFrequency.size()); - Assert.assertEquals(1000f, speciesBatch.getSampleCategoryWeight(), 0.0f); + Assert.assertEquals(1f, speciesBatch.getSampleCategoryWeight(), 0.0f); } else if (ACANPALSpecies.equals(speciesBatch.getSpecies())) { // Plusieurs poids renseignes mais pas tous, on ne met aucun poids // Pas de catégorie -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.