branch develop updated (65ac7cc -> 9f19d6d)
This is an automated email from the git hooks/post-receive script. New change to branch develop in repository tutti. See http://git.codelutin.com/tutti.git from 65ac7cc Fixes #8114 Merge branch 'feature/8114' into develop new ed5a12f Ajout de la colonne maturité même s'il n'y a pas d'observations individuelles encore présentes (See #8118) new 9f19d6d Fixes #8118 Merge branch 'feature/8118' 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 9f19d6d4990b31823d4c6f882470f7bced58642a Merge: 65ac7cc ed5a12f Author: Tony CHEMIT <chemit@codelutin.com> Date: Sun Mar 13 06:44:23 2016 +0100 Fixes #8118 Merge branch 'feature/8118' into develop commit ed5a12fbc29263c041277137f9b0af90fe5d735f Author: Tony CHEMIT <chemit@codelutin.com> Date: Sun Mar 13 06:44:20 2016 +0100 Ajout de la colonne maturité même s'il n'y a pas d'observations individuelles encore présentes (See #8118) Summary of changes: .../species/frequency/SpeciesFrequencyUIHandler.java | 15 ++++++++------- 1 file changed, 8 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 http://git.codelutin.com/tutti.git commit ed5a12fbc29263c041277137f9b0af90fe5d735f Author: Tony CHEMIT <chemit@codelutin.com> Date: Sun Mar 13 06:44:20 2016 +0100 Ajout de la colonne maturité même s'il n'y a pas d'observations individuelles encore présentes (See #8118) --- .../species/frequency/SpeciesFrequencyUIHandler.java | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 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 9316275..5744459 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 @@ -769,19 +769,20 @@ public class SpeciesFrequencyUIHandler extends AbstractTuttiTableUIHandler<Speci } } + // Add maturity column if necessary + + Optional<Caracteristic> maturityCaracteristic = speciesMaturityPmfmId.map(maturityCaracteristics::get); + + if (maturityCaracteristic.isPresent()) { + addMaturityCaracteristicColumnToModel(maturityCaracteristic.get()); + } + List<IndividualObservationBatchRowModel> individualObservations = speciesBatch.getIndividualObservation(); // try to load existing frequency if (CollectionUtils.isNotEmpty(individualObservations)) { - Optional<Caracteristic> maturityCaracteristic = - speciesMaturityPmfmId.map(pmfmId -> maturityCaracteristics.get(pmfmId)); - - if (maturityCaracteristic.isPresent()) { - addMaturityCaracteristicColumnToModel(maturityCaracteristic.get()); - } - IndividualObservationBatchTableModel tableModel = getObsTableModel(); tableModel.setRows(new ArrayList<>()); -- 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 http://git.codelutin.com/tutti.git commit 9f19d6d4990b31823d4c6f882470f7bced58642a Merge: 65ac7cc ed5a12f Author: Tony CHEMIT <chemit@codelutin.com> Date: Sun Mar 13 06:44:23 2016 +0100 Fixes #8118 Merge branch 'feature/8118' into develop .../species/frequency/SpeciesFrequencyUIHandler.java | 15 ++++++++------- 1 file changed, 8 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