September 2023 - Observe-commits - mailman.cloud.codelutin.com

[Git][ultreiaio/ird-observe][develop] 3 commits: add specs pdf to gitignore
by Tony CHEMIT (＠tchemit) 30 Sep '23

30 Sep '23

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: aa23ea72 by Tony Chemit at 2023-09-25T19:44:17+02:00 add specs pdf to gitignore - - - - - 36c083cb by Tony Chemit at 2023-09-30T11:09:24+02:00 Erreur sur ajout d'un orin dans LL / Observations / Composition globale - Closes #2790 - - - - - c3e2e386 by Tony Chemit at 2023-09-30T11:09:24+02:00 update pom - - - - - 4 changed files: - .gitignore - client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/observation/SetGlobalCompositionUI.jaxx - client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/observation/SetGlobalCompositionUI.jcss - pom.xml Changes: ===================================== .gitignore ===================================== @@ -29,7 +29,7 @@ server/runner/src/main/assembly/dist/config/observe-server* /*/*/*/.mvn/i18n-configuration.properties /*/*/*/*/.mvn/i18n-configuration.properties /*/*/*/*/*/.mvn/i18n-configuration.properties -doc/specs/*/* +doc/specs/*/*.pdf /*/src/site/markdown/index.md /*/*/src/site/markdown/index.md /*/*/*/src/site/markdown/index.md ===================================== client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/observation/SetGlobalCompositionUI.jaxx ===================================== @@ -106,4 +106,5 @@ <SetBranchlinesCompositionUIModelStates id='branchlinesCompositionStates' initializer="branchlinesCompositionUI.getModel().getStates()"/> <SetHooksCompositionUIModelStates id='hooksCompositionStates' initializer="hooksCompositionUI.getModel().getStates()"/> <SetBaitsCompositionUIModelStates id='baitsCompositionStates' initializer="baitsCompositionUI.getModel().getStates()"/> + <JButton id="save"/> </fr.ird.observe.client.datasource.editor.api.content.data.simple.ContentSimpleUI> ===================================== client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/observation/SetGlobalCompositionUI.jcss ===================================== @@ -48,3 +48,7 @@ #baitsCompositionUI { _tab:{"baitsCompositionTab"}; } + +#save { + enabled:{states.isModified() && states.isValid() && !(floatlinesCompositionStates.isCanSaveRow() || branchlinesCompositionStates.isCanSaveRow() || hooksCompositionStates.isCanSaveRow() || baitsCompositionStates.isCanSaveRow())}; +} \ No newline at end of file ===================================== pom.xml ===================================== @@ -23,7 +23,7 @@ <parent> <groupId>io.ultreia.maven</groupId> <artifactId>pom</artifactId> - <version>2023.44</version> + <version>2023.45</version> </parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/e2af5abffe4deef80c7113d7… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/e2af5abffe4deef80c7113d7… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][pages] Site checkin for project ObServe (version 9.2.0-SNAPSHOT)
by Tony CHEMIT (＠tchemit) 25 Sep '23

25 Sep '23

Tony CHEMIT pushed to branch pages at ultreiaio / ird-observe Commits: 1475301e by Tony Chemit at 2023-09-25T19:39:36+02:00 Site checkin for project ObServe (version 9.2.0-SNAPSHOT) - - - - - 9 changed files: - 9.2.0-SNAPSHOT/CHANGELOG.html - 9.2.0-SNAPSHOT/architecture-logicielle.html - 9.2.0-SNAPSHOT/avdth/common.html - 9.2.0-SNAPSHOT/avdth/index.html - 9.2.0-SNAPSHOT/avdth/landing.html - 9.2.0-SNAPSHOT/avdth/local_market.html - 9.2.0-SNAPSHOT/avdth/logbook.html - 9.2.0-SNAPSHOT/avdth/referential.html - 9.2.0-SNAPSHOT/avdth/sample.html The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/1475301e0a9990b0cd89738b6… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/1475301e0a9990b0cd89738b6… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] 2 commits: Ajout de caractéristiques autorisées sur des équipements - Closes #2787
by Tony CHEMIT (＠tchemit) 17 Sep '23

17 Sep '23

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 0327b7ba by Tony Chemit at 2023-09-17T13:41:41+02:00 Ajout de caractéristiques autorisées sur des équipements - Closes #2787 - - - - - e2af5abf by Tony Chemit at 2023-09-17T13:41:42+02:00 Supprimer les valeurs ```None``` des identifiants de balises via la migration classique. - Closes #2788 - - - - - 6 changed files: - core/persistence/migration/src/main/java/fr/ird/observe/spi/migration/v9/DataSourceMigrationForVersion_9_2.java - + core/persistence/migration/src/main/resources/db/migration/v9/9.2/13_issue-2787-common.sql - + core/persistence/migration/src/main/resources/db/migration/v9/9.2/14_issue-2788-common.sql - core/persistence/test/src/test/resources/fixtures/persistence/table_count/referential.properties - core/services/test/src/main/resources/fixtures/fr/ird/observe/services/service/ValidateService-referentialResult-common.json - model/src/main/resources/fixtures/global.properties Changes: ===================================== core/persistence/migration/src/main/java/fr/ird/observe/spi/migration/v9/DataSourceMigrationForVersion_9_2.java ===================================== @@ -125,6 +125,12 @@ public class DataSourceMigrationForVersion_9_2 extends ByMajorMigrationVersionRe } // See https://gitlab.com/ultreiaio/ird-observe/-/issues/2765 addNewTable(executor, withIds, "12_01_issue-2765", "table-common_gear_associations"); + if (withIds) { + // See https://gitlab.com/ultreiaio/ird-observe/-/issues/2787 + executor.addScript("13", "issue-2787"); + // See https://gitlab.com/ultreiaio/ird-observe/-/issues/2788 + executor.addScript("14", "issue-2788"); + } } ===================================== core/persistence/migration/src/main/resources/db/migration/v9/9.2/13_issue-2787-common.sql ===================================== @@ -0,0 +1,83 @@ +--- +-- #%L +-- ObServe Core :: Persistence :: Migration +-- %% +-- Copyright (C) 2008 - 2023 IRD, Ultreia.io +-- %% +-- This program is free software: you can redistribute it and/or modify +-- it under the terms of the GNU General Public License as +-- published by the Free Software Foundation, either version 3 of the +-- License, or (at your option) any later version. +-- +-- This program is distributed in the hope that it will be useful, +-- but WITHOUT ANY WARRANTY; without even the implied warranty of +-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +-- GNU General Public License for more details. +-- +-- You should have received a copy of the GNU General Public +-- License along with this program. If not, see +-- <http://www.gnu.org/licenses/gpl-3.0.html>. +-- #L% +--- +-- add caracteristic 27 +INSERT INTO common.GearCharacteristic (TOPIAID, TOPIAVERSION, TOPIACREATEDATE, LASTUPDATEDATE, CODE, URI, HOMEID, NEEDCOMMENT, STATUS, LABEL1, LABEL2, LABEL3, LABEL4, LABEL5, LABEL6, LABEL7, LABEL8, UNIT, GEARCHARACTERISTICTYPE) VALUES ('fr.ird.referential.common.GearCharacteristic#${REFERENTIAL_PREFIX}027', 0, ${CURRENT_DATE}, ${CURRENT_TIMESTAMP}, '27', null, null, false, 1, 'Electric power', 'Puissance électrique', 'Energia electrica', null, null, null, null, null, 'kW', 'fr.ird.referential.common.GearCharacteristicType#1239832686123#0.3'); + +-- add characteristic (4, 5, 15 and 27) to gear 2 +INSERT INTO common.gear_allowedGearCharacteristic(gear, gearCharacteristic) VALUES ('fr.ird.referential.common.Gear#1239832686125#0.1', 'fr.ird.referential.common.GearCharacteristic#1239832686124#0.4'); +INSERT INTO common.gear_allowedGearCharacteristic(gear, gearCharacteristic) VALUES ( 'fr.ird.referential.common.Gear#1239832686125#0.1', 'fr.ird.referential.common.GearCharacteristic#1239832686124#0.5'); +INSERT INTO common.gear_allowedGearCharacteristic(gear, gearCharacteristic) VALUES ( 'fr.ird.referential.common.Gear#1239832686125#0.1', 'fr.ird.referential.common.GearCharacteristic#1239832686124#0.1'); +INSERT INTO common.gear_allowedGearCharacteristic(gear, gearCharacteristic) VALUES ( 'fr.ird.referential.common.Gear#1239832686125#0.1', 'fr.ird.referential.common.GearCharacteristic#${REFERENTIAL_PREFIX}027'); + +-- add characteristic (4, 5, 15 and 27) to gear 3 +INSERT INTO common.gear_allowedGearCharacteristic(gear, gearCharacteristic) VALUES ('fr.ird.referential.common.Gear#1239832686125#0.2', 'fr.ird.referential.common.GearCharacteristic#1239832686124#0.4'); +INSERT INTO common.gear_allowedGearCharacteristic(gear, gearCharacteristic) VALUES ('fr.ird.referential.common.Gear#1239832686125#0.2', 'fr.ird.referential.common.GearCharacteristic#1239832686124#0.5'); +INSERT INTO common.gear_allowedGearCharacteristic(gear, gearCharacteristic) VALUES ('fr.ird.referential.common.Gear#1239832686125#0.2', 'fr.ird.referential.common.GearCharacteristic#1239832686124#0.1'); +INSERT INTO common.gear_allowedGearCharacteristic(gear, gearCharacteristic) VALUES ('fr.ird.referential.common.Gear#1239832686125#0.2', 'fr.ird.referential.common.GearCharacteristic#${REFERENTIAL_PREFIX}027'); + +-- add characteristic (4, 5, 15 and 27) to gear 4 +INSERT INTO common.gear_allowedGearCharacteristic(gear, gearCharacteristic) VALUES ('fr.ird.referential.common.Gear#1239832686125#0.3', 'fr.ird.referential.common.GearCharacteristic#1239832686124#0.4'); +INSERT INTO common.gear_allowedGearCharacteristic(gear, gearCharacteristic) VALUES ('fr.ird.referential.common.Gear#1239832686125#0.3', 'fr.ird.referential.common.GearCharacteristic#1239832686124#0.5'); +INSERT INTO common.gear_allowedGearCharacteristic(gear, gearCharacteristic) VALUES ('fr.ird.referential.common.Gear#1239832686125#0.3', 'fr.ird.referential.common.GearCharacteristic#1239832686124#0.1'); +INSERT INTO common.gear_allowedGearCharacteristic(gear, gearCharacteristic) VALUES ('fr.ird.referential.common.Gear#1239832686125#0.3', 'fr.ird.referential.common.GearCharacteristic#${REFERENTIAL_PREFIX}027'); + +-- add characteristic (4, 5, 15 and 27) to gear 5 +INSERT INTO common.gear_allowedGearCharacteristic(gear, gearCharacteristic) VALUES ('fr.ird.referential.common.Gear#1239832686125#0.4', 'fr.ird.referential.common.GearCharacteristic#1239832686124#0.4'); +INSERT INTO common.gear_allowedGearCharacteristic(gear, gearCharacteristic) VALUES ('fr.ird.referential.common.Gear#1239832686125#0.4', 'fr.ird.referential.common.GearCharacteristic#1239832686124#0.5'); +-- INSERT INTO common.gear_allowedGearCharacteristic(gear, gearCharacteristic) VALUES ('fr.ird.referential.common.Gear#1239832686125#0.4', 'fr.ird.referential.common.GearCharacteristic#1239832686124#0.1'); +INSERT INTO common.gear_allowedGearCharacteristic(gear, gearCharacteristic) VALUES ('fr.ird.referential.common.Gear#1239832686125#0.4', 'fr.ird.referential.common.GearCharacteristic#${REFERENTIAL_PREFIX}027'); + +-- add characteristic (4, 5, 15 and 27) to gear 6 +INSERT INTO common.gear_allowedGearCharacteristic(gear, gearCharacteristic) VALUES ('fr.ird.referential.common.Gear#1239832686125#0.5', 'fr.ird.referential.common.GearCharacteristic#1239832686124#0.4'); +INSERT INTO common.gear_allowedGearCharacteristic(gear, gearCharacteristic) VALUES ('fr.ird.referential.common.Gear#1239832686125#0.5', 'fr.ird.referential.common.GearCharacteristic#1239832686124#0.5'); +INSERT INTO common.gear_allowedGearCharacteristic(gear, gearCharacteristic) VALUES ('fr.ird.referential.common.Gear#1239832686125#0.5', 'fr.ird.referential.common.GearCharacteristic#1239832686124#0.1'); +INSERT INTO common.gear_allowedGearCharacteristic(gear, gearCharacteristic) VALUES ('fr.ird.referential.common.Gear#1239832686125#0.5', 'fr.ird.referential.common.GearCharacteristic#${REFERENTIAL_PREFIX}027'); + +-- add characteristic (4, 5, 15 and 27) to gear 32 +INSERT INTO common.gear_allowedGearCharacteristic(gear, gearCharacteristic) VALUES ('fr.ird.referential.common.Gear#1464000000000#32', 'fr.ird.referential.common.GearCharacteristic#1239832686124#0.4'); +INSERT INTO common.gear_allowedGearCharacteristic(gear, gearCharacteristic) VALUES ('fr.ird.referential.common.Gear#1464000000000#32', 'fr.ird.referential.common.GearCharacteristic#1239832686124#0.5'); +INSERT INTO common.gear_allowedGearCharacteristic(gear, gearCharacteristic) VALUES ('fr.ird.referential.common.Gear#1464000000000#32', 'fr.ird.referential.common.GearCharacteristic#1239832686124#0.1'); +INSERT INTO common.gear_allowedGearCharacteristic(gear, gearCharacteristic) VALUES ('fr.ird.referential.common.Gear#1464000000000#32', 'fr.ird.referential.common.GearCharacteristic#${REFERENTIAL_PREFIX}027'); + +-- add characteristic (4, 5, 15 and 27) to gear 34 +INSERT INTO common.gear_allowedGearCharacteristic(gear, gearCharacteristic) VALUES ('fr.ird.referential.common.Gear#1464000000000#34', 'fr.ird.referential.common.GearCharacteristic#1239832686124#0.4'); +INSERT INTO common.gear_allowedGearCharacteristic(gear, gearCharacteristic) VALUES ('fr.ird.referential.common.Gear#1464000000000#34', 'fr.ird.referential.common.GearCharacteristic#1239832686124#0.5'); +INSERT INTO common.gear_allowedGearCharacteristic(gear, gearCharacteristic) VALUES ('fr.ird.referential.common.Gear#1464000000000#34', 'fr.ird.referential.common.GearCharacteristic#1239832686124#0.1'); +INSERT INTO common.gear_allowedGearCharacteristic(gear, gearCharacteristic) VALUES ('fr.ird.referential.common.Gear#1464000000000#34', 'fr.ird.referential.common.GearCharacteristic#${REFERENTIAL_PREFIX}027'); + +-- add characteristic (4, 5, 15 and 27) to gear 35 +INSERT INTO common.gear_allowedGearCharacteristic(gear, gearCharacteristic) VALUES ('fr.ird.referential.common.Gear#1464000000000#35', 'fr.ird.referential.common.GearCharacteristic#1239832686124#0.4'); +INSERT INTO common.gear_allowedGearCharacteristic(gear, gearCharacteristic) VALUES ('fr.ird.referential.common.Gear#1464000000000#35', 'fr.ird.referential.common.GearCharacteristic#1239832686124#0.5'); +INSERT INTO common.gear_allowedGearCharacteristic(gear, gearCharacteristic) VALUES ('fr.ird.referential.common.Gear#1464000000000#35', 'fr.ird.referential.common.GearCharacteristic#1239832686124#0.1'); +INSERT INTO common.gear_allowedGearCharacteristic(gear, gearCharacteristic) VALUES ('fr.ird.referential.common.Gear#1464000000000#35', 'fr.ird.referential.common.GearCharacteristic#${REFERENTIAL_PREFIX}027'); + +-- add characteristic (4, 5, 15 and 27) to gear 36 +INSERT INTO common.gear_allowedGearCharacteristic(gear, gearCharacteristic) VALUES ('fr.ird.referential.common.Gear#1464000000000#36', 'fr.ird.referential.common.GearCharacteristic#1239832686124#0.4'); +INSERT INTO common.gear_allowedGearCharacteristic(gear, gearCharacteristic) VALUES ('fr.ird.referential.common.Gear#1464000000000#36', 'fr.ird.referential.common.GearCharacteristic#1239832686124#0.5'); +INSERT INTO common.gear_allowedGearCharacteristic(gear, gearCharacteristic) VALUES ('fr.ird.referential.common.Gear#1464000000000#36', 'fr.ird.referential.common.GearCharacteristic#1239832686124#0.1'); +INSERT INTO common.gear_allowedGearCharacteristic(gear, gearCharacteristic) VALUES ('fr.ird.referential.common.Gear#1464000000000#36', 'fr.ird.referential.common.GearCharacteristic#${REFERENTIAL_PREFIX}027'); + +-- add characteristic (4, 5, 15 and 27) to gear 37 +INSERT INTO common.gear_allowedGearCharacteristic(gear, gearCharacteristic) VALUES ('fr.ird.referential.common.Gear#1464000000000#37', 'fr.ird.referential.common.GearCharacteristic#1239832686124#0.4'); +INSERT INTO common.gear_allowedGearCharacteristic(gear, gearCharacteristic) VALUES ('fr.ird.referential.common.Gear#1464000000000#37', 'fr.ird.referential.common.GearCharacteristic#1239832686124#0.5'); +INSERT INTO common.gear_allowedGearCharacteristic(gear, gearCharacteristic) VALUES ('fr.ird.referential.common.Gear#1464000000000#37', 'fr.ird.referential.common.GearCharacteristic#1239832686124#0.1'); +INSERT INTO common.gear_allowedGearCharacteristic(gear, gearCharacteristic) VALUES ('fr.ird.referential.common.Gear#1464000000000#37', 'fr.ird.referential.common.GearCharacteristic#${REFERENTIAL_PREFIX}027'); ===================================== core/persistence/migration/src/main/resources/db/migration/v9/9.2/14_issue-2788-common.sql ===================================== @@ -0,0 +1,22 @@ +--- +-- #%L +-- ObServe Core :: Persistence :: Migration +-- %% +-- Copyright (C) 2008 - 2023 IRD, Ultreia.io +-- %% +-- This program is free software: you can redistribute it and/or modify +-- it under the terms of the GNU General Public License as +-- published by the Free Software Foundation, either version 3 of the +-- License, or (at your option) any later version. +-- +-- This program is distributed in the hope that it will be useful, +-- but WITHOUT ANY WARRANTY; without even the implied warranty of +-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +-- GNU General Public License for more details. +-- +-- You should have received a copy of the GNU General Public +-- License along with this program. If not, see +-- <http://www.gnu.org/licenses/gpl-3.0.html>. +-- #L% +--- +UPDATE ps_logbook.TransmittingBuoy SET code = NULL WHERE code ILIKE 'None'; ===================================== core/persistence/test/src/test/resources/fixtures/persistence/table_count/referential.properties ===================================== @@ -23,7 +23,7 @@ common.country=91 common.dataQuality=5 common.fpaZone=45 common.gear=38 -common.gearCharacteristic=46 +common.gearCharacteristic=47 common.gearCharacteristicListItem=220 common.gearCharacteristicType=8 common.harbour=98 @@ -114,7 +114,7 @@ ps_observation.reasonForDiscard=5 ps_observation.speciesStatus=6 ps_observation.surroundingActivity=8 -common.gear_allowedGearCharacteristic=43 +common.gear_allowedGearCharacteristic=82 common.gear_defaultGearCharacteristic=39 common.species_ocean=553 common.speciesGroup_speciesGroupReleaseMode=19 ===================================== core/services/test/src/main/resources/fixtures/fr/ird/observe/services/service/ValidateService-referentialResult-common.json ===================================== @@ -4387,6 +4387,22 @@ } ] }, + { + "datum": { + "text": "27##Puissance électrique##kW", + "type": "fr.ird.observe.dto.referential.common.GearCharacteristicDto", + "id": "fr.ird.referential.common.GearCharacteristic#1464000000000#027", + "topiaVersion": 0, + "lastUpdateDate": "2023-09-01T00:00:00.000Z" + }, + "messages": [ + { + "fieldName": "uri", + "scope": "WARNING", + "message": "Le champ n'est pas renseigné." + } + ] + }, { "datum": { "text": "FURUNO - CI-30##001_001", ===================================== model/src/main/resources/fixtures/global.properties ===================================== @@ -25,4 +25,4 @@ REFERENCE_DATA_COUNT=68 ENTITIES_LIMIT_SIZE=100 # fr.ird.observe.services.service.referential.ReferentialService # fr.ird.observe.services.local.service.referential.DifferentialModelTest -REFERENTIAL_COUNT=4356 +REFERENTIAL_COUNT=4357 View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/068ecd365a55ce6f04586ebd… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/068ecd365a55ce6f04586ebd… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] 2 commits: Ajout de caractéristiques autorisées sur des équipements - See #2787
by Tony CHEMIT (＠tchemit) 17 Sep '23

17 Sep '23

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 590e4e04 by Tony Chemit at 2023-09-17T13:31:14+02:00 Ajout de caractéristiques autorisées sur des équipements - See #2787 - - - - - 068ecd36 by Tony Chemit at 2023-09-17T13:31:14+02:00 Supprimer les valeurs ```None``` des identifiants de balises via la migration classique. - See #2788 - - - - - 6 changed files: - core/persistence/migration/src/main/java/fr/ird/observe/spi/migration/v9/DataSourceMigrationForVersion_9_2.java - + core/persistence/migration/src/main/resources/db/migration/v9/9.2/13_issue-2787-common.sql - + core/persistence/migration/src/main/resources/db/migration/v9/9.2/14_issue-2788-common.sql - core/persistence/test/src/test/resources/fixtures/persistence/table_count/referential.properties - core/services/test/src/main/resources/fixtures/fr/ird/observe/services/service/ValidateService-referentialResult-common.json - model/src/main/resources/fixtures/global.properties Changes: ===================================== core/persistence/migration/src/main/java/fr/ird/observe/spi/migration/v9/DataSourceMigrationForVersion_9_2.java ===================================== @@ -125,6 +125,12 @@ public class DataSourceMigrationForVersion_9_2 extends ByMajorMigrationVersionRe } // See https://gitlab.com/ultreiaio/ird-observe/-/issues/2765 addNewTable(executor, withIds, "12_01_issue-2765", "table-common_gear_associations"); + if (withIds) { + // See https://gitlab.com/ultreiaio/ird-observe/-/issues/2787 + executor.addScript("13", "issue-2787"); + // See https://gitlab.com/ultreiaio/ird-observe/-/issues/2788 + executor.addScript("14", "issue-2788"); + } } ===================================== core/persistence/migration/src/main/resources/db/migration/v9/9.2/13_issue-2787-common.sql ===================================== @@ -0,0 +1,83 @@ +--- +-- #%L +-- ObServe Core :: Persistence :: Migration +-- %% +-- Copyright (C) 2008 - 2023 IRD, Ultreia.io +-- %% +-- This program is free software: you can redistribute it and/or modify +-- it under the terms of the GNU General Public License as +-- published by the Free Software Foundation, either version 3 of the +-- License, or (at your option) any later version. +-- +-- This program is distributed in the hope that it will be useful, +-- but WITHOUT ANY WARRANTY; without even the implied warranty of +-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +-- GNU General Public License for more details. +-- +-- You should have received a copy of the GNU General Public +-- License along with this program. If not, see +-- <http://www.gnu.org/licenses/gpl-3.0.html>. +-- #L% +--- +-- add caracteristic 27 +INSERT INTO common.GearCharacteristic (TOPIAID, TOPIAVERSION, TOPIACREATEDATE, LASTUPDATEDATE, CODE, URI, HOMEID, NEEDCOMMENT, STATUS, LABEL1, LABEL2, LABEL3, LABEL4, LABEL5, LABEL6, LABEL7, LABEL8, UNIT, GEARCHARACTERISTICTYPE) VALUES ('fr.ird.referential.common.GearCharacteristic#${REFERENTIAL_PREFIX}027', 0, ${CURRENT_DATE}, ${CURRENT_TIMESTAMP}, '27', null, null, false, 1, 'Electric power', 'Puissance électrique', 'Energia electrica', null, null, null, null, null, 'kW', 'fr.ird.referential.common.GearCharacteristicType#1239832686123#0.3'); + +-- add characteristic (4, 5, 15 and 27) to gear 2 +INSERT INTO common.gear_allowedGearCharacteristic(gear, gearCharacteristic) VALUES ('fr.ird.referential.common.Gear#1239832686125#0.1', 'fr.ird.referential.common.GearCharacteristic#1239832686124#0.4'); +INSERT INTO common.gear_allowedGearCharacteristic(gear, gearCharacteristic) VALUES ( 'fr.ird.referential.common.Gear#1239832686125#0.1', 'fr.ird.referential.common.GearCharacteristic#1239832686124#0.5'); +INSERT INTO common.gear_allowedGearCharacteristic(gear, gearCharacteristic) VALUES ( 'fr.ird.referential.common.Gear#1239832686125#0.1', 'fr.ird.referential.common.GearCharacteristic#1239832686124#0.1'); +INSERT INTO common.gear_allowedGearCharacteristic(gear, gearCharacteristic) VALUES ( 'fr.ird.referential.common.Gear#1239832686125#0.1', 'fr.ird.referential.common.GearCharacteristic#${REFERENTIAL_PREFIX}027'); + +-- add characteristic (4, 5, 15 and 27) to gear 3 +INSERT INTO common.gear_allowedGearCharacteristic(gear, gearCharacteristic) VALUES ('fr.ird.referential.common.Gear#1239832686125#0.2', 'fr.ird.referential.common.GearCharacteristic#1239832686124#0.4'); +INSERT INTO common.gear_allowedGearCharacteristic(gear, gearCharacteristic) VALUES ('fr.ird.referential.common.Gear#1239832686125#0.2', 'fr.ird.referential.common.GearCharacteristic#1239832686124#0.5'); +INSERT INTO common.gear_allowedGearCharacteristic(gear, gearCharacteristic) VALUES ('fr.ird.referential.common.Gear#1239832686125#0.2', 'fr.ird.referential.common.GearCharacteristic#1239832686124#0.1'); +INSERT INTO common.gear_allowedGearCharacteristic(gear, gearCharacteristic) VALUES ('fr.ird.referential.common.Gear#1239832686125#0.2', 'fr.ird.referential.common.GearCharacteristic#${REFERENTIAL_PREFIX}027'); + +-- add characteristic (4, 5, 15 and 27) to gear 4 +INSERT INTO common.gear_allowedGearCharacteristic(gear, gearCharacteristic) VALUES ('fr.ird.referential.common.Gear#1239832686125#0.3', 'fr.ird.referential.common.GearCharacteristic#1239832686124#0.4'); +INSERT INTO common.gear_allowedGearCharacteristic(gear, gearCharacteristic) VALUES ('fr.ird.referential.common.Gear#1239832686125#0.3', 'fr.ird.referential.common.GearCharacteristic#1239832686124#0.5'); +INSERT INTO common.gear_allowedGearCharacteristic(gear, gearCharacteristic) VALUES ('fr.ird.referential.common.Gear#1239832686125#0.3', 'fr.ird.referential.common.GearCharacteristic#1239832686124#0.1'); +INSERT INTO common.gear_allowedGearCharacteristic(gear, gearCharacteristic) VALUES ('fr.ird.referential.common.Gear#1239832686125#0.3', 'fr.ird.referential.common.GearCharacteristic#${REFERENTIAL_PREFIX}027'); + +-- add characteristic (4, 5, 15 and 27) to gear 5 +INSERT INTO common.gear_allowedGearCharacteristic(gear, gearCharacteristic) VALUES ('fr.ird.referential.common.Gear#1239832686125#0.4', 'fr.ird.referential.common.GearCharacteristic#1239832686124#0.4'); +INSERT INTO common.gear_allowedGearCharacteristic(gear, gearCharacteristic) VALUES ('fr.ird.referential.common.Gear#1239832686125#0.4', 'fr.ird.referential.common.GearCharacteristic#1239832686124#0.5'); +-- INSERT INTO common.gear_allowedGearCharacteristic(gear, gearCharacteristic) VALUES ('fr.ird.referential.common.Gear#1239832686125#0.4', 'fr.ird.referential.common.GearCharacteristic#1239832686124#0.1'); +INSERT INTO common.gear_allowedGearCharacteristic(gear, gearCharacteristic) VALUES ('fr.ird.referential.common.Gear#1239832686125#0.4', 'fr.ird.referential.common.GearCharacteristic#${REFERENTIAL_PREFIX}027'); + +-- add characteristic (4, 5, 15 and 27) to gear 6 +INSERT INTO common.gear_allowedGearCharacteristic(gear, gearCharacteristic) VALUES ('fr.ird.referential.common.Gear#1239832686125#0.5', 'fr.ird.referential.common.GearCharacteristic#1239832686124#0.4'); +INSERT INTO common.gear_allowedGearCharacteristic(gear, gearCharacteristic) VALUES ('fr.ird.referential.common.Gear#1239832686125#0.5', 'fr.ird.referential.common.GearCharacteristic#1239832686124#0.5'); +INSERT INTO common.gear_allowedGearCharacteristic(gear, gearCharacteristic) VALUES ('fr.ird.referential.common.Gear#1239832686125#0.5', 'fr.ird.referential.common.GearCharacteristic#1239832686124#0.1'); +INSERT INTO common.gear_allowedGearCharacteristic(gear, gearCharacteristic) VALUES ('fr.ird.referential.common.Gear#1239832686125#0.5', 'fr.ird.referential.common.GearCharacteristic#${REFERENTIAL_PREFIX}027'); + +-- add characteristic (4, 5, 15 and 27) to gear 32 +INSERT INTO common.gear_allowedGearCharacteristic(gear, gearCharacteristic) VALUES ('fr.ird.referential.common.Gear#1464000000000#32', 'fr.ird.referential.common.GearCharacteristic#1239832686124#0.4'); +INSERT INTO common.gear_allowedGearCharacteristic(gear, gearCharacteristic) VALUES ('fr.ird.referential.common.Gear#1464000000000#32', 'fr.ird.referential.common.GearCharacteristic#1239832686124#0.5'); +INSERT INTO common.gear_allowedGearCharacteristic(gear, gearCharacteristic) VALUES ('fr.ird.referential.common.Gear#1464000000000#32', 'fr.ird.referential.common.GearCharacteristic#1239832686124#0.1'); +INSERT INTO common.gear_allowedGearCharacteristic(gear, gearCharacteristic) VALUES ('fr.ird.referential.common.Gear#1464000000000#32', 'fr.ird.referential.common.GearCharacteristic#${REFERENTIAL_PREFIX}027'); + +-- add characteristic (4, 5, 15 and 27) to gear 34 +INSERT INTO common.gear_allowedGearCharacteristic(gear, gearCharacteristic) VALUES ('fr.ird.referential.common.Gear#1464000000000#34', 'fr.ird.referential.common.GearCharacteristic#1239832686124#0.4'); +INSERT INTO common.gear_allowedGearCharacteristic(gear, gearCharacteristic) VALUES ('fr.ird.referential.common.Gear#1464000000000#34', 'fr.ird.referential.common.GearCharacteristic#1239832686124#0.5'); +INSERT INTO common.gear_allowedGearCharacteristic(gear, gearCharacteristic) VALUES ('fr.ird.referential.common.Gear#1464000000000#34', 'fr.ird.referential.common.GearCharacteristic#1239832686124#0.1'); +INSERT INTO common.gear_allowedGearCharacteristic(gear, gearCharacteristic) VALUES ('fr.ird.referential.common.Gear#1464000000000#34', 'fr.ird.referential.common.GearCharacteristic#${REFERENTIAL_PREFIX}027'); + +-- add characteristic (4, 5, 15 and 27) to gear 35 +INSERT INTO common.gear_allowedGearCharacteristic(gear, gearCharacteristic) VALUES ('fr.ird.referential.common.Gear#1464000000000#35', 'fr.ird.referential.common.GearCharacteristic#1239832686124#0.4'); +INSERT INTO common.gear_allowedGearCharacteristic(gear, gearCharacteristic) VALUES ('fr.ird.referential.common.Gear#1464000000000#35', 'fr.ird.referential.common.GearCharacteristic#1239832686124#0.5'); +INSERT INTO common.gear_allowedGearCharacteristic(gear, gearCharacteristic) VALUES ('fr.ird.referential.common.Gear#1464000000000#35', 'fr.ird.referential.common.GearCharacteristic#1239832686124#0.1'); +INSERT INTO common.gear_allowedGearCharacteristic(gear, gearCharacteristic) VALUES ('fr.ird.referential.common.Gear#1464000000000#35', 'fr.ird.referential.common.GearCharacteristic#${REFERENTIAL_PREFIX}027'); + +-- add characteristic (4, 5, 15 and 27) to gear 36 +INSERT INTO common.gear_allowedGearCharacteristic(gear, gearCharacteristic) VALUES ('fr.ird.referential.common.Gear#1464000000000#36', 'fr.ird.referential.common.GearCharacteristic#1239832686124#0.4'); +INSERT INTO common.gear_allowedGearCharacteristic(gear, gearCharacteristic) VALUES ('fr.ird.referential.common.Gear#1464000000000#36', 'fr.ird.referential.common.GearCharacteristic#1239832686124#0.5'); +INSERT INTO common.gear_allowedGearCharacteristic(gear, gearCharacteristic) VALUES ('fr.ird.referential.common.Gear#1464000000000#36', 'fr.ird.referential.common.GearCharacteristic#1239832686124#0.1'); +INSERT INTO common.gear_allowedGearCharacteristic(gear, gearCharacteristic) VALUES ('fr.ird.referential.common.Gear#1464000000000#36', 'fr.ird.referential.common.GearCharacteristic#${REFERENTIAL_PREFIX}027'); + +-- add characteristic (4, 5, 15 and 27) to gear 37 +INSERT INTO common.gear_allowedGearCharacteristic(gear, gearCharacteristic) VALUES ('fr.ird.referential.common.Gear#1464000000000#37', 'fr.ird.referential.common.GearCharacteristic#1239832686124#0.4'); +INSERT INTO common.gear_allowedGearCharacteristic(gear, gearCharacteristic) VALUES ('fr.ird.referential.common.Gear#1464000000000#37', 'fr.ird.referential.common.GearCharacteristic#1239832686124#0.5'); +INSERT INTO common.gear_allowedGearCharacteristic(gear, gearCharacteristic) VALUES ('fr.ird.referential.common.Gear#1464000000000#37', 'fr.ird.referential.common.GearCharacteristic#1239832686124#0.1'); +INSERT INTO common.gear_allowedGearCharacteristic(gear, gearCharacteristic) VALUES ('fr.ird.referential.common.Gear#1464000000000#37', 'fr.ird.referential.common.GearCharacteristic#${REFERENTIAL_PREFIX}027'); ===================================== core/persistence/migration/src/main/resources/db/migration/v9/9.2/14_issue-2788-common.sql ===================================== @@ -0,0 +1,22 @@ +--- +-- #%L +-- ObServe Core :: Persistence :: Migration +-- %% +-- Copyright (C) 2008 - 2023 IRD, Ultreia.io +-- %% +-- This program is free software: you can redistribute it and/or modify +-- it under the terms of the GNU General Public License as +-- published by the Free Software Foundation, either version 3 of the +-- License, or (at your option) any later version. +-- +-- This program is distributed in the hope that it will be useful, +-- but WITHOUT ANY WARRANTY; without even the implied warranty of +-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +-- GNU General Public License for more details. +-- +-- You should have received a copy of the GNU General Public +-- License along with this program. If not, see +-- <http://www.gnu.org/licenses/gpl-3.0.html>. +-- #L% +--- +UPDATE ps_logbook.TransmittingBuoy SET code = NULL WHERE code ILIKE 'None'; ===================================== core/persistence/test/src/test/resources/fixtures/persistence/table_count/referential.properties ===================================== @@ -23,7 +23,7 @@ common.country=91 common.dataQuality=5 common.fpaZone=45 common.gear=38 -common.gearCharacteristic=46 +common.gearCharacteristic=47 common.gearCharacteristicListItem=220 common.gearCharacteristicType=8 common.harbour=98 @@ -114,7 +114,7 @@ ps_observation.reasonForDiscard=5 ps_observation.speciesStatus=6 ps_observation.surroundingActivity=8 -common.gear_allowedGearCharacteristic=43 +common.gear_allowedGearCharacteristic=82 common.gear_defaultGearCharacteristic=39 common.species_ocean=553 common.speciesGroup_speciesGroupReleaseMode=19 ===================================== core/services/test/src/main/resources/fixtures/fr/ird/observe/services/service/ValidateService-referentialResult-common.json ===================================== @@ -4387,6 +4387,22 @@ } ] }, + { + "datum": { + "text": "27##Puissance électrique##kW", + "type": "fr.ird.observe.dto.referential.common.GearCharacteristicDto", + "id": "fr.ird.referential.common.GearCharacteristic#1464000000000#027", + "topiaVersion": 0, + "lastUpdateDate": "2023-09-01T00:00:00.000Z" + }, + "messages": [ + { + "fieldName": "uri", + "scope": "WARNING", + "message": "Le champ n'est pas renseigné." + } + ] + }, { "datum": { "text": "FURUNO - CI-30##001_001", ===================================== model/src/main/resources/fixtures/global.properties ===================================== @@ -25,4 +25,4 @@ REFERENCE_DATA_COUNT=68 ENTITIES_LIMIT_SIZE=100 # fr.ird.observe.services.service.referential.ReferentialService # fr.ird.observe.services.local.service.referential.DifferentialModelTest -REFERENTIAL_COUNT=4356 +REFERENTIAL_COUNT=4357 View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/d990702723a226c46f6dd4ec… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/d990702723a226c46f6dd4ec… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] 2 commits: Améliorer le rapport de validation (ajout d'une action tout plier, tout déplier) - See #2215
by Tony CHEMIT (＠tchemit) 17 Sep '23

17 Sep '23

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 121edbe0 by Tony Chemit at 2023-09-16T18:52:09+02:00 Améliorer le rapport de validation (ajout d'une action tout plier, tout déplier) - See #2215 - - - - - d9907027 by Tony Chemit at 2023-09-17T12:32:16+02:00 Ajout de caractéristiques autorisées sur des équipements - See #2787 - - - - - 8 changed files: - client/datasource/actions/src/main/i18n/templates/validationReport_en_GB.ftl - client/datasource/actions/src/main/i18n/templates/validationReport_es_ES.ftl - client/datasource/actions/src/main/i18n/templates/validationReport_fr_FR.ftl - core/persistence/migration/src/main/java/fr/ird/observe/spi/migration/v9/DataSourceMigrationForVersion_9_2.java - + core/persistence/migration/src/main/resources/db/migration/v9/9.2/13_issue-2787-common.sql - core/persistence/test/src/test/resources/fixtures/persistence/table_count/referential.properties - core/services/test/src/main/resources/fixtures/fr/ird/observe/services/service/ValidateService-referentialResult-common.json - model/src/main/resources/fixtures/global.properties Changes: ===================================== client/datasource/actions/src/main/i18n/templates/validationReport_en_GB.ftl ===================================== @@ -163,6 +163,11 @@ ul.messages { list-style-type: none; } + + .action { + cursor: pointer; + user-select: none; + } </style> </head> <body> @@ -191,6 +196,8 @@ <div class="information">To collapse a note, click on icon <span class="caret-down"></span> (Combination with key <b>Shift</b> will also collapse his inner sub-tree).</div> <div class="information">A click on a id will select it automatically.</div> <br/> +<div class="information">To expand all, click on the following icon: <span id="expandAll" class="caretSymbol action"></span>.</div> +<div class="information">To collapse all, click on the following icon: <span id="collapseAll" class="caret-down action"></span>.</div> <#assign rootNode = .data_model.rootNode /> <ul id="result"> <#list rootNode.getChildren() as node> @@ -230,10 +237,22 @@ } } }); - <#if .data_model.modelMode.name() == "REFERENTIEL"> - caret.click(); - </#if> } + let collapseAll = document.getElementById("collapseAll"); + collapseAll.addEventListener("click", function (event) { + for (const caret of document.getElementsByClassName("caret")) { + collapse(caret); + } + }); + let expandAll = document.getElementById("expandAll"); + expandAll.addEventListener("click", function (event) { + for (const caret of document.getElementsByClassName("caret")) { + expand(caret); + } + }); + <#if .data_model.modelMode.name() == "REFERENTIEL"> + expandAll.click(); + </#if> for (const caret of document.getElementsByClassName("leaf")) { let element = caret.parentElement.querySelector(".nested"); if (element != null) { ===================================== client/datasource/actions/src/main/i18n/templates/validationReport_es_ES.ftl ===================================== @@ -26,8 +26,9 @@ <#assign withMessages = node.messagesCount != 0 /> <li> <span id="${node.id}" class="<#if withChildren>caret<#else>leaf</#if>"></span> - <span class="datum">${node.label}</span> <#if node.id?starts_with("fr.ird.referential") || node.id?starts_with("fr.ird.data") > - <span - class="topiaId">${node.id}</span></#if> + <span class="datum">${node.label}</span> <#if node.id?starts_with("fr.ird.referential") || node.id?starts_with("fr.ird.data") > - + <span + class="topiaId">${node.id}</span></#if> <#if withChildren || withMessages> <ul class="nested"> <#if withMessages> @@ -90,6 +91,7 @@ display: inline-block; margin-right: 6px; } + .leaf { margin-top: 6px; } @@ -163,6 +165,11 @@ ul.messages { list-style-type: none; } + + .action { + cursor: pointer; + user-select: none; + } </style> </head> <body> @@ -179,19 +186,34 @@ <span class="<#if scope.name() == "ERROR">error<#else>warning</#if>">${scope.label}</span> </#list> </li> - <li>Velocidad máxima autorizada en el control de las velocidades de las actividades: ${.data_model.validationSpeedMaxValue}</li> - <li>Forzar la validación de las velocidades de las actividades: ${.data_model.validationSpeedEnable?string("yes", "no")}</li> - <li>Forzar la validación de la talla de especies min/max: ${.data_model.validationLengthWeightEnable?string("yes", "no")}</li> - <li>Para que la utilización de referenciales obsoletos sea autorizado (se advertirá en los mensajes de validación): ${.data_model.validationUseDisabledReferential?string("yes", "no")}</li> + <li>Velocidad máxima autorizada en el control de las velocidades de las + actividades: ${.data_model.validationSpeedMaxValue}</li> + <li>Forzar la validación de las velocidades de las + actividades: ${.data_model.validationSpeedEnable?string("yes", "no")}</li> + <li>Forzar la validación de la talla de especies + min/max: ${.data_model.validationLengthWeightEnable?string("yes", "no")}</li> + <li>Para que la utilización de referenciales obsoletos sea autorizado (se advertirá en los mensajes de + validación): ${.data_model.validationUseDisabledReferential?string("yes", "no")}</li> <li>Diccionario de sistemas observados requeridos por especies en la modalidad de cerco: ...</li> </ul> <h2>Results</h2> <h3>Notes</h3> -<div class="information">To expand a node, click on icon <span class="caretSymbol"></span> (Combination with key <b>Shift</b> will also expand his inner sub-tree).</div> -<div class="information">To collapse a note, click on icon <span class="caret-down"></span> (Combination with key <b>Shift</b> will also collapse his inner sub-tree).</div> +<div class="information">To expand a node, click on icon <span class="caretSymbol"></span> (Combination with key <b>Shift</b> + will also expand his inner sub-tree). +</div> +<div class="information">To collapse a note, click on icon <span class="caret-down"></span> (Combination with key <b>Shift</b> + will also collapse his inner sub-tree). +</div> <div class="information">A click on a id will select it automatically.</div> <br/> +<div class="information">To expand all, click on the following icon: <span id="expandAll" + class="caretSymbol action"></span>. +</div> +<div class="information">To collapse all, click on the following icon: <span id="collapseAll" + class="caret-down action"></span>. +</div> + <#assign rootNode = .data_model.rootNode /> <ul id="result"> <#list rootNode.getChildren() as node> @@ -231,10 +253,22 @@ } } }); - <#if .data_model.modelMode.name() == "REFERENTIEL"> - caret.click(); - </#if> } + let collapseAll = document.getElementById("collapseAll"); + collapseAll.addEventListener("click", function (event) { + for (const caret of document.getElementsByClassName("caret")) { + collapse(caret); + } + }); + let expandAll = document.getElementById("expandAll"); + expandAll.addEventListener("click", function (event) { + for (const caret of document.getElementsByClassName("caret")) { + expand(caret); + } + }); + <#if .data_model.modelMode.name() == "REFERENTIEL"> + expandAll.click(); + </#if> for (const caret of document.getElementsByClassName("leaf")) { let element = caret.parentElement.querySelector(".nested"); if (element != null) { ===================================== client/datasource/actions/src/main/i18n/templates/validationReport_fr_FR.ftl ===================================== @@ -164,6 +164,10 @@ ul.messages { list-style-type: none; } + .action { + cursor: pointer; + user-select: none; + } </style> </head> <body> @@ -192,6 +196,8 @@ <div class="information">Pour replier un nœud, cliquez sur l'icone <span class="caret-down"></span> (la combinaison avec la touche <b>Maj</b> effectue l'action sur le sous-arbre constitué de ses fils).</div> <div class="information">Un clic sur un identifiant le sélectionne automatiquement.</div> <br/> +<div class="information">Pour tout déplier, cliquez sur l'icone suivant : <span id="expandAll" class="caretSymbol action"></span>.</div> +<div class="information">Pour tout replier, cliquez sur l'icone suivant : <span id="collapseAll" class="caret-down action"></span>.</div> <#assign rootNode = .data_model.rootNode /> <ul id="result"> <#list rootNode.getChildren() as node> @@ -220,7 +226,6 @@ expand(node); } } - for (const caret of document.getElementsByClassName("caret")) { caret.addEventListener("click", function (event) { let expanded = this.classList.contains("caret-down"); @@ -234,10 +239,22 @@ } } }); - <#if .data_model.modelMode.name() == "REFERENTIEL"> - caret.click(); - </#if> } + let collapseAll = document.getElementById("collapseAll"); + collapseAll.addEventListener("click", function (event) { + for (const caret of document.getElementsByClassName("caret")) { + collapse(caret); + } + }); + let expandAll = document.getElementById("expandAll"); + expandAll.addEventListener("click", function (event) { + for (const caret of document.getElementsByClassName("caret")) { + expand(caret); + } + }); + <#if .data_model.modelMode.name() == "REFERENTIEL"> + expandAll.click(); + </#if> for (const caret of document.getElementsByClassName("leaf")) { let element = caret.parentElement.querySelector(".nested"); if (element != null) { ===================================== core/persistence/migration/src/main/java/fr/ird/observe/spi/migration/v9/DataSourceMigrationForVersion_9_2.java ===================================== @@ -125,6 +125,10 @@ public class DataSourceMigrationForVersion_9_2 extends ByMajorMigrationVersionRe } // See https://gitlab.com/ultreiaio/ird-observe/-/issues/2765 addNewTable(executor, withIds, "12_01_issue-2765", "table-common_gear_associations"); + if (withIds) { + // See https://gitlab.com/ultreiaio/ird-observe/-/issues/2787 + executor.addScript("13", "issue-2787"); + } } ===================================== core/persistence/migration/src/main/resources/db/migration/v9/9.2/13_issue-2787-common.sql ===================================== @@ -0,0 +1,83 @@ +--- +-- #%L +-- ObServe Core :: Persistence :: Migration +-- %% +-- Copyright (C) 2008 - 2023 IRD, Ultreia.io +-- %% +-- This program is free software: you can redistribute it and/or modify +-- it under the terms of the GNU General Public License as +-- published by the Free Software Foundation, either version 3 of the +-- License, or (at your option) any later version. +-- +-- This program is distributed in the hope that it will be useful, +-- but WITHOUT ANY WARRANTY; without even the implied warranty of +-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +-- GNU General Public License for more details. +-- +-- You should have received a copy of the GNU General Public +-- License along with this program. If not, see +-- <http://www.gnu.org/licenses/gpl-3.0.html>. +-- #L% +--- +-- add caracteristic 27 +INSERT INTO common.GearCharacteristic (TOPIAID, TOPIAVERSION, TOPIACREATEDATE, LASTUPDATEDATE, CODE, URI, HOMEID, NEEDCOMMENT, STATUS, LABEL1, LABEL2, LABEL3, LABEL4, LABEL5, LABEL6, LABEL7, LABEL8, UNIT, GEARCHARACTERISTICTYPE) VALUES ('fr.ird.referential.common.GearCharacteristic#${REFERENTIAL_PREFIX}027', 0, ${CURRENT_DATE}, ${CURRENT_TIMESTAMP}, '27', null, null, false, 1, 'Electric power', 'Puissance électrique', 'Energia electrica', null, null, null, null, null, 'kW', 'fr.ird.referential.common.GearCharacteristicType#1239832686123#0.3'), + +-- add characteristic (4, 5, 15 and 27) to gear 2 +INSERT INTO common.gear_allowedGearCharacteristic(gear, gearCharacteristic) VALUES ('fr.ird.referential.common.Gear#1239832686125#0.1', 'fr.ird.referential.common.GearCharacteristic#1239832686124#0.4'); +INSERT INTO common.gear_allowedGearCharacteristic(gear, gearCharacteristic) VALUES ( 'fr.ird.referential.common.Gear#1239832686125#0.1', 'fr.ird.referential.common.GearCharacteristic#1239832686124#0.5'); +INSERT INTO common.gear_allowedGearCharacteristic(gear, gearCharacteristic) VALUES ( 'fr.ird.referential.common.Gear#1239832686125#0.1', 'fr.ird.referential.common.GearCharacteristic#1239832686124#0.1'); +INSERT INTO common.gear_allowedGearCharacteristic(gear, gearCharacteristic) VALUES ( 'fr.ird.referential.common.Gear#1239832686125#0.1', 'fr.ird.referential.common.GearCharacteristic#${REFERENTIAL_PREFIX}027'); + +-- add characteristic (4, 5, 15 and 27) to gear 3 +INSERT INTO common.gear_allowedGearCharacteristic(gear, gearCharacteristic) VALUES ('fr.ird.referential.common.Gear#1239832686125#0.2', 'fr.ird.referential.common.GearCharacteristic#1239832686124#0.4'); +INSERT INTO common.gear_allowedGearCharacteristic(gear, gearCharacteristic) VALUES ('fr.ird.referential.common.Gear#1239832686125#0.2', 'fr.ird.referential.common.GearCharacteristic#1239832686124#0.5'); +INSERT INTO common.gear_allowedGearCharacteristic(gear, gearCharacteristic) VALUES ('fr.ird.referential.common.Gear#1239832686125#0.2', 'fr.ird.referential.common.GearCharacteristic#1239832686124#0.1'); +INSERT INTO common.gear_allowedGearCharacteristic(gear, gearCharacteristic) VALUES ('fr.ird.referential.common.Gear#1239832686125#0.2', 'fr.ird.referential.common.GearCharacteristic#${REFERENTIAL_PREFIX}027'); + +-- add characteristic (4, 5, 15 and 27) to gear 4 +INSERT INTO common.gear_allowedGearCharacteristic(gear, gearCharacteristic) VALUES ('fr.ird.referential.common.Gear#1239832686125#0.3', 'fr.ird.referential.common.GearCharacteristic#1239832686124#0.4'); +INSERT INTO common.gear_allowedGearCharacteristic(gear, gearCharacteristic) VALUES ('fr.ird.referential.common.Gear#1239832686125#0.3', 'fr.ird.referential.common.GearCharacteristic#1239832686124#0.5'); +INSERT INTO common.gear_allowedGearCharacteristic(gear, gearCharacteristic) VALUES ('fr.ird.referential.common.Gear#1239832686125#0.3', 'fr.ird.referential.common.GearCharacteristic#1239832686124#0.1'); +INSERT INTO common.gear_allowedGearCharacteristic(gear, gearCharacteristic) VALUES ('fr.ird.referential.common.Gear#1239832686125#0.3', 'fr.ird.referential.common.GearCharacteristic#${REFERENTIAL_PREFIX}027'); + +-- add characteristic (4, 5, 15 and 27) to gear 5 +INSERT INTO common.gear_allowedGearCharacteristic(gear, gearCharacteristic) VALUES ('fr.ird.referential.common.Gear#1239832686125#0.4', 'fr.ird.referential.common.GearCharacteristic#1239832686124#0.4'); +INSERT INTO common.gear_allowedGearCharacteristic(gear, gearCharacteristic) VALUES ('fr.ird.referential.common.Gear#1239832686125#0.4', 'fr.ird.referential.common.GearCharacteristic#1239832686124#0.5'); +-- INSERT INTO common.gear_allowedGearCharacteristic(gear, gearCharacteristic) VALUES ('fr.ird.referential.common.Gear#1239832686125#0.4', 'fr.ird.referential.common.GearCharacteristic#1239832686124#0.1'); +INSERT INTO common.gear_allowedGearCharacteristic(gear, gearCharacteristic) VALUES ('fr.ird.referential.common.Gear#1239832686125#0.4', 'fr.ird.referential.common.GearCharacteristic#${REFERENTIAL_PREFIX}027'); + +-- add characteristic (4, 5, 15 and 27) to gear 6 +INSERT INTO common.gear_allowedGearCharacteristic(gear, gearCharacteristic) VALUES ('fr.ird.referential.common.Gear#1239832686125#0.5', 'fr.ird.referential.common.GearCharacteristic#1239832686124#0.4'); +INSERT INTO common.gear_allowedGearCharacteristic(gear, gearCharacteristic) VALUES ('fr.ird.referential.common.Gear#1239832686125#0.5', 'fr.ird.referential.common.GearCharacteristic#1239832686124#0.5'); +INSERT INTO common.gear_allowedGearCharacteristic(gear, gearCharacteristic) VALUES ('fr.ird.referential.common.Gear#1239832686125#0.5', 'fr.ird.referential.common.GearCharacteristic#1239832686124#0.1'); +INSERT INTO common.gear_allowedGearCharacteristic(gear, gearCharacteristic) VALUES ('fr.ird.referential.common.Gear#1239832686125#0.5', 'fr.ird.referential.common.GearCharacteristic#${REFERENTIAL_PREFIX}027'); + +-- add characteristic (4, 5, 15 and 27) to gear 32 +INSERT INTO common.gear_allowedGearCharacteristic(gear, gearCharacteristic) VALUES ('fr.ird.referential.common.Gear#1464000000000#32', 'fr.ird.referential.common.GearCharacteristic#1239832686124#0.4'); +INSERT INTO common.gear_allowedGearCharacteristic(gear, gearCharacteristic) VALUES ('fr.ird.referential.common.Gear#1464000000000#32', 'fr.ird.referential.common.GearCharacteristic#1239832686124#0.5'); +INSERT INTO common.gear_allowedGearCharacteristic(gear, gearCharacteristic) VALUES ('fr.ird.referential.common.Gear#1464000000000#32', 'fr.ird.referential.common.GearCharacteristic#1239832686124#0.1'); +INSERT INTO common.gear_allowedGearCharacteristic(gear, gearCharacteristic) VALUES ('fr.ird.referential.common.Gear#1464000000000#32', 'fr.ird.referential.common.GearCharacteristic#${REFERENTIAL_PREFIX}027'); + +-- add characteristic (4, 5, 15 and 27) to gear 34 +INSERT INTO common.gear_allowedGearCharacteristic(gear, gearCharacteristic) VALUES ('fr.ird.referential.common.Gear#1464000000000#34', 'fr.ird.referential.common.GearCharacteristic#1239832686124#0.4'); +INSERT INTO common.gear_allowedGearCharacteristic(gear, gearCharacteristic) VALUES ('fr.ird.referential.common.Gear#1464000000000#34', 'fr.ird.referential.common.GearCharacteristic#1239832686124#0.5'); +INSERT INTO common.gear_allowedGearCharacteristic(gear, gearCharacteristic) VALUES ('fr.ird.referential.common.Gear#1464000000000#34', 'fr.ird.referential.common.GearCharacteristic#1239832686124#0.1'); +INSERT INTO common.gear_allowedGearCharacteristic(gear, gearCharacteristic) VALUES ('fr.ird.referential.common.Gear#1464000000000#34', 'fr.ird.referential.common.GearCharacteristic#${REFERENTIAL_PREFIX}027'); + +-- add characteristic (4, 5, 15 and 27) to gear 35 +INSERT INTO common.gear_allowedGearCharacteristic(gear, gearCharacteristic) VALUES ('fr.ird.referential.common.Gear#1464000000000#35', 'fr.ird.referential.common.GearCharacteristic#1239832686124#0.4'); +INSERT INTO common.gear_allowedGearCharacteristic(gear, gearCharacteristic) VALUES ('fr.ird.referential.common.Gear#1464000000000#35', 'fr.ird.referential.common.GearCharacteristic#1239832686124#0.5'); +INSERT INTO common.gear_allowedGearCharacteristic(gear, gearCharacteristic) VALUES ('fr.ird.referential.common.Gear#1464000000000#35', 'fr.ird.referential.common.GearCharacteristic#1239832686124#0.1'); +INSERT INTO common.gear_allowedGearCharacteristic(gear, gearCharacteristic) VALUES ('fr.ird.referential.common.Gear#1464000000000#35', 'fr.ird.referential.common.GearCharacteristic#${REFERENTIAL_PREFIX}027'); + +-- add characteristic (4, 5, 15 and 27) to gear 36 +INSERT INTO common.gear_allowedGearCharacteristic(gear, gearCharacteristic) VALUES ('fr.ird.referential.common.Gear#1464000000000#36', 'fr.ird.referential.common.GearCharacteristic#1239832686124#0.4'); +INSERT INTO common.gear_allowedGearCharacteristic(gear, gearCharacteristic) VALUES ('fr.ird.referential.common.Gear#1464000000000#36', 'fr.ird.referential.common.GearCharacteristic#1239832686124#0.5'); +INSERT INTO common.gear_allowedGearCharacteristic(gear, gearCharacteristic) VALUES ('fr.ird.referential.common.Gear#1464000000000#36', 'fr.ird.referential.common.GearCharacteristic#1239832686124#0.1'); +INSERT INTO common.gear_allowedGearCharacteristic(gear, gearCharacteristic) VALUES ('fr.ird.referential.common.Gear#1464000000000#36', 'fr.ird.referential.common.GearCharacteristic#${REFERENTIAL_PREFIX}027'); + +-- add characteristic (4, 5, 15 and 27) to gear 37 +INSERT INTO common.gear_allowedGearCharacteristic(gear, gearCharacteristic) VALUES ('fr.ird.referential.common.Gear#1464000000000#37', 'fr.ird.referential.common.GearCharacteristic#1239832686124#0.4'); +INSERT INTO common.gear_allowedGearCharacteristic(gear, gearCharacteristic) VALUES ('fr.ird.referential.common.Gear#1464000000000#37', 'fr.ird.referential.common.GearCharacteristic#1239832686124#0.5'); +INSERT INTO common.gear_allowedGearCharacteristic(gear, gearCharacteristic) VALUES ('fr.ird.referential.common.Gear#1464000000000#37', 'fr.ird.referential.common.GearCharacteristic#1239832686124#0.1'); +INSERT INTO common.gear_allowedGearCharacteristic(gear, gearCharacteristic) VALUES ('fr.ird.referential.common.Gear#1464000000000#37', 'fr.ird.referential.common.GearCharacteristic#${REFERENTIAL_PREFIX}027'); ===================================== core/persistence/test/src/test/resources/fixtures/persistence/table_count/referential.properties ===================================== @@ -23,7 +23,7 @@ common.country=91 common.dataQuality=5 common.fpaZone=45 common.gear=38 -common.gearCharacteristic=46 +common.gearCharacteristic=47 common.gearCharacteristicListItem=220 common.gearCharacteristicType=8 common.harbour=98 @@ -114,7 +114,7 @@ ps_observation.reasonForDiscard=5 ps_observation.speciesStatus=6 ps_observation.surroundingActivity=8 -common.gear_allowedGearCharacteristic=43 +common.gear_allowedGearCharacteristic=82 common.gear_defaultGearCharacteristic=39 common.species_ocean=553 common.speciesGroup_speciesGroupReleaseMode=19 ===================================== core/services/test/src/main/resources/fixtures/fr/ird/observe/services/service/ValidateService-referentialResult-common.json ===================================== @@ -4387,6 +4387,22 @@ } ] }, + { + "datum": { + "text": "27##Puissance électrique##kW", + "type": "fr.ird.observe.dto.referential.common.GearCharacteristicDto", + "id": "fr.ird.referential.common.GearCharacteristic#1464000000000#027", + "topiaVersion": 0, + "lastUpdateDate": "2023-09-01T00:00:00.000Z" + }, + "messages": [ + { + "fieldName": "uri", + "scope": "WARNING", + "message": "Le champ n'est pas renseigné." + } + ] + }, { "datum": { "text": "FURUNO - CI-30##001_001", ===================================== model/src/main/resources/fixtures/global.properties ===================================== @@ -25,4 +25,4 @@ REFERENCE_DATA_COUNT=68 ENTITIES_LIMIT_SIZE=100 # fr.ird.observe.services.service.referential.ReferentialService # fr.ird.observe.services.local.service.referential.DifferentialModelTest -REFERENTIAL_COUNT=4356 +REFERENTIAL_COUNT=4357 View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/4aab601162ab50c713b149a8… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/4aab601162ab50c713b149a8… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] 17 commits: remove any space in Test methodName
by Tony CHEMIT (＠tchemit) 15 Sep '23

15 Sep '23

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 01ca03cc by Tony Chemit at 2023-09-15T11:54:07+02:00 remove any space in Test methodName - - - - - 05cc2546 by Tony Chemit at 2023-09-15T11:54:18+02:00 Ajout d'un **(s)** sur le nombre de messages par scope de validation sur les nœud - See #2211 - - - - - 3dcac2e5 by Tony Chemit at 2023-09-15T12:01:14+02:00 Ajout du champ parentId sur DeleteRequest - - - - - 09711fa7 by Tony Chemit at 2023-09-15T12:04:30+02:00 Ajout de DeleteRequestCallback, pour permettre un traitement supplémentaire dans la génération du code sql de suppression - - - - - ac5fe585 by Tony Chemit at 2023-09-15T12:05:48+02:00 Ajout de ActivityNumberRecord pour pouvoir récupérer la liste des activités d'une route dans l'ordre byNumber ou byTime avec tout ce qu'il faut pour ensuite pouvoir réordonner les activités suite à une suppression ou un déplacement. - - - - - d681b10a by Tony Chemit at 2023-09-15T12:06:52+02:00 Ajout du callback ActivityDeleteRequestCallback pour réordonner les activités suite à une ou plusieurs suppressions. - - - - - dac4edb0 by Tony Chemit at 2023-09-15T12:08:11+02:00 Pouvoir éditer le DeleteTreeAdapter - - - - - 9a4c1755 by Tony Chemit at 2023-09-15T12:08:35+02:00 Pouvoir modifier la méthode adaptParentNode du DeleteTreeAdapter - - - - - cc7edc4a by Tony Chemit at 2023-09-15T12:09:37+02:00 Adaptation du ActivityUIDeleteTreeAdapter pour recharger les nœuds de toutes les activités d'une route suite à une suppression - - - - - a864950f by Tony Chemit at 2023-09-15T12:12:50+02:00 Merge branch 'feature/2784' into develop Sur la suppression d'un activité, il faut recalculer les numéros d'ordre sur les activités restantes de la route - Closes #2784 - - - - - 454b4e03 by Tony Chemit at 2023-09-15T12:16:32+02:00 Ajout du paramètre replaceIds sur la méthode consume de ReplicateRequestCallback afin ensuite lors du déplacement des activités de pouvoir connaître les identifiants des activités répliquées - - - - - 21b497aa by Tony Chemit at 2023-09-15T12:17:09+02:00 Ajout du callback pour le déplacement des activités - - - - - d800252a by Tony Chemit at 2023-09-15T13:09:42+02:00 Renommage de la méthode addMissingChildren en getNewSelectedNodeFromNewParentNode sur MoveTreeAdapter - - - - - 8c4a45cc by Tony Chemit at 2023-09-15T13:13:42+02:00 Merge branch 'feature/2785' into develop Sur le déplacement d'un activité, il faut recalculer les numéros d'ordre des activités sur la route origine et la route destination du déplacement. - Closes #2785 - - - - - 743df4c9 by Tony Chemit at 2023-09-15T13:59:29+02:00 Mettre à jour le champ lastUpdateDate sur les entités parent lors d'une suppression - - - - - a7e54a6c by Tony Chemit at 2023-09-15T13:59:53+02:00 Mettre à jour l'arbre de navigation suite à la mise à jour des lastUpdateDate des entités parent de l'entité à supprimer - - - - - 4aab6011 by Tony Chemit at 2023-09-15T14:20:21+02:00 Merge branch 'feature/2786' into develop Lors de la suppression d'une donnée, il faut mettre à jour le champ lastUpdateDate sur les entitées qui remontent jusqu'à la marée - Closes #2786 - - - - - 30 changed files: - client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/validate/tree/ValidationNode.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/actions/delete/DeleteTreeAdapter.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/actions/move/MoveTreeAdapter.java - client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/logbook/sample/ActivitySampleUIMoveTreeAdapter.java - client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/logbook/sample/ActivitySampleUIMoveTreeAdapterToTrip.java - client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/logbook/sample/SampleUIMoveTreeAdapterToActivity.java - + client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/logbook/ActivityUIDeleteTreeAdapter.java - client/datasource/editor/spi/src/main/java/fr/ird/observe/client/datasource/editor/spi/content/GenerateContentUISupport.java - client/datasource/editor/spi/src/main/java/fr/ird/observe/client/datasource/editor/spi/content/data/openable/GenerateContentOpenableUIMoveTreeAdapter.java - core/persistence/java/src/main/java/fr/ird/observe/entities/ObserveTopiaApplicationContext.java - core/persistence/java/src/main/java/fr/ird/observe/entities/data/ll/logbook/ActivitySampleReplicateRequestCallback.java - core/persistence/java/src/main/java/fr/ird/observe/entities/data/ll/logbook/LogbookReplicateRequestCallback.java - core/persistence/java/src/main/java/fr/ird/observe/entities/data/ll/observation/ObservationReplicateRequestCallback.java - + core/persistence/java/src/main/java/fr/ird/observe/entities/data/ps/logbook/ActivityDeleteRequestCallback.java - + core/persistence/java/src/main/java/fr/ird/observe/entities/data/ps/logbook/ActivityReplicateRequestCallback.java - core/persistence/java/src/main/java/fr/ird/observe/entities/data/ps/logbook/ActivitySpi.java - core/persistence/java/src/main/java/fr/ird/observe/entities/data/ps/observation/ObservationReplicateRequestCallback.java - core/persistence/test/src/test/java/fr/ird/observe/persistence/test/request/DeleteDataRequestTest.java - core/persistence/test/src/test/java/fr/ird/observe/persistence/test/request/DeleteReferentialRequestTest.java - core/persistence/test/src/test/java/fr/ird/observe/persistence/test/request/ReferentialExtraScriptsTest.java - core/persistence/test/src/test/java/fr/ird/observe/persistence/test/request/ReplicateRequestTest.java - core/services/test/src/main/java/fr/ird/observe/services/service/DataSourceServiceFixtures.java - toolkit/api-datasource/src/main/java/fr/ird/observe/datasource/request/DeleteRequest.java - toolkit/api-datasource/src/main/java/fr/ird/observe/datasource/request/ReplicateRequest.java - toolkit/persistence/src/main/java/fr/ird/observe/entities/ToolkitTopiaPersistenceContextSupport.java - toolkit/persistence/src/main/java/fr/ird/observe/spi/context/DataDtoEntityContext.java - toolkit/persistence/src/main/java/fr/ird/observe/spi/context/EditableDtoEntityContext.java - toolkit/persistence/src/main/java/fr/ird/observe/spi/context/OpenableDtoEntityContext.java - toolkit/persistence/src/main/java/org/nuiton/topia/service/sql/TopiaEntitySqlModelResource.java - toolkit/persistence/src/main/java/org/nuiton/topia/service/sql/TopiaSqlServiceConfiguration.java The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/3adcab0902b200a62e6a3e1f… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/3adcab0902b200a62e6a3e1f… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] 6 commits: Sur la suppression d'un activité, il faut recalculer les numéros d'ordre sur...
by Tony CHEMIT (＠tchemit) 15 Sep '23

15 Sep '23

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: c4a9acd2 by Tony Chemit at 2023-09-15T11:52:40+02:00 Sur la suppression d'un activité, il faut recalculer les numéros d'ordre sur les activités restantes de la route - Closes #2784 - - - - - ee933647 by Tony Chemit at 2023-09-15T11:52:40+02:00 remove any space in Test methodName - - - - - 97c14bc1 by Tony Chemit at 2023-09-15T11:52:40+02:00 Add replaceIds parameter on ReplicateRequestCallback consume method - See #2785 - - - - - 8d38a4bc by Tony Chemit at 2023-09-15T11:52:40+02:00 Sur le déplacement d'un activité, il faut recalculer les numéros d'ordre sur les activités restantes de la route qui la contenait et positionner le numéro de l'activité déplacée en dernière position - Closes #2785 - - - - - d535181e by Tony Chemit at 2023-09-15T11:52:40+02:00 Ajout d'un **(s)** sur le nombre de messages par scope de validation sur les nœud - See #2211 - - - - - 3adcab09 by Tony Chemit at 2023-09-15T11:53:19+02:00 Adaptation suppression activité dans l'arbre de navigation - Closes #2784 - - - - - 30 changed files: - client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/validate/tree/ValidationNode.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/actions/delete/DeleteTreeAdapter.java - + client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/logbook/ActivityUIDeleteTreeAdapter.java - client/datasource/editor/spi/src/main/java/fr/ird/observe/client/datasource/editor/spi/content/GenerateContentUISupport.java - core/persistence/java/src/main/java/fr/ird/observe/entities/ObserveTopiaApplicationContext.java - core/persistence/java/src/main/java/fr/ird/observe/entities/data/ll/logbook/ActivitySampleReplicateRequestCallback.java - core/persistence/java/src/main/java/fr/ird/observe/entities/data/ll/logbook/LogbookReplicateRequestCallback.java - core/persistence/java/src/main/java/fr/ird/observe/entities/data/ll/observation/ObservationReplicateRequestCallback.java - + core/persistence/java/src/main/java/fr/ird/observe/entities/data/ps/logbook/ActivityDeleteRequestCallback.java - + core/persistence/java/src/main/java/fr/ird/observe/entities/data/ps/logbook/ActivityReplicateRequestCallback.java - core/persistence/java/src/main/java/fr/ird/observe/entities/data/ps/logbook/ActivitySpi.java - core/persistence/java/src/main/java/fr/ird/observe/entities/data/ps/observation/ObservationReplicateRequestCallback.java - core/persistence/test/src/test/java/fr/ird/observe/persistence/test/request/DeleteDataRequestTest.java - core/persistence/test/src/test/java/fr/ird/observe/persistence/test/request/DeleteReferentialRequestTest.java - core/persistence/test/src/test/java/fr/ird/observe/persistence/test/request/ReferentialExtraScriptsTest.java - core/persistence/test/src/test/java/fr/ird/observe/persistence/test/request/ReplicateRequestTest.java - core/services/test/src/main/java/fr/ird/observe/services/service/DataSourceServiceFixtures.java - toolkit/api-datasource/src/main/java/fr/ird/observe/datasource/request/DeleteRequest.java - toolkit/api-datasource/src/main/java/fr/ird/observe/datasource/request/ReplicateRequest.java - toolkit/persistence/src/main/java/fr/ird/observe/entities/ToolkitTopiaPersistenceContextSupport.java - toolkit/persistence/src/main/java/fr/ird/observe/spi/context/DataDtoEntityContext.java - toolkit/persistence/src/main/java/fr/ird/observe/spi/context/OpenableDtoEntityContext.java - toolkit/persistence/src/main/java/org/nuiton/topia/service/sql/TopiaEntitySqlModelResource.java - toolkit/persistence/src/main/java/org/nuiton/topia/service/sql/TopiaSqlServiceConfiguration.java - toolkit/persistence/src/main/java/org/nuiton/topia/service/sql/TopiaSqlServiceImpl.java - toolkit/persistence/src/main/java/org/nuiton/topia/service/sql/internal/SqlRequestSet.java - toolkit/persistence/src/main/java/org/nuiton/topia/service/sql/internal/TopiaEntitySqlModelResourceImpl.java - toolkit/persistence/src/main/java/org/nuiton/topia/service/sql/internal/consumer/DeleteEntityConsumer.java - toolkit/persistence/src/main/java/org/nuiton/topia/service/sql/internal/consumer/ReplicateEntityConsumer.java - toolkit/persistence/src/main/java/org/nuiton/topia/service/sql/internal/consumer/ReplicateEntityWorkContext.java The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/8794319f8d9342d8ec3a6ecc… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/8794319f8d9342d8ec3a6ecc… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] 6 commits: Ajouter une rège de validation sur les routes pour vérifier que les numéros...
by Tony CHEMIT (＠tchemit) 14 Sep '23

14 Sep '23

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 8c4d639d by Tony Chemit at 2023-09-14T17:06:35+02:00 Ajouter une rège de validation sur les routes pour vérifier que les numéros d'ordre suivent bien une séquence partant de 1 - Closes #2783 - - - - - 76f6076b by Tony Chemit at 2023-09-14T17:06:35+02:00 Sur la suppression d'un activité, il faut recalculer les numéros d'ordre sur les activités restantes de la route - Closes #2784 - - - - - aabe7c0c by Tony Chemit at 2023-09-14T17:06:35+02:00 remove any space in Test methodName - - - - - 61c254a8 by Tony Chemit at 2023-09-14T17:06:35+02:00 Add replaceIds parameter on ReplicateRequestCallback consume method - See #2785 - - - - - 6e544830 by Tony Chemit at 2023-09-14T17:06:35+02:00 Sur le déplacement d'un activité, il faut recalculer les numéros d'ordre sur les activités restantes de la route qui la contenait et positionner le numéro de l'activité déplacée en dernière position - Closes #2785 - - - - - 8794319f by Tony Chemit at 2023-09-14T17:06:35+02:00 Ajout d'un **(s)** sur le nombre de messages par scope de validation sur les nœud - See #2211 - - - - - 30 changed files: - client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/validate/tree/ValidationNode.java - core/api/dto-validation/src/main/i18n/getters/java.getter - + core/api/dto-validation/src/main/java/fr/ird/observe/dto/validation/validators/data/ps/logbook/RouteCheckActivityNumber.java - core/api/dto-validation/src/main/resources/validators.xml - core/api/validation/src/main/filtered-resources/META-INF/validators/validation.json - core/api/validation/src/main/resources/fr/ird/observe/dto/data/ps/logbook/RouteDto-update-error-validation.xml - core/api/validation/src/main/validation/fr/ird/observe/dto/data/ps/logbook/RouteDto-update-error-validation.xml - core/persistence/java/src/main/java/fr/ird/observe/entities/ObserveTopiaApplicationContext.java - core/persistence/java/src/main/java/fr/ird/observe/entities/data/ll/logbook/ActivitySampleReplicateRequestCallback.java - core/persistence/java/src/main/java/fr/ird/observe/entities/data/ll/logbook/LogbookReplicateRequestCallback.java - core/persistence/java/src/main/java/fr/ird/observe/entities/data/ll/observation/ObservationReplicateRequestCallback.java - + core/persistence/java/src/main/java/fr/ird/observe/entities/data/ps/logbook/ActivityDeleteRequestCallback.java - + core/persistence/java/src/main/java/fr/ird/observe/entities/data/ps/logbook/ActivityReplicateRequestCallback.java - core/persistence/java/src/main/java/fr/ird/observe/entities/data/ps/logbook/ActivitySpi.java - core/persistence/java/src/main/java/fr/ird/observe/entities/data/ps/observation/ObservationReplicateRequestCallback.java - core/persistence/resources/src/main/resources/fr/ird/observe/entities/data/ps/logbook/Route/validation-update.json - core/persistence/test/src/test/java/fr/ird/observe/persistence/test/request/DeleteDataRequestTest.java - core/persistence/test/src/test/java/fr/ird/observe/persistence/test/request/DeleteReferentialRequestTest.java - core/persistence/test/src/test/java/fr/ird/observe/persistence/test/request/ReferentialExtraScriptsTest.java - core/persistence/test/src/test/java/fr/ird/observe/persistence/test/request/ReplicateRequestTest.java - core/services/i18n/src/main/i18n/translations/services_en_GB.properties - core/services/i18n/src/main/i18n/translations/services_es_ES.properties - core/services/i18n/src/main/i18n/translations/services_fr_FR.properties - core/services/test/src/main/java/fr/ird/observe/services/service/DataSourceServiceFixtures.java - core/services/test/src/main/resources/fixtures/fr/ird/observe/services/service/ValidateService-dataResult-ps.json - server/runner/src/main/webResources/doc/api/public/data/ps/logbook/Route/validation-update-error.xml - server/runner/src/main/webResources/doc/api/public/data/ps/logbook/Route/validation-update.json - toolkit/api-datasource/src/main/java/fr/ird/observe/datasource/request/DeleteRequest.java - toolkit/api-datasource/src/main/java/fr/ird/observe/datasource/request/ReplicateRequest.java - toolkit/persistence/src/main/java/fr/ird/observe/entities/ToolkitTopiaPersistenceContextSupport.java The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/1dfd4bb1faaee5616a6388e8… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/1dfd4bb1faaee5616a6388e8… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] 6 commits: Ajouter une rège de validation sur les routes pour vérifier que les numéros...
by Tony CHEMIT (＠tchemit) 14 Sep '23

14 Sep '23

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 959d34c8 by Tony Chemit at 2023-09-14T16:20:10+02:00 Ajouter une rège de validation sur les routes pour vérifier que les numéros d'ordre suivent bien une séquence partant de 1 - Closes #2783 - - - - - 598574b5 by Tony Chemit at 2023-09-14T16:20:11+02:00 Sur la suppression d'un activité, il faut recalculer les numéros d'ordre sur les activités restantes de la route - Closes #2784 - - - - - 7ba2cfb6 by Tony Chemit at 2023-09-14T16:20:11+02:00 remove any space in Test methodName - - - - - 1aa40bd3 by Tony Chemit at 2023-09-14T16:20:11+02:00 Add replaceIds parameter on ReplicateRequestCallback consume method - See #2785 - - - - - 465eeb9a by Tony Chemit at 2023-09-14T16:20:11+02:00 Sur le déplacement d'un activité, il faut recalculer les numéros d'ordre sur les activités restantes de la route qui la contenait et positionner le numéro de l'activité déplacée en dernière position - Closes #2785 - - - - - 1dfd4bb1 by Tony Chemit at 2023-09-14T16:20:11+02:00 Ajout d'un **(s)** sur le nombre de messages par scope de validation sur les nœud - See #2211 - - - - - 30 changed files: - client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/validate/tree/ValidationNode.java - core/api/dto-validation/src/main/i18n/getters/java.getter - + core/api/dto-validation/src/main/java/fr/ird/observe/dto/validation/validators/data/ps/logbook/RouteCheckActivityNumber.java - core/api/dto-validation/src/main/resources/validators.xml - core/api/validation/src/main/filtered-resources/META-INF/validators/validation.json - core/api/validation/src/main/resources/fr/ird/observe/dto/data/ps/logbook/RouteDto-update-error-validation.xml - core/api/validation/src/main/validation/fr/ird/observe/dto/data/ps/logbook/RouteDto-update-error-validation.xml - core/persistence/java/src/main/java/fr/ird/observe/entities/ObserveTopiaApplicationContext.java - core/persistence/java/src/main/java/fr/ird/observe/entities/data/ll/logbook/ActivitySampleReplicateRequestCallback.java - core/persistence/java/src/main/java/fr/ird/observe/entities/data/ll/logbook/LogbookReplicateRequestCallback.java - core/persistence/java/src/main/java/fr/ird/observe/entities/data/ll/observation/ObservationReplicateRequestCallback.java - + core/persistence/java/src/main/java/fr/ird/observe/entities/data/ps/logbook/ActivityDeleteRequestCallback.java - + core/persistence/java/src/main/java/fr/ird/observe/entities/data/ps/logbook/ActivityReplicateRequestCallback.java - core/persistence/java/src/main/java/fr/ird/observe/entities/data/ps/logbook/ActivitySpi.java - core/persistence/java/src/main/java/fr/ird/observe/entities/data/ps/observation/ObservationReplicateRequestCallback.java - core/persistence/resources/src/main/resources/fr/ird/observe/entities/data/ps/logbook/Route/validation-update.json - core/persistence/test/src/test/java/fr/ird/observe/persistence/test/request/DeleteDataRequestTest.java - core/persistence/test/src/test/java/fr/ird/observe/persistence/test/request/DeleteReferentialRequestTest.java - core/persistence/test/src/test/java/fr/ird/observe/persistence/test/request/ReferentialExtraScriptsTest.java - core/persistence/test/src/test/java/fr/ird/observe/persistence/test/request/ReplicateRequestTest.java - core/services/i18n/src/main/i18n/translations/services_en_GB.properties - core/services/i18n/src/main/i18n/translations/services_es_ES.properties - core/services/i18n/src/main/i18n/translations/services_fr_FR.properties - core/services/test/src/main/java/fr/ird/observe/services/service/DataSourceServiceFixtures.java - core/services/test/src/main/resources/fixtures/fr/ird/observe/services/service/ValidateService-dataResult-ps.json - server/runner/src/main/webResources/doc/api/public/data/ps/logbook/Route/validation-update-error.xml - server/runner/src/main/webResources/doc/api/public/data/ps/logbook/Route/validation-update.json - toolkit/api-datasource/src/main/java/fr/ird/observe/datasource/request/DeleteRequest.java - toolkit/api-datasource/src/main/java/fr/ird/observe/datasource/request/ReplicateRequest.java - toolkit/persistence/src/main/java/fr/ird/observe/entities/ToolkitTopiaPersistenceContextSupport.java The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/864968168587e15d9ca29d9d… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/864968168587e15d9ca29d9d… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] 5 commits: Sur la suppression d'un activité, il faut recalculer les numéros d'ordre sur...
by Tony CHEMIT (＠tchemit) 14 Sep '23

14 Sep '23

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: d27378dc by Tony Chemit at 2023-09-14T16:19:38+02:00 Sur la suppression d'un activité, il faut recalculer les numéros d'ordre sur les activités restantes de la route - Closes #2784 - - - - - d82b52e9 by Tony Chemit at 2023-09-14T16:19:39+02:00 remove any space in Test methodName - - - - - 5f57fe47 by Tony Chemit at 2023-09-14T16:19:39+02:00 Add replaceIds parameter on ReplicateRequestCallback consume method - See #2785 - - - - - 77a0ac0d by Tony Chemit at 2023-09-14T16:19:39+02:00 Sur le déplacement d'un activité, il faut recalculer les numéros d'ordre sur les activités restantes de la route qui la contenait et positionner le numéro de l'activité déplacée en dernière position - Closes #2785 - - - - - 86496816 by Tony Chemit at 2023-09-14T16:19:39+02:00 Ajout d'un **(s)** sur le nombre de messages par scope de validation sur les nœud - See #2211 - - - - - 30 changed files: - client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/validate/tree/ValidationNode.java - core/persistence/java/src/main/java/fr/ird/observe/entities/ObserveTopiaApplicationContext.java - core/persistence/java/src/main/java/fr/ird/observe/entities/data/ll/logbook/ActivitySampleReplicateRequestCallback.java - core/persistence/java/src/main/java/fr/ird/observe/entities/data/ll/logbook/LogbookReplicateRequestCallback.java - core/persistence/java/src/main/java/fr/ird/observe/entities/data/ll/observation/ObservationReplicateRequestCallback.java - + core/persistence/java/src/main/java/fr/ird/observe/entities/data/ps/logbook/ActivityDeleteRequestCallback.java - + core/persistence/java/src/main/java/fr/ird/observe/entities/data/ps/logbook/ActivityReplicateRequestCallback.java - core/persistence/java/src/main/java/fr/ird/observe/entities/data/ps/logbook/ActivitySpi.java - core/persistence/java/src/main/java/fr/ird/observe/entities/data/ps/observation/ObservationReplicateRequestCallback.java - core/persistence/test/src/test/java/fr/ird/observe/persistence/test/request/DeleteDataRequestTest.java - core/persistence/test/src/test/java/fr/ird/observe/persistence/test/request/DeleteReferentialRequestTest.java - core/persistence/test/src/test/java/fr/ird/observe/persistence/test/request/ReferentialExtraScriptsTest.java - core/persistence/test/src/test/java/fr/ird/observe/persistence/test/request/ReplicateRequestTest.java - core/services/test/src/main/java/fr/ird/observe/services/service/DataSourceServiceFixtures.java - toolkit/api-datasource/src/main/java/fr/ird/observe/datasource/request/DeleteRequest.java - toolkit/api-datasource/src/main/java/fr/ird/observe/datasource/request/ReplicateRequest.java - toolkit/persistence/src/main/java/fr/ird/observe/entities/ToolkitTopiaPersistenceContextSupport.java - toolkit/persistence/src/main/java/fr/ird/observe/spi/context/DataDtoEntityContext.java - toolkit/persistence/src/main/java/fr/ird/observe/spi/context/OpenableDtoEntityContext.java - toolkit/persistence/src/main/java/org/nuiton/topia/service/sql/TopiaEntitySqlModelResource.java - toolkit/persistence/src/main/java/org/nuiton/topia/service/sql/TopiaSqlServiceConfiguration.java - toolkit/persistence/src/main/java/org/nuiton/topia/service/sql/TopiaSqlServiceImpl.java - toolkit/persistence/src/main/java/org/nuiton/topia/service/sql/internal/SqlRequestSet.java - toolkit/persistence/src/main/java/org/nuiton/topia/service/sql/internal/TopiaEntitySqlModelResourceImpl.java - toolkit/persistence/src/main/java/org/nuiton/topia/service/sql/internal/consumer/DeleteEntityConsumer.java - toolkit/persistence/src/main/java/org/nuiton/topia/service/sql/internal/consumer/ReplicateEntityConsumer.java - toolkit/persistence/src/main/java/org/nuiton/topia/service/sql/internal/consumer/ReplicateEntityWorkContext.java - toolkit/persistence/src/main/java/org/nuiton/topia/service/sql/internal/request/DeleteEntityRequest.java - + toolkit/persistence/src/main/java/org/nuiton/topia/service/sql/request/DeleteRequestCallback.java - toolkit/persistence/src/main/java/org/nuiton/topia/service/sql/request/ReplicateRequestCallback.java The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/1038a4c5b1a83e957ccfa294… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/1038a4c5b1a83e957ccfa294… You're receiving this email because of your account on gitlab.com.

1 0