This is an automated email from the git hooks/post-receive script. New commit to branch feature/7163 in repository tutti. See http://git.codelutin.com/tutti.git commit 765da3a59580dcb5818aab40a3fc14213dd5ee41 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 604319c..f976bcf 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>.