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

[Git][ultreiaio/ird-observe] Pushed new tag v9.2.0
by Tony CHEMIT (＠tchemit) 09 Oct '23

09 Oct '23

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

1 0

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

09 Oct '23

Tony CHEMIT pushed to branch release/9.2.0 at ultreiaio / ird-observe Commits: 203cc757 by Tony Chemit at 2023-10-09T11:15:17+02:00 [jgitflow-maven-plugin]updating poms for branch'release/9.2.0' 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-consolidation/pom.xml - core/api/dto-decoration/pom.xml - core/api/dto-validation/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/avdth/pom.xml - core/persistence/consolidation/pom.xml - core/persistence/decoration/pom.xml - core/persistence/java/pom.xml - core/persistence/migration/pom.xml - core/persistence/pom.xml - core/persistence/report/pom.xml - core/persistence/resources/pom.xml - core/persistence/test/pom.xml The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/203cc757c7581a4faca04880a… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/203cc757c7581a4faca04880a… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][master] 208 commits: [jgitflow-maven-plugin]updating poms for 9.1.7-SNAPSHOT development[skip ci]
by Tony CHEMIT (＠tchemit) 09 Oct '23

09 Oct '23

Tony CHEMIT pushed to branch master at ultreiaio / ird-observe Commits: 9d3db242 by Tony Chemit at 2023-07-15T12:53:08+02:00 [jgitflow-maven-plugin]updating poms for 9.1.7-SNAPSHOT development[skip ci] - - - - - 59534757 by Tony Chemit at 2023-07-15T13:17:35+02:00 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts[skip ci] - - - - - 761e89c9 by Tony Chemit at 2023-07-15T13:17:36+02:00 [jgitflow-maven-plugin]merging 'master' into 'develop' - - - - - 161d3d0e by Tony Chemit at 2023-07-15T13:17:37+02:00 [jgitflow-maven-plugin]Updating develop poms back to pre merge state[skip ci] - - - - - 046f8841 by Tony Chemit at 2023-07-16T12:13:43+02:00 Move to version 9.2.0-SNAPSHOT - - - - - b9fc24f4 by Tony Chemit at 2023-07-16T12:48:32+02:00 fix gitlab ci cache directory - - - - - 00ef5d95 by Tony Chemit at 2023-07-16T13:54:15+02:00 Move to persistence model 9.2 - - - - - f5d45df5 by Tony Chemit at 2023-07-16T13:54:15+02:00 Create migration directory if not exists - - - - - 23c501af by Tony Chemit at 2023-07-16T16:35:54+02:00 Clean imports in jaxx files - - - - - 0a61df1f by Tony Chemit at 2023-07-16T18:38:56+02:00 ll_observation.Catch.count devrait être NOT NULL - Closes #2714 - - - - - acb43924 by Tony Chemit at 2023-07-16T19:28:31+02:00 Fix tck extra script - - - - - 0ed88182 by Tony Chemit at 2023-07-16T19:29:39+02:00 Adapt migration 9.1 to make MigrateTckDatabases works again (mainly for empty databases) - - - - - 349c6bb3 by Tony Chemit at 2023-07-16T19:29:53+02:00 test more cases in MigrateTckDatabases - - - - - 1318666e by Tony Chemit at 2023-07-16T19:30:27+02:00 change persistence.previous.model.version to 9.1 (no need here to retest over and over the 9.0 → 9.1 migration) - - - - - 4ddd0436 by Tony Chemit at 2023-07-17T13:45:52+02:00 For the moment migration 9.2 does not require finalisation - - - - - d8ca5361 by Tony Chemit at 2023-07-19T12:12:40+02:00 Revue du code de sauvegarde d'un openDto au niveau du service pour pouvoir interagir avec l'objet responsable de la finalisation de la sauvegarde (on supprime la méthode flottante saveCallback qui ne permet de conserver certains états dont nous allons avoir besoin dans la suite des développements). - - - - - 8cddc462 by Tony Chemit at 2023-07-20T09:29:51+02:00 Fix ValidationDefinitionTemplate which always store for update scope, the create scope... - - - - - 47a6d415 by Tony Chemit at 2023-07-21T10:58:00+02:00 On ps_logbook.Activity there is no set, so no action add set :) - - - - - 12735f90 by Tony Chemit at 2023-07-21T10:58:39+02:00 Ajout du champs Trip.activitiesAcquisitionMode - - - - - 644ea7de by Tony Chemit at 2023-07-21T10:58:39+02:00 Migration classique - - - - - a030ca2d by Tony Chemit at 2023-07-21T10:58:39+02:00 Migration avdth - - - - - 71b894e1 by Tony Chemit at 2023-07-21T10:58:39+02:00 Mise en place du champs sur le formulaire marée Ajout de la valeur par défaut lors de la création d'une nouvelle marée au niveau du service - - - - - e76fb6f7 by Tony Chemit at 2023-07-21T10:58:51+02:00 Mise en place du formulaire activité et modification de la sauvegarde au niveau du service pour réordonner si nécessaire le Activity.number - - - - - e41483a3 by Tony Chemit at 2023-07-21T10:59:41+02:00 Merge branch 'feature/issue_2729' into develop En PS / logbook / Activité, voir comment mieux gérer l'ajout d'une activité dont l'horaire précéde celui de la dernière activité saisie (souci lié au numéro d'activité auto incrémenté) - Closes #2729 - - - - - af7f4bd0 by Tony Chemit at 2023-07-21T15:59:45+02:00 Introduce method ObserveDefaultDecoratorRenderer.booleanValue - - - - - 4580061f by Tony Chemit at 2023-07-21T15:59:55+02:00 (PS) Ajout des nouveaux champs VesselActivity.allowFpaZoneChange et VesselActivity.allowSet - - - - - 4f11b0c7 by Tony Chemit at 2023-07-22T07:45:19+02:00 (PS) Utilisation des nouveaux champs VesselActivity.allowFpaZoneChange et VesselActivity.allowSet et revue des formulaires Activity - - - - - 1e912c79 by Tony Chemit at 2023-07-22T07:45:19+02:00 (LL) Ajout du nouveau champs VesselActivity.allowSet - - - - - 2346e3e6 by Tony Chemit at 2023-07-22T07:45:19+02:00 (LL) Utilisation du nouveau champs VesselActivity.allowSet et revue des formulaires Activity - - - - - 1649adaf by Tony Chemit at 2023-07-22T07:46:32+02:00 Merge branch 'feature/issue_2449' into develop Nouveaux flags allowSet et fpaZoneMode sur les types d'activités bateau - Closes #2449 - - - - - 715d1dcc by Tony Chemit at 2023-07-22T08:17:22+02:00 Mise à jour du modèle - - - - - 545a590d by Tony Chemit at 2023-07-22T08:49:04+02:00 Mise en commun des labels currentFpaZone, nextFpaZone et previousFpaZone - - - - - ea3b0a34 by Tony Chemit at 2023-07-22T08:49:04+02:00 Mise à jour de la validation - - - - - c5a5cc30 by Tony Chemit at 2023-07-22T08:49:04+02:00 Mise à jour du code java de persistance - - - - - 82babea6 by Tony Chemit at 2023-07-22T08:49:04+02:00 Mise à jour de la migration classique - - - - - a3049cbf by Tony Chemit at 2023-07-22T08:49:04+02:00 Mise à jour de la migration avdth - - - - - e05e96d9 by Tony Chemit at 2023-07-22T08:49:04+02:00 Mise à jour des ressources de persistance - - - - - c77f6656 by Tony Chemit at 2023-07-22T08:49:04+02:00 Mise à jour du la documentation de l'API publique (rattrapage sur le ticket #2449) - - - - - 77a628c8 by Tony Chemit at 2023-07-22T09:14:08+02:00 ajout dans le dto de la propagation de la propriété changedZoneOperation lors du changement de l'activité bateau - - - - - 0bba7777 by Tony Chemit at 2023-07-22T09:14:39+02:00 Ajout des nouveaux champs dans le formulaire - - - - - 55abb4b1 by Tony Chemit at 2023-07-22T09:14:47+02:00 Amélioration sur les deux formulaires de l'utilisation des champs fpa - - - - - 41240f48 by Tony Chemit at 2023-07-22T09:21:36+02:00 Merge branch 'feature/issue_2740' into develop En PS / logbook, ajouter 2 champs previousFpaZone et nextFpaZone - Closes - - - - - f714c30e by Tony Chemit at 2023-07-22T12:37:15+02:00 Fix Amélioration sur les deux formulaires de l'utilisation des champs fpa (See #2740) - - - - - 8f7351cf by Tony Chemit at 2023-07-22T12:37:32+02:00 Ajout du référentiel ps.observation.NonTargetCatchReleaseHandlingPlace - - - - - cf63132d by Tony Chemit at 2023-07-22T16:11:32+02:00 Ajout des champs ps.observation.NonTargetCatchRelease.handlingPlace et ps.observation.NonTargetCatchRelease.brailNumber - - - - - b391d1e8 by Tony Chemit at 2023-07-22T16:11:32+02:00 Mise à jour des fixtures (pour générer la documentation de l'API publique) - - - - - b9d9826c by Tony Chemit at 2023-07-22T16:11:32+02:00 Mise à jour de la documentation de l'API publique - - - - - 78479d52 by Tony Chemit at 2023-07-22T16:11:45+02:00 Merge branch 'feature/issue_2708' into develop Ajout de deux nouveaux champs et listes déroulantes sur le formulaire bonnes pratiques de remise à l'eau - Closes #2708 - - - - - 8aff39ac by Tony Chemit at 2023-07-22T16:34:58+02:00 Ajout des champs observation et logbook sur ps_common.VesselActivity et ll_common.VesselActivity - - - - - f4e7d206 by Tony Chemit at 2023-07-22T16:34:58+02:00 Mise à jour de la migration - - - - - 129d5c85 by Tony Chemit at 2023-07-22T16:34:58+02:00 Mise à jour des formulaires des référentiels VesselActivity - - - - - c9be69cb by Tony Chemit at 2023-07-22T16:34:58+02:00 Utilisation des nouveaux filtres dans les formulaires d'activités - - - - - 05182233 by Tony Chemit at 2023-07-22T16:44:33+02:00 Mise à jour de la documentation de l'API publique - - - - - 6ba35dbb by Tony Chemit at 2023-07-22T16:56:48+02:00 Merge branch 'feature/issue_2498' into develop Filtrage des types d'activité bateau pour les données observation et logbooks PS et LL - Closes #2498 - - - - - ab7cbb54 by Tony Chemit at 2023-07-23T12:53:51+02:00 Fix missing i18n label on model - - - - - f48749b3 by Tony Chemit at 2023-07-23T12:53:51+02:00 Fix GetReferentialIdsTest asset - - - - - b85dbdd6 by Tony Chemit at 2023-07-23T14:22:41+02:00 Fix Dao delete method generation (we have a weird reverse attribute, which then act as an entity but the attribute is just a primitive type...) → Really need to remove this Dao.delete method - - - - - a1637c74 by Tony Chemit at 2023-07-23T14:22:54+02:00 Mise en commun des labels observation,logbook, landing, localmarket - - - - - d8fe6cfe by Tony Chemit at 2023-07-23T14:22:55+02:00 Renommage des champs allowXXX en xXX (pour ps_common.WeightCategory et ps_common.ObservedSystem) - - - - - b06ac086 by Tony Chemit at 2023-07-23T14:22:55+02:00 Mise à jour de la migration - - - - - f7340142 by Tony Chemit at 2023-07-23T14:47:14+02:00 Merge branch 'feature/issue_2762' into develop Normalisation des drapeaux sur référentiels qui permettent de filtrer la liste des référentiels - Closes #2762 - - - - - 03d7cfed by Tony Chemit at 2023-07-23T17:29:32+02:00 Add more method on TagValuesExtractor to get and augments class tag values - - - - - 55e40d00 by Tony Chemit at 2023-07-23T17:29:35+02:00 Reduce log level on TagValuesExtractor - - - - - 099bc55b by Tony Chemit at 2023-07-23T17:36:33+02:00 When atLeastOneSelected tag-value is used, then add the WithAtLeastOneSelected interface on the class (I love auto-generate code even in model!) - - - - - 7cc0bae3 by Tony Chemit at 2023-07-23T17:36:35+02:00 Augments i18nLabels tag-value when using atLeastOneSelected tag-value (we should do more of this, auto tag-value generation is magic!) - - - - - d0e88c4d by Tony Chemit at 2023-07-23T18:53:22+02:00 When inlineDataDtoProperties tag-value is used, then add the InlineDataDto interface on the class (I love auto-generate code even in model!) - - - - - b17b1f48 by Tony Chemit at 2023-07-23T18:53:26+02:00 In ConsolidateDtoModel do not any-longer check inlineDataDto (since the interface is added by the tag-value!) - - - - - 2d90f347 by Tony Chemit at 2023-07-23T18:53:36+02:00 Ajout des drapeaux observation et logbook sur ll_common.CatchFate et ps_common.SpeciesFate - - - - - aeebdad4 by Tony Chemit at 2023-07-23T18:53:36+02:00 Mise à jour de la migration - - - - - 8027fd1e by Tony Chemit at 2023-07-23T18:53:36+02:00 Mise à jour des formulaires des référentiels - - - - - b1629ca1 by Tony Chemit at 2023-07-23T18:53:36+02:00 Utilisation des nouveaux filtres dans les formulaires de capture - - - - - 47f75d46 by Tony Chemit at 2023-07-23T18:53:36+02:00 Mise à jour de la documentation de l'API publique - - - - - 8391793c by Tony Chemit at 2023-07-23T18:53:54+02:00 Merge branch 'feature/issue_2497' into develop Filtrage des devenirs pour les données observation et logbooks PS et LL - Closes #2497 - - - - - f46cc71d by Tony Chemit at 2023-07-23T20:19:30+02:00 Add validation in warning for atLeastOneSelected (if tag-value starts with «:») - - - - - 5f3b24c6 by Tony Chemit at 2023-07-24T07:45:56+02:00 Ajout sur les VesselActivity de la tag-value atLeastOneSelected (en mode warning pour le moment) et amélioration des formulaires - See #27498 - - - - - e3a16b03 by Tony Chemit at 2023-07-24T07:45:56+02:00 Simplification des scripts de migration (See #2449, See #2498) - - - - - e190facf by Tony Chemit at 2023-07-24T10:17:57+02:00 Fix persistence test API (dataSourceConfiguration is not remove at the end of a test...) - - - - - cb43bdc0 by Tony Chemit at 2023-07-24T12:02:58+02:00 Ajout du champs ps_common.TransmittingBuoyType.regex - - - - - f931d13b by Tony Chemit at 2023-07-24T12:02:58+02:00 Mise à jour Mise à jour de la migration - - - - - 8eae2c7e by Tony Chemit at 2023-07-24T12:02:58+02:00 Mise à jour du formulaire du référentiel - - - - - e2923ae5 by Tony Chemit at 2023-07-24T12:02:58+02:00 Mise à jour de la documentation de l'API publique - - - - - dfadd9cc by Tony Chemit at 2023-07-24T12:03:08+02:00 Merge branch 'feature/issue_2725' into develop Contrôler la syntaxe des id balises par une expression régulière propre à chaque modèle de balise - Closes #2725 - - - - - 1eb81a8b by Tony Chemit at 2023-07-24T17:32:39+02:00 Ajout via la migration - - - - - d501503a by Tony Chemit at 2023-07-24T17:32:46+02:00 Mise à jour des fixtures - - - - - f9db81d7 by Tony Chemit at 2023-07-24T17:54:18+02:00 Ajout dans l'api de méthodes pour lire et écrire une caractéristique de type date - - - - - d2a67dd3 by Tony Chemit at 2023-07-24T17:54:18+02:00 Adaptation des ui pour rendre et éditer des caractéristiques de type date - - - - - 5bd6877e by Tony Chemit at 2023-07-24T17:54:29+02:00 Merge branch 'feature/issue_2763' into develop Rajouter un type Date (simple et sans time zone) dans GearCharacteristicType - Closes #2763 - - - - - 97d6dd6c by Tony Chemit at 2023-07-25T13:54:30+02:00 Do not generate again generateIds fixtures if already existing - - - - - 15b0f453 by Tony Chemit at 2023-07-25T13:54:34+02:00 Be able to add some filter on referentialCache for Referential UI - - - - - 6b8584bb by Tony Chemit at 2023-07-26T08:53:22+02:00 Ajout de GearCharacteristicListItem dans le modèle - - - - - d04270b1 by Tony Chemit at 2023-07-26T08:53:58+02:00 Ajout dans l'api de méthodes pour lire et écrire une caractéristique de type list - - - - - 3c8fed9a by Tony Chemit at 2023-07-26T08:54:39+02:00 Mise à jour de la migration - - - - - 88a04f00 by Tony Chemit at 2023-07-26T08:55:05+02:00 Mise à jour des fixtures - - - - - c911ab39 by Tony Chemit at 2023-07-26T08:55:05+02:00 Ajout du nouveau formulaire de référentiel - - - - - 4a9642df by Tony Chemit at 2023-07-26T08:55:05+02:00 Adaptation des ui pour rendre et éditer des caractéristiques de type liste - - - - - b1067c62 by Tony Chemit at 2023-07-26T08:55:05+02:00 Mise à jour des fixtures (pour la documentation de l'API publique) - - - - - c569eebd by Tony Chemit at 2023-07-26T08:55:05+02:00 Mise à jour de la documentation de l'API publique - - - - - d20f873a by Tony Chemit at 2023-07-26T08:55:31+02:00 Merge branch 'feature/issue_2764' into develop Rajouter un type 'Liste de choix' dans GearCharacteristicType et une nouvelle table gearCharacteristicListItem et remplissage des listes utilisées à l'AZTI - Closes #2764 - - - - - 1abf4cdc by Tony Chemit at 2023-07-26T12:24:37+02:00 Remove obsolete file ToolkitEntitySqlScriptModel.json - - - - - edf719d9 by Tony Chemit at 2023-07-26T12:24:44+02:00 Ignore more test with magic IgnoreTestClassRule - - - - - b47673fb by Tony Chemit at 2023-07-26T12:24:47+02:00 Ajout de scripts pour les tck - - - - - 24de337e by Tony Chemit at 2023-07-26T12:24:51+02:00 Champs comment manquant sur le formulaire du référentiel GearCharacteristicListItem - - - - - f9cb0e9f by Tony Chemit at 2023-07-26T14:55:40+02:00 update site skin - - - - - b46267ee by Tony Chemit at 2023-07-26T14:55:43+02:00 Remove FIXME (code was moved to JAXX) - - - - - 7110cc10 by Tony Chemit at 2023-07-26T14:55:45+02:00 update pom - - - - - 36252c2f by Tony Chemit at 2023-07-26T14:55:49+02:00 fix CI cache - - - - - f0670d65 by Tony Chemit at 2023-07-26T15:31:08+02:00 Revert "Do not generate again generateIds fixtures if already existing" This reverts commit 97d6dd6c94424bd171f43ee9cbe2b2ef1cee42ae. - - - - - aadc2452 by Tony Chemit at 2023-07-26T15:31:08+02:00 Do not generate again generateIds fixtures if already existing - - - - - a9cf0e07 by Tony Chemit at 2023-07-26T15:31:32+02:00 Mise à jour des tables d'association de gear - - - - - 500dfe8d by Tony Chemit at 2023-07-26T15:31:32+02:00 Mise à jour de la migration - - - - - c45d4b5c by Tony Chemit at 2023-07-26T15:31:32+02:00 Mise à jour des fixtures - - - - - 3a8de752 by Tony Chemit at 2023-07-26T15:31:32+02:00 Mise à jour du formulaire du réferentiel - - - - - 3eab40b9 by Tony Chemit at 2023-07-26T15:31:32+02:00 Mise en place du filtre sur les caractéristiques autorisées d'un équipement dans le formulaire de données - - - - - bd6113a6 by Tony Chemit at 2023-07-26T15:31:32+02:00 Mise à jour des fixtures (pour la documentation de l'API publique) - - - - - 830e6cbd by Tony Chemit at 2023-07-26T15:31:32+02:00 Mise à jour de la documentation de l'API publique - - - - - 8703f699 by Tony Chemit at 2023-07-26T15:31:49+02:00 Merge branch 'feature/issue_2765' into develop Contraindre les caractéristiques d'équipement (common.gearcharacteristic) autorisées pour un équipement (common.gear) donné. - Closes #2765 - - - - - bea39d78 by Tony Chemit at 2023-07-26T16:56:52+02:00 Fix migration - See #2762 - - - - - ab18e1d6 by Tony Chemit at 2023-07-28T16:05:34+02:00 On ne voit pas les toolTip dans les arbres des assistants de synchronisation - Closes #2768 - - - - - 984a29d2 by Tony Chemit at 2023-07-28T16:05:34+02:00 Add a new classifier «action» on enumeration I18n constants (will be used by new actions based on enumration) - - - - - f1602cd3 by Tony Chemit at 2023-07-28T16:05:34+02:00 Open API in ToolkitTreeModelSupport to be able to build first the flatModel and then build the root node from it (will be used when we want to keep the flatModel and do some filter on it to produce root node without having to make a service call, since the flatModel won't have changed) - - - - - 5f94b023 by Tony Chemit at 2023-07-28T16:05:34+02:00 Review method SelectionTreeModelSupport.allDataIds to be able to use it outside of the model scope - - - - - acd770bf by Tony Chemit at 2023-07-28T16:05:34+02:00 Improve SelectionTreeNodeRendererContext API to be able to extend it - - - - - 22e5721c by Tony Chemit at 2023-07-28T16:05:34+02:00 Ne plus afficher le label L'opération requière des corrections sur les interfaces de certains assistants - Closes #2767 - - - - - 87d5045f by Tony Chemit at 2023-07-28T16:07:09+02:00 Introduce IdAndLastUpdateDate and IdState (will be used to compute differential on selection model) - - - - - b7a9069e by Tony Chemit at 2023-07-28T16:07:10+02:00 Review actions ui code to implements the filter on IdState, and make the code much clear - - - - - 82b0c64e by Tony Chemit at 2023-07-28T16:10:49+02:00 Merge branch 'feature/issue_2750' into develop Effectuer un différentiel sur l'UI de synchro de marées - Closes #2750 - - - - - a812ba3e by Tony Chemit at 2023-07-30T09:15:05+02:00 Low log level on XxxReportDefinitionsBuilder - - - - - 6cdf9f0b by Tony Chemit at 2023-07-30T09:15:05+02:00 Service tests - Fix bad serialization to json (was using unicode inside String...) - - - - - d517c1ee by Tony Chemit at 2023-07-30T09:15:05+02:00 Service tests - Improve loadJson method (using now Type instead of Class to be able to load parametrized classes) - - - - - 8355c1bc by Tony Chemit at 2023-07-31T11:42:26+02:00 Permettre de rejouer l'assistant (à partir de l'onglet Sélection de données pour l'assistant de validation) - - - - - 2b964ef7 by Tony Chemit at 2023-07-31T11:42:26+02:00 Validation UI - Remove mainRequest in code, never used! - - - - - acc17d54 by Tony Chemit at 2023-07-31T11:42:26+02:00 improve decoration of data.ps.observation.Sample - - - - - 2ffd197b by Tony Chemit at 2023-07-31T11:42:26+02:00 Fix selection model for loadReferential: we can see the configuration panel and then always add the *common* business module - - - - - 862c5e3f by Tony Chemit at 2023-07-31T11:42:26+02:00 update pom - - - - - 7d07a019 by Tony Chemit at 2023-07-31T11:42:26+02:00 low log level - - - - - b821bcc0 by Tony Chemit at 2023-07-31T11:42:26+02:00 Validation Context - add more stuff in the ValidationContextSupport - - - - - 771e8482 by Tony Chemit at 2023-07-31T13:03:53+02:00 SelectData UI - fix focus when select tree is displayed - - - - - a4819af5 by Tony Chemit at 2023-07-31T13:03:59+02:00 Validation API - Replace in ValidationResultDto DtoReference by the path of the data (composed by ToolkitIdLabel) to the root data (means from data to his Trip, for referential just one item) - - - - - 67a5add8 by Tony Chemit at 2023-07-31T13:03:59+02:00 Validation Persistence - Review API and make some improvements (some code goes now to the toolkit modules - - - - - 1433b447 by Tony Chemit at 2023-07-31T13:03:59+02:00 Validation Services test - Review it, update then new results using the changes in ValidationResultDto - - - - - 3cbfaaab by Tony Chemit at 2023-07-31T13:03:59+02:00 Validation UI - adapt ui to display more information on each ValidationResultDto - - - - - fb9eafa9 by Tony Chemit at 2023-07-31T13:06:22+02:00 Merge branch 'feature/issue_2706' into develop Revoir la validation pour produire un résultat en forme d'arbre - Closes #2211 Améliorer l'identification des enregistrements dans l'UI de validation batch - Closes #2706 - - - - - 38138697 by Tony Chemit at 2023-07-31T13:09:08+02:00 Améliorer le rapport de validation - Closes #2215 - - - - - 1a0f5077 by Tony Chemit at 2023-08-31T11:09:10+02:00 update pom - - - - - d8bbdba4 by Tony Chemit at 2023-08-31T11:09:10+02:00 La valeur de configuration instance.security.key n'est pas bien enregistrée même si elle est présente dans les fichiers de configuration commun (/var/local/observe-server/.conf/9.x) - Closes #2769 - - - - - 9324ead4 by Tony Chemit at 2023-08-31T14:26:54+02:00 Contraindre les caractéristiques d'équipement (common.gearcharacteristic) autorisées pour un équipement (common.gear) donné - Closes #2765 - - - - - 6f30ef06 by Tony Chemit at 2023-09-01T18:55:37+02:00 Rajouter un type 'Liste de choix' dans GearCharacteristicType et une nouvelle table gearCharacteristicListItem et remplissage des listes utilisées à l'AZTI - Closes #2764 - - - - - ec25f0ff by Tony Chemit at 2023-09-01T18:55:37+02:00 Renommage I18n ValidationModelMode.DATA et suppression de ValidationModelMode.ALL - - - - - 95d1abf9 by Tony Chemit at 2023-09-01T18:55:37+02:00 Sur les validateurs de poids/taille d'espèce, rajouter dans le message de validation la valeur incriminée - Closes #2771 - - - - - 68ce791c by Tony Chemit at 2023-09-01T18:55:37+02:00 Pouvoir trier par date (ou timestamp) des ToolkitIdLabel non en français - - - - - 7e56a98d by Tony Chemit at 2023-09-01T18:55:37+02:00 Pouvoir découper un ToolkitIdLabel même si son texte n'est pas comme prévu séparé par le # (mais pas un « - ») - - - - - 70d57dd0 by Tony Chemit at 2023-09-01T18:55:37+02:00 Trier les marées sélectionnées pour toujours obtenir l'ordre chronologique sur les marées - See #2706 - - - - - 0d1041c1 by Tony Chemit at 2023-09-01T18:55:37+02:00 Reordonner les numéros d'ordre des activités Logbook si on passe en mode horodaté lors de la sauvegarde de la marée - See #2729 - - - - - 80df174e by Tony Chemit at 2023-09-01T18:55:37+02:00 Alignement des identifiants de la table LastUpdateDate - - - - - 9dd37758 by Tony Chemit at 2023-09-01T18:55:37+02:00 Rajouter un type Date (simple et sans time zone) dans GearCharacteristicType (correction de la caractéristique ajoutée) - See #2763 Mise à jour de la date de migration de la version 9.2 - - - - - d0034c0f by Tony Chemit at 2023-09-01T18:55:37+02:00 Ajout d'un décorateur «Long» pour GearCharacteristicListItem - See #2764 - - - - - 7b30e533 by Tony Chemit at 2023-09-01T18:57:46+02:00 Ne pas autoriser l'utilisation d'une caractéristique plus d'une fois sur le formulaire équipement - Closes #2772 - - - - - d6a58f5b by Tony Chemit at 2023-09-01T19:46:56+02:00 Rajouter un type 'Liste de choix' dans GearCharacteristicType et une nouvelle table gearCharacteristicListItem et remplissage des listes utilisées à l'AZTI - Closes #2764 - - - - - a9b945a9 by Tony Chemit at 2023-09-05T13:19:59+02:00 Centralisdation de l'utilisation de formatter pour les dates et horodatage suivant la locale utilisée - - - - - 383d2cc2 by Tony Chemit at 2023-09-05T13:42:15+02:00 Ajout de la configuration dans le rapport de validation - See #2215 - - - - - d02060f5 by Tony Chemit at 2023-09-05T17:27:21+02:00 Revue de la validation sur le formulaire marée du mode d'acquisition des activités - See #2729 - - - - - 68d9523b by Tony Chemit at 2023-09-11T21:30:06+02:00 Revue de la validation sur le formulaire activité du champs time - See #2729 - - - - - 0fdb658b by Tony Chemit at 2023-09-11T21:30:06+02:00 Sur les validateurs de poids/taille d'espèce, rajouter dans le message de validation la valeur incriminée - Closes #2771 - - - - - 734a2185 by Tony Chemit at 2023-09-11T21:30:06+02:00 Mauvaise récupération des heures dans l'API publique - Closes #2773 - - - - - 69889578 by Tony Chemit at 2023-09-11T21:30:06+02:00 Revue des GearCharacteristicListItem et des associations Gear_xxx - See #2764 , #2765 - - - - - 978bbd57 by Tony Chemit at 2023-09-11T21:30:06+02:00 Revue de l'import avdth (on utilise toujours le mode indexé) - See #2729 - - - - - 511db739 by Tony Chemit at 2023-09-11T21:30:06+02:00 En mode indexé, lorsque l'on remonte une activité, les activités qui lui succédaient sont incrémentées - Closes #2774 - - - - - b3854a0b by Tony Chemit at 2023-09-11T21:30:06+02:00 Suppression du site nommé latest - Closes #2775 - - - - - 747fdcec by Tony Chemit at 2023-09-11T23:07:44+02:00 update pom - - - - - 4c22792e by Tony Chemit at 2023-09-11T23:07:44+02:00 Suppression des JSlider sur les éditeurs de temps - Closes #2776 - - - - - f4f1db61 by Tony Chemit at 2023-09-11T23:07:44+02:00 Sur les écrans LL-Observation qui renseigne des avançons, le champs TimeSinceContact est initialement accéssible alors que cela est conditionné par le champ Timer - Closes #2777 - - - - - aa2329cf by Tony Chemit at 2023-09-11T23:07:44+02:00 Sur LL-Observation Capture, dans l'onglet Avançon le champ Horodatage de montée à bord n'est jamais accessible - Closes #2778 - - - - - 2b89c9ce by Tony Chemit at 2023-09-12T14:03:24+02:00 Lors de la migration, il faut réorganiser les numéros d'ordre des activités - Closes #2780 - - - - - b4306294 by Tony Chemit at 2023-09-13T12:26:45+02:00 Ajout de règles de validation sur les champ zone FPA sur les formulaires Activités - Closes #2781 - - - - - e5507f9d by Tony Chemit at 2023-09-13T13:11:24+02:00 Ne pas autoriser la recherche dans les arbres (via l'API consacrée dans JTree) - Closes #2782 - - - - - 78a74627 by Tony Chemit at 2023-09-14T10:13:01+02:00 Amélioration des messages pour la validation - See #2715 - - - - - 8c4d639d by Tony Chemit at 2023-09-14T17:06:35+02:00 Ajouter une rège de validation sur les routes pour vérifier que les numéros d'ordre suivent bien une séquence partant de 1 - Closes #2783 - - - - - 01ca03cc by Tony Chemit at 2023-09-15T11:54:07+02:00 remove any space in Test methodName - - - - - 05cc2546 by Tony Chemit at 2023-09-15T11:54:18+02:00 Ajout d'un **(s)** sur le nombre de messages par scope de validation sur les nœud - See #2211 - - - - - 3dcac2e5 by Tony Chemit at 2023-09-15T12:01:14+02:00 Ajout du champ parentId sur DeleteRequest - - - - - 09711fa7 by Tony Chemit at 2023-09-15T12:04:30+02:00 Ajout de DeleteRequestCallback, pour permettre un traitement supplémentaire dans la génération du code sql de suppression - - - - - ac5fe585 by Tony Chemit at 2023-09-15T12:05:48+02:00 Ajout de ActivityNumberRecord pour pouvoir récupérer la liste des activités d'une route dans l'ordre byNumber ou byTime avec tout ce qu'il faut pour ensuite pouvoir réordonner les activités suite à une suppression ou un déplacement. - - - - - d681b10a by Tony Chemit at 2023-09-15T12:06:52+02:00 Ajout du callback ActivityDeleteRequestCallback pour réordonner les activités suite à une ou plusieurs suppressions. - - - - - dac4edb0 by Tony Chemit at 2023-09-15T12:08:11+02:00 Pouvoir éditer le DeleteTreeAdapter - - - - - 9a4c1755 by Tony Chemit at 2023-09-15T12:08:35+02:00 Pouvoir modifier la méthode adaptParentNode du DeleteTreeAdapter - - - - - cc7edc4a by Tony Chemit at 2023-09-15T12:09:37+02:00 Adaptation du ActivityUIDeleteTreeAdapter pour recharger les nœuds de toutes les activités d'une route suite à une suppression - - - - - a864950f by Tony Chemit at 2023-09-15T12:12:50+02:00 Merge branch 'feature/2784' into develop Sur la suppression d'un activité, il faut recalculer les numéros d'ordre sur les activités restantes de la route - Closes #2784 - - - - - 454b4e03 by Tony Chemit at 2023-09-15T12:16:32+02:00 Ajout du paramètre replaceIds sur la méthode consume de ReplicateRequestCallback afin ensuite lors du déplacement des activités de pouvoir connaître les identifiants des activités répliquées - - - - - 21b497aa by Tony Chemit at 2023-09-15T12:17:09+02:00 Ajout du callback pour le déplacement des activités - - - - - d800252a by Tony Chemit at 2023-09-15T13:09:42+02:00 Renommage de la méthode addMissingChildren en getNewSelectedNodeFromNewParentNode sur MoveTreeAdapter - - - - - 8c4a45cc by Tony Chemit at 2023-09-15T13:13:42+02:00 Merge branch 'feature/2785' into develop Sur le déplacement d'un activité, il faut recalculer les numéros d'ordre des activités sur la route origine et la route destination du déplacement. - Closes #2785 - - - - - 743df4c9 by Tony Chemit at 2023-09-15T13:59:29+02:00 Mettre à jour le champ lastUpdateDate sur les entités parent lors d'une suppression - - - - - a7e54a6c by Tony Chemit at 2023-09-15T13:59:53+02:00 Mettre à jour l'arbre de navigation suite à la mise à jour des lastUpdateDate des entités parent de l'entité à supprimer - - - - - 4aab6011 by Tony Chemit at 2023-09-15T14:20:21+02:00 Merge branch 'feature/2786' into develop Lors de la suppression d'une donnée, il faut mettre à jour le champ lastUpdateDate sur les entitées qui remontent jusqu'à la marée - Closes #2786 - - - - - 121edbe0 by Tony Chemit at 2023-09-16T18:52:09+02:00 Améliorer le rapport de validation (ajout d'une action tout plier, tout déplier) - See #2215 - - - - - 0327b7ba by Tony Chemit at 2023-09-17T13:41:41+02:00 Ajout de caractéristiques autorisées sur des équipements - Closes #2787 - - - - - e2af5abf by Tony Chemit at 2023-09-17T13:41:42+02:00 Supprimer les valeurs ```None``` des identifiants de balises via la migration classique. - Closes #2788 - - - - - aa23ea72 by Tony Chemit at 2023-09-25T19:44:17+02:00 add specs pdf to gitignore - - - - - 36c083cb by Tony Chemit at 2023-09-30T11:09:24+02:00 Erreur sur ajout d'un orin dans LL / Observations / Composition globale - Closes #2790 - - - - - c3e2e386 by Tony Chemit at 2023-09-30T11:09:24+02:00 update pom - - - - - 2b2f14d4 by Tony Chemit at 2023-10-05T20:31:51+02:00 Problème de connexion au serveur IEO - Closes #2791 - - - - - e2385264 by Tony Chemit at 2023-10-06T09:52:51+02:00 Une incompatibilité empêche l'ouverture de l'application sous Java 21 - Closes #2792 - - - - - d6624be7 by Tony Chemit at 2023-10-09T09:41:56+02:00 Rajouter un type 'Liste de choix' dans GearCharacteristicType et une nouvelle table gearCharacteristicListItem et remplissage des listes utilisées à l'AZTI - See 2764 - - - - - af5bc111 by Tony Chemit at 2023-10-09T10:59:59+02:00 L'UI équipement n'interdit pas d'associer à un équipement une caractéristique qui ne lui est pas destinée - Closes 2793 - - - - - a489cc05 by Tony Chemit at 2023-10-09T11:03:52+02:00 Elargir l'affichage du panneau Caractéristiques (d'un équipement) - Closes 2794 - - - - - 32b43414 by Tony Chemit at 2023-10-09T11:13:58+02:00 Update changelog for v.9.2.0 [skip CI] - - - - - 203cc757 by Tony Chemit at 2023-10-09T11:15:17+02:00 [jgitflow-maven-plugin]updating poms for branch'release/9.2.0' with non-snapshot versions[skip ci] - - - - - a66fe707 by Tony Chemit at 2023-10-09T12:02:54+02:00 [jgitflow-maven-plugin]merging 'release/9.2.0' into 'master' - - - - - 30 changed files: - .gitignore - .gitlab-ci.yml - + .mvn/scripts/tck/delete.sh - + .mvn/scripts/tck/test.sh - + .mvn/scripts/tck/update.sh - CHANGELOG.md - client/configuration/pom.xml - client/configuration/src/main/config/Client.ini - client/configuration/src/main/i18n/getters/config.getter - client/configuration/src/main/i18n/getters/java.getter - client/configuration/src/main/java/fr/ird/observe/client/configuration/ClientConfig.java - client/configuration/src/main/java/fr/ird/observe/client/configuration/ClientResources.java - + client/configuration/src/main/resources/observe.jks - client/core/pom.xml - client/core/src/main/java/fr/ird/observe/client/datasource/api/cache/ReferencesFilterHelper.java - client/core/src/main/java/fr/ird/observe/client/datasource/h2/backup/BackupsManager.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/DefaultUIInitializer.java - client/core/src/main/java/fr/ird/observe/client/util/init/UIInitHelper.java - client/core/src/main/java/fr/ird/observe/client/util/table/EditableTableModelWithCache.java - client/core/src/main/java/fr/ird/observe/client/util/table/JXTableUtil.java - client/core/src/main/resources/fr/ird/observe/client/ui/ObserveCommon.jcss - client/core/src/main/resources/observe-ui.properties - client/datasource/actions/pom.xml - client/datasource/actions/src/main/i18n/getters/java-enumeration.getter - client/datasource/actions/src/main/i18n/getters/java.getter - client/datasource/actions/src/main/i18n/templates/validationReport_en_GB.ftl - client/datasource/actions/src/main/i18n/templates/validationReport_es_ES.ftl - client/datasource/actions/src/main/i18n/templates/validationReport_fr_FR.ftl - client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/AdminTabUI.jaxx The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/9b9b81d00dd4ac7cc18ae325… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/9b9b81d00dd4ac7cc18ae325… 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.2.0' with non-snapshot versions[skip ci]
by Tony CHEMIT (＠tchemit) 09 Oct '23

09 Oct '23

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 203cc757 by Tony Chemit at 2023-10-09T11:15:17+02:00 [jgitflow-maven-plugin]updating poms for branch'release/9.2.0' with non-snapshot versions[skip ci] - - - - - a66fe707 by Tony Chemit at 2023-10-09T12:02:54+02:00 [jgitflow-maven-plugin]merging 'release/9.2.0' into 'master' - - - - - bbd8662d by Tony Chemit at 2023-10-09T12:03:03+02:00 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts[skip ci] - - - - - b3ce84eb by Tony Chemit at 2023-10-09T12:03:04+02:00 [jgitflow-maven-plugin]merging 'master' into 'develop' - - - - - 921c45da by Tony Chemit at 2023-10-09T12:03:06+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/44f91b51ff77c479c4616bd0… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/44f91b51ff77c479c4616bd0… 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.2.1-SNAPSHOT development[skip ci]
by Tony CHEMIT (＠tchemit) 09 Oct '23

09 Oct '23

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 44f91b51 by Tony Chemit at 2023-10-09T11:14:50+02:00 [jgitflow-maven-plugin]updating poms for 9.2.1-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-consolidation/pom.xml - core/api/dto-decoration/pom.xml - core/api/dto-validation/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/avdth/pom.xml - core/persistence/consolidation/pom.xml - core/persistence/decoration/pom.xml - core/persistence/java/pom.xml - core/persistence/migration/pom.xml - core/persistence/pom.xml - core/persistence/report/pom.xml - core/persistence/resources/pom.xml - core/persistence/test/pom.xml The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/44f91b51ff77c479c4616bd05… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/44f91b51ff77c479c4616bd05… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe] Pushed new branch release/9.2.0
by Tony CHEMIT (＠tchemit) 09 Oct '23

09 Oct '23

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

1 0

[Git][ultreiaio/ird-observe][develop] Update changelog for v.9.2.0 [skip CI]
by Tony CHEMIT (＠tchemit) 09 Oct '23

09 Oct '23

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 32b43414 by Tony Chemit at 2023-10-09T11:13:58+02:00 Update changelog for v.9.2.0 [skip CI] - - - - - 1 changed file: - CHANGELOG.md Changes: ===================================== CHANGELOG.md ===================================== @@ -1,16 +1,66 @@ # ObServe changelog * Author [Tony Chemit](mailto:dev@tchemit.fr) - * Last generated at 2023-07-15 12:19. + * Last generated at 2023-10-09 11:10. + +## Version [9.2.0](https://gitlab.com/ultreiaio/ird-observe/-/milestones/269) + +**Closed at 2023-10-09.** + +### Download +* [Client (observe-9.2.0-client.zip)](https://repo1.maven.org/maven2/fr/ird/observe/ob…) +* [Serveur (observe-9.2.0.war)](https://repo1.maven.org/maven2/fr/ird/observe/observe/9…) +* [Serveur (observe-9.2.0-server.zip)](https://repo1.maven.org/maven2/fr/ird/observe/ob…) + + +### Issues + * [[Type::Anomalie 2761]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2761) **Validation d'une activité 13 sans heure** (Thanks to Tony CHEMIT) (Reported by Pascal Cauquil) + * [[Type::Anomalie 2768]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2768) **On ne voit pas les toolTip dans les arbres des assistants de synchronisation** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Type::Anomalie 2769]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2769) **La valeur de configuration instance.security.key n'est pas bien enregistrée même si elle est présente dans les fichiers de configuration commun (/var/local/observe-server/.conf/9.x)** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Type::Anomalie 2774]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2774) **En mode indexé, lorsque l'on remonte une activité, les activités qui lui succédaient sont incrémentées** (Thanks to Tony CHEMIT) (Reported by Pascal Cauquil) + * [[Type::Anomalie 2777]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2777) **Sur les écrans LL-Observation qui renseigne des avançons, le champs TimeSinceContact est initialement accéssible alors que cela est conditionné par le champ Timer** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Type::Anomalie 2778]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2778) **Sur LL-Observation Capture, dans l'onglet Avançon le champ Horodatage de montée à bord n'est jamais accessible** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Type::Anomalie 2779]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2779) **La valeur null du champs de type time est altérée lors de l'ouverture des formulaires** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Type::Anomalie 2786]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2786) **Lors de la suppression d'une donnée, il faut mettre à jour le champ lastUpdateDate sur les entités qui remontent jusqu'à la marée** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Type::Anomalie 2792]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2792) **Une incompatibilité empêche l'ouverture de l'application sous Java 21** (Thanks to Tony CHEMIT) (Reported by Pascal Cauquil) + * [[Type::Evolution 2211]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2211) **Revoir la validation pour produire un résultat en forme d'arbre** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Type::Evolution 2215]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2215) **Améliorer le rapport de validation** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Type::Evolution 2449]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2449) **Nouveaux flags allowSet et fpaZoneMode sur les types d'activités bateau** (Thanks to Pascal Cauquil) (Reported by Pascal Cauquil) + * [[Type::Evolution 2497]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2497) **Filtrage des devenirs pour les données observation et logbooks PS et LL** (Thanks to Tony CHEMIT) (Reported by Pascal Cauquil) + * [[Type::Evolution 2498]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2498) **Filtrage des types d'activité bateau pour les données observation et logbooks PS et LL** (Thanks to Tony CHEMIT) (Reported by Pascal Cauquil) + * [[Type::Evolution 2706]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2706) **Améliorer l'identification des enregistrements dans l'UI de validation batch** (Thanks to Tony CHEMIT) (Reported by Pascal Cauquil) + * [[Type::Evolution 2707]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2707) **Faire évoluer l'UI équipement du bateau pour autoriser la gestion de listes de référence** (Thanks to Tony CHEMIT) (Reported by Pascal Cauquil) + * [[Type::Evolution 2708]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2708) **Ajout de deux nouveaux champs et listes déroulantes sur le formulaire bonnes pratiques de remise à l'eau** (Thanks to Tony CHEMIT) (Reported by Pascal Cauquil) + * [[Type::Evolution 2714]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2714) **ll_observation.Catch.count devrait être NOT NULL** (Thanks to Pascal Cauquil) (Reported by Pascal Cauquil) + * [[Type::Evolution 2725]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2725) **Contrôler la syntaxe des id balises par une expression régulière propre à chaque modèle de balise** (Thanks to Tony CHEMIT) (Reported by Pascal Cauquil) + * [[Type::Evolution 2729]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2729) **En PS / logbook / Activité, voir comment mieux gérer l'ajout d'une activité dont l'horaire précéde celui de la dernière activité saisie (souci lié au numéro d'activité auto incrémenté)** (Thanks to Pascal Cauquil) (Reported by Pascal Cauquil) + * [[Type::Evolution 2740]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2740) **En PS / logbook, ajouter 2 champs previousFpaZone et nextFpaZone** (Thanks to Tony CHEMIT) (Reported by Pascal Cauquil) + * [[Type::Evolution 2750]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2750) **Effectuer un différentiel sur l'UI de synchro de marées** (Thanks to Tony CHEMIT) (Reported by Pascal Cauquil) + * [[Type::Evolution 2762]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2762) **Normalisation des drapeaux sur référentiels qui permettent de filtrer la liste des référentiels** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Type::Evolution 2763]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2763) **Rajouter un type Date (simple et sans time zone) dans GearCharacteristicType** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Type::Evolution 2767]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2767) **Ne plus afficher le label L'opération requière des corrections sur les interfaces de certains assistants** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Type::Evolution 2771]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2771) **Sur les validateur de type taille/poids d'une espèce, rajouter dans le message la valeur incriminée** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Type::Evolution 2772]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2772) **Ne pas autoriser l'utilisation d'une caractéristique plus d'une fois sur le formulaire équipement** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Type::Evolution 2773]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2773) **Mauvaise récupération des heures dans l'API publique** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Type::Evolution 2776]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2776) **Suppression des JSlider sur les éditeurs de temps** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Type::Evolution 2780]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2780) **Lors de la migration, il faut réorganiser les numéros d'ordre des activités** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Type::Evolution 2781]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2781) **Ajout de règles de validation sur les champ zone FPA sur les formulaires Activités** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Type::Evolution 2782]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2782) **Ne pas autoriser la recherche dans les arbres (via l'API consacrée dans JTree)** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Type::Evolution 2783]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2783) **Ajouter une rège de validation sur les routes pour vérifier que les numéros d'ordre suivent bien une séquence partant de 1** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Type::Evolution 2784]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2784) **Sur la suppression d'un activité, il faut recalculer les numéros d'ordre sur les activités restantes de la route** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Type::Evolution 2785]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2785) **Sur le déplacement d'un activité, il faut recalculer les numéros d'ordre des activités sur la route origine et la route destination du déplacement.** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Type::Evolution 2787]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2787) **Ajout de caractéristiques autorisées sur des équipements** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Type::Evolution 2788]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2788) **Supprimer les valeurs ```None``` des identifiants de balises via la migration classique.** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Type::Tâche 2791]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2791) **Problème de connexion au serveur IEO** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) ## Version [9.1.6](https://gitlab.com/ultreiaio/ird-observe/-/milestones/270) **Closed at 2023-07-15.** ### Download - * [Client (observe-9.1.6-client.zip)](https://repo1.maven.org/maven2/fr/ird/observe/ob…) - * [Serveur (observe-9.1.6.war)](https://repo1.maven.org/maven2/fr/ird/observe/observe/9…) - * [Serveur (observe-9.1.6-server.zip)](https://repo1.maven.org/maven2/fr/ird/observe/ob…) +* [Client (observe-9.1.6-client.zip)](https://repo1.maven.org/maven2/fr/ird/observe/ob…) +* [Serveur (observe-9.1.6.war)](https://repo1.maven.org/maven2/fr/ird/observe/observe/9…) +* [Serveur (observe-9.1.6-server.zip)](https://repo1.maven.org/maven2/fr/ird/observe/ob…) ### Issues * [[Type::Anomalie 2747]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2747) **Séquence du focus sur PS / Logbook / Activité** (Thanks to Tony CHEMIT) (Reported by Pascal Cauquil) View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/32b43414e9184300f66f53f94… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/32b43414e9184300f66f53f94… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] 2 commits: L'UI équipement n'interdit pas d'associer à un équipement une caractéristique...
by Tony CHEMIT (＠tchemit) 09 Oct '23

09 Oct '23

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: af5bc111 by Tony Chemit at 2023-10-09T10:59:59+02:00 L'UI équipement n'interdit pas d'associer à un équipement une caractéristique qui ne lui est pas destinée - Closes 2793 - - - - - a489cc05 by Tony Chemit at 2023-10-09T11:03:52+02:00 Elargir l'affichage du panneau Caractéristiques (d'un équipement) - Closes 2794 - - - - - 4 changed files: - client/core/src/main/java/fr/ird/observe/client/util/table/EditableTableModelWithCache.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/GearUseFeaturesMeasurementsTableModelSupport.java - client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/common/TripGearUseFeaturesUI.jaxx - client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/common/TripGearUseFeaturesUI.jaxx Changes: ===================================== client/core/src/main/java/fr/ird/observe/client/util/table/EditableTableModelWithCache.java ===================================== @@ -86,7 +86,7 @@ public abstract class EditableTableModelWithCache<E extends BusinessDto & Inline } } - public final void onBeforeResetRow(String prefix, int editingRow, JTable table) { + public void onBeforeResetRow(String prefix, int editingRow, JTable table) { if (!isEditable()) { return; } ===================================== client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/GearUseFeaturesMeasurementsTableModelSupport.java ===================================== @@ -33,6 +33,7 @@ import fr.ird.observe.client.util.table.EditableTableModelWithCache; import fr.ird.observe.client.util.table.JXTableUtil; import fr.ird.observe.dto.BusinessDto; import fr.ird.observe.dto.data.ContainerChildDto; +import fr.ird.observe.dto.data.ContainerDto; import fr.ird.observe.dto.data.GearUseFeaturesAware; import fr.ird.observe.dto.data.GearUseFeaturesMeasurementAware; import fr.ird.observe.dto.referential.common.GearCharacteristicListItemReference; @@ -46,6 +47,7 @@ import org.apache.logging.log4j.Logger; import org.nuiton.jaxx.validator.swing.SwingValidator; import javax.swing.JScrollPane; +import javax.swing.JTable; import java.util.ArrayList; import java.util.List; import java.util.Objects; @@ -66,19 +68,21 @@ public abstract class GearUseFeaturesMeasurementsTableModelSupport<E extends Bus private FilterableComboBox<GearCharacteristicReference> gearCharacteristicEditor; private List<GearCharacteristicReference> allowedCharacteristics; + private ContentTableUI<?, P, ?> ui; + @SuppressWarnings("unchecked") public static <E extends BusinessDto & GearUseFeaturesMeasurementAware, P extends ContainerChildDto & GearUseFeaturesAware> void onInit(ContentTableUI<?, P, ?> ui, JScrollPane scrollPane, EditableTable<E, ?> table, SwingValidator<E> rowValidator) { table.setRowHeight(22); GearUseFeaturesMeasurementsTableModelSupport<E, P> model = (GearUseFeaturesMeasurementsTableModelSupport<E, P>) table.getModel(); ui.getTableModel().registerInlineModel(model, table); - + model.ui = ui; ContentTableUITableModel<?, P, ?> tableUIModel = ui.getTableModel(); @SuppressWarnings("unchecked") P tableEditBean = (P) ui.getTableEditBean(); - tableEditBean.addPropertyChangeListener("gear", evt -> model.onGearChanged(tableUIModel, (GearReference) evt.getNewValue())); + tableEditBean.addPropertyChangeListener("gear", evt -> model.onGearChanged(ui, tableUIModel, (GearReference) evt.getNewValue(), false)); tableUIModel.addPropertyChangeListener(ContentTableUITableModel.SELECTED_ROW_PROPERTY, evt -> { int newValue = (int) evt.getNewValue(); if (newValue != -1) { - model.onGearChanged(tableUIModel, tableEditBean.getGear()); + model.onGearChanged(ui, tableUIModel, tableEditBean.getGear(), true); } }); model.gearsById = Maps.uniqueIndex(ui.getHandler().getReferentialService().loadDtoList(GearDto.class), GearDto::getId); @@ -104,7 +108,24 @@ public abstract class GearUseFeaturesMeasurementsTableModelSupport<E extends Bus super(listProperty); } - private void onGearChanged(ContentTableUITableModel<?, P, ?> tableModel, GearReference newGear) { + @Override + public void onBeforeResetRow(String prefix, int editingRow, JTable table) { + if (!isEditable()) { + return; + } + log.info(String.format("%sBefore reset edit bean at row: %d", prefix, editingRow)); + UIHelper.cancelEditing(table); + @SuppressWarnings("unchecked") ContainerDto<P> containerBean = (ContainerDto<P>) ui.getBean(); + List<P> children = containerBean.getChildren(); + P bean = children.get(editingRow); + @SuppressWarnings("unchecked") List<E> gearUseFeaturesMeasurement = (List<E>) bean.getGearUseFeaturesMeasurement(); + cache().replace(editingRow, gearUseFeaturesMeasurement); + List<E> newData = cache().get(editingRow); + setData(newData); + validate(); + } + + private void onGearChanged(ContentTableUI<?, P, ?> ui, ContentTableUITableModel<?, P, ?> tableModel, GearReference newGear, boolean selectionRowChanged) { if (!tableModel.isEditable()) { return; } @@ -112,35 +133,14 @@ public abstract class GearUseFeaturesMeasurementsTableModelSupport<E extends Bus return; } String gearId = newGear == null ? null : newGear.getId(); - log.info("Use gear: {}", gearId); - updateAllowedCharacteristics(gearId); - if (tableModel.isCreate()) { - // add default measurements + log.info("Use gear: {}, selection row changed? {}, existing measurements ({})", gearId, selectionRowChanged, getRowCount()); + if (!selectionRowChanged && !ui.getStates().isResetEdit()) { + // This means user has changed the gear, need to reset measurement, then add default ones setDefaultMeasurementsOnSelectedRow(gearId, tableModel.getSelectedRow()); } + updateAllowedCharacteristics(gearId); } -// public void onAfterLoadRowBeanToEdit(int editingRow, P tableEditBean, boolean newRow) { -// List<E> measurements = get(editingRow); -// if (measurements == null) { -// log.info(String.format("init measurements for row %d", editingRow)); -// // first time coming on this row -// if (newRow) { -// // create mode: just init with empty list -// measurements = Collections.emptyList(); -// log.info("create mode, use an empty list"); -// } else { -// measurements = new ArrayList<>(getGearUseFeaturesMeasurement(tableEditBean)); -// } -// // init measurements -// put(editingRow, measurements); -// } else { -// log.info(String.format("Using existing measurements for row %d : %d", editingRow, measurements.size())); -// } -// setData(measurements); -// setModified(false); -// } - @Override public final int getColumnCount() { return 2; @@ -176,7 +176,7 @@ public abstract class GearUseFeaturesMeasurementsTableModelSupport<E extends Bus public void setDefaultMeasurementsOnSelectedRow(String gearId, int editingRow) { List<E> measurements = getDefaultGearUseFeaturesMeasurement(gearId); - log.info(String.format("Create mode, use default measurements: %d", measurements.size())); + log.info(String.format("User mode, use default measurements: %d", measurements.size())); //FIXME Error no list for row -1 cache().replace(editingRow, measurements); setData(measurements); ===================================== client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/common/TripGearUseFeaturesUI.jaxx ===================================== @@ -58,54 +58,55 @@ <Table id='editorPanel' fill='both' insets='0' beanScope="tableEditBean"> <row> - <cell weightx="0.5"> - <JXTitledPanel id="definitionPanel" contentContainer='{definitionForm}'> - <Table id='definitionForm' fill='both' insets='1'> -  - <row> - <cell> - <JLabel id='gearLabel'/> - </cell> - <cell weightx='1' anchor='east'> - <FilterableComboBox id='gear' genericType='GearReference'/> - </cell> - </row> -  - <row> - <cell> - <JLabel id='numberLabel'/> - </cell> - <cell weightx='1' anchor='east'> - <NumberEditor id='number' styleClass="int6"/> - </cell> - </row> -  - <row> - <cell> - <JLabel id='usedInTripLabel'/> - </cell> - <cell weightx='1' anchor='east'> - <BooleanEditor id='usedInTrip'/> - </cell> - </row> -  - <row> - <cell columns="2" weighty='1'> - <BigTextEditor id="comment"/> - </cell> - </row> - </Table> - </JXTitledPanel> - </cell> - <cell weightx="0.5"> - <JXTitledPanel id="measurementsPanel" contentContainer='{measurementsInternalPanel}'> - <JPanel id="measurementsInternalPanel" layout='{new GridLayout()}'> - <JScrollPane id='measurementsScrollPane'> - <EditableTable id='measurementsTable' constructorParams='measurementsTableModel' genericType="GearUseFeaturesMeasurementDto, GearUseFeaturesMeasurementsTableModel"/> - </JScrollPane> - </JPanel> - </JXTitledPanel> + <cell weightx="1"> + <JPanel layout="{new GridLayout()}"> + <JXTitledPanel id="definitionPanel" contentContainer='{definitionForm}'> + <Table id='definitionForm' fill='both' insets='1'> +  + <row> + <cell> + <JLabel id='gearLabel'/> + </cell> + <cell weightx='1' anchor='east'> + <FilterableComboBox id='gear' genericType='GearReference'/> + </cell> + </row> +  + <row> + <cell> + <JLabel id='numberLabel'/> + </cell> + <cell weightx='1' anchor='east'> + <NumberEditor id='number' styleClass="int6"/> + </cell> + </row> +  + <row> + <cell> + <JLabel id='usedInTripLabel'/> + </cell> + <cell weightx='1' anchor='east'> + <BooleanEditor id='usedInTrip'/> + </cell> + </row> +  + <row> + <cell columns="2" weighty='1'> + <BigTextEditor id="comment"/> + </cell> + </row> + </Table> + </JXTitledPanel> + <JXTitledPanel id="measurementsPanel" contentContainer='{measurementsInternalPanel}'> + <JPanel id="measurementsInternalPanel" layout='{new GridLayout()}'> + <JScrollPane id='measurementsScrollPane'> + <EditableTable id='measurementsTable' constructorParams='measurementsTableModel' genericType="GearUseFeaturesMeasurementDto, GearUseFeaturesMeasurementsTableModel"/> + </JScrollPane> + </JPanel> + </JXTitledPanel> + </JPanel> </cell> </row> </Table> + <JMenuItem id='moveAll' styleClass='editableAndNotModifiedAndTableNotEmpty'/> </fr.ird.observe.client.datasource.editor.api.content.data.table.ContentTableUI> ===================================== client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/common/TripGearUseFeaturesUI.jaxx ===================================== @@ -58,53 +58,53 @@ <Table id='editorPanel' fill='both' insets='0' beanScope="tableEditBean"> <row> - <cell weightx="0.5"> - <JXTitledPanel id="definitionPanel" contentContainer='{definitionForm}'> - <Table id='definitionForm' fill='both' insets='1'> -  - <row> - <cell> - <JLabel id='gearLabel'/> - </cell> - <cell weightx='1' anchor='east'> - <FilterableComboBox id='gear' genericType='GearReference'/> - </cell> - </row> -  - <row> - <cell> - <JLabel id='numberLabel'/> - </cell> - <cell weightx='1' anchor='east'> - <NumberEditor id='number' styleClass="int6"/> - </cell> - </row> -  - <row> - <cell> - <JLabel id='usedInTripLabel'/> - </cell> - <cell weightx='1' anchor='east'> - <BooleanEditor id='usedInTrip'/> - </cell> - </row> -  - <row> - <cell columns="2" weighty='1'> - <BigTextEditor id="comment"/> - </cell> - </row> - </Table> - </JXTitledPanel> - </cell> - <cell weightx="0.5"> - <JXTitledPanel id="measurementsPanel" contentContainer='{measurementsInternalPanel}'> - <JPanel id="measurementsInternalPanel" layout='{new GridLayout()}'> - <JScrollPane id='measurementsScrollPane'> - <EditableTable id='measurementsTable' constructorParams='measurementsTableModel' genericType="GearUseFeaturesMeasurementDto, GearUseFeaturesMeasurementsTableModel"/> - </JScrollPane> - </JPanel> - </JXTitledPanel> + <cell weightx="1"> + <JPanel layout="{new GridLayout()}"> + <JXTitledPanel id="definitionPanel" contentContainer='{definitionForm}'> + <Table id='definitionForm' fill='both' insets='1'> +  + <row> + <cell> + <JLabel id='gearLabel'/> + </cell> + <cell weightx='1' anchor='east'> + <FilterableComboBox id='gear' genericType='GearReference'/> + </cell> + </row> +  + <row> + <cell> + <JLabel id='numberLabel'/> + </cell> + <cell weightx='1' anchor='east'> + <NumberEditor id='number' styleClass="int6"/> + </cell> + </row> +  + <row> + <cell> + <JLabel id='usedInTripLabel'/> + </cell> + <cell weightx='1' anchor='east'> + <BooleanEditor id='usedInTrip'/> + </cell> + </row> +  + <row> + <cell columns="2" weighty='1'> + <BigTextEditor id="comment"/> + </cell> + </row> + </Table> + </JXTitledPanel> + <JXTitledPanel id="measurementsPanel" contentContainer='{measurementsInternalPanel}'> + <JPanel id="measurementsInternalPanel" layout='{new GridLayout()}'> + <JScrollPane id='measurementsScrollPane'> + <EditableTable id='measurementsTable' constructorParams='measurementsTableModel' genericType="GearUseFeaturesMeasurementDto, GearUseFeaturesMeasurementsTableModel"/> + </JScrollPane> + </JPanel> + </JXTitledPanel> + </JPanel> </cell> </row> </Table> View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/d6624be7806c07e795b9323d… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/d6624be7806c07e795b9323d… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] Rajouter un type 'Liste de choix' dans GearCharacteristicType et une nouvelle...
by Tony CHEMIT (＠tchemit) 09 Oct '23

09 Oct '23

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: d6624be7 by Tony Chemit at 2023-10-09T09:41:56+02:00 Rajouter un type 'Liste de choix' dans GearCharacteristicType et une nouvelle table gearCharacteristicListItem et remplissage des listes utilisées à l'AZTI - See 2764 - - - - - 22 changed files: - core/persistence/migration/src/main/java/fr/ird/observe/spi/migration/v9/DataSourceMigrationForVersion_9_2.java - core/persistence/migration/src/main/resources/db/migration/v9/9.2/11_03_issue-2764_add-list-001-common.sql - core/persistence/migration/src/main/resources/db/migration/v9/9.2/11_03_issue-2764_add-list-002-common.sql - core/persistence/migration/src/main/resources/db/migration/v9/9.2/11_03_issue-2764_add-list-003-common.sql - core/persistence/migration/src/main/resources/db/migration/v9/9.2/11_03_issue-2764_add-list-004-common.sql - core/persistence/migration/src/main/resources/db/migration/v9/9.2/11_03_issue-2764_add-list-005-common.sql - core/persistence/migration/src/main/resources/db/migration/v9/9.2/11_03_issue-2764_add-list-006-common.sql - core/persistence/migration/src/main/resources/db/migration/v9/9.2/11_03_issue-2764_add-list-007-common.sql - core/persistence/migration/src/main/resources/db/migration/v9/9.2/11_03_issue-2764_add-list-011-common.sql - core/persistence/migration/src/main/resources/db/migration/v9/9.2/11_03_issue-2764_add-list-012-common.sql - core/persistence/migration/src/main/resources/db/migration/v9/9.2/11_03_issue-2764_add-list-013-common.sql - core/persistence/migration/src/main/resources/db/migration/v9/9.2/11_03_issue-2764_add-list-014-common.sql - core/persistence/migration/src/main/resources/db/migration/v9/9.2/11_03_issue-2764_add-list-015-common.sql - core/persistence/migration/src/main/resources/db/migration/v9/9.2/11_03_issue-2764_add-list-016-common.sql - core/persistence/migration/src/main/resources/db/migration/v9/9.2/11_03_issue-2764_add-list-017-common.sql - core/persistence/migration/src/main/resources/db/migration/v9/9.2/11_03_issue-2764_add-list-018-common.sql - core/persistence/migration/src/main/resources/db/migration/v9/9.2/11_03_issue-2764_add-list-019-common.sql - + core/persistence/migration/src/main/resources/db/migration/v9/9.2/11_03_issue-2764_add-list-020-common.sql - + core/persistence/migration/src/main/resources/db/migration/v9/9.2/11_03_issue-2764_add-list-021-common.sql - + core/persistence/migration/src/main/resources/db/migration/v9/9.2/11_03_issue-2764_add-list-022-common.sql - + core/persistence/migration/src/main/resources/db/migration/v9/9.2/11_03_issue-2764_add-list-023-common.sql - + core/persistence/migration/src/main/resources/db/migration/v9/9.2/11_03_issue-2764_add-list-024-common.sql The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/d6624be7806c07e795b9323d8… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/d6624be7806c07e795b9323d8… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] 2 commits: Problème de connexion au serveur IEO - Closes #2791
by Tony CHEMIT (＠tchemit) 08 Oct '23

08 Oct '23

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 2b2f14d4 by Tony Chemit at 2023-10-05T20:31:51+02:00 Problème de connexion au serveur IEO - Closes #2791 - - - - - e2385264 by Tony Chemit at 2023-10-06T09:52:51+02:00 Une incompatibilité empêche l'ouverture de l'application sous Java 21 - Closes #2792 - - - - - 11 changed files: - client/configuration/src/main/config/Client.ini - client/configuration/src/main/i18n/getters/config.getter - client/configuration/src/main/i18n/getters/java.getter - client/configuration/src/main/java/fr/ird/observe/client/configuration/ClientConfig.java - client/configuration/src/main/java/fr/ird/observe/client/configuration/ClientResources.java - + client/configuration/src/main/resources/observe.jks - client/core/src/main/java/fr/ird/observe/client/datasource/h2/backup/BackupsManager.java - client/core/src/main/java/fr/ird/observe/client/main/body/ClientConfigUI.java - client/runner/src/main/i18n/translations/client-runner_en_GB.properties - client/runner/src/main/i18n/translations/client-runner_es_ES.properties - client/runner/src/main/i18n/translations/client-runner_fr_FR.properties Changes: ===================================== client/configuration/src/main/config/Client.ini ===================================== @@ -331,6 +331,12 @@ type = file defaultValue = ${instance.resources.directory}/observe-log4j2.xml transient = true +[option useJvmKeyStore] +description = observe.config.useJvmKeyStore.description +key = instance.useJvmKeyStore +type = Boolean +defaultValue = false + [option longlineActivityPairingMaxDistance] description = observe.config.longlineActivityPairing.maxDistance key = instance.longlineActivityPairing.maxDistance ===================================== client/configuration/src/main/i18n/getters/config.getter ===================================== @@ -153,6 +153,7 @@ observe.config.ui.tree.node.disabled.color observe.config.ui.tree.node.empty.color observe.config.ui.tree.node.unloaded.color observe.config.ui.tree.node.unsaved.color +observe.config.useJvmKeyStore.description observe.config.validation.lengthWeightEnable observe.config.validation.speedEnable observe.config.validation.speedMaxValue ===================================== client/configuration/src/main/i18n/getters/java.getter ===================================== @@ -5,7 +5,9 @@ observe.runner.copy.default.map.file observe.runner.copy.default.report.file observe.runner.copy.default.swing.preferences.file observe.runner.copy.default.ui.file +observe.runner.copy.embedded.keystore.file observe.runner.loading.ui.configuration +observe.runner.use.embedded.keystore.file observe.ui.message.save.configuration observe.warning.nimbus.landf observe.warning.no.ui ===================================== client/configuration/src/main/java/fr/ird/observe/client/configuration/ClientConfig.java ===================================== @@ -430,6 +430,26 @@ public class ClientConfig extends GeneratedClientConfig implements TripMapConfig // 11 - export directory createDirectory(ClientConfigOption.EXPORT_DIRECTORY); + + // 12 - Add custom keystore (See https://gitlab.com/ultreiaio/ird-observe/-/issues/2791) + + Path keystore = resourcesDirectory.toPath().resolve("observe.jks"); + if (Files.notExists(keystore)) { + String message = t("observe.runner.copy.embedded.keystore.file", keystore); + log.info(message); + ClientResources.KEYSTORE.copyResource(keystore.toFile()); + } + + if (!isUseJvmKeyStore()) { + String message = t("observe.runner.use.embedded.keystore.file", keystore); + log.info(message); + System.setProperty("javax.net.ssl.trustStore", keystore.toString()); + System.setProperty("javax.net.ssl.trustStorePassword", "changeit"); + } else { + System.clearProperty("javax.net.ssl.trustStore"); + System.clearProperty("javax.net.ssl.trustStorePassword"); + } + } public void detectLocalDataBase() { ===================================== client/configuration/src/main/java/fr/ird/observe/client/configuration/ClientResources.java ===================================== @@ -42,4 +42,5 @@ public final class ClientResources { public static final ConfigResource LOG_CONFIGURATION_FILE = new ConfigResource("/observe-log4j2.xml"); public static final ConfigResource DCP_PRESETS = new ConfigResource("/dcp-presets.zip"); public static final ConfigResource mapLayers = new ConfigResource("/map.zip"); + public static final ConfigResource KEYSTORE = new ConfigResource("/observe.jks"); } ===================================== client/configuration/src/main/resources/observe.jks ===================================== Binary files /dev/null and b/client/configuration/src/main/resources/observe.jks differ ===================================== client/core/src/main/java/fr/ird/observe/client/datasource/h2/backup/BackupsManager.java ===================================== @@ -23,6 +23,7 @@ package fr.ird.observe.client.datasource.h2.backup; */ import com.google.gson.Gson; +import com.google.gson.GsonBuilder; import com.google.gson.reflect.TypeToken; import fr.ird.observe.client.configuration.ClientConfig; import fr.ird.observe.client.datasource.api.ObserveDataSourcesManager; @@ -30,10 +31,10 @@ import fr.ird.observe.client.datasource.api.ObserveSwingDataSource; import fr.ird.observe.client.datasource.api.event.ObserveSwingDataSourceEvent; import fr.ird.observe.client.datasource.api.event.ObserveSwingDataSourceListenerAdapter; import fr.ird.observe.client.util.ObserveSwingTechnicalException; -import io.ultreia.java4all.lang.Strings; +import io.ultreia.java4all.util.json.adapters.DateAdapter; +import io.ultreia.java4all.util.sql.SqlScript; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import io.ultreia.java4all.util.sql.SqlScript; import java.io.BufferedReader; import java.io.BufferedWriter; @@ -41,12 +42,8 @@ import java.io.Closeable; import java.io.IOException; import java.lang.reflect.Type; import java.nio.charset.StandardCharsets; -import java.nio.file.FileVisitResult; import java.nio.file.Files; import java.nio.file.Path; -import java.nio.file.SimpleFileVisitor; -import java.nio.file.attribute.BasicFileAttributes; -import java.util.ArrayList; import java.util.Comparator; import java.util.Date; import java.util.Iterator; @@ -69,11 +66,11 @@ public class BackupsManager implements Closeable { private static final Pattern AUTOMATIC_BACKUP_FILENAME_PATTERN = Pattern.compile("obs.+-([0-9-]+)\\.sql\\.gz"); - private final Path backupsPath; private final ObserveDataSourcesManager dataSourcesManager; private final Path storePath; private final List<BackupStorage> backups; private final BlockingDeque<BackupStorage> backupsToCheck = new LinkedBlockingDeque<>(); + private final Gson gson; private boolean run = true; private final Thread checkBackups = new Thread("Check-Backups") { @Override @@ -121,16 +118,21 @@ public class BackupsManager implements Closeable { public BackupsManager(ClientConfig config, ObserveDataSourcesManager dataSourcesManager) { this.storePath = config.getBackupsFile().toPath(); - this.backupsPath = config.getBackupDirectory().toPath(); this.dataSourcesManager = dataSourcesManager; - + this.gson = new GsonBuilder().registerTypeAdapter(Date.class, new DateAdapter()).create(); try { List<BackupStorage> backups; if (config.isBackupUse() && Files.exists(storePath)) { try (BufferedReader reader = Files.newBufferedReader(storePath, StandardCharsets.UTF_8)) { Type typeOfT = new TypeToken<List<BackupStorage>>() { }.getType(); - backups = new Gson().fromJson(reader, typeOfT); + + try { + backups = gson.fromJson(reader, typeOfT); + } catch (Exception e) { + log.error(String.format("Could not load %s file.", storePath), e); + backups = new LinkedList<>(); + } log.info(String.format("Loaded %d backups from %s", backups.size(), storePath)); } } else { @@ -160,36 +162,10 @@ public class BackupsManager implements Closeable { } } - private List<BackupStorage> discoverAutomaticBackups(Path backupsPath) throws IOException { - List<BackupStorage> backups = new ArrayList<>(); - Files.walkFileTree(backupsPath, new SimpleFileVisitor<>() { - @Override - public FileVisitResult visitFile(Path file, BasicFileAttributes attrs) throws IOException { - Matcher matcher = AUTOMATIC_BACKUP_FILENAME_PATTERN.matcher(file.toFile().getName()); - if (matcher.matches()) { - BackupStorage backupStorage = new BackupStorage(); - backupStorage.setDate(new Date(Files.getLastModifiedTime(file).toMillis())); - backupStorage.setFile(file.toFile()); - backupStorage.setAutomatic(true); - backupStorage.setVerified(false); - backupStorage.setName(matcher.group(1)); - backups.add(backupStorage); - } - return FileVisitResult.CONTINUE; - } - }); - log.info(String.format("Discovered %d automatic backups from %s", backups.size(), backupsPath)); - return backups; - } - public List<BackupStorage> getAutomaticBackups() { return backups.stream().filter(BackupStorage::isAutomatic).sorted(Comparator.comparing(BackupStorage::getDate).reversed()).collect(Collectors.toList()); } - public List<BackupStorage> getUserBackups() { - return backups.stream().filter(BackupStorage::isUser).sorted(Comparator.comparing(BackupStorage::getDate).reversed()).collect(Collectors.toList()); - } - public void addAutomaticBackup(Path backupPath) { Matcher matcher = AUTOMATIC_BACKUP_FILENAME_PATTERN.matcher(backupPath.toFile().getName()); if (!matcher.matches()) { @@ -204,21 +180,6 @@ public class BackupsManager implements Closeable { backupsToCheck.add(backupStorage); } - public void addUserBackup(Path backupPath) { - BackupStorage backupStorage = new BackupStorage(); - backupStorage.setDate(new Date()); - backupStorage.setFile(backupPath.toFile()); - backupStorage.setAutomatic(false); - backupStorage.setVerified(false); - String name = Strings.removeEnd(backupPath.toFile().getName(), ".sql.gz"); - backupStorage.setName(name); - backupsToCheck.add(backupStorage); - } - - public void sanityBackups() { - log.info("Sanity backups at " + backupsPath); - } - @Override public void close() { @@ -239,7 +200,7 @@ public class BackupsManager implements Closeable { private void storeBackups() throws IOException { log.info(String.format("Store %d backups to %s", backups.size(), storePath)); try (BufferedWriter writer = Files.newBufferedWriter(storePath, StandardCharsets.UTF_8)) { - new Gson().toJson(backups, writer); + gson.toJson(backups, writer); } } ===================================== client/core/src/main/java/fr/ird/observe/client/main/body/ClientConfigUI.java ===================================== @@ -406,6 +406,7 @@ public class ClientConfigUI extends JXTitledPanel implements WithClientUIContext helper.addOption(ClientConfigOption.AVDTH_FORCE_IMPORT); helper.addOption(ClientConfigOption.SHOW_SQL); + helper.addOption(ClientConfigOption.USE_JVM_KEY_STORE); } ===================================== client/runner/src/main/i18n/translations/client-runner_en_GB.properties ===================================== @@ -170,6 +170,7 @@ observe.config.ui.tree.node.disabled.color=Color for disabled node observe.config.ui.tree.node.empty.color=Color for empty node observe.config.ui.tree.node.unloaded.color=Color for unloaded node observe.config.ui.tree.node.unsaved.color=Color for unsaved node +observe.config.useJvmKeyStore.description=To use the Java «keystore», otherwise will use the embedded «keystore» (located at resources-xxx/observe.jks). observe.config.validation.lengthWeightEnable=Force validation of species length max observe.config.validation.speedEnable=Force validation of activities speed observe.config.validation.speedMaxValue=Max speed value used in activities speed validation @@ -283,6 +284,7 @@ observe.runner.copy.default.map.file=Création des cartes %1$s. observe.runner.copy.default.report.file=Création du fichier de reports %1$s. observe.runner.copy.default.swing.preferences.file=Création du fichier de préférence Swing %1$s. observe.runner.copy.default.ui.file=Création du fichier de cosmétique %1$s. +observe.runner.copy.embedded.keystore.file=Copy embedded keystore (%s). observe.runner.i18n.loaded=Service de traduction chargé dans la langue %1$s. observe.runner.init=Initialisation d'ObServe %1$s %2$s observe.runner.initStorage.choice.createLocalStorage=Create local storage @@ -305,6 +307,7 @@ observe.runner.quit.without.ui=Close application without opening ui observe.runner.start=Start ObServe %1$s %2$s observe.runner.title.error.dialog=An error occurs\! observe.runner.ui.loaded=Graphical interface is ready. +observe.runner.use.embedded.keystore.file=Use embedded keystore (%s). observe.runner.user.directories.loaded=User directory is ready (%1$s). observe.security.role=Role observe.security.role.administrator=Owner of database ===================================== client/runner/src/main/i18n/translations/client-runner_es_ES.properties ===================================== @@ -170,6 +170,7 @@ observe.config.ui.tree.node.disabled.color=Color for disabled node observe.config.ui.tree.node.empty.color=Color for empty node observe.config.ui.tree.node.unloaded.color=Color for unloaded node observe.config.ui.tree.node.unsaved.color=Color for unsaved node +observe.config.useJvmKeyStore.description=To use the Java «keystore», otherwise will use the embedded «keystore» (located at resources-xxx/observe.jks). \#TODO observe.config.validation.lengthWeightEnable=Forzar la validación de la talla de especies min/max observe.config.validation.speedEnable=Forzar la validación de las velocidades de las actividades observe.config.validation.speedMaxValue=Velocidad máxima autorizada en el control de las velocidades de las actividades @@ -283,6 +284,7 @@ observe.runner.copy.default.map.file=Creación de los mapas %1$s. observe.runner.copy.default.report.file=Creación del archivo de informes %1$s. observe.runner.copy.default.swing.preferences.file=Création du fichier de préférence Swing %1$s. observe.runner.copy.default.ui.file=Creación del archivo de cosmético %1$s. +observe.runner.copy.embedded.keystore.file=Copy embedded keystore (%s). \#TODO observe.runner.i18n.loaded=Servicio de traducción cargado en el idioma %1$s. observe.runner.init=Inicialización de ObServe %1$s %2$s observe.runner.initStorage.choice.createLocalStorage=Crear la base local @@ -305,6 +307,7 @@ observe.runner.quit.without.ui=Cierre de la aplicación sin abrir la interfaz gr observe.runner.start=Inicio de ObServe %1$s %2$s observe.runner.title.error.dialog=Un error se ha producido\! observe.runner.ui.loaded=Finalizada la inicialización de la interfaz gráfica +observe.runner.use.embedded.keystore.file=Use embedded keystore (%s). \#TODO observe.runner.user.directories.loaded=Se ha inicializado el directorio del usuario (%1$s). observe.security.role=Rol observe.security.role.administrator=Propietario de la base ===================================== client/runner/src/main/i18n/translations/client-runner_fr_FR.properties ===================================== @@ -170,6 +170,7 @@ observe.config.ui.tree.node.disabled.color=Couleur pour un nœud désactivé observe.config.ui.tree.node.empty.color=Couleur pour un nœud vide observe.config.ui.tree.node.unloaded.color=Couleur pour un nœud non chargé observe.config.ui.tree.node.unsaved.color=Couleur pour un nœud non persisté +observe.config.useJvmKeyStore.description=Pour utiliser le «keystore» fourni par Java, sinon pour utiliser le keystore fourni par l'application (localisé ici \: resources-xxx/observe.jks). observe.config.validation.lengthWeightEnable=Forcer la validation des bornes min/max de taille d'espèce observe.config.validation.speedEnable=Forcer la validation des vitesses d'activités observe.config.validation.speedMaxValue=Vitesse maximale autorisée dans le contrôle des vitesses d'activités @@ -283,6 +284,7 @@ observe.runner.copy.default.map.file=Création des cartes %1$s. observe.runner.copy.default.report.file=Création du fichier de reports %1$s. observe.runner.copy.default.swing.preferences.file=Création du fichier de préférence Swing %1$s. observe.runner.copy.default.ui.file=Création du fichier de cosmétique %1$s. +observe.runner.copy.embedded.keystore.file=Recopie du «keystore» embarqué par l'application (%s). observe.runner.i18n.loaded=Service de traduction chargé dans la langue %1$s. observe.runner.init=Initialisation d'ObServe %1$s %2$s observe.runner.initStorage.choice.createLocalStorage=Créer la base locale @@ -305,6 +307,7 @@ observe.runner.quit.without.ui=Fermeture de l'application sans ouvrir l'interfac observe.runner.start=Démarrage d'ObServe %1$s %2$s observe.runner.title.error.dialog=Une erreur est survenue\! observe.runner.ui.loaded=Initialisation de l'interface graphique terminée. +observe.runner.use.embedded.keystore.file=Utilisation du «keystore» embarqué (%s). observe.runner.user.directories.loaded=Le répertoire utilisateur a été initialisé (%1$s). observe.security.role=Rôle observe.security.role.administrator=Propriétaire de la base View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/c3e2e386a47721ccc624fc3a… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/c3e2e386a47721ccc624fc3a… You're receiving this email because of your account on gitlab.com.

1 0