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

[Git][ultreiaio/ird-observe][master] 158 commits: [jgitflow-maven-plugin]updating poms for 8.0.3-SNAPSHOT development[skip ci]
by Tony CHEMIT 18 Jan '21

18 Jan '21

Tony CHEMIT pushed to branch master at ultreiaio / ird-observe Commits: a72a1e7a by Tony Chemit at 2020-12-24T12:18:27+01:00 [jgitflow-maven-plugin]updating poms for 8.0.3-SNAPSHOT development[skip ci] - - - - - 4822a008 by Tony Chemit at 2020-12-24T12:32:49+01:00 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts[skip ci] - - - - - e6b962be by Tony Chemit at 2020-12-24T12:32:49+01:00 [jgitflow-maven-plugin]merging 'master' into 'develop' - - - - - fc5f1beb by Tony Chemit at 2020-12-24T12:32:50+01:00 [jgitflow-maven-plugin]Updating develop poms back to pre merge state[skip ci] - - - - - f64c17d7 by Tony Chemit at 2020-12-24T12:48:58+01:00 update CHANGELOG [skip ci] - - - - - 5e91ce44 by Tony Chemit at 2020-12-24T12:54:26+01:00 update CHANGELOG [skip ci] - - - - - 117feaa8 by Tony Chemit at 2020-12-26T10:28:20+01:00 l'information nombre total d'opération de pêches sur le formulaire marée me semble un peu faible ? - See #1695 - - - - - ec3b8390 by Tony Chemit at 2020-12-26T10:33:57+01:00 On en voit pas les activités observées disponibles - Closes #1697 - - - - - 59e06833 by Tony Chemit at 2020-12-26T10:35:06+01:00 Low log level - - - - - 31ae3c7c by Tony Chemit at 2020-12-26T13:32:01+01:00 Low log level - - - - - bbcf858d by Tony Chemit at 2020-12-27T07:01:59+01:00 Show tests results only if not in assert mode - - - - - 0e056c2c by Tony Chemit at 2020-12-27T07:32:45+01:00 Improve topia context API : * adding a hook when closing persistence context (TODO add a new event API on this) - - - - - 35a87380 by Tony Chemit at 2020-12-27T07:33:02+01:00 do not add last update date row if entity is bastract - - - - - eae28300 by Tony Chemit at 2020-12-27T07:34:19+01:00 add missing write annotation on some services (TODO remove the lastupdatedate service, this is clearly a persistence matter, not a service) - - - - - b3263f1d by Tony Chemit at 2020-12-27T07:35:08+01:00 use last pom - - - - - 6a214721 by Tony Chemit at 2020-12-27T07:36:56+01:00 Improve services generator : * introduce service-api meta-generator * introduce service-local meta-generator - - - - - 1848f995 by Tony Chemit at 2020-12-27T07:38:30+01:00 Génération du code final des services local - See #1698 Review service-local API (no more proxy to handler transaction, just generated code^^) - - - - - 9fcf2d77 by Tony Chemit at 2020-12-27T07:39:14+01:00 Génération du code final des services local - See #1698 Rename service local implementations to support. Real implementations are now generated. - - - - - f8876946 by Tony Chemit at 2020-12-27T08:43:45+01:00 Il manque des logs sur le serveur - See #1700 - - - - - afb328c1 by Tony Chemit at 2020-12-27T12:33:15+01:00 l'information nombre total d'opération de pêches sur le formulaire marée me semble un peu faible ? - Closes #1695 - - - - - 20be6d67 by Tony Chemit at 2020-12-27T12:45:56+01:00 Impossible d'ouvrir la configuration - Closes #1701 - - - - - 72505b35 by Tony Chemit at 2020-12-27T17:20:41+01:00 Configuration de la cartographie - See #1702 Utilisation nouvelles zones zee - - - - - 3d16f0de by Tony Chemit at 2020-12-27T17:21:05+01:00 Configuration de la cartographie - See #1702 Mise en place de la configuration de certaines couleurs à améliorer - - - - - 03aa3129 by Tony Chemit at 2020-12-28T12:03:52+01:00 Configuration de la cartographie - See #1702 - - - - - 5eaaef3d by Tony Chemit at 2020-12-28T12:32:04+01:00 Ajouts au référentiel VesseType - Closes #1704 - - - - - 9157663c by Tony Chemit at 2020-12-28T13:36:00+01:00 Il reste quelques optimisations à réaliser sur la couche de persistence - See #1664 Sanitize longline observations elements - - - - - 2425906c by Tony Chemit at 2020-12-28T19:48:11+01:00 Peaufinage de la table ll_common.catchefate - Closes #1706 - - - - - a94627d5 by Tony Chemit at 2020-12-28T20:18:51+01:00 Peaufinage de la table ll_common.onboardprocessing - Closes #1705 - - - - - 78d97ddc by Tony Chemit at 2020-12-29T12:04:50+01:00 Peaufinage de la table ll_common.onboardprocessing - Closes #1705 - - - - - 1b7dd1d4 by Tony Chemit at 2020-12-29T12:27:39+01:00 Peaufinage de la table common.country - Closes #1708 - - - - - 6a818a1d by Tony Chemit at 2020-12-29T16:46:05+01:00 Améliorer les performances lors du changement de l'arbre de navigation - See #1655 Mise en page de l'arbre sur le référentiel manageur - Closes #1707 - - - - - 4a856a8b by Tony Chemit at 2020-12-30T11:22:13+01:00 Peaufinage de la table common.program - Closes #1712 - - - - - 44aee866 by Tony Chemit at 2020-12-30T19:06:51+01:00 LL Trip : erreur d'enregistrement - Closes #1715 * Revue de l'API de sauvegarde * Génération de l'action de sauvegarde - - - - - 8784925f by Tony Chemit at 2020-12-30T22:23:57+01:00 Fix NavigationService Rest APi . be better to use - - - - - e54f4ddf by Tony Chemit at 2020-12-31T09:01:59+01:00 La carto ne tolère pas le 'Port à corriger' - closes #1719 - - - - - bab39d40 by Tony Chemit at 2020-12-31T09:48:48+01:00 La dernière SNAPSHOT 8.0.3 semble instable - closes #1718 - - - - - e9fc2489 by Tony Chemit at 2020-12-31T09:48:48+01:00 Remontée des messages d'erreur serveur vers le client - closes #1637 - - - - - 8debafba by Tony Chemit at 2020-12-31T09:48:48+01:00 fix trip vessel validator on create mode - - - - - 9c8ca5a9 by Tony Chemit at 2020-12-31T10:26:13+01:00 Meilleure disposition pour l'onglet carte - closes #1721 Plus nettoyage code sur TripUIModel (suppression états inutiles). Debut de correction de #1654 - - - - - dc340121 by Tony Chemit at 2021-01-01T11:14:06+01:00 Validateur needcomment récalcitrant - Closes #1714 - - - - - fcd9cf26 by Tony Chemit at 2021-01-02T12:18:40+01:00 Clean reset action - See #1665 - - - - - b9fda780 by Tony Chemit at 2021-01-03T22:58:13+01:00 remove unused methods - - - - - bb74c8a1 by Tony Chemit at 2021-01-03T22:58:40+01:00 Introduce new strong dto types - - - - - fb9261c4 by Tony Chemit at 2021-01-03T22:59:17+01:00 Fix how to get references from spi (always use reference type of it instead of the one of the entity) - - - - - a6d69783 by Tony Chemit at 2021-01-03T22:59:45+01:00 Update pom (last topia-extension stable) - - - - - bd980cc8 by Tony Chemit at 2021-01-03T23:00:18+01:00 be able to generate generated dto classes if object marked as skip - - - - - a37a0393 by Tony Chemit at 2021-01-03T23:00:50+01:00 Do not set back data reference collections to entity - - - - - 14fe62cc by Tony Chemit at 2021-01-03T23:05:16+01:00 LL Fix not-null constraint Sample.trip (can be null if sample is attached to activity) - - - - - e77aed08 by Tony Chemit at 2021-01-03T23:12:22+01:00 Introduce ActivitySampleDto and then remove all hacks around it. - - - - - d0271c59 by Tony Chemit at 2021-01-03T23:14:17+01:00 Remove bean from constructo in cotentTableUIModel - - - - - feda57f7 by Tony Chemit at 2021-01-03T23:16:24+01:00 Introduce models-dto-definition maven module with the dto model. - - - - - 76ca4c4f by Tony Chemit at 2021-01-03T23:17:19+01:00 Little improvements of LL dto - - - - - bbc06fb1 by Tony Chemit at 2021-01-03T23:17:41+01:00 remove unused method - - - - - a56089d6 by Tony Chemit at 2021-01-03T23:18:14+01:00 Make EditableDataServiceLocalSupport works with more than one dto from same entity ^^ - - - - - 398bd122 by Tony Chemit at 2021-01-03T23:18:47+01:00 Fix how to get references from spi (always use reference type of it instead of the one of the entity) - - - - - 342a2670 by Tony Chemit at 2021-01-04T11:21:21+01:00 Détail ergonomique sur l'arbre - Closes #1723 - - - - - 18699c34 by Tony Chemit at 2021-01-04T11:21:21+01:00 Les marées sont mal classées dans la fenêtre de droite - Closes #1726 - - - - - 2aecae7e by Tony Chemit at 2021-01-04T12:14:57+01:00 LL Logbook capture : validation formulaire - Closes #1727 - - - - - 89d60b77 by Tony Chemit at 2021-01-04T13:35:04+01:00 Erreur sur création de marée LL - Closes #1728 - - - - - 9110ae3d by Tony Chemit at 2021-01-05T12:13:20+01:00 Add toIds method - - - - - c99808ed by Tony Chemit at 2021-01-05T12:14:39+01:00 Introduce LazyDataDtoReferenceSet, at last, works perfectly. - - - - - a41f5bd6 by Tony Chemit at 2021-01-05T12:15:59+01:00 Extends referenceService to get a set of reference at a time - - - - - 45fb171a by Tony Chemit at 2021-01-05T12:17:03+01:00 Améliorer les performances lors du changement de l'arbre de navigation - See #1709 Use specialized dao methods to get navigation result - - - - - e7bf5f3c by Tony Chemit at 2021-01-05T12:20:52+01:00 Améliorer les performances lors du changement de l'arbre de navigation - See #1709 Simplify dto model and make it compliant with next ui generation - - - - - a6d677f0 by Tony Chemit at 2021-01-05T12:21:39+01:00 Améliorer les performances lors du changement de l'arbre de navigation - See #1709 Review Service API (now getting only trip ids), let the navigation tree load what it needs from this to avoid loading all trip nodes... - - - - - 5cc43cee by Tony Chemit at 2021-01-05T13:01:54+01:00 Améliorer les performances lors du changement de l'arbre de navigation - See #1709 Adapt ui to use auto-loading data sets. - - - - - f661eff4 by Tony Chemit at 2021-01-05T13:58:42+01:00 Peaufinage de la table ll_common.onboardprocessing - Closes #1733 - - - - - 95738c12 by Tony Chemit at 2021-01-05T14:00:16+01:00 Gestion du champ 'numéro au virage' - Closes #1729 Erreur sur validateur 'numéro au virage' - Closes #1730 - - - - - ce3b613b by Tony Chemit at 2021-01-06T11:35:22+01:00 Valider tous les écrans du modèle LL - See #1665 Problème de restitution de la position sur la ligne LL-Observation-Catch/Tdr - - - - - 46bd55b1 by Tony Chemit at 2021-01-06T11:41:34+01:00 Peaufinage de la table ll_common.onboardprocessing 2 - Closes #1735 - - - - - a741dd77 by Tony Chemit at 2021-01-06T16:37:19+01:00 Consultation du tableau de captures - Closes #1731 Review ContentTable actions (before focus refactor) Review ContentUI actions scope (never be able to use them if not in content zone) - - - - - 4aac1786 by Tony Chemit at 2021-01-06T17:14:52+01:00 Bouton 'infos techniques' sur formulaire captures - Closes #1732 - - - - - 75460181 by Tony Chemit at 2021-01-06T18:34:40+01:00 Fix some bad binding in jaxx :( - - - - - 16179a26 by Tony Chemit at 2021-01-06T18:38:41+01:00 Problème si on supprime l'unique commentaire d'une commentaire, ça ne fonctionne pas bien! - Closes #1725 - - - - - 36a35df1 by Tony Chemit at 2021-01-06T19:51:07+01:00 Happy new year commit! - - - - - 0c01dd99 by Tony Chemit at 2021-01-06T20:39:13+01:00 Valider tous les écrans du modèle LL - See #1665 Fix ContentTable - first table entry is not selected if in reading mode - - - - - 1b0c5030 by Tony Chemit at 2021-01-07T01:16:34+01:00 Nettoyage des modèles : on doit appeler directement les states (à terme ils seront générés et c'est là qu'on fera des extensions de modèle...) Nettoyage de l'API de focus sur les tableaux : trop compliqués et ne fonctionne pas bien - - - - - 35eeddae by Tony Chemit at 2021-01-07T01:16:34+01:00 Verrouillage/déverouillage des formulaires - Closes #1740 - - - - - f7933258 by Tony Chemit at 2021-01-07T01:33:43+01:00 Fix ask to quit on read mode - - - - - dc15e4f9 by Tony Chemit at 2021-01-07T01:34:08+01:00 Fix focus goes to form on read mode - - - - - e02d4abe by Tony Chemit at 2021-01-07T01:34:32+01:00 Improve safe focus on form - - - - - 0ee15c40 by Tony Chemit at 2021-01-07T02:36:06+01:00 Improve safe focus on form - - - - - 55be320c by Tony Chemit at 2021-01-07T12:07:36+01:00 Fix JLabel init (never assign LabelFor if JLabel is not design for (his name must ends by Label) : because otherwise nasty StackOverFlow can happen! - - - - - 88cfaf49 by Tony Chemit at 2021-01-07T13:29:59+01:00 If no row selected, then do nothing - - - - - d63a83d8 by Tony Chemit at 2021-01-07T14:27:22+01:00 Avoid costy log - - - - - c03d89aa by Tony Chemit at 2021-01-07T14:37:30+01:00 Consultation du tableau des débarquements lorsque le formulaire est verrouillé - Closes #1739 - - - - - e5fe0fab by Tony Chemit at 2021-01-07T14:51:31+01:00 Rechargement de la source de données - Closes #1738 - - - - - 3f58446c by Tony Chemit at 2021-01-07T15:41:56+01:00 Consultation du tableau des débarquements lorsque le formulaire est verrouillé - Closes #1739 Meilleure gestion des actions partagées - - - - - aceee7ee by Tony Chemit at 2021-01-07T16:26:19+01:00 On arrive à vider la sélection sur un tableau alors qu'on ne devrait pas - Closes #1741 - - - - - 84ea6b17 by Tony Chemit at 2021-01-07T16:27:22+01:00 Consultation du tableau des débarquements lorsque le formulaire est verrouillé - Closes #1739 Ne pas autoriser le tableau à déplacer les lignes (il reste d'autres raccourcis clavier qu'il faudrait supprimer) - - - - - ee081a5d by Tony Chemit at 2021-01-07T16:27:52+01:00 Consultation du tableau des débarquements lorsque le formulaire est verrouillé - Closes #1739 Utilisation de meilleurs raccourcis (de toute façon le shift + ... ne fonctionnait pas) - - - - - 6f0f4aff by Tony Chemit at 2021-01-07T16:40:08+01:00 Fix i18n - - - - - aebd40b3 by Tony Chemit at 2021-01-07T16:48:15+01:00 Clean java code > 8 - - - - - 3ca43532 by Tony Chemit at 2021-01-08T15:24:43+01:00 Generation des ContentUIModelStates (à finaliser) - Closes #1743 - - - - - 66cff9d6 by Tony Chemit at 2021-01-09T13:47:53+01:00 Clean more dto (remove a property change listener : a lots of code, for nothing...) - - - - - f3db7806 by Tony Chemit at 2021-01-09T13:48:22+01:00 Remove annotation - - - - - 91030af0 by Tony Chemit at 2021-01-09T13:48:43+01:00 Add extra method to lot extra referential references in cache - - - - - 9ba76cd8 by Tony Chemit at 2021-01-09T13:49:58+01:00 * Review ModelStates and clean as much as possible Model) * Make Model not JavaBean - - - - - f10e5207 by Tony Chemit at 2021-01-09T15:48:18+01:00 Begin of review of focus Restrict override of concrete classes - - - - - 48a92367 by Tony Chemit at 2021-01-09T17:14:14+01:00 Add more root cycle Remove old focus API \o/, replaced by nothing or nearly \o/\o/ - - - - - 8c1d872d by Tony Chemit at 2021-01-10T02:15:27+01:00 Improve KeyboardFocusManager usage (blocks also any focus event if model is blocking focus) - - - - - 764a8bc5 by Tony Chemit at 2021-01-10T02:15:27+01:00 Remove some default bindings on JTabbedPane to fi our usages - - - - - 0a7d58df by Tony Chemit at 2021-01-10T02:15:27+01:00 By default always focus on navigation - - - - - 5d69912b by Tony Chemit at 2021-01-10T05:07:59+01:00 Rename body in ContentUI to contentBody to avoid any conflict, body was already used by MainUI... - - - - - 96f35bb9 by Tony Chemit at 2021-01-10T05:07:59+01:00 Avoid NPE (standalone ui has no changeMode action) - - - - - 4d3785b5 by Tony Chemit at 2021-01-10T05:07:59+01:00 Fix injected binding in JaxxComboBox - - - - - 0e7b949c by Tony Chemit at 2021-01-10T05:07:59+01:00 Remove actionDown from ContentUI (legacy code) - - - - - 406d7331 by Tony Chemit at 2021-01-13T11:49:26+01:00 Widget horodatage sans bouton de réinitialisation - Closes #1746 - - - - - 974d8975 by Tony Chemit at 2021-01-13T11:55:58+01:00 Affichage des coordonnées - Closes #1745 - - - - - 13723861 by Tony Chemit at 2021-01-13T16:31:42+01:00 L'export de marées vers sql.gz ne fontionne pas - Closes #1748 - - - - - 8e54fbe4 by Tony Chemit at 2021-01-13T16:31:42+01:00 Add autoSelectText ui option (will use by next FocusManager API) - - - - - 3bb4a251 by Tony Chemit at 2021-01-13T16:34:39+01:00 Fix missing model binding - - - - - afa929e1 by Tony Chemit at 2021-01-13T17:22:19+01:00 Review focus model, nearly ok. - - - - - 42452fe2 by Tony Chemit at 2021-01-13T17:39:37+01:00 Fix trip missing binding - - - - - b71dc75b by Tony Chemit at 2021-01-13T18:25:20+01:00 Optimisation de l'arbre de sélection de données - See #1750 - - - - - fbc2873b by Tony Chemit at 2021-01-14T12:49:45+01:00 Fix bad service instanciation (bad block scope, so got illegal state exception in DataSourceService.create in server mode) - - - - - c6a0e8ec by Tony Chemit at 2021-01-14T12:50:34+01:00 Add missing method credentials - - - - - 83536653 by Tony Chemit at 2021-01-14T12:53:30+01:00 Optimisation de l'arbre de sélection de données - See #1750 (never use trip ids to get program children in navigation / selection node) - - - - - 779aa92f by Tony Chemit at 2021-01-14T12:57:05+01:00 Remplacer les raccourcis clavier Ctrl+L et Ctrl+R par des raccourcis compatible MacOs - Closes #1752 - - - - - ee0a7b32 by Tony Chemit at 2021-01-14T12:58:05+01:00 Add FIXME on NavigationNode update performance issues (a ContentList reload all his references, should get only updates one and do the merge with previous one - - - - - 84e6b88a by Tony Chemit at 2021-01-14T13:00:45+01:00 Use Java9 API - - - - - 18559d07 by Tony Chemit at 2021-01-14T14:51:21+01:00 Add lastUpdate on any type of DtoReferenceSet to be able to reload only the changed part from service - See #1750 - - - - - 641fc046 by Tony Chemit at 2021-01-14T14:52:17+01:00 Review ImmutableSet Injector (was pretty lame :( with a double conversion string to gson to object)) : no way! thanks to smaisonneuve See #1750 - - - - - 379c0745 by Tony Chemit at 2021-01-14T14:52:54+01:00 Add lastUpdate on any type of DtoReferenceSet to be able to reload only the changed part from service - See #1750 - - - - - a535a8e8 by Tony Chemit at 2021-01-14T14:57:36+01:00 Améliorer la gestion des focus - See #1418 - - - - - ec14b19e by Tony Chemit at 2021-01-14T15:28:42+01:00 Fix entity ←→ dto binding for DataFileDto properties - - - - - 2462e0f4 by Tony Chemit at 2021-01-14T18:38:54+01:00 Optimisation de l'arbre de sélection et navigation - See #1750 - - - - - d28d1be5 by Tony Chemit at 2021-01-14T19:24:59+01:00 Optimisation de l'arbre de sélection et navigation - See #1750 Ne pas recharger l'apparence des fils du parent (ce n'est pas nécessaire) - - - - - 3ffeb6ee by Tony Chemit at 2021-01-14T19:25:07+01:00 clean code - - - - - 10362d83 by Tony Chemit at 2021-01-14T22:01:03+01:00 Problème d'enregistrement sur avançon depuis le formulaire capture - Closes #1755 - - - - - dbc89a2d by Tony Chemit at 2021-01-14T22:39:19+01:00 Découplage case 'Horloge' et champ 'Horodatage de montée à bord' - Closes #1754 - - - - - ad9a007c by Tony Chemit at 2021-01-14T23:05:57+01:00 Découplage case 'Horloge' et champ 'Horodatage de montée à bord' - Closes #1754 Clean timeSinceContact when timer is off. - - - - - 8bfa20bb by Tony Chemit at 2021-01-15T03:31:30+01:00 Low some log level (in configuration file, do not touch the code) - - - - - 4bc05760 by Tony Chemit at 2021-01-15T03:36:59+01:00 Let's make overridable BusinessModule - - - - - 3c6c9b65 by Tony Chemit at 2021-01-15T03:40:20+01:00 Optimisation de l'arbre de sélection et navigation - Closes #1750 Première très concluante : on obtient des temps de l'ordre de quelques secondes pour une grosse base \o/ - - - - - 9ada1099 by Tony Chemit at 2021-01-15T03:50:41+01:00 Fix some missing decorators - - - - - c704ea5c by Tony Chemit at 2021-01-15T15:09:29+01:00 Use new jaxx list widgets (remove select ones) Clean jaxx files (remove dummy constructor who passes the ui to widgets, this is too much! and it works without it, so remove them) - - - - - b701b5a1 by Tony Chemit at 2021-01-15T16:33:02+01:00 [LL][Observations] Horodatage hook timers par défaut - Closes #1625 - - - - - 9c1ffd91 by Tony Chemit at 2021-01-16T14:36:06+01:00 Change Branchline.timeSinceContact to Integer - See #1757 - - - - - 810bcf8b by Tony Chemit at 2021-01-16T14:41:47+01:00 Introduce UnlimitedTimeEditor - See #1757 - - - - - be3b4ce7 by Tony Chemit at 2021-01-16T14:42:12+01:00 Specify java version - - - - - 6e4da3e6 by Tony Chemit at 2021-01-16T14:43:58+01:00 use UnlimitedTimeEditor on SetCatchUI and do the math (in fact just remove all specific code ^^) - See #1757 - - - - - e4033872 by Tony Chemit at 2021-01-16T15:34:55+01:00 use UnlimitedTimeEditor on BranchlineUI and do the math (in fact just remove all specific code ^^) - See #1757 Now functional on both forms :) - - - - - 70cd590f by Tony Chemit at 2021-01-17T10:28:21+01:00 Libellé erreur suppresion base locale - Closes #1758 - - - - - 483ac6ca by Tony Chemit at 2021-01-17T10:28:30+01:00 update pom - - - - - 93b221d8 by Tony Chemit at 2021-01-17T12:05:48+01:00 At init time, always go on first tab - See #1418 - - - - - fd60bfb9 by Tony Chemit at 2021-01-17T12:06:28+01:00 Improve Branchline form on SetCatch - See #1418 - - - - - 0cdc8301 by Tony Chemit at 2021-01-17T18:55:49+01:00 Review ContentTableUI API : simplify it and control more what can be overridden by client Clean LL SetTdr and SetCatch See #1418 - - - - - 6a276219 by Tony Chemit at 2021-01-17T19:23:13+01:00 update pom - - - - - fd7adab9 by Tony Chemit at 2021-01-18T13:08:57+01:00 At last, remove bad design BranchlineUI, replace it by inline code in SetDetailCompositionUI Then remove any support for not standalone ContentSimpleUI And then remove any service in ContentUIModel, prefer to generate them. See #1665 - - - - - 914fb93e by Tony Chemit at 2021-01-18T16:59:06+01:00 Make possible to override properties in referential reference cache - - - - - 38b0dc72 by Tony Chemit at 2021-01-18T16:59:55+01:00 Valider tous les écrans du modèle LL - See #1665 Composition détaillée fonctionne \o/ - - - - - 6470e3bb by Tony Chemit at 2021-01-18T17:13:52+01:00 Mark more method final in ContentUI models - - - - - 4fc552d0 by Tony Chemit at 2021-01-18T17:41:08+01:00 Valider tous les écrans du modèle LL - See #1665 Composition détaillée fonctionne encore mieux \o/ - - - - - 59fa92f2 by Tony Chemit at 2021-01-18T17:46:29+01:00 update CHANGELOG [skip ci] - - - - - 271c467a by Tony Chemit at 2021-01-18T17:55:50+01:00 [jgitflow-maven-plugin]updating poms for 8.0.3 branch with snapshot versions[skip ci] - - - - - 6a92ad0f by Tony Chemit at 2021-01-18T17:56:21+01:00 [jgitflow-maven-plugin]updating poms for branch'release/8.0.3' with non-snapshot versions[skip ci] - - - - - aa617bb3 by Tony Chemit at 2021-01-18T18:07:56+01:00 [jgitflow-maven-plugin]merging 'release/8.0.3' into 'master' - - - - - 30 changed files: - 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/.mvn/models-dto - client/core/pom.xml - client/core/src/main/i18n/getters/java.getter The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/3adb39f204b44ed44a122c64… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/3adb39f204b44ed44a122c64… 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.3 branch with snapshot versions[skip ci]
by Tony CHEMIT 18 Jan '21

18 Jan '21

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 271c467a by Tony Chemit at 2021-01-18T17:55:50+01:00 [jgitflow-maven-plugin]updating poms for 8.0.3 branch with snapshot versions[skip ci] - - - - - 6a92ad0f by Tony Chemit at 2021-01-18T17:56:21+01:00 [jgitflow-maven-plugin]updating poms for branch'release/8.0.3' with non-snapshot versions[skip ci] - - - - - aa617bb3 by Tony Chemit at 2021-01-18T18:07:56+01:00 [jgitflow-maven-plugin]merging 'release/8.0.3' into 'master' - - - - - 399f5c00 by Tony Chemit at 2021-01-18T18:07:59+01:00 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts[skip ci] - - - - - 62ea5470 by Tony Chemit at 2021-01-18T18:07:59+01:00 [jgitflow-maven-plugin]merging 'master' into 'develop' - - - - - b4631c03 by Tony Chemit at 2021-01-18T18:08:00+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/2047abd0f35b95bd30e4966e… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/2047abd0f35b95bd30e4966e… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe] Pushed new branch release/8.0.3
by Tony CHEMIT 18 Jan '21

18 Jan '21

Tony CHEMIT pushed new branch release/8.0.3 at ultreiaio / ird-observe -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/tree/release/8.0.3 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.4-SNAPSHOT development[skip ci]
by Tony CHEMIT 18 Jan '21

18 Jan '21

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 2047abd0 by Tony Chemit at 2021-01-18T17:55:51+01:00 [jgitflow-maven-plugin]updating poms for 8.0.4-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-definition/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 The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/2047abd0f35b95bd30e4966e8… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/2047abd0f35b95bd30e4966e8… 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 18 Jan '21

18 Jan '21

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 59fa92f2 by Tony Chemit at 2021-01-18T17:46:29+01:00 update CHANGELOG [skip ci] - - - - - 1 changed file: - CHANGELOG.md Changes: ===================================== CHANGELOG.md ===================================== @@ -1,7 +1,57 @@ # ObServe changelog * Author [Tony Chemit](mailto:dev@tchemit.fr) - * Last generated at 2020-12-24 12:53. + * Last generated at 2021-01-18 17:45. + +## Version [8.0.3](https://gitlab.com/ultreiaio/ird-observe/-/milestones/176) + +**Closed at 2021-01-18.** + + +### Issues + * [[Anomalie 813]](https://gitlab.com/ultreiaio/ird-observe/-/issues/813) **Le focus n'est pas bien positionné sur le formulaire** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Anomalie 1637]](https://gitlab.com/ultreiaio/ird-observe/-/issues/1637) **Remontée des messages d'erreur serveur vers le client** (Thanks to Tony CHEMIT) (Reported by Pascal Cauquil) + * [[Anomalie 1697]](https://gitlab.com/ultreiaio/ird-observe/-/issues/1697) **On en voit pas les activités observées disponibles** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Anomalie 1700]](https://gitlab.com/ultreiaio/ird-observe/-/issues/1700) **Il manque des logs sur le serveur** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Anomalie 1701]](https://gitlab.com/ultreiaio/ird-observe/-/issues/1701) **Impossible d'ouvrir la configuration** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Anomalie 1714]](https://gitlab.com/ultreiaio/ird-observe/-/issues/1714) **Validateur needcomment récalcitrant** (Thanks to Tony CHEMIT) (Reported by Pascal Cauquil) + * [[Anomalie 1715]](https://gitlab.com/ultreiaio/ird-observe/-/issues/1715) **LL Trip : erreur d'enregistrement** (Thanks to Tony CHEMIT) (Reported by Pascal Cauquil) + * [[Anomalie 1718]](https://gitlab.com/ultreiaio/ird-observe/-/issues/1718) **La dernière SNAPSHOT 8.0.3 semble instable** (Thanks to Tony CHEMIT) (Reported by Pascal Cauquil) + * [[Anomalie 1719]](https://gitlab.com/ultreiaio/ird-observe/-/issues/1719) **La carto ne tolère pas le 'Port à corriger'** (Thanks to Tony CHEMIT) (Reported by Pascal Cauquil) + * [[Anomalie 1720]](https://gitlab.com/ultreiaio/ird-observe/-/issues/1720) **La dernière SNAPSHOT 8.0.3 semble instable 2** (Thanks to Tony CHEMIT) (Reported by Pascal Cauquil) + * [[Anomalie 1723]](https://gitlab.com/ultreiaio/ird-observe/-/issues/1723) **Détail ergonomique sur l'arbre** (Thanks to Tony CHEMIT) (Reported by Pascal Cauquil) + * [[Anomalie 1725]](https://gitlab.com/ultreiaio/ird-observe/-/issues/1725) **Problème si on supprime l'unique commentaire d'une commentaire, ça ne fonctionne pas bien!** (Thanks to ) (Reported by Tony CHEMIT) + * [[Anomalie 1726]](https://gitlab.com/ultreiaio/ird-observe/-/issues/1726) **Les marées sont mal classées dans la fenêtre de droite** (Thanks to Tony CHEMIT) (Reported by Pascal Cauquil) + * [[Anomalie 1728]](https://gitlab.com/ultreiaio/ird-observe/-/issues/1728) **Erreur sur création de marée LL** (Thanks to Tony CHEMIT) (Reported by Pascal Cauquil) + * [[Anomalie 1730]](https://gitlab.com/ultreiaio/ird-observe/-/issues/1730) **Erreur sur validateur 'numéro au virage'** (Thanks to Tony CHEMIT) (Reported by Pascal Cauquil) + * [[Anomalie 1731]](https://gitlab.com/ultreiaio/ird-observe/-/issues/1731) **Consultation du tableau de captures** (Thanks to Tony CHEMIT) (Reported by Pascal Cauquil) + * [[Anomalie 1732]](https://gitlab.com/ultreiaio/ird-observe/-/issues/1732) **Bouton 'infos techniques' sur formulaire captures** (Thanks to Tony CHEMIT) (Reported by Pascal Cauquil) + * [[Anomalie 1739]](https://gitlab.com/ultreiaio/ird-observe/-/issues/1739) **Consultation du tableau des débarquements lorsque le formulaire est verrouillé** (Thanks to Tony CHEMIT) (Reported by Pascal Cauquil) + * [[Anomalie 1741]](https://gitlab.com/ultreiaio/ird-observe/-/issues/1741) **On arrive à vider la sélection sur un tableau alors qu'on ne devrait pas** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Anomalie 1746]](https://gitlab.com/ultreiaio/ird-observe/-/issues/1746) **Widget horodatage sans bouton de réinitialisation** (Thanks to Tony CHEMIT) (Reported by Pascal Cauquil) + * [[Anomalie 1748]](https://gitlab.com/ultreiaio/ird-observe/-/issues/1748) **L'export de marées vers sql.gz ne fontionne pas** (Thanks to Tony CHEMIT) (Reported by Pascal Cauquil) + * [[Anomalie 1759]](https://gitlab.com/ultreiaio/ird-observe/-/issues/1759) **Focus lors du dévérouillage LL/observations/Composition détaillée** (Thanks to Tony CHEMIT) (Reported by Pascal Cauquil) + * [[Evolution 1695]](https://gitlab.com/ultreiaio/ird-observe/-/issues/1695) **l'information nombre total d'opération de pêches sur le formulaire marée me semble un peu faible ?** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Evolution 1698]](https://gitlab.com/ultreiaio/ird-observe/-/issues/1698) **Génération du code final des services local** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Evolution 1702]](https://gitlab.com/ultreiaio/ird-observe/-/issues/1702) **Configuration de la cartographie** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Evolution 1704]](https://gitlab.com/ultreiaio/ird-observe/-/issues/1704) **Ajouts au référentiel VesseType** (Thanks to Tony CHEMIT) (Reported by Pascal Cauquil) + * [[Evolution 1705]](https://gitlab.com/ultreiaio/ird-observe/-/issues/1705) **Peaufinage de la table ll_common.onboardprocessing** (Thanks to Tony CHEMIT) (Reported by Pascal Cauquil) + * [[Evolution 1706]](https://gitlab.com/ultreiaio/ird-observe/-/issues/1706) **Peaufinage de la table ll_common.catchefate** (Thanks to Tony CHEMIT) (Reported by Pascal Cauquil) + * [[Evolution 1707]](https://gitlab.com/ultreiaio/ird-observe/-/issues/1707) **Mise en page de l'arbre sur le référentiel manageur** (Thanks to Tony CHEMIT) (Reported by Pascal Cauquil) + * [[Evolution 1708]](https://gitlab.com/ultreiaio/ird-observe/-/issues/1708) **Peaufinage de la table common.country** (Thanks to Tony CHEMIT) (Reported by Pascal Cauquil) + * [[Evolution 1709]](https://gitlab.com/ultreiaio/ird-observe/-/issues/1709) **Améliorer les performances lors du changement de l'arbre de navigation** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Evolution 1711]](https://gitlab.com/ultreiaio/ird-observe/-/issues/1711) **Peaufinage de la table ll_common.triptype** (Thanks to Tony CHEMIT) (Reported by Pascal Cauquil) + * [[Evolution 1712]](https://gitlab.com/ultreiaio/ird-observe/-/issues/1712) **Peaufinage de la table common.program** (Thanks to Tony CHEMIT) (Reported by Pascal Cauquil) + * [[Evolution 1721]](https://gitlab.com/ultreiaio/ird-observe/-/issues/1721) **Meilleure disposition pour l'onglet carte** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Evolution 1727]](https://gitlab.com/ultreiaio/ird-observe/-/issues/1727) **LL Logbook capture : validation formulaire** (Thanks to Tony CHEMIT) (Reported by Pascal Cauquil) + * [[Evolution 1729]](https://gitlab.com/ultreiaio/ird-observe/-/issues/1729) **Gestion du champ 'numéro au virage'** (Thanks to Tony CHEMIT) (Reported by Pascal Cauquil) + * [[Evolution 1733]](https://gitlab.com/ultreiaio/ird-observe/-/issues/1733) **Peaufinage de la table ll_common.onboardprocessing** (Thanks to Tony CHEMIT) (Reported by Pascal Cauquil) + * [[Evolution 1738]](https://gitlab.com/ultreiaio/ird-observe/-/issues/1738) **Rechargement de la source de données** (Thanks to Tony CHEMIT) (Reported by Pascal Cauquil) + * [[Evolution 1740]](https://gitlab.com/ultreiaio/ird-observe/-/issues/1740) **Verrouillage/déverouillage des formulaires** (Thanks to Tony CHEMIT) (Reported by Pascal Cauquil) + * [[Evolution 1745]](https://gitlab.com/ultreiaio/ird-observe/-/issues/1745) **Affichage des coordonnées** (Thanks to Tony CHEMIT) (Reported by Pascal Cauquil) + * [[Evolution 1750]](https://gitlab.com/ultreiaio/ird-observe/-/issues/1750) **Optimisation de l'arbre de sélection et navigation** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Tâche 1664]](https://gitlab.com/ultreiaio/ird-observe/-/issues/1664) **Il reste quelques optimisations à réaliser sur la couche de persistence** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Tâche 1665]](https://gitlab.com/ultreiaio/ird-observe/-/issues/1665) **Valider tous les écrans du modèle LL** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) ## Version [8.0.2](https://gitlab.com/ultreiaio/ird-observe/-/milestones/175) Merry Christmas @@ -68,7 +118,6 @@ Merry Christmas * [[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) View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/59fa92f282e74a72369f48656… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/59fa92f282e74a72369f48656… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] Valider tous les écrans du modèle LL - See #1665
by Tony CHEMIT 18 Jan '21

18 Jan '21

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 4fc552d0 by Tony Chemit at 2021-01-18T17:41:08+01:00 Valider tous les écrans du modèle LL - See #1665 Composition détaillée fonctionne encore mieux \o/ - - - - - 7 changed files: - client/core/src/main/java/fr/ird/observe/client/util/init/DefaultUIInitializer.java - client/core/src/main/java/fr/ird/observe/client/util/init/UIInitHelper.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/ContentUIInitializer.java - client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/observation/SetDetailCompositionUI.jaxx - client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/observation/SetDetailCompositionUI.jcss - client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/observation/SetDetailCompositionUIHandler.java - client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/observation/SetDetailCompositionUIInitializer.java Changes: ===================================== client/core/src/main/java/fr/ird/observe/client/util/init/DefaultUIInitializer.java ===================================== @@ -172,7 +172,7 @@ public class DefaultUIInitializer<UI extends JComponent & JAXXObject> extends UI protected void init(NumberEditor editor) { initializerContext.checkFirstPass(); - editor.init(); + UIInitHelper.init(editor, getClientConfig().isAutoPopupNumberEditor(), getClientConfig().isShowNumberEditorButton()); } protected void init(DateTimeEditor editor) { ===================================== client/core/src/main/java/fr/ird/observe/client/util/init/UIInitHelper.java ===================================== @@ -175,11 +175,11 @@ public class UIInitHelper { } - public static void init(JAXXObject ui, ObserveSwingValidator<?> validator, TemperatureEditor editor, boolean autoPopupNumberEditor, boolean showTimeEditorSlider) { + public static void init(JAXXObject ui, ObserveSwingValidator<?> validator, TemperatureEditor editor, boolean autoPopupNumberEditor, boolean showPopupButton) { NumberEditor numberEditor = editor.getEditor(); numberEditor.setShowReset(true); numberEditor.setAutoPopup(autoPopupNumberEditor); - numberEditor.setShowPopupButton(showTimeEditorSlider); + numberEditor.setShowPopupButton(showPopupButton); String propertyName = editor.getName(); JLabel label = (JLabel) ui.getObjectById(propertyName + "Label"); Objects.requireNonNull(label, "can't find label for temperature editor " + editor); @@ -188,10 +188,10 @@ public class UIInitHelper { editor.getModel().addPropertyChangeListener("format", e -> validator.doValidate()); } - public static void init(NumberEditor editor, boolean autoPopupNumberEditor, boolean showTimeEditorSlider) { + public static void init(NumberEditor editor, boolean autoPopupNumberEditor, boolean showPopupButton) { editor.setShowReset(true); editor.setAutoPopup(autoPopupNumberEditor); - editor.setShowPopupButton(showTimeEditorSlider); + editor.setShowPopupButton(showPopupButton); editor.init(); } ===================================== client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/ContentUIInitializer.java ===================================== @@ -236,7 +236,7 @@ public class ContentUIInitializer<UI extends ContentUI> extends UIInitializerSup if (ui instanceof EditableContentUI) { validator = ((EditableContentUI<?>) ui).getValidator(); } - UIInitHelper.init(ui, validator, editor, getClientConfig().isAutoPopupNumberEditor(), getClientConfig().isShowTimeEditorSlider()); + UIInitHelper.init(ui, validator, editor, getClientConfig().isAutoPopupNumberEditor(), getClientConfig().isShowNumberEditorButton()); } protected void init(JToolBar editor) { @@ -281,7 +281,7 @@ public class ContentUIInitializer<UI extends ContentUI> extends UIInitializerSup protected void init(NumberEditor editor) { initializerContext.checkFirstPass(); - UIInitHelper.init(editor, getClientConfig().isAutoPopupNumberEditor(), getClientConfig().isShowTimeEditorSlider()); + UIInitHelper.init(editor, getClientConfig().isAutoPopupNumberEditor(), getClientConfig().isShowNumberEditorButton()); } public JComponent getActionContainer() { ===================================== client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/observation/SetDetailCompositionUI.jaxx ===================================== @@ -329,7 +329,7 @@ </JTabbedPane> </cell> </row> - <row> + <row weighty="1"> <cell weighty="1" fill="both"> <BigTextEditor id="comment"/> </cell> ===================================== client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/observation/SetDetailCompositionUI.jcss ===================================== @@ -137,6 +137,10 @@ _showTimeEditorSlider:false; } +#snapWeight { + enabled:{Objects.equals(true, branchlineBean.getWeightedSnap())}; +} + #swivelWeight { enabled:{Objects.equals(true, branchlineBean.getWeightedSwivel())}; } ===================================== client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/observation/SetDetailCompositionUIHandler.java ===================================== @@ -105,12 +105,15 @@ public class SetDetailCompositionUIHandler extends GeneratedSetDetailComposition ResetAction.installAction(ui, ui.getReset(), new DefaultResetAdapter<>() { @Override public void onUpdate(SetDetailCompositionUI ui) { -// BranchlineDto branchline = ui.getBranchlinesTableModel().getSelectedRow(); + BranchlineDto branchline = ui.getBranchlinesTableModel().getSelectedRow(); onBranchlineChanged(null); ui.getSectionsTableModel().clear(); ui.getBasketsTableModel().clear(); ui.getBranchlinesTableModel().clear(); super.onUpdate(ui); + if (branchline != null && ui.getMainTabbedPane().getSelectedIndex() == 2) { + onBranchlineChanged(branchline); + } } }); ResetAction<SetDetailCompositionUI> action = ResetAction.prepareAction(new DefaultResetAdapter<>() { @@ -145,10 +148,10 @@ public class SetDetailCompositionUIHandler extends GeneratedSetDetailComposition // TODO Use a cache of templates on setLongline (session scope) model.getStates().getSectionTemplatesTableModel().setData(new ArrayList<>()); - BranchlineDto selectedRow = model.getStates().getBranchlinesTableModel().getSelectedRow(); - if (ui.getMainTabbedPane().getSelectedIndex() == 2) { - onBranchlineChanged(selectedRow); - } +// BranchlineDto selectedRow = model.getStates().getBranchlinesTableModel().getSelectedRow(); +// if (ui.getMainTabbedPane().getSelectedIndex() == 2) { +// onBranchlineChanged(selectedRow); +// } } @Override @@ -394,7 +397,7 @@ public class SetDetailCompositionUIHandler extends GeneratedSetDetailComposition ui.getValidator().setChanged(true); } - void onTimerChanged(Boolean newValue) { + void onTimerChanged(boolean newValue) { if (Objects.equals(true, newValue)) { // with timer ui.getBranchlineBean().setTimeSinceContact(0); @@ -403,4 +406,24 @@ public class SetDetailCompositionUIHandler extends GeneratedSetDetailComposition ui.getBranchlineBean().setTimeSinceContact(null); } } + + void onWeightedSnapChanged(boolean newValue) { + if (Objects.equals(true, newValue)) { + // with timer + ui.getBranchlineBean().setSnapWeight(0F); + } else { + // without timer + ui.getBranchlineBean().setSnapWeight(null); + } + } + + void onWeightedSwivelChanged(boolean newValue) { + if (Objects.equals(true, newValue)) { + // with timer + ui.getBranchlineBean().setSwivelWeight(0F); + } else { + // without timer + ui.getBranchlineBean().setSwivelWeight(null); + } + } } ===================================== client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/observation/SetDetailCompositionUIInitializer.java ===================================== @@ -257,6 +257,18 @@ public class SetDetailCompositionUIInitializer extends ContentSimpleUIInitialize ui.getHandler().onTimerChanged(((BeanCheckBox) e.getSource()).isSelected()); } }); + UIInitHelper.setAction(ui.getWeightedSnap(), new AbstractAction() { + @Override + public void actionPerformed(ActionEvent e) { + ui.getHandler().onWeightedSnapChanged(((BeanCheckBox) e.getSource()).isSelected()); + } + }); + UIInitHelper.setAction(ui.getWeightedSwivel(), new AbstractAction() { + @Override + public void actionPerformed(ActionEvent e) { + ui.getHandler().onWeightedSwivelChanged(((BeanCheckBox) e.getSource()).isSelected()); + } + }); SetDefaultTimerTimeOnBoard.init(ui, ui.getSetDefaultTimerTimeOnBoard(), new SetDefaultTimerTimeOnBoard<SetDetailCompositionUI>() { @Override protected Date getHaulingStartTimeStamp(SetDetailCompositionUI ui) { View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/4fc552d0f5b84ac4778de7a26… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/4fc552d0f5b84ac4778de7a26… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] Mark more method final in ContentUI models
by Tony CHEMIT 18 Jan '21

18 Jan '21

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 6470e3bb by Tony Chemit at 2021-01-18T17:13:52+01:00 Mark more method final in ContentUI models - - - - - 2 changed files: - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/list/ContentListUIModel.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/open/ContentOpenableUIModel.java Changes: ===================================== client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/list/ContentListUIModel.java ===================================== @@ -55,15 +55,15 @@ public abstract class ContentListUIModel<R extends DataDtoReference> extends Con return (ContentListUIModelStates<R>) super.getStates(); } - public MoveRequestBuilder.StepSetParentCandidates toMoveRequest() { + public final MoveRequestBuilder.StepSetParentCandidates toMoveRequest() { return MoveRequestBuilder.create(getSource().getScope().getMainReferenceType(), getSource().getScope().getParentReferenceType(), getStates().getSelectedParentId(), getStates().getSelectedIds()); } - public ShowIdRequest getShowIdRequest() { + public final ShowIdRequest getShowIdRequest() { return new ShowIdRequest(getStates()::getSafeSelectedData); } - public ChangeModeRequest toChangeModeRequest() { + public final ChangeModeRequest toChangeModeRequest() { return new ChangeModeRequest(getSource().getScope().getI18nTranslation("type")) { @Override protected SelectNode<?> getSelectNode(ContentUI ui) { ===================================== client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/open/ContentOpenableUIModel.java ===================================== @@ -59,12 +59,12 @@ public abstract class ContentOpenableUIModel<D extends DataDto> extends ContentS return (ContentOpenableUIModelStates<D>) super.getStates(); } - public ShowIdRequest getShowIdRequest() { + public final ShowIdRequest getShowIdRequest() { return new ShowIdRequest(getSource()::getReference); } @Override - public Form<D> openForm(ObserveServicesProvider servicesProvider, String selectedId) { + public final Form<D> openForm(ObserveServicesProvider servicesProvider, String selectedId) { open(); Form<D> form; if (selectedId == null) { @@ -80,7 +80,7 @@ public abstract class ContentOpenableUIModel<D extends DataDto> extends ContentS } //FIXME Generate me (better use generation over cryptic code) - public MoveRequestBuilder.StepSetParentCandidates toMoveRequest() { + public final MoveRequestBuilder.StepSetParentCandidates toMoveRequest() { return MoveRequestBuilder.create(getSource().getScope().getMainReferenceType(), getSource().getScope().getParentReferenceType(), getStates().getSelectedParentId(), ImmutableSet.of(getStates().getBean().getId())); } } View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/6470e3bbea34e38532bed532b… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/6470e3bbea34e38532bed532b… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] 2 commits: Make possible to override properties in referential reference cache
by Tony CHEMIT 18 Jan '21

18 Jan '21

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 914fb93e by Tony Chemit at 2021-01-18T16:59:06+01:00 Make possible to override properties in referential reference cache - - - - - 38b0dc72 by Tony Chemit at 2021-01-18T16:59:55+01:00 Valider tous les écrans du modèle LL - See #1665 Composition détaillée fonctionne \o/ - - - - - 5 changed files: - client/core/src/main/java/fr/ird/observe/client/datasource/api/cache/ReferencesCache.java - client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/observation/SetDetailCompositionUI.jaxx - client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/observation/SetDetailCompositionUI.jcss - client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/observation/SetDetailCompositionUIHandler.java - client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/observation/composition/SetDetailCompositionUIValidationHelper.java Changes: ===================================== client/core/src/main/java/fr/ird/observe/client/datasource/api/cache/ReferencesCache.java ===================================== @@ -128,9 +128,13 @@ public class ReferencesCache { public void loadReferentialReferenceSetsInModel(FormDefinition<?> formDefinition, boolean clear) { Class<? extends IdDto> dtoType = formDefinition.getType(); ImmutableMap.Builder<String, ReferentialDtoReferenceSet<?>> modelReferentialReferenceSets = ImmutableMap.builder(); + Set<String> existingProperties; if (!clear) { // keep existing sets modelReferentialReferenceSets.putAll(referentialReferenceSetsByPropertyName); + existingProperties = referentialReferenceSetsByPropertyName.keySet(); + } else { + existingProperties = Collections.emptySet(); } log.debug("Update referential reference sets for: " + dtoType); // mettre à jour le cache de référentiel @@ -138,6 +142,10 @@ public class ReferencesCache { // calculer les listes de référentiels à utiliser dans le modèle for (Map.Entry<String, ReferentialDtoReferenceDefinition<?, ?>> entry : formDefinition.getProperties().entrySet()) { String propertyName = entry.getKey(); + if (existingProperties.contains(propertyName)) { + // already in cache + continue; + } ReferentialDtoReferenceDefinition definition = entry.getValue(); ReferentialDtoReferenceSet<?> referentialReferenceSet = referentialReferenceSetsByType.get(definition.getType()); ReferentialDtoReferenceSet<?> filteredReferentialReferenceSet = filterReferentialReferenceSet(propertyName, definition, referentialReferenceSet); ===================================== client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/observation/SetDetailCompositionUI.jaxx ===================================== @@ -63,9 +63,9 @@ <BasketTableModel id='basketsTableModel' initializer="getStates().getBasketsTableModel()"/> <BranchlineTableModel id='branchlinesTableModel' initializer="getStates().getBranchlinesTableModel()"/> - <BeanValidator id='validator' autoField='true' - beanClass='fr.ird.observe.dto.data.ll.observation.SetDetailCompositionDto' - errorTableModel='{getErrorTableModel()}' context='update-detailComposition'> + <BeanValidator id='validator' beanClass='fr.ird.observe.dto.data.ll.observation.SetDetailCompositionDto' + errorTableModel='{getErrorTableModel()}' context='update'> + <field name='comment' component='contentBody'/> </BeanValidator> <BeanValidator id='generateValidator' @@ -88,9 +88,13 @@ <BeanValidator id='branchlineValidator' beanClass='fr.ird.observe.dto.data.ll.observation.BranchlineDto' errorTableModel='{getErrorTableModel()}' context='update'> - <field name='settingIdentifier' component='branchlinesPane'/> - <field name='tracelineLength' component='branchlinesPane'/> - <field name='branchlineLength' component='branchlinesPane'/> + <field name='settingIdentifier' component='branchlinesTable'/> + <field name='tracelineLength' component='branchlinesTable'/> + <field name='branchlineLength' component='branchlinesTable'/> + </BeanValidator> + + <BeanValidator id='branchlineDetailValidator' autoField="true" beanClass='fr.ird.observe.dto.data.ll.observation.BranchlineDto' + errorTableModel='{getErrorTableModel()}' context='update'> </BeanValidator> <JPopupMenu id='sectionTemplatesPopup'> @@ -326,7 +330,7 @@ </cell> </row> <row> - <cell> + <cell weighty="1" fill="both"> <BigTextEditor id="comment"/> </cell> </row> ===================================== client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/observation/SetDetailCompositionUI.jcss ===================================== @@ -25,7 +25,7 @@ valid:{states.isCompositionTabValid() && states.isBranchlineDetailTabValid()}; generateTabValid: {!states.isCanGenerate() || sectionTemplatesTableModel.isValid()}; compositionTabValid: {sectionsTableModel.isValid() && basketsTableModel.isValid() && branchlinesTableModel.isValid()}; - branchlineDetailTabValid: {branchlineValidator.isValid()}; + branchlineDetailTabValid: {branchlineDetailValidator.isValid()}; } #mainTabbedPane { @@ -117,7 +117,7 @@ /* ***************************************************************************** */ #branchlineTab { - enabled: {compositionTab.isEnabled() && states.isCompositionTabValid() && !branchlinesTableModel.isSelectionEmpty()}; + enabled: {compositionTab.isEnabled() && states.isCompositionTabValid() && branchlinesTableModel.getSelectedRowIndex() != -1}; } #noBranchlineSelected { @@ -146,9 +146,9 @@ } #resetBranchline { - enabled:{branchlineValidator.isChanged()}; + enabled:{branchlineDetailValidator.isChanged()}; } #saveBranchline { - enabled:{branchlineValidator.isChanged() && branchlineValidator.isValid()}; + enabled:{branchlineDetailValidator.isChanged() && branchlineDetailValidator.isValid()}; } ===================================== client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/observation/SetDetailCompositionUIHandler.java ===================================== @@ -105,11 +105,12 @@ public class SetDetailCompositionUIHandler extends GeneratedSetDetailComposition ResetAction.installAction(ui, ui.getReset(), new DefaultResetAdapter<>() { @Override public void onUpdate(SetDetailCompositionUI ui) { - BranchlineDto branchline = ui.getBranchlinesTableModel().getSelectedRow(); +// BranchlineDto branchline = ui.getBranchlinesTableModel().getSelectedRow(); + onBranchlineChanged(null); + ui.getSectionsTableModel().clear(); + ui.getBasketsTableModel().clear(); + ui.getBranchlinesTableModel().clear(); super.onUpdate(ui); - if (branchline != null) { - onBranchlineChanged(branchline); - } } }); ResetAction<SetDetailCompositionUI> action = ResetAction.prepareAction(new DefaultResetAdapter<>() { @@ -145,7 +146,9 @@ public class SetDetailCompositionUIHandler extends GeneratedSetDetailComposition model.getStates().getSectionTemplatesTableModel().setData(new ArrayList<>()); BranchlineDto selectedRow = model.getStates().getBranchlinesTableModel().getSelectedRow(); - onBranchlineChanged(selectedRow); + if (ui.getMainTabbedPane().getSelectedIndex() == 2) { + onBranchlineChanged(selectedRow); + } } @Override @@ -171,6 +174,9 @@ public class SetDetailCompositionUIHandler extends GeneratedSetDetailComposition public void onInstallValidators(IdDto editBean) { super.onInstallValidators(editBean); ui.getGenerateValidator().setBean(getModel().getStates()); + if (ui.getMainTabbedPane().getSelectedIndex() == 2 && getModel().getStates().getBranchlinesTableModel().getSelectedRow() != null) { + ui.getBranchlineDetailValidator().setBean(ui.getBranchlineBean()); + } } @Override @@ -280,7 +286,7 @@ public class SetDetailCompositionUIHandler extends GeneratedSetDetailComposition } public void onBranchlineChanged(BranchlineDto newValue) { - boolean changed = ui.getValidator().isChanged(); + boolean changed = ui.getValidator().isChanged() || ui.getModel().getStates().isModified(); String oldId = null; BranchlineDto branchlineBean = ui.getModel().getStates().getBranchlineBean(); @@ -296,8 +302,7 @@ public class SetDetailCompositionUIHandler extends GeneratedSetDetailComposition return; } - SwingValidator<BranchlineDto> branchlineValidator = ui.getBranchlineValidator(); - SetDetailCompositionUIModel model = getModel(); + SwingValidator<BranchlineDto> branchlineValidator = ui.getBranchlineDetailValidator(); if (newValue == null) { log.info(String.format("%s Remove branchline", prefix)); branchlineValidator.setBean(null); @@ -314,9 +319,9 @@ public class SetDetailCompositionUIHandler extends GeneratedSetDetailComposition void updateBranchlineAccessibility(boolean withBranchline) { if (withBranchline) { - ui.getMainTabbedPane().setComponentAt(5, ui.getBranchlinePanel()); + ui.getMainTabbedPane().setComponentAt(2, ui.getBranchlinePanel()); } else { - ui.getMainTabbedPane().setComponentAt(5, ui.getNoBranchlineForm()); + ui.getMainTabbedPane().setComponentAt(2, ui.getNoBranchlineForm()); } } @@ -324,7 +329,7 @@ public class SetDetailCompositionUIHandler extends GeneratedSetDetailComposition boolean canContinue; SetDetailCompositionUIModel model = getModel(); SetDetailCompositionUIModelStates states = model.getStates(); - if (states.isEditing() && ui.getBranchlineValidator().isChanged()) { + if (states.isEditing() && ui.getBranchlineDetailValidator().isChanged()) { canContinue = false; if (states.isBranchlineDetailTabValid()) { // le formulaire est valide, on demande a l'utilisateur s'il @@ -384,8 +389,9 @@ public class SetDetailCompositionUIHandler extends GeneratedSetDetailComposition public void doSaveBranchline() { BranchlineDto beanToSave = ui.getModel().getStates().getBranchlineBean(); beanToSave.copy(ui.getModel().getStates().getBranchlinesTableModel().getSelectedRow()); - ui.getBranchlineValidator().setChanged(false); - ui.getBranchlineValidator().setValid(true); + ui.getBranchlineDetailValidator().setChanged(false); + ui.getBranchlineDetailValidator().setValid(true); + ui.getValidator().setChanged(true); } void onTimerChanged(Boolean newValue) { ===================================== client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/observation/composition/SetDetailCompositionUIValidationHelper.java ===================================== @@ -35,6 +35,7 @@ import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.nuiton.jaxx.validator.swing.SwingValidator; import org.nuiton.jaxx.validator.swing.SwingValidatorMessage; +import org.nuiton.validator.NuitonValidatorScope; import org.nuiton.validator.bean.simple.SimpleBeanValidator; import javax.swing.JComponent; @@ -79,7 +80,8 @@ public class SetDetailCompositionUIValidationHelper { List<SwingValidatorMessage> messages = validatorService.validateSections(notEmptyData); removeOldMessages(); errorTableModel.addMessages(messages); - model.getStates().setCompositionTabValid(messages.isEmpty()); + long errorMessagesCount = messages.stream().filter(m -> m.getScope() == NuitonValidatorScope.ERROR).count(); + model.getStates().setCompositionTabValid(errorMessagesCount == 0); } } @@ -90,7 +92,8 @@ public class SetDetailCompositionUIValidationHelper { List<SwingValidatorMessage> messages = validatorService.validateSections(notEmptyData); removeOldMessages(); errorTableModel.addMessages(messages); - model.getStates().setCompositionTabValid(messages.isEmpty()); + long errorMessagesCount = messages.stream().filter(m -> m.getScope() == NuitonValidatorScope.ERROR).count(); + model.getStates().setCompositionTabValid(errorMessagesCount == 0); } } @@ -101,7 +104,8 @@ public class SetDetailCompositionUIValidationHelper { List<SwingValidatorMessage> messages = validatorService.validateSections(notEmptyData); removeOldMessages(); errorTableModel.addMessages(messages); - model.getStates().setCompositionTabValid(messages.isEmpty()); + long errorMessagesCount = messages.stream().filter(m -> m.getScope() == NuitonValidatorScope.ERROR).count(); + model.getStates().setCompositionTabValid(errorMessagesCount == 0); } } View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/fd7adab93f7415422d866774… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/fd7adab93f7415422d866774… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] 5 commits: At init time, always go on first tab - See #1418
by Tony CHEMIT 18 Jan '21

18 Jan '21

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 93b221d8 by Tony Chemit at 2021-01-17T12:05:48+01:00 At init time, always go on first tab - See #1418 - - - - - fd60bfb9 by Tony Chemit at 2021-01-17T12:06:28+01:00 Improve Branchline form on SetCatch - See #1418 - - - - - 0cdc8301 by Tony Chemit at 2021-01-17T18:55:49+01:00 Review ContentTableUI API : simplify it and control more what can be overridden by client Clean LL SetTdr and SetCatch See #1418 - - - - - 6a276219 by Tony Chemit at 2021-01-17T19:23:13+01:00 update pom - - - - - fd7adab9 by Tony Chemit at 2021-01-18T13:08:57+01:00 At last, remove bad design BranchlineUI, replace it by inline code in SetDetailCompositionUI Then remove any support for not standalone ContentSimpleUI And then remove any service in ContentUIModel, prefer to generate them. See #1665 - - - - - 30 changed files: - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/ContentUIHandler.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/ContentUIInitializer.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/ContentUIModel.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/actions/create/CreateNewOpenableUI.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/actions/move/MoveRequestBuilder.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/actions/open/ContentOpen.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/TripUIHelper.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/edit/ContentEditUIHandler.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/edit/ContentEditUIModel.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/edit/ContentEditUIOpenExecutor.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/edit/actions/DeleteEdit.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/list/ContentListUI.jaxx - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/list/ContentListUIHandler.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/list/ContentListUIModel.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/list/ContentListUIModelStates.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/list/ContentListUIOpenExecutor.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/list/actions/DeleteMultiple.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/content/data/list/actions/MoveMultiple.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/open/ContentOpenableUIHandler.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/open/ContentOpenableUIModel.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/open/ContentOpenableUIOpenExecutor.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/open/actions/DeleteOpenable.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/open/actions/MoveOpenable.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/simple/ContentSimpleUIModel.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/simple/ContentSimpleUIModelSupport.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/simple/ContentSimpleUINavigationNode.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/simple/ContentSimpleUIOpenExecutor.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/table/ContentTableUIHandler.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/table/ContentTableUIListSelectionModel.java The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/483ac6ca5b1d976b133e7011… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/483ac6ca5b1d976b133e7011… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] 2 commits: Libellé erreur suppresion base locale - Closes #1758
by Tony CHEMIT 17 Jan '21

17 Jan '21

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 70cd590f by Tony Chemit at 2021-01-17T10:28:21+01:00 Libellé erreur suppresion base locale - Closes #1758 - - - - - 483ac6ca by Tony Chemit at 2021-01-17T10:28:30+01:00 update pom - - - - - 3 changed files: - client/datasource/editor/api/src/main/i18n/templates/feedBackOnClosingLocalDataSource_fr_FR.ftl - client/datasource/editor/api/src/main/i18n/templates/feedBackOnOpeningLocalDataSource_fr_FR.ftl - pom.xml Changes: ===================================== client/datasource/editor/api/src/main/i18n/templates/feedBackOnClosingLocalDataSource_fr_FR.ftl ===================================== @@ -24,7 +24,7 @@ <hr/> À ce stade, vous pouvez générer un retour d'expérience sous forme d'archive qui contiendra les données nécessaires - pour que nous puissons corriger le problème). + pour que nous puissions examiner le problème). L'archive sera générée ici: ${feedBackFile} @@ -35,12 +35,10 @@ Vous pouvez : <ul> <li>Annuler la génération du retour d'expérience - (cela annulera la suite de l'opération d'ouverturde de source de - données) + (cela annulera la suite de l'opération d'ouverture de source de données) </li> - <li>Generer le retour d'expérience (cela supprimera la base locale et poursuivera l'opération d'ouverture de - source de - données) + <li>Generer le retour d'expérience (cela supprimera la base locale et poursuivra l'opération d'ouverture de + source de données) </li> </ul> </body> ===================================== client/datasource/editor/api/src/main/i18n/templates/feedBackOnOpeningLocalDataSource_fr_FR.ftl ===================================== @@ -33,7 +33,7 @@ À ce stade, vous pouvez générer un retour d'expérience sous forme d'archive qui contiendra les données nécessaires - pour que nous puissons corriger le problème. + pour que nous puissions examiner le problème. L'archive sera générée ici: ${feedBackFile} ===================================== pom.xml ===================================== @@ -25,7 +25,7 @@ <parent> <groupId>io.ultreia.maven</groupId> <artifactId>pom</artifactId> - <version>2021.2-SNAPSHOT</version> + <version>2021.2</version> </parent> <groupId>fr.ird.observe</groupId> View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/e4033872bc681bbc79430507… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/e4033872bc681bbc79430507… You're receiving this email because of your account on gitlab.com.

1 0