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 78cc4c321c372390b6734846cbf045926cbb349f Author: Tony CHEMIT <chemit@codelutin.com> Date: Mon Apr 25 16:58:07 2016 +0200 génération des mensurations lors d'un import multiposte sur uniquement les observations individuelles (See #8276) --- .../frequency/actions/ImportMultiPostSpeciesSupportAction.java | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) 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 0db76a2..5fb2f92 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 @@ -146,7 +146,7 @@ public abstract class ImportMultiPostSpeciesSupportAction extends LongActionSupp IndividualObservationBatchUIModel individualObservationModel = model.getIndividualObservationModel(); List<IndividualObservationBatchRowModel> rows = individualObservationModel.getRows(); individualObservationModel.removeIndividualObservations(rows); - + getHandler().loadFrequenciesAndObservations(frequencyRows, individualObservationRows, true); if (totalWeight != null) { @@ -154,6 +154,14 @@ public abstract class ImportMultiPostSpeciesSupportAction extends LongActionSupp // on reporte ce poids qui ne peut pas être importé model.setTotalWeight(totalWeight); } + + if (!isImportFrequencies() && model.mustCopyIndividualObservationSize()) { + + // on doit recopier les mensurations depuis les observations individuelles + model.getFrequencyTableModel().reloadRowsFromIndividualObservations(); + + } + model.setModify(true); } -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.