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

Commits:

23 changed files:

Changes:

  • client/src/main/java/fr/ird/observe/client/ui/content/data/longline/logbook/SetLonglineLogbookUI.jaxx
    ... ... @@ -326,13 +326,13 @@
    326 326
                           <JCheckBox id='lightsticksUsed' styleClass="i18n"/>
    
    327 327
                         </cell>
    
    328 328
                       </row>
    
    329
    -                  <!-- lightsticks per basket count -->
    
    329
    +                  <!-- total lightsticks count -->
    
    330 330
                       <row>
    
    331 331
                         <cell anchor='west'>
    
    332
    -                      <JLabel id='lightsticksPerBasketCountLabel'/>
    
    332
    +                      <JLabel id='totalLightsticksCountLabel'/>
    
    333 333
                         </cell>
    
    334 334
                         <cell fill='both' weightx="1" columns="3">
    
    335
    -                      <NumberEditor id='lightsticksPerBasketCount' constructorParams='this' styleClass="int6"/>
    
    335
    +                      <NumberEditor id='totalLightsticksCount' constructorParams='this' styleClass="int6"/>
    
    336 336
                         </cell>
    
    337 337
                       </row>
    
    338 338
                       <!-- lightsticks type -->
    

  • client/src/main/java/fr/ird/observe/client/ui/content/data/longline/logbook/SetLonglineLogbookUI.jcss
    ... ... @@ -196,9 +196,9 @@
    196 196
       selected:{BooleanUtils.isTrue(bean.getLightsticksUsed())};
    
    197 197
     }
    
    198 198
     
    
    199
    -#lightsticksPerBasketCount {
    
    200
    -  property:{SetLonglineLogbookDto.PROPERTY_LIGHTSTICKS_PER_BASKET_COUNT};
    
    201
    -  numberValue:{bean.getLightsticksPerBasketCount()};
    
    199
    +#totalLightsticksCount {
    
    200
    +  property:{SetLonglineLogbookDto.PROPERTY_TOTAL_LIGHTSTICKS_COUNT};
    
    201
    +  numberValue:{bean.getTotalLightsticksCount()};
    
    202 202
     }
    
    203 203
     
    
    204 204
     #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
    127 127
             if (BooleanUtils.isTrue(newValue)) {
    
    128 128
     
    
    129 129
                 // depredated
    
    130
    -            ui.getLightsticksPerBasketCount().setEnabled(true);
    
    130
    +            ui.getTotalLightsticksCount().setEnabled(true);
    
    131 131
                 ui.getLightsticksType().setEnabled(true);
    
    132 132
                 ui.getLightsticksColor().setEnabled(true);
    
    133 133
             } else {
    
    134 134
     
    
    135 135
                 // not depredated
    
    136
    -            ui.getLightsticksPerBasketCount().setEnabled(false);
    
    136
    +            ui.getTotalLightsticksCount().setEnabled(false);
    
    137 137
                 ui.getLightsticksType().setEnabled(false);
    
    138 138
                 ui.getLightsticksColor().setEnabled(false);
    
    139
    -            tableEditBean.setLightsticksPerBasketCount(null);
    
    139
    +            tableEditBean.setTotalLightsticksCount(null);
    
    140 140
                 tableEditBean.setLightsticksType(null);
    
    141 141
                 tableEditBean.setLightsticksColor(null);
    
    142 142
             }
    

  • dto/src/main/models/Observe-06-data-longline-logbook.model
    ... ... @@ -49,11 +49,11 @@ branchlinesPerBasketCount + {*:1} Integer
    49 49
     totalSectionsCount + {*:1} Integer
    
    50 50
     totalBasketsCount + {*:1} Integer
    
    51 51
     totalHooksCount + {*:1} Integer
    
    52
    +totalLightsticksCount + {*:1} Integer
    
    52 53
     weightedSnap + {*:1} Boolean
    
    53 54
     snapWeight + {*:1} Float
    
    54 55
     weightedSwivel + {*:1} Boolean
    
    55 56
     swivelWeight + {*:1} Float
    
    56
    -lightsticksPerBasketCount + {*:1} Integer
    
    57 57
     timeBetweenHooks + {*:1} Long
    
    58 58
     shooterUsed + {*:1} Boolean
    
    59 59
     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;
    10 10
      * it under the terms of the GNU General Public License as
    
    11 11
      * published by the Free Software Foundation, either version 3 of the
    
    12 12
      * License, or (at your option) any later version.
    
    13
    - * 
    
    13
    + *
    
    14 14
      * This program is distributed in the hope that it will be useful,
    
    15 15
      * but WITHOUT ANY WARRANTY; without even the implied warranty of
    
    16 16
      * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    
    17 17
      * GNU General Public License for more details.
    
    18
    - * 
    
    18
    + *
    
    19 19
      * You should have received a copy of the GNU General Public
    
    20 20
      * License along with this program.  If not, see
    
    21 21
      * <http://www.gnu.org/licenses/gpl-3.0.html>.
    
    ... ... @@ -74,7 +74,7 @@ public class SetLonglineLogbookEntityDtoBinder extends DataEntityDtoBinderSuppor
    74 74
             entity.setMonitored(dto.getMonitored());
    
    75 75
     
    
    76 76
             entity.setLightsticksUsed(dto.getLightsticksUsed());
    
    77
    -        entity.setLightsticksPerBasketCount(dto.getLightsticksPerBasketCount());
    
    77
    +        entity.setTotalLightsticksCount(dto.getTotalLightsticksCount());
    
    78 78
             entity.setLightsticksType(toEntity(dto.getLightsticksType()));
    
    79 79
             entity.setLightsticksColor(toEntity(dto.getLightsticksColor()));
    
    80 80
     
    
    ... ... @@ -126,7 +126,7 @@ public class SetLonglineLogbookEntityDtoBinder extends DataEntityDtoBinderSuppor
    126 126
             dto.setMonitored(entity.getMonitored());
    
    127 127
     
    
    128 128
             dto.setLightsticksUsed(entity.getLightsticksUsed());
    
    129
    -        dto.setLightsticksPerBasketCount(entity.getLightsticksPerBasketCount());
    
    129
    +        dto.setTotalLightsticksCount(entity.getTotalLightsticksCount());
    
    130 130
             dto.setLightsticksType(toReferentialReference(referentialLocale, entity.getLightsticksType()));
    
    131 131
             dto.setLightsticksColor(toReferentialReference(referentialLocale, entity.getLightsticksColor()));
    
    132 132
     
    

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

  • persistence/src/main/models/Observe-06-data-longline-logbook.model
    ... ... @@ -51,11 +51,11 @@ branchlinesPerBasketCount + {*:1} Integer
    51 51
     totalSectionsCount + {*:1} Integer
    
    52 52
     totalBasketsCount + {*:1} Integer
    
    53 53
     totalHooksCount + {*:1} Integer
    
    54
    +totalLightsticksCount + {*:1} Integer
    
    54 55
     weightedSnap + {*:1} Boolean
    
    55 56
     snapWeight + {*:1} Float | sqlType=numeric
    
    56 57
     weightedSwivel + {*:1} Boolean
    
    57 58
     swivelWeight + {*:1} Float | sqlType=numeric
    
    58
    -lightsticksPerBasketCount + {*:1} Integer
    
    59 59
     timeBetweenHooks + {*:1} Long
    
    60 60
     shooterUsed + {*:1} Boolean
    
    61 61
     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 @@
    19 19
     -- <http://www.gnu.org/licenses/gpl-3.0.html>.
    
    20 20
     -- #L%
    
    21 21
     ---
    
    22
    -INSERT INTO observe_longline.linetype (topiaid,
    
    23
    -                                       topiaversion,
    
    24
    -                                       topiacreatedate,
    
    25
    -                                       lastupdatedate,
    
    26
    -                                       status,
    
    27
    -                                       needComment,
    
    28
    -                                       code,
    
    29
    -                                       label1,
    
    30
    -                                       label2,
    
    31
    -                                       label3)
    
    32
    -values ('fr.ird.observe.entities.referentiel.longline.LineType#1239832686157#0.9',
    
    33
    -        0,
    
    34
    -        CURRENT_DATE,
    
    35
    -        CURRENT_TIMESTAMP,
    
    36
    -        1,
    
    37
    -        false,
    
    38
    -        'UNK',
    
    39
    -        'Unknown',
    
    40
    -        'Inconnu',
    
    41
    -        'Desconocido');
    
    42
    -UPDATE observe_common.LASTUPDATEDATE
    
    43
    -SET lastupdatedate = CURRENT_TIMESTAMP
    
    44
    -WHERE topiaId = 'fr.ird.observe.entities.LastUpdateDate#1236861982132#0.48';
    \ No newline at end of file
    22
    +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');
    
    23
    +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
    1
    +---
    
    2
    +-- #%L
    
    3
    +-- ObServe :: Persistence
    
    4
    +-- %%
    
    5
    +-- Copyright (C) 2008 - 2018 IRD, Code Lutin, Ultreia.io
    
    6
    +-- %%
    
    7
    +-- This program is free software: you can redistribute it and/or modify
    
    8
    +-- it under the terms of the GNU General Public License as
    
    9
    +-- published by the Free Software Foundation, either version 3 of the
    
    10
    +-- License, or (at your option) any later version.
    
    11
    +--
    
    12
    +-- This program is distributed in the hope that it will be useful,
    
    13
    +-- but WITHOUT ANY WARRANTY; without even the implied warranty of
    
    14
    +-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    
    15
    +-- GNU General Public License for more details.
    
    16
    +--
    
    17
    +-- You should have received a copy of the GNU General Public
    
    18
    +-- License along with this program.  If not, see
    
    19
    +-- <http://www.gnu.org/licenses/gpl-3.0.html>.
    
    20
    +-- #L%
    
    21
    +---
    
    22
    +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
    1
    +---
    
    2
    +-- #%L
    
    3
    +-- ObServe :: Persistence
    
    4
    +-- %%
    
    5
    +-- Copyright (C) 2008 - 2018 IRD, Code Lutin, Ultreia.io
    
    6
    +-- %%
    
    7
    +-- This program is free software: you can redistribute it and/or modify
    
    8
    +-- it under the terms of the GNU General Public License as
    
    9
    +-- published by the Free Software Foundation, either version 3 of the
    
    10
    +-- License, or (at your option) any later version.
    
    11
    +--
    
    12
    +-- This program is distributed in the hope that it will be useful,
    
    13
    +-- but WITHOUT ANY WARRANTY; without even the implied warranty of
    
    14
    +-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    
    15
    +-- GNU General Public License for more details.
    
    16
    +--
    
    17
    +-- You should have received a copy of the GNU General Public
    
    18
    +-- License along with this program.  If not, see
    
    19
    +-- <http://www.gnu.org/licenses/gpl-3.0.html>.
    
    20
    +-- #L%
    
    21
    +---
    
    22
    +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
    76 76
             ActivityLonglineLogbook activityLongline = ACTIVITY_LONGLINE_LOGBOOK_SPI.loadEntity(getTopiaPersistenceContext(), activityLonglineId);
    
    77 77
             SetLonglineLogbook preCreated = SET_LONGLINE_LOGBOOK_SPI.newEntity();
    
    78 78
     
    
    79
    -        // on utilise la date - heure de l'activité pour initialiser les horodatages
    
    80
    -        // de l'opération de pêche
    
    79
    +        // on utilise la date - heure de l'activité pour initialiser les horodatages de l'opération de pêche
    
    81 80
             Date timeStamp = activityLongline.getTimeStamp();
    
    82 81
             preCreated.setSettingStartTimeStamp(timeStamp);
    
    83 82
             preCreated.setSettingEndTimeStamp(DateUtils.addHours(timeStamp, 1));
    
    ... ... @@ -87,6 +86,9 @@ public class SetLonglineLogbookServiceLocal extends ObserveServiceLocal implemen
    87 86
             // on reporte la position de l'activité pour la position de début de filage
    
    88 87
             preCreated.setSettingStartLatitude(activityLongline.getLatitude());
    
    89 88
             preCreated.setSettingStartLongitude(activityLongline.getLongitude());
    
    89
    +
    
    90
    +        // by default 1 section count
    
    91
    +        preCreated.setTotalSectionsCount(1);
    
    90 92
             Form<SetLonglineLogbookDto> form = SET_LONGLINE_LOGBOOK_SPI.dataEntityToForm(preCreated, getReferentialLocale());
    
    91 93
             form.getObject().setOtherSets(getOtherSetLonglineDtoSet(activityLongline, preCreated));
    
    92 94
             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
    85 85
     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));
    
    86 86
     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));
    
    87 87
     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));
    
    88
    -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));
    
    88
    +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));
    
    89 89
     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));
    
    90 90
     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));
    
    91 91
     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
    85 85
     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));
    
    86 86
     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));
    
    87 87
     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));
    
    88
    -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));
    
    88
    +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));
    
    89 89
     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));
    
    90 90
     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));
    
    91 91
     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 @@
    42 42
     
    
    43 43
       </field>
    
    44 44
     
    
    45
    -  <field name="haulingDirectionSameAsSetting">
    
    46
    -
    
    47
    -    <!-- haulingDirectionSameAsSetting non renseigne -->
    
    48
    -    <field-validator type="required" short-circuit="true">
    
    49
    -      <message>observe.validation.setLongline.required.haulingDirectionSameAsSetting</message>
    
    50
    -    </field-validator>
    
    51
    -
    
    52
    -  </field>
    
    53
    -
    
    54 45
       <field name="settingStartTimeStamp">
    
    55 46
     
    
    56 47
         <!-- settingStartTimeStamp non renseigne -->
    
    ... ... @@ -454,11 +445,6 @@
    454 445
     
    
    455 446
       <field name="totalSectionsCount">
    
    456 447
     
    
    457
    -    <!-- totalSectionsCount obligatoire -->
    
    458
    -    <field-validator type="required" short-circuit="true">
    
    459
    -      <message>observe.validation.setLongline.required.totalSectionsCount</message>
    
    460
    -    </field-validator>
    
    461
    -
    
    462 448
         <!-- 0 <= totalSectionsCount <= 100 -->
    
    463 449
         <field-validator type="fieldexpressionwithparams" short-circuit="true">
    
    464 450
           <param name="intParams">min:0|max:100</param>
    
    ... ... @@ -475,16 +461,11 @@
    475 461
     
    
    476 462
       <field name="basketsPerSectionCount">
    
    477 463
     
    
    478
    -    <!-- basketsPerSectionCount obligatoire -->
    
    479
    -    <field-validator type="required" short-circuit="true">
    
    480
    -      <message>observe.validation.setLongline.required.basketsPerSectionCount</message>
    
    481
    -    </field-validator>
    
    482
    -
    
    483 464
         <!-- 0 <= basketsPerSectionCount <= 100 -->
    
    484 465
         <field-validator type="fieldexpressionwithparams" short-circuit="true">
    
    485 466
           <param name="intParams">min:0|max:100</param>
    
    486 467
           <param name="expression"><![CDATA[
    
    487
    -                (ints.min <= basketsPerSectionCount && basketsPerSectionCount <= ints.max)
    
    468
    +        basketsPerSectionCount == null || (ints.min <= basketsPerSectionCount && basketsPerSectionCount <= ints.max)
    
    488 469
                  ]]>
    
    489 470
           </param>
    
    490 471
           <message>
    
    ... ... @@ -496,16 +477,11 @@
    496 477
     
    
    497 478
       <field name="branchlinesPerBasketCount">
    
    498 479
     
    
    499
    -    <!-- branchlinesPerBasketCount obligatoire -->
    
    500
    -    <field-validator type="required" short-circuit="true">
    
    501
    -      <message>observe.validation.setLongline.required.branchlinesPerBasketCount</message>
    
    502
    -    </field-validator>
    
    503
    -
    
    504 480
         <!-- 0 <= branchlinesPerBasketCount <= 50 -->
    
    505 481
         <field-validator type="fieldexpressionwithparams" short-circuit="true">
    
    506 482
           <param name="intParams">min:0|max:50</param>
    
    507 483
           <param name="expression"><![CDATA[
    
    508
    -                (ints.min <= branchlinesPerBasketCount && branchlinesPerBasketCount <= ints.max)
    
    484
    +        branchlinesPerBasketCount == null || (ints.min <= branchlinesPerBasketCount && branchlinesPerBasketCount <= ints.max)
    
    509 485
                  ]]>
    
    510 486
           </param>
    
    511 487
           <message>
    
    ... ... @@ -547,17 +523,17 @@
    547 523
     
    
    548 524
       </field>
    
    549 525
     
    
    550
    -  <field name="lightsticksPerBasketCount">
    
    526
    +  <field name="totalLightsticksCount">
    
    551 527
     
    
    552
    -    <!-- 0 <= lightsticksPerBasketCount <= 50 -->
    
    528
    +    <!-- 0 <= totalLightsticksCount <= 50 -->
    
    553 529
         <field-validator type="fieldexpressionwithparams" short-circuit="true">
    
    554 530
           <param name="intParams">min:0|max:50</param>
    
    555 531
           <param name="expression"><![CDATA[
    
    556
    -                lightsticksPerBasketCount == null || (ints.min <= lightsticksPerBasketCount && lightsticksPerBasketCount <= ints.max)
    
    532
    +                totalLightsticksCount == null || (ints.min <= totalLightsticksCount && totalLightsticksCount <= ints.max)
    
    557 533
                  ]]>
    
    558 534
           </param>
    
    559 535
           <message>
    
    560
    -        observe.validation.setLongline.bound.lightsticksPerBasketCount##${ints.min}##${ints.max}
    
    536
    +        observe.validation.setLongline.bound.totalLightsticksCount##${ints.min}##${ints.max}
    
    561 537
           </message>
    
    562 538
         </field-validator>
    
    563 539
     
    

  • validation/src/main/resources/fr/ird/observe/dto/data/longline/SetLonglineLogbookDto-create-warning-validation.xml
    ... ... @@ -140,4 +140,31 @@
    140 140
     
    
    141 141
       </field>
    
    142 142
     
    
    143
    +  <field name="totalSectionsCount">
    
    144
    +
    
    145
    +    <!-- totalSectionsCount obligatoire -->
    
    146
    +    <field-validator type="required" short-circuit="true">
    
    147
    +      <message>observe.validation.setLongline.required.totalSectionsCount</message>
    
    148
    +    </field-validator>
    
    149
    +
    
    150
    +  </field>
    
    151
    +
    
    152
    +  <field name="basketsPerSectionCount">
    
    153
    +
    
    154
    +    <!-- basketsPerSectionCount obligatoire -->
    
    155
    +    <field-validator type="required" short-circuit="true">
    
    156
    +      <message>observe.validation.setLongline.required.basketsPerSectionCount</message>
    
    157
    +    </field-validator>
    
    158
    +
    
    159
    +  </field>
    
    160
    +
    
    161
    +  <field name="branchlinesPerBasketCount">
    
    162
    +
    
    163
    +    <!-- branchlinesPerBasketCount obligatoire -->
    
    164
    +    <field-validator type="required" short-circuit="true">
    
    165
    +      <message>observe.validation.setLongline.required.branchlinesPerBasketCount</message>
    
    166
    +    </field-validator>
    
    167
    +
    
    168
    +  </field>
    
    169
    +
    
    143 170
     </validators>

  • validation/src/main/resources/fr/ird/observe/dto/data/longline/SetLonglineLogbookDto-update-error-validation.xml
    ... ... @@ -42,15 +42,6 @@
    42 42
     
    
    43 43
       </field>
    
    44 44
     
    
    45
    -  <field name="haulingDirectionSameAsSetting">
    
    46
    -
    
    47
    -    <!-- haulingDirectionSameAsSetting non renseigne -->
    
    48
    -    <field-validator type="required" short-circuit="true">
    
    49
    -      <message>observe.validation.setLongline.required.haulingDirectionSameAsSetting</message>
    
    50
    -    </field-validator>
    
    51
    -
    
    52
    -  </field>
    
    53
    -
    
    54 45
       <field name="settingStartTimeStamp">
    
    55 46
     
    
    56 47
         <!-- settingStartTimeStamp non renseigne -->
    
    ... ... @@ -438,11 +429,6 @@
    438 429
     
    
    439 430
       <field name="totalSectionsCount">
    
    440 431
     
    
    441
    -    <!-- totalSectionsCount obligatoire -->
    
    442
    -    <field-validator type="required" short-circuit="true">
    
    443
    -      <message>observe.validation.setLongline.required.totalSectionsCount</message>
    
    444
    -    </field-validator>
    
    445
    -
    
    446 432
         <!-- 0 <= totalSectionsCount <= 100 -->
    
    447 433
         <field-validator type="fieldexpressionwithparams" short-circuit="true">
    
    448 434
           <param name="intParams">min:0|max:100</param>
    
    ... ... @@ -459,16 +445,11 @@
    459 445
     
    
    460 446
       <field name="basketsPerSectionCount">
    
    461 447
     
    
    462
    -    <!-- basketsPerSectionCount obligatoire -->
    
    463
    -    <field-validator type="required" short-circuit="true">
    
    464
    -      <message>observe.validation.setLongline.required.basketsPerSectionCount</message>
    
    465
    -    </field-validator>
    
    466
    -
    
    467 448
         <!-- 0 <= basketsPerSectionCount <= 100 -->
    
    468 449
         <field-validator type="fieldexpressionwithparams" short-circuit="true">
    
    469 450
           <param name="intParams">min:0|max:100</param>
    
    470 451
           <param name="expression"><![CDATA[
    
    471
    -                (ints.min <= basketsPerSectionCount && basketsPerSectionCount <= ints.max)
    
    452
    +        basketsPerSectionCount == null || (ints.min <= basketsPerSectionCount && basketsPerSectionCount <= ints.max)
    
    472 453
                  ]]>
    
    473 454
           </param>
    
    474 455
           <message>
    
    ... ... @@ -480,16 +461,11 @@
    480 461
     
    
    481 462
       <field name="branchlinesPerBasketCount">
    
    482 463
     
    
    483
    -    <!-- branchlinesPerBasketCount obligatoire -->
    
    484
    -    <field-validator type="required" short-circuit="true">
    
    485
    -      <message>observe.validation.setLongline.required.branchlinesPerBasketCount</message>
    
    486
    -    </field-validator>
    
    487
    -
    
    488 464
         <!-- 0 <= branchlinesPerBasketCount <= 50 -->
    
    489 465
         <field-validator type="fieldexpressionwithparams" short-circuit="true">
    
    490 466
           <param name="intParams">min:0|max:50</param>
    
    491 467
           <param name="expression"><![CDATA[
    
    492
    -                (ints.min <= branchlinesPerBasketCount && branchlinesPerBasketCount <= ints.max)
    
    468
    +        branchlinesPerBasketCount == null || (ints.min <= branchlinesPerBasketCount && branchlinesPerBasketCount <= ints.max)
    
    493 469
                  ]]>
    
    494 470
           </param>
    
    495 471
           <message>
    
    ... ... @@ -531,17 +507,17 @@
    531 507
     
    
    532 508
       </field>
    
    533 509
     
    
    534
    -  <field name="lightsticksPerBasketCount">
    
    510
    +  <field name="totalLightsticksCount">
    
    535 511
     
    
    536
    -    <!-- 0 <= lightsticksPerBasketCount <= 50 -->
    
    512
    +    <!-- 0 <= totalLightsticksCount <= 50 -->
    
    537 513
         <field-validator type="fieldexpressionwithparams" short-circuit="true">
    
    538 514
           <param name="intParams">min:0|max:50</param>
    
    539 515
           <param name="expression"><![CDATA[
    
    540
    -                lightsticksPerBasketCount == null || (ints.min <= lightsticksPerBasketCount && lightsticksPerBasketCount <= ints.max)
    
    516
    +                totalLightsticksCount == null || (ints.min <= totalLightsticksCount && totalLightsticksCount <= ints.max)
    
    541 517
                  ]]>
    
    542 518
           </param>
    
    543 519
           <message>
    
    544
    -        observe.validation.setLongline.bound.lightsticksPerBasketCount##${ints.min}##${ints.max}
    
    520
    +        observe.validation.setLongline.bound.totalLightsticksCount##${ints.min}##${ints.max}
    
    545 521
           </message>
    
    546 522
         </field-validator>
    
    547 523
     
    

  • validation/src/main/resources/fr/ird/observe/dto/data/longline/SetLonglineLogbookDto-update-warning-validation.xml
    ... ... @@ -140,4 +140,31 @@
    140 140
     
    
    141 141
       </field>
    
    142 142
     
    
    143
    +  <field name="totalSectionsCount">
    
    144
    +
    
    145
    +    <!-- totalSectionsCount obligatoire -->
    
    146
    +    <field-validator type="required" short-circuit="true">
    
    147
    +      <message>observe.validation.setLongline.required.totalSectionsCount</message>
    
    148
    +    </field-validator>
    
    149
    +
    
    150
    +  </field>
    
    151
    +
    
    152
    +  <field name="basketsPerSectionCount">
    
    153
    +
    
    154
    +    <!-- basketsPerSectionCount obligatoire -->
    
    155
    +    <field-validator type="required" short-circuit="true">
    
    156
    +      <message>observe.validation.setLongline.required.basketsPerSectionCount</message>
    
    157
    +    </field-validator>
    
    158
    +
    
    159
    +  </field>
    
    160
    +
    
    161
    +  <field name="branchlinesPerBasketCount">
    
    162
    +
    
    163
    +    <!-- branchlinesPerBasketCount obligatoire -->
    
    164
    +    <field-validator type="required" short-circuit="true">
    
    165
    +      <message>observe.validation.setLongline.required.branchlinesPerBasketCount</message>
    
    166
    +    </field-validator>
    
    167
    +
    
    168
    +  </field>
    
    169
    +
    
    143 170
     </validators>

  • validation/src/main/resources/i18n/validation_en_GB.properties
    ... ... @@ -254,7 +254,6 @@ observe.common.SetLonglineLogbookDto.haulingStartQuadrant=Hauling start quadrant
    254 254
     observe.common.SetLonglineLogbookDto.haulingStartTimeStamp=Start timestamp
    
    255 255
     observe.common.SetLonglineLogbookDto.homeId=Home id
    
    256 256
     observe.common.SetLonglineLogbookDto.lightsticksColor=Lightsticks color
    
    257
    -observe.common.SetLonglineLogbookDto.lightsticksPerBasketCount=lightsticks per basket count
    
    258 257
     observe.common.SetLonglineLogbookDto.lightsticksType=Lightsticks type
    
    259 258
     observe.common.SetLonglineLogbookDto.lineType=Line type
    
    260 259
     observe.common.SetLonglineLogbookDto.maxDepthTargeted=Max depth targeted (m)
    
    ... ... @@ -275,6 +274,7 @@ observe.common.SetLonglineLogbookDto.swivelWeight=swivel weight (kg)
    275 274
     observe.common.SetLonglineLogbookDto.timeBetweenHooks=time between hooks
    
    276 275
     observe.common.SetLonglineLogbookDto.totalBasketsCount=Total baskets count
    
    277 276
     observe.common.SetLonglineLogbookDto.totalHooksCount=Total hooks count
    
    277
    +observe.common.SetLonglineLogbookDto.totalLightsticksCount=Total number of lightsticks
    
    278 278
     observe.common.SetLonglineLogbookDto.totalSectionsCount=Total sections count
    
    279 279
     observe.common.SetLonglineLogbookGlobalCompositionDto.baitsComposition=Baits composition
    
    280 280
     observe.common.SetLonglineLogbookGlobalCompositionDto.baitsCompositionProportionSum=Baits composition proportion sum
    
    ... ... @@ -766,6 +766,7 @@ observe.validation.setLongline.bound.swivelWeight=Swivel weight must be bound be
    766 766
     observe.validation.setLongline.bound.timeBetweenHooks=Time between hooks must be bound between %s and %s.
    
    767 767
     observe.validation.setLongline.bound.totalBasketsCount=Total baskets count must be bound between %s and %s.
    
    768 768
     observe.validation.setLongline.bound.totalHooksCount=Total hooks count must be bound between %s and %s.
    
    769
    +observe.validation.setLongline.bound.totalLightsticksCount=Total number of lightsticks must be bound between %s and %s.
    
    769 770
     observe.validation.setLongline.bound.totalSectionsCount=must be bound between %s and %s.
    
    770 771
     observe.validation.setLongline.branchlinesComposition.uniqueKey=Tuple (topType/type/size) must be unique.
    
    771 772
     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
    256 256
     observe.common.SetLonglineLogbookDto.haulingStartTimeStamp=Timestamp del inicio
    
    257 257
     observe.common.SetLonglineLogbookDto.homeId=Id de negocio
    
    258 258
     observe.common.SetLonglineLogbookDto.lightsticksColor=Color de barrita de luz
    
    259
    -observe.common.SetLonglineLogbookDto.lightsticksPerBasketCount=Número de barrita de luz por cesta
    
    260 259
     observe.common.SetLonglineLogbookDto.lightsticksType=Tipo de barrita de luz
    
    261 260
     observe.common.SetLonglineLogbookDto.lineType=Tipo de línea
    
    262 261
     observe.common.SetLonglineLogbookDto.maxDepthTargeted=Profundidad máxima deseada
    
    ... ... @@ -277,6 +276,7 @@ observe.common.SetLonglineLogbookDto.swivelWeight=Peso de el destorcedor (kg)
    277 276
     observe.common.SetLonglineLogbookDto.timeBetweenHooks=Temps entre anzuelos (s)
    
    278 277
     observe.common.SetLonglineLogbookDto.totalBasketsCount=Número total de baskets
    
    279 278
     observe.common.SetLonglineLogbookDto.totalHooksCount=Número total d'arponcillos
    
    279
    +observe.common.SetLonglineLogbookDto.totalLightsticksCount=Número total de barras de luz
    
    280 280
     observe.common.SetLonglineLogbookDto.totalSectionsCount=Número total de secciones
    
    281 281
     observe.common.SetLonglineLogbookGlobalCompositionDto.baitsComposition=Cebo
    
    282 282
     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
    768 768
     observe.validation.setLongline.bound.timeBetweenHooks=El tiempo entre avanzuelos debe estar comprendido entre %1$s y %2$s.
    
    769 769
     observe.validation.setLongline.bound.totalBasketsCount=El número total de cestas debe estar comprendido entre %1$s y %2$s.
    
    770 770
     observe.validation.setLongline.bound.totalHooksCount=El número total de avanzuelos debe estar comprendido entre %1$s y %2$s.
    
    771
    +observe.validation.setLongline.bound.totalLightsticksCount=El total de barras de luz debe estar comprendido entre %1$s y %2$s.
    
    771 772
     observe.validation.setLongline.bound.totalSectionsCount=El número total de secciones debe estar comprendido entre %1$s y %2$s.
    
    772 773
     observe.validation.setLongline.branchlinesComposition.uniqueKey=La tupla (tipo alto/tipo bajo/tamaño) debe ser única, la tupa ya está utilizada.
    
    773 774
     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
    254 254
     observe.common.SetLonglineLogbookDto.haulingStartTimeStamp=Horodatage début
    
    255 255
     observe.common.SetLonglineLogbookDto.homeId=Id métier
    
    256 256
     observe.common.SetLonglineLogbookDto.lightsticksColor=Couleur de cyalumes
    
    257
    -observe.common.SetLonglineLogbookDto.lightsticksPerBasketCount=Nombre de cyalumes par panier
    
    258 257
     observe.common.SetLonglineLogbookDto.lightsticksType=Type de cyalumes
    
    259 258
     observe.common.SetLonglineLogbookDto.lineType=Type de ligne
    
    260 259
     observe.common.SetLonglineLogbookDto.maxDepthTargeted=Profondeur maximum ciblée
    
    ... ... @@ -275,6 +274,7 @@ observe.common.SetLonglineLogbookDto.swivelWeight=Poids de l'émerillon (kg)
    275 274
     observe.common.SetLonglineLogbookDto.timeBetweenHooks=Temps entre hameçons (s)
    
    276 275
     observe.common.SetLonglineLogbookDto.totalBasketsCount=Nombre total de paniers
    
    277 276
     observe.common.SetLonglineLogbookDto.totalHooksCount=Nombre total d'avançons
    
    277
    +observe.common.SetLonglineLogbookDto.totalLightsticksCount=Nombre total de cyalumes
    
    278 278
     observe.common.SetLonglineLogbookDto.totalSectionsCount=Nombre total de sections
    
    279 279
     observe.common.SetLonglineLogbookGlobalCompositionDto.baitsComposition=Appâts
    
    280 280
     observe.common.SetLonglineLogbookGlobalCompositionDto.baitsCompositionProportionSum=Somme des proportions d'appâts (%)
    
    ... ... @@ -766,6 +766,7 @@ observe.validation.setLongline.bound.swivelWeight=Le poids émerillon doit être
    766 766
     observe.validation.setLongline.bound.timeBetweenHooks=Le temps entre hameçons doit être compris entre %1$s et %2$s.
    
    767 767
     observe.validation.setLongline.bound.totalBasketsCount=Le nombre total de paniers doit être compris entre %1$s et %2$s.
    
    768 768
     observe.validation.setLongline.bound.totalHooksCount=Le nombre total d'hameçons doit être compris entre %1$s et %2$s.
    
    769
    +observe.validation.setLongline.bound.totalLightsticksCount=Le nombre total de cyalumes doit être compris entre %1$s et %2$s.
    
    769 770
     observe.validation.setLongline.bound.totalSectionsCount=Le nombre total de sections doit être compris entre %1$s et %2$s.
    
    770 771
     observe.validation.setLongline.branchlinesComposition.uniqueKey=Le tuple (type haut/type bas/taille) doit être unique
    
    771 772
     observe.validation.setLongline.desactivated.lightsticksColor=La couleur de cyalume sélectionné est désactivé.