branch develop updated (074584b -> d8e19d2)
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 074584b Merge branch 'feature/8225' into 'develop' new fd87d89 on supprime la colonne de maturité en fermant l'ui, pour avoir les même colonnes qu'à la création de l'écran (important pour la swing session) (fixes #8202) new d8e19d2 Livrable #8202 Merge branch 'feature/8202' into develop The 2 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 d8e19d2bc21a95fed34236436665d3f2aee9610b Merge: 074584b fd87d89 Author: Tony CHEMIT <chemit@codelutin.com> Date: Wed Apr 6 17:47:53 2016 +0200 Livrable #8202 Merge branch 'feature/8202' into develop commit fd87d89fed66388f822cf2935115ca88f3b37f44 Author: Kevin Morin <morin@codelutin.com> Date: Wed Apr 6 15:17:45 2016 +0200 on supprime la colonne de maturité en fermant l'ui, pour avoir les même colonnes qu'à la création de l'écran (important pour la swing session) (fixes #8202) Summary of changes: .../catches/species/frequency/SpeciesFrequencyUIHandler.java | 8 ++++++++ 1 file changed, 8 insertions(+) -- 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 fd87d89fed66388f822cf2935115ca88f3b37f44 Author: Kevin Morin <morin@codelutin.com> Date: Wed Apr 6 15:17:45 2016 +0200 on supprime la colonne de maturité en fermant l'ui, pour avoir les même colonnes qu'à la création de l'écran (important pour la swing session) (fixes #8202) --- .../catches/species/frequency/SpeciesFrequencyUIHandler.java | 8 ++++++++ 1 file changed, 8 insertions(+) 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 0ad49d2..a019c3b 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 @@ -836,6 +836,14 @@ public class SpeciesFrequencyUIHandler extends AbstractTuttiTableUIHandler<Speci EditSpeciesBatchPanelUI parent = getParentContainer(EditSpeciesBatchPanelUI.class); parent.switchToEditBatch(); + // on supprime la colonne maturité en fermant, pour avoir les même colonnes qu'à la création de l'écran (important pour la swing session) + if (maturityColumnId.isPresent()) { + TableColumnExt maturityColumn = ui.getObsTable().getColumnExt(maturityColumnId.get()); + ui.getObsTable().removeColumn(maturityColumn); + getObsTableModel().removeMaturityIdentifier(maturityColumnId.get()); + maturityColumnId = Optional.empty(); + } + TuttiUIContext context = getContext(); if (context.isIchtyometerConnected()) { -- 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 d8e19d2bc21a95fed34236436665d3f2aee9610b Merge: 074584b fd87d89 Author: Tony CHEMIT <chemit@codelutin.com> Date: Wed Apr 6 17:47:53 2016 +0200 Livrable #8202 Merge branch 'feature/8202' into develop .../catches/species/frequency/SpeciesFrequencyUIHandler.java | 8 ++++++++ 1 file changed, 8 insertions(+) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
participants (1)
-
codelutin.com scm