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

Commits:

23 changed files:

Changes:

  • client/src/main/java/fr/ird/observe/client/ui/content/data/longline/logbook/ActivityLonglineLogbookUI.jaxx
    ... ... @@ -113,12 +113,41 @@
    113 113
           </row>
    
    114 114
     
    
    115 115
           <!-- vitesse vessel -->
    
    116
    +      <row>
    
    117
    +        <cell anchor='west'>
    
    118
    +          <JLabel id='windSpeedLabel'/>
    
    119
    +        </cell>
    
    120
    +        <cell anchor='east' weightx="1" fill="both">
    
    121
    +          <NumberEditor id='windSpeed' constructorParams='this' styleClass="float2"/>
    
    122
    +        </cell>
    
    123
    +      </row>
    
    124
    +
    
    125
    +      <!-- direction du vent -->
    
    126
    +      <row>
    
    127
    +        <cell anchor='west'>
    
    128
    +          <JLabel id='windDirectionLabel'/>
    
    129
    +        </cell>
    
    130
    +        <cell anchor='east' weightx="1" fill="both">
    
    131
    +          <NumberEditor id='windDirection' constructorParams='this' styleClass="int6"/>
    
    132
    +        </cell>
    
    133
    +      </row>
    
    134
    +      <!-- vitesse du courant -->
    
    116 135
           <row>
    
    117 136
             <cell anchor='west'>
    
    118 137
               <JLabel id='currentSpeedLabel'/>
    
    119 138
             </cell>
    
    120 139
             <cell anchor='east' weightx="1" fill="both">
    
    121
    -          <NumberEditor id='currentSpeed' constructorParams='this' styleClass="float2"/>
    
    140
    +          <NumberEditor id='currentSpeed' constructorParams='this' styleClass="float1"/>
    
    141
    +        </cell>
    
    142
    +      </row>
    
    143
    +
    
    144
    +      <!--  direction du courant -->
    
    145
    +      <row>
    
    146
    +        <cell anchor='west'>
    
    147
    +          <JLabel id='currentDirectionLabel'/>
    
    148
    +        </cell>
    
    149
    +        <cell anchor='east' weightx="1" fill="both">
    
    150
    +          <NumberEditor id='currentDirection' constructorParams='this' styleClass="int6"/>
    
    122 151
             </cell>
    
    123 152
           </row>
    
    124 153
     
    

  • client/src/main/java/fr/ird/observe/client/ui/content/data/longline/logbook/ActivityLonglineLogbookUI.jcss
    ... ... @@ -57,6 +57,26 @@
    57 57
       storageTemperature:{bean.getSeaSurfaceTemperature()};
    
    58 58
     }
    
    59 59
     
    
    60
    +#currentSpeed {
    
    61
    +  property:{ActivityLonglineLogbookDto.PROPERTY_CURRENT_SPEED};
    
    62
    +  numberValue:{bean.getCurrentSpeed()};
    
    63
    +}
    
    64
    +
    
    65
    +#currentDirection {
    
    66
    +  property:{ActivityLonglineLogbookDto.PROPERTY_CURRENT_DIRECTION};
    
    67
    +  numberValue:{bean.getCurrentDirection()};
    
    68
    +}
    
    69
    +
    
    70
    +#windSpeed {
    
    71
    +  property:{ActivityLonglineLogbookDto.PROPERTY_WIND_SPEED};
    
    72
    +  numberValue:{bean.getWindSpeed()};
    
    73
    +}
    
    74
    +
    
    75
    +#windDirection {
    
    76
    +  property:{ActivityLonglineLogbookDto.PROPERTY_WIND_DIRECTION};
    
    77
    +  numberValue:{bean.getWindDirection()};
    
    78
    +}
    
    79
    +
    
    60 80
     #dataQuality {
    
    61 81
       property:{ActivityLonglineLogbookDto.PROPERTY_DATA_QUALITY};
    
    62 82
       selectedItem:{bean.getDataQuality()};
    

  • client/src/main/resources/i18n/client_en_GB.properties
    ... ... @@ -357,7 +357,6 @@ observe.common.ActivityLonglineLogbookDto.action.addSet=Add the fishing operatio
    357 357
     observe.common.ActivityLonglineLogbookDto.action.addSet.tip=Add the fishing operation associated with this activity
    
    358 358
     observe.common.ActivityLonglineLogbookDto.action.moves=Change trip
    
    359 359
     observe.common.ActivityLonglineLogbookDto.action.moves.tip=Change trip of activities
    
    360
    -observe.common.ActivityLonglineLogbookDto.currentSpeed=Current speed
    
    361 360
     observe.common.ActivityLonglineLogbookDto.list.message.none=< No activity for current trip >
    
    362 361
     observe.common.ActivityLonglineLogbookDto.message.active.found=An activity is opened.
    
    363 362
     observe.common.ActivityLonglineLogbookDto.message.active.found.for.other.trip=An activity is opened in another trip.
    
    ... ... @@ -370,6 +369,7 @@ observe.common.ActivityLonglineLogbookDto.relatedObservedActivity=Related observ
    370 369
     observe.common.ActivityLonglineLogbookDto.timeStamp=timestamp
    
    371 370
     observe.common.ActivityLonglineLogbookDto.titles=Activities
    
    372 371
     observe.common.ActivityLonglineLogbookDto.wind=Wind
    
    372
    +observe.common.ActivityLonglineLogbookDto.windSpeed=Wind spped (kt)
    
    373 373
     observe.common.ActivityLonglineObsDto.action.addSet=Add the fishing operation
    
    374 374
     observe.common.ActivityLonglineObsDto.action.addSet.tip=Add the fishing operation associated with this activity
    
    375 375
     observe.common.ActivityLonglineObsDto.action.moves=Change trip
    

  • client/src/main/resources/i18n/client_es_ES.properties
    ... ... @@ -357,7 +357,6 @@ observe.common.ActivityLonglineLogbookDto.action.addSet=Añadir la operación de
    357 357
     observe.common.ActivityLonglineLogbookDto.action.addSet.tip=Añadir la operación de pesca asociada a esta actividad
    
    358 358
     observe.common.ActivityLonglineLogbookDto.action.moves=Cambiar de marea
    
    359 359
     observe.common.ActivityLonglineLogbookDto.action.moves.tip=Cambiar la marea de las actividades seleccionas
    
    360
    -observe.common.ActivityLonglineLogbookDto.currentSpeed=Current speed \#TODO
    
    361 360
     observe.common.ActivityLonglineLogbookDto.list.message.none=< Ninguna actividad por la marea actual >
    
    362 361
     observe.common.ActivityLonglineLogbookDto.message.active.found=Actividad abierta
    
    363 362
     observe.common.ActivityLonglineLogbookDto.message.active.found.for.other.trip=Existe una actividad abierta en otra ruta.
    
    ... ... @@ -370,6 +369,7 @@ observe.common.ActivityLonglineLogbookDto.relatedObservedActivity=Related observ
    370 369
     observe.common.ActivityLonglineLogbookDto.timeStamp=Timestamp
    
    371 370
     observe.common.ActivityLonglineLogbookDto.titles=Actividades
    
    372 371
     observe.common.ActivityLonglineLogbookDto.wind=Wind \#TODO
    
    372
    +observe.common.ActivityLonglineLogbookDto.windSpeed=Wind sppe (kt) \#TODO
    
    373 373
     observe.common.ActivityLonglineObsDto.action.addSet=Añadir la operación de pesca
    
    374 374
     observe.common.ActivityLonglineObsDto.action.addSet.tip=Añadir la operación de pesca asociada a esta actividad
    
    375 375
     observe.common.ActivityLonglineObsDto.action.moves=Cambiar de marea
    

  • client/src/main/resources/i18n/client_fr_FR.properties
    ... ... @@ -357,7 +357,6 @@ observe.common.ActivityLonglineLogbookDto.action.addSet=Ajouter l'opération de
    357 357
     observe.common.ActivityLonglineLogbookDto.action.addSet.tip=Ajouter l'opération de pêche associée à cette activité
    
    358 358
     observe.common.ActivityLonglineLogbookDto.action.moves=Changer de marée
    
    359 359
     observe.common.ActivityLonglineLogbookDto.action.moves.tip=Changer la marée des activités sélectionnées
    
    360
    -observe.common.ActivityLonglineLogbookDto.currentSpeed=Vitesse
    
    361 360
     observe.common.ActivityLonglineLogbookDto.list.message.none=< Aucune activité pour la marée courante >
    
    362 361
     observe.common.ActivityLonglineLogbookDto.message.active.found=Une activité est ouverte.
    
    363 362
     observe.common.ActivityLonglineLogbookDto.message.active.found.for.other.trip=Une activité ouverte existe dans une autre marée.
    
    ... ... @@ -370,6 +369,7 @@ observe.common.ActivityLonglineLogbookDto.relatedObservedActivity=Activité obse
    370 369
     observe.common.ActivityLonglineLogbookDto.timeStamp=Horodatage
    
    371 370
     observe.common.ActivityLonglineLogbookDto.titles=Activités
    
    372 371
     observe.common.ActivityLonglineLogbookDto.wind=Vent
    
    372
    +observe.common.ActivityLonglineLogbookDto.windSpeed=Vitesse du vent (nd)
    
    373 373
     observe.common.ActivityLonglineObsDto.action.addSet=Ajouter l'opération de pêche
    
    374 374
     observe.common.ActivityLonglineObsDto.action.addSet.tip=Ajouter l'opération de pêche associée à cette activité
    
    375 375
     observe.common.ActivityLonglineObsDto.action.moves=Changer de marée
    

  • dto/src/main/models/Observe-06-data-longline-logbook.model
    ... ... @@ -27,6 +27,7 @@ hasSetLongline + {*:1} boolean
    27 27
     quadrant + {*:1} Integer
    
    28 28
     fpaZone {*:1} fr.ird.observe.dto.referential.FpaZoneReference
    
    29 29
     wind {*:1} fr.ird.observe.dto.referential.WindReference
    
    30
    +windSpeed + {*:1} Float
    
    30 31
     windDirection + {*:1} Integer
    
    31 32
     currentSpeed + {*:1} Float
    
    32 33
     currentDirection + {*:1} Integer
    

  • persistence/src/main/java/fr/ird/observe/binder/data/longline/ActivityLonglineLogbookEntityDtoBinder.java
    ... ... @@ -10,12 +10,12 @@ package fr.ird.observe.binder.data.longline;
    10 10
      * it under the terms of the GNU General Public License as
    
    11 11
      * published by the Free Software Foundation, either version 3 of the
    
    12 12
      * License, or (at your option) any later version.
    
    13
    - * 
    
    13
    + *
    
    14 14
      * This program is distributed in the hope that it will be useful,
    
    15 15
      * but WITHOUT ANY WARRANTY; without even the implied warranty of
    
    16 16
      * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    
    17 17
      * GNU General Public License for more details.
    
    18
    - * 
    
    18
    + *
    
    19 19
      * You should have received a copy of the GNU General Public
    
    20 20
      * License along with this program.  If not, see
    
    21 21
      * <http://www.gnu.org/licenses/gpl-3.0.html>.
    
    ... ... @@ -50,6 +50,11 @@ public class ActivityLonglineLogbookEntityDtoBinder extends DataEntityDtoBinderS
    50 50
             entity.setFpaZone(toEntity(dto.getFpaZone()));
    
    51 51
             entity.setDataQuality(toEntity(dto.getDataQuality()));
    
    52 52
             entity.setSample(toDataEntity(dto.getSample()));
    
    53
    +        entity.setWind(toEntity(dto.getWind()));
    
    54
    +        entity.setWindSpeed(dto.getWindSpeed());
    
    55
    +        entity.setWindDirection(dto.getWindDirection());
    
    56
    +        entity.setCurrentSpeed(dto.getCurrentSpeed());
    
    57
    +        entity.setCurrentDirection(dto.getCurrentDirection());
    
    53 58
         }
    
    54 59
     
    
    55 60
         @Override
    
    ... ... @@ -67,6 +72,12 @@ public class ActivityLonglineLogbookEntityDtoBinder extends DataEntityDtoBinderS
    67 72
             dto.setSample(toDataReference(referentialLocale, entity.getSample()));
    
    68 73
             dto.setSetLongline(toDataReference(referentialLocale, entity.getSetLongline()));
    
    69 74
             dto.setHasSetLongline(entity.getSetLongline() != null);
    
    75
    +
    
    76
    +        dto.setWind(toReferentialReference(referentialLocale, entity.getWind()));
    
    77
    +        dto.setWindSpeed(entity.getWindSpeed());
    
    78
    +        dto.setWindDirection(entity.getWindDirection());
    
    79
    +        dto.setCurrentSpeed(entity.getCurrentSpeed());
    
    80
    +        dto.setCurrentDirection(entity.getCurrentDirection());
    
    70 81
         }
    
    71 82
     
    
    72 83
     }

  • persistence/src/main/java/fr/ird/observe/persistence/migration/DataSourceMigrationForVersion_8_3.java
    ... ... @@ -45,6 +45,7 @@ public class DataSourceMigrationForVersion_8_3 extends MigrationVersionResource
    45 45
             executor.addScript("02", "update_referential_common_harbour");
    
    46 46
             executor.addScript("03", "update_referential_longline_line_type");
    
    47 47
             executor.addScript("04", "update_longline_set_logbook_field");
    
    48
    +        executor.addScript("05", "update_longline_activity_logbook_field");
    
    48 49
         }
    
    49 50
     
    
    50 51
     }
    

  • persistence/src/main/models/Observe-06-data-longline-logbook.model
    ... ... @@ -5,6 +5,7 @@ latitude + {*:1} Float
    5 5
     longitude + {*:1} Float
    
    6 6
     seaSurfaceTemperature + {*:1} Float
    
    7 7
     wind + {*:1} referentiel.Wind
    
    8
    +windSpeed + {*:1} Float
    
    8 9
     windDirection + {*:1} Integer
    
    9 10
     currentSpeed + {*:1} Float
    
    10 11
     currentDirection + {*:1} Integer
    

  • persistence/src/main/resources/db/migration/8.3/05_update_longline_activity_logbook_field-common.sql
    1
    +---
    
    2
    +-- #%L
    
    3
    +-- ObServe :: Persistence
    
    4
    +-- %%
    
    5
    +-- Copyright (C) 2008 - 2018 IRD, Code Lutin, Ultreia.io
    
    6
    +-- %%
    
    7
    +-- This program is free software: you can redistribute it and/or modify
    
    8
    +-- it under the terms of the GNU General Public License as
    
    9
    +-- published by the Free Software Foundation, either version 3 of the
    
    10
    +-- License, or (at your option) any later version.
    
    11
    +--
    
    12
    +-- This program is distributed in the hope that it will be useful,
    
    13
    +-- but WITHOUT ANY WARRANTY; without even the implied warranty of
    
    14
    +-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    
    15
    +-- GNU General Public License for more details.
    
    16
    +--
    
    17
    +-- You should have received a copy of the GNU General Public
    
    18
    +-- License along with this program.  If not, see
    
    19
    +-- <http://www.gnu.org/licenses/gpl-3.0.html>.
    
    20
    +-- #L%
    
    21
    +---
    
    22
    +
    
    23
    +ALTER TABLE observe_longline.ACTIVITYLOGBOOK ADD COLUMN windSpeed REAL;
    \ No newline at end of file

  • test/src/main/resources/db/8.3/dataForTestLongline.sql.gz The diff for this file was not included because it is too large.
  • test/src/main/resources/db/8.3/dataForTestSeine.sql.gz The diff for this file was not included because it is too large.
  • test/src/main/resources/db/8.3/empty_h2.sql.gz
    ... ... @@ -34,7 +34,7 @@ create table OBSERVE_COMMON.vesselType (topiaId varchar(255) not null, topiaVers
    34 34
     create table OBSERVE_COMMON.weightMeasureMethod (topiaId varchar(255) not null, topiaVersion bigint not null, topiaCreateDate timestamp, lastUpdateDate timestamp not null, code varchar(255), uri varchar(255), needComment boolean not null, status integer, label1 varchar(255), label2 varchar(255), label3 varchar(255), label4 varchar(255), label5 varchar(255), label6 varchar(255), label7 varchar(255), label8 varchar(255), primary key (topiaId));
    
    35 35
     create table OBSERVE_COMMON.weightMeasureType (topiaId varchar(255) not null, topiaVersion bigint not null, topiaCreateDate timestamp, lastUpdateDate timestamp not null, code varchar(255), uri varchar(255), needComment boolean not null, status integer, label1 varchar(255), label2 varchar(255), label3 varchar(255), label4 varchar(255), label5 varchar(255), label6 varchar(255), label7 varchar(255), label8 varchar(255), primary key (topiaId));
    
    36 36
     create table OBSERVE_COMMON.wind (topiaId varchar(255) not null, topiaVersion bigint not null, topiaCreateDate timestamp, lastUpdateDate timestamp not null, code varchar(255), uri varchar(255), needComment boolean not null, status integer, label1 varchar(255), label2 varchar(255), label3 varchar(255), label4 varchar(255), label5 varchar(255), label6 varchar(255), label7 varchar(255), label8 varchar(255), speedRange varchar(255), waveHeight varchar(255), primary key (topiaId));
    
    37
    -create table OBSERVE_LONGLINE.ActivityLogbook (topiaId varchar(255) not null, topiaVersion bigint not null, topiaCreateDate timestamp, lastUpdateDate timestamp not null, comment varchar(2147483647), timeStamp timestamp, latitude float, longitude float, seaSurfaceTemperature float, wind varchar(255), windDirection integer, currentSpeed float, currentDirection integer, vesselActivity varchar(255), dataQuality varchar(255), fpaZone varchar(255), relatedObservedActivity varchar(255), set varchar(255), sample varchar(255), trip varchar(255), primary key (topiaId));
    
    37
    +create table OBSERVE_LONGLINE.ActivityLogbook (topiaId varchar(255) not null, topiaVersion bigint not null, topiaCreateDate timestamp, lastUpdateDate timestamp not null, comment varchar(2147483647), timeStamp timestamp, latitude float, longitude float, seaSurfaceTemperature float, wind varchar(255), windSpeed float, windDirection integer, currentSpeed float, currentDirection integer, vesselActivity varchar(255), dataQuality varchar(255), fpaZone varchar(255), relatedObservedActivity varchar(255), set varchar(255), sample varchar(255), trip varchar(255), primary key (topiaId));
    
    38 38
     create table OBSERVE_LONGLINE.ActivityObs (topiaId varchar(255) not null, topiaVersion bigint not null, topiaCreateDate timestamp, lastUpdateDate timestamp not null, comment varchar(2147483647), timeStamp timestamp, latitude float, longitude float, seaSurfaceTemperature float, set varchar(255), vesselActivity varchar(255), dataQuality varchar(255), fpaZone varchar(255), trip varchar(255), primary key (topiaId));
    
    39 39
     create table OBSERVE_LONGLINE.baitHaulingStatus (topiaId varchar(255) not null, topiaVersion bigint not null, topiaCreateDate timestamp, lastUpdateDate timestamp not null, code varchar(255), uri varchar(255), needComment boolean not null, status integer, label1 varchar(255), label2 varchar(255), label3 varchar(255), label4 varchar(255), label5 varchar(255), label6 varchar(255), label7 varchar(255), label8 varchar(255), primary key (topiaId));
    
    40 40
     create table OBSERVE_LONGLINE.baitsCompositionLogbook (topiaId varchar(255) not null, topiaVersion bigint not null, topiaCreateDate timestamp, lastUpdateDate timestamp not null, proportion integer, individualSize integer, individualWeight float, baitSettingStatus varchar(255), baitType varchar(255), set varchar(255), primary key (topiaId));
    

  • test/src/main/resources/db/8.3/empty_pg.sql.gz
    ... ... @@ -34,7 +34,7 @@ create table OBSERVE_COMMON.vesselType (topiaId varchar(255) not null, topiaVers
    34 34
     create table OBSERVE_COMMON.weightMeasureMethod (topiaId varchar(255) not null, topiaVersion int8 not null, topiaCreateDate timestamp, lastUpdateDate timestamp not null, code varchar(255), uri varchar(255), needComment boolean not null, status int4, label1 varchar(255), label2 varchar(255), label3 varchar(255), label4 varchar(255), label5 varchar(255), label6 varchar(255), label7 varchar(255), label8 varchar(255), primary key (topiaId));
    
    35 35
     create table OBSERVE_COMMON.weightMeasureType (topiaId varchar(255) not null, topiaVersion int8 not null, topiaCreateDate timestamp, lastUpdateDate timestamp not null, code varchar(255), uri varchar(255), needComment boolean not null, status int4, label1 varchar(255), label2 varchar(255), label3 varchar(255), label4 varchar(255), label5 varchar(255), label6 varchar(255), label7 varchar(255), label8 varchar(255), primary key (topiaId));
    
    36 36
     create table OBSERVE_COMMON.wind (topiaId varchar(255) not null, topiaVersion int8 not null, topiaCreateDate timestamp, lastUpdateDate timestamp not null, code varchar(255), uri varchar(255), needComment boolean not null, status int4, label1 varchar(255), label2 varchar(255), label3 varchar(255), label4 varchar(255), label5 varchar(255), label6 varchar(255), label7 varchar(255), label8 varchar(255), speedRange varchar(255), waveHeight varchar(255), primary key (topiaId));
    
    37
    -create table OBSERVE_LONGLINE.ActivityLogbook (topiaId varchar(255) not null, topiaVersion int8 not null, topiaCreateDate timestamp, lastUpdateDate timestamp not null, comment text, timeStamp timestamp, latitude float4, longitude float4, seaSurfaceTemperature float4, wind varchar(255), windDirection int4, currentSpeed float4, currentDirection int4, vesselActivity varchar(255), dataQuality varchar(255), fpaZone varchar(255), relatedObservedActivity varchar(255), set varchar(255), sample varchar(255), trip varchar(255), primary key (topiaId));
    
    37
    +create table OBSERVE_LONGLINE.ActivityLogbook (topiaId varchar(255) not null, topiaVersion int8 not null, topiaCreateDate timestamp, lastUpdateDate timestamp not null, comment text, timeStamp timestamp, latitude float4, longitude float4, seaSurfaceTemperature float4, wind varchar(255), windSpeed float4, windDirection int4, currentSpeed float4, currentDirection int4, vesselActivity varchar(255), dataQuality varchar(255), fpaZone varchar(255), relatedObservedActivity varchar(255), set varchar(255), sample varchar(255), trip varchar(255), primary key (topiaId));
    
    38 38
     create table OBSERVE_LONGLINE.ActivityObs (topiaId varchar(255) not null, topiaVersion int8 not null, topiaCreateDate timestamp, lastUpdateDate timestamp not null, comment text, timeStamp timestamp, latitude float4, longitude float4, seaSurfaceTemperature float4, set varchar(255), vesselActivity varchar(255), dataQuality varchar(255), fpaZone varchar(255), trip varchar(255), primary key (topiaId));
    
    39 39
     create table OBSERVE_LONGLINE.baitHaulingStatus (topiaId varchar(255) not null, topiaVersion int8 not null, topiaCreateDate timestamp, lastUpdateDate timestamp not null, code varchar(255), uri varchar(255), needComment boolean not null, status int4, label1 varchar(255), label2 varchar(255), label3 varchar(255), label4 varchar(255), label5 varchar(255), label6 varchar(255), label7 varchar(255), label8 varchar(255), primary key (topiaId));
    
    40 40
     create table OBSERVE_LONGLINE.baitsCompositionLogbook (topiaId varchar(255) not null, topiaVersion int8 not null, topiaCreateDate timestamp, lastUpdateDate timestamp not null, proportion int4, individualSize int4, individualWeight float4, baitSettingStatus varchar(255), baitType varchar(255), set varchar(255), primary key (topiaId));
    

  • test/src/main/resources/db/8.3/referentiel.sql.gz The diff for this file was not included because it is too large.
  • validation/src/main/resources/fr/ird/observe/dto/data/longline/ActivityLonglineLogbookDto-create-error-validation.xml
    ... ... @@ -190,4 +190,37 @@
    190 190
         </field-validator>
    
    191 191
       </field>
    
    192 192
     
    
    193
    +  <field name="currentDirection">
    
    194
    +
    
    195
    +    <!-- 0 <= direction courant <= 360  -->
    
    196
    +    <field-validator type="int" short-circuit="true">
    
    197
    +      <param name="min">0</param>
    
    198
    +      <param name="max">359</param>
    
    199
    +      <message>observe.validation.bound.currentDirection##${min}##${max}</message>
    
    200
    +    </field-validator>
    
    201
    +
    
    202
    +  </field>
    
    203
    +
    
    204
    +  <field name="currentSpeed">
    
    205
    +
    
    206
    +    <!-- 0 < vitesse courant <= 20 -->
    
    207
    +    <field-validator type="double" short-circuit="true">
    
    208
    +      <param name="minExclusive">0</param>
    
    209
    +      <param name="maxInclusive">20</param>
    
    210
    +      <message>observe.validation.bound.currentSpeed##${minExclusive}##${maxInclusive}</message>
    
    211
    +    </field-validator>
    
    212
    +
    
    213
    +  </field>
    
    214
    +
    
    215
    +  <field name="windDirection">
    
    216
    +
    
    217
    +    <!-- 0 <= direction courant <= 360  -->
    
    218
    +    <field-validator type="int" short-circuit="true">
    
    219
    +      <param name="min">0</param>
    
    220
    +      <param name="max">359</param>
    
    221
    +      <message>observe.validation.bound.windDirection##${min}##${max}</message>
    
    222
    +    </field-validator>
    
    223
    +
    
    224
    +  </field>
    
    225
    +
    
    193 226
     </validators>

  • validation/src/main/resources/fr/ird/observe/dto/data/longline/ActivityLonglineLogbookDto-update-error-validation.xml
    ... ... @@ -165,4 +165,39 @@
    165 165
           <message>observe.validation.activity.desactivated.dataQuality</message>
    
    166 166
         </field-validator>
    
    167 167
       </field>
    
    168
    +
    
    169
    +
    
    170
    +  <field name="currentDirection">
    
    171
    +
    
    172
    +    <!-- 0 <= direction courant <= 360  -->
    
    173
    +    <field-validator type="int" short-circuit="true">
    
    174
    +      <param name="min">0</param>
    
    175
    +      <param name="max">359</param>
    
    176
    +      <message>observe.validation.bound.currentDirection##${min}##${max}</message>
    
    177
    +    </field-validator>
    
    178
    +
    
    179
    +  </field>
    
    180
    +
    
    181
    +  <field name="currentSpeed">
    
    182
    +
    
    183
    +    <!-- 0 < vitesse courant <= 20 -->
    
    184
    +    <field-validator type="double" short-circuit="true">
    
    185
    +      <param name="minExclusive">0</param>
    
    186
    +      <param name="maxInclusive">20</param>
    
    187
    +      <message>observe.validation.bound.currentSpeed##${minExclusive}##${maxInclusive}</message>
    
    188
    +    </field-validator>
    
    189
    +
    
    190
    +  </field>
    
    191
    +
    
    192
    +  <field name="windDirection">
    
    193
    +
    
    194
    +    <!-- 0 <= direction courant <= 360  -->
    
    195
    +    <field-validator type="int" short-circuit="true">
    
    196
    +      <param name="min">0</param>
    
    197
    +      <param name="max">359</param>
    
    198
    +      <message>observe.validation.bound.windDirection##${min}##${max}</message>
    
    199
    +    </field-validator>
    
    200
    +
    
    201
    +  </field>
    
    202
    +
    
    168 203
     </validators>

  • validation/src/main/resources/fr/ird/observe/dto/data/seine/ActivitySeineDto-update-error-validation.xml
    ... ... @@ -134,7 +134,7 @@
    134 134
         <!-- windSpeed desactive  -->
    
    135 135
         <field-validator type="fieldexpression" short-circuit="true">
    
    136 136
           <param name="expression">
    
    137
    -        <![CDATA[ windSpeed == null || ventBeaufort.enabled ]]>
    
    137
    +        <![CDATA[ wind == null || wind.enabled ]]>
    
    138 138
           </param>
    
    139 139
           <message>observe.validation.activity.desactivated.wind</message>
    
    140 140
         </field-validator>
    

  • validation/src/main/resources/fr/ird/observe/dto/data/seine/SetSeineDto-create-error-validation.xml
    ... ... @@ -156,8 +156,8 @@
    156 156
         <!-- 0 <= direction courant <= 360  -->
    
    157 157
         <field-validator type="int" short-circuit="true">
    
    158 158
           <param name="min">0</param>
    
    159
    -      <param name="max">360</param>
    
    160
    -      <message>observe.validation.set.bound.currentDirection##${min}##${max}</message>
    
    159
    +      <param name="max">359</param>
    
    160
    +      <message>observe.validation.bound.currentDirection##${min}##${max}</message>
    
    161 161
         </field-validator>
    
    162 162
     
    
    163 163
       </field>
    
    ... ... @@ -168,7 +168,7 @@
    168 168
         <field-validator type="double" short-circuit="true">
    
    169 169
           <param name="minExclusive">0</param>
    
    170 170
           <param name="maxInclusive">40</param>
    
    171
    -      <message>observe.validation.set.bound.currentSpeed##${minExclusive}##${maxInclusive}</message>
    
    171
    +      <message>observe.validation.bound.currentSpeed##${minExclusive}##${maxInclusive}</message>
    
    172 172
         </field-validator>
    
    173 173
     
    
    174 174
       </field>
    

  • validation/src/main/resources/fr/ird/observe/dto/data/seine/SetSeineDto-update-error-validation.xml
    ... ... @@ -168,8 +168,8 @@
    168 168
         <!-- 0 <= direction courant <= 360  -->
    
    169 169
         <field-validator type="int" short-circuit="true">
    
    170 170
           <param name="min">0</param>
    
    171
    -      <param name="max">360</param>
    
    172
    -      <message>observe.validation.set.bound.currentDirection##${min}##${max}</message>
    
    171
    +      <param name="max">359</param>
    
    172
    +      <message>observe.validation.bound.currentDirection##${min}##${max}</message>
    
    173 173
         </field-validator>
    
    174 174
     
    
    175 175
       </field>
    
    ... ... @@ -180,7 +180,7 @@
    180 180
         <field-validator type="double" short-circuit="true">
    
    181 181
           <param name="minExclusive">0</param>
    
    182 182
           <param name="maxInclusive">40</param>
    
    183
    -      <message>observe.validation.set.bound.currentSpeed##${minExclusive}##${maxInclusive}</message>
    
    183
    +      <message>observe.validation.bound.currentSpeed##${minExclusive}##${maxInclusive}</message>
    
    184 184
         </field-validator>
    
    185 185
     
    
    186 186
       </field>
    

  • validation/src/main/resources/i18n/validation_en_GB.properties
    1 1
     observe.common.ActivityLonglineLogbookDto.comment=Activity comment
    
    2
    +observe.common.ActivityLonglineLogbookDto.currentDirection=Current direction (°)
    
    3
    +observe.common.ActivityLonglineLogbookDto.currentSpeed=Current Speed (kt)
    
    2 4
     observe.common.ActivityLonglineLogbookDto.dataQuality=Data quality
    
    3 5
     observe.common.ActivityLonglineLogbookDto.date=Date
    
    4 6
     observe.common.ActivityLonglineLogbookDto.fpaZone=FPA Zone
    
    ... ... @@ -8,6 +10,7 @@ observe.common.ActivityLonglineLogbookDto.quadrant=Quadrant
    8 10
     observe.common.ActivityLonglineLogbookDto.seaSurfaceTemperature=SST
    
    9 11
     observe.common.ActivityLonglineLogbookDto.time=Time
    
    10 12
     observe.common.ActivityLonglineLogbookDto.vesselActivityLongline=Vessel activity
    
    13
    +observe.common.ActivityLonglineLogbookDto.windDirection=Wind direction (°)
    
    11 14
     observe.common.ActivityLonglineObsDto.comment=Activity comment
    
    12 15
     observe.common.ActivityLonglineObsDto.dataQuality=Data quality
    
    13 16
     observe.common.ActivityLonglineObsDto.date=Date
    
    ... ... @@ -486,6 +489,9 @@ observe.validation.baitsComposition.required.proportion=Proportion is required.
    486 489
     observe.validation.basket.bound.floatline1Length=Floatline 1 length must be bound between %s and %s.
    
    487 490
     observe.validation.basket.bound.floatline2Length=Floatline 2 length must be bound between %s and %s.
    
    488 491
     observe.validation.basket.required.settingIdentifier=Setting identifier is required.
    
    492
    +observe.validation.bound.currentDirection=current direction must be bound between %s and %s.
    
    493
    +observe.validation.bound.currentSpeed=Current speed must be bound between %s and %s.
    
    494
    +observe.validation.bound.windDirection=wind direction must be bound between %s and %s.
    
    489 495
     observe.validation.branchline.bound.branchlineLength=Branchline length must be bound between %s and %s.
    
    490 496
     observe.validation.branchline.bound.tracelineLength=Traceline length must be bound between %s and %s.
    
    491 497
     observe.validation.branchline.desactivated.baitHaulingStatus=Selected bait Hauling status is disabled.
    
    ... ... @@ -733,8 +739,6 @@ observe.validation.sensorUsed.desactivated.sensorDataFormat=Selected sensor data
    733 739
     observe.validation.sensorUsed.desactivated.sensorType=Selected sensor type is disabled.
    
    734 740
     observe.validation.sensorUsed.null.sensorSerialNo=Sensor serial No is not filled.
    
    735 741
     observe.validation.sensorUsed.required.sensorType=Sensor type must be filled.
    
    736
    -observe.validation.set.bound.currentDirection=current direction must be bound between %s and %s.
    
    737
    -observe.validation.set.bound.currentSpeed=Current speed must be bound between %s and %s.
    
    738 742
     observe.validation.set.bound.delay=Delay must be bound between %s and %s.
    
    739 743
     observe.validation.set.bound.maxGearDepth=Max gear depth must be bound between %s and %s.
    
    740 744
     observe.validation.set.bound.schoolMeanDepth=School mean depth must be bound between %s and %s.
    

  • validation/src/main/resources/i18n/validation_es_ES.properties
    1 1
     observe.common.ActivityLonglineLogbookDto.comment=Comentario de la actividad
    
    2
    +observe.common.ActivityLonglineLogbookDto.currentDirection=Current direction (°) \#TODO
    
    3
    +observe.common.ActivityLonglineLogbookDto.currentSpeed=Current speed (kt) \#TODO
    
    2 4
     observe.common.ActivityLonglineLogbookDto.dataQuality=Qualité de donnée \#TODO
    
    3 5
     observe.common.ActivityLonglineLogbookDto.date=Día de observación
    
    4 6
     observe.common.ActivityLonglineLogbookDto.fpaZone=Zona FPA
    
    ... ... @@ -8,6 +10,7 @@ observe.common.ActivityLonglineLogbookDto.quadrant=Quadrant
    8 10
     observe.common.ActivityLonglineLogbookDto.seaSurfaceTemperature=Temperatura de la superficie
    
    9 11
     observe.common.ActivityLonglineLogbookDto.time=Hora
    
    10 12
     observe.common.ActivityLonglineLogbookDto.vesselActivityLongline=Actividad barco
    
    13
    +observe.common.ActivityLonglineLogbookDto.windDirection=Dirección del viento (°)
    
    11 14
     observe.common.ActivityLonglineObsDto.comment=Comentario de la actividad
    
    12 15
     observe.common.ActivityLonglineObsDto.dataQuality=Qualité de donnée \#TODO
    
    13 16
     observe.common.ActivityLonglineObsDto.date=Día de observación
    
    ... ... @@ -488,6 +491,9 @@ observe.validation.baitsComposition.required.proportion=La proporción está vac
    488 491
     observe.validation.basket.bound.floatline1Length=La longitud del orinque 1 debe ser entre %1$s y %2$s.
    
    489 492
     observe.validation.basket.bound.floatline2Length=La longitud d'orinque 1 debe ser entre %1$s y %2$s.&
    
    490 493
     observe.validation.basket.required.settingIdentifier=El identificador de la calada es mandatorio.
    
    494
    +observe.validation.bound.currentDirection=La dirección actual debe ser un número comprendido entre %1$s y %2$s.
    
    495
    +observe.validation.bound.currentSpeed=La velocidad actual debe ser un número comprendido entre %1$s y %2$s
    
    496
    +observe.validation.bound.windDirection=La dirección actual debe ser un número comprendido entre %1$s y %2$s.
    
    491 497
     observe.validation.branchline.bound.branchlineLength=La longitud del arponcillo debe ser entre %1$s y %2$s.
    
    492 498
     observe.validation.branchline.bound.tracelineLength=La longitud de la parte baja debe ser entre %1$s y %2$s.
    
    493 499
     observe.validation.branchline.desactivated.baitHaulingStatus=El estado del cebo está desactivado.
    
    ... ... @@ -735,8 +741,6 @@ observe.validation.sensorUsed.desactivated.sensorDataFormat=El tipo de formato d
    735 741
     observe.validation.sensorUsed.desactivated.sensorType=El tipo seleccionado está desactivado.
    
    736 742
     observe.validation.sensorUsed.null.sensorSerialNo=El número de serie es mandatorio.
    
    737 743
     observe.validation.sensorUsed.required.sensorType=La selección de un tipo es mandatoria.
    
    738
    -observe.validation.set.bound.currentDirection=La dirección actual debe ser un número comprendido entre %1$s y %2$s.
    
    739
    -observe.validation.set.bound.currentSpeed=La velocidad actual debe ser un número comprendido entre %1$s y %2$s
    
    740 744
     observe.validation.set.bound.delay=La duración entre la hora final del lance y la de fin de recogida de la jareta debe ser al menos de %1$s minutos.
    
    741 745
     observe.validation.set.bound.maxGearDepth=Las profundidas debe ser comprendidas entre %1$s y %2$s.
    
    742 746
     observe.validation.set.bound.schoolMeanDepth=La profundidad media debe ser un entero comprendido entre %1$s y %2$s
    

  • validation/src/main/resources/i18n/validation_fr_FR.properties
    1 1
     observe.common.ActivityLonglineLogbookDto.comment=Commentaire de l'activité
    
    2
    +observe.common.ActivityLonglineLogbookDto.currentDirection=Direction du courant (°)
    
    3
    +observe.common.ActivityLonglineLogbookDto.currentSpeed=vitesse du courant (nd)
    
    2 4
     observe.common.ActivityLonglineLogbookDto.dataQuality=Qualité de donnée
    
    3 5
     observe.common.ActivityLonglineLogbookDto.date=Jour d'observation
    
    4 6
     observe.common.ActivityLonglineLogbookDto.fpaZone=Zone FPA
    
    ... ... @@ -8,6 +10,7 @@ observe.common.ActivityLonglineLogbookDto.quadrant=Quadrant
    8 10
     observe.common.ActivityLonglineLogbookDto.seaSurfaceTemperature=Température surface
    
    9 11
     observe.common.ActivityLonglineLogbookDto.time=Heure
    
    10 12
     observe.common.ActivityLonglineLogbookDto.vesselActivityLongline=Activité bateau
    
    13
    +observe.common.ActivityLonglineLogbookDto.windDirection=Direction du vent (°)
    
    11 14
     observe.common.ActivityLonglineObsDto.comment=Commentaire de l'activité
    
    12 15
     observe.common.ActivityLonglineObsDto.dataQuality=Qualité de donnée
    
    13 16
     observe.common.ActivityLonglineObsDto.date=Jour d'observation
    
    ... ... @@ -486,6 +489,9 @@ observe.validation.baitsComposition.required.proportion=Proportion non renseign
    486 489
     observe.validation.basket.bound.floatline1Length=La longueur d'orin 1 être comprise entre %1$s et %2$s.
    
    487 490
     observe.validation.basket.bound.floatline2Length=La longueur d'orin 1 être comprise entre %1$s et %2$s.&
    
    488 491
     observe.validation.basket.required.settingIdentifier=L'identifiant de filage est obligatoire.
    
    492
    +observe.validation.bound.currentDirection=La direction courant doit être un entier compris entre %1$s et %2$s.
    
    493
    +observe.validation.bound.currentSpeed=La vitesse courant (en nd) doit être un nombre compris entre %1$s et %2$s.
    
    494
    +observe.validation.bound.windDirection=La direction du vent doit être un entier compris entre %1$s et %2$s.
    
    489 495
     observe.validation.branchline.bound.branchlineLength=La longueur avançon doit être comprise entre %1$s et %2$s.
    
    490 496
     observe.validation.branchline.bound.tracelineLength=La longueur de la partie basse doit être comprise entre %1$s et %2$s.
    
    491 497
     observe.validation.branchline.desactivated.baitHaulingStatus=L'état d'appât est désactivé.
    
    ... ... @@ -733,8 +739,6 @@ observe.validation.sensorUsed.desactivated.sensorDataFormat=Le type de format de
    733 739
     observe.validation.sensorUsed.desactivated.sensorType=Le type sélectionné est désactivé.
    
    734 740
     observe.validation.sensorUsed.null.sensorSerialNo=Le numéro de série n'est pas renseigné.
    
    735 741
     observe.validation.sensorUsed.required.sensorType=La sélection d'un type est obligatoire.
    
    736
    -observe.validation.set.bound.currentDirection=La direction courant doit être un entier compris entre %1$s et %2$s.
    
    737
    -observe.validation.set.bound.currentSpeed=La vitesse courant (en nd) doit être un nombre compris entre %1$s et %2$s.
    
    738 742
     observe.validation.set.bound.delay=La durée entre l'heure de fin de calée et l'heure de fin de coulissage doit être d'au moins %1$s minutes.
    
    739 743
     observe.validation.set.bound.maxGearDepth=La profondeur doit être comprise entre %1$s et %2$s.
    
    740 744
     observe.validation.set.bound.schoolMeanDepth=La profondeur moyenne doit être un entier compris entre %1$s et %2$s.