branch develop updated (b0e531f -> 22912b8)
This is an automated email from the git hooks/post-receive script. New change to branch develop in repository tutti. See https://gitlab.nuiton.org/codelutin/tutti.git from b0e531f Livrable #8256 Merge branch 'feature/8256' into develop new ca6413e Bien reporter le poids de sous-échantillon après un import (See #8248) new e010538 Correction du chargement de l'écran des mensurations si pas de méthode de mensuration trouvée new 22912b8 Livrable #8248 Merge branch 'feature/8248' into develop The 3 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit 22912b87f46eba5a305d88cd13ea4b25c832607a Merge: b0e531f e010538 Author: Tony CHEMIT <chemit@codelutin.com> Date: Sun Apr 17 12:28:34 2016 +0200 Livrable #8248 Merge branch 'feature/8248' into develop commit e010538141ceeaf0a51fc47dd0af53563d93128d Author: Tony CHEMIT <chemit@codelutin.com> Date: Sun Apr 17 12:28:31 2016 +0200 Correction du chargement de l'écran des mensurations si pas de méthode de mensuration trouvée 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) Summary of changes: .../frequency/SpeciesFrequencyUIHandler.java | 16 +++++++++++----- .../ImportMultiPostSpeciesSupportAction.java | 21 ++++++++++++++------- 2 files changed, 25 insertions(+), 12 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
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>.
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 e010538141ceeaf0a51fc47dd0af53563d93128d Author: Tony CHEMIT <chemit@codelutin.com> Date: Sun Apr 17 12:28:31 2016 +0200 Correction du chargement de l'écran des mensurations si pas de méthode de mensuration trouvée --- .../species/frequency/SpeciesFrequencyUIHandler.java | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUIHandler.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUIHandler.java index acdcae7..f9049fa 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUIHandler.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUIHandler.java @@ -371,7 +371,12 @@ public class SpeciesFrequencyUIHandler extends AbstractTuttiTableUIHandler<Speci recomputeRowValidState(rowModel); } } - SpeciesFrequencyUIHandler.this.ui.getValidator().doValidate(); + + if (!model.isInitBatchEdition()) { + + // on valide uniquement si on est pas en mode de chargement de l'écran + SpeciesFrequencyUIHandler.this.ui.getValidator().doValidate(); + } // getObsTableModel().setLengthstepCaracteristic(newValue); }); @@ -1129,7 +1134,7 @@ public class SpeciesFrequencyUIHandler extends AbstractTuttiTableUIHandler<Speci FrequencyConfigurationMode mode; - if (number != null || (lengthStepCaracteristic == null && taxonCache.containsLengthStepPmfmId(species))) { + if (number != null || lengthStepCaracteristic == null) { mode = FrequencyConfigurationMode.SIMPLE_COUNTING; @@ -1251,19 +1256,20 @@ public class SpeciesFrequencyUIHandler extends AbstractTuttiTableUIHandler<Speci if (lengthStepCaracteristic == null) { - String lengthStepPmfmId = taxonCache.getLengthStepPmfmId(species); + if (taxonCache.containsLengthStepPmfmId(species)) { - if (lengthStepPmfmId != null) { + String lengthStepPmfmId = taxonCache.getLengthStepPmfmId(species); lengthStepCaracteristic = lengthStepCaracteristics.get(lengthStepPmfmId); if (log.isInfoEnabled()) { log.info("Use existing from protocol lengthStep caracteristic / step " + decorate(lengthStepCaracteristic)); } - } + } return lengthStepCaracteristic; + } } -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
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 22912b87f46eba5a305d88cd13ea4b25c832607a Merge: b0e531f e010538 Author: Tony CHEMIT <chemit@codelutin.com> Date: Sun Apr 17 12:28:34 2016 +0200 Livrable #8248 Merge branch 'feature/8248' into develop .../frequency/SpeciesFrequencyUIHandler.java | 16 +++++++++++----- .../ImportMultiPostSpeciesSupportAction.java | 21 ++++++++++++++------- 2 files changed, 25 insertions(+), 12 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
participants (1)
-
codelutin.com scm