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 3d46837048c1af68e5ae07aa1f633e3b10ed464e Author: Tony CHEMIT <chemit@codelutin.com> Date: Wed Feb 4 14:49:50 2015 +0100 fixes #6588: [VALIDATION] ordre des traits : proposer d'ordonner les trait par date/heure ou n° station ou n° trait (les traits sont ordonnés par date / heure) --- .../catches/ValidateCruiseOperationsService.java | 38 ++++++++++------------ .../resources/i18n/tutti-service_en_GB.properties | 3 ++ .../resources/i18n/tutti-service_fr_FR.properties | 6 ++-- .../validation/ValidateCruiseUIHandler.java | 13 ++++---- .../content/validation/ValidateCruiseUIModel.java | 3 +- 5 files changed, 34 insertions(+), 29 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 774069c..bfeb53b 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.LinkedHashMap; import java.util.List; import java.util.Map; @@ -93,52 +94,49 @@ public class ValidateCruiseOperationsService extends AbstractTuttiService { } /** - * Validates the currently selected cruise. + * Validates the given cruise id. * * @return the validation results */ - public NuitonValidatorResult validateCruise(ProgressionModel progressionModel) { + public NuitonValidatorResult validateCruise(ProgressionModel progressionModel, String cruiseId) { - TuttiDataContext dataContext = context.getDataContext(); - Cruise cruise = persistenceService.getCruise(dataContext.getCruiseId()); - - List<String> operations = persistenceService.getAllFishingOperationIds(dataContext.getCruiseId()); - progressionModel.setTotal(operations.size() + 1); + progressionModel.increments(t("tutti.service.validateCruise.cruise.loading", cruiseId)); + Cruise cruise = persistenceService.getCruise(cruiseId); Decorator<Cruise> decorator = decoratorService.getDecoratorByType(Cruise.class); - progressionModel.setMessage(t("tutti.service.validateCruise.cruise.progress", decorator.toString(cruise))); + progressionModel.increments(t("tutti.service.validateCruise.cruise.check", cruiseId, decorator.toString(cruise))); NuitonValidatorResult validator = validationService.validateValidateCruise(cruise); - progressionModel.increments(1); - return validator; + } /** - * Validates the operations of the currently selected cruise. + * Validates the operations of the given operation ids. * * @return a map containing the operations and the validation results */ - public Map<FishingOperation, NuitonValidatorResult> validateCruiseOperations(ProgressionModel progressionModel) { - Map<FishingOperation, NuitonValidatorResult> result = Maps.newHashMap(); + public LinkedHashMap<FishingOperation, NuitonValidatorResult> validateOperations(ProgressionModel progressionModel, List<String> operationIds) { - TuttiDataContext dataContext = context.getDataContext(); - List<FishingOperation> operations = persistenceService.getAllFishingOperation(dataContext.getCruiseId()); -// progressionModel.setTotal(operations.size()); + LinkedHashMap<FishingOperation, NuitonValidatorResult> result = new LinkedHashMap<>(); Decorator<FishingOperation> decorator = decoratorService.getDecoratorByType(FishingOperation.class); - for (FishingOperation operation : operations) { - operation = persistenceService.getFishingOperation(operation.getId()); - progressionModel.setMessage(t("tutti.service.validateCruise.operations.progress", decorator.toString(operation))); + for (String operationId : operationIds) { + + progressionModel.increments(t("tutti.service.validateCruise.operations.loading", operationId)); + FishingOperation operation = persistenceService.getFishingOperation(operationId); + + progressionModel.increments(t("tutti.service.validateCruise.operations.check", operationId, decorator.toString(operation))); NuitonValidatorResult validator = validationService.validateValidateFishingOperation(operation); checkOperation(operation, validator); result.put(operation, validator); - progressionModel.increments(1); + } return result; + } /** 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 2e482a1..ad4e519 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 @@ -276,8 +276,11 @@ tutti.service.sumatra.export.step.export= tutti.service.sumatra.export.step.load.cruise= tutti.service.sumatra.export.step.load.fishingOperation= tutti.service.sumatra.export.step.load.fishingOperationIds= +tutti.service.validateCruise.cruise.loading= tutti.service.validateCruise.cruise.progress= tutti.service.validateCruise.exportResult.error= +tutti.service.validateCruise.operations.check= +tutti.service.validateCruise.operations.loading= tutti.service.validateCruise.operations.progress= tutti.validator.error.accidental.species.required= tutti.validator.error.accidentalBatch.species.required= 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 cdde34a..abe02d5 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 @@ -248,9 +248,11 @@ tutti.service.sumatra.export.step.export=Export dans le fichier %s tutti.service.sumatra.export.step.load.cruise=Chargement de la campagne %s tutti.service.sumatra.export.step.load.fishingOperation=Chargement du trait %s tutti.service.sumatra.export.step.load.fishingOperationIds=Recherche des opérations -tutti.service.validateCruise.cruise.progress= +tutti.service.validateCruise.cruise.check=Vérification de la campagne %s (%s) +tutti.service.validateCruise.cruise.loading=chargement de la campagne d'identifiant %s tutti.service.validateCruise.exportResult.error=Erreur lors de l'export des résultats de validation de la campagne dans le fichier %s -tutti.service.validateCruise.operations.progress=Vérification du trait %s +tutti.service.validateCruise.operations.check=Vérification du trait %s (%s) +tutti.service.validateCruise.operations.loading=Chargement du trait d'identifiant %s tutti.validator.error.accidentalBatch.species.required=L'espèce est obligatoire tutti.validator.error.accidentalBatch.species.temporary=La capture accidentelle utilise une espèce temporaire tutti.validator.error.benthosBatch.species.required=L'espèce est obligatoire diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/validation/ValidateCruiseUIHandler.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/validation/ValidateCruiseUIHandler.java index fe5b818..f39e59b 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/validation/ValidateCruiseUIHandler.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/validation/ValidateCruiseUIHandler.java @@ -29,10 +29,10 @@ import fr.ifremer.tutti.persistence.entities.data.FishingOperation; import fr.ifremer.tutti.ui.swing.action.EditCruiseInValidationUIAction; import fr.ifremer.tutti.ui.swing.action.EditFishingOperationInValidationUIAction; import fr.ifremer.tutti.ui.swing.content.cruise.EditCruiseUI; +import fr.ifremer.tutti.ui.swing.content.operation.FishingOperationsUI; import fr.ifremer.tutti.ui.swing.content.validation.tree.CruiseTreeNode; import fr.ifremer.tutti.ui.swing.content.validation.tree.OperationTreeNode; import fr.ifremer.tutti.ui.swing.content.validation.tree.ValidationTreeCellRenderer; -import fr.ifremer.tutti.ui.swing.content.operation.FishingOperationsUI; import fr.ifremer.tutti.ui.swing.util.AbstractTuttiUIHandler; import fr.ifremer.tutti.ui.swing.util.RemoveablePropertyChangeListener; import jaxx.runtime.SwingUtil; @@ -57,8 +57,8 @@ import java.awt.Rectangle; import java.awt.event.KeyEvent; import java.awt.event.MouseEvent; import java.beans.PropertyChangeEvent; +import java.util.LinkedHashMap; import java.util.List; -import java.util.Map; import java.util.Objects; /** @@ -84,13 +84,14 @@ public class ValidateCruiseUIHandler extends AbstractTuttiUIHandler<ValidateCrui ApplicationActionUIModel actionUIModel = getContext().getActionUI().getModel(); actionUIModel.setProgressionModel(progressionModel); - List<String> operations = getPersistenceService().getAllFishingOperationIds(getDataContext().getCruiseId()); - progressionModel.setTotal(operations.size() + 2); + String cruiseId = getDataContext().getCruiseId(); + List<String> operationIds = getPersistenceService().getAllFishingOperationIds(cruiseId); + progressionModel.setTotal(2 * operationIds.size() + 2); - NuitonValidatorResult cruiseValidatorResult = getValidateCruiseOperationsService().validateCruise(progressionModel); + NuitonValidatorResult cruiseValidatorResult = getValidateCruiseOperationsService().validateCruise(progressionModel, cruiseId); model.setCruiseValidatorResult(cruiseValidatorResult); - Map<FishingOperation, NuitonValidatorResult> validator = getValidateCruiseOperationsService().validateCruiseOperations(progressionModel); + LinkedHashMap<FishingOperation, NuitonValidatorResult> validator = getValidateCruiseOperationsService().validateOperations(progressionModel, operationIds); model.addFishingOperationValidatorResults(validator); actionUIModel.setProgressionModel(null); diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/validation/ValidateCruiseUIModel.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/validation/ValidateCruiseUIModel.java index 108f621..1e80e09 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/validation/ValidateCruiseUIModel.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/validation/ValidateCruiseUIModel.java @@ -32,6 +32,7 @@ import org.jdesktop.beans.AbstractSerializableBean; import org.nuiton.validator.NuitonValidatorResult; import java.util.HashMap; +import java.util.LinkedHashMap; import java.util.Map; import java.util.Set; @@ -54,7 +55,7 @@ public class ValidateCruiseUIModel extends AbstractSerializableBean { protected FishingOperation selectedFishingOperation; - protected final Map<FishingOperation, NuitonValidatorResult> validator = new HashMap<FishingOperation, NuitonValidatorResult>(); + protected final LinkedHashMap<FishingOperation, NuitonValidatorResult> validator = new LinkedHashMap<FishingOperation, NuitonValidatorResult>(); protected NuitonValidatorResult cruiseValidatorResult; -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.