Tony CHEMIT pushed to branch master at ultreiaio / ird-observe Commits: cd4f3685 by Tony Chemit at 2023-11-14T16:52:18+01:00 [jgitflow-maven-plugin]updating poms for 9.2.2-SNAPSHOT development[skip ci] - - - - - ce079ce4 by Tony Chemit at 2023-11-14T17:11:57+01:00 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts[skip ci] - - - - - 550888fb by Tony Chemit at 2023-11-14T17:11:58+01:00 [jgitflow-maven-plugin]merging 'master' into 'develop' - - - - - 90eab29a by Tony Chemit at 2023-11-14T17:11:59+01:00 [jgitflow-maven-plugin]Updating develop poms back to pre merge state[skip ci] - - - - - 7e3962e1 by Tony Chemit at 2023-11-15T12:00:25+01:00 Move to version 9.3.0 - - - - - 38a62dbb by Tony Chemit at 2023-11-17T12:14:33+01:00 Ajout de la fonctionnalité d'export html dans l'interface graphique - - - - - 939468ef by Tony Chemit at 2023-11-17T12:15:13+01:00 Ajout des templates pour générer l'export html - - - - - 3e9dac14 by Tony Chemit at 2023-11-17T12:17:49+01:00 Merge branch 'feature/issue_2755' into develop Sur les tableaux de synthèse, ajouter un export HTML - Closes #2755 - - - - - eafab6dc by Tony Chemit at 2023-11-21T10:30:11+01:00 Sur le plan de cuves, empêcher la saisie multiple d'une même activité sur une même cuve - Closes #2717 - - - - - f71ab184 by Tony Chemit at 2023-11-21T11:12:44+01:00 importDirectory must not be final and transient to be persisted... - - - - - 78740869 by Tony Chemit at 2023-11-21T11:18:05+01:00 add backupsDirectory (only used for automatic backups) - - - - - 52092051 by Tony Chemit at 2023-11-21T11:18:37+01:00 fix dumpFile initial value in initFromConfig method - - - - - 0c44c3a8 by Tony Chemit at 2023-11-21T11:30:41+01:00 persist backupDirectory when performing a backup - - - - - 8416c255 by Tony Chemit at 2023-11-21T11:52:18+01:00 Merge branch 'feature/issue-2804' into develop Les assistants d'ouverture ou sauvergade de sql.gz ne retrouvent jamais le dernier répertoire utilisé - Closes #2804 - - - - - cf138579 by Tony Chemit at 2023-11-21T13:15:38+01:00 fix how to make line (on ll we have no text, and for ps we have points always with text (but text can also be null)) - - - - - 998e6449 by Tony Chemit at 2023-11-21T13:17:02+01:00 adapt ps logbook lines (use the same layer to display day and night points (but night ones have no text) - - - - - f5d24778 by Tony Chemit at 2023-11-21T13:43:49+01:00 Merge branch 'feature/issue-2756' into develop La distinction jour/nuit sur la carte est peu pertinente pour les données logbook - See #2756 - - - - - 3e2f7791 by Tony Chemit at 2023-11-21T16:13:01+01:00 use plain line style - See #2756 - - - - - 284c10f6 by Tony Chemit at 2023-11-21T16:14:51+01:00 add new options in TripMapConfigDto (only used by TripMapContentBuilder) - - - - - 1c2772ec by Tony Chemit at 2023-11-21T16:16:00+01:00 add new options in TripMapUI and use them to update add new options in TripMapConfigDto and rebuild map model - - - - - 580b9080 by Tony Chemit at 2023-11-21T16:17:38+01:00 Merge branch 'feature/issue-2363' into develop Ajouter une option pour afficher/masquer la trace entre les activités de la carte - See #2363 - - - - - 777cba00 by Tony Chemit at 2023-11-22T10:36:58+01:00 sort items in legend - - - - - 10adf5d7 by Tony Chemit at 2023-11-22T10:37:48+01:00 add new entries in TripMapPointType - - - - - 1fc0533e by Tony Chemit at 2023-11-22T10:40:30+01:00 get logbook activities with sampling and use new entries of TripMapPointType in TripMapBuilder - - - - - 5cd87f5f by Tony Chemit at 2023-11-22T10:41:07+01:00 add new configuration option for logbook activities with sampling (default is yellow) - - - - - dc72c092 by Tony Chemit at 2023-11-22T10:41:48+01:00 update TripMapContentBuilder and ps style to use new type of point (with sampling) - - - - - 0fa755fe by Tony Chemit at 2023-11-22T12:45:05+01:00 add suppressWarning for services with generics and AutoService annotation usage - - - - - 6a0e6978 by Tony Chemit at 2023-11-22T12:45:50+01:00 change shortcut (Alt + Fxx is used under linux by X) - - - - - 29e47618 by Tony Chemit at 2023-11-22T12:46:41+01:00 Merge branch 'feature/issue-2549' into develop Mettre en exergue sur la carte les calées qui ont été échantillonnées - See - - - - - 41742eaf by Tony Chemit at 2023-11-22T12:56:55+01:00 add suppressWarning for services with generics and AutoService annotation usage - - - - - a36cd49b by Tony Chemit at 2023-11-22T14:01:21+01:00 fix french I18n legendBottom and legendTop are reversed.... - - - - - ea70e2f2 by Tony Chemit at 2023-11-22T14:01:22+01:00 add validCount and notValidCount in ObserveMapPaneLegendItem (o be able to compute real label at runtime) - - - - - c5c1314f by Tony Chemit at 2023-11-22T14:15:59+01:00 add addPointCount option in ObserveMapPane and use it to compute legend label - - - - - f261cfc6 by Tony Chemit at 2023-11-22T14:15:59+01:00 add AddPointCount action to switch addPointCount option - - - - - 70eb8a1c by Tony Chemit at 2023-11-22T14:17:17+01:00 Merge branch 'feature/issue-2805' into develop Ajouter une option pour voir le nombre de points dans la légende - Closes #2805 - - - - - c86477a7 by Tony Chemit at 2023-11-22T15:37:45+01:00 add validCount and notValidCount in ObserveMapPaneLegendItem (to be able to compute real label at runtime via the getLabel method) - See #2805 - - - - - d72c14b2 by Tony Chemit at 2023-11-22T17:45:06+01:00 Pouvoir sélectionner/déselectionner les lignes et les points dans la carte - Closes #2806 - - - - - 576a6a8c by Tony Chemit at 2023-11-23T13:44:28+01:00 Move persistence model back to 9.2 (we don't need a migration at this time) and update pom - - - - - 58a78780 by Tony Chemit at 2023-11-23T13:58:02+01:00 update pom - - - - - 5171ad36 by Tony Chemit at 2023-11-25T13:40:12+01:00 update pom change pom dependencies coordinates - - - - - b474e869 by Tony Chemit at 2023-11-25T13:40:12+01:00 Remove never used code - - - - - b009e471 by Tony Chemit at 2023-11-25T13:40:12+01:00 fix on service should be PUT but was POST... - - - - - e810ab41 by Tony Chemit at 2023-11-25T13:40:12+01:00 Update http library API and improve timeout tuning - - - - - 40a629ff by Tony Chemit at 2023-11-25T13:40:12+01:00 add missing annotations - - - - - 8fbbb17f by Tony Chemit at 2023-11-25T14:47:48+01:00 Upgrade to fileupload2 - - - - - bc7ebe50 by Tony Chemit at 2023-11-25T14:47:48+01:00 update pom - - - - - bdc2aff0 by Tony Chemit at 2023-11-25T14:48:58+01:00 Merge branch 'feature/issue-2605' into develop Mettre à jour la libraire apache http-client - Closes #2605 - - - - - 16bd168a by Tony Chemit at 2023-11-25T14:57:31+01:00 Supprimer le module server-configuration-tool (il ne sert pas) - Closes #2807 - - - - - 5c5514d0 by Tony Chemit at 2023-11-27T17:14:48+01:00 Add a new hook when loading a dto for from and validation (we will use it in Validation interceptor to load on dto some properties used for validation) - - - - - 9fba01ae by Tony Chemit at 2023-11-27T17:14:48+01:00 Add new entity method Activity.isCoordinateRequired to compute this value - - - - - 98639a6a by Tony Chemit at 2023-11-27T17:14:48+01:00 Add new dto method Activity.isCoordinateRequired to get value computed on entity - - - - - 251c5d0b by Tony Chemit at 2023-11-27T17:16:08+01:00 load Activity.coordinateRequired property to dto (when validation is required) - - - - - f58e962c by Tony Chemit at 2023-11-27T17:16:20+01:00 Add validation rule on ActivityDto coordinates (not null except if !coordinateRequired) - - - - - 15719d0c by Tony Chemit at 2023-11-27T17:16:20+01:00 Use new hook loadDtoFroValidation in EntityInterceptor (so now we can have exact same behaviour than in application forms (but need to double check any overrides)) - - - - - e3c8ed67 by Tony Chemit at 2023-11-27T17:17:58+01:00 Merge branch 'feature/issue-2663' into develop Contrôle de validation position si opération sur objet != perte/fin transmission/fin balise - Closes #2663 - - - - - 09239859 by Tony Chemit at 2023-11-28T12:38:48+01:00 update pom - - - - - d60f1b41 by Tony Chemit at 2023-11-28T12:42:29+01:00 Mettre tous les traits en fin (width=1)- Closes #2756 - - - - - c7a40264 by Tony Chemit at 2023-11-28T16:39:21+01:00 Remove report legacy API and migration. - - - - - 5fc26ffc by Tony Chemit at 2023-11-28T16:39:50+01:00 update pom - - - - - 156a852f by Tony Chemit at 2023-11-28T16:39:51+01:00 add method I18nDecoratorHelper.newTimeFormat - - - - - 6d909796 by Tony Chemit at 2023-11-28T16:39:51+01:00 add cellValueFormatter on ReportRequestExecutor to format date and time (pass it to the DataMatrix) - - - - - e77b6111 by Tony Chemit at 2023-11-28T16:39:51+01:00 update reports to remove any date and time transformations in requests (this will be done after) - - - - - 7d39513a by Tony Chemit at 2023-11-28T16:39:51+01:00 update reports fixtures - - - - - 9686faf4 by Tony Chemit at 2023-11-28T16:45:27+01:00 Merge branch 'feature/issue-2812' into develop Normalisation des dates et heures dans les rapports - Closes #2812 - - - - - ee03d54b by Tony Chemit at 2023-11-28T17:19:37+01:00 avoid re-entrant code in listener - - - - - b5b89df8 by Tony Chemit at 2023-11-28T17:20:29+01:00 Do not enable change mode action if not one selected data - - - - - b3f7a158 by Tony Chemit at 2023-11-28T17:33:20+01:00 On list ui, always select first item at end open - - - - - c4dec149 by Tony Chemit at 2023-11-28T17:34:08+01:00 On list ui, show configuration actions in navigation context menu even if model is not editable (may have the goto editing child action enabled here) - - - - - cfc0c2f3 by Tony Chemit at 2023-11-28T17:34:26+01:00 Merge branch 'feature/issue-2810' into develop LL observations, en sélection multiple d'activités, la fonction 'Rouvrir la donnée de type activité' ne devrait pas être disponible - Closes #2810 - - - - - 43df8143 by Tony Chemit at 2023-11-30T12:59:58+01:00 update pom - - - - - 4e4fab22 by Tony Chemit at 2023-11-30T14:33:12+01:00 on Report action, let's select all data for local data source - See #281x ? - - - - - ad1a88c8 by Tony Chemit at 2023-11-30T14:33:14+01:00 add AutoNext mechanism on admin tab when tab state change to success, add it on consolidate tab :) - See #281x ? - - - - - bf5d8d8a by Tony Chemit at 2023-11-30T14:33:25+01:00 use TopiaPersistenceContext instead of TopiaDaoSupplier in DefaultReportRequestExecutor to be able to use findById method and use ReportDefinition instead of Report parameter in method TopiaPersistenceContext.newReportRequestExecutor - - - - - df4266dd by Tony Chemit at 2023-11-30T14:33:25+01:00 add method ReportRequestExecutor.getReferentialLabel method and implements it. - - - - - 7248bb0d by Tony Chemit at 2023-11-30T14:33:25+01:00 introduce ColumnRendererDefinition and add some in ReportDefinition - - - - - b2021fca by Tony Chemit at 2023-11-30T15:12:09+01:00 introduce ColumnRendererConsumer and ColumnRendererParameters API - - - - - 8515cd4f by Tony Chemit at 2023-11-30T15:12:39+01:00 implements first ColumnRendererConsumers - - - - - b9ec8221 by Tony Chemit at 2023-11-30T15:12:39+01:00 add method ReportService.initColumnRendererParameters - - - - - 8fc495ce by Tony Chemit at 2023-11-30T15:12:39+01:00 test new API in fixtures - - - - - 6d61b859 by Tony Chemit at 2023-11-30T15:12:39+01:00 add first cell renderers in report definitions :) - - - - - ae59a5f8 by Tony Chemit at 2023-11-30T15:12:39+01:00 adapt Report ui action API to load column renderers of selected report and offers them to HtmlExportModel. - - - - - 498756f4 by Tony Chemit at 2023-11-30T15:45:34+01:00 adapt Report html template at last - - - - - 1b79ed66 by Tony Chemit at 2023-11-30T15:46:12+01:00 Merge branch 'feature/issue-2811' into develop Définir les règles de mise en forme conditionnelle sur les tableaux de synthèse - See #2811 - - - - - fb599bfe by Tony Chemit at 2023-12-01T08:48:22+01:00 Move to persistence model 9.3 - - - - - 6124147c by Tony Chemit at 2023-12-01T09:08:13+01:00 add persistence migration code - - - - - 8f934f33 by Tony Chemit at 2023-12-01T09:33:05+01:00 Do not disable TransmittingBuoy.country - - - - - 6587e1f5 by Tony Chemit at 2023-12-01T09:33:32+01:00 Rename I18n label TransmittingBuoy.country to flagCountry - - - - - 125b581f by Tony Chemit at 2023-12-01T10:29:02+01:00 keep protected unknown TransmittingBuoyOwnership id - - - - - 15552adc by Tony Chemit at 2023-12-01T10:49:53+01:00 add listener on TransmittingBuoyOwnership to enable/disable vessel or country - - - - - 2e651502 by Tony Chemit at 2023-12-01T10:50:26+01:00 remove commented code (from v7) - - - - - c2557d28 by Tony Chemit at 2023-12-01T10:50:48+01:00 Merge branch 'feature/issue-2044' into develop Peaufinage du form Balise : disponibilité des champs Appartenance, Pays et Navire - Closes #2044 - - - - - d8b081ff by Tony Chemit at 2023-12-01T15:35:26+01:00 Review SubtractColum to a better null management - - - - - a88911d9 by Tony Chemit at 2023-12-01T15:54:38+01:00 Review first ColumnRendererConsumer (add null management + improve the code) - - - - - 44de672d by Tony Chemit at 2023-12-01T15:54:38+01:00 Rename html export configuration tab to metadata - - - - - 3f0ecbae by Tony Chemit at 2023-12-01T15:55:24+01:00 Improve report html export (now fill the hole cell :)) - - - - - bbeeac87 by Tony Chemit at 2023-12-01T16:06:32+01:00 Merge branch 'feature/issue-2811' into develop Définir les règles de mise en forme conditionnelle sur les tableaux de synthèse - Closes #2811 - - - - - 7e08d2ef by Tony Chemit at 2023-12-01T16:08:17+01:00 Add client configuration option skipConsolidateStepForReport - Closes #281x ? - - - - - ba11dbb3 by Tony Chemit at 2023-12-05T11:39:23+01:00 Improve report html export - final touch - Closes #2811 Add DataMatrix gson adapter (to reduce format) introduce ColumnRendererConsumer and ColumnRendererParameters API (add gson adapter) - - - - - - 568bf70f by Tony Chemit at 2023-12-05T12:04:17+01:00 update pom - - - - - 14a57d2a by Tony Chemit at 2023-12-05T12:11:45+01:00 Le service init.information de l'API retourne les informations sur la base cible, alors qu'on ne devrait que retourner son nom - Closes #2817 - - - - - e9eb4688 by Tony Chemit at 2023-12-05T12:22:29+01:00 VesselActivity sur création d'activity par l'importeur AVDTH - Closes #2814 - - - - - cf3e20b0 by Tony Chemit at 2023-12-05T12:37:28+01:00 Improve report html export - final touch - Closes #2811 - - - - - 8735d717 by Tony Chemit at 2023-12-06T14:29:14+01:00 [toolkit-api-report] Introduce WithRequest and ReportRequestExecutorI18nContext to be able to translate anything in hql requests and in some parameters - - - - - bd80057f by Tony Chemit at 2023-12-06T14:29:14+01:00 [toolkit-persistence] Adapt DefaultReportRequestExecutor to use new i18n API - - - - - 51a80bb7 by Tony Chemit at 2023-12-06T14:29:14+01:00 [core-persistence-report] Implements ReportI18nKeysProducer to add default i18n mapping used in embedded reports and adapt reports definition file (using new i18n API) [core-services-i18n] update then i18n bundle - - - - - 892a74e7 by Tony Chemit at 2023-12-06T14:29:14+01:00 [core-services-test] Update report fixtures - - - - - 1a8b3696 by Tony Chemit at 2023-12-06T14:29:14+01:00 [toolkit-api-report] Introduce a way to translate report meta-data (such as name, description, columnsHeader and rowsHeader) - - - - - 6f106303 by Tony Chemit at 2023-12-06T14:29:14+01:00 [client-datasource-actions] Use new I18n API in Report on ui and export template - - - - - 74dea2b0 by Tony Chemit at 2023-12-06T14:29:14+01:00 [client-datasource-actions] Use reportDefinition id instead of his name to compute reportRenderers - - - - - b3ffff3f by Tony Chemit at 2023-12-06T14:29:14+01:00 [core-persistence-report] Add new properties in report definition file to fill english and spanish translations - - - - - 28a8c734 by Tony Chemit at 2023-12-06T14:29:14+01:00 [client-datasource-actions] Use now a separated file for report html export css style - - - - - 22dcf3c7 by Tony Chemit at 2023-12-06T14:30:41+01:00 Merge branch 'feature/issue-2599' into develop Rendre le fichier de définition des rapports multilingue - See #2599 - - - - - defe4bce by Tony Chemit at 2023-12-07T17:58:18+01:00 [toolkit-api-report] Fix new json adapter (See #2599) - - - - - f7e26769 by Tony Chemit at 2023-12-07T17:58:23+01:00 Correction de la condition de création d'activités ficitives sur l'import avdth - - - - - 2551e5e5 by Tony Chemit at 2023-12-08T11:43:43+01:00 Add nice method in MojoRunnable in execute a simple Runnable - - - - - 04e62ee0 by Tony Chemit at 2023-12-08T11:43:47+01:00 add SuppressWarnings - - - - - d5392cdd by Tony Chemit at 2023-12-08T11:43:52+01:00 [core-persistence-report] fix ReportI18nKeys keys - See #2599 - - - - - c2f1fbed by Tony Chemit at 2023-12-08T11:44:04+01:00 [toolkit-api-report] Review builder, now we are loading a file per report, for detection, use a generated file with mapping of embedded reports - - - - - de0e255d by Tony Chemit at 2023-12-08T11:44:04+01:00 [toolkit-maven-plugin] Add mojo to generate the embedded reports list file - - - - - 7ce2337c by Tony Chemit at 2023-12-08T11:44:04+01:00 [core-persistence-report] Split reports (one file per report) + generate reports list file - - - - - 64e02e7d by Tony Chemit at 2023-12-08T11:44:04+01:00 [core-services-test] Use the DefaultByClassPathReportDefinitionBuilder in services tests - - - - - b00a6359 by Tony Chemit at 2023-12-08T11:44:04+01:00 [client] Remove reportFile configuration option and now use directly the reportDirectory - - - - - d597c79b by Tony Chemit at 2023-12-08T11:45:04+01:00 Merge branch 'feature/issue-2962' into develop Séparer le fichier des reports en plusieurs fichiers - Closes #2962 - - - - - a5ffcc7d by Tony Chemit at 2023-12-08T15:01:06+01:00 [toolkit-api-report] Review i18n API - - - - - f5dbc4d4 by Tony Chemit at 2023-12-08T15:23:47+01:00 [core-persistence-report] include i18n in each report definition - - - - - 94819d99 by Tony Chemit at 2023-12-08T15:23:47+01:00 [i18n] clean it - - - - - 6ca418c5 by Tony Chemit at 2023-12-08T15:23:55+01:00 Merge branch 'feature/issue-2599' into develop Rendre le fichier de définition des rapports multilingue - See #2599 - - - - - e6513e5c by Tony Chemit at 2023-12-08T15:59:03+01:00 improve HighlightIfEquals18nReferentialValue (add warning if not error, nor ok) - see #2811 - - - - - 300332c3 by Tony Chemit at 2023-12-08T16:04:18+01:00 Move to version 9.3.0-RC-1-SNAPSHOT - - - - - b0492b5a by Tony Chemit at 2023-12-08T16:05:22+01:00 [jgitflow-maven-plugin]updating poms for branch'release/9.3.0-RC-1' with non-snapshot versions[skip ci] - - - - - 735b3ecd by Tony Chemit at 2023-12-08T16:26:13+01:00 [jgitflow-maven-plugin]merging 'release/9.3.0-RC-1' into 'master' - - - - - 30 changed files: - client/configuration/pom.xml - client/configuration/src/main/config/Client.ini - client/configuration/src/main/i18n/getters/config.getter - client/configuration/src/main/java/fr/ird/observe/client/configuration/ClientConfig.java - client/configuration/src/main/java/fr/ird/observe/client/configuration/ClientResources.java - client/configuration/src/main/java/fr/ird/observe/client/configuration/SeineBycatchObservedSystemConfigConverter.java - client/core/pom.xml - client/core/src/main/java/fr/ird/observe/client/datasource/h2/backup/LocalDatabaseBackupTaskSupport.java - client/core/src/main/java/fr/ird/observe/client/datasource/h2/server/H2ServerBodyContent.java - client/core/src/main/java/fr/ird/observe/client/datasource/presets/RemotePresetsBodyContent.java - client/core/src/main/java/fr/ird/observe/client/main/body/ClientConfigBodyContent.java - client/core/src/main/java/fr/ird/observe/client/main/body/ClientConfigUI.java - client/core/src/main/java/fr/ird/observe/client/main/body/NoBodyContent.java - client/core/src/main/resources/observe-ui.properties - client/datasource/actions/pom.xml - client/datasource/actions/src/main/i18n/getters/java.getter - + client/datasource/actions/src/main/i18n/templates/reportHtmlExport_en_GB.ftl - + client/datasource/actions/src/main/i18n/templates/reportHtmlExport_es_ES.ftl - + client/datasource/actions/src/main/i18n/templates/reportHtmlExport_fr_FR.ftl - client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/AdminTabUIHandler.java - client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/AdminUIBodyContent.java - client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/ObserveKeyStrokesActions.java - client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/config/SelectDataModel.java - client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/consolidate/ConsolidateModel.java - client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/consolidate/ConsolidateUIHandler.java - client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/consolidate/actions/Start.java - + client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/report/HtmlExportModel.java - client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/report/ReportModel.java - client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/report/ReportUI.jaxx - 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/9213109789f45e636eaaaa377... -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/9213109789f45e636eaaaa377... You're receiving this email because of your account on gitlab.com.