branch develop updated (b786680 -> f99c48c)
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 b786680 [CAMPAGNE] si je modifie l'heure de fin de la campagne, je perds tous les saisisseurs des traits !!! (fixes #7283) Merge branch 'feature/7283' into develop new b608f24 Voir toutes les espèces (species et benthos) qui ne respectent pas le protocole dans l'écran de validation (refs #7279) new f99c48c [VALIDATION] la liste d’erreur n’affiche pas toutes les espèces ne respectant pas le proto mais seulement la 1ère (fixes #7279) Merge branch 'feature/7279' 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 f99c48cc867a8ac5913062d4ce93dcfddc3c4d13 Merge: b786680 b608f24 Author: Tony CHEMIT <chemit@codelutin.com> Date: Mon Aug 24 16:37:55 2015 +0200 [VALIDATION] la liste d’erreur n’affiche pas toutes les espèces ne respectant pas le proto mais seulement la 1ère (fixes #7279) Merge branch 'feature/7279' into develop commit b608f24e5b9535549303e47c9d0c42cd689c7dab Author: Tony CHEMIT <chemit@codelutin.com> Date: Mon Aug 24 16:37:53 2015 +0200 Voir toutes les espèces (species et benthos) qui ne respectent pas le protocole dans l'écran de validation (refs #7279) Summary of changes: .../catches/ValidateCruiseOperationsService.java | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 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 http://git.codelutin.com/tutti.git commit b608f24e5b9535549303e47c9d0c42cd689c7dab Author: Tony CHEMIT <chemit@codelutin.com> Date: Mon Aug 24 16:37:53 2015 +0200 Voir toutes les espèces (species et benthos) qui ne respectent pas le protocole dans l'écran de validation (refs #7279) --- .../catches/ValidateCruiseOperationsService.java | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/ValidateCruiseOperationsService.java b/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/ValidateCruiseOperationsService.java index bfeb53b..aed841e 100644 --- a/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/ValidateCruiseOperationsService.java +++ b/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/ValidateCruiseOperationsService.java @@ -60,6 +60,7 @@ import org.nuiton.validator.NuitonValidatorScope; import java.io.File; import java.io.IOException; +import java.util.ArrayList; import java.util.LinkedHashMap; import java.util.List; import java.util.Map; @@ -392,33 +393,33 @@ public class ValidateCruiseOperationsService extends AbstractTuttiService { Decorator<Species> speciesDecorator = decoratorService.getDecoratorByType(Species.class); if (rootSpeciesBatch != null) { + List<String> warnings = new ArrayList<>(); for (SpeciesBatch batch : rootSpeciesBatch.getChildren()) { if (isSpeciesBatchInvalid(batch)) { String species = speciesDecorator.toString(batch.getSpecies()); String categoryValue = decoratorService.getDecorator(batch.getSampleCategoryValue()) .toString(batch.getSampleCategoryValue()); - warningMap.put("species", - Lists.newArrayList(t("tutti.validator.warning.species.protocolNotRespected", - species, categoryValue)) - ); - break; + warnings.add(t("tutti.validator.warning.species.protocolNotRespected", species, categoryValue)); } } + if (!warnings.isEmpty()) { + warningMap.put("species", warnings); + } } if (rootBenthosBatch != null) { + List<String> warnings = new ArrayList<>(); for (BenthosBatch batch : rootBenthosBatch.getChildren()) { if (isBenthosBatchInvalid(batch)) { String species = speciesDecorator.toString(batch.getSpecies()); String categoryValue = decoratorService.getDecorator(batch.getSampleCategoryValue()) .toString(batch.getSampleCategoryValue()); - warningMap.put("benthos", - Lists.newArrayList(t("tutti.validator.warning.benthos.protocolNotRespected", - species, categoryValue)) - ); - break; + warnings.add(t("tutti.validator.warning.benthos.protocolNotRespected", species, categoryValue)); } } + if (!warnings.isEmpty()) { + warningMap.put("benthos", warnings); + } } if (MapUtils.isNotEmpty(warningMap)) { -- 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 f99c48cc867a8ac5913062d4ce93dcfddc3c4d13 Merge: b786680 b608f24 Author: Tony CHEMIT <chemit@codelutin.com> Date: Mon Aug 24 16:37:55 2015 +0200 [VALIDATION] la liste d’erreur n’affiche pas toutes les espèces ne respectant pas le proto mais seulement la 1ère (fixes #7279) Merge branch 'feature/7279' into develop .../catches/ValidateCruiseOperationsService.java | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
participants (1)
-
codelutin.com scm