Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 6c632ae1 by Tony Chemit at 2020-11-01T15:39:24+01:00 Manque le champ lightsticksperbasket - Closes #1626 - - - - - 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: ===================================== client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/logbook/SetUI.jaxx ===================================== @@ -316,6 +316,15 @@ <BeanCheckBox id='lightsticksUsed'/> </cell> </row> + <!-- lightsticksPerBasketCount --> + <row> + <cell anchor='west'> + <JLabel id='lightsticksPerBasketCountLabel'/> + </cell> + <cell fill='both' weightx="1" columns="3"> + <NumberEditor id='lightsticksPerBasketCount' constructorParams='this' styleClass="int6"/> + </cell> + </row> <!-- total lightsticks count --> <row> <cell anchor='west'> ===================================== models/dto/src/main/models/Observe-31-data-ll-logbook.model ===================================== @@ -51,6 +51,7 @@ branchlinesPerBasketCount + {*:1} Integer | mayNotNull positiveNumber totalSectionsCount + {*:1} Integer | notNull positiveNumber totalBasketsCount + {*:1} Integer | positiveNumber totalHooksCount + {*:1} Integer | positiveNumber +lightsticksPerBasketCount + {*:1} Integer | mayNotNull positiveNumber totalLightsticksCount + {*:1} Integer | positiveNumber weightedSnap + {*:1} Boolean snapWeight + {*:1} Float | positiveNumber ===================================== models/persistence/src/main/models/Observe-31-data-ll-logbook.model ===================================== @@ -30,6 +30,7 @@ branchlinesPerBasketCount + {*:1} Integer totalSectionsCount + {*:1} Integer totalBasketsCount + {*:1} Integer totalHooksCount + {*:1} Integer +lightsticksPerBasketCount + {*:1} Integer totalLightsticksCount + {*:1} Integer weightedSnap + {*:1} Boolean snapWeight + {*:1} Float | sqlType=numeric ===================================== models/persistence/src/main/resources/db/migration/8.0/80_ll_logbook_create-common.sql ===================================== @@ -22,7 +22,7 @@ CREATE SCHEMA ll_logbook; -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)); +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)); 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)); 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)); 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)); ===================================== services/i18n/src/main/i18n/translations/services_en_GB.properties ===================================== @@ -1,3 +1,4 @@ +observe.data.ll.logbook.Set.lightsticksPerBasketCount=Lightsticks per basket count boolean.false=No boolean.true=Yes observe.Id.comment=Comment ===================================== services/i18n/src/main/i18n/translations/services_es_ES.properties ===================================== @@ -1,3 +1,4 @@ +observe.data.ll.logbook.Set.lightsticksPerBasketCount=Número de barras de luz por cesta boolean.false=No boolean.true=Si observe.Id.comment=Commentario ===================================== services/i18n/src/main/i18n/translations/services_fr_FR.properties ===================================== @@ -10,6 +10,7 @@ observe.Id.longitude=Longitude observe.Id.ocean=Ocean observe.Id.quadrant=Quadrant observe.Id.sex=Sexe +observe.data.ll.logbook.Set.lightsticksPerBasketCount=Nombre de cyalumes par panier observe.Id.sizeMeasureType=Type de mensuration observe.Id.validation.comment.needed.for.multiple=Un commentaire est requis pour l'un des référentiels %s sélectionné. observe.Id.validation.comment.needed.for.single=Un commentaire est requis pour le référentiel %s sélectionné. ===================================== services/validation/src/main/i18n/getters/validation-fields.getter ===================================== @@ -106,6 +106,7 @@ observe.data.ll.logbook.Set.haulingStartQuadrant observe.data.ll.logbook.Set.haulingStartTimeStamp observe.data.ll.logbook.Set.lengthBetweenBranchlines observe.data.ll.logbook.Set.lightsticksColor +observe.data.ll.logbook.Set.lightsticksPerBasketCount observe.data.ll.logbook.Set.lightsticksType observe.data.ll.logbook.Set.lineType observe.data.ll.logbook.Set.maxDepthTargeted ===================================== tests/test/src/main/resources/db/8.0/dataForTestLongline.sql.gz ===================================== Binary files a/tests/test/src/main/resources/db/8.0/dataForTestLongline.sql.gz and b/tests/test/src/main/resources/db/8.0/dataForTestLongline.sql.gz differ ===================================== tests/test/src/main/resources/db/8.0/dataForTestSeine.sql.gz ===================================== Binary files a/tests/test/src/main/resources/db/8.0/dataForTestSeine.sql.gz and b/tests/test/src/main/resources/db/8.0/dataForTestSeine.sql.gz differ ===================================== tests/test/src/main/resources/db/8.0/empty_h2.sql.gz ===================================== Binary files a/tests/test/src/main/resources/db/8.0/empty_h2.sql.gz and b/tests/test/src/main/resources/db/8.0/empty_h2.sql.gz differ ===================================== tests/test/src/main/resources/db/8.0/empty_pg.sql.gz ===================================== Binary files a/tests/test/src/main/resources/db/8.0/empty_pg.sql.gz and b/tests/test/src/main/resources/db/8.0/empty_pg.sql.gz differ ===================================== tests/test/src/main/resources/db/8.0/referentiel.sql.gz ===================================== Binary files a/tests/test/src/main/resources/db/8.0/referentiel.sql.gz and b/tests/test/src/main/resources/db/8.0/referentiel.sql.gz differ View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/6c632ae19ea6d2f439558b7c98... -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/6c632ae19ea6d2f439558b7c98... You're receiving this email because of your account on gitlab.com.