This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository tutti. See https://gitlab.nuiton.org/codelutin/tutti.git commit 6f4a2d925f17a6670ccd524884d32ded62015c84 Author: Tony CHEMIT <chemit@codelutin.com> Date: Wed Apr 13 11:16:18 2016 +0200 Correction des unités lors de la sauvegarde d'un lot (code en double en fait avec deux fois une conversion d'unité) --- .../species/edit/SpeciesBatchUIHandler.java | 27 ++++------------------ 1 file changed, 4 insertions(+), 23 deletions(-) diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/edit/SpeciesBatchUIHandler.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/edit/SpeciesBatchUIHandler.java index db45cbd..ec90dba 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/edit/SpeciesBatchUIHandler.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/edit/SpeciesBatchUIHandler.java @@ -1245,39 +1245,20 @@ public class SpeciesBatchUIHandler extends AbstractTuttiBatchTableUIHandler<Spec public void saveRow(SpeciesBatchRowModel row) { - FishingOperation fishingOperation = getModel().getFishingOperation(); - Preconditions.checkNotNull(fishingOperation); - + Preconditions.checkNotNull(row); Preconditions.checkNotNull(row.getSpecies()); - SampleCategory<?> sampleCategory = row.getFinestCategory(); - Preconditions.checkNotNull(sampleCategory); - Preconditions.checkNotNull(sampleCategory.getCategoryId()); - Preconditions.checkNotNull(sampleCategory.getCategoryValue()); SpeciesBatch catchBean = row.toEntity(); - WeightUnit weightUnit = getWeightUnit(); - - // convert weight - Float weight = catchBean.getWeight(); - catchBean.setWeight(weightUnit.toEntity(weight)); - + FishingOperation fishingOperation = getModel().getFishingOperation(); + Preconditions.checkNotNull(fishingOperation); catchBean.setFishingOperation(fishingOperation); SpeciesBatchRowModel parent = row.getParentBatch(); if (parent != null) { - //FIXME Check no need to convert parent weight ? :( catchBean.setParentBatch(parent.toEntity()); } - // apply sample category - catchBean.setSampleCategoryId(sampleCategory.getCategoryId()); - catchBean.setSampleCategoryValue(sampleCategory.getCategoryValue()); - - // convert sample category weight - Float categoryWeight = sampleCategory.getCategoryWeight(); - catchBean.setSampleCategoryWeight(weightUnit.toEntity(categoryWeight)); - if (TuttiEntities.isNew(catchBean)) { Integer parentBatchId = null; @@ -1309,7 +1290,7 @@ public class SpeciesBatchUIHandler extends AbstractTuttiBatchTableUIHandler<Spec frequency = speciesOrBenthosBatchUISupport.saveBatchFrequencies(catchBean.getIdAsInt(), frequency); // push it back to row model - frequencyRows = SpeciesFrequencyRowModel.fromEntity(weightUnit, frequency); + frequencyRows = SpeciesFrequencyRowModel.fromEntity(getWeightUnit(), frequency); row.setFrequency(frequencyRows); List<IndividualObservationBatchRowModel> obsRows = row.getIndividualObservation() -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.