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/73b7a9101f2d021761dfee260... -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/73b7a9101f2d021761dfee260... You're receiving this email because of your account on gitlab.com.