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

[Git][ultreiaio/ird-observe][release/9.0.0-RC-18] [jgitflow-maven-plugin]updating poms for branch'release/9.0.0-RC-18' with...
by Tony CHEMIT (＠tchemit) 08 Nov '21

08 Nov '21

Tony CHEMIT pushed to branch release/9.0.0-RC-18 at ultreiaio / ird-observe Commits: 96c6651a by Tony Chemit at 2021-11-08T14:26:59+01:00 [jgitflow-maven-plugin]updating poms for branch'release/9.0.0-RC-18' with non-snapshot versions[skip ci] - - - - - 30 changed files: - client/configuration/pom.xml - client/core/pom.xml - client/datasource/actions/pom.xml - client/datasource/api/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/i18n/pom.xml - client/pom.xml - client/runner/pom.xml - models/definition/pom.xml - models/dto/i18n/pom.xml - models/dto/java/pom.xml - models/dto/pom.xml - models/navigation/descriptor/pom.xml - models/navigation/id/pom.xml - models/navigation/pom.xml - models/navigation/tree/pom.xml - models/persistence/avdth/pom.xml - models/persistence/java/pom.xml - models/persistence/migration/pom.xml - models/persistence/pom.xml - models/persistence/test-api/pom.xml - models/persistence/test-impl/pom.xml - models/pom.xml The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/96c6651a379e6ff7246be4a1b… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/96c6651a379e6ff7246be4a1b… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][master] 51 commits: [jgitflow-maven-plugin]updating poms for 9.0.0-RC-18-SNAPSHOT development[skip ci]
by Tony CHEMIT (＠tchemit) 08 Nov '21

08 Nov '21

Tony CHEMIT pushed to branch master at ultreiaio / ird-observe Commits: 77077cc6 by Tony Chemit at 2021-10-27T17:23:59+02:00 [jgitflow-maven-plugin]updating poms for 9.0.0-RC-18-SNAPSHOT development[skip ci] - - - - - 5b381785 by Tony Chemit at 2021-10-27T17:37:23+02:00 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts[skip ci] - - - - - 749d1079 by Tony Chemit at 2021-10-27T17:37:24+02:00 [jgitflow-maven-plugin]merging 'master' into 'develop' - - - - - ff32a654 by Tony Chemit at 2021-10-27T17:37:25+02:00 [jgitflow-maven-plugin]Updating develop poms back to pre merge state[skip ci] - - - - - 8cbf2487 by Tony Chemit at 2021-10-28T08:00:39+02:00 On peut créer un programme sans sélectionner aucun des types de données qu'il peut recevoir - Closes #2071 - - - - - c416b6ba by Tony Chemit at 2021-10-29T00:49:36+02:00 Création des routes et activités requises lorsqu'elles sont absentes - Closes #2070 Improve Avdth API: * now reader have no logic everything is in ImportDataContext (except for dcp...) * introduce ImportReferentialContext with all possible cache we need. Improve avdth tests - - - - - 3b2e61d2 by Tony Chemit at 2021-10-29T01:07:05+02:00 Ne pas supprimer les fichers temporaires à chaque lancement de l'application - Closes #2074 + clean de RunObserveListener - - - - - 3bc25c05 by Tony Chemit at 2021-10-29T01:07:05+02:00 Positionner sur le bouton choisir un fichier ou un répertoire sur les écrans requis - Closes #2076 - - - - - b6d8cd0f by Tony Chemit at 2021-10-29T01:07:05+02:00 Correction référentiels (' est doublé dans les migrations) Les systèmes observés 102→104 sont désactivés - - - - - 21b6f701 by Tony Chemit at 2021-10-29T14:55:16+02:00 Symboles de carte pour V9 - Closes #1347 - - - - - 2cd8ad6e by Tony Chemit at 2021-10-30T12:53:22+02:00 Codes espèces manquants dans la base de production - See ultreiaio/ird-observe#2073 - - - - - f123d904 by Tony Chemit at 2021-10-31T11:54:09+01:00 Improve Validator runtime API - See ultreiaio/jaxx#811 remove Unified API from jaxx-validator - See ultreiaio/jaxx##810 - - - - - 6982080f by Tony Chemit at 2021-11-02T15:55:55+01:00 Add tag value to decompose timeStamp to date and time dto property and generate the code - Closes ultreiaio/ird-observe-toolkit#104 Introduce LlActivityAware and PsActivityAware and clean once again dto code. Have only one place to code business logic. - - - - - ddbc282f by Tony Chemit at 2021-11-02T15:57:33+01:00 normalize enabled properties usage in ui - - - - - e15793fe by Tony Chemit at 2021-11-03T17:29:34+01:00 Si des activités sont liées aux échantillons ou bien au plan de cuves et qu'elles ne sont pas de type pêche, on ne les voit pas dans les formulaires associés - Closes #2087 - - - - - fb339162 by Tony Chemit at 2021-11-03T17:29:34+01:00 Activité PS logbook : Préremplir 'Nombre d'opération' avec 1 - Closes #2081 - - - - - 7221de9d by Tony Chemit at 2021-11-04T15:14:43+01:00 Supprimer ces flags sur Program - See ultreiaio/ird-observe#2051 - - - - - 73715a44 by Tony Chemit at 2021-11-04T15:14:43+01:00 Distinguer Perte de transmission et Fin d'utilisation de balise - See ultreiaio/ird-observe#2081 - - - - - afb3c8c8 by Tony Chemit at 2021-11-04T15:14:43+01:00 Improve focus dispatch on CoordinatesEditor validation messages - - - - - ef7af2d2 by Tony Chemit at 2021-11-04T15:14:43+01:00 le reset du quadrant n'est pas effectuée - See ultreiaio/jaxx#811 - - - - - 5c5b6797 by Tony Chemit at 2021-11-04T15:14:43+01:00 update pom - - - - - 7586623f by Tony Chemit at 2021-11-04T15:14:43+01:00 Clean validators - See ultreiaio/ird-observe-toolkit#105 - - - - - 81d04187 by Tony Chemit at 2021-11-04T15:14:43+01:00 Passer activity.latitude/longitude en NULL possible - See ultreiaio/ird-observe#2078 - - - - - 4c007a59 by Tony Chemit at 2021-11-04T15:14:43+01:00 Mauvais enregistrement matériaux au départ lors de l'import AVDTH - Closes #2083 - - - - - 55a943ce by Tony Chemit at 2021-11-04T15:14:43+01:00 update Public API doc - - - - - 49a258a0 by Tony Chemit at 2021-11-04T15:14:43+01:00 Amélioration des pré-configuration de DCP - Closes #2084 - - - - - b4413c4a by Tony Chemit at 2021-11-05T01:39:57+01:00 Remplir les codes de weightmeasuremethod - See ultreiaio/ird-observe#2085 - - - - - 6d43f15e by Tony Chemit at 2021-11-05T01:39:57+01:00 Voir pourquoi le parsing des poids min/max sur les catégories n'a pas bien fonctionné - See ultreiaio/ird-observe#2086 - - - - - faa75a01 by Tony Chemit at 2021-11-05T01:39:57+01:00 toolkit in snapshot - - - - - 38c2e20f by Tony Chemit at 2021-11-05T01:39:57+01:00 Par défaut l'assistant report ne cherche pas les reports au bon endroit - Closes ultreiaio/ird-observe#2088 - - - - - 2b6f828f by Tony Chemit at 2021-11-05T01:39:57+01:00 Improve UsageService to be usable also for data - Closes ultreiaio/ird-observe-toolkit#106 - - - - - a63691b1 by Tony Chemit at 2021-11-05T01:39:57+01:00 Petite amélioration des formulaires sur les paquetages de référentiels - Closes #2090 - - - - - 45363e8a by Tony Chemit at 2021-11-05T01:39:57+01:00 La migration AVDTH met 'Peson' au lieu de 'Estimation Visuelle' sur les captures logbook - Closes #2092 - - - - - 10c3d826 by Tony Chemit at 2021-11-05T01:39:57+01:00 Passer activity.latitude/longitude en NULL possible - See #2078 - - - - - a907f534 by Tony Chemit at 2021-11-05T01:39:57+01:00 Mise en conformité des couleurs sur les nœuds de l'arbre de navigation sur les référentiels. - Closes #2093 - - - - - 7eb4c82e by Tony Chemit at 2021-11-06T12:58:24+01:00 Remonter l'action supprimer dans les formulaire de type tableau dans la popup Actions supplémentaires - Closes #2094 - - - - - d7cd7c95 by Tony Chemit at 2021-11-06T12:58:24+01:00 fix inline table models messages when stop edit - - - - - 61ae04f5 by Tony Chemit at 2021-11-06T12:58:24+01:00 La migration AVDTH devrait initialiser le saisisseur de données logbook - Closes #2097 - - - - - 83d0fece by Tony Chemit at 2021-11-06T16:34:16+01:00 Il nous manque de quoi consigner qu'une calée est positive, nulle ou de type inconnu - See ultreiaio/ird-observe#2091 - - - - - 4f1fa407 by Tony Chemit at 2021-11-08T04:33:20+01:00 update pom and use last CI improvements - - - - - beef38eb by Tony Chemit at 2021-11-08T04:33:22+01:00 use new ultreiaio scripts for site - - - - - f1eb48ff by Tony Chemit at 2021-11-08T04:33:22+01:00 La récupération des activités observées associées ne fonctionne pas - Closes #2099 - - - - - aaf9d174 by Tony Chemit at 2021-11-08T04:33:22+01:00 Ajout de 3 codes dans le référentiel vesselActivity : la bonne méthode - See ultreiaio/ird-observe#2098 - - - - - 20270abf by Tony Chemit at 2021-11-08T04:33:22+01:00 Always sort validationResult Improve validation tests, now we keep the hole result to compare it with current validation result. - - - - - 58ea64bd by Tony Chemit at 2021-11-08T04:33:22+01:00 Make ContentListUI strict to OpenableDto and no more a mix of DataDto and OpenableDto - - - - - f0a4522f by Tony Chemit at 2021-11-08T13:55:21+01:00 Revoir les conditions avant suppression des données (avec lien externe) - See ultreiaio/ird-observe#2011 - - - - - 1de267e0 by Tony Chemit at 2021-11-08T13:58:31+01:00 update toolkit - - - - - af6c3a12 by Tony Chemit at 2021-11-08T14:20:34+01:00 update fixtures - - - - - aca89b79 by Tony Chemit at 2021-11-08T14:26:02+01:00 update CHANGELOG [skip ci] - - - - - 96c6651a by Tony Chemit at 2021-11-08T14:26:59+01:00 [jgitflow-maven-plugin]updating poms for branch'release/9.0.0-RC-18' with non-snapshot versions[skip ci] - - - - - 8bb1f6a3 by Tony Chemit at 2021-11-08T14:38:23+01:00 [jgitflow-maven-plugin]merging 'release/9.0.0-RC-18' into 'master' - - - - - 30 changed files: - .gitignore - .gitlab-ci.yml - CHANGELOG.md - client/configuration/pom.xml - client/configuration/src/main/assembly/dcp-presets.xml - client/configuration/src/main/config/Client.ini - client/configuration/src/main/dcp-presets/ps/logbook/01-deployment-preset.yml → client/configuration/src/main/dcp-presets/ps/common/01-standard-fad-deployment-preset.yml - client/configuration/src/main/dcp-presets/ps/logbook/02-removal-preset.yml → client/configuration/src/main/dcp-presets/ps/common/02-standard-fad-removal-preset.yml - client/configuration/src/main/dcp-presets/ps/logbook/03-update-preset.yml → client/configuration/src/main/dcp-presets/ps/common/03-standard-fad-update-preset.yml - client/configuration/src/main/dcp-presets/ps/logbook/04-abandonned-preset.yml → client/configuration/src/main/dcp-presets/ps/common/04-standard-fad-abandonned-preset.yml - client/configuration/src/main/dcp-presets/ps/observation/01-deployment-preset.yml → client/configuration/src/main/dcp-presets/ps/common/05-standard-fad-endOfUse-preset.yml - + client/configuration/src/main/dcp-presets/ps/common/README.TXT - + client/configuration/src/main/dcp-presets/ps/logbook/README.TXT - − client/configuration/src/main/dcp-presets/ps/observation/02-removal-preset.yml - − client/configuration/src/main/dcp-presets/ps/observation/03-update-preset.yml - + client/configuration/src/main/dcp-presets/ps/observation/README.TXT - client/configuration/src/main/i18n/getters/config.getter - client/configuration/src/main/java/fr/ird/observe/client/configuration/ClientConfig.java - client/configuration/src/test/java/fr/ird/observe/client/configuration/ClientConfigTest.java - client/core/pom.xml - client/core/src/main/i18n/getters/java.getter - client/core/src/main/java/fr/ird/observe/client/ClientUIContext.java - client/core/src/main/java/fr/ird/observe/client/datasource/api/ObserveSwingDataSource.java - client/core/src/main/java/fr/ird/observe/client/datasource/validation/ObserveValidatorMessageMouseListener.java - client/core/src/main/java/fr/ird/observe/client/main/body/ClientConfigUI.java - client/core/src/main/java/fr/ird/observe/client/util/init/UIInitHelper.java - + client/core/src/main/resources/icons/wifi-lost.png - client/datasource/actions/pom.xml - client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/actions/DataManager.java - client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/synchronize/referential/ng/ReferentialSynchroModel.java The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/9d3e40f9eee4316bbd7f933c… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/9d3e40f9eee4316bbd7f933c… 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.0-RC-18' with...
by Tony CHEMIT (＠tchemit) 08 Nov '21

08 Nov '21

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 96c6651a by Tony Chemit at 2021-11-08T14:26:59+01:00 [jgitflow-maven-plugin]updating poms for branch'release/9.0.0-RC-18' with non-snapshot versions[skip ci] - - - - - 8bb1f6a3 by Tony Chemit at 2021-11-08T14:38:23+01:00 [jgitflow-maven-plugin]merging 'release/9.0.0-RC-18' into 'master' - - - - - 155630d7 by Tony Chemit at 2021-11-08T14:38:27+01:00 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts[skip ci] - - - - - 72a22b47 by Tony Chemit at 2021-11-08T14:38:28+01:00 [jgitflow-maven-plugin]merging 'master' into 'develop' - - - - - 2557bd87 by Tony Chemit at 2021-11-08T14:38:29+01:00 [jgitflow-maven-plugin]Updating develop poms back to pre merge state[skip ci] - - - - - 0 changed files: Changes: View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/e681e09da312501083f8a595… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/e681e09da312501083f8a595… 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.0-RC-19-SNAPSHOT development[skip ci]
by Tony CHEMIT (＠tchemit) 08 Nov '21

08 Nov '21

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: e681e09d by Tony Chemit at 2021-11-08T14:26:22+01:00 [jgitflow-maven-plugin]updating poms for 9.0.0-RC-19-SNAPSHOT development[skip ci] - - - - - 30 changed files: - client/configuration/pom.xml - client/core/pom.xml - client/datasource/actions/pom.xml - client/datasource/api/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/i18n/pom.xml - client/pom.xml - client/runner/pom.xml - models/definition/pom.xml - models/dto/i18n/pom.xml - models/dto/java/pom.xml - models/dto/pom.xml - models/navigation/descriptor/pom.xml - models/navigation/id/pom.xml - models/navigation/pom.xml - models/navigation/tree/pom.xml - models/persistence/avdth/pom.xml - models/persistence/java/pom.xml - models/persistence/migration/pom.xml - models/persistence/pom.xml - models/persistence/test-api/pom.xml - models/persistence/test-impl/pom.xml - models/pom.xml The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/e681e09da312501083f8a595b… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/e681e09da312501083f8a595b… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe] Pushed new branch release/9.0.0-RC-18
by Tony CHEMIT (＠tchemit) 08 Nov '21

08 Nov '21

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

1 0

[Git][ultreiaio/ird-observe][develop] 2 commits: update fixtures
by Tony CHEMIT (＠tchemit) 08 Nov '21

08 Nov '21

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: af6c3a12 by Tony Chemit at 2021-11-08T14:20:34+01:00 update fixtures - - - - - aca89b79 by Tony Chemit at 2021-11-08T14:26:02+01:00 update CHANGELOG [skip ci] - - - - - 15 changed files: - CHANGELOG.md - server/runner/src/main/webResources/doc/api/public/data/ll/common/Trip/Create/content.json - server/runner/src/main/webResources/doc/api/public/data/ll/common/Trip/Update/content.json - server/runner/src/main/webResources/doc/api/public/data/ps/common/Trip/Create/content.json - server/runner/src/main/webResources/doc/api/public/data/ps/common/Trip/Update/content.json - tests/test/src/main/resources/fixtures/data/ll/common/Trip/content.json - tests/test/src/main/resources/fixtures/data/ll/common/Trip/create.json - tests/test/src/main/resources/fixtures/data/ll/logbook/Activity/content.json - tests/test/src/main/resources/fixtures/data/ll/logbook/Activity/create.json - tests/test/src/main/resources/fixtures/data/ps/common/Trip/content.json - tests/test/src/main/resources/fixtures/data/ps/common/Trip/create.json - tests/test/src/main/resources/fixtures/data/ps/logbook/Activity/content.json - tests/test/src/main/resources/fixtures/data/ps/logbook/Activity/create.json - tests/test/src/main/resources/fixtures/data/ps/logbook/Route/content.json - tests/test/src/main/resources/fixtures/data/ps/logbook/Route/create.json Changes: ===================================== CHANGELOG.md ===================================== @@ -1,7 +1,43 @@ # ObServe changelog * Author [Tony Chemit](mailto:dev@tchemit.fr) - * Last generated at 2021-10-27 12:34. + * Last generated at 2021-11-08 14:25. + +## Version [9.0.0-RC-18](https://gitlab.com/ultreiaio/ird-observe/-/milestones/206) + +**Closed at 2021-11-08.** + +### Download +* [Application (observe-9.0.0-RC-18.zip)](https://repo1.maven.org/maven2/fr/ird/observe/obs…) +* [Serveur (observe-9.0.0-RC-18.war)](https://repo1.maven.org/maven2/fr/ird/observe/obs…) + +### Issues + * [[Type::Anomalie 2071]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2071) **On peut créer un programme sans sélectionner aucun des types de données qu'il peut recevoir** (Thanks to Tony CHEMIT) (Reported by Pascal Cauquil) + * [[Type::Anomalie 2074]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2074) **Ne pas supprimer les fichers temporaires à chaque lancement de l'application** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Type::Anomalie 2079]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2079) **Interdire l'utilisation des systèmes observés désactivés** (Thanks to Pascal Cauquil) (Reported by Pascal Cauquil) + * [[Type::Anomalie 2083]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2083) **Mauvais enregistrement matériaux au départ lors de l'import AVDTH** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Type::Anomalie 2086]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2086) **Voir pourquoi le parsing des poids min/max sur les catégories n'a pas bien fonctionné** (Thanks to Tony CHEMIT) (Reported by Pascal Cauquil) + * [[Type::Anomalie 2087]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2087) **Si des activités sont liées aux échantillons ou bien au plan de cuves et qu'elles ne sont pas de type pêche, on ne les voit pas dans les formulaires associés** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Type::Anomalie 2088]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2088) **Par défaut l'assistant report ne cherche pas les reports au bon endroit** (Thanks to Tony CHEMIT) (Reported by Pascal Cauquil) + * [[Type::Anomalie 2089]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2089) **Aucun report ne fonctionne en mode serveur** (Thanks to Tony CHEMIT) (Reported by Pascal Cauquil) + * [[Type::Evolution 1347]](https://gitlab.com/ultreiaio/ird-observe/-/issues/1347) **Symboles de carte pour V9** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Type::Evolution 2011]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2011) **Revoir les conditions avant suppression des données (avec lien externe)** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Type::Evolution 2051]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2051) **Supprimer ces flags sur Program** (Thanks to Tony CHEMIT) (Reported by Pascal Cauquil) + * [[Type::Evolution 2070]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2070) **Création des routes et activités requises lorsqu'elles sont absentes** (Thanks to Tony CHEMIT) (Reported by Pascal Cauquil) + * [[Type::Evolution 2075]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2075) **Alléger la décoration des espèces** (Thanks to Pascal Cauquil) (Reported by Tony CHEMIT) + * [[Type::Evolution 2076]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2076) **Positionner sur le bouton choisir un fichier ou un répertoire sur les écrans requis** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Type::Evolution 2078]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2078) **Passer activity.latitude/longitude en NULL possible** (Thanks to Tony CHEMIT) (Reported by Pascal Cauquil) + * [[Type::Evolution 2080]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2080) **Activité PS logbook : Préremplir 'Nombre d'opération' avec 1** (Thanks to Tony CHEMIT) (Reported by Pascal Cauquil) + * [[Type::Evolution 2081]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2081) **Distinguer Perte de transmission et Fin d'utilisation de balise** (Thanks to Pascal Cauquil) (Reported by Pascal Cauquil) + * [[Type::Evolution 2082]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2082) **Retirer le contrôle sur le quandrant en fonction de l'océan** (Thanks to Tony CHEMIT) (Reported by Pascal Cauquil) + * [[Type::Evolution 2084]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2084) **Amélioration des pré-configuration de DCP** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Type::Evolution 2085]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2085) **Remplir les codes de weightmeasuremethod** (Thanks to Tony CHEMIT) (Reported by Pascal Cauquil) + * [[Type::Evolution 2090]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2090) **Petite amélioration des formulaires sur les paquetages de référentiels** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Type::Evolution 2092]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2092) **La migration AVDTH met 'Peson' au lieu de 'Estimation Visuelle' sur les captures logbook** (Thanks to Tony CHEMIT) (Reported by Pascal Cauquil) + * [[Type::Evolution 2093]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2093) **Mise en conformité des couleurs sur les nœuds de l'arbre de navigation sur les référentiels.** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Type::Evolution 2094]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2094) **Remonter l'action supprimer dans les formulaire de type tableau dans la popup Actions supplémentaires** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Type::Evolution 2097]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2097) **La migration AVDTH devrait initialiser le saisisseur de données logbook** (Thanks to Tony CHEMIT) (Reported by Pascal Cauquil) + * [[Type::Evolution 2098]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2098) **Ajout de 3 codes dans le référentiel vesselActivity : la bonne méthode** (Thanks to Tony CHEMIT) (Reported by Pascal Cauquil) ## Version [9.0.0-RC-17](https://gitlab.com/ultreiaio/ird-observe/-/milestones/205) ===================================== server/runner/src/main/webResources/doc/api/public/data/ll/common/Trip/Create/content.json ===================================== @@ -558,6 +558,15 @@ } ], "activityLogbook": [ + { + "topiaId": "fr.ird.data.ll.logbook.Activity#1464000000000#0.01093485", + "topiaCreateDate": "2021-01-05T03:40:31.000Z", + "lastUpdateDate": "2021-02-15T13:15:05.651Z", + "startTimeStamp": "2018-08-17T06:15:00.000Z", + "latitude": -1.666667, + "longitude": 54.65, + "vesselActivity": "fr.ird.referential.ll.common.VesselActivity#1464000000000#0.11" + }, { "topiaId": "fr.ird.data.ll.logbook.Activity#1464000000000#0.01093486", "topiaCreateDate": "2021-01-05T03:40:31.000Z", @@ -615,15 +624,6 @@ "mitigationType": [], "branchlinesComposition": [] } - }, - { - "topiaId": "fr.ird.data.ll.logbook.Activity#1464000000000#0.01093485", - "topiaCreateDate": "2021-01-05T03:40:31.000Z", - "lastUpdateDate": "2021-02-15T13:15:05.651Z", - "startTimeStamp": "2018-08-17T06:15:00.000Z", - "latitude": -1.666667, - "longitude": 54.65, - "vesselActivity": "fr.ird.referential.ll.common.VesselActivity#1464000000000#0.11" } ], "landing": [ ===================================== server/runner/src/main/webResources/doc/api/public/data/ll/common/Trip/Update/content.json ===================================== @@ -558,6 +558,15 @@ } ], "activityLogbook": [ + { + "topiaId": "fr.ird.data.ll.logbook.Activity#1464000000000#0.01093485", + "topiaCreateDate": "2021-01-05T03:40:31.000Z", + "lastUpdateDate": "2021-02-15T13:15:05.651Z", + "startTimeStamp": "2018-08-17T06:15:00.000Z", + "latitude": -1.666667, + "longitude": 54.65, + "vesselActivity": "fr.ird.referential.ll.common.VesselActivity#1464000000000#0.11" + }, { "topiaId": "fr.ird.data.ll.logbook.Activity#1464000000000#0.01093486", "topiaCreateDate": "2021-01-05T03:40:31.000Z", @@ -615,15 +624,6 @@ "mitigationType": [], "branchlinesComposition": [] } - }, - { - "topiaId": "fr.ird.data.ll.logbook.Activity#1464000000000#0.01093485", - "topiaCreateDate": "2021-01-05T03:40:31.000Z", - "lastUpdateDate": "2021-02-15T13:15:05.651Z", - "startTimeStamp": "2018-08-17T06:15:00.000Z", - "latitude": -1.666667, - "longitude": 54.65, - "vesselActivity": "fr.ird.referential.ll.common.VesselActivity#1464000000000#0.11" } ], "landing": [ ===================================== server/runner/src/main/webResources/doc/api/public/data/ps/common/Trip/Create/content.json ===================================== @@ -158,6 +158,7 @@ "positionCorrected": false, "number": 1.0, "vesselActivity": "fr.ird.referential.ps.common.VesselActivity#1239832675369#0.12552908048322586", + "relatedObservedActivity": "fr.ird.data.ps.observation.Activity#1554113237260#0.6013473195166136", "catches": [ { "topiaId": "fr.ird.data.ps.logbook.Catch#1616768024297#0.28635979304850434", ===================================== server/runner/src/main/webResources/doc/api/public/data/ps/common/Trip/Update/content.json ===================================== @@ -158,6 +158,7 @@ "positionCorrected": false, "number": 1.0, "vesselActivity": "fr.ird.referential.ps.common.VesselActivity#1239832675369#0.12552908048322586", + "relatedObservedActivity": "fr.ird.data.ps.observation.Activity#1554113237260#0.6013473195166136", "catches": [ { "topiaId": "fr.ird.data.ps.logbook.Catch#1616768024297#0.28635979304850434", ===================================== tests/test/src/main/resources/fixtures/data/ll/common/Trip/content.json ===================================== @@ -561,6 +561,15 @@ } ], "activityLogbook": [ + { + "topiaId": "fr.ird.data.ll.logbook.Activity#1464000000000#0.01093485", + "topiaCreateDate": "2021-01-05T03:40:31.000Z", + "lastUpdateDate": "2021-02-15T13:15:05.651Z", + "startTimeStamp": "2018-08-17T06:15:00.000Z", + "latitude": -1.666667, + "longitude": 54.65, + "vesselActivity": "fr.ird.referential.ll.common.VesselActivity#1464000000000#0.11" + }, { "topiaId": "fr.ird.data.ll.logbook.Activity#1464000000000#0.01093486", "topiaCreateDate": "2021-01-05T03:40:31.000Z", @@ -618,15 +627,6 @@ "mitigationType": [], "branchlinesComposition": [] } - }, - { - "topiaId": "fr.ird.data.ll.logbook.Activity#1464000000000#0.01093485", - "topiaCreateDate": "2021-01-05T03:40:31.000Z", - "lastUpdateDate": "2021-02-15T13:15:05.651Z", - "startTimeStamp": "2018-08-17T06:15:00.000Z", - "latitude": -1.666667, - "longitude": 54.65, - "vesselActivity": "fr.ird.referential.ll.common.VesselActivity#1464000000000#0.11" } ], "landing": [ ===================================== tests/test/src/main/resources/fixtures/data/ll/common/Trip/create.json ===================================== @@ -426,6 +426,12 @@ } ], "activityLogbook": [ + { + "startTimeStamp": "2018-08-17T06:15:00.000Z", + "latitude": -1.666667, + "longitude": 54.65, + "vesselActivity": "fr.ird.referential.ll.common.VesselActivity#1464000000000#0.11" + }, { "startTimeStamp": "2018-08-18T14:35:00.000Z", "latitude": -4.35, @@ -471,12 +477,6 @@ "mitigationType": [], "branchlinesComposition": [] } - }, - { - "startTimeStamp": "2018-08-17T06:15:00.000Z", - "latitude": -1.666667, - "longitude": 54.65, - "vesselActivity": "fr.ird.referential.ll.common.VesselActivity#1464000000000#0.11" } ], "landing": [ ===================================== tests/test/src/main/resources/fixtures/data/ll/logbook/Activity/content.json ===================================== @@ -6,6 +6,7 @@ "latitude": -2.116667, "longitude": 55.05, "vesselActivity": "fr.ird.referential.ll.common.VesselActivity#1239832686138#0.1", + "relatedObservedActivity": "fr.ird.data.ll.observation.Activity#1538025383462#0.7048860714573149", "set": { "topiaId": "fr.ird.data.ll.logbook.Set#1464000000000#0.01093484", "topiaCreateDate": "2021-01-05T03:40:31.000Z", ===================================== tests/test/src/main/resources/fixtures/data/ll/logbook/Activity/create.json ===================================== @@ -3,6 +3,7 @@ "latitude": -2.116667, "longitude": 55.05, "vesselActivity": "fr.ird.referential.ll.common.VesselActivity#1239832686138#0.1", + "relatedObservedActivity": "fr.ird.data.ll.observation.Activity#1538025383462#0.7048860714573149", "set": { "homeId": "FINSS-1093484", "settingStartTimeStamp": "2018-08-16T14:15:00.000Z", ===================================== tests/test/src/main/resources/fixtures/data/ps/common/Trip/content.json ===================================== @@ -161,6 +161,7 @@ "positionCorrected": false, "number": 1.0, "vesselActivity": "fr.ird.referential.ps.common.VesselActivity#1239832675369#0.12552908048322586", + "relatedObservedActivity": "fr.ird.data.ps.observation.Activity#1554113237260#0.6013473195166136", "catches": [ { "topiaId": "fr.ird.data.ps.logbook.Catch#1616768024297#0.28635979304850434", ===================================== tests/test/src/main/resources/fixtures/data/ps/common/Trip/create.json ===================================== @@ -125,6 +125,7 @@ "positionCorrected": false, "number": 1.0, "vesselActivity": "fr.ird.referential.ps.common.VesselActivity#1239832675369#0.12552908048322586", + "relatedObservedActivity": "fr.ird.data.ps.observation.Activity#1554113237260#0.6013473195166136", "catches": [ { "comment": "qa", ===================================== tests/test/src/main/resources/fixtures/data/ps/logbook/Activity/content.json ===================================== @@ -10,6 +10,7 @@ "positionCorrected": false, "number": 1.0, "vesselActivity": "fr.ird.referential.ps.common.VesselActivity#1239832675369#0.12552908048322586", + "relatedObservedActivity": "fr.ird.data.ps.observation.Activity#1554113237260#0.6013473195166136", "catches": [ { "topiaId": "fr.ird.data.ps.logbook.Catch#1616768024297#0.28635979304850434", ===================================== tests/test/src/main/resources/fixtures/data/ps/logbook/Activity/create.json ===================================== @@ -7,6 +7,7 @@ "positionCorrected": false, "number": 1.0, "vesselActivity": "fr.ird.referential.ps.common.VesselActivity#1239832675369#0.12552908048322586", + "relatedObservedActivity": "fr.ird.data.ps.observation.Activity#1554113237260#0.6013473195166136", "catches": [ { "comment": "qa", ===================================== tests/test/src/main/resources/fixtures/data/ps/logbook/Route/content.json ===================================== @@ -16,6 +16,7 @@ "positionCorrected": false, "number": 1.0, "vesselActivity": "fr.ird.referential.ps.common.VesselActivity#1239832675369#0.12552908048322586", + "relatedObservedActivity": "fr.ird.data.ps.observation.Activity#1554113237260#0.6013473195166136", "catches": [ { "topiaId": "fr.ird.data.ps.logbook.Catch#1616768024297#0.28635979304850434", ===================================== tests/test/src/main/resources/fixtures/data/ps/logbook/Route/create.json ===================================== @@ -10,6 +10,7 @@ "positionCorrected": false, "number": 1.0, "vesselActivity": "fr.ird.referential.ps.common.VesselActivity#1239832675369#0.12552908048322586", + "relatedObservedActivity": "fr.ird.data.ps.observation.Activity#1554113237260#0.6013473195166136", "catches": [ { "comment": "qa", View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/1de267e06291f96a200be441… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/1de267e06291f96a200be441… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] 21 commits: Remplir les codes de weightmeasuremethod - See ultreiaio/ird-observe#2085
by Tony CHEMIT (＠tchemit) 08 Nov '21

08 Nov '21

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: b4413c4a by Tony Chemit at 2021-11-05T01:39:57+01:00 Remplir les codes de weightmeasuremethod - See ultreiaio/ird-observe#2085 - - - - - 6d43f15e by Tony Chemit at 2021-11-05T01:39:57+01:00 Voir pourquoi le parsing des poids min/max sur les catégories n'a pas bien fonctionné - See ultreiaio/ird-observe#2086 - - - - - faa75a01 by Tony Chemit at 2021-11-05T01:39:57+01:00 toolkit in snapshot - - - - - 38c2e20f by Tony Chemit at 2021-11-05T01:39:57+01:00 Par défaut l'assistant report ne cherche pas les reports au bon endroit - Closes ultreiaio/ird-observe#2088 - - - - - 2b6f828f by Tony Chemit at 2021-11-05T01:39:57+01:00 Improve UsageService to be usable also for data - Closes ultreiaio/ird-observe-toolkit#106 - - - - - a63691b1 by Tony Chemit at 2021-11-05T01:39:57+01:00 Petite amélioration des formulaires sur les paquetages de référentiels - Closes #2090 - - - - - 45363e8a by Tony Chemit at 2021-11-05T01:39:57+01:00 La migration AVDTH met 'Peson' au lieu de 'Estimation Visuelle' sur les captures logbook - Closes #2092 - - - - - 10c3d826 by Tony Chemit at 2021-11-05T01:39:57+01:00 Passer activity.latitude/longitude en NULL possible - See #2078 - - - - - a907f534 by Tony Chemit at 2021-11-05T01:39:57+01:00 Mise en conformité des couleurs sur les nœuds de l'arbre de navigation sur les référentiels. - Closes #2093 - - - - - 7eb4c82e by Tony Chemit at 2021-11-06T12:58:24+01:00 Remonter l'action supprimer dans les formulaire de type tableau dans la popup Actions supplémentaires - Closes #2094 - - - - - d7cd7c95 by Tony Chemit at 2021-11-06T12:58:24+01:00 fix inline table models messages when stop edit - - - - - 61ae04f5 by Tony Chemit at 2021-11-06T12:58:24+01:00 La migration AVDTH devrait initialiser le saisisseur de données logbook - Closes #2097 - - - - - 83d0fece by Tony Chemit at 2021-11-06T16:34:16+01:00 Il nous manque de quoi consigner qu'une calée est positive, nulle ou de type inconnu - See ultreiaio/ird-observe#2091 - - - - - 4f1fa407 by Tony Chemit at 2021-11-08T04:33:20+01:00 update pom and use last CI improvements - - - - - beef38eb by Tony Chemit at 2021-11-08T04:33:22+01:00 use new ultreiaio scripts for site - - - - - f1eb48ff by Tony Chemit at 2021-11-08T04:33:22+01:00 La récupération des activités observées associées ne fonctionne pas - Closes #2099 - - - - - aaf9d174 by Tony Chemit at 2021-11-08T04:33:22+01:00 Ajout de 3 codes dans le référentiel vesselActivity : la bonne méthode - See ultreiaio/ird-observe#2098 - - - - - 20270abf by Tony Chemit at 2021-11-08T04:33:22+01:00 Always sort validationResult Improve validation tests, now we keep the hole result to compare it with current validation result. - - - - - 58ea64bd by Tony Chemit at 2021-11-08T04:33:22+01:00 Make ContentListUI strict to OpenableDto and no more a mix of DataDto and OpenableDto - - - - - f0a4522f by Tony Chemit at 2021-11-08T13:55:21+01:00 Revoir les conditions avant suppression des données (avec lien externe) - See ultreiaio/ird-observe#2011 - - - - - 1de267e0 by Tony Chemit at 2021-11-08T13:58:31+01:00 update toolkit - - - - - 30 changed files: - .gitignore - .gitlab-ci.yml - client/configuration/src/main/config/Client.ini - client/core/src/main/java/fr/ird/observe/client/ClientUIContext.java - client/core/src/main/java/fr/ird/observe/client/util/init/UIInitHelper.java - client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/actions/DataManager.java - client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/synchronize/referential/ng/ReferentialSynchroModel.java - client/datasource/editor/api/src/main/i18n/getters/java.getter - client/datasource/editor/api/src/main/i18n/getters/jaxx.getter - + client/datasource/editor/api/src/main/i18n/templates/DeleteDependenciesMessage_en_GB.ftl - + client/datasource/editor/api/src/main/i18n/templates/DeleteDependenciesMessage_es_ES.ftl - + client/datasource/editor/api/src/main/i18n/templates/DeleteDependenciesMessage_fr_FR.ftl - + client/datasource/editor/api/src/main/i18n/templates/DeleteReferentialMessage_en_GB.ftl - + client/datasource/editor/api/src/main/i18n/templates/DeleteReferentialMessage_es_ES.ftl - + client/datasource/editor/api/src/main/i18n/templates/DeleteReferentialMessage_fr_FR.ftl - + client/datasource/editor/api/src/main/i18n/templates/DisableReferentialMessage_en_GB.ftl - + client/datasource/editor/api/src/main/i18n/templates/DisableReferentialMessage_es_ES.ftl - + client/datasource/editor/api/src/main/i18n/templates/DisableReferentialMessage_fr_FR.ftl - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/ContentUIHandler.java - + client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/actions/delete/DeletePanel.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/actions/delete/DeleteRequestBuilder.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/actions/id/ChangeIdExecutor.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/actions/move/MoveRequestBuilder.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/list/ContentListUI.jaxx - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/list/ContentListUIHandler.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/list/ContentListUIOpenExecutor.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/list/actions/ContentListUIActionSupport.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/list/actions/FixData.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/list/actions/GotoOpenData.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/list/actions/GotoSelectedData.java The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/491c31d7a10a4d3573c2ad21… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/491c31d7a10a4d3573c2ad21… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] 2 commits: Passer activity.latitude/longitude en NULL possible - See #2078
by Tony CHEMIT (＠tchemit) 04 Nov '21

04 Nov '21

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: b30328dd by Tony Chemit at 2021-11-04T17:13:47+01:00 Passer activity.latitude/longitude en NULL possible - See #2078 - - - - - 491c31d7 by Tony Chemit at 2021-11-04T17:32:24+01:00 Mise en conformité des couleurs sur les nœuds de l'arbre de navigation sur les référentiels. - Closes #2093 - - - - - 5 changed files: - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/referential/ContentReferentialUI.jcss - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/referential/ContentReferentialUIHandler.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/referential/ContentReferentialUINavigationHandler.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/referential/ReferentialHomeUINavigationHandler.java - models/persistence/java/src/main/java/fr/ird/observe/entities/data/ps/common/TripMapBuilder.java Changes: ===================================== client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/referential/ContentReferentialUI.jcss ===================================== @@ -102,3 +102,7 @@ enabled:{showTechnicalInformations.isEnabled()}; } +#changeId { + enabled:false; +} + ===================================== client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/referential/ContentReferentialUIHandler.java ===================================== @@ -58,11 +58,13 @@ import javax.swing.Icon; import javax.swing.JList; import javax.swing.KeyStroke; import javax.swing.SwingUtilities; +import java.awt.Component; import java.awt.Container; import java.awt.event.MouseAdapter; import java.awt.event.MouseEvent; import java.util.Collections; import java.util.List; +import java.util.Objects; import java.util.Set; /** @@ -87,6 +89,8 @@ public class ContentReferentialUIHandler<D extends ReferentialDto, R extends Ref return; } ui1.revalidate(); + Component component = ui1.getHandler().computeFocusOwner(); + component.requestFocusInWindow(); }; } @@ -134,6 +138,7 @@ public class ContentReferentialUIHandler<D extends ReferentialDto, R extends Ref public final ContentOpenWithValidator<U> getContentOpen() { return (ContentOpenWithValidator<U>) super.getContentOpen(); } + @Override protected final ContentUIInitializer<U> createContentUIInitializer(U ui) { return new ContentReferentialUIInitializer<>(ui); @@ -154,6 +159,25 @@ public class ContentReferentialUIHandler<D extends ReferentialDto, R extends Ref installSaveAction(); } + @Override + protected Container computeFocusOwnerContainer() { + if (getModel().getSource().getHandler().getChildCount() == 0) { + return ui; + } + if (Objects.equals(ui.getViewLayout().getSelected(), ContentReferentialUI.LIST_VIEW)) { + return ui.getContentBody(); + } + ContentMode mode = getModel().getStates().getMode(); + if (mode == null || mode == ContentMode.READ || !getModel().getStates().isEditable()) { + if (Objects.equals(ui.getViewLayout().getSelected(), ContentReferentialUI.DETAIL_VIEW)) { + // can't give focus to form + return ui.getActions(); + } + return ui.getContentBody(); + } + return super.computeFocusOwnerContainer(); + } + @Override public void installChangeModeAction() { ChangeModeRequest request = ChangeModeRequest.of(ui); ===================================== client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/referential/ContentReferentialUINavigationHandler.java ===================================== @@ -25,7 +25,9 @@ package fr.ird.observe.client.datasource.editor.api.content.referential; import fr.ird.observe.client.datasource.editor.api.content.ContentMode; import fr.ird.observe.client.datasource.editor.api.navigation.tree.NavigationHandler; +import java.awt.Color; import java.util.Objects; +import java.util.function.Supplier; /** * Created on 24/10/2020. @@ -53,7 +55,7 @@ public abstract class ContentReferentialUINavigationHandler<N extends ContentRef public final String getText() { N node = getNode(); String text = node.getScope().getI18nTranslation("type"); - return String.format("%s (%s)", text, node.isLoaded() ? node.getReferences().size() : node.getInitializer().getInitialCount()); + return text + getChildCountText(); } @Override @@ -64,6 +66,25 @@ public abstract class ContentReferentialUINavigationHandler<N extends ContentRef @Override public String getContentTitle() { - return getNode().getScope().getI18nTranslation("type"); + return getText(); + } + + @Override + protected Color getColor0(Supplier<Color> defaultValue) { + if (!getNode().getInitializer().isEditable()) { + return getDisabledColor(); + } + if (getChildCount() == 0) { + return getEmptyColor(); + } + return super.getColor0(defaultValue); + } + + protected long getChildCount() { + return node.isLoaded() ? node.getReferences().size() : node.getInitializer().getInitialCount(); + } + + protected String getChildCountText() { + return String.format(" (%d)", getChildCount()); } } ===================================== client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/referential/ReferentialHomeUINavigationHandler.java ===================================== @@ -25,7 +25,9 @@ package fr.ird.observe.client.datasource.editor.api.content.referential; import fr.ird.observe.client.datasource.editor.api.content.ContentMode; import fr.ird.observe.client.datasource.editor.api.navigation.tree.NavigationHandler; +import java.awt.Color; import java.util.Objects; +import java.util.function.Supplier; /** * Created on 24/10/2020. @@ -69,4 +71,12 @@ public abstract class ReferentialHomeUINavigationHandler<N extends ReferentialHo // We can not perform any edit action return ContentMode.READ; } + + @Override + protected Color getColor0(Supplier<Color> defaultValue) { + if (!getNode().getInitializer().isEditable()) { + return getDisabledColor(); + } + return super.getColor0(defaultValue); + } } ===================================== models/persistence/java/src/main/java/fr/ird/observe/entities/data/ps/common/TripMapBuilder.java ===================================== @@ -98,7 +98,7 @@ public class TripMapBuilder { " FROM ps_logbook.route r" + " INNER JOIN ps_logbook.activity a ON a.route = r.topiaId" + " WHERE r.trip = ?" + - " ORDER BY r.date, a.time"); + " ORDER BY r.date, a.number"); } @Override View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/5cef97c0a10459c434afe79c… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/5cef97c0a10459c434afe79c… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] 17 commits: Supprimer ces flags sur Program - See ultreiaio/ird-observe#2051
by Tony CHEMIT (＠tchemit) 04 Nov '21

04 Nov '21

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 7221de9d by Tony Chemit at 2021-11-04T15:14:43+01:00 Supprimer ces flags sur Program - See ultreiaio/ird-observe#2051 - - - - - 73715a44 by Tony Chemit at 2021-11-04T15:14:43+01:00 Distinguer Perte de transmission et Fin d'utilisation de balise - See ultreiaio/ird-observe#2081 - - - - - afb3c8c8 by Tony Chemit at 2021-11-04T15:14:43+01:00 Improve focus dispatch on CoordinatesEditor validation messages - - - - - ef7af2d2 by Tony Chemit at 2021-11-04T15:14:43+01:00 le reset du quadrant n'est pas effectuée - See ultreiaio/jaxx#811 - - - - - 5c5b6797 by Tony Chemit at 2021-11-04T15:14:43+01:00 update pom - - - - - 7586623f by Tony Chemit at 2021-11-04T15:14:43+01:00 Clean validators - See ultreiaio/ird-observe-toolkit#105 - - - - - 81d04187 by Tony Chemit at 2021-11-04T15:14:43+01:00 Passer activity.latitude/longitude en NULL possible - See ultreiaio/ird-observe#2078 - - - - - 4c007a59 by Tony Chemit at 2021-11-04T15:14:43+01:00 Mauvais enregistrement matériaux au départ lors de l'import AVDTH - Closes #2083 - - - - - 55a943ce by Tony Chemit at 2021-11-04T15:14:43+01:00 update Public API doc - - - - - 49a258a0 by Tony Chemit at 2021-11-04T15:14:43+01:00 Amélioration des pré-configuration de DCP - Closes #2084 - - - - - 0436204d by Tony Chemit at 2021-11-04T15:14:43+01:00 Remplir les codes de weightmeasuremethod - See ultreiaio/ird-observe#2085 - - - - - d6dc8215 by Tony Chemit at 2021-11-04T15:14:43+01:00 Voir pourquoi le parsing des poids min/max sur les catégories n'a pas bien fonctionné - See ultreiaio/ird-observe#2086 - - - - - f7b95dfe by Tony Chemit at 2021-11-04T15:14:43+01:00 toolkit in snapshot - - - - - 72375d96 by Tony Chemit at 2021-11-04T15:14:43+01:00 Par défaut l'assistant report ne cherche pas les reports au bon endroit - Closes ultreiaio/ird-observe#2088 - - - - - 1e1c4d28 by Tony Chemit at 2021-11-04T15:14:43+01:00 Improve UsageService to be usable also for data - Closes ultreiaio/ird-observe-toolkit#106 - - - - - 4150624e by Tony Chemit at 2021-11-04T16:00:35+01:00 Petite amélioration des formulaires sur les paquetages de référentiels - Closes #2090 - - - - - 5cef97c0 by Tony Chemit at 2021-11-04T16:06:38+01:00 La migration AVDTH met 'Peson' au lieu de 'Estimation Visuelle' sur les captures logbook - Closes #2092 - - - - - 30 changed files: - client/configuration/src/main/assembly/dcp-presets.xml - client/configuration/src/main/config/Client.ini - client/configuration/src/main/dcp-presets/ps/logbook/01-deployment-preset.yml → client/configuration/src/main/dcp-presets/ps/common/01-standard-fad-deployment-preset.yml - client/configuration/src/main/dcp-presets/ps/logbook/02-removal-preset.yml → client/configuration/src/main/dcp-presets/ps/common/02-standard-fad-removal-preset.yml - client/configuration/src/main/dcp-presets/ps/logbook/03-update-preset.yml → client/configuration/src/main/dcp-presets/ps/common/03-standard-fad-update-preset.yml - client/configuration/src/main/dcp-presets/ps/logbook/04-abandonned-preset.yml → client/configuration/src/main/dcp-presets/ps/common/04-standard-fad-abandonned-preset.yml - client/configuration/src/main/dcp-presets/ps/observation/01-deployment-preset.yml → client/configuration/src/main/dcp-presets/ps/common/05-standard-fad-endOfUse-preset.yml - + client/configuration/src/main/dcp-presets/ps/common/README.TXT - + client/configuration/src/main/dcp-presets/ps/logbook/README.TXT - − client/configuration/src/main/dcp-presets/ps/observation/02-removal-preset.yml - − client/configuration/src/main/dcp-presets/ps/observation/03-update-preset.yml - + client/configuration/src/main/dcp-presets/ps/observation/README.TXT - client/configuration/src/main/i18n/getters/config.getter - client/configuration/src/main/java/fr/ird/observe/client/configuration/ClientConfig.java - client/configuration/src/test/java/fr/ird/observe/client/configuration/ClientConfigTest.java - client/core/src/main/i18n/getters/java.getter - client/core/src/main/java/fr/ird/observe/client/datasource/api/ObserveSwingDataSource.java - client/core/src/main/java/fr/ird/observe/client/datasource/validation/ObserveValidatorMessageMouseListener.java - client/core/src/main/java/fr/ird/observe/client/main/body/ClientConfigUI.java - client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/synchronize/referential/ng/ReferentialSynchroModel.java - client/datasource/editor/api/src/main/i18n/getters/java.getter - client/datasource/editor/api/src/main/i18n/getters/jaxx.getter - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/ContentUIHandler.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/actions/open/ContentOpen.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/referential/ContentReferentialUI.jcss - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/referential/ContentReferentialUIModelStates.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/referential/ReferentialHomeUIHandler.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/referential/actions/DeleteReferential.java - + client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/referential/actions/OpenReferentialType.java - models/dto/java/src/main/java/fr/ird/observe/dto/referential/common/ProgramObservation.java → client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/referential/actions/ReferentialHomeUIActionSupport.java The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/a6f98efdfd96048ed41e8353… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/a6f98efdfd96048ed41e8353… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] Par défaut l'assistant report ne cherche pas les reports au bon endroit -...
by Tony CHEMIT (＠tchemit) 04 Nov '21

04 Nov '21

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: a6f98efd by Tony Chemit at 2021-11-04T09:41:39+01:00 Par défaut l'assistant report ne cherche pas les reports au bon endroit - Closes ultreiaio/ird-observe#2088 - - - - - 3 changed files: - client/configuration/src/main/config/Client.ini - client/runner/src/main/resources/META-INF/configuration/ClientConfig.md - client/runner/src/main/resources/META-INF/configuration/ClientConfig.properties Changes: ===================================== client/configuration/src/main/config/Client.ini ===================================== @@ -134,7 +134,7 @@ final = true description = observe.config.defaultReportFile.description key = report.file type = file -defaultValue = ${resources.directory}/observe-reports.properties +defaultValue = ${report.directory}/observe-reports.properties transient = false final = false ===================================== client/runner/src/main/resources/META-INF/configuration/ClientConfig.md ===================================== @@ -429,7 +429,7 @@ Description : **Configuration d'ObServe** | Modifiable ? | Oui | | Sauvegardable ? | Oui | | Type | ```file``` | -| Valeur par défaut | ```${resources.directory}/observe-reports.properties``` | +| Valeur par défaut | ```${report.directory}/observe-reports.properties``` | ### <a name="detail_option_map.directory"></a> ===================================== client/runner/src/main/resources/META-INF/configuration/ClientConfig.properties ===================================== @@ -164,12 +164,12 @@ # Clef : report.file # Description : Fichier par défaut des rapports de l'application # Type : file -# Valeur par défaut : ${resources.directory}/observe-reports.properties +# Valeur par défaut : ${report.directory}/observe-reports.properties # Modifiable ? : Oui # Sauvegardable ? : Oui # # Pour modifier l'option, veuillez décommenter la ligne suivante -# report.file=${resources.directory}/observe-reports.properties +# report.file=${report.directory}/observe-reports.properties # Option : mapDirectory # Clef : map.directory View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/a6f98efdfd96048ed41e8353d… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/a6f98efdfd96048ed41e8353d… You're receiving this email because of your account on gitlab.com.

1 0