November 2020 - Observe-commits - mailman.cloud.codelutin.com

[Git][ultreiaio/ird-observe] Deleted tag v7.7.0
by Tony CHEMIT Nov. 4, 2020

Nov. 4, 2020

Tony CHEMIT deleted tag v7.7.0 at ultreiaio / ird-observe -- You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] 5 commits: [LL][Logbooks] table ll_landing.datasource à compléter - Closes #1627
by Tony CHEMIT Nov. 3, 2020

Nov. 3, 2020

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 8f09eca5 by Tony Chemit at 2020-11-03T10:46:32+01:00 [LL][Logbooks] table ll_landing.datasource à compléter - Closes #1627 [LL][Logbookd] Renommer table compagnies - Closes #1628 [LL][Logbooks] Ajout d'un champ - Closes #1629 [LL][Logbook] landingpart.landing devrait être une FK - Closes #1632 [LL][Logbook] ll_landing.landingpart contient 3 champs certainement en trop - Closes #1633 - - - - - d220aa6d by Tony Chemit at 2020-11-03T10:46:32+01:00 Manque le champ lightsticksperbasket - Closes #1626 - - - - - 0232c04c by Tony Chemit at 2020-11-03T10:46:32+01:00 Optimisation de la migration 8.0 - Closes #1623 - - - - - d82447e7 by Tony Chemit at 2020-11-03T10:46:32+01:00 Normalisation des modèles de navigation pour pouvoir les générer. - - - - - 62935874 by Tony Chemit at 2020-11-03T10:46:32+01:00 Generate edit and select model :) - - - - - 30 changed files: - client/configuration/src/main/config/Client.ini - client/configuration/src/main/i18n/templates/about_en_GB.ftl - client/configuration/src/main/java/fr/ird/observe/client/configuration/ClientConfig.java - client/configuration/src/test/java/fr/ird/observe/client/configuration/ClientConfigTest.java - client/core/src/main/java/fr/ird/observe/client/ClientUIContext.java - client/core/src/main/java/fr/ird/observe/client/datasource/api/ObserveDataSourcesManager.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/DataSourceEditorBodyContent.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/ContentUIHandler.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/actions/move/MoveExecutor.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/actions/save/SaveAdapter.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/actions/save/SaveExecutor.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/edit/actions/SaveEditUIAdapter.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/list/ContentListUINavigationContext.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/list/actions/CloseOpen.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/list/actions/DeleteMultiple.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/list/actions/OpenClose.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/open/ContentOpenableUIHandler.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/open/ContentOpenableUIModelStates.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/open/actions/CloseOpenable.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/open/actions/CreateNewOpenable.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/open/actions/DeleteOpenable.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/open/actions/OpenOpenable.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/open/actions/SaveOpenableUIAdapter.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/simple/ContentSimpleUIModelStates.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/simple/actions/SaveSimpleUIAdapter.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/table/actions/SaveTableUIAdapter.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/navigation/NavigationContext.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/navigation/NavigationNode.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/navigation/NavigationScope.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/navigation/NavigationTree.java The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/6d97a706c0356129ae365306… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/6d97a706c0356129ae365306… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] 2 commits: Normalisation des modèles de navigation pour pouvoir les générer.
by Tony CHEMIT Nov. 2, 2020

Nov. 2, 2020

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 3e9a5042 by Tony Chemit at 2020-11-01T21:28:44+01:00 Normalisation des modèles de navigation pour pouvoir les générer. - - - - - 6d97a706 by Tony Chemit at 2020-11-02T15:12:44+01:00 Generate edit and select model :) - - - - - 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/test/java/fr/ird/observe/client/configuration/ClientConfigTest.java - client/core/src/main/java/fr/ird/observe/client/ClientUIContext.java - client/core/src/main/java/fr/ird/observe/client/datasource/api/ObserveDataSourcesManager.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/DataSourceEditorBodyContent.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/ContentUIHandler.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/actions/move/MoveExecutor.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/actions/save/SaveAdapter.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/actions/save/SaveExecutor.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/edit/actions/SaveEditUIAdapter.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/list/ContentListUINavigationContext.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/list/actions/CloseOpen.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/list/actions/DeleteMultiple.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/list/actions/OpenClose.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/open/ContentOpenableUIHandler.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/open/ContentOpenableUIModelStates.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/open/actions/CloseOpenable.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/open/actions/CreateNewOpenable.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/open/actions/DeleteOpenable.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/open/actions/OpenOpenable.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/open/actions/SaveOpenableUIAdapter.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/simple/ContentSimpleUIModelStates.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/simple/actions/SaveSimpleUIAdapter.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/table/actions/SaveTableUIAdapter.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/navigation/NavigationContext.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/navigation/NavigationNode.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/navigation/NavigationScope.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/navigation/NavigationTree.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/navigation/NavigationTreeModel.java The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/402c8f05313bf6bfacf85659… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/402c8f05313bf6bfacf85659… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] Optimisation de la migration 8.0 - Closes #1623
by Tony CHEMIT Nov. 1, 2020

Nov. 1, 2020

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 402c8f05 by Tony Chemit at 2020-11-01T18:33:30+01:00 Optimisation de la migration 8.0 - Closes #1623 - - - - - 30 changed files: - client/datasource/editor/ll/src/main/i18n/getters/jaxx.getter - models/persistence/src/main/java/fr/ird/observe/entities/migration/DataSourceMigrationForVersion_8_0.java - − models/persistence/src/main/resources/db/migration/8.0/01_move_wind_referential-H2.sql - − models/persistence/src/main/resources/db/migration/8.0/01_move_wind_referential-PG.sql - models/persistence/src/main/resources/db/migration/8.0/06_fill_vessel_activity-common.sql → models/persistence/src/main/resources/db/migration/8.0/01_update_referential-common.sql - − models/persistence/src/main/resources/db/migration/8.0/02_wind_i18n-common.sql - − models/persistence/src/main/resources/db/migration/8.0/03_update_vesseltype-common.sql - − models/persistence/src/main/resources/db/migration/8.0/04_update_person-common.sql - − models/persistence/src/main/resources/db/migration/8.0/04_update_person2-common.sql - − models/persistence/src/main/resources/db/migration/8.0/05_rename_tripType-common.sql - − models/persistence/src/main/resources/db/migration/8.0/07_add_weight_determination_method-common.sql - − models/persistence/src/main/resources/db/migration/8.0/08_add_weight_category-common.sql - − models/persistence/src/main/resources/db/migration/8.0/10_add_length_measure_method-common.sql - − models/persistence/src/main/resources/db/migration/8.0/11_add_weight_measure_method-common.sql - − models/persistence/src/main/resources/db/migration/8.0/13_add_on_board_processing-common.sql - − models/persistence/src/main/resources/db/migration/8.0/16_rename_seine_weight_category-common.sql - − models/persistence/src/main/resources/db/migration/8.0/17_add_trip_type-common.sql - − models/persistence/src/main/resources/db/migration/8.0/18_update_longline_trip-H2.sql - − models/persistence/src/main/resources/db/migration/8.0/18_update_longline_trip-PG.sql - − models/persistence/src/main/resources/db/migration/8.0/19_add_longline_trip_species_list-common.sql - − models/persistence/src/main/resources/db/migration/8.0/20_update_referential_longline_line_type-common.sql - − models/persistence/src/main/resources/db/migration/8.0/21_i18n_referential_harbour-H2.sql - − models/persistence/src/main/resources/db/migration/8.0/21_i18n_referential_harbour-PG.sql - models/persistence/src/main/resources/db/migration/8.0/30_common_fill-common.sql - models/persistence/src/main/resources/db/migration/8.0/30_common_finalize-common.sql - models/persistence/src/main/resources/db/migration/8.0/40_ps_common_finalize-common.sql - models/persistence/src/main/resources/db/migration/8.0/50_ps_observation_fill-common.sql - models/persistence/src/main/resources/db/migration/8.0/50_ps_observation_finalize-common.sql - models/persistence/src/main/resources/db/migration/8.0/60_ll_common_fill-common.sql - models/persistence/src/main/resources/db/migration/8.0/60_ll_common_finalize-common.sql The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/402c8f05313bf6bfacf856592… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/402c8f05313bf6bfacf856592… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] Manque le champ lightsticksperbasket - Closes #1626
by Tony CHEMIT Nov. 1, 2020

Nov. 1, 2020

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> +  + <row> + <cell anchor='west'> + <JLabel id='lightsticksPerBasketCountLabel'/> + </cell> + <cell fill='both' weightx="1" columns="3"> + <NumberEditor id='lightsticksPerBasketCount' constructorParams='this' styleClass="int6"/> + </cell> + </row>  <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/6c632ae19ea6d2f439558b7c9… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/6c632ae19ea6d2f439558b7c9… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] 2 commits: Fix MigrateTestsDatabases script (test module has been moved to tests directory)
by Tony CHEMIT Nov. 1, 2020

Nov. 1, 2020

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 0283f885 by Tony Chemit at 2020-11-01T14:39:27+01:00 Fix MigrateTestsDatabases script (test module has been moved to tests directory) - - - - - 194525be by Tony Chemit at 2020-11-01T15:21:10+01:00 [LL][Logbooks] table ll_landing.datasource à compléter - Closes #1627 [LL][Logbookd] Renommer table compagnies - Closes #1628 [LL][Logbooks] Ajout d'un champ - Closes #1629 [LL][Logbook] landingpart.landing devrait être une FK - Closes #1632 [LL][Logbook] ll_landing.landingpart contient 3 champs certainement en trop - Closes #1633 - - - - - 30 changed files: - client/configuration/src/main/i18n/templates/about_en_GB.ftl - client/datasource/editor/ll/src/main/i18n/getters/jaxx.getter - client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/landing/LandingPartUI.jaxx - client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/landing/LandingUI.jaxx - client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/referential/landing/CompagniesUI.jaxx → client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/referential/landing/CompanyUI.jaxx - models/dto/src/main/i18n/getters/eugene.getter - models/dto/src/main/java/fr/ird/observe/dto/decoration/init/ReferentialLlLandingModelDecoratorInitializer.java - models/dto/src/main/models/Observe-13-referential-ll-landing.model - models/dto/src/main/models/Observe-32-data-ll-landing.model - models/persistence/src/main/java/fr/ird/observe/entities/migration/DataSourceMigrationForVersion_8_0.java - models/persistence/src/main/models/Observe-13-referential-ll-landing.model - models/persistence/src/main/models/Observe-32-data-ll-landing.model - − models/persistence/src/main/resources/db/migration/8.0/09_add_compagnies-common.sql - − models/persistence/src/main/resources/db/migration/8.0/12_add_conservation-common.sql - − models/persistence/src/main/resources/db/migration/8.0/14_add_data_source-common.sql - models/persistence/src/main/resources/db/migration/8.0/90_ll_landing_create-common.sql - models/persistence/src/main/resources/db/migration/8.0/90_ll_landing_fill-common.sql - models/persistence/src/main/resources/db/migration/8.0/90_ll_landing_finalize-common.sql - models/persistence/src/test/java/fr/ird/observe/entities/spi/DeleteTest.java - models/persistence/src/test/resources/fixtures/persistence/count-referential-longline.properties - models/persistence/src/test/resources/fixtures/persistence/entity-replication-order-referential.list - models/persistence/src/test/resources/fixtures/persistence/entity-tables-count-referential.properties - models/persistence/src/test/resources/fixtures/persistence/entity-tables-selector-referential.properties - 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/local-impl/src/test/java/fr/ird/observe/services/local/service/sql/MigrateTestsDatabases.java - services/local-impl/src/test/resources/fixtures/validate-service-referential.properties - services/validation/src/main/i18n/getters/validation-fields.getter - tests/test/src/main/filtered-resources/observetest.properties The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/22153a67d6d755b0fd136d5d… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/22153a67d6d755b0fd136d5d… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][pages] Site checkin for project ObServe :: Pom
by Tony CHEMIT Nov. 1, 2020

Nov. 1, 2020

Tony CHEMIT pushed to branch pages at ultreiaio / ird-observe Commits: 79941a52 by 166231 at 2020-11-01T12:14:13+00:00 Site checkin for project ObServe :: Pom - - - - - 3 changed files: - administration-web.html - architecture-logicielle.html - + css/apache-maven-fluido-1.8.min.css The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/79941a52ce0b4b41e72ae33d1… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/79941a52ce0b4b41e72ae33d1… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe] Deleted branch release/7.7.0
by Tony CHEMIT Nov. 1, 2020

Nov. 1, 2020

Tony CHEMIT deleted branch release/7.7.0 at ultreiaio / ird-observe -- You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe] Pushed new tag v7.7.0
by Tony CHEMIT Nov. 1, 2020

Nov. 1, 2020

Tony CHEMIT pushed new tag v7.7.0 at ultreiaio / ird-observe -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/tree/v7.7.0 You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][release/7.7.0] [jgitflow-maven-plugin]updating poms for branch'release/7.7.0' with non-snapshot versions[skip ci]
by Tony CHEMIT Nov. 1, 2020

Nov. 1, 2020

Tony CHEMIT pushed to branch release/7.7.0 at ultreiaio / ird-observe Commits: 5a459340 by Tony Chemit at 2020-11-01T12:14:54+01:00 [jgitflow-maven-plugin]updating poms for branch'release/7.7.0' with non-snapshot versions[skip ci] - - - - - 22 changed files: - client-configuration/pom.xml - client-core/pom.xml - client-runner/pom.xml - common-dto/pom.xml - common-persistence/pom.xml - common-service/pom.xml - common-validation/pom.xml - dto/pom.xml - observe-i18n/pom.xml - observe/pom.xml - persistence/pom.xml - pom.xml - server-configuration/pom.xml - server-core/pom.xml - server-runner/pom.xml - services-client/pom.xml - services-local/pom.xml - services/pom.xml - templates/pom.xml - test/pom.xml - toolbox-maven-plugin/pom.xml - validation/pom.xml Changes: ===================================== client-configuration/pom.xml ===================================== @@ -24,7 +24,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.7.0-SNAPSHOT</version> + <version>7.7.0</version> </parent> <artifactId>client-configuration</artifactId> ===================================== client-core/pom.xml ===================================== @@ -24,7 +24,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.7.0-SNAPSHOT</version> + <version>7.7.0</version> </parent> <artifactId>client-core</artifactId> ===================================== client-runner/pom.xml ===================================== @@ -24,7 +24,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.7.0-SNAPSHOT</version> + <version>7.7.0</version> </parent> <artifactId>client-runner</artifactId> ===================================== common-dto/pom.xml ===================================== @@ -25,7 +25,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.7.0-SNAPSHOT</version> + <version>7.7.0</version> </parent> <groupId>fr.ird.observe.toolkit</groupId> ===================================== common-persistence/pom.xml ===================================== @@ -25,7 +25,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.7.0-SNAPSHOT</version> + <version>7.7.0</version> </parent> <groupId>fr.ird.observe.toolkit</groupId> ===================================== common-service/pom.xml ===================================== @@ -25,7 +25,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.7.0-SNAPSHOT</version> + <version>7.7.0</version> </parent> <groupId>fr.ird.observe.toolkit</groupId> ===================================== common-validation/pom.xml ===================================== @@ -25,7 +25,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.7.0-SNAPSHOT</version> + <version>7.7.0</version> </parent> <groupId>fr.ird.observe.toolkit</groupId> ===================================== dto/pom.xml ===================================== @@ -25,7 +25,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.7.0-SNAPSHOT</version> + <version>7.7.0</version> </parent> <artifactId>dto</artifactId> ===================================== observe-i18n/pom.xml ===================================== @@ -24,7 +24,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.7.0-SNAPSHOT</version> + <version>7.7.0</version> </parent> <artifactId>observe-i18n</artifactId> ===================================== observe/pom.xml ===================================== @@ -24,7 +24,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.7.0-SNAPSHOT</version> + <version>7.7.0</version> </parent> <artifactId>observe</artifactId> ===================================== persistence/pom.xml ===================================== @@ -24,7 +24,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.7.0-SNAPSHOT</version> + <version>7.7.0</version> </parent> <artifactId>persistence</artifactId> ===================================== pom.xml ===================================== @@ -29,7 +29,7 @@ <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.7.0-SNAPSHOT</version> + <version>7.7.0</version> <packaging>pom</packaging> <name>ObServe :: Pom</name> ===================================== server-configuration/pom.xml ===================================== @@ -24,7 +24,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.7.0-SNAPSHOT</version> + <version>7.7.0</version> </parent> <artifactId>server-configuration</artifactId> @@ -118,7 +118,7 @@ <dependency> <groupId>fr.ird.observe</groupId> <artifactId>services</artifactId> - <version>7.7.0-SNAPSHOT</version> + <version>7.7.0</version> <scope>compile</scope> </dependency> ===================================== server-core/pom.xml ===================================== @@ -25,7 +25,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.7.0-SNAPSHOT</version> + <version>7.7.0</version> </parent> <artifactId>server-core</artifactId> ===================================== server-runner/pom.xml ===================================== @@ -25,7 +25,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.7.0-SNAPSHOT</version> + <version>7.7.0</version> </parent> <artifactId>server-runner</artifactId> ===================================== services-client/pom.xml ===================================== @@ -25,7 +25,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.7.0-SNAPSHOT</version> + <version>7.7.0</version> </parent> <artifactId>services-client</artifactId> ===================================== services-local/pom.xml ===================================== @@ -25,7 +25,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.7.0-SNAPSHOT</version> + <version>7.7.0</version> </parent> <artifactId>services-local</artifactId> ===================================== services/pom.xml ===================================== @@ -25,7 +25,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.7.0-SNAPSHOT</version> + <version>7.7.0</version> </parent> <artifactId>services</artifactId> ===================================== templates/pom.xml ===================================== @@ -24,7 +24,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.7.0-SNAPSHOT</version> + <version>7.7.0</version> </parent> <groupId>fr.ird.observe.toolkit</groupId> ===================================== test/pom.xml ===================================== @@ -24,7 +24,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.7.0-SNAPSHOT</version> + <version>7.7.0</version> </parent> <artifactId>test</artifactId> ===================================== toolbox-maven-plugin/pom.xml ===================================== @@ -24,7 +24,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.7.0-SNAPSHOT</version> + <version>7.7.0</version> </parent> <groupId>fr.ird.observe.toolkit</groupId> ===================================== validation/pom.xml ===================================== @@ -24,7 +24,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.7.0-SNAPSHOT</version> + <version>7.7.0</version> </parent> <artifactId>validation</artifactId> View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/5a459340e978361dd7d8127a1… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/5a459340e978361dd7d8127a1… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][master-7.x] 9 commits: [jgitflow-maven-plugin]updating poms for 7.6.6-SNAPSHOT development[skip ci]
by Tony CHEMIT Nov. 1, 2020

Nov. 1, 2020

Tony CHEMIT pushed to branch master-7.x at ultreiaio / ird-observe Commits: 77ed3cc9 by Tony Chemit at 2020-08-10T13:45:06+02:00 [jgitflow-maven-plugin]updating poms for 7.6.6-SNAPSHOT development[skip ci] - - - - - 78f26675 by Tony Chemit at 2020-08-10T13:52:35+02:00 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts[skip ci] - - - - - eb5e9b93 by Tony Chemit at 2020-08-10T13:52:35+02:00 [jgitflow-maven-plugin]merging 'master-7.x' into 'develop-7.x' - - - - - 63f7e0ff by Tony Chemit at 2020-08-10T13:52:35+02:00 [jgitflow-maven-plugin]Updating develop poms back to pre merge state[skip ci] - - - - - 2c66a979 by Tony Chemit at 2020-11-01T11:42:18+01:00 [LL] Perte des données saisies "catchhealthstatus" et "discardhealthstatus" dans table "catch" depuis le passage à 7.6.2 - Closes #1624 - - - - - 9fb9dbdf by Tony Chemit at 2020-11-01T11:42:18+01:00 [PS] Champ "type de mensuration" ne se met pas à jour - Closes #1631 - - - - - bb53107e by Tony Chemit at 2020-11-01T11:42:18+01:00 Move to version 7.7.0 - - - - - 5a459340 by Tony Chemit at 2020-11-01T12:14:54+01:00 [jgitflow-maven-plugin]updating poms for branch'release/7.7.0' with non-snapshot versions[skip ci] - - - - - 2d6e7e53 by Tony Chemit at 2020-11-01T12:21:24+01:00 [jgitflow-maven-plugin]merging 'release/7.7.0' into 'master-7.x' - - - - - 30 changed files: - client-configuration/pom.xml - client-core/pom.xml - client-core/src/main/java/fr/ird/observe/client/ui/content/data/seine/NonTargetSampleUIHandler.java - client-runner/pom.xml - common-dto/pom.xml - common-persistence/pom.xml - common-service/pom.xml - common-validation/pom.xml - dto/pom.xml - observe-i18n/pom.xml - observe/pom.xml - persistence/pom.xml - persistence/src/main/resources/db/migration/7.4/03_rename_referential-H2.sql - persistence/src/main/resources/db/migration/7.4/03_rename_referential-PG.sql - pom.xml - server-configuration/pom.xml - server-core/pom.xml - server-runner/pom.xml - services-client/pom.xml - services-local/pom.xml - services/pom.xml - templates/pom.xml - test/pom.xml - test/src/main/resources/db/7.6/dataForTestLongline.sql.gz - test/src/main/resources/db/7.6/dataForTestSeine.sql.gz - test/src/main/resources/db/7.6/empty_h2.sql.gz - test/src/main/resources/db/7.6/empty_pg.sql.gz - test/src/main/resources/db/7.6/referentiel.sql.gz - toolbox-maven-plugin/pom.xml - validation/pom.xml Changes: ===================================== client-configuration/pom.xml ===================================== @@ -24,7 +24,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.6.5</version> + <version>7.7.0</version> </parent> <artifactId>client-configuration</artifactId> ===================================== client-core/pom.xml ===================================== @@ -24,7 +24,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.6.5</version> + <version>7.7.0</version> </parent> <artifactId>client-core</artifactId> ===================================== client-core/src/main/java/fr/ird/observe/client/ui/content/data/seine/NonTargetSampleUIHandler.java ===================================== @@ -103,13 +103,20 @@ public class NonTargetSampleUIHandler extends AbstractSampleUIHandler<NonTargetS @Override protected void onSpeciesChanged(SpeciesReference species) { - - Optional<SizeMeasureTypeReference> oldSizeMeasureType = Optional.ofNullable(getTableEditBean()).map(NonTargetLengthDto::getSizeMeasureType); - Optional<SizeMeasureTypeReference> sizeMeasureType = getSpeciesDefaultSizeMeasureType(species); - log.debug("Default size measure " + sizeMeasureType.orElse(null)); - getUi().getModel().setDefaultSizeMeasureType(sizeMeasureType.orElse(null)); + log.debug("On species changed to : " + species); + SizeMeasureTypeReference oldSizeMeasureType = getTableEditBean().getSizeMeasureType(); + Optional<SizeMeasureTypeReference> defaultSizeMeasureType = getSpeciesDefaultSizeMeasureType(species); + log.debug("Old size measure " + oldSizeMeasureType); + log.debug("Default size measure " + defaultSizeMeasureType.orElse(null)); + getUi().getModel().setDefaultSizeMeasureType(defaultSizeMeasureType.orElse(null)); resetDefaultSizeMeasureType(); - oldSizeMeasureType.ifPresent(sizeMeasureTypeReference -> getTableEditBean().setSizeMeasureType(sizeMeasureTypeReference)); + if (getTableModel().isCreate()) { + log.debug("On create mode, always use default size measure"); + oldSizeMeasureType = null; + } + SizeMeasureTypeReference newSizeMeasureType = oldSizeMeasureType == null ? defaultSizeMeasureType.orElse(null) : oldSizeMeasureType; + log.debug("New size measure " + newSizeMeasureType); + getTableEditBean().setSizeMeasureType(newSizeMeasureType); } @Override ===================================== client-runner/pom.xml ===================================== @@ -24,7 +24,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.6.5</version> + <version>7.7.0</version> </parent> <artifactId>client-runner</artifactId> ===================================== common-dto/pom.xml ===================================== @@ -25,7 +25,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.6.5</version> + <version>7.7.0</version> </parent> <groupId>fr.ird.observe.toolkit</groupId> ===================================== common-persistence/pom.xml ===================================== @@ -25,7 +25,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.6.5</version> + <version>7.7.0</version> </parent> <groupId>fr.ird.observe.toolkit</groupId> ===================================== common-service/pom.xml ===================================== @@ -25,7 +25,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.6.5</version> + <version>7.7.0</version> </parent> <groupId>fr.ird.observe.toolkit</groupId> ===================================== common-validation/pom.xml ===================================== @@ -25,7 +25,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.6.5</version> + <version>7.7.0</version> </parent> <groupId>fr.ird.observe.toolkit</groupId> ===================================== dto/pom.xml ===================================== @@ -25,7 +25,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.6.5</version> + <version>7.7.0</version> </parent> <artifactId>dto</artifactId> ===================================== observe-i18n/pom.xml ===================================== @@ -24,7 +24,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.6.5</version> + <version>7.7.0</version> </parent> <artifactId>observe-i18n</artifactId> ===================================== observe/pom.xml ===================================== @@ -24,7 +24,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.6.5</version> + <version>7.7.0</version> </parent> <artifactId>observe</artifactId> ===================================== persistence/pom.xml ===================================== @@ -24,7 +24,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.6.5</version> + <version>7.7.0</version> </parent> <artifactId>persistence</artifactId> ===================================== persistence/src/main/resources/db/migration/7.4/03_rename_referential-H2.sql ===================================== @@ -29,7 +29,7 @@ INSERT INTO observe_longline.StomachFullness(topiaId, topiaVersion, topiaCreateD ALTER TABLE observe_longline.Catch ADD COLUMN discardHealthStatus VARCHAR(255); ALTER TABLE observe_longline.Catch ADD COLUMN catchHealthStatus VARCHAR(255); ALTER TABLE observe_longline.Catch ADD COLUMN stomachFullness VARCHAR(255); -UPDATE observe_longline.Catch SET discardHealthStatus = REPLACE(discardHealthStatus, 'Healthness','HealthStatus'), catchHealthStatus = REPLACE(catchHealthStatus, 'Healthness','HealthStatus'), stomachFullness = REPLACE(stomachFullness, 'StomacFullness','StomachFullness'); +UPDATE observe_longline.Catch SET discardHealthStatus = REPLACE(discardHealthness, 'Healthness', 'HealthStatus'), catchHealthStatus = REPLACE(catchHealthness, 'Healthness', 'HealthStatus'), stomachFullness = REPLACE(stomacFullness, 'StomacFullness','StomachFullness'); ALTER TABLE observe_longline.Catch DROP COLUMN discardHealthness; ALTER TABLE observe_longline.Catch DROP COLUMN catchHealthness; ALTER TABLE observe_longline.Catch DROP COLUMN stomacFullness; ===================================== persistence/src/main/resources/db/migration/7.4/03_rename_referential-PG.sql ===================================== @@ -28,7 +28,7 @@ INSERT INTO observe_longline.StomachFullness(topiaId, topiaVersion, topiaCreateD ALTER TABLE observe_longline.Catch ADD COLUMN discardHealthStatus VARCHAR(255); ALTER TABLE observe_longline.Catch ADD COLUMN catchHealthStatus VARCHAR(255); ALTER TABLE observe_longline.Catch ADD COLUMN stomachFullness VARCHAR(255); -UPDATE observe_longline.Catch SET discardHealthStatus = REPLACE(discardHealthStatus, 'Healthness','HealthStatus'), catchHealthStatus = REPLACE(catchHealthStatus, 'Healthness','HealthStatus'), stomachFullness = REPLACE(stomachFullness, 'StomacFullness','StomachFullness'); +UPDATE observe_longline.Catch SET discardHealthStatus = REPLACE(discardHealthness, 'Healthness', 'HealthStatus'), catchHealthStatus = REPLACE(catchHealthness, 'Healthness', 'HealthStatus'), stomachFullness = REPLACE(stomacFullness, 'StomacFullness','StomachFullness'); ALTER TABLE observe_longline.Catch DROP COLUMN discardHealthness CASCADE; ALTER TABLE observe_longline.Catch DROP COLUMN catchHealthness CASCADE; ALTER TABLE observe_longline.Catch DROP COLUMN stomacFullness CASCADE; ===================================== pom.xml ===================================== @@ -29,7 +29,7 @@ <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.6.5</version> + <version>7.7.0</version> <packaging>pom</packaging> <name>ObServe :: Pom</name> ===================================== server-configuration/pom.xml ===================================== @@ -24,7 +24,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.6.5</version> + <version>7.7.0</version> </parent> <artifactId>server-configuration</artifactId> @@ -118,7 +118,7 @@ <dependency> <groupId>fr.ird.observe</groupId> <artifactId>services</artifactId> - <version>7.6.5</version> + <version>7.7.0</version> <scope>compile</scope> </dependency> ===================================== server-core/pom.xml ===================================== @@ -25,7 +25,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.6.5</version> + <version>7.7.0</version> </parent> <artifactId>server-core</artifactId> ===================================== server-runner/pom.xml ===================================== @@ -25,7 +25,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.6.5</version> + <version>7.7.0</version> </parent> <artifactId>server-runner</artifactId> ===================================== services-client/pom.xml ===================================== @@ -25,7 +25,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.6.5</version> + <version>7.7.0</version> </parent> <artifactId>services-client</artifactId> ===================================== services-local/pom.xml ===================================== @@ -25,7 +25,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.6.5</version> + <version>7.7.0</version> </parent> <artifactId>services-local</artifactId> ===================================== services/pom.xml ===================================== @@ -25,7 +25,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.6.5</version> + <version>7.7.0</version> </parent> <artifactId>services</artifactId> ===================================== templates/pom.xml ===================================== @@ -24,7 +24,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.6.5</version> + <version>7.7.0</version> </parent> <groupId>fr.ird.observe.toolkit</groupId> ===================================== test/pom.xml ===================================== @@ -24,7 +24,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.6.5</version> + <version>7.7.0</version> </parent> <artifactId>test</artifactId> ===================================== test/src/main/resources/db/7.6/dataForTestLongline.sql.gz ===================================== Binary files a/test/src/main/resources/db/7.6/dataForTestLongline.sql.gz and b/test/src/main/resources/db/7.6/dataForTestLongline.sql.gz differ ===================================== test/src/main/resources/db/7.6/dataForTestSeine.sql.gz ===================================== Binary files a/test/src/main/resources/db/7.6/dataForTestSeine.sql.gz and b/test/src/main/resources/db/7.6/dataForTestSeine.sql.gz differ ===================================== test/src/main/resources/db/7.6/empty_h2.sql.gz ===================================== Binary files a/test/src/main/resources/db/7.6/empty_h2.sql.gz and b/test/src/main/resources/db/7.6/empty_h2.sql.gz differ ===================================== test/src/main/resources/db/7.6/empty_pg.sql.gz ===================================== Binary files a/test/src/main/resources/db/7.6/empty_pg.sql.gz and b/test/src/main/resources/db/7.6/empty_pg.sql.gz differ ===================================== test/src/main/resources/db/7.6/referentiel.sql.gz ===================================== Binary files a/test/src/main/resources/db/7.6/referentiel.sql.gz and b/test/src/main/resources/db/7.6/referentiel.sql.gz differ ===================================== toolbox-maven-plugin/pom.xml ===================================== @@ -24,7 +24,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.6.5</version> + <version>7.7.0</version> </parent> <groupId>fr.ird.observe.toolkit</groupId> ===================================== validation/pom.xml ===================================== @@ -24,7 +24,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.6.5</version> + <version>7.7.0</version> </parent> <artifactId>validation</artifactId> View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/911301d2995d86c9de57098d… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/911301d2995d86c9de57098d… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop-7.x] 5 commits: [jgitflow-maven-plugin]updating poms for branch'release/7.7.0' with non-snapshot versions[skip ci]
by Tony CHEMIT Nov. 1, 2020

Nov. 1, 2020

Tony CHEMIT pushed to branch develop-7.x at ultreiaio / ird-observe Commits: 5a459340 by Tony Chemit at 2020-11-01T12:14:54+01:00 [jgitflow-maven-plugin]updating poms for branch'release/7.7.0' with non-snapshot versions[skip ci] - - - - - 2d6e7e53 by Tony Chemit at 2020-11-01T12:21:24+01:00 [jgitflow-maven-plugin]merging 'release/7.7.0' into 'master-7.x' - - - - - 27d45c8c by Tony Chemit at 2020-11-01T12:21:26+01:00 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts[skip ci] - - - - - faa83a49 by Tony Chemit at 2020-11-01T12:21:26+01:00 [jgitflow-maven-plugin]merging 'master-7.x' into 'develop-7.x' - - - - - 0d91ce44 by Tony Chemit at 2020-11-01T12:21:27+01:00 [jgitflow-maven-plugin]Updating develop poms back to pre merge state[skip ci] - - - - - 0 changed files: Changes: View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/94bf9cb6bddb5780d6af4302… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/94bf9cb6bddb5780d6af4302… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop-7.x] [jgitflow-maven-plugin]updating poms for 7.7.1-SNAPSHOT development[skip ci]
by Tony CHEMIT Nov. 1, 2020

Nov. 1, 2020

Tony CHEMIT pushed to branch develop-7.x at ultreiaio / ird-observe Commits: 94bf9cb6 by Tony Chemit at 2020-11-01T12:11:17+01:00 [jgitflow-maven-plugin]updating poms for 7.7.1-SNAPSHOT development[skip ci] - - - - - 22 changed files: - client-configuration/pom.xml - client-core/pom.xml - client-runner/pom.xml - common-dto/pom.xml - common-persistence/pom.xml - common-service/pom.xml - common-validation/pom.xml - dto/pom.xml - observe-i18n/pom.xml - observe/pom.xml - persistence/pom.xml - pom.xml - server-configuration/pom.xml - server-core/pom.xml - server-runner/pom.xml - services-client/pom.xml - services-local/pom.xml - services/pom.xml - templates/pom.xml - test/pom.xml - toolbox-maven-plugin/pom.xml - validation/pom.xml Changes: ===================================== client-configuration/pom.xml ===================================== @@ -24,7 +24,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.7.0-SNAPSHOT</version> + <version>7.7.1-SNAPSHOT</version> </parent> <artifactId>client-configuration</artifactId> ===================================== client-core/pom.xml ===================================== @@ -24,7 +24,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.7.0-SNAPSHOT</version> + <version>7.7.1-SNAPSHOT</version> </parent> <artifactId>client-core</artifactId> ===================================== client-runner/pom.xml ===================================== @@ -24,7 +24,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.7.0-SNAPSHOT</version> + <version>7.7.1-SNAPSHOT</version> </parent> <artifactId>client-runner</artifactId> ===================================== common-dto/pom.xml ===================================== @@ -25,7 +25,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.7.0-SNAPSHOT</version> + <version>7.7.1-SNAPSHOT</version> </parent> <groupId>fr.ird.observe.toolkit</groupId> ===================================== common-persistence/pom.xml ===================================== @@ -25,7 +25,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.7.0-SNAPSHOT</version> + <version>7.7.1-SNAPSHOT</version> </parent> <groupId>fr.ird.observe.toolkit</groupId> ===================================== common-service/pom.xml ===================================== @@ -25,7 +25,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.7.0-SNAPSHOT</version> + <version>7.7.1-SNAPSHOT</version> </parent> <groupId>fr.ird.observe.toolkit</groupId> ===================================== common-validation/pom.xml ===================================== @@ -25,7 +25,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.7.0-SNAPSHOT</version> + <version>7.7.1-SNAPSHOT</version> </parent> <groupId>fr.ird.observe.toolkit</groupId> ===================================== dto/pom.xml ===================================== @@ -25,7 +25,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.7.0-SNAPSHOT</version> + <version>7.7.1-SNAPSHOT</version> </parent> <artifactId>dto</artifactId> ===================================== observe-i18n/pom.xml ===================================== @@ -24,7 +24,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.7.0-SNAPSHOT</version> + <version>7.7.1-SNAPSHOT</version> </parent> <artifactId>observe-i18n</artifactId> ===================================== observe/pom.xml ===================================== @@ -24,7 +24,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.7.0-SNAPSHOT</version> + <version>7.7.1-SNAPSHOT</version> </parent> <artifactId>observe</artifactId> ===================================== persistence/pom.xml ===================================== @@ -24,7 +24,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.7.0-SNAPSHOT</version> + <version>7.7.1-SNAPSHOT</version> </parent> <artifactId>persistence</artifactId> ===================================== pom.xml ===================================== @@ -29,7 +29,7 @@ <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.7.0-SNAPSHOT</version> + <version>7.7.1-SNAPSHOT</version> <packaging>pom</packaging> <name>ObServe :: Pom</name> ===================================== server-configuration/pom.xml ===================================== @@ -24,7 +24,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.7.0-SNAPSHOT</version> + <version>7.7.1-SNAPSHOT</version> </parent> <artifactId>server-configuration</artifactId> @@ -118,7 +118,7 @@ <dependency> <groupId>fr.ird.observe</groupId> <artifactId>services</artifactId> - <version>7.7.0-SNAPSHOT</version> + <version>7.7.1-SNAPSHOT</version> <scope>compile</scope> </dependency> ===================================== server-core/pom.xml ===================================== @@ -25,7 +25,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.7.0-SNAPSHOT</version> + <version>7.7.1-SNAPSHOT</version> </parent> <artifactId>server-core</artifactId> ===================================== server-runner/pom.xml ===================================== @@ -25,7 +25,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.7.0-SNAPSHOT</version> + <version>7.7.1-SNAPSHOT</version> </parent> <artifactId>server-runner</artifactId> ===================================== services-client/pom.xml ===================================== @@ -25,7 +25,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.7.0-SNAPSHOT</version> + <version>7.7.1-SNAPSHOT</version> </parent> <artifactId>services-client</artifactId> ===================================== services-local/pom.xml ===================================== @@ -25,7 +25,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.7.0-SNAPSHOT</version> + <version>7.7.1-SNAPSHOT</version> </parent> <artifactId>services-local</artifactId> ===================================== services/pom.xml ===================================== @@ -25,7 +25,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.7.0-SNAPSHOT</version> + <version>7.7.1-SNAPSHOT</version> </parent> <artifactId>services</artifactId> ===================================== templates/pom.xml ===================================== @@ -24,7 +24,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.7.0-SNAPSHOT</version> + <version>7.7.1-SNAPSHOT</version> </parent> <groupId>fr.ird.observe.toolkit</groupId> ===================================== test/pom.xml ===================================== @@ -24,7 +24,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.7.0-SNAPSHOT</version> + <version>7.7.1-SNAPSHOT</version> </parent> <artifactId>test</artifactId> ===================================== toolbox-maven-plugin/pom.xml ===================================== @@ -24,7 +24,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.7.0-SNAPSHOT</version> + <version>7.7.1-SNAPSHOT</version> </parent> <groupId>fr.ird.observe.toolkit</groupId> ===================================== validation/pom.xml ===================================== @@ -24,7 +24,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.7.0-SNAPSHOT</version> + <version>7.7.1-SNAPSHOT</version> </parent> <artifactId>validation</artifactId> View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/94bf9cb6bddb5780d6af4302c… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/94bf9cb6bddb5780d6af4302c… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe] Pushed new branch release/7.7.0
by Tony CHEMIT Nov. 1, 2020

Nov. 1, 2020

Tony CHEMIT pushed new branch release/7.7.0 at ultreiaio / ird-observe -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/tree/release/7.7.0 You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] 4 commits: Review client datasource editor layout (more and more stuff generated in ui)
by Tony CHEMIT Nov. 1, 2020

Nov. 1, 2020

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: dc6747db by Tony Chemit at 2020-10-29T12:06:33+01:00 Review client datasource editor layout (more and more stuff generated in ui) - - - - - ba03132f by Tony Chemit at 2020-10-30T20:53:34+01:00 Continue storm on ui - - - - - 86de5d9c by Tony Chemit at 2020-10-31T21:17:42+01:00 Introduce new spi module to put to the spi stuff used to generate so much things. - - - - - 22153a67 by Tony Chemit at 2020-11-01T12:07:27+01:00 update changelog for version 7.7.0 - - - - - 30 changed files: - CHANGELOG.md - client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/AdminActionModel.java - client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/AdminTabUI.jaxx - client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/AdminUIBodyContent.java - client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/AdminUIModel.java - client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/actions/AdminTabUIActionSupport.java - client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/config/ConfigModel.java - client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/config/ConfigUI.jaxx - client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/config/SelectDataModel.java - client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/config/SelectDataUI.jaxx - client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/config/SelectDataUIHandler.java - client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/config/actions/SelectData.java - client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/consolidate/ConsolidateModel.java - client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/export/ExportModel.java - client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/export/actions/Prepare.java - client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/pairing/ll/ActivityLlPairingModel.java - client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/report/ReportModel.java - client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/report/ReportUIHandler.java - client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/synchronize/data/DataSynchroModel.java - client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/synchronize/data/DataSynchroUIHandler.java - client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/synchronize/data/actions/Start.java - client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/synchronize/data/tree/DataSelectionTreePane.jaxx - client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/synchronize/data/tree/DataSelectionTreePaneHandler.java - client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/synchronize/data/tree/actions/DataSelectionTreePaneActionSupport.java - client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/synchronize/data/tree/actions/DataSourceInformation.java - client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/synchronize/data/tree/actions/RegisterCopy.java - client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/synchronize/data/tree/actions/RegisterDelete.java - client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/synchronize/referential/legacy/ObsoleteReferentialReferenceListCellRenderer.java - client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/synchronize/referential/legacy/SynchronizeModel.java - client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/synchronize/referential/legacy/actions/SynchroUIActionSupport.java The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/daf444f8477fdfe54eae90ee… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/daf444f8477fdfe54eae90ee… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop-7.x] 3 commits: [LL] Perte des données saisies "catchhealthstatus" et "discardhealthstatus"...
by Tony CHEMIT Nov. 1, 2020

Nov. 1, 2020

Tony CHEMIT pushed to branch develop-7.x at ultreiaio / ird-observe Commits: 2c66a979 by Tony Chemit at 2020-11-01T11:42:18+01:00 [LL] Perte des données saisies "catchhealthstatus" et "discardhealthstatus" dans table "catch" depuis le passage à 7.6.2 - Closes #1624 - - - - - 9fb9dbdf by Tony Chemit at 2020-11-01T11:42:18+01:00 [PS] Champ "type de mensuration" ne se met pas à jour - Closes #1631 - - - - - bb53107e by Tony Chemit at 2020-11-01T11:42:18+01:00 Move to version 7.7.0 - - - - - 30 changed files: - client-configuration/pom.xml - client-core/pom.xml - client-core/src/main/java/fr/ird/observe/client/ui/content/data/seine/NonTargetSampleUIHandler.java - client-runner/pom.xml - common-dto/pom.xml - common-persistence/pom.xml - common-service/pom.xml - common-validation/pom.xml - dto/pom.xml - observe-i18n/pom.xml - observe/pom.xml - persistence/pom.xml - persistence/src/main/resources/db/migration/7.4/03_rename_referential-H2.sql - persistence/src/main/resources/db/migration/7.4/03_rename_referential-PG.sql - pom.xml - server-configuration/pom.xml - server-core/pom.xml - server-runner/pom.xml - services-client/pom.xml - services-local/pom.xml - services/pom.xml - templates/pom.xml - test/pom.xml - test/src/main/resources/db/7.6/dataForTestLongline.sql.gz - test/src/main/resources/db/7.6/dataForTestSeine.sql.gz - test/src/main/resources/db/7.6/empty_h2.sql.gz - test/src/main/resources/db/7.6/empty_pg.sql.gz - test/src/main/resources/db/7.6/referentiel.sql.gz - toolbox-maven-plugin/pom.xml - validation/pom.xml Changes: ===================================== client-configuration/pom.xml ===================================== @@ -24,7 +24,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.6.6-SNAPSHOT</version> + <version>7.7.0-SNAPSHOT</version> </parent> <artifactId>client-configuration</artifactId> ===================================== client-core/pom.xml ===================================== @@ -24,7 +24,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.6.6-SNAPSHOT</version> + <version>7.7.0-SNAPSHOT</version> </parent> <artifactId>client-core</artifactId> ===================================== client-core/src/main/java/fr/ird/observe/client/ui/content/data/seine/NonTargetSampleUIHandler.java ===================================== @@ -103,13 +103,20 @@ public class NonTargetSampleUIHandler extends AbstractSampleUIHandler<NonTargetS @Override protected void onSpeciesChanged(SpeciesReference species) { - - Optional<SizeMeasureTypeReference> oldSizeMeasureType = Optional.ofNullable(getTableEditBean()).map(NonTargetLengthDto::getSizeMeasureType); - Optional<SizeMeasureTypeReference> sizeMeasureType = getSpeciesDefaultSizeMeasureType(species); - log.debug("Default size measure " + sizeMeasureType.orElse(null)); - getUi().getModel().setDefaultSizeMeasureType(sizeMeasureType.orElse(null)); + log.debug("On species changed to : " + species); + SizeMeasureTypeReference oldSizeMeasureType = getTableEditBean().getSizeMeasureType(); + Optional<SizeMeasureTypeReference> defaultSizeMeasureType = getSpeciesDefaultSizeMeasureType(species); + log.debug("Old size measure " + oldSizeMeasureType); + log.debug("Default size measure " + defaultSizeMeasureType.orElse(null)); + getUi().getModel().setDefaultSizeMeasureType(defaultSizeMeasureType.orElse(null)); resetDefaultSizeMeasureType(); - oldSizeMeasureType.ifPresent(sizeMeasureTypeReference -> getTableEditBean().setSizeMeasureType(sizeMeasureTypeReference)); + if (getTableModel().isCreate()) { + log.debug("On create mode, always use default size measure"); + oldSizeMeasureType = null; + } + SizeMeasureTypeReference newSizeMeasureType = oldSizeMeasureType == null ? defaultSizeMeasureType.orElse(null) : oldSizeMeasureType; + log.debug("New size measure " + newSizeMeasureType); + getTableEditBean().setSizeMeasureType(newSizeMeasureType); } @Override ===================================== client-runner/pom.xml ===================================== @@ -24,7 +24,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.6.6-SNAPSHOT</version> + <version>7.7.0-SNAPSHOT</version> </parent> <artifactId>client-runner</artifactId> ===================================== common-dto/pom.xml ===================================== @@ -25,7 +25,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.6.6-SNAPSHOT</version> + <version>7.7.0-SNAPSHOT</version> </parent> <groupId>fr.ird.observe.toolkit</groupId> ===================================== common-persistence/pom.xml ===================================== @@ -25,7 +25,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.6.6-SNAPSHOT</version> + <version>7.7.0-SNAPSHOT</version> </parent> <groupId>fr.ird.observe.toolkit</groupId> ===================================== common-service/pom.xml ===================================== @@ -25,7 +25,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.6.6-SNAPSHOT</version> + <version>7.7.0-SNAPSHOT</version> </parent> <groupId>fr.ird.observe.toolkit</groupId> ===================================== common-validation/pom.xml ===================================== @@ -25,7 +25,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.6.6-SNAPSHOT</version> + <version>7.7.0-SNAPSHOT</version> </parent> <groupId>fr.ird.observe.toolkit</groupId> ===================================== dto/pom.xml ===================================== @@ -25,7 +25,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.6.6-SNAPSHOT</version> + <version>7.7.0-SNAPSHOT</version> </parent> <artifactId>dto</artifactId> ===================================== observe-i18n/pom.xml ===================================== @@ -24,7 +24,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.6.6-SNAPSHOT</version> + <version>7.7.0-SNAPSHOT</version> </parent> <artifactId>observe-i18n</artifactId> ===================================== observe/pom.xml ===================================== @@ -24,7 +24,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.6.6-SNAPSHOT</version> + <version>7.7.0-SNAPSHOT</version> </parent> <artifactId>observe</artifactId> ===================================== persistence/pom.xml ===================================== @@ -24,7 +24,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.6.6-SNAPSHOT</version> + <version>7.7.0-SNAPSHOT</version> </parent> <artifactId>persistence</artifactId> ===================================== persistence/src/main/resources/db/migration/7.4/03_rename_referential-H2.sql ===================================== @@ -29,7 +29,7 @@ INSERT INTO observe_longline.StomachFullness(topiaId, topiaVersion, topiaCreateD ALTER TABLE observe_longline.Catch ADD COLUMN discardHealthStatus VARCHAR(255); ALTER TABLE observe_longline.Catch ADD COLUMN catchHealthStatus VARCHAR(255); ALTER TABLE observe_longline.Catch ADD COLUMN stomachFullness VARCHAR(255); -UPDATE observe_longline.Catch SET discardHealthStatus = REPLACE(discardHealthStatus, 'Healthness','HealthStatus'), catchHealthStatus = REPLACE(catchHealthStatus, 'Healthness','HealthStatus'), stomachFullness = REPLACE(stomachFullness, 'StomacFullness','StomachFullness'); +UPDATE observe_longline.Catch SET discardHealthStatus = REPLACE(discardHealthness, 'Healthness', 'HealthStatus'), catchHealthStatus = REPLACE(catchHealthness, 'Healthness', 'HealthStatus'), stomachFullness = REPLACE(stomacFullness, 'StomacFullness','StomachFullness'); ALTER TABLE observe_longline.Catch DROP COLUMN discardHealthness; ALTER TABLE observe_longline.Catch DROP COLUMN catchHealthness; ALTER TABLE observe_longline.Catch DROP COLUMN stomacFullness; ===================================== persistence/src/main/resources/db/migration/7.4/03_rename_referential-PG.sql ===================================== @@ -28,7 +28,7 @@ INSERT INTO observe_longline.StomachFullness(topiaId, topiaVersion, topiaCreateD ALTER TABLE observe_longline.Catch ADD COLUMN discardHealthStatus VARCHAR(255); ALTER TABLE observe_longline.Catch ADD COLUMN catchHealthStatus VARCHAR(255); ALTER TABLE observe_longline.Catch ADD COLUMN stomachFullness VARCHAR(255); -UPDATE observe_longline.Catch SET discardHealthStatus = REPLACE(discardHealthStatus, 'Healthness','HealthStatus'), catchHealthStatus = REPLACE(catchHealthStatus, 'Healthness','HealthStatus'), stomachFullness = REPLACE(stomachFullness, 'StomacFullness','StomachFullness'); +UPDATE observe_longline.Catch SET discardHealthStatus = REPLACE(discardHealthness, 'Healthness', 'HealthStatus'), catchHealthStatus = REPLACE(catchHealthness, 'Healthness', 'HealthStatus'), stomachFullness = REPLACE(stomacFullness, 'StomacFullness','StomachFullness'); ALTER TABLE observe_longline.Catch DROP COLUMN discardHealthness CASCADE; ALTER TABLE observe_longline.Catch DROP COLUMN catchHealthness CASCADE; ALTER TABLE observe_longline.Catch DROP COLUMN stomacFullness CASCADE; ===================================== pom.xml ===================================== @@ -29,7 +29,7 @@ <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.6.6-SNAPSHOT</version> + <version>7.7.0-SNAPSHOT</version> <packaging>pom</packaging> <name>ObServe :: Pom</name> ===================================== server-configuration/pom.xml ===================================== @@ -24,7 +24,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.6.6-SNAPSHOT</version> + <version>7.7.0-SNAPSHOT</version> </parent> <artifactId>server-configuration</artifactId> @@ -118,7 +118,7 @@ <dependency> <groupId>fr.ird.observe</groupId> <artifactId>services</artifactId> - <version>7.6.6-SNAPSHOT</version> + <version>7.7.0-SNAPSHOT</version> <scope>compile</scope> </dependency> ===================================== server-core/pom.xml ===================================== @@ -25,7 +25,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.6.6-SNAPSHOT</version> + <version>7.7.0-SNAPSHOT</version> </parent> <artifactId>server-core</artifactId> ===================================== server-runner/pom.xml ===================================== @@ -25,7 +25,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.6.6-SNAPSHOT</version> + <version>7.7.0-SNAPSHOT</version> </parent> <artifactId>server-runner</artifactId> ===================================== services-client/pom.xml ===================================== @@ -25,7 +25,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.6.6-SNAPSHOT</version> + <version>7.7.0-SNAPSHOT</version> </parent> <artifactId>services-client</artifactId> ===================================== services-local/pom.xml ===================================== @@ -25,7 +25,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.6.6-SNAPSHOT</version> + <version>7.7.0-SNAPSHOT</version> </parent> <artifactId>services-local</artifactId> ===================================== services/pom.xml ===================================== @@ -25,7 +25,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.6.6-SNAPSHOT</version> + <version>7.7.0-SNAPSHOT</version> </parent> <artifactId>services</artifactId> ===================================== templates/pom.xml ===================================== @@ -24,7 +24,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.6.6-SNAPSHOT</version> + <version>7.7.0-SNAPSHOT</version> </parent> <groupId>fr.ird.observe.toolkit</groupId> ===================================== test/pom.xml ===================================== @@ -24,7 +24,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.6.6-SNAPSHOT</version> + <version>7.7.0-SNAPSHOT</version> </parent> <artifactId>test</artifactId> ===================================== test/src/main/resources/db/7.6/dataForTestLongline.sql.gz ===================================== Binary files a/test/src/main/resources/db/7.6/dataForTestLongline.sql.gz and b/test/src/main/resources/db/7.6/dataForTestLongline.sql.gz differ ===================================== test/src/main/resources/db/7.6/dataForTestSeine.sql.gz ===================================== Binary files a/test/src/main/resources/db/7.6/dataForTestSeine.sql.gz and b/test/src/main/resources/db/7.6/dataForTestSeine.sql.gz differ ===================================== test/src/main/resources/db/7.6/empty_h2.sql.gz ===================================== Binary files a/test/src/main/resources/db/7.6/empty_h2.sql.gz and b/test/src/main/resources/db/7.6/empty_h2.sql.gz differ ===================================== test/src/main/resources/db/7.6/empty_pg.sql.gz ===================================== Binary files a/test/src/main/resources/db/7.6/empty_pg.sql.gz and b/test/src/main/resources/db/7.6/empty_pg.sql.gz differ ===================================== test/src/main/resources/db/7.6/referentiel.sql.gz ===================================== Binary files a/test/src/main/resources/db/7.6/referentiel.sql.gz and b/test/src/main/resources/db/7.6/referentiel.sql.gz differ ===================================== toolbox-maven-plugin/pom.xml ===================================== @@ -24,7 +24,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.6.6-SNAPSHOT</version> + <version>7.7.0-SNAPSHOT</version> </parent> <groupId>fr.ird.observe.toolkit</groupId> ===================================== validation/pom.xml ===================================== @@ -24,7 +24,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.6.6-SNAPSHOT</version> + <version>7.7.0-SNAPSHOT</version> </parent> <artifactId>validation</artifactId> View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/73b7a9101f2d021761dfee26… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/73b7a9101f2d021761dfee26… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop-7.x] [LL] Perte des données saisies "catchhealthstatus" et "discardhealthstatus"...
by Tony CHEMIT Nov. 1, 2020

Nov. 1, 2020

Tony CHEMIT pushed to branch develop-7.x at ultreiaio / ird-observe Commits: 73b7a910 by Tony Chemit at 2020-11-01T10:37:51+01:00 [LL] Perte des données saisies "catchhealthstatus" et "discardhealthstatus" dans table "catch" depuis le passage à 7.6.2 - Closes #1624 - - - - - 2 changed files: - persistence/src/main/resources/db/migration/7.4/03_rename_referential-H2.sql - persistence/src/main/resources/db/migration/7.4/03_rename_referential-PG.sql Changes: ===================================== persistence/src/main/resources/db/migration/7.4/03_rename_referential-H2.sql ===================================== @@ -29,7 +29,7 @@ INSERT INTO observe_longline.StomachFullness(topiaId, topiaVersion, topiaCreateD ALTER TABLE observe_longline.Catch ADD COLUMN discardHealthStatus VARCHAR(255); ALTER TABLE observe_longline.Catch ADD COLUMN catchHealthStatus VARCHAR(255); ALTER TABLE observe_longline.Catch ADD COLUMN stomachFullness VARCHAR(255); -UPDATE observe_longline.Catch SET discardHealthStatus = REPLACE(discardHealthStatus, 'Healthness','HealthStatus'), catchHealthStatus = REPLACE(catchHealthStatus, 'Healthness','HealthStatus'), stomachFullness = REPLACE(stomachFullness, 'StomacFullness','StomachFullness'); +UPDATE observe_longline.Catch SET discardHealthStatus = REPLACE(discardHealthness, 'Healthness', 'HealthStatus'), catchHealthStatus = REPLACE(catchHealthness, 'Healthness', 'HealthStatus'), stomachFullness = REPLACE(stomacFullness, 'StomacFullness','StomachFullness'); ALTER TABLE observe_longline.Catch DROP COLUMN discardHealthness; ALTER TABLE observe_longline.Catch DROP COLUMN catchHealthness; ALTER TABLE observe_longline.Catch DROP COLUMN stomacFullness; ===================================== persistence/src/main/resources/db/migration/7.4/03_rename_referential-PG.sql ===================================== @@ -28,7 +28,7 @@ INSERT INTO observe_longline.StomachFullness(topiaId, topiaVersion, topiaCreateD ALTER TABLE observe_longline.Catch ADD COLUMN discardHealthStatus VARCHAR(255); ALTER TABLE observe_longline.Catch ADD COLUMN catchHealthStatus VARCHAR(255); ALTER TABLE observe_longline.Catch ADD COLUMN stomachFullness VARCHAR(255); -UPDATE observe_longline.Catch SET discardHealthStatus = REPLACE(discardHealthStatus, 'Healthness','HealthStatus'), catchHealthStatus = REPLACE(catchHealthStatus, 'Healthness','HealthStatus'), stomachFullness = REPLACE(stomachFullness, 'StomacFullness','StomachFullness'); +UPDATE observe_longline.Catch SET discardHealthStatus = REPLACE(discardHealthness, 'Healthness', 'HealthStatus'), catchHealthStatus = REPLACE(catchHealthness, 'Healthness', 'HealthStatus'), stomachFullness = REPLACE(stomacFullness, 'StomacFullness','StomachFullness'); ALTER TABLE observe_longline.Catch DROP COLUMN discardHealthness CASCADE; ALTER TABLE observe_longline.Catch DROP COLUMN catchHealthness CASCADE; ALTER TABLE observe_longline.Catch DROP COLUMN stomacFullness CASCADE; View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/73b7a9101f2d021761dfee260… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/73b7a9101f2d021761dfee260… You're receiving this email because of your account on gitlab.com.

1 0