Tony CHEMIT pushed to branch master-9.0.x at ultreiaio / ird-observe Commits: fe5e9fbc by Tony Chemit at 2022-12-12T19:33:42+01:00 [jgitflow-maven-plugin]updating poms for 9.0.23-SNAPSHOT development[skip ci] - - - - - 7fe3e3c3 by Tony Chemit at 2022-12-12T20:24:50+01:00 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts[skip ci] - - - - - f4ae314d by Tony Chemit at 2022-12-12T20:24:52+01:00 [jgitflow-maven-plugin]merging 'master-9.0.x' into 'develop-9.0.x' - - - - - 2328882e by Tony Chemit at 2022-12-12T20:24:55+01:00 [jgitflow-maven-plugin]Updating develop poms back to pre merge state[skip ci] - - - - - 08ad9278 by Tony Chemit at 2022-12-16T18:51:03+01:00 Persistence - Add BusinessProject inside the PersistenceBusinessProject (to be able to transform reference type to dto type) - - - - - a0fc9666 by Tony Chemit at 2022-12-16T18:51:19+01:00 Report - improve DataMatrixDimension and DataMatrixPoint code (they are immutable objects). - - - - - c3acbf65 by Tony Chemit at 2022-12-16T18:51:19+01:00 Report - introduce ReportRequestExecutor.isVariableUsed method to use the same code (we previously had two different code for this. - - - - - 3dc171b4 by Tony Chemit at 2022-12-16T18:51:19+01:00 Report - add TimeLog instance in ReportRequestExecutor to avoid override in DefaultReportRequestExecutor some methods to just add TimeLog. - - - - - 800b253b by Tony Chemit at 2022-12-16T18:51:19+01:00 Report - move ReportRequest.extractParams to ReportRequestExecutor (better place, and the ReportRequest is part of the report model, it should contains no logic at all) - - - - - f98d4f2b by Tony Chemit at 2022-12-16T18:51:19+01:00 Report - clean ReportRequest code - - - - - 864f2970 by Tony Chemit at 2022-12-16T18:51:19+01:00 Report - introduce ReportVariableValueAware for report variable with type that are not a full entity dto (to replace the very weak code used for speciesFeate.discard) - - - - - 1e543c56 by Tony Chemit at 2022-12-16T18:51:19+01:00 Report API - Code review and some nice new features : * improve ReportVariable (have now ReportVariableSupport base class then ReportVariable and ReportRepeatVariable as implementation) * improve code of ReportRequestExecutor * now we can manage to populate variables with dependencies on other variables - - - - - 4fcc15ca by Tony Chemit at 2022-12-16T18:51:19+01:00 Report UI - Code review and some nice new features : * review handler and model code (was pretty a mess (thanks to K.M and S.B...) * variables can now depend on others \o/ - - - - - 05b6509d by Tony Chemit at 2022-12-16T18:51:19+01:00 Report - Introduce SpeciesFateDiscardModeDto to replace the discard (as boolean) in reports : * psObservationCatchWeightByGroupAndSpeciesFateDiscardPerAssociation * psObservationCatchTotalCountByGroupAndSpeciesFateDiscardPerAssociation - - - - - 7c98149a by Tony Chemit at 2022-12-16T18:51:19+01:00 Report - Improve psObservationCatch report (show only speciesGroup with data and species within the selected group really used in data) - - - - - 66df35e8 by Tony Chemit at 2022-12-16T18:51:19+01:00 Report - Improve psObservationLengthsDistribution report (make variable sizeMeasureType depends on selected variable species) - - - - - 606c3fc2 by Tony Chemit at 2022-12-16T18:51:53+01:00 Merge branch 'feature/issue_2577' into develop-9.0.x Améliorer les variables dans les rapports pour proposer les variables suivantes en filtrant sur la variable précédente - Closes #2577 - - - - - 9911e717 by Tony Chemit at 2022-12-23T07:44:53+01:00 update pom - - - - - def9e61f by Tony Chemit at 2022-12-23T07:52:23+01:00 Introduce toolkit-api-services Service - use DataMatrix from java-util Review how to load DifferentialMetaModel (generates it and remove it from BusinessProject) - - - - - 07b8da59 by Tony Chemit at 2022-12-23T07:53:56+01:00 Fix commons-collections license issue - - - - - 385bb2b7 by Tony Chemit at 2022-12-23T07:53:56+01:00 Report API - Introduce toolkit-api-report module - - - - - 98885a37 by Tony Chemit at 2022-12-23T07:53:56+01:00 Report UI - Review code and use last services report API - - - - - 7da90227 by Tony Chemit at 2022-12-23T07:53:56+01:00 Validation - Introduce toolkit-api-validation and core-api-dto-resources - - - - - a6a144c0 by Tony Chemit at 2022-12-23T07:57:46+01:00 Introduce toolkit-api-datasource and toolkit-api-server modules - - - - - 1c8eb7ff by Tony Chemit at 2022-12-23T07:57:46+01:00 Introduce CleanTemporaryFilesTask (application level for client or server) - Closes ultreiaio/config#38 - - - - - 5245ff3c by Tony Chemit at 2022-12-23T07:57:46+01:00 Introduce ConfigHelper - Closes ultreiaio/config#39 - - - - - 7df0e0ec by Tony Chemit at 2022-12-23T07:57:46+01:00 Introduce toolkit-api-decoration , core-api-dto-decoration, core-api-dto-validation - - - - - 847af88a by Tony Chemit at 2022-12-23T07:57:46+01:00 Introduce core-persistence-decoration and move persistence fixtures to model module - - - - - 447d44e4 by Tony Chemit at 2022-12-23T07:57:46+01:00 Introduce new maven modules http-spi and http-spi-processor (split of http-maven-plugin) - See ultreiaio/http#57 - - - - - 2db2d26e by Tony Chemit at 2022-12-23T07:57:46+01:00 remove provided dependencies in pom - - - - - d945b8c1 by Tony Chemit at 2022-12-23T07:57:46+01:00 introduce module toolkit-api-i18n, fix some i18n keys, clean pom dependencies - - - - - 70070b1a by Tony Chemit at 2022-12-23T09:04:29+01:00 optimize i18n - - - - - 194323af by Tony Chemit at 2022-12-23T09:04:29+01:00 Be able to add (or not!) the date on Generated annotation by DecoratorDefinitionJavaFileBuilder - Closes ultreiaio/decorator#13 - - - - - dd09ffa7 by Tony Chemit at 2022-12-23T09:30:01+01:00 Decorator - let's generate them in module sources directory (to make i18n possible) - - - - - 52760025 by Tony Chemit at 2022-12-23T10:21:32+01:00 update pom - - - - - 7cbd7e7d by Tony Chemit at 2022-12-23T10:38:33+01:00 optimize i18n - - - - - 0a531588 by Tony Chemit at 2022-12-28T16:53:27+01:00 Services tck - improve logs of loaded fixtures - - - - - d1271a87 by Tony Chemit at 2022-12-28T17:01:32+01:00 Merge branch 'feature/split_toolkit_api' into develop-9.0.x - - - - - 5ae21984 by Tony Chemit at 2022-12-29T05:10:01+01:00 test - move assertFixture to ObserveFixtures - - - - - 5ad2ce48 by Tony Chemit at 2022-12-29T08:13:55+01:00 test - move asserts to ToolkitFixtures - - - - - faf0528c by Tony Chemit at 2022-12-29T08:13:55+01:00 client config - clean code - - - - - d9bb23a5 by Tony Chemit at 2022-12-29T08:21:30+01:00 Report Api - low log level on ReportRequestExecutor - - - - - 4e561b18 by Tony Chemit at 2022-12-29T08:21:38+01:00 Report Api - Add comment on variables and repeat variables - - - - - 1f68ec39 by Tony Chemit at 2022-12-29T08:21:38+01:00 Report Api - Add comment on request - - - - - 5d6b021b by Tony Chemit at 2022-12-29T08:21:39+01:00 Report Api - Introduce new syntax builder - - - - - bb3b18d5 by Tony Chemit at 2022-12-29T08:21:39+01:00 Report Api - Introduce migrate report file tool - - - - - 299e0317 by Tony Chemit at 2022-12-29T08:27:59+01:00 Report Api - Introduce core-persistence-report module and use new report syntax - - - - - 0cbd36ae by Tony Chemit at 2022-12-29T08:27:59+01:00 Report Test - Improve them and test legacy and default syntax - - - - - b6e1143a by Tony Chemit at 2022-12-29T08:46:50+01:00 Merge branch 'feature/issue_2578' into develop-9.0.x Revoir la syntaxe des rapports - Closes #2578 - - - - - 0d8cc4c6 by Tony Chemit at 2023-01-03T12:49:20+01:00 Impossible de créer une route en 9.0.22 - Closes #2579 - - - - - 8a8f2a7c by Tony Chemit at 2023-01-03T13:03:36+01:00 Happy new yar commit \o/ - - - - - d8016878 by Tony Chemit at 2023-01-03T14:29:48+01:00 Lors de la suppression gloable d'une capture utilisée sur le formulaire espèces sensibles, la demande de confirmation n'est pas proposée (mais elle l'est bien si l'espèce est utilisée dans un échantillon) - Closes #2580 - - - - - cf5d1c5b by Tony Chemit at 2023-01-03T18:35:10+01:00 Imperfection de la validation sur une activité de pêche - Closes #2581 - - - - - 5662c2b9 by Tony Chemit at 2023-01-03T18:35:10+01:00 Après création d'une activité, le nœud captures n'apparaît pas - Closes #2582 - - - - - 395dc4e4 by Tony Chemit at 2023-01-03T18:35:10+01:00 Les activités ne sont pas disponibles lors de la création d'un échantillon (mais disponible en mode mis à jour) - Closes #2584 - - - - - a4c18864 by Tony Chemit at 2023-01-03T18:35:10+01:00 Problème sur la sauvegarde d'un échantillon (si on lui associe des activités) - Closes #2585 - - - - - 1cec9150 by Tony Chemit at 2023-01-03T19:37:33+01:00 update pom - - - - - fc4ee4b9 by Tony Chemit at 2023-01-04T15:11:19+01:00 Amélioration du texte d'information quand on ne peut pas encore remplir le marché local - closes #2586 - - - - - 6836cd1c by Tony Chemit at 2023-01-04T16:03:51+01:00 Ajout sur le formulaire d'une information sur la saisie possible ou non du marché local à partir du port d'arrivée sélectionné - closes #2590 - - - - - 49d90e71 by Tony Chemit at 2023-01-04T17:03:48+01:00 Mauvaise persistence des lots au niveau des sondages - closes #2591 - - - - - e18a2ccd by Tony Chemit at 2023-01-04T17:28:06+01:00 Si on quitte le formulaire marée modifié, aucune alerte n'est proposée pour enregistrer les modifications - closes #2587 - - - - - b8e6082e by Tony Chemit at 2023-01-04T17:29:00+01:00 Sur un formulaire tableau modifié, la demande confirmation est demandée deux fois si la première fois, on dit annuler - closes #2589 - - - - - 09569172 by Tony Chemit at 2023-01-04T17:56:56+01:00 Sur le formulaire lot, le champs commentaire n'est pas lié à un commentaire de la marée - closes #2592 - - - - - 90eb070a by Tony Chemit at 2023-01-05T13:39:00+01:00 Update changelog for v.9.0.23 [skip CI] - - - - - 29d23042 by Tony Chemit at 2023-01-05T13:39:00+01:00 Report API - Review it and make json compliant - - - - - 37f45b04 by Tony Chemit at 2023-01-05T13:39:00+01:00 Améliorations de libellés de l'arbre - Closes #2595 - - - - - 902babdd by Tony Chemit at 2023-01-05T14:18:01+01:00 update pom - - - - - 3487d61a by Tony Chemit at 2023-01-05T17:34:00+01:00 [jgitflow-maven-plugin]updating poms for 9.0.23 branch with snapshot versions[skip ci] - - - - - 00fa1f1f by Tony Chemit at 2023-01-05T17:34:23+01:00 [jgitflow-maven-plugin]updating poms for branch'release/9.0.23' with non-snapshot versions[skip ci] - - - - - bdcac517 by Tony Chemit at 2023-01-05T17:54:40+01:00 [jgitflow-maven-plugin]merging 'release/9.0.23' into 'master-9.0.x' - - - - - 30 changed files: - CHANGELOG.md - client/configuration/pom.xml - − client/configuration/src/license/THIRD-PARTY.properties - client/configuration/src/main/assembly/dcp-presets.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/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/ObServeSwingSessionConfig.java - client/configuration/src/main/java/fr/ird/observe/client/ObserveSwingSession.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/ClientResources.java - client/configuration/src/main/java/fr/ird/observe/client/configuration/SeineBycatchObservedSystemConfigConverter.java - client/configuration/src/test/java/fr/ird/observe/client/configuration/ClientConfigTest.java - client/core/pom.xml - client/core/src/license/THIRD-PARTY.properties - + client/core/src/main/i18n/getters/java-enumeration.getter - client/core/src/main/i18n/templates/ConfigurationModel_en_GB.ftl - client/core/src/main/i18n/templates/ConfigurationModel_es_ES.ftl - client/core/src/main/i18n/templates/ConfigurationModel_fr_FR.ftl - toolkit/api/src/main/i18n/templates/DataSourceInitModel_en_GB.ftl → client/core/src/main/i18n/templates/DataSourceInitModel_en_GB.ftl - toolkit/api/src/main/i18n/templates/DataSourceInitModel_es_ES.ftl → client/core/src/main/i18n/templates/DataSourceInitModel_es_ES.ftl - toolkit/api/src/main/i18n/templates/DataSourceInitModel_fr_FR.ftl → client/core/src/main/i18n/templates/DataSourceInitModel_fr_FR.ftl - client/core/src/main/i18n/templates/InitStorageModel_en_GB.ftl - client/core/src/main/i18n/templates/InitStorageModel_es_ES.ftl - client/core/src/main/i18n/templates/InitStorageModel_fr_FR.ftl - client/core/src/main/i18n/templates/ObserveSwingDataSource_en_GB.ftl The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/c2573c84fe1fb2459081840fd... -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/c2573c84fe1fb2459081840fd... You're receiving this email because of your account on gitlab.com.