GitLab

at 2023-11-14T16:52:18+01:00

[jgitflow-maven-plugin]updating poms for 9.2.2-SNAPSHOT development[skip ci]
[jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts[skip ci]
[jgitflow-maven-plugin]merging 'master' into 'develop'
[jgitflow-maven-plugin]Updating develop poms back to pre merge state[skip ci]
Move to version 9.3.0

Ajout de la fonctionnalité d'export html dans l'interface graphique

Ajout des templates pour générer l'export html

Merge branch 'feature/issue_2755' into develop
Sur les tableaux de synthèse, ajouter un export HTML - Closes #2755

Sur le plan de cuves, empêcher la saisie multiple d'une même activité sur une même cuve - Closes #2717

importDirectory must not be final and transient to be persisted...

add backupsDirectory (only used for automatic backups)

fix dumpFile initial value in initFromConfig method

persist backupDirectory when performing a backup

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

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))

adapt ps logbook lines (use the same layer to display day and night points (but night ones have no text)

Merge branch 'feature/issue-2756' into develop
La distinction jour/nuit sur la carte est peu pertinente pour les données logbook
- See #2756

use plain line style - See #2756

add new options in TripMapConfigDto (only used by TripMapContentBuilder)

add new options in TripMapUI and use them to update add new options in TripMapConfigDto and rebuild map model

Merge branch 'feature/issue-2363' into develop
Ajouter une option pour afficher/masquer la trace entre les activités de la carte
- See #2363

sort items in legend

add new entries in TripMapPointType

get logbook activities with sampling and use new entries of TripMapPointType in TripMapBuilder

add new configuration option for logbook activities with sampling (default is yellow)

update TripMapContentBuilder and ps style to use new type of point (with sampling)

add suppressWarning for services with generics and AutoService annotation usage

change shortcut (Alt + Fxx is used under linux by X)

Merge branch 'feature/issue-2549' into develop
Mettre en exergue sur la carte les calées qui ont été échantillonnées - See

add suppressWarning for services with generics and AutoService annotation usage

fix french I18n legendBottom and legendTop are reversed....

add validCount and notValidCount in ObserveMapPaneLegendItem (o be able to compute real label at runtime)

add addPointCount option in ObserveMapPane and use it to compute legend label

add AddPointCount action to switch addPointCount option

Merge branch 'feature/issue-2805' into develop
Ajouter une option pour voir le nombre de points dans la légende - Closes #2805

add validCount and notValidCount in ObserveMapPaneLegendItem (to be able to compute real label at runtime via the getLabel method) - See #2805

Pouvoir sélectionner/déselectionner les lignes et les points dans la carte - Closes #2806

Move persistence model back to 9.2 (we don't need a migration at this time) and update pom

update pom

update pom
change pom dependencies coordinates

Remove never used code

fix on service should be PUT but was POST...

Update http library API and improve timeout tuning

add missing annotations

Upgrade to fileupload2

update pom

Merge branch 'feature/issue-2605' into develop
Mettre à jour la libraire apache http-client - Closes #2605

Supprimer le module server-configuration-tool (il ne sert pas) - Closes #2807

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)

Add new entity method Activity.isCoordinateRequired to compute this value

Add new dto method Activity.isCoordinateRequired to get value computed on entity

load Activity.coordinateRequired property to dto (when validation is required)

Add validation rule on ActivityDto coordinates (not null except if !coordinateRequired)

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))

Merge branch 'feature/issue-2663' into develop
Contrôle de validation position si opération sur objet != perte/fin transmission/fin balise
- Closes #2663

update pom

Mettre tous les traits en fin (width=1)- Closes #2756

Remove report legacy API and migration.

update pom

add method I18nDecoratorHelper.newTimeFormat

add cellValueFormatter on ReportRequestExecutor to format date and time (pass it to the DataMatrix)

update reports to remove any date and time transformations in requests (this will be done after)

update reports fixtures

Merge branch 'feature/issue-2812' into develop
Normalisation des dates et heures dans les rapports - Closes #2812

avoid re-entrant code in listener

Do not enable change mode action if not one selected data

On list ui, always select first item at end open

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)

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

update pom

on Report action, let's select all data for local data source - See #281x ?

add AutoNext mechanism on admin tab when tab state change to success, add it on consolidate tab :) - See #281x ?

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

add method ReportRequestExecutor.getReferentialLabel method and implements it.

introduce ColumnRendererDefinition and add some in ReportDefinition

introduce ColumnRendererConsumer and ColumnRendererParameters API

implements first ColumnRendererConsumers

add method ReportService.initColumnRendererParameters

test new API in fixtures

add first cell renderers in report definitions :)

adapt Report ui action API to load column renderers of selected report and offers them to HtmlExportModel.

adapt Report html template at last

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

Move to persistence model 9.3

add persistence migration code

Do not disable TransmittingBuoy.country

Rename I18n label TransmittingBuoy.country to flagCountry

keep protected unknown TransmittingBuoyOwnership id

add listener on TransmittingBuoyOwnership to enable/disable vessel or country

remove commented code (from v7)

Merge branch 'feature/issue-2044' into develop
Peaufinage du form Balise : disponibilité des champs Appartenance, Pays et Navire
- Closes #2044

Review SubtractColum to a better null management

Review first ColumnRendererConsumer (add null management + improve the code)

Rename html export configuration tab to metadata

Improve report html export (now fill the hole cell :))

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

Add client configuration option skipConsolidateStepForReport - Closes #281x ?

Improve report html export - final touch - Closes #2811
Add DataMatrix gson adapter (to reduce format)
introduce ColumnRendererConsumer and ColumnRendererParameters API (add gson adapter) -

update pom

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

VesselActivity sur création d'activity par l'importeur AVDTH - Closes #2814

Improve report html export - final touch - Closes #2811

[toolkit-api-report] Introduce WithRequest and ReportRequestExecutorI18nContext to be able to translate anything in hql requests and in some parameters

[toolkit-persistence] Adapt DefaultReportRequestExecutor to use new i18n API

[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

[core-services-test] Update report fixtures

[toolkit-api-report] Introduce a way to translate report meta-data (such as name, description, columnsHeader and rowsHeader)

[client-datasource-actions] Use new I18n API in Report on ui and export template

[client-datasource-actions] Use reportDefinition id instead of his name to compute reportRenderers

[core-persistence-report] Add new properties in report definition file to fill english and spanish translations

[client-datasource-actions] Use now a separated file for report html export css style

Merge branch 'feature/issue-2599' into develop
Rendre le fichier de définition des rapports multilingue - See #2599

[toolkit-api-report] Fix new json adapter (See #2599)

Correction de la condition de création d'activités ficitives sur l'import avdth

Add nice method in MojoRunnable in execute a simple Runnable

add SuppressWarnings

[core-persistence-report] fix ReportI18nKeys keys - See #2599

[toolkit-api-report] Review builder, now we are loading a file per report, for detection, use a generated file with mapping of embedded  reports

[toolkit-maven-plugin] Add mojo to generate the embedded reports list file

[core-persistence-report] Split reports (one file per report) + generate reports list file

[core-services-test] Use the DefaultByClassPathReportDefinitionBuilder in services tests

[client] Remove reportFile configuration option and now use directly the reportDirectory

Merge branch 'feature/issue-2962' into develop
Séparer le fichier des reports en plusieurs fichiers - Closes #2962

[toolkit-api-report] Review i18n API

[core-persistence-report] include i18n in each report definition

[i18n] clean it

Merge branch 'feature/issue-2599' into develop
Rendre le fichier de définition des rapports multilingue - See #2599

improve HighlightIfEquals18nReferentialValue (add warning if not error, nor ok) - see #2811

Move to version 9.3.0-RC-1-SNAPSHOT

[jgitflow-maven-plugin]updating poms for branch'release/9.3.0-RC-1' with non-snapshot versions[skip ci]
[jgitflow-maven-plugin]merging 'release/9.3.0-RC-1' into 'master'

Tony CHEMIT pushed to branch master at ultreiaio / ird-observe

Commits:

30 changed files:

The diff was not included because it is too large.