This is an automated email from the git hooks/post-receive script. New commit to branch feature/7278 in repository tutti. See http://git.codelutin.com/tutti.git commit 93f5ca10be30ff6f90bf9b0a5a10eb8c6dd4087c Author: Kevin Morin <morin@codelutin.com> Date: Tue Dec 22 12:04:25 2015 +0100 ajout du champs de poids de sous echantillon sur l'ecran de creation de lot d'especes (fixes #7278) --- .../filtered-resources/tutti-help-fr.properties | 3 ++- .../catches/benthos/BenthosBatchUIHandler.java | 1 - .../catches/species/SpeciesBatchUIHandler.java | 3 ++- .../species/create/CreateSpeciesBatchUI.css | 17 ++++++++++++++- .../species/create/CreateSpeciesBatchUI.jaxx | 11 ++++++++++ .../create/CreateSpeciesBatchUIHandler.java | 1 + .../species/create/CreateSpeciesBatchUIModel.java | 19 ++++++++++++++++ .../CreateSpeciesBatchUIModel-error-validation.xml | 25 ++++++++++++++++++++-- .../resources/i18n/tutti-ui-swing_en_GB.properties | 2 ++ .../resources/i18n/tutti-ui-swing_fr_FR.properties | 8 ++++--- 10 files changed, 81 insertions(+), 9 deletions(-) diff --git a/tutti-ui-swing/src/main/filtered-resources/tutti-help-fr.properties b/tutti-ui-swing/src/main/filtered-resources/tutti-help-fr.properties index eb8458e..157704f 100644 --- a/tutti-ui-swing/src/main/filtered-resources/tutti-help-fr.properties +++ b/tutti-ui-swing/src/main/filtered-resources/tutti-help-fr.properties @@ -1,5 +1,5 @@ #Generated by org.nuiton.jaxx.plugin.GenerateHelpIdsMojo -#Tue Dec 22 10:31:28 CET 2015 +#Tue Dec 22 11:50:30 CET 2015 tutti.config.help=config.html tutti.createAccidentalBatch.action.cancel.help=editFishingOperation.html\#captureCapturesAccidentellesActions tutti.createAccidentalBatch.action.saveAndClose.help=editFishingOperation.html\#captureCapturesAccidentellesActions @@ -48,6 +48,7 @@ tutti.createSpeciesBatch.action.cancel.help=editFishingOperation.html\#captureEs tutti.createSpeciesBatch.action.saveAndClose.help=editFishingOperation.html\#captureEspecesCreeLotActions tutti.createSpeciesBatch.action.saveAndContinue.help=editFishingOperation.html\#captureEspecesCreeLotActions tutti.createSpeciesBatch.field.batchCount.help=editFishingOperation.html\#captureEspecesCreeLotFields +tutti.createSpeciesBatch.field.batchSampleWeight.help= tutti.createSpeciesBatch.field.batchWeight.help=editFishingOperation.html\#captureEspecesCreeLotFields tutti.createSpeciesBatch.field.categoryField.help=editFishingOperation.html\#captureEspecesCreeLotFields tutti.createSpeciesBatch.field.sampleCategory.help=editFishingOperation.html\#captureEspecesCreeLotFields diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/BenthosBatchUIHandler.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/BenthosBatchUIHandler.java index 227650e..b51a779 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/BenthosBatchUIHandler.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/BenthosBatchUIHandler.java @@ -908,7 +908,6 @@ public class BenthosBatchUIHandler extends AbstractTuttiBatchTableUIHandler<Bent SampleCategory category = newRow.getFirstSampleCategory(); category.setCategoryValue(sampleCategory); category.setCategoryWeight(batchRootRowModel.getBatchSampleWeight()); - category.setCategoryWeight(batchRootRowModel.getBatchSampleWeight()); newRow.setSampleCategory(category); newRow.setWeight(batchRootRowModel.getBatchWeight()); diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/SpeciesBatchUIHandler.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/SpeciesBatchUIHandler.java index 43cb3f0..557156f 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/SpeciesBatchUIHandler.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/SpeciesBatchUIHandler.java @@ -912,8 +912,9 @@ public class SpeciesBatchUIHandler extends AbstractTuttiBatchTableUIHandler<Spec CaracteristicQualitativeValue sampleCategory = batchRootRowModel.getSampleCategory(); SampleCategory category = newRow.getFirstSampleCategory(); category.setCategoryValue(sampleCategory); - category.setCategoryWeight(batchRootRowModel.getBatchWeight()); + category.setCategoryWeight(batchRootRowModel.getBatchSampleWeight()); newRow.setSampleCategory(category); + newRow.setWeight(batchRootRowModel.getBatchWeight()); recomputeRowValidState(newRow); 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 0b609ce..8a1b9e2 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 @@ -51,7 +51,7 @@ NumberEditor { } #categoryPanel { - visible: {model.getSpecies() != null && model.getBatchCount() == null}; + visible: {model.getSpecies() != null && model.getBatchCount() == null && model.getBatchWeight() == null}; } #sampleCategoryLabel { @@ -67,6 +67,21 @@ NumberEditor { _help: {"tutti.createSpeciesBatch.field.sampleCategory.help"}; } +#batchSampleWeightLabel { + text: "tutti.createSpeciesBatch.field.batchSampleWeight"; + toolTipText: "tutti.createSpeciesBatch.field.batchSampleWeight.tip"; + labelFor: {batchSampleWeightField}; + _help: {"tutti.createSpeciesBatch.field.batchSampleWeight.help"}; + _addWeightUnit: {handler.getConfig().getSpeciesWeightUnit()}; +} + +#batchSampleWeightField { + property: batchSampleWeight; + numberValue: {model.getBatchSampleWeight()}; + numberType: {Float.class}; + _help: {"tutti.createSpeciesBatch.field.batchSampleWeight.help"}; +} + #batchWeightLabel { text: "tutti.createSpeciesBatch.field.batchWeight"; toolTipText: "tutti.createSpeciesBatch.field.batchWeight.tip"; 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 d523757..9418a7a 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 @@ -57,6 +57,7 @@ public CreateSpeciesBatchUI(EditCatchesUI parentUI) { uiClass='jaxx.runtime.validator.swing.ui.ImageValidationUI'> <field name='species' component='speciesComboBox'/> <field name='sampleCategory' component='sampleCategoryComboBox'/> + <field name='batchSampleWeight' component='batchSampleWeightField'/> <field name='batchWeight' component='batchWeightField'/> <field name='batchCount' component='batchCountField'/> <field name='selectedCategory' component='categoryComboBox'/> @@ -82,6 +83,16 @@ public CreateSpeciesBatchUI(EditCatchesUI parentUI) { </cell> </row> + <!-- Species batch sample weight --> + <row> + <cell anchor='west'> + <JLabel id='batchSampleWeightLabel'/> + </cell> + <cell weightx='1.0' columns='2'> + <NumberEditor id='batchSampleWeightField' constructorParams='this'/> + </cell> + </row> + <!-- Species batch weight --> <row> <cell anchor='west'> 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 bc5eb3d..97f4062 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 @@ -359,6 +359,7 @@ public class CreateSpeciesBatchUIHandler extends AbstractTuttiTableUIHandler<Spl model.setSpecies(null); model.setSampleCategory(null); + model.setBatchSampleWeight(null); model.setBatchWeight(null); model.setBatchCount(null); 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 ce2edc3..21f1852 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 @@ -55,6 +55,8 @@ public class CreateSpeciesBatchUIModel extends AbstractTuttiTableUIModel<CreateS public static final String PROPERTY_SAMPLE_CATEGORY = "sampleCategory"; + public static final String PROPERTY_BATCH_SAMPLE_WEIGHT = "batchSampleWeight"; + public static final String PROPERTY_BATCH_WEIGHT = "batchWeight"; public static final String PROPERTY_BATCH_COUNT = "batchCount"; @@ -89,6 +91,13 @@ public class CreateSpeciesBatchUIModel extends AbstractTuttiTableUIModel<CreateS /** * Batch weight. * + * @since 4.2 + */ + protected Float batchSampleWeight; + + /** + * Batch weight. + * * @since 0.3 */ protected Float batchWeight; @@ -181,6 +190,16 @@ public class CreateSpeciesBatchUIModel extends AbstractTuttiTableUIModel<CreateS firePropertyChange(PROPERTY_SAMPLE_CATEGORY, oldValue, sampleCategory); } + public Float getBatchSampleWeight() { + return batchSampleWeight; + } + + public void setBatchSampleWeight(Float batchSampleWeight) { + Object oldValue = getBatchSampleWeight(); + this.batchSampleWeight = batchSampleWeight; + firePropertyChange(PROPERTY_BATCH_SAMPLE_WEIGHT, oldValue, batchSampleWeight); + } + public Float getBatchWeight() { return batchWeight; } diff --git a/tutti-ui-swing/src/main/resources/fr/ifremer/tutti/ui/swing/content/operation/catches/species/create/CreateSpeciesBatchUIModel-error-validation.xml b/tutti-ui-swing/src/main/resources/fr/ifremer/tutti/ui/swing/content/operation/catches/species/create/CreateSpeciesBatchUIModel-error-validation.xml index 502f450..f06b742 100644 --- a/tutti-ui-swing/src/main/resources/fr/ifremer/tutti/ui/swing/content/operation/catches/species/create/CreateSpeciesBatchUIModel-error-validation.xml +++ b/tutti-ui-swing/src/main/resources/fr/ifremer/tutti/ui/swing/content/operation/catches/species/create/CreateSpeciesBatchUIModel-error-validation.xml @@ -57,6 +57,27 @@ </field-validator> </field> + <field name="batchSampleWeight"> + + <field-validator type="fieldexpression" short-circuit="true"> + <param name="expression"> + <![CDATA[ batchSampleWeight == null || batchSampleWeight > 0 ]]></param> + <message> + tutti.validator.error.createSpeciesBatch.batchSampleWeight.invalidValue + </message> + </field-validator> + + <field-validator type="fieldexpression" short-circuit="true"> + <param name="expression"> + <![CDATA[ batchCount != null || sampleWeight == null || batchSampleWeight == null || sampleWeight <= batchSampleWeight]]> + </param> + <message> + tutti.validator.error.splitSpeciesBatch.sampleWeight.sampleBatchGreaterThanBatchWeight + </message> + </field-validator> + + </field> + <field name="batchWeight"> <field-validator type="fieldexpression" short-circuit="true"> @@ -69,10 +90,10 @@ <field-validator type="fieldexpression" short-circuit="true"> <param name="expression"> - <![CDATA[ batchCount != null || sampleWeight == null || batchWeight == null || sampleWeight <= batchWeight]]> + <![CDATA[ batchWeight == null || batchWeight <= batchSampleWeight]]> </param> <message> - tutti.validator.error.splitSpeciesBatch.sampleWeight.sampleBatchGreaterThanBatchWeight + tutti.validator.error.createSpeciesBatch.weight.weightGreaterThanBatchSampleWeight </message> </field-validator> 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 65f4f7f..b169016 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 @@ -304,6 +304,8 @@ tutti.createSpeciesBatch.action.saveAndContinue.mnemonic= tutti.createSpeciesBatch.action.saveAndContinue.tip= tutti.createSpeciesBatch.field.batchCount= tutti.createSpeciesBatch.field.batchCount.tip= +tutti.createSpeciesBatch.field.batchSampleWeight= +tutti.createSpeciesBatch.field.batchSampleWeight.tip= tutti.createSpeciesBatch.field.batchWeight= tutti.createSpeciesBatch.field.batchWeight.tip= tutti.createSpeciesBatch.field.category= 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 76e3e5a..04ea6c2 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 @@ -206,7 +206,7 @@ tutti.createBenthosBatch.action.saveAndContinue.tip=Enregistrer la création du tutti.createBenthosBatch.field.batchCount=Nombre tutti.createBenthosBatch.field.batchCount.tip=Saisir le nombre d'individus dans le lot tutti.createBenthosBatch.field.batchSampleWeight=Poids du lot -tutti.createBenthosBatch.field.batchSampleWeight.tip=Poids du lot +tutti.createBenthosBatch.field.batchSampleWeight.tip=Poids du lot (non obligatoire à ce stade) tutti.createBenthosBatch.field.batchWeight=Poids de sous-échantillon tutti.createBenthosBatch.field.batchWeight.tip=Poids de sous-échantillon tutti.createBenthosBatch.field.category=Catégorie @@ -286,8 +286,10 @@ tutti.createSpeciesBatch.action.saveAndContinue.mnemonic=C tutti.createSpeciesBatch.action.saveAndContinue.tip=Enregistrer la création du lot espèce et en saisir un autre tutti.createSpeciesBatch.field.batchCount=Nombre tutti.createSpeciesBatch.field.batchCount.tip=Saisir le nombre d'individus dans le lot -tutti.createSpeciesBatch.field.batchWeight=Poids du lot -tutti.createSpeciesBatch.field.batchWeight.tip=Poids du lot (non obligatoire à ce stade) +tutti.createSpeciesBatch.field.batchSampleWeight=Poids du lot +tutti.createSpeciesBatch.field.batchSampleWeight.tip=Poids du lot (non obligatoire à ce stade) +tutti.createSpeciesBatch.field.batchWeight=Poids de sous-échantillon +tutti.createSpeciesBatch.field.batchWeight.tip=Poids de sous-échantillon tutti.createSpeciesBatch.field.category=Catégorie tutti.createSpeciesBatch.field.category.tip=Choisir le mode de catégorisation tutti.createSpeciesBatch.field.sampleCategory=V / HV -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.