branch develop updated (1db67bd -> 84f234b)
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 1db67bd [jgitflow-maven-plugin]Updating develop poms back to pre merge state new a945277 especes : ajout du libellé sous la liste des especes + mise en gras du label Nombre ou du bouton Creer et mesurer en fonction de l'espece choisie (refs #7163) new 3ea70c6 benthos : ajout du libellé sous la liste des especes + mise en gras du label Nombre ou du bouton Creer et mesurer en fonction de l'espece choisie (fixes #7163) new 9661262 Mettre les constantes en premier dans un test d'égalité new 1d7865c Gestion des espèces qui ne viennent pas du protocole + correction de l'algorithme de choix du mode à afficher (See #7163) new 84f234b Fixes #7163 Testable #7163 Merge branch 'feature/7163' into develop The 5 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 84f234b7b585e36b2ddb3de7e0efc1e88733e3e1 Merge: 1db67bd 1d7865c Author: Tony CHEMIT <chemit@codelutin.com> Date: Thu Jan 7 09:36:56 2016 +0100 Fixes #7163 Testable #7163 Merge branch 'feature/7163' into develop commit 1d7865cb5b140d2ab8b1360ca7b88e9617d878ce Author: Tony CHEMIT <chemit@codelutin.com> Date: Thu Jan 7 09:36:39 2016 +0100 Gestion des espèces qui ne viennent pas du protocole + correction de l'algorithme de choix du mode à afficher (See #7163) commit 96612623ad2ea8472c871076039442614ab081f7 Author: Tony CHEMIT <chemit@codelutin.com> Date: Thu Jan 7 09:35:43 2016 +0100 Mettre les constantes en premier dans un test d'égalité commit 3ea70c6ef014bbfecea203c7ba716bdfecf9300a Author: Kevin Morin <morin@codelutin.com> Date: Tue Jan 5 16:53:45 2016 +0100 benthos : ajout du libellé sous la liste des especes + mise en gras du label Nombre ou du bouton Creer et mesurer en fonction de l'espece choisie (fixes #7163) commit a9452779e4b67169fcacd250ba1403d388a29354 Author: Kevin Morin <morin@codelutin.com> Date: Tue Jan 5 16:35:46 2016 +0100 especes : ajout du libellé sous la liste des especes + mise en gras du label Nombre ou du bouton Creer et mesurer en fonction de l'espece choisie (refs #7163) Summary of changes: tutti-ui-swing/pom.xml | 2 ++ .../fr/ifremer/tutti/ui/swing/content/Common.css | 4 +++ .../benthos/create/CreateBenthosBatchUI.css | 8 +++++ .../benthos/create/CreateBenthosBatchUI.jaxx | 11 +++++- .../create/CreateBenthosBatchUIHandler.java | 20 ++++++++++- .../benthos/create/CreateBenthosBatchUIModel.java | 41 ++++++++++++++++++++++ .../species/create/CreateSpeciesBatchUI.css | 8 +++++ .../species/create/CreateSpeciesBatchUI.jaxx | 11 +++++- .../create/CreateSpeciesBatchUIHandler.java | 18 ++++++++++ .../species/create/CreateSpeciesBatchUIModel.java | 41 ++++++++++++++++++++++ .../resources/i18n/tutti-ui-swing_en_GB.properties | 2 ++ .../resources/i18n/tutti-ui-swing_fr_FR.properties | 2 ++ 12 files changed, 165 insertions(+), 3 deletions(-) create mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/Common.css -- 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 a9452779e4b67169fcacd250ba1403d388a29354 Author: Kevin Morin <morin@codelutin.com> Date: Tue Jan 5 16:35:46 2016 +0100 especes : ajout du libellé sous la liste des especes + mise en gras du label Nombre ou du bouton Creer et mesurer en fonction de l'espece choisie (refs #7163) --- tutti-ui-swing/pom.xml | 2 ++ .../fr/ifremer/tutti/ui/swing/content/Common.css | 4 +++ .../species/create/CreateSpeciesBatchUI.css | 8 +++++ .../species/create/CreateSpeciesBatchUI.jaxx | 11 +++++- .../create/CreateSpeciesBatchUIHandler.java | 12 +++++++ .../species/create/CreateSpeciesBatchUIModel.java | 41 ++++++++++++++++++++++ .../resources/i18n/tutti-ui-swing_en_GB.properties | 2 ++ .../resources/i18n/tutti-ui-swing_fr_FR.properties | 2 ++ 8 files changed, 81 insertions(+), 1 deletion(-) diff --git a/tutti-ui-swing/pom.xml b/tutti-ui-swing/pom.xml index e26f64e..52ebaa3 100644 --- a/tutti-ui-swing/pom.xml +++ b/tutti-ui-swing/pom.xml @@ -49,6 +49,8 @@ <jaxx.autoImportCss>true</jaxx.autoImportCss> <jaxx.autoRecurseInCss>false</jaxx.autoRecurseInCss> <jaxx.addAutoHandlerUI>true</jaxx.addAutoHandlerUI> + <jaxx.commonCss>${project.basedir}/src/main/java/fr/ifremer/tutti/ui/swing/content/Common.css</jaxx.commonCss> + <!-- jaxx help configuration --> <jaxx.helpsetName>tutti</jaxx.helpsetName> diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/Common.css b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/Common.css new file mode 100644 index 0000000..b3d144c --- /dev/null +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/Common.css @@ -0,0 +1,4 @@ + +.buttonPanel { + height: 50; +} \ No newline at end of file diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/create/CreateSpeciesBatchUI.css b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/create/CreateSpeciesBatchUI.css index 18a7ebe..0c57521 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/create/CreateSpeciesBatchUI.css +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/create/CreateSpeciesBatchUI.css @@ -50,6 +50,12 @@ NumberEditor { _help: {"tutti.createSpeciesBatch.field.species.help"}; } +#speciesFrequencyMeasurementLabel { + visible: { model.getSpeciesProtocolFrequencyMode() != null }; + text: { model.getSpeciesProtocolFrequencyMode().toString() }; + font-weight: bold; +} + #categoryPanel { visible: {model.isCategorizationEnabled()}; } @@ -101,6 +107,7 @@ NumberEditor { text: "tutti.createSpeciesBatch.field.batchCount"; toolTipText: "tutti.createSpeciesBatch.field.batchCount.tip"; labelFor: {batchCountField}; + font-weight: { model.getSpeciesProtocolFrequencyMode() == CreateSpeciesBatchUIModel.SpeciesProtocolFrequencyMode.COUNT ? "bold" : "normal" }; _help: {"tutti.createSpeciesBatch.field.batchCount.help"}; } @@ -187,6 +194,7 @@ NumberEditor { toolTipText: "tutti.createSpeciesBatch.action.saveAndFrequencies.tip"; i18nMnemonic: "tutti.createSpeciesBatch.action.saveAndFrequencies.mnemonic"; enabled: {model.isValid()}; + font-weight: { model.getSpeciesProtocolFrequencyMode() == CreateSpeciesBatchUIModel.SpeciesProtocolFrequencyMode.MEASURE ? "bold" : "normal" }; _simpleAction: {fr.ifremer.tutti.ui.swing.content.operation.catches.species.create.actions.CreateSpeciesBatchAndFrequenciesAction.class}; _help: {"tutti.createSpeciesBatch.action.saveAndFrequencies.help"}; } diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/create/CreateSpeciesBatchUI.jaxx b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/create/CreateSpeciesBatchUI.jaxx index 2f9abee..7b3ace3 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/create/CreateSpeciesBatchUI.jaxx +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/create/CreateSpeciesBatchUI.jaxx @@ -83,6 +83,15 @@ public CreateSpeciesBatchUI(EditCatchesUI parentUI) { </cell> </row> + <row> + <cell anchor='west'> + <JLabel/> + </cell> + <cell weightx='1.0' columns='2'> + <JLabel id='speciesFrequencyMeasurementLabel' /> + </cell> + </row> + <!-- Sample Category --> <row> <cell anchor='west'> @@ -167,7 +176,7 @@ public CreateSpeciesBatchUI(EditCatchesUI parentUI) { </JPanel> <!-- Form Actions --> - <JPanel layout='{new GridLayout(1, 0)}' constraints='BorderLayout.SOUTH'> + <JPanel layout='{new GridLayout(1, 0)}' constraints='BorderLayout.SOUTH' styleClass="buttonPanel"> <JButton id='cancelButton'/> <JButton id='saveAndContinueButton'/> <JButton id='saveAndCloseButton'/> diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/create/CreateSpeciesBatchUIHandler.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/create/CreateSpeciesBatchUIHandler.java index 98f1dc6..08a18b1 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/create/CreateSpeciesBatchUIHandler.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/create/CreateSpeciesBatchUIHandler.java @@ -28,6 +28,8 @@ import com.google.common.collect.Multimap; import fr.ifremer.adagio.core.dao.referential.pmfm.QualitativeValueId; import fr.ifremer.tutti.persistence.entities.data.SampleCategoryModel; import fr.ifremer.tutti.persistence.entities.data.SampleCategoryModelEntry; +import fr.ifremer.tutti.persistence.entities.protocol.SpeciesProtocol; +import fr.ifremer.tutti.persistence.entities.protocol.TuttiProtocols; import fr.ifremer.tutti.persistence.entities.referential.Caracteristic; import fr.ifremer.tutti.persistence.entities.referential.CaracteristicQualitativeValue; import fr.ifremer.tutti.persistence.entities.referential.Species; @@ -110,6 +112,8 @@ public class CreateSpeciesBatchUIHandler extends AbstractTuttiTableUIHandler<Spl // reset V/HV category source.setSampleCategory(null); + getModel().setSpeciesProtocolFrequencyMode(null); + } else { // select the last used V/HV category used, or sorted if no batch has been created @@ -154,6 +158,14 @@ public class CreateSpeciesBatchUIHandler extends AbstractTuttiTableUIHandler<Spl // set new selected category source.setSelectedCategory(selectedCategory); + + SpeciesProtocol speciesProtocol = TuttiProtocols.getSpeciesProtocol(getDataContext().getProtocol(), + newValue.getReferenceTaxonId()); + String lengthStepPmfmId = speciesProtocol.getLengthStepPmfmId(); + + getModel().setSpeciesProtocolFrequencyMode(lengthStepPmfmId != null ? + CreateSpeciesBatchUIModel.SpeciesProtocolFrequencyMode.MEASURE : + CreateSpeciesBatchUIModel.SpeciesProtocolFrequencyMode.COUNT); } } }; diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/create/CreateSpeciesBatchUIModel.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/create/CreateSpeciesBatchUIModel.java index 24f2a66..04ccaae 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/create/CreateSpeciesBatchUIModel.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/create/CreateSpeciesBatchUIModel.java @@ -36,6 +36,9 @@ import org.apache.commons.logging.LogFactory; import java.util.List; +import static org.nuiton.i18n.I18n.n; +import static org.nuiton.i18n.I18n.t; + /** * Model of {@link CreateSpeciesBatchUI}. * @@ -71,6 +74,27 @@ public class CreateSpeciesBatchUIModel extends AbstractTuttiTableUIModel<CreateS public static final String PROPERTY_SAMPLE_WEIGHT = "sampleWeight"; + public static final String PROPERTY_SPECIES_PROTOCOL_FREQUENCY_MODE = "speciesProtocolFrequencyMode"; + + /** + * Frequency mode according to the selected species and the protocol + */ + public enum SpeciesProtocolFrequencyMode { + MEASURE(n("tutti.createSpeciesBatch.species.toMeasure")), + COUNT(n("tutti.createSpeciesBatch.species.toCount")); + + private String label; + + SpeciesProtocolFrequencyMode(String label) { + this.label = label; + } + + @Override + public String toString() { + return t(label); + } + } + /** * All available species (sets by protocol). * @@ -155,6 +179,13 @@ public class CreateSpeciesBatchUIModel extends AbstractTuttiTableUIModel<CreateS */ protected final Multimap<CaracteristicQualitativeValue, Species> speciesUsed = ArrayListMultimap.create(); + /** + * Frequency measurement mode according to the species + * + * @since 4.3 + */ + protected SpeciesProtocolFrequencyMode speciesProtocolFrequencyMode; + public CreateSpeciesBatchUIModel(SampleCategoryModel sampleCategoryModel) { super(CreateSpeciesBatchUIModel.class, null, null); this.sampleCategoryModel = sampleCategoryModel; @@ -312,6 +343,16 @@ public class CreateSpeciesBatchUIModel extends AbstractTuttiTableUIModel<CreateS return result; } + public SpeciesProtocolFrequencyMode getSpeciesProtocolFrequencyMode() { + return speciesProtocolFrequencyMode; + } + + public void setSpeciesProtocolFrequencyMode(SpeciesProtocolFrequencyMode speciesProtocolFrequencyMode) { + Object oldValue = getSpeciesProtocolFrequencyMode(); + this.speciesProtocolFrequencyMode = speciesProtocolFrequencyMode; + firePropertyChange(PROPERTY_SPECIES_PROTOCOL_FREQUENCY_MODE, oldValue, speciesProtocolFrequencyMode); + } + @Override protected CreateSpeciesBatchUIModel newEntity() { return new CreateSpeciesBatchUIModel(sampleCategoryModel); diff --git a/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_en_GB.properties b/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_en_GB.properties index 4ab1654..c1572ab 100644 --- a/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_en_GB.properties +++ b/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_en_GB.properties @@ -326,6 +326,8 @@ tutti.createSpeciesBatch.field.sampleWeight= tutti.createSpeciesBatch.field.sampleWeight.tip= tutti.createSpeciesBatch.field.species= tutti.createSpeciesBatch.field.species.tip= +tutti.createSpeciesBatch.species.toCount= +tutti.createSpeciesBatch.species.toMeasure= tutti.createSpeciesBatch.title= tutti.createSpeciesMelag.action.cancel= tutti.createSpeciesMelag.action.cancel.mnemonic= diff --git a/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properties b/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properties index 8f2b1da..6844f20 100644 --- a/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properties +++ b/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properties @@ -304,6 +304,8 @@ tutti.createSpeciesBatch.field.sampleWeight=Poids total catégorisé tutti.createSpeciesBatch.field.sampleWeight.tip=Somme des poids saisis ci-dessous tutti.createSpeciesBatch.field.species=Espèce du lot tutti.createSpeciesBatch.field.species.tip=Code campagne ou Code Rubin – Nom scientifique du lot à créer +tutti.createSpeciesBatch.species.toCount=À DÉNOMBRER +tutti.createSpeciesBatch.species.toMeasure=À MESURER tutti.createSpeciesBatch.title=Créer un lot tutti.createSpeciesMelag.action.cancel=Annuler tutti.createSpeciesMelag.action.cancel.mnemonic=A -- 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 3ea70c6ef014bbfecea203c7ba716bdfecf9300a Author: Kevin Morin <morin@codelutin.com> Date: Tue Jan 5 16:53:45 2016 +0100 benthos : ajout du libellé sous la liste des especes + mise en gras du label Nombre ou du bouton Creer et mesurer en fonction de l'espece choisie (fixes #7163) --- .../benthos/create/CreateBenthosBatchUI.css | 8 +++++ .../benthos/create/CreateBenthosBatchUI.jaxx | 11 +++++- .../create/CreateBenthosBatchUIHandler.java | 15 +++++++- .../benthos/create/CreateBenthosBatchUIModel.java | 41 ++++++++++++++++++++++ .../create/CreateSpeciesBatchUIHandler.java | 5 +-- 5 files changed, 76 insertions(+), 4 deletions(-) diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/create/CreateBenthosBatchUI.css b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/create/CreateBenthosBatchUI.css index b1154e1..edb712c 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/create/CreateBenthosBatchUI.css +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/create/CreateBenthosBatchUI.css @@ -50,6 +50,12 @@ NumberEditor { _help: {"tutti.createBenthosBatch.field.species.help"}; } +#speciesFrequencyMeasurementLabel { + visible: { model.getSpeciesProtocolFrequencyMode() != null }; + text: { model.getSpeciesProtocolFrequencyMode().toString() }; + font-weight: bold; +} + #categoryPanel { visible: {model.isCategorizationEnabled()}; } @@ -101,6 +107,7 @@ NumberEditor { text: "tutti.createBenthosBatch.field.batchCount"; toolTipText: "tutti.createBenthosBatch.field.batchCount.tip"; labelFor: {batchCountField}; + font-weight: { model.getSpeciesProtocolFrequencyMode() == CreateBenthosBatchUIModel.SpeciesProtocolFrequencyMode.COUNT ? "bold" : "normal" }; _help: {"tutti.createBenthosBatch.field.batchCount.help"}; } @@ -187,6 +194,7 @@ NumberEditor { toolTipText: "tutti.createBenthosBatch.action.saveAndFrequencies.tip"; i18nMnemonic: "tutti.createBenthosBatch.action.saveAndFrequencies.mnemonic"; enabled: {model.isValid()}; + font-weight: { model.getSpeciesProtocolFrequencyMode() == CreateBenthosBatchUIModel.SpeciesProtocolFrequencyMode.MEASURE ? "bold" : "normal" }; _simpleAction: {fr.ifremer.tutti.ui.swing.content.operation.catches.benthos.create.actions.CreateBenthosBatchAndFrequenciesAction.class}; _help: {"tutti.createBenthosBatch.action.saveAndFrequencies.help"}; } diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/create/CreateBenthosBatchUI.jaxx b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/create/CreateBenthosBatchUI.jaxx index 80d84a0..32fe0ed 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/create/CreateBenthosBatchUI.jaxx +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/create/CreateBenthosBatchUI.jaxx @@ -83,6 +83,15 @@ public CreateBenthosBatchUI(EditCatchesUI parentUI) { </cell> </row> + <row> + <cell anchor='west'> + <JLabel/> + </cell> + <cell weightx='1.0' columns='2'> + <JLabel id='speciesFrequencyMeasurementLabel' /> + </cell> + </row> + <!-- Sorted / Unsorted Category --> <row> <cell anchor='west'> @@ -167,7 +176,7 @@ public CreateBenthosBatchUI(EditCatchesUI parentUI) { </JPanel> <!-- Form Actions --> - <JPanel layout='{new GridLayout(1, 0)}' constraints='BorderLayout.SOUTH'> + <JPanel layout='{new GridLayout(1, 0)}' constraints='BorderLayout.SOUTH' styleClass="buttonPanel"> <JButton id='cancelButton'/> <JButton id='saveAndContinueButton'/> <JButton id='saveAndCloseButton'/> diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/create/CreateBenthosBatchUIHandler.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/create/CreateBenthosBatchUIHandler.java index 5088f22..a6f6e31 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/create/CreateBenthosBatchUIHandler.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/create/CreateBenthosBatchUIHandler.java @@ -28,6 +28,8 @@ import com.google.common.collect.Multimap; import fr.ifremer.adagio.core.dao.referential.pmfm.QualitativeValueId; import fr.ifremer.tutti.persistence.entities.data.SampleCategoryModel; import fr.ifremer.tutti.persistence.entities.data.SampleCategoryModelEntry; +import fr.ifremer.tutti.persistence.entities.protocol.SpeciesProtocol; +import fr.ifremer.tutti.persistence.entities.protocol.TuttiProtocols; import fr.ifremer.tutti.persistence.entities.referential.Caracteristic; import fr.ifremer.tutti.persistence.entities.referential.CaracteristicQualitativeValue; import fr.ifremer.tutti.persistence.entities.referential.Species; @@ -47,7 +49,7 @@ import org.apache.commons.logging.LogFactory; import org.jdesktop.swingx.JXTable; import org.jdesktop.swingx.table.DefaultTableColumnModelExt; -import javax.swing.*; +import javax.swing.JComponent; import java.beans.PropertyChangeEvent; import java.beans.PropertyChangeListener; import java.util.List; @@ -110,6 +112,8 @@ public class CreateBenthosBatchUIHandler extends AbstractTuttiTableUIHandler<Spl // reset V/HV category source.setSampleCategory(null); + source.setSpeciesProtocolFrequencyMode(null); + } else { // select the last used V/HV category used, or sorted if no batch has been created @@ -155,6 +159,15 @@ public class CreateBenthosBatchUIHandler extends AbstractTuttiTableUIHandler<Spl // set new selected category source.setSelectedCategory(selectedCategory); + + // get species protocol to check the measurement method + SpeciesProtocol speciesProtocol = TuttiProtocols.getBenthosProtocol(getDataContext().getProtocol(), + newValue.getReferenceTaxonId()); + String lengthStepPmfmId = speciesProtocol.getLengthStepPmfmId(); + + source.setSpeciesProtocolFrequencyMode(lengthStepPmfmId != null ? + CreateBenthosBatchUIModel.SpeciesProtocolFrequencyMode.MEASURE : + CreateBenthosBatchUIModel.SpeciesProtocolFrequencyMode.COUNT); } } }; diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/create/CreateBenthosBatchUIModel.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/create/CreateBenthosBatchUIModel.java index 646208f..86ec923 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/create/CreateBenthosBatchUIModel.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/create/CreateBenthosBatchUIModel.java @@ -36,6 +36,9 @@ import org.apache.commons.logging.LogFactory; import java.util.List; +import static org.nuiton.i18n.I18n.n; +import static org.nuiton.i18n.I18n.t; + /** * Model of {@link CreateBenthosBatchUI}. * @@ -70,6 +73,27 @@ public class CreateBenthosBatchUIModel extends AbstractTuttiTableUIModel<CreateB public static final String PROPERTY_SAMPLE_WEIGHT = "sampleWeight"; + public static final String PROPERTY_SPECIES_PROTOCOL_FREQUENCY_MODE = "speciesProtocolFrequencyMode"; + + /** + * Frequency mode according to the selected species and the protocol + */ + public enum SpeciesProtocolFrequencyMode { + MEASURE(n("tutti.createSpeciesBatch.species.toMeasure")), + COUNT(n("tutti.createSpeciesBatch.species.toCount")); + + private String label; + + SpeciesProtocolFrequencyMode(String label) { + this.label = label; + } + + @Override + public String toString() { + return t(label); + } + } + /** * All available species (sets by protocol). * @@ -155,6 +179,13 @@ public class CreateBenthosBatchUIModel extends AbstractTuttiTableUIModel<CreateB */ protected final Multimap<CaracteristicQualitativeValue, Species> speciesUsed = ArrayListMultimap.create(); + /** + * Frequency measurement mode according to the species + * + * @since 4.3 + */ + protected SpeciesProtocolFrequencyMode speciesProtocolFrequencyMode; + public CreateBenthosBatchUIModel(SampleCategoryModel sampleCategoryModel) { super(CreateBenthosBatchUIModel.class, null, null); this.sampleCategoryModel = sampleCategoryModel; @@ -312,6 +343,16 @@ public class CreateBenthosBatchUIModel extends AbstractTuttiTableUIModel<CreateB return result; } + public SpeciesProtocolFrequencyMode getSpeciesProtocolFrequencyMode() { + return speciesProtocolFrequencyMode; + } + + public void setSpeciesProtocolFrequencyMode(SpeciesProtocolFrequencyMode speciesProtocolFrequencyMode) { + Object oldValue = getSpeciesProtocolFrequencyMode(); + this.speciesProtocolFrequencyMode = speciesProtocolFrequencyMode; + firePropertyChange(PROPERTY_SPECIES_PROTOCOL_FREQUENCY_MODE, oldValue, speciesProtocolFrequencyMode); + } + @Override protected CreateBenthosBatchUIModel newEntity() { return new CreateBenthosBatchUIModel(sampleCategoryModel); diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/create/CreateSpeciesBatchUIHandler.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/create/CreateSpeciesBatchUIHandler.java index 08a18b1..74ebcc4 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/create/CreateSpeciesBatchUIHandler.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/create/CreateSpeciesBatchUIHandler.java @@ -112,7 +112,7 @@ public class CreateSpeciesBatchUIHandler extends AbstractTuttiTableUIHandler<Spl // reset V/HV category source.setSampleCategory(null); - getModel().setSpeciesProtocolFrequencyMode(null); + source.setSpeciesProtocolFrequencyMode(null); } else { @@ -159,11 +159,12 @@ public class CreateSpeciesBatchUIHandler extends AbstractTuttiTableUIHandler<Spl // set new selected category source.setSelectedCategory(selectedCategory); + // get species protocol to check the measurement method SpeciesProtocol speciesProtocol = TuttiProtocols.getSpeciesProtocol(getDataContext().getProtocol(), newValue.getReferenceTaxonId()); String lengthStepPmfmId = speciesProtocol.getLengthStepPmfmId(); - getModel().setSpeciesProtocolFrequencyMode(lengthStepPmfmId != null ? + source.setSpeciesProtocolFrequencyMode(lengthStepPmfmId != null ? CreateSpeciesBatchUIModel.SpeciesProtocolFrequencyMode.MEASURE : CreateSpeciesBatchUIModel.SpeciesProtocolFrequencyMode.COUNT); } -- 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 96612623ad2ea8472c871076039442614ab081f7 Author: Tony CHEMIT <chemit@codelutin.com> Date: Thu Jan 7 09:35:43 2016 +0100 Mettre les constantes en premier dans un test d'égalité --- .../content/operation/catches/benthos/create/CreateBenthosBatchUI.css | 4 ++-- .../content/operation/catches/species/create/CreateSpeciesBatchUI.css | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/create/CreateBenthosBatchUI.css b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/create/CreateBenthosBatchUI.css index edb712c..d13bdda 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/create/CreateBenthosBatchUI.css +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/create/CreateBenthosBatchUI.css @@ -107,7 +107,7 @@ NumberEditor { text: "tutti.createBenthosBatch.field.batchCount"; toolTipText: "tutti.createBenthosBatch.field.batchCount.tip"; labelFor: {batchCountField}; - font-weight: { model.getSpeciesProtocolFrequencyMode() == CreateBenthosBatchUIModel.SpeciesProtocolFrequencyMode.COUNT ? "bold" : "normal" }; + font-weight: { CreateBenthosBatchUIModel.SpeciesProtocolFrequencyMode.COUNT == model.getSpeciesProtocolFrequencyMode() ? "bold" : "normal" }; _help: {"tutti.createBenthosBatch.field.batchCount.help"}; } @@ -194,7 +194,7 @@ NumberEditor { toolTipText: "tutti.createBenthosBatch.action.saveAndFrequencies.tip"; i18nMnemonic: "tutti.createBenthosBatch.action.saveAndFrequencies.mnemonic"; enabled: {model.isValid()}; - font-weight: { model.getSpeciesProtocolFrequencyMode() == CreateBenthosBatchUIModel.SpeciesProtocolFrequencyMode.MEASURE ? "bold" : "normal" }; + font-weight: { CreateBenthosBatchUIModel.SpeciesProtocolFrequencyMode.MEASURE == model.getSpeciesProtocolFrequencyMode() ? "bold" : "normal" }; _simpleAction: {fr.ifremer.tutti.ui.swing.content.operation.catches.benthos.create.actions.CreateBenthosBatchAndFrequenciesAction.class}; _help: {"tutti.createBenthosBatch.action.saveAndFrequencies.help"}; } diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/create/CreateSpeciesBatchUI.css b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/create/CreateSpeciesBatchUI.css index 0c57521..71b69cb 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/create/CreateSpeciesBatchUI.css +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/create/CreateSpeciesBatchUI.css @@ -107,7 +107,7 @@ NumberEditor { text: "tutti.createSpeciesBatch.field.batchCount"; toolTipText: "tutti.createSpeciesBatch.field.batchCount.tip"; labelFor: {batchCountField}; - font-weight: { model.getSpeciesProtocolFrequencyMode() == CreateSpeciesBatchUIModel.SpeciesProtocolFrequencyMode.COUNT ? "bold" : "normal" }; + font-weight: { CreateSpeciesBatchUIModel.SpeciesProtocolFrequencyMode.COUNT == model.getSpeciesProtocolFrequencyMode() ? "bold" : "normal" }; _help: {"tutti.createSpeciesBatch.field.batchCount.help"}; } @@ -194,7 +194,7 @@ NumberEditor { toolTipText: "tutti.createSpeciesBatch.action.saveAndFrequencies.tip"; i18nMnemonic: "tutti.createSpeciesBatch.action.saveAndFrequencies.mnemonic"; enabled: {model.isValid()}; - font-weight: { model.getSpeciesProtocolFrequencyMode() == CreateSpeciesBatchUIModel.SpeciesProtocolFrequencyMode.MEASURE ? "bold" : "normal" }; + font-weight: { CreateSpeciesBatchUIModel.SpeciesProtocolFrequencyMode.MEASURE == model.getSpeciesProtocolFrequencyMode() ? "bold" : "normal" }; _simpleAction: {fr.ifremer.tutti.ui.swing.content.operation.catches.species.create.actions.CreateSpeciesBatchAndFrequenciesAction.class}; _help: {"tutti.createSpeciesBatch.action.saveAndFrequencies.help"}; } -- 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 1d7865cb5b140d2ab8b1360ca7b88e9617d878ce Author: Tony CHEMIT <chemit@codelutin.com> Date: Thu Jan 7 09:36:39 2016 +0100 Gestion des espèces qui ne viennent pas du protocole + correction de l'algorithme de choix du mode à afficher (See #7163) --- .../catches/benthos/create/CreateBenthosBatchUIHandler.java | 13 +++++++++---- .../catches/species/create/CreateSpeciesBatchUIHandler.java | 13 +++++++++---- 2 files changed, 18 insertions(+), 8 deletions(-) diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/create/CreateBenthosBatchUIHandler.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/create/CreateBenthosBatchUIHandler.java index a6f6e31..e99dd58 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/create/CreateBenthosBatchUIHandler.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/create/CreateBenthosBatchUIHandler.java @@ -163,11 +163,16 @@ public class CreateBenthosBatchUIHandler extends AbstractTuttiTableUIHandler<Spl // get species protocol to check the measurement method SpeciesProtocol speciesProtocol = TuttiProtocols.getBenthosProtocol(getDataContext().getProtocol(), newValue.getReferenceTaxonId()); - String lengthStepPmfmId = speciesProtocol.getLengthStepPmfmId(); - source.setSpeciesProtocolFrequencyMode(lengthStepPmfmId != null ? - CreateBenthosBatchUIModel.SpeciesProtocolFrequencyMode.MEASURE : - CreateBenthosBatchUIModel.SpeciesProtocolFrequencyMode.COUNT); + CreateBenthosBatchUIModel.SpeciesProtocolFrequencyMode frequencyMode = null; + if (speciesProtocol != null) { + if (speciesProtocol.getLengthStepPmfmId() != null) { + frequencyMode = CreateBenthosBatchUIModel.SpeciesProtocolFrequencyMode.MEASURE; + } else if (speciesProtocol.isCountIfNoFrequencyEnabled()) { + frequencyMode = CreateBenthosBatchUIModel.SpeciesProtocolFrequencyMode.COUNT; + } + } + source.setSpeciesProtocolFrequencyMode(frequencyMode); } } }; diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/create/CreateSpeciesBatchUIHandler.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/create/CreateSpeciesBatchUIHandler.java index 74ebcc4..7058de7 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/create/CreateSpeciesBatchUIHandler.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/create/CreateSpeciesBatchUIHandler.java @@ -162,11 +162,16 @@ public class CreateSpeciesBatchUIHandler extends AbstractTuttiTableUIHandler<Spl // get species protocol to check the measurement method SpeciesProtocol speciesProtocol = TuttiProtocols.getSpeciesProtocol(getDataContext().getProtocol(), newValue.getReferenceTaxonId()); - String lengthStepPmfmId = speciesProtocol.getLengthStepPmfmId(); - source.setSpeciesProtocolFrequencyMode(lengthStepPmfmId != null ? - CreateSpeciesBatchUIModel.SpeciesProtocolFrequencyMode.MEASURE : - CreateSpeciesBatchUIModel.SpeciesProtocolFrequencyMode.COUNT); + CreateSpeciesBatchUIModel.SpeciesProtocolFrequencyMode frequencyMode = null; + if (speciesProtocol != null) { + if (speciesProtocol.getLengthStepPmfmId() != null) { + frequencyMode = CreateSpeciesBatchUIModel.SpeciesProtocolFrequencyMode.MEASURE; + } else if (speciesProtocol.isCountIfNoFrequencyEnabled()) { + frequencyMode = CreateSpeciesBatchUIModel.SpeciesProtocolFrequencyMode.COUNT; + } + } + source.setSpeciesProtocolFrequencyMode(frequencyMode); } } }; -- 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 84f234b7b585e36b2ddb3de7e0efc1e88733e3e1 Merge: 1db67bd 1d7865c Author: Tony CHEMIT <chemit@codelutin.com> Date: Thu Jan 7 09:36:56 2016 +0100 Fixes #7163 Testable #7163 Merge branch 'feature/7163' into develop tutti-ui-swing/pom.xml | 2 ++ .../fr/ifremer/tutti/ui/swing/content/Common.css | 4 +++ .../benthos/create/CreateBenthosBatchUI.css | 8 +++++ .../benthos/create/CreateBenthosBatchUI.jaxx | 11 +++++- .../create/CreateBenthosBatchUIHandler.java | 20 ++++++++++- .../benthos/create/CreateBenthosBatchUIModel.java | 41 ++++++++++++++++++++++ .../species/create/CreateSpeciesBatchUI.css | 8 +++++ .../species/create/CreateSpeciesBatchUI.jaxx | 11 +++++- .../create/CreateSpeciesBatchUIHandler.java | 18 ++++++++++ .../species/create/CreateSpeciesBatchUIModel.java | 41 ++++++++++++++++++++++ .../resources/i18n/tutti-ui-swing_en_GB.properties | 2 ++ .../resources/i18n/tutti-ui-swing_fr_FR.properties | 2 ++ 12 files changed, 165 insertions(+), 3 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
participants (1)
-
codelutin.com scm