Tony CHEMIT pushed to branch develop-7.x at ultreiaio / ird-observe
Commits:
-
91f26bf0
by Tony CHEMIT at 2018-07-10T12:50:15Z
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:
| ... | ... | @@ -410,8 +410,6 @@ observe.common.BranchlineDto.hookLost=Hook lost |
| 410 | 410 |
observe.common.BranchlineDto.hookOffset=Hook offset
|
| 411 | 411 |
observe.common.BranchlineDto.message.modified=Branchline was modified and is valid.
|
| 412 | 412 |
observe.common.BranchlineDto.message.modified.but.invalid=Branchline was modified but is not valid.
|
| 413 |
-observe.common.BranchlineDto.snapWeight=Snap weight (kg)
|
|
| 414 |
-observe.common.BranchlineDto.swivelWeight=Swivel weight (kg)
|
|
| 415 | 413 |
observe.common.BranchlineDto.timeSinceContact=Time since contact
|
| 416 | 414 |
observe.common.BranchlineDto.timer=Timer
|
| 417 | 415 |
observe.common.BranchlineDto.timerTimeOnBoard=Time on board
|
| ... | ... | @@ -410,8 +410,6 @@ observe.common.BranchlineDto.hookLost=Anzuelo erdido |
| 410 | 410 |
observe.common.BranchlineDto.hookOffset=Offset anzuelo (°)
|
| 411 | 411 |
observe.common.BranchlineDto.message.modified=El arponcillo que se está modificando actualmente ha sido modificado y es valido.
|
| 412 | 412 |
observe.common.BranchlineDto.message.modified.but.invalid=El arponcillo que se está modificando actualmente ha sido modificado, pero no es valido.
|
| 413 |
-observe.common.BranchlineDto.snapWeight=Peso snap (kg)
|
|
| 414 |
-observe.common.BranchlineDto.swivelWeight=Peso destorcedor (kg)
|
|
| 415 | 413 |
observe.common.BranchlineDto.timeSinceContact=Tiempo desde el estallido
|
| 416 | 414 |
observe.common.BranchlineDto.timer=Reloj
|
| 417 | 415 |
observe.common.BranchlineDto.timerTimeOnBoard=Timestamp de subida a bordo
|
| ... | ... | @@ -410,8 +410,6 @@ observe.common.BranchlineDto.hookLost=Hameçon perdu |
| 410 | 410 |
observe.common.BranchlineDto.hookOffset=Offset hameçon (°)
|
| 411 | 411 |
observe.common.BranchlineDto.message.modified=L'avançon en cours d'édition a été modifié et est valide.
|
| 412 | 412 |
observe.common.BranchlineDto.message.modified.but.invalid=L'avançon en cours d'édition a été modifié, mais n'est pas valide.
|
| 413 |
-observe.common.BranchlineDto.snapWeight=Poids snap (kg)
|
|
| 414 |
-observe.common.BranchlineDto.swivelWeight=Poids émerillon (kg)
|
|
| 415 | 413 |
observe.common.BranchlineDto.timeSinceContact=Temps depuis déclenchement
|
| 416 | 414 |
observe.common.BranchlineDto.timer=Horloge
|
| 417 | 415 |
observe.common.BranchlineDto.timerTimeOnBoard=Horodatage de montée à bord
|
| ... | ... | @@ -47,6 +47,7 @@ public class ObserveI18nLabelsBuilder extends I18nLabelsBuilder { |
| 47 | 47 |
static {
|
| 48 | 48 |
n("observe.common.I18nReferentialDto.label");
|
| 49 | 49 |
n("observe.common.SetLonglineGlobalCompositionDto.type");
|
| 50 |
+ n("observe.common.SetLonglineDetailCompositionDto.type");
|
|
| 50 | 51 |
}
|
| 51 | 52 |
|
| 52 | 53 |
private static final ObserveI18nLabelsBuilder INSTANCE = new ObserveI18nLabelsBuilder(null);
|
| ... | ... | @@ -159,6 +159,7 @@ observe.common.SensorTypeDto.types=Sensors type |
| 159 | 159 |
observe.common.SensorUsedDto.title=Sensors ursed
|
| 160 | 160 |
observe.common.SensorUsedDto.type=Sensor used
|
| 161 | 161 |
observe.common.SensorUsedDto.types=Sensors used
|
| 162 |
+observe.common.SetLonglineDetailCompositionDto.type=Detailed composition
|
|
| 162 | 163 |
observe.common.SetLonglineDto.title=Fishing operation
|
| 163 | 164 |
observe.common.SetLonglineDto.type=Set
|
| 164 | 165 |
observe.common.SetLonglineDto.types=Sets
|
| ... | ... | @@ -157,6 +157,7 @@ observe.common.SensorTypeDto.types=Tipos de sensor |
| 157 | 157 |
observe.common.SensorUsedDto.title=Sensores
|
| 158 | 158 |
observe.common.SensorUsedDto.type=Sensor utilizado
|
| 159 | 159 |
observe.common.SensorUsedDto.types=Sensores utilizados
|
| 160 |
+observe.common.SetLonglineDetailCompositionDto.type=Esquema del palangre
|
|
| 160 | 161 |
observe.common.SetLonglineDto.title=Operación de pesca
|
| 161 | 162 |
observe.common.SetLonglineDto.type=Operación de pesca
|
| 162 | 163 |
observe.common.SetLonglineDto.types=Operaciones de pesca
|
| ... | ... | @@ -159,6 +159,7 @@ observe.common.SensorTypeDto.types=Types de capteur |
| 159 | 159 |
observe.common.SensorUsedDto.title=Capteurs
|
| 160 | 160 |
observe.common.SensorUsedDto.type=Capteur utilisé
|
| 161 | 161 |
observe.common.SensorUsedDto.types=Capteurs utilisés
|
| 162 |
+observe.common.SetLonglineDetailCompositionDto.type=Schéma de palangre
|
|
| 162 | 163 |
observe.common.SetLonglineDto.title=Opération de pêche
|
| 163 | 164 |
observe.common.SetLonglineDto.type=Opération de pêche
|
| 164 | 165 |
observe.common.SetLonglineDto.types=Opérations de pêche
|
| ... | ... | @@ -108,4 +108,30 @@ |
| 108 | 108 |
|
| 109 | 109 |
</field>
|
| 110 | 110 |
|
| 111 |
+ <field name="swivelWeight">
|
|
| 112 |
+ |
|
| 113 |
+ <!-- 0.0 <= swivelWeight <= 0.2 -->
|
|
| 114 |
+ <field-validator type="fieldexpressionwithparams" short-circuit="true">
|
|
| 115 |
+ <param name="doubleParams">min:0.0|max:0.2</param>
|
|
| 116 |
+ <param name="expression"><![CDATA[ !weightedSwivel || swivelWeight == null || (doubles.min < swivelWeight && (swivelWeight - doubles.max) * 1000 < 1)]]></param>
|
|
| 117 |
+ <message>
|
|
| 118 |
+ observe.validation.setLongline.bound.swivelWeight##${doubles.min}##${doubles.max}
|
|
| 119 |
+ </message>
|
|
| 120 |
+ </field-validator>
|
|
| 121 |
+ |
|
| 122 |
+ </field>
|
|
| 123 |
+ |
|
| 124 |
+ <field name="snapWeight">
|
|
| 125 |
+ |
|
| 126 |
+ <!-- 0.0 <= snapWeight <= 0.2 -->
|
|
| 127 |
+ <field-validator type="fieldexpressionwithparams" short-circuit="true">
|
|
| 128 |
+ <param name="doubleParams">min:0.0|max:0.2</param>
|
|
| 129 |
+ <param name="expression"><![CDATA[ !weightedSnap || snapWeight == null || (doubles.min < snapWeight && (snapWeight - doubles.max) * 1000 < 1)]]></param>
|
|
| 130 |
+ <message>
|
|
| 131 |
+ observe.validation.setLongline.bound.snapWeight##${doubles.min}##${doubles.max}
|
|
| 132 |
+ </message>
|
|
| 133 |
+ </field-validator>
|
|
| 134 |
+ |
|
| 135 |
+ </field>
|
|
| 136 |
+ |
|
| 111 | 137 |
</validators>
|
| ... | ... | @@ -39,7 +39,7 @@ |
| 39 | 39 |
<field-validator type="fieldexpressionwithparams" short-circuit="true">
|
| 40 | 40 |
<param name="doubleParams">min:0.0|max:50.0</param>
|
| 41 | 41 |
<param name="expression">
|
| 42 |
- <![CDATA[ branchlineLength == null || (doubles.min <= branchlineLength && branchlineLength <= doubles.max)]]>
|
|
| 42 |
+ <![CDATA[ branchlineLength == null || (doubles.min < branchlineLength && (branchlineLength - doubles.max) * 1000 < 1)]]>
|
|
| 43 | 43 |
</param>
|
| 44 | 44 |
<message>
|
| 45 | 45 |
observe.validation.branchline.bound.branchlineLength##${doubles.min}##${doubles.max}
|
| ... | ... | @@ -54,7 +54,7 @@ |
| 54 | 54 |
<field-validator type="fieldexpressionwithparams" short-circuit="true">
|
| 55 | 55 |
<param name="doubleParams">min:0.0|max:50.0</param>
|
| 56 | 56 |
<param name="expression">
|
| 57 |
- <![CDATA[ tracelineLength == null || (doubles.min <= tracelineLength && tracelineLength <= doubles.max)]]>
|
|
| 57 |
+ <![CDATA[ tracelineLength == null || (doubles.min <= tracelineLength && (tracelineLength - doubles.max) * 1000 < 1)]]>
|
|
| 58 | 58 |
</param>
|
| 59 | 59 |
<message>
|
| 60 | 60 |
observe.validation.branchline.bound.tracelineLength##${doubles.min}##${doubles.max}
|
| ... | ... | @@ -113,11 +113,8 @@ |
| 113 | 113 |
|
| 114 | 114 |
<!-- 0.0 <= swivelWeight <= 0.2 -->
|
| 115 | 115 |
<field-validator type="fieldexpressionwithparams" short-circuit="true">
|
| 116 |
- <param name="doubleParams">min:0.0|max:0.2001</param>
|
|
| 117 |
- <param name="expression"><![CDATA[
|
|
| 118 |
- swivelWeight == null || (doubles.min < swivelWeight && swivelWeight <= doubles.max)
|
|
| 119 |
- ]]>
|
|
| 120 |
- </param>
|
|
| 116 |
+ <param name="doubleParams">min:0.0|max:0.2</param>
|
|
| 117 |
+ <param name="expression"><![CDATA[ !weightedSwivel || swivelWeight == null || (doubles.min < swivelWeight && (swivelWeight - doubles.max) * 1000 < 1)]]></param>
|
|
| 121 | 118 |
<message>
|
| 122 | 119 |
observe.validation.setLongline.bound.swivelWeight##${doubles.min}##${doubles.max}
|
| 123 | 120 |
</message>
|
| ... | ... | @@ -129,11 +126,8 @@ |
| 129 | 126 |
|
| 130 | 127 |
<!-- 0.0 <= snapWeight <= 0.2 -->
|
| 131 | 128 |
<field-validator type="fieldexpressionwithparams" short-circuit="true">
|
| 132 |
- <param name="doubleParams">min:0.0|max:0.2001</param>
|
|
| 133 |
- <param name="expression"><![CDATA[
|
|
| 134 |
- snapWeight == null || (doubles.min < snapWeight && snapWeight <= doubles.max)
|
|
| 135 |
- ]]>
|
|
| 136 |
- </param>
|
|
| 129 |
+ <param name="doubleParams">min:0.0|max:0.2</param>
|
|
| 130 |
+ <param name="expression"><![CDATA[ !weightedSnap || snapWeight == null || (doubles.min < snapWeight && (snapWeight - doubles.max) * 1000 < 1)]]></param>
|
|
| 137 | 131 |
<message>
|
| 138 | 132 |
observe.validation.setLongline.bound.snapWeight##${doubles.min}##${doubles.max}
|
| 139 | 133 |
</message>
|
| ... | ... | @@ -147,11 +147,8 @@ |
| 147 | 147 |
|
| 148 | 148 |
<!-- 0.0 <= swivelWeight <= 0.2 -->
|
| 149 | 149 |
<field-validator type="fieldexpressionwithparams" short-circuit="true">
|
| 150 |
- <param name="doubleParams">min:0.0|max:0.20001</param>
|
|
| 151 |
- <param name="expression"><![CDATA[
|
|
| 152 |
- swivelWeight == null || (doubles.min < swivelWeight && swivelWeight <= doubles.max)
|
|
| 153 |
- ]]>
|
|
| 154 |
- </param>
|
|
| 150 |
+ <param name="doubleParams">min:0.0|max:0.2</param>
|
|
| 151 |
+ <param name="expression"><![CDATA[ !weightedSwivel || swivelWeight == null || (doubles.min < swivelWeight && (swivelWeight - doubles.max) * 1000 < 1)]]></param>
|
|
| 155 | 152 |
<message>
|
| 156 | 153 |
observe.validation.setLongline.bound.swivelWeight##${doubles.min}##${doubles.max}
|
| 157 | 154 |
</message>
|
| ... | ... | @@ -163,11 +160,8 @@ |
| 163 | 160 |
|
| 164 | 161 |
<!-- 0.0 <= snapWeight <= 0.2 -->
|
| 165 | 162 |
<field-validator type="fieldexpressionwithparams" short-circuit="true">
|
| 166 |
- <param name="doubleParams">min:0.0|max:0.200001</param>
|
|
| 167 |
- <param name="expression"><![CDATA[
|
|
| 168 |
- snapWeight == null || (doubles.min < snapWeight && snapWeight <= doubles.max)
|
|
| 169 |
- ]]>
|
|
| 170 |
- </param>
|
|
| 163 |
+ <param name="doubleParams">min:0.0|max:0.2</param>
|
|
| 164 |
+ <param name="expression"><![CDATA[ !weightedSnap || snapWeight == null || (doubles.min < snapWeight && (snapWeight - doubles.max) * 1000 < 1)]]></param>
|
|
| 171 | 165 |
<message>
|
| 172 | 166 |
observe.validation.setLongline.bound.snapWeight##${doubles.min}##${doubles.max}
|
| 173 | 167 |
</message>
|
| ... | ... | @@ -44,6 +44,8 @@ observe.common.BranchlineDto.branchlineLength=Branchline length |
| 44 | 44 |
observe.common.BranchlineDto.hookSize=Hook size
|
| 45 | 45 |
observe.common.BranchlineDto.hookType=Hook type
|
| 46 | 46 |
observe.common.BranchlineDto.settingIdentifier=Setting
|
| 47 |
+observe.common.BranchlineDto.snapWeight=Snap weight (kg)
|
|
| 48 |
+observe.common.BranchlineDto.swivelWeight=Swivel weight (kg)
|
|
| 47 | 49 |
observe.common.BranchlineDto.topType=Top part type
|
| 48 | 50 |
observe.common.BranchlineDto.tracelineLength=Traceline length
|
| 49 | 51 |
observe.common.BranchlineDto.tracelineType=Traceline type
|
| ... | ... | @@ -44,6 +44,8 @@ observe.common.BranchlineDto.branchlineLength=Arponcillo (m) |
| 44 | 44 |
observe.common.BranchlineDto.hookSize=Tamaño del anzuelo
|
| 45 | 45 |
observe.common.BranchlineDto.hookType=Tipo de anzuelo
|
| 46 | 46 |
observe.common.BranchlineDto.settingIdentifier=Calada
|
| 47 |
+observe.common.BranchlineDto.snapWeight=Peso snap (kg)
|
|
| 48 |
+observe.common.BranchlineDto.swivelWeight=Peso de el destorcedor (kg)
|
|
| 47 | 49 |
observe.common.BranchlineDto.topType=Tipo parte superior
|
| 48 | 50 |
observe.common.BranchlineDto.tracelineLength=Parte baja (m)
|
| 49 | 51 |
observe.common.BranchlineDto.tracelineType=Tipo bajo de línea
|
| ... | ... | @@ -457,7 +459,7 @@ observe.validation.lengthFormula.endDate.before.startDate=End date must be after |
| 457 | 459 |
observe.validation.lengthLengthParameter.disabled.inputSizeMeasureType=Le type de mensuration d'entrée sélectionné est désactivé. \#TODO
|
| 458 | 460 |
observe.validation.lengthLengthParameter.invalid.inputOutputFormula=La formule n'est pas valide. \#TODO
|
| 459 | 461 |
observe.validation.lengthLengthParameter.invalid.outputInputFormula=La formule n'est pas valide. \#TODO
|
| 460 |
-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
|
|
| 462 |
+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
|
|
| 461 | 463 |
observe.validation.lengthLengthParameter.null.inputSizeMeasureType=Le type de mensuration d'entrée n'est pas renseigné. \#TODO
|
| 462 | 464 |
observe.validation.lengthLengthParameter.null.ocean=No se ha seleccionado oceano.
|
| 463 | 465 |
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 |
| 470 | 472 |
observe.validation.lengthLengthParameter.required.startDate=fecha de comienzo de validez no especificada.
|
| 471 | 473 |
observe.validation.lengthWeightParameter.disabled.sizeMeasureType=Le type de mensuration sélectionné est désactivé. \#TODO
|
| 472 | 474 |
observe.validation.lengthWeightParameter.invalid.lengthWeightFormula=Relación de peso introducida no es coherente.
|
| 473 |
-observe.validation.lengthWeightParameter.invalid.uniqueKey=Tupla (especie/sexo/océano/sizeMeasureType/startDate) debe ser única, la tupla ya se ha usado. #TODO
|
|
| 475 |
+observe.validation.lengthWeightParameter.invalid.uniqueKey=Tupla (especie/sexo/océano/sizeMeasureType/startDate) debe ser única, la tupla ya se ha usado. \#TODO
|
|
| 474 | 476 |
observe.validation.lengthWeightParameter.invalid.weightLengthFormula=Relación de talla introducida no es coherente.
|
| 475 | 477 |
observe.validation.lengthWeightParameter.null.ocean=No se ha seleccionado oceano.
|
| 476 | 478 |
observe.validation.lengthWeightParameter.null.sizeMeasureType=Type de mensuration non renseigné. \#TODO
|
| ... | ... | @@ -44,6 +44,8 @@ observe.common.BranchlineDto.branchlineLength=Longueur Avançon (m) |
| 44 | 44 |
observe.common.BranchlineDto.hookSize=Taille d'hameçon
|
| 45 | 45 |
observe.common.BranchlineDto.hookType=Type d'hameçon
|
| 46 | 46 |
observe.common.BranchlineDto.settingIdentifier=Filage
|
| 47 |
+observe.common.BranchlineDto.snapWeight=Poids snap (kg)
|
|
| 48 |
+observe.common.BranchlineDto.swivelWeight=Poids de l'émerillon (kg)
|
|
| 47 | 49 |
observe.common.BranchlineDto.topType=Type partie supérieure
|
| 48 | 50 |
observe.common.BranchlineDto.tracelineLength=Partie basse (m)
|
| 49 | 51 |
observe.common.BranchlineDto.tracelineType=Type bas de ligne
|