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>.