Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 71b5db56 by Tony CHEMIT at 2018-10-07T16:54:39Z [LL] Activité : Petits ajustements - Closes #1118 - - - - - 23 changed files: - client/src/main/java/fr/ird/observe/client/ui/content/data/longline/logbook/ActivityLonglineLogbookUI.jaxx - client/src/main/java/fr/ird/observe/client/ui/content/data/longline/logbook/ActivityLonglineLogbookUI.jcss - 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/models/Observe-06-data-longline-logbook.model - persistence/src/main/java/fr/ird/observe/binder/data/longline/ActivityLonglineLogbookEntityDtoBinder.java - persistence/src/main/java/fr/ird/observe/persistence/migration/DataSourceMigrationForVersion_8_3.java - persistence/src/main/models/Observe-06-data-longline-logbook.model - + persistence/src/main/resources/db/migration/8.3/05_update_longline_activity_logbook_field-common.sql - test/src/main/resources/db/8.3/dataForTestLongline.sql.gz - test/src/main/resources/db/8.3/dataForTestSeine.sql.gz - test/src/main/resources/db/8.3/empty_h2.sql.gz - test/src/main/resources/db/8.3/empty_pg.sql.gz - test/src/main/resources/db/8.3/referentiel.sql.gz - validation/src/main/resources/fr/ird/observe/dto/data/longline/ActivityLonglineLogbookDto-create-error-validation.xml - validation/src/main/resources/fr/ird/observe/dto/data/longline/ActivityLonglineLogbookDto-update-error-validation.xml - validation/src/main/resources/fr/ird/observe/dto/data/seine/ActivitySeineDto-update-error-validation.xml - validation/src/main/resources/fr/ird/observe/dto/data/seine/SetSeineDto-create-error-validation.xml - validation/src/main/resources/fr/ird/observe/dto/data/seine/SetSeineDto-update-error-validation.xml - validation/src/main/resources/i18n/validation_en_GB.properties - validation/src/main/resources/i18n/validation_es_ES.properties - validation/src/main/resources/i18n/validation_fr_FR.properties Changes: ===================================== client/src/main/java/fr/ird/observe/client/ui/content/data/longline/logbook/ActivityLonglineLogbookUI.jaxx ===================================== @@ -113,12 +113,41 @@ </row> <!-- vitesse vessel --> + <row> + <cell anchor='west'> + <JLabel id='windSpeedLabel'/> + </cell> + <cell anchor='east' weightx="1" fill="both"> + <NumberEditor id='windSpeed' constructorParams='this' styleClass="float2"/> + </cell> + </row> + + <!-- direction du vent --> + <row> + <cell anchor='west'> + <JLabel id='windDirectionLabel'/> + </cell> + <cell anchor='east' weightx="1" fill="both"> + <NumberEditor id='windDirection' constructorParams='this' styleClass="int6"/> + </cell> + </row> + <!-- vitesse du courant --> <row> <cell anchor='west'> <JLabel id='currentSpeedLabel'/> </cell> <cell anchor='east' weightx="1" fill="both"> - <NumberEditor id='currentSpeed' constructorParams='this' styleClass="float2"/> + <NumberEditor id='currentSpeed' constructorParams='this' styleClass="float1"/> + </cell> + </row> + + <!-- direction du courant --> + <row> + <cell anchor='west'> + <JLabel id='currentDirectionLabel'/> + </cell> + <cell anchor='east' weightx="1" fill="both"> + <NumberEditor id='currentDirection' constructorParams='this' styleClass="int6"/> </cell> </row> ===================================== client/src/main/java/fr/ird/observe/client/ui/content/data/longline/logbook/ActivityLonglineLogbookUI.jcss ===================================== @@ -57,6 +57,26 @@ storageTemperature:{bean.getSeaSurfaceTemperature()}; } +#currentSpeed { + property:{ActivityLonglineLogbookDto.PROPERTY_CURRENT_SPEED}; + numberValue:{bean.getCurrentSpeed()}; +} + +#currentDirection { + property:{ActivityLonglineLogbookDto.PROPERTY_CURRENT_DIRECTION}; + numberValue:{bean.getCurrentDirection()}; +} + +#windSpeed { + property:{ActivityLonglineLogbookDto.PROPERTY_WIND_SPEED}; + numberValue:{bean.getWindSpeed()}; +} + +#windDirection { + property:{ActivityLonglineLogbookDto.PROPERTY_WIND_DIRECTION}; + numberValue:{bean.getWindDirection()}; +} + #dataQuality { property:{ActivityLonglineLogbookDto.PROPERTY_DATA_QUALITY}; 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 observe.common.ActivityLonglineLogbookDto.action.addSet.tip=Add the fishing operation associated with this activity observe.common.ActivityLonglineLogbookDto.action.moves=Change trip observe.common.ActivityLonglineLogbookDto.action.moves.tip=Change trip of activities -observe.common.ActivityLonglineLogbookDto.currentSpeed=Current speed observe.common.ActivityLonglineLogbookDto.list.message.none=< No activity for current trip > observe.common.ActivityLonglineLogbookDto.message.active.found=An activity is opened. 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 observe.common.ActivityLonglineLogbookDto.timeStamp=timestamp observe.common.ActivityLonglineLogbookDto.titles=Activities observe.common.ActivityLonglineLogbookDto.wind=Wind +observe.common.ActivityLonglineLogbookDto.windSpeed=Wind spped (kt) observe.common.ActivityLonglineObsDto.action.addSet=Add the fishing operation observe.common.ActivityLonglineObsDto.action.addSet.tip=Add the fishing operation associated with this activity 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 observe.common.ActivityLonglineLogbookDto.action.addSet.tip=Añadir la operación de pesca asociada a esta actividad observe.common.ActivityLonglineLogbookDto.action.moves=Cambiar de marea observe.common.ActivityLonglineLogbookDto.action.moves.tip=Cambiar la marea de las actividades seleccionas -observe.common.ActivityLonglineLogbookDto.currentSpeed=Current speed \#TODO observe.common.ActivityLonglineLogbookDto.list.message.none=< Ninguna actividad por la marea actual > observe.common.ActivityLonglineLogbookDto.message.active.found=Actividad abierta 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 observe.common.ActivityLonglineLogbookDto.timeStamp=Timestamp observe.common.ActivityLonglineLogbookDto.titles=Actividades observe.common.ActivityLonglineLogbookDto.wind=Wind \#TODO +observe.common.ActivityLonglineLogbookDto.windSpeed=Wind sppe (kt) \#TODO observe.common.ActivityLonglineObsDto.action.addSet=Añadir la operación de pesca observe.common.ActivityLonglineObsDto.action.addSet.tip=Añadir la operación de pesca asociada a esta actividad 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 observe.common.ActivityLonglineLogbookDto.action.addSet.tip=Ajouter l'opération de pêche associée à cette activité observe.common.ActivityLonglineLogbookDto.action.moves=Changer de marée observe.common.ActivityLonglineLogbookDto.action.moves.tip=Changer la marée des activités sélectionnées -observe.common.ActivityLonglineLogbookDto.currentSpeed=Vitesse observe.common.ActivityLonglineLogbookDto.list.message.none=< Aucune activité pour la marée courante > observe.common.ActivityLonglineLogbookDto.message.active.found=Une activité est ouverte. 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 observe.common.ActivityLonglineLogbookDto.timeStamp=Horodatage observe.common.ActivityLonglineLogbookDto.titles=Activités observe.common.ActivityLonglineLogbookDto.wind=Vent +observe.common.ActivityLonglineLogbookDto.windSpeed=Vitesse du vent (nd) observe.common.ActivityLonglineObsDto.action.addSet=Ajouter l'opération de pêche observe.common.ActivityLonglineObsDto.action.addSet.tip=Ajouter l'opération de pêche associée à cette activité 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 quadrant + {*:1} Integer fpaZone {*:1} fr.ird.observe.dto.referential.FpaZoneReference wind {*:1} fr.ird.observe.dto.referential.WindReference +windSpeed + {*:1} Float windDirection + {*:1} Integer currentSpeed + {*:1} Float 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; * it under the terms of the GNU General Public License as * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public * License along with this program. If not, see * <http://www.gnu.org/licenses/gpl-3.0.html>. @@ -50,6 +50,11 @@ public class ActivityLonglineLogbookEntityDtoBinder extends DataEntityDtoBinderS entity.setFpaZone(toEntity(dto.getFpaZone())); entity.setDataQuality(toEntity(dto.getDataQuality())); entity.setSample(toDataEntity(dto.getSample())); + entity.setWind(toEntity(dto.getWind())); + entity.setWindSpeed(dto.getWindSpeed()); + entity.setWindDirection(dto.getWindDirection()); + entity.setCurrentSpeed(dto.getCurrentSpeed()); + entity.setCurrentDirection(dto.getCurrentDirection()); } @Override @@ -67,6 +72,12 @@ public class ActivityLonglineLogbookEntityDtoBinder extends DataEntityDtoBinderS dto.setSample(toDataReference(referentialLocale, entity.getSample())); dto.setSetLongline(toDataReference(referentialLocale, entity.getSetLongline())); dto.setHasSetLongline(entity.getSetLongline() != null); + + dto.setWind(toReferentialReference(referentialLocale, entity.getWind())); + dto.setWindSpeed(entity.getWindSpeed()); + dto.setWindDirection(entity.getWindDirection()); + dto.setCurrentSpeed(entity.getCurrentSpeed()); + dto.setCurrentDirection(entity.getCurrentDirection()); } } ===================================== persistence/src/main/java/fr/ird/observe/persistence/migration/DataSourceMigrationForVersion_8_3.java ===================================== @@ -45,6 +45,7 @@ public class DataSourceMigrationForVersion_8_3 extends MigrationVersionResource executor.addScript("02", "update_referential_common_harbour"); executor.addScript("03", "update_referential_longline_line_type"); executor.addScript("04", "update_longline_set_logbook_field"); + executor.addScript("05", "update_longline_activity_logbook_field"); } } ===================================== persistence/src/main/models/Observe-06-data-longline-logbook.model ===================================== @@ -5,6 +5,7 @@ latitude + {*:1} Float longitude + {*:1} Float seaSurfaceTemperature + {*:1} Float wind + {*:1} referentiel.Wind +windSpeed + {*:1} Float windDirection + {*:1} Integer currentSpeed + {*:1} Float currentDirection + {*:1} Integer ===================================== persistence/src/main/resources/db/migration/8.3/05_update_longline_activity_logbook_field-common.sql ===================================== @@ -0,0 +1,23 @@ +--- +-- #%L +-- ObServe :: Persistence +-- %% +-- Copyright (C) 2008 - 2018 IRD, Code Lutin, Ultreia.io +-- %% +-- This program is free software: you can redistribute it and/or modify +-- it under the terms of the GNU General Public License as +-- published by the Free Software Foundation, either version 3 of the +-- License, or (at your option) any later version. +-- +-- This program is distributed in the hope that it will be useful, +-- but WITHOUT ANY WARRANTY; without even the implied warranty of +-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +-- GNU General Public License for more details. +-- +-- You should have received a copy of the GNU General Public +-- License along with this program. If not, see +-- <http://www.gnu.org/licenses/gpl-3.0.html>. +-- #L% +--- + +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 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)); 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)); 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)); -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)); +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)); 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)); 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)); 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 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)); 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)); 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)); -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)); +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)); 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)); 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)); 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 @@ </field-validator> </field> + <field name="currentDirection"> + + <!-- 0 <= direction courant <= 360 --> + <field-validator type="int" short-circuit="true"> + <param name="min">0</param> + <param name="max">359</param> + <message>observe.validation.bound.currentDirection##${min}##${max}</message> + </field-validator> + + </field> + + <field name="currentSpeed"> + + <!-- 0 < vitesse courant <= 20 --> + <field-validator type="double" short-circuit="true"> + <param name="minExclusive">0</param> + <param name="maxInclusive">20</param> + <message>observe.validation.bound.currentSpeed##${minExclusive}##${maxInclusive}</message> + </field-validator> + + </field> + + <field name="windDirection"> + + <!-- 0 <= direction courant <= 360 --> + <field-validator type="int" short-circuit="true"> + <param name="min">0</param> + <param name="max">359</param> + <message>observe.validation.bound.windDirection##${min}##${max}</message> + </field-validator> + + </field> + </validators> ===================================== validation/src/main/resources/fr/ird/observe/dto/data/longline/ActivityLonglineLogbookDto-update-error-validation.xml ===================================== @@ -165,4 +165,39 @@ <message>observe.validation.activity.desactivated.dataQuality</message> </field-validator> </field> + + + <field name="currentDirection"> + + <!-- 0 <= direction courant <= 360 --> + <field-validator type="int" short-circuit="true"> + <param name="min">0</param> + <param name="max">359</param> + <message>observe.validation.bound.currentDirection##${min}##${max}</message> + </field-validator> + + </field> + + <field name="currentSpeed"> + + <!-- 0 < vitesse courant <= 20 --> + <field-validator type="double" short-circuit="true"> + <param name="minExclusive">0</param> + <param name="maxInclusive">20</param> + <message>observe.validation.bound.currentSpeed##${minExclusive}##${maxInclusive}</message> + </field-validator> + + </field> + + <field name="windDirection"> + + <!-- 0 <= direction courant <= 360 --> + <field-validator type="int" short-circuit="true"> + <param name="min">0</param> + <param name="max">359</param> + <message>observe.validation.bound.windDirection##${min}##${max}</message> + </field-validator> + + </field> + </validators> ===================================== validation/src/main/resources/fr/ird/observe/dto/data/seine/ActivitySeineDto-update-error-validation.xml ===================================== @@ -134,7 +134,7 @@ <!-- windSpeed desactive --> <field-validator type="fieldexpression" short-circuit="true"> <param name="expression"> - <![CDATA[ windSpeed == null || ventBeaufort.enabled ]]> + <![CDATA[ wind == null || wind.enabled ]]> </param> <message>observe.validation.activity.desactivated.wind</message> </field-validator> ===================================== validation/src/main/resources/fr/ird/observe/dto/data/seine/SetSeineDto-create-error-validation.xml ===================================== @@ -156,8 +156,8 @@ <!-- 0 <= direction courant <= 360 --> <field-validator type="int" short-circuit="true"> <param name="min">0</param> - <param name="max">360</param> - <message>observe.validation.set.bound.currentDirection##${min}##${max}</message> + <param name="max">359</param> + <message>observe.validation.bound.currentDirection##${min}##${max}</message> </field-validator> </field> @@ -168,7 +168,7 @@ <field-validator type="double" short-circuit="true"> <param name="minExclusive">0</param> <param name="maxInclusive">40</param> - <message>observe.validation.set.bound.currentSpeed##${minExclusive}##${maxInclusive}</message> + <message>observe.validation.bound.currentSpeed##${minExclusive}##${maxInclusive}</message> </field-validator> </field> ===================================== validation/src/main/resources/fr/ird/observe/dto/data/seine/SetSeineDto-update-error-validation.xml ===================================== @@ -168,8 +168,8 @@ <!-- 0 <= direction courant <= 360 --> <field-validator type="int" short-circuit="true"> <param name="min">0</param> - <param name="max">360</param> - <message>observe.validation.set.bound.currentDirection##${min}##${max}</message> + <param name="max">359</param> + <message>observe.validation.bound.currentDirection##${min}##${max}</message> </field-validator> </field> @@ -180,7 +180,7 @@ <field-validator type="double" short-circuit="true"> <param name="minExclusive">0</param> <param name="maxInclusive">40</param> - <message>observe.validation.set.bound.currentSpeed##${minExclusive}##${maxInclusive}</message> + <message>observe.validation.bound.currentSpeed##${minExclusive}##${maxInclusive}</message> </field-validator> </field> ===================================== validation/src/main/resources/i18n/validation_en_GB.properties ===================================== @@ -1,4 +1,6 @@ observe.common.ActivityLonglineLogbookDto.comment=Activity comment +observe.common.ActivityLonglineLogbookDto.currentDirection=Current direction (°) +observe.common.ActivityLonglineLogbookDto.currentSpeed=Current Speed (kt) observe.common.ActivityLonglineLogbookDto.dataQuality=Data quality observe.common.ActivityLonglineLogbookDto.date=Date observe.common.ActivityLonglineLogbookDto.fpaZone=FPA Zone @@ -8,6 +10,7 @@ observe.common.ActivityLonglineLogbookDto.quadrant=Quadrant observe.common.ActivityLonglineLogbookDto.seaSurfaceTemperature=SST observe.common.ActivityLonglineLogbookDto.time=Time observe.common.ActivityLonglineLogbookDto.vesselActivityLongline=Vessel activity +observe.common.ActivityLonglineLogbookDto.windDirection=Wind direction (°) observe.common.ActivityLonglineObsDto.comment=Activity comment observe.common.ActivityLonglineObsDto.dataQuality=Data quality observe.common.ActivityLonglineObsDto.date=Date @@ -486,6 +489,9 @@ observe.validation.baitsComposition.required.proportion=Proportion is required. observe.validation.basket.bound.floatline1Length=Floatline 1 length must be bound between %s and %s. observe.validation.basket.bound.floatline2Length=Floatline 2 length must be bound between %s and %s. observe.validation.basket.required.settingIdentifier=Setting identifier is required. +observe.validation.bound.currentDirection=current direction must be bound between %s and %s. +observe.validation.bound.currentSpeed=Current speed must be bound between %s and %s. +observe.validation.bound.windDirection=wind direction must be bound between %s and %s. observe.validation.branchline.bound.branchlineLength=Branchline length must be bound between %s and %s. observe.validation.branchline.bound.tracelineLength=Traceline length must be bound between %s and %s. observe.validation.branchline.desactivated.baitHaulingStatus=Selected bait Hauling status is disabled. @@ -733,8 +739,6 @@ observe.validation.sensorUsed.desactivated.sensorDataFormat=Selected sensor data observe.validation.sensorUsed.desactivated.sensorType=Selected sensor type is disabled. observe.validation.sensorUsed.null.sensorSerialNo=Sensor serial No is not filled. observe.validation.sensorUsed.required.sensorType=Sensor type must be filled. -observe.validation.set.bound.currentDirection=current direction must be bound between %s and %s. -observe.validation.set.bound.currentSpeed=Current speed must be bound between %s and %s. observe.validation.set.bound.delay=Delay must be bound between %s and %s. observe.validation.set.bound.maxGearDepth=Max gear depth must be bound between %s and %s. 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,4 +1,6 @@ observe.common.ActivityLonglineLogbookDto.comment=Comentario de la actividad +observe.common.ActivityLonglineLogbookDto.currentDirection=Current direction (°) \#TODO +observe.common.ActivityLonglineLogbookDto.currentSpeed=Current speed (kt) \#TODO observe.common.ActivityLonglineLogbookDto.dataQuality=Qualité de donnée \#TODO observe.common.ActivityLonglineLogbookDto.date=Día de observación observe.common.ActivityLonglineLogbookDto.fpaZone=Zona FPA @@ -8,6 +10,7 @@ observe.common.ActivityLonglineLogbookDto.quadrant=Quadrant observe.common.ActivityLonglineLogbookDto.seaSurfaceTemperature=Temperatura de la superficie observe.common.ActivityLonglineLogbookDto.time=Hora observe.common.ActivityLonglineLogbookDto.vesselActivityLongline=Actividad barco +observe.common.ActivityLonglineLogbookDto.windDirection=Dirección del viento (°) observe.common.ActivityLonglineObsDto.comment=Comentario de la actividad observe.common.ActivityLonglineObsDto.dataQuality=Qualité de donnée \#TODO observe.common.ActivityLonglineObsDto.date=Día de observación @@ -488,6 +491,9 @@ observe.validation.baitsComposition.required.proportion=La proporción está vac observe.validation.basket.bound.floatline1Length=La longitud del orinque 1 debe ser entre %1$s y %2$s. observe.validation.basket.bound.floatline2Length=La longitud d'orinque 1 debe ser entre %1$s y %2$s.& observe.validation.basket.required.settingIdentifier=El identificador de la calada es mandatorio. +observe.validation.bound.currentDirection=La dirección actual debe ser un número comprendido entre %1$s y %2$s. +observe.validation.bound.currentSpeed=La velocidad actual debe ser un número comprendido entre %1$s y %2$s +observe.validation.bound.windDirection=La dirección actual debe ser un número comprendido entre %1$s y %2$s. observe.validation.branchline.bound.branchlineLength=La longitud del arponcillo debe ser entre %1$s y %2$s. observe.validation.branchline.bound.tracelineLength=La longitud de la parte baja debe ser entre %1$s y %2$s. 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 observe.validation.sensorUsed.desactivated.sensorType=El tipo seleccionado está desactivado. observe.validation.sensorUsed.null.sensorSerialNo=El número de serie es mandatorio. observe.validation.sensorUsed.required.sensorType=La selección de un tipo es mandatoria. -observe.validation.set.bound.currentDirection=La dirección actual debe ser un número comprendido entre %1$s y %2$s. -observe.validation.set.bound.currentSpeed=La velocidad actual debe ser un número comprendido entre %1$s y %2$s 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. observe.validation.set.bound.maxGearDepth=Las profundidas debe ser comprendidas entre %1$s y %2$s. 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,4 +1,6 @@ observe.common.ActivityLonglineLogbookDto.comment=Commentaire de l'activité +observe.common.ActivityLonglineLogbookDto.currentDirection=Direction du courant (°) +observe.common.ActivityLonglineLogbookDto.currentSpeed=vitesse du courant (nd) observe.common.ActivityLonglineLogbookDto.dataQuality=Qualité de donnée observe.common.ActivityLonglineLogbookDto.date=Jour d'observation observe.common.ActivityLonglineLogbookDto.fpaZone=Zone FPA @@ -8,6 +10,7 @@ observe.common.ActivityLonglineLogbookDto.quadrant=Quadrant observe.common.ActivityLonglineLogbookDto.seaSurfaceTemperature=Température surface observe.common.ActivityLonglineLogbookDto.time=Heure observe.common.ActivityLonglineLogbookDto.vesselActivityLongline=Activité bateau +observe.common.ActivityLonglineLogbookDto.windDirection=Direction du vent (°) observe.common.ActivityLonglineObsDto.comment=Commentaire de l'activité observe.common.ActivityLonglineObsDto.dataQuality=Qualité de donnée observe.common.ActivityLonglineObsDto.date=Jour d'observation @@ -486,6 +489,9 @@ observe.validation.baitsComposition.required.proportion=Proportion non renseign observe.validation.basket.bound.floatline1Length=La longueur d'orin 1 être comprise entre %1$s et %2$s. observe.validation.basket.bound.floatline2Length=La longueur d'orin 1 être comprise entre %1$s et %2$s.& observe.validation.basket.required.settingIdentifier=L'identifiant de filage est obligatoire. +observe.validation.bound.currentDirection=La direction courant doit être un entier compris entre %1$s et %2$s. +observe.validation.bound.currentSpeed=La vitesse courant (en nd) doit être un nombre compris entre %1$s et %2$s. +observe.validation.bound.windDirection=La direction du vent doit être un entier compris entre %1$s et %2$s. observe.validation.branchline.bound.branchlineLength=La longueur avançon doit être comprise entre %1$s et %2$s. observe.validation.branchline.bound.tracelineLength=La longueur de la partie basse doit être comprise entre %1$s et %2$s. 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 observe.validation.sensorUsed.desactivated.sensorType=Le type sélectionné est désactivé. observe.validation.sensorUsed.null.sensorSerialNo=Le numéro de série n'est pas renseigné. observe.validation.sensorUsed.required.sensorType=La sélection d'un type est obligatoire. -observe.validation.set.bound.currentDirection=La direction courant doit être un entier compris entre %1$s et %2$s. -observe.validation.set.bound.currentSpeed=La vitesse courant (en nd) doit être un nombre compris entre %1$s et %2$s. 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. observe.validation.set.bound.maxGearDepth=La profondeur doit être comprise entre %1$s et %2$s. observe.validation.set.bound.schoolMeanDepth=La profondeur moyenne doit être un entier compris entre %1$s et %2$s. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/71b5db568c1671fa916e4c83bf39... -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/71b5db568c1671fa916e4c83bf39... You're receiving this email because of your account on gitlab.com.