branch develop updated (f7eb183 -> d43093c)
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 f7eb183 Livrable #8272 Merge branch 'feature/8272' into develop new 8574475 Meilleure gestion du tableau des mensurations lors de la génération depuis les observations individuelles new 9607b38 correction log new 78cc4c3 génération des mensurations lors d'un import multiposte sur uniquement les observations individuelles (See #8276) new d43093c Livrable #8276 Merge branch 'feature/8276' into develop The 4 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 d43093c8329a6fabcb9b40c76720f6fe50ee6b24 Merge: f7eb183 78cc4c3 Author: Tony CHEMIT <chemit@codelutin.com> Date: Mon Apr 25 16:58:09 2016 +0200 Livrable #8276 Merge branch 'feature/8276' into develop 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) commit 9607b38ffd96d17f03398cba468c80a08c4c9adc Author: Tony CHEMIT <chemit@codelutin.com> Date: Mon Apr 25 16:56:48 2016 +0200 correction log commit 85744752230d699df9a971a1b0647060264dedf0 Author: Tony CHEMIT <chemit@codelutin.com> Date: Mon Apr 25 16:56:36 2016 +0200 Meilleure gestion du tableau des mensurations lors de la génération depuis les observations individuelles Summary of changes: .../IndividualObservationToFrequencyEngine.java | 2 +- .../species/frequency/SpeciesFrequencyTableModel.java | 16 +++++++++++----- .../actions/ImportMultiPostSpeciesSupportAction.java | 10 +++++++++- 3 files changed, 21 insertions(+), 7 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 85744752230d699df9a971a1b0647060264dedf0 Author: Tony CHEMIT <chemit@codelutin.com> Date: Mon Apr 25 16:56:36 2016 +0200 Meilleure gestion du tableau des mensurations lors de la génération depuis les observations individuelles --- .../species/frequency/SpeciesFrequencyTableModel.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/SpeciesFrequencyTableModel.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyTableModel.java index a993a60..1aeb3d3 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyTableModel.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyTableModel.java @@ -471,8 +471,14 @@ public class SpeciesFrequencyTableModel extends AbstractApplicationTableModel<Sp if (uiModel.mustCopyIndividualObservationSize()) { + if (log.isInfoEnabled()) { + log.info("Generate frequencies from individual observations (mode: " + uiModel.getCopyIndividualObservationMode() + ")"); + } + boolean copyWeights = uiModel.isCopyIndividualObservationAll(); + rows.clear(); + uiModel.getValidIndividualObservations().stream() .filter(IndividualObservationBatchRowModel::withSize) .forEachOrdered(individualObservation -> { @@ -487,14 +493,14 @@ public class SpeciesFrequencyTableModel extends AbstractApplicationTableModel<Sp }); - } - - if (rows.isEmpty()) { - addNewRow(); } else { - Collections.sort(rows); + if (rows.isEmpty()) { + addNewRow(); + } } + Collections.sort(rows); + uiModel.reloadRows(); } -- 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 9607b38ffd96d17f03398cba468c80a08c4c9adc Author: Tony CHEMIT <chemit@codelutin.com> Date: Mon Apr 25 16:56:48 2016 +0200 correction log --- .../species/frequency/IndividualObservationToFrequencyEngine.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/IndividualObservationToFrequencyEngine.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/IndividualObservationToFrequencyEngine.java index c287da4..a5c2316 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/IndividualObservationToFrequencyEngine.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/IndividualObservationToFrequencyEngine.java @@ -225,7 +225,7 @@ public class IndividualObservationToFrequencyEngine { if (lengthStepToIncrement != null) { if (log.isInfoEnabled()) { - log.info("Increments frequency rows number for length class: " + lengthStepToDecrement); + log.info("Increments frequency rows number for length class: " + lengthStepToIncrement); } frequencyTableModel.incrementFrequencyRowsNumbers(lengthStepToIncrement); -- 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 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>.
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 d43093c8329a6fabcb9b40c76720f6fe50ee6b24 Merge: f7eb183 78cc4c3 Author: Tony CHEMIT <chemit@codelutin.com> Date: Mon Apr 25 16:58:09 2016 +0200 Livrable #8276 Merge branch 'feature/8276' into develop .../IndividualObservationToFrequencyEngine.java | 2 +- .../species/frequency/SpeciesFrequencyTableModel.java | 16 +++++++++++----- .../actions/ImportMultiPostSpeciesSupportAction.java | 10 +++++++++- 3 files changed, 21 insertions(+), 7 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
participants (1)
-
codelutin.com scm