May 2013 - Tutti-commits - mailman.cloud.codelutin.com

r1067 - in trunk/tutti-service/src/main: java/fr/ifremer/tutti/service/catches resources/i18n
by kmorin＠users.forge.codelutin.com 31 May '13

31 May '13

Author: kmorin Date: 2013-05-31 18:47:10 +0200 (Fri, 31 May 2013) New Revision: 1067 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/1067 Log: fixes #2487 [VALIDATION] alertes r?\195?\169p?\195?\169t?\195?\169es et pas d'identification des donn?\195?\169es / lots concern?\195?\169s Modified: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/TuttiWeightComputingService.java trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/ValidateCruiseOperationsService.java trunk/tutti-service/src/main/resources/i18n/tutti-service_fr_FR.properties Modified: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/TuttiWeightComputingService.java =================================================================== --- trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/TuttiWeightComputingService.java 2013-05-31 16:20:21 UTC (rev 1066) +++ trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/TuttiWeightComputingService.java 2013-05-31 16:47:10 UTC (rev 1067) @@ -363,7 +363,7 @@ return rootSpeciesBatch; } - protected Float computeSpeciesBatch(SpeciesBatch batch) { + public Float computeSpeciesBatch(SpeciesBatch batch) { Float result = null; int thisIndex = currentSpeciesRowIndex++; Float categoryWeight = batch.getSampleCategoryWeight(); @@ -517,7 +517,7 @@ return rootBenthosBatch; } - protected Float computeBenthosBatch(BenthosBatch batch) { + public Float computeBenthosBatch(BenthosBatch batch) { Float result = null; int thisIndex = currentBenthosRowIndex++; Float categoryWeight = batch.getSampleCategoryWeight(); Modified: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/ValidateCruiseOperationsService.java =================================================================== --- trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/ValidateCruiseOperationsService.java 2013-05-31 16:20:21 UTC (rev 1066) +++ trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/ValidateCruiseOperationsService.java 2013-05-31 16:47:10 UTC (rev 1067) @@ -235,21 +235,51 @@ List<String> errors = Lists.newArrayList(); String fishingOperationId = fishingOperation.getId(); - BatchContainer<SpeciesBatch> rootSpeciesBatch; - try { - rootSpeciesBatch = tuttiWeightComputingService.getComputedSpeciesBatches(fishingOperation); + BatchContainer<SpeciesBatch> rootSpeciesBatch = null; + boolean isCatchBatch = !persistenceService.isFishingOperationWithCatchBatch(fishingOperationId); + boolean error = !isCatchBatch; - } catch (TuttiBusinessException e) { - errors.add(e.getMessage()); + if (isCatchBatch) { rootSpeciesBatch = persistenceService.getRootSpeciesBatch(fishingOperationId); + + if (rootSpeciesBatch != null) { + List<SpeciesBatch> roots = rootSpeciesBatch.getChildren(); + + for (SpeciesBatch batch : roots) { + try { + tuttiWeightComputingService.computeSpeciesBatch(batch); + + } catch (TuttiBusinessException e) { + errors.add(e.getMessage()); + error = true; + } + } + } } + if (error) { + rootSpeciesBatch = persistenceService.getRootSpeciesBatch(fishingOperationId); + } - BatchContainer<BenthosBatch> rootBenthosBatch; - try { - rootBenthosBatch = tuttiWeightComputingService.getComputedBenthosBatches(fishingOperation); + BatchContainer<BenthosBatch> rootBenthosBatch = null; + error = false; + if (isCatchBatch) { + rootBenthosBatch = persistenceService.getRootBenthosBatch(fishingOperationId); - } catch (TuttiBusinessException e) { - errors.add(e.getMessage()); + if (rootBenthosBatch != null) { + List<BenthosBatch> roots = rootBenthosBatch.getChildren(); + + for (BenthosBatch batch : roots) { + try { + rootBenthosBatch = tuttiWeightComputingService.getComputedBenthosBatches(fishingOperation); + + } catch (TuttiBusinessException e) { + errors.add(e.getMessage()); + error = true; + } + } + } + } + if (error) { rootBenthosBatch = persistenceService.getRootBenthosBatch(fishingOperationId); } Modified: trunk/tutti-service/src/main/resources/i18n/tutti-service_fr_FR.properties =================================================================== --- trunk/tutti-service/src/main/resources/i18n/tutti-service_fr_FR.properties 2013-05-31 16:20:21 UTC (rev 1066) +++ trunk/tutti-service/src/main/resources/i18n/tutti-service_fr_FR.properties 2013-05-31 16:47:10 UTC (rev 1067) @@ -206,10 +206,10 @@ tutti.validator.export.message.error=\t- [ERREUR] %s tutti.validator.export.message.warning=\t- [WARNING] %s tutti.validator.export.operation=* %s \: -tutti.validator.warning.benthos.protocolNotRespected=[Benthos] le lot de %s / %s ne suit pas les recommandations du protocole +tutti.validator.warning.benthos.protocolNotRespected=Benthos - le lot de %s / %s ne suit pas les recommandations du protocole tutti.validator.warning.fishingOperation.batch.notFound=Pas d'arbre d’échantillonnage trouvé tutti.validator.warning.fishingOperation.invalid.batch.model=Arbre d’échantillonnage non compatible avec l'application tutti.validator.warning.latitude.outOfBounds=La Latitude doit être comprise entre -90.0 et 90.0 tutti.validator.warning.longitude.outOfBounds=La longitude doit être comprise entre -180.0 et 180.0 tutti.validator.warning.marineLitter.weight.required=Vous devez saisir la valeur du poids total des déchets<br/>ou le poids de chacune des catégories observées. -tutti.validator.warning.species.protocolNotRespected=[Espèces] le lot de %s / %s ne suit pas les recommandations du protocole +tutti.validator.warning.species.protocolNotRespected=Espèces - le lot de %s / %s ne suit pas les recommandations du protocole

1 0

r1066 - in trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation: . catches/accidental catches/benthos catches/individualobservation catches/marinelitter
by kmorin＠users.forge.codelutin.com 31 May '13

31 May '13

Author: kmorin Date: 2013-05-31 18:20:21 +0200 (Fri, 31 May 2013) New Revision: 1066 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/1066 Log: fixes #2477 [MACRO DECHETS] manque unit?\195?\169 de poids sur colonne Poids ...(kg) Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/AbstractTuttiBatchUIModel.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/accidental/AccidentalBatchUIHandler.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/accidental/AccidentalBatchUIModel.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/BenthosBatchUIHandler.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/BenthosBatchUIModel.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/IndividualObservationBatchUIHandler.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/IndividualObservationBatchUIModel.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/marinelitter/MarineLitterBatchUIHandler.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/marinelitter/MarineLitterBatchUIModel.java Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/AbstractTuttiBatchUIModel.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/AbstractTuttiBatchUIModel.java 2013-05-31 16:16:35 UTC (rev 1065) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/AbstractTuttiBatchUIModel.java 2013-05-31 16:20:21 UTC (rev 1066) @@ -83,7 +83,7 @@ return null; } - public void fireBatchUpdated(SpeciesBatchRowModel row) { + public void fireBatchUpdated(R row) { if (catchesUIModel != null) { catchesUIModel.firePropertyChanged(EditCatchesUIModel.PROPERTY_BATCH_UPDATED, null, row); } Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/accidental/AccidentalBatchUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/accidental/AccidentalBatchUIHandler.java 2013-05-31 16:16:35 UTC (rev 1065) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/accidental/AccidentalBatchUIHandler.java 2013-05-31 16:20:21 UTC (rev 1066) @@ -502,5 +502,7 @@ } else { persistenceService.saveAccidentalBatch(catchBean); } + + getModel().fireBatchUpdated(row); } } Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/accidental/AccidentalBatchUIModel.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/accidental/AccidentalBatchUIModel.java 2013-05-31 16:16:35 UTC (rev 1065) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/accidental/AccidentalBatchUIModel.java 2013-05-31 16:20:21 UTC (rev 1066) @@ -46,7 +46,8 @@ protected boolean removeBatchEnabled; public AccidentalBatchUIModel(EditCatchesUIModel catchesUIModel) { - super(catchesUIModel); + super(catchesUIModel, + EditCatchesUIModel.PROPERTY_BATCH_UPDATED); } public boolean isRemoveBatchEnabled() { Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/BenthosBatchUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/BenthosBatchUIHandler.java 2013-05-31 16:16:35 UTC (rev 1065) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/BenthosBatchUIHandler.java 2013-05-31 16:20:21 UTC (rev 1066) @@ -930,6 +930,8 @@ // push it back to row model frequencyRows = BenthosFrequencyRowModel.fromBeans(frequency); row.setFrequency(frequencyRows); + + getModel().fireBatchUpdated(row); } public String getFilterBenthosBatchRootButtonText(int rootNumber) { Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/BenthosBatchUIModel.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/BenthosBatchUIModel.java 2013-05-31 16:16:35 UTC (rev 1065) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/BenthosBatchUIModel.java 2013-05-31 16:20:21 UTC (rev 1066) @@ -140,7 +140,8 @@ EditCatchesUIModel.PROPERTY_BENTHOS_TOTAL_UNSORTED_COMPUTED_WEIGHT, EditCatchesUIModel.PROPERTY_BENTHOS_TOTAL_SAMPLE_SORTED_COMPUTED_WEIGHT, EditCatchesUIModel.PROPERTY_BENTHOS_TOTAL_INERT_WEIGHT, - EditCatchesUIModel.PROPERTY_BENTHOS_TOTAL_LIVING_NOT_ITEMIZED_WEIGHT); + EditCatchesUIModel.PROPERTY_BENTHOS_TOTAL_LIVING_NOT_ITEMIZED_WEIGHT, + EditCatchesUIModel.PROPERTY_BATCH_UPDATED); } @Override Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/IndividualObservationBatchUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/IndividualObservationBatchUIHandler.java 2013-05-31 16:16:35 UTC (rev 1065) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/IndividualObservationBatchUIHandler.java 2013-05-31 16:20:21 UTC (rev 1066) @@ -498,5 +498,7 @@ } else { persistenceService.saveIndividualObservationBatch(catchBean); } + + getModel().fireBatchUpdated(row); } } Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/IndividualObservationBatchUIModel.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/IndividualObservationBatchUIModel.java 2013-05-31 16:16:35 UTC (rev 1065) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/IndividualObservationBatchUIModel.java 2013-05-31 16:20:21 UTC (rev 1066) @@ -46,7 +46,8 @@ protected boolean removeBatchEnabled; public IndividualObservationBatchUIModel(EditCatchesUIModel catchesUIModel) { - super(catchesUIModel); + super(catchesUIModel, + EditCatchesUIModel.PROPERTY_BATCH_UPDATED); } public boolean isRemoveBatchEnabled() { Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/marinelitter/MarineLitterBatchUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/marinelitter/MarineLitterBatchUIHandler.java 2013-05-31 16:16:35 UTC (rev 1065) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/marinelitter/MarineLitterBatchUIHandler.java 2013-05-31 16:20:21 UTC (rev 1066) @@ -452,6 +452,8 @@ } else { persistenceService.saveMarineLitterBatch(catchBean); } + + getModel().fireBatchUpdated(row); } public void removeFromMarineLitterCategoriesUsed(MarineLitterBatchRowModel row) { Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/marinelitter/MarineLitterBatchUIModel.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/marinelitter/MarineLitterBatchUIModel.java 2013-05-31 16:16:35 UTC (rev 1065) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/marinelitter/MarineLitterBatchUIModel.java 2013-05-31 16:20:21 UTC (rev 1066) @@ -54,7 +54,8 @@ public MarineLitterBatchUIModel(EditCatchesUIModel catchesUIModel) { super(catchesUIModel, - EditCatchesUIModel.PROPERTY_MARINE_LITTER_TOTAL_WEIGHT); + EditCatchesUIModel.PROPERTY_MARINE_LITTER_TOTAL_WEIGHT, + EditCatchesUIModel.PROPERTY_BATCH_UPDATED); } public TuttiComputedOrNotData<Float> getMarineLitterTotalComputedOrNotWeight() {

1 0

r1065 - in trunk: tutti-service/src/main/java/fr/ifremer/tutti/service/catches tutti-service/src/main/resources/i18n tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species tutti-ui-swing/src/main/resources/i18n
by kmorin＠users.forge.codelutin.com 31 May '13

31 May '13

Author: kmorin Date: 2013-05-31 18:16:35 +0200 (Fri, 31 May 2013) New Revision: 1065 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/1065 Log: refs #2487 [VALIDATION] alertes r?\195?\169p?\195?\169t?\195?\169es et pas d'identification des donn?\195?\169es / lots concern?\195?\169s Modified: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/ValidateCruiseOperationsService.java trunk/tutti-service/src/main/resources/i18n/tutti-service_fr_FR.properties trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise/EditCruiseFishingOperationAction.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/AbstractTuttiBatchUIModel.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/EditCatchesUIHandler.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/EditCatchesUIModel.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/SpeciesBatchUIHandler.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/SpeciesBatchUIModel.java trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properties Modified: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/ValidateCruiseOperationsService.java =================================================================== --- trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/ValidateCruiseOperationsService.java 2013-05-31 16:12:18 UTC (rev 1064) +++ trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/ValidateCruiseOperationsService.java 2013-05-31 16:16:35 UTC (rev 1065) @@ -40,6 +40,7 @@ import fr.ifremer.tutti.persistence.entities.data.SpeciesBatchFrequency; import fr.ifremer.tutti.persistence.entities.protocol.TuttiProtocol; import fr.ifremer.tutti.persistence.entities.protocol.TuttiProtocols; +import fr.ifremer.tutti.persistence.entities.referential.Species; import fr.ifremer.tutti.service.AbstractTuttiService; import fr.ifremer.tutti.service.DecoratorService; import fr.ifremer.tutti.service.PersistenceService; @@ -282,16 +283,27 @@ TuttiProtocol protocol = dataContext.getProtocol(); Map<String, List<String>> warningMap = Maps.newHashMap(); + Decorator<Species> speciesDecorator = decoratorService.getDecoratorByType(Species.class); for (SpeciesBatch batch : rootSpeciesBatch.getChildren()) { if (isSpeciesBatchInvalid(batch, protocol)) { - warningMap.put("species", Lists.newArrayList(_("tutti.validator.warning.species.protocolNotRespected"))); + String species = speciesDecorator.toString(batch.getSpecies()); + String categoryValue = decoratorService.getDecorator(batch.getSampleCategoryValue()) + .toString(batch.getSampleCategoryValue()); + warningMap.put("species", + Lists.newArrayList(_("tutti.validator.warning.species.protocolNotRespected", + species, categoryValue))); break; } } for (BenthosBatch batch : rootBenthosBatch.getChildren()) { if (isBenthosBatchInvalid(batch, protocol)) { - warningMap.put("benthos", Lists.newArrayList(_("tutti.validator.warning.benthos.protocolNotRespected"))); + String species = speciesDecorator.toString(batch.getSpecies()); + String categoryValue = decoratorService.getDecorator(batch.getSampleCategoryValue()) + .toString(batch.getSampleCategoryValue()); + warningMap.put("benthos", + Lists.newArrayList(_("tutti.validator.warning.benthos.protocolNotRespected", + species, categoryValue))); break; } } Modified: trunk/tutti-service/src/main/resources/i18n/tutti-service_fr_FR.properties =================================================================== --- trunk/tutti-service/src/main/resources/i18n/tutti-service_fr_FR.properties 2013-05-31 16:12:18 UTC (rev 1064) +++ trunk/tutti-service/src/main/resources/i18n/tutti-service_fr_FR.properties 2013-05-31 16:16:35 UTC (rev 1065) @@ -206,10 +206,10 @@ tutti.validator.export.message.error=\t- [ERREUR] %s tutti.validator.export.message.warning=\t- [WARNING] %s tutti.validator.export.operation=* %s \: -tutti.validator.warning.benthos.protocolNotRespected=Un lot du benthos ne suit pas les recommandations du protocole +tutti.validator.warning.benthos.protocolNotRespected=[Benthos] le lot de %s / %s ne suit pas les recommandations du protocole tutti.validator.warning.fishingOperation.batch.notFound=Pas d'arbre d’échantillonnage trouvé tutti.validator.warning.fishingOperation.invalid.batch.model=Arbre d’échantillonnage non compatible avec l'application tutti.validator.warning.latitude.outOfBounds=La Latitude doit être comprise entre -90.0 et 90.0 tutti.validator.warning.longitude.outOfBounds=La longitude doit être comprise entre -180.0 et 180.0 tutti.validator.warning.marineLitter.weight.required=Vous devez saisir la valeur du poids total des déchets<br/>ou le poids de chacune des catégories observées. -tutti.validator.warning.species.protocolNotRespected=Un lot des espèces ne suit pas les recommandations du protocole +tutti.validator.warning.species.protocolNotRespected=[Espèces] le lot de %s / %s ne suit pas les recommandations du protocole Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise/EditCruiseFishingOperationAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise/EditCruiseFishingOperationAction.java 2013-05-31 16:12:18 UTC (rev 1064) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise/EditCruiseFishingOperationAction.java 2013-05-31 16:16:35 UTC (rev 1065) @@ -67,14 +67,16 @@ protected FishingOperation fishingOperation; protected final PropertyChangeListener editFishingOperationModelListener = new PropertyChangeListener() { + + protected final List<String> propertiesToIgnore = Lists.newArrayList( + EditFishingOperationUIModel.PROPERTY_MODIFY, + EditFishingOperationUIModel.PROPERTY_VALID, + EditFishingOperationUIModel.PROPERTY_PERSISTED + ); + @Override public void propertyChange(PropertyChangeEvent evt) { - List<String> propertiesToIgnore = Lists.newArrayList( - EditFishingOperationUIModel.PROPERTY_MODIFY, - EditFishingOperationUIModel.PROPERTY_VALID, - EditFishingOperationUIModel.PROPERTY_PERSISTED - ); EditFishingOperationUIModel model = (EditFishingOperationUIModel) evt.getSource(); if (!model.isLoadingData() @@ -98,29 +100,30 @@ }; protected final PropertyChangeListener editCatchesModelListener = new PropertyChangeListener() { + + protected final List<String> propertiesToIgnore = Lists.newArrayList( + EditCatchesUIModel.PROPERTY_MODIFY, + EditCatchesUIModel.PROPERTY_VALID, + EditCatchesUIModel.PROPERTY_CATCH_TOTAL_COMPUTED_WEIGHT, + EditCatchesUIModel.PROPERTY_CATCH_TOTAL_SORTED_COMPUTED_WEIGHT, + EditCatchesUIModel.PROPERTY_CATCH_TOTAL_UNSORTED_COMPUTED_WEIGHT, + EditCatchesUIModel.PROPERTY_CATCH_TOTAL_REJECTED_COMPUTED_WEIGHT, + EditCatchesUIModel.PROPERTY_SPECIES_TOTAL_COMPUTED_WEIGHT, + EditCatchesUIModel.PROPERTY_SPECIES_TOTAL_SORTED_COMPUTED_WEIGHT, + EditCatchesUIModel.PROPERTY_SPECIES_TOTAL_UNSORTED_COMPUTED_WEIGHT, + EditCatchesUIModel.PROPERTY_SPECIES_TOTAL_SAMPLE_SORTED_COMPUTED_WEIGHT, + EditCatchesUIModel.PROPERTY_SPECIES_TOTAL_INERT_COMPUTED_WEIGHT, + EditCatchesUIModel.PROPERTY_SPECIES_TOTAL_LIVING_NOT_ITEMIZED_COMPUTED_WEIGHT, + EditCatchesUIModel.PROPERTY_BENTHOS_TOTAL_COMPUTED_WEIGHT, + EditCatchesUIModel.PROPERTY_BENTHOS_TOTAL_SORTED_COMPUTED_WEIGHT, + EditCatchesUIModel.PROPERTY_BENTHOS_TOTAL_UNSORTED_COMPUTED_WEIGHT, + EditCatchesUIModel.PROPERTY_BENTHOS_TOTAL_SAMPLE_SORTED_COMPUTED_WEIGHT, + EditCatchesUIModel.PROPERTY_BENTHOS_TOTAL_INERT_COMPUTED_WEIGHT, + EditCatchesUIModel.PROPERTY_BENTHOS_TOTAL_LIVING_NOT_ITEMIZED_COMPUTED_WEIGHT + ); + @Override public void propertyChange(PropertyChangeEvent evt) { - - List<String> propertiesToIgnore = Lists.newArrayList( - EditCatchesUIModel.PROPERTY_MODIFY, - EditCatchesUIModel.PROPERTY_VALID, - EditCatchesUIModel.PROPERTY_CATCH_TOTAL_COMPUTED_WEIGHT, - EditCatchesUIModel.PROPERTY_CATCH_TOTAL_SORTED_COMPUTED_WEIGHT, - EditCatchesUIModel.PROPERTY_CATCH_TOTAL_UNSORTED_COMPUTED_WEIGHT, - EditCatchesUIModel.PROPERTY_CATCH_TOTAL_REJECTED_COMPUTED_WEIGHT, - EditCatchesUIModel.PROPERTY_SPECIES_TOTAL_COMPUTED_WEIGHT, - EditCatchesUIModel.PROPERTY_SPECIES_TOTAL_SORTED_COMPUTED_WEIGHT, - EditCatchesUIModel.PROPERTY_SPECIES_TOTAL_UNSORTED_COMPUTED_WEIGHT, - EditCatchesUIModel.PROPERTY_SPECIES_TOTAL_SAMPLE_SORTED_COMPUTED_WEIGHT, - EditCatchesUIModel.PROPERTY_SPECIES_TOTAL_INERT_COMPUTED_WEIGHT, - EditCatchesUIModel.PROPERTY_SPECIES_TOTAL_LIVING_NOT_ITEMIZED_COMPUTED_WEIGHT, - EditCatchesUIModel.PROPERTY_BENTHOS_TOTAL_COMPUTED_WEIGHT, - EditCatchesUIModel.PROPERTY_BENTHOS_TOTAL_SORTED_COMPUTED_WEIGHT, - EditCatchesUIModel.PROPERTY_BENTHOS_TOTAL_UNSORTED_COMPUTED_WEIGHT, - EditCatchesUIModel.PROPERTY_BENTHOS_TOTAL_SAMPLE_SORTED_COMPUTED_WEIGHT, - EditCatchesUIModel.PROPERTY_BENTHOS_TOTAL_INERT_COMPUTED_WEIGHT, - EditCatchesUIModel.PROPERTY_BENTHOS_TOTAL_LIVING_NOT_ITEMIZED_COMPUTED_WEIGHT - ); EditCatchesUIModel model = (EditCatchesUIModel) evt.getSource(); if (!model.isLoadingData() @@ -134,7 +137,6 @@ uiModel.getValidator().put(uiModel.getSelectedFishingOperation(), validationResult); getHandler().updateCurrentOperatonNode(validationResult); - } } }; Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/AbstractTuttiBatchUIModel.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/AbstractTuttiBatchUIModel.java 2013-05-31 16:12:18 UTC (rev 1064) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/AbstractTuttiBatchUIModel.java 2013-05-31 16:16:35 UTC (rev 1065) @@ -27,6 +27,7 @@ import com.google.common.collect.Sets; import fr.ifremer.tutti.persistence.entities.data.FishingOperation; import fr.ifremer.tutti.ui.swing.content.operation.catches.EditCatchesUIModel; +import fr.ifremer.tutti.ui.swing.content.operation.catches.species.SpeciesBatchRowModel; import fr.ifremer.tutti.ui.swing.util.AbstractTuttiBeanUIModel; import fr.ifremer.tutti.ui.swing.util.table.AbstractTuttiTableUIModel; @@ -81,4 +82,10 @@ protected FishingOperation newEntity() { return null; } + + public void fireBatchUpdated(SpeciesBatchRowModel row) { + if (catchesUIModel != null) { + catchesUIModel.firePropertyChanged(EditCatchesUIModel.PROPERTY_BATCH_UPDATED, null, row); + } + } } Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/EditCatchesUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/EditCatchesUIHandler.java 2013-05-31 16:12:18 UTC (rev 1064) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/EditCatchesUIHandler.java 2013-05-31 16:16:35 UTC (rev 1065) @@ -172,7 +172,8 @@ EditCatchesUIModel.PROPERTY_BENTHOS_TOTAL_SAMPLE_SORTED_COMPUTED_WEIGHT, EditCatchesUIModel.PROPERTY_BENTHOS_TOTAL_INERT_COMPUTED_WEIGHT, EditCatchesUIModel.PROPERTY_BENTHOS_TOTAL_LIVING_NOT_ITEMIZED_COMPUTED_WEIGHT, - EditCatchesUIModel.PROPERTY_ATTACHMENT + EditCatchesUIModel.PROPERTY_ATTACHMENT, + EditCatchesUIModel.PROPERTY_BATCH_UPDATED )); return result; } Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/EditCatchesUIModel.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/EditCatchesUIModel.java 2013-05-31 16:12:18 UTC (rev 1064) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/EditCatchesUIModel.java 2013-05-31 16:16:35 UTC (rev 1065) @@ -56,6 +56,8 @@ public static final String PROPERTY_CATCH_BATCH = "catchBatch"; + public static final String PROPERTY_BATCH_UPDATED = "batchUpdated"; + protected static final Binder<CatchBatch, EditCatchesUIModel> fromBeanBinder = BinderFactory.newBinder(CatchBatch.class, EditCatchesUIModel.class); protected static final Binder<EditCatchesUIModel, CatchBatch> toBeanBinder = BinderFactory.newBinder(EditCatchesUIModel.class, CatchBatch.class); Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/SpeciesBatchUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/SpeciesBatchUIHandler.java 2013-05-31 16:12:18 UTC (rev 1064) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/SpeciesBatchUIHandler.java 2013-05-31 16:16:35 UTC (rev 1065) @@ -934,6 +934,8 @@ // push it back to row model frequencyRows = SpeciesFrequencyRowModel.fromBeans(frequency); row.setFrequency(frequencyRows); + + getModel().fireBatchUpdated(row); } public String getFilterSpeciesBatchRootButtonText(int rootNumber) { Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/SpeciesBatchUIModel.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/SpeciesBatchUIModel.java 2013-05-31 16:12:18 UTC (rev 1064) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/SpeciesBatchUIModel.java 2013-05-31 16:16:35 UTC (rev 1065) @@ -140,7 +140,8 @@ EditCatchesUIModel.PROPERTY_SPECIES_TOTAL_UNSORTED_COMPUTED_WEIGHT, EditCatchesUIModel.PROPERTY_SPECIES_TOTAL_SAMPLE_SORTED_COMPUTED_WEIGHT, EditCatchesUIModel.PROPERTY_SPECIES_TOTAL_INERT_WEIGHT, - EditCatchesUIModel.PROPERTY_SPECIES_TOTAL_LIVING_NOT_ITEMIZED_WEIGHT); + EditCatchesUIModel.PROPERTY_SPECIES_TOTAL_LIVING_NOT_ITEMIZED_WEIGHT, + EditCatchesUIModel.PROPERTY_BATCH_UPDATED); } public Float getSpeciesTotalComputedWeight() { Modified: trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properties =================================================================== --- trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properties 2013-05-31 16:12:18 UTC (rev 1064) +++ trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properties 2013-05-31 16:16:35 UTC (rev 1065) @@ -1273,12 +1273,12 @@ tutti.updateApplication.message.success=La mise à jour nécessite le redémarrage du l'application tutti.updateApplication.noUpdate=Aucune mise à jour de l'application détectée. tutti.updateApplication.title.success=Redémarrage de l'application nécessaire... -tutti.validateCruise.action.export.all.chooseFile.defaultFile=validation_%s +tutti.validateCruise.action.export.all.chooseFile.defaultFile=validation_%s.txt tutti.validateCruise.action.export.all.chooseFile.label=Choisir le fichier d'export tutti.validateCruise.action.export.all.chooseFile.title=Exporter les messages de validation de la campagne tutti.validateCruise.action.export.all.success=Les messages de validation des captures ont correctement été exporté dans le fichier %s tutti.validateCruise.action.export.all.tip=Exporter les messages de validation de la campagne -tutti.validateCruise.action.export.operation.chooseFile.defaultFile=validation_%s +tutti.validateCruise.action.export.operation.chooseFile.defaultFile=validation_%s.txt tutti.validateCruise.action.export.operation.chooseFile.label=Choisir le fichier d'export tutti.validateCruise.action.export.operation.chooseFile.title=Exporter les messages de validation de l'opération tutti.validateCruise.action.export.operation.success=Les messages de validation de l'opération ont correctement été exporté dans le fichier %s

1 0

r1064 - in trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches: benthos/frequency species/frequency
by kmorin＠users.forge.codelutin.com 31 May '13

31 May '13

Author: kmorin Date: 2013-05-31 18:12:18 +0200 (Fri, 31 May 2013) New Revision: 1064 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/1064 Log: fixes #2496 [MENSURATION] Am?\195?\169liorations de la saisie Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/BenthosFrequencyUIHandler.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUIHandler.java Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/BenthosFrequencyUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/BenthosFrequencyUIHandler.java 2013-05-31 10:24:19 UTC (rev 1063) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/BenthosFrequencyUIHandler.java 2013-05-31 16:12:18 UTC (rev 1064) @@ -409,7 +409,7 @@ model.setRows(rows); // select first cell in table (see http://forge.codelutin.com/issues/2496) - AbstractSelectTableAction.doSelectCell(getUI().getTable(), 0, 0); + AbstractSelectTableAction.doSelectCell(getUI().getTable(), 0, 1); } public void applyRafaleStep(Float step) { Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUIHandler.java 2013-05-31 10:24:19 UTC (rev 1063) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUIHandler.java 2013-05-31 16:12:18 UTC (rev 1064) @@ -409,7 +409,7 @@ model.setRows(rows); // select first cell in table (see http://forge.codelutin.com/issues/2496) - AbstractSelectTableAction.doSelectCell(getUI().getTable(), 0, 0); + AbstractSelectTableAction.doSelectCell(getUI().getTable(), 0, 1); } public void applyRafaleStep(Float step) {

1 0

r1063 - trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/table
by kmorin＠users.forge.codelutin.com 31 May '13

31 May '13

Author: kmorin Date: 2013-05-31 12:24:19 +0200 (Fri, 31 May 2013) New Revision: 1063 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/1063 Log: fixes #2546 [ERGO] - Parcourt des tableaux bloqu?\195?\169 sur certains champs non ?\195?\169ditables Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/table/MoveToNextEditableRowAction.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/table/MoveToPreviousEditableRowAction.java Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/table/MoveToNextEditableRowAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/table/MoveToNextEditableRowAction.java 2013-05-31 10:08:57 UTC (rev 1062) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/table/MoveToNextEditableRowAction.java 2013-05-31 10:24:19 UTC (rev 1063) @@ -57,15 +57,22 @@ int currentRow = getSelectedRow(); int currentColumn = getSelectedColumn(); - if (isCellEditable(currentRow, currentColumn)) { - if (log.isDebugEnabled()) { - log.debug("Move to next row editable cell " + - getCellCoordinate(currentRow, currentColumn)); - } + if (log.isDebugEnabled()) { + log.debug("Move to next row editable cell " + + getCellCoordinate(currentRow, currentColumn)); + } + + int rowCount = getRowCount(); + + while (currentRow < rowCount) { + + // go to next cell currentRow++; + boolean canSelect = true; - boolean canSelect = true; - if (currentRow >= getRowCount()) { + // select next cell + if (currentRow >= rowCount) { + if (log.isDebugEnabled()) { log.debug("No next row"); } @@ -76,16 +83,19 @@ } else { canSelect = false; } + } else { + canSelect = isCellEditable(currentRow, currentColumn); } if (canSelect) { doSelectCell(currentRow, currentColumn); - } - } else { - if (log.isDebugEnabled()) { - log.debug("Cell not editable at " + - getCellCoordinate(currentRow, currentColumn)); + break; + } else { + if (log.isDebugEnabled()) { + log.debug("Cell not editable at " + + getCellCoordinate(currentRow, currentColumn)); + } } } } Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/table/MoveToPreviousEditableRowAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/table/MoveToPreviousEditableRowAction.java 2013-05-31 10:08:57 UTC (rev 1062) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/table/MoveToPreviousEditableRowAction.java 2013-05-31 10:24:19 UTC (rev 1063) @@ -58,25 +58,29 @@ int currentRow = getSelectedRow(); int currentColumn = getSelectedColumn(); - if (isCellEditable(currentRow, currentColumn)) { - if (log.isDebugEnabled()) { - log.debug("Move to previous row editable cell " + - getCellCoordinate(currentRow, currentColumn)); - } + if (log.isDebugEnabled()) { + log.debug("Move to previous row editable cell " + + getCellCoordinate(currentRow, currentColumn)); + } + + int rowCount = getRowCount(); + + while (currentRow > 0) { + + // go to next cell currentRow--; + boolean canSelect = isCellEditable(currentRow, currentColumn); - if (currentRow < 0) { + if (canSelect) { + doSelectCell(currentRow, currentColumn); + + break; + } else { if (log.isDebugEnabled()) { - log.debug("No previous row"); + log.debug("Cell not editable at " + + getCellCoordinate(currentRow, currentColumn)); } - } else { - doSelectCell(currentRow, currentColumn); } - } else { - if (log.isDebugEnabled()) { - log.debug("Cell not editable at " + - getCellCoordinate(currentRow, currentColumn)); - } } } }

1 0

r1062 - in trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches: benthos species
by kmorin＠users.forge.codelutin.com 31 May '13

31 May '13

Author: kmorin Date: 2013-05-31 12:08:57 +0200 (Fri, 31 May 2013) New Revision: 1062 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/1062 Log: fixes #2544 [ESPECE] - Cat?\195?\169gorisation de lot impossible apr?\195?\168s suppression des mensurations Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/BenthosBatchUIHandler.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/SpeciesBatchUIHandler.java Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/BenthosBatchUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/BenthosBatchUIHandler.java 2013-05-31 09:45:22 UTC (rev 1061) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/BenthosBatchUIHandler.java 2013-05-31 10:08:57 UTC (rev 1062) @@ -859,6 +859,7 @@ row.setComputedNumber(totalNumber); row.getFinestCategory().setOnlyOneFrequency(onlyOneFrequency); + recomputeBatchActionEnable(); } public void saveRows(Iterable<BenthosBatchRowModel> rows) { Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/SpeciesBatchUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/SpeciesBatchUIHandler.java 2013-05-31 09:45:22 UTC (rev 1061) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/SpeciesBatchUIHandler.java 2013-05-31 10:08:57 UTC (rev 1062) @@ -865,6 +865,7 @@ row.setComputedNumber(totalNumber); row.getFinestCategory().setOnlyOneFrequency(onlyOneFrequency); + recomputeBatchActionEnable(); } public void saveRows(Iterable<SpeciesBatchRowModel> rows) {

1 0

r1061 - in trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content: cruise operation operation/catches
by kmorin＠users.forge.codelutin.com 31 May '13

31 May '13

Author: kmorin Date: 2013-05-31 11:45:22 +0200 (Fri, 31 May 2013) New Revision: 1061 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/1061 Log: fixes #2543 [ERGO] - Pi?\195?\168ces jointes : Ecran en mode modification en cas d'ajout / suppression des pi?\195?\168ces jointes Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise/EditCruiseUIHandler.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/EditFishingOperationUIHandler.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/EditCatchesUIHandler.java Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise/EditCruiseUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise/EditCruiseUIHandler.java 2013-05-31 09:25:00 UTC (rev 1060) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise/EditCruiseUIHandler.java 2013-05-31 09:45:22 UTC (rev 1061) @@ -54,6 +54,7 @@ import java.beans.PropertyChangeEvent; import java.beans.PropertyChangeListener; import java.util.List; +import java.util.Set; import static org.nuiton.i18n.I18n._; @@ -308,6 +309,13 @@ } @Override + protected Set<String> getPropertiesToIgnore() { + Set<String> result = super.getPropertiesToIgnore(); + result.add(EditCruiseUIModel.PROPERTY_ATTACHMENT); + return result; + } + + @Override public void onCloseUI() { if (log.isDebugEnabled()) { log.debug("closing: " + ui); @@ -340,5 +348,4 @@ String name = model.getGeneratedCampaignName(); model.setName(name); } - } Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/EditFishingOperationUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/EditFishingOperationUIHandler.java 2013-05-31 09:25:00 UTC (rev 1060) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/EditFishingOperationUIHandler.java 2013-05-31 09:45:22 UTC (rev 1061) @@ -66,6 +66,7 @@ import java.util.Calendar; import java.util.Date; import java.util.List; +import java.util.Set; import static org.nuiton.i18n.I18n._; @@ -353,6 +354,13 @@ } @Override + protected Set<String> getPropertiesToIgnore() { + Set<String> result = super.getPropertiesToIgnore(); + result.add(EditFishingOperationUIModel.PROPERTY_ATTACHMENT); + return result; + } + + @Override public void onCloseUI() { if (log.isDebugEnabled()) { Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/EditCatchesUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/EditCatchesUIHandler.java 2013-05-31 09:25:00 UTC (rev 1060) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/EditCatchesUIHandler.java 2013-05-31 09:45:22 UTC (rev 1061) @@ -171,7 +171,8 @@ EditCatchesUIModel.PROPERTY_BENTHOS_TOTAL_UNSORTED_COMPUTED_WEIGHT, EditCatchesUIModel.PROPERTY_BENTHOS_TOTAL_SAMPLE_SORTED_COMPUTED_WEIGHT, EditCatchesUIModel.PROPERTY_BENTHOS_TOTAL_INERT_COMPUTED_WEIGHT, - EditCatchesUIModel.PROPERTY_BENTHOS_TOTAL_LIVING_NOT_ITEMIZED_COMPUTED_WEIGHT + EditCatchesUIModel.PROPERTY_BENTHOS_TOTAL_LIVING_NOT_ITEMIZED_COMPUTED_WEIGHT, + EditCatchesUIModel.PROPERTY_ATTACHMENT )); return result; }

1 0

r1060 - in trunk/tutti-service/src/main: java/fr/ifremer/tutti/service/pupitri resources/i18n
by kmorin＠users.forge.codelutin.com 31 May '13

31 May '13

Author: kmorin Date: 2013-05-31 11:25:00 +0200 (Fri, 31 May 2013) New Revision: 1060 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/1060 Log: fixes #2329 [IMPORT PUPITRI] ne garder que les deux derniers fichiers importer Modified: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/pupitri/TuttiPupitriImportExportService.java trunk/tutti-service/src/main/resources/i18n/tutti-service_en_GB.properties trunk/tutti-service/src/main/resources/i18n/tutti-service_fr_FR.properties Modified: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/pupitri/TuttiPupitriImportExportService.java =================================================================== --- trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/pupitri/TuttiPupitriImportExportService.java 2013-05-31 08:18:06 UTC (rev 1059) +++ trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/pupitri/TuttiPupitriImportExportService.java 2013-05-31 09:25:00 UTC (rev 1060) @@ -65,7 +65,10 @@ import java.io.File; import java.io.IOException; import java.io.Reader; +import java.text.DateFormat; +import java.text.SimpleDateFormat; import java.util.Collections; +import java.util.Date; import java.util.List; import java.util.Set; @@ -149,7 +152,9 @@ attachment.setObjectType(AttachementObjectTypeEnum.CATCH_BATCH); attachment.setObjectId(Integer.valueOf(catchBatch.getId())); attachment.setName(f.getName()); - attachment.setComment("import pupitri"); + String date = DateFormat.getDateTimeInstance().format(new Date()); + String comment = _("tutti.service.pupitri.import.attachment.comment", date); + attachment.setComment(comment); persistenceService.createAttachment(attachment, f); } Modified: trunk/tutti-service/src/main/resources/i18n/tutti-service_en_GB.properties =================================================================== --- trunk/tutti-service/src/main/resources/i18n/tutti-service_en_GB.properties 2013-05-31 08:18:06 UTC (rev 1059) +++ trunk/tutti-service/src/main/resources/i18n/tutti-service_en_GB.properties 2013-05-31 09:25:00 UTC (rev 1060) @@ -163,6 +163,7 @@ tutti.service.protocol.import.species.error= tutti.service.protocol.import.taxonUsed.error= tutti.service.pupitri.export.species.error= +tutti.service.pupitri.import.attachment.comment= tutti.service.pupitri.import.carrousel.error= tutti.service.pupitri.import.trunk.error= tutti.service.referential.export.gear.error= Modified: trunk/tutti-service/src/main/resources/i18n/tutti-service_fr_FR.properties =================================================================== --- trunk/tutti-service/src/main/resources/i18n/tutti-service_fr_FR.properties 2013-05-31 08:18:06 UTC (rev 1059) +++ trunk/tutti-service/src/main/resources/i18n/tutti-service_fr_FR.properties 2013-05-31 09:25:00 UTC (rev 1060) @@ -133,6 +133,7 @@ tutti.service.protocol.import.species.error=Erreur lors de l'import des espèces du protocole %1s du fichier %2s tutti.service.protocol.import.taxonUsed.error=Le taxon référent d'id %s est déjà utilisé tutti.service.pupitri.export.species.error=Erreur lors de l'export des espèces pour Pupitri dans le fichier %s +tutti.service.pupitri.import.attachment.comment=Import Pupitri du %s tutti.service.pupitri.import.carrousel.error=Erreur lors de l'import du fichier de carrousel %2s pour le trait %1s tutti.service.pupitri.import.trunk.error=Erreur lors de l'import du fichier de trémie %2s pour le trait %1s tutti.service.referential.export.gear.error=Erreur lors de l'export des engins dans le fichier %s

1 0

r1059 - trunk/tutti-ui-swing/src/main/resources/i18n
by kmorin＠users.forge.codelutin.com 31 May '13

31 May '13

Author: kmorin Date: 2013-05-31 10:18:06 +0200 (Fri, 31 May 2013) New Revision: 1059 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/1059 Log: fixes #2540 [CAPTURE] intitul?\195?\169 de la colonne "Nombre" : modifier en ""Tailles/Poids ou Nombre" Modified: trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properties Modified: trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properties =================================================================== --- trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properties 2013-05-30 20:24:51 UTC (rev 1058) +++ trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properties 2013-05-31 08:18:06 UTC (rev 1059) @@ -364,8 +364,8 @@ tutti.editBenthosBatch.table.header.ageCategory.tip=Age des individus dans le lot (pour les coquilles St Jacques) tutti.editBenthosBatch.table.header.comment=Commentaire tutti.editBenthosBatch.table.header.comment.tip=Commentaire sur la ligne -tutti.editBenthosBatch.table.header.computedNumber=Nombre -tutti.editBenthosBatch.table.header.computedNumber.tip=Nombre d'individus dans le lot +tutti.editBenthosBatch.table.header.computedNumber=Tailles/Poids ou Nombre +tutti.editBenthosBatch.table.header.computedNumber.tip=Tailles/Poids ou Nombre d'individus dans le lot tutti.editBenthosBatch.table.header.file=Pièces jointes tutti.editBenthosBatch.table.header.file.tip=Pièces jointes associées à la ligne tutti.editBenthosBatch.table.header.maturityCategory=Maturité @@ -881,7 +881,7 @@ tutti.editSpeciesBatch.split.weightNotNull.title=Poids sous-échantillonné non nul tutti.editSpeciesBatch.table.header.ageCategory=Age (kg) tutti.editSpeciesBatch.table.header.comment=Commentaire -tutti.editSpeciesBatch.table.header.computedNumber=Nombre +tutti.editSpeciesBatch.table.header.computedNumber=Tailles/Poids ou Nombre tutti.editSpeciesBatch.table.header.file=Pièces jointes tutti.editSpeciesBatch.table.header.maturityCategory=Maturité (kg) tutti.editSpeciesBatch.table.header.sexCategory=Sexe (kg)

1 0

r1058 - in trunk/tutti-ui-swing/src/main: java/fr/ifremer/tutti/ui/swing/content java/fr/ifremer/tutti/ui/swing/util/action resources/i18n resources/icons
by tchemit＠users.forge.codelutin.com 30 May '13

30 May '13

Author: tchemit Date: 2013-05-30 22:24:51 +0200 (Thu, 30 May 2013) New Revision: 1058 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/1058 Log: fixes #2509: [TECH] le nom du logiciel sera ALLEGRO CAMPAGNE Added: trunk/tutti-ui-swing/src/main/resources/icons/allegro_32.png trunk/tutti-ui-swing/src/main/resources/icons/allegro_about.png Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/MainUI.css trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/MainUIHandler.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/ShowAboutAction.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/action/TuttiActionUIHandler.java trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_en_GB.properties trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properties Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/MainUI.css =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/MainUI.css 2013-05-30 19:50:25 UTC (rev 1057) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/MainUI.css 2013-05-30 20:24:51 UTC (rev 1058) @@ -31,6 +31,7 @@ #mainFrame { title: "tutti.main.title.applicationName"; defaultCloseOperation: {JFrame.DO_NOTHING_ON_CLOSE}; + iconImage:{SwingUtil.createImageIcon("allegro_32.png").getImage()}; } #menuFile { Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/MainUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/MainUIHandler.java 2013-05-30 19:50:25 UTC (rev 1057) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/MainUIHandler.java 2013-05-30 20:24:51 UTC (rev 1058) @@ -491,7 +491,9 @@ String title = getSelectedCruiseTitle(); - ui.setTitle("Tutti - v " + getConfig().getVersion() + " [ " + title + " ]"); + ui.setTitle(_("tutti.main.title.application", + getConfig().getVersion(), + title)); } protected String getSelectedCruiseTitle() { Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/ShowAboutAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/ShowAboutAction.java 2013-05-30 19:50:25 UTC (rev 1057) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/ShowAboutAction.java 2013-05-30 20:24:51 UTC (rev 1058) @@ -37,7 +37,6 @@ import jaxx.runtime.swing.AboutPanel; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.nuiton.util.config.ApplicationConfig; import org.nuiton.util.updater.ApplicationInfo; import org.nuiton.util.updater.ApplicationUpdater; @@ -107,10 +106,7 @@ about = null; - ApplicationConfig applicationConfig = - getContext().getConfig().getApplicationConfig(); - - String iconPath = applicationConfig.getOption("application.icon.path"); + String iconPath = "/icons/allegro_about.png"; String name = "tutti"; String licensePath = "META-INF/" + name + "-LICENSE.txt"; String thirdPartyPath = "META-INF/" + name + "-THIRD-PARTY.txt"; Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/action/TuttiActionUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/action/TuttiActionUIHandler.java 2013-05-30 19:50:25 UTC (rev 1057) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/action/TuttiActionUIHandler.java 2013-05-30 20:24:51 UTC (rev 1058) @@ -86,6 +86,9 @@ } protected void showAction(AbstractTuttiAction action) { + ui.setTitle(_("tutti.main.title.action", + getConfig().getVersion(), + action.getActionDescription())); ui.getGlobalActionLabel().setText( _("tutti.message.action.running", action.getActionDescription())); Modified: trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_en_GB.properties =================================================================== --- trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_en_GB.properties 2013-05-30 19:50:25 UTC (rev 1057) +++ trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_en_GB.properties 2013-05-30 20:24:51 UTC (rev 1058) @@ -1129,7 +1129,9 @@ tutti.main.menu.help= tutti.main.menu.help.mnemonic= tutti.main.menu.help.tip= -tutti.main.title.applicationName= +tutti.main.title.action=Allegro Campagne - v %s [%s] +tutti.main.title.application=Allegro Campagne - v %s [%s] +tutti.main.title.applicationName=Tutti tutti.main.title.noSelectedCruise= tutti.main.title.noSelectedProgram= tutti.main.title.noSelectedProtocol= Modified: trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properties =================================================================== --- trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properties 2013-05-30 19:50:25 UTC (rev 1057) +++ trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properties 2013-05-30 20:24:51 UTC (rev 1058) @@ -1090,6 +1090,8 @@ tutti.main.menu.help=Aide tutti.main.menu.help.mnemonic=A tutti.main.menu.help.tip=Aide +tutti.main.title.action=Allegro Campagne - v %s [%s] +tutti.main.title.application=Allegro Campagne - v %s [%s] tutti.main.title.applicationName=Tutti tutti.main.title.noSelectedCruise=Pas de campagne sélectionné tutti.main.title.noSelectedProgram=Pas de série de campagne sélectionné Added: trunk/tutti-ui-swing/src/main/resources/icons/allegro_32.png =================================================================== (Binary files differ) Property changes on: trunk/tutti-ui-swing/src/main/resources/icons/allegro_32.png ___________________________________________________________________ Added: svn:mime-type + image/png Added: svn:keywords + Author Date Id Revision HeadURL Added: trunk/tutti-ui-swing/src/main/resources/icons/allegro_about.png =================================================================== (Binary files differ) Property changes on: trunk/tutti-ui-swing/src/main/resources/icons/allegro_about.png ___________________________________________________________________ Added: svn:mime-type + image/png Added: svn:keywords + Author Date Id Revision HeadURL

1 0