GitLab

at 2024-07-05T12:52:31+02:00

[jgitflow-maven-plugin]updating poms for 9.3.7-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]
Faille sur l'UI de remplacement de code de référentiel - Closes #2917

fix CI

update pom

Amélioration des poids +10/-10 et total des échantillons lors de l'import AVDTH - Closes #2918

Mettre à null le commentaire Trip.logbookComment si celui ci n'est constitué que d'espaces - Closes #2923

Reduce log level

increase timeout for method SynchronizeService.produceSqlResult

update pom

Replace tomcat plugin to deploy on demo the release war

Add andThen nice method to chain consumers (with possible null on first one)

Review SPI code to improve save mechanism (only override the onSave method, and no more the saveEntity one)

update spi to use new save API

Improve tests log level

Update pom

Introduce WithEndDateEntityAware

use WithEndDateEntityAware in TripEntityAware and update Trip spi

use WithEndDateEntityAware on entities

update spi to use new save API and TripEntityAware onSaveUpdateTripIfEndDateChanged method

Merge branch 'feature/issue_2903' into develop
LL observations / logbook : mise à jour auto de la date de fin de marée en fonction des dates activités (comme en PS)
- Closes #2903

update pom

Remove unnecessary brace to one jaxx expression

KeepBeanPropertyOrder in presets storage

Add fileName property in FloatingObjectPreset (to be able to use it later)

Improve FloatingObjectPresetStorage and load filename when reading storage, but never store it at write time

Improve FloatingObjectPresetsStorage and add store method to be able to rewrite all the presets from the presetsMap parameter.

Replace # by -- in presets (otherwise it is a comment and is never loaded

Introduce method reloadDefaultDcpPresets to be able to reload embedded presets

Introduce method setMainI18nLanguage to be able to apply it in presets ui

Improve FloatingObjectPresetUIInitializer to use it form preset managers also

Open buildMaterialsList method to be used by presets manager

Add presets manager UI

Add new content body to display presets manager

Merge branch 'feature/issue-2826' into develop
Permettre le renommage, la suppression, éventuellement l'édition des présélections de FOB
- Closes #2826

Add more i18n from TripAware

Introduce a simple update sql query for bulk changes and use it in DataGroupByDefinition

Introduce updateQualitativeProperty method in RootOpenableService and in dedicated SPI

can now override RootListModelStates

Introduce createReferenceCache method in ContentRootListUIModelStates and fill it in concrete classes (and reuse existing code on ContentRootOpenableUIModelStates)

Add action BulkModify on ContentRootListUI

Add new BulkModify ui

Merge branch 'feature/issue-2816' into develop
Fonction de changement de programme en masse - Closes #2816

Ajout des nouveaux groupBy dans le modèle

Mise à jour des modèles générés

Mise à jour des requètes pour les nouveaux groupBy

Ajout dans les DataGroupByReferentialHelper des nouveaux référentiels utilisables dans les nouveaux groupBy

Ajout dans les libellés sur la qualité de donné du suffix du sous-domaine (obs ou logbook)

Mise à jour des fixtures

Merge branch 'feature/issue-2924' into develop
Ajout de nouveaux critères dans la configuration de l'arbre de navigation - Closes #2924

Fix DateSupport code (comparing Timestamp and Date is not ok)

Fix DtoFormValidatorTransformer dayFunction and timeFunction (for timestamp property)

Add common I18n for xxxDate properties on Set

Decompose xxxTimestamp properties on Set

Review validation temporal rules for Logbook.(Activity/Set)

Review validator on ui for temporal rules Logbook.(Activity/Set)

Review validation temporal rules for Observation.(Activity/Set)

Review validator on ui for temporal rules Observation.(Activity/Set)

Merge branch 'feature/issue-2904' into develop
LL observations / logbook : Revue des contrôles sur la cohérences des dates sur les calées
- Closes #2904

Perte dans l'éditeur du type de mesure et de pesée lors de la sélection d'une ligne fraîchement crée dans le tableau des données d'échantillons - Closes #2925

Sanitize SaveTableEntry code and when create property goes back to false

Amélioration de la conservation du paramétrage des UI - Closes #2926

Introduce WithIndex and ContainerChildWithIndexDto API

use ContainerChildWithIndexDto in ObServe model

Be able to do actions on JXTableHeader (for the sort actions on reading form)

Improve JXTableUtil to display index column with a specific renderer

Review ContentTableUI API to use WithIndex objects, review also move actions

Adapt forms using WithIndex objects

Merge branch 'feature/issue-1203' into develop
Tableaux de saisie (captures, échantillons, équipements...) - Classement en cliquant sur les en-têtes de colonnes
- Closes #1203

Add FilterableComboBoxState state

Add ListHeaderState state

use new states in ObserveSwingSession

Merge branch 'feature/issue-2834' into develop
Sauvegarde des préférences utilisateur sur le classement des listes : gestion dans l'UI
- Closes #2834

Make sure form is never modified on opening in updating mode - See #2928

Never alter modified state when changing format (this code is actually not working, but will soon...)  - See #2928

Le changement de format des éditeurs de température ou de longueur altère l'état «modifié» du formulaire - Closes #2927

Add TemperatureEditorState state

Add NauticalLengthEditorState state

Add CoordinatesEditorState state

use new states in ObserveSwingSession

Merge branch 'feature/issue-2901' into develop
Permettre à l’utilisateur de sauvegarder les unités choisies (longueur, température et coordonnées)
- Closes #2901

Add more SwingSession states for some widgets - Closes ultreiaio/jaxx#849

Update jaxx version - Closes #2928

Fix WithIndex generation - See #1203

Fix onRemoveRow method (we already are using the modelRow) - See #1203

Add new queries in TripDao

Add new methods in TripService

Add new labels (will be used for ui for new actions)

Open API (to hack to order of configuration actions)

Add ContentTableUITableModel.addNewEntry(bean) method to be able to create a new row from a given bean

Implements action AddActivitiesFromSample on Well form

Implements action AddActivitiesFromSample on Sample form

Merge branch 'feature/issue-2734' into develop
La liste des activités associées à un échantillon pourrait être déduite du plan de cuves, et inversément - Closes #2734

Add new ClientConfig option to store the speciesList and fill from the hardcoded list in consolidate action

Add the species list in consolidation request, then use it in consolidation code instead of the hardcoded list

Use the species list in Consolidation action in GUI (and for this time add a TODO to configure this list in config UI)

Merge branch 'feature/issue-2929' into develop
Rendre configurable la liste des espèces à inclure dans la consolidation du sampleActivity.wieghtedWeight - Closes #2929

Add new client configuration option showSensibleCriteriaInTripBulkChanges

use new client configuration option showSensibleCriteriaInTripBulkChanges in BulkModify ui

Merge branch 'feature/issue-2816' into develop
Fonction de changement de programme en masse - Closes #2816

Remove ObserveSwingSession (use directly SwingSession)

Remove ObServeSwingSessionConfig

do not use any longer ObserveSwingSessionHelper in ContentUIInitializer (everything is managed now by SwingSession)

Merge branch 'feature/issue-2834' into develop
Suppression du système de préférences d'ui codé en dure - Closes #2834

fix license header

Hide species ids option (Will be re-add in #2931) - Closes #2929

Remove FloatingObjectPresetsManager and use now only a FloatingObjectPresetsStorage

Use now only one client configuration option and simplify dcp-presets directory layout

Review FloatingObjectPresetsUI (remove tabs and rename FloatingObjectPresetsTabUI to FloatingObjectPresetsEditorUI)

Merge branch 'feature/issue-2826' into develop
Permettre le renommage, la suppression, éventuellement l'édition des présélections de FOB
- Closes #2826

update decorator and pom

override DecoratorSorted.getComparator

use Decorator comparator in RowSorter

Merge branch 'feature/issue_1203' into develop
Utilisation des décorateurs des colonnes de type décorable pour fournir
l'ordre lors d'un tri d'une telle colonne - Closes #1203

Update changelog for v.9.3.7 [skip CI]

update to 9.4.0-M1-SNAPSHOT version

Move I18nReferentialDto.isLabelTranslated method to WithI18n

Fix some missing i18n keys

use correct commons-configuration2

Add FIXME to resolve

Improve validation comments

Depreciate xwork field validators

use new validation and jaxx validation API

implements new field validator using new API

rewrite validation models

Fix some validation errors discovered with the new validation implementation^^

Test both validation implementations in services tck

update pom

I18n does not parse any longer xml files

Manage extra validators in client datasource editors

use new validation and jaxx validation API

add a temporary configuration option to be able to change the validation default factory name

Merge branch 'feature/feature/issue-2594' into develop
Suppression de la technologie XWorks (utilisé pour la validation) - Closes #2594

compositionTabValid can not be bind to tableModels since there is some validation done outside of them... and must be always true on reading mode

Make table not sortable

Open ContentMessageTableModel.data property

Fix i18n key name (replace Section.template by Section.sectionTemplate)

clean SetDetailCompositionUIInitializer code

Improve Reset action

Improve validation flow to validate less things (before we revalidate all sections each time...)

Improve open form performance

Fix where to call validation helper

Limit when use rearrangeIds method

Fix validators editors mapping (but still not working to display icons on validator ui)

Merge branch 'feature/feature/issue-2906' into develop
LL observations/composition détaillée : amélioration de la réactivité du formulaire en mode édition - Closes #2906

Fix jaxx id

update pom

Improve table column sort for enum and boolean - See #1203

Introduce DecoratorTableRenderer

Fix focus owner to number (but should review this in Focus session) - See #2902

fix new maven modules version

Move to persistence model 9.4

Fix IO issues

Review generateTckScripts method (will now migrate referential and data) then will add optional data extra script

Downgrade log4j version (need to understand new warnings)

Fix observe.Common.tracelineLength I18n value

Reduce digits to 2 for floatline3Length and floatline2Length

Reduce digits to 2 for floatline3Length and floatline2Length from migration

SectionTemplateDto now treat all floats with 2 digits only

On ui validation, let's use only two digits to compare FloatlineLengths

On ui editors, let's use only two digits

Merge branch 'feature/issue-2914' into develop
Utilisation du convertisseur d'unité sur la définition détaillée de palangre et décimales - Closes #2914

Fix consolidation printResult on SampleActivity

Add speciesList by migration

Update test fixtures

Review TripConsolidateRequest to use only speciesList id

Replace client configuration option by a simple id of the dedicated speciesList and adapt consolidation action

Add config for consolidate action on speciesList

Merge branch 'feature/feature/issue-2931' into develop
Ajouter une liste d'espèce dédiée à la consolidation et l'utiliser dans l'assistant de consolidation - Closes #2931

Add sampleReferences field in Catch model

Add common I18n for sampleReferences

Add persistence migration

Update generated model

Update generated validation

Merge branch 'feature/feature/issue-2909' into develop
LL observations/captures : ajout de champs Reférence Échantillon - Closes #2909

[services-test] Add default validation factory name in DataEntityServiceLocalWriteTest

[model] update model

[model] add generated tag values

[model] update generated models

[model] update fixtures

[api-dto-decoration] update i18n labels and add generated decorators

[api-services] update generated model

[api-tree] update generated models

[api-tree] update fixtures

[api-validation] update generated validators

[api-validation] update fixtures

[persistence-java] update generated mappings and models

[persistence-decoration] add generated decorator

[persistence-migration] add migration

[persistence-resources] update generated resources

[persistence-test] update fixtures

[services-i18n] update i18n stuff

[services-test] update fixtures

[server] Update generated mapping

[client] Add new UI and update Vessel one

[client] Update generated resources

Merge branch 'feature/feature/issue-2818' into develop
Ajouter 2 tables de référence et 2 références à ces tables dans Vessel - Closes #2818

update pom

[model] update model

[api-dto-decoration] update i18n labels

[persistence-java] update generated mappings and models

[persistence-migration] add migration

[persistence-resources] update generated resources

[services-i18n] update i18n stuff

[client]  Add new field on Form and create action for it

[validation] Weights are no more mandatory

[test] update fixtures

[persistence-migration] add migration

[api] Review consolidate request and result to add new Sample consolidation

Review consolidate engine to add new Sample consolidation and implements the new consolidation action

[test] Update consolidation test

[client] Add new configuration option to store the species list used in new consolidation action

[client] Review consolidation ui action

[doc] Update consolidation documentation

Merge branch 'feature/feature/issue-2669' into develop
Automatiser la calcul des sample.minus10Weight et sample.plus10Weight par sommation des lots du plan de cuves - Closes #2669

[i18n] quelques améliorations demandées - See #2907#note_2097858285

[client] use a default weight measure method in create mode - See #2907

[services-test] update report fixtures (tck was changed)

[services-test] update validation fixtures (tck was changed)

[ui] Add a way to not create an empty row when data is empty...

[ui] Need to validate inline models when edit them

[model] update model

[api-dto-decoration] update i18n labels and decorators

[api-validation] update generated validators

[persistence-java] update generated mappings and models

[persistence-decoration] update generated decorator

[persistence-migration] add migration

[persistence-resources] update generated resources

[persistence-test] update fixtures

[model] update fixtures

[services-i18n] update i18n stuff

[services-test] update validation fixtures

[client] update Catch UI

Merge branch 'feature/feature/issue-2932' into develop
3 listes déroulantes à ajouter sur formulaire LL / observations / captures (références déjà existantes)
- Closes #2932

[persistence] add activity points except if settingStart is a valid point (Obs & Logbook)

[ui] Remove date from any zone

[ui] Add date on activity point and settingStart one

[ui] Use Setting and Hauling line colors for setting and hauling points as well

Merge branch 'feature/feature/issue-2875' into develop
A propos des dates d'activités sur la carte LL - Closes #2875

Fix i18n (See #2932)

Fix decorator in table for location on branchline

New design of form

Fix focus owner to number (but should review this in Focus session)

Merge branch 'feature/issue-2907' into develop
[report 9.4.0] LL observations/captures : réorganisation du formulaire - Closes #2907

Review validators (rename them to xxxObservation) and fix date control (activities are using timestamps)

[model] Add ll.Trip.activityLogbook

[api-dto-validation] Add ll.Trip.activityLogbook validators

[api-validation] Use ll.Trip.activityLogbook validators

[persistence-resources] Update generated validation

[services-test] Update validation fixtures

[client] Update Trip node when saving obs Set or logbook Set

Remove validation rule : ps.logbook.Route.date <= Trip.endDate (Closes #2903)

Merge branch 'feature/issue-2903' into develop
LL observations / logbook : mise à jour auto de la date de fin de marée en fonction des dates activités et calées (comme en PS) - Closes #2903

[api-validation] Update generated validation model

[persistence-resources] Update generated validation

[services-i18n] Add new validation messages

[client] Add validation on Trip.activityLogbook

Merge branch 'feature/issue-2934' into develop
Certains forms acceptent des dates supérieures à la date du jour - Closes #2934

Ajout dans la configuration du client de l'option déjéà existante instance.server.checkServerVersion (onglet expert) - Closes #2936

Amélioration des poids +10/-10 et total des échantillons lors de l'import AVDTH - Closes #2918

Review server API doc (use now json validation files)

[pom] Fix missing mapping.json files in jar - Closes #2935

[pom] Remove any dependencies to legacy validators and xwork and ognl \o/

[toolkit-api-validation] Remove legacy validators

[toolkit-templates] Remove legacy templates and rename GenerateCollectionUniqueKeyValidators2 to GenerateCollectionUniqueKeyValidators

[core-api-dto-validation] Remove legacy validators

[core-api-validation] Remove user legacy validation models

[core-api-validation] Remove user legacy validation models

[core-api-validation] Remove generated legacy validation models

[core-api-validation] Review tests

[core-dto-api-validation] Update generated validators

[core-services-test] Adapt tests

[server-configuration] Always use default validator factory name

[client-configuration] Always use default validator factory name, remove hidden option to switch validation factory name

[client-datasource-editor-xx-validation] Remove legacy validation resources

Merge branch 'feature/remove-xwork' into develop
That's it xwork/ognl are dead - See #2594

Update changelog for v.9.3.7 [skip CI]

Make deploy war works again \o/

Unify profile name for tests

Add minor property to deploy at a better place

Improve deploy release process

Fix validation mapping.json file location

update pom

Mettre à null le commentaire Activity.comment si celui ci n'est constitué que d'espaces - Closes #2923

Mettre à null le commentaire Batch.comment si celui ci n'est constitué que d'espaces - Closes #2923

Do it for Report adapters (add some equals on Parameters to be able to test them) - See #2938

L'action n'est active que si une source de donnée est active - See #2826

[pom] introduce version.series property (used by git and deploy)

Update validation model - See #2818

Erreur lors de la création d'une route PS observations - Closes #2939

Update server public API documentation

Impossible de saisir les Echantillons espèce en PS logbook - Closes #2943

Update changelog for v.9.3.8 [skip CI]

Problème de validation sur le formulaire Échantillon (PS - Marché local) - Closes #2944

Update changelog for v.9.3.9 [skip CI]

[ui] fix Logger name

Labels à améliorer - Closes #2893

Update changelog for v.9.4.0-M1 [skip CI]

update pom

[jgitflow-maven-plugin]updating poms for 9.4.0-M1 branch with snapshot versions[skip ci]
[jgitflow-maven-plugin]updating poms for branch'release/9.4.0-M1' with non-snapshot versions[skip ci]
[jgitflow-maven-plugin]merging 'release/9.4.0-M1' 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.