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

[Git][ultreiaio/ird-observe] Pushed new tag v8.0.1
by Tony CHEMIT 14 Dec '20

14 Dec '20

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

1 0

[Git][ultreiaio/ird-observe][master] 327 commits: [jgitflow-maven-plugin]updating poms for 8.0.1-SNAPSHOT development[skip ci]
by Tony CHEMIT 14 Dec '20

14 Dec '20

Tony CHEMIT pushed to branch master at ultreiaio / ird-observe Commits: f9ea4bf6 by Tony Chemit at 2020-08-10T14:11:33+02:00 [jgitflow-maven-plugin]updating poms for 8.0.1-SNAPSHOT development[skip ci] - - - - - a7a7647c by Tony Chemit at 2020-08-10T14:19:04+02:00 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts[skip ci] - - - - - 3d56bf7d by Tony Chemit at 2020-08-10T14:19:05+02:00 [jgitflow-maven-plugin]merging 'master' into 'develop' - - - - - 1671f0d9 by Tony Chemit at 2020-08-10T14:19:05+02:00 [jgitflow-maven-plugin]Updating develop poms back to pre merge state[skip ci] - - - - - be45eb6d by Tony Chemit at 2020-08-14T12:02:33+02:00 Gestion du versionning des marées - See #1512 * Improve TopiaApplicationContext * Introduce UpdateEntityScript object and implements it for main data entity - - - - - 6b592da8 by Tony Chemit at 2020-08-14T12:28:45+02:00 Gestion du versionning des marées - Closes #1512 * Improve save API in services (but need to be better...) - - - - - df94f73b by Tony Chemit at 2020-08-14T12:28:53+02:00 Add Fixme - - - - - 9e4cd83f by Tony Chemit at 2020-08-14T15:07:17+02:00 Make Entity JavaBean :) - - - - - 1c2d492a by Tony Chemit at 2020-08-14T15:36:36+02:00 Improve service delete method (now just two methods) - - - - - 25e4e895 by Tony Chemit at 2020-08-14T15:55:29+02:00 Add test to be sure java bean are loaded on entities. - - - - - 03be6fe8 by Tony Chemit at 2020-08-14T16:01:07+02:00 optimize dependencies - - - - - a6757019 by Tony Chemit at 2020-08-15T12:19:54+02:00 Improve javaBean on entities (let's generate everything \o/) - - - - - 0350df7e by Tony Chemit at 2020-08-16T15:49:33+02:00 Stash with a lots of improvements to be continued - - - - - 0315ab30 by Tony Chemit at 2020-08-16T17:59:08+02:00 Impossible d'enregister une caléee ll observation - Closes #1588 - - - - - 8deb907a by Tony Chemit at 2020-08-16T18:39:59+02:00 Impossible ouverture LL observation captures - Closes #1589 - - - - - 7f7f1802 by Tony Chemit at 2020-08-17T15:43:02+02:00 Improve DeleteSqlScriptProducerRequest builder API - - - - - 75b2792a by Tony Chemit at 2020-08-17T17:27:23+02:00 * Generate lastUpdateDate sql scripts * Use last topia extension API * Improve persistence API - - - - - cb1085bd by Tony Chemit at 2020-08-17T17:58:12+02:00 * Remove dbName tag value from persistence model, since in v8 entity names are db table names - - - - - 38e6fa93 by Tony Chemit at 2020-08-17T18:13:51+02:00 * Remove reverseDbName tag value from persistence model, since in v8 entity names are db table names - - - - - ef9da7b2 by Tony Chemit at 2020-08-17T18:41:28+02:00 * Remove manyToManyTableName tag value from persistence model, since in v8 entity names are db table names - - - - - 6ed074a4 by Tony Chemit at 2020-08-18T14:59:15+02:00 Move to version 8.1.0 (we will change the db model) - - - - - 232e2a9b by Tony Chemit at 2020-08-18T16:07:28+02:00 Remplacer le moteur de scripting utilisé - Closes #1532 Cela engendre une migration de données (pour remplacer length() par length dans le javascript en base) - - - - - 3fa15cee by Tony Chemit at 2020-08-18T16:07:31+02:00 Make FloatingObjectPreset compaliant with last yamlbean API - - - - - 448d68c4 by Tony Chemit at 2020-08-18T16:50:59+02:00 Make Server beans compaliant with last yamlbean API and simplify them to death... - - - - - 6edc1899 by Tony Chemit at 2020-09-02T20:11:47+02:00 Make some updates for webmotion and others - - - - - 365166b5 by Tony Chemit at 2020-09-02T20:11:49+02:00 [Référentiel] Corriger un nom de champ - Closes #495 - - - - - 077c5324 by Tony Chemit at 2020-09-02T20:11:49+02:00 update pom - - - - - f947fc29 by Tony Chemit at 2020-09-02T20:11:49+02:00 Auto-chargement des rôles pour les utilisateurs de la base ciblées dans les assistants de création/mise à jour - Closes #1592 - - - - - 38ad117c by Tony Chemit at 2020-09-29T15:03:15+02:00 Auto-chargement des rôles pour les utilisateurs de la base ciblées dans les assistants de création/mise à jour - Closes #1592 plus un peu de ménage sur ce très vieux code - - - - - b3108e16 by Tony Chemit at 2020-09-29T15:06:58+02:00 Generate getXXXSize method instead of sizeXXX ones + add isNotXXXEmpty Update pom - - - - - 251b0f3c by Tony Chemit at 2020-09-29T15:07:05+02:00 remove unused contract on model - - - - - ac2e7f53 by Tony Chemit at 2020-09-29T15:07:17+02:00 Add nice stream method - - - - - 3b617c23 by Tony Chemit at 2020-09-29T15:07:24+02:00 Make more validators skipable - - - - - ea151c2d by Tony Chemit at 2020-09-29T15:07:29+02:00 Make plugin more quiet - - - - - c7a2a793 by Tony Chemit at 2020-09-29T15:07:35+02:00 Introduce DtoPropertyModification (maybe should be in java-bean project ?) - - - - - 9f47c243 by Tony Chemit at 2020-09-29T15:07:40+02:00 Make tests from more recent databases - - - - - 8285cd11 by Tony Chemit at 2020-09-29T15:07:44+02:00 Improve SPI API (remove type in toDto and toReference methods) - - - - - 3f12e383 by Tony Chemit at 2020-09-29T15:13:12+02:00 Let's move stuff from services to common-dto, common-service or dto : in services module just services declaration with no logic. - - - - - acc178e2 by Tony Chemit at 2020-09-29T15:14:06+02:00 La reprise sur erreur en mode serveur doit être revue - Closes #1596 - - - - - cb205f52 by Tony Chemit at 2020-09-29T15:14:58+02:00 Move module services to services-api - - - - - 13e44e85 by Tony Chemit at 2020-09-29T15:26:20+02:00 Let's move stuff from services to common-dto, common-service or dto : in services module just services declaration with no logic. (fix) - - - - - 20404f50 by Tony Chemit at 2020-09-29T17:20:11+02:00 Realign from v9 - - - - - 9da5e89c by Tony Chemit at 2020-09-29T17:21:07+02:00 clean pom - - - - - 57280fce by Tony Chemit at 2020-09-29T17:21:13+02:00 increase apply security web service timeout (can be more than one minute) and realign the migrateData to same value (100 minutes instead of one thousand...) - - - - - bd015d6f by Tony Chemit at 2020-09-29T17:23:57+02:00 Use new topia extension API - - - - - bded0033 by Tony Chemit at 2020-09-29T17:24:05+02:00 Review server timeout management (was pretty lame : bad unit and default timeout always applied after request specialized values :() - Now everything is back to normal. - - - - - a3ac1120 by Tony Chemit at 2020-09-29T17:24:11+02:00 Remove unused service method - - - - - 01d20f68 by Tony Chemit at 2020-09-29T17:24:16+02:00 Add new tip on install doc - - - - - 99b4a6fd by Tony Chemit at 2020-09-29T17:24:20+02:00 If contentUI can not be opened, avoid a silly NPE - - - - - 2019f7e1 by Tony Chemit at 2020-09-29T17:24:24+02:00 Let's display any bad exceptions (if any can be good :)) - - - - - 81da39db by Tony Chemit at 2020-09-29T17:24:28+02:00 Rename i18n keys - - - - - 2269d636 by Tony Chemit at 2020-09-29T17:24:51+02:00 Clean at last entities user code (very oldish style...) - - - - - a0d13bca by Tony Chemit at 2020-09-29T17:31:18+02:00 Use last jaxx widgets API - - - - - 0a980717 by Tony Chemit at 2020-09-29T17:31:23+02:00 Make TripMap APi neutral and let's put domain style file where it belongs - - - - - e28a4116 by Tony Chemit at 2020-09-29T17:31:29+02:00 Fix some closing issues - - - - - da9eb8b5 by Tony Chemit at 2020-09-29T17:33:32+02:00 Fix veto actions on trips - - - - - 74b5029a by Tony Chemit at 2020-09-29T17:34:41+02:00 More review on TripMap API - - - - - 528809fa by Tony Chemit at 2020-09-29T18:22:20+02:00 * Amélioration du nommage des SelectNode et utilisation des nœuds pour le modèle PS Logbook * Mis en commun du code de gestion des flux disponibles sur les marées * Mise en place des gardes fous de création de flux non disponibles sur le modèle PS - - - - - b5ff51a9 by Tony Chemit at 2020-09-29T18:23:40+02:00 Readd missing i18n keys while moving classes from modules... - - - - - 5ea45179 by Tony Chemit at 2020-09-29T18:24:02+02:00 update pom - - - - - de13e1ac by Tony Chemit at 2020-09-29T18:24:12+02:00 Have a new case to deal with (collection of data references) - - - - - 0d41d997 by Tony Chemit at 2020-09-29T18:24:25+02:00 Deal with relation nm of data references - - - - - 1b69a616 by Tony Chemit at 2020-09-29T18:25:14+02:00 Let's clone nuiton-validator to fix it (no time to create a new project now...) - - - - - afd2850e by Tony Chemit at 2020-09-29T18:25:21+02:00 Nuiton-Validator : Fix ValidatorComparator (was based on simple name... need fully qualified name to deal with synonyms) - - - - - 9ef1212f by Tony Chemit at 2020-09-29T18:26:49+02:00 Open reference cache for data - - - - - c236c6e8 by Tony Chemit at 2020-09-29T18:27:01+02:00 Fix how to save a entity list from a reference list (a first one here...) - - - - - 1bc325f6 by Tony Chemit at 2020-09-29T18:27:19+02:00 Lors de l'ouverture de l'application, si la base locale est déjà occupée par une autre application, message erroné - Closes #1598 - - - - - 4fa0553c by Tony Chemit at 2020-09-29T18:28:30+02:00 Use the natural order of attributes declaration to generate the form definition, in ordre to have a deterministic order (some filters may need other ones) - - - - - ee595065 by Tony Chemit at 2020-09-29T19:40:24+02:00 Realign code to version 8 (maven 8.0.1-SNAPSHOT) (model 8.0) - - - - - adc4972e by Tony Chemit at 2020-09-29T19:42:31+02:00 fix ci jobs - - - - - dcbd6522 by Tony Chemit at 2020-09-29T19:44:17+02:00 fix computation of showData on ContentTableUIModel - - - - - 59b79983 by Tony Chemit at 2020-09-29T19:44:52+02:00 template better generate on none main dto - - - - - a31872d6 by Tony Chemit at 2020-09-29T19:44:56+02:00 change one maven module order - - - - - 12245930 by Tony Chemit at 2020-09-29T19:45:01+02:00 avoid nasty swing NPE - - - - - b352de85 by Tony Chemit at 2020-09-29T19:45:30+02:00 Ajouter un nouveau bouton sur le formulaire d'une ligne sélectionnée dans un écran de type table créer/enregister ET nouveau - Closes #1613 - - - - - 4b44fc8b by Tony Chemit at 2020-09-29T19:58:47+02:00 Stash on ListCreate action - - - - - 94fb62b7 by Tony Chemit at 2020-09-29T20:05:41+02:00 Nouveau texte de popup pour le cas 'Vous devez mettre à jour le form marée avant de pouvoir saisir le livre de bord' - See #1605 - - - - - 6ceff472 by Tony Chemit at 2020-09-30T08:56:49+02:00 Review DtoEntityContext and add on it TopiaEntitySqlDescriptor - - - - - 54c8bfaf by Tony Chemit at 2020-09-30T08:57:07+02:00 Move ObserveTopiaConfigurationFactory and ObserveTopiaApplicationContextFactory to his native module (nothing to do with services-local, persistence is the proper place to be (or common-persistence))... - - - - - 198186f3 by Tony Chemit at 2020-09-30T08:57:14+02:00 update pom - - - - - f22a12e9 by Tony Chemit at 2020-10-01T14:17:54+02:00 Merge back from v8.1.0. Need serious tests - - - - - aa472017 by Tony Chemit at 2020-10-01T14:17:54+02:00 Move back to develop - - - - - f9ecef15 by Tony Chemit at 2020-10-01T16:28:03+02:00 Optimisation de la migration 8.0 - Closes #1623 - - - - - 33d9fc7d by Tony Chemit at 2020-10-01T16:28:03+02:00 Figer tous les lastUpdate et topiaCreateDate dans les scripts de migration - See #1593 On pose au 1er octobre 2020 pour la v8.0 (See also #1623) - - - - - 223f1d1b by Tony Chemit at 2020-10-03T18:10:58+02:00 Introduce, generate and use BusinessProject API. This replace hardcoded types lists (that you should update when adding new dto types :)) This must be finished by replacing old DtoModelHelper by the new brand generated BusinessProject with just method to get some types mapping, so no more usage of an application component (this will simplify a lots of things). Stash/stash - - - - - 366e6b1f by Tony Chemit at 2020-10-04T09:35:27+02:00 Remove unused API (replaced by BusinessProject API) - - - - - 64426cb5 by Tony Chemit at 2020-10-04T13:32:36+02:00 Review maven modules layout : * one module for tests * one module for models * one module for services * one module for client * one module for server - - - - - 59fe52a4 by Tony Chemit at 2020-10-05T16:33:31+02:00 Remove DtoModelHelper and improve BusinessProject to replace it. Still need to do the same on persistence module - - - - - 20bb7764 by Tony Chemit at 2020-10-05T21:08:59+02:00 Remove Generics on DtoReference API (so lighter :)) Now we should make a last pass, since since some different ways of mapping dto and references... we should uniformize this. - - - - - f3d6030a by Tony Chemit at 2020-10-06T11:29:48+02:00 Review Persistence SPI API (No more DbModelHelper, replaced by PersistenceBusinessProject - - - - - 47338f88 by Tony Chemit at 2020-10-06T11:43:25+02:00 Fix template - - - - - bbd49a0d by Tony Chemit at 2020-10-06T13:10:32+02:00 Review maven module layout extreme! but keep same logic everywhere. - - - - - 6d9202de by Tony Chemit at 2020-10-06T13:31:33+02:00 Missing disabled programs in selection tree - - - - - 669278c9 by Tony Chemit at 2020-10-06T13:31:46+02:00 oups this file should not be persisted - - - - - 467d7ed1 by Tony Chemit at 2020-10-06T14:58:50+02:00 Make public BusinessProject API - - - - - 395919ea by Tony Chemit at 2020-10-06T15:02:27+02:00 Clean server-i18n bundle - - - - - bdc9cf22 by Tony Chemit at 2020-10-06T15:08:42+02:00 Realign i18n on ui tree before generating everything :) - - - - - 71aad4d9 by Tony Chemit at 2020-10-06T18:26:43+02:00 Review tree api layout (prepare for new ui generation)... - - - - - 43da725c by Tony Chemit at 2020-10-09T17:16:15+02:00 Use last stable of jaxx - - - - - af0065c9 by Tony Chemit at 2020-10-09T17:16:15+02:00 First pass of generating ui i18n keys - - - - - 972120ec by Tony Chemit at 2020-10-12T21:06:38+02:00 Add nice method to avoid java generic erasure :) - - - - - 541c8229 by Tony Chemit at 2020-10-13T02:38:44+02:00 On ne demande plus de créer la base locale au démarrage si elle n'existe pas. - - - - - ce2bdda3 by Tony Chemit at 2020-10-13T03:06:40+02:00 Les mesures d'équipements ne sont pas enregistrées tant que le formulaire globale ne l'est pas! - - - - - a4e36e6f by Tony Chemit at 2020-10-13T03:08:16+02:00 Nettoyage sur les paramètres et noms dans méthodes dans les services - - - - - 6a25fc37 by Tony Chemit at 2020-10-13T03:13:04+02:00 Réusinage des actions, encore des tests à faire... - - - - - ed8ae8d8 by Tony Chemit at 2020-10-13T16:40:35+02:00 Add new method to exclude on reference - - - - - 1055b243 by Tony Chemit at 2020-10-13T16:41:01+02:00 Add missing constant property - - - - - 3d54436b by Tony Chemit at 2020-10-14T16:36:03+02:00 Association parent can also be on a referential (See Trip for example) - - - - - ad738471 by Tony Chemit at 2020-10-14T16:36:54+02:00 Improve DtoReferenceCollection API - - - - - 88369353 by Tony Chemit at 2020-10-14T16:38:25+02:00 Introduce TripAwareTopiaDao contract and improve TripAware API to mutualise code (sse next commit) - - - - - 5134accb by Tony Chemit at 2020-10-14T18:47:02+02:00 update pom - - - - - f9152ef3 by Tony Chemit at 2020-10-14T19:04:46+02:00 Introduce OpenableDataService, save us a lots of code for the future and also normalize service method names. Should declare to or three more such services to avoid any boilerplate code :) - - - - - b1f787b0 by Tony Chemit at 2020-10-16T14:55:42+02:00 Improve ProjectPackagesDefinition API (now just a simple bean loaded from a properties file) → This makes us free to remove one module: modesl-dto-psi Move to toolkit-dto SimpleDto and common type translators Introduce new WithDataFile API (to have a common code for this) Introduce new data service contracts (now any data service inherits from one of them) Implements data service local and reduce all the service local at the very strict minimum (only specific code!!!) - - - - - b985f0e5 by Tony Chemit at 2020-10-16T14:57:00+02:00 Review Move API Introduce common WithDataFile actions - - - - - 66d4b8b6 by Tony Chemit at 2020-10-16T15:50:48+02:00 Remove as done for dto, models-persistence-spi maven module :) - - - - - 5b097333 by Tony Chemit at 2020-10-16T16:31:36+02:00 Still some code to remove from services-local - - - - - 579d46e8 by Tony Chemit at 2020-10-16T21:14:10+02:00 Introduce SaveExecutor to get some nice save actions without having to write a full class. Now just do a Save.installAction with good parameters :) - - - - - 310a8577 by Tony Chemit at 2020-10-17T16:34:01+02:00 Introduce Service SPI and now let's generate most of data services (this means developer has only to write specific method and only them)! - - - - - a6966b69 by Tony Chemit at 2020-10-18T20:35:59+02:00 Improve ContentUI actions (using new Service SPI)) - - - - - c04cc31f by Tony Chemit at 2020-10-20T01:15:15+02:00 stash - - - - - 4f7d6c87 by Tony Chemit at 2020-10-21T15:34:45+02:00 Introduce NavigationScope and his friend to have only one way to get Navigation and ContentUI metadata! - - - - - dc6747db by Tony Chemit at 2020-10-29T12:06:33+01:00 Review client datasource editor layout (more and more stuff generated in ui) - - - - - ba03132f by Tony Chemit at 2020-10-30T20:53:34+01:00 Continue storm on ui - - - - - 86de5d9c by Tony Chemit at 2020-10-31T21:17:42+01:00 Introduce new spi module to put to the spi stuff used to generate so much things. - - - - - 22153a67 by Tony Chemit at 2020-11-01T12:07:27+01:00 update changelog for version 7.7.0 - - - - - 0283f885 by Tony Chemit at 2020-11-01T14:39:27+01:00 Fix MigrateTestsDatabases script (test module has been moved to tests directory) - - - - - 8f09eca5 by Tony Chemit at 2020-11-03T10:46:32+01:00 [LL][Logbooks] table ll_landing.datasource à compléter - Closes #1627 [LL][Logbookd] Renommer table compagnies - Closes #1628 [LL][Logbooks] Ajout d'un champ - Closes #1629 [LL][Logbook] landingpart.landing devrait être une FK - Closes #1632 [LL][Logbook] ll_landing.landingpart contient 3 champs certainement en trop - Closes #1633 - - - - - d220aa6d by Tony Chemit at 2020-11-03T10:46:32+01:00 Manque le champ lightsticksperbasket - Closes #1626 - - - - - 0232c04c by Tony Chemit at 2020-11-03T10:46:32+01:00 Optimisation de la migration 8.0 - Closes #1623 - - - - - d82447e7 by Tony Chemit at 2020-11-03T10:46:32+01:00 Normalisation des modèles de navigation pour pouvoir les générer. - - - - - 6a28e8bb by Tony Chemit at 2020-11-07T01:35:15+01:00 Generate edit and select model :) - - - - - f840c55b by Tony Chemit at 2020-11-07T01:35:15+01:00 [LL][Observations] Horodatage hook timers par défaut - Closes #1625 - - - - - a8ff1cb9 by Tony Chemit at 2020-11-07T01:35:15+01:00 update CHANGELOG [skip ci] - - - - - 4dc4aa7a by Tony Chemit at 2020-11-09T20:33:47+01:00 stash for i18n (presque fini!) - - - - - 7546af0e by Tony Chemit at 2020-11-10T23:05:31+01:00 Nouveau service sympa pour récupérer les références - - - - - 2354cf83 by Tony Chemit at 2020-11-10T23:19:38+01:00 Correction d'un problème de design sur le SPI.toReference : si on surcharge la méthode dans l'entité, alors cela n'était pas rpis en compte... - - - - - 404057a1 by Tony Chemit at 2020-11-10T23:19:55+01:00 Ajout paramètre force dans le plugin - - - - - 4925c3fc by Tony Chemit at 2020-11-10T23:20:52+01:00 Ajout méthode pour avoir la nouvelle disposition : module.[data|referential].subModule - - - - - 5f787f55 by Tony Chemit at 2020-11-10T23:21:34+01:00 Ajout méthode pour avoir la nouvelle disposition : module.[data|referential].subModule - - - - - 3e980804 by Tony Chemit at 2020-11-11T04:58:58+01:00 Nouvelle option de configuration pour activer le chargement automatique des nœuds - - - - - b7427cf0 by Tony Chemit at 2020-11-11T04:59:25+01:00 Ajout méthode pour avoir la nouvelle disposition : module.[data|referential].subModule - - - - - 44b3436c by Tony Chemit at 2020-11-11T11:53:10+01:00 Mise en place des scopes sur les ui Amélioration de l'arbre de navigation Début de mise en place de la navigation précédent-suivant - - - - - b5bf42f9 by Tony Chemit at 2020-11-12T03:08:14+01:00 methode plus facile pour changer une sélection - - - - - a25b87d8 by Tony Chemit at 2020-11-12T03:08:30+01:00 peaufinage de la génération - - - - - 0dc055c0 by Tony Chemit at 2020-11-12T04:26:51+01:00 fix edit scope - - - - - 79ed48e4 by Tony Chemit at 2020-11-16T18:01:19+01:00 Stash before testing - - - - - 2be70ece by Tony Chemit at 2020-11-17T18:38:37+01:00 Time to clean all old API (first step) - - - - - ce19197f by Tony Chemit at 2020-11-18T19:33:40+01:00 Move at last navigation model API to his dedicated package Time to clean all old API (second step) Review and clean scopes - - - - - 89058da9 by Tony Chemit at 2020-11-19T11:19:16+01:00 Add isDisabled method - - - - - c04d598c by Tony Chemit at 2020-11-19T19:16:18+01:00 Add parentService in scope and as much as reference types as possible Generate more methods in UIHandler Simplify some action api (need another round with full generation of action using generated api (fluent code)) - - - - - 42f7724e by Tony Chemit at 2020-11-19T19:16:43+01:00 Fix some content title - - - - - 1fd95a89 by Tony Chemit at 2020-11-20T01:19:19+01:00 update pom - - - - - 67351ee2 by Tony Chemit at 2020-11-20T01:19:56+01:00 Review validation context and generate a good part of it from project SelectModel - - - - - dc36c694 by Tony Chemit at 2020-11-21T12:07:28+01:00 Add sort method on DtoReferenceCollection - - - - - 18628634 by Tony Chemit at 2020-11-21T12:08:21+01:00 Improve ProgramReference comparator - - - - - 3eb39065 by Tony Chemit at 2020-11-21T13:13:17+01:00 Add magic method to avoid cast - - - - - 8f0cad7a by Tony Chemit at 2020-11-21T14:36:26+01:00 Add toArrayList method - - - - - d94bf290 by Tony Chemit at 2020-11-21T15:13:28+01:00 Clean code - - - - - e8d6a0e5 by Tony Chemit at 2020-11-21T15:14:15+01:00 Improve scope organisation, final states of it. - - - - - 25e4cd21 by Tony Chemit at 2020-11-21T15:15:08+01:00 Let's clean last more time the API, everything seems to be pretty clean. Need now to debug it and adjust from legacy code. - - - - - 9e7eb0de by Tony Chemit at 2020-11-21T23:43:53+01:00 Revue des permissions des services et génération dans le scope de navigation des permissions associées (fini les petits calculs à l'exécution pour savoir si on peut éditer un formulaire :)) - - - - - 5b26e7bb by Tony Chemit at 2020-11-22T17:16:30+01:00 Improve permission API - - - - - 8c4f888a by Tony Chemit at 2020-11-22T21:12:26+01:00 Review standalone ui and clean scopes - - - - - 7f63a236 by Tony Chemit at 2020-11-22T23:12:42+01:00 Change order of navigation actions - - - - - 55608d7b by Tony Chemit at 2020-11-23T00:54:17+01:00 Première revue des actions techniques - - - - - c998ffe6 by Tony Chemit at 2020-11-23T14:17:50+01:00 Should always see exception somewhere - - - - - f3b9c014 by Tony Chemit at 2020-11-23T17:28:44+01:00 Continue clean, use new Jaxx MenuAction API - - - - - 23cad004 by Tony Chemit at 2020-11-24T16:08:33+01:00 Improve accelerator - - - - - 1b9a4021 by Tony Chemit at 2020-11-24T16:10:36+01:00 Improve initializer toString (yet introduce RootUI) - - - - - 4862f2b6 by Tony Chemit at 2020-11-24T16:11:13+01:00 Review navigation actions and implements horizontal navigation - - - - - 0d8cf4ee by Tony Chemit at 2020-11-24T17:04:30+01:00 Use last jaxx - - - - - 7e025449 by Tony Chemit at 2020-11-25T11:19:54+01:00 use last pom - - - - - 81a89ead by Tony Chemit at 2020-11-25T11:21:08+01:00 Clean navigation actions and introduce ui properties files for editor api - - - - - a6cc0c27 by Tony Chemit at 2020-11-25T13:17:00+01:00 Fix goUp enabled property - - - - - c099cf22 by Tony Chemit at 2020-11-25T13:17:39+01:00 Better way to get ReloadAction and improve init - - - - - 5a0c0857 by Tony Chemit at 2020-11-25T13:44:02+01:00 Better code for ShowIdExecutor - - - - - 3630dba7 by Tony Chemit at 2020-11-25T15:42:28+01:00 Clean some generators plus review how to get select node from open ui (better pass by edit model) - - - - - bb68febe by Tony Chemit at 2020-11-25T15:43:04+01:00 Fix freemarker template (does not accept default method → need to change this poor template model) - - - - - 0f933029 by Tony Chemit at 2020-11-25T15:43:35+01:00 (from Possibilité de forcer le topiaid sur tous les écrans de création des référentiels - See #1328) Report on v8 - - - - - 1f2b3206 by Tony Chemit at 2020-11-25T20:23:36+01:00 Add new insert button (need more tests on it) - - - - - 22e87e5c by Tony Chemit at 2020-11-25T21:09:09+01:00 Fix model test which prove that something is wrong... - - - - - 105c2ea3 by Tony Chemit at 2020-11-26T15:53:54+01:00 Miss to set a dto contract for both dto and reference - - - - - f038df8c by Tony Chemit at 2020-11-26T16:12:26+01:00 Fix how to get interfaces (some where missing) - - - - - f3718ffc by Tony Chemit at 2020-11-26T18:21:50+01:00 Add test to be sure what is generated - - - - - e1ac9ed2 by Tony Chemit at 2020-11-26T20:03:39+01:00 Add strong type method and generate SPI in NavigationNode - - - - - a33d9ad1 by Tony Chemit at 2020-11-26T20:23:34+01:00 Fix findChildByType method - - - - - 884369b9 by Tony Chemit at 2020-11-26T22:59:50+01:00 Add insert popup and move move action to extra actions. - - - - - 13d4ef3d by Tony Chemit at 2020-11-27T14:15:53+01:00 Right now Trip on Seine always have observations availability + add javaBean on TripModel - - - - - 4e35c921 by Tony Chemit at 2020-11-27T14:47:27+01:00 Add ChangeMode action (now just one action to edit any form from anywhere!) - - - - - 067bd1d9 by Tony Chemit at 2020-11-28T09:45:54+01:00 Fix getChildPosition method - - - - - ceb8544a by Tony Chemit at 2020-11-28T09:46:15+01:00 No more newReference method on model - - - - - 83d2c4d6 by Tony Chemit at 2020-11-28T09:46:32+01:00 Fix i18n - - - - - 3a77a3c1 by Tony Chemit at 2020-11-28T10:33:15+01:00 Clean the way to save editable and openable forms - - - - - ca916e1c by Tony Chemit at 2020-11-28T10:33:55+01:00 Introduce ContentOpen API - - - - - 25d4f840 by Tony Chemit at 2020-11-28T12:41:48+01:00 Remove old configuration for node selection - - - - - 4041d7ac by Tony Chemit at 2020-11-29T01:04:19+01:00 Fix some bugs on Ps Set, - - - - - 125c36b3 by Tony Chemit at 2020-11-29T01:04:36+01:00 Use F3 to insert - - - - - 86b67b51 by Tony Chemit at 2020-11-29T01:55:16+01:00 Fix some bugs on Ps Set and DCP - - - - - 562a5864 by Tony Chemit at 2020-11-29T06:18:08+01:00 Fix how to select initial node - - - - - d887f89f by Tony Chemit at 2020-11-29T06:18:45+01:00 No extra loading on root node - - - - - f55bb645 by Tony Chemit at 2020-11-29T06:19:24+01:00 Save select model at each move - - - - - bbb8bd7a by Tony Chemit at 2020-11-29T06:19:46+01:00 Do not open node while loading child nodes - - - - - ae6d0455 by Tony Chemit at 2020-11-29T06:20:12+01:00 No need to do some init in handler - - - - - abeb2196 by Tony Chemit at 2020-11-29T06:20:29+01:00 Review some keyStrokes - - - - - aeeec2eb by Tony Chemit at 2020-11-29T06:20:57+01:00 continue debugging ui and improve ChangeMode action - - - - - 1e831a72 by Tony Chemit at 2020-11-29T06:59:29+01:00 Add missing validation on ShipOwner - - - - - 1a818f5a by Tony Chemit at 2020-11-29T06:59:42+01:00 Invert condition on saveRequest - - - - - cf7b7113 by Tony Chemit at 2020-11-29T07:51:17+01:00 Add reloadNodeDataToRoot method when need a full reload of all ancestors - - - - - 43eacd63 by Tony Chemit at 2020-11-29T07:51:35+01:00 Improve save action - - - - - 7e5ac4e3 by Tony Chemit at 2020-11-29T08:01:34+01:00 Review some service save action (can't modify data after a hibernate update) - - - - - cc7a06c0 by Tony Chemit at 2020-11-29T10:36:56+01:00 Fix how to get select node from content list - - - - - 5bedd5c0 by Tony Chemit at 2020-11-29T10:38:02+01:00 Can at last remove this dummy return (is parent was updated), since navigation tree can do all of this for use, plus we need to update all nodes up to root path (all lastupdate date are modified) - - - - - 94e0d06b by Tony Chemit at 2020-11-29T10:38:30+01:00 Add contract on ShipOwner plus missing license headers - - - - - c2c454e7 by Tony Chemit at 2020-11-29T10:38:44+01:00 Fix bad binding - - - - - fb3196bd by Tony Chemit at 2020-11-29T10:40:19+01:00 Lazy loading of GoPrevious and GoNext otherwise we could load the navigation tree if a specific node is not found... Better let use do this! - - - - - a69bcb82 by Tony Chemit at 2020-11-29T10:42:15+01:00 Continue debug of ContentUI, now all forms are quite ok - - - - - a3c7ded3 by Tony Chemit at 2020-11-29T11:24:15+01:00 Fix edit node renderer on top node - - - - - 1dbfa66e by Tony Chemit at 2020-11-30T02:56:11+01:00 Improve some toolkit API - - - - - 1c128f4a by Tony Chemit at 2020-11-30T02:57:21+01:00 Add FIXME - - - - - 79e82219 by Tony Chemit at 2020-11-30T03:02:11+01:00 Last Service API and implementation cleaning. Now no extra code in services, use persistence layer. Fix some error also in entity model :( (thanks to bavencoff) - - - - - 20c08eed by Tony Chemit at 2020-11-30T13:04:05+01:00 Fix at last delete longline trip: from 1.30 minutes to 25 secondes - - - - - e5cbda8e by Tony Chemit at 2020-11-30T13:09:06+01:00 Introduce DtoParentAware and use it to improve longline branchline API. Fix very weird Basket.set and Section.set attributes - - - - - 33152ada by Tony Chemit at 2020-11-30T13:21:05+01:00 Revert optimized (but still dangerous code) on persistence - - - - - c41e99b4 by Tony Chemit at 2020-11-30T15:50:15+01:00 Remove so bad fields in model (see LL-Section) - - - - - c4fad30e by Tony Chemit at 2020-11-30T15:54:18+01:00 Fix more ui (ps model is now fine) - - - - - ac1a2b5f by Tony Chemit at 2020-11-30T16:32:25+01:00 Fix more ui (ps model is now fine) - - - - - 53fbcb27 by Tony Chemit at 2020-11-30T16:32:38+01:00 Bad select node scope saved ? - - - - - ad93f062 by Tony Chemit at 2020-12-02T06:30:47+01:00 Be able to override NavigationHandler classes - - - - - d87ade2b by Tony Chemit at 2020-12-02T06:31:58+01:00 Move two validation to dto module (not the best place, but better than in ui model...) - - - - - 7442236b by Tony Chemit at 2020-12-02T06:32:49+01:00 init bean code moved in service layer - - - - - 65d3e982 by Tony Chemit at 2020-12-02T06:35:27+01:00 Review and clean LL forms - - - - - 19762beb by Tony Chemit at 2020-12-02T06:36:56+01:00 Review Save action - - - - - eb6fce8c by Tony Chemit at 2020-12-02T06:37:12+01:00 Review WithDataFile actions - - - - - 9d8c5120 by Tony Chemit at 2020-12-02T08:39:49+01:00 Review and fix how to get select node from edit node (there is still an unsafe method getDtoType) - - - - - 4b33051d by Tony Chemit at 2020-12-02T08:41:58+01:00 Add some new methods in action support, we should never call getUi() from code - - - - - 3f3e0589 by Tony Chemit at 2020-12-02T08:59:09+01:00 Review DataFile API, make it neutral, this simplify quite a lot the code and permits us to remove two more specialized services. - - - - - c2a5a240 by Tony Chemit at 2020-12-02T10:30:47+01:00 Move generateHomeId to DataSourceService, and then can now delete TripService and let toolkit generates it for us. - - - - - d6a73b1b by Tony Chemit at 2020-12-02T10:39:13+01:00 Review TargetSampleAwareService and clean dedicated services - - - - - 1923b958 by Tony Chemit at 2020-12-02T10:40:27+01:00 Review LonglineCompositionDto and remove the service methods - - - - - de883bd1 by Tony Chemit at 2020-12-02T10:40:38+01:00 Remove generated service - - - - - 1420acb5 by Tony Chemit at 2020-12-02T10:40:51+01:00 Clean some code - - - - - 014fc593 by Tony Chemit at 2020-12-02T11:12:38+01:00 Clean Sample move code (one more service removed) - - - - - 9f494e6a by Tony Chemit at 2020-12-03T09:41:35+01:00 Change navigation actions accelerators - - - - - e27e8a10 by Tony Chemit at 2020-12-03T11:41:36+01:00 Improve keystrokes placeholders. - - - - - fb640b84 by Tony Chemit at 2020-12-03T20:17:25+01:00 Let's generate create actions (Open one are now ok, need to finish it for edit and table one) : generation is always better than runtime code... - - - - - a86b18c8 by Tony Chemit at 2020-12-03T22:52:29+01:00 When reset on an empty table ui, then do not block user when leaving the form - - - - - 889cbecb by Tony Chemit at 2020-12-04T04:47:27+01:00 Add nice method to get type simple name prefixed bu his sub module - - - - - b25d2333 by Tony Chemit at 2020-12-04T04:48:16+01:00 Review create data actions, now everything is quite smooth, nearly no human interaction. - - - - - 25dce5ad by Tony Chemit at 2020-12-04T05:45:04+01:00 Improve navigation context actions popup : * actions are now organized by purpose * actions can keep original accelerator (feel cooler like this) * add missing action : ChangeMode - - - - - 30a99d6c by Tony Chemit at 2020-12-04T06:06:16+01:00 Champs avec needcomment=true - Closes #1620 - - - - - fb75745c by Tony Chemit at 2020-12-04T06:23:40+01:00 Fix renderer for referential combo box when disabled plus improve the tool tip - - - - - 14a9f32f by Tony Chemit at 2020-12-04T10:05:29+01:00 Improve NonTargetCatchRelease api design, don't need to bring over a SpeciesGroup list to service :( - - - - - df4875b7 by Tony Chemit at 2020-12-04T13:58:42+01:00 Quick flush may help when some objects are not still created. - - - - - 79642e2e by Tony Chemit at 2020-12-04T13:59:43+01:00 Improve DTO API : introduce some nice and easy methods to compute some stuff (just compare the previous one with this one!) - - - - - 5d1275d0 by Tony Chemit at 2020-12-04T14:00:07+01:00 Readd I18n on not standalone ContentTable - - - - - 01d7eb16 by Tony Chemit at 2020-12-04T14:03:48+01:00 Continue to clean code, and remove info message API in content. Introduce AskDelete object to do the job. ContentTableUI API is ok (complex not standalone forms are fine Sample and Landing) - - - - - 4a9a858c by Tony Chemit at 2020-12-04T14:57:03+01:00 Fix missing i18n - - - - - 19fcf265 by Tony Chemit at 2020-12-04T14:57:24+01:00 Clean i18n - - - - - 3eeb58c5 by Tony Chemit at 2020-12-04T14:58:11+01:00 Can use now Tdr form (even if we still don't have schema :() - - - - - 3b33cde8 by Tony Chemit at 2020-12-04T14:58:26+01:00 clean old commented code - - - - - ca34f8c0 by Tony Chemit at 2020-12-05T20:06:48+01:00 Introduce ProportionField validator and generate his usage - - - - - 545c03bb by Tony Chemit at 2020-12-05T20:06:48+01:00 Clean code - - - - - 66f51c92 by Tony Chemit at 2020-12-05T20:06:48+01:00 Fix toolkit when Dto has multiple inheritance - - - - - 387462c2 by Tony Chemit at 2020-12-05T20:06:48+01:00 Improve Dto design for ll set longline description - - - - - 472ce218 by Tony Chemit at 2020-12-05T20:06:48+01:00 Rename SectionTemplate to SectionTemplateDto and make it JavaBean instead of Serializable, and then remove nasty swingx dependency on dto module :) - - - - - bc5f702a by Tony Chemit at 2020-12-05T20:06:48+01:00 Make ContentTableUITableModel uses JavaBean instead of Serializable - - - - - 8db07e72 by Tony Chemit at 2020-12-05T22:55:51+01:00 Improve service code - - - - - 93f24fa5 by Tony Chemit at 2020-12-05T22:56:32+01:00 Fix scope for standalone stuff - - - - - 979c52cd by Tony Chemit at 2020-12-05T22:57:54+01:00 Fix create new editable node (was not select the new node...) - - - - - 232836ed by Tony Chemit at 2020-12-05T22:58:43+01:00 Simplify binding - - - - - b48d0e46 by Tony Chemit at 2020-12-05T22:59:36+01:00 Show Insert button when possible - - - - - ee61a339 by Tony Chemit at 2020-12-06T16:09:34+01:00 At last begin to refactor very bad code from sbavencoff (no thanks to him) - - - - - 453386fd by Tony Chemit at 2020-12-06T16:09:34+01:00 Improve content action i18n keys Add select and edt node for simple ui - - - - - a27c5f0c by Tony Chemit at 2020-12-06T16:09:34+01:00 Fix simple ui open flow - - - - - 1cc4a8a8 by Tony Chemit at 2020-12-06T16:09:34+01:00 Fix delete all action on LL-Observation detail composition (by fixing correct notUsed property when creating new dto) - - - - - d2674b39 by Tony Chemit at 2020-12-06T16:09:34+01:00 Add getTypes on Business elements - - - - - 1d8644b9 by Tony Chemit at 2020-12-06T16:09:34+01:00 Introduce nice method to avoid boilerplate code - - - - - f9522817 by Tony Chemit at 2020-12-06T16:09:34+01:00 Clean at last the very ugly code from nowhere :- Adding some minimum documentation can help also! - - - - - 9fe18f76 by Tony Chemit at 2020-12-06T16:09:43+01:00 Improve decorator design by introducing formatter to apply on jxContext instead of just using the string format which can not deal with null values... - - - - - 0920f857 by Tony Chemit at 2020-12-07T15:50:43+01:00 By default nothing to do on closing ServicesProvider. - - - - - 0693c770 by Tony Chemit at 2020-12-07T22:35:35+01:00 Reconnaissance des paramètres de sécurité - See #1638 - - - - - 69a9fe82 by Tony Chemit at 2020-12-07T23:30:09+01:00 Remove abstract notion on ContentTable, now everything seems to be ok without using the abstract trick - - - - - da3985ed by Tony Chemit at 2020-12-07T23:32:16+01:00 Realign at last GearUseFeatures - on both model we got exactly the same code even if not factorize. - - - - - d2ac7813 by Tony Chemit at 2020-12-07T23:37:26+01:00 no need to expose I18n property - - - - - a52fc657 by Tony Chemit at 2020-12-07T23:54:50+01:00 * Clean content css * Unify the way to use not standalone table ui (remove notion of abstract ui) * Move logic of referential filters to model * Improve the ContentUIHandler design (now a lot is done by OpenExecutor) - - - - - 3a267327 by Tony Chemit at 2020-12-08T17:06:03+01:00 Add nice methods on dto (stop doing stuff on ui about data) - - - - - 9e280878 by Tony Chemit at 2020-12-08T17:11:35+01:00 Clean ui files Make models safer (sub models are not contained by main model), make it always the same (was not the case actually) - - - - - 0ced5083 by Tony Chemit at 2020-12-08T17:12:11+01:00 Remove full generated files :) - - - - - 48974faf by Tony Chemit at 2020-12-08T17:12:34+01:00 ContentHandler APi review (need just more tests and a finish) - - - - - f80c50a8 by Tony Chemit at 2020-12-09T11:10:19+01:00 Add nice methods on dto (stop doing stuff on ui about data) - - - - - 94f79fac by Tony Chemit at 2020-12-09T12:18:50+01:00 Improve DecoratorServiceTest and fix dependencies - - - - - 35fd022b by Tony Chemit at 2020-12-10T10:16:22+01:00 Introduce a fine and simple way to initialize Jaxx objects - - - - - 08a541cb by Tony Chemit at 2020-12-10T21:57:03+01:00 Improve init UI API (should reverse it to JAXX...) - - - - - fc7bfe23 by Tony Chemit at 2020-12-10T22:55:51+01:00 Avoid nasty side effects while clearing beans + make works last form :) - - - - - d112789b by Tony Chemit at 2020-12-11T12:34:11+01:00 nice method on dto (still moving some stuff from ui to dto) - - - - - 23a211f3 by Tony Chemit at 2020-12-11T12:35:00+01:00 Improve init UI API (step two: make it neutral before moving it to JAXX) - - - - - 1ab7b0d1 by Tony Chemit at 2020-12-11T13:44:40+01:00 Improve init UI API (step three: using new JAXX API) - - - - - 3c87c0d2 by Tony Chemit at 2020-12-12T10:22:55+01:00 Use last pom and jaxx version - - - - - 27f807f4 by Tony Chemit at 2020-12-12T23:18:35+01:00 * Improve data source cache API * Remove standalone service methods to get extra data: now include them in dto - - - - - 110a9699 by Tony Chemit at 2020-12-12T23:48:12+01:00 Bien vérifier le fonctionnement des flags observe/calculé - Closes #1650 - - - - - 3c13b948 by Tony Chemit at 2020-12-12T23:54:11+01:00 Calée : racourcis inopportuns - Closes #1645 - - - - - 72e4001b by Tony Chemit at 2020-12-12T23:54:24+01:00 remove unused code - - - - - cf387649 by Tony Chemit at 2020-12-13T00:04:23+01:00 clean code - - - - - 60857167 by Tony Chemit at 2020-12-13T00:04:47+01:00 Boutons de navigation devraient avoir disparu - Closes #1648 - - - - - a3a7921a by Tony Chemit at 2020-12-13T00:27:40+01:00 CTROL+F8 non fonctionnel (sous Mac) - Closes #1644 - - - - - 67b3e882 by Tony Chemit at 2020-12-13T01:11:36+01:00 Déploiement du calendrier - Closes #1643 - - - - - d8798942 by Tony Chemit at 2020-12-13T14:06:25+01:00 Add showReset css class - - - - - 57fd399c by Tony Chemit at 2020-12-13T14:18:14+01:00 Avoid NPe if route date is null - - - - - a822e8be by Tony Chemit at 2020-12-13T14:40:27+01:00 Fix edit referential flow - - - - - 0fd7d3c0 by Tony Chemit at 2020-12-13T14:40:58+01:00 Replace BeanDateEditor by DateEditor - - - - - 17e8b3e6 by Tony Chemit at 2020-12-13T14:52:28+01:00 Méthodes de mesure par défaut - Closes #1646 - - - - - 41b33c60 by Tony Chemit at 2020-12-13T14:52:54+01:00 Bug sur suppression estimation banc - Closes #1647 - - - - - 659321ef by Tony Chemit at 2020-12-13T15:44:05+01:00 Revoir les clefs d'unicité sur la base - Closes #1658 - - - - - 9b8d3ab8 by Tony Chemit at 2020-12-13T19:21:47+01:00 Suppression d'entrée en synchro avancée - Closes #1639 - - - - - 65c3d6df by Tony Chemit at 2020-12-13T20:30:05+01:00 Revoir les clefs d'unicité sur la base (correction dans la migration) - closes #1658 - - - - - 7f3e8dc7 by Tony Chemit at 2020-12-13T20:30:46+01:00 Fix i18n key - - - - - 575a645f by Tony Chemit at 2020-12-13T20:31:11+01:00 Fix some init issues with new Jaxx API - - - - - 38ef3812 by Tony Chemit at 2020-12-14T11:04:41+01:00 Remove unused property (and more over in v9 this will be common) - - - - - 551a32be by Tony Chemit at 2020-12-14T12:35:37+01:00 clean dcp code (need a second review, but better than before) - - - - - 6b9fa85f by Tony Chemit at 2020-12-14T12:37:03+01:00 Fix messages view (but yet again need a second review, there is still a lots of code to manage validation on a form, it should be more easier and directly linked to the editing state of model) - - - - - b1950fd4 by Tony Chemit at 2020-12-14T13:10:47+01:00 Fix vessel filter on Trip form - - - - - 06645989 by Tony Chemit at 2020-12-14T13:10:56+01:00 use last pom - - - - - 2ca5de47 by Tony Chemit at 2020-12-14T13:13:29+01:00 '+' / Nouvelle route non à propos - Closes #1641 - - - - - 531ffaf2 by Tony Chemit at 2020-12-14T13:19:41+01:00 update CHANGELOG [skip ci] - - - - - 01ca06f3 by Tony Chemit at 2020-12-14T13:20:27+01:00 [jgitflow-maven-plugin]updating poms for 8.0.1 branch with snapshot versions[skip ci] - - - - - 01bde9ee by Tony Chemit at 2020-12-14T13:21:25+01:00 [jgitflow-maven-plugin]updating poms for branch'release/8.0.1' with non-snapshot versions[skip ci] - - - - - e4367745 by Tony Chemit at 2020-12-14T13:32:28+01:00 [jgitflow-maven-plugin]merging 'release/8.0.1' into 'master' - - - - - 30 changed files: - .gitignore - .gitlab-ci.yml - CHANGELOG.md - − client-configuration/pom.xml - − client-configuration/src/main/config/Client.ini - − client-configuration/src/main/filtered-resources/observe-application.properties - − client-configuration/src/main/i18n/getters/config.getter - − client-configuration/src/main/i18n/templates/about_en_GB.ftl - − client-configuration/src/main/i18n/templates/about_es_ES.ftl - − client-configuration/src/main/i18n/templates/about_fr_FR.ftl - − client-configuration/src/main/java/fr/ird/observe/client/ClientConfigFinderInstance.java - − client-configuration/src/main/java/fr/ird/observe/client/ObServeSwingSessionConfig.java - − client-configuration/src/main/java/fr/ird/observe/client/ObserveClientResourceManager.java - − client-configuration/src/main/java/fr/ird/observe/client/configuration/ClientConfig.java - − client-configuration/src/main/java/fr/ird/observe/client/configuration/ClientConfigFinder.java - − client-configuration/src/main/java/fr/ird/observe/client/configuration/NavigationTreeConfig.java - − client-configuration/src/main/java/fr/ird/observe/client/configuration/NavigationTreeConfigBean.java - − client-configuration/src/main/java/fr/ird/observe/client/configuration/SeineBycatchObservedSystemConfigConverter.java - − client-configuration/src/main/java/fr/ird/observe/client/constants/AcquisitionMode.java - − client-configuration/src/main/java/fr/ird/observe/client/constants/CatchAcquisitionMode.java - − client-configuration/src/main/java/fr/ird/observe/client/constants/ConnexionStatus.java - − client-configuration/src/main/java/fr/ird/observe/client/constants/CreationMode.java - − client-configuration/src/main/java/fr/ird/observe/client/constants/DbMode.java - − client-configuration/src/main/java/fr/ird/observe/client/constants/ProgramObservation.java - − client-configuration/src/main/java/fr/ird/observe/client/constants/ValidationModelMode.java - − client-configuration/src/main/java/fr/ird/observe/client/datasource/dcp/FloatingObjectPresetsManager.java - − client-configuration/src/main/resources/log4j2.xml - − client-configuration/src/main/resources/observe-log4j2.xml - − client-configuration/src/test/java/fr/ird/observe/client/configuration/ClientConfigTest.java - − client-core/pom.xml The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/a58020835dda1d790cd211f1… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/a58020835dda1d790cd211f1… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][release/8.0.1] [jgitflow-maven-plugin]updating poms for branch'release/8.0.1' with non-snapshot versions[skip ci]
by Tony CHEMIT 14 Dec '20

14 Dec '20

Tony CHEMIT pushed to branch release/8.0.1 at ultreiaio / ird-observe Commits: 01bde9ee by Tony Chemit at 2020-12-14T13:21:25+01:00 [jgitflow-maven-plugin]updating poms for branch'release/8.0.1' 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/i18n/pom.xml - client/pom.xml - client/runner/pom.xml - models/dto/pom.xml - models/persistence/pom.xml - models/pom.xml - observe/pom.xml - pom.xml - server/configuration/pom.xml - server/core/pom.xml - server/i18n/pom.xml - server/pom.xml - server/runner/pom.xml - services/api/pom.xml - services/client-impl/pom.xml - services/i18n/pom.xml - services/local-impl/pom.xml - services/pom.xml - services/provider/pom.xml The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/01bde9ee1f57c4f885151e3aa… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/01bde9ee1f57c4f885151e3aa… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] 6 commits: [jgitflow-maven-plugin]updating poms for 8.0.1 branch with snapshot versions[skip ci]
by Tony CHEMIT 14 Dec '20

14 Dec '20

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 01ca06f3 by Tony Chemit at 2020-12-14T13:20:27+01:00 [jgitflow-maven-plugin]updating poms for 8.0.1 branch with snapshot versions[skip ci] - - - - - 01bde9ee by Tony Chemit at 2020-12-14T13:21:25+01:00 [jgitflow-maven-plugin]updating poms for branch'release/8.0.1' with non-snapshot versions[skip ci] - - - - - e4367745 by Tony Chemit at 2020-12-14T13:32:28+01:00 [jgitflow-maven-plugin]merging 'release/8.0.1' into 'master' - - - - - 9dde4cde by Tony Chemit at 2020-12-14T13:32:32+01:00 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts[skip ci] - - - - - 33b19c96 by Tony Chemit at 2020-12-14T13:32:33+01:00 [jgitflow-maven-plugin]merging 'master' into 'develop' - - - - - b683cd39 by Tony Chemit at 2020-12-14T13:32:34+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/b7c2c2ab03dcbae61f69bd1c… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/b7c2c2ab03dcbae61f69bd1c… 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 8.0.2-SNAPSHOT development[skip ci]
by Tony CHEMIT 14 Dec '20

14 Dec '20

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: b7c2c2ab by Tony Chemit at 2020-12-14T13:20:28+01:00 [jgitflow-maven-plugin]updating poms for 8.0.2-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/i18n/pom.xml - client/pom.xml - client/runner/pom.xml - models/dto/pom.xml - models/persistence/pom.xml - models/pom.xml - observe/pom.xml - pom.xml - server/configuration/pom.xml - server/core/pom.xml - server/i18n/pom.xml - server/pom.xml - server/runner/pom.xml - services/api/pom.xml - services/client-impl/pom.xml - services/i18n/pom.xml - services/local-impl/pom.xml - services/pom.xml - services/provider/pom.xml The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/b7c2c2ab03dcbae61f69bd1ce… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/b7c2c2ab03dcbae61f69bd1ce… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe] Pushed new branch release/8.0.1
by Tony CHEMIT 14 Dec '20

14 Dec '20

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

1 0

[Git][ultreiaio/ird-observe][develop] update CHANGELOG [skip ci]
by Tony CHEMIT 14 Dec '20

14 Dec '20

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 531ffaf2 by Tony Chemit at 2020-12-14T13:19:41+01:00 update CHANGELOG [skip ci] - - - - - 1 changed file: - CHANGELOG.md Changes: ===================================== CHANGELOG.md ===================================== @@ -1,7 +1,47 @@ # ObServe changelog * Author [Tony Chemit](mailto:dev@tchemit.fr) - * Last generated at 2020-11-04 11:57. + * Last generated at 2020-12-14 13:19. + +## Version [8.0.1](https://gitlab.com/ultreiaio/ird-observe/-/milestones/173) + +**Closed at 2020-12-14.** + + +### Issues + * [[Anomalie 1588]](https://gitlab.com/ultreiaio/ird-observe/-/issues/1588) **Impossible d'enregister une caléee ll observation** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Anomalie 1596]](https://gitlab.com/ultreiaio/ird-observe/-/issues/1596) **La reprise sur erreur en mode serveur doit être revue** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Anomalie 1598]](https://gitlab.com/ultreiaio/ird-observe/-/issues/1598) **Lors de l'ouverture de l'application, si la base locale est déjà occupée par une autre application, message erroné** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Anomalie 1620]](https://gitlab.com/ultreiaio/ird-observe/-/issues/1620) **Champs avec needcomment=true** (Thanks to Tony CHEMIT) (Reported by Pascal Cauquil) + * [[Anomalie 1632]](https://gitlab.com/ultreiaio/ird-observe/-/issues/1632) **[LL][Logbook] landingpart.landing devrait être une FK** (Thanks to Tony CHEMIT) (Reported by Pascal Cauquil) + * [[Anomalie 1633]](https://gitlab.com/ultreiaio/ird-observe/-/issues/1633) **[LL][Logbook] ll_landing.landingpart contient 3 champs certainement en trop** (Thanks to Tony CHEMIT) (Reported by Pascal Cauquil) + * [[Anomalie 1636]](https://gitlab.com/ultreiaio/ird-observe/-/issues/1636) **Nombre de marées par programme non affiché dans l'arbre, avant clic sur chaque programme** (Thanks to Tony CHEMIT) (Reported by Pascal Cauquil) + * [[Anomalie 1638]](https://gitlab.com/ultreiaio/ird-observe/-/issues/1638) **Reconnaissance des paramètres de sécurité** (Thanks to Tony CHEMIT) (Reported by Pascal Cauquil) + * [[Anomalie 1639]](https://gitlab.com/ultreiaio/ird-observe/-/issues/1639) **Suppression d'entrée en synchro avancée** (Thanks to Tony CHEMIT) (Reported by Pascal Cauquil) + * [[Anomalie 1641]](https://gitlab.com/ultreiaio/ird-observe/-/issues/1641) **'+' / Nouvelle route non à propos** (Thanks to Tony CHEMIT) (Reported by Pascal Cauquil) + * [[Anomalie 1644]](https://gitlab.com/ultreiaio/ird-observe/-/issues/1644) **CTROL+F8 non fonctionnel (sous Mac)** (Thanks to Tony CHEMIT) (Reported by Pascal Cauquil) + * [[Anomalie 1645]](https://gitlab.com/ultreiaio/ird-observe/-/issues/1645) **Calée : racourcis inopportuns** (Thanks to Tony CHEMIT) (Reported by Pascal Cauquil) + * [[Anomalie 1647]](https://gitlab.com/ultreiaio/ird-observe/-/issues/1647) **Bug sur suppression estimation banc** (Thanks to Tony CHEMIT) (Reported by Pascal Cauquil) + * [[Anomalie 1648]](https://gitlab.com/ultreiaio/ird-observe/-/issues/1648) **Boutons de navigation devraient avoir disparu** (Thanks to Tony CHEMIT) (Reported by Pascal Cauquil) + * [[Anomalie 1649]](https://gitlab.com/ultreiaio/ird-observe/-/issues/1649) **Les listes déroulantes permettent de chosir des entrées de référentiel désactivées** (Thanks to Tony CHEMIT) (Reported by Pascal Cauquil) + * [[Evolution 495]](https://gitlab.com/ultreiaio/ird-observe/-/issues/495) **[Référentiel] Corriger un nom de champ** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Evolution 974]](https://gitlab.com/ultreiaio/ird-observe/-/issues/974) **Ajouter une option de configuration permettant de s'affranchir des ouvertures/clôtures** (Thanks to Tony CHEMIT) (Reported by Pascal Cauquil) + * [[Evolution 1249]](https://gitlab.com/ultreiaio/ird-observe/-/issues/1249) **Amélioration des fonctionnalités de synchronisation avancées** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Evolution 1512]](https://gitlab.com/ultreiaio/ird-observe/-/issues/1512) **Gestion du versionning des marées** (Thanks to Tony CHEMIT) (Reported by Pascal Cauquil) + * [[Evolution 1592]](https://gitlab.com/ultreiaio/ird-observe/-/issues/1592) **Auto-chargement des rôles pour les utilisateurs de la base ciblées dans les assistants de création/mise à jour** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Evolution 1605]](https://gitlab.com/ultreiaio/ird-observe/-/issues/1605) **Nouveau texte de popup pour le cas 'Vous devez mettre à jour le form marée avant de pouvoir saisir le livre de bord'** (Thanks to Tony CHEMIT) (Reported by Pascal Cauquil) + * [[Evolution 1613]](https://gitlab.com/ultreiaio/ird-observe/-/issues/1613) **Ajouter un nouveau bouton sur le formulaire d'une ligne sélectionnée dans un écran de type table créer/enregister ET nouveau** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Evolution 1625]](https://gitlab.com/ultreiaio/ird-observe/-/issues/1625) **[LL][Observations] Horodatage hook timers par défaut** (Thanks to Tony CHEMIT) (Reported by Philippe Sabarros) + * [[Evolution 1626]](https://gitlab.com/ultreiaio/ird-observe/-/issues/1626) **Manque le champ lightsticksperbasket** (Thanks to Tony CHEMIT) (Reported by Pascal Cauquil) + * [[Evolution 1627]](https://gitlab.com/ultreiaio/ird-observe/-/issues/1627) **[LL][Logbooks] table ll_landing.datasource à compléter** (Thanks to Tony CHEMIT) (Reported by Pascal Cauquil) + * [[Evolution 1628]](https://gitlab.com/ultreiaio/ird-observe/-/issues/1628) **[LL][Logbookd] Renommer table compagnies** (Thanks to Tony CHEMIT) (Reported by Pascal Cauquil) + * [[Evolution 1629]](https://gitlab.com/ultreiaio/ird-observe/-/issues/1629) **[LL][Logbooks] Ajout d'un champ** (Thanks to Tony CHEMIT) (Reported by Pascal Cauquil) + * [[Evolution 1643]](https://gitlab.com/ultreiaio/ird-observe/-/issues/1643) **Déploiement du calendrier** (Thanks to Tony CHEMIT) (Reported by Pascal Cauquil) + * [[Evolution 1646]](https://gitlab.com/ultreiaio/ird-observe/-/issues/1646) **Méthodes de mesure par défaut** (Thanks to Tony CHEMIT) (Reported by Pascal Cauquil) + * [[Evolution 1658]](https://gitlab.com/ultreiaio/ird-observe/-/issues/1658) **Revoir les clefs d'unicité sur la base** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Tâche 1532]](https://gitlab.com/ultreiaio/ird-observe/-/issues/1532) **Remplacer le moteur de scripting utilisé** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Tâche 1611]](https://gitlab.com/ultreiaio/ird-observe/-/issues/1611) **Revoir si on doit laisser le lien Catch.set si la capture est associée à un élément de la ligne (section, basket, branchline)** (Thanks to Pascal Cauquil) (Reported by Tony CHEMIT) + * [[Tâche 1623]](https://gitlab.com/ultreiaio/ird-observe/-/issues/1623) **Optimisation de la migration 8.0** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) ## Version [8.0.0](https://gitlab.com/ultreiaio/ird-observe/-/milestones/149) View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/531ffaf282988a33b30b9a462… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/531ffaf282988a33b30b9a462… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] 6 commits: Remove unused property (and more over in v9 this will be common)
by Tony CHEMIT 14 Dec '20

14 Dec '20

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 38ef3812 by Tony Chemit at 2020-12-14T11:04:41+01:00 Remove unused property (and more over in v9 this will be common) - - - - - 551a32be by Tony Chemit at 2020-12-14T12:35:37+01:00 clean dcp code (need a second review, but better than before) - - - - - 6b9fa85f by Tony Chemit at 2020-12-14T12:37:03+01:00 Fix messages view (but yet again need a second review, there is still a lots of code to manage validation on a form, it should be more easier and directly linked to the editing state of model) - - - - - b1950fd4 by Tony Chemit at 2020-12-14T13:10:47+01:00 Fix vessel filter on Trip form - - - - - 06645989 by Tony Chemit at 2020-12-14T13:10:56+01:00 use last pom - - - - - 2ca5de47 by Tony Chemit at 2020-12-14T13:13:29+01:00 '+' / Nouvelle route non à propos - Closes #1641 - - - - - 30 changed files: - client/core/src/main/java/fr/ird/observe/client/datasource/api/cache/ReferencesFilterHelper.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/ContentMessageTableModel.java → client/core/src/main/java/fr/ird/observe/client/util/BeanLabel.java - client/core/src/main/java/fr/ird/observe/client/util/init/DefaultUIInitializer.java - + client/core/src/main/resources/icons/action-add-preset.png - client/core/src/main/resources/observe-ui.properties - client/datasource/editor/api/pom.xml - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/DataSourceEditor.jcss - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/DataSourceEditorHandler.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/DataSourceEditorModel.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/ContentUI.jaxx - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/ContentUIHandler.java - client/core/src/main/java/fr/ird/observe/client/util/ObserveSwingValidatorMessageTableModel.java → client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/validation/ContentMessageTableModel.java - client/core/src/main/java/fr/ird/observe/client/util/ObserveValidatorMessageTableRenderer.java → client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/validation/ContentMessageTableRenderer.java - client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/common/TripListUI.jaxx - client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/common/TripUIModel.java - client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/landing/LandingListUI.jaxx - client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/logbook/ActivityListUI.jaxx - client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/logbook/SampleListUI.jaxx - client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/observation/ActivityListUI.jaxx - client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/observation/composition/SetDetailCompositionUIValidationHelper.java - client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/ObservePsKeyStrokes.java - client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/common/TripListUI.jaxx - − client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/common/TripListUIHandler.java - client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/common/TripUIModel.java - client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/dcp/presets/FloatingObjectBuoyPresetUI.jaxx - client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/dcp/presets/FloatingObjectBuoyPresetUI.jcss - client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/dcp/presets/FloatingObjectBuoyPresetUIHandler.java - client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/dcp/presets/FloatingObjectPresetUI.jaxx - client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/dcp/presets/FloatingObjectPresetUI.jcss - client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/dcp/presets/FloatingObjectPresetUIHandler.java The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/575a645f92a9724f81c85aa4… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/575a645f92a9724f81c85aa4… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] 5 commits: Revoir les clefs d'unicité sur la base - Closes #1658
by Tony CHEMIT 13 Dec '20

13 Dec '20

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 659321ef by Tony Chemit at 2020-12-13T15:44:05+01:00 Revoir les clefs d'unicité sur la base - Closes #1658 - - - - - 9b8d3ab8 by Tony Chemit at 2020-12-13T19:21:47+01:00 Suppression d'entrée en synchro avancée - Closes #1639 - - - - - 65c3d6df by Tony Chemit at 2020-12-13T20:30:05+01:00 Revoir les clefs d'unicité sur la base (correction dans la migration) - closes #1658 - - - - - 7f3e8dc7 by Tony Chemit at 2020-12-13T20:30:46+01:00 Fix i18n key - - - - - 575a645f by Tony Chemit at 2020-12-13T20:31:11+01:00 Fix some init issues with new Jaxx API - - - - - 29 changed files: - client/core/src/main/java/fr/ird/observe/client/util/init/DefaultUIInitializer.java - client/datasource/actions/src/main/i18n/getters/java.getter - client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/synchronize/referential/ng/ReferentialSynchroModel.java - client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/synchronize/referential/ng/ReferentialSynchronizeResources.java - client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/synchronize/referential/ng/actions/ReferentialSynchroUIActionSupport.java - client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/synchronize/referential/ng/actions/Start.java - client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/synchronize/referential/ng/task/SwingReferentialSynchronizeTask.java - client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/synchronize/referential/ng/task/SwingWithReplaceDataTask.java - client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/synchronize/referential/ng/tree/ReferentialSelectionTreePaneHandler.java - client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/synchronize/referential/ng/tree/ReferentialSynchronizeTreeModel.java - client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/synchronize/referential/ng/tree/actions/RegisterDeactivateWithReplacement.java - client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/synchronize/referential/ng/tree/actions/RegisterDelete.java - client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/synchronize/referential/ng/tree/actions/RegisterTaskActionSupport.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/ContentUIInitializer.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/list/actions/GotoSelectedData.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/navigation/NavigationUIHandler.java - client/datasource/editor/api/src/main/resources/fr/ird/observe/client/datasource/editor/api/content/data/list/ContentListUI.keys - client/i18n/src/main/i18n/translations/observe_en_GB.properties - client/i18n/src/main/i18n/translations/observe_es_ES.properties - client/i18n/src/main/i18n/translations/observe_fr_FR.properties - models/persistence/src/main/java/fr/ird/observe/entities/data/ps/observation/SetImpl.java - models/persistence/src/main/models/Observe-20-data-ps-observation.model - models/persistence/src/main/resources/db/migration/8.0/50_ps_observation_create-common.sql - services/api/src/main/java/fr/ird/observe/services/service/actions/synchro/referential/ng/task/ReferentialSynchronizeTaskType.java - tests/test/src/main/resources/db/8.0/dataForTestLongline.sql.gz - tests/test/src/main/resources/db/8.0/dataForTestSeine.sql.gz - tests/test/src/main/resources/db/8.0/empty_h2.sql.gz - tests/test/src/main/resources/db/8.0/empty_pg.sql.gz - tests/test/src/main/resources/db/8.0/referentiel.sql.gz Changes: ===================================== client/core/src/main/java/fr/ird/observe/client/util/init/DefaultUIInitializer.java ===================================== @@ -46,6 +46,7 @@ import org.nuiton.jaxx.widgets.text.BigTextEditor; import javax.swing.AbstractButton; import javax.swing.JComponent; import javax.swing.JLabel; +import javax.swing.JSplitPane; import javax.swing.JTree; import javax.swing.KeyStroke; import java.awt.Component; @@ -55,7 +56,6 @@ import java.util.Objects; public class DefaultUIInitializer<UI extends JComponent & JAXXObject> extends UIInitializerSupport<UI, DefaultUIInitializerContext<UI>> implements WithClientConfig, WithClientUIContext { - public static final String OBSERVE_ACTION = "observeAction"; public static final String CLIENT_PROPERTY_FORCE_LOAD = "forceLoad"; public static final String CLIENT_PROPERTY_LIST_NO_LOAD = "listNoLoad"; // public static final String DELEGATE_CONTENT_UI = "delegateContentUI"; @@ -113,6 +113,7 @@ public class DefaultUIInitializer<UI extends JComponent & JAXXObject> extends UI .onComponents(CoordinatesEditor.class, this::init) .onComponents(BeanEnumEditor.class, this::init) .onComponents(JLabel.class, this::init) + .onComponents(JSplitPane.class, this::init) .onComponents(JTree.class, this::init) .startSecondPass(); } @@ -131,12 +132,13 @@ public class DefaultUIInitializer<UI extends JComponent & JAXXObject> extends UI } } + private void init(JSplitPane editor) { + initializerContext.checkFirstPass(); + UIInitHelper.init(editor); + } + protected void init(AbstractButton editor) { initializerContext.checkFirstPass(); - String actionId = (String) editor.getClientProperty(OBSERVE_ACTION); - if (actionId != null) { - throw new IllegalStateException(String.format("Can't use observeAction... on ui:%s - %s", ui.getClass().getName(), actionId)); - } } protected void init(BeanCheckBox editor) { ===================================== client/datasource/actions/src/main/i18n/getters/java.getter ===================================== @@ -143,7 +143,9 @@ observe.ui.datasource.editor.actions.synchro.referential.task.deactivateFromLeft observe.ui.datasource.editor.actions.synchro.referential.task.deactivateFromRight observe.ui.datasource.editor.actions.synchro.referential.task.deactivateFromRightWithReplacement observe.ui.datasource.editor.actions.synchro.referential.task.deleteFromLeft +observe.ui.datasource.editor.actions.synchro.referential.task.deleteFromLeftWithReplacement observe.ui.datasource.editor.actions.synchro.referential.task.deleteFromRight +observe.ui.datasource.editor.actions.synchro.referential.task.deleteFromRightWithReplacement observe.ui.datasource.editor.actions.synchro.referential.task.include.properties observe.ui.datasource.editor.actions.synchro.referential.task.prepare observe.ui.datasource.editor.actions.synchro.referential.task.revertFromLeft ===================================== client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/synchronize/referential/ng/ReferentialSynchroModel.java ===================================== @@ -45,6 +45,8 @@ import fr.ird.observe.services.service.actions.synchro.referential.ng.Referentia import fr.ird.observe.services.service.actions.synchro.referential.ng.ReferentialSynchronizeServiceEngine; import fr.ird.observe.services.service.actions.synchro.referential.ng.task.ReferentialSynchronizeTaskType; import fr.ird.observe.services.service.referential.differential.DifferentialEngine; +import fr.ird.observe.services.service.usage.DtoUsageCountRequest; +import fr.ird.observe.services.service.usage.DtoUsageCountResult; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.nuiton.jaxx.runtime.swing.wizard.ext.WizardState; @@ -422,4 +424,8 @@ public class ReferentialSynchroModel extends AdminActionModel implements WithDec } return ImmutableList.copyOf(references.values()); } + + public <R extends ReferentialDtoReference> DtoUsageCountResult<?> getUsageCount(boolean left, R reference) { + return (left ? getLeftSource() : getRightSource()).getUsageService().count(new DtoUsageCountRequest<>(reference.getDtoType(), reference.getId())); + } } ===================================== client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/synchronize/referential/ng/ReferentialSynchronizeResources.java ===================================== @@ -22,15 +22,8 @@ package fr.ird.observe.client.datasource.actions.synchronize.referential.ng; * #L% */ -import com.google.common.collect.ImmutableSet; -import fr.ird.observe.client.datasource.actions.synchronize.referential.ng.task.SwingReferentialSynchronizeTask; -import fr.ird.observe.client.datasource.actions.synchronize.referential.ng.task.SwingWithIncludedPropertyNamesTask; -import fr.ird.observe.client.datasource.actions.synchronize.referential.ng.task.SwingWithReplaceDataTask; import fr.ird.observe.client.datasource.actions.synchronize.referential.ng.tree.node.ReferentialSynchroNodeSupport; import fr.ird.observe.client.util.UIHelper; -import fr.ird.observe.dto.reference.ReferentialDtoReference; -import fr.ird.observe.dto.referential.differential.Differential; -import fr.ird.observe.dto.referential.differential.DifferentialPropertyList; import fr.ird.observe.services.service.actions.synchro.referential.ng.task.ReferentialSynchronizeTaskType; import javax.swing.Icon; @@ -72,10 +65,6 @@ public enum ReferentialSynchronizeResources { null, ReferentialSynchronizeTaskType.UPDATE, ReferentialSynchroNodeSupport::isCanUpdate) { - @Override - public SwingReferentialSynchronizeTask createTask(boolean left, Differential differential, ReferentialDtoReference replaceReference, ImmutableSet<String> includedPropertyNames, DifferentialPropertyList includedProperties) { - return new SwingWithIncludedPropertyNamesTask(this, left, differential, includedPropertyNames, includedProperties); - } }, COPY( "copyToRight", @@ -99,13 +88,16 @@ public enum ReferentialSynchronizeResources { n("observe.ui.datasource.editor.actions.synchro.referential.action.deleteFromRight.tip"), ReferentialSynchroModel.DELETE_LEFT_PROPERTY_NAME, ReferentialSynchroModel.DELETE_RIGHT_PROPERTY_NAME, - KeyStroke.getKeyStroke("pressed F6"), - KeyStroke.getKeyStroke("shift pressed F6"), + KeyStroke.getKeyStroke("pressed F5"), + KeyStroke.getKeyStroke("shift pressed F5"), ReferentialSynchronizeTaskType.DELETE, ReferentialSynchroNodeSupport::isCanDelete) { @Override - public SwingReferentialSynchronizeTask createTask(boolean left, Differential differential, ReferentialDtoReference replaceReference, ImmutableSet<String> includedPropertyNames, DifferentialPropertyList includedProperties) { - return new SwingWithReplaceDataTask(this, left, differential, replaceReference); + public String getTaskReplaceLabel(boolean left) { + if (left) { + return n("observe.ui.datasource.editor.actions.synchro.referential.task.deleteFromLeftWithReplacement"); + } + return n("observe.ui.datasource.editor.actions.synchro.referential.task.deleteFromRightWithReplacement"); } }, REVERT( @@ -120,12 +112,7 @@ public enum ReferentialSynchronizeResources { KeyStroke.getKeyStroke("pressed F2"), KeyStroke.getKeyStroke("shift pressed F2"), ReferentialSynchronizeTaskType.REVERT, - ReferentialSynchroNodeSupport::isCanRevert) { - @Override - public SwingReferentialSynchronizeTask createTask(boolean left, Differential differential, ReferentialDtoReference replaceReference, ImmutableSet<String> includedPropertyNames, DifferentialPropertyList includedProperties) { - return new SwingWithIncludedPropertyNamesTask(this, left, differential, includedPropertyNames, includedProperties); - } - }, + ReferentialSynchroNodeSupport::isCanRevert), DEACTIVATE( "deactivateFromLeft", "deactivateFromRight", @@ -151,12 +138,7 @@ public enum ReferentialSynchronizeResources { KeyStroke.getKeyStroke("pressed F4"), KeyStroke.getKeyStroke("shift pressed F4"), ReferentialSynchronizeTaskType.DEACTIVATE_WITH_REPLACEMENT, - ReferentialSynchroNodeSupport::isCanDelete) { - @Override - public SwingReferentialSynchronizeTask createTask(boolean left, Differential differential, ReferentialDtoReference replaceReference, ImmutableSet<String> includedPropertyNames, DifferentialPropertyList includedProperties) { - return new SwingWithReplaceDataTask(this, left, differential, replaceReference); - } - }; + ReferentialSynchroNodeSupport::isCanDelete); private final String leftActionName; private final String leftTaskI18nKey; @@ -215,6 +197,10 @@ public enum ReferentialSynchronizeResources { return left ? leftTaskI18nKey : rightTaskI18nKey; } + public String getTaskReplaceLabel(boolean left) { + return getTaskLabel(left); + } + public String getActionTip(boolean left) { return left ? leftActionTipI18nKey : rightActionTipI18nKey; } @@ -235,14 +221,6 @@ public enum ReferentialSynchronizeResources { return taskType != null && taskType.withProperties(); } - public boolean withReplace() { - return taskType != null && taskType.withReplace(); - } - - public SwingReferentialSynchronizeTask createTask(boolean left, Differential differential, ReferentialDtoReference replaceReference, ImmutableSet<String> includedPropertyNames, DifferentialPropertyList includedProperties) { - return new SwingReferentialSynchronizeTask(this, left, differential); - } - public KeyStroke getKeyStroke(boolean left) { return left ? leftKeyStroke : rightKeyStroke; } ===================================== client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/synchronize/referential/ng/actions/ReferentialSynchroUIActionSupport.java ===================================== @@ -23,56 +23,12 @@ package fr.ird.observe.client.datasource.actions.synchronize.referential.ng.acti */ import fr.ird.observe.client.datasource.actions.actions.AdminTabUIActionSupport; -import fr.ird.observe.client.datasource.actions.synchronize.referential.ng.ReferentialSynchroModel; import fr.ird.observe.client.datasource.actions.synchronize.referential.ng.ReferentialSynchroUI; -import fr.ird.observe.client.datasource.actions.synchronize.referential.ng.tree.ReferentialSynchronizeTreeModel; - -import javax.swing.KeyStroke; abstract class ReferentialSynchroUIActionSupport extends AdminTabUIActionSupport<ReferentialSynchroUI> { - ReferentialSynchroUIActionSupport(String label, String shortDescription, String actionIcon, KeyStroke acceleratorKey) { - super(label, shortDescription, actionIcon, acceleratorKey); - } - ReferentialSynchroUIActionSupport(String label, String shortDescription, String actionIcon, char acceleratorKey) { super(label, shortDescription, actionIcon, acceleratorKey); } - - protected void updateLeftEnableActions(ReferentialSynchronizeTreeModel treeModel) { - - ReferentialSynchroModel stepModel = ui.getStepModel(); - - treeModel.updateSelectedActions(); - stepModel.setCopyLeft(treeModel.isCanAdd() || treeModel.isCanUpdate()); - stepModel.setDeleteLeft(treeModel.isCanDelete()); - stepModel.setDeactivateLeft(treeModel.isCanDelete()); - stepModel.setDeactivateWithReplaceLeft(treeModel.isCanDelete()); - stepModel.setRevertLeft(treeModel.isCanRevert()); - stepModel.setSkipLeft(treeModel.isCanSkip()); - } - - protected void updateRightEnableActions(ReferentialSynchronizeTreeModel treeModel) { - - ReferentialSynchroModel stepModel = ui.getStepModel(); - - treeModel.updateSelectedActions(); - stepModel.setCopyRight(treeModel.isCanAdd() || treeModel.isCanUpdate()); - stepModel.setDeleteRight(treeModel.isCanDelete()); - stepModel.setDeactivateRight(treeModel.isCanDelete()); - stepModel.setDeactivateWithReplaceRight(treeModel.isCanDelete()); - stepModel.setRevertRight(treeModel.isCanRevert()); - stepModel.setSkipRight(treeModel.isCanSkip()); - } - - - protected void updateActions(ReferentialSynchronizeTreeModel treeModel) { - if (treeModel.isLeft()) { - updateLeftEnableActions(treeModel); - } else { - updateRightEnableActions(treeModel); - } - } - } ===================================== client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/synchronize/referential/ng/actions/Start.java ===================================== @@ -30,6 +30,7 @@ import fr.ird.observe.client.datasource.actions.synchronize.referential.ng.tree. import fr.ird.observe.client.datasource.actions.synchronize.referential.ng.tree.ReferentialSelectionTreePane; import fr.ird.observe.client.datasource.actions.synchronize.referential.ng.tree.ReferentialSynchronizeTreeModel; import fr.ird.observe.client.datasource.actions.synchronize.referential.ng.tree.ReferentialSynchronizeTreeModelsBuilder; +import fr.ird.observe.client.datasource.actions.synchronize.referential.ng.tree.actions.RegisterTaskActionSupport; import fr.ird.observe.client.datasource.api.ObserveSwingDataSource; import fr.ird.observe.client.datasource.editor.api.wizard.connexion.DataSourceSelectorModel; import fr.ird.observe.dto.ProgressionModel; @@ -93,13 +94,13 @@ public class Start extends ReferentialSynchroUIActionSupport { stepModel.getLeftTreeModel(), model.getConfigModel().getLeftSourceModel(), t("observe.ui.datasource.editor.actions.synchro.referential.message.referential.leftData.loaded"), - evt -> updateLeftEnableActions(stepModel.getLeftTreeModel())); + evt -> RegisterTaskActionSupport.updateActions(stepModel, stepModel.getLeftTreeModel())); initTree(ui.getRightTreePane(), stepModel.getRightTreeModel(), model.getConfigModel().getRightSourceModel(), t("observe.ui.datasource.editor.actions.synchro.referential.message.referential.rightData.loaded"), - evt -> updateRightEnableActions(stepModel.getRightTreeModel())); + evt -> RegisterTaskActionSupport.updateActions(stepModel, stepModel.getRightTreeModel())); return WizardState.NEED_FIX; } ===================================== client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/synchronize/referential/ng/task/SwingReferentialSynchronizeTask.java ===================================== @@ -49,21 +49,23 @@ public class SwingReferentialSynchronizeTask implements WithDecoratorService { private final String i18nKey; private final Differential differential; private final Icon icon; - // private final ReferentialSynchronizeResources resource; private final boolean left; private final ReferentialSynchronizeTaskType taskType; - public SwingReferentialSynchronizeTask(ReferentialSynchronizeResources resource, boolean left, Differential differential) { -// this.resource = resource; - this.left = left; + public SwingReferentialSynchronizeTask(String i18nKey, Differential differential, Icon icon, boolean left, ReferentialSynchronizeTaskType taskType) { + this.i18nKey = i18nKey; this.differential = differential; - this.icon = resource.getIcon(left); - this.i18nKey = resource.getTaskLabel(left); - this.taskType = resource.getTaskType(); + this.icon = icon; + this.left = left; + this.taskType = taskType; this.dataStr = differential.getLabel(getDecoratorService()); this.typeStr = t(ContentReferentialUII18nHelper.getType(differential.getDtoType())); } + public SwingReferentialSynchronizeTask(ReferentialSynchronizeResources resource, boolean left, Differential differential) { + this(resource.getTaskLabel(left), differential, resource.getIcon(left), left, resource.getTaskType()); + } + public final Differential getDifferential() { return differential; } ===================================== client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/synchronize/referential/ng/task/SwingWithReplaceDataTask.java ===================================== @@ -28,7 +28,6 @@ import fr.ird.observe.dto.referential.differential.Differential; import fr.ird.observe.services.service.actions.synchro.referential.ng.task.ReferentialSynchronizeTask; import java.util.Date; -import java.util.Objects; import static io.ultreia.java4all.i18n.I18n.t; @@ -42,8 +41,8 @@ public class SwingWithReplaceDataTask extends SwingReferentialSynchronizeTask { private final String replaceDataStr; public SwingWithReplaceDataTask(ReferentialSynchronizeResources resource, boolean left, Differential differential, ReferentialDtoReference replaceData) { - super(resource, left, differential); - this.replaceData = Objects.requireNonNull(replaceData); + super(resource.getTaskReplaceLabel(left), differential, resource.getIcon(left), left, resource.getTaskType()); + this.replaceData = replaceData; this.replaceDataStr = getDecoratorService().getReferentialReferenceDecorator(replaceData.getClass()).toString(replaceData); } ===================================== client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/synchronize/referential/ng/tree/ReferentialSelectionTreePaneHandler.java ===================================== @@ -32,6 +32,7 @@ import fr.ird.observe.client.datasource.actions.synchronize.referential.ng.tree. import fr.ird.observe.client.datasource.actions.synchronize.referential.ng.tree.actions.RegisterDelete; import fr.ird.observe.client.datasource.actions.synchronize.referential.ng.tree.actions.RegisterRevert; import fr.ird.observe.client.datasource.actions.synchronize.referential.ng.tree.actions.SelectUnselect; +import fr.ird.observe.client.util.init.DefaultUIInitializer; import org.nuiton.jaxx.runtime.spi.UIHandler; import java.awt.BorderLayout; @@ -42,6 +43,11 @@ import java.awt.BorderLayout; */ public class ReferentialSelectionTreePaneHandler implements UIHandler<ReferentialSelectionTreePane> { + @Override + public void afterInit(ReferentialSelectionTreePane ui) { + DefaultUIInitializer.doInit(ui); + } + void init(ReferentialSelectionTreePane ui) { ReferentialSynchroUI parent = ui.getContextValue(ReferentialSynchroUI.class, ReferentialSynchroUIHandler.ADMIN_TAB_UI); ReferentialSynchroModel stepModel = parent.getStepModel(); ===================================== client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/synchronize/referential/ng/tree/ReferentialSynchronizeTreeModel.java ===================================== @@ -33,7 +33,6 @@ import fr.ird.observe.client.datasource.actions.synchronize.referential.ng.tree. import fr.ird.observe.dto.referential.ReferentialDto; import javax.swing.tree.DefaultTreeModel; -import javax.swing.tree.TreeNode; import java.beans.PropertyChangeListener; import java.beans.PropertyChangeSupport; import java.util.Collection; @@ -87,7 +86,7 @@ public class ReferentialSynchronizeTreeModel extends DefaultTreeModel { if (node instanceof ReferentialTypeSynchroNode) { ReferentialTypeSynchroNode node1 = (ReferentialTypeSynchroNode) node; node1.updateSelect(value); - Enumeration<? extends TreeNode> children = node1.children(); + Enumeration<?> children = node1.children(); while (children.hasMoreElements()) { ReferentialSynchroNodeSupport childNode = (ReferentialSynchroNodeSupport) children.nextElement(); updateSelected(value, childNode); ===================================== client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/synchronize/referential/ng/tree/actions/RegisterDeactivateWithReplacement.java ===================================== @@ -37,6 +37,11 @@ public class RegisterDeactivateWithReplacement extends RegisterTaskActionSupport super(ui, ReferentialSynchronizeResources.DEACTIVATE_WITH_REPLACEMENT, left); } + protected <R extends ReferentialDtoReference> boolean shouldReplace(R reference) { + // always ask a replacement for this task + return true; + } + @Override protected String getReplaceTitle(ReferentialDtoReference reference) { return t("observe.ui.datasource.editor.actions.synchro.referential.replaceBeforeDeactivate.title", typeStr, referenceStr); ===================================== client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/synchronize/referential/ng/tree/actions/RegisterDelete.java ===================================== @@ -22,9 +22,11 @@ package fr.ird.observe.client.datasource.actions.synchronize.referential.ng.tree * #L% */ +import fr.ird.observe.client.datasource.actions.synchronize.referential.ng.ReferentialSynchroModel; import fr.ird.observe.client.datasource.actions.synchronize.referential.ng.ReferentialSynchronizeResources; import fr.ird.observe.client.datasource.actions.synchronize.referential.ng.tree.ReferentialSelectionTreePane; import fr.ird.observe.dto.reference.ReferentialDtoReference; +import fr.ird.observe.services.service.usage.DtoUsageCountResult; import static io.ultreia.java4all.i18n.I18n.t; @@ -42,4 +44,11 @@ public class RegisterDelete extends RegisterTaskActionSupport { return t("observe.ui.datasource.editor.actions.synchro.referential.replaceBeforeDelete.title", typeStr, referenceStr); } + @Override + protected <R extends ReferentialDtoReference> boolean shouldReplace(R reference) { + // check if there is some data using it + ReferentialSynchroModel stepModel = parentUI.getStepModel(); + DtoUsageCountResult<?> usages = stepModel.getUsageCount(isLeft(), reference); + return !usages.isEmpty(); + } } ===================================== client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/synchronize/referential/ng/tree/actions/RegisterTaskActionSupport.java ===================================== @@ -24,9 +24,6 @@ package fr.ird.observe.client.datasource.actions.synchronize.referential.ng.tree import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableSet; -import fr.ird.observe.client.datasource.actions.AdminStep; -import fr.ird.observe.client.datasource.actions.AdminTabUI; -import fr.ird.observe.client.datasource.actions.AdminUI; import fr.ird.observe.client.datasource.actions.synchronize.referential.ng.ReferentialReplaceUI; import fr.ird.observe.client.datasource.actions.synchronize.referential.ng.ReferentialReplaceUIHandler; import fr.ird.observe.client.datasource.actions.synchronize.referential.ng.ReferentialSynchroModel; @@ -34,6 +31,7 @@ import fr.ird.observe.client.datasource.actions.synchronize.referential.ng.Refer import fr.ird.observe.client.datasource.actions.synchronize.referential.ng.ReferentialSynchronizeResources; import fr.ird.observe.client.datasource.actions.synchronize.referential.ng.task.SwingReferentialSynchronizeTask; import fr.ird.observe.client.datasource.actions.synchronize.referential.ng.task.SwingWithIncludedPropertyNamesTask; +import fr.ird.observe.client.datasource.actions.synchronize.referential.ng.task.SwingWithReplaceDataTask; import fr.ird.observe.client.datasource.actions.synchronize.referential.ng.tree.ReferentialSelectionTree; import fr.ird.observe.client.datasource.actions.synchronize.referential.ng.tree.ReferentialSelectionTreePane; import fr.ird.observe.client.datasource.actions.synchronize.referential.ng.tree.ReferentialSynchronizeTreeModel; @@ -80,16 +78,32 @@ import static io.ultreia.java4all.i18n.I18n.t; public abstract class RegisterTaskActionSupport extends ReferentialSelectionTreePaneActionSupport implements WithDecoratorService { private static final Logger log = LogManager.getLogger(RegisterTaskActionSupport.class); + protected final ReferentialSynchroUI parentUI; final Predicate<ReferentialSynchroNodeSupport> predicate; final ReferentialSelectionTreePane ui; private final boolean left; - private final boolean needReplace; private final ReferentialSynchronizeTaskType taskType; private final ReferentialSynchronizeResources resource; - private final ReferentialSynchroUI parentUI; String typeStr; String referenceStr; + public static void updateActions(ReferentialSynchroModel stepModel, ReferentialSynchronizeTreeModel treeModel) { + treeModel.updateSelectedActions(); + if (treeModel.isLeft()) { + stepModel.setCopyLeft(treeModel.isCanAdd() || treeModel.isCanUpdate()); + stepModel.setDeleteLeft(treeModel.isCanDelete()); + stepModel.setDeactivateLeft(treeModel.isCanDelete()); + stepModel.setDeactivateWithReplaceLeft(treeModel.isCanDelete()); + stepModel.setRevertLeft(treeModel.isCanRevert()); + } else { + stepModel.setCopyRight(treeModel.isCanAdd() || treeModel.isCanUpdate()); + stepModel.setDeleteRight(treeModel.isCanDelete()); + stepModel.setDeactivateRight(treeModel.isCanDelete()); + stepModel.setDeactivateWithReplaceRight(treeModel.isCanDelete()); + stepModel.setRevertRight(treeModel.isCanRevert()); + } + } + RegisterTaskActionSupport(ReferentialSelectionTreePane ui, ReferentialSynchronizeResources resource, boolean left) { super("", null, null, Objects.requireNonNull(resource).getKeyStroke(left)); this.resource = resource; @@ -104,7 +118,7 @@ public abstract class RegisterTaskActionSupport extends ReferentialSelectionTree this.ui = ui; this.left = left; this.taskType = resource.getTaskType(); - this.needReplace = resource.withReplace(); +// this.needReplace = resource.withReplace(); parentUI = ui.getContextValue(ReferentialSynchroUI.class, "synchroParent"); Predicate<ReferentialSynchroNodeSupport> predicate = resource.getPredicate(); @@ -127,7 +141,15 @@ public abstract class RegisterTaskActionSupport extends ReferentialSelectionTree } protected final SwingReferentialSynchronizeTask createTask(boolean left, Differential differential, ReferentialDtoReference replaceReference, ImmutableSet<String> includedPropertyNames, DifferentialPropertyList includedModifiedProperties) { - return getResource().createTask(left, differential, replaceReference, includedPropertyNames, includedModifiedProperties); + ReferentialSynchronizeResources resource = getResource(); + if (replaceReference != null) { + return new SwingWithReplaceDataTask(resource, left, differential, replaceReference); + } + if (resource.withProperties()) { + return new SwingWithIncludedPropertyNamesTask(resource, left, differential, includedPropertyNames, includedModifiedProperties); + + } + return new SwingReferentialSynchronizeTask(resource, left, differential); } public ReferentialSynchronizeResources getResource() { @@ -147,7 +169,7 @@ public abstract class RegisterTaskActionSupport extends ReferentialSelectionTree ReferentialSynchronizeTreeModel treeModel = getTreeModel(); createTasks(); treeModel.clearSelection(); - updateActions(treeModel); + updateActions(parentUI.getStepModel(), treeModel); SwingUtilities.invokeLater(getTree()::repaint); } @@ -189,6 +211,11 @@ public abstract class RegisterTaskActionSupport extends ReferentialSelectionTree } } + protected <R extends ReferentialDtoReference> boolean shouldReplace(R reference) { + // by default never ask for a replacement + return false; + } + @SuppressWarnings("unchecked") public <R extends ReferentialDtoReference> void process(ReferentialSynchroNodeSupport node, Collection<SwingReferentialSynchronizeTask> addedTasks, @@ -198,7 +225,7 @@ public abstract class RegisterTaskActionSupport extends ReferentialSelectionTree R reference = (R) node.getReferentialReference(); R replaceReference = null; - if (needReplace) { + if (shouldReplace(reference)) { Class<R> type = (Class<R>) reference.getReferenceType(); List<R> references = new LinkedList<>(parentUI.getStepModel().getPossibleReplaceUniverse(left, reference)); @@ -301,63 +328,14 @@ public abstract class RegisterTaskActionSupport extends ReferentialSelectionTree } public String sendMessage(String message) { - AdminStep step = parentUI.getStep(); - addMessage(step, message); + addMessage(message); return message; } - - public void addMessage(AdminStep step, String text) { + public void addMessage(String text) { JTextArea progression = parentUI.getProgression(); progression.append(text + "\n"); progression.setCaretPosition(progression.getDocument().getLength()); } - public void addMessage(AdminTabUI ui, AdminStep step, String text) { - JTextArea progression = ui.getProgression(); - progression.append(text + "\n"); - progression.setCaretPosition(progression.getDocument().getLength()); - } - - - protected AdminUI getParentUI() { - return parentUI.getContextValue(AdminUI.class, "parent"); - } - - - protected void updateLeftEnableActions(ReferentialSynchronizeTreeModel treeModel) { - - ReferentialSynchroModel stepModel = parentUI.getStepModel(); - - treeModel.updateSelectedActions(); - stepModel.setCopyLeft(treeModel.isCanAdd() || treeModel.isCanUpdate()); - stepModel.setDeleteLeft(treeModel.isCanDelete()); - stepModel.setDeactivateLeft(treeModel.isCanDelete()); - stepModel.setDeactivateWithReplaceLeft(treeModel.isCanDelete()); - stepModel.setRevertLeft(treeModel.isCanRevert()); - stepModel.setSkipLeft(treeModel.isCanSkip()); - } - - protected void updateRightEnableActions(ReferentialSynchronizeTreeModel treeModel) { - - ReferentialSynchroModel stepModel = parentUI.getStepModel(); - - treeModel.updateSelectedActions(); - stepModel.setCopyRight(treeModel.isCanAdd() || treeModel.isCanUpdate()); - stepModel.setDeleteRight(treeModel.isCanDelete()); - stepModel.setDeactivateRight(treeModel.isCanDelete()); - stepModel.setDeactivateWithReplaceRight(treeModel.isCanDelete()); - stepModel.setRevertRight(treeModel.isCanRevert()); - stepModel.setSkipRight(treeModel.isCanSkip()); - } - - - protected void updateActions(ReferentialSynchronizeTreeModel treeModel) { - if (treeModel.isLeft()) { - updateLeftEnableActions(treeModel); - } else { - updateRightEnableActions(treeModel); - } - } - } ===================================== client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/ContentUIInitializer.java ===================================== @@ -74,6 +74,7 @@ import javax.swing.JComponent; import javax.swing.JLabel; import javax.swing.JList; import javax.swing.JScrollBar; +import javax.swing.JSplitPane; import javax.swing.JTabbedPane; import javax.swing.JToolBar; import javax.swing.KeyStroke; @@ -193,6 +194,7 @@ public class ContentUIInitializer<UI extends ContentUI> extends UIInitializerSup .onComponents(BeanEnumEditor.class, this::init) .onComponents(ObserveSwingValidator.class, this::init) .onComponents(JLabel.class, this::init) + .onComponents(JSplitPane.class, this::init) .onComponents(BigTextEditor.class, this::init) .onComponents(UrlEditor.class, this::init) .onComponents(NormalTextEditor.class, this::init) ===================================== client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/list/actions/GotoSelectedData.java ===================================== @@ -44,7 +44,7 @@ public final class GotoSelectedData<D extends DataDto, R extends DataDtoReferenc public GotoSelectedData(Class<D> dataType) { super(dataType, null, null, "go-down", ObserveKeyStrokesEditorApi.KEY_STROKE_ALT_ENTER); - setText(ContentListUII18nHelper.getListActionGoToSelected(getDataType())); + setText(ContentListUII18nHelper.getActionGoToSelected(getDataType())); } @Override ===================================== client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/navigation/NavigationUIHandler.java ===================================== @@ -93,7 +93,7 @@ public class NavigationUIHandler implements UIHandler<NavigationUI> { @Override public void afterInit(NavigationUI ui) { UIInitializerResult initializerResult = new Init(ui).initUI(); - actionsToReload = ReloadAction.collect(initializerResult.getComponents(AbstractButton.class)); + actionsToReload = ReloadAction.collect(initializerResult.getSubComponents(AbstractButton.class)); } public void updateActions(NavigationNode selectedNode) { ===================================== client/datasource/editor/api/src/main/resources/fr/ird/observe/client/datasource/editor/api/content/data/list/ContentListUI.keys ===================================== @@ -1,12 +1,12 @@ type list.title list.message.none -list.action.goToSelected list.navigation.node action.create action.create.tip action.goToOpen action.goToOpen.short +action.goToSelected action.move.tip action.move action.move.choose.parent.title ===================================== client/i18n/src/main/i18n/translations/observe_en_GB.properties ===================================== @@ -1405,8 +1405,10 @@ observe.ui.datasource.editor.actions.synchro.referential.task.deactivateFromLeft observe.ui.datasource.editor.actions.synchro.referential.task.deactivateFromLeftWithReplacement=Disable in left database\: %s - «%s» to replace by «%s» observe.ui.datasource.editor.actions.synchro.referential.task.deactivateFromRight=Disable in right database\: %s - «%s» observe.ui.datasource.editor.actions.synchro.referential.task.deactivateFromRightWithReplacement=Disable in right database\: %s - «%s» to replace by «%s» -observe.ui.datasource.editor.actions.synchro.referential.task.deleteFromLeft=Delete in left database\: %s - «%s» to replace by «%s» -observe.ui.datasource.editor.actions.synchro.referential.task.deleteFromRight=Delete in right database\: %s - «%s» to replace by «%s» +observe.ui.datasource.editor.actions.synchro.referential.task.deleteFromLeft=Delete in left database\: %s - «%s» with no replacement +observe.ui.datasource.editor.actions.synchro.referential.task.deleteFromLeftWithReplacement=Delete in left database\: %s - «%s» to replace by «%s» +observe.ui.datasource.editor.actions.synchro.referential.task.deleteFromRight=Delete in right database\: %s - «%s» with no replacement +observe.ui.datasource.editor.actions.synchro.referential.task.deleteFromRightWithReplacement=Delete in right database\: %s - «%s» to replace by «%s» observe.ui.datasource.editor.actions.synchro.referential.task.include.properties=Included properties\: %s observe.ui.datasource.editor.actions.synchro.referential.task.prepare=Register action %s\n * old left last update date \: %s\n * old right last update date \: %s\n * new last update date \: %s observe.ui.datasource.editor.actions.synchro.referential.task.revertFromLeft=Revert in left database\: %s - «%s» ===================================== client/i18n/src/main/i18n/translations/observe_es_ES.properties ===================================== @@ -1405,8 +1405,10 @@ observe.ui.datasource.editor.actions.synchro.referential.task.deactivateFromLeft observe.ui.datasource.editor.actions.synchro.referential.task.deactivateFromLeftWithReplacement=Desactivar en la base de la iquierda \: %s - «%s» debe ser reemplazado por «%s» observe.ui.datasource.editor.actions.synchro.referential.task.deactivateFromRight=Desactivar en la base de la derecha \: %s - «%s» observe.ui.datasource.editor.actions.synchro.referential.task.deactivateFromRightWithReplacement=Desactivar en la base de la derecha \: %s - «%s» debe ser reemplazado por «%s» -observe.ui.datasource.editor.actions.synchro.referential.task.deleteFromLeft=Eliminar en la base de la izquierda\: %s - «%s» debe ser reemplazado por «%s» -observe.ui.datasource.editor.actions.synchro.referential.task.deleteFromRight=Eliminar en la base de la izquierda \: %s - «%s» debe ser reemplazado por «%s» +observe.ui.datasource.editor.actions.synchro.referential.task.deleteFromLeft=Eliminar en la base de la izquierda\: %s - «%s» +observe.ui.datasource.editor.actions.synchro.referential.task.deleteFromLeftWithReplacement=Eliminar en la base de la izquierda\: %s - «%s» debe ser reemplazado por «%s» +observe.ui.datasource.editor.actions.synchro.referential.task.deleteFromRight=Eliminar en la base de la izquierda \: %s - «%s» +observe.ui.datasource.editor.actions.synchro.referential.task.deleteFromRightWithReplacement=Eliminar en la base de la izquierda \: %s - «%s» debe ser reemplazado por «%s» observe.ui.datasource.editor.actions.synchro.referential.task.include.properties=Included properties\: %s \#TODO observe.ui.datasource.editor.actions.synchro.referential.task.prepare=Registro de la acción %s\n * old left last update date \: %s\n * old right last update date \: %s\n * new last update date \: %s \#TODO observe.ui.datasource.editor.actions.synchro.referential.task.revertFromLeft=Volver atrás en la base de la izquierda \: %s - «%s» ===================================== client/i18n/src/main/i18n/translations/observe_fr_FR.properties ===================================== @@ -1405,8 +1405,10 @@ observe.ui.datasource.editor.actions.synchro.referential.task.deactivateFromLeft observe.ui.datasource.editor.actions.synchro.referential.task.deactivateFromLeftWithReplacement=Désactiver dans la base de gauche \: %s - «%s» à remplacer par «%s» observe.ui.datasource.editor.actions.synchro.referential.task.deactivateFromRight=Désactiver dans la base de droite \: %s - «%s» observe.ui.datasource.editor.actions.synchro.referential.task.deactivateFromRightWithReplacement=Désactiver dans la base de droite \: %s - «%s» à remplacer par «%s» -observe.ui.datasource.editor.actions.synchro.referential.task.deleteFromLeft=Supprimer dans la base de gauche \: %s - «%s» à remplacer par «%s» -observe.ui.datasource.editor.actions.synchro.referential.task.deleteFromRight=Supprimer dans la base de droite \: %s - «%s» à remplacer par «%s» +observe.ui.datasource.editor.actions.synchro.referential.task.deleteFromLeft=Supprimer dans la base de gauche \: %s - «%s» sans remplacement +observe.ui.datasource.editor.actions.synchro.referential.task.deleteFromLeftWithReplacement=Supprimer dans la base de gauche \: %s - «%s» à remplacer par «%s» +observe.ui.datasource.editor.actions.synchro.referential.task.deleteFromRight=Supprimer dans la base de droite \: %s - «%s» sans remplacement +observe.ui.datasource.editor.actions.synchro.referential.task.deleteFromRightWithReplacement=Supprimer dans la base de droite \: %s - «%s» à remplacer par «%s» observe.ui.datasource.editor.actions.synchro.referential.task.include.properties=Propriétés incluses \: %s observe.ui.datasource.editor.actions.synchro.referential.task.prepare=Enregistrement de l'action %s\n * ancienne date de mise à jour à gauche \: %s\n * ancienne date de mise à jourà droite \: %s\n * nouvelle date de mise à jour \: %s observe.ui.datasource.editor.actions.synchro.referential.task.revertFromLeft=Revenir en arrière dans la base de gauche \: %s - «%s» ===================================== models/persistence/src/main/java/fr/ird/observe/entities/data/ps/observation/SetImpl.java ===================================== @@ -22,7 +22,6 @@ package fr.ird.observe.entities.data.ps.observation; import com.google.common.collect.ImmutableSet; -import fr.ird.observe.dto.IdDto; import fr.ird.observe.dto.ProtectedIdsPs; import fr.ird.observe.dto.data.DataDto; import fr.ird.observe.dto.data.ps.observation.DiscardedTargetCatchDto; @@ -44,7 +43,6 @@ import fr.ird.observe.entities.referential.ps.common.SpeciesFate; import org.nuiton.util.DateUtil; import org.nuiton.util.NumberUtil; -import java.util.Collection; import java.util.Date; import java.util.List; import java.util.Objects; @@ -185,11 +183,11 @@ public class SetImpl extends SetAbstract { @Override public <D extends DataDto> void toDto(ReferentialLocale referentialLocale, D dto) { if (dto instanceof SetDiscardedTargetCatchDto) { - toSetTargetCatchDto(true, referentialLocale, dto, DiscardedTargetCatchDto.class); + toSetDiscardedTargetCatchDto(referentialLocale, (SetDiscardedTargetCatchDto) dto); return; } if (dto instanceof SetKeptTargetCatchDto) { - toSetTargetCatchDto(false, referentialLocale, dto, KeptTargetCatchDto.class); + toSetKeptTargetCatchDto(referentialLocale, (SetKeptTargetCatchDto) dto); return; } if (dto instanceof SetNonTargetCatchDto) { @@ -221,11 +219,11 @@ public class SetImpl extends SetAbstract { @Override public <D extends DataDto> void fromDto(ReferentialLocale referentialLocale, D dto) { if (dto instanceof SetDiscardedTargetCatchDto) { - fromSetTargetCatchDto(true, referentialLocale, dto); + fromSetDiscardedTargetCatchDto(referentialLocale, (SetDiscardedTargetCatchDto) dto); return; } if (dto instanceof SetKeptTargetCatchDto) { - fromSetTargetCatchDto(false, referentialLocale, dto); + fromSetKeptTargetCatchDto(referentialLocale, (SetKeptTargetCatchDto) dto); return; } if (dto instanceof SetNonTargetCatchDto) { @@ -253,18 +251,36 @@ public class SetImpl extends SetAbstract { } } - private <D extends DataDto, C extends DataDto> void toSetTargetCatchDto(boolean discarded, ReferentialLocale referentialLocale, D dto, Class<C> dtoCatchType) { + private void toSetKeptTargetCatchDto(ReferentialLocale referentialLocale, SetKeptTargetCatchDto dto) { super.toDto(referentialLocale, dto); - List<C> dtoList = EntityHelper.toDataDtoList(referentialLocale, getTargetCatch(discarded), dtoCatchType); - dto.set(SetKeptTargetCatchDto.PROPERTY_TARGET_CATCH, dtoList); + List<KeptTargetCatchDto> dtoList = EntityHelper.toDataDtoList(referentialLocale, getTargetCatch(false), KeptTargetCatchDto.class); + dto.setTargetCatch(dtoList); // is there some sample? - TargetSample targetSample = getTargetSample(discarded); + TargetSample targetSample = getTargetSample(false); if (targetSample != null) { // get usable species ids java.util.Set<String> speciesId = DtoReferenceAware.ids(targetSample.getTargetLength().stream().map(TargetLength::getSpecies)); // mark catch if there is associated samples to it dtoList.forEach(catchDto -> { - SpeciesReference species = catchDto.get(KeptTargetCatchDto.PROPERTY_SPECIES); + SpeciesReference species = catchDto.getSpecies(); + boolean hasSample = speciesId.contains(species.getId()); + catchDto.set(KeptTargetCatchDto.PROPERTY_HAS_SAMPLE, hasSample); + }); + } + } + + private void toSetDiscardedTargetCatchDto(ReferentialLocale referentialLocale, SetDiscardedTargetCatchDto dto) { + super.toDto(referentialLocale, dto); + List<DiscardedTargetCatchDto> dtoList = EntityHelper.toDataDtoList(referentialLocale, getTargetCatch(true), DiscardedTargetCatchDto.class); + dto.setTargetCatch(dtoList); + // is there some sample? + TargetSample targetSample = getTargetSample(true); + if (targetSample != null) { + // get usable species ids + java.util.Set<String> speciesId = DtoReferenceAware.ids(targetSample.getTargetLength().stream().map(TargetLength::getSpecies)); + // mark catch if there is associated samples to it + dtoList.forEach(catchDto -> { + SpeciesReference species = catchDto.getSpecies(); boolean hasSample = speciesId.contains(species.getId()); catchDto.set(KeptTargetCatchDto.PROPERTY_HAS_SAMPLE, hasSample); }); @@ -297,19 +313,33 @@ public class SetImpl extends SetAbstract { } } - private <D extends DataDto> void fromSetTargetCatchDto(boolean discarded, ReferentialLocale referentialLocale, D dto) { + private void fromSetKeptTargetCatchDto(ReferentialLocale referentialLocale, SetKeptTargetCatchDto dto) { + // keep other catches + List<TargetCatch> otherTargetCatches = getTargetCatch(true); + // do normal copy + super.fromDto(referentialLocale, dto); + // delete any sample which not using the given species ids + TargetSample targetSample = getTargetSample(false); + if (targetSample != null) { + List<KeptTargetCatchDto> targetCatch = dto.getTargetCatch(); + Set<String> speciesIds = DtoReferenceAware.ids(targetCatch.stream().map(KeptTargetCatchDto::getSpecies)); + // remove sample from species ids + targetSample.getTargetLength().removeIf(targetLength -> !speciesIds.contains(targetLength.getSpecies().getTopiaId())); + } + // push back other catches + otherTargetCatches.forEach(this::addTargetCatch); + } + + private void fromSetDiscardedTargetCatchDto(ReferentialLocale referentialLocale, SetDiscardedTargetCatchDto dto) { // keep other catches - List<TargetCatch> otherTargetCatches = getTargetCatch(!discarded); + List<TargetCatch> otherTargetCatches = getTargetCatch(false); // do normal copy super.fromDto(referentialLocale, dto); - List<TargetCatch> newCatches = getTargetCatch(discarded); - // set back set in any catches - newCatches.forEach(t -> t.setSet(this)); // delete any sample which not using the given species ids - TargetSample targetSample = getTargetSample(discarded); + TargetSample targetSample = getTargetSample(true); if (targetSample != null) { - Collection<? extends IdDto> targetCatch = dto.get("targetCatch"); - Set<String> speciesIds = DtoReferenceAware.ids(targetCatch.stream().map(t -> t.get("species"))); + List<DiscardedTargetCatchDto> targetCatch = dto.getTargetCatch(); + Set<String> speciesIds = DtoReferenceAware.ids(targetCatch.stream().map(DiscardedTargetCatchDto::getSpecies)); // remove sample from species ids targetSample.getTargetLength().removeIf(targetLength -> !speciesIds.contains(targetLength.getSpecies().getTopiaId())); } ===================================== models/persistence/src/main/models/Observe-20-data-ps-observation.model ===================================== @@ -181,22 +181,20 @@ setEndSetTime(endSetTime Date) getEndPursingTime() Date setEndPursingTime(endPursingTime Date) -data.ps.observation.TargetCatch > data.DataEntity | naturalIdMutable entity +data.ps.observation.TargetCatch > data.DataEntity | entity comment + {*:1} String | hibernateAttributeType=text catchWeight + {*:1} Float | sqlType=numeric -well + {*:1} String | naturalId notNull=false +well + {*:1} String broughtOnDeck + {*:1} Boolean -discarded + {*:1} boolean | naturalId -set {*:1} data.ps.observation.Set | naturalId inverse skipModelNavigation -weightCategory {*:1} referential.ps.observation.WeightCategory | naturalId -reasonForDiscard {*:0..1} referential.ps.observation.ReasonForDiscard | naturalId notNull=false +discarded + {*:1} boolean +weightCategory {*:1} referential.ps.observation.WeightCategory +reasonForDiscard {*:0..1} referential.ps.observation.ReasonForDiscard weightMeasureMethod {*:0..1} referential.common.WeightMeasureMethod getSpecies() referential.common.Species setSpecies(species referential.common.Species) isKept() boolean isUsableForSample() boolean - data.ps.observation.TargetLength > data.DataEntity >> data.ps.observation.LengthWeightComputableAware | entity constants=totalWeight length + {*:1} Float | sqlType=numeric isLengthComputed + {*:1} boolean ===================================== models/persistence/src/main/resources/db/migration/8.0/50_ps_observation_create-common.sql ===================================== @@ -33,7 +33,7 @@ CREATE TABLE ps_observation.reasonfornullset(topiaId VARCHAR(255) NOT NULL CONST CREATE TABLE ps_observation.set(topiaId VARCHAR(255) NOT NULL CONSTRAINT pk_ps_observation_set PRIMARY KEY, topiaVersion BIGINT NOT NULL, topiaCreateDate TIMESTAMP NOT NULL, starttime TIME, endpursingtimestamp TIMESTAMP, endsettimestamp TIMESTAMP, maxgeardepth INTEGER, currentspeed NUMERIC, currentdirection INTEGER, schooltopdepth INTEGER, schoolmeandepth INTEGER, schoolthickness INTEGER, supportvesselname VARCHAR(255), comment VARCHAR(1025), schooltype VARCHAR(255), currentmeasuredepth INTEGER, reasonfornullset VARCHAR(255), lastUpdateDate TIMESTAMP DEFAULT now() NOT NULL, targetcatchcompositionestimatedbyobserver BOOLEAN DEFAULT FALSE, targetdiscardcatchcompositionestimatedbyobserver BOOLEAN DEFAULT FALSE, homeId VARCHAR(255)); CREATE TABLE ps_observation.nontargetcatchrelease(topiaId VARCHAR(255) NOT NULL CONSTRAINT pk_ps_observation_non_target_catch_release PRIMARY KEY, topiaVersion BIGINT NOT NULL, topiaCreateDate TIMESTAMP NOT NULL, lastUpdateDate TIMESTAMP NOT NULL, length NUMERIC, count INTEGER, acquisitionmode INTEGER, comment VARCHAR(1025), species VARCHAR(255), sex VARCHAR(255), speciesgroupreleasemode VARCHAR(255), set VARCHAR(255), set_idx INTEGER, status VARCHAR(255) NOT NULL, conformity VARCHAR(255), releasingtime VARCHAR(255), lengthmeasuremethod VARCHAR(255), homeId VARCHAR(255)); CREATE TABLE ps_observation.nontargetsample(topiaId VARCHAR(255) NOT NULL CONSTRAINT pk_ps_observation_nontargetsample PRIMARY KEY, topiaVersion BIGINT NOT NULL, topiaCreateDate TIMESTAMP NOT NULL, comment VARCHAR(1025), set VARCHAR(255), lastUpdateDate TIMESTAMP DEFAULT now() NOT NULL, homeId VARCHAR(255)); -CREATE TABLE ps_observation.schoolestimate(topiaId VARCHAR(255) NOT NULL CONSTRAINT pk_ps_observation_schoolestimate PRIMARY KEY, topiaVersion BIGINT NOT NULL, set VARCHAR(255) NOT NULL, species VARCHAR(255) NOT NULL, topiaCreateDate TIMESTAMP NOT NULL, totalweight INTEGER, meanweight INTEGER, lastUpdateDate TIMESTAMP DEFAULT now() NOT NULL, weightmeasuremethod VARCHAR(255), CONSTRAINT uk_schoolestimate_species_set unique(species, set), homeId VARCHAR(255)); +CREATE TABLE ps_observation.schoolestimate(topiaId VARCHAR(255) NOT NULL CONSTRAINT pk_ps_observation_schoolestimate PRIMARY KEY, topiaVersion BIGINT NOT NULL, set VARCHAR(255), species VARCHAR(255) NOT NULL, topiaCreateDate TIMESTAMP NOT NULL, totalweight INTEGER, meanweight INTEGER, lastUpdateDate TIMESTAMP DEFAULT now() NOT NULL, weightmeasuremethod VARCHAR(255), CONSTRAINT uk_schoolestimate_species_set unique(species, set), homeId VARCHAR(255)); CREATE TABLE ps_observation.nontargetcatch(topiaId VARCHAR(255) NOT NULL CONSTRAINT pk_ps_observation_nontargetcatch PRIMARY KEY, topiaVersion BIGINT NOT NULL, topiaCreateDate TIMESTAMP NOT NULL, catchweight NUMERIC, catchweightcomputedsource INTEGER, meanweight NUMERIC, meanweightcomputedsource INTEGER, meanlength NUMERIC, meanlengthcomputedsource INTEGER, totalcount INTEGER, totalcountcomputedsource INTEGER, comment VARCHAR(1025), reasonfordiscard VARCHAR(255), species VARCHAR(255), speciesfate VARCHAR(255), set VARCHAR(255), lastUpdateDate TIMESTAMP DEFAULT now() NOT NULL, well VARCHAR(255), set_idx INTEGER, lengthmeasuremethod VARCHAR(255), weightmeasuremethod VARCHAR(255), homeId VARCHAR(255)); CREATE TABLE ps_observation.nontargetlength(topiaId VARCHAR(255) NOT NULL CONSTRAINT pk_ps_observation_nontargetlength PRIMARY KEY, topiaVersion BIGINT NOT NULL, topiaCreateDate TIMESTAMP NOT NULL, length NUMERIC, islengthcomputed BOOLEAN, picturesreferences VARCHAR(255), weight NUMERIC, isweightcomputed BOOLEAN, count INTEGER, acquisitionmode INTEGER, species VARCHAR(255), nontargetsample VARCHAR(255), sex VARCHAR(255), lastUpdateDate TIMESTAMP DEFAULT now() NOT NULL, sizemeasuretype VARCHAR(255), weightmeasuretype VARCHAR(255), tagnumber VARCHAR(255), speciesfate VARCHAR(255), nontargetsample_idx INTEGER, lengthmeasuremethod VARCHAR(255), weightmeasuremethod VARCHAR(255), homeId VARCHAR(255)); CREATE TABLE ps_observation.speciesstatus(topiaId VARCHAR(255) NOT NULL CONSTRAINT pk_ps_observation_speciesstatus PRIMARY KEY, topiaVersion BIGINT NOT NULL, topiaCreateDate TIMESTAMP NOT NULL, code VARCHAR(255), uri VARCHAR(255), status INTEGER DEFAULT 1, label1 VARCHAR(255), label2 VARCHAR(255), label3 VARCHAR(255), label4 VARCHAR(255), label5 VARCHAR(255), label6 VARCHAR(255), label7 VARCHAR(255), label8 VARCHAR(255), needComment BOOLEAN DEFAULT FALSE, lastUpdateDate TIMESTAMP DEFAULT now() NOT NULL, homeId VARCHAR(255)); @@ -48,5 +48,5 @@ CREATE TABLE ps_observation.objectobservedspecies(topiaId VARCHAR(255) NOT NULL CREATE TABLE ps_observation.objectschoolestimate(topiaId VARCHAR(255) NOT NULL CONSTRAINT pk_ps_observation_objectschoolestimate PRIMARY KEY, topiaVersion BIGINT NOT NULL, topiaCreateDate TIMESTAMP NOT NULL, totalweight INTEGER, species VARCHAR(255), floatingobject VARCHAR(255), lastUpdateDate TIMESTAMP DEFAULT now() NOT NULL, weightmeasuremethod VARCHAR(255), homeId VARCHAR(255)); CREATE TABLE ps_observation.transmittingbuoy(topiaId VARCHAR(255) NOT NULL CONSTRAINT pk_ps_observation_transmittingbuoy PRIMARY KEY, topiaVersion BIGINT NOT NULL, topiaCreateDate TIMESTAMP NOT NULL, code VARCHAR(255), comment VARCHAR(1024), transmittingBuoyOwnership VARCHAR(255), transmittingbuoytype VARCHAR(255), transmittingbuoyoperation VARCHAR(255), floatingobject VARCHAR(255), country VARCHAR(255), vessel VARCHAR(255), lastUpdateDate TIMESTAMP DEFAULT now() NOT NULL, homeId VARCHAR(255)); CREATE TABLE ps_observation.weightcategory(topiaId VARCHAR(255) NOT NULL CONSTRAINT pk_ps_observation_weightcategory PRIMARY KEY, topiaVersion BIGINT NOT NULL, topiaCreateDate TIMESTAMP NOT NULL, code VARCHAR(255), uri VARCHAR(255), status INTEGER DEFAULT 1, label1 VARCHAR(255), label2 VARCHAR(255), label3 VARCHAR(255), label4 VARCHAR(255), label5 VARCHAR(255), label6 VARCHAR(255), label7 VARCHAR(255), label8 VARCHAR(255), species VARCHAR(255), needComment BOOLEAN DEFAULT FALSE, lastUpdateDate TIMESTAMP DEFAULT now() NOT NULL, homeId VARCHAR(255)); -CREATE TABLE ps_observation.targetcatch(topiaId VARCHAR(255) NOT NULL CONSTRAINT pk_ps_observation_targetcatch PRIMARY KEY, topiaVersion BIGINT NOT NULL, well VARCHAR(255), discarded BOOLEAN NOT NULL, set VARCHAR(255) NOT NULL, weightcategory VARCHAR(255) NOT NULL, reasonfordiscard VARCHAR(255), topiaCreateDate TIMESTAMP NOT NULL, catchweight NUMERIC, broughtondeck BOOLEAN, comment VARCHAR(1025), lastUpdateDate TIMESTAMP DEFAULT now() NOT NULL, set_idx INTEGER, weightmeasuremethod VARCHAR(255), CONSTRAINT uk_targetcatch_well_reasonfordiscard_weightcategory_discarded_s unique(well, reasonfordiscard, weightcategory, discarded, set), homeId VARCHAR(255)); +CREATE TABLE ps_observation.targetcatch(topiaId VARCHAR(255) NOT NULL CONSTRAINT pk_ps_observation_targetcatch PRIMARY KEY, topiaVersion BIGINT NOT NULL, well VARCHAR(255), discarded BOOLEAN NOT NULL, set VARCHAR(255), weightcategory VARCHAR(255) NOT NULL, reasonfordiscard VARCHAR(255), topiaCreateDate TIMESTAMP NOT NULL, catchweight NUMERIC, broughtondeck BOOLEAN, comment VARCHAR(1025), lastUpdateDate TIMESTAMP DEFAULT now() NOT NULL, set_idx INTEGER, weightmeasuremethod VARCHAR(255), CONSTRAINT uk_targetcatch_well_reasonfordiscard_weightcategory_discarded_s unique(well, reasonfordiscard, weightcategory, discarded, set), homeId VARCHAR(255)); CREATE TABLE ps_observation.activity_observedsystem(activity VARCHAR(255) NOT NULL, observedsystem VARCHAR(255) NOT NULL, CONSTRAINT pk_ps_observation_activity_observedsystem PRIMARY KEY(activity, observedsystem)); ===================================== services/api/src/main/java/fr/ird/observe/services/service/actions/synchro/referential/ng/task/ReferentialSynchronizeTaskType.java ===================================== @@ -30,27 +30,21 @@ package fr.ird.observe.services.service.actions.synchro.referential.ng.task; */ public enum ReferentialSynchronizeTaskType { - ADD(false, false, true), - UPDATE(false, true, true), - REVERT(false, true, false), - DELETE(true, false, false), - DEACTIVATE(false, false, false), - DEACTIVATE_WITH_REPLACEMENT(true, false, false); + ADD(false, true), + UPDATE(true, true), + REVERT(true, false), + DELETE(false, false), + DEACTIVATE(false, false), + DEACTIVATE_WITH_REPLACEMENT(false, false); - private final boolean withReplace; private final boolean withProperties; private final boolean toOtherSide; - ReferentialSynchronizeTaskType(boolean withReplace, boolean withProperties, boolean toOtherSide) { - this.withReplace = withReplace; + ReferentialSynchronizeTaskType(boolean withProperties, boolean toOtherSide) { this.withProperties = withProperties; this.toOtherSide = toOtherSide; } - public boolean withReplace() { - return withReplace; - } - public boolean withProperties() { return withProperties; } ===================================== tests/test/src/main/resources/db/8.0/dataForTestLongline.sql.gz ===================================== Binary files a/tests/test/src/main/resources/db/8.0/dataForTestLongline.sql.gz and b/tests/test/src/main/resources/db/8.0/dataForTestLongline.sql.gz differ ===================================== tests/test/src/main/resources/db/8.0/dataForTestSeine.sql.gz ===================================== Binary files a/tests/test/src/main/resources/db/8.0/dataForTestSeine.sql.gz and b/tests/test/src/main/resources/db/8.0/dataForTestSeine.sql.gz differ ===================================== tests/test/src/main/resources/db/8.0/empty_h2.sql.gz ===================================== Binary files a/tests/test/src/main/resources/db/8.0/empty_h2.sql.gz and b/tests/test/src/main/resources/db/8.0/empty_h2.sql.gz differ ===================================== tests/test/src/main/resources/db/8.0/empty_pg.sql.gz ===================================== Binary files a/tests/test/src/main/resources/db/8.0/empty_pg.sql.gz and b/tests/test/src/main/resources/db/8.0/empty_pg.sql.gz differ ===================================== tests/test/src/main/resources/db/8.0/referentiel.sql.gz ===================================== Binary files a/tests/test/src/main/resources/db/8.0/referentiel.sql.gz and b/tests/test/src/main/resources/db/8.0/referentiel.sql.gz differ View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/41b33c60a9516846f415c155… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/41b33c60a9516846f415c155… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] 6 commits: Add showReset css class
by Tony CHEMIT 13 Dec '20

13 Dec '20

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: d8798942 by Tony Chemit at 2020-12-13T14:06:25+01:00 Add showReset css class - - - - - 57fd399c by Tony Chemit at 2020-12-13T14:18:14+01:00 Avoid NPe if route date is null - - - - - a822e8be by Tony Chemit at 2020-12-13T14:40:27+01:00 Fix edit referential flow - - - - - 0fd7d3c0 by Tony Chemit at 2020-12-13T14:40:58+01:00 Replace BeanDateEditor by DateEditor - - - - - 17e8b3e6 by Tony Chemit at 2020-12-13T14:52:28+01:00 Méthodes de mesure par défaut - Closes #1646 - - - - - 41b33c60 by Tony Chemit at 2020-12-13T14:52:54+01:00 Bug sur suppression estimation banc - Closes #1647 - - - - - 26 changed files: - client/core/src/main/resources/fr/ird/observe/client/ui/ObserveCommon.jcss - client/datasource/editor/api/src/main/i18n/getters/java.getter - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/ContentUIInitializer.java - 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/ContentReferentialUIModel.java - 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/actions/BackToListReferential.java - client/datasource/editor/common/src/main/java/fr/ird/observe/client/datasource/editor/common/referential/common/FpaZoneUI.jaxx - client/datasource/editor/common/src/main/java/fr/ird/observe/client/datasource/editor/common/referential/common/LengthLengthParameterUI.jaxx - client/datasource/editor/common/src/main/java/fr/ird/observe/client/datasource/editor/common/referential/common/LengthWeightParameterUI.jaxx - client/datasource/editor/common/src/main/java/fr/ird/observe/client/datasource/editor/common/referential/common/ProgramUI.jaxx - client/datasource/editor/common/src/main/java/fr/ird/observe/client/datasource/editor/common/referential/common/ShipOwnerUI.jaxx - client/datasource/editor/common/src/main/java/fr/ird/observe/client/datasource/editor/common/referential/common/VesselUI.jaxx - client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/common/TripUI.jaxx - client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/landing/LandingUI.jaxx - client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/common/TripUI.jaxx - client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/observation/RouteUI.jaxx - client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/observation/SetKeptTargetCatchUIModel.java - client/i18n/src/main/i18n/translations/observe_en_GB.properties - client/i18n/src/main/i18n/translations/observe_es_ES.properties - client/i18n/src/main/i18n/translations/observe_fr_FR.properties - models/dto/src/main/java/fr/ird/observe/dto/ProtectedIdsPs.java - models/persistence/src/main/java/fr/ird/observe/entities/data/ps/observation/SetImpl.java - models/persistence/src/main/models/Observe-20-data-ps-observation.model - services/validation-spi/src/main/java/fr/ird/observe/validation/validators/ActivitySimpleSpeedDtoValidator.java - services/validation-spi/src/main/java/fr/ird/observe/validation/validators/ActivitySpeedDtoValidator.java Changes: ===================================== client/core/src/main/resources/fr/ird/observe/client/ui/ObserveCommon.jcss ===================================== @@ -104,6 +104,10 @@ disabledIcon:{fr.ird.observe.client.util.UIHelper.getUIManagerActionIcon("data-observe")}; } +.showReset { + showReset:true; +} + JToolBar { borderPainted:false; floatable:false; ===================================== client/datasource/editor/api/src/main/i18n/getters/java.getter ===================================== @@ -275,7 +275,6 @@ observe.ui.datasource.storage.server.sessionExpire.reload observe.ui.datasource.storage.server.sessionExpire.title observe.ui.datasource.storage.serverConfiguration.presets.save observe.ui.datasource.storage.step.label -observe.ui.datepicker.show observe.ui.menu.navigation.ll observe.ui.menu.navigation.ps observe.ui.message.db.closed ===================================== client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/ContentUIInitializer.java ===================================== @@ -24,7 +24,6 @@ package fr.ird.observe.client.datasource.editor.api.content; import fr.ird.observe.client.WithClientUIContext; import fr.ird.observe.client.configuration.WithClientConfig; -import fr.ird.observe.client.datasource.editor.api.ObserveKeyStrokesEditorApi; import fr.ird.observe.client.datasource.editor.api.content.actions.GoToTab; import fr.ird.observe.client.datasource.editor.api.content.data.map.ObserveMapPane; import fr.ird.observe.client.datasource.editor.api.content.data.map.TripMapUI; @@ -44,7 +43,6 @@ import fr.ird.observe.dto.decoration.decorators.ReferentialReferenceDecorator; import fr.ird.observe.dto.reference.DataDtoReference; import fr.ird.observe.dto.reference.ReferentialDtoReference; import io.ultreia.java4all.bean.JavaBean; -import io.ultreia.java4all.i18n.I18n; import io.ultreia.java4all.jaxx.widgets.choice.BeanCheckBox; import io.ultreia.java4all.jaxx.widgets.choice.BooleanEditor; import io.ultreia.java4all.jaxx.widgets.combobox.BeanEnumEditor; @@ -56,10 +54,8 @@ import org.nuiton.jaxx.runtime.swing.Table; import org.nuiton.jaxx.validator.JAXXValidator; import org.nuiton.jaxx.validator.swing.SwingValidatorUtil; import org.nuiton.jaxx.widgets.BeanUIUtil; -import org.nuiton.jaxx.widgets.datetime.BeanDateEditor; +import org.nuiton.jaxx.widgets.datetime.DateEditor; import org.nuiton.jaxx.widgets.datetime.DateTimeEditor; -import org.nuiton.jaxx.widgets.datetime.ExtendedBasicDatePickerUI; -import org.nuiton.jaxx.widgets.datetime.JAXXDatePicker; import org.nuiton.jaxx.widgets.datetime.TimeEditor; import org.nuiton.jaxx.widgets.gis.absolute.CoordinatesEditor; import org.nuiton.jaxx.widgets.number.NumberEditor; @@ -73,7 +69,6 @@ import org.nuiton.jaxx.widgets.text.NormalTextEditor; import org.nuiton.jaxx.widgets.text.UrlEditor; import javax.swing.ActionMap; -import javax.swing.JButton; import javax.swing.JComboBox; import javax.swing.JComponent; import javax.swing.JLabel; @@ -107,14 +102,13 @@ public class ContentUIInitializer<UI extends ContentUI> extends UIInitializerSup public static final Class<?>[] MANAGED_TYPES = new Class<?>[]{ JComponent.class, JToolBar.class, - JAXXDatePicker.class, BlockingLayerUI.class, BeanCheckBox.class, NumberEditor.class, JaxxComboBox.class, BeanListHeader.class, FilterableDoubleList.class, - BeanDateEditor.class, + DateEditor.class, TimeEditor.class, DateTimeEditor.class, CoordinatesEditor.class, @@ -192,10 +186,9 @@ public class ContentUIInitializer<UI extends ContentUI> extends UIInitializerSup .onComponents(CoordinatesEditor.class, true, this::init) .onComponents(TemperatureEditor.class, true, this::init) .onComponents(JToolBar.class, this::init) - .onComponents(JAXXDatePicker.class, this::init) .onComponents(BeanCheckBox.class, this::init) .onComponents(NumberEditor.class, this::init) - .onComponents(BeanDateEditor.class, this::init) + .onComponents(DateEditor.class, this::init) .onComponents(BooleanEditor.class, this::init) .onComponents(BeanEnumEditor.class, this::init) .onComponents(ObserveSwingValidator.class, this::init) @@ -410,22 +403,6 @@ public class ContentUIInitializer<UI extends ContentUI> extends UIInitializerSup editor.init(); } - protected void init(JAXXDatePicker editor) { - initializerContext.checkFirstPass(); - editor.setFormats("dd/MM/yyyy"); - ExtendedBasicDatePickerUI ui = new ExtendedBasicDatePickerUI() { - @Override - protected JButton createPopupButton() { - JButton popupButton = super.createPopupButton(); - if (popupButton != null) { - popupButton.setToolTipText(ObserveKeyStrokesEditorApi.suffixTextWithKeyStroke(I18n.t("observe.ui.datepicker.show"), ObserveKeyStrokesEditorApi.KEY_STROKE_GO_DOWN)); - } - return popupButton; - } - }; - editor.setUI(ui); - } - protected void init(BooleanEditor editor) { initializerContext.checkFirstPass(); editor.init(); @@ -441,21 +418,9 @@ public class ContentUIInitializer<UI extends ContentUI> extends UIInitializerSup editor.init(I18nEnumHelper::getLabel); } - protected void init(BeanDateEditor editor) { + protected void init(DateEditor editor) { initializerContext.checkFirstPass(); editor.setLocale(getClientConfig().getLocale()); - ExtendedBasicDatePickerUI ui = new ExtendedBasicDatePickerUI() { - @Override - protected JButton createPopupButton() { - JButton popupButton = super.createPopupButton(); - if (popupButton != null) { - popupButton.setToolTipText(ObserveKeyStrokesEditorApi.suffixTextWithKeyStroke(I18n.t("observe.ui.datepicker.show"), ObserveKeyStrokesEditorApi.KEY_STROKE_GO_DOWN)); - } - return popupButton; - } - }; - ui.setShowPopupButton(true); - editor.setUI(ui); editor.init(); } ===================================== client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/referential/ContentReferentialUIHandler.java ===================================== @@ -122,6 +122,12 @@ public class ContentReferentialUIHandler<D extends ReferentialDto, R extends Ref protected ContentOpen createContentOpen(U ui) { ContentReferentialUIOpenExecutor<D, R, U> executor = new ContentReferentialUIOpenExecutor<>(); return new ContentOpen<>(ui, executor, executor); +// return new ContentOpen(ui, executor, executor) { +// @Override +// public boolean applyBeforeSave(Close close) { +// return super.applyBeforeSave(close==Close.CLOSE?Close.RESET : close); +// } +// }; } @Override ===================================== client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/referential/ContentReferentialUIModel.java ===================================== @@ -24,12 +24,14 @@ package fr.ird.observe.client.datasource.editor.api.content.referential; import com.google.common.collect.ImmutableSet; import fr.ird.observe.client.configuration.ClientConfig; import fr.ird.observe.client.datasource.api.cache.ReferencesCache; +import fr.ird.observe.client.datasource.editor.api.content.ContentUI; import fr.ird.observe.client.datasource.editor.api.content.ContentUIModel; import fr.ird.observe.client.datasource.editor.api.content.actions.id.ChangeIdRequest; import fr.ird.observe.client.datasource.editor.api.content.actions.id.ShowIdRequest; import fr.ird.observe.client.datasource.editor.api.content.actions.save.SaveRequest; import fr.ird.observe.client.datasource.editor.api.content.referential.usage.UsageForDesactivateUIHandler; import fr.ird.observe.client.datasource.editor.api.navigation.tree.NavigationNode; +import fr.ird.observe.client.util.init.DefaultUIInitializerResult; import fr.ird.observe.dto.form.Form; import fr.ird.observe.dto.reference.ReferentialDtoReference; import fr.ird.observe.dto.referential.ReferenceStatus; @@ -75,6 +77,12 @@ public abstract class ContentReferentialUIModel<D extends ReferentialDto, R exte return getSource().getContext().newModelStates(getSource().getInitializer()); } + @Override + public void init(ContentUI ui, DefaultUIInitializerResult initializerResult) { + super.init(ui, initializerResult); + getReferenceCache().registerComponents(initializerResult); + } + public void openForm(Form<D> form) { getReferenceCache().loadReferentialReferenceSetsInModel(form); setForm(form); ===================================== client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/referential/ContentReferentialUIModelStates.java ===================================== @@ -58,6 +58,24 @@ public class ContentReferentialUIModelStates<D extends ReferentialDto, R extends this.bean = Objects.requireNonNull(bean); } + @Override + public boolean canQuit() { + if (!isEnabled()) { + // model disabled, no check + return true; + } + if (!isEditing()) { + // model not editing, no check + return true; + } + if (isReadingMode()) { + // model in reading mode, no check + return true; + } + // can quit only if model not modified + return !isGlobalModified(); + } + public String[] getNaturalIds() { return naturalIds; } ===================================== client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/referential/actions/BackToListReferential.java ===================================== @@ -51,6 +51,10 @@ public final class BackToListReferential<D extends ReferentialDto, R extends Ref ContentOpen.Close close = contentOpen.tryToClose(); if (close == ContentOpen.Close.CANCEL) { return; + }if (close == ContentOpen.Close.CLOSE) { + // special case, in this form we always need to stop editing (editing does not means editable...) + //FIXME Review the form to stop using the editing property for this + close = ContentOpen.Close.RESET; } boolean canQuit = contentOpen.applyBeforeSave(close); if (!canQuit) { ===================================== client/datasource/editor/common/src/main/java/fr/ird/observe/client/datasource/editor/common/referential/common/FpaZoneUI.jaxx ===================================== @@ -27,7 +27,7 @@ fr.ird.observe.dto.referential.common.FpaZoneDto fr.ird.observe.dto.referential.common.FpaZoneReference - org.nuiton.jaxx.widgets.datetime.BeanDateEditor + org.nuiton.jaxx.widgets.datetime.DateEditor org.nuiton.jaxx.widgets.text.NormalTextEditor io.ultreia.java4all.jaxx.widgets.combobox.BeanEnumEditor io.ultreia.java4all.jaxx.widgets.choice.BeanCheckBox @@ -79,8 +79,8 @@ </cell> <cell anchor='west' weightx="1" fill="both"> <JPanel layout='{new GridLayout()}'> - <BeanDateEditor id='startDate'/> - <BeanDateEditor id='endDate'/> + <DateEditor id='startDate' styleClass='showReset'/> + <DateEditor id='endDate' styleClass='showReset'/> </JPanel> </cell> </row> ===================================== client/datasource/editor/common/src/main/java/fr/ird/observe/client/datasource/editor/common/referential/common/LengthLengthParameterUI.jaxx ===================================== @@ -39,7 +39,7 @@ org.nuiton.jaxx.widgets.text.NormalTextEditor io.ultreia.java4all.jaxx.widgets.combobox.BeanEnumEditor io.ultreia.java4all.jaxx.widgets.choice.BeanCheckBox - org.nuiton.jaxx.widgets.datetime.BeanDateEditor + org.nuiton.jaxx.widgets.datetime.DateEditor javax.swing.JScrollPane javax.swing.JTable @@ -105,8 +105,8 @@ </cell> <cell anchor='west' weightx="1" fill="both"> <JPanel layout='{new GridLayout()}'> - <BeanDateEditor id='startDate'/> - <BeanDateEditor id='endDate'/> + <DateEditor id='startDate' styleClass='showReset'/> + <DateEditor id='endDate' styleClass='showReset'/> </JPanel> </cell> </row> ===================================== client/datasource/editor/common/src/main/java/fr/ird/observe/client/datasource/editor/common/referential/common/LengthWeightParameterUI.jaxx ===================================== @@ -38,7 +38,7 @@ org.nuiton.jaxx.widgets.text.NormalTextEditor io.ultreia.java4all.jaxx.widgets.combobox.BeanEnumEditor io.ultreia.java4all.jaxx.widgets.choice.BeanCheckBox - org.nuiton.jaxx.widgets.datetime.BeanDateEditor + org.nuiton.jaxx.widgets.datetime.DateEditor javax.swing.JScrollPane javax.swing.JTable @@ -131,8 +131,8 @@ public void decorateUniqueKeyTable(JTable table, TableCellRenderer renderer, JSc </cell> <cell anchor='west' weightx="1" fill="both"> <JPanel layout='{new GridLayout()}'> - <BeanDateEditor id='startDate'/> - <BeanDateEditor id='endDate'/> + <DateEditor id='startDate' styleClass='showReset'/> + <DateEditor id='endDate' styleClass='showReset'/> </JPanel> </cell> </row> ===================================== client/datasource/editor/common/src/main/java/fr/ird/observe/client/datasource/editor/common/referential/common/ProgramUI.jaxx ===================================== @@ -34,7 +34,7 @@ io.ultreia.java4all.jaxx.widgets.combobox.BeanEnumEditor io.ultreia.java4all.jaxx.widgets.choice.BeanCheckBox - org.nuiton.jaxx.widgets.datetime.BeanDateEditor + org.nuiton.jaxx.widgets.datetime.DateEditor org.nuiton.jaxx.widgets.text.BigTextEditor org.nuiton.jaxx.widgets.text.NormalTextEditor @@ -117,8 +117,8 @@ </cell> <cell anchor='west'> <JPanel layout='{new GridLayout()}'> - <BeanDateEditor id='startDate'/> - <BeanDateEditor id='endDate'/> + <DateEditor id='startDate' styleClass='showReset'/> + <DateEditor id='endDate' styleClass='showReset'/> </JPanel> </cell> </row> ===================================== client/datasource/editor/common/src/main/java/fr/ird/observe/client/datasource/editor/common/referential/common/ShipOwnerUI.jaxx ===================================== @@ -32,7 +32,7 @@ org.nuiton.jaxx.widgets.text.NormalTextEditor io.ultreia.java4all.jaxx.widgets.combobox.BeanEnumEditor io.ultreia.java4all.jaxx.widgets.choice.BeanCheckBox - org.nuiton.jaxx.widgets.datetime.BeanDateEditor + org.nuiton.jaxx.widgets.datetime.DateEditor static fr.ird.observe.client.util.UIHelper.getStringValue fr.ird.observe.dto.referential.ReferenceStatus </import> @@ -100,8 +100,8 @@ </cell> <cell anchor='west' weightx="1" fill="both"> <JPanel layout='{new GridLayout()}'> - <BeanDateEditor id='startDate'/> - <BeanDateEditor id='endDate'/> + <DateEditor id='startDate' styleClass='showReset'/> + <DateEditor id='endDate' styleClass='showReset'/> </JPanel> </cell> </row> ===================================== client/datasource/editor/common/src/main/java/fr/ird/observe/client/datasource/editor/common/referential/common/VesselUI.jaxx ===================================== @@ -36,7 +36,7 @@ org.nuiton.jaxx.widgets.text.NormalTextEditor io.ultreia.java4all.jaxx.widgets.combobox.BeanEnumEditor io.ultreia.java4all.jaxx.widgets.choice.BeanCheckBox - org.nuiton.jaxx.widgets.datetime.BeanDateEditor + org.nuiton.jaxx.widgets.datetime.DateEditor static fr.ird.observe.client.util.UIHelper.getStringValue fr.ird.observe.dto.referential.ReferenceStatus @@ -209,7 +209,7 @@ <JLabel id='changeDateLabel'/> </cell> <cell anchor='west'> - <BeanDateEditor id='changeDate'/> + <DateEditor id='changeDate' styleClass='showReset'/> </cell> </row> <row> ===================================== client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/common/TripUI.jaxx ===================================== @@ -34,7 +34,7 @@ fr.ird.observe.dto.referential.ll.common.ObservationMethodReference fr.ird.observe.client.datasource.editor.api.content.data.open.ContentOpenableUIModelStates io.ultreia.java4all.jaxx.widgets.choice.BeanCheckBox - org.nuiton.jaxx.widgets.datetime.BeanDateEditor + org.nuiton.jaxx.widgets.datetime.DateEditor fr.ird.observe.client.datasource.editor.api.content.data.map.TripMapUI @@ -131,7 +131,7 @@ <JLabel id='startDateLabel'/> </cell> <cell anchor='west' weightx="0.5"> - <BeanDateEditor id='startDate'/> + <DateEditor id='startDate'/> </cell> </row> @@ -151,7 +151,7 @@ <JLabel id='endDateLabel'/> </cell> <cell anchor='west' weightx="0.5"> - <BeanDateEditor id='endDate'/> + <DateEditor id='endDate'/> </cell> </row> ===================================== client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/landing/LandingUI.jaxx ===================================== @@ -34,7 +34,7 @@ fr.ird.observe.client.ObserveSwingApplicationContext fr.ird.observe.client.datasource.editor.api.content.data.table.ContentTableUIModelStates fr.ird.observe.client.datasource.editor.api.content.data.open.ContentOpenableUIModelStates - org.nuiton.jaxx.widgets.datetime.BeanDateEditor + org.nuiton.jaxx.widgets.datetime.DateEditor org.nuiton.jaxx.widgets.text.BigTextEditor org.nuiton.jaxx.widgets.number.NumberEditor @@ -141,7 +141,7 @@ <JLabel id='startDateLabel'/> </cell> <cell anchor='east' weightx="1"> - <BeanDateEditor id='startDate'/> + <DateEditor id='startDate'/> </cell> </row> @@ -151,7 +151,7 @@ <JLabel id='endDateLabel'/> </cell> <cell anchor='east' weightx="1"> - <BeanDateEditor id='endDate'/> + <DateEditor id='endDate'/> </cell> </row> <row> ===================================== client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/common/TripUI.jaxx ===================================== @@ -34,7 +34,7 @@ fr.ird.observe.client.datasource.editor.api.content.data.map.TripMapUI fr.ird.observe.client.datasource.editor.api.content.data.open.ContentOpenableUIModelStates - org.nuiton.jaxx.widgets.datetime.BeanDateEditor + org.nuiton.jaxx.widgets.datetime.DateEditor io.ultreia.java4all.jaxx.widgets.choice.BeanCheckBox org.nuiton.jaxx.widgets.number.NumberEditor @@ -177,7 +177,7 @@ <JLabel id='startDateLabel'/> </cell> <cell anchor='west' weightx="0.5"> - <BeanDateEditor id='startDate'/> + <DateEditor id='startDate'/> </cell> </row> @@ -187,7 +187,7 @@ <JLabel id='endDateLabel'/> </cell> <cell anchor='west' weightx="0.5"> - <BeanDateEditor id='endDate'/> + <DateEditor id='endDate'/> </cell> </row> ===================================== client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/observation/RouteUI.jaxx ===================================== @@ -24,8 +24,7 @@ <import> fr.ird.observe.dto.data.ps.observation.RouteDto fr.ird.observe.client.datasource.editor.api.content.data.open.ContentOpenableUIModelStates - org.nuiton.jaxx.widgets.datetime.BeanDateEditor - + org.nuiton.jaxx.widgets.datetime.DateEditor org.nuiton.jaxx.widgets.number.NumberEditor org.nuiton.jaxx.widgets.text.BigTextEditor @@ -50,7 +49,7 @@ <JLabel id='dateLabel'/> </cell> <cell anchor='east' weightx="1"> - <BeanDateEditor id='date'/> + <DateEditor id='date'/> </cell> </row> <row> ===================================== client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/observation/SetKeptTargetCatchUIModel.java ===================================== @@ -22,12 +22,16 @@ package fr.ird.observe.client.datasource.editor.ps.data.observation; * #L% */ +import fr.ird.observe.client.ClientUIContextApplicationComponent; import fr.ird.observe.client.configuration.ClientConfig; +import fr.ird.observe.client.datasource.api.ObserveSwingDataSource; import fr.ird.observe.client.datasource.api.cache.ReferencesCache; import fr.ird.observe.client.datasource.api.cache.ReferencesFilterHelper; import fr.ird.observe.client.datasource.editor.api.content.data.table.AskToDelete; +import fr.ird.observe.dto.ProtectedIdsPs; import fr.ird.observe.dto.data.ps.observation.KeptTargetCatchDto; import fr.ird.observe.dto.data.ps.observation.SetKeptTargetCatchDto; +import fr.ird.observe.dto.referential.common.WeightMeasureMethodReference; import fr.ird.observe.services.ObserveServicesProvider; import io.ultreia.java4all.i18n.I18n; @@ -40,9 +44,11 @@ import java.util.List; * @since XXX */ public class SetKeptTargetCatchUIModel extends GeneratedSetKeptTargetCatchUIModel { - + private final WeightMeasureMethodReference defaultWeightMeasureMethod; public SetKeptTargetCatchUIModel(SetKeptTargetCatchUINavigationNode source) { super(source); + ObserveSwingDataSource dataSource = ClientUIContextApplicationComponent.value().getDataSourcesManager().getMainDataSource(); + defaultWeightMeasureMethod = dataSource.getReferentialReferenceSet(WeightMeasureMethodReference.class).tryGetReferenceById(ProtectedIdsPs.PS_OBSERVATION_KEPT_TARGET_CATCH_DEFAULT_WEIGHT_MEASURE_METHOD_ID).orElseThrow(IllegalStateException::new); } @Override @@ -59,4 +65,15 @@ public class SetKeptTargetCatchUIModel extends GeneratedSetKeptTargetCatchUIMode return ask.needDelete(this.getClientUIContext().getDecoratorService(), originalBean, bean); } + + public WeightMeasureMethodReference getDefaultWeightMeasureMethod() { + return defaultWeightMeasureMethod; + } + + @Override + public KeptTargetCatchDto newTableEditBean() { + KeptTargetCatchDto result = super.newTableEditBean(); + result.setWeightMeasureMethod(getDefaultWeightMeasureMethod()); + return result; + } } ===================================== client/i18n/src/main/i18n/translations/observe_en_GB.properties ===================================== @@ -1591,7 +1591,6 @@ observe.ui.datasource.storage.useRemoteStorage.config=Configure remote data sour observe.ui.datasource.storage.useRemoteStorage.description=Please configure connexion to remote data source\nYou must validate your connexion to continue. observe.ui.datasource.storage.useServerStorage.config=Configure remote server to use observe.ui.datasource.storage.useServerStorage.description=Please configure connexion to remote server\nYou must validate your connexion to continue. -observe.ui.datepicker.show=To show date picker dialog observe.ui.menu.actions=Actions observe.ui.menu.configuration=Configuration observe.ui.menu.configuration.tip=To configure application ===================================== client/i18n/src/main/i18n/translations/observe_es_ES.properties ===================================== @@ -1591,7 +1591,6 @@ observe.ui.datasource.storage.useRemoteStorage.config=Configurar la base remota observe.ui.datasource.storage.useRemoteStorage.description=Configure la conexión a la base remota\nAntes de continuar, debe validar la conexión. observe.ui.datasource.storage.useServerStorage.config=Configurar el servidor remoto a utilizar observe.ui.datasource.storage.useServerStorage.description=Configure su conexión al servidor remoto\nAntes de que pueda continuar, tiene que validar la conexión. -observe.ui.datepicker.show=To show date picker dialog \#TODO observe.ui.menu.actions=Acciones observe.ui.menu.configuration=Configuración observe.ui.menu.configuration.tip=Menú de configuración ===================================== client/i18n/src/main/i18n/translations/observe_fr_FR.properties ===================================== @@ -1591,7 +1591,6 @@ observe.ui.datasource.storage.useRemoteStorage.config=Configurer la base distant observe.ui.datasource.storage.useRemoteStorage.description=Veuillez configurer votre connexion à la base distante\nAvant de pouvoir poursuivre, vous devez valider la connexion. observe.ui.datasource.storage.useServerStorage.config=Configurer le serveur distant à utiliser observe.ui.datasource.storage.useServerStorage.description=Veuillez configurer votre connexion au serveur distant\nAvant de pouvoir poursuivre, vous devez valider la connexion. -observe.ui.datepicker.show=Pour ouvrir l'éditeur de date observe.ui.menu.actions=Actions observe.ui.menu.configuration=Configuration observe.ui.menu.configuration.tip=Menu de configuration ===================================== models/dto/src/main/java/fr/ird/observe/dto/ProtectedIdsPs.java ===================================== @@ -56,6 +56,7 @@ public interface ProtectedIdsPs { String PS_OBSERVATION_FOB_OBSERVED_SYSTEM = "fr.ird.referential.ps.observation.ObservedSystem#0#1.2"; ImmutableSet<String> PS_OBSERVATION_FOB_OBSERVED_SYSTEM_EXCLUDE_OPERATIONS = ImmutableSet.of("fr.ird.referential.ps.common.ObjectOperation#0#10", "fr.ird.referential.ps.common.ObjectOperation#0#1"); String PS_OBSERVATION_SCHOOL_ESTIMATE_DEFAULT_WEIGHT_MEASURE_METHOD_ID = "fr.ird.referential.common.WeightMeasureMethod#666#04"; + String PS_OBSERVATION_KEPT_TARGET_CATCH_DEFAULT_WEIGHT_MEASURE_METHOD_ID = "fr.ird.referential.common.WeightMeasureMethod#666#01"; String PS_LOGBOOK_TRIP_DEFAULT_DATA_QUALITY_ID = "fr.ird.referential.common.DataQuality#0#5"; String PS_LOGBOOK_TRIP_DEFAULT_DEPARTURE_WELL_STATES_ID = "fr.ird.referential.ps.logbook.WellsState#666#03"; String PS_LOGBOOK_TRIP_DEFAULT_LANDING_WELL_STATES_ID = "fr.ird.referential.ps.logbook.WellsState#666#03"; ===================================== models/persistence/src/main/java/fr/ird/observe/entities/data/ps/observation/SetImpl.java ===================================== @@ -35,7 +35,6 @@ import fr.ird.observe.dto.data.ps.observation.SetDto; import fr.ird.observe.dto.data.ps.observation.SetKeptTargetCatchDto; import fr.ird.observe.dto.data.ps.observation.SetNonTargetCatchDto; import fr.ird.observe.dto.data.ps.observation.SetNonTargetCatchReleaseDto; -import fr.ird.observe.dto.data.ps.observation.SetSchoolEstimateDto; import fr.ird.observe.dto.reference.DtoReferenceAware; import fr.ird.observe.dto.referential.ReferentialLocale; import fr.ird.observe.dto.referential.common.SpeciesReference; @@ -234,9 +233,6 @@ public class SetImpl extends SetAbstract { return; } super.fromDto(referentialLocale, dto); - if (dto instanceof SetSchoolEstimateDto) { - getSchoolEstimate().forEach(t -> t.setSet(this)); - } } private void fromSetNonTargetCatchDto(ReferentialLocale referentialLocale, SetNonTargetCatchDto dto) { ===================================== models/persistence/src/main/models/Observe-20-data-ps-observation.model ===================================== @@ -130,11 +130,10 @@ endLogValue + {*:1} Float | sqlType=numeric checkLevel + {*:1} int activity + {*} data.ps.observation.Activity | unique orderBy=time -data.ps.observation.SchoolEstimate > data.DataEntity | naturalIdMutable entity +data.ps.observation.SchoolEstimate > data.DataEntity | entity totalWeight + {*:1} Integer meanWeight + {*:1} Integer -set {*:1} data.ps.observation.Set | naturalId skipModelNavigation -species {*:1} referential.common.Species | naturalId +species {*:1} referential.common.Species weightMeasureMethod {*:0..1} referential.common.WeightMeasureMethod data.ps.observation.Set > data.DataEntity >> data.SetAware | entity constants=targetSampleCapture,endSetDate,endPursingDate,endSetTime,endPursingTime @@ -157,7 +156,7 @@ nonTargetCatch + {*} data.ps.observation.NonTargetCatch | ordered reasonForNullSet {*:0..1} referential.ps.observation.ReasonForNullSet nonTargetSample + {*} data.ps.observation.NonTargetSample | unique targetSample + {*} data.ps.observation.TargetSample | unique -targetCatch + {*} data.ps.observation.TargetCatch | ordered +targetCatch + {*} data.ps.observation.TargetCatch | ordered inverse=false schoolEstimate + {*} data.ps.observation.SchoolEstimate | orderBy=topiaCreateDate nonTargetCatchRelease + {*} data.ps.observation.NonTargetCatchRelease | ordered hasDiscardedTargetCatch() boolean @@ -188,7 +187,7 @@ catchWeight + {*:1} Float | sqlType=numeric well + {*:1} String | naturalId notNull=false broughtOnDeck + {*:1} Boolean discarded + {*:1} boolean | naturalId -set {*:1} data.ps.observation.Set | naturalId skipModelNavigation +set {*:1} data.ps.observation.Set | naturalId inverse skipModelNavigation weightCategory {*:1} referential.ps.observation.WeightCategory | naturalId reasonForDiscard {*:0..1} referential.ps.observation.ReasonForDiscard | naturalId notNull=false weightMeasureMethod {*:0..1} referential.common.WeightMeasureMethod ===================================== services/validation-spi/src/main/java/fr/ird/observe/validation/validators/ActivitySimpleSpeedDtoValidator.java ===================================== @@ -179,6 +179,11 @@ public class ActivitySimpleSpeedDtoValidator extends FieldValidatorSupport { RouteDto route = (RouteDto) stack.findValue("currentPsObservationRoute"); Objects.requireNonNull(route, " could not find currentPsObservationRoute in valueStack"); + if (route.getDate() == null) { + // cas limite (pas de date sur la route) + log.debug(String.format("Missing route date : %s, skip speed computation", route.getId())); + return; + } ActivityStubDto previousActivity; ===================================== services/validation-spi/src/main/java/fr/ird/observe/validation/validators/ActivitySpeedDtoValidator.java ===================================== @@ -77,6 +77,7 @@ public class ActivitySpeedDtoValidator extends FieldValidatorSupport { private CollectionFieldExpressionValidator delegate; private boolean enable; private Float speed; + public Float getSpeed() { return speed; } @@ -145,6 +146,11 @@ public class ActivitySpeedDtoValidator extends FieldValidatorSupport { return true; } + if (route.getDate() == null) { + // cas limite (pas de date sur la route) + LOG.debug(String.format("Missing route date : %s, skip speed computation", route.getId())); + return true; + } GPSPoint previousPoint = newPoint(route, previousActivity); GPSPoint currentPoint = newPoint(route, currentActivity); @@ -178,6 +184,7 @@ public class ActivitySpeedDtoValidator extends FieldValidatorSupport { public float getComputedSpeed() { return computedSpeed; } + public float getSpeed() { return ActivitySpeedDtoValidator.this.getSpeed(); } View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/67b3e8822a805060e8532361… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/67b3e8822a805060e8532361… You're receiving this email because of your account on gitlab.com.

1 0