branch feature/8074 created (now 463351f)
This is an automated email from the git hooks/post-receive script. New change to branch feature/8074 in repository tutti. See http://git.codelutin.com/tutti.git at 463351f force le mode rafale et l'ajout de la mensuration en obs indiv quand on passe en mode de recopie (fixes #8074) This branch includes the following new commits: new 463351f force le mode rafale et l'ajout de la mensuration en obs indiv quand on passe en mode de recopie (fixes #8074) The 1 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 463351f09d56500d0af7b63df907f1ae57318c03 Author: Kevin Morin <morin@codelutin.com> Date: Mon Mar 7 16:08:30 2016 +0100 force le mode rafale et l'ajout de la mensuration en obs indiv quand on passe en mode de recopie (fixes #8074) -- 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/8074 in repository tutti. See http://git.codelutin.com/tutti.git commit 463351f09d56500d0af7b63df907f1ae57318c03 Author: Kevin Morin <morin@codelutin.com> Date: Mon Mar 7 16:08:30 2016 +0100 force le mode rafale et l'ajout de la mensuration en obs indiv quand on passe en mode de recopie (fixes #8074) --- .../operation/catches/species/frequency/SpeciesFrequencyUI.jcss | 3 +++ .../catches/species/frequency/SpeciesFrequencyUIHandler.java | 4 +++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUI.jcss b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUI.jcss index 085026f..bdf350f 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUI.jcss +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUI.jcss @@ -96,6 +96,7 @@ ComputableDataEditor { value: "autoGenMode"; selected: {model.isAutoGenMode()}; buttonGroup: "frequenciesMode"; + enabled: {model.isCopyIndividualObservationNothing()}; _help: {"tutti.editSpeciesFrequencies.field.frequencyMode.autoGen.help"}; } @@ -106,6 +107,7 @@ ComputableDataEditor { value: "rafaleMode"; selected: {model.isRafaleMode()}; buttonGroup: "frequenciesMode"; + enabled: {model.isCopyIndividualObservationNothing()}; _help: {"tutti.editSpeciesFrequencies.field.mode.rafale.help"}; } @@ -175,6 +177,7 @@ ComputableDataEditor { #addIndividualObservationCheckBox { text: "tutti.editSpeciesFrequencies.field.addIndividualObservationOnRafale"; toolTipText: "tutti.editSpeciesFrequencies.field.addIndividualObservationOnRafale.tip"; + enabled: {model.isCopyIndividualObservationNothing()}; _help: {"tutti.editSpeciesFrequencies.field.addIndividualObservationOnRafale.help"}; } 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 dca0707..4303af4 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 @@ -538,6 +538,9 @@ public class SpeciesFrequencyUIHandler extends AbstractTuttiTableUIHandler<Speci CopyIndividualObservationMode newCopyMode = (CopyIndividualObservationMode) evt.getNewValue(); + ui.getRafaleModeButton().setSelected(true); + ui.getAddIndividualObservationCheckBox().setSelected(true); + model.getRows().clear(); model.getRowsInError().clear(); model.reloadRows(); @@ -546,7 +549,6 @@ public class SpeciesFrequencyUIHandler extends AbstractTuttiTableUIHandler<Speci if (newCopyMode != null && model.getIndividualObservationRowsInError().isEmpty()) { reloadRowsFromIndividualObservations(); - } getTableModel().fireTableDataChanged(); -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
participants (1)
-
codelutin.com scm