Observe-commits
Threads by month
- ----- 2026 -----
- June
- May
- April
- March
- February
- January
- ----- 2025 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2024 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2023 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2022 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2021 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2020 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2019 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2018 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2017 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2016 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2015 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2014 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2013 -----
- December
- November
- October
- September
- 7199 discussions
[Git][ultreiaio/ird-observe][develop] [LL] Opération de pêche : petits ajustements - Closes #1126
by Tony CHEMIT 07 Oct '18
by Tony CHEMIT 07 Oct '18
07 Oct '18
Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe
Commits:
60ebe3c4 by Tony CHEMIT at 2018-10-07T15:59:12Z
[LL] Opération de pêche : petits ajustements - Closes #1126
- - - - -
23 changed files:
- client/src/main/java/fr/ird/observe/client/ui/content/data/longline/logbook/SetLonglineLogbookUI.jaxx
- client/src/main/java/fr/ird/observe/client/ui/content/data/longline/logbook/SetLonglineLogbookUI.jcss
- client/src/main/java/fr/ird/observe/client/ui/content/data/longline/logbook/SetLonglineLogbookUIHandler.java
- dto/src/main/models/Observe-06-data-longline-logbook.model
- persistence/src/main/java/fr/ird/observe/binder/data/longline/SetLonglineLogbookEntityDtoBinder.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/03_update_referential_longline_line_type-common.sql
- + persistence/src/main/resources/db/migration/8.3/04_update_longline_set_logbook_field-H2.sql
- + persistence/src/main/resources/db/migration/8.3/04_update_longline_set_logbook_field-PG.sql
- services-local/src/main/java/fr/ird/observe/services/local/service/data/longline/SetLonglineLogbookServiceLocal.java
- 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/SetLonglineLogbookDto-create-error-validation.xml
- validation/src/main/resources/fr/ird/observe/dto/data/longline/SetLonglineLogbookDto-create-warning-validation.xml
- validation/src/main/resources/fr/ird/observe/dto/data/longline/SetLonglineLogbookDto-update-error-validation.xml
- validation/src/main/resources/fr/ird/observe/dto/data/longline/SetLonglineLogbookDto-update-warning-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/SetLonglineLogbookUI.jaxx
=====================================
@@ -326,13 +326,13 @@
<JCheckBox id='lightsticksUsed' styleClass="i18n"/>
</cell>
</row>
- <!-- lightsticks per basket count -->
+ <!-- total lightsticks count -->
<row>
<cell anchor='west'>
- <JLabel id='lightsticksPerBasketCountLabel'/>
+ <JLabel id='totalLightsticksCountLabel'/>
</cell>
<cell fill='both' weightx="1" columns="3">
- <NumberEditor id='lightsticksPerBasketCount' constructorParams='this' styleClass="int6"/>
+ <NumberEditor id='totalLightsticksCount' constructorParams='this' styleClass="int6"/>
</cell>
</row>
<!-- lightsticks type -->
=====================================
client/src/main/java/fr/ird/observe/client/ui/content/data/longline/logbook/SetLonglineLogbookUI.jcss
=====================================
@@ -196,9 +196,9 @@
selected:{BooleanUtils.isTrue(bean.getLightsticksUsed())};
}
-#lightsticksPerBasketCount {
- property:{SetLonglineLogbookDto.PROPERTY_LIGHTSTICKS_PER_BASKET_COUNT};
- numberValue:{bean.getLightsticksPerBasketCount()};
+#totalLightsticksCount {
+ property:{SetLonglineLogbookDto.PROPERTY_TOTAL_LIGHTSTICKS_COUNT};
+ numberValue:{bean.getTotalLightsticksCount()};
}
#lightsticksType {
=====================================
client/src/main/java/fr/ird/observe/client/ui/content/data/longline/logbook/SetLonglineLogbookUIHandler.java
=====================================
@@ -127,16 +127,16 @@ class SetLonglineLogbookUIHandler extends ContentEditUIHandler<SetLonglineLogboo
if (BooleanUtils.isTrue(newValue)) {
// depredated
- ui.getLightsticksPerBasketCount().setEnabled(true);
+ ui.getTotalLightsticksCount().setEnabled(true);
ui.getLightsticksType().setEnabled(true);
ui.getLightsticksColor().setEnabled(true);
} else {
// not depredated
- ui.getLightsticksPerBasketCount().setEnabled(false);
+ ui.getTotalLightsticksCount().setEnabled(false);
ui.getLightsticksType().setEnabled(false);
ui.getLightsticksColor().setEnabled(false);
- tableEditBean.setLightsticksPerBasketCount(null);
+ tableEditBean.setTotalLightsticksCount(null);
tableEditBean.setLightsticksType(null);
tableEditBean.setLightsticksColor(null);
}
=====================================
dto/src/main/models/Observe-06-data-longline-logbook.model
=====================================
@@ -49,11 +49,11 @@ branchlinesPerBasketCount + {*:1} Integer
totalSectionsCount + {*:1} Integer
totalBasketsCount + {*:1} Integer
totalHooksCount + {*:1} Integer
+totalLightsticksCount + {*:1} Integer
weightedSnap + {*:1} Boolean
snapWeight + {*:1} Float
weightedSwivel + {*:1} Boolean
swivelWeight + {*:1} Float
-lightsticksPerBasketCount + {*:1} Integer
timeBetweenHooks + {*:1} Long
shooterUsed + {*:1} Boolean
shooterSpeed + {*:1} Float
=====================================
persistence/src/main/java/fr/ird/observe/binder/data/longline/SetLonglineLogbookEntityDtoBinder.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>.
@@ -74,7 +74,7 @@ public class SetLonglineLogbookEntityDtoBinder extends DataEntityDtoBinderSuppor
entity.setMonitored(dto.getMonitored());
entity.setLightsticksUsed(dto.getLightsticksUsed());
- entity.setLightsticksPerBasketCount(dto.getLightsticksPerBasketCount());
+ entity.setTotalLightsticksCount(dto.getTotalLightsticksCount());
entity.setLightsticksType(toEntity(dto.getLightsticksType()));
entity.setLightsticksColor(toEntity(dto.getLightsticksColor()));
@@ -126,7 +126,7 @@ public class SetLonglineLogbookEntityDtoBinder extends DataEntityDtoBinderSuppor
dto.setMonitored(entity.getMonitored());
dto.setLightsticksUsed(entity.getLightsticksUsed());
- dto.setLightsticksPerBasketCount(entity.getLightsticksPerBasketCount());
+ dto.setTotalLightsticksCount(entity.getTotalLightsticksCount());
dto.setLightsticksType(toReferentialReference(referentialLocale, entity.getLightsticksType()));
dto.setLightsticksColor(toReferentialReference(referentialLocale, entity.getLightsticksColor()));
=====================================
persistence/src/main/java/fr/ird/observe/persistence/migration/DataSourceMigrationForVersion_8_3.java
=====================================
@@ -44,6 +44,7 @@ public class DataSourceMigrationForVersion_8_3 extends MigrationVersionResource
executor.addScript("01", "update_referential_longline_conservation");
executor.addScript("02", "update_referential_common_harbour");
executor.addScript("03", "update_referential_longline_line_type");
+ executor.addScript("04", "update_longline_set_logbook_field");
}
}
=====================================
persistence/src/main/models/Observe-06-data-longline-logbook.model
=====================================
@@ -51,11 +51,11 @@ branchlinesPerBasketCount + {*:1} Integer
totalSectionsCount + {*:1} Integer
totalBasketsCount + {*:1} Integer
totalHooksCount + {*:1} Integer
+totalLightsticksCount + {*:1} Integer
weightedSnap + {*:1} Boolean
snapWeight + {*:1} Float | sqlType=numeric
weightedSwivel + {*:1} Boolean
swivelWeight + {*:1} Float | sqlType=numeric
-lightsticksPerBasketCount + {*:1} Integer
timeBetweenHooks + {*:1} Long
shooterUsed + {*:1} Boolean
shooterSpeed + {*:1} Float | sqlType=numeric
=====================================
persistence/src/main/resources/db/migration/8.3/03_update_referential_longline_line_type-common.sql
=====================================
@@ -19,26 +19,5 @@
-- <http://www.gnu.org/licenses/gpl-3.0.html>.
-- #L%
---
-INSERT INTO observe_longline.linetype (topiaid,
- topiaversion,
- topiacreatedate,
- lastupdatedate,
- status,
- needComment,
- code,
- label1,
- label2,
- label3)
-values ('fr.ird.observe.entities.referentiel.longline.LineType#1239832686157#0.9',
- 0,
- CURRENT_DATE,
- CURRENT_TIMESTAMP,
- 1,
- false,
- 'UNK',
- 'Unknown',
- 'Inconnu',
- 'Desconocido');
-UPDATE observe_common.LASTUPDATEDATE
-SET lastupdatedate = CURRENT_TIMESTAMP
-WHERE topiaId = 'fr.ird.observe.entities.LastUpdateDate#1236861982132#0.48';
\ No newline at end of file
+INSERT INTO observe_longline.linetype (topiaid, topiaversion, topiacreatedate, lastupdatedate, status, needComment, code, label1, label2, label3) values ('fr.ird.observe.entities.referentiel.longline.LineType#1239832686157#0.9', 0, CURRENT_DATE, CURRENT_TIMESTAMP, 1, false, 'UNK', 'Unknown', 'Inconnu', 'Desconocido');
+UPDATE observe_common.LASTUPDATEDATE SET lastupdatedate = CURRENT_TIMESTAMP WHERE topiaId = 'fr.ird.observe.entities.LastUpdateDate#1236861982132#0.48';
\ No newline at end of file
=====================================
persistence/src/main/resources/db/migration/8.3/04_update_longline_set_logbook_field-H2.sql
=====================================
@@ -0,0 +1,22 @@
+---
+-- #%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.setlogbook ALTER COLUMN lightsticksPerBasketCount RENAME TO totalLightsticksCount;
\ No newline at end of file
=====================================
persistence/src/main/resources/db/migration/8.3/04_update_longline_set_logbook_field-PG.sql
=====================================
@@ -0,0 +1,22 @@
+---
+-- #%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.setlogbook RENAME COLUMN lightsticksPerBasketCount TO totalLightsticksCount;
\ No newline at end of file
=====================================
services-local/src/main/java/fr/ird/observe/services/local/service/data/longline/SetLonglineLogbookServiceLocal.java
=====================================
@@ -76,8 +76,7 @@ public class SetLonglineLogbookServiceLocal extends ObserveServiceLocal implemen
ActivityLonglineLogbook activityLongline = ACTIVITY_LONGLINE_LOGBOOK_SPI.loadEntity(getTopiaPersistenceContext(), activityLonglineId);
SetLonglineLogbook preCreated = SET_LONGLINE_LOGBOOK_SPI.newEntity();
- // on utilise la date - heure de l'activité pour initialiser les horodatages
- // de l'opération de pêche
+ // on utilise la date - heure de l'activité pour initialiser les horodatages de l'opération de pêche
Date timeStamp = activityLongline.getTimeStamp();
preCreated.setSettingStartTimeStamp(timeStamp);
preCreated.setSettingEndTimeStamp(DateUtils.addHours(timeStamp, 1));
@@ -87,6 +86,9 @@ public class SetLonglineLogbookServiceLocal extends ObserveServiceLocal implemen
// on reporte la position de l'activité pour la position de début de filage
preCreated.setSettingStartLatitude(activityLongline.getLatitude());
preCreated.setSettingStartLongitude(activityLongline.getLongitude());
+
+ // by default 1 section count
+ preCreated.setTotalSectionsCount(1);
Form<SetLonglineLogbookDto> form = SET_LONGLINE_LOGBOOK_SPI.dataEntityToForm(preCreated, getReferentialLocale());
form.getObject().setOtherSets(getOtherSetLonglineDtoSet(activityLongline, preCreated));
return form;
=====================================
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
=====================================
@@ -85,7 +85,7 @@ create table OBSERVE_LONGLINE.sensorBrand (topiaId varchar(255) not null, topiaV
create table OBSERVE_LONGLINE.sensorDataFormat (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.sensorType (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.sensorUsedObs (topiaId varchar(255) not null, topiaVersion bigint not null, topiaCreateDate timestamp, lastUpdateDate timestamp not null, data blob, dataFilename varchar(255), dataLocation varchar(255), sensorSerialNo varchar(255), sensorType varchar(255), sensorDataFormat varchar(255), sensorBrand varchar(255), activity varchar(255), primary key (topiaId));
-create table OBSERVE_LONGLINE.SetLogbook (topiaId varchar(255) not null, topiaVersion bigint not null, topiaCreateDate timestamp, lastUpdateDate timestamp not null, comment varchar(2147483647), homeId varchar(255), number integer, basketsPerSectionCount integer, branchlinesPerBasketCount integer, totalSectionsCount integer, totalBasketsCount integer, totalHooksCount integer, weightedSnap boolean, snapWeight numeric, weightedSwivel boolean, swivelWeight numeric, lightsticksPerBasketCount integer, timeBetweenHooks bigint, shooterUsed boolean, shooterSpeed numeric, maxDepthTargeted integer, settingStartTimeStamp timestamp, settingStartLatitude numeric, settingStartLongitude numeric, settingEndTimeStamp timestamp, settingEndLatitude numeric, settingEndLongitude numeric, settingVesselSpeed numeric, haulingDirectionSameAsSetting boolean, haulingStartTimeStamp timestamp, haulingStartLatitude numeric, haulingStartLongitude numeric, haulingEndTimeStamp timestamp, haulingEndLatitude numeric, haulingEndLongitude numeric, haulingBreaks integer, monitored boolean, totalLineLength integer, basketLineLength integer, lengthBetweenBranchlines integer, settingShape varchar(255), lineType varchar(255), lightsticksUsed boolean, lightsticksCount integer, lightsticksType varchar(255), lightsticksColor varchar(255), primary key (topiaId));
+create table OBSERVE_LONGLINE.SetLogbook (topiaId varchar(255) not null, topiaVersion bigint not null, topiaCreateDate timestamp, lastUpdateDate timestamp not null, comment varchar(2147483647), homeId varchar(255), number integer, basketsPerSectionCount integer, branchlinesPerBasketCount integer, totalSectionsCount integer, totalBasketsCount integer, totalHooksCount integer, totalLightsticksCount integer, weightedSnap boolean, snapWeight numeric, weightedSwivel boolean, swivelWeight numeric, timeBetweenHooks bigint, shooterUsed boolean, shooterSpeed numeric, maxDepthTargeted integer, settingStartTimeStamp timestamp, settingStartLatitude numeric, settingStartLongitude numeric, settingEndTimeStamp timestamp, settingEndLatitude numeric, settingEndLongitude numeric, settingVesselSpeed numeric, haulingDirectionSameAsSetting boolean, haulingStartTimeStamp timestamp, haulingStartLatitude numeric, haulingStartLongitude numeric, haulingEndTimeStamp timestamp, haulingEndLatitude numeric, haulingEndLongitude numeric, haulingBreaks integer, monitored boolean, totalLineLength integer, basketLineLength integer, lengthBetweenBranchlines integer, settingShape varchar(255), lineType varchar(255), lightsticksUsed boolean, lightsticksCount integer, lightsticksType varchar(255), lightsticksColor varchar(255), primary key (topiaId));
create table OBSERVE_LONGLINE.SetObs (topiaId varchar(255) not null, topiaVersion bigint not null, topiaCreateDate timestamp, lastUpdateDate timestamp not null, comment varchar(2147483647), homeId varchar(255), number integer, basketsPerSectionCount integer, branchlinesPerBasketCount integer, totalSectionsCount integer, totalBasketsCount integer, totalHooksCount integer, weightedSnap boolean, snapWeight numeric, weightedSwivel boolean, swivelWeight numeric, lightsticksPerBasketCount integer, timeBetweenHooks bigint, shooterUsed boolean, shooterSpeed numeric, maxDepthTargeted integer, settingStartTimeStamp timestamp, settingStartLatitude numeric, settingStartLongitude numeric, settingEndTimeStamp timestamp, settingEndLatitude numeric, settingEndLongitude numeric, settingVesselSpeed numeric, haulingDirectionSameAsSetting boolean, haulingStartTimeStamp timestamp, haulingStartLatitude numeric, haulingStartLongitude numeric, haulingEndTimeStamp timestamp, haulingEndLatitude numeric, haulingEndLongitude numeric, haulingBreaks integer, monitored boolean, settingShape varchar(255), lineType varchar(255), lightsticksType varchar(255), lightsticksColor varchar(255), primary key (topiaId));
create table OBSERVE_LONGLINE.settingShape (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.sizeMeasureObs (topiaId varchar(255) not null, topiaVersion bigint not null, topiaCreateDate timestamp, lastUpdateDate timestamp not null, size numeric, sizeMeasureType varchar(255), lengthMeasureMethod varchar(255), catch varchar(255), primary key (topiaId));
=====================================
test/src/main/resources/db/8.3/empty_pg.sql.gz
=====================================
@@ -85,7 +85,7 @@ create table OBSERVE_LONGLINE.sensorBrand (topiaId varchar(255) not null, topiaV
create table OBSERVE_LONGLINE.sensorDataFormat (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.sensorType (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.sensorUsedObs (topiaId varchar(255) not null, topiaVersion int8 not null, topiaCreateDate timestamp, lastUpdateDate timestamp not null, data oid, dataFilename varchar(255), dataLocation varchar(255), sensorSerialNo varchar(255), sensorType varchar(255), sensorDataFormat varchar(255), sensorBrand varchar(255), activity varchar(255), primary key (topiaId));
-create table OBSERVE_LONGLINE.SetLogbook (topiaId varchar(255) not null, topiaVersion int8 not null, topiaCreateDate timestamp, lastUpdateDate timestamp not null, comment text, homeId varchar(255), number int4, basketsPerSectionCount int4, branchlinesPerBasketCount int4, totalSectionsCount int4, totalBasketsCount int4, totalHooksCount int4, weightedSnap boolean, snapWeight numeric, weightedSwivel boolean, swivelWeight numeric, lightsticksPerBasketCount int4, timeBetweenHooks int8, shooterUsed boolean, shooterSpeed numeric, maxDepthTargeted int4, settingStartTimeStamp timestamp, settingStartLatitude numeric, settingStartLongitude numeric, settingEndTimeStamp timestamp, settingEndLatitude numeric, settingEndLongitude numeric, settingVesselSpeed numeric, haulingDirectionSameAsSetting boolean, haulingStartTimeStamp timestamp, haulingStartLatitude numeric, haulingStartLongitude numeric, haulingEndTimeStamp timestamp, haulingEndLatitude numeric, haulingEndLongitude numeric, haulingBreaks int4, monitored boolean, totalLineLength int4, basketLineLength int4, lengthBetweenBranchlines int4, settingShape varchar(255), lineType varchar(255), lightsticksUsed boolean, lightsticksCount int4, lightsticksType varchar(255), lightsticksColor varchar(255), primary key (topiaId));
+create table OBSERVE_LONGLINE.SetLogbook (topiaId varchar(255) not null, topiaVersion int8 not null, topiaCreateDate timestamp, lastUpdateDate timestamp not null, comment text, homeId varchar(255), number int4, basketsPerSectionCount int4, branchlinesPerBasketCount int4, totalSectionsCount int4, totalBasketsCount int4, totalHooksCount int4, totalLightsticksCount int4, weightedSnap boolean, snapWeight numeric, weightedSwivel boolean, swivelWeight numeric, timeBetweenHooks int8, shooterUsed boolean, shooterSpeed numeric, maxDepthTargeted int4, settingStartTimeStamp timestamp, settingStartLatitude numeric, settingStartLongitude numeric, settingEndTimeStamp timestamp, settingEndLatitude numeric, settingEndLongitude numeric, settingVesselSpeed numeric, haulingDirectionSameAsSetting boolean, haulingStartTimeStamp timestamp, haulingStartLatitude numeric, haulingStartLongitude numeric, haulingEndTimeStamp timestamp, haulingEndLatitude numeric, haulingEndLongitude numeric, haulingBreaks int4, monitored boolean, totalLineLength int4, basketLineLength int4, lengthBetweenBranchlines int4, settingShape varchar(255), lineType varchar(255), lightsticksUsed boolean, lightsticksCount int4, lightsticksType varchar(255), lightsticksColor varchar(255), primary key (topiaId));
create table OBSERVE_LONGLINE.SetObs (topiaId varchar(255) not null, topiaVersion int8 not null, topiaCreateDate timestamp, lastUpdateDate timestamp not null, comment text, homeId varchar(255), number int4, basketsPerSectionCount int4, branchlinesPerBasketCount int4, totalSectionsCount int4, totalBasketsCount int4, totalHooksCount int4, weightedSnap boolean, snapWeight numeric, weightedSwivel boolean, swivelWeight numeric, lightsticksPerBasketCount int4, timeBetweenHooks int8, shooterUsed boolean, shooterSpeed numeric, maxDepthTargeted int4, settingStartTimeStamp timestamp, settingStartLatitude numeric, settingStartLongitude numeric, settingEndTimeStamp timestamp, settingEndLatitude numeric, settingEndLongitude numeric, settingVesselSpeed numeric, haulingDirectionSameAsSetting boolean, haulingStartTimeStamp timestamp, haulingStartLatitude numeric, haulingStartLongitude numeric, haulingEndTimeStamp timestamp, haulingEndLatitude numeric, haulingEndLongitude numeric, haulingBreaks int4, monitored boolean, settingShape varchar(255), lineType varchar(255), lightsticksType varchar(255), lightsticksColor varchar(255), primary key (topiaId));
create table OBSERVE_LONGLINE.settingShape (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.sizeMeasureObs (topiaId varchar(255) not null, topiaVersion int8 not null, topiaCreateDate timestamp, lastUpdateDate timestamp not null, size numeric, sizeMeasureType varchar(255), lengthMeasureMethod varchar(255), catch 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/SetLonglineLogbookDto-create-error-validation.xml
=====================================
@@ -42,15 +42,6 @@
</field>
- <field name="haulingDirectionSameAsSetting">
-
- <!-- haulingDirectionSameAsSetting non renseigne -->
- <field-validator type="required" short-circuit="true">
- <message>observe.validation.setLongline.required.haulingDirectionSameAsSetting</message>
- </field-validator>
-
- </field>
-
<field name="settingStartTimeStamp">
<!-- settingStartTimeStamp non renseigne -->
@@ -454,11 +445,6 @@
<field name="totalSectionsCount">
- <!-- totalSectionsCount obligatoire -->
- <field-validator type="required" short-circuit="true">
- <message>observe.validation.setLongline.required.totalSectionsCount</message>
- </field-validator>
-
<!-- 0 <= totalSectionsCount <= 100 -->
<field-validator type="fieldexpressionwithparams" short-circuit="true">
<param name="intParams">min:0|max:100</param>
@@ -475,16 +461,11 @@
<field name="basketsPerSectionCount">
- <!-- basketsPerSectionCount obligatoire -->
- <field-validator type="required" short-circuit="true">
- <message>observe.validation.setLongline.required.basketsPerSectionCount</message>
- </field-validator>
-
<!-- 0 <= basketsPerSectionCount <= 100 -->
<field-validator type="fieldexpressionwithparams" short-circuit="true">
<param name="intParams">min:0|max:100</param>
<param name="expression"><![CDATA[
- (ints.min <= basketsPerSectionCount && basketsPerSectionCount <= ints.max)
+ basketsPerSectionCount == null || (ints.min <= basketsPerSectionCount && basketsPerSectionCount <= ints.max)
]]>
</param>
<message>
@@ -496,16 +477,11 @@
<field name="branchlinesPerBasketCount">
- <!-- branchlinesPerBasketCount obligatoire -->
- <field-validator type="required" short-circuit="true">
- <message>observe.validation.setLongline.required.branchlinesPerBasketCount</message>
- </field-validator>
-
<!-- 0 <= branchlinesPerBasketCount <= 50 -->
<field-validator type="fieldexpressionwithparams" short-circuit="true">
<param name="intParams">min:0|max:50</param>
<param name="expression"><![CDATA[
- (ints.min <= branchlinesPerBasketCount && branchlinesPerBasketCount <= ints.max)
+ branchlinesPerBasketCount == null || (ints.min <= branchlinesPerBasketCount && branchlinesPerBasketCount <= ints.max)
]]>
</param>
<message>
@@ -547,17 +523,17 @@
</field>
- <field name="lightsticksPerBasketCount">
+ <field name="totalLightsticksCount">
- <!-- 0 <= lightsticksPerBasketCount <= 50 -->
+ <!-- 0 <= totalLightsticksCount <= 50 -->
<field-validator type="fieldexpressionwithparams" short-circuit="true">
<param name="intParams">min:0|max:50</param>
<param name="expression"><![CDATA[
- lightsticksPerBasketCount == null || (ints.min <= lightsticksPerBasketCount && lightsticksPerBasketCount <= ints.max)
+ totalLightsticksCount == null || (ints.min <= totalLightsticksCount && totalLightsticksCount <= ints.max)
]]>
</param>
<message>
- observe.validation.setLongline.bound.lightsticksPerBasketCount##${ints.min}##${ints.max}
+ observe.validation.setLongline.bound.totalLightsticksCount##${ints.min}##${ints.max}
</message>
</field-validator>
=====================================
validation/src/main/resources/fr/ird/observe/dto/data/longline/SetLonglineLogbookDto-create-warning-validation.xml
=====================================
@@ -140,4 +140,31 @@
</field>
+ <field name="totalSectionsCount">
+
+ <!-- totalSectionsCount obligatoire -->
+ <field-validator type="required" short-circuit="true">
+ <message>observe.validation.setLongline.required.totalSectionsCount</message>
+ </field-validator>
+
+ </field>
+
+ <field name="basketsPerSectionCount">
+
+ <!-- basketsPerSectionCount obligatoire -->
+ <field-validator type="required" short-circuit="true">
+ <message>observe.validation.setLongline.required.basketsPerSectionCount</message>
+ </field-validator>
+
+ </field>
+
+ <field name="branchlinesPerBasketCount">
+
+ <!-- branchlinesPerBasketCount obligatoire -->
+ <field-validator type="required" short-circuit="true">
+ <message>observe.validation.setLongline.required.branchlinesPerBasketCount</message>
+ </field-validator>
+
+ </field>
+
</validators>
=====================================
validation/src/main/resources/fr/ird/observe/dto/data/longline/SetLonglineLogbookDto-update-error-validation.xml
=====================================
@@ -42,15 +42,6 @@
</field>
- <field name="haulingDirectionSameAsSetting">
-
- <!-- haulingDirectionSameAsSetting non renseigne -->
- <field-validator type="required" short-circuit="true">
- <message>observe.validation.setLongline.required.haulingDirectionSameAsSetting</message>
- </field-validator>
-
- </field>
-
<field name="settingStartTimeStamp">
<!-- settingStartTimeStamp non renseigne -->
@@ -438,11 +429,6 @@
<field name="totalSectionsCount">
- <!-- totalSectionsCount obligatoire -->
- <field-validator type="required" short-circuit="true">
- <message>observe.validation.setLongline.required.totalSectionsCount</message>
- </field-validator>
-
<!-- 0 <= totalSectionsCount <= 100 -->
<field-validator type="fieldexpressionwithparams" short-circuit="true">
<param name="intParams">min:0|max:100</param>
@@ -459,16 +445,11 @@
<field name="basketsPerSectionCount">
- <!-- basketsPerSectionCount obligatoire -->
- <field-validator type="required" short-circuit="true">
- <message>observe.validation.setLongline.required.basketsPerSectionCount</message>
- </field-validator>
-
<!-- 0 <= basketsPerSectionCount <= 100 -->
<field-validator type="fieldexpressionwithparams" short-circuit="true">
<param name="intParams">min:0|max:100</param>
<param name="expression"><![CDATA[
- (ints.min <= basketsPerSectionCount && basketsPerSectionCount <= ints.max)
+ basketsPerSectionCount == null || (ints.min <= basketsPerSectionCount && basketsPerSectionCount <= ints.max)
]]>
</param>
<message>
@@ -480,16 +461,11 @@
<field name="branchlinesPerBasketCount">
- <!-- branchlinesPerBasketCount obligatoire -->
- <field-validator type="required" short-circuit="true">
- <message>observe.validation.setLongline.required.branchlinesPerBasketCount</message>
- </field-validator>
-
<!-- 0 <= branchlinesPerBasketCount <= 50 -->
<field-validator type="fieldexpressionwithparams" short-circuit="true">
<param name="intParams">min:0|max:50</param>
<param name="expression"><![CDATA[
- (ints.min <= branchlinesPerBasketCount && branchlinesPerBasketCount <= ints.max)
+ branchlinesPerBasketCount == null || (ints.min <= branchlinesPerBasketCount && branchlinesPerBasketCount <= ints.max)
]]>
</param>
<message>
@@ -531,17 +507,17 @@
</field>
- <field name="lightsticksPerBasketCount">
+ <field name="totalLightsticksCount">
- <!-- 0 <= lightsticksPerBasketCount <= 50 -->
+ <!-- 0 <= totalLightsticksCount <= 50 -->
<field-validator type="fieldexpressionwithparams" short-circuit="true">
<param name="intParams">min:0|max:50</param>
<param name="expression"><![CDATA[
- lightsticksPerBasketCount == null || (ints.min <= lightsticksPerBasketCount && lightsticksPerBasketCount <= ints.max)
+ totalLightsticksCount == null || (ints.min <= totalLightsticksCount && totalLightsticksCount <= ints.max)
]]>
</param>
<message>
- observe.validation.setLongline.bound.lightsticksPerBasketCount##${ints.min}##${ints.max}
+ observe.validation.setLongline.bound.totalLightsticksCount##${ints.min}##${ints.max}
</message>
</field-validator>
=====================================
validation/src/main/resources/fr/ird/observe/dto/data/longline/SetLonglineLogbookDto-update-warning-validation.xml
=====================================
@@ -140,4 +140,31 @@
</field>
+ <field name="totalSectionsCount">
+
+ <!-- totalSectionsCount obligatoire -->
+ <field-validator type="required" short-circuit="true">
+ <message>observe.validation.setLongline.required.totalSectionsCount</message>
+ </field-validator>
+
+ </field>
+
+ <field name="basketsPerSectionCount">
+
+ <!-- basketsPerSectionCount obligatoire -->
+ <field-validator type="required" short-circuit="true">
+ <message>observe.validation.setLongline.required.basketsPerSectionCount</message>
+ </field-validator>
+
+ </field>
+
+ <field name="branchlinesPerBasketCount">
+
+ <!-- branchlinesPerBasketCount obligatoire -->
+ <field-validator type="required" short-circuit="true">
+ <message>observe.validation.setLongline.required.branchlinesPerBasketCount</message>
+ </field-validator>
+
+ </field>
+
</validators>
=====================================
validation/src/main/resources/i18n/validation_en_GB.properties
=====================================
@@ -254,7 +254,6 @@ observe.common.SetLonglineLogbookDto.haulingStartQuadrant=Hauling start quadrant
observe.common.SetLonglineLogbookDto.haulingStartTimeStamp=Start timestamp
observe.common.SetLonglineLogbookDto.homeId=Home id
observe.common.SetLonglineLogbookDto.lightsticksColor=Lightsticks color
-observe.common.SetLonglineLogbookDto.lightsticksPerBasketCount=lightsticks per basket count
observe.common.SetLonglineLogbookDto.lightsticksType=Lightsticks type
observe.common.SetLonglineLogbookDto.lineType=Line type
observe.common.SetLonglineLogbookDto.maxDepthTargeted=Max depth targeted (m)
@@ -275,6 +274,7 @@ observe.common.SetLonglineLogbookDto.swivelWeight=swivel weight (kg)
observe.common.SetLonglineLogbookDto.timeBetweenHooks=time between hooks
observe.common.SetLonglineLogbookDto.totalBasketsCount=Total baskets count
observe.common.SetLonglineLogbookDto.totalHooksCount=Total hooks count
+observe.common.SetLonglineLogbookDto.totalLightsticksCount=Total number of lightsticks
observe.common.SetLonglineLogbookDto.totalSectionsCount=Total sections count
observe.common.SetLonglineLogbookGlobalCompositionDto.baitsComposition=Baits composition
observe.common.SetLonglineLogbookGlobalCompositionDto.baitsCompositionProportionSum=Baits composition proportion sum
@@ -766,6 +766,7 @@ observe.validation.setLongline.bound.swivelWeight=Swivel weight must be bound be
observe.validation.setLongline.bound.timeBetweenHooks=Time between hooks must be bound between %s and %s.
observe.validation.setLongline.bound.totalBasketsCount=Total baskets count must be bound between %s and %s.
observe.validation.setLongline.bound.totalHooksCount=Total hooks count must be bound between %s and %s.
+observe.validation.setLongline.bound.totalLightsticksCount=Total number of lightsticks must be bound between %s and %s.
observe.validation.setLongline.bound.totalSectionsCount=must be bound between %s and %s.
observe.validation.setLongline.branchlinesComposition.uniqueKey=Tuple (topType/type/size) must be unique.
observe.validation.setLongline.desactivated.lightsticksColor=Selected lightstick color is disabled.
=====================================
validation/src/main/resources/i18n/validation_es_ES.properties
=====================================
@@ -256,7 +256,6 @@ observe.common.SetLonglineLogbookDto.haulingStartQuadrant=Arrastre Quadrant
observe.common.SetLonglineLogbookDto.haulingStartTimeStamp=Timestamp del inicio
observe.common.SetLonglineLogbookDto.homeId=Id de negocio
observe.common.SetLonglineLogbookDto.lightsticksColor=Color de barrita de luz
-observe.common.SetLonglineLogbookDto.lightsticksPerBasketCount=Número de barrita de luz por cesta
observe.common.SetLonglineLogbookDto.lightsticksType=Tipo de barrita de luz
observe.common.SetLonglineLogbookDto.lineType=Tipo de línea
observe.common.SetLonglineLogbookDto.maxDepthTargeted=Profundidad máxima deseada
@@ -277,6 +276,7 @@ observe.common.SetLonglineLogbookDto.swivelWeight=Peso de el destorcedor (kg)
observe.common.SetLonglineLogbookDto.timeBetweenHooks=Temps entre anzuelos (s)
observe.common.SetLonglineLogbookDto.totalBasketsCount=Número total de baskets
observe.common.SetLonglineLogbookDto.totalHooksCount=Número total d'arponcillos
+observe.common.SetLonglineLogbookDto.totalLightsticksCount=Número total de barras de luz
observe.common.SetLonglineLogbookDto.totalSectionsCount=Número total de secciones
observe.common.SetLonglineLogbookGlobalCompositionDto.baitsComposition=Cebo
observe.common.SetLonglineLogbookGlobalCompositionDto.baitsCompositionProportionSum=Suma de los proporciónes de cebo (%)
@@ -768,6 +768,7 @@ observe.validation.setLongline.bound.swivelWeight=El peso destorcedor debe estar
observe.validation.setLongline.bound.timeBetweenHooks=El tiempo entre avanzuelos debe estar comprendido entre %1$s y %2$s.
observe.validation.setLongline.bound.totalBasketsCount=El número total de cestas debe estar comprendido entre %1$s y %2$s.
observe.validation.setLongline.bound.totalHooksCount=El número total de avanzuelos debe estar comprendido entre %1$s y %2$s.
+observe.validation.setLongline.bound.totalLightsticksCount=El total de barras de luz debe estar comprendido entre %1$s y %2$s.
observe.validation.setLongline.bound.totalSectionsCount=El número total de secciones debe estar comprendido entre %1$s y %2$s.
observe.validation.setLongline.branchlinesComposition.uniqueKey=La tupla (tipo alto/tipo bajo/tamaño) debe ser única, la tupa ya está utilizada.
observe.validation.setLongline.desactivated.lightsticksColor=El color de la barrita de luz seleccionado está desactivado.
=====================================
validation/src/main/resources/i18n/validation_fr_FR.properties
=====================================
@@ -254,7 +254,6 @@ observe.common.SetLonglineLogbookDto.haulingStartQuadrant=Quadrant de début de
observe.common.SetLonglineLogbookDto.haulingStartTimeStamp=Horodatage début
observe.common.SetLonglineLogbookDto.homeId=Id métier
observe.common.SetLonglineLogbookDto.lightsticksColor=Couleur de cyalumes
-observe.common.SetLonglineLogbookDto.lightsticksPerBasketCount=Nombre de cyalumes par panier
observe.common.SetLonglineLogbookDto.lightsticksType=Type de cyalumes
observe.common.SetLonglineLogbookDto.lineType=Type de ligne
observe.common.SetLonglineLogbookDto.maxDepthTargeted=Profondeur maximum ciblée
@@ -275,6 +274,7 @@ observe.common.SetLonglineLogbookDto.swivelWeight=Poids de l'émerillon (kg)
observe.common.SetLonglineLogbookDto.timeBetweenHooks=Temps entre hameçons (s)
observe.common.SetLonglineLogbookDto.totalBasketsCount=Nombre total de paniers
observe.common.SetLonglineLogbookDto.totalHooksCount=Nombre total d'avançons
+observe.common.SetLonglineLogbookDto.totalLightsticksCount=Nombre total de cyalumes
observe.common.SetLonglineLogbookDto.totalSectionsCount=Nombre total de sections
observe.common.SetLonglineLogbookGlobalCompositionDto.baitsComposition=Appâts
observe.common.SetLonglineLogbookGlobalCompositionDto.baitsCompositionProportionSum=Somme des proportions d'appâts (%)
@@ -766,6 +766,7 @@ observe.validation.setLongline.bound.swivelWeight=Le poids émerillon doit être
observe.validation.setLongline.bound.timeBetweenHooks=Le temps entre hameçons doit être compris entre %1$s et %2$s.
observe.validation.setLongline.bound.totalBasketsCount=Le nombre total de paniers doit être compris entre %1$s et %2$s.
observe.validation.setLongline.bound.totalHooksCount=Le nombre total d'hameçons doit être compris entre %1$s et %2$s.
+observe.validation.setLongline.bound.totalLightsticksCount=Le nombre total de cyalumes doit être compris entre %1$s et %2$s.
observe.validation.setLongline.bound.totalSectionsCount=Le nombre total de sections doit être compris entre %1$s et %2$s.
observe.validation.setLongline.branchlinesComposition.uniqueKey=Le tuple (type haut/type bas/taille) doit être unique
observe.validation.setLongline.desactivated.lightsticksColor=La couleur de cyalume sélectionné est désactivé.
View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/60ebe3c43dc1e0ebbf447140098…
--
View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/60ebe3c43dc1e0ebbf447140098…
You're receiving this email because of your account on gitlab.com.
1
0
[Git][ultreiaio/ird-observe][develop] 3 commits: [LL] Composition globale de la palangre : petits ajustements - Closes #1128…
by Tony CHEMIT 07 Oct '18
by Tony CHEMIT 07 Oct '18
07 Oct '18
Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe
Commits:
4f62c2f4 by Tony CHEMIT at 2018-10-07T15:12:10Z
[LL] Composition globale de la palangre : petits ajustements - Closes #1128 (plus alignement de l'écran observation)
- - - - -
39e3eb2c by Tony CHEMIT at 2018-10-07T15:12:13Z
[LL] Les positions géographiques de fin de filage, début et fin de virage ne doivent pas être obligatoires - Closes #1115
- - - - -
a370d2af by Tony CHEMIT at 2018-10-07T15:12:13Z
fix coordinates validation message (and remove a lots of them \o/)
- - - - -
30 changed files:
- client/src/main/java/fr/ird/observe/client/ui/content/api/data/table/ContentTableUIModel.java
- + client/src/main/java/fr/ird/observe/client/ui/content/api/data/table/NotStandaloneContentTableUIHandler.java
- client/src/main/java/fr/ird/observe/client/ui/content/data/longline/logbook/BaitsCompositionLogbookUI.jaxx
- client/src/main/java/fr/ird/observe/client/ui/content/data/longline/logbook/BaitsCompositionLogbookUI.jcss
- client/src/main/java/fr/ird/observe/client/ui/content/data/longline/logbook/BaitsCompositionLogbookUIHandler.java
- client/src/main/java/fr/ird/observe/client/ui/content/data/longline/logbook/BaitsCompositionLogbookUIModel.java
- client/src/main/java/fr/ird/observe/client/ui/content/data/longline/logbook/BranchlinesCompositionLogbookUI.jaxx
- client/src/main/java/fr/ird/observe/client/ui/content/data/longline/logbook/BranchlinesCompositionLogbookUI.jcss
- client/src/main/java/fr/ird/observe/client/ui/content/data/longline/logbook/BranchlinesCompositionLogbookUIHandler.java
- client/src/main/java/fr/ird/observe/client/ui/content/data/longline/logbook/BranchlinesCompositionLogbookUIModel.java
- client/src/main/java/fr/ird/observe/client/ui/content/data/longline/logbook/FloatlinesCompositionLogbookUI.jaxx
- client/src/main/java/fr/ird/observe/client/ui/content/data/longline/logbook/FloatlinesCompositionLogbookUI.jcss
- client/src/main/java/fr/ird/observe/client/ui/content/data/longline/logbook/FloatlinesCompositionLogbookUIHandler.java
- client/src/main/java/fr/ird/observe/client/ui/content/data/longline/logbook/FloatlinesCompositionLogbookUIModel.java
- client/src/main/java/fr/ird/observe/client/ui/content/data/longline/logbook/HooksCompositionLogbookUI.jaxx
- client/src/main/java/fr/ird/observe/client/ui/content/data/longline/logbook/HooksCompositionLogbookUI.jcss
- client/src/main/java/fr/ird/observe/client/ui/content/data/longline/logbook/HooksCompositionLogbookUIHandler.java
- client/src/main/java/fr/ird/observe/client/ui/content/data/longline/logbook/HooksCompositionLogbookUIModel.java
- client/src/main/java/fr/ird/observe/client/ui/content/data/longline/obs/BaitsCompositionObsUI.jaxx
- client/src/main/java/fr/ird/observe/client/ui/content/data/longline/obs/BaitsCompositionObsUI.jcss
- client/src/main/java/fr/ird/observe/client/ui/content/data/longline/obs/BaitsCompositionObsUIHandler.java
- client/src/main/java/fr/ird/observe/client/ui/content/data/longline/obs/BranchlinesCompositionObsUI.jaxx
- client/src/main/java/fr/ird/observe/client/ui/content/data/longline/obs/BranchlinesCompositionObsUI.jcss
- client/src/main/java/fr/ird/observe/client/ui/content/data/longline/obs/BranchlinesCompositionObsUIHandler.java
- client/src/main/java/fr/ird/observe/client/ui/content/data/longline/obs/FloatlinesCompositionObsUI.jaxx
- client/src/main/java/fr/ird/observe/client/ui/content/data/longline/obs/FloatlinesCompositionObsUI.jcss
- client/src/main/java/fr/ird/observe/client/ui/content/data/longline/obs/FloatlinesCompositionObsUIHandler.java
- client/src/main/java/fr/ird/observe/client/ui/content/data/longline/obs/HooksCompositionObsUI.jaxx
- + client/src/main/java/fr/ird/observe/client/ui/content/data/longline/obs/HooksCompositionObsUI.jcss
- client/src/main/java/fr/ird/observe/client/ui/content/data/longline/obs/HooksCompositionObsUIHandler.java
The diff was not included because it is too large.
View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/591c5b54eec1351876d3e9baaf…
--
View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/591c5b54eec1351876d3e9baaf…
You're receiving this email because of your account on gitlab.com.
1
0
[Git][ultreiaio/ird-observe][develop] 2 commits: [LL] Les positions géographiques de fin de filage, début et fin de virage ne…
by Tony CHEMIT 07 Oct '18
by Tony CHEMIT 07 Oct '18
07 Oct '18
Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe
Commits:
40c00247 by Tony CHEMIT at 2018-10-07T14:32:34Z
[LL] Les positions géographiques de fin de filage, début et fin de virage ne doivent pas être obligatoires - Closes #1115
- - - - -
591c5b54 by Tony CHEMIT at 2018-10-07T14:57:37Z
fix coordinates validation message (and remove a lots of them \o/)
- - - - -
22 changed files:
- + services/.mvn/i18n-generate
- + services/.mvn/i18n-parse-java
- + services/src/main/resources/i18n/services_en_GB.properties
- + services/src/main/resources/i18n/services_es_ES.properties
- + services/src/main/resources/i18n/services_fr_FR.properties
- 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/longline/ActivityLonglineObsDto-create-error-validation.xml
- validation/src/main/resources/fr/ird/observe/dto/data/longline/ActivityLonglineObsDto-update-error-validation.xml
- validation/src/main/resources/fr/ird/observe/dto/data/longline/SampleLogbookDto-create-error-validation.xml
- validation/src/main/resources/fr/ird/observe/dto/data/longline/SampleLogbookDto-update-error-validation.xml
- validation/src/main/resources/fr/ird/observe/dto/data/longline/SetLonglineLogbookDto-create-error-validation.xml
- validation/src/main/resources/fr/ird/observe/dto/data/longline/SetLonglineLogbookDto-create-warning-validation.xml
- validation/src/main/resources/fr/ird/observe/dto/data/longline/SetLonglineLogbookDto-update-error-validation.xml
- validation/src/main/resources/fr/ird/observe/dto/data/longline/SetLonglineLogbookDto-update-warning-validation.xml
- validation/src/main/resources/fr/ird/observe/dto/data/longline/SetLonglineObsDto-create-error-validation.xml
- validation/src/main/resources/fr/ird/observe/dto/data/longline/SetLonglineObsDto-update-error-validation.xml
- validation/src/main/resources/fr/ird/observe/dto/data/seine/ActivitySeineDto-create-error-validation.xml
- validation/src/main/resources/fr/ird/observe/dto/data/seine/ActivitySeineDto-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:
=====================================
services/.mvn/i18n-generate
=====================================
=====================================
services/.mvn/i18n-parse-java
=====================================
=====================================
services/src/main/resources/i18n/services_en_GB.properties
=====================================
@@ -0,0 +1,6 @@
+observe.validation.coordinate.degree.latitude.outOfBound=Latitude must be between 0 and 90.
+observe.validation.coordinate.degree.longitude.outOfBound=Longitude must be between 0 and 180.
+observe.validation.coordinate.minute.latitude.outOfBound=Latitude must be between 0 and 90.
+observe.validation.coordinate.minute.longitude.outOfBound=Longitude must be between 0 and 180.
+observe.validation.coordinate.second.latitude.outOfBound=Latitude must be between 0 and 90.
+observe.validation.coordinate.second.longitude.outOfBound=Longitude must be between 0 and 180.
=====================================
services/src/main/resources/i18n/services_es_ES.properties
=====================================
@@ -0,0 +1,6 @@
+observe.validation.coordinate.degree.latitude.outOfBound=La latitud estar comprendida entre 0 y 90.
+observe.validation.coordinate.degree.longitude.outOfBound=La longitud estar comprendida entre 0 y 180.
+observe.validation.coordinate.minute.latitude.outOfBound=La latitud estar comprendida entre 0 y 90.
+observe.validation.coordinate.minute.longitude.outOfBound=La longitud estar comprendida entre 0 y 180.
+observe.validation.coordinate.second.latitude.outOfBound=La latitud estar comprendida entre 0 y 90.
+observe.validation.coordinate.second.longitude.outOfBound=La longitud estar comprendida entre 0 y 180.
=====================================
services/src/main/resources/i18n/services_fr_FR.properties
=====================================
@@ -0,0 +1,6 @@
+observe.validation.coordinate.degree.latitude.outOfBound=La latitude doit être comprise entre 0 et 90.
+observe.validation.coordinate.degree.longitude.outOfBound=La longitude doit être comprise entre 0 et 180.
+observe.validation.coordinate.minute.latitude.outOfBound=La latitude doit être comprise entre 0 et 90.
+observe.validation.coordinate.minute.longitude.outOfBound=La longitude doit être comprise entre 0 et 180.
+observe.validation.coordinate.second.latitude.outOfBound=La latitude doit être comprise entre 0 et 90.
+observe.validation.coordinate.second.longitude.outOfBound=La longitude doit être comprise entre 0 et 180.
=====================================
validation/src/main/resources/fr/ird/observe/dto/data/longline/ActivityLonglineLogbookDto-create-error-validation.xml
=====================================
@@ -111,17 +111,6 @@
<message>observe.validation.activity.required.latitude</message>
</field-validator>
- <!-- 0 <= latitude <= 90 -->
- <field-validator type="fieldexpressionwithparams" short-circuit="true">
- <param name="doubleParams">min:-90.0|max:90.0</param>
- <param name="expression">
- <![CDATA[ (doubles.min <= latitude && latitude <= doubles.max)]]>
- </param>
- <message>
- observe.validation.activity.bound.latitude##0.0##${doubles.max}
- </message>
- </field-validator>
-
<field-validator type="coordinateLatitudeDto" short-circuit="true">
<param name="editorName">coordinate</param>
<message/>
@@ -136,17 +125,6 @@
<message>observe.validation.activity.required.longitude</message>
</field-validator>
- <!-- 0 <= longitude <= 180 -->
- <field-validator type="fieldexpressionwithparams" short-circuit="true">
- <param name="doubleParams">min:-180.0|max:180.0</param>
- <param name="expression">
- <![CDATA[ (doubles.min <= longitude && longitude <= doubles.max)]]>
- </param>
- <message>
- observe.validation.activity.bound.longitude##0.0##${doubles.max}
- </message>
- </field-validator>
-
<field-validator type="coordinateLongitudeDto" short-circuit="true">
<param name="editorName">coordinate</param>
<message/>
=====================================
validation/src/main/resources/fr/ird/observe/dto/data/longline/ActivityLonglineLogbookDto-update-error-validation.xml
=====================================
@@ -96,18 +96,6 @@
<message>observe.validation.activity.required.latitude</message>
</field-validator>
- <!-- 0 <= latitude <= 90 -->
-
- <field-validator type="fieldexpressionwithparams" short-circuit="true">
- <param name="doubleParams">min:-90.0|max:90.0</param>
- <param name="expression">
- <![CDATA[ (doubles.min <= latitude && latitude <= doubles.max)]]>
- </param>
- <message>
- observe.validation.activity.bound.latitude##0.0##${doubles.max}
- </message>
- </field-validator>
-
<field-validator type="coordinateLatitudeDto" short-circuit="true">
<param name="editorName">coordinate</param>
<message/>
@@ -122,17 +110,6 @@
<message>observe.validation.activity.required.longitude</message>
</field-validator>
- <!-- 0 <= longitude <= 180 -->
- <field-validator type="fieldexpressionwithparams" short-circuit="true">
- <param name="doubleParams">min:-180.0|max:180.0</param>
- <param name="expression">
- <![CDATA[ (doubles.min <= longitude && longitude <= doubles.max)]]>
- </param>
- <message>
- observe.validation.activity.bound.longitude##0.0##${doubles.max}
- </message>
- </field-validator>
-
<field-validator type="coordinateLongitudeDto" short-circuit="true">
<param name="editorName">coordinate</param>
<message/>
=====================================
validation/src/main/resources/fr/ird/observe/dto/data/longline/ActivityLonglineObsDto-create-error-validation.xml
=====================================
@@ -112,17 +112,6 @@
<message>observe.validation.activity.required.latitude</message>
</field-validator>
- <!-- 0 <= latitude <= 90 -->
- <field-validator type="fieldexpressionwithparams" short-circuit="true">
- <param name="doubleParams">min:-90.0|max:90.0</param>
- <param name="expression">
- <![CDATA[ (doubles.min <= latitude && latitude <= doubles.max)]]>
- </param>
- <message>
- observe.validation.activity.bound.latitude##0.0##${doubles.max}
- </message>
- </field-validator>
-
<field-validator type="coordinateLatitudeDto" short-circuit="true">
<param name="editorName">coordinate</param>
<message/>
@@ -137,17 +126,6 @@
<message>observe.validation.activity.required.longitude</message>
</field-validator>
- <!-- 0 <= longitude <= 180 -->
- <field-validator type="fieldexpressionwithparams" short-circuit="true">
- <param name="doubleParams">min:-180.0|max:180.0</param>
- <param name="expression">
- <![CDATA[ (doubles.min <= longitude && longitude <= doubles.max)]]>
- </param>
- <message>
- observe.validation.activity.bound.longitude##0.0##${doubles.max}
- </message>
- </field-validator>
-
<field-validator type="coordinateLongitudeDto" short-circuit="true">
<param name="editorName">coordinate</param>
<message/>
=====================================
validation/src/main/resources/fr/ird/observe/dto/data/longline/ActivityLonglineObsDto-update-error-validation.xml
=====================================
@@ -97,18 +97,6 @@
<message>observe.validation.activity.required.latitude</message>
</field-validator>
- <!-- 0 <= latitude <= 90 -->
-
- <field-validator type="fieldexpressionwithparams" short-circuit="true">
- <param name="doubleParams">min:-90.0|max:90.0</param>
- <param name="expression">
- <![CDATA[ (doubles.min <= latitude && latitude <= doubles.max)]]>
- </param>
- <message>
- observe.validation.activity.bound.latitude##0.0##${doubles.max}
- </message>
- </field-validator>
-
<field-validator type="coordinateLatitudeDto" short-circuit="true">
<param name="editorName">coordinate</param>
<message/>
@@ -123,17 +111,6 @@
<message>observe.validation.activity.required.longitude</message>
</field-validator>
- <!-- 0 <= longitude <= 180 -->
- <field-validator type="fieldexpressionwithparams" short-circuit="true">
- <param name="doubleParams">min:-180.0|max:180.0</param>
- <param name="expression">
- <![CDATA[ (doubles.min <= longitude && longitude <= doubles.max)]]>
- </param>
- <message>
- observe.validation.activity.bound.longitude##0.0##${doubles.max}
- </message>
- </field-validator>
-
<field-validator type="coordinateLongitudeDto" short-circuit="true">
<param name="editorName">coordinate</param>
<message/>
=====================================
validation/src/main/resources/fr/ird/observe/dto/data/longline/SampleLogbookDto-create-error-validation.xml
=====================================
@@ -56,17 +56,6 @@
<message>observe.validation.activity.required.latitude</message>
</field-validator>
- <!-- 0 <= latitude <= 90 -->
- <field-validator type="fieldexpressionwithparams" short-circuit="true">
- <param name="doubleParams">min:-90.0|max:90.0</param>
- <param name="expression">
- <![CDATA[ (doubles.min <= latitude && latitude <= doubles.max)]]>
- </param>
- <message>
- observe.validation.activity.bound.latitude##0.0##${doubles.max}
- </message>
- </field-validator>
-
<field-validator type="coordinateLatitudeDto" short-circuit="true">
<param name="editorName">coordinate</param>
<message/>
@@ -81,15 +70,9 @@
<message>observe.validation.activity.required.longitude</message>
</field-validator>
- <!-- 0 <= longitude <= 180 -->
- <field-validator type="fieldexpressionwithparams" short-circuit="true">
- <param name="doubleParams">min:-180.0|max:180.0</param>
- <param name="expression">
- <![CDATA[ (doubles.min <= longitude && longitude <= doubles.max)]]>
- </param>
- <message>
- observe.validation.activity.bound.longitude##0.0##${doubles.max}
- </message>
+ <field-validator type="coordinateLongitudeDto" short-circuit="true">
+ <param name="editorName">coordinate</param>
+ <message/>
</field-validator>
</field>
=====================================
validation/src/main/resources/fr/ird/observe/dto/data/longline/SampleLogbookDto-update-error-validation.xml
=====================================
@@ -57,17 +57,6 @@
<message>observe.validation.activity.required.latitude</message>
</field-validator>
- <!-- 0 <= latitude <= 90 -->
- <field-validator type="fieldexpressionwithparams" short-circuit="true">
- <param name="doubleParams">min:-90.0|max:90.0</param>
- <param name="expression">
- <![CDATA[ (doubles.min <= latitude && latitude <= doubles.max)]]>
- </param>
- <message>
- observe.validation.activity.bound.latitude##0.0##${doubles.max}
- </message>
- </field-validator>
-
<field-validator type="coordinateLatitudeDto" short-circuit="true">
<param name="editorName">coordinate</param>
<message/>
@@ -82,17 +71,6 @@
<message>observe.validation.activity.required.longitude</message>
</field-validator>
- <!-- 0 <= longitude <= 180 -->
- <field-validator type="fieldexpressionwithparams" short-circuit="true">
- <param name="doubleParams">min:-180.0|max:180.0</param>
- <param name="expression">
- <![CDATA[ (doubles.min <= longitude && longitude <= doubles.max)]]>
- </param>
- <message>
- observe.validation.activity.bound.longitude##0.0##${doubles.max}
- </message>
- </field-validator>
-
<field-validator type="coordinateLongitudeDto" short-circuit="true">
<param name="editorName">coordinate</param>
<message/>
=====================================
validation/src/main/resources/fr/ird/observe/dto/data/longline/SetLonglineLogbookDto-create-error-validation.xml
=====================================
@@ -230,17 +230,6 @@
<message>observe.validation.setLongline.required.settingStartLatitude</message>
</field-validator>
- <!-- 0 <= settingStartLatitude <= 90 -->
- <field-validator type="fieldexpressionwithparams" short-circuit="true">
- <param name="doubleParams">min:-90.0|max:90.0</param>
- <param name="expression">
- <![CDATA[ (doubles.min <= settingStartLatitude && settingStartLatitude <= doubles.max)]]>
- </param>
- <message>
- observe.validation.setLongline.bound.settingStartLatitude##0.0##${doubles.max}
- </message>
- </field-validator>
-
<field-validator type="coordinateLatitudeDto" short-circuit="true">
<param name="editorName">settingStart</param>
<message/>
@@ -255,17 +244,6 @@
<message>observe.validation.setLongline.required.settingStartLongitude</message>
</field-validator>
- <!-- 0 <= settingStartLongitude <= 180 -->
- <field-validator type="fieldexpressionwithparams" short-circuit="true">
- <param name="doubleParams">min:-180.0|max:180.0</param>
- <param name="expression">
- <![CDATA[ (doubles.min <= settingStartLongitude && settingStartLongitude <= doubles.max)]]>
- </param>
- <message>
- observe.validation.setLongline.bound.settingStartLongitude##0.0##${doubles.max}
- </message>
- </field-validator>
-
<field-validator type="coordinateLongitudeDto" short-circuit="true">
<param name="editorName">settingStart</param>
<message/>
@@ -275,7 +253,10 @@
<field name="settingEndQuadrant">
- <field-validator type="required" short-circuit="true">
+ <field-validator type="fieldexpression" short-circuit="true">
+ <param name="expression">
+ <![CDATA[ settingEndQuadrant != null || (settingEndLatitude == null && settingEndLongitude == null )]]>
+ </param>
<message>observe.validation.setLongline.required.quadrant</message>
</field-validator>
@@ -291,20 +272,11 @@
<field name="settingEndLatitude">
- <!-- settingEndLatitude obligatoire -->
- <field-validator type="required" short-circuit="true">
- <message>observe.validation.setLongline.required.settingEndLatitude</message>
- </field-validator>
-
- <!-- 0 <= settingEndLatitude <= 90 -->
- <field-validator type="fieldexpressionwithparams" short-circuit="true">
- <param name="doubleParams">min:-90.0|max:90.0</param>
+ <field-validator type="fieldexpression" short-circuit="true">
<param name="expression">
- <![CDATA[ (doubles.min <= settingEndLatitude && settingEndLatitude <= doubles.max)]]>
+ <![CDATA[ settingEndLatitude != null || ( settingEndQuadrant == null && settingEndLongitude == null )]]>
</param>
- <message>
- observe.validation.setLongline.bound.settingEndLatitude##0.0##${doubles.max}
- </message>
+ <message>observe.validation.setLongline.required.settingEndLatitude</message>
</field-validator>
<field-validator type="coordinateLatitudeDto" short-circuit="true">
@@ -316,20 +288,11 @@
<field name="settingEndLongitude">
- <!-- settingEndLongitude obligatoire -->
- <field-validator type="required" short-circuit="true">
- <message>observe.validation.setLongline.required.settingEndLongitude</message>
- </field-validator>
-
- <!-- 0 <= settingEndLongitude <= 180 -->
- <field-validator type="fieldexpressionwithparams" short-circuit="true">
- <param name="doubleParams">min:-180.0|max:180.0</param>
+ <field-validator type="fieldexpression" short-circuit="true">
<param name="expression">
- <![CDATA[ (doubles.min <= settingEndLongitude && settingEndLongitude <= doubles.max)]]>
+ <![CDATA[ settingEndLongitude != null || ( settingEndQuadrant == null && settingEndLatitude == null )]]>
</param>
- <message>
- observe.validation.setLongline.bound.settingEndLongitude##0.0##${doubles.max}
- </message>
+ <message>observe.validation.setLongline.required.settingEndLongitude</message>
</field-validator>
<field-validator type="coordinateLongitudeDto" short-circuit="true">
@@ -341,7 +304,10 @@
<field name="haulingStartQuadrant">
- <field-validator type="required" short-circuit="true">
+ <field-validator type="fieldexpression" short-circuit="true">
+ <param name="expression">
+ <![CDATA[ haulingStartQuadrant != null || (haulingStartLatitude == null && haulingStartLongitude == null )]]>
+ </param>
<message>observe.validation.setLongline.required.quadrant</message>
</field-validator>
@@ -357,20 +323,11 @@
<field name="haulingStartLatitude">
- <!-- haulingStartLatitude obligatoire -->
- <field-validator type="required" short-circuit="true">
- <message>observe.validation.setLongline.required.haulingStartLatitude</message>
- </field-validator>
-
- <!-- 0 <= haulingStartLatitude <= 90 -->
- <field-validator type="fieldexpressionwithparams" short-circuit="true">
- <param name="doubleParams">min:-90.0|max:90.0</param>
+ <field-validator type="fieldexpression" short-circuit="true">
<param name="expression">
- <![CDATA[ (doubles.min <= haulingStartLatitude && haulingStartLatitude <= doubles.max)]]>
+ <![CDATA[ haulingStartLatitude != null || ( haulingStartQuadrant == null && haulingStartLongitude == null )]]>
</param>
- <message>
- observe.validation.setLongline.bound.haulingStartLatitude##0.0##${doubles.max}
- </message>
+ <message>observe.validation.setLongline.required.haulingStartLatitude</message>
</field-validator>
<field-validator type="coordinateLatitudeDto" short-circuit="true">
@@ -382,20 +339,11 @@
<field name="haulingStartLongitude">
- <!-- haulingStartLongitude obligatoire -->
- <field-validator type="required" short-circuit="true">
- <message>observe.validation.setLongline.required.haulingStartLongitude</message>
- </field-validator>
-
- <!-- 0 <= haulingStartLongitude <= 180 -->
- <field-validator type="fieldexpressionwithparams" short-circuit="true">
- <param name="doubleParams">min:-180.0|max:180.0</param>
+ <field-validator type="fieldexpression" short-circuit="true">
<param name="expression">
- <![CDATA[ (doubles.min <= haulingStartLongitude && haulingStartLongitude <= doubles.max)]]>
+ <![CDATA[ haulingStartLongitude != null || ( haulingStartQuadrant == null && haulingStartLatitude == null )]]>
</param>
- <message>
- observe.validation.setLongline.bound.haulingStartLongitude##0.0##${doubles.max}
- </message>
+ <message>observe.validation.setLongline.required.haulingStartLongitude</message>
</field-validator>
<field-validator type="coordinateLongitudeDto" short-circuit="true">
@@ -407,7 +355,10 @@
<field name="haulingEndQuadrant">
- <field-validator type="required" short-circuit="true">
+ <field-validator type="fieldexpression" short-circuit="true">
+ <param name="expression">
+ <![CDATA[ haulingEndQuadrant != null || (haulingEndLatitude == null && haulingEndLongitude == null )]]>
+ </param>
<message>observe.validation.setLongline.required.quadrant</message>
</field-validator>
@@ -423,20 +374,11 @@
<field name="haulingEndLatitude">
- <!-- haulingEndLatitude obligatoire -->
- <field-validator type="required" short-circuit="true">
- <message>observe.validation.setLongline.required.haulingEndLatitude</message>
- </field-validator>
-
- <!-- 0 <= haulingEndLatitude <= 90 -->
- <field-validator type="fieldexpressionwithparams" short-circuit="true">
- <param name="doubleParams">min:-90.0|max:90.0</param>
+ <field-validator type="fieldexpression" short-circuit="true">
<param name="expression">
- <![CDATA[ (doubles.min <= haulingEndLatitude && haulingEndLatitude <= doubles.max)]]>
+ <![CDATA[ haulingEndLatitude != null || ( haulingEndQuadrant == null && haulingEndLongitude == null )]]>
</param>
- <message>
- observe.validation.setLongline.bound.haulingEndLatitude##0.0##${doubles.max}
- </message>
+ <message>observe.validation.setLongline.required.haulingEndLatitude</message>
</field-validator>
<field-validator type="coordinateLatitudeDto" short-circuit="true">
@@ -448,20 +390,11 @@
<field name="haulingEndLongitude">
- <!-- haulingEndLongitude obligatoire -->
- <field-validator type="required" short-circuit="true">
- <message>observe.validation.setLongline.required.haulingEndLongitude</message>
- </field-validator>
-
- <!-- 0 <= haulingEndLongitude <= 180 -->
- <field-validator type="fieldexpressionwithparams" short-circuit="true">
- <param name="doubleParams">min:-180.0|max:180.0</param>
+ <field-validator type="fieldexpression" short-circuit="true">
<param name="expression">
- <![CDATA[ (doubles.min <= haulingEndLongitude && haulingEndLongitude <= doubles.max)]]>
+ <![CDATA[ haulingEndLongitude != null || ( haulingEndQuadrant == null && haulingEndLatitude == null )]]>
</param>
- <message>
- observe.validation.setLongline.bound.haulingEndLongitude##0.0##${doubles.max}
- </message>
+ <message>observe.validation.setLongline.required.haulingEndLongitude</message>
</field-validator>
<field-validator type="coordinateLongitudeDto" short-circuit="true">
=====================================
validation/src/main/resources/fr/ird/observe/dto/data/longline/SetLonglineLogbookDto-create-warning-validation.xml
=====================================
@@ -42,4 +42,102 @@
</field>
+ <field name="settingEndQuadrant">
+
+ <field-validator type="fieldexpression" short-circuit="true">
+ <param name="expression">
+ <![CDATA[ settingEndQuadrant != null || settingEndLatitude != null || settingEndLongitude != null ]]>
+ </param>
+ <message>observe.validation.setLongline.required.quadrant</message>
+ </field-validator>
+
+ </field>
+
+ <field name="settingEndLatitude">
+
+ <field-validator type="fieldexpression" short-circuit="true">
+ <param name="expression">
+ <![CDATA[ settingEndQuadrant != null || settingEndLatitude != null || settingEndLongitude != null ]]>
+ </param>
+ <message>observe.validation.setLongline.required.settingEndLatitude</message>
+ </field-validator>
+
+ </field>
+
+ <field name="settingEndLongitude">
+
+ <field-validator type="fieldexpression" short-circuit="true">
+ <param name="expression">
+ <![CDATA[ settingEndQuadrant != null || settingEndLatitude != null || settingEndLongitude != null ]]>
+ </param>
+ <message>observe.validation.setLongline.required.settingEndLongitude</message>
+ </field-validator>
+
+ </field>
+
+ <field name="haulingStartQuadrant">
+
+ <field-validator type="fieldexpression" short-circuit="true">
+ <param name="expression">
+ <![CDATA[ haulingStartQuadrant != null || haulingStartLatitude != null || haulingStartLongitude != null ]]>
+ </param>
+ <message>observe.validation.setLongline.required.quadrant</message>
+ </field-validator>
+
+ </field>
+
+ <field name="haulingStartLatitude">
+
+ <field-validator type="fieldexpression" short-circuit="true">
+ <param name="expression">
+ <![CDATA[ haulingStartQuadrant != null || haulingStartLatitude != null || haulingStartLongitude != null ]]>
+ </param>
+ <message>observe.validation.setLongline.required.haulingStartLatitude</message>
+ </field-validator>
+
+ </field>
+
+ <field name="haulingStartLongitude">
+
+ <field-validator type="fieldexpression" short-circuit="true">
+ <param name="expression">
+ <![CDATA[ haulingStartQuadrant != null || haulingStartLatitude != null || haulingStartLongitude != null ]]>
+ </param>
+ <message>observe.validation.setLongline.required.haulingStartLongitude</message>
+ </field-validator>
+
+ </field>
+
+ <field name="haulingEndQuadrant">
+
+ <field-validator type="fieldexpression" short-circuit="true">
+ <param name="expression">
+ <![CDATA[ haulingEndQuadrant != null || haulingEndLatitude != null || haulingEndLongitude != null ]]>
+ </param>
+ <message>observe.validation.setLongline.required.quadrant</message>
+ </field-validator>
+
+ </field>
+
+ <field name="haulingEndLatitude">
+
+ <field-validator type="fieldexpression" short-circuit="true">
+ <param name="expression">
+ <![CDATA[ haulingEndQuadrant != null || haulingEndLatitude != null || haulingEndLongitude != null ]]>
+ </param>
+ <message>observe.validation.setLongline.required.haulingEndLatitude</message>
+ </field-validator>
+ </field>
+
+ <field name="haulingEndLongitude">
+
+ <field-validator type="fieldexpression" short-circuit="true">
+ <param name="expression">
+ <![CDATA[ haulingEndQuadrant != null || haulingEndLatitude != null || haulingEndLongitude != null ]]>
+ </param>
+ <message>observe.validation.setLongline.required.haulingEndLongitude</message>
+ </field-validator>
+
+ </field>
+
</validators>
=====================================
validation/src/main/resources/fr/ird/observe/dto/data/longline/SetLonglineLogbookDto-update-error-validation.xml
=====================================
@@ -214,17 +214,6 @@
<message>observe.validation.setLongline.required.settingStartLatitude</message>
</field-validator>
- <!-- 0 <= settingStartLatitude <= 90 -->
- <field-validator type="fieldexpressionwithparams" short-circuit="true">
- <param name="doubleParams">min:-90.0|max:90.0</param>
- <param name="expression">
- <![CDATA[ (doubles.min <= settingStartLatitude && settingStartLatitude <= doubles.max)]]>
- </param>
- <message>
- observe.validation.setLongline.bound.settingStartLatitude##0.0##${doubles.max}
- </message>
- </field-validator>
-
<field-validator type="coordinateLatitudeDto" short-circuit="true">
<param name="editorName">settingStart</param>
<message/>
@@ -239,17 +228,6 @@
<message>observe.validation.setLongline.required.settingStartLongitude</message>
</field-validator>
- <!-- 0 <= settingStartLongitude <= 180 -->
- <field-validator type="fieldexpressionwithparams" short-circuit="true">
- <param name="doubleParams">min:-180.0|max:180.0</param>
- <param name="expression">
- <![CDATA[ (doubles.min <= settingStartLongitude && settingStartLongitude <= doubles.max)]]>
- </param>
- <message>
- observe.validation.setLongline.bound.settingStartLongitude##0.0##${doubles.max}
- </message>
- </field-validator>
-
<field-validator type="coordinateLongitudeDto" short-circuit="true">
<param name="editorName">settingStart</param>
<message/>
@@ -257,11 +235,13 @@
</field>
- <field name="settingStartQuadrant">
+ <field name="settingEndQuadrant">
- <!-- quadrant obligatoire (http://forge.codelutin.com/issues/840) -->
- <field-validator type="required" short-circuit="true">
- <message>observe.validation.activity.required.quadrant</message>
+ <field-validator type="fieldexpression" short-circuit="true">
+ <param name="expression">
+ <![CDATA[ settingEndQuadrant != null || (settingEndLatitude == null && settingEndLongitude == null )]]>
+ </param>
+ <message>observe.validation.setLongline.required.quadrant</message>
</field-validator>
<!-- coherence quadrant par rapport a l'ocean de la maree -->
@@ -276,20 +256,11 @@
<field name="settingEndLatitude">
- <!-- settingEndLatitude obligatoire -->
- <field-validator type="required" short-circuit="true">
- <message>observe.validation.setLongline.required.settingEndLatitude</message>
- </field-validator>
-
- <!-- 0 <= settingEndLatitude <= 90 -->
- <field-validator type="fieldexpressionwithparams" short-circuit="true">
- <param name="doubleParams">min:-90.0|max:90.0</param>
+ <field-validator type="fieldexpression" short-circuit="true">
<param name="expression">
- <![CDATA[ (doubles.min <= settingEndLatitude && settingEndLatitude <= doubles.max)]]>
+ <![CDATA[ settingEndLatitude != null || ( settingEndQuadrant == null && settingEndLongitude == null )]]>
</param>
- <message>
- observe.validation.setLongline.bound.settingEndLatitude##0.0##${doubles.max}
- </message>
+ <message>observe.validation.setLongline.required.settingEndLatitude</message>
</field-validator>
<field-validator type="coordinateLatitudeDto" short-circuit="true">
@@ -301,20 +272,11 @@
<field name="settingEndLongitude">
- <!-- settingEndLongitude obligatoire -->
- <field-validator type="required" short-circuit="true">
- <message>observe.validation.setLongline.required.settingEndLongitude</message>
- </field-validator>
-
- <!-- 0 <= settingEndLongitude <= 180 -->
- <field-validator type="fieldexpressionwithparams" short-circuit="true">
- <param name="doubleParams">min:-180.0|max:180.0</param>
+ <field-validator type="fieldexpression" short-circuit="true">
<param name="expression">
- <![CDATA[ (doubles.min <= settingEndLongitude && settingEndLongitude <= doubles.max)]]>
+ <![CDATA[ settingEndLongitude != null || ( settingEndQuadrant == null && settingEndLatitude == null )]]>
</param>
- <message>
- observe.validation.setLongline.bound.settingEndLongitude##0.0##${doubles.max}
- </message>
+ <message>observe.validation.setLongline.required.settingEndLongitude</message>
</field-validator>
<field-validator type="coordinateLongitudeDto" short-circuit="true">
@@ -324,11 +286,13 @@
</field>
- <field name="settingEndQuadrant">
+ <field name="haulingStartQuadrant">
- <!-- quadrant obligatoire (http://forge.codelutin.com/issues/840) -->
- <field-validator type="required" short-circuit="true">
- <message>observe.validation.activity.required.quadrant</message>
+ <field-validator type="fieldexpression" short-circuit="true">
+ <param name="expression">
+ <![CDATA[ haulingStartQuadrant != null || (haulingStartLatitude == null && haulingStartLongitude == null )]]>
+ </param>
+ <message>observe.validation.setLongline.required.quadrant</message>
</field-validator>
<!-- coherence quadrant par rapport a l'ocean de la maree -->
@@ -343,20 +307,11 @@
<field name="haulingStartLatitude">
- <!-- haulingStartLatitude obligatoire -->
- <field-validator type="required" short-circuit="true">
- <message>observe.validation.setLongline.required.haulingStartLatitude</message>
- </field-validator>
-
- <!-- 0 <= haulingStartLatitude <= 90 -->
- <field-validator type="fieldexpressionwithparams" short-circuit="true">
- <param name="doubleParams">min:-90.0|max:90.0</param>
+ <field-validator type="fieldexpression" short-circuit="true">
<param name="expression">
- <![CDATA[ (doubles.min <= haulingStartLatitude && haulingStartLatitude <= doubles.max)]]>
+ <![CDATA[ haulingStartLatitude != null || ( haulingStartQuadrant == null && haulingStartLongitude == null )]]>
</param>
- <message>
- observe.validation.setLongline.bound.haulingStartLatitude##0.0##${doubles.max}
- </message>
+ <message>observe.validation.setLongline.required.haulingStartLatitude</message>
</field-validator>
<field-validator type="coordinateLatitudeDto" short-circuit="true">
@@ -368,20 +323,11 @@
<field name="haulingStartLongitude">
- <!-- haulingStartLongitude obligatoire -->
- <field-validator type="required" short-circuit="true">
- <message>observe.validation.setLongline.required.haulingStartLongitude</message>
- </field-validator>
-
- <!-- 0 <= haulingStartLongitude <= 180 -->
- <field-validator type="fieldexpressionwithparams" short-circuit="true">
- <param name="doubleParams">min:-180.0|max:180.0</param>
+ <field-validator type="fieldexpression" short-circuit="true">
<param name="expression">
- <![CDATA[ (doubles.min <= haulingStartLongitude && haulingStartLongitude <= doubles.max)]]>
+ <![CDATA[ haulingStartLongitude != null || ( haulingStartQuadrant == null && haulingStartLatitude == null )]]>
</param>
- <message>
- observe.validation.setLongline.bound.haulingStartLongitude##0.0##${doubles.max}
- </message>
+ <message>observe.validation.setLongline.required.haulingStartLongitude</message>
</field-validator>
<field-validator type="coordinateLongitudeDto" short-circuit="true">
@@ -391,11 +337,13 @@
</field>
- <field name="haulingStartQuadrant">
+ <field name="haulingEndQuadrant">
- <!-- quadrant obligatoire (http://forge.codelutin.com/issues/840) -->
- <field-validator type="required" short-circuit="true">
- <message>observe.validation.activity.required.quadrant</message>
+ <field-validator type="fieldexpression" short-circuit="true">
+ <param name="expression">
+ <![CDATA[ haulingEndQuadrant != null || (haulingEndLatitude == null && haulingEndLongitude == null )]]>
+ </param>
+ <message>observe.validation.setLongline.required.quadrant</message>
</field-validator>
<!-- coherence quadrant par rapport a l'ocean de la maree -->
@@ -410,20 +358,11 @@
<field name="haulingEndLatitude">
- <!-- haulingEndLatitude obligatoire -->
- <field-validator type="required" short-circuit="true">
- <message>observe.validation.setLongline.required.haulingEndLatitude</message>
- </field-validator>
-
- <!-- 0 <= haulingEndLatitude <= 90 -->
- <field-validator type="fieldexpressionwithparams" short-circuit="true">
- <param name="doubleParams">min:-90.0|max:90.0</param>
+ <field-validator type="fieldexpression" short-circuit="true">
<param name="expression">
- <![CDATA[ (doubles.min <= haulingEndLatitude && haulingEndLatitude <= doubles.max)]]>
+ <![CDATA[ haulingEndLatitude != null || ( haulingEndQuadrant == null && haulingEndLongitude == null )]]>
</param>
- <message>
- observe.validation.setLongline.bound.haulingEndLatitude##0.0##${doubles.max}
- </message>
+ <message>observe.validation.setLongline.required.haulingEndLatitude</message>
</field-validator>
<field-validator type="coordinateLatitudeDto" short-circuit="true">
@@ -435,20 +374,11 @@
<field name="haulingEndLongitude">
- <!-- haulingEndLongitude obligatoire -->
- <field-validator type="required" short-circuit="true">
- <message>observe.validation.setLongline.required.haulingEndLongitude</message>
- </field-validator>
-
- <!-- 0 <= haulingEndLongitude <= 180 -->
- <field-validator type="fieldexpressionwithparams" short-circuit="true">
- <param name="doubleParams">min:-180.0|max:180.0</param>
+ <field-validator type="fieldexpression" short-circuit="true">
<param name="expression">
- <![CDATA[ (doubles.min <= haulingEndLongitude && haulingEndLongitude <= doubles.max)]]>
+ <![CDATA[ haulingEndLongitude != null || ( haulingEndQuadrant == null && haulingEndLatitude == null )]]>
</param>
- <message>
- observe.validation.setLongline.bound.haulingEndLongitude##0.0##${doubles.max}
- </message>
+ <message>observe.validation.setLongline.required.haulingEndLongitude</message>
</field-validator>
<field-validator type="coordinateLongitudeDto" short-circuit="true">
@@ -458,23 +388,6 @@
</field>
- <field name="haulingEndQuadrant">
-
- <!-- quadrant obligatoire (http://forge.codelutin.com/issues/840) -->
- <field-validator type="required" short-circuit="true">
- <message>observe.validation.activity.required.quadrant</message>
- </field-validator>
-
- <!-- coherence quadrant par rapport a l'ocean de la maree -->
- <field-validator type="quadrantDto" short-circuit="true">
- <param name="ocean">currentTripLongline.ocean</param>
- <message>
- observe.validation.setLongline.invalid.quadrant##${currentTripLongline.ocean.label}
- </message>
- </field-validator>
-
- </field>
-
<field name="settingShape">
<!-- settingShape desactive -->
=====================================
validation/src/main/resources/fr/ird/observe/dto/data/longline/SetLonglineLogbookDto-update-warning-validation.xml
=====================================
@@ -42,4 +42,102 @@
</field>
+ <field name="settingEndQuadrant">
+
+ <field-validator type="fieldexpression" short-circuit="true">
+ <param name="expression">
+ <![CDATA[ settingEndQuadrant != null || settingEndLatitude != null || settingEndLongitude != null ]]>
+ </param>
+ <message>observe.validation.setLongline.required.quadrant</message>
+ </field-validator>
+
+ </field>
+
+ <field name="settingEndLatitude">
+
+ <field-validator type="fieldexpression" short-circuit="true">
+ <param name="expression">
+ <![CDATA[ settingEndQuadrant != null || settingEndLatitude != null || settingEndLongitude != null ]]>
+ </param>
+ <message>observe.validation.setLongline.required.settingEndLatitude</message>
+ </field-validator>
+
+ </field>
+
+ <field name="settingEndLongitude">
+
+ <field-validator type="fieldexpression" short-circuit="true">
+ <param name="expression">
+ <![CDATA[ settingEndQuadrant != null || settingEndLatitude != null || settingEndLongitude != null ]]>
+ </param>
+ <message>observe.validation.setLongline.required.settingEndLongitude</message>
+ </field-validator>
+
+ </field>
+
+ <field name="haulingStartQuadrant">
+
+ <field-validator type="fieldexpression" short-circuit="true">
+ <param name="expression">
+ <![CDATA[ haulingStartQuadrant != null || haulingStartLatitude != null || haulingStartLongitude != null ]]>
+ </param>
+ <message>observe.validation.setLongline.required.quadrant</message>
+ </field-validator>
+
+ </field>
+
+ <field name="haulingStartLatitude">
+
+ <field-validator type="fieldexpression" short-circuit="true">
+ <param name="expression">
+ <![CDATA[ haulingStartQuadrant != null || haulingStartLatitude != null || haulingStartLongitude != null ]]>
+ </param>
+ <message>observe.validation.setLongline.required.haulingStartLatitude</message>
+ </field-validator>
+
+ </field>
+
+ <field name="haulingStartLongitude">
+
+ <field-validator type="fieldexpression" short-circuit="true">
+ <param name="expression">
+ <![CDATA[ haulingStartQuadrant != null || haulingStartLatitude != null || haulingStartLongitude != null ]]>
+ </param>
+ <message>observe.validation.setLongline.required.haulingStartLongitude</message>
+ </field-validator>
+
+ </field>
+
+ <field name="haulingEndQuadrant">
+
+ <field-validator type="fieldexpression" short-circuit="true">
+ <param name="expression">
+ <![CDATA[ haulingEndQuadrant != null || haulingEndLatitude != null || haulingEndLongitude != null ]]>
+ </param>
+ <message>observe.validation.setLongline.required.quadrant</message>
+ </field-validator>
+
+ </field>
+
+ <field name="haulingEndLatitude">
+
+ <field-validator type="fieldexpression" short-circuit="true">
+ <param name="expression">
+ <![CDATA[ haulingEndQuadrant != null || haulingEndLatitude != null || haulingEndLongitude != null ]]>
+ </param>
+ <message>observe.validation.setLongline.required.haulingEndLatitude</message>
+ </field-validator>
+ </field>
+
+ <field name="haulingEndLongitude">
+
+ <field-validator type="fieldexpression" short-circuit="true">
+ <param name="expression">
+ <![CDATA[ haulingEndQuadrant != null || haulingEndLatitude != null || haulingEndLongitude != null ]]>
+ </param>
+ <message>observe.validation.setLongline.required.haulingEndLongitude</message>
+ </field-validator>
+
+ </field>
+
</validators>
=====================================
validation/src/main/resources/fr/ird/observe/dto/data/longline/SetLonglineObsDto-create-error-validation.xml
=====================================
@@ -230,17 +230,6 @@
<message>observe.validation.setLongline.required.settingStartLatitude</message>
</field-validator>
- <!-- 0 <= settingStartLatitude <= 90 -->
- <field-validator type="fieldexpressionwithparams" short-circuit="true">
- <param name="doubleParams">min:-90.0|max:90.0</param>
- <param name="expression">
- <![CDATA[ (doubles.min <= settingStartLatitude && settingStartLatitude <= doubles.max)]]>
- </param>
- <message>
- observe.validation.setLongline.bound.settingStartLatitude##0.0##${doubles.max}
- </message>
- </field-validator>
-
<field-validator type="coordinateLatitudeDto" short-circuit="true">
<param name="editorName">settingStart</param>
<message/>
@@ -255,17 +244,6 @@
<message>observe.validation.setLongline.required.settingStartLongitude</message>
</field-validator>
- <!-- 0 <= settingStartLongitude <= 180 -->
- <field-validator type="fieldexpressionwithparams" short-circuit="true">
- <param name="doubleParams">min:-180.0|max:180.0</param>
- <param name="expression">
- <![CDATA[ (doubles.min <= settingStartLongitude && settingStartLongitude <= doubles.max)]]>
- </param>
- <message>
- observe.validation.setLongline.bound.settingStartLongitude##0.0##${doubles.max}
- </message>
- </field-validator>
-
<field-validator type="coordinateLongitudeDto" short-circuit="true">
<param name="editorName">settingStart</param>
<message/>
@@ -296,17 +274,6 @@
<message>observe.validation.setLongline.required.settingEndLatitude</message>
</field-validator>
- <!-- 0 <= settingEndLatitude <= 90 -->
- <field-validator type="fieldexpressionwithparams" short-circuit="true">
- <param name="doubleParams">min:-90.0|max:90.0</param>
- <param name="expression">
- <![CDATA[ (doubles.min <= settingEndLatitude && settingEndLatitude <= doubles.max)]]>
- </param>
- <message>
- observe.validation.setLongline.bound.settingEndLatitude##0.0##${doubles.max}
- </message>
- </field-validator>
-
<field-validator type="coordinateLatitudeDto" short-circuit="true">
<param name="editorName">settingEnd</param>
<message/>
@@ -321,17 +288,6 @@
<message>observe.validation.setLongline.required.settingEndLongitude</message>
</field-validator>
- <!-- 0 <= settingEndLongitude <= 180 -->
- <field-validator type="fieldexpressionwithparams" short-circuit="true">
- <param name="doubleParams">min:-180.0|max:180.0</param>
- <param name="expression">
- <![CDATA[ (doubles.min <= settingEndLongitude && settingEndLongitude <= doubles.max)]]>
- </param>
- <message>
- observe.validation.setLongline.bound.settingEndLongitude##0.0##${doubles.max}
- </message>
- </field-validator>
-
<field-validator type="coordinateLongitudeDto" short-circuit="true">
<param name="editorName">settingEnd</param>
<message/>
@@ -362,17 +318,6 @@
<message>observe.validation.setLongline.required.haulingStartLatitude</message>
</field-validator>
- <!-- 0 <= haulingStartLatitude <= 90 -->
- <field-validator type="fieldexpressionwithparams" short-circuit="true">
- <param name="doubleParams">min:-90.0|max:90.0</param>
- <param name="expression">
- <![CDATA[ (doubles.min <= haulingStartLatitude && haulingStartLatitude <= doubles.max)]]>
- </param>
- <message>
- observe.validation.setLongline.bound.haulingStartLatitude##0.0##${doubles.max}
- </message>
- </field-validator>
-
<field-validator type="coordinateLatitudeDto" short-circuit="true">
<param name="editorName">haulingStart</param>
<message/>
@@ -387,17 +332,6 @@
<message>observe.validation.setLongline.required.haulingStartLongitude</message>
</field-validator>
- <!-- 0 <= haulingStartLongitude <= 180 -->
- <field-validator type="fieldexpressionwithparams" short-circuit="true">
- <param name="doubleParams">min:-180.0|max:180.0</param>
- <param name="expression">
- <![CDATA[ (doubles.min <= haulingStartLongitude && haulingStartLongitude <= doubles.max)]]>
- </param>
- <message>
- observe.validation.setLongline.bound.haulingStartLongitude##0.0##${doubles.max}
- </message>
- </field-validator>
-
<field-validator type="coordinateLongitudeDto" short-circuit="true">
<param name="editorName">haulingStart</param>
<message/>
@@ -428,17 +362,6 @@
<message>observe.validation.setLongline.required.haulingEndLatitude</message>
</field-validator>
- <!-- 0 <= haulingEndLatitude <= 90 -->
- <field-validator type="fieldexpressionwithparams" short-circuit="true">
- <param name="doubleParams">min:-90.0|max:90.0</param>
- <param name="expression">
- <![CDATA[ (doubles.min <= haulingEndLatitude && haulingEndLatitude <= doubles.max)]]>
- </param>
- <message>
- observe.validation.setLongline.bound.haulingEndLatitude##0.0##${doubles.max}
- </message>
- </field-validator>
-
<field-validator type="coordinateLatitudeDto" short-circuit="true">
<param name="editorName">haulingEnd</param>
<message/>
@@ -453,17 +376,6 @@
<message>observe.validation.setLongline.required.haulingEndLongitude</message>
</field-validator>
- <!-- 0 <= haulingEndLongitude <= 180 -->
- <field-validator type="fieldexpressionwithparams" short-circuit="true">
- <param name="doubleParams">min:-180.0|max:180.0</param>
- <param name="expression">
- <![CDATA[ (doubles.min <= haulingEndLongitude && haulingEndLongitude <= doubles.max)]]>
- </param>
- <message>
- observe.validation.setLongline.bound.haulingEndLongitude##0.0##${doubles.max}
- </message>
- </field-validator>
-
<field-validator type="coordinateLongitudeDto" short-circuit="true">
<param name="editorName">haulingEnd</param>
<message/>
=====================================
validation/src/main/resources/fr/ird/observe/dto/data/longline/SetLonglineObsDto-update-error-validation.xml
=====================================
@@ -214,17 +214,6 @@
<message>observe.validation.setLongline.required.settingStartLatitude</message>
</field-validator>
- <!-- 0 <= settingStartLatitude <= 90 -->
- <field-validator type="fieldexpressionwithparams" short-circuit="true">
- <param name="doubleParams">min:-90.0|max:90.0</param>
- <param name="expression">
- <![CDATA[ (doubles.min <= settingStartLatitude && settingStartLatitude <= doubles.max)]]>
- </param>
- <message>
- observe.validation.setLongline.bound.settingStartLatitude##0.0##${doubles.max}
- </message>
- </field-validator>
-
<field-validator type="coordinateLatitudeDto" short-circuit="true">
<param name="editorName">settingStart</param>
<message/>
@@ -239,17 +228,6 @@
<message>observe.validation.setLongline.required.settingStartLongitude</message>
</field-validator>
- <!-- 0 <= settingStartLongitude <= 180 -->
- <field-validator type="fieldexpressionwithparams" short-circuit="true">
- <param name="doubleParams">min:-180.0|max:180.0</param>
- <param name="expression">
- <![CDATA[ (doubles.min <= settingStartLongitude && settingStartLongitude <= doubles.max)]]>
- </param>
- <message>
- observe.validation.setLongline.bound.settingStartLongitude##0.0##${doubles.max}
- </message>
- </field-validator>
-
<field-validator type="coordinateLongitudeDto" short-circuit="true">
<param name="editorName">settingStart</param>
<message/>
@@ -281,17 +259,6 @@
<message>observe.validation.setLongline.required.settingEndLatitude</message>
</field-validator>
- <!-- 0 <= settingEndLatitude <= 90 -->
- <field-validator type="fieldexpressionwithparams" short-circuit="true">
- <param name="doubleParams">min:-90.0|max:90.0</param>
- <param name="expression">
- <![CDATA[ (doubles.min <= settingEndLatitude && settingEndLatitude <= doubles.max)]]>
- </param>
- <message>
- observe.validation.setLongline.bound.settingEndLatitude##0.0##${doubles.max}
- </message>
- </field-validator>
-
<field-validator type="coordinateLatitudeDto" short-circuit="true">
<param name="editorName">settingEnd</param>
<message/>
@@ -306,17 +273,6 @@
<message>observe.validation.setLongline.required.settingEndLongitude</message>
</field-validator>
- <!-- 0 <= settingEndLongitude <= 180 -->
- <field-validator type="fieldexpressionwithparams" short-circuit="true">
- <param name="doubleParams">min:-180.0|max:180.0</param>
- <param name="expression">
- <![CDATA[ (doubles.min <= settingEndLongitude && settingEndLongitude <= doubles.max)]]>
- </param>
- <message>
- observe.validation.setLongline.bound.settingEndLongitude##0.0##${doubles.max}
- </message>
- </field-validator>
-
<field-validator type="coordinateLongitudeDto" short-circuit="true">
<param name="editorName">settingEnd</param>
<message/>
@@ -347,17 +303,6 @@
<message>observe.validation.setLongline.required.haulingStartLatitude</message>
</field-validator>
- <!-- 0 <= haulingStartLatitude <= 90 -->
- <field-validator type="fieldexpressionwithparams" short-circuit="true">
- <param name="doubleParams">min:-90.0|max:90.0</param>
- <param name="expression">
- <![CDATA[ (doubles.min <= haulingStartLatitude && haulingStartLatitude <= doubles.max)]]>
- </param>
- <message>
- observe.validation.setLongline.bound.haulingStartLatitude##0.0##${doubles.max}
- </message>
- </field-validator>
-
<field-validator type="coordinateLatitudeDto" short-circuit="true">
<param name="editorName">haulingStart</param>
<message/>
@@ -372,17 +317,6 @@
<message>observe.validation.setLongline.required.haulingStartLongitude</message>
</field-validator>
- <!-- 0 <= haulingStartLongitude <= 180 -->
- <field-validator type="fieldexpressionwithparams" short-circuit="true">
- <param name="doubleParams">min:-180.0|max:180.0</param>
- <param name="expression">
- <![CDATA[ (doubles.min <= haulingStartLongitude && haulingStartLongitude <= doubles.max)]]>
- </param>
- <message>
- observe.validation.setLongline.bound.haulingStartLongitude##0.0##${doubles.max}
- </message>
- </field-validator>
-
<field-validator type="coordinateLongitudeDto" short-circuit="true">
<param name="editorName">haulingStart</param>
<message/>
@@ -414,17 +348,6 @@
<message>observe.validation.setLongline.required.haulingEndLatitude</message>
</field-validator>
- <!-- 0 <= haulingEndLatitude <= 90 -->
- <field-validator type="fieldexpressionwithparams" short-circuit="true">
- <param name="doubleParams">min:-90.0|max:90.0</param>
- <param name="expression">
- <![CDATA[ (doubles.min <= haulingEndLatitude && haulingEndLatitude <= doubles.max)]]>
- </param>
- <message>
- observe.validation.setLongline.bound.haulingEndLatitude##0.0##${doubles.max}
- </message>
- </field-validator>
-
<field-validator type="coordinateLatitudeDto" short-circuit="true">
<param name="editorName">haulingEnd</param>
<message/>
@@ -439,17 +362,6 @@
<message>observe.validation.setLongline.required.haulingEndLongitude</message>
</field-validator>
- <!-- 0 <= haulingEndLongitude <= 180 -->
- <field-validator type="fieldexpressionwithparams" short-circuit="true">
- <param name="doubleParams">min:-180.0|max:180.0</param>
- <param name="expression">
- <![CDATA[ (doubles.min <= haulingEndLongitude && haulingEndLongitude <= doubles.max)]]>
- </param>
- <message>
- observe.validation.setLongline.bound.haulingEndLongitude##0.0##${doubles.max}
- </message>
- </field-validator>
-
<field-validator type="coordinateLongitudeDto" short-circuit="true">
<param name="editorName">haulingEnd</param>
<message/>
=====================================
validation/src/main/resources/fr/ird/observe/dto/data/seine/ActivitySeineDto-create-error-validation.xml
=====================================
@@ -192,17 +192,6 @@
<message>observe.validation.activity.required.latitude</message>
</field-validator>
- <!-- 0 <= latitude <= 90 -->
- <field-validator type="fieldexpressionwithparams" short-circuit="true">
- <param name="doubleParams">min:-90.0|max:90.0</param>
- <param name="expression">
- <![CDATA[ (doubles.min <= latitude && latitude <= doubles.max)]]>
- </param>
- <message>
- observe.validation.activity.bound.latitude##0.0##${doubles.max}
- </message>
- </field-validator>
-
<field-validator type="coordinateLatitudeDto" short-circuit="true">
<param name="editorName">coordinate</param>
<message/>
@@ -217,17 +206,6 @@
<message>observe.validation.activity.required.longitude</message>
</field-validator>
- <!-- 0 <= longitude <= 180 -->
- <field-validator type="fieldexpressionwithparams" short-circuit="true">
- <param name="doubleParams">min:-180.0|max:180.0</param>
- <param name="expression">
- <![CDATA[ (doubles.min <= longitude && longitude <= doubles.max)]]>
- </param>
- <message>
- observe.validation.activity.bound.longitude##0.0##${doubles.max}
- </message>
- </field-validator>
-
<field-validator type="coordinateLongitudeDto" short-circuit="true">
<param name="editorName">coordinate</param>
<message/>
=====================================
validation/src/main/resources/fr/ird/observe/dto/data/seine/ActivitySeineDto-update-error-validation.xml
=====================================
@@ -50,18 +50,6 @@
<message>observe.validation.activity.required.latitude</message>
</field-validator>
- <!-- 0 <= latitude <= 90 -->
-
- <field-validator type="fieldexpressionwithparams" short-circuit="true">
- <param name="doubleParams">min:-90.0|max:90.0</param>
- <param name="expression">
- <![CDATA[ (doubles.min <= latitude && latitude <= doubles.max)]]>
- </param>
- <message>
- observe.validation.activity.bound.latitude##0.0##${doubles.max}
- </message>
- </field-validator>
-
<field-validator type="coordinateLatitudeDto" short-circuit="true">
<param name="editorName">coordinate</param>
<message/>
@@ -76,17 +64,6 @@
<message>observe.validation.activity.required.longitude</message>
</field-validator>
- <!-- 0 <= longitude <= 180 -->
- <field-validator type="fieldexpressionwithparams" short-circuit="true">
- <param name="doubleParams">min:-180.0|max:180.0</param>
- <param name="expression">
- <![CDATA[ (doubles.min <= longitude && longitude <= doubles.max)]]>
- </param>
- <message>
- observe.validation.activity.bound.longitude##0.0##${doubles.max}
- </message>
- </field-validator>
-
<field-validator type="coordinateLongitudeDto" short-circuit="true">
<param name="editorName">coordinate</param>
<message/>
=====================================
validation/src/main/resources/i18n/validation_en_GB.properties
=====================================
@@ -70,21 +70,13 @@ observe.common.BranchlinesCompositionObsDto.length=Length
observe.common.BranchlinesCompositionObsDto.proportion=Proportion
observe.common.BranchlinesCompositionObsDto.topType=Top part type
observe.common.BranchlinesCompositionObsDto.tracelineType=Traceline type
-observe.common.CatchLonglineLogbookDto.basket=Basket
-observe.common.CatchLonglineLogbookDto.branchline=Branchline
observe.common.CatchLonglineLogbookDto.catchFateLongline=Fate
observe.common.CatchLonglineLogbookDto.catchHealthness=Catch healthness
observe.common.CatchLonglineLogbookDto.comment=Comment
observe.common.CatchLonglineLogbookDto.count=Count
observe.common.CatchLonglineLogbookDto.discardHealthness=Discard healthness
-observe.common.CatchLonglineLogbookDto.gonadeWeight=Gonade weight (g)
-observe.common.CatchLonglineLogbookDto.hookPosition=Hook position
-observe.common.CatchLonglineLogbookDto.maturityStatus=Sexual maturity
observe.common.CatchLonglineLogbookDto.onBoardProcessing=On board processing
-observe.common.CatchLonglineLogbookDto.section=Section
-observe.common.CatchLonglineLogbookDto.sex=Sex
observe.common.CatchLonglineLogbookDto.speciesCatch=Species
-observe.common.CatchLonglineLogbookDto.stomacFullness=Stomac fullness
observe.common.CatchLonglineObsDto.basket=Basket
observe.common.CatchLonglineObsDto.branchline=Branchline
observe.common.CatchLonglineObsDto.catchFateLongline=Fate
@@ -444,8 +436,6 @@ observe.common.VesselSizeCategoryDto.gaugeLabel=Gauge label
observe.common.WeightCategorySeineDto.species=Thuna species
observe.common.WindDto.speedRange=Speed range
observe.common.WindDto.waveHeight=Wave weight
-observe.validation.activity.bound.latitude=Latitude must be between %1$s and %2$s.
-observe.validation.activity.bound.longitude=Longitude must be between %1$s and %2$s.
observe.validation.activity.bound.seaSurfaceTemperature=Temperature must be between %1$s%3$s and %2$s%3$s.
observe.validation.activity.bound.vesselSpeed=Vessel speed must be between %1$s and %2$s.
observe.validation.activity.comment.tobig=Comment size is bound to 1024 characters.
@@ -461,7 +451,6 @@ observe.validation.activity.desactivated.vesselActivity=Selected vessel activity
observe.validation.activity.desactivated.wind=Selected wind is disabled.
observe.validation.activity.duplicated.time=There is already another activity at this time.
observe.validation.activity.invalid.quadrant=Quadrant is not coherent with ocean (%1$s) of trip (indian\: 1,2, atlantic 1,2,3,4).
-observe.validation.activity.invalid.seaSurfaceTemperature=Previous activity (%1$s) sea temperature was %2$s%5$s, current temperature must be between %3$s%5$s and %4$s%5$s.
observe.validation.activity.invalid.speed=Activity speed is %s nb, which is more than the maximum authorized which is %s nd.
observe.validation.activity.null.dcp=No floating object selected.
observe.validation.activity.null.fpaZone=Fpa zone is not filled.
@@ -601,11 +590,9 @@ observe.validation.lengthLengthParameter.null.ocean=Ocean is not filled.
observe.validation.lengthLengthParameter.null.outputSizeMeasureType=Output size measure type is not filled.
observe.validation.lengthLengthParameter.null.sex=Sex must be filled.
observe.validation.lengthLengthParameter.required.coefficients=Coefficients are required.
-observe.validation.lengthLengthParameter.required.endDate=End date must be filled.
observe.validation.lengthLengthParameter.required.inputOutputFormula=Formula is required.
observe.validation.lengthLengthParameter.required.outputInputFormula=Formula is required.
observe.validation.lengthLengthParameter.required.species=Species must be filled.
-observe.validation.lengthLengthParameter.required.startDate=Start date must be filled.
observe.validation.lengthWeightParameter.disabled.sizeMeasureType=Selected size measure type is disabled.
observe.validation.lengthWeightParameter.invalid.lengthWeightFormula=Formula is not valid.
observe.validation.lengthWeightParameter.invalid.uniqueKey=Tuple (species/ocean/gender/sizeMeasureType/startDate) must be unique.
@@ -640,7 +627,6 @@ observe.validation.nonTargetCatch.uniqueKey=Tuple (species - objectFate) must be
observe.validation.nonTargetCatchRelease.bound.count=Count must be between %1$s and %2$s.
observe.validation.nonTargetCatchRelease.comment.tobig=Comment size can not exceed 1024 characters.
observe.validation.nonTargetCatchRelease.desactivated.conformity=Selected conformity is disabled.
-observe.validation.nonTargetCatchRelease.desactivated.releasingTime=Selected releasing time is disabled.
observe.validation.nonTargetCatchRelease.desactivated.sex=Selected sex fate is disabled.
observe.validation.nonTargetCatchRelease.desactivated.species=Selected species is disabled.
observe.validation.nonTargetCatchRelease.desactivated.speciesGroupReleaseMode=Selected release mode is disabled.
@@ -710,8 +696,6 @@ observe.validation.referentiel.status.desactivated=Status is disabled (it can't
observe.validation.referentiel.status.required=Status must be filled.
observe.validation.referentiel.untranslated.label1=English label is not translated.
observe.validation.referentiel.untranslated.label3=Spanish label is not translated.
-observe.validation.required.categoryMax=Category max is not filled.
-observe.validation.required.categoryMin=Category min is not filled.
observe.validation.required.compagnies=Compagnies is not filled.
observe.validation.required.harbour=Harbour is not filleds.
observe.validation.required.species=Species is not filled.
@@ -722,7 +706,6 @@ observe.validation.route.invalid.date=Date must be after trip start date (%1$s).
observe.validation.route.invalid.endLogValue.maximum=End log can't be before start log.
observe.validation.route.invalid.endLogValue.minimum=End log must be after start log.
observe.validation.route.invalid.quadrant=Activity quadrant at position %1$s is not consistent with trip ocean (%2$s) of trip (indian\: 1 or 2, atlantic\: 1,2,3 or 4).
-observe.validation.route.invalid.seaSurfaceTemperature=Sear surface temperature can't vary more than 12° between two activities (activity at position %1$s is not correct).
observe.validation.route.invalid.speed=Speed between two activities can't exceed %1$s nd, (activity %2$s speed is %3$s).
observe.validation.route.invalid.startLogValue=Start log value (%1$s) can't be after end log value (%2$s) of route %3$s.
observe.validation.route.invalid.time=Observation time cant' be after the one of the previous activity (activity at position %1$s is not correct).
@@ -775,15 +758,7 @@ observe.validation.setLongline.bad.hooksCompositionProportionSum=Sum of proporti
observe.validation.setLongline.baitsComposition.uniqueKey=Tuple (type/status/size/weight) must be unique.
observe.validation.setLongline.bound.basketsPerSectionCount=Baskets per section count must be bound between %s and %s.
observe.validation.setLongline.bound.branchlinesPerBasketCount=Branchlines per basket count must be bound between %s and %s.
-observe.validation.setLongline.bound.haulingEndLatitude=Latitude must be bound between %s and %s.
-observe.validation.setLongline.bound.haulingEndLongitude=Longitude must be bound between %s and %s.
-observe.validation.setLongline.bound.haulingStartLatitude=Latitude must be bound between %s and %s.
-observe.validation.setLongline.bound.haulingStartLongitude=Longitude must be bound between %s and %s.
observe.validation.setLongline.bound.lightsticksPerBasketCount=Lightsticks per basket count must be bound between %s and %s.
-observe.validation.setLongline.bound.settingEndLatitude=Latitude must be bound between %s and %s.
-observe.validation.setLongline.bound.settingEndLongitude=Longitude must be bound between %s and %s.
-observe.validation.setLongline.bound.settingStartLatitude=Latitude must be bound between %s and %s.
-observe.validation.setLongline.bound.settingStartLongitude=Longitude must be bound between %s and %s.
observe.validation.setLongline.bound.settingVesselSpeed=Setting vessel speed must be bound between %s and %s.
observe.validation.setLongline.bound.shooterSpeed=Shooter speed must be bound between %s and %s.
observe.validation.setLongline.bound.snapWeight=Snap weight must be bound between %s and %s.
=====================================
validation/src/main/resources/i18n/validation_es_ES.properties
=====================================
@@ -70,21 +70,13 @@ observe.common.BranchlinesCompositionObsDto.length=Longitud (m)
observe.common.BranchlinesCompositionObsDto.proportion=Proporción (%)
observe.common.BranchlinesCompositionObsDto.topType=Tipo de la parte superior
observe.common.BranchlinesCompositionObsDto.tracelineType=Tipo bajo de línea
-observe.common.CatchLonglineLogbookDto.basket=cesta
-observe.common.CatchLonglineLogbookDto.branchline=Arponcillo
observe.common.CatchLonglineLogbookDto.catchFateLongline=Devenir
observe.common.CatchLonglineLogbookDto.catchHealthness=Salud a la captura
observe.common.CatchLonglineLogbookDto.comment=Comentario
observe.common.CatchLonglineLogbookDto.count=Numéro
observe.common.CatchLonglineLogbookDto.discardHealthness=Salud al rechazo
-observe.common.CatchLonglineLogbookDto.gonadeWeight=Peso de las gonadas (g)
-observe.common.CatchLonglineLogbookDto.hookPosition=Posición del gancho
-observe.common.CatchLonglineLogbookDto.maturityStatus=Maturidad sexual
observe.common.CatchLonglineLogbookDto.onBoardProcessing=On board processing \#TODO
-observe.common.CatchLonglineLogbookDto.section=sección
-observe.common.CatchLonglineLogbookDto.sex=Sexo
observe.common.CatchLonglineLogbookDto.speciesCatch=Especie
-observe.common.CatchLonglineLogbookDto.stomacFullness=Estatuto del estomago
observe.common.CatchLonglineObsDto.basket=cesta
observe.common.CatchLonglineObsDto.branchline=Arponcillo
observe.common.CatchLonglineObsDto.catchFateLongline=Devenir
@@ -446,8 +438,6 @@ observe.common.VesselSizeCategoryDto.gaugeLabel=Texto «Capacidad»
observe.common.WeightCategorySeineDto.species=Especie
observe.common.WindDto.speedRange=Texto velocidad del viento
observe.common.WindDto.waveHeight=Texto descriptivo de «altura media de la ola»
-observe.validation.activity.bound.latitude=La latitud dada debe estar comprendida entre %1$s y %2$s.
-observe.validation.activity.bound.longitude=La longitud dada debe estar comprendida entre %1$s y %2$s.
observe.validation.activity.bound.seaSurfaceTemperature=La temperatura debe estar comprendida entre %1$s%3$s y %2$s%3$s.
observe.validation.activity.bound.vesselSpeed=La Velocidad del viento estar comprendida entre %1$s y %2$s.
observe.validation.activity.comment.tobig=La longitud del campo comentarios está limitada a 1024 carácteres.
@@ -463,7 +453,6 @@ observe.validation.activity.desactivated.vesselActivity=Actividad del barco sele
observe.validation.activity.desactivated.wind=La fuerza del viento seleccionada está desactivada.
observe.validation.activity.duplicated.time=Ya existe una actividad a esa hora.
observe.validation.activity.invalid.quadrant=El cuadrante no es coherente con el informe del oceano (%1$s) de la marea (indico \: 1,2, atlantico \: 1, 2, 3, 4)
-observe.validation.activity.invalid.seaSurfaceTemperature=Previous activity (%1$s) sea temperature was %2$s%5$s, current temperature must be between %3$s%5$s and %4$s%5$s. \#TODO
observe.validation.activity.invalid.speed=La velocidad de la actividad actual es %s nudos, mientras que la velocidad máxima es %s nudos.
observe.validation.activity.null.dcp=No se ha introducido objeto flotante.
observe.validation.activity.null.fpaZone=La selección de una zona FPA es obligatoria.
@@ -603,11 +592,9 @@ observe.validation.lengthLengthParameter.null.ocean=No se ha seleccionado oceano
observe.validation.lengthLengthParameter.null.outputSizeMeasureType=Le type de mensuration de sortie n'est pas renseigné. \#TODO
observe.validation.lengthLengthParameter.null.sex=Le sexe doit être renseigné. \#TODO
observe.validation.lengthLengthParameter.required.coefficients=Les coefficients sont obligatoires. \#TODO
-observe.validation.lengthLengthParameter.required.endDate=Fecha de fin de validez debe ser especificada.
observe.validation.lengthLengthParameter.required.inputOutputFormula=La formule est obligatoire. \#TODO
observe.validation.lengthLengthParameter.required.outputInputFormula=La formule est obligatoire. \#TODO
observe.validation.lengthLengthParameter.required.species=Especie no especificada.
-observe.validation.lengthLengthParameter.required.startDate=fecha de comienzo de validez no especificada.
observe.validation.lengthWeightParameter.disabled.sizeMeasureType=Le type de mensuration sélectionné est désactivé. \#TODO
observe.validation.lengthWeightParameter.invalid.lengthWeightFormula=Relación de peso introducida no es coherente.
observe.validation.lengthWeightParameter.invalid.uniqueKey=Tupla (especie/sexo/océano/sizeMeasureType/startDate) debe ser única, la tupla ya se ha usado. \#TODO
@@ -642,7 +629,6 @@ observe.validation.nonTargetCatch.uniqueKey=El par (especie - objectFate) debe s
observe.validation.nonTargetCatchRelease.bound.count=Le nombre doit être compris entre %1$s et %2$s. \#TODO
observe.validation.nonTargetCatchRelease.comment.tobig=La taille du commentaire est limitée à 1024 caractères. \#TODO
observe.validation.nonTargetCatchRelease.desactivated.conformity=Selected conformity is disabled. \#TODO
-observe.validation.nonTargetCatchRelease.desactivated.releasingTime=Selected releasing time is disabled. \#TODO
observe.validation.nonTargetCatchRelease.desactivated.sex=Le sexe sélectionné est désactivé. \#TODO
observe.validation.nonTargetCatchRelease.desactivated.species=L'espèce sélectionnée est désactivée. \#TODO
observe.validation.nonTargetCatchRelease.desactivated.speciesGroupReleaseMode=Le mode de libération sélectionné est désactivé. \#TODO
@@ -712,8 +698,6 @@ observe.validation.referentiel.status.desactivated=El objeto está desactivado (
observe.validation.referentiel.status.required=El estatuto activo-inactivo es mandatorio.
observe.validation.referentiel.untranslated.label1=La etiqueta en inglés no se ha traducido.
observe.validation.referentiel.untranslated.label3=La etiqueta en espaÑol no se ha traducido.
-observe.validation.required.categoryMax=Category max is not filled.
-observe.validation.required.categoryMin=Category min is not filled.
observe.validation.required.compagnies=Compagnies is not filled.
observe.validation.required.harbour=Harbour is not filleds.
observe.validation.required.species=Species is not filled.
@@ -724,7 +708,6 @@ observe.validation.route.invalid.date=El día de observación debe ser superior
observe.validation.route.invalid.endLogValue.maximum=La corredera de tarde no puede ser superior en %1$s a la de mañana.
observe.validation.route.invalid.endLogValue.minimum=la corredera de tarde debe ser superior a la de mañana.
observe.validation.route.invalid.quadrant=El cuadrante de la actividad %1$s no es coherente con el océano (%2$s) de la marea (indico \: 1,2, atlántico \: 1, 2, 3, 4)
-observe.validation.route.invalid.seaSurfaceTemperature=La temperatura superficial no puede variar más de 12° entre 2 actividades (actividad %1$s incorrecta).
observe.validation.route.invalid.speed=la velocidad entre dos actividades no debe sobrepasar %1$s nd, (actividad %2$s incorrecta, velocidad \: %3$s nd).
observe.validation.route.invalid.startLogValue=La corredera de mañana (%1$s) debe ser superior a la de tarde (%2$s) de la routa %3$s.
observe.validation.route.invalid.time=La hora de la observación de la actividad debe ser superior a la de la actividad anterior (actividad %1$s incorrecta).
@@ -777,15 +760,7 @@ observe.validation.setLongline.bad.hooksCompositionProportionSum=La suma de las
observe.validation.setLongline.baitsComposition.uniqueKey=La tupla (type/estado/tamaño/peso) debe ser única, la tupa ya está utilizada.
observe.validation.setLongline.bound.basketsPerSectionCount=El número de cestas en la sección debe estar comprendido entre %1$s y %2$s.
observe.validation.setLongline.bound.branchlinesPerBasketCount=El número de avanzuelos en la cesta debe estar comprendido entre %1$s y %2$s.
-observe.validation.setLongline.bound.haulingEndLatitude=La latitud de fin de arrastre debe estar comprendida entre %1$s y %2$s.
-observe.validation.setLongline.bound.haulingEndLongitude=La longitud de fin de arrastre debe estar comprendida entre %1$s y %2$s.
-observe.validation.setLongline.bound.haulingStartLatitude=La latitud de inicio de arrastre debe estar comprendida entre %1$s y %2$s.
-observe.validation.setLongline.bound.haulingStartLongitude=La longitud de inicio de arrastre debe estar comprendida entre %1$s y %2$s.
observe.validation.setLongline.bound.lightsticksPerBasketCount=El número de cyalumes en la cesta debe estar comprendido entre %1$s y %2$s.
-observe.validation.setLongline.bound.settingEndLatitude=La latitud de fin de calada debe estar comprendida entre %1$s y %2$s.
-observe.validation.setLongline.bound.settingEndLongitude=La longitud de fin de calada debe estar comprendida entre %1$s y %2$s.
-observe.validation.setLongline.bound.settingStartLatitude=La latitud de inicio de calada debe estar comprendida entre %1$s y %2$s.
-observe.validation.setLongline.bound.settingStartLongitude=La longitud de inicio de calada debe estar comprendida entre %1$s y %2$s.
observe.validation.setLongline.bound.settingVesselSpeed=La velocidad del barco debe estar comprendida entre %1$s y %2$s.
observe.validation.setLongline.bound.shooterSpeed=La velocidad de shooter debe estar comprendida entre %1$s y %2$s.
observe.validation.setLongline.bound.snapWeight=El peso snap debe estar comprendido entre %1$s y %2$s.
=====================================
validation/src/main/resources/i18n/validation_fr_FR.properties
=====================================
@@ -70,21 +70,13 @@ observe.common.BranchlinesCompositionObsDto.length=Longueur (m)
observe.common.BranchlinesCompositionObsDto.proportion=Proportion (%)
observe.common.BranchlinesCompositionObsDto.topType=Type partie supérieure
observe.common.BranchlinesCompositionObsDto.tracelineType=Type bas de ligne
-observe.common.CatchLonglineLogbookDto.basket=Panier
-observe.common.CatchLonglineLogbookDto.branchline=Avançon
observe.common.CatchLonglineLogbookDto.catchFateLongline=Devenir
observe.common.CatchLonglineLogbookDto.catchHealthness=Santé à la capture
observe.common.CatchLonglineLogbookDto.comment=Commentaire
observe.common.CatchLonglineLogbookDto.count=Nombre
observe.common.CatchLonglineLogbookDto.discardHealthness=Santé au rejet
-observe.common.CatchLonglineLogbookDto.gonadeWeight=Poids des gonades (g)
-observe.common.CatchLonglineLogbookDto.hookPosition=Position de l'hameçon
-observe.common.CatchLonglineLogbookDto.maturityStatus=Maturité sexuelle
observe.common.CatchLonglineLogbookDto.onBoardProcessing=Traitement à bord
-observe.common.CatchLonglineLogbookDto.section=Section
-observe.common.CatchLonglineLogbookDto.sex=Sexe
observe.common.CatchLonglineLogbookDto.speciesCatch=Espèce
-observe.common.CatchLonglineLogbookDto.stomacFullness=État de l'estomac
observe.common.CatchLonglineObsDto.basket=Panier
observe.common.CatchLonglineObsDto.branchline=Avançon
observe.common.CatchLonglineObsDto.catchFateLongline=Devenir
@@ -444,8 +436,6 @@ observe.common.VesselSizeCategoryDto.gaugeLabel=Libellé jauge
observe.common.WeightCategorySeineDto.species=Espèce de thon
observe.common.WindDto.speedRange=Libellé vitesse vent
observe.common.WindDto.waveHeight=Libellé Hauteur moyenne vagues
-observe.validation.activity.bound.latitude=La latitude doit être comprise entre %1$s et %2$s.
-observe.validation.activity.bound.longitude=La longitude doit être comprise entre %1$s et %2$s.
observe.validation.activity.bound.seaSurfaceTemperature=La température doit être comprise entre %1$s%3$s et %2$s%3$s.
observe.validation.activity.bound.vesselSpeed=La vitesse navire doit être comprise entre %1$s et %2$s.
observe.validation.activity.comment.tobig=La taille du commentaire est limitée à 1024 caractères.
@@ -461,7 +451,6 @@ observe.validation.activity.desactivated.vesselActivity=L'activité bateau séle
observe.validation.activity.desactivated.wind=Le vent Beaufort sélectionné est désactivé.
observe.validation.activity.duplicated.time=Il existe déjà une autre activité à cette heure.
observe.validation.activity.invalid.quadrant=Le quadrant n'est pas cohérent par rapport à l'océan (%1$s) de la marée (indien \: 1
-observe.validation.activity.invalid.seaSurfaceTemperature=La température surface de l'activité précédente (%1$s) est de %2$s%5$s, la température doit être comprise entre %3$s%5$s et %4$s%5$s.
observe.validation.activity.invalid.speed=La vitesse de l'activité courante est de %s nd, alors que la vitesse maximale autorisée est %s nd
observe.validation.activity.null.dcp=Aucun objet flottant saisi.
observe.validation.activity.null.fpaZone=La sélection d'une zone FPA est obligatoire.
@@ -601,11 +590,9 @@ observe.validation.lengthLengthParameter.null.ocean=Aucun océan sélectionné.
observe.validation.lengthLengthParameter.null.outputSizeMeasureType=Le type de mensuration de sortie n'est pas renseigné.
observe.validation.lengthLengthParameter.null.sex=Le sexe doit être renseigné.
observe.validation.lengthLengthParameter.required.coefficients=Les coefficients sont obligatoires.
-observe.validation.lengthLengthParameter.required.endDate=Date de fin de validité non renseignée.
observe.validation.lengthLengthParameter.required.inputOutputFormula=La formule est obligatoire.
observe.validation.lengthLengthParameter.required.outputInputFormula=La formule est obligatoire.
observe.validation.lengthLengthParameter.required.species=L'espèce n'est pas renseignée.
-observe.validation.lengthLengthParameter.required.startDate=date de début de validité non renseignée.
observe.validation.lengthWeightParameter.disabled.sizeMeasureType=Le type de mensuration sélectionné est désactivé.
observe.validation.lengthWeightParameter.invalid.lengthWeightFormula=La relation poids saisie n'est pas cohérente.
observe.validation.lengthWeightParameter.invalid.uniqueKey=Le tuple (espèce/sexe/océan/type de measure/date de début) doit être unique
@@ -640,7 +627,6 @@ observe.validation.nonTargetCatch.uniqueKey=Le couple (espèce - devenir objet)
observe.validation.nonTargetCatchRelease.bound.count=Le nombre doit être compris entre %1$s et %2$s.
observe.validation.nonTargetCatchRelease.comment.tobig=La taille du commentaire est limitée à 1024 caractères.
observe.validation.nonTargetCatchRelease.desactivated.conformity=La conformité sélectionnée est désactivée.
-observe.validation.nonTargetCatchRelease.desactivated.releasingTime=Le moment de libération sélectionné est désactivé.
observe.validation.nonTargetCatchRelease.desactivated.sex=Le sexe sélectionné est désactivé.
observe.validation.nonTargetCatchRelease.desactivated.species=L'espèce sélectionnée est désactivée.
observe.validation.nonTargetCatchRelease.desactivated.speciesGroupReleaseMode=Le mode de libération sélectionné est désactivé.
@@ -710,8 +696,6 @@ observe.validation.referentiel.status.desactivated=L'objet est désactivé (il n
observe.validation.referentiel.status.required=Le statut actif-inactif est obligatoire.
observe.validation.referentiel.untranslated.label1=Le libellé anglais n'est pas traduit.
observe.validation.referentiel.untranslated.label3=Le libellé espagnol n'est pas traduit.
-observe.validation.required.categoryMax=La catégorie Max n'est pas renseignée.
-observe.validation.required.categoryMin=La catégorie Min n'est pas renseignée.
observe.validation.required.compagnies=La compagnie n'est pas renseignée.
observe.validation.required.harbour=Le port n'est pas renseigné.
observe.validation.required.species=L'espèce n'est pas renseigné.
@@ -722,7 +706,6 @@ observe.validation.route.invalid.date=Le jour d'observation doit être supérieu
observe.validation.route.invalid.endLogValue.maximum=Le loch du soir ne peut pas être supérieur de %1$s à celui du matin.
observe.validation.route.invalid.endLogValue.minimum=Le loch du soir doit être strictement supérieur à celui du matin.
observe.validation.route.invalid.quadrant=Le quadrant de l’activité à la position %1$s n'est pas cohérent par rapport à l'océan (%2$s) de la marée (indien \: 1
-observe.validation.route.invalid.seaSurfaceTemperature=La température surface ne peut pas varier de plus de 12° entre 2 activités (activité de position %1$s incorrecte).
observe.validation.route.invalid.speed=La vitesse entre deux activités ne doit pas dépasser %1$s nd, (l'activité %2$s a une vitesse de %3$s nd).
observe.validation.route.invalid.startLogValue=Le loch du matin (%1$s) doit être supérieur au loch soir (%2$s) de la route %3$s.
observe.validation.route.invalid.time=L'heure d'observation d'une activité doit être supérieure à celle de l'activité précédente (activité de position %1$s incorrecte).
@@ -775,15 +758,7 @@ observe.validation.setLongline.bad.hooksCompositionProportionSum=La somme des pr
observe.validation.setLongline.baitsComposition.uniqueKey=Le tuple (type/état/taille/poids) doit être unique, le tuple est déjà utilisé.
observe.validation.setLongline.bound.basketsPerSectionCount=Le nombre de panier par section doit être compris entre %1$s et %2$s.
observe.validation.setLongline.bound.branchlinesPerBasketCount=Le nombre d'hameçons par panier doit être compris entre %1$s et %2$s.
-observe.validation.setLongline.bound.haulingEndLatitude=La latitude de fin de virage doit être comprise entre %1$s et %2$s.
-observe.validation.setLongline.bound.haulingEndLongitude=La longitude de fin de virage doit être comprise entre %1$s et %2$s.
-observe.validation.setLongline.bound.haulingStartLatitude=La latitude de début de virage doit être comprise entre %1$s et %2$s.
-observe.validation.setLongline.bound.haulingStartLongitude=La longitude de début de virage doit être comprise entre %1$s et %2$s.
observe.validation.setLongline.bound.lightsticksPerBasketCount=Le nombre de cyalumes par panier doit être compris entre %1$s et %2$s.
-observe.validation.setLongline.bound.settingEndLatitude=La latitude de fin de filage doit être comprise entre %1$s et %2$s.
-observe.validation.setLongline.bound.settingEndLongitude=La longitude de fin de filage doit être comprise entre %1$s et %2$s.
-observe.validation.setLongline.bound.settingStartLatitude=La latitude de début de filage doit être comprise entre %1$s et %2$s.
-observe.validation.setLongline.bound.settingStartLongitude=La longitude de début de filage doit être comprise entre %1$s et %2$s.
observe.validation.setLongline.bound.settingVesselSpeed=La vitesse bateau doit être comprise entre %1$s et %2$s.
observe.validation.setLongline.bound.shooterSpeed=La vitesse de shooter doit être comprise entre %1$s et %2$s.
observe.validation.setLongline.bound.snapWeight=Le poids snap doit être compris entre %1$s et %2$s.
View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/b95c598b05fa5dbe8f70f358d4…
--
View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/b95c598b05fa5dbe8f70f358d4…
You're receiving this email because of your account on gitlab.com.
1
0
[Git][ultreiaio/ird-observe][develop] [LL] Composition globale de la palangre : petits ajustements - Closes #1128…
by Tony CHEMIT 07 Oct '18
by Tony CHEMIT 07 Oct '18
07 Oct '18
Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe
Commits:
b95c598b by Tony CHEMIT at 2018-10-07T13:11:36Z
[LL] Composition globale de la palangre : petits ajustements - Closes #1128 (plus alignement de l'écran observation)
- - - - -
30 changed files:
- client/src/main/java/fr/ird/observe/client/ui/content/api/data/table/ContentTableUIModel.java
- + client/src/main/java/fr/ird/observe/client/ui/content/api/data/table/NotStandaloneContentTableUIHandler.java
- client/src/main/java/fr/ird/observe/client/ui/content/data/longline/logbook/BaitsCompositionLogbookUI.jaxx
- client/src/main/java/fr/ird/observe/client/ui/content/data/longline/logbook/BaitsCompositionLogbookUI.jcss
- client/src/main/java/fr/ird/observe/client/ui/content/data/longline/logbook/BaitsCompositionLogbookUIHandler.java
- client/src/main/java/fr/ird/observe/client/ui/content/data/longline/logbook/BaitsCompositionLogbookUIModel.java
- client/src/main/java/fr/ird/observe/client/ui/content/data/longline/logbook/BranchlinesCompositionLogbookUI.jaxx
- client/src/main/java/fr/ird/observe/client/ui/content/data/longline/logbook/BranchlinesCompositionLogbookUI.jcss
- client/src/main/java/fr/ird/observe/client/ui/content/data/longline/logbook/BranchlinesCompositionLogbookUIHandler.java
- client/src/main/java/fr/ird/observe/client/ui/content/data/longline/logbook/BranchlinesCompositionLogbookUIModel.java
- client/src/main/java/fr/ird/observe/client/ui/content/data/longline/logbook/FloatlinesCompositionLogbookUI.jaxx
- client/src/main/java/fr/ird/observe/client/ui/content/data/longline/logbook/FloatlinesCompositionLogbookUI.jcss
- client/src/main/java/fr/ird/observe/client/ui/content/data/longline/logbook/FloatlinesCompositionLogbookUIHandler.java
- client/src/main/java/fr/ird/observe/client/ui/content/data/longline/logbook/FloatlinesCompositionLogbookUIModel.java
- client/src/main/java/fr/ird/observe/client/ui/content/data/longline/logbook/HooksCompositionLogbookUI.jaxx
- client/src/main/java/fr/ird/observe/client/ui/content/data/longline/logbook/HooksCompositionLogbookUI.jcss
- client/src/main/java/fr/ird/observe/client/ui/content/data/longline/logbook/HooksCompositionLogbookUIHandler.java
- client/src/main/java/fr/ird/observe/client/ui/content/data/longline/logbook/HooksCompositionLogbookUIModel.java
- client/src/main/java/fr/ird/observe/client/ui/content/data/longline/obs/BaitsCompositionObsUI.jaxx
- client/src/main/java/fr/ird/observe/client/ui/content/data/longline/obs/BaitsCompositionObsUI.jcss
- client/src/main/java/fr/ird/observe/client/ui/content/data/longline/obs/BranchlinesCompositionObsUI.jaxx
- client/src/main/java/fr/ird/observe/client/ui/content/data/longline/obs/BranchlinesCompositionObsUI.jcss
- client/src/main/java/fr/ird/observe/client/ui/content/data/longline/obs/FloatlinesCompositionObsUI.jaxx
- client/src/main/java/fr/ird/observe/client/ui/content/data/longline/obs/FloatlinesCompositionObsUI.jcss
- client/src/main/java/fr/ird/observe/client/ui/content/data/longline/obs/HooksCompositionObsUI.jaxx
- + client/src/main/java/fr/ird/observe/client/ui/content/data/longline/obs/HooksCompositionObsUI.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
- persistence/src/main/java/fr/ird/observe/persistence/migration/DataSourceMigrationForVersion_8_3.java
The diff was not included because it is too large.
View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/b95c598b05fa5dbe8f70f358d4e…
--
View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/b95c598b05fa5dbe8f70f358d4e…
You're receiving this email because of your account on gitlab.com.
1
0
[Git][ultreiaio/ird-observe][develop] 2 commits: [LL] Créer une liste d'affichage d'espèces propre aux captures, débarquements et…
by Tony CHEMIT 07 Oct '18
by Tony CHEMIT 07 Oct '18
07 Oct '18
Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe
Commits:
4ed9f518 by Tony CHEMIT at 2018-10-07T10:16:38Z
[LL] Créer une liste d'affichage d'espèces propre aux captures, débarquements et échantillons LL Logbooks - See #1130
- - - - -
f680c163 by Tony CHEMIT at 2018-10-07T10:52:45Z
[LL] Capture : petits ajustements - Closes #1129
- - - - -
30 changed files:
- client-configuration/src/main/config/Client.ini
- client-configuration/src/main/java/fr/ird/observe/client/configuration/ClientConfig.java
- client-configuration/src/main/resources/i18n/client-configuration_en_GB.properties
- client-configuration/src/main/resources/i18n/client-configuration_es_ES.properties
- client-configuration/src/main/resources/i18n/client-configuration_fr_FR.properties
- client/src/main/java/fr/ird/observe/client/db/ObserveSwingDataSource.java
- client/src/main/java/fr/ird/observe/client/ui/actions/main/menu/config/ShowConfigAction.java
- client/src/main/java/fr/ird/observe/client/ui/content/data/longline/TripLonglineUIHandler.java
- client/src/main/java/fr/ird/observe/client/ui/content/data/longline/logbook/CatchLonglineLogbookUI.jcss
- client/src/main/java/fr/ird/observe/client/ui/content/data/longline/logbook/CatchLonglineLogbookUIHandler.java
- client/src/main/java/fr/ird/observe/client/ui/content/data/longline/logbook/CatchLonglineLogbookUIModel.java
- client/src/main/java/fr/ird/observe/client/ui/content/data/longline/logbook/LandingPartLogbookUIHandler.java
- client/src/main/java/fr/ird/observe/client/ui/content/data/longline/logbook/SamplePartLogbookUIHandler.java
- client/src/main/java/fr/ird/observe/client/ui/content/data/longline/obs/CatchLonglineObsUIHandler.java
- client/src/main/java/fr/ird/observe/client/ui/content/data/longline/obs/EncounterObsUIHandler.java
- client/src/main/java/fr/ird/observe/client/ui/content/data/longline/obs/TdrObsUIHandler.java
- client/src/main/java/fr/ird/observe/client/ui/content/data/seine/NonTargetCatchReleaseUIHandler.java
- client/src/main/java/fr/ird/observe/client/ui/content/data/seine/NonTargetCatchUIHandler.java
- client/src/main/java/fr/ird/observe/client/ui/content/data/seine/NonTargetSampleUIHandler.java
- client/src/main/java/fr/ird/observe/client/ui/content/data/seine/ObjectObservedSpeciesUIHandler.java
- client/src/main/java/fr/ird/observe/client/ui/content/data/seine/ObjectSchoolEstimateUIHandler.java
- client/src/main/java/fr/ird/observe/client/ui/content/data/seine/SchoolEstimateUIHandler.java
- client/src/main/java/fr/ird/observe/client/ui/content/data/seine/TargetCatchUIHandler.java
- client/src/main/java/fr/ird/observe/client/ui/content/data/seine/TargetDiscardCatchUIHandler.java
- client/src/main/java/fr/ird/observe/client/ui/content/data/seine/TargetSampleUIHandler.java
- client/src/main/java/fr/ird/observe/client/ui/content/data/seine/TripSeineUIHandler.java
- client/src/main/resources/i18n/client_en_GB.properties
- client/src/main/resources/i18n/client_es_ES.properties
- client/src/main/resources/i18n/client_fr_FR.properties
- + dto/src/main/java/fr/ird/observe/dto/SpeciesListConfiguration.java
The diff was not included because it is too large.
View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/668d0921fdc8797c2be2b550a6…
--
View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/668d0921fdc8797c2be2b550a6…
You're receiving this email because of your account on gitlab.com.
1
0
[Git][ultreiaio/ird-observe][develop] [LL] Créer une liste d'affichage d'espèces propre aux captures, débarquements et…
by Tony CHEMIT 06 Oct '18
by Tony CHEMIT 06 Oct '18
06 Oct '18
Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe
Commits:
668d0921 by Tony CHEMIT at 2018-10-06T17:15:24Z
[LL] Créer une liste d'affichage d'espèces propre aux captures, débarquements et échantillons LL Logbooks - See #1130
- - - - -
22 changed files:
- client-configuration/src/main/config/Client.ini
- client-configuration/src/main/resources/i18n/client-configuration_en_GB.properties
- client-configuration/src/main/resources/i18n/client-configuration_es_ES.properties
- client-configuration/src/main/resources/i18n/client-configuration_fr_FR.properties
- client/src/main/java/fr/ird/observe/client/ui/actions/main/menu/config/ShowConfigAction.java
- client/src/main/java/fr/ird/observe/client/ui/content/data/longline/TripLonglineUIHandler.java
- client/src/main/java/fr/ird/observe/client/ui/content/data/longline/logbook/CatchLonglineLogbookUIHandler.java
- client/src/main/java/fr/ird/observe/client/ui/content/data/longline/logbook/LandingPartLogbookUIHandler.java
- client/src/main/java/fr/ird/observe/client/ui/content/data/longline/logbook/SamplePartLogbookUIHandler.java
- client/src/main/java/fr/ird/observe/client/ui/content/data/longline/obs/CatchLonglineObsUIHandler.java
- client/src/main/java/fr/ird/observe/client/ui/content/data/longline/obs/EncounterObsUIHandler.java
- client/src/main/java/fr/ird/observe/client/ui/content/data/longline/obs/TdrObsUIHandler.java
- client/src/main/java/fr/ird/observe/client/ui/content/data/seine/NonTargetCatchReleaseUIHandler.java
- client/src/main/java/fr/ird/observe/client/ui/content/data/seine/NonTargetCatchUIHandler.java
- client/src/main/java/fr/ird/observe/client/ui/content/data/seine/NonTargetSampleUIHandler.java
- client/src/main/java/fr/ird/observe/client/ui/content/data/seine/ObjectObservedSpeciesUIHandler.java
- client/src/main/java/fr/ird/observe/client/ui/content/data/seine/ObjectSchoolEstimateUIHandler.java
- client/src/main/java/fr/ird/observe/client/ui/content/data/seine/SchoolEstimateUIHandler.java
- client/src/main/java/fr/ird/observe/client/ui/content/data/seine/TargetCatchUIHandler.java
- client/src/main/java/fr/ird/observe/client/ui/content/data/seine/TargetDiscardCatchUIHandler.java
- client/src/main/java/fr/ird/observe/client/ui/content/data/seine/TargetSampleUIHandler.java
- client/src/main/java/fr/ird/observe/client/ui/content/data/seine/TripSeineUIHandler.java
Changes:
=====================================
client-configuration/src/main/config/Client.ini
=====================================
@@ -369,24 +369,43 @@ key = speciesList.seine.objectObservedSpecies
type = string
defaultValue = "fr.ird.observe.entities.referentiel.SpeciesList#1239832675370#0.2"
-[option speciesListLonglineCatchId]
-description = observe.config.speciesList.longline.catch
-key = speciesList.longline.catch
+[option speciesListLonglineObsCatchId]
+description = observe.config.speciesList.longline.obs.catch
+key = speciesList.longline.obs.catch
type = string
defaultValue = "fr.ird.observe.entities.referentiel.SpeciesList#1239832675370#0.3"
-[option speciesListLonglineEncounterId]
-description = observe.config.speciesList.longline.encounter
-key = speciesList.longline.encounter
+[option speciesListLonglineObsEncounterId]
+description = observe.config.speciesList.longline.obs.encounter
+key = speciesList.longline.obs.encounter
type = string
defaultValue = "fr.ird.observe.entities.referentiel.SpeciesList#1239832675370#0.4"
-[option speciesListLonglineDepredatorId]
-description = observe.config.speciesList.longline.encounter
-key = speciesList.longline.depredator
+[option speciesListLonglineObsDepredatorId]
+description = observe.config.speciesList.longline.obs.depredator
+key = speciesList.longline.obs.tdr
type = string
defaultValue = "fr.ird.observe.entities.referentiel.SpeciesList#1239832675370#0.5"
+[option speciesListLonglineLogbookCatchId]
+description = observe.config.speciesList.longline.logbook.catch
+key = speciesList.longline.logbook.catch
+type = string
+defaultValue = "fr.ird.observe.entities.referentiel.SpeciesList#1239832675370#0.3"
+
+[option speciesListLonglineLogbookLandingId]
+description = observe.config.speciesList.longline.logbook.landing
+key = speciesList.longline.logbook.landing
+type = string
+defaultValue = "fr.ird.observe.entities.referentiel.SpeciesList#1239832675370#0.3"
+
+[option speciesListLonglineLogbookSampleId]
+description = observe.config.speciesList.longline.logbook.sample
+key = speciesList.longline.logbook.sample
+type = string
+defaultValue = "fr.ird.observe.entities.referentiel.SpeciesList#1239832675370#0.3"
+
+
[option speciesListLonglineTripId]
description = observe.config.speciesList.longline.trip
key = speciesList.longline.trip
=====================================
client-configuration/src/main/resources/i18n/client-configuration_en_GB.properties
=====================================
@@ -69,8 +69,12 @@ observe.config.serverDataSourceConfigurations.description=Server data source con
observe.config.showMigrationProgression=Show migration progression
observe.config.showMigrationSql=Show migration sql queries
observe.config.showSql=Show sql
-observe.config.speciesList.longline.catch=Species for catches
-observe.config.speciesList.longline.encounter=Species for encounters
+observe.config.speciesList.longline.logbook.catch=Species for logbook catches
+observe.config.speciesList.longline.logbook.landing=Species for logbook landings
+observe.config.speciesList.longline.logbook.sample=Species for logbook samples
+observe.config.speciesList.longline.obs.catch=Species for observation catches
+observe.config.speciesList.longline.obs.depredator=Species for observation depredator
+observe.config.speciesList.longline.obs.encounter=Species for encounters
observe.config.speciesList.longline.trip=Species for trip longline
observe.config.speciesList.seine.nonTargetCatch=Species for non target catches
observe.config.speciesList.seine.objectObservedSpecies=Species for object observed species
=====================================
client-configuration/src/main/resources/i18n/client-configuration_es_ES.properties
=====================================
@@ -69,8 +69,12 @@ observe.config.serverDataSourceConfigurations.description=Configurations de serv
observe.config.showMigrationProgression=Mostar los logs de actualización de una base de datos
observe.config.showMigrationSql=Mostrar en los logs las consultas realizadas durante la actualización de una base de datos
observe.config.showSql=Mostrar en los los todas las consultas sql ejecutadas
-observe.config.speciesList.longline.catch=Especies para las capturas - TDR
-observe.config.speciesList.longline.encounter=Especies para los encuentros
+observe.config.speciesList.longline.logbook.catch=Especies para las capturas logbook \#TODO
+observe.config.speciesList.longline.logbook.landing=Especies para las landing logbook \#TODO
+observe.config.speciesList.longline.logbook.sample=Especies para las sample logbook \#TODO
+observe.config.speciesList.longline.obs.catch=Especies para las capturas observations \#TODO
+observe.config.speciesList.longline.obs.depredator=Species for observation depredator \#TODO
+observe.config.speciesList.longline.obs.encounter=Especies para los encuentros
observe.config.speciesList.longline.trip=Especies para las marea - Longline
observe.config.speciesList.seine.nonTargetCatch=Especies para las capturas que no forman parte del objetivo
observe.config.speciesList.seine.objectObservedSpecies=Especies para los especies que no forman parte del objetivo y que fueron observadas
=====================================
client-configuration/src/main/resources/i18n/client-configuration_fr_FR.properties
=====================================
@@ -69,8 +69,12 @@ observe.config.serverDataSourceConfigurations.description=connexions à des serv
observe.config.showMigrationProgression=Afficher dans les logs la progression de la mise à jour d'une base
observe.config.showMigrationSql=Afficher dans les logs les requêtes jouées lors de la mise à jour d'une base
observe.config.showSql=Afficher dans les logs toutes les requêtes sql executées
-observe.config.speciesList.longline.catch=Espèces pour les captures - TDR
-observe.config.speciesList.longline.encounter=Espèces pour les rencontre
+observe.config.speciesList.longline.logbook.catch=Espèces pour les captures Logbook
+observe.config.speciesList.longline.logbook.landing=Espèces pour les débarquements Logbook
+observe.config.speciesList.longline.logbook.sample=Espèces pour les échantillons Logbook
+observe.config.speciesList.longline.obs.catch=Espèces pour les captures observation
+observe.config.speciesList.longline.obs.depredator=Espèces pour les déprédations
+observe.config.speciesList.longline.obs.encounter=Espèces pour les rencontre
observe.config.speciesList.longline.trip=Espèces ciébles pour les marées Palangre
observe.config.speciesList.seine.nonTargetCatch=Espèces pour les captures non cible
observe.config.speciesList.seine.objectObservedSpecies=Espèces pour les espèces non cible observées
=====================================
client/src/main/java/fr/ird/observe/client/ui/actions/main/menu/config/ShowConfigAction.java
=====================================
@@ -36,8 +36,8 @@ import fr.ird.observe.dto.decoration.decorators.ReferentialReferenceDecorator;
import fr.ird.observe.dto.reference.ReferentialDtoReference;
import fr.ird.observe.dto.referential.SpeciesListReference;
import io.ultreia.java4all.config.ConfigOptionDef;
-import org.apache.logging.log4j.Logger;
import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
import org.jdesktop.swingx.renderer.DefaultTableRenderer;
import org.nuiton.decorator.Decorator;
import org.nuiton.jaxx.widgets.config.ConfigCategoryUI;
@@ -234,8 +234,13 @@ public class ShowConfigAction extends MenuActionSupport {
n("observe.config.category.speciesList.longline.description"),
ObserveUICallback.ui.name());
- helper.addSpeciesListOption(ClientConfigOption.SPECIES_LIST_LONGLINE_CATCH_ID);
- helper.addSpeciesListOption(ClientConfigOption.SPECIES_LIST_LONGLINE_ENCOUNTER_ID);
+ helper.addSpeciesListOption(ClientConfigOption.SPECIES_LIST_LONGLINE_TRIP_ID);
+ helper.addSpeciesListOption(ClientConfigOption.SPECIES_LIST_LONGLINE_OBS_CATCH_ID);
+ helper.addSpeciesListOption(ClientConfigOption.SPECIES_LIST_LONGLINE_OBS_DEPREDATOR_ID);
+ helper.addSpeciesListOption(ClientConfigOption.SPECIES_LIST_LONGLINE_OBS_ENCOUNTER_ID);
+ helper.addSpeciesListOption(ClientConfigOption.SPECIES_LIST_LONGLINE_LOGBOOK_CATCH_ID);
+ helper.addSpeciesListOption(ClientConfigOption.SPECIES_LIST_LONGLINE_LOGBOOK_LANDING_ID);
+ helper.addSpeciesListOption(ClientConfigOption.SPECIES_LIST_LONGLINE_LOGBOOK_SAMPLE_ID);
}
=====================================
client/src/main/java/fr/ird/observe/client/ui/content/data/longline/TripLonglineUIHandler.java
=====================================
@@ -70,7 +70,7 @@ class TripLonglineUIHandler extends ContentOpenableUIHandler<TripLonglineDto, Tr
}
@Override
- public void afterInit(TripLonglineUI ui) {
+ protected void onAfterInitAddReferentialFilters() {
addReferentialFilter(TripLonglineDto.PROPERTY_CAPTAIN, (ReferentialReferencesFilter<PersonDto, PersonReference>) incomingReferences -> {
List<PersonReference> result = PersonHelper.filterCaptainReferences(incomingReferences);
return DtoReferenceCollection.filterEnabled(result);
@@ -98,6 +98,10 @@ class TripLonglineUIHandler extends ContentOpenableUIHandler<TripLonglineDto, Tr
List<SpeciesReference> result = getTripLonglineService().getSpeciesByListAndTrip(tripLonglineId, speciesListId).toList();
return DtoReferenceCollection.filterEnabled(result);
});
+ }
+
+ @Override
+ public void afterInit(TripLonglineUI ui) {
super.afterInit(ui);
TripMapUI tripMap = ui.getTripMap();
ClientConfig config = ObserveSwingApplicationContext.get().getConfig();
=====================================
client/src/main/java/fr/ird/observe/client/ui/content/data/longline/logbook/CatchLonglineLogbookUIHandler.java
=====================================
@@ -126,22 +126,19 @@ public class CatchLonglineLogbookUIHandler extends ContentTableUIHandler<SetLong
}
@Override
- public void afterInit(CatchLonglineLogbookUI ui) {
- super.afterInit(ui);
+ protected void onAfterInitAddReferentialFilters() {
addReferentialFilter(CatchLonglineLogbookDto.PROPERTY_SPECIES_CATCH, (ReferentialReferencesFilter<SpeciesDto, SpeciesReference>) incomingReferences -> {
- String speciesListId = ObserveSwingApplicationContext.get().getConfig().getSpeciesListLonglineCatchId();
+ String speciesListId = ObserveSwingApplicationContext.get().getConfig().getSpeciesListLonglineLogbookCatchId();
String tripLonglineId = ObserveSwingApplicationContext.get().getNavigationSelect().getLongline().getTrip().getId();
List<SpeciesReference> result = getTripLonglineService().getSpeciesByListAndTrip(tripLonglineId, speciesListId).toList();
return DtoReferenceCollection.filterEnabled(result);
});
-
addReferentialFilter(CatchLonglineLogbookDto.PROPERTY_PREDATOR, (ReferentialReferencesFilter<SpeciesDto, SpeciesReference>) incomingReferences -> {
- String speciesListId = ObserveSwingApplicationContext.get().getConfig().getSpeciesListLonglineDepredatorId();
+ String speciesListId = ObserveSwingApplicationContext.get().getConfig().getSpeciesListLonglineObsDepredatorId();
String tripLonglineId = ObserveSwingApplicationContext.get().getNavigationSelect().getLongline().getTrip().getId();
List<SpeciesReference> result = getTripLonglineService().getSpeciesByListAndTrip(tripLonglineId, speciesListId).toList();
return DtoReferenceCollection.filterEnabled(result);
});
-
}
@Override
=====================================
client/src/main/java/fr/ird/observe/client/ui/content/data/longline/logbook/LandingPartLogbookUIHandler.java
=====================================
@@ -22,11 +22,13 @@ package fr.ird.observe.client.ui.content.data.longline.logbook;
* #L%
*/
+import fr.ird.observe.client.ObserveSwingApplicationContext;
import fr.ird.observe.client.ui.content.api.data.table.ContentTableUIHandler;
import fr.ird.observe.client.ui.content.api.ui.ObserveLayoutFocusTraversalPolicy;
import fr.ird.observe.client.ui.util.UIHelper;
import fr.ird.observe.dto.data.longline.LandingLogbookDto;
import fr.ird.observe.dto.data.longline.LandingPartLogbookDto;
+import fr.ird.observe.dto.reference.DtoReferenceCollection;
import fr.ird.observe.dto.referential.SpeciesReference;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
@@ -36,6 +38,7 @@ import javax.swing.JTable;
import javax.swing.table.DefaultTableCellRenderer;
import java.awt.Component;
import java.awt.Container;
+import java.util.List;
import static org.nuiton.i18n.I18n.n;
@@ -69,6 +72,16 @@ public class LandingPartLogbookUIHandler extends ContentTableUIHandler<LandingLo
};
}
+ @Override
+ protected void onAfterInitAddReferentialFilters() {
+ addReferentialFilter(LandingPartLogbookDto.PROPERTY_SPECIES, incomingReferences -> {
+ String speciesListId = ObserveSwingApplicationContext.get().getConfig().getSpeciesListLonglineLogbookLandingId();
+ String tripLonglineId = ObserveSwingApplicationContext.get().getNavigationSelect().getLongline().getTrip().getId();
+ List<SpeciesReference> result = getTripLonglineService().getSpeciesByListAndTrip(tripLonglineId, speciesListId).toList();
+ return DtoReferenceCollection.filterEnabled(result);
+ });
+ }
+
@Override
protected void initTableUI(DefaultTableCellRenderer renderer) {
JTable table = ui.getTable();
=====================================
client/src/main/java/fr/ird/observe/client/ui/content/data/longline/logbook/SamplePartLogbookUIHandler.java
=====================================
@@ -31,7 +31,7 @@ import fr.ird.observe.client.ui.content.api.ui.ObserveLayoutFocusTraversalPolicy
import fr.ird.observe.client.ui.util.UIHelper;
import fr.ird.observe.dto.data.longline.SampleLogbookDto;
import fr.ird.observe.dto.data.longline.SamplePartLogbookDto;
-import fr.ird.observe.dto.reference.ReferentialDtoReferenceSet;
+import fr.ird.observe.dto.reference.DtoReferenceCollection;
import fr.ird.observe.dto.referential.SexReference;
import fr.ird.observe.dto.referential.SizeMeasureTypeReference;
import fr.ird.observe.dto.referential.SpeciesReference;
@@ -46,7 +46,6 @@ import javax.swing.table.DefaultTableCellRenderer;
import java.awt.Component;
import java.awt.Container;
import java.beans.PropertyChangeListener;
-import java.util.LinkedList;
import java.util.List;
import java.util.Optional;
@@ -97,21 +96,24 @@ public class SamplePartLogbookUIHandler extends ContentTableUIHandler<SampleLogb
}
@Override
- public void afterInit(SamplePartLogbookUI ui) {
+ protected void onAfterInitAddReferentialFilters() {
addReferentialFilter(SamplePartLogbookDto.PROPERTY_SPECIES, incomingReferences -> {
- if (fromActivity) {
-// FIXME We do not have the set selected here (since this is a brother of it)
- String setId = ObserveSwingApplicationContext.get().getNavigationSelect().getLongline().getActivityLogbookSet().getId();
- if (setId == null) {
- return incomingReferences;
- }
- ReferentialDtoReferenceSet<SpeciesReference> sampleSpecies = getSetLonglineLogbookCatchService().getSampleSpecies(setId);
- return new LinkedList<>(sampleSpecies.toSet());
- } else {
- return incomingReferences;
- }
+ String speciesListId = ObserveSwingApplicationContext.get().getConfig().getSpeciesListLonglineLogbookSampleId();
+ String tripLonglineId = ObserveSwingApplicationContext.get().getNavigationSelect().getLongline().getTrip().getId();
+ List<SpeciesReference> result = getTripLonglineService().getSpeciesByListAndTrip(tripLonglineId, speciesListId).toList();
+ return DtoReferenceCollection.filterEnabled(result);
+// if (fromActivity) {
+//// FIXME We do not have the set selected here (since this is a brother of it)
+// String setId = ObserveSwingApplicationContext.get().getNavigationSelect().getLongline().getActivityLogbookSet().getId();
+// if (setId == null) {
+// return incomingReferences;
+// }
+// ReferentialDtoReferenceSet<SpeciesReference> sampleSpecies = getSetLonglineLogbookCatchService().getSampleSpecies(setId);
+// return new LinkedList<>(sampleSpecies.toSet());
+// } else {
+// return incomingReferences;
+// }
});
- super.afterInit(ui);
}
@Override
=====================================
client/src/main/java/fr/ird/observe/client/ui/content/data/longline/obs/CatchLonglineObsUIHandler.java
=====================================
@@ -161,24 +161,25 @@ public class CatchLonglineObsUIHandler extends ContentTableUIHandler<SetLongline
}
@Override
- public void afterInit(CatchLonglineObsUI ui) {
-
- super.afterInit(ui);
-
+ protected void onAfterInitAddReferentialFilters() {
addReferentialFilter(CatchLonglineObsDto.PROPERTY_SPECIES_CATCH, (ReferentialReferencesFilter<SpeciesDto, SpeciesReference>) incomingReferences -> {
- String speciesListId = ObserveSwingApplicationContext.get().getConfig().getSpeciesListLonglineCatchId();
+ String speciesListId = ObserveSwingApplicationContext.get().getConfig().getSpeciesListLonglineObsCatchId();
String tripLonglineId = ObserveSwingApplicationContext.get().getNavigationSelect().getLongline().getTrip().getId();
List<SpeciesReference> result = getTripLonglineService().getSpeciesByListAndTrip(tripLonglineId, speciesListId).toList();
return DtoReferenceCollection.filterEnabled(result);
});
addReferentialFilter(CatchLonglineObsDto.PROPERTY_PREDATOR, (ReferentialReferencesFilter<SpeciesDto, SpeciesReference>) incomingReferences -> {
- String speciesListId = ObserveSwingApplicationContext.get().getConfig().getSpeciesListLonglineDepredatorId();
+ String speciesListId = ObserveSwingApplicationContext.get().getConfig().getSpeciesListLonglineObsDepredatorId();
String tripLonglineId = ObserveSwingApplicationContext.get().getNavigationSelect().getLongline().getTrip().getId();
List<SpeciesReference> result = getTripLonglineService().getSpeciesByListAndTrip(tripLonglineId, speciesListId).toList();
return DtoReferenceCollection.filterEnabled(result);
});
+ }
+ @Override
+ public void afterInit(CatchLonglineObsUI ui) {
+ super.afterInit(ui);
CatchLonglineObsUIModel model = ui.getModel();
model.addPropertyChangeListener(CatchLonglineObsUIModel.PROPERTY_SHOW_INDIVIDUAL_TABS, evt -> {
Boolean newValue = (Boolean) evt.getNewValue();
=====================================
client/src/main/java/fr/ird/observe/client/ui/content/data/longline/obs/EncounterObsUIHandler.java
=====================================
@@ -60,9 +60,9 @@ public class EncounterObsUIHandler extends ContentTableUIHandler<ActivityLonglin
private static final Logger log = LogManager.getLogger(EncounterObsUIHandler.class);
@Override
- public void afterInit(EncounterObsUI ui) {
+ protected void onAfterInitAddReferentialFilters() {
addReferentialFilter(EncounterObsDto.PROPERTY_SPECIES, (ReferentialReferencesFilter<SpeciesDto, SpeciesReference>) incomingReferences -> {
- String speciesListId = ObserveSwingApplicationContext.get().getConfig().getSpeciesListLonglineEncounterId();
+ String speciesListId = ObserveSwingApplicationContext.get().getConfig().getSpeciesListLonglineObsEncounterId();
Form<SpeciesListDto> speciesListDtoForm = getReferentialService().loadForm(SpeciesListDto.class, speciesListId);
SpeciesListDto speciesListDto = speciesListDtoForm.getObject();
@@ -71,7 +71,6 @@ public class EncounterObsUIHandler extends ContentTableUIHandler<ActivityLonglin
List<SpeciesReference> result = DtoReferenceCollection.filterContains(incomingReferences, speciesIds);
return DtoReferenceCollection.filterEnabled(result);
});
- super.afterInit(ui);
}
@Override
=====================================
client/src/main/java/fr/ird/observe/client/ui/content/data/longline/obs/TdrObsUIHandler.java
=====================================
@@ -181,15 +181,18 @@ public class TdrObsUIHandler extends ContentTableUIHandler<SetLonglineObsTdrDto,
}
@Override
- public void afterInit(TdrObsUI ui) {
+ protected void onAfterInitAddReferentialFilters() {
addReferentialFilter(TdrObsDto.PROPERTY_SPECIES, (ReferentialReferencesFilter<SpeciesDto, SpeciesReference>) incomingReferences -> {
- String speciesListId = ObserveSwingApplicationContext.get().getConfig().getSpeciesListLonglineCatchId();
+ String speciesListId = ObserveSwingApplicationContext.get().getConfig().getSpeciesListLonglineObsCatchId();
String tripLonglineId = ObserveSwingApplicationContext.get().getNavigationSelect().getLongline().getTrip().getId();
List<SpeciesReference> result = getTripLonglineService().getSpeciesByListAndTrip(tripLonglineId, speciesListId).toList();
return DtoReferenceCollection.filterEnabled(result);
});
- super.afterInit(ui);
+ }
+ @Override
+ public void afterInit(TdrObsUI ui) {
+ super.afterInit(ui);
positionHelper = new LonglinePositionHelper<>(ui.getSection(), ui.getBasket(), ui.getBranchline(), ui.getTableEditBean());
}
=====================================
client/src/main/java/fr/ird/observe/client/ui/content/data/seine/NonTargetCatchReleaseUIHandler.java
=====================================
@@ -113,11 +113,15 @@ public class NonTargetCatchReleaseUIHandler extends ContentTableUIHandler<SetSei
}
@Override
- public void afterInit(NonTargetCatchReleaseUI ui) {
+ protected void onAfterInitAddReferentialFilters() {
addReferentialFilter(NonTargetCatchReleaseDto.PROPERTY_SPECIES, incomingReferences -> {
ReferentialDtoReferenceSet<SpeciesReference> sampleSpecies = getNonTargetCatchReleaseService().getSampleSpecies(getModel().getSelectedId());
return new LinkedList<>(sampleSpecies.toSet());
});
+ }
+
+ @Override
+ public void afterInit(NonTargetCatchReleaseUI ui) {
super.afterInit(ui);
speciesGroupDtoMap = new TreeMap<>();
getReferentialService().loadSensibleSpeciesGroup().forEach(id -> speciesGroupDtoMap.put(id.getId(), id));
=====================================
client/src/main/java/fr/ird/observe/client/ui/content/data/seine/NonTargetCatchUIHandler.java
=====================================
@@ -180,11 +180,8 @@ public class NonTargetCatchUIHandler extends ContentTableUIHandler<SetSeineNonTa
UIHelper.setTableColumnRenderer(table, 7, UIHelper.newEmptyNumberTableCellRenderer(renderer));
UIHelper.setTableColumnRenderer(table, 8, UIHelper.newStringTableCellRenderer(renderer, 10, true));
}
-
@Override
- protected void loadEditBean(String beanId) {
- Form<SetSeineNonTargetCatchDto> form = getNonTargetCatchService().loadForm(beanId);
- getModel().openForm(form);
+ protected void onAfterInitAddReferentialFilters() {
addReferentialFilter(NonTargetCatchDto.PROPERTY_SPECIES, (ReferentialReferencesFilter<SpeciesDto, SpeciesReference>) incomingReferences -> {
String speciesListId = ObserveSwingApplicationContext.get().getConfig().getSpeciesListSeineNonTargetCatchId();
String tripId = ObserveSwingApplicationContext.get().getNavigationSelect().getSeine().getTrip().getId();
@@ -193,6 +190,19 @@ public class NonTargetCatchUIHandler extends ContentTableUIHandler<SetSeineNonTa
});
}
+ @Override
+ protected void loadEditBean(String beanId) {
+ Form<SetSeineNonTargetCatchDto> form = getNonTargetCatchService().loadForm(beanId);
+ getModel().openForm(form);
+ //FIXME voir pk on faisait ça à ce moment
+// addReferentialFilter(NonTargetCatchDto.PROPERTY_SPECIES, (ReferentialReferencesFilter<SpeciesDto, SpeciesReference>) incomingReferences -> {
+// String speciesListId = ObserveSwingApplicationContext.get().getConfig().getSpeciesListSeineNonTargetCatchId();
+// String tripId = ObserveSwingApplicationContext.get().getNavigationSelect().getSeine().getTrip().getId();
+// List<SpeciesReference> result = getTripSeineService().getSpeciesByListAndTrip(tripId, speciesListId).toList();
+// return DtoReferenceCollection.filterEnabled(result);
+// });
+ }
+
@Override
protected void onSelectedRowChanged(int editingRow, NonTargetCatchDto bean, boolean create) {
ContentTableModel<SetSeineNonTargetCatchDto, NonTargetCatchDto> model = getTableModel();
=====================================
client/src/main/java/fr/ird/observe/client/ui/content/data/seine/NonTargetSampleUIHandler.java
=====================================
@@ -91,7 +91,7 @@ public class NonTargetSampleUIHandler extends AbstractSampleUIHandler<NonTargetS
}
@Override
- public void afterInit(NonTargetSampleUI ui) {
+ protected void onAfterInitAddReferentialFilters() {
addReferentialFilter(NonTargetLengthDto.PROPERTY_SPECIES, incomingReferences -> {
ReferentialDtoReferenceSet<SpeciesReference> sampleSpecies = getNonTargetSampleService().getSampleSpecies(getModel().getSelectedId());
return new LinkedList<>(sampleSpecies.toSet());
@@ -102,7 +102,6 @@ public class NonTargetSampleUIHandler extends AbstractSampleUIHandler<NonTargetS
return new LinkedList<>(speciesFate);
// return ReferentialDtoReferences.filterEnabled(result);
});
- super.afterInit(ui);
}
@Override
=====================================
client/src/main/java/fr/ird/observe/client/ui/content/data/seine/ObjectObservedSpeciesUIHandler.java
=====================================
@@ -58,7 +58,7 @@ public class ObjectObservedSpeciesUIHandler extends ContentTableUIHandler<Floati
private static final Logger log = LogManager.getLogger(ObjectObservedSpeciesUIHandler.class);
@Override
- public void afterInit(ObjectObservedSpeciesUI ui) {
+ protected void onAfterInitAddReferentialFilters() {
addReferentialFilter(ObjectSchoolEstimateDto.PROPERTY_SPECIES, (ReferentialReferencesFilter<SpeciesDto, SpeciesReference>) incomingReferences -> {
String speciesListId = ObserveSwingApplicationContext.get().getConfig().getSpeciesListSeineObjectObservedSpeciesId();
Form<SpeciesListDto> speciesListDtoForm = getReferentialService().loadForm(SpeciesListDto.class, speciesListId);
@@ -69,7 +69,6 @@ public class ObjectObservedSpeciesUIHandler extends ContentTableUIHandler<Floati
List<SpeciesReference> result = DtoReferenceCollection.filterContains(incomingReferences, speciesIds);
return DtoReferenceCollection.filterEnabled(result);
});
- super.afterInit(ui);
}
@Override
=====================================
client/src/main/java/fr/ird/observe/client/ui/content/data/seine/ObjectSchoolEstimateUIHandler.java
=====================================
@@ -56,7 +56,7 @@ public class ObjectSchoolEstimateUIHandler extends ContentTableUIHandler<Floatin
private static final Logger log = LogManager.getLogger(ObjectSchoolEstimateUIHandler.class);
@Override
- public void afterInit(ObjectSchoolEstimateUI ui) {
+ protected void onAfterInitAddReferentialFilters() {
addReferentialFilter(ObjectSchoolEstimateDto.PROPERTY_SPECIES, (ReferentialReferencesFilter<SpeciesDto, SpeciesReference>) incomingReferences -> {
String speciesListId = ObserveSwingApplicationContext.get().getConfig().getSpeciesListSeineObjectSchoolEstimateId();
Form<SpeciesListDto> speciesListDtoForm = getReferentialService().loadForm(SpeciesListDto.class, speciesListId);
@@ -67,7 +67,6 @@ public class ObjectSchoolEstimateUIHandler extends ContentTableUIHandler<Floatin
List<SpeciesReference> result = DtoReferenceCollection.filterContains(incomingReferences, speciesIds);
return DtoReferenceCollection.filterEnabled(result);
});
- super.afterInit(ui);
}
@Override
=====================================
client/src/main/java/fr/ird/observe/client/ui/content/data/seine/SchoolEstimateUIHandler.java
=====================================
@@ -56,7 +56,7 @@ import static org.nuiton.i18n.I18n.n;
public class SchoolEstimateUIHandler extends ContentTableUIHandler<SetSeineSchoolEstimateDto, SchoolEstimateDto, SchoolEstimateUI> implements UIHandler<SchoolEstimateUI> {
@Override
- public void afterInit(SchoolEstimateUI ui) {
+ protected void onAfterInitAddReferentialFilters() {
addReferentialFilter(SchoolEstimateDto.PROPERTY_SPECIES, (ReferentialReferencesFilter<SpeciesDto, SpeciesReference>) incomingReferences -> {
String speciesListId = ObserveSwingApplicationContext.get().getConfig().getSpeciesListSeineSchoolEstimateId();
@@ -64,7 +64,6 @@ public class SchoolEstimateUIHandler extends ContentTableUIHandler<SetSeineSchoo
List<SpeciesReference> result = getTripSeineService().getSpeciesByListAndTrip(tripId, speciesListId).toList();
return DtoReferenceCollection.filterEnabled(result);
});
- super.afterInit(ui);
}
@Override
=====================================
client/src/main/java/fr/ird/observe/client/ui/content/data/seine/TargetCatchUIHandler.java
=====================================
@@ -67,7 +67,7 @@ public class TargetCatchUIHandler extends ContentTableUIHandler<SetSeineTargetCa
private static final Logger log = LogManager.getLogger(TargetCatchUIHandler.class);
@Override
- public void afterInit(TargetCatchUI ui) {
+ protected void onAfterInitAddReferentialFilters() {
addReferentialFilter(TargetCatchDto.PROPERTY_SPECIES, (ReferentialReferencesFilter<SpeciesDto, SpeciesReference>) incomingReferences -> {
String speciesListId = ObserveSwingApplicationContext.get().getConfig().getSpeciesListSeineTargetCatchId();
@@ -75,6 +75,10 @@ public class TargetCatchUIHandler extends ContentTableUIHandler<SetSeineTargetCa
List<SpeciesReference> result = getTripSeineService().getSpeciesByListAndTrip(tripId, speciesListId).toList();
return DtoReferenceCollection.filterEnabled(result);
});
+ }
+
+ @Override
+ public void afterInit(TargetCatchUI ui) {
super.afterInit(ui);
// lors de la modification d'une species (sur une entree non sauvee)
=====================================
client/src/main/java/fr/ird/observe/client/ui/content/data/seine/TargetDiscardCatchUIHandler.java
=====================================
@@ -71,7 +71,7 @@ public class TargetDiscardCatchUIHandler extends ContentTableUIHandler<SetSeineT
private static final Logger log = LogManager.getLogger(TargetDiscardCatchUIHandler.class);
@Override
- public void afterInit(TargetDiscardCatchUI ui) {
+ protected void onAfterInitAddReferentialFilters() {
addReferentialFilter(TargetCatchDto.PROPERTY_SPECIES, (ReferentialReferencesFilter<SpeciesDto, SpeciesReference>) incomingReferences -> {
String speciesListId = ObserveSwingApplicationContext.get().getConfig().getSpeciesListSeineTargetCatchId();
@@ -79,6 +79,10 @@ public class TargetDiscardCatchUIHandler extends ContentTableUIHandler<SetSeineT
List<SpeciesReference> result = getTripSeineService().getSpeciesByListAndTrip(tripId, speciesListId).toList();
return DtoReferenceCollection.filterEnabled(result);
});
+ }
+
+ @Override
+ public void afterInit(TargetDiscardCatchUI ui) {
super.afterInit(ui);
// lors de la modification d'une species (sur une entree non sauvee)
=====================================
client/src/main/java/fr/ird/observe/client/ui/content/data/seine/TargetSampleUIHandler.java
=====================================
@@ -136,7 +136,7 @@ public class TargetSampleUIHandler<U extends ContentTableUI<TargetSampleDto, Tar
}
@Override
- public void afterInit(U ui) {
+ protected void onAfterInitAddReferentialFilters() {
addReferentialFilter(TargetLengthDto.PROPERTY_SPECIES, (ReferentialReferencesFilter<SpeciesDto, SpeciesReference>) incomingReferences -> {
List<SpeciesReference> result = TargetSampleUIHandler.this.getTargetSampleService().getSampleSpecies(getModel().getSelectedId(), discarded).toList();
return DtoReferenceCollection.filterEnabled(result);
@@ -146,7 +146,6 @@ public class TargetSampleUIHandler<U extends ContentTableUI<TargetSampleDto, Tar
checkSizeMeasureTypes(result);
return DtoReferenceCollection.filterEnabled(result);
});
- super.afterInit(ui);
}
@Override
=====================================
client/src/main/java/fr/ird/observe/client/ui/content/data/seine/TripSeineUIHandler.java
=====================================
@@ -65,7 +65,7 @@ class TripSeineUIHandler extends ContentOpenableUIHandler<TripSeineDto, TripSein
}
@Override
- public void afterInit(TripSeineUI ui) {
+ protected void onAfterInitAddReferentialFilters() {
addReferentialFilter(TripSeineDto.PROPERTY_CAPTAIN, (ReferentialReferencesFilter<PersonDto, PersonReference>) incomingReferences -> {
List<PersonReference> result = PersonHelper.filterCaptainReferences(incomingReferences);
return DtoReferenceCollection.filterEnabled(result);
@@ -83,6 +83,10 @@ class TripSeineUIHandler extends ContentOpenableUIHandler<TripSeineDto, TripSein
List<VesselReference> result = VesselHelper.filterVesselReferencesByVesselTypeIds(incomingReferences, config.getLonglineVesselTypeIds());
return DtoReferenceCollection.filterEnabled(result);
});
+ }
+
+ @Override
+ public void afterInit(TripSeineUI ui) {
super.afterInit(ui);
TripMapUI tripMap = ui.getTripMap();
View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/668d0921fdc8797c2be2b550a65…
--
View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/668d0921fdc8797c2be2b550a65…
You're receiving this email because of your account on gitlab.com.
1
0
[Git][ultreiaio/ird-observe][develop] [LL][PS] Dans le widget liste déroulante d'espèces, après le code FAO et le non…
by Tony CHEMIT 06 Oct '18
by Tony CHEMIT 06 Oct '18
06 Oct '18
Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe
Commits:
7cb93827 by Tony CHEMIT at 2018-10-06T16:34:10Z
[LL][PS] Dans le widget liste déroulante d'espèces, après le code FAO et le non scientifique, ajouter le nom commun (vernaculaire) dans la langue courante - Closes #1131
- - - - -
1 changed file:
- dto/src/main/java/fr/ird/observe/dto/decoration/DecoratorService.java
Changes:
=====================================
dto/src/main/java/fr/ird/observe/dto/decoration/DecoratorService.java
=====================================
@@ -753,7 +753,7 @@ public class DecoratorService extends DecoratorProvider {
@Override
public void initSpeciesDto() {
registerDecorator(new SpeciesDecorator());
- registerReferentialReferenceDecorator(SpeciesReference.class, "${faoCode}$s##${scientificLabel}$s");
+ registerReferentialReferenceDecorator(SpeciesReference.class, "${faoCode}$s##${scientificLabel}$s##${label}$s");
}
@Override
View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/7cb93827c8f4dd71bee0999e7e8…
--
View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/7cb93827c8f4dd71bee0999e7e8…
You're receiving this email because of your account on gitlab.com.
1
0
[Git][ultreiaio/ird-observe][develop] 10 commits: add test database form model 8.3
by Tony CHEMIT 06 Oct '18
by Tony CHEMIT 06 Oct '18
06 Oct '18
Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe
Commits:
c75c91f7 by Tony CHEMIT at 2018-10-06T16:15:23Z
add test database form model 8.3
- - - - -
97b5b714 by Tony CHEMIT at 2018-10-06T16:15:24Z
[LL][PS] Améliorer le widget position - Closes #1133
- - - - -
332de6b9 by Tony CHEMIT at 2018-10-06T16:15:25Z
[LL] Débarquements : petits ajustements - See #1121 (correction libelle)
- - - - -
7097ff78 by Tony CHEMIT at 2018-10-06T16:15:25Z
[LL] Débarquements : petits ajustements - See #1121 (catégories de poids non obligatoires)
- - - - -
12cee0d3 by Tony CHEMIT at 2018-10-06T16:15:25Z
[LL] Débarquements : petits ajustements - See #1121 (ajout configuration pour la méthode de mesure de poids par défaut pour la création d'un nouveau débarquement)
- - - - -
3e814944 by Tony CHEMIT at 2018-10-06T16:15:25Z
[LL] Débarquements : petits ajustements - See #1121 (ajout filtre sur les navires (cargo ou inconnu))
- - - - -
2fa7ea4a by Tony CHEMIT at 2018-10-06T16:15:25Z
[LL] Débarquements : petits ajustements - See #1121 (utilisation méthode de mensuration de poids lors de la création d'un nouveau débarquement)
- - - - -
511c3b13 by Tony CHEMIT at 2018-10-06T16:15:25Z
[LL] Débarquements : petits ajustements - See #1121 (correction des messages pour le déplacement)
- - - - -
5ecad347 by Tony CHEMIT at 2018-10-06T16:15:25Z
Ajout d'un raccourci clavier pour déplacer des éléments
- - - - -
bd5625ac by Tony CHEMIT at 2018-10-06T16:15:25Z
open api
- - - - -
30 changed files:
- client-configuration/src/main/config/Client.ini
- client-configuration/src/main/resources/i18n/client-configuration_en_GB.properties
- client-configuration/src/main/resources/i18n/client-configuration_es_ES.properties
- client-configuration/src/main/resources/i18n/client-configuration_fr_FR.properties
- client/src/main/java/fr/ird/observe/client/db/ObserveSwingDataSource.java
- client/src/main/java/fr/ird/observe/client/ui/ObserveKeyStrokes.java
- client/src/main/java/fr/ird/observe/client/ui/ObserveMainUIInitializer.java
- client/src/main/java/fr/ird/observe/client/ui/actions/content/api/data/list/MoveMultipleDataUIActionSupport.java
- client/src/main/java/fr/ird/observe/client/ui/actions/content/api/data/open/MoveSingleDataUIActionSupport.java
- client/src/main/java/fr/ird/observe/client/ui/actions/content/data/longline/move/MoveMultipleTripLonglineLandingLogbookUIAction.java
- client/src/main/java/fr/ird/observe/client/ui/actions/content/data/longline/move/MoveSingleTripLonglineLandingLogbookUIAction.java
- client/src/main/java/fr/ird/observe/client/ui/content/Common.jcss
- client/src/main/java/fr/ird/observe/client/ui/content/api/ContentUIHandler.java
- client/src/main/java/fr/ird/observe/client/ui/content/data/longline/logbook/LandingPartLogbookUIHandler.java
- client/src/main/java/fr/ird/observe/client/ui/content/data/longline/logbook/LandingPartLogbookUIModel.java
- client/src/main/java/fr/ird/observe/client/ui/content/data/longline/logbook/TripLonglineLandingLogbookUIHandler.java
- 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
- pom.xml
- + 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
- test/src/main/resources/fixtures/count-referential-common.properties
- test/src/main/resources/fixtures/count-referential-longline.properties
- test/src/main/resources/fixtures/validate-service-referential.properties
- validation/src/main/resources/fr/ird/observe/dto/data/longline/LandingPartLogbookDto-update-error-validation.xml
- validation/src/main/resources/i18n/validation_es_ES.properties
The diff was not included because it is too large.
View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/4830a244ad358521527d361631…
--
View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/4830a244ad358521527d361631…
You're receiving this email because of your account on gitlab.com.
1
0
[Git][ultreiaio/ird-observe][develop] 5 commits: end of ui handler refactor (may need a hole test of ui...)
by Tony CHEMIT 06 Oct '18
by Tony CHEMIT 06 Oct '18
06 Oct '18
Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe
Commits:
4e973c5c by Tony CHEMIT at 2018-10-06T14:12:43Z
end of ui handler refactor (may need a hole test of ui...)
- - - - -
fdfbb6b3 by Tony CHEMIT at 2018-10-06T14:12:45Z
[LL] Attribution de codes aux états de conservation - Closes #1123
- - - - -
d051d38a by Tony CHEMIT at 2018-10-06T14:12:45Z
[LL] Débarquements : petits ajustements - See #1121 (add harbour entry)
- - - - -
83cf3045 by Tony CHEMIT at 2018-10-06T14:12:46Z
add test database form model 8.3
- - - - -
4830a244 by Tony CHEMIT at 2018-10-06T14:13:32Z
[LL][PS] Améliorer le widget position - Closes #1133
- - - - -
30 changed files:
- client/pom.xml
- client/src/main/java/fr/ird/observe/client/ui/content/Common.jcss
- client/src/main/java/fr/ird/observe/client/ui/content/api/ContentUIHandler.java
- client/src/main/java/fr/ird/observe/client/ui/content/api/ContentUIModel.java
- client/src/main/java/fr/ird/observe/client/ui/content/api/data/edit/ContentEditUIHandler.java
- client/src/main/java/fr/ird/observe/client/ui/content/api/data/list/ContentListUIHandler.java
- client/src/main/java/fr/ird/observe/client/ui/content/api/data/open/ContentOpenableUIHandler.java
- client/src/main/java/fr/ird/observe/client/ui/content/api/data/simple/ContentSimpleUIHandler.java
- client/src/main/java/fr/ird/observe/client/ui/content/api/data/simple/ContentSimpleUIInitializer.java
- client/src/main/java/fr/ird/observe/client/ui/content/api/data/simple/ContentSimpleUIModel.java
- client/src/main/java/fr/ird/observe/client/ui/content/api/data/table/ContentTableUIHandler.java
- client/src/main/java/fr/ird/observe/client/ui/content/api/data/table/ContentTableUIModel.java
- client/src/main/java/fr/ird/observe/client/ui/content/api/ref/ContentReferenceUIHandler.java
- client/src/main/java/fr/ird/observe/client/ui/content/api/ref/ContentReferenceUIModel.java
- client/src/main/java/fr/ird/observe/client/ui/content/api/ref/ReferenceHomeUIHandler.java
- client/src/main/java/fr/ird/observe/client/ui/content/data/longline/GearUseFeaturesLonglineUIHandler.java
- client/src/main/java/fr/ird/observe/client/ui/content/data/longline/TripLonglineListUIHandler.java
- client/src/main/java/fr/ird/observe/client/ui/content/data/longline/TripLonglineUIHandler.java
- client/src/main/java/fr/ird/observe/client/ui/content/data/longline/logbook/ActivityLonglineLogbookListUIHandler.java
- client/src/main/java/fr/ird/observe/client/ui/content/data/longline/logbook/ActivityLonglineLogbookSampleUIHandler.java
- client/src/main/java/fr/ird/observe/client/ui/content/data/longline/logbook/ActivityLonglineLogbookUIHandler.java
- client/src/main/java/fr/ird/observe/client/ui/content/data/longline/logbook/BaitsCompositionLogbookUIHandler.java
- client/src/main/java/fr/ird/observe/client/ui/content/data/longline/logbook/BranchlinesCompositionLogbookUIHandler.java
- client/src/main/java/fr/ird/observe/client/ui/content/data/longline/logbook/CatchLonglineLogbookUIHandler.java
- client/src/main/java/fr/ird/observe/client/ui/content/data/longline/logbook/FloatlinesCompositionLogbookUIHandler.java
- client/src/main/java/fr/ird/observe/client/ui/content/data/longline/logbook/HooksCompositionLogbookUIHandler.java
- client/src/main/java/fr/ird/observe/client/ui/content/data/longline/logbook/LonglineGlobalCompositionLogbookUIHandler.java
- client/src/main/java/fr/ird/observe/client/ui/content/data/longline/logbook/SamplePartLogbookUIHandler.java
- client/src/main/java/fr/ird/observe/client/ui/content/data/longline/logbook/SamplePartLogbookUIModel.java
- client/src/main/java/fr/ird/observe/client/ui/content/data/longline/logbook/SetLonglineLogbookUIHandler.java
The diff was not included because it is too large.
View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/4c51af42c264c2e1bfa060a84b…
--
View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/4c51af42c264c2e1bfa060a84b…
You're receiving this email because of your account on gitlab.com.
1
0
[Git][ultreiaio/ird-observe][develop] [LL] Correction de libellés - See #1117
by Tony CHEMIT 05 Oct '18
by Tony CHEMIT 05 Oct '18
05 Oct '18
Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe
Commits:
4c51af42 by Tony CHEMIT at 2018-10-05T10:32:04Z
[LL] Correction de libellés - See #1117
- - - - -
1 changed file:
- client/src/main/resources/i18n/client_fr_FR.properties
Changes:
=====================================
client/src/main/resources/i18n/client_fr_FR.properties
=====================================
@@ -1092,8 +1092,8 @@ observe.common.SetLonglineLogbookDto.action.reset.homeId.tip=Réinitialiser l'id
observe.common.SetLonglineLogbookDto.basketLineLength=Longueur de la ligne par panier (m)
observe.common.SetLonglineLogbookDto.haulingTab=Virage
observe.common.SetLonglineLogbookDto.lengthBetweenBranchlines=Distance entre avançons (m)
-observe.common.SetLonglineLogbookDto.lightsticksTab=Cyalumnes
-observe.common.SetLonglineLogbookDto.lightsticksUsed=Utilisation des cyalumnes
+observe.common.SetLonglineLogbookDto.lightsticksTab=Cyalumes
+observe.common.SetLonglineLogbookDto.lightsticksUsed=Utilisation des Cyalumes
observe.common.SetLonglineLogbookDto.message.creating=L'opération de pêche est en cours de création.
observe.common.SetLonglineLogbookDto.message.updating=L'opération de pêche est en cours de modification.
observe.common.SetLonglineLogbookDto.monitored=Instrumentée
View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/4c51af42c264c2e1bfa060a84bc…
--
View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/4c51af42c264c2e1bfa060a84bc…
You're receiving this email because of your account on gitlab.com.
1
0