Tony CHEMIT pushed to branch develop-7.x at ultreiaio / ird-observe Commits: 91f26bf0 by Tony CHEMIT at 2018-07-10T12:50:15Z [LL] Plus de validation sur snap et émerillon - Closes #1028 - - - - - 14 changed files: - client/src/main/resources/i18n/client_en_GB.properties - client/src/main/resources/i18n/client_es_ES.properties - client/src/main/resources/i18n/client_fr_FR.properties - dto/src/main/java/fr/ird/observe/dto/decoration/ObserveI18nLabelsBuilder.java - dto/src/main/resources/i18n/dto_en_GB.properties - dto/src/main/resources/i18n/dto_es_ES.properties - dto/src/main/resources/i18n/dto_fr_FR.properties - validation/src/main/resources/fr/ird/observe/dto/data/longline/BranchlineDto-update-error-validation.xml - validation/src/main/resources/fr/ird/observe/dto/data/longline/BranchlineDto-update-table-error-validation.xml - validation/src/main/resources/fr/ird/observe/dto/data/longline/SetLonglineDto-create-error-validation.xml - validation/src/main/resources/fr/ird/observe/dto/data/longline/SetLonglineDto-update-error-validation.xml - validation/src/main/resources/i18n/validation_en_GB.properties - validation/src/main/resources/i18n/validation_es_ES.properties - validation/src/main/resources/i18n/validation_fr_FR.properties Changes: ===================================== client/src/main/resources/i18n/client_en_GB.properties ===================================== @@ -410,8 +410,6 @@ observe.common.BranchlineDto.hookLost=Hook lost observe.common.BranchlineDto.hookOffset=Hook offset observe.common.BranchlineDto.message.modified=Branchline was modified and is valid. observe.common.BranchlineDto.message.modified.but.invalid=Branchline was modified but is not valid. -observe.common.BranchlineDto.snapWeight=Snap weight (kg) -observe.common.BranchlineDto.swivelWeight=Swivel weight (kg) observe.common.BranchlineDto.timeSinceContact=Time since contact observe.common.BranchlineDto.timer=Timer observe.common.BranchlineDto.timerTimeOnBoard=Time on board ===================================== client/src/main/resources/i18n/client_es_ES.properties ===================================== @@ -410,8 +410,6 @@ observe.common.BranchlineDto.hookLost=Anzuelo erdido observe.common.BranchlineDto.hookOffset=Offset anzuelo (°) observe.common.BranchlineDto.message.modified=El arponcillo que se está modificando actualmente ha sido modificado y es valido. observe.common.BranchlineDto.message.modified.but.invalid=El arponcillo que se está modificando actualmente ha sido modificado, pero no es valido. -observe.common.BranchlineDto.snapWeight=Peso snap (kg) -observe.common.BranchlineDto.swivelWeight=Peso destorcedor (kg) observe.common.BranchlineDto.timeSinceContact=Tiempo desde el estallido observe.common.BranchlineDto.timer=Reloj observe.common.BranchlineDto.timerTimeOnBoard=Timestamp de subida a bordo ===================================== client/src/main/resources/i18n/client_fr_FR.properties ===================================== @@ -410,8 +410,6 @@ observe.common.BranchlineDto.hookLost=Hameçon perdu observe.common.BranchlineDto.hookOffset=Offset hameçon (°) observe.common.BranchlineDto.message.modified=L'avançon en cours d'édition a été modifié et est valide. observe.common.BranchlineDto.message.modified.but.invalid=L'avançon en cours d'édition a été modifié, mais n'est pas valide. -observe.common.BranchlineDto.snapWeight=Poids snap (kg) -observe.common.BranchlineDto.swivelWeight=Poids émerillon (kg) observe.common.BranchlineDto.timeSinceContact=Temps depuis déclenchement observe.common.BranchlineDto.timer=Horloge observe.common.BranchlineDto.timerTimeOnBoard=Horodatage de montée à bord ===================================== dto/src/main/java/fr/ird/observe/dto/decoration/ObserveI18nLabelsBuilder.java ===================================== @@ -47,6 +47,7 @@ public class ObserveI18nLabelsBuilder extends I18nLabelsBuilder { static { n("observe.common.I18nReferentialDto.label"); n("observe.common.SetLonglineGlobalCompositionDto.type"); + n("observe.common.SetLonglineDetailCompositionDto.type"); } private static final ObserveI18nLabelsBuilder INSTANCE = new ObserveI18nLabelsBuilder(null); ===================================== dto/src/main/resources/i18n/dto_en_GB.properties ===================================== @@ -159,6 +159,7 @@ observe.common.SensorTypeDto.types=Sensors type observe.common.SensorUsedDto.title=Sensors ursed observe.common.SensorUsedDto.type=Sensor used observe.common.SensorUsedDto.types=Sensors used +observe.common.SetLonglineDetailCompositionDto.type=Detailed composition observe.common.SetLonglineDto.title=Fishing operation observe.common.SetLonglineDto.type=Set observe.common.SetLonglineDto.types=Sets ===================================== dto/src/main/resources/i18n/dto_es_ES.properties ===================================== @@ -157,6 +157,7 @@ observe.common.SensorTypeDto.types=Tipos de sensor observe.common.SensorUsedDto.title=Sensores observe.common.SensorUsedDto.type=Sensor utilizado observe.common.SensorUsedDto.types=Sensores utilizados +observe.common.SetLonglineDetailCompositionDto.type=Esquema del palangre observe.common.SetLonglineDto.title=Operación de pesca observe.common.SetLonglineDto.type=Operación de pesca observe.common.SetLonglineDto.types=Operaciones de pesca ===================================== dto/src/main/resources/i18n/dto_fr_FR.properties ===================================== @@ -159,6 +159,7 @@ observe.common.SensorTypeDto.types=Types de capteur observe.common.SensorUsedDto.title=Capteurs observe.common.SensorUsedDto.type=Capteur utilisé observe.common.SensorUsedDto.types=Capteurs utilisés +observe.common.SetLonglineDetailCompositionDto.type=Schéma de palangre observe.common.SetLonglineDto.title=Opération de pêche observe.common.SetLonglineDto.type=Opération de pêche observe.common.SetLonglineDto.types=Opérations de pêche ===================================== validation/src/main/resources/fr/ird/observe/dto/data/longline/BranchlineDto-update-error-validation.xml ===================================== @@ -108,4 +108,30 @@ </field> + <field name="swivelWeight"> + + <!-- 0.0 <= swivelWeight <= 0.2 --> + <field-validator type="fieldexpressionwithparams" short-circuit="true"> + <param name="doubleParams">min:0.0|max:0.2</param> + <param name="expression"><![CDATA[ !weightedSwivel || swivelWeight == null || (doubles.min < swivelWeight && (swivelWeight - doubles.max) * 1000 < 1)]]></param> + <message> + observe.validation.setLongline.bound.swivelWeight##${doubles.min}##${doubles.max} + </message> + </field-validator> + + </field> + + <field name="snapWeight"> + + <!-- 0.0 <= snapWeight <= 0.2 --> + <field-validator type="fieldexpressionwithparams" short-circuit="true"> + <param name="doubleParams">min:0.0|max:0.2</param> + <param name="expression"><![CDATA[ !weightedSnap || snapWeight == null || (doubles.min < snapWeight && (snapWeight - doubles.max) * 1000 < 1)]]></param> + <message> + observe.validation.setLongline.bound.snapWeight##${doubles.min}##${doubles.max} + </message> + </field-validator> + + </field> + </validators> ===================================== validation/src/main/resources/fr/ird/observe/dto/data/longline/BranchlineDto-update-table-error-validation.xml ===================================== @@ -39,7 +39,7 @@ <field-validator type="fieldexpressionwithparams" short-circuit="true"> <param name="doubleParams">min:0.0|max:50.0</param> <param name="expression"> - <![CDATA[ branchlineLength == null || (doubles.min <= branchlineLength && branchlineLength <= doubles.max)]]> + <![CDATA[ branchlineLength == null || (doubles.min < branchlineLength && (branchlineLength - doubles.max) * 1000 < 1)]]> </param> <message> observe.validation.branchline.bound.branchlineLength##${doubles.min}##${doubles.max} @@ -54,7 +54,7 @@ <field-validator type="fieldexpressionwithparams" short-circuit="true"> <param name="doubleParams">min:0.0|max:50.0</param> <param name="expression"> - <![CDATA[ tracelineLength == null || (doubles.min <= tracelineLength && tracelineLength <= doubles.max)]]> + <![CDATA[ tracelineLength == null || (doubles.min <= tracelineLength && (tracelineLength - doubles.max) * 1000 < 1)]]> </param> <message> observe.validation.branchline.bound.tracelineLength##${doubles.min}##${doubles.max} ===================================== validation/src/main/resources/fr/ird/observe/dto/data/longline/SetLonglineDto-create-error-validation.xml ===================================== @@ -113,11 +113,8 @@ <!-- 0.0 <= swivelWeight <= 0.2 --> <field-validator type="fieldexpressionwithparams" short-circuit="true"> - <param name="doubleParams">min:0.0|max:0.2001</param> - <param name="expression"><![CDATA[ - swivelWeight == null || (doubles.min < swivelWeight && swivelWeight <= doubles.max) - ]]> - </param> + <param name="doubleParams">min:0.0|max:0.2</param> + <param name="expression"><![CDATA[ !weightedSwivel || swivelWeight == null || (doubles.min < swivelWeight && (swivelWeight - doubles.max) * 1000 < 1)]]></param> <message> observe.validation.setLongline.bound.swivelWeight##${doubles.min}##${doubles.max} </message> @@ -129,11 +126,8 @@ <!-- 0.0 <= snapWeight <= 0.2 --> <field-validator type="fieldexpressionwithparams" short-circuit="true"> - <param name="doubleParams">min:0.0|max:0.2001</param> - <param name="expression"><![CDATA[ - snapWeight == null || (doubles.min < snapWeight && snapWeight <= doubles.max) - ]]> - </param> + <param name="doubleParams">min:0.0|max:0.2</param> + <param name="expression"><![CDATA[ !weightedSnap || snapWeight == null || (doubles.min < snapWeight && (snapWeight - doubles.max) * 1000 < 1)]]></param> <message> observe.validation.setLongline.bound.snapWeight##${doubles.min}##${doubles.max} </message> ===================================== validation/src/main/resources/fr/ird/observe/dto/data/longline/SetLonglineDto-update-error-validation.xml ===================================== @@ -147,11 +147,8 @@ <!-- 0.0 <= swivelWeight <= 0.2 --> <field-validator type="fieldexpressionwithparams" short-circuit="true"> - <param name="doubleParams">min:0.0|max:0.20001</param> - <param name="expression"><![CDATA[ - swivelWeight == null || (doubles.min < swivelWeight && swivelWeight <= doubles.max) - ]]> - </param> + <param name="doubleParams">min:0.0|max:0.2</param> + <param name="expression"><![CDATA[ !weightedSwivel || swivelWeight == null || (doubles.min < swivelWeight && (swivelWeight - doubles.max) * 1000 < 1)]]></param> <message> observe.validation.setLongline.bound.swivelWeight##${doubles.min}##${doubles.max} </message> @@ -163,11 +160,8 @@ <!-- 0.0 <= snapWeight <= 0.2 --> <field-validator type="fieldexpressionwithparams" short-circuit="true"> - <param name="doubleParams">min:0.0|max:0.200001</param> - <param name="expression"><![CDATA[ - snapWeight == null || (doubles.min < snapWeight && snapWeight <= doubles.max) - ]]> - </param> + <param name="doubleParams">min:0.0|max:0.2</param> + <param name="expression"><![CDATA[ !weightedSnap || snapWeight == null || (doubles.min < snapWeight && (snapWeight - doubles.max) * 1000 < 1)]]></param> <message> observe.validation.setLongline.bound.snapWeight##${doubles.min}##${doubles.max} </message> ===================================== validation/src/main/resources/i18n/validation_en_GB.properties ===================================== @@ -44,6 +44,8 @@ observe.common.BranchlineDto.branchlineLength=Branchline length observe.common.BranchlineDto.hookSize=Hook size observe.common.BranchlineDto.hookType=Hook type observe.common.BranchlineDto.settingIdentifier=Setting +observe.common.BranchlineDto.snapWeight=Snap weight (kg) +observe.common.BranchlineDto.swivelWeight=Swivel weight (kg) observe.common.BranchlineDto.topType=Top part type observe.common.BranchlineDto.tracelineLength=Traceline length observe.common.BranchlineDto.tracelineType=Traceline type ===================================== validation/src/main/resources/i18n/validation_es_ES.properties ===================================== @@ -44,6 +44,8 @@ observe.common.BranchlineDto.branchlineLength=Arponcillo (m) observe.common.BranchlineDto.hookSize=Tamaño del anzuelo observe.common.BranchlineDto.hookType=Tipo de anzuelo observe.common.BranchlineDto.settingIdentifier=Calada +observe.common.BranchlineDto.snapWeight=Peso snap (kg) +observe.common.BranchlineDto.swivelWeight=Peso de el destorcedor (kg) observe.common.BranchlineDto.topType=Tipo parte superior observe.common.BranchlineDto.tracelineLength=Parte baja (m) observe.common.BranchlineDto.tracelineType=Tipo bajo de línea @@ -457,7 +459,7 @@ observe.validation.lengthFormula.endDate.before.startDate=End date must be after observe.validation.lengthLengthParameter.disabled.inputSizeMeasureType=Le type de mensuration d'entrée sélectionné est désactivé. \#TODO observe.validation.lengthLengthParameter.invalid.inputOutputFormula=La formule n'est pas valide. \#TODO observe.validation.lengthLengthParameter.invalid.outputInputFormula=La formule n'est pas valide. \#TODO -observe.validation.lengthLengthParameter.invalid.uniqueKey=Tupla (especiesexo/océano/input size measure/ output size measure/startDate) debe ser única, la tupla ya se ha usado. #TODO +observe.validation.lengthLengthParameter.invalid.uniqueKey=Tupla (especiesexo/océano/input size measure/ output size measure/startDate) debe ser única, la tupla ya se ha usado. \#TODO observe.validation.lengthLengthParameter.null.inputSizeMeasureType=Le type de mensuration d'entrée n'est pas renseigné. \#TODO observe.validation.lengthLengthParameter.null.ocean=No se ha seleccionado oceano. observe.validation.lengthLengthParameter.null.outputSizeMeasureType=Le type de mensuration de sortie n'est pas renseigné. \#TODO @@ -470,7 +472,7 @@ observe.validation.lengthLengthParameter.required.species=Especie no especificad observe.validation.lengthLengthParameter.required.startDate=fecha de comienzo de validez no especificada. observe.validation.lengthWeightParameter.disabled.sizeMeasureType=Le type de mensuration sélectionné est désactivé. \#TODO observe.validation.lengthWeightParameter.invalid.lengthWeightFormula=Relación de peso introducida no es coherente. -observe.validation.lengthWeightParameter.invalid.uniqueKey=Tupla (especie/sexo/océano/sizeMeasureType/startDate) debe ser única, la tupla ya se ha usado. #TODO +observe.validation.lengthWeightParameter.invalid.uniqueKey=Tupla (especie/sexo/océano/sizeMeasureType/startDate) debe ser única, la tupla ya se ha usado. \#TODO observe.validation.lengthWeightParameter.invalid.weightLengthFormula=Relación de talla introducida no es coherente. observe.validation.lengthWeightParameter.null.ocean=No se ha seleccionado oceano. observe.validation.lengthWeightParameter.null.sizeMeasureType=Type de mensuration non renseigné. \#TODO ===================================== validation/src/main/resources/i18n/validation_fr_FR.properties ===================================== @@ -44,6 +44,8 @@ observe.common.BranchlineDto.branchlineLength=Longueur Avançon (m) observe.common.BranchlineDto.hookSize=Taille d'hameçon observe.common.BranchlineDto.hookType=Type d'hameçon observe.common.BranchlineDto.settingIdentifier=Filage +observe.common.BranchlineDto.snapWeight=Poids snap (kg) +observe.common.BranchlineDto.swivelWeight=Poids de l'émerillon (kg) observe.common.BranchlineDto.topType=Type partie supérieure observe.common.BranchlineDto.tracelineLength=Partie basse (m) observe.common.BranchlineDto.tracelineType=Type bas de ligne View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/91f26bf075775a04ce7e4836b1d6... -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/91f26bf075775a04ce7e4836b1d6... You're receiving this email because of your account on gitlab.com.