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 ca6413eb302c047f0b2e2f6965860f98b7027f03 Author: Tony CHEMIT <chemit@codelutin.com> Date: Sun Apr 17 12:28:02 2016 +0200 Bien reporter le poids de sous-échantillon après un import (See #8248) --- .../ImportMultiPostSpeciesSupportAction.java | 21 ++++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-) diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/actions/ImportMultiPostSpeciesSupportAction.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/actions/ImportMultiPostSpeciesSupportAction.java index edb1495..a9a9c37 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/actions/ImportMultiPostSpeciesSupportAction.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/actions/ImportMultiPostSpeciesSupportAction.java @@ -60,6 +60,7 @@ public abstract class ImportMultiPostSpeciesSupportAction extends LongActionSupp * Optional data that were not imported. */ private MultiPostImportResult importResult; + protected Float totalWeight; protected ImportMultiPostSpeciesSupportAction(SpeciesFrequencyUIHandler handler) { super(handler, false); @@ -104,9 +105,10 @@ public abstract class ImportMultiPostSpeciesSupportAction extends LongActionSupp FishingOperation operation = getDataContext().getFishingOperation(); - SpeciesOrBenthosBatchUISupport batchUISupport = getModel().getSpeciesOrBenthosBatchUISupport(); - SpeciesBatch speciesBatch = getModel().getBatch().toEntity(); - + SpeciesFrequencyUIModel model = getModel(); + SpeciesOrBenthosBatchUISupport batchUISupport = model.getSpeciesOrBenthosBatchUISupport(); + SpeciesBatch speciesBatch = model.getBatch().toEntity(); + totalWeight = model.getTotalWeight(); importResult = batchUISupport.importMultiPost(file, operation, speciesBatch, isImportFrequencies(), isImportIndivudalObservations()); } @@ -126,7 +128,8 @@ public abstract class ImportMultiPostSpeciesSupportAction extends LongActionSupp if (log.isInfoEnabled()) { log.info("[SpeciesBatch: " + speciesBatchId + "] Frequencies: " + frequencies.size()); } - List<SpeciesFrequencyRowModel> frequencyRows = SpeciesFrequencyRowModel.fromEntity(getModel().getSpeciesOrBenthosBatchUISupport().getWeightUnit(), frequencies); + SpeciesFrequencyUIModel model = getModel(); + List<SpeciesFrequencyRowModel> frequencyRows = SpeciesFrequencyRowModel.fromEntity(model.getSpeciesOrBenthosBatchUISupport().getWeightUnit(), frequencies); List<IndividualObservationBatch> individualObservations = importResult.getImportedObservations(); if (log.isInfoEnabled()) { @@ -136,11 +139,15 @@ public abstract class ImportMultiPostSpeciesSupportAction extends LongActionSupp getDataContext().getDefaultIndividualObservationCaracteristics(), individualObservations); - //FIXME Il faut reporter le poids de sous-échantillons - //FIXME Faire un «reset» avant pour l'algorithme de prélèvement getHandler().loadFrequenciesAndObservations(frequencyRows, individualObservationRows); - getModel().setModify(true); + + if (totalWeight != null) { + + // on reporte ce poids qui ne peut pas être importé + model.setTotalWeight(totalWeight); + } + model.setModify(true); } -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.