branch develop updated (345e74b -> 5e594e9)
This is an automated email from the git hooks/post-receive script. New change to branch develop in repository tutti. See http://git.codelutin.com/tutti.git from 345e74b [jgitflow-maven-plugin]Updating develop poms back to pre merge state new c2df164 Convertir en kilogrammes le poids de sous échantillon lors de l'import bigfin (See #7539) new 5e594e9 [IMPORT BIGFIN] poids de 1000g importé en 1000kg, attention aux unités de poids (lié à #7537) Termine #7539 Merge branch 'feature/7539' 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 5e594e9257807121d24b133c16b42dd2a424c913 Merge: 345e74b c2df164 Author: Tony CHEMIT <chemit@codelutin.com> Date: Mon Sep 21 09:53:06 2015 +0200 [IMPORT BIGFIN] poids de 1000g importé en 1000kg, attention aux unités de poids (lié à #7537) Termine #7539 Merge branch 'feature/7539' into develop 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) Summary of changes: .../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(-) -- 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 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>.
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 5e594e9257807121d24b133c16b42dd2a424c913 Merge: 345e74b c2df164 Author: Tony CHEMIT <chemit@codelutin.com> Date: Mon Sep 21 09:53:06 2015 +0200 [IMPORT BIGFIN] poids de 1000g importé en 1000kg, attention aux unités de poids (lié à #7537) Termine #7539 Merge branch 'feature/7539' into develop .../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(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
participants (1)
-
codelutin.com scm