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

[Git][ultreiaio/ird-observe][develop] 5 commits: On peut créer un programme sans sélectionner aucun des types de données qu'il...
by Tony CHEMIT (＠tchemit) Oct. 29, 2021

Oct. 29, 2021

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 8cbf2487 by Tony Chemit at 2021-10-28T08:00:39+02:00 On peut créer un programme sans sélectionner aucun des types de données qu'il peut recevoir - Closes #2071 - - - - - c416b6ba by Tony Chemit at 2021-10-29T00:49:36+02:00 Création des routes et activités requises lorsqu'elles sont absentes - Closes #2070 Improve Avdth API: * now reader have no logic everything is in ImportDataContext (except for dcp...) * introduce ImportReferentialContext with all possible cache we need. Improve avdth tests - - - - - 3b2e61d2 by Tony Chemit at 2021-10-29T01:07:05+02:00 Ne pas supprimer les fichers temporaires à chaque lancement de l'application - Closes #2074 + clean de RunObserveListener - - - - - 3bc25c05 by Tony Chemit at 2021-10-29T01:07:05+02:00 Positionner sur le bouton choisir un fichier ou un répertoire sur les écrans requis - Closes #2076 - - - - - b6d8cd0f by Tony Chemit at 2021-10-29T01:07:05+02:00 Correction référentiels (' est doublé dans les migrations) Les systèmes observés 102→104 sont désactivés - - - - - 30 changed files: - client/configuration/pom.xml - client/configuration/src/main/java/fr/ird/observe/client/configuration/ClientConfig.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/RunObserveListener.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/wizard/StorageUIHandler.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/wizard/tabs/ConfigUIHandler.java - models/definition/src/main/models/Observe/dto/attribute/notNullIf.properties - models/persistence/avdth/src/main/java/fr/ird/observe/persistence/avdth/QueryDefinition.java - models/persistence/avdth/src/main/java/fr/ird/observe/persistence/avdth/data/DataReader.java - models/persistence/avdth/src/main/java/fr/ird/observe/persistence/avdth/data/DataTables.java - models/persistence/avdth/src/main/java/fr/ird/observe/persistence/avdth/data/DataWriter.java - + models/persistence/avdth/src/main/java/fr/ird/observe/persistence/avdth/data/ImportDataContext.java - models/persistence/avdth/src/main/java/fr/ird/observe/persistence/avdth/data/ImportEngine.java - models/persistence/avdth/src/main/java/fr/ird/observe/persistence/avdth/data/ImportEngineExecution.java - + models/persistence/avdth/src/main/java/fr/ird/observe/persistence/avdth/data/ImportReferentialContext.java - models/persistence/avdth/src/main/java/fr/ird/observe/persistence/avdth/data/common/LandingReader.java - − models/persistence/avdth/src/main/java/fr/ird/observe/persistence/avdth/data/common/LandingTableReader.java - models/persistence/avdth/src/main/java/fr/ird/observe/persistence/avdth/data/common/TripReader.java - − models/persistence/avdth/src/main/java/fr/ird/observe/persistence/avdth/data/common/TripTableReader.java - models/persistence/avdth/src/main/java/fr/ird/observe/persistence/avdth/data/common/TripWriter.java - models/persistence/avdth/src/main/java/fr/ird/observe/persistence/avdth/data/localmarket/BatchReader.java - − models/persistence/avdth/src/main/java/fr/ird/observe/persistence/avdth/data/localmarket/BatchTableReader.java - models/persistence/avdth/src/main/java/fr/ird/observe/persistence/avdth/data/localmarket/SampleReader.java - models/persistence/avdth/src/main/java/fr/ird/observe/persistence/avdth/data/localmarket/SampleSpeciesMeasureReader.java - − models/persistence/avdth/src/main/java/fr/ird/observe/persistence/avdth/data/localmarket/SampleSpeciesMeasureTableReader.java - models/persistence/avdth/src/main/java/fr/ird/observe/persistence/avdth/data/localmarket/SampleSpeciesReader.java - − models/persistence/avdth/src/main/java/fr/ird/observe/persistence/avdth/data/localmarket/SampleSpeciesTableReader.java - − models/persistence/avdth/src/main/java/fr/ird/observe/persistence/avdth/data/localmarket/SampleWellTableReader.java - models/persistence/avdth/src/main/java/fr/ird/observe/persistence/avdth/data/localmarket/SampleWriter.java - models/persistence/avdth/src/main/java/fr/ird/observe/persistence/avdth/data/localmarket/SurveyReader.java - models/persistence/avdth/src/main/java/fr/ird/observe/persistence/avdth/data/logbook/ActivityReader.java The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/ff32a654ccd3a8f4b0394ce2… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/ff32a654ccd3a8f4b0394ce2… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][pages] Site checkin for project ObServe (version 9.0.0-RC-17)
by Tony CHEMIT (＠tchemit) Oct. 27, 2021

Oct. 27, 2021

Tony CHEMIT pushed to branch pages at ultreiaio / ird-observe Commits: 00031423 by Tony Chemit at 2021-10-27T17:42:32+02:00 Site checkin for project ObServe (version 9.0.0-RC-17) - - - - - 26 changed files: - 9.0.0-RC-17-SNAPSHOT/CHANGELOG.html → 9.0.0-RC-17/CHANGELOG.html - 9.0.0-RC-17-SNAPSHOT/ClientConfig.html → 9.0.0-RC-17/ClientConfig.html - 9.0.0-RC-17-SNAPSHOT/ClientConfig.properties → 9.0.0-RC-17/ClientConfig.properties - 9.0.0-RC-17-SNAPSHOT/ServerConfig.html → 9.0.0-RC-17/ServerConfig.html - 9.0.0-RC-17-SNAPSHOT/ServerConfig.properties → 9.0.0-RC-17/ServerConfig.properties - 9.0.0-RC-17-SNAPSHOT/administration-web.html → 9.0.0-RC-17/administration-web.html - 9.0.0-RC-17-SNAPSHOT/architecture-logicielle.html → 9.0.0-RC-17/architecture-logicielle.html - 9.0.0-RC-17-SNAPSHOT/avdth/common.html → 9.0.0-RC-17/avdth/common.html - 9.0.0-RC-17-SNAPSHOT/avdth/index.html → 9.0.0-RC-17/avdth/index.html - 9.0.0-RC-17-SNAPSHOT/avdth/landing.html → 9.0.0-RC-17/avdth/landing.html - 9.0.0-RC-17-SNAPSHOT/avdth/local_market.html → 9.0.0-RC-17/avdth/local_market.html - 9.0.0-RC-17-SNAPSHOT/avdth/logbook.html → 9.0.0-RC-17/avdth/logbook.html - 9.0.0-RC-17-SNAPSHOT/avdth/referential.html → 9.0.0-RC-17/avdth/referential.html - 9.0.0-RC-17-SNAPSHOT/avdth/sample.html → 9.0.0-RC-17/avdth/sample.html - 9.0.0-RC-17-SNAPSHOT/changelog.html → 9.0.0-RC-17/changelog.html - 9.0.0-RC-17-SNAPSHOT/changes-report.html → 9.0.0-RC-17/changes-report.html - 9.0.0-RC-17-SNAPSHOT/ci-management.html → 9.0.0-RC-17/ci-management.html - 9.0.0-RC-17-SNAPSHOT/css/apache-maven-fluido-1.9.min.css → 9.0.0-RC-17/css/apache-maven-fluido-1.9.min.css - 9.0.0-RC-17-SNAPSHOT/css/print.css → 9.0.0-RC-17/css/print.css - 9.0.0-RC-17-SNAPSHOT/css/site.css → 9.0.0-RC-17/css/site.css - 9.0.0-RC-17-SNAPSHOT/dependency-convergence.html → 9.0.0-RC-17/dependency-convergence.html - 9.0.0-RC-17-SNAPSHOT/dependency-info.html → 9.0.0-RC-17/dependency-info.html - 9.0.0-RC-17-SNAPSHOT/dependency-management.html → 9.0.0-RC-17/dependency-management.html - 9.0.0-RC-17-SNAPSHOT/dependency-updates-report.html → 9.0.0-RC-17/dependency-updates-report.html - 9.0.0-RC-17-SNAPSHOT/dev-activity.html → 9.0.0-RC-17/dev-activity.html - 9.0.0-RC-17-SNAPSHOT/distribution-management.html → 9.0.0-RC-17/distribution-management.html The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/00031423065bda8abfc0c87ab… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/00031423065bda8abfc0c87ab… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe] Deleted branch release/9.0.0-RC-17
by Tony CHEMIT (＠tchemit) Oct. 27, 2021

Oct. 27, 2021

Tony CHEMIT deleted branch release/9.0.0-RC-17 at ultreiaio / ird-observe -- You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe] Pushed new tag v9.0.0-RC-17
by Tony CHEMIT (＠tchemit) Oct. 27, 2021

Oct. 27, 2021

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

1 0

[Git][ultreiaio/ird-observe][release/9.0.0-RC-17] [jgitflow-maven-plugin]updating poms for branch'release/9.0.0-RC-17' with...
by Tony CHEMIT (＠tchemit) Oct. 27, 2021

Oct. 27, 2021

Tony CHEMIT pushed to branch release/9.0.0-RC-17 at ultreiaio / ird-observe Commits: 88ca98b1 by Tony Chemit at 2021-10-27T17:26:28+02:00 [jgitflow-maven-plugin]updating poms for branch'release/9.0.0-RC-17' with non-snapshot versions[skip ci] - - - - - 30 changed files: - client/configuration/pom.xml - client/core/pom.xml - client/datasource/actions/pom.xml - client/datasource/api/pom.xml - client/datasource/editor/api-test/pom.xml - client/datasource/editor/api/pom.xml - client/datasource/editor/common/pom.xml - client/datasource/editor/ll/pom.xml - client/datasource/editor/pom.xml - client/datasource/editor/ps/pom.xml - client/datasource/editor/spi/pom.xml - client/datasource/pom.xml - client/i18n/pom.xml - client/pom.xml - client/runner/pom.xml - models/definition/pom.xml - models/dto/i18n/pom.xml - models/dto/java/pom.xml - models/dto/pom.xml - models/navigation/descriptor/pom.xml - models/navigation/id/pom.xml - models/navigation/pom.xml - models/navigation/tree/pom.xml - models/persistence/avdth/pom.xml - models/persistence/java/pom.xml - models/persistence/migration/pom.xml - models/persistence/pom.xml - models/persistence/test-api/pom.xml - models/persistence/test-impl/pom.xml - models/pom.xml The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/88ca98b1fa05e97ddb018c4d1… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/88ca98b1fa05e97ddb018c4d1… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][master] 98 commits: [jgitflow-maven-plugin]updating poms for 9.0.0-RC-17-SNAPSHOT development[skip ci]
by Tony CHEMIT (＠tchemit) Oct. 27, 2021

Oct. 27, 2021

Tony CHEMIT pushed to branch master at ultreiaio / ird-observe Commits: 08bd4d08 by Tony Chemit at 2021-10-08T16:10:42+02:00 [jgitflow-maven-plugin]updating poms for 9.0.0-RC-17-SNAPSHOT development[skip ci] - - - - - d6274da3 by Tony Chemit at 2021-10-08T16:22:34+02:00 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts[skip ci] - - - - - 1ba01e74 by Tony Chemit at 2021-10-08T16:22:34+02:00 [jgitflow-maven-plugin]merging 'master' into 'develop' - - - - - 320cbfff by Tony Chemit at 2021-10-08T16:22:35+02:00 [jgitflow-maven-plugin]Updating develop poms back to pre merge state[skip ci] - - - - - ea447671 by Tony Chemit at 2021-10-10T11:00:14+02:00 ll_landing.landingpart.weight NOT NULL ? - See ultreiaio/ird-observe#2027 - - - - - 1a4ba00b by Tony Chemit at 2021-10-10T12:35:21+02:00 Revue layout formulaire LL_logbook.Sample - - - - - 3c5e4a1d by Tony Chemit at 2021-10-10T12:35:41+02:00 Revue layout formulaire LL_landing.Landing - - - - - 57e5ae35 by Tony Chemit at 2021-10-10T13:42:38+02:00 Amélioration rendu ps.common.AcquisitionStatus - - - - - efa41e4c by Tony Chemit at 2021-10-11T15:30:41+02:00 reduce i18n keys for Trip - - - - - 6724054c by Tony Chemit at 2021-10-11T15:30:41+02:00 Lecture des messages longs - Closes #2028 - - - - - 37ed54ef by Tony Chemit at 2021-10-12T22:46:41+02:00 update pom - - - - - fe561861 by Tony Chemit at 2021-10-12T22:46:41+02:00 Stockage en base locale de la date de dernière mise à jour du référentiel - See ultreiaio/ird-observe#1511 - - - - - 7c425026 by Tony Chemit at 2021-10-12T22:46:41+02:00 Improve referential synchronize API : * always use replication order to build diff and generate sql * review how to deal with missing ids * improve builder design See ultreiaio/ird-observe#2029 - - - - - 4c091301 by Tony Chemit at 2021-10-12T22:46:41+02:00 Navigation tree with no minimum size (otherwise tree has not a lot of space on screen) - - - - - 91c09c64 by Tony Chemit at 2021-10-12T22:46:41+02:00 no need DecoratorService inside differential nodes - - - - - 6934ff32 by Tony Chemit at 2021-10-12T22:46:41+02:00 Que faire des référentiels plus à jour dans la base locale lors d'une synchronisation de référentiel simple - See ultreiaio/ird-observe#2030 - - - - - 77af232c by Tony Chemit at 2021-10-12T22:46:41+02:00 Review DifferentialModel API - - - - - deb06822 by Tony Chemit at 2021-10-13T10:39:36+02:00 improve persistence stack API : * make application context builder of DifferentialMetaModel * improve TopiaEntitySqlModelSupport - - - - - 1080014c by Tony Chemit at 2021-10-13T10:40:07+02:00 remove LastUpdateDate entity from referential replication at last. - - - - - 5be8aa2f by Tony Chemit at 2021-10-13T10:42:49+02:00 Improve how to get DifferentialModelBuilder from admin actions. - - - - - 418e922c by Tony Chemit at 2021-10-13T12:55:19+02:00 Logs de l'import AVDTH - Closes #2026 - - - - - 232319c5 by Tony Chemit at 2021-10-13T12:55:19+02:00 Amélioration interface de l'import AVDTH - Closes #2031 - - - - - 99e39a7b by Tony Chemit at 2021-10-14T21:43:53+02:00 Revue de l'affichage des indicateurs dans l'arbre de navigation - Closes #2033 - - - - - 520ce343 by Tony Chemit at 2021-10-14T21:43:53+02:00 Fix reference generation - - - - - c1872060 by Tony Chemit at 2021-10-14T21:43:53+02:00 Improve parent reference management in navigation node, now offers it from his parent to never reload it ever). - - - - - 77bc68ca by Tony Chemit at 2021-10-14T21:43:53+02:00 Gestion de showData dans les ContentListUI - - - - - 3b3ad29f by Tony Chemit at 2021-10-15T13:10:49+02:00 Gestion de showData dans les ContentTableUI - - - - - 93c7e450 by Tony Chemit at 2021-10-15T13:10:49+02:00 improve menu accessibility - - - - - 07dcc19a by Tony Chemit at 2021-10-15T13:10:49+02:00 Improve default focus on list and table when not reading - - - - - d0863cd3 by Tony Chemit at 2021-10-15T13:10:49+02:00 Flip de deux champs (pour refléter l'arbre de navigation) - - - - - 629f22c8 by Tony Chemit at 2021-10-15T13:10:49+02:00 Auto-chargement des nœuds fils, le retour... Au final on charge toujours les fils d'un enfant si il est unique et de type reference ou conteneur de références. - - - - - 2cfcfdeb by Tony Chemit at 2021-10-15T13:10:49+02:00 Le focus peut ouvrir un menu d'action désormais depuis la liste des messages. - - - - - 35e4efbf by Tony Chemit at 2021-10-15T16:31:26+02:00 Revue de l'action déplacer et assainissement du service de récupération des parents - - - - - 8f91f6fc by Tony Chemit at 2021-10-17T13:25:03+02:00 Le classement alphabétique des bateaux semble ne pas fonctionner - Closes #2037 - - - - - b583eba4 by Tony Chemit at 2021-10-19T08:32:19+02:00 Afficher le type bateau sur le liste du gestionnaire bateaux - Closes #2035 - - - - - bfa67a58 by Tony Chemit at 2021-10-19T08:32:19+02:00 Visibilité des types de bateaux - Closes #2036 - - - - - 032ec8e7 by Tony Chemit at 2021-10-19T08:32:19+02:00 Ajout de personnes - Closes #2039 - - - - - efad030f by Tony Chemit at 2021-10-19T08:32:19+02:00 Petites améliorations sur la migration V9 des zones FPA - Closes #2042 - - - - - 33fd229a by Tony Chemit at 2021-10-19T08:32:19+02:00 Peaufinage validation du form PS logbook échantillon - Closes #2046 - - - - - b7764f35 by Tony Chemit at 2021-10-19T08:32:19+02:00 Petit défaut d'affichage sur Marché local - Closes #2048 - - - - - 28d61251 by Tony Chemit at 2021-10-20T09:19:05+02:00 Libellé form plan de cuves - Closes #2045 - - - - - 515d7e98 by Tony Chemit at 2021-10-20T09:19:05+02:00 Organisation du form PS/Logbook/Activité - Closes #2043 - - - - - 4b8e0056 by Tony Chemit at 2021-10-20T09:19:05+02:00 Ajout de 2 colonnes dates sur Vessel - Closes #2040 - - - - - d84222a0 by Tony Chemit at 2021-10-20T09:19:05+02:00 Note d'information sur le form Activité - Closes #2041 - - - - - de793ba1 by Tony Chemit at 2021-10-20T09:19:05+02:00 revert remove LastUpdateDate entity from referential replication at last. - - - - - f96cbab1 by Tony Chemit at 2021-10-20T09:19:05+02:00 Fix decorator issues in ListHEader and DoubleList - Closes ultreiaio/jaxx#802 - - - - - e7e55544 by Tony Chemit at 2021-10-20T09:19:05+02:00 Organisation du form PS/Logbook/Activité - Closes #2043 - - - - - 86e89b0a by Tony Chemit at 2021-10-20T09:19:05+02:00 Note d'information sur le form Activité - Closes #2041 - - - - - 851cc31e by Tony Chemit at 2021-10-26T12:43:10+02:00 update pom - - - - - 02ae80a3 by Tony Chemit at 2021-10-26T12:43:10+02:00 fix bad focus in ContentListUI when not empty (list lost fpcus to header) - - - - - dc461b68 by Tony Chemit at 2021-10-26T12:43:10+02:00 Marché local : conseil à donner lorsque la liste des conditionnements est vide - See #1840 - - - - - 5c7cce3e by Tony Chemit at 2021-10-26T12:43:10+02:00 validator redundant - - - - - c5076944 by Tony Chemit at 2021-10-26T12:43:10+02:00 Passage ps local market SurveyPart en tableau inline Correction validation Survey - - - - - db2b20b8 by Tony Chemit at 2021-10-26T12:43:10+02:00 do not display messages coming from validator without ui - - - - - b00b8c00 by Tony Chemit at 2021-10-26T12:43:10+02:00 be able to change the bean on a ContentSimpleUI - - - - - cdf9c6d0 by Tony Chemit at 2021-10-26T12:43:10+02:00 improve ps landing date validation - - - - - e2135414 by Tony Chemit at 2021-10-26T12:43:10+02:00 add missing status in ps TripDto - - - - - 6c9ccad1 by Tony Chemit at 2021-10-26T12:43:10+02:00 improve extra decorators - - - - - 8f20d051 by Tony Chemit at 2021-10-26T12:43:10+02:00 Passage ps local market SurveyPart en tableau inline - - - - - db5d4721 by Tony Chemit at 2021-10-26T12:43:10+02:00 Improve ps local market batch form (use short packaging decorator) - - - - - 7eb2df11 by Tony Chemit at 2021-10-26T12:43:10+02:00 improve species decoration in data use at last decorator renderer defined in the concrete project (so can make any modification on them :)) - - - - - 56bef7d4 by Tony Chemit at 2021-10-26T12:43:10+02:00 use jaxx editors decorator classifier for table references render - - - - - 85f3389d by Tony Chemit at 2021-10-26T12:43:10+02:00 Revue de la modélisation ps logbook Sample - See ultreiaio/ird-observe#2001 - - - - - f0678ca6 by Tony Chemit at 2021-10-26T12:43:10+02:00 revue layout ps logbook activity catch - - - - - 55a5f230 by Tony Chemit at 2021-10-26T12:43:10+02:00 fix default logbook value on trip create (ps) - - - - - c0eb415f by Tony Chemit at 2021-10-26T12:43:10+02:00 add tooltip on tables :) - - - - - 14099425 by Tony Chemit at 2021-10-26T12:43:10+02:00 Amélioration d'un libellé - Closes #2038 - - - - - ed558448 by Tony Chemit at 2021-10-26T12:43:10+02:00 Nouvelle marée : onglet focusé - Closes #2050 - - - - - 21d30810 by Tony Chemit at 2021-10-26T12:43:10+02:00 add missing Trip.departureWellContentStatus not null if validation - - - - - 5bbcd6de by Tony Chemit at 2021-10-26T12:43:10+02:00 update fixtures - - - - - 1891b9a1 by Tony Chemit at 2021-10-26T12:43:10+02:00 flags Program.observation(s) et Program.logbook(s) - See ultreiaio/ird-observe#2052 Rajouter un programme logbook sur la marée Review program and trip API, reduce the program API. See ultreiaio/ird-observe#1963 - - - - - 381588e1 by Tony Chemit at 2021-10-26T12:43:10+02:00 normalisation i18n sur validateur dayBefore et dayAfter pour pouvoir les génerer :) - - - - - 7dad36b4 by Tony Chemit at 2021-10-26T12:43:10+02:00 generation des validateurs temporels - - - - - 85208b4c by Tony Chemit at 2021-10-26T12:43:10+02:00 update public API doc remove short-circuit on generated validation update model use generated temporal validators - - - - - 73dfa540 by Tony Chemit at 2021-10-26T12:43:10+02:00 Fix Trip vessel validator when no vessel - - - - - f98e6ccb by Tony Chemit at 2021-10-26T12:43:10+02:00 clean and improve AVDTH Species management - - - - - e5c5e008 by Tony Chemit at 2021-10-26T12:43:10+02:00 generate decoratorWithClassifier from model fix decorator usage By default, do not see validate range label in referential decorations, only for referential forms. - - - - - 6b8ba129 by Tony Chemit at 2021-10-26T12:43:10+02:00 Amélioration des éditeurs de type combo-box - Closes #2057 - - - - - 88c6601b by Tony Chemit at 2021-10-26T12:43:10+02:00 Contrôle total marché local - Closes #2059 - - - - - b2b09f71 by Tony Chemit at 2021-10-26T12:43:10+02:00 Unicité Trip PS & LL - Closes #2060 - - - - - c20ee3c4 by Tony Chemit at 2021-10-26T12:43:10+02:00 Erreur sur ouverture des forms objet flottant en mode serveur, sur les logbooks et les observations - Closes #2055 - - - - - 7abf4b93 by Tony Chemit at 2021-10-26T12:43:10+02:00 Reconnexion - Closes #2067 - - - - - 5b608a74 by Tony Chemit at 2021-10-26T12:43:10+02:00 Exception sur modification des dates d'une marée PS existante - Closes #2057 - - - - - 6fb2751d by Tony Chemit at 2021-10-26T12:43:10+02:00 reduce log and add FIXME on EditableTable - - - - - c6ca3ecf by Tony Chemit at 2021-10-26T20:06:47+02:00 Review TableReader API and finalize import \o/ Revue des catégories de poids pour utiliser le code FAO plutot que l'obscure code espèce venant d'AVDTH... Add missing species for avdth import Synthèse des espèces et catégories de poids dans l'import AVDTH - Closes ultreiaio/ird-observe#2068 - - - - - 7583b03d by Tony Chemit at 2021-10-26T20:06:47+02:00 sampleActivity.weightedWeight, sample.smallsWeight, sample.bigsWeight et sample.totalWeight - See ultreiaio/ird-observe#2069 - - - - - ae83c34d by Tony Chemit at 2021-10-26T20:36:01+02:00 update CHANGELOG [skip ci] - - - - - b8b83c01 by Tony Chemit at 2021-10-26T20:44:47+02:00 update pom - - - - - bafa1586 by Tony Chemit at 2021-10-26T21:03:03+02:00 update fixtures - - - - - d1c53add by Tony Chemit at 2021-10-26T21:04:18+02:00 update public API doc - - - - - daa07bd4 by Tony Chemit at 2021-10-27T12:02:41+02:00 low log level - - - - - 6dfac180 by Tony Chemit at 2021-10-27T12:04:09+02:00 improve WeightCategoryHelper code - - - - - a709fbdc by Tony Chemit at 2021-10-27T12:14:31+02:00 update pom - - - - - 1e948a7b by Tony Chemit at 2021-10-27T12:34:40+02:00 update CHANGELOG [skip ci] - - - - - 762b5622 by Tony Chemit at 2021-10-27T13:21:45+02:00 Gestion des dates de mises à jour lors de suppression de référentiels via les synchronisations - Close ultreiaio/ird-observe-toolkit#102 On utilise toujours une date par defaut si on ne la pas trouvée depuis la Task lors de la génération du code sql, cette date est nécessaire pour mettee à jour certaines associations lors de remplacement - - - - - 76d2d058 by Tony Chemit at 2021-10-27T15:12:40+02:00 update pom - - - - - 88ca98b1 by Tony Chemit at 2021-10-27T17:26:28+02:00 [jgitflow-maven-plugin]updating poms for branch'release/9.0.0-RC-17' with non-snapshot versions[skip ci] - - - - - 9d3e40f9 by Tony Chemit at 2021-10-27T17:37:19+02:00 [jgitflow-maven-plugin]merging 'release/9.0.0-RC-17' into 'master' - - - - - 30 changed files: - CHANGELOG.md - client/configuration/pom.xml - client/configuration/src/main/config/Client.ini - client/configuration/src/main/filtered-resources/log4j2.xml - client/configuration/src/main/filtered-resources/observe-log4j2.xml - client/core/pom.xml - client/datasource/api/src/main/i18n/templates/ObserveSwingDataSource_en_GB.ftl → client/core/src/main/i18n/templates/ObserveSwingDataSource_en_GB.ftl - client/datasource/api/src/main/i18n/templates/ObserveSwingDataSource_es_ES.ftl → client/core/src/main/i18n/templates/ObserveSwingDataSource_es_ES.ftl - client/datasource/api/src/main/i18n/templates/ObserveSwingDataSource_fr_FR.ftl → client/core/src/main/i18n/templates/ObserveSwingDataSource_fr_FR.ftl - client/core/src/main/java/fr/ird/observe/client/datasource/api/ObserveSwingDataSource.java - client/core/src/main/java/fr/ird/observe/client/datasource/api/cache/ReferencesCache.java - client/core/src/main/java/fr/ird/observe/client/datasource/api/cache/ReferencesFilterHelper.java - client/core/src/main/java/fr/ird/observe/client/datasource/validation/ContentMessageTableModel.java - client/core/src/main/java/fr/ird/observe/client/datasource/validation/ObserveValidatorMessageMouseListener.java - client/core/src/main/java/fr/ird/observe/client/main/body/ClientConfigUI.java - client/core/src/main/java/fr/ird/observe/client/main/focus/FocusDispatcher.java - client/core/src/main/java/fr/ird/observe/client/util/UIHelper.java - client/core/src/main/java/fr/ird/observe/client/util/init/DefaultUIInitializer.java - client/core/src/main/java/fr/ird/observe/client/util/init/DefaultUIInitializerContext.java - client/core/src/main/java/fr/ird/observe/client/util/init/DefaultUIInitializerResult.java - client/core/src/main/java/fr/ird/observe/client/util/init/UIInitHelper.java - client/core/src/main/java/fr/ird/observe/client/util/session/ObserveSwingSessionHelper.java - client/core/src/main/java/fr/ird/observe/client/util/table/EditableTableModel.java - client/core/src/main/java/fr/ird/observe/client/util/table/JXTableUtil.java - client/core/src/main/resources/fr/ird/observe/client/ui/ObserveCommon.jcss - client/datasource/actions/pom.xml - client/datasource/actions/src/main/i18n/getters/java.getter - client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/AdminActionModel.java - client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/pairing/ll/tree/ActivityLlPairingTreeTable.java - client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/report/ReportUIHandler.java The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/fa3196d390b158781dbfe757… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/fa3196d390b158781dbfe757… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] 5 commits: [jgitflow-maven-plugin]updating poms for branch'release/9.0.0-RC-17' with...
by Tony CHEMIT (＠tchemit) Oct. 27, 2021

Oct. 27, 2021

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 88ca98b1 by Tony Chemit at 2021-10-27T17:26:28+02:00 [jgitflow-maven-plugin]updating poms for branch'release/9.0.0-RC-17' with non-snapshot versions[skip ci] - - - - - 9d3e40f9 by Tony Chemit at 2021-10-27T17:37:19+02:00 [jgitflow-maven-plugin]merging 'release/9.0.0-RC-17' into 'master' - - - - - 5b381785 by Tony Chemit at 2021-10-27T17:37:23+02:00 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts[skip ci] - - - - - 749d1079 by Tony Chemit at 2021-10-27T17:37:24+02:00 [jgitflow-maven-plugin]merging 'master' into 'develop' - - - - - ff32a654 by Tony Chemit at 2021-10-27T17:37:25+02:00 [jgitflow-maven-plugin]Updating develop poms back to pre merge state[skip ci] - - - - - 0 changed files: Changes: View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/77077cc6ef69c847d72d537a… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/77077cc6ef69c847d72d537a… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] [jgitflow-maven-plugin]updating poms for 9.0.0-RC-18-SNAPSHOT development[skip ci]
by Tony CHEMIT (＠tchemit) Oct. 27, 2021

Oct. 27, 2021

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 77077cc6 by Tony Chemit at 2021-10-27T17:23:59+02:00 [jgitflow-maven-plugin]updating poms for 9.0.0-RC-18-SNAPSHOT development[skip ci] - - - - - 30 changed files: - client/configuration/pom.xml - client/core/pom.xml - client/datasource/actions/pom.xml - client/datasource/api/pom.xml - client/datasource/editor/api-test/pom.xml - client/datasource/editor/api/pom.xml - client/datasource/editor/common/pom.xml - client/datasource/editor/ll/pom.xml - client/datasource/editor/pom.xml - client/datasource/editor/ps/pom.xml - client/datasource/editor/spi/pom.xml - client/datasource/pom.xml - client/i18n/pom.xml - client/pom.xml - client/runner/pom.xml - models/definition/pom.xml - models/dto/i18n/pom.xml - models/dto/java/pom.xml - models/dto/pom.xml - models/navigation/descriptor/pom.xml - models/navigation/id/pom.xml - models/navigation/pom.xml - models/navigation/tree/pom.xml - models/persistence/avdth/pom.xml - models/persistence/java/pom.xml - models/persistence/migration/pom.xml - models/persistence/pom.xml - models/persistence/test-api/pom.xml - models/persistence/test-impl/pom.xml - models/pom.xml The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/77077cc6ef69c847d72d537aa… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/77077cc6ef69c847d72d537aa… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe] Pushed new branch release/9.0.0-RC-17
by Tony CHEMIT (＠tchemit) Oct. 27, 2021

Oct. 27, 2021

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

1 0

[Git][ultreiaio/ird-observe][develop] 6 commits: low log level
by Tony CHEMIT (＠tchemit) Oct. 27, 2021

Oct. 27, 2021

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: daa07bd4 by Tony Chemit at 2021-10-27T12:02:41+02:00 low log level - - - - - 6dfac180 by Tony Chemit at 2021-10-27T12:04:09+02:00 improve WeightCategoryHelper code - - - - - a709fbdc by Tony Chemit at 2021-10-27T12:14:31+02:00 update pom - - - - - 1e948a7b by Tony Chemit at 2021-10-27T12:34:40+02:00 update CHANGELOG [skip ci] - - - - - 762b5622 by Tony Chemit at 2021-10-27T13:21:45+02:00 Gestion des dates de mises à jour lors de suppression de référentiels via les synchronisations - Close ultreiaio/ird-observe-toolkit#102 On utilise toujours une date par defaut si on ne la pas trouvée depuis la Task lors de la génération du code sql, cette date est nécessaire pour mettee à jour certaines associations lors de remplacement - - - - - 76d2d058 by Tony Chemit at 2021-10-27T15:12:40+02:00 update pom - - - - - 6 changed files: - CHANGELOG.md - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/simple/ContentSimpleUIModelSupport.java - client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/WeightCategoryHelper.java - pom.xml - services/local-impl/src/main/java/fr/ird/observe/services/local/service/referential/ReferentialServiceLocalSupport.java - services/local-impl/src/main/java/fr/ird/observe/services/local/service/referential/SynchronizeServiceLocalSupport.java Changes: ===================================== CHANGELOG.md ===================================== @@ -1,11 +1,11 @@ # ObServe changelog * Author [Tony Chemit](mailto:dev@tchemit.fr) - * Last generated at 2021-10-26 20:34. + * Last generated at 2021-10-27 12:34. ## Version [9.0.0-RC-17](https://gitlab.com/ultreiaio/ird-observe/-/milestones/205) -**Closed at 2021-10-26.** +**Closed at 2021-10-27.** ### Download * [Application (observe-9.0.0-RC-17.zip)](https://repo1.maven.org/maven2/fr/ird/observe/obs…) @@ -47,7 +47,9 @@ * [[Type::Evolution 1618]](https://gitlab.com/ultreiaio/ird-observe/-/issues/1618) **[PS][Logbook] Rajout d'un champ** (Thanks to Tony CHEMIT) (Reported by Pascal Cauquil) * [[Type::Evolution 1773]](https://gitlab.com/ultreiaio/ird-observe/-/issues/1773) **S'assurer qu'il y aura une date sur les landings PS** (Thanks to Tony CHEMIT) (Reported by Pascal Cauquil) * [[Type::Evolution 1862]](https://gitlab.com/ultreiaio/ird-observe/-/issues/1862) **Migration des données Logbook depuis AVDTH** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Type::Evolution 1871]](https://gitlab.com/ultreiaio/ird-observe/-/issues/1871) **Migration des TargetCatch de la v7/8 vers Catch de la v9 : De la catégorie au poids moyen** (Thanks to Pascal Cauquil) (Reported by Pascal Cauquil) * [[Type::Evolution 1883]](https://gitlab.com/ultreiaio/ird-observe/-/issues/1883) **Captures logbook avec espèce de type Appât** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Type::Evolution 1888]](https://gitlab.com/ultreiaio/ird-observe/-/issues/1888) **Synthèse des catégories de poids actuellement en vigueur** (Thanks to Tony CHEMIT) (Reported by Pascal Cauquil) * [[Type::Evolution 1890]](https://gitlab.com/ultreiaio/ird-observe/-/issues/1890) **Déporter la regex de contrôle de la syntaxe des cuves dans la configuration de l'application** (Thanks to Tony CHEMIT) (Reported by Pascal Cauquil) * [[Type::Evolution 1963]](https://gitlab.com/ultreiaio/ird-observe/-/issues/1963) **Rajouter un programme logbook sur la marée** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) * [[Type::Evolution 2026]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2026) **Logs de l'import AVDTH** (Thanks to Tony CHEMIT) (Reported by Pascal Cauquil) ===================================== client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/simple/ContentSimpleUIModelSupport.java ===================================== @@ -61,7 +61,7 @@ public abstract class ContentSimpleUIModelSupport<D extends DataDto> extends Con result = bean.get(showDataPropertyName); if (result) { // got a matching bean property - log.info(String.format("%sUse dto bean property %s to enable %s create action.", getPrefix(), showDataPropertyName, dtoType.getName())); + log.debug(String.format("%sUse dto bean property %s to enable %s create action.", getPrefix(), showDataPropertyName, dtoType.getName())); } } return result; ===================================== client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/WeightCategoryHelper.java ===================================== @@ -43,6 +43,7 @@ import java.util.stream.Collectors; * @since 9.0.0 */ public class WeightCategoryHelper { + public static final String AVAILABLE_WEIGHT_CATEGORY = "availableWeightCategory"; private static final Logger log = LogManager.getLogger(WeightCategoryHelper.class); final ContentTableUIModelStates<?, ?> states; final PropertyChangeListener speciesChanged; @@ -53,16 +54,18 @@ public class WeightCategoryHelper { } public void install(FilterableComboBox<WeightCategoryReference> editor) { - states.addPropertyChangeListener("availableWeightCategory", evt -> { - WeightCategoryReference weightCategory = states.getTableEditBean().get("weightCategory"); + states.addPropertyChangeListener(AVAILABLE_WEIGHT_CATEGORY, evt -> { + WeightCategoryReference previousWeightCategory = states.getTableEditBean().get("weightCategory"); @SuppressWarnings("unchecked") List<WeightCategoryReference> newValue = (List<WeightCategoryReference>) evt.getNewValue(); -// boolean weightCategoryModified = false; - if (newValue == null || !newValue.contains(weightCategory)) { - weightCategory = null; -// weightCategoryModified = true; + WeightCategoryReference newWeightCategory; + if (newValue == null || !newValue.contains(previousWeightCategory)) { + newWeightCategory = null; + } else { + newWeightCategory = previousWeightCategory; } + log.info(String.format("Will use category %s, from %d category(ies)", newWeightCategory, newValue == null ? 0 : newValue.size())); editor.setData(newValue); - editor.setSelectedItem(weightCategory); + editor.setSelectedItem(newWeightCategory); }); } @@ -79,8 +82,7 @@ public class WeightCategoryHelper { if (states.isReadingMode() || !states.isEditing()) { return; } - List<WeightCategoryReference> newCategories; - List<WeightCategoryReference> referentialReferences = states.getReferenceCache().getReferentialReferences(CatchDto.PROPERTY_WEIGHT_CATEGORY); + List<WeightCategoryReference> allCategories = states.getReferenceCache().getReferentialReferences(CatchDto.PROPERTY_WEIGHT_CATEGORY); Predicate<WeightCategoryReference> predicate; if (species == null) { // get all categories with no species @@ -89,8 +91,8 @@ public class WeightCategoryHelper { // get all categories with no species, or with this species predicate = r -> r.getSpecies() == null || r.getSpecies().equals(species); } - newCategories = referentialReferences.stream().filter(predicate).collect(Collectors.toList()); + List<WeightCategoryReference> newCategories = allCategories.stream().filter(predicate).collect(Collectors.toList()); log.info(String.format("For species: %s, found %d category(ies)", species, newCategories.size())); - states.firePropertyChanged("availableWeightCategory", newCategories); + states.firePropertyChanged(AVAILABLE_WEIGHT_CATEGORY, newCategories); } } ===================================== pom.xml ===================================== @@ -24,7 +24,7 @@ <parent> <groupId>io.ultreia.maven</groupId> <artifactId>pom</artifactId> - <version>2021.113</version> + <version>2021.116</version> </parent> <groupId>fr.ird.observe</groupId> @@ -161,7 +161,7 @@ <maven.build.timestamp.format>dd/MM/yyyy HH:mm z</maven.build.timestamp.format> <buildDate>${maven.build.timestamp}</buildDate> - <lib.version.toolkit>5.0.51</lib.version.toolkit> + <lib.version.toolkit>5.0.52</lib.version.toolkit> <lib.version.ognl>3.1.29</lib.version.ognl>  ===================================== services/local-impl/src/main/java/fr/ird/observe/services/local/service/referential/ReferentialServiceLocalSupport.java ===================================== @@ -278,7 +278,7 @@ class ReferentialServiceLocalSupport extends ObserveServiceLocal implements Refe } OneSideSqlRequest sqlRequest = OneSideSqlRequest.builder().addTasks(SynchronizeTaskType.ADD, missingReferentialIds).build(); OneSideSqlResult sqlResult = serviceContext.getTopiaApplicationContext() - .newOneSideSqlResultBuilder(getTopiaPersistenceContext(), getApplicationLocale()) + .newOneSideSqlResultBuilder(getTopiaPersistenceContext(), getApplicationLocale(), now()) .build(sqlRequest); Path temporaryDirectoryRoot = serviceContext.getServiceInitializer().getInitializerConfig().getTemporaryDirectoryRoot().toPath(); ===================================== services/local-impl/src/main/java/fr/ird/observe/services/local/service/referential/SynchronizeServiceLocalSupport.java ===================================== @@ -89,7 +89,7 @@ public class SynchronizeServiceLocalSupport extends ObserveServiceLocal implemen public OneSideSqlResult produceSqlResult(OneSideSqlRequest request) { long startTime = TimeLog.getTime(); OneSideSqlResult result = serviceContext.getTopiaApplicationContext() - .newOneSideSqlResultBuilder(getTopiaPersistenceContext(), getApplicationLocale()) + .newOneSideSqlResultBuilder(getTopiaPersistenceContext(), getApplicationLocale(), now()) .build(request); TIME_LOG.log(startTime, "produceSqlResult"); return result; View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/d1c53add87dc53aa9b34d817… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/d1c53add87dc53aa9b34d817… You're receiving this email because of your account on gitlab.com.

1 0