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

[Git][ultreiaio/ird-observe] Pushed new tag v9.0.11
by Tony CHEMIT (＠tchemit) 06 Oct '22

06 Oct '22

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

1 0

[Git][ultreiaio/ird-observe][release/9.0.11] [jgitflow-maven-plugin]updating poms for branch'release/9.0.11' with non-snapshot versions[skip ci]
by Tony CHEMIT (＠tchemit) 06 Oct '22

06 Oct '22

Tony CHEMIT pushed to branch release/9.0.11 at ultreiaio / ird-observe Commits: 9e3c8add by Tony Chemit at 2022-10-06T12:20:20+02:00 [jgitflow-maven-plugin]updating poms for branch'release/9.0.11' with non-snapshot versions[skip ci] - - - - - 30 changed files: - client/configuration/pom.xml - client/core/pom.xml - client/datasource/actions/pom.xml - client/datasource/editor/api-test/pom.xml - client/datasource/editor/api/pom.xml - client/datasource/editor/common/pom.xml - client/datasource/editor/ll/pom.xml - client/datasource/editor/pom.xml - client/datasource/editor/ps/pom.xml - client/datasource/editor/spi/pom.xml - client/datasource/pom.xml - client/pom.xml - client/runner/pom.xml - core/api/dto/pom.xml - core/api/pom.xml - core/api/services/pom.xml - core/api/tree/pom.xml - core/api/validation/pom.xml - core/persistence/java/pom.xml - core/persistence/pom.xml - core/persistence/resources/pom.xml - core/persistence/test/pom.xml - core/pom.xml - core/services/client/pom.xml - core/services/i18n/pom.xml - core/services/local/pom.xml - core/services/pom.xml - core/services/test/pom.xml - model/pom.xml - observe/pom.xml The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/9e3c8addf03909a8d736e8b11… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/9e3c8addf03909a8d736e8b11… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][master] 16 commits: [jgitflow-maven-plugin]updating poms for 9.0.11-SNAPSHOT development[skip ci]
by Tony CHEMIT (＠tchemit) 06 Oct '22

06 Oct '22

Tony CHEMIT pushed to branch master at ultreiaio / ird-observe Commits: e0985d68 by Tony Chemit at 2022-10-03T17:35:48+02:00 [jgitflow-maven-plugin]updating poms for 9.0.11-SNAPSHOT development[skip ci] - - - - - 3e97ddd9 by Tony Chemit at 2022-10-03T17:57:25+02:00 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts[skip ci] - - - - - 74d6c3d9 by Tony Chemit at 2022-10-03T17:57:26+02:00 [jgitflow-maven-plugin]merging 'master' into 'develop' - - - - - 0ce39209 by Tony Chemit at 2022-10-03T17:57:27+02:00 [jgitflow-maven-plugin]Updating develop poms back to pre merge state[skip ci] - - - - - 279bbfa9 by Tony Chemit at 2022-10-05T18:53:32+02:00 Ajout de références ObservedSystem - See ultreiaio/ird-observe#2446 - - - - - d3e701ad by Tony Chemit at 2022-10-06T10:40:01+02:00 Un référentiel présent indiqué comme absent par l'importeur AVDTH - Closes #2447 - - - - - 73d58173 by Tony Chemit at 2022-10-06T10:41:19+02:00 Ajout de références ObservedSystem - Closes #2446 - - - - - 29da365c by Tony Chemit at 2022-10-06T10:41:19+02:00 Un référentiel présent indiqué comme absent par l'importeur AVDTH - Closes #2447 - - - - - 4d26083f by Tony Chemit at 2022-10-06T11:12:45+02:00 Problème d'import AVDTH - Closes #2445 - - - - - 10885143 by Tony Chemit at 2022-10-06T11:32:17+02:00 Merge branch 'feature/issue_2445' into develop - - - - - 4526b9cf by Tony Chemit at 2022-10-06T11:33:07+02:00 Documentation - Clean AVDTH doc - - - - - 71b0bf5f by Tony Chemit at 2022-10-06T12:00:53+02:00 Documentation - Clean AVDTH doc - - - - - d2487bcf by Tony Chemit at 2022-10-06T12:03:56+02:00 Update changelog for v.9.0.11 [skip CI] - - - - - 2ef774ec by Tony Chemit at 2022-10-06T12:17:01+02:00 Merge branch 'develop' of gitlab.com:ultreiaio/ird-observe into develop - - - - - 9e3c8add by Tony Chemit at 2022-10-06T12:20:20+02:00 [jgitflow-maven-plugin]updating poms for branch'release/9.0.11' with non-snapshot versions[skip ci] - - - - - 3a8ad843 by Tony Chemit at 2022-10-06T12:44:35+02:00 [jgitflow-maven-plugin]merging 'release/9.0.11' into 'master' - - - - - 30 changed files: - CHANGELOG.md - client/configuration/pom.xml - client/core/pom.xml - client/datasource/actions/pom.xml - client/datasource/editor/api-test/pom.xml - client/datasource/editor/api/pom.xml - client/datasource/editor/common/pom.xml - client/datasource/editor/ll/pom.xml - client/datasource/editor/pom.xml - client/datasource/editor/ps/pom.xml - client/datasource/editor/spi/pom.xml - client/datasource/pom.xml - client/pom.xml - client/runner/pom.xml - core/api/dto/pom.xml - core/api/pom.xml - core/api/services/pom.xml - core/api/tree/pom.xml - core/api/validation/pom.xml - core/persistence/java/pom.xml - core/persistence/pom.xml - core/persistence/resources/pom.xml - core/persistence/resources/src/main/java/fr/ird/observe/persistence/avdth/referential/interceptors/ObservedSystemInterceptor.java - core/persistence/resources/src/main/java/fr/ird/observe/persistence/avdth/referential/interceptors/TransmittingBuoyTypeInterceptor.java - core/persistence/resources/src/main/java/fr/ird/observe/spi/migration/v9/DataSourceMigrationForVersion_9_0.java - + core/persistence/resources/src/main/resources/db/migration/v9/9.0/96_add_referential_ps_common_ObservedSystem_74-common.sql - + core/persistence/resources/src/main/resources/db/migration/v9/9.0/96_add_referential_ps_common_ObservedSystem_81-common.sql - core/persistence/test/pom.xml - core/persistence/test/src/test/resources/fixtures/persistence/table_count/referential.properties - core/pom.xml The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/70c9a8ad60304ddfcec25ddd… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/70c9a8ad60304ddfcec25ddd… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] 5 commits: [jgitflow-maven-plugin]updating poms for branch'release/9.0.11' with non-snapshot versions[skip ci]
by Tony CHEMIT (＠tchemit) 06 Oct '22

06 Oct '22

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 9e3c8add by Tony Chemit at 2022-10-06T12:20:20+02:00 [jgitflow-maven-plugin]updating poms for branch'release/9.0.11' with non-snapshot versions[skip ci] - - - - - 3a8ad843 by Tony Chemit at 2022-10-06T12:44:35+02:00 [jgitflow-maven-plugin]merging 'release/9.0.11' into 'master' - - - - - 62423bab by Tony Chemit at 2022-10-06T12:44:41+02:00 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts[skip ci] - - - - - c46f5976 by Tony Chemit at 2022-10-06T12:44:42+02:00 [jgitflow-maven-plugin]merging 'master' into 'develop' - - - - - 085a3225 by Tony Chemit at 2022-10-06T12:44:43+02:00 [jgitflow-maven-plugin]Updating develop poms back to pre merge state[skip ci] - - - - - 0 changed files: Changes: View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/72e11bd2968eab06ee349d7a… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/72e11bd2968eab06ee349d7a… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] [jgitflow-maven-plugin]updating poms for 9.0.12-SNAPSHOT development[skip ci]
by Tony CHEMIT (＠tchemit) 06 Oct '22

06 Oct '22

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 72e11bd2 by Tony Chemit at 2022-10-06T12:20:01+02:00 [jgitflow-maven-plugin]updating poms for 9.0.12-SNAPSHOT development[skip ci] - - - - - 30 changed files: - client/configuration/pom.xml - client/core/pom.xml - client/datasource/actions/pom.xml - client/datasource/editor/api-test/pom.xml - client/datasource/editor/api/pom.xml - client/datasource/editor/common/pom.xml - client/datasource/editor/ll/pom.xml - client/datasource/editor/pom.xml - client/datasource/editor/ps/pom.xml - client/datasource/editor/spi/pom.xml - client/datasource/pom.xml - client/pom.xml - client/runner/pom.xml - core/api/dto/pom.xml - core/api/pom.xml - core/api/services/pom.xml - core/api/tree/pom.xml - core/api/validation/pom.xml - core/persistence/java/pom.xml - core/persistence/pom.xml - core/persistence/resources/pom.xml - core/persistence/test/pom.xml - core/pom.xml - core/services/client/pom.xml - core/services/i18n/pom.xml - core/services/local/pom.xml - core/services/pom.xml - core/services/test/pom.xml - model/pom.xml - observe/pom.xml The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/72e11bd2968eab06ee349d7a8… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/72e11bd2968eab06ee349d7a8… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe] Pushed new branch release/9.0.11
by Tony CHEMIT (＠tchemit) 06 Oct '22

06 Oct '22

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

1 0

[Git][ultreiaio/ird-observe][develop] 2 commits: Documentation - Clean AVDTH doc
by Tony CHEMIT (＠tchemit) 06 Oct '22

06 Oct '22

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 4526b9cf by Tony Chemit at 2022-10-06T11:33:07+02:00 Documentation - Clean AVDTH doc - - - - - 2ef774ec by Tony Chemit at 2022-10-06T12:17:01+02:00 Merge branch 'develop' of gitlab.com:ultreiaio/ird-observe into develop - - - - - 0 changed files: Changes: View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/d2487bcfec7148d75005bdc3… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/d2487bcfec7148d75005bdc3… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] 2 commits: Documentation - Clean AVDTH doc
by Tony CHEMIT (＠tchemit) 06 Oct '22

06 Oct '22

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 71b0bf5f by Tony Chemit at 2022-10-06T12:00:53+02:00 Documentation - Clean AVDTH doc - - - - - d2487bcf by Tony Chemit at 2022-10-06T12:03:56+02:00 Update changelog for v.9.0.11 [skip CI] - - - - - 3 changed files: - CHANGELOG.md - src/site/markdown/avdth/logbook.md - src/site/markdown/avdth/referential.md Changes: ===================================== CHANGELOG.md ===================================== @@ -1,7 +1,19 @@ # ObServe changelog * Author [Tony Chemit](mailto:dev@tchemit.fr) - * Last generated at 2022-10-03 17:32. + * Last generated at 2022-10-06 11:52. + +## Version [9.0.11](https://gitlab.com/ultreiaio/ird-observe/-/milestones/237) + +**Closed at 2022-10-06.** + +### Download +* [Client (observe-9.0.11-client.zip)](https://repo1.maven.org/maven2/fr/ird/observe/o…) +* [Serveur (observe-9.0.11.war)](https://repo1.maven.org/maven2/fr/ird/observe/observe/…) +* [Serveur (observe-9.0.11-server.zip)](https://repo1.maven.org/maven2/fr/ird/observe/o…) + +### Issues + * [[Type::Evolution 2446]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2446) **Ajout de références ObservedSystem** (Thanks to Tony CHEMIT) (Reported by Pascal Cauquil) ## Version [9.0.10](https://gitlab.com/ultreiaio/ird-observe/-/milestones/236) @@ -12,7 +24,6 @@ * [Serveur (observe-9.0.10.war)](https://repo1.maven.org/maven2/fr/ird/observe/observe/…) * [Serveur (observe-9.0.10-server.zip)](https://repo1.maven.org/maven2/fr/ird/observe/o…) - ### Issues * [[Type::Anomalie 2072]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2072) **Importeur AVDTH - bouton** (Thanks to Tony CHEMIT) (Reported by Pascal Cauquil) * [[Type::Anomalie 2438]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2438) **La synchro simple de référentiel ne fonctionne toujours pas en 9.0.9** (Thanks to Tony CHEMIT) (Reported by Pascal Cauquil) ===================================== src/site/markdown/avdth/logbook.md ===================================== @@ -236,50 +236,9 @@ Soit ```transmittingBuoyOperation``` (translation de **ACTIVITE.C_OPERA**) Soit ```transmittingBuoyType``` (translation de **ACTIVITE.C_TYP_BALISE**) -| ACTIVITE.C_TYP_BALISE | ps_common.TransmittingBuoyType.code | -| :--- | :--- | -| 1 | 1 | -| 2 | 2 | -| 3 | 3 | -| 4 | 4 | -| 5 | 5 | -| 6 | 6 | -| 7 | 7 | -| 8 | 8 | -| 9 | 9 | -| 10 | 10 | -| 11 | 90 | -| 12 | 21 | -| 13 | 22 | -| 14 | 23 | -| 15 | 24 | -| 16 | 25 | -| 17 | 26 | -| 18 | 27 | -| 19 | 28 | -| 20 | 41 | -| 21 | 42 | -| 22 | 43 | -| 23 | 44 | -| 24 | 45 | -| 25 | 46 | -| 26 | 47 | -| 27 | 100 | -| 28 | 61 | -| 29 | 62 | -| 30 | 63 | -| 31 | 64 | -| 32 | 65 | -| 33 | 66 | -| 34 | 67 | -| 35 | 68 | -| 36 | 69 | -| 37 | 70 | -| 38 | 71 | -| 39 | 3 | -| 40 | 91 | -| 98 | 99 | -| 99 | 99 | +Voir mapping [REF_TRANSMITTING_BUOY](./referential.html#REF_TRANSMITTING_BUOY) + +**Attention: cette règle n'est plus appliquée!** ** On remplace par 999 si non trouvé** ===================================== src/site/markdown/avdth/referential.md ===================================== @@ -12,11 +12,11 @@ Dans **ObServe**, cela est remplacé par un identifiant de type chaine de caract Le mapping sur la position est réalisé ainsi : -|**Position dans AVDTH**| **Position dans ObServe**| -|:--- | :--- | -|1 | B | -|2 | T | -|3 | A | +| **Position dans AVDTH** | **Position dans ObServe** | +|:------------------------|:--------------------------| +| 1 | B | +| 2 | T | +| 3 | A | ### REF_SPECIES @@ -24,107 +24,107 @@ Mapping espèce On transpose les codes espèce AVDTH (**ESPECE.C_ESP**) en **Species.faoCode** -| **ESPECE.C_ESP** | **Species.faoCode** | note | -|:-----------------|:--------------------|:----------------------| -| 8 | TUN | | -| 9 | TUN | | -| 34 | BUM | | -| 40 | TUS | | -| 43 | LTA | //FIXME Should be RAV | -| 99 | XXX* | | -| 701 | PIL | | -| 702 | CLP | | -| 703 | JAX | | -| 704 | PAX | | -| 705 | ANE | | -| 706 | CLP | | -| 707 | BOG | | -| 708 | CLP | | -| 709 | MZZ | | -| 801 | YFT | | -| 802 | SKJ | | -| 803 | BET | | -| 804 | ALB | | -| 805 | LTA | | -| 806 | FRI | | -| 807 | SKH | | -| 809 | TUN | | -| 810 | KAW | | -| 811 | LOT | | -| 843 | LTA | | -| 899 | XXX* | | +| **ESPECE.C_ESP** | **Species.faoCode** | +|:-----------------|:--------------------| +| 8 | TUN | +| 9 | TUN | +| 34 | BUM | +| 40 | TUS | +| 43 | RVA* | +| 99 | XXX* | +| 701 | PIL | +| 702 | CLP | +| 703 | JAX | +| 704 | PAX | +| 705 | ANE | +| 706 | CLP | +| 707 | BOG | +| 708 | CLP | +| 709 | MZZ | +| 801 | YFT | +| 802 | SKJ | +| 803 | BET | +| 804 | ALB | +| 805 | LTA | +| 806 | FRI | +| 807 | SKH | +| 809 | TUN | +| 810 | KAW | +| 811 | LOT | +| 843 | RAV* | +| 899 | XXX* | ### REF_SPECIES_2 (pour les catégories de poids) Pour calculer les différentes catégories de poids, on effectue une translation sur les codes espèces AVDTH -|**ESPECE.C_ESP**| **ESPECE.C_ESP**| note | -|:--- | :--- | :--- | -| 8 | 41 | | -| 9 | 41 | | -| 16 | 310 | //FIXME add BIP Bonito oriental | -| 19 | 23 | //FIXME add BOP Palomette | -| 21 | 23 | //FIXME add SSM Thazard atlantique, Maquereau espagnol | -| 22 | 23 | //FIXME add KGM Thazard serra | -| 24 | 23 | //FIXME add CER Thazard franc | -| 25 | 23 | //FIXME add COM Thazard rayé (Indo-Pacifique) | -| 34 | 23 | //FIXME add BLZ Makaire bleu Indo-Pacifique | -| 40 | 23 | //FIXME add BGT Grand thonidés | -| 43 | 5 | // FIXME add RAV | -| 99 | 41 | | -| 701 | 41 | //FIXME Add Appat species ? | -| 702 | 41 | //FIXME Add Appat species ? | -| 703 | 41 | //FIXME Add Appat species ? | -| 704 | 41 | //FIXME Add Appat species ? | -| 705 | 41 | //FIXME Add Appat species ? | -| 706 | 5 | //FIXME Add Appat species ? | -| 707 | 41 | //FIXME Add Appat species ? | -| 708 | 41 | //FIXME Add Appat species ? | -| 709 | 41 | //FIXME Add Appat species ? | -| 801 | 1 | | -| 802 | 2 | | -| 803 | 3 | | -| 804 | 4 | | -| 805 | 5 | | -| 806 | 6 | | -| 809 | 41 | | -| 807 | 7 | | -| 810 | 10 | | -| 811 | 11 | | -| 817 | 17 | | -| 818 | 18 | | -| 820 | 20 | | -| 829 | 29 | | -| 830 | 30 | | -| 831 | 31 | | -| 832 | 32 | | -| 833 | 33 | | -| 834 | 34 | | -| 835 | 35 | | -| 836 | 36 | | -| 837 | 37 | | -| 838 | 38 | | -| 839 | 39 | | -| 843 | 5 | | -| 844 | 44 | | -| 845 | 45 | | -| 846 | 46 | | -| 847 | 47 | | -| 848 | 48 | | -| 849 | 49 | | -| 850 | 50 | | -| 851 | 51 | | -| 852 | 52 | | -| 853 | 53 | | -| 854 | 54 | | -| 855 | 55 | | -| 856 | 56 | | -| 857 | 57 | | -| 858 | 58 | | -| 899 | 41 | | -| 1042 | 41 | //FIXME Remove this ACC Grémille | -| 7066 | 312 | | +| **ESPECE.C_ESP** | **ESPECE.C_ESP** | note | +|:-----------------|:-----------------|:---------------------------------------------------------| +| 8 | 41 | | +| 9 | 41 | | +| 16 | 310 | //FIXME add BIP Bonito oriental | +| 19 | 23 | //FIXME add BOP Palomette | +| 21 | 23 | //FIXME add SSM Thazard atlantique, Maquereau espagnol | +| 22 | 23 | //FIXME add KGM Thazard serra | +| 24 | 23 | //FIXME add CER Thazard franc | +| 25 | 23 | //FIXME add COM Thazard rayé (Indo-Pacifique) | +| 34 | 23 | //FIXME add BLZ Makaire bleu Indo-Pacifique | +| 40 | 23 | //FIXME add BGT Grand thonidés | +| 43 | 5 | // FIXME add RAV | +| 99 | 41 | | +| 701 | 41 | //FIXME Add Appat species ? | +| 702 | 41 | //FIXME Add Appat species ? | +| 703 | 41 | //FIXME Add Appat species ? | +| 704 | 41 | //FIXME Add Appat species ? | +| 705 | 41 | //FIXME Add Appat species ? | +| 706 | 5 | //FIXME Add Appat species ? | +| 707 | 41 | //FIXME Add Appat species ? | +| 708 | 41 | //FIXME Add Appat species ? | +| 709 | 41 | //FIXME Add Appat species ? | +| 801 | 1 | | +| 802 | 2 | | +| 803 | 3 | | +| 804 | 4 | | +| 805 | 5 | | +| 806 | 6 | | +| 809 | 41 | | +| 807 | 7 | | +| 810 | 10 | | +| 811 | 11 | | +| 817 | 17 | | +| 818 | 18 | | +| 820 | 20 | | +| 829 | 29 | | +| 830 | 30 | | +| 831 | 31 | | +| 832 | 32 | | +| 833 | 33 | | +| 834 | 34 | | +| 835 | 35 | | +| 836 | 36 | | +| 837 | 37 | | +| 838 | 38 | | +| 839 | 39 | | +| 843 | 5 | | +| 844 | 44 | | +| 845 | 45 | | +| 846 | 46 | | +| 847 | 47 | | +| 848 | 48 | | +| 849 | 49 | | +| 850 | 50 | | +| 851 | 51 | | +| 852 | 52 | | +| 853 | 53 | | +| 854 | 54 | | +| 855 | 55 | | +| 856 | 56 | | +| 857 | 57 | | +| 858 | 58 | | +| 899 | 41 | | +| 1042 | 41 | //FIXME Remove this ACC Grémille | +| 7066 | 312 | | ### REF_SIZE_MEASURE_TYPE @@ -205,39 +205,39 @@ Pour transposer certains codes **TYPE_BALISE.C_TYP_BALISE** en code **ps_common. Mapping type d'activité -|**ACTIVITY.C_OPERA**| **ps_common.VesselActivity.code** | -|:--- |:----------------------------------| -| 0 | 6 (1) | -| 1 | 6 (1) | -| 2 | 6 (1) | -| 14 | 6 (1) (3) | -| 3 | 2 | -| 4 | 1 | -| 5 | 13 (2) | -| 6 | 13 (2) | -| 22 | 13 (2) | -| 23 | 13 (2) | -| 24 | 13 (2) | -| 25 | 13 (2) | -| 26 | 13 (2) | -| 29 | 13 (2) | -| 30 | 13 (2) | -| 31 | 13 (2) | -| 32 | 13 (2) | -| 33 | 13 (2) | -| 34 | 13 (2) | -| 7 | 22 | -| 8 | 10 | -| 9 | 23 | -| 10 | 24 | -| 11 | 25 | -| 12 | 26 | -| 13 | 27 | -| 15 | 0 | -| 19 | 29 | -| 20 | 30 | -| 35 | 31 | -| 36 | 99 **FIXME** | +| **ACTIVITY.C_OPERA** | **ps_common.VesselActivity.code** | +|:---------------------|:----------------------------------| +| 0 | 6 (1) | +| 1 | 6 (1) | +| 2 | 6 (1) | +| 14 | 6 (1) (3) | +| 3 | 2 | +| 4 | 1 | +| 5 | 13 (2) | +| 6 | 13 (2) | +| 22 | 13 (2) | +| 23 | 13 (2) | +| 24 | 13 (2) | +| 25 | 13 (2) | +| 26 | 13 (2) | +| 29 | 13 (2) | +| 30 | 13 (2) | +| 31 | 13 (2) | +| 32 | 13 (2) | +| 33 | 13 (2) | +| 34 | 13 (2) | +| 7 | 22 | +| 8 | 10 | +| 9 | 23 | +| 10 | 24 | +| 11 | 25 | +| 12 | 26 | +| 13 | 27 | +| 15 | 0 | +| 19 | 29 | +| 20 | 30 | +| 35 | 31 | +| 36 | 99 **FIXME** | 1. **Seule une activité de code 6 permet la création de captures**. 2. **Seule une activité de code 13 permet la création de DCP**.. @@ -247,11 +247,11 @@ Mapping type d'activité Mapping type de banc -|**ACTIVITY.C_TBANC**| **ps_common.SchoolType.code**| -|:--- | :--- | -| 1 | 1 | -| 2 | 2 | -| 3 | 0 | +| **ACTIVITY.C_TBANC** | **ps_common.SchoolType.code** | +|:---------------------|:------------------------------| +| 1 | 1 | +| 2 | 2 | +| 3 | 0 | ### REF_CATCH_WEIGHT_CATEGORY @@ -279,28 +279,28 @@ Mapping conformité d'échantillonnage de cuve À partir de **CUVE.C_DEST**, on déduit **ps_logbook.WellSamplingConformity.code** -|**CUVE.C_DEST**| **WellSamplingConformity.code**| -|:--- | :--- | -| 1 | 9 | -| 2 | 9 | -| 3 | 9 | -| 4 | 9 | -| 5 | 9 | -| 6 | 9 | -| 7 | 9 | -| 8 | 9 | -| 9 | 9 | -| 10 | 1 | -| 11 | 1 | -| 12 | 1 | -| 13 | 1 | -| 14 | 1 | -| 15 | 1 | -| 16 | 1 | -| 17 | 1 | -| 20 | 2 | -| 21 | 2 | -| 22 | 2 | +| **CUVE.C_DEST** | **WellSamplingConformity.code** | +|:------------------|:--------------------------------| +| 1 | 9 | +| 2 | 9 | +| 3 | 9 | +| 4 | 9 | +| 5 | 9 | +| 6 | 9 | +| 7 | 9 | +| 8 | 9 | +| 9 | 9 | +| 10 | 1 | +| 11 | 1 | +| 12 | 1 | +| 13 | 1 | +| 14 | 1 | +| 15 | 1 | +| 16 | 1 | +| 17 | 1 | +| 20 | 2 | +| 21 | 2 | +| 22 | 2 | ### REF_WELL_SAMPLING_STATUS @@ -308,28 +308,28 @@ Mapping status d'échantillonnage de cuve À partir de **CUVE_DEST**, on déduit **ps_logbook.WellSamplingStatus.code** -|**CUVE.C_DEST**| **WellSamplingStatus.code** | -|:--- | :--- | -| 1 | 9 | -| 2 | 9 | -| 3 | 9 | -| 4 | 9 | -| 5 | 9 | -| 6 | 9 | -| 7 | 9 | -| 8 | 9 | -| 9 | 9 | -| 10 | 1 | -| 11 | 2 | -| 12 | 3 | -| 13 | 4 | -| 14 | 5 | -| 15 | 6 | -| 16 | 7 | -| 17 | 8 | -| 20 | 10 | -| 21 | 11 | -| 22 | 12 | +| **CUVE.C_DEST** | **WellSamplingStatus.code** | +|:----------------|:-----------------------------| +| 1 | 9 | +| 2 | 9 | +| 3 | 9 | +| 4 | 9 | +| 5 | 9 | +| 6 | 9 | +| 7 | 9 | +| 8 | 9 | +| 9 | 9 | +| 10 | 1 | +| 11 | 2 | +| 12 | 3 | +| 13 | 4 | +| 14 | 5 | +| 15 | 6 | +| 16 | 7 | +| 17 | 8 | +| 20 | 10 | +| 21 | 11 | +| 22 | 12 | ### REF_WELL_SAMPLE_WEIGHT_CATEGORY View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/4526b9cff920226908eda2d3… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/4526b9cff920226908eda2d3… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] 7 commits: Ajout de références ObservedSystem - See ultreiaio/ird-observe#2446
by Tony CHEMIT (＠tchemit) 06 Oct '22

06 Oct '22

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 279bbfa9 by Tony Chemit at 2022-10-05T18:53:32+02:00 Ajout de références ObservedSystem - See ultreiaio/ird-observe#2446 - - - - - d3e701ad by Tony Chemit at 2022-10-06T10:40:01+02:00 Un référentiel présent indiqué comme absent par l'importeur AVDTH - Closes #2447 - - - - - 73d58173 by Tony Chemit at 2022-10-06T10:41:19+02:00 Ajout de références ObservedSystem - Closes #2446 - - - - - 29da365c by Tony Chemit at 2022-10-06T10:41:19+02:00 Un référentiel présent indiqué comme absent par l'importeur AVDTH - Closes #2447 - - - - - 4d26083f by Tony Chemit at 2022-10-06T11:12:45+02:00 Problème d'import AVDTH - Closes #2445 - - - - - 10885143 by Tony Chemit at 2022-10-06T11:32:17+02:00 Merge branch 'feature/issue_2445' into develop - - - - - 4526b9cf by Tony Chemit at 2022-10-06T11:33:07+02:00 Documentation - Clean AVDTH doc - - - - - 8 changed files: - core/persistence/resources/src/main/java/fr/ird/observe/persistence/avdth/referential/interceptors/ObservedSystemInterceptor.java - core/persistence/resources/src/main/java/fr/ird/observe/persistence/avdth/referential/interceptors/TransmittingBuoyTypeInterceptor.java - core/persistence/resources/src/main/java/fr/ird/observe/spi/migration/v9/DataSourceMigrationForVersion_9_0.java - + core/persistence/resources/src/main/resources/db/migration/v9/9.0/96_add_referential_ps_common_ObservedSystem_74-common.sql - + core/persistence/resources/src/main/resources/db/migration/v9/9.0/96_add_referential_ps_common_ObservedSystem_81-common.sql - core/persistence/test/src/test/resources/fixtures/persistence/table_count/referential.properties - model/src/main/resources/fixtures/global.properties - src/site/markdown/avdth/referential.md Changes: ===================================== core/persistence/resources/src/main/java/fr/ird/observe/persistence/avdth/referential/interceptors/ObservedSystemInterceptor.java ===================================== @@ -58,58 +58,24 @@ public class ObservedSystemInterceptor extends ReferentialInterceptor<ObservedSy * From avdth code to observe code. */ public static final Map<String, String> CODE_MAPPING = ImmutableMap.<String, String>builder() - .put("0", "0") .put("10", "18") .put("11", "23") .put("12", "24") .put("13", "25") .put("14", "26") - .put("20", "20") .put("21", "20") .put("22", "20") .put("23", "20") .put("24", "20") .put("25", "20") .put("26", "17") - .put("27", "27") - .put("28", "28") .put("29", "31") .put("30", "4") .put("31", "4") - .put("32", "32") - .put("33", "33") - .put("34", "34") - .put("35", "35") - .put("36", "36") - .put("37", "37") - .put("38", "38") - .put("40", "40") - .put("41", "41") - .put("42", "42") - .put("43", "43") - .put("50", "50") .put("51", "11") .put("52", "10") - .put("53", "53") .put("60", "12") .put("61", "13") - .put("62", "62") - .put("70", "70") - .put("71", "71") - .put("72", "72") - .put("73", "73") - .put("80", "80") - .put("81", "7") - .put("90", "90") - .put("91", "91") - .put("92", "92") - .put("93", "93") - .put("94", "94") - .put("95", "95") - .put("96", "96") - .put("97", "97") - .put("98", "98") - .put("99", "99") .build(); /** * Internal cache of created entities, keep it static to reuse if for more than one import... @@ -170,7 +136,7 @@ public class ObservedSystemInterceptor extends ReferentialInterceptor<ObservedSy @Override protected ObservedSystem read(Map<String, ObservedSystem> existingIndex, String code) { - String realCode = CODE_MAPPING.get(code); + String realCode = CODE_MAPPING.getOrDefault(code, code); ObservedSystem entity = super.read(existingIndex, realCode); entity.setCode(code); return entity; ===================================== core/persistence/resources/src/main/java/fr/ird/observe/persistence/avdth/referential/interceptors/TransmittingBuoyTypeInterceptor.java ===================================== @@ -41,7 +41,6 @@ import java.sql.ResultSet; import java.sql.SQLException; import java.util.List; import java.util.Map; -import java.util.Objects; /** * Created on 22/05/2021. @@ -54,16 +53,6 @@ public class TransmittingBuoyTypeInterceptor extends ReferentialInterceptor<Tran * From avdth to observe code. */ public static final Map<String, String> CODE_MAPPING = ImmutableMap.<String, String>builder() - .put("1", "1") - .put("2", "2") - .put("3", "3") - .put("4", "4") - .put("5", "5") - .put("6", "6") - .put("7", "7") - .put("8", "8") - .put("9", "9") - .put("10", "10") .put("11", "90") .put("12", "21") .put("13", "22") @@ -94,10 +83,7 @@ public class TransmittingBuoyTypeInterceptor extends ReferentialInterceptor<Tran .put("38", "71") .put("39", "3") .put("40", "91") - .put("91", "91") .put("98", "99") - .put("99", "99") - .put("999", "999") .build(); @SuppressWarnings("SpellCheckingInspection") @@ -113,6 +99,7 @@ public class TransmittingBuoyTypeInterceptor extends ReferentialInterceptor<Tran */ public TransmittingBuoyTypeTable() { super(1); + } @Override @@ -152,8 +139,8 @@ public class TransmittingBuoyTypeInterceptor extends ReferentialInterceptor<Tran @Override protected TransmittingBuoyType read(Map<String, TransmittingBuoyType> existingIndex, String code) { - String realCode = CODE_MAPPING.get(code); - TransmittingBuoyType entity = super.read(existingIndex, Objects.requireNonNull(realCode)); + String realCode = CODE_MAPPING.getOrDefault(code, code); + TransmittingBuoyType entity = super.read(existingIndex, realCode); entity.setCode(code); return entity; } ===================================== core/persistence/resources/src/main/java/fr/ird/observe/spi/migration/v9/DataSourceMigrationForVersion_9_0.java ===================================== @@ -215,7 +215,7 @@ public class DataSourceMigrationForVersion_9_0 extends ByMajorMigrationVersionRe private void addObservedSystem(MigrationVersionResourceExecutor executor) { Set<String> existingCodes = executor.findMultipleResultAstSet(SqlQuery.wrap("SELECT CODE FROM ps_common.ObservedSystem", resultSet -> resultSet.getString(1))); Set<String> newCodes = new LinkedHashSet<>(); - Stream.of("110").forEach(code -> { + Stream.of("74", "81", "110").forEach(code -> { if (!existingCodes.contains(code)) { executor.addScript("96", "add_referential_ps_common_ObservedSystem_" + code); newCodes.add(code); ===================================== core/persistence/resources/src/main/resources/db/migration/v9/9.0/96_add_referential_ps_common_ObservedSystem_74-common.sql ===================================== @@ -0,0 +1,22 @@ +--- +-- #%L +-- ObServe Core :: Persistence :: Resources +-- %% +-- Copyright (C) 2008 - 2022 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% +--- +INSERT INTO ps_common.observedsystem(topiaid, topiaversion, topiacreatedate, lastupdatedate, code, uri, homeid, needcomment, status, label1, label2, label3, label4, label5, label6, label7, label8, schooltype, allowobservation, allowlogbook) VALUES ('fr.ird.referential.ps.common.ObservedSystem#${REFERENTIAL_PREFIX}74', 0, ${CURRENT_DATE}, ${CURRENT_TIMESTAMP}, '74', null, null, FALSE, 1, 'Billfish', 'Poisson à rostre', 'Billfish TODO', null, null, null, null, null, '${SchoolType_2}', FALSE, TRUE); ===================================== core/persistence/resources/src/main/resources/db/migration/v9/9.0/96_add_referential_ps_common_ObservedSystem_81-common.sql ===================================== @@ -0,0 +1,22 @@ +--- +-- #%L +-- ObServe Core :: Persistence :: Resources +-- %% +-- Copyright (C) 2008 - 2022 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% +--- +INSERT INTO ps_common.observedsystem(topiaid, topiaversion, topiacreatedate, lastupdatedate, code, uri, homeid, needcomment, status, label1, label2, label3, label4, label5, label6, label7, label8, schooltype, allowobservation, allowlogbook) VALUES ('fr.ird.referential.ps.common.ObservedSystem#${REFERENTIAL_PREFIX}81', 0, ${CURRENT_DATE}, ${CURRENT_TIMESTAMP}, '81', null, null, FALSE, 1, 'Carrion', 'Charogne', 'Carrion TODO', null, null, null, null, null, '${SchoolType_0}', FALSE, TRUE); ===================================== core/persistence/test/src/test/resources/fixtures/persistence/table_count/referential.properties ===================================== @@ -79,7 +79,7 @@ ps_common.acquisitionStatus=9 ps_common.objectMaterial=91 ps_common.objectMaterialType=5 ps_common.objectOperation=12 -ps_common.observedSystem=64 +ps_common.observedSystem=66 ps_common.program=17 ps_common.reasonForNoFishing=16 ps_common.reasonForNullSet=10 ===================================== model/src/main/resources/fixtures/global.properties ===================================== @@ -25,4 +25,4 @@ REFERENCE_DATA_COUNT=66 ENTITIES_LIMIT_SIZE=100 # fr.ird.observe.services.service.referential.ReferentialService # fr.ird.observe.services.local.service.referential.DifferentialModelTest -REFERENTIAL_COUNT=4090 +REFERENTIAL_COUNT=4092 ===================================== src/site/markdown/avdth/referential.md ===================================== @@ -12,11 +12,11 @@ Dans **ObServe**, cela est remplacé par un identifiant de type chaine de caract Le mapping sur la position est réalisé ainsi : -|**Position dans AVDTH**| **Position dans ObServe**| -|:--- | :--- | -|1 | B | -|2 | T | -|3 | A | +| **Position dans AVDTH** | **Position dans ObServe** | +|:------------------------|:--------------------------| +| 1 | B | +| 2 | T | +| 3 | A | ### REF_SPECIES @@ -24,107 +24,107 @@ Mapping espèce On transpose les codes espèce AVDTH (**ESPECE.C_ESP**) en **Species.faoCode** -| **ESPECE.C_ESP** | **Species.faoCode** | note | -|:-----------------|:--------------------|:----------------------| -| 8 | TUN | | -| 9 | TUN | | -| 34 | BUM | | -| 40 | TUS | | -| 43 | LTA | //FIXME Should be RAV | -| 99 | XXX* | | -| 701 | PIL | | -| 702 | CLP | | -| 703 | JAX | | -| 704 | PAX | | -| 705 | ANE | | -| 706 | CLP | | -| 707 | BOG | | -| 708 | CLP | | -| 709 | MZZ | | -| 801 | YFT | | -| 802 | SKJ | | -| 803 | BET | | -| 804 | ALB | | -| 805 | LTA | | -| 806 | FRI | | -| 807 | SKH | | -| 809 | TUN | | -| 810 | KAW | | -| 811 | LOT | | -| 843 | LTA | | -| 899 | XXX* | | +| **ESPECE.C_ESP** | **Species.faoCode** | +|:-----------------|:--------------------| +| 8 | TUN | +| 9 | TUN | +| 34 | BUM | +| 40 | TUS | +| 43 | RVA* | +| 99 | XXX* | +| 701 | PIL | +| 702 | CLP | +| 703 | JAX | +| 704 | PAX | +| 705 | ANE | +| 706 | CLP | +| 707 | BOG | +| 708 | CLP | +| 709 | MZZ | +| 801 | YFT | +| 802 | SKJ | +| 803 | BET | +| 804 | ALB | +| 805 | LTA | +| 806 | FRI | +| 807 | SKH | +| 809 | TUN | +| 810 | KAW | +| 811 | LOT | +| 843 | RAV* | +| 899 | XXX* | ### REF_SPECIES_2 (pour les catégories de poids) Pour calculer les différentes catégories de poids, on effectue une translation sur les codes espèces AVDTH -|**ESPECE.C_ESP**| **ESPECE.C_ESP**| note | -|:--- | :--- | :--- | -| 8 | 41 | | -| 9 | 41 | | -| 16 | 310 | //FIXME add BIP Bonito oriental | -| 19 | 23 | //FIXME add BOP Palomette | -| 21 | 23 | //FIXME add SSM Thazard atlantique, Maquereau espagnol | -| 22 | 23 | //FIXME add KGM Thazard serra | -| 24 | 23 | //FIXME add CER Thazard franc | -| 25 | 23 | //FIXME add COM Thazard rayé (Indo-Pacifique) | -| 34 | 23 | //FIXME add BLZ Makaire bleu Indo-Pacifique | -| 40 | 23 | //FIXME add BGT Grand thonidés | -| 43 | 5 | // FIXME add RAV | -| 99 | 41 | | -| 701 | 41 | //FIXME Add Appat species ? | -| 702 | 41 | //FIXME Add Appat species ? | -| 703 | 41 | //FIXME Add Appat species ? | -| 704 | 41 | //FIXME Add Appat species ? | -| 705 | 41 | //FIXME Add Appat species ? | -| 706 | 5 | //FIXME Add Appat species ? | -| 707 | 41 | //FIXME Add Appat species ? | -| 708 | 41 | //FIXME Add Appat species ? | -| 709 | 41 | //FIXME Add Appat species ? | -| 801 | 1 | | -| 802 | 2 | | -| 803 | 3 | | -| 804 | 4 | | -| 805 | 5 | | -| 806 | 6 | | -| 809 | 41 | | -| 807 | 7 | | -| 810 | 10 | | -| 811 | 11 | | -| 817 | 17 | | -| 818 | 18 | | -| 820 | 20 | | -| 829 | 29 | | -| 830 | 30 | | -| 831 | 31 | | -| 832 | 32 | | -| 833 | 33 | | -| 834 | 34 | | -| 835 | 35 | | -| 836 | 36 | | -| 837 | 37 | | -| 838 | 38 | | -| 839 | 39 | | -| 843 | 5 | | -| 844 | 44 | | -| 845 | 45 | | -| 846 | 46 | | -| 847 | 47 | | -| 848 | 48 | | -| 849 | 49 | | -| 850 | 50 | | -| 851 | 51 | | -| 852 | 52 | | -| 853 | 53 | | -| 854 | 54 | | -| 855 | 55 | | -| 856 | 56 | | -| 857 | 57 | | -| 858 | 58 | | -| 899 | 41 | | -| 1042 | 41 | //FIXME Remove this ACC Grémille | -| 7066 | 312 | | +| **ESPECE.C_ESP** | **ESPECE.C_ESP** | note | +|:-----------------|:-----------------|:---------------------------------------------------------| +| 8 | 41 | | +| 9 | 41 | | +| 16 | 310 | //FIXME add BIP Bonito oriental | +| 19 | 23 | //FIXME add BOP Palomette | +| 21 | 23 | //FIXME add SSM Thazard atlantique, Maquereau espagnol | +| 22 | 23 | //FIXME add KGM Thazard serra | +| 24 | 23 | //FIXME add CER Thazard franc | +| 25 | 23 | //FIXME add COM Thazard rayé (Indo-Pacifique) | +| 34 | 23 | //FIXME add BLZ Makaire bleu Indo-Pacifique | +| 40 | 23 | //FIXME add BGT Grand thonidés | +| 43 | 5 | // FIXME add RAV | +| 99 | 41 | | +| 701 | 41 | //FIXME Add Appat species ? | +| 702 | 41 | //FIXME Add Appat species ? | +| 703 | 41 | //FIXME Add Appat species ? | +| 704 | 41 | //FIXME Add Appat species ? | +| 705 | 41 | //FIXME Add Appat species ? | +| 706 | 5 | //FIXME Add Appat species ? | +| 707 | 41 | //FIXME Add Appat species ? | +| 708 | 41 | //FIXME Add Appat species ? | +| 709 | 41 | //FIXME Add Appat species ? | +| 801 | 1 | | +| 802 | 2 | | +| 803 | 3 | | +| 804 | 4 | | +| 805 | 5 | | +| 806 | 6 | | +| 809 | 41 | | +| 807 | 7 | | +| 810 | 10 | | +| 811 | 11 | | +| 817 | 17 | | +| 818 | 18 | | +| 820 | 20 | | +| 829 | 29 | | +| 830 | 30 | | +| 831 | 31 | | +| 832 | 32 | | +| 833 | 33 | | +| 834 | 34 | | +| 835 | 35 | | +| 836 | 36 | | +| 837 | 37 | | +| 838 | 38 | | +| 839 | 39 | | +| 843 | 5 | | +| 844 | 44 | | +| 845 | 45 | | +| 846 | 46 | | +| 847 | 47 | | +| 848 | 48 | | +| 849 | 49 | | +| 850 | 50 | | +| 851 | 51 | | +| 852 | 52 | | +| 853 | 53 | | +| 854 | 54 | | +| 855 | 55 | | +| 856 | 56 | | +| 857 | 57 | | +| 858 | 58 | | +| 899 | 41 | | +| 1042 | 41 | //FIXME Remove this ACC Grémille | +| 7066 | 312 | | ### REF_SIZE_MEASURE_TYPE @@ -138,45 +138,106 @@ Mapping type de mesure de taille Mapping systèmes observés -TODO +Pour transposer certains codes **ACT_ASSOC.C_ASSOC** en code **ps_common.ObservedSystem.code**, les autres codes sont ceux d'ObServe. + +| **ACT_ASSOC.C_ASSOC** | **ps_common.ObservedSystem.code** | +|:----------------------|:----------------------------------| +| 10 | 18 | +| 11 | 23 | +| 12 | 24 | +| 13 | 25 | +| 14 | 26 | +| 21 | 20 | +| 22 | 20 | +| 23 | 20 | +| 24 | 20 | +| 25 | 20 | +| 26 | 17 | +| 29 | 31 | +| 30 | 4 | +| 31 | 4 | +| 51 | 11 | +| 52 | 10 | +| 60 | 12 | +| 61 | 13 | + +### REF_TRANSMITTING_BUOY + +Mapping TransmittingBuoy + +Pour transposer certains codes **TYPE_BALISE.C_TYP_BALISE** en code **ps_common.TransmittingBuoy.code**, les autres codes sont ceux d'ObServe. + +| **TYPE_BALISE.C_TYP_BALISE** | **ps_common.ObservedSystem.code** | +|:-----------------------------|:----------------------------------| +| 11 | 90 | +| 12 | 21 | +| 13 | 22 | +| 14 | 23 | +| 15 | 24 | +| 16 | 25 | +| 17 | 26 | +| 18 | 27 | +| 19 | 28 | +| 20 | 41 | +| 21 | 42 | +| 22 | 43 | +| 23 | 44 | +| 24 | 45 | +| 25 | 46 | +| 26 | 47 | +| 27 | 100 | +| 28 | 61 | +| 29 | 62 | +| 30 | 63 | +| 31 | 64 | +| 32 | 65 | +| 33 | 66 | +| 34 | 67 | +| 35 | 68 | +| 36 | 69 | +| 37 | 70 | +| 38 | 71 | +| 39 | 3 | +| 40 | 91 | +| 98 | 99 | ### REF_VESSEL_ACTIVITY_TYPE Mapping type d'activité -|**ACTIVITY.C_OPERA**| **ps_common.VesselActivity.code** | -|:--- |:----------------------------------| -| 0 | 6 (1) | -| 1 | 6 (1) | -| 2 | 6 (1) | -| 14 | 6 (1) (3) | -| 3 | 2 | -| 4 | 1 | -| 5 | 13 (2) | -| 6 | 13 (2) | -| 22 | 13 (2) | -| 23 | 13 (2) | -| 24 | 13 (2) | -| 25 | 13 (2) | -| 26 | 13 (2) | -| 29 | 13 (2) | -| 30 | 13 (2) | -| 31 | 13 (2) | -| 32 | 13 (2) | -| 33 | 13 (2) | -| 34 | 13 (2) | -| 7 | 22 | -| 8 | 10 | -| 9 | 23 | -| 10 | 24 | -| 11 | 25 | -| 12 | 26 | -| 13 | 27 | -| 15 | 0 | -| 19 | 29 | -| 20 | 30 | -| 35 | 31 | -| 36 | 99 **FIXME** | +| **ACTIVITY.C_OPERA** | **ps_common.VesselActivity.code** | +|:---------------------|:----------------------------------| +| 0 | 6 (1) | +| 1 | 6 (1) | +| 2 | 6 (1) | +| 14 | 6 (1) (3) | +| 3 | 2 | +| 4 | 1 | +| 5 | 13 (2) | +| 6 | 13 (2) | +| 22 | 13 (2) | +| 23 | 13 (2) | +| 24 | 13 (2) | +| 25 | 13 (2) | +| 26 | 13 (2) | +| 29 | 13 (2) | +| 30 | 13 (2) | +| 31 | 13 (2) | +| 32 | 13 (2) | +| 33 | 13 (2) | +| 34 | 13 (2) | +| 7 | 22 | +| 8 | 10 | +| 9 | 23 | +| 10 | 24 | +| 11 | 25 | +| 12 | 26 | +| 13 | 27 | +| 15 | 0 | +| 19 | 29 | +| 20 | 30 | +| 35 | 31 | +| 36 | 99 **FIXME** | 1. **Seule une activité de code 6 permet la création de captures**. 2. **Seule une activité de code 13 permet la création de DCP**.. @@ -186,11 +247,11 @@ Mapping type d'activité Mapping type de banc -|**ACTIVITY.C_TBANC**| **ps_common.SchoolType.code**| -|:--- | :--- | -| 1 | 1 | -| 2 | 2 | -| 3 | 0 | +| **ACTIVITY.C_TBANC** | **ps_common.SchoolType.code** | +|:---------------------|:------------------------------| +| 1 | 1 | +| 2 | 2 | +| 3 | 0 | ### REF_CATCH_WEIGHT_CATEGORY @@ -218,28 +279,28 @@ Mapping conformité d'échantillonnage de cuve À partir de **CUVE.C_DEST**, on déduit **ps_logbook.WellSamplingConformity.code** -|**CUVE.C_DEST**| **WellSamplingConformity.code**| -|:--- | :--- | -| 1 | 9 | -| 2 | 9 | -| 3 | 9 | -| 4 | 9 | -| 5 | 9 | -| 6 | 9 | -| 7 | 9 | -| 8 | 9 | -| 9 | 9 | -| 10 | 1 | -| 11 | 1 | -| 12 | 1 | -| 13 | 1 | -| 14 | 1 | -| 15 | 1 | -| 16 | 1 | -| 17 | 1 | -| 20 | 2 | -| 21 | 2 | -| 22 | 2 | +| **CUVE.C_DEST** | **WellSamplingConformity.code** | +|:------------------|:--------------------------------| +| 1 | 9 | +| 2 | 9 | +| 3 | 9 | +| 4 | 9 | +| 5 | 9 | +| 6 | 9 | +| 7 | 9 | +| 8 | 9 | +| 9 | 9 | +| 10 | 1 | +| 11 | 1 | +| 12 | 1 | +| 13 | 1 | +| 14 | 1 | +| 15 | 1 | +| 16 | 1 | +| 17 | 1 | +| 20 | 2 | +| 21 | 2 | +| 22 | 2 | ### REF_WELL_SAMPLING_STATUS @@ -247,28 +308,28 @@ Mapping status d'échantillonnage de cuve À partir de **CUVE_DEST**, on déduit **ps_logbook.WellSamplingStatus.code** -|**CUVE.C_DEST**| **WellSamplingStatus.code** | -|:--- | :--- | -| 1 | 9 | -| 2 | 9 | -| 3 | 9 | -| 4 | 9 | -| 5 | 9 | -| 6 | 9 | -| 7 | 9 | -| 8 | 9 | -| 9 | 9 | -| 10 | 1 | -| 11 | 2 | -| 12 | 3 | -| 13 | 4 | -| 14 | 5 | -| 15 | 6 | -| 16 | 7 | -| 17 | 8 | -| 20 | 10 | -| 21 | 11 | -| 22 | 12 | +| **CUVE.C_DEST** | **WellSamplingStatus.code** | +|:----------------|:-----------------------------| +| 1 | 9 | +| 2 | 9 | +| 3 | 9 | +| 4 | 9 | +| 5 | 9 | +| 6 | 9 | +| 7 | 9 | +| 8 | 9 | +| 9 | 9 | +| 10 | 1 | +| 11 | 2 | +| 12 | 3 | +| 13 | 4 | +| 14 | 5 | +| 15 | 6 | +| 16 | 7 | +| 17 | 8 | +| 20 | 10 | +| 21 | 11 | +| 22 | 12 | ### REF_WELL_SAMPLE_WEIGHT_CATEGORY View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/0ce39209b08fe057e206557c… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/0ce39209b08fe057e206557c… 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.0.11-SNAPSHOT)
by Tony CHEMIT (＠tchemit) 06 Oct '22

06 Oct '22

Tony CHEMIT pushed to branch pages at ultreiaio / ird-observe Commits: ac384e33 by Tony Chemit at 2022-10-06T11:31:22+02:00 Site checkin for project ObServe (version 9.0.11-SNAPSHOT) - - - - - 30 changed files: - 9.0.11-SNAPSHOT/CHANGELOG.html - 9.0.11-SNAPSHOT/architecture-logicielle.html - 9.0.11-SNAPSHOT/avdth/common.html - 9.0.11-SNAPSHOT/avdth/index.html - 9.0.11-SNAPSHOT/avdth/landing.html - 9.0.11-SNAPSHOT/avdth/local_market.html - 9.0.11-SNAPSHOT/avdth/logbook.html - 9.0.11-SNAPSHOT/avdth/referential.html - 9.0.11-SNAPSHOT/avdth/sample.html - 9.0.11-SNAPSHOT/changelog.html - 9.0.11-SNAPSHOT/changes-report.html - 9.0.11-SNAPSHOT/ci-management.html - 9.0.11-SNAPSHOT/dependency-convergence.html - 9.0.11-SNAPSHOT/dependency-info.html - 9.0.11-SNAPSHOT/dependency-management.html - 9.0.11-SNAPSHOT/dependency-updates-report.html - 9.0.11-SNAPSHOT/dev-activity.html - 9.0.11-SNAPSHOT/distribution-management.html - 9.0.11-SNAPSHOT/file-activity.html - 9.0.11-SNAPSHOT/index.html - 9.0.11-SNAPSHOT/install.html - 9.0.11-SNAPSHOT/issue-management.html - 9.0.11-SNAPSHOT/licenses.html - 9.0.11-SNAPSHOT/modules.html - 9.0.11-SNAPSHOT/observe-client.conf - 9.0.11-SNAPSHOT/observe-client.html - 9.0.11-SNAPSHOT/observe-server.conf - 9.0.11-SNAPSHOT/observe-server.html - 9.0.11-SNAPSHOT/plugin-management.html - 9.0.11-SNAPSHOT/plugin-updates-report.html The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/ac384e334b03c879355e81d3f… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/ac384e334b03c879355e81d3f… You're receiving this email because of your account on gitlab.com.

1 0