Author: kmorin Date: 2013-05-28 16:43:34 +0200 (Tue, 28 May 2013) New Revision: 1027 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/1027 Log: check if the step is positive in the frequencies Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/BenthosFrequencyUI.css trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/BenthosFrequencyUI.jaxx trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUI.css trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUI.jaxx trunk/tutti-ui-swing/src/main/resources/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/BenthosFrequencyUIModel-error-validation.xml trunk/tutti-ui-swing/src/main/resources/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUIModel-error-validation.xml trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_en_GB.properties trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properties Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/BenthosFrequencyUI.css =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/BenthosFrequencyUI.css 2013-05-28 14:40:59 UTC (rev 1026) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/BenthosFrequencyUI.css 2013-05-28 14:43:34 UTC (rev 1027) @@ -73,6 +73,7 @@ bean: {model}; enabled: {!model.isSimpleCountingMode()}; _selectOnFocus: true; + _validatorLabel: {_("tutti.editBenthosFrequencies.field.step")}; } #totalNumberLabel { @@ -115,6 +116,7 @@ property: lengthStepCaracteristic; selectedItem: {model.getLengthStepCaracteristic()}; enabled: {!model.isSimpleCountingMode()}; + _validatorLabel: {_("tutti.editBenthosFrequencies.field.lengthStepCaracteristic")}; } #minStepLabel { @@ -235,12 +237,16 @@ layout: {dataFieldLayout}; } +#tableScrollPane { + _validatorLabel: {_("tutti.editBenthosFrequencies.field.rows")}; +} + #table { selectionMode: {ListSelectionModel.SINGLE_SELECTION}; selectionBackground: {null}; selectionForeground: {Color.BLACK}; sortable: false; - enabled: {model.getLengthStepCaracteristic() != null} + enabled: {model.getLengthStepCaracteristic() != null && model.getStep() > 0f}; } #simpleCountingLabel { Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/BenthosFrequencyUI.jaxx =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/BenthosFrequencyUI.jaxx 2013-05-28 14:40:59 UTC (rev 1026) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/BenthosFrequencyUI.jaxx 2013-05-28 14:43:34 UTC (rev 1027) @@ -74,6 +74,7 @@ uiClass='jaxx.runtime.validator.swing.ui.ImageValidationUI'> <field name='lengthStepCaracteristic' component='lengthStepCaracteristicComboBox'/> + <field name='step' component='stepField'/> <field name='rows' component='tableScrollPane'/> </BeanValidator> Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUI.css =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUI.css 2013-05-28 14:40:59 UTC (rev 1026) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUI.css 2013-05-28 14:43:34 UTC (rev 1027) @@ -73,6 +73,7 @@ bean: {model}; enabled: {!model.isSimpleCountingMode()}; _selectOnFocus: true; + _validatorLabel: {_("tutti.editSpeciesFrequencies.field.step")}; } #totalNumberLabel { @@ -115,6 +116,7 @@ property: lengthStepCaracteristic; selectedItem: {model.getLengthStepCaracteristic()}; enabled: {!model.isSimpleCountingMode()}; + _validatorLabel: {_("tutti.editSpeciesFrequencies.field.lengthStepCaracteristic")}; } #minStepLabel { @@ -235,12 +237,16 @@ layout: {dataFieldLayout}; } +#tableScrollPane { + _validatorLabel: {_("tutti.editSpeciesFrequencies.field.rows")}; +} + #table { selectionMode: {ListSelectionModel.SINGLE_SELECTION}; selectionBackground: {null}; selectionForeground: {Color.BLACK}; sortable: false; - enabled: {model.getLengthStepCaracteristic() != null} + enabled: {model.getLengthStepCaracteristic() != null && model.getStep() > 0f}; } #simpleCountingLabel { Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUI.jaxx =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUI.jaxx 2013-05-28 14:40:59 UTC (rev 1026) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUI.jaxx 2013-05-28 14:43:34 UTC (rev 1027) @@ -74,6 +74,7 @@ uiClass='jaxx.runtime.validator.swing.ui.ImageValidationUI'> <field name='lengthStepCaracteristic' component='lengthStepCaracteristicComboBox'/> + <field name='step' component='stepField'/> <field name='rows' component='tableScrollPane'/> </BeanValidator> Modified: trunk/tutti-ui-swing/src/main/resources/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/BenthosFrequencyUIModel-error-validation.xml =================================================================== --- trunk/tutti-ui-swing/src/main/resources/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/BenthosFrequencyUIModel-error-validation.xml 2013-05-28 14:40:59 UTC (rev 1026) +++ trunk/tutti-ui-swing/src/main/resources/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/BenthosFrequencyUIModel-error-validation.xml 2013-05-28 14:43:34 UTC (rev 1027) @@ -34,19 +34,30 @@ <![CDATA[ isSimpleCountingMode() || lengthStepCaracteristic != null ]]> </param> <message> - tutti.validator.error.speciesFrequency.lengthStepCaracteristic.required + tutti.validator.error.benthosFrequency.lengthStepCaracteristic.required </message> </field-validator> </field> + <field name="step"> + + <field-validator type="double" short-circuit="true"> + <param name="minExclusive">0</param> + <message> + tutti.validator.error.benthosFrequency.step.positiveValue + </message> + </field-validator> + + </field> + <field name="rows"> <field-validator type="fieldexpression" short-circuit="true"> <param name="expression"> <![CDATA[ isSimpleCountingMode() || rows != null ]]> </param> - <message>tutti.validator.error.speciesFrequency.oneRowRequired</message> + <message>tutti.validator.error.benthosFrequency.oneRowRequired</message> </field-validator> </field> Modified: trunk/tutti-ui-swing/src/main/resources/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUIModel-error-validation.xml =================================================================== --- trunk/tutti-ui-swing/src/main/resources/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUIModel-error-validation.xml 2013-05-28 14:40:59 UTC (rev 1026) +++ trunk/tutti-ui-swing/src/main/resources/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUIModel-error-validation.xml 2013-05-28 14:43:34 UTC (rev 1027) @@ -40,6 +40,17 @@ </field> + <field name="step"> + + <field-validator type="double" short-circuit="true"> + <param name="minExclusive">0</param> + <message> + tutti.validator.error.speciesFrequency.step.positiveValue + </message> + </field-validator> + + </field> + <field name="rows"> <field-validator type="fieldexpression" short-circuit="true"> Modified: trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_en_GB.properties =================================================================== --- trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_en_GB.properties 2013-05-28 14:40:59 UTC (rev 1026) +++ trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_en_GB.properties 2013-05-28 14:43:34 UTC (rev 1027) @@ -416,6 +416,7 @@ tutti.editBenthosFrequencies.field.mode.simpleCounting.tip= tutti.editBenthosFrequencies.field.rafaleStep= tutti.editBenthosFrequencies.field.rafaleStep.tip= +tutti.editBenthosFrequencies.field.rows= tutti.editBenthosFrequencies.field.simpleCounting= tutti.editBenthosFrequencies.field.simpleCounting.tip= tutti.editBenthosFrequencies.field.step= @@ -954,6 +955,7 @@ tutti.editSpeciesFrequencies.field.mode.simpleCounting.tip= tutti.editSpeciesFrequencies.field.rafaleStep= tutti.editSpeciesFrequencies.field.rafaleStep.tip= +tutti.editSpeciesFrequencies.field.rows= tutti.editSpeciesFrequencies.field.simpleCounting= tutti.editSpeciesFrequencies.field.simpleCounting.tip= tutti.editSpeciesFrequencies.field.step= @@ -1338,6 +1340,9 @@ tutti.validateCruise.navigation.action.export.tip= tutti.validateCruise.navigation.action.refresh.all.tip= tutti.validateCruise.navigation.title= +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.createIndividualObservationBatch.lengthStepCaracteristic.required= tutti.validator.error.createIndividualObservationBatch.size.required= @@ -1363,6 +1368,7 @@ tutti.validator.error.program.zone.required= tutti.validator.error.speciesFrequency.lengthStepCaracteristic.required= 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.selectedCategory.required= Modified: trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properties =================================================================== --- trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properties 2013-05-28 14:40:59 UTC (rev 1026) +++ trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properties 2013-05-28 14:43:34 UTC (rev 1027) @@ -410,6 +410,7 @@ tutti.editBenthosFrequencies.field.mode.simpleCounting.tip=Mode par défaut si la classe de taille n'est pas renseignée dans le protocole tutti.editBenthosFrequencies.field.rafaleStep=Classe de taille à incrémenter tutti.editBenthosFrequencies.field.rafaleStep.tip=Saisir à la suite les différentes tailles mesurées +tutti.editBenthosFrequencies.field.rows=Classes de taille tutti.editBenthosFrequencies.field.simpleCounting=Nombre tutti.editBenthosFrequencies.field.simpleCounting.tip=Saisir le nombre d'individus dans le lot tutti.editBenthosFrequencies.field.step=Pas de la classe de taille @@ -917,6 +918,7 @@ tutti.editSpeciesFrequencies.field.mode.simpleCounting.tip=Mode par défaut si la classe de taille n'est pas renseignée dans le protocole. tutti.editSpeciesFrequencies.field.rafaleStep=Classe de taille à incrémenter tutti.editSpeciesFrequencies.field.rafaleStep.tip=Saisir à la suite les différentes tailles mesurées +tutti.editSpeciesFrequencies.field.rows=Classes de taille tutti.editSpeciesFrequencies.field.simpleCounting=Nombre tutti.editSpeciesFrequencies.field.simpleCounting.tip=Saisir le nombre d'individus dans le lot tutti.editSpeciesFrequencies.field.step=Pas de la classe de taille @@ -1285,6 +1287,9 @@ tutti.validateCruise.navigation.action.export.operation.tip=Exporter les messages de validation de l'opération tutti.validateCruise.navigation.action.refresh.all.tip=Rafraîchir les messages de validation de la campagne tutti.validateCruise.navigation.title=Traits +tutti.validator.error.benthosFrequency.lengthStepCaracteristic.required=La classe de taille est obligatoire +tutti.validator.error.benthosFrequency.oneRowRequired=Au moins une classe de taille doit être observée +tutti.validator.error.benthosFrequency.step.positiveValue=Le pas de la classe de taille doit être strictement positif tutti.validator.error.createAccidentalBatch.species.required=L'espèce est obligatoire tutti.validator.error.createIndividualObservationBatch.lengthStepCaracteristic.required=La classe de taille est obligatoire tutti.validator.error.createIndividualObservationBatch.size.required=La taille est obligatoire @@ -1310,6 +1315,7 @@ tutti.validator.error.program.zone.required=La zone de la série est obligatoire tutti.validator.error.speciesFrequency.lengthStepCaracteristic.required=La classe de taille est obligatoire tutti.validator.error.speciesFrequency.oneRowRequired=Au moins une classe de taille doit être observée +tutti.validator.error.speciesFrequency.step.positiveValue=Le pas de la classe de taille doit être strictement positif tutti.validator.error.splitSpeciesBatch.sampleWeight.invalidValue=La somme des poids ventilés doit être strictement positive tutti.validator.error.splitSpeciesBatch.sampleWeight.sampleBatchGreaterThanBatchWeight=La somme des poids ventilés doit être inférieur ou égale à celle du poids du lot tutti.validator.error.splitSpeciesBatch.selectedCategory.required=La catégorie est obligatoire