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 eb6d09a6f68be73fdf544c45acc4eb2bb09e2beb Author: Kevin Morin <morin@codelutin.com> Date: Tue Dec 22 11:40:51 2015 +0100 ajout du champs de poids de sous echantillon sur l'ecran de creation de lot du benthos (refs #7278) --- .../filtered-resources/tutti-help-fr.properties | 3 ++- .../catches/benthos/BenthosBatchUIHandler.java | 5 +++- .../benthos/create/CreateBenthosBatchUI.css | 17 ++++++++++++- .../benthos/create/CreateBenthosBatchUI.jaxx | 11 +++++++++ .../create/CreateBenthosBatchUIHandler.java | 1 + .../benthos/create/CreateBenthosBatchUIModel.java | 19 +++++++++++++++ .../CreateBenthosBatchUIModel-error-validation.xml | 28 ++++++++++++++++++---- .../resources/i18n/tutti-ui-swing_en_GB.properties | 8 +++++++ .../resources/i18n/tutti-ui-swing_fr_FR.properties | 10 +++++--- 9 files changed, 92 insertions(+), 10 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 4e0c7a3..eb8458e 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 -#Mon Dec 21 17:19:49 CET 2015 +#Tue Dec 22 10:31:28 CET 2015 tutti.config.help=config.html tutti.createAccidentalBatch.action.cancel.help=editFishingOperation.html\#captureCapturesAccidentellesActions tutti.createAccidentalBatch.action.saveAndClose.help=editFishingOperation.html\#captureCapturesAccidentellesActions @@ -16,6 +16,7 @@ tutti.createBenthosBatch.action.cancel.help=editFishingOperation.html\#captureBe tutti.createBenthosBatch.action.saveAndClose.help=editFishingOperation.html\#captureBenthosActions tutti.createBenthosBatch.action.saveAndContinue.help=editFishingOperation.html\#captureBenthosActions tutti.createBenthosBatch.field.batchCount.help=editFishingOperation.html\#captureBenthosFields +tutti.createBenthosBatch.field.batchSampleWeight.help= tutti.createBenthosBatch.field.batchWeight.help=editFishingOperation.html\#captureBenthosFields tutti.createBenthosBatch.field.categoryField.help=editFishingOperation.html\#captureBenthosFields tutti.createBenthosBatch.field.sampleCategory.help=editFishingOperation.html\#captureBenthosFields 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 2b20bb8..227650e 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 @@ -907,9 +907,12 @@ public class BenthosBatchUIHandler extends AbstractTuttiBatchTableUIHandler<Bent CaracteristicQualitativeValue sampleCategory = batchRootRowModel.getSampleCategory(); SampleCategory category = newRow.getFirstSampleCategory(); category.setCategoryValue(sampleCategory); - category.setCategoryWeight(batchRootRowModel.getBatchWeight()); + category.setCategoryWeight(batchRootRowModel.getBatchSampleWeight()); + category.setCategoryWeight(batchRootRowModel.getBatchSampleWeight()); newRow.setSampleCategory(category); + newRow.setWeight(batchRootRowModel.getBatchWeight()); + recomputeRowValidState(newRow); saveRow(newRow); 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 97d6683..5ea6fa9 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 @@ -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.createBenthosBatch.field.sampleCategory.help"}; } +#batchSampleWeightLabel { + text: "tutti.createBenthosBatch.field.batchSampleWeight"; + toolTipText: "tutti.createBenthosBatch.field.batchSampleWeight.tip"; + labelFor: {batchSampleWeightField}; + _help: {"tutti.createBenthosBatch.field.batchSampleWeight.help"}; + _addWeightUnit: {handler.getConfig().getBenthosWeightUnit()}; +} + +#batchSampleWeightField { + property: batchSampleWeight; + numberValue: {model.getBatchSampleWeight()}; + numberType: {Float.class}; + _help: {"tutti.createBenthosBatch.field.batchSampleWeight.help"}; +} + #batchWeightLabel { text: "tutti.createBenthosBatch.field.batchWeight"; toolTipText: "tutti.createBenthosBatch.field.batchWeight.tip"; 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 9ff2abf..2e91c68 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 @@ -57,6 +57,7 @@ public CreateBenthosBatchUI(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 CreateBenthosBatchUI(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/benthos/create/CreateBenthosBatchUIHandler.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/create/CreateBenthosBatchUIHandler.java index 8a7c914..4f18161 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 @@ -360,6 +360,7 @@ public class CreateBenthosBatchUIHandler 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/benthos/create/CreateBenthosBatchUIModel.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/create/CreateBenthosBatchUIModel.java index ccc4a7d..48194d5 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 @@ -54,6 +54,8 @@ public class CreateBenthosBatchUIModel extends AbstractTuttiTableUIModel<CreateB 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"; @@ -88,6 +90,13 @@ public class CreateBenthosBatchUIModel extends AbstractTuttiTableUIModel<CreateB /** * Batch weight. * + * @since 4.2 + */ + protected Float batchSampleWeight; + + /** + * Batch weight. + * * @since 0.3 */ protected Float batchWeight; @@ -180,6 +189,16 @@ public class CreateBenthosBatchUIModel extends AbstractTuttiTableUIModel<CreateB 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/benthos/create/CreateBenthosBatchUIModel-error-validation.xml b/tutti-ui-swing/src/main/resources/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/create/CreateBenthosBatchUIModel-error-validation.xml index f84813c..f06b742 100644 --- a/tutti-ui-swing/src/main/resources/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/create/CreateBenthosBatchUIModel-error-validation.xml +++ b/tutti-ui-swing/src/main/resources/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/create/CreateBenthosBatchUIModel-error-validation.xml @@ -57,23 +57,43 @@ </field-validator> </field> - <field name="batchWeight"> + <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[ batchWeight == null || batchWeight > 0 ]]> + <![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"> + <param name="expression"> + <![CDATA[ batchWeight == null || batchWeight > 0 ]]></param> + <message> tutti.validator.error.createSpeciesBatch.batchWeight.invalidValue </message> </field-validator> <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 5cc27a9..65f4f7f 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 @@ -223,6 +223,8 @@ tutti.createBenthosBatch.action.saveAndContinue.mnemonic= tutti.createBenthosBatch.action.saveAndContinue.tip= tutti.createBenthosBatch.field.batchCount= tutti.createBenthosBatch.field.batchCount.tip= +tutti.createBenthosBatch.field.batchSampleWeight= +tutti.createBenthosBatch.field.batchSampleWeight.tip= tutti.createBenthosBatch.field.batchWeight= tutti.createBenthosBatch.field.batchWeight.tip= tutti.createBenthosBatch.field.category= @@ -2153,6 +2155,7 @@ tutti.validator.error.benthosFrequency.lengthStepCaracteristic.required= tutti.validator.error.benthosFrequency.oneRowRequired= tutti.validator.error.benthosFrequency.step.positiveValue= tutti.validator.error.createAccidentalBatch.species.required= +tutti.validator.error.createBenthosBatch.batchWeight.noBatchSampleWeight= tutti.validator.error.createIndividualObservationBatch.lengthStepCaracteristic.required= tutti.validator.error.createIndividualObservationBatch.size.required= tutti.validator.error.createIndividualObservationBatch.species.required= @@ -2162,10 +2165,13 @@ tutti.validator.error.createMarineLitterBatch.marineLitterCategory.required= tutti.validator.error.createMarineLitterBatch.marineLitterSizeCategory.required= tutti.validator.error.createMarineLitterBatch.number.invalidValue= tutti.validator.error.createMarineLitterBatch.number.required= +tutti.validator.error.createSpeciesBatch.batchSampleWeight.invalidValue= tutti.validator.error.createSpeciesBatch.batchWeight.invalidValue= +tutti.validator.error.createSpeciesBatch.batchWeight.noBatchSampleWeight= tutti.validator.error.createSpeciesBatch.sortedUnsortedCategory.required= tutti.validator.error.createSpeciesBatch.species.required= tutti.validator.error.createSpeciesBatch.speciesAndCategory.notAvailable= +tutti.validator.error.createSpeciesBatch.weight.weightGreaterThanBatchSampleWeight= tutti.validator.error.cruise.name.format= tutti.validator.error.latitude.decimal.outOfBounds= tutti.validator.error.latitude.degree.outOfBounds= @@ -2192,7 +2198,9 @@ tutti.validator.error.speciesFrequency.oneRowRequired= tutti.validator.error.speciesFrequency.step.positiveValue= tutti.validator.error.splitSpeciesBatch.sampleWeight.invalidValue= tutti.validator.error.splitSpeciesBatch.sampleWeight.sampleBatchGreaterThanBatchWeight= +tutti.validator.error.splitSpeciesBatch.sampleWeight.sampleWeightGreaterThanBatchSampleWeight= tutti.validator.error.splitSpeciesBatch.selectedCategory.required= +tutti.validator.error.splitSpeciesBatch.weight.weightGreaterThanBatchSampleWeight= tutti.validator.info.cruise.noError= tutti.validator.info.operation.noError= tutti.validator.warning.benthosFrequency.redundantTotalWeight= 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 419b881..76e3e5a 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 @@ -205,8 +205,10 @@ tutti.createBenthosBatch.action.saveAndContinue.mnemonic=C tutti.createBenthosBatch.action.saveAndContinue.tip=Enregistrer la création du lot espèce et en saisir un autre tutti.createBenthosBatch.field.batchCount=Nombre tutti.createBenthosBatch.field.batchCount.tip=Saisir le nombre d'individus dans le lot -tutti.createBenthosBatch.field.batchWeight=Poids du lot -tutti.createBenthosBatch.field.batchWeight.tip=Poids du lot +tutti.createBenthosBatch.field.batchSampleWeight=Poids du lot +tutti.createBenthosBatch.field.batchSampleWeight.tip=Poids du lot +tutti.createBenthosBatch.field.batchWeight=Poids de sous-échantillon +tutti.createBenthosBatch.field.batchWeight.tip=Poids de sous-échantillon tutti.createBenthosBatch.field.category=Catégorie tutti.createBenthosBatch.field.category.tip=Choisir le mode de catégorisation tutti.createBenthosBatch.field.sampleCategory=V / HV @@ -2026,10 +2028,12 @@ tutti.validator.error.createMarineLitterBatch.marineLitterCategory.required=La c tutti.validator.error.createMarineLitterBatch.marineLitterSizeCategory.required=La catégorie de taille est obligatoire tutti.validator.error.createMarineLitterBatch.number.invalidValue=Le nombre doit être strictement positif tutti.validator.error.createMarineLitterBatch.number.required=Le nombre est obligatoire -tutti.validator.error.createSpeciesBatch.batchWeight.invalidValue=Le poids du lot doit être strictement positif +tutti.validator.error.createSpeciesBatch.batchSampleWeight.invalidValue=Le poids du lot doit être strictement positif +tutti.validator.error.createSpeciesBatch.batchWeight.invalidValue=Le poids de sous-échantillon doit être strictement positif tutti.validator.error.createSpeciesBatch.sortedUnsortedCategory.required=La catégorie Vrac / Hors Vrac est obligatoire tutti.validator.error.createSpeciesBatch.species.required=L'espèce est obligatoire tutti.validator.error.createSpeciesBatch.speciesAndCategory.notAvailable=Couple (espèce - Vrac/Hors Vrac) déjà utilisée +tutti.validator.error.createSpeciesBatch.weight.weightGreaterThanBatchSampleWeight=Le poids de sous-échantillon doit être inférieur ou égal au poids du lot tutti.validator.error.cruise.name.format=Le format n'est pas celui attendu ... tutti.validator.error.latitude.decimal.outOfBounds=La décimale de la latitude doit être comprise entre 0 et 99 tutti.validator.error.latitude.degree.outOfBounds=Le degré de la latitude doit être compris entre -90 et 90 -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.