Author: kmorin Date: 2013-02-19 11:42:52 +0100 (Tue, 19 Feb 2013) New Revision: 448 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/448 Log: - fixes #1994 S?\195?\169lection automatique de bon trait lors de l'ouverture de l'?\195?\169cran trait - debug Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/EditFishingOperationAction.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/FishingOperationsUIHandler.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/ComputeWeightsAction.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/frequency/SpeciesFrequencyUIHandler.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/split/CreateSpeciesBatchUIHandler.java trunk/tutti-ui-swing/src/main/resources/fr/ifremer/tutti/ui/swing/content/operation/EditFishingOperationUIModel-edit-error-validation.xml Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/EditFishingOperationAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/EditFishingOperationAction.java 2013-02-18 15:17:03 UTC (rev 447) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/EditFishingOperationAction.java 2013-02-19 10:42:52 UTC (rev 448) @@ -33,6 +33,7 @@ import fr.ifremer.tutti.persistence.entities.referential.Person; import fr.ifremer.tutti.service.PersistenceService; import fr.ifremer.tutti.ui.swing.AbstractTuttiAction; +import fr.ifremer.tutti.ui.swing.content.operation.catches.ComputeWeightsAction; import fr.ifremer.tutti.ui.swing.content.operation.catches.EditCatchesUI; import fr.ifremer.tutti.ui.swing.content.operation.catches.EditCatchesUIModel; import fr.ifremer.tutti.ui.swing.content.operation.catches.SaveCatchBatchAction; @@ -96,6 +97,13 @@ * @since 1.0 */ protected SaveFishingOperationAction saveFishingOperationAction; + + /** + * Delegate action to compute the weight of the catches. + * + * @since 1.1 + */ + protected ComputeWeightsAction computeWeightsAction; /** * Delgate action to save catch batch. @@ -172,6 +180,7 @@ fishingOperation = null; checkPreviousEdit = true; super.releaseAction(event); +// getComputeWeightsAction().actionPerformed(event); } protected SaveFishingOperationAction getSaveFishingOperationAction() { @@ -187,6 +196,13 @@ } return saveCatchBatchAction; } + + protected ComputeWeightsAction getComputeWeightsAction() { + if (computeWeightsAction == null) { + computeWeightsAction = new ComputeWeightsAction(getUI().getCatchesTabContent().getHandler()); + } + return computeWeightsAction; + } @Override protected boolean prepareAction(ActionEvent event) { @@ -349,6 +365,9 @@ // wait last minute to display (avoid dirty display effects) ui.add(form, BorderLayout.CENTER); + + ui.getFishingOperationTabContent().getFishingOperationTabPane().setSelectedIndex(0); + ui.getTabPane().setSelectedIndex(0); } model.addPropertyChangeListener(coordinatePropertiesListener); @@ -526,6 +545,7 @@ } + } - + } Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/FishingOperationsUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/FishingOperationsUIHandler.java 2013-02-18 15:17:03 UTC (rev 447) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/FishingOperationsUIHandler.java 2013-02-19 10:42:52 UTC (rev 448) @@ -105,8 +105,6 @@ List<FishingOperation> fishingOperations = persistenceService.getAllFishingOperation(cruiseId); - //FIXME Should remove this when no more use dev persistence impl - //TODO make sure to use selection cruise ? for (FishingOperation fishingOperation : fishingOperations) { fishingOperation.setCruise(cruise); } @@ -187,10 +185,19 @@ } }); - if (!fishingOperations.isEmpty()) { + FishingOperation selectedOperation = null; + for (FishingOperation fishingOperation : fishingOperations) { + if (selectedOperation == null || + fishingOperation.getGearShootingStartDate() + .after(selectedOperation.getGearShootingStartDate()) + && fishingOperation.getFishingOperationNumber() + > selectedOperation.getFishingOperationNumber() + ) { + selectedOperation = fishingOperation; + } + } - model.setSelectedFishingOperation(fishingOperations.get(0)); - } + model.setSelectedFishingOperation(selectedOperation); } @Override Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/ComputeWeightsAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/ComputeWeightsAction.java 2013-02-18 15:17:03 UTC (rev 447) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/ComputeWeightsAction.java 2013-02-19 10:42:52 UTC (rev 448) @@ -106,6 +106,7 @@ } else if (totalWeight == null) { if (rejectedWeight == null) { rejectedWeight = 0f; + model.setCatchTotalRejectedComputedWeight(0f); } model.setCatchTotalComputedWeight(speciesWeights.get(Weights.UNSORTED) + speciesWeights.get(Weights.SORTED) + rejectedWeight); @@ -157,13 +158,19 @@ } } } - Number inertWeight = speciesUI.getSpeciesTotalInertWeightField().getModel(); + + Number inertWeight = model.getSpeciesTotalInertWeight(); if (inertWeight != null) { totalSortedWeight += inertWeight.floatValue(); + } else { + model.setSpeciesTotalInertWeight(0f); } - Number livingNotItemizedWeight = speciesUI.getSpeciesTotalLivingNotItemizedWeightField().getModel(); + + Number livingNotItemizedWeight = model.getSpeciesTotalLivingNotItemizedWeight(); if (livingNotItemizedWeight != null) { totalSortedWeight += livingNotItemizedWeight.floatValue(); + } else { + model.setSpeciesTotalLivingNotItemizedWeight(0f); } setComputedValue(speciesUI.getSpeciesTotalSampleSortedWeightField(), 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-02-18 15:17:03 UTC (rev 447) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/SpeciesBatchUIHandler.java 2013-02-19 10:42:52 UTC (rev 448) @@ -479,6 +479,8 @@ // all synonyms Collection<Species> synonyms = map.get(referenceTaxonId); allSpecies.addAll(synonyms); + // TODO 20130218 kmorin: check with tchemit if we should not + // check that the species has the category in the protocol for (Species species : synonyms) { speciesSampleCategories.put(species, SampleCategoryType.sortedUnsorted); speciesSampleCategories.put(species, SampleCategoryType.size); @@ -487,6 +489,8 @@ speciesSampleCategories.put(species, SampleCategoryType.age); } } + //TODO 20130218 kmorin: check with Vincent what to allow on the + // other species which are not in the protocol } } else { 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-02-18 15:17:03 UTC (rev 447) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUIHandler.java 2013-02-19 10:42:52 UTC (rev 448) @@ -478,7 +478,7 @@ if (protocol != null) { Integer taxonId = speciesBatch.getSpecies().getReferenceTaxonId(); SpeciesProtocol speciesProtocol = this.speciesProtocol.get(taxonId); - if (speciesProtocol.getLengthStepPmfmId() == null) { + if (speciesProtocol == null || speciesProtocol.getLengthStepPmfmId() == null) { mode = SpeciesFrequencyUIModel.ConfigurationMode.SIMPLE_COUNTING; } } Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/split/CreateSpeciesBatchUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/split/CreateSpeciesBatchUIHandler.java 2013-02-18 15:17:03 UTC (rev 447) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/split/CreateSpeciesBatchUIHandler.java 2013-02-19 10:42:52 UTC (rev 448) @@ -228,6 +228,7 @@ } model.setAvailableSpecies(speciesToUse); + ui.getSpeciesComboBox().requestFocus(); } public void save() { Modified: trunk/tutti-ui-swing/src/main/resources/fr/ifremer/tutti/ui/swing/content/operation/EditFishingOperationUIModel-edit-error-validation.xml =================================================================== --- trunk/tutti-ui-swing/src/main/resources/fr/ifremer/tutti/ui/swing/content/operation/EditFishingOperationUIModel-edit-error-validation.xml 2013-02-18 15:17:03 UTC (rev 447) +++ trunk/tutti-ui-swing/src/main/resources/fr/ifremer/tutti/ui/swing/content/operation/EditFishingOperationUIModel-edit-error-validation.xml 2013-02-19 10:42:52 UTC (rev 448) @@ -96,7 +96,7 @@ <field-validator type="fieldexpression" short-circuit="true"> <param name="expression"> - <![CDATA[ gearShootingEndDate == null || gearShootingStartDate.compareTo(gearShootingEndDate) < 0 ]]> + <![CDATA[ gearShootingEndDate == null || gearShootingStartDate.compareTo(gearShootingEndDate) <= 0 ]]> </param> <message>tutti.validator.error.fishingOperation.dates.endBeforeStart</message> </field-validator> @@ -107,7 +107,7 @@ <field-validator type="fieldexpression" short-circuit="true"> <param name="expression"> - <![CDATA[ gearShootingEndDate == null || gearShootingStartDate == null || gearShootingStartDate.compareTo(gearShootingEndDate) < 0 ]]> + <![CDATA[ gearShootingEndDate == null || gearShootingStartDate == null || gearShootingStartDate.compareTo(gearShootingEndDate) <= 0 ]]> </param> <message>tutti.validator.error.fishingOperation.dates.endBeforeStart</message> </field-validator>