Tony CHEMIT pushed to branch develop-7.x at ultreiaio / ird-observe

Commits:

20 changed files:

Changes:

  • client-core/src/main/i18n/getters/jaxx.getter
    ... ... @@ -608,8 +608,8 @@ observe.common.TdrDto.dataLocation
    608 608 
     observe.common.TdrDto.dataLocation.tip
    609 609 
     observe.common.TdrDto.deleteData
    610 610 
     observe.common.TdrDto.deleteData.tip
    611 
    -observe.common.TdrDto.deployementEnd
    612 
    -observe.common.TdrDto.deployementStart
    611 
    +observe.common.TdrDto.deploymentEnd
    612 
    +observe.common.TdrDto.deploymentStart
    613 613 
     observe.common.TdrDto.enableTimestamp
    614 614 
     observe.common.TdrDto.enableTimestamp.tip
    615 615 
     observe.common.TdrDto.exportData
    ... ... @@ -628,9 +628,9 @@ observe.common.TdrDto.keyDataTab
    628 628 
     observe.common.TdrDto.localisationTab
    629 629 
     observe.common.TdrDto.locationOnLongline
    630 630 
     observe.common.TdrDto.maxFishingDepth
    631 
    -observe.common.TdrDto.meanDeployementDepth
    631 
    +observe.common.TdrDto.meanDeploymentDepth
    632 632 
     observe.common.TdrDto.meanFishingDepth
    633 
    -observe.common.TdrDto.medianDeployementDepth
    633 
    +observe.common.TdrDto.medianDeploymentDepth
    634 634 
     observe.common.TdrDto.medianFishingDepth
    635 635 
     observe.common.TdrDto.minFishingDepth
    636 636 
     observe.common.TdrDto.section

  • client-core/src/main/java/fr/ird/observe/client/ui/content/data/longline/TdrUI.jaxx
    ... ... @@ -253,10 +253,10 @@
    253 253
    254 254 
                     <Table id='timestampPanel' fill='both' constraints='BorderLayout.CENTER' insets="0">
    255 255
    256 
    -                  <!-- deployementStart -->
    256 
    +                  <!-- deploymentStart -->
    257 257 
                       <row>
    258 258 
                         <cell weightx="1" fill="both">
    259 
    -                      <DateTimeEditor id='deployementStart' constructorParams='this'/>
    259 
    +                      <DateTimeEditor id='deploymentStart' constructorParams='this'/>
    260 260 
                         </cell>
    261 261 
                       </row>
    262 262 
                       <!-- fishingStart -->
    ... ... @@ -271,10 +271,10 @@
    271 271 
                           <DateTimeEditor id='fishingEnd' constructorParams='this'/>
    272 272 
                         </cell>
    273 273 
                       </row>
    274 
    -                  <!-- deployementEnd -->
    274 
    +                  <!-- deploymentEnd -->
    275 275 
                       <row>
    276 276 
                         <cell>
    277 
    -                      <DateTimeEditor id='deployementEnd' constructorParams='this'/>
    277 
    +                      <DateTimeEditor id='deploymentEnd' constructorParams='this'/>
    278 278 
                         </cell>
    279 279 
                       </row>
    280 280 
                     </Table>
    ... ... @@ -342,22 +342,22 @@
    342 342 
                         <NumberEditor id='medianFishingDepth' constructorParams='this' styleClass='float2'/>
    343 343 
                       </cell>
    344 344 
                     </row>
    345 
    -                <!-- meanDeployementDepth -->
    345 
    +                <!-- meanDeploymentDepth -->
    346 346 
                     <row>
    347 347 
                       <cell>
    348 
    -                    <JLabel id='meanDeployementDepthLabel'/>
    348 
    +                    <JLabel id='meanDeploymentDepthLabel'/>
    349 349 
                       </cell>
    350 350 
                       <cell weightx='1' anchor='east'>
    351 
    -                    <NumberEditor id='meanDeployementDepth' constructorParams='this' styleClass='float2'/>
    351 
    +                    <NumberEditor id='meanDeploymentDepth' constructorParams='this' styleClass='float2'/>
    352 352 
                       </cell>
    353 353 
                     </row>
    354 
    -                <!-- medianDeployementDepth -->
    354 
    +                <!-- medianDeploymentDepth -->
    355 355 
                     <row>
    356 356 
                       <cell>
    357 
    -                    <JLabel id='medianDeployementDepthLabel'/>
    357 
    +                    <JLabel id='medianDeploymentDepthLabel'/>
    358 358 
                       </cell>
    359 359 
                       <cell weightx='1' anchor='east'>
    360 
    -                    <NumberEditor id='medianDeployementDepth' constructorParams='this' styleClass='float2'/>
    360 
    +                    <NumberEditor id='medianDeploymentDepth' constructorParams='this' styleClass='float2'/>
    361 361 
                       </cell>
    362 362 
                     </row>
    363 363 
                   </Table>

  • client-core/src/main/java/fr/ird/observe/client/ui/content/data/longline/TdrUI.jcss
    ... ... @@ -154,14 +154,14 @@
    154 154 
       visible:{enableTimestamp.isSelected()};
    155 155 
     }
    156 156
    157 
    -#deployementStart {
    158 
    -  date:{tableEditBean.getDeployementStart()};
    159 
    -  propertyDate: {TdrDto.PROPERTY_DEPLOYEMENT_START};
    157 
    +#deploymentStart {
    158 
    +  date:{tableEditBean.getDeploymentStart()};
    159 
    +  propertyDate: {TdrDto.PROPERTY_DEPLOYMENT_START};
    160 160 
     }
    161 161
    162 
    -#deployementEnd {
    163 
    -  date:{tableEditBean.getDeployementEnd()};
    164 
    -  propertyDate: {TdrDto.PROPERTY_DEPLOYEMENT_END};
    162 
    +#deploymentEnd {
    163 
    +  date:{tableEditBean.getDeploymentEnd()};
    164 
    +  propertyDate: {TdrDto.PROPERTY_DEPLOYMENT_END};
    165 165 
     }
    166 166
    167 167 
     #fishingStart {
    ... ... @@ -192,14 +192,14 @@
    192 192 
       numberValue:{tableEditBean.getFishingEndDepth()};
    193 193 
     }
    194 194
    195 
    -#meanDeployementDepth {
    196 
    -  property:{TdrDto.PROPERTY_MEAN_DEPLOYEMENT_DEPTH};
    197 
    -  numberValue:{tableEditBean.getMeanDeployementDepth()};
    195 
    +#meanDeploymentDepth {
    196 
    +  property:{TdrDto.PROPERTY_MEAN_DEPLOYMENT_DEPTH};
    197 
    +  numberValue:{tableEditBean.getMeanDeploymentDepth()};
    198 198 
     }
    199 199
    200 
    -#medianDeployementDepth {
    201 
    -  property:{TdrDto.PROPERTY_MEDIAN_DEPLOYEMENT_DEPTH};
    202 
    -  numberValue:{tableEditBean.getMedianDeployementDepth()};
    200 
    +#medianDeploymentDepth {
    201 
    +  property:{TdrDto.PROPERTY_MEDIAN_DEPLOYMENT_DEPTH};
    202 
    +  numberValue:{tableEditBean.getMedianDeploymentDepth()};
    203 203 
     }
    204 204
    205 205 
     #minFishingDepth {

  • client-core/src/main/java/fr/ird/observe/client/ui/content/data/longline/TdrUIHandler.java
    ... ... @@ -202,8 +202,8 @@ public class TdrUIHandler extends ContentTableUIHandler<SetLonglineTdrDto, TdrDt
    202 202
    203 203 
             POSITION_HELPER_ENTRY.setContextValue(ui, positionHelper);
    204 204
    205 
    -        ui.getDeployementStart().getSliderHidor().addPropertyChangeListener(HidorButton.PROPERTY_TARGET_VISIBLE, onToogleTimeEditorSliderChangedListener);
    206 
    -        ui.getDeployementEnd().getSliderHidor().addPropertyChangeListener(HidorButton.PROPERTY_TARGET_VISIBLE, onToogleTimeEditorSliderChangedListener);
    205 
    +        ui.getDeploymentStart().getSliderHidor().addPropertyChangeListener(HidorButton.PROPERTY_TARGET_VISIBLE, onToogleTimeEditorSliderChangedListener);
    206 
    +        ui.getDeploymentEnd().getSliderHidor().addPropertyChangeListener(HidorButton.PROPERTY_TARGET_VISIBLE, onToogleTimeEditorSliderChangedListener);
    207 207 
             ui.getFishingStart().getSliderHidor().addPropertyChangeListener(HidorButton.PROPERTY_TARGET_VISIBLE, onToogleTimeEditorSliderChangedListener);
    208 208 
             ui.getFishingEnd().getSliderHidor().addPropertyChangeListener(HidorButton.PROPERTY_TARGET_VISIBLE, onToogleTimeEditorSliderChangedListener);
    209 209
    ... ... @@ -416,8 +416,8 @@ public class TdrUIHandler extends ContentTableUIHandler<SetLonglineTdrDto, TdrDt
    416 416
    417 417 
                     boolean selected = !newValue;
    418 418
    419 
    -                getUi().getDeployementStart().getSliderHidor().setSelected(selected);
    420 
    -                getUi().getDeployementStart().getSliderHidor().setTargetVisible(newValue);
    419 
    +                getUi().getDeploymentStart().getSliderHidor().setSelected(selected);
    420 
    +                getUi().getDeploymentStart().getSliderHidor().setTargetVisible(newValue);
    421 421
    422 422 
                     getUi().getFishingStart().getSliderHidor().setSelected(selected);
    423 423 
                     getUi().getFishingStart().getSliderHidor().setTargetVisible(newValue);
    ... ... @@ -425,8 +425,8 @@ public class TdrUIHandler extends ContentTableUIHandler<SetLonglineTdrDto, TdrDt
    425 425 
                     getUi().getFishingEnd().getSliderHidor().setSelected(selected);
    426 426 
                     getUi().getFishingEnd().getSliderHidor().setTargetVisible(newValue);
    427 427
    428 
    -                getUi().getDeployementEnd().getSliderHidor().setSelected(selected);
    429 
    -                getUi().getDeployementEnd().getSliderHidor().setTargetVisible(newValue);
    428 
    +                getUi().getDeploymentEnd().getSliderHidor().setSelected(selected);
    429 
    +                getUi().getDeploymentEnd().getSliderHidor().setTargetVisible(newValue);
    430 430
    431 431 
                 } finally {
    432 432
    ... ... @@ -440,8 +440,8 @@ public class TdrUIHandler extends ContentTableUIHandler<SetLonglineTdrDto, TdrDt
    440 440
    441 441 
         private void setTimestamp(TdrDto bean, Date timestamp) {
    442 442
    443 
    -        bean.setDeployementStart(timestamp);
    444 
    -        bean.setDeployementEnd(timestamp);
    443 
    +        bean.setDeploymentStart(timestamp);
    444 
    +        bean.setDeploymentEnd(timestamp);
    445 445 
             bean.setFishingStart(timestamp);
    446 446 
             bean.setFishingEnd(timestamp);
    447 447

  • client-core/src/main/java/fr/ird/observe/client/ui/content/data/longline/TdrUIModel.java
    ... ... @@ -62,8 +62,8 @@ public class TdrUIModel extends ContentTableUIModel<SetLonglineTdrDto, TdrDto> {
    62 62
    63 63
    64 64 
         public static final Set<String> TIMESTAMP_TAB_PROPERTIES =
    65 
    -            ImmutableSet.<String>builder().add(TdrDto.PROPERTY_DEPLOYEMENT_START,
    66 
    -                                               TdrDto.PROPERTY_DEPLOYEMENT_END,
    65 
    +            ImmutableSet.<String>builder().add(TdrDto.PROPERTY_DEPLOYMENT_START,
    66 
    +                                               TdrDto.PROPERTY_DEPLOYMENT_END,
    67 67 
                                                    TdrDto.PROPERTY_FISHING_START,
    68 68 
                                                    TdrDto.PROPERTY_FISHING_END
    69 69 
                 ).build();
    ... ... @@ -71,8 +71,8 @@ public class TdrUIModel extends ContentTableUIModel<SetLonglineTdrDto, TdrDto> {
    71 71 
         public static final Set<String> KEY_DATA_TAB_PROPERTIES =
    72 72 
                 ImmutableSet.<String>builder().add(TdrDto.PROPERTY_FISHING_START_DEPTH,
    73 73 
                                                    TdrDto.PROPERTY_FISHING_END_DEPTH,
    74 
    -                                               TdrDto.PROPERTY_MEAN_DEPLOYEMENT_DEPTH,
    75 
    -                                               TdrDto.PROPERTY_MEDIAN_DEPLOYEMENT_DEPTH,
    74 
    +                                               TdrDto.PROPERTY_MEAN_DEPLOYMENT_DEPTH,
    75 
    +                                               TdrDto.PROPERTY_MEDIAN_DEPLOYMENT_DEPTH,
    76 76 
                                                    TdrDto.PROPERTY_MEAN_FISHING_DEPTH,
    77 77 
                                                    TdrDto.PROPERTY_MEDIAN_FISHING_DEPTH,
    78 78 
                                                    TdrDto.PROPERTY_MIN_FISHING_DEPTH,
    ... ... @@ -129,16 +129,16 @@ public class TdrUIModel extends ContentTableUIModel<SetLonglineTdrDto, TdrDto> {
    129 129 
                           TdrDto.PROPERTY_FLOATLINE2_LENGTH,
    130 130
    131 131 
                           // timestamp tab
    132 
    -                      TdrDto.PROPERTY_DEPLOYEMENT_START,
    133 
    -                      TdrDto.PROPERTY_DEPLOYEMENT_END,
    132 
    +                      TdrDto.PROPERTY_DEPLOYMENT_START,
    133 
    +                      TdrDto.PROPERTY_DEPLOYMENT_END,
    134 134 
                           TdrDto.PROPERTY_FISHING_START,
    135 135 
                           TdrDto.PROPERTY_FISHING_END,
    136 136
    137 137 
                           // key data tab
    138 138 
                           TdrDto.PROPERTY_FISHING_START_DEPTH,
    139 139 
                           TdrDto.PROPERTY_FISHING_END_DEPTH,
    140 
    -                      TdrDto.PROPERTY_MEAN_DEPLOYEMENT_DEPTH,
    141 
    -                      TdrDto.PROPERTY_MEDIAN_DEPLOYEMENT_DEPTH,
    140 
    +                      TdrDto.PROPERTY_MEAN_DEPLOYMENT_DEPTH,
    141 
    +                      TdrDto.PROPERTY_MEDIAN_DEPLOYMENT_DEPTH,
    142 142 
                           TdrDto.PROPERTY_MEAN_FISHING_DEPTH,
    143 143 
                           TdrDto.PROPERTY_MEDIAN_FISHING_DEPTH,
    144 144 
                           TdrDto.PROPERTY_MIN_FISHING_DEPTH,

  • dto/src/main/models/Observe.model
    ... ... @@ -310,14 +310,14 @@ floatline1Length + {*:1} Float | strictlyPositiveNumber
    310 310 
     floatline2Length + {*:1} Float | strictlyPositiveNumber
    311 311 
     serialNo + {*:1} String
    312 312 
     hasData + {*:1} boolean
    313 
    -deployementStart + {*:1} Date
    314 
    -deployementEnd + {*:1} Date
    313 
    +deploymentStart + {*:1} Date
    314 
    +deploymentEnd + {*:1} Date
    315 315 
     fishingStart + {*:1} Date
    316 316 
     fishingEnd + {*:1} Date
    317 317 
     fishingStartDepth + {*:1} Float | strictlyPositiveNumber
    318 318 
     fishingEndDepth + {*:1} Float | strictlyPositiveNumber
    319 
    -meanDeployementDepth + {*:1} Float | strictlyPositiveNumber
    320 
    -medianDeployementDepth + {*:1} Float | strictlyPositiveNumber
    319 
    +meanDeploymentDepth + {*:1} Float | strictlyPositiveNumber
    320 
    +medianDeploymentDepth + {*:1} Float | strictlyPositiveNumber
    321 321 
     minFishingDepth + {*:1} Float | strictlyPositiveNumber
    322 322 
     maxFishingDepth + {*:1} Float | strictlyPositiveNumber
    323 323 
     meanFishingDepth + {*:1} Float | strictlyPositiveNumber

  • observe-i18n/src/main/i18n/translations/observe_en_GB.properties
    ... ... @@ -1489,8 +1489,8 @@ observe.common.TdrDto.dataLocation.tip=Data location
    1489 1489 
     observe.common.TdrDto.delete.data.message=Confirm to delete saved data
    1490 1490 
     observe.common.TdrDto.deleteData=Delete
    1491 1491 
     observe.common.TdrDto.deleteData.tip=Delete data
    1492 
    -observe.common.TdrDto.deployementEnd=Deployement end
    1493 
    -observe.common.TdrDto.deployementStart=Deployement start
    1492 
    +observe.common.TdrDto.deploymentEnd=Deployement end
    1493 
    +observe.common.TdrDto.deploymentStart=Deployement start
    1494 1494 
     observe.common.TdrDto.enableTimestamp=Use timestamp
    1495 1495 
     observe.common.TdrDto.enableTimestamp.tip=Use timestamp for this recorder
    1496 1496 
     observe.common.TdrDto.exportData=Export
    ... ... @@ -1510,9 +1510,9 @@ observe.common.TdrDto.keyDataTab=Data keys
    1510 1510 
     observe.common.TdrDto.localisationTab=Localisation
    1511 1511 
     observe.common.TdrDto.locationOnLongline=Location on longline
    1512 1512 
     observe.common.TdrDto.maxFishingDepth=Maximum fishing depth (m)
    1513 
    -observe.common.TdrDto.meanDeployementDepth=Mean deployement depth (m)
    1513 
    +observe.common.TdrDto.meanDeploymentDepth=Mean deployement depth (m)
    1514 1514 
     observe.common.TdrDto.meanFishingDepth=Maximum fishing depth (m)
    1515 
    -observe.common.TdrDto.medianDeployementDepth=Median deployement depth (m)
    1515 
    +observe.common.TdrDto.medianDeploymentDepth=Median deployement depth (m)
    1516 1516 
     observe.common.TdrDto.medianFishingDepth=Median fishing depth (m)
    1517 1517 
     observe.common.TdrDto.minFishingDepth=Minimum fishing depth (m)
    1518 1518 
     observe.common.TdrDto.replace.data.message=Confirm to replace existing data file «%s»
    ... ... @@ -2312,8 +2312,8 @@ observe.validation.species.weight.bound=Weight must be bound between %s and %s.
    2312 2312 
     observe.validation.targetCatch.uniqueKey=Tuple (weight category - well) must be unique.
    2313 2313 
     observe.validation.targetDiscarded.uniqueKey=Tuple (species - category - reasonForDiscard - brought on deck) must be unique.
    2314 2314 
     observe.validation.targetLength.required.weight.or.taille=Weight or size must be filled.
    2315 
    -observe.validation.tdr.deployementStart.before.fishingStart=fishing start time must be before deployement start time.
    2316 
    -observe.validation.tdr.fishingEnd.before.deployementEnd=Deployement end time must be before fishing end time.
    2315 
    +observe.validation.tdr.deploymentStart.before.fishingStart=fishing start time must be before deployement start time.
    2316 
    +observe.validation.tdr.fishingEnd.before.deploymentEnd=Deployement end time must be before fishing end time.
    2317 2317 
     observe.validation.tdr.fishingStart.before.fishingEnd=Fishing end time must be before fishing start time.
    2318 2318 
     observe.validation.tdr.required.position=Position must be filled.
    2319 2319 
     observe.validation.technology.too.big=Field size can not exceed %s characters (actual length\: %s).

  • observe-i18n/src/main/i18n/translations/observe_es_ES.properties
    ... ... @@ -1489,8 +1489,8 @@ observe.common.TdrDto.dataLocation.tip=Ubicación del archivo de datos
    1489 1489 
     observe.common.TdrDto.delete.data.message=Confirmar la eliminación del archivo de datos
    1490 1490 
     observe.common.TdrDto.deleteData=Eliminar
    1491 1491 
     observe.common.TdrDto.deleteData.tip=Eliminar el archivo de datos
    1492 
    -observe.common.TdrDto.deployementEnd=Fin de despliegue
    1493 
    -observe.common.TdrDto.deployementStart=Inicio de despliegue
    1492 
    +observe.common.TdrDto.deploymentEnd=Fin de despliegue
    1493 
    +observe.common.TdrDto.deploymentStart=Inicio de despliegue
    1494 1494 
     observe.common.TdrDto.enableTimestamp=Activar la FechaHora
    1495 1495 
     observe.common.TdrDto.enableTimestamp.tip=Activar la FechaHora para este registro
    1496 1496 
     observe.common.TdrDto.exportData=Exportar
    ... ... @@ -1510,9 +1510,9 @@ observe.common.TdrDto.keyDataTab=Datos clave
    1510 1510 
     observe.common.TdrDto.localisationTab=Localización
    1511 1511 
     observe.common.TdrDto.locationOnLongline=Localización sobre la línea
    1512 1512 
     observe.common.TdrDto.maxFishingDepth=Profundidad máxima de pesca (m)
    1513 
    -observe.common.TdrDto.meanDeployementDepth=Profundidad media de despliegue (m)
    1513 
    +observe.common.TdrDto.meanDeploymentDepth=Profundidad media de despliegue (m)
    1514 1514 
     observe.common.TdrDto.meanFishingDepth=Profundidad media de pesca (m)
    1515 
    -observe.common.TdrDto.medianDeployementDepth=Profundidad mediana de despliegue (m)
    1515 
    +observe.common.TdrDto.medianDeploymentDepth=Profundidad mediana de despliegue (m)
    1516 1516 
     observe.common.TdrDto.medianFishingDepth=Profundidad mediana de pesca (m)
    1517 1517 
     observe.common.TdrDto.minFishingDepth=Profundidad mínima de pesca (m)
    1518 1518 
     observe.common.TdrDto.replace.data.message=Confirmar la sustitución del archivo existente «%s»
    ... ... @@ -2312,8 +2312,8 @@ observe.validation.species.weight.bound=El peso para esta especie debe estar com
    2312 2312 
     observe.validation.targetCatch.uniqueKey=El par categoría de peso-cuba debe ser único.
    2313 2313 
     observe.validation.targetDiscarded.uniqueKey=La serie especie / categoria / causa del descarte / izado a bordo debe ser única. Esta serie ya se ha usado
    2314 2314 
     observe.validation.targetLength.required.weight.or.taille=Al menos uno de los valores (talla / peso) debe ser registrado
    2315 
    -observe.validation.tdr.deployementStart.before.fishingStart=La FechaHora de inicio de pesca debe llegar después de la FechaHora de inicio de despliegue
    2316 
    -observe.validation.tdr.fishingEnd.before.deployementEnd=La FechaHora de fin de despliegue debe ir después de la FechaHora de fin de pesca
    2315 
    +observe.validation.tdr.deploymentStart.before.fishingStart=La FechaHora de inicio de pesca debe llegar después de la FechaHora de inicio de despliegue
    2316 
    +observe.validation.tdr.fishingEnd.before.deploymentEnd=La FechaHora de fin de despliegue debe ir después de la FechaHora de fin de pesca
    2317 2317 
     observe.validation.tdr.fishingStart.before.fishingEnd=La FechaHora de fin de pesca debe llegar después del inicio del de inicio de pesca
    2318 2318 
     observe.validation.tdr.required.position=Deben registrarse posiciones
    2319 2319 
     observe.validation.technology.too.big=El tamaño está limitado a %s caracteres (tamaño actual\: %s).

  • observe-i18n/src/main/i18n/translations/observe_fr_FR.properties
    ... ... @@ -1489,8 +1489,8 @@ observe.common.TdrDto.dataLocation.tip=Hébergement du fichier de données
    1489 1489 
     observe.common.TdrDto.delete.data.message=Confirmer la suppression du fichier de données
    1490 1490 
     observe.common.TdrDto.deleteData=Supprimer
    1491 1491 
     observe.common.TdrDto.deleteData.tip=Supprimer le fichier de données
    1492 
    -observe.common.TdrDto.deployementEnd=Fin déploiement
    1493 
    -observe.common.TdrDto.deployementStart=Début déploiement
    1492 
    +observe.common.TdrDto.deploymentEnd=Fin déploiement
    1493 
    +observe.common.TdrDto.deploymentStart=Début déploiement
    1494 1494 
     observe.common.TdrDto.enableTimestamp=Activer l'horodatage
    1495 1495 
     observe.common.TdrDto.enableTimestamp.tip=Activer l'horodatage pour cet enregistreur
    1496 1496 
     observe.common.TdrDto.exportData=Exporter
    ... ... @@ -1510,9 +1510,9 @@ observe.common.TdrDto.keyDataTab=Données clef
    1510 1510 
     observe.common.TdrDto.localisationTab=Localisation
    1511 1511 
     observe.common.TdrDto.locationOnLongline=Localisation sur la ligne
    1512 1512 
     observe.common.TdrDto.maxFishingDepth=Profondeur maximale de pêche (m)
    1513 
    -observe.common.TdrDto.meanDeployementDepth=Profondeur moyenne de déploiement (m)
    1513 
    +observe.common.TdrDto.meanDeploymentDepth=Profondeur moyenne de déploiement (m)
    1514 1514 
     observe.common.TdrDto.meanFishingDepth=Profondeur moyenne de pêche (m)
    1515 
    -observe.common.TdrDto.medianDeployementDepth=Profondeur médiane de déploiement (m)
    1515 
    +observe.common.TdrDto.medianDeploymentDepth=Profondeur médiane de déploiement (m)
    1516 1516 
     observe.common.TdrDto.medianFishingDepth=Profondeur médiane de pêche (m)
    1517 1517 
     observe.common.TdrDto.minFishingDepth=Profondeur minimale de pêche (m)
    1518 1518 
     observe.common.TdrDto.replace.data.message=Confirmer le remplacement du fichier de données déjà existant «%s»
    ... ... @@ -2312,8 +2312,8 @@ observe.validation.species.weight.bound=Le poids pour cette espèce doit être c
    2312 2312 
     observe.validation.targetCatch.uniqueKey=Le couple (catégorie poids - cuve) doit être unique.
    2313 2313 
     observe.validation.targetDiscarded.uniqueKey=Le tuple (espèce - catégorie - raison rejet - monté sur le pont) doit être unique.
    2314 2314 
     observe.validation.targetLength.required.weight.or.taille=Au moins une des valeurs (taille / poids) doit être renseignée.
    2315 
    -observe.validation.tdr.deployementStart.before.fishingStart=L'horodatage de début de pêche doit être après le début de celui de début de déploiement.
    2316 
    -observe.validation.tdr.fishingEnd.before.deployementEnd=L'horodatage de fin de déploiement doit être après le début de celui de fin de pêche.
    2315 
    +observe.validation.tdr.deploymentStart.before.fishingStart=L'horodatage de début de pêche doit être après le début de celui de début de déploiement.
    2316 
    +observe.validation.tdr.fishingEnd.before.deploymentEnd=L'horodatage de fin de déploiement doit être après le début de celui de fin de pêche.
    2317 2317 
     observe.validation.tdr.fishingStart.before.fishingEnd=L'horodatage de fin de pêche doit être après le début de celui de début de pêche.
    2318 2318 
     observe.validation.tdr.required.position=Pas de position renseignée sur la palangre.
    2319 2319 
     observe.validation.technology.too.big=La taille du champs est limitée à %s caractères (taille actuelle %s).

  • persistence/src/main/java/fr/ird/observe/binder/data/longline/TdrEntityDtoBinder.java
    ... ... @@ -59,14 +59,14 @@ public class TdrEntityDtoBinder extends DataEntityDtoBinderSupport<TdrDto, Tdr>
    59 59 
                 entity.setDataFilename(null);
    60 60 
             }
    61 61 
             entity.setDataLocation(dto.getDataLocation());
    62 
    -        entity.setDeployementStart(dto.getDeployementStart());
    63 
    -        entity.setDeployementEnd(dto.getDeployementEnd());
    62 
    +        entity.setDeploymentStart(dto.getDeploymentStart());
    63 
    +        entity.setDeploymentEnd(dto.getDeploymentEnd());
    64 64 
             entity.setFishingStart(dto.getFishingStart());
    65 65 
             entity.setFishingEnd(dto.getFishingEnd());
    66 66 
             entity.setFishingStartDepth(dto.getFishingStartDepth());
    67 67 
             entity.setFishingEndDepth(dto.getFishingEndDepth());
    68 
    -        entity.setMeanDeployementDepth(dto.getMeanDeployementDepth());
    69 
    -        entity.setMedianDeployementDepth(dto.getMedianDeployementDepth());
    68 
    +        entity.setMeanDeploymentDepth(dto.getMeanDeploymentDepth());
    69 
    +        entity.setMedianDeploymentDepth(dto.getMedianDeploymentDepth());
    70 70 
             entity.setMinFishingDepth(dto.getMinFishingDepth());
    71 71 
             entity.setMaxFishingDepth(dto.getMaxFishingDepth());
    72 72 
             entity.setMeanFishingDepth(dto.getMeanFishingDepth());
    ... ... @@ -96,14 +96,14 @@ public class TdrEntityDtoBinder extends DataEntityDtoBinderSupport<TdrDto, Tdr>
    96 96 
             // le champ data ne sert que pour l'upload du fichier si il a changé
    97 97 
             dto.setData(null);
    98 98 
             dto.setDataLocation(entity.getDataLocation());
    99 
    -        dto.setDeployementStart(entity.getDeployementStart());
    100 
    -        dto.setDeployementEnd(entity.getDeployementEnd());
    99 
    +        dto.setDeploymentStart(entity.getDeploymentStart());
    100 
    +        dto.setDeploymentEnd(entity.getDeploymentEnd());
    101 101 
             dto.setFishingStart(entity.getFishingStart());
    102 102 
             dto.setFishingEnd(entity.getFishingEnd());
    103 103 
             dto.setFishingStartDepth(entity.getFishingStartDepth());
    104 104 
             dto.setFishingEndDepth(entity.getFishingEndDepth());
    105 
    -        dto.setMeanDeployementDepth(entity.getMeanDeployementDepth());
    106 
    -        dto.setMedianDeployementDepth(entity.getMedianDeployementDepth());
    105 
    +        dto.setMeanDeploymentDepth(entity.getMeanDeploymentDepth());
    106 
    +        dto.setMedianDeploymentDepth(entity.getMedianDeploymentDepth());
    107 107 
             dto.setMinFishingDepth(entity.getMinFishingDepth());
    108 108 
             dto.setMaxFishingDepth(entity.getMaxFishingDepth());
    109 109 
             dto.setMeanFishingDepth(entity.getMeanFishingDepth());

  • persistence/src/main/java/fr/ird/observe/entities/longline/TdrImpl.java
    ... ... @@ -31,23 +31,23 @@ public class TdrImpl extends TdrAbstract {
    31 31 
         private static final long serialVersionUID = 1L;
    32 32
    33 33 
         @Override
    34 
    -    public Date getDeployementStartDate() {
    35 
    -        return deployementStart == null ? null : DateUtil.getDay(deployementStart);
    34 
    +    public Date getDeploymentStartDate() {
    35 
    +        return deploymentStart == null ? null : DateUtil.getDay(deploymentStart);
    36 36 
         }
    37 37
    38 38 
         @Override
    39 
    -    public Date getDeployementStartTime() {
    40 
    -        return deployementStart == null ? null : DateUtil.getTime(deployementStart, false, false);
    39 
    +    public Date getDeploymentStartTime() {
    40 
    +        return deploymentStart == null ? null : DateUtil.getTime(deploymentStart, false, false);
    41 41 
         }
    42 42
    43 43 
         @Override
    44 
    -    public Date getDeployementEndDate() {
    45 
    -        return deployementEnd == null ? null : DateUtil.getDay(deployementEnd);
    44 
    +    public Date getDeploymentEndDate() {
    45 
    +        return deploymentEnd == null ? null : DateUtil.getDay(deploymentEnd);
    46 46 
         }
    47 47
    48 48 
         @Override
    49 
    -    public Date getDeployementEndTime() {
    50 
    -        return deployementEnd == null ? null : DateUtil.getTime(deployementEnd, false, false);
    49 
    +    public Date getDeploymentEndTime() {
    50 
    +        return deploymentEnd == null ? null : DateUtil.getTime(deploymentEnd, false, false);
    51 51 
         }
    52 52
    53 53 
         @Override
    ... ... @@ -71,34 +71,34 @@ public class TdrImpl extends TdrAbstract {
    71 71 
         }
    72 72
    73 73 
         @Override
    74 
    -    public void setDeployementStartDate(Date date) {
    75 
    -        if (deployementStart != null) {
    76 
    -            Date dateAndTime = DateUtil.getDateAndTime(date, deployementStart, true, false);
    77 
    -            setDeployementStart(dateAndTime);
    74 
    +    public void setDeploymentStartDate(Date date) {
    75 
    +        if (deploymentStart != null) {
    76 
    +            Date dateAndTime = DateUtil.getDateAndTime(date, deploymentStart, true, false);
    77 
    +            setDeploymentStart(dateAndTime);
    78 78 
             }
    79 79 
         }
    80 80
    81 81 
         @Override
    82 
    -    public void setDeployementStartTime(Date time) {
    83 
    -        if (deployementStart != null) {
    84 
    -            Date dateAndTime = DateUtil.getDateAndTime(deployementStart, time, false, false);
    85 
    -            setDeployementStart(dateAndTime);
    82 
    +    public void setDeploymentStartTime(Date time) {
    83 
    +        if (deploymentStart != null) {
    84 
    +            Date dateAndTime = DateUtil.getDateAndTime(deploymentStart, time, false, false);
    85 
    +            setDeploymentStart(dateAndTime);
    86 86 
             }
    87 87 
         }
    88 88
    89 89 
         @Override
    90 
    -    public void setDeployementEndDate(Date date) {
    91 
    -        if (deployementEnd != null) {
    92 
    -            Date dateAndTime = DateUtil.getDateAndTime(date, deployementEnd, true, false);
    93 
    -            setDeployementEnd(dateAndTime);
    90 
    +    public void setDeploymentEndDate(Date date) {
    91 
    +        if (deploymentEnd != null) {
    92 
    +            Date dateAndTime = DateUtil.getDateAndTime(date, deploymentEnd, true, false);
    93 
    +            setDeploymentEnd(dateAndTime);
    94 94 
             }
    95 95 
         }
    96 96
    97 97 
         @Override
    98 
    -    public void setDeployementEndTime(Date time) {
    99 
    -        if (deployementEnd != null) {
    100 
    -            Date dateAndTime = DateUtil.getDateAndTime(deployementEnd, time, false, false);
    101 
    -            setDeployementEnd(dateAndTime);
    98 
    +    public void setDeploymentEndTime(Date time) {
    99 
    +        if (deploymentEnd != null) {
    100 
    +            Date dateAndTime = DateUtil.getDateAndTime(deploymentEnd, time, false, false);
    101 
    +            setDeploymentEnd(dateAndTime);
    102 102 
             }
    103 103 
         }
    104 104

  • persistence/src/main/models/Observe.model
    ... ... @@ -291,7 +291,7 @@ longline.SizeMeasure > ObserveDataEntity | entity
    291 291 
     size + {*:1} Float | sqlType=numeric
    292 292 
     sizeMeasureType {*:1} referentiel.SizeMeasureType
    293 293
    294 
    -longline.Tdr > ObserveDataEntity >> longline.LonglinePositionAware | entity constants=deployementStartDate,deployementStartTime,deployementEndDate,deployementEndTime,fishingStartDate,fishingStartTime,fishingEndDate,fishingEndTime
    294 
    +longline.Tdr > ObserveDataEntity >> longline.LonglinePositionAware | entity constants=deploymentStartDate,deploymentStartTime,deploymentEndDate,deploymentEndTime,fishingStartDate,fishingStartTime,fishingEndDate,fishingEndTime
    295 295 
     homeId + {*:1} String
    296 296 
     floatline1Length + {*:1} Float | sqlType=numeric
    297 297 
     floatline2Length + {*:1} Float | sqlType=numeric
    ... ... @@ -299,14 +299,14 @@ serialNo + {*:1} String
    299 299 
     data + {*:1} !java.sql.Blob
    300 300 
     dataFilename + {*:1} String
    301 301 
     dataLocation + {*:1} String
    302 
    -deployementStart + {*:1} Date
    303 
    -deployementEnd + {*:1} Date
    302 
    +deploymentStart + {*:1} Date
    303 
    +deploymentEnd + {*:1} Date
    304 304 
     fishingStart + {*:1} Date
    305 305 
     fishingEnd + {*:1} Date
    306 306 
     fishingStartDepth + {*:1} Float
    307 307 
     fishingEndDepth + {*:1} Float
    308 
    -meanDeployementDepth + {*:1} Float
    309 
    -medianDeployementDepth + {*:1} Float
    308 
    +meanDeploymentDepth + {*:1} Float
    309 
    +medianDeploymentDepth + {*:1} Float
    310 310 
     minFishingDepth + {*:1} Float
    311 311 
     maxFishingDepth + {*:1} Float
    312 312 
     meanFishingDepth + {*:1} Float
    ... ... @@ -319,18 +319,18 @@ section {*:0..1} longline.Section
    319 319 
     basket {*:0..1} longline.Basket
    320 320 
     itemHorizontalPosition {*:0..1} referentiel.longline.ItemHorizontalPosition
    321 321 
     itemVerticalPosition {*:0..1} referentiel.longline.ItemVerticalPosition
    322 
    -getDeployementStartDate() Date
    323 
    -getDeployementStartTime() Date
    324 
    -getDeployementEndDate() Date
    325 
    -getDeployementEndTime() Date
    322 
    +getDeploymentStartDate() Date
    323 
    +getDeploymentStartTime() Date
    324 
    +getDeploymentEndDate() Date
    325 
    +getDeploymentEndTime() Date
    326 326 
     getFishingStartDate() Date
    327 327 
     getFishingStartTime() Date
    328 328 
     getFishingEndDate() Date
    329 329 
     getFishingEndTime() Date
    330 
    -setDeployementStartDate(date Date)
    331 
    -setDeployementEndDate(date Date)
    332 
    -setDeployementStartTime(time Date)
    333 
    -setDeployementEndTime(time Date)
    330 
    +setDeploymentStartDate(date Date)
    331 
    +setDeploymentEndDate(date Date)
    332 
    +setDeploymentStartTime(time Date)
    333 
    +setDeploymentEndTime(time Date)
    334 334 
     setFishingStartDate(date Date)
    335 335 
     setFishingStartTime(time Date)
    336 336 
     setFishingEndDate(date Date)

  • test/src/main/resources/db/7.5/dataForTestLongline.sql.gz
    No preview for this file type
  • test/src/main/resources/db/7.5/dataForTestSeine.sql.gz
    No preview for this file type
  • test/src/main/resources/db/7.5/empty_h2.sql.gz
    No preview for this file type
  • test/src/main/resources/db/7.5/empty_pg.sql.gz
    No preview for this file type
  • test/src/main/resources/db/7.5/referentiel.sql.gz
    No preview for this file type
  • validation/src/main/i18n/getters/validation-fields.getter
    ... ... @@ -248,7 +248,7 @@ observe.common.TargetLengthDto.length
    248 248 
     observe.common.TargetLengthDto.weight
    249 249 
     observe.common.TdrDto.basket
    250 250 
     observe.common.TdrDto.branchline
    251 
    -observe.common.TdrDto.deployementEnd
    251 
    +observe.common.TdrDto.deploymentEnd
    252 252 
     observe.common.TdrDto.fishingEnd
    253 253 
     observe.common.TdrDto.fishingEndDepth
    254 254 
     observe.common.TdrDto.fishingStart
    ... ... @@ -258,9 +258,9 @@ observe.common.TdrDto.floatline2Length
    258 258 
     observe.common.TdrDto.itemHorizontalPosition
    259 259 
     observe.common.TdrDto.itemVerticalPosition
    260 260 
     observe.common.TdrDto.maxFishingDepth
    261 
    -observe.common.TdrDto.meanDeployementDepth
    261 
    +observe.common.TdrDto.meanDeploymentDepth
    262 262 
     observe.common.TdrDto.meanFishingDepth
    263 
    -observe.common.TdrDto.medianDeployementDepth
    263 
    +observe.common.TdrDto.medianDeploymentDepth
    264 264 
     observe.common.TdrDto.medianFishingDepth
    265 265 
     observe.common.TdrDto.minFishingDepth
    266 266 
     observe.common.TdrDto.section

  • validation/src/main/i18n/getters/validation-messages.getter
    ... ... @@ -56,8 +56,8 @@ observe.validation.species.weight.bound
    56 56 
     observe.validation.targetCatch.uniqueKey
    57 57 
     observe.validation.targetDiscarded.uniqueKey
    58 58 
     observe.validation.targetLength.required.weight.or.taille
    59 
    -observe.validation.tdr.deployementStart.before.fishingStart
    60 
    -observe.validation.tdr.fishingEnd.before.deployementEnd
    59 
    +observe.validation.tdr.deploymentStart.before.fishingStart
    60 
    +observe.validation.tdr.fishingEnd.before.deploymentEnd
    61 61 
     observe.validation.tdr.fishingStart.before.fishingEnd
    62 62 
     observe.validation.tdr.required.position
    63 63 
     observe.validation.technology.too.big

  • validation/src/main/resources/fr/ird/observe/dto/data/longline/TdrDto-update-error-validation.xml
    ... ... @@ -24,12 +24,12 @@
    24 24 
         "http://struts.apache.org/dtds/xwork-validator-1.0.3.dtd">
    25 25 
     <validators>
    26 26 
       <field name="fishingStart">
    27 
    -    <!-- deployementStart < fishingStart -->
    27 
    +    <!-- deploymentStart < fishingStart -->
    28 28 
         <field-validator type="fieldexpression" short-circuit="true">
    29 29 
           <param name="expression">
    30 
    -        <![CDATA[ deployementStart == null || fishingStart == null || deployementStart.time < fishingStart.time ]]>
    30 
    +        <![CDATA[ deploymentStart == null || fishingStart == null || deploymentStart.time < fishingStart.time ]]>
    31 31 
           </param>
    32 
    -      <message>observe.validation.tdr.deployementStart.before.fishingStart</message>
    32 
    +      <message>observe.validation.tdr.deploymentStart.before.fishingStart</message>
    33 33 
         </field-validator>
    34 34 
       </field>
    35 35 
       <field name="fishingEnd">
    ... ... @@ -41,13 +41,13 @@
    41 41 
           <message>observe.validation.tdr.fishingStart.before.fishingEnd</message>
    42 42 
         </field-validator>
    43 43 
       </field>
    44 
    -  <field name="deployementEnd">
    45 
    -    <!-- fishingEnd < deployementEnd -->
    44 
    +  <field name="deploymentEnd">
    45 
    +    <!-- fishingEnd < deploymentEnd -->
    46 46 
         <field-validator type="fieldexpression" short-circuit="true">
    47 47 
           <param name="expression">
    48 
    -        <![CDATA[ fishingEnd == null || deployementEnd == null || fishingEnd.time < deployementEnd.time ]]>
    48 
    +        <![CDATA[ fishingEnd == null || deploymentEnd == null || fishingEnd.time < deploymentEnd.time ]]>
    49 49 
           </param>
    50 
    -      <message>observe.validation.tdr.fishingEnd.before.deployementEnd</message>
    50 
    +      <message>observe.validation.tdr.fishingEnd.before.deploymentEnd</message>
    51 51 
         </field-validator>
    52 52 
       </field>
    53 53 
     </validators>

    • —
    View it on GitLab.
    You're receiving this email because of your account on gitlab.com. If you'd like to receive fewer emails, you can adjust your notification settings.