Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe
Commits:
-
6c632ae1
by Tony Chemit at 2020-11-01T15:39:24+01:00
13 changed files:
- client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/logbook/SetUI.jaxx
- models/dto/src/main/models/Observe-31-data-ll-logbook.model
- models/persistence/src/main/models/Observe-31-data-ll-logbook.model
- models/persistence/src/main/resources/db/migration/8.0/80_ll_logbook_create-common.sql
- services/i18n/src/main/i18n/translations/services_en_GB.properties
- services/i18n/src/main/i18n/translations/services_es_ES.properties
- services/i18n/src/main/i18n/translations/services_fr_FR.properties
- services/validation/src/main/i18n/getters/validation-fields.getter
- tests/test/src/main/resources/db/8.0/dataForTestLongline.sql.gz
- tests/test/src/main/resources/db/8.0/dataForTestSeine.sql.gz
- tests/test/src/main/resources/db/8.0/empty_h2.sql.gz
- tests/test/src/main/resources/db/8.0/empty_pg.sql.gz
- tests/test/src/main/resources/db/8.0/referentiel.sql.gz
Changes:
| ... | ... | @@ -316,6 +316,15 @@ |
| 316 | 316 |
<BeanCheckBox id='lightsticksUsed'/>
|
| 317 | 317 |
</cell>
|
| 318 | 318 |
</row>
|
| 319 |
+ <!-- lightsticksPerBasketCount -->
|
|
| 320 |
+ <row>
|
|
| 321 |
+ <cell anchor='west'>
|
|
| 322 |
+ <JLabel id='lightsticksPerBasketCountLabel'/>
|
|
| 323 |
+ </cell>
|
|
| 324 |
+ <cell fill='both' weightx="1" columns="3">
|
|
| 325 |
+ <NumberEditor id='lightsticksPerBasketCount' constructorParams='this' styleClass="int6"/>
|
|
| 326 |
+ </cell>
|
|
| 327 |
+ </row>
|
|
| 319 | 328 |
<!-- total lightsticks count -->
|
| 320 | 329 |
<row>
|
| 321 | 330 |
<cell anchor='west'>
|
| ... | ... | @@ -51,6 +51,7 @@ branchlinesPerBasketCount + {*:1} Integer | mayNotNull positiveNumber |
| 51 | 51 |
totalSectionsCount + {*:1} Integer | notNull positiveNumber
|
| 52 | 52 |
totalBasketsCount + {*:1} Integer | positiveNumber
|
| 53 | 53 |
totalHooksCount + {*:1} Integer | positiveNumber
|
| 54 |
+lightsticksPerBasketCount + {*:1} Integer | mayNotNull positiveNumber
|
|
| 54 | 55 |
totalLightsticksCount + {*:1} Integer | positiveNumber
|
| 55 | 56 |
weightedSnap + {*:1} Boolean
|
| 56 | 57 |
snapWeight + {*:1} Float | positiveNumber
|
| ... | ... | @@ -30,6 +30,7 @@ branchlinesPerBasketCount + {*:1} Integer |
| 30 | 30 |
totalSectionsCount + {*:1} Integer
|
| 31 | 31 |
totalBasketsCount + {*:1} Integer
|
| 32 | 32 |
totalHooksCount + {*:1} Integer
|
| 33 |
+lightsticksPerBasketCount + {*:1} Integer
|
|
| 33 | 34 |
totalLightsticksCount + {*:1} Integer
|
| 34 | 35 |
weightedSnap + {*:1} Boolean
|
| 35 | 36 |
snapWeight + {*:1} Float | sqlType=numeric
|
| ... | ... | @@ -22,7 +22,7 @@ |
| 22 | 22 |
|
| 23 | 23 |
CREATE SCHEMA ll_logbook;
|
| 24 | 24 |
|
| 25 |
-CREATE TABLE ll_logbook.set(topiaId VARCHAR(255) NOT NULL, topiaVersion BIGINT NOT NULL, topiaCreateDate TIMESTAMP NOT NULL, lastUpdateDate TIMESTAMP NOT NULL, comment VARCHAR(1025), number INTEGER, basketspersectioncount INTEGER, branchlinesperbasketcount INTEGER, totalsectionscount INTEGER, totalbasketscount INTEGER, totalhookscount INTEGER, weightedsnap BOOLEAN, snapweight NUMERIC, weightedswivel BOOLEAN, swivelweight NUMERIC, totallightstickscount 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, lightsticksused BOOLEAN, totallinelength INTEGER, basketlinelength INTEGER, lengthbetweenbranchlines INTEGER, settingshape VARCHAR(255), linetype VARCHAR(255), lightstickstype VARCHAR(255), lightstickscolor VARCHAR(255), homeId VARCHAR(255), CONSTRAINT pk_ll_logbook_set primary key(topiaId));
|
|
| 25 |
+CREATE TABLE ll_logbook.set(topiaId VARCHAR(255) NOT NULL, topiaVersion BIGINT NOT NULL, topiaCreateDate TIMESTAMP NOT NULL, lastUpdateDate TIMESTAMP NOT NULL, comment VARCHAR(1025), number INTEGER, basketspersectioncount INTEGER, branchlinesperbasketcount INTEGER, totalsectionscount INTEGER, totalbasketscount INTEGER, totalhookscount INTEGER, weightedsnap BOOLEAN, snapweight NUMERIC, weightedswivel BOOLEAN, swivelweight NUMERIC, lightsticksPerBasketCount INTEGER, totallightstickscount 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, lightsticksused BOOLEAN, totallinelength INTEGER, basketlinelength INTEGER, lengthbetweenbranchlines INTEGER, settingshape VARCHAR(255), linetype VARCHAR(255), lightstickstype VARCHAR(255), lightstickscolor VARCHAR(255), homeId VARCHAR(255), CONSTRAINT pk_ll_logbook_set primary key(topiaId));
|
|
| 26 | 26 |
CREATE TABLE ll_logbook.baitscomposition(topiaId VARCHAR(255) NOT NULL, topiaVersion BIGINT NOT NULL, topiaCreateDate TIMESTAMP NOT NULL, lastUpdateDate TIMESTAMP NOT NULL, proportion INTEGER, individualsize INTEGER, individualweight NUMERIC, baitsettingstatus VARCHAR(255), baittype VARCHAR(255), set VARCHAR(255), homeId VARCHAR(255), CONSTRAINT pk_ll_logbook_baitscomposition primary key(topiaId));
|
| 27 | 27 |
CREATE TABLE ll_logbook.branchlinescomposition(topiaId VARCHAR(255) NOT NULL, topiaVersion BIGINT NOT NULL, topiaCreateDate TIMESTAMP NOT NULL, lastUpdateDate TIMESTAMP NOT NULL, length NUMERIC, proportion INTEGER, tracelinelength NUMERIC, toptype VARCHAR(255), tracelinetype VARCHAR(255), set VARCHAR(255), homeId VARCHAR(255), CONSTRAINT pk_ll_logbook_branchlinescomposition primary key(topiaId));
|
| 28 | 28 |
CREATE TABLE ll_logbook.catch(topiaId VARCHAR(255) NOT NULL, topiaVersion BIGINT NOT NULL, topiaCreateDate TIMESTAMP NOT NULL, lastUpdateDate TIMESTAMP NOT NULL, comment VARCHAR(1025), count INTEGER, totalweight NUMERIC, hookwhendiscarded BOOLEAN, depredated BOOLEAN, beatdiameter NUMERIC, countdepredated INTEGER, depredatedproportion INTEGER, photoreferences VARCHAR(255), number INTEGER, acquisitionmode INTEGER, tagnumber VARCHAR(255), onboardprocessing VARCHAR(255), catchfate VARCHAR(255), discardhealthStatus VARCHAR(255), speciescatch VARCHAR(255), catchhealthStatus VARCHAR(255), weightmeasuremethod VARCHAR(255), set VARCHAR(255), set_idx INTEGER, homeId VARCHAR(255), CONSTRAINT pk_ll_logbook_catch primary key(topiaId));
|
| 1 |
+observe.data.ll.logbook.Set.lightsticksPerBasketCount=Lightsticks per basket count
|
|
| 1 | 2 |
boolean.false=No
|
| 2 | 3 |
boolean.true=Yes
|
| 3 | 4 |
observe.Id.comment=Comment
|
| 1 |
+observe.data.ll.logbook.Set.lightsticksPerBasketCount=Número de barras de luz por cesta
|
|
| 1 | 2 |
boolean.false=No
|
| 2 | 3 |
boolean.true=Si
|
| 3 | 4 |
observe.Id.comment=Commentario
|
| ... | ... | @@ -10,6 +10,7 @@ observe.Id.longitude=Longitude |
| 10 | 10 |
observe.Id.ocean=Ocean
|
| 11 | 11 |
observe.Id.quadrant=Quadrant
|
| 12 | 12 |
observe.Id.sex=Sexe
|
| 13 |
+observe.data.ll.logbook.Set.lightsticksPerBasketCount=Nombre de cyalumes par panier
|
|
| 13 | 14 |
observe.Id.sizeMeasureType=Type de mensuration
|
| 14 | 15 |
observe.Id.validation.comment.needed.for.multiple=Un commentaire est requis pour l'un des référentiels %s sélectionné.
|
| 15 | 16 |
observe.Id.validation.comment.needed.for.single=Un commentaire est requis pour le référentiel %s sélectionné.
|
| ... | ... | @@ -106,6 +106,7 @@ observe.data.ll.logbook.Set.haulingStartQuadrant |
| 106 | 106 |
observe.data.ll.logbook.Set.haulingStartTimeStamp
|
| 107 | 107 |
observe.data.ll.logbook.Set.lengthBetweenBranchlines
|
| 108 | 108 |
observe.data.ll.logbook.Set.lightsticksColor
|
| 109 |
+observe.data.ll.logbook.Set.lightsticksPerBasketCount
|
|
| 109 | 110 |
observe.data.ll.logbook.Set.lightsticksType
|
| 110 | 111 |
observe.data.ll.logbook.Set.lineType
|
| 111 | 112 |
observe.data.ll.logbook.Set.maxDepthTargeted
|
No preview for this file type
No preview for this file type
No preview for this file type
No preview for this file type
No preview for this file type