Author: kmorin Date: 2013-04-16 15:10:11 +0200 (Tue, 16 Apr 2013) New Revision: 799 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/799 Log: fixes #2316 [CAPTURES] - Observations individuelles - Erreur lors de la saisie du code de pr?\195?\169l?\195?\168vement pi?\195?\168ce calcifi?\195?\169e Modified: trunk/tutti-persistence/src/main/xmi/tutti-persistence.zargo 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/EditFishingOperationAction.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/individualobservation/IndividualObservationBatchRowModel.java Modified: trunk/tutti-persistence/src/main/xmi/tutti-persistence.zargo =================================================================== (Binary files differ) 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-04-16 10:20:24 UTC (rev 798) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/AbstractTuttiBatchUIModel.java 2013-04-16 13:10:11 UTC (rev 799) @@ -45,14 +45,14 @@ private static final long serialVersionUID = 1L; /** - * Fishing Operation to prapagate to catches model. + * Fishing Operation to prapagate to operations model. * * @since 0.3 */ protected final Set<String> propagateProperties; /** - * Editing fishing catches model. + * Editing fishing operations model. * * @since 0.3 */ 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-04-16 10:20:24 UTC (rev 798) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/EditFishingOperationAction.java 2013-04-16 13:10:11 UTC (rev 799) @@ -98,7 +98,7 @@ protected SaveFishingOperationAction saveFishingOperationAction; /** - * Delegate action to compute the weight of the catches. + * Delegate action to compute the weight of the operations. * * @since 1.1 */ 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-04-16 10:20:24 UTC (rev 798) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/ComputeWeightsAction.java 2013-04-16 13:10:11 UTC (rev 799) @@ -33,6 +33,7 @@ import fr.ifremer.tutti.persistence.entities.data.MarineLitterBatch; import fr.ifremer.tutti.persistence.entities.data.SortedUnsortedEnum; import fr.ifremer.tutti.persistence.entities.data.SpeciesBatch; +import fr.ifremer.tutti.service.catches.TuttiWeightComputingException; import fr.ifremer.tutti.service.catches.TuttiWeightComputingService; import fr.ifremer.tutti.ui.swing.content.operation.catches.benthos.BenthosBatchRowModel; import fr.ifremer.tutti.ui.swing.content.operation.catches.species.SpeciesBatchRowModel; @@ -65,10 +66,23 @@ tuttiWeightComputingService.getComputedSpeciesBatches(model.getFishingOperation()); Float totalSpeciesSortedWeight = computeSpeciesBatches(computedSpeciesBatches); - BatchContainer<BenthosBatch> computedBenthosBatches = - tuttiWeightComputingService.getComputedBenthosBatches(model.getFishingOperation()); - Float totalBenthosSortedWeight = computeBenthosBatches(computedBenthosBatches); + BatchContainer<BenthosBatch> computedBenthosBatches; + Float totalBenthosSortedWeight; + int rowIndex = 0; + try { + computedBenthosBatches = + tuttiWeightComputingService.getComputedBenthosBatches(model.getFishingOperation()); + totalBenthosSortedWeight = computeBenthosBatches(computedBenthosBatches); + } catch (TuttiWeightComputingException e) { + rowIndex = e.getIndex(); + throw e; + + } finally { + getUI().getTabPane().setSelectedIndex(2); + AbstractSelectTableAction.doSelectCell(getUI().getBenthosTabContent().getTable(), rowIndex, 1); + } + BatchContainer<MarineLitterBatch> computedMarineLitterBatches = tuttiWeightComputingService.getComputedMarineLitterBatches(model.getFishingOperation()); Float totalMarineLitterWeight = computeMarineLitterBatches(computedMarineLitterBatches); @@ -189,11 +203,6 @@ Float weight = row.getSortedUnsortedCategoryWeight(); if (weight == null) { weight = row.getSortedUnsortedCategoryComputedWeight(); - } - if (weight == null) { - getUI().getTabPane().setSelectedIndex(2); - AbstractSelectTableAction.doSelectCell(getUI().getBenthosTabContent().getTable(), rowIndex, 1); - throw new TuttiBusinessException(_("tutti.editCatchBatch.action.computeWeights.error.noWeight")); } else if (SortedUnsortedEnum.SORTED.matchValue( row.getSortedUnsortedCategoryValue())) { Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/IndividualObservationBatchRowModel.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/IndividualObservationBatchRowModel.java 2013-04-16 10:20:24 UTC (rev 798) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/IndividualObservationBatchRowModel.java 2013-04-16 13:10:11 UTC (rev 799) @@ -174,12 +174,12 @@ } @Override - public Integer getCalcifiedPieceSamplingCode() { + public String getCalcifiedPieceSamplingCode() { return editObject.getCalcifiedPieceSamplingCode(); } @Override - public void setCalcifiedPieceSamplingCode(Integer calcifiedPieceSamplingCode) { + public void setCalcifiedPieceSamplingCode(String calcifiedPieceSamplingCode) { Object oldValue = getCalcifiedPieceSamplingCode(); editObject.setCalcifiedPieceSamplingCode(calcifiedPieceSamplingCode); firePropertyChange(PROPERTY_CALCIFIED_PIECE_SAMPLING_CODE, oldValue, calcifiedPieceSamplingCode);