branch feature/8059 created (now cef2cf4)
This is an automated email from the git hooks/post-receive script. New change to branch feature/8059 in repository tutti. See http://git.codelutin.com/tutti.git at cef2cf4 on vérifie que les caractéristiques n'ont pas de valeurs (fixes #8059) This branch includes the following new commits: new 7c471e2 on vérifie qu'il y a des lignes non vides dans le tableau des observations (refs #8059) new cef2cf4 on vérifie que les caractéristiques n'ont pas de valeurs (fixes #8059) 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 cef2cf4836d1874b00a841643611f948905b9c2e Author: Kevin Morin <morin@codelutin.com> Date: Fri Mar 4 11:47:38 2016 +0100 on vérifie que les caractéristiques n'ont pas de valeurs (fixes #8059) commit 7c471e2036db3c3ac9bda6b1a3fad07511761e9f Author: Kevin Morin <morin@codelutin.com> Date: Thu Mar 3 17:10:43 2016 +0100 on vérifie qu'il y a des lignes non vides dans le tableau des observations (refs #8059) -- 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 feature/8059 in repository tutti. See http://git.codelutin.com/tutti.git commit 7c471e2036db3c3ac9bda6b1a3fad07511761e9f Author: Kevin Morin <morin@codelutin.com> Date: Thu Mar 3 17:10:43 2016 +0100 on vérifie qu'il y a des lignes non vides dans le tableau des observations (refs #8059) --- .../IndividualObservationBatchRowModel.java | 9 +++++ .../IndividualObservationBatchTableModel.java | 6 +--- .../frequency/SpeciesFrequencyUIHandler.java | 3 ++ .../species/frequency/SpeciesFrequencyUIModel.java | 39 +++++++++++++++------- 4 files changed, 40 insertions(+), 17 deletions(-) diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/IndividualObservationBatchRowModel.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/IndividualObservationBatchRowModel.java index 8a3de05..b6be073 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/IndividualObservationBatchRowModel.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/IndividualObservationBatchRowModel.java @@ -372,4 +372,13 @@ public class IndividualObservationBatchRowModel extends AbstractTuttiBeanUIModel this.attachment.remove(attachment); firePropertyChange(PROPERTY_ATTACHMENT, null, getAttachment()); } + + public boolean isEmpty() { + return getSize() == null + && getWeight() == null && getCaracteristics().isEmpty() + && (getCaracteristics() == null || getCaracteristics().isEmpty()) + && (getDefaultCaracteristics() == null || getDefaultCaracteristics().isEmpty()) + && getComment() == null + && (getAttachment() == null || getAttachment().isEmpty()); + } } diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/IndividualObservationBatchTableModel.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/IndividualObservationBatchTableModel.java index 0826e25..de460d0 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/IndividualObservationBatchTableModel.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/IndividualObservationBatchTableModel.java @@ -129,11 +129,7 @@ public class IndividualObservationBatchTableModel extends AbstractApplicationTab for (int i = rows.size() - 1 ; i >= 0 ; i--) { IndividualObservationBatchRowModel row = rows.get(i); // if the row has no data set, then it could be the empty row we are looking for - if (row.getWeight() == null - && row.getSize() == null - && (row.getCaracteristics() == null || row.getCaracteristics().isEmpty()) - && row.getComment() == null - && (row.getAttachment() == null || row.getAttachment().isEmpty())) { + if (row.isEmpty()) { result = row; 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 a5e4071..72894bd 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 @@ -226,6 +226,7 @@ public class SpeciesFrequencyUIHandler extends AbstractTuttiTableUIHandler<Speci } getModel().recomputeIndividualObservationRowValidState(row); + getModel().recomputeCanEditLengthStep(); } }; @@ -1262,6 +1263,8 @@ public class SpeciesFrequencyUIHandler extends AbstractTuttiTableUIHandler<Speci getModel().recomputeIndividualObservationRowValidState(newRow); } } + + getModel().recomputeCanEditLengthStep(); }); } diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUIModel.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUIModel.java index 2527646..8ad71d4 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUIModel.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUIModel.java @@ -765,25 +765,40 @@ public class SpeciesFrequencyUIModel extends AbstractTuttiTableUIModel<SpeciesBa boolean result = true; - for (SpeciesFrequencyRowModel row : rows) { + if (rows != null) { + for (SpeciesFrequencyRowModel row : rows) { + + if (row.isEmpty()) { + // la ligne est vide + continue; + } + if (row.getLengthStep() == null || row.getNumber() == null) { + // la ligne n'est pas complete + continue; + } + + // une ligne non vide et complete a ete trouvee + // on ne peut plus editer + result = false; - if (row.isEmpty()) { - // la ligne est vide - continue; - } - if (row.getLengthStep() == null || row.getNumber() == null) { - // la ligne n'est pas complete - continue; } + } - // une ligne non vide et complete a ete trouvee - // on ne peut plus editer - result = false; + if (individualObservationRows != null) { + for (IndividualObservationBatchRowModel row : individualObservationRows) { + if (row.isEmpty()) { + // la ligne est vide + continue; + } + + // une ligne non vide et complete a ete trouvee + // on ne peut plus editer + result = false; + } } setCanEditLengthStep(result); - } public void computeRowWeightWithRtp(SpeciesFrequencyRowModel row) { -- 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 feature/8059 in repository tutti. See http://git.codelutin.com/tutti.git commit cef2cf4836d1874b00a841643611f948905b9c2e Author: Kevin Morin <morin@codelutin.com> Date: Fri Mar 4 11:47:38 2016 +0100 on vérifie que les caractéristiques n'ont pas de valeurs (fixes #8059) --- .../fr/ifremer/tutti/persistence/entities/CaracteristicMap.java | 4 ++++ .../individualobservation/IndividualObservationBatchRowModel.java | 6 +++--- .../catches/species/frequency/SpeciesFrequencyUIModel.java | 5 +++-- 3 files changed, 10 insertions(+), 5 deletions(-) diff --git a/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/CaracteristicMap.java b/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/CaracteristicMap.java index 10d1184..655b511 100644 --- a/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/CaracteristicMap.java +++ b/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/CaracteristicMap.java @@ -43,4 +43,8 @@ public class CaracteristicMap extends LinkedHashMap<Caracteristic, Serializable> } return result; } + + public boolean hasNotNullValues() { + return values().stream().filter(value -> value != null).count() > 0; + } } diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/IndividualObservationBatchRowModel.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/IndividualObservationBatchRowModel.java index b6be073..81ab5fc 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/IndividualObservationBatchRowModel.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/IndividualObservationBatchRowModel.java @@ -375,9 +375,9 @@ public class IndividualObservationBatchRowModel extends AbstractTuttiBeanUIModel public boolean isEmpty() { return getSize() == null - && getWeight() == null && getCaracteristics().isEmpty() - && (getCaracteristics() == null || getCaracteristics().isEmpty()) - && (getDefaultCaracteristics() == null || getDefaultCaracteristics().isEmpty()) + && getWeight() == null + && (getCaracteristics() == null || !getCaracteristics().hasNotNullValues()) + && (getDefaultCaracteristics() == null || !getDefaultCaracteristics().hasNotNullValues()) && getComment() == null && (getAttachment() == null || getAttachment().isEmpty()); } diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUIModel.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUIModel.java index 8ad71d4..ddb1a82 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUIModel.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUIModel.java @@ -765,7 +765,7 @@ public class SpeciesFrequencyUIModel extends AbstractTuttiTableUIModel<SpeciesBa boolean result = true; - if (rows != null) { + if (rows != null) { for (SpeciesFrequencyRowModel row : rows) { if (row.isEmpty()) { @@ -780,7 +780,7 @@ public class SpeciesFrequencyUIModel extends AbstractTuttiTableUIModel<SpeciesBa // une ligne non vide et complete a ete trouvee // on ne peut plus editer result = false; - + break; } } @@ -795,6 +795,7 @@ public class SpeciesFrequencyUIModel extends AbstractTuttiTableUIModel<SpeciesBa // une ligne non vide et complete a ete trouvee // on ne peut plus editer result = false; + break; } } -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
participants (1)
-
codelutin.com scm