branch develop updated (bd34b7e -> a2d6dba)
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 bd34b7e Fixes #8128 Merge branch 'feature/8128' into develop new 06def09 import new 0af8ebc Persister les mensurations si le poids ou la taille est présente new a2d6dba Forcer le mode de recopie à l'ouverture de l'écran The 3 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 a2d6dbaf249c853d0290160e0993600b40965755 Author: Tony CHEMIT <chemit@codelutin.com> Date: Thu Mar 17 11:09:02 2016 +0100 Forcer le mode de recopie à l'ouverture de l'écran commit 0af8ebc70c326105bc0978acd0e8ecdae5ccd3eb Author: Tony CHEMIT <chemit@codelutin.com> Date: Thu Mar 17 11:08:41 2016 +0100 Persister les mensurations si le poids ou la taille est présente commit 06def091e982be2cff631316276613dd740a730f Author: Tony CHEMIT <chemit@codelutin.com> Date: Thu Mar 17 11:07:58 2016 +0100 import Summary of changes: .../operation/catches/species/actions/CreateSpeciesMelagAction.java | 3 +-- .../catches/species/frequency/SpeciesFrequencyCellComponent.java | 2 +- .../operation/catches/species/frequency/SpeciesFrequencyRowModel.java | 1 + .../operation/catches/species/frequency/SpeciesFrequencyUIHandler.java | 1 + 4 files changed, 4 insertions(+), 3 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 06def091e982be2cff631316276613dd740a730f Author: Tony CHEMIT <chemit@codelutin.com> Date: Thu Mar 17 11:07:58 2016 +0100 import --- .../operation/catches/species/actions/CreateSpeciesMelagAction.java | 3 +-- .../operation/catches/species/frequency/SpeciesFrequencyRowModel.java | 1 + 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/actions/CreateSpeciesMelagAction.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/actions/CreateSpeciesMelagAction.java index e3d0f96..f45f931 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/actions/CreateSpeciesMelagAction.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/actions/CreateSpeciesMelagAction.java @@ -24,15 +24,14 @@ package fr.ifremer.tutti.ui.swing.content.operation.catches.species.actions; import com.google.common.collect.Maps; import fr.ifremer.tutti.type.WeightUnit; -import fr.ifremer.tutti.ui.swing.util.actions.LongActionSupport; import fr.ifremer.tutti.ui.swing.content.operation.catches.SpeciesAbleBatchRowHelper; import fr.ifremer.tutti.ui.swing.content.operation.catches.species.SpeciesBatchRowModel; import fr.ifremer.tutti.ui.swing.content.operation.catches.species.SpeciesBatchTableModel; import fr.ifremer.tutti.ui.swing.content.operation.catches.species.SpeciesBatchUI; import fr.ifremer.tutti.ui.swing.content.operation.catches.species.SpeciesBatchUIHandler; import fr.ifremer.tutti.ui.swing.content.operation.catches.species.SpeciesBatchUIModel; +import fr.ifremer.tutti.ui.swing.util.actions.LongActionSupport; import fr.ifremer.tutti.ui.swing.util.species.EnterMelagWeightUI; -import fr.ifremer.tutti.util.Weights; import jaxx.runtime.SwingUtil; import org.apache.commons.lang3.StringUtils; diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyRowModel.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyRowModel.java index 004e70d..3b55ccb 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyRowModel.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyRowModel.java @@ -30,6 +30,7 @@ import fr.ifremer.tutti.persistence.entities.data.SpeciesBatchFrequencys; import fr.ifremer.tutti.persistence.entities.referential.Caracteristic; import fr.ifremer.tutti.type.WeightUnit; import fr.ifremer.tutti.ui.swing.util.AbstractTuttiBeanUIModel; +import fr.ifremer.tutti.util.Weights; import org.nuiton.util.beans.Binder; import org.nuiton.util.beans.BinderFactory; -- 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 0af8ebc70c326105bc0978acd0e8ecdae5ccd3eb Author: Tony CHEMIT <chemit@codelutin.com> Date: Thu Mar 17 11:08:41 2016 +0100 Persister les mensurations si le poids ou la taille est présente --- .../catches/species/frequency/SpeciesFrequencyCellComponent.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/SpeciesFrequencyCellComponent.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyCellComponent.java index e0a2d51..a203b51 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyCellComponent.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyCellComponent.java @@ -274,7 +274,7 @@ public class SpeciesFrequencyCellComponent extends DefaultTableCellRenderer { List<SpeciesFrequencyRowModel> frequency = frequencyModel.getRows() .stream() - .filter(row -> row.isValid() && row.withNumber() && row.withWeight()) + .filter(row -> row.isValid() && (row.withNumber() || row.withWeight())) .collect(Collectors.toList()); if (log.isDebugEnabled()) { -- 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 a2d6dbaf249c853d0290160e0993600b40965755 Author: Tony CHEMIT <chemit@codelutin.com> Date: Thu Mar 17 11:09:02 2016 +0100 Forcer le mode de recopie à l'ouverture de l'écran --- .../operation/catches/species/frequency/SpeciesFrequencyUIHandler.java | 1 + 1 file changed, 1 insertion(+) 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 893cffb..afffb38 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 @@ -977,6 +977,7 @@ public class SpeciesFrequencyUIHandler extends AbstractTuttiTableUIHandler<Speci // let's change the copy mode (mark it in init mode to avoid user change confirmation and some recompuations) initCopyIndividualObservationMode = true; try { + model.setCopyIndividualObservationMode(null); model.setCopyIndividualObservationMode(copyIndividualObservationMode); } finally { initCopyIndividualObservationMode = false; -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
participants (1)
-
codelutin.com scm