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

[Git][ultreiaio/ird-observe][develop] Fix Amélioration sur les deux formulaires de l'utilisation des champs fpa (See #2740)
by Tony CHEMIT (＠tchemit) July 22, 2023

July 22, 2023

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: f714c30e by Tony Chemit at 2023-07-22T12:37:15+02:00 Fix Amélioration sur les deux formulaires de l'utilisation des champs fpa (See #2740) - - - - - 2 changed files: - client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/logbook/ActivityUIHandler.java - client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/observation/ActivityUIHandler.java Changes: ===================================== client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/logbook/ActivityUIHandler.java ===================================== @@ -66,12 +66,12 @@ class ActivityUIHandler extends GeneratedActivityUIHandler { bean.removePropertyChangeListener(ActivityDto.PROPERTY_ORIGINAL_DATA_MODIFIED, originalDataModifiedChanged); bean.removePropertyChangeListener(ActivityDto.PROPERTY_CHANGED_ZONE_OPERATION, fpaZoneChangedChanged); onOriginalDataModifiedChanged(bean.isOriginalDataModified()); + onFpaZoneChanged(bean.isChangedZoneOperation()); super.startEditUI(); bean.addPropertyChangeListener(ActivityDto.PROPERTY_ORIGINAL_DATA_MODIFIED, originalDataModifiedChanged); bean.addPropertyChangeListener(ActivityDto.PROPERTY_CHANGED_ZONE_OPERATION, fpaZoneChangedChanged); TripDto trip = getClientValidationContext().getCurrentPsCommonTrip(); getModel().getStates().setNumberEnabled(Objects.requireNonNull(trip.getActivitiesAcquisitionMode()).isByNumber()); - onFpaZoneChanged(bean.isChangedZoneOperation()); } @Override ===================================== client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/observation/ActivityUIHandler.java ===================================== @@ -65,9 +65,9 @@ public class ActivityUIHandler extends GeneratedActivityUIHandler { public void startEditUI() { ActivityDto bean = getModel().getStates().getBean(); bean.removePropertyChangeListener(ActivityDto.PROPERTY_CHANGED_ZONE_OPERATION, fpaZoneChangedChanged); + onFpaZoneChanged(bean.isChangedZoneOperation()); super.startEditUI(); bean.addPropertyChangeListener(ActivityDto.PROPERTY_CHANGED_ZONE_OPERATION, fpaZoneChangedChanged); - onFpaZoneChanged(bean.isChangedZoneOperation()); } void onFpaZoneChanged(boolean newValue) { View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/f714c30e25ce61d969ed269bf… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/f714c30e25ce61d969ed269bf… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] 12 commits: Mise à jour du modèle
by Tony CHEMIT (＠tchemit) July 22, 2023

July 22, 2023

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 715d1dcc by Tony Chemit at 2023-07-22T08:17:22+02:00 Mise à jour du modèle - - - - - 545a590d by Tony Chemit at 2023-07-22T08:49:04+02:00 Mise en commun des labels currentFpaZone, nextFpaZone et previousFpaZone - - - - - ea3b0a34 by Tony Chemit at 2023-07-22T08:49:04+02:00 Mise à jour de la validation - - - - - c5a5cc30 by Tony Chemit at 2023-07-22T08:49:04+02:00 Mise à jour du code java de persistance - - - - - 82babea6 by Tony Chemit at 2023-07-22T08:49:04+02:00 Mise à jour de la migration classique - - - - - a3049cbf by Tony Chemit at 2023-07-22T08:49:04+02:00 Mise à jour de la migration avdth - - - - - e05e96d9 by Tony Chemit at 2023-07-22T08:49:04+02:00 Mise à jour des ressources de persistance - - - - - c77f6656 by Tony Chemit at 2023-07-22T08:49:04+02:00 Mise à jour du la documentation de l'API publique (rattrapage sur le ticket #2449) - - - - - 77a628c8 by Tony Chemit at 2023-07-22T09:14:08+02:00 ajout dans le dto de la propagation de la propriété changedZoneOperation lors du changement de l'activité bateau - - - - - 0bba7777 by Tony Chemit at 2023-07-22T09:14:39+02:00 Ajout des nouveaux champs dans le formulaire - - - - - 55abb4b1 by Tony Chemit at 2023-07-22T09:14:47+02:00 Amélioration sur les deux formulaires de l'utilisation des champs fpa - - - - - 41240f48 by Tony Chemit at 2023-07-22T09:21:36+02:00 Merge branch 'feature/issue_2740' into develop En PS / logbook, ajouter 2 champs previousFpaZone et nextFpaZone - Closes - - - - - 30 changed files: - client/datasource/editor/ps/src/main/i18n/getters/jaxx.getter - client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/logbook/ActivityUI.jaxx - client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/logbook/ActivityUI.jcss - client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/logbook/ActivityUIHandler.java - client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/observation/ActivityUIHandler.java - core/api/dto-decoration/src/main/i18n/getters/labels.getter - core/api/dto-decoration/src/main/resources/META-INF/i18n/Observe-labels.properties - core/api/dto/src/main/java/fr/ird/observe/dto/ObserveI18nLabelsBuilder.java - core/api/dto/src/main/java/fr/ird/observe/dto/data/ps/PsActivityAware.java - core/api/dto/src/main/java/fr/ird/observe/dto/data/ps/logbook/ActivityDto.java - core/api/dto/src/main/java/fr/ird/observe/dto/data/ps/observation/ActivityDto.java - core/api/validation/src/main/filtered-resources/META-INF/validators/validation.json - core/api/validation/src/main/i18n/getters/eugene.getter - core/api/validation/src/main/resources/fr/ird/observe/dto/data/ps/logbook/ActivityDto-create-error-validation.xml - core/api/validation/src/main/resources/fr/ird/observe/dto/data/ps/logbook/ActivityDto-create-warning-validation.xml - core/api/validation/src/main/resources/fr/ird/observe/dto/data/ps/logbook/ActivityDto-update-error-validation.xml - core/api/validation/src/main/resources/fr/ird/observe/dto/data/ps/logbook/ActivityDto-update-warning-validation.xml - core/persistence/avdth/src/main/java/fr/ird/observe/persistence/avdth/data/logbook/ActivityReader.java - core/persistence/avdth/src/main/java/fr/ird/observe/persistence/avdth/data/logbook/ActivityWriter.java - core/persistence/java/src/main/java/fr/ird/observe/entities/data/ps/logbook/ActivitySpi.java - core/persistence/java/src/main/resources/META-INF/persistence/Observe/TopiaEntitySqlCopyPlanModel.json - core/persistence/java/src/main/resources/META-INF/persistence/Observe/TopiaEntitySqlModel.json - core/persistence/java/src/main/resources/META-INF/persistence/Observe/TopiaEntitySqlReplicatePlanModel.json - core/persistence/java/src/main/resources/META-INF/persistence/Observe/TopiaEntitySqlScriptModel.json - core/persistence/java/src/main/resources/META-INF/persistence/Observe/TopiaEntitySqlUsageModel.json - core/persistence/java/src/main/resources/fr/ird/observe/entities/data/ps/logbook/ActivityImpl.hbm.xml - core/persistence/migration/src/main/java/fr/ird/observe/spi/migration/v9/DataSourceMigrationForVersion_9_2.java - + core/persistence/migration/src/main/resources/db/migration/v9/9.2/04_issue-2740-H2.sql - + core/persistence/migration/src/main/resources/db/migration/v9/9.2/04_issue-2740-PG.sql - core/persistence/migration/src/main/resources/db/migration/v9/9.2/empty-schema-H2.sql The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/1649adaf627cfeb58dfb4d39… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/1649adaf627cfeb58dfb4d39… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] 5 commits: (PS) Ajout des nouveaux champs VesselActivity.allowFpaZoneChange et VesselActivity.allowSet
by Tony CHEMIT (＠tchemit) July 22, 2023

July 22, 2023

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 4580061f by Tony Chemit at 2023-07-21T15:59:55+02:00 (PS) Ajout des nouveaux champs VesselActivity.allowFpaZoneChange et VesselActivity.allowSet - - - - - 4f11b0c7 by Tony Chemit at 2023-07-22T07:45:19+02:00 (PS) Utilisation des nouveaux champs VesselActivity.allowFpaZoneChange et VesselActivity.allowSet et revue des formulaires Activity - - - - - 1e912c79 by Tony Chemit at 2023-07-22T07:45:19+02:00 (LL) Ajout du nouveau champs VesselActivity.allowSet - - - - - 2346e3e6 by Tony Chemit at 2023-07-22T07:45:19+02:00 (LL) Utilisation du nouveau champs VesselActivity.allowSet et revue des formulaires Activity - - - - - 1649adaf by Tony Chemit at 2023-07-22T07:46:32+02:00 Merge branch 'feature/issue_2449' into develop Nouveaux flags allowSet et fpaZoneMode sur les types d'activités bateau - Closes #2449 - - - - - 30 changed files: - client/datasource/editor/ll/src/main/i18n/getters/jaxx.getter - client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/logbook/ActivityUI.jaxx - client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/logbook/ActivityUI.jcss - client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/observation/ActivityUI.jaxx - client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/observation/ActivityUI.jcss - client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/referential/common/VesselActivityUI.jaxx - client/datasource/editor/ll/src/main/resources/fr/ird/observe/client/datasource/editor/ll/referential/common/VesselActivityUINavigationNode.scope - client/datasource/editor/ps/src/main/i18n/getters/java.getter - client/datasource/editor/ps/src/main/i18n/getters/jaxx.getter - client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/logbook/ActivityUI.jaxx - client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/logbook/ActivityUI.jcss - client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/logbook/ActivityUIHandler.java - client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/observation/ActivityUI.jaxx - client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/observation/ActivityUI.jcss - client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/observation/ActivityUIHandler.java - client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/referential/common/VesselActivityUI.jaxx - client/datasource/editor/ps/src/main/resources/fr/ird/observe/client/datasource/editor/ps/referential/common/VesselActivityUINavigationNode.scope - core/api/dto-decoration/src/main/i18n/getters/java.getter - core/api/dto-decoration/src/main/i18n/getters/labels.getter - core/api/dto/src/main/java/fr/ird/observe/dto/referential/ll/common/VesselActivityReference.java → core/api/dto-decoration/src/main/java/fr/ird/observe/dto/referential/ll/common/VesselActivityDtoLongDecoratorDefinition.java - + core/api/dto-decoration/src/main/java/fr/ird/observe/dto/referential/ll/common/VesselActivityReferenceLongDecoratorDefinition.java - + core/api/dto-decoration/src/main/java/fr/ird/observe/dto/referential/ps/common/VesselActivityDtoLongDecoratorDefinition.java - + core/api/dto-decoration/src/main/java/fr/ird/observe/dto/referential/ps/common/VesselActivityReferenceLongDecoratorDefinition.java - core/api/dto-decoration/src/main/resources/META-INF/i18n/Observe-labels.properties - core/api/dto/src/main/java/fr/ird/observe/dto/ObserveI18nLabelsBuilder.java - core/api/dto/src/main/java/fr/ird/observe/dto/ProtectedIdsLl.java - core/api/dto/src/main/java/fr/ird/observe/dto/ProtectedIdsPs.java - core/api/dto/src/main/java/fr/ird/observe/dto/data/ll/LlActivityAware.java - core/api/dto/src/main/java/fr/ird/observe/dto/data/ps/PsActivityAware.java - core/api/dto/src/main/java/fr/ird/observe/dto/referential/ps/common/VesselActivityReference.java The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/af7f4bd002a7e19792176b54… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/af7f4bd002a7e19792176b54… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] Introduce method ObserveDefaultDecoratorRenderer.booleanValue
by Tony CHEMIT (＠tchemit) July 21, 2023

July 21, 2023

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: af7f4bd0 by Tony Chemit at 2023-07-21T15:59:45+02:00 Introduce method ObserveDefaultDecoratorRenderer.booleanValue - - - - - 1 changed file: - core/api/dto-decoration/src/main/java/fr/ird/observe/dto/decoration/ObserveDefaultDecoratorRenderer.java Changes: ===================================== core/api/dto-decoration/src/main/java/fr/ird/observe/dto/decoration/ObserveDefaultDecoratorRenderer.java ===================================== @@ -54,6 +54,9 @@ public interface ObserveDefaultDecoratorRenderer { return fieldEnabler ? I18n.l(locale, "observe.referential.ps.common.AcquisitionStatus.fieldEnabled") : I18n.l(locale, "observe.referential.ps.common.AcquisitionStatus.fieldDisabled"); } + default String booleanValue(Locale locale, boolean booleanValue) { + return booleanValue ? I18n.l(locale, "boolean.true") : I18n.l(locale, "boolean.false"); + } default String speciesFateDiscard(Locale locale, Boolean discard) { String value; View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/af7f4bd002a7e19792176b54e… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/af7f4bd002a7e19792176b54e… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] 6 commits: Ajout du champs Trip.activitiesAcquisitionMode
by Tony CHEMIT (＠tchemit) July 21, 2023

July 21, 2023

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 12735f90 by Tony Chemit at 2023-07-21T10:58:39+02:00 Ajout du champs Trip.activitiesAcquisitionMode - - - - - 644ea7de by Tony Chemit at 2023-07-21T10:58:39+02:00 Migration classique - - - - - a030ca2d by Tony Chemit at 2023-07-21T10:58:39+02:00 Migration avdth - - - - - 71b894e1 by Tony Chemit at 2023-07-21T10:58:39+02:00 Mise en place du champs sur le formulaire marée Ajout de la valeur par défaut lors de la création d'une nouvelle marée au niveau du service - - - - - e76fb6f7 by Tony Chemit at 2023-07-21T10:58:51+02:00 Mise en place du formulaire activité et modification de la sauvegarde au niveau du service pour réordonner si nécessaire le Activity.number - - - - - e41483a3 by Tony Chemit at 2023-07-21T10:59:41+02:00 Merge branch 'feature/issue_2729' into develop En PS / logbook / Activité, voir comment mieux gérer l'ajout d'une activité dont l'horaire précéde celui de la dernière activité saisie (souci lié au numéro d'activité auto incrémenté) - Closes #2729 - - - - - 30 changed files: - client/datasource/editor/ps/src/main/i18n/getters/jaxx.getter - client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/common/TripUI.jaxx - core/api/dto/src/main/java/fr/ird/observe/dto/data/ps/logbook/TimeAndNumberAware.java → client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/common/TripUIHandler.java - client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/logbook/ActivityUI.jcss - client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/logbook/ActivityUIHandler.java - client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/logbook/ActivityUIModelStates.java - core/api/dto-decoration/src/main/i18n/getters/labels.getter - core/api/dto-validation/src/main/i18n/getters/java.getter - − core/api/dto-validation/src/main/java/fr/ird/observe/dto/validation/validators/data/ps/logbook/ActivityCheckTime.java - core/api/dto-validation/src/main/resources/validators.xml - core/api/dto/src/main/i18n/getters/java-enumeration.getter - core/api/dto-validation/src/main/java/fr/ird/observe/dto/validation/validators/data/ps/logbook/RouteCheckActivityTime.java → core/api/dto/src/main/java/fr/ird/observe/dto/data/ps/ActivitiesAcquisitionMode.java - core/api/dto/src/main/java/fr/ird/observe/dto/data/ps/logbook/ActivityDto.java - core/api/dto/src/main/java/fr/ird/observe/dto/data/ps/logbook/ActivityStubDto.java - core/api/dto/src/main/java/fr/ird/observe/dto/data/ps/logbook/RouteDto.java - core/api/services/src/main/java/fr/ird/observe/services/service/data/ps/common/TripService.java - core/api/validation/src/main/filtered-resources/META-INF/validators/validation.json - core/api/validation/src/main/i18n/getters/eugene.getter - core/api/validation/src/main/i18n/getters/validation-messages.getter - core/api/validation/src/main/resources/fr/ird/observe/dto/data/ps/common/TripDto-create-error-validation.xml - core/api/validation/src/main/resources/fr/ird/observe/dto/data/ps/common/TripDto-update-error-validation.xml - core/api/validation/src/main/resources/fr/ird/observe/dto/data/ps/logbook/ActivityDto-create-error-validation.xml - core/api/validation/src/main/resources/fr/ird/observe/dto/data/ps/logbook/ActivityDto-update-error-validation.xml - core/api/validation/src/main/resources/fr/ird/observe/dto/data/ps/logbook/RouteDto-update-error-validation.xml - core/api/validation/src/main/validation/fr/ird/observe/dto/data/ps/common/TripDto-update-error-validation.xml - core/api/validation/src/main/validation/fr/ird/observe/dto/data/ps/logbook/ActivityDto-create-error-validation.xml - core/api/validation/src/main/validation/fr/ird/observe/dto/data/ps/logbook/ActivityDto-update-error-validation.xml - core/api/validation/src/main/validation/fr/ird/observe/dto/data/ps/logbook/RouteDto-update-error-validation.xml - core/persistence/avdth/pom.xml - core/persistence/avdth/src/main/java/fr/ird/observe/persistence/avdth/data/ImportDataContext.java The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/47a6d41546a0cf875494b612… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/47a6d41546a0cf875494b612… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] On ps_logbook.Activity there is no set, so no action add set :)
by Tony CHEMIT (＠tchemit) July 21, 2023

July 21, 2023

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 47a6d415 by Tony Chemit at 2023-07-21T10:58:00+02:00 On ps_logbook.Activity there is no set, so no action add set :) - - - - - 2 changed files: - client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/logbook/ActivityUI.jaxx - client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/logbook/ActivityUIHandler.java Changes: ===================================== client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/logbook/ActivityUI.jaxx ===================================== @@ -293,6 +293,5 @@ </JTabbedPane> </JPanel> - <JMenuItem id='addSet'/> <JMenuItem id='addFloatingObject'/> </fr.ird.observe.client.datasource.editor.api.content.data.open.ContentOpenableUI> ===================================== client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/logbook/ActivityUIHandler.java ===================================== @@ -76,7 +76,7 @@ class ActivityUIHandler extends GeneratedActivityUIHandler { SaveAction.create(ui, ActivityDto.class) .on(ui.getModel()::toSaveRequest) .call((r, d) -> getOpenableService().save(r.getParentId(), d)) - .then(new SaveContentOpenableUIAdapter<>(ActivityDto::isSetEnabled, ActivityUI::getAddSet) { + .then(new SaveContentOpenableUIAdapter<>(d -> false, ui -> null) { @Override protected void afterNodeUpdated(DataSourceEditor dataSourceEditor, ActivityUI ui, NavigationTree tree, ContentOpenableUINavigationNode node, boolean notPersisted, ActivityDto bean) { View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/47a6d41546a0cf875494b612a… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/47a6d41546a0cf875494b612a… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] 2 commits: Revue du code de sauvegarde d'un openDto au niveau du service pour pouvoir...
by Tony CHEMIT (＠tchemit) July 20, 2023

July 20, 2023

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: d8ca5361 by Tony Chemit at 2023-07-19T12:12:40+02:00 Revue du code de sauvegarde d'un openDto au niveau du service pour pouvoir interagir avec l'objet responsable de la finalisation de la sauvegarde (on supprime la méthode flottante saveCallback qui ne permet de conserver certains états dont nous allons avoir besoin dans la suite des développements). - - - - - 8cddc462 by Tony Chemit at 2023-07-20T09:29:51+02:00 Fix ValidationDefinitionTemplate which always store for update scope, the create scope... - - - - - 27 changed files: - core/persistence/java/src/main/java/fr/ird/observe/entities/data/ll/landing/LandingSpi.java - core/persistence/java/src/main/java/fr/ird/observe/entities/data/ll/logbook/ActivitySpi.java - core/persistence/java/src/main/java/fr/ird/observe/entities/data/ll/logbook/SampleSpi.java - core/persistence/java/src/main/java/fr/ird/observe/entities/data/ll/observation/ActivitySpi.java - core/persistence/java/src/main/java/fr/ird/observe/entities/data/ps/localmarket/SurveySpi.java - core/persistence/java/src/main/java/fr/ird/observe/entities/data/ps/logbook/ActivitySpi.java - core/persistence/java/src/main/java/fr/ird/observe/entities/data/ps/logbook/RouteSpi.java - core/persistence/java/src/main/java/fr/ird/observe/entities/data/ps/logbook/SampleSpi.java - core/persistence/java/src/main/java/fr/ird/observe/entities/data/ps/logbook/WellSpi.java - core/persistence/java/src/main/java/fr/ird/observe/entities/data/ps/observation/ActivitySpi.java - core/persistence/java/src/main/java/fr/ird/observe/entities/data/ps/observation/RouteSpi.java - core/persistence/resources/src/main/resources/fr/ird/observe/entities/data/ll/common/Trip/validation-update.json - core/persistence/resources/src/main/resources/fr/ird/observe/entities/data/ll/landing/LandingPart/validation-update.json - core/persistence/resources/src/main/resources/fr/ird/observe/entities/data/ps/logbook/Activity/validation-update.json - core/persistence/resources/src/main/resources/fr/ird/observe/entities/data/ps/logbook/Route/validation-update.json - core/persistence/resources/src/main/resources/fr/ird/observe/entities/data/ps/observation/Activity/validation-update.json - core/persistence/resources/src/main/resources/fr/ird/observe/entities/data/ps/observation/Catch/validation-update.json - core/persistence/resources/src/main/resources/fr/ird/observe/entities/data/ps/observation/Route/validation-update.json - server/runner/src/main/webResources/doc/api/public/data/ll/common/Trip/validation-update.json - server/runner/src/main/webResources/doc/api/public/data/ll/landing/LandingPart/validation-update.json - server/runner/src/main/webResources/doc/api/public/data/ps/logbook/Activity/validation-update.json - server/runner/src/main/webResources/doc/api/public/data/ps/logbook/Route/validation-update.json - server/runner/src/main/webResources/doc/api/public/data/ps/observation/Activity/validation-update.json - server/runner/src/main/webResources/doc/api/public/data/ps/observation/Catch/validation-update.json - server/runner/src/main/webResources/doc/api/public/data/ps/observation/Route/validation-update.json - toolkit/persistence/src/main/java/fr/ird/observe/spi/context/OpenableDtoEntityContext.java - toolkit/plugin/src/main/java/fr/ird/observe/toolkit/maven/plugin/server/definition/ValidationDefinitionTemplate.java Changes: ===================================== core/persistence/java/src/main/java/fr/ird/observe/entities/data/ll/landing/LandingSpi.java ===================================== @@ -26,8 +26,11 @@ import fr.ird.observe.dto.data.ll.landing.LandingDto; import fr.ird.observe.dto.form.Form; import fr.ird.observe.entities.data.ll.common.Trip; import fr.ird.observe.services.service.SaveResultDto; +import fr.ird.observe.spi.result.AddEntityToUpdateStep; import fr.ird.observe.spi.service.ServiceContext; +import java.util.function.Consumer; + /** * Created on 10/05/2021. * @@ -43,8 +46,8 @@ public class LandingSpi extends GeneratedLandingSpi { } @Override - protected SaveResultDto saveEntity(ServiceContext context, Trip parent, Landing entity) { + protected SaveResultDto saveEntity(ServiceContext context, Trip parent, Landing entity, Consumer<AddEntityToUpdateStep> extraConsumer) { LandingPart.SPI.initId(context, entity.getLandingPart()); - return super.saveEntity(context, parent, entity); + return super.saveEntity(context, parent, entity, extraConsumer); } } ===================================== core/persistence/java/src/main/java/fr/ird/observe/entities/data/ll/logbook/ActivitySpi.java ===================================== @@ -34,6 +34,7 @@ import fr.ird.observe.dto.referential.ReferentialLocale; import fr.ird.observe.entities.data.ll.common.Trip; import fr.ird.observe.entities.referential.common.DataQuality; import fr.ird.observe.entities.referential.common.Species; +import fr.ird.observe.spi.result.AddEntityToUpdateStep; import fr.ird.observe.spi.service.ServiceContext; import io.ultreia.java4all.util.Dates; import org.apache.logging.log4j.LogManager; @@ -41,6 +42,7 @@ import org.apache.logging.log4j.Logger; import java.util.Calendar; import java.util.Date; +import java.util.function.Consumer; import java.util.stream.Collectors; /** @@ -104,11 +106,11 @@ public class ActivitySpi extends GeneratedActivitySpi { // } @Override - public void onSave(ServiceContext context, Trip parent, Activity entity, ActivityDto dto, boolean needCopy) { + public Consumer<AddEntityToUpdateStep> onSave(ServiceContext context, Trip parent, Activity entity, ActivityDto dto, boolean needCopy) { if (!dto.isSetEnabled() && entity.getSet() != null) { log.info(String.format("Remove set: %s", entity.getSet().getTopiaId())); entity.setSet(null); } - super.onSave(context, parent, entity, dto, needCopy); + return super.onSave(context, parent, entity, dto, needCopy); } } ===================================== core/persistence/java/src/main/java/fr/ird/observe/entities/data/ll/logbook/SampleSpi.java ===================================== @@ -27,10 +27,12 @@ import fr.ird.observe.dto.data.ll.logbook.SampleDto; import fr.ird.observe.dto.form.Form; import fr.ird.observe.entities.data.ll.common.Trip; import fr.ird.observe.services.service.SaveResultDto; +import fr.ird.observe.spi.result.AddEntityToUpdateStep; import fr.ird.observe.spi.service.ServiceContext; import java.util.Calendar; import java.util.Date; +import java.util.function.Consumer; /** * Created on 10/05/2021. @@ -57,8 +59,8 @@ public class SampleSpi extends GeneratedSampleSpi { } @Override - protected SaveResultDto saveEntity(ServiceContext context, Trip parent, Sample entity) { + protected SaveResultDto saveEntity(ServiceContext context, Trip parent, Sample entity, Consumer<AddEntityToUpdateStep> extraConsumer) { SamplePart.SPI.initId(context, entity.getSamplePart()); - return super.saveEntity(context, parent, entity); + return super.saveEntity(context, parent, entity, extraConsumer); } } ===================================== core/persistence/java/src/main/java/fr/ird/observe/entities/data/ll/observation/ActivitySpi.java ===================================== @@ -29,12 +29,14 @@ import fr.ird.observe.dto.data.ll.observation.ActivityReference; import fr.ird.observe.dto.form.Form; import fr.ird.observe.dto.referential.ReferentialLocale; import fr.ird.observe.entities.data.ll.common.Trip; +import fr.ird.observe.spi.result.AddEntityToUpdateStep; import fr.ird.observe.spi.service.ServiceContext; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import java.util.Calendar; import java.util.Date; +import java.util.function.Consumer; /** * Created on 10/05/2021. @@ -78,12 +80,12 @@ public class ActivitySpi extends GeneratedActivitySpi { // } @Override - public void onSave(ServiceContext context, Trip parent, Activity entity, ActivityDto dto, boolean needCopy) { + public Consumer<AddEntityToUpdateStep> onSave(ServiceContext context, Trip parent, Activity entity, ActivityDto dto, boolean needCopy) { if (!dto.isSetEnabled() && entity.getSet() != null) { log.info(String.format("Remove set: %s", entity.getSet().getTopiaId())); entity.setSet(null); } - super.onSave(context, parent, entity, dto, needCopy); + return super.onSave(context, parent, entity, dto, needCopy); } } ===================================== core/persistence/java/src/main/java/fr/ird/observe/entities/data/ps/localmarket/SurveySpi.java ===================================== @@ -35,6 +35,7 @@ import java.util.Collection; import java.util.LinkedList; import java.util.Objects; import java.util.Set; +import java.util.function.Consumer; import java.util.stream.Collectors; /** @@ -61,7 +62,7 @@ public class SurveySpi extends GeneratedSurveySpi { } @Override - public void onSave(ServiceContext context, Trip parent, Survey entity, SurveyDto dto, boolean needCopy) { + public Consumer<AddEntityToUpdateStep> onSave(ServiceContext context, Trip parent, Survey entity, SurveyDto dto, boolean needCopy) { // Get all batch ids associated to this survey Set<String> newBatchIds = dto.getBatches().stream().map(BatchReference::getId).collect(Collectors.toSet()); @@ -70,8 +71,8 @@ public class SurveySpi extends GeneratedSurveySpi { // Remove from batches survey if equals to this one String surveyId = dto.getId(); localmarketBatches.stream() - .filter(b -> b.getSurvey() != null && surveyId.equals(b.getSurvey().getTopiaId())) - .forEach(b -> b.setSurvey(null)); + .filter(b -> b.getSurvey() != null && surveyId.equals(b.getSurvey().getTopiaId())) + .forEach(b -> b.setSurvey(null)); } if (needCopy) { fromDto(context, entity, dto); @@ -79,18 +80,19 @@ public class SurveySpi extends GeneratedSurveySpi { // Set new association on batches associated to this survey localmarketBatches.stream().filter(b -> newBatchIds.contains(b.getTopiaId())).forEach(b -> b.setSurvey(entity)); super.onSave(context, parent, entity, dto, false); + return s -> s.updateCollection(SurveyPart.SPI, entity.getSurveyPart()); } -// + // @Override // public void moveCallback(Trip oldParent, Trip newParent, List<Survey> moved) { // //FIXME Copy missing meta-data to new parent? // } - - @Override - public void saveCallback(AddEntityToUpdateStep saveHelper, Survey entity) { - saveHelper.updateCollection(SurveyPart.SPI, entity.getSurveyPart()); - } +// +// @Override +// public void saveCallback(AddEntityToUpdateStep saveHelper, Survey entity) { +// saveHelper.updateCollection(SurveyPart.SPI, entity.getSurveyPart()); +// } public void fillFormObject(ReferentialLocale referentialLocale, Trip trip, Survey survey, Form<SurveyDto> form) { Collection<Batch> availableBatches = new LinkedList<>(); ===================================== core/persistence/java/src/main/java/fr/ird/observe/entities/data/ps/logbook/ActivitySpi.java ===================================== @@ -30,6 +30,7 @@ import fr.ird.observe.dto.form.Form; import fr.ird.observe.dto.referential.ReferentialLocale; import fr.ird.observe.entities.referential.common.FpaZone; import fr.ird.observe.entities.referential.ps.logbook.InformationSource; +import fr.ird.observe.spi.result.AddEntityToUpdateStep; import fr.ird.observe.spi.service.ServiceContext; import io.ultreia.java4all.util.Dates; import org.apache.logging.log4j.LogManager; @@ -37,6 +38,7 @@ import org.apache.logging.log4j.Logger; import java.util.Date; import java.util.function.BiConsumer; +import java.util.function.Consumer; /** * Created on 10/05/2021. @@ -103,7 +105,7 @@ public class ActivitySpi extends GeneratedActivitySpi { } @Override - public void onSave(ServiceContext context, Route parent, Activity entity, ActivityDto dto, boolean needCopy) { + public Consumer<AddEntityToUpdateStep> onSave(ServiceContext context, Route parent, Activity entity, ActivityDto dto, boolean needCopy) { if (!dto.isCatchesEnabled() && entity.isCatchesNotEmpty()) { log.info(String.format("Remove %d catch(es).", entity.getCatchesSize())); entity.clearCatches(); @@ -114,7 +116,7 @@ public class ActivitySpi extends GeneratedActivitySpi { } entity.clearFloatingObject(); } - super.onSave(context, parent, entity, dto, needCopy); + return null; } @Override ===================================== core/persistence/java/src/main/java/fr/ird/observe/entities/data/ps/logbook/RouteSpi.java ===================================== @@ -29,12 +29,14 @@ import fr.ird.observe.dto.form.Form; import fr.ird.observe.entities.data.ps.common.Trip; import fr.ird.observe.entities.data.ps.common.TripSpi; import fr.ird.observe.services.service.SaveResultDto; +import fr.ird.observe.spi.result.AddEntityToUpdateStep; import fr.ird.observe.spi.service.ServiceContext; import io.ultreia.java4all.util.Dates; import org.apache.commons.lang3.time.DateUtils; import java.util.Date; import java.util.Set; +import java.util.function.Consumer; import java.util.stream.Collectors; /** @@ -59,14 +61,14 @@ public class RouteSpi extends GeneratedRouteSpi { } @Override - protected SaveResultDto saveEntity(ServiceContext context, Trip parent, Route entity) { + protected SaveResultDto saveEntity(ServiceContext context, Trip parent, Route entity, Consumer<AddEntityToUpdateStep> extraConsumer) { if (TripSpi.updateEndDate(parent)) { return newSaveHelper(context) .update(Trip.SPI, parent) .update(this, entity) .build(entity); } - return super.saveEntity(context, parent, entity); + return super.saveEntity(context, parent, entity, extraConsumer); } @Override ===================================== core/persistence/java/src/main/java/fr/ird/observe/entities/data/ps/logbook/SampleSpi.java ===================================== @@ -30,9 +30,11 @@ import fr.ird.observe.entities.data.ps.common.Trip; import fr.ird.observe.entities.referential.ps.common.SampleType; import fr.ird.observe.entities.referential.ps.logbook.SampleQuality; import fr.ird.observe.services.service.SaveResultDto; +import fr.ird.observe.spi.result.AddEntityToUpdateStep; import fr.ird.observe.spi.service.ServiceContext; import java.util.Objects; +import java.util.function.Consumer; /** * Created on 10/05/2021. @@ -70,7 +72,7 @@ public class SampleSpi extends GeneratedSampleSpi { } @Override - public void onSave(ServiceContext context, Trip parent, Sample entity, SampleDto dto, boolean needCopy) { + public Consumer<AddEntityToUpdateStep> onSave(ServiceContext context, Trip parent, Sample entity, SampleDto dto, boolean needCopy) { boolean superSampleChanged = !Objects.equals(entity.isSuperSample(), dto.isSuperSample()); if (superSampleChanged && entity.isSampleSpeciesNotEmpty()) { // superSample changed (adapt) @@ -87,7 +89,7 @@ public class SampleSpi extends GeneratedSampleSpi { entity.getSampleSpecies().forEach(sampleSpecies -> sampleSpecies.setSubSampleNumber(0)); } } - super.onSave(context, parent, entity, dto, needCopy); + return super.onSave(context, parent, entity, dto, needCopy); } private int getSampleSpeciesSubNumber(Sample entity) { @@ -95,9 +97,9 @@ public class SampleSpi extends GeneratedSampleSpi { } @Override - protected SaveResultDto saveEntity(ServiceContext context, Trip parent, Sample entity) { + protected SaveResultDto saveEntity(ServiceContext context, Trip parent, Sample entity, Consumer<AddEntityToUpdateStep> extraConsumer) { SampleActivity.SPI.initId(context, entity.getSampleActivity()); - return super.saveEntity(context, parent, entity); + return super.saveEntity(context, parent, entity, extraConsumer); } //FIXME Add a callback in MoveRequest ===================================== core/persistence/java/src/main/java/fr/ird/observe/entities/data/ps/logbook/WellSpi.java ===================================== @@ -22,30 +22,43 @@ package fr.ird.observe.entities.data.ps.logbook; * #L% */ +import fr.ird.observe.dto.data.ps.logbook.WellDto; import fr.ird.observe.entities.data.ps.common.Trip; import fr.ird.observe.services.service.SaveResultDto; import fr.ird.observe.spi.result.AddEntityToUpdateStep; import fr.ird.observe.spi.service.ServiceContext; import java.util.Set; +import java.util.function.Consumer; public class WellSpi extends GeneratedWellSpi { +// @Override +// public void saveCallback(AddEntityToUpdateStep saveHelper, Well entity) { +// Set<WellActivity> wellActivity = entity.getWellActivity(); +// saveHelper.updateCollection(WellActivity.SPI, wellActivity); +// wellActivity.forEach(c -> saveHelper.updateCollection(WellActivitySpecies.SPI, c.getWellActivitySpecies(), false)); +// saveHelper.updateLastUpdateDateTable(WellActivitySpecies.SPI); +// } + @Override - public void saveCallback(AddEntityToUpdateStep saveHelper, Well entity) { - Set<WellActivity> wellActivity = entity.getWellActivity(); - saveHelper.updateCollection(WellActivity.SPI, wellActivity); - wellActivity.forEach(c -> saveHelper.updateCollection(WellActivitySpecies.SPI, c.getWellActivitySpecies(), false)); - saveHelper.updateLastUpdateDateTable(WellActivitySpecies.SPI); + public Consumer<AddEntityToUpdateStep> onSave(ServiceContext context, Trip parent, Well entity, WellDto dto, boolean needCopy) { + super.onSave(context, parent, entity, dto, needCopy); + return s -> { + Set<WellActivity> wellActivity = entity.getWellActivity(); + s.updateCollection(WellActivity.SPI, wellActivity); + wellActivity.forEach(c -> s.updateCollection(WellActivitySpecies.SPI, c.getWellActivitySpecies(), false)); + s.updateLastUpdateDateTable(WellActivitySpecies.SPI); + }; } @Override - protected SaveResultDto saveEntity(ServiceContext context, Trip parent, Well entity) { + protected SaveResultDto saveEntity(ServiceContext context, Trip parent, Well entity, Consumer<AddEntityToUpdateStep> extraConsumer) { Set<WellActivity> wellActivity = entity.getWellActivity(); if (wellActivity != null) { WellActivity.SPI.initId(context, wellActivity); wellActivity.forEach(activity -> WellActivitySpecies.SPI.initId(context, activity.getWellActivitySpecies())); } - return super.saveEntity(context, parent, entity); + return super.saveEntity(context, parent, entity, extraConsumer); } } //WellSpi ===================================== core/persistence/java/src/main/java/fr/ird/observe/entities/data/ps/observation/ActivitySpi.java ===================================== @@ -31,6 +31,7 @@ import fr.ird.observe.dto.referential.ReferentialLocale; import fr.ird.observe.dto.referential.common.SpeciesReference; import fr.ird.observe.entities.referential.common.FpaZone; import fr.ird.observe.entities.referential.common.Species; +import fr.ird.observe.spi.result.AddEntityToUpdateStep; import fr.ird.observe.spi.service.ServiceContext; import io.ultreia.java4all.util.Dates; import org.apache.logging.log4j.LogManager; @@ -39,6 +40,7 @@ import org.apache.logging.log4j.Logger; import java.util.Date; import java.util.LinkedHashSet; import java.util.function.BiConsumer; +import java.util.function.Consumer; import java.util.stream.Stream; /** @@ -97,7 +99,7 @@ public class ActivitySpi extends GeneratedActivitySpi { } @Override - public void onSave(ServiceContext context, Route parent, Activity entity, ActivityDto dto, boolean needCopy) { + public Consumer<AddEntityToUpdateStep> onSave(ServiceContext context, Route parent, Activity entity, ActivityDto dto, boolean needCopy) { if (!dto.isSetEnabled() && entity.getSet() != null) { log.info(String.format("Remove set: %s", entity.getSet().getTopiaId())); entity.setSet(null); @@ -108,7 +110,7 @@ public class ActivitySpi extends GeneratedActivitySpi { } entity.clearFloatingObject(); } - super.onSave(context, parent, entity, dto, needCopy); + return super.onSave(context, parent, entity, dto, needCopy); } @Override ===================================== core/persistence/java/src/main/java/fr/ird/observe/entities/data/ps/observation/RouteSpi.java ===================================== @@ -30,6 +30,7 @@ import fr.ird.observe.dto.form.Form; import fr.ird.observe.entities.data.ps.common.Trip; import fr.ird.observe.entities.data.ps.common.TripSpi; import fr.ird.observe.services.service.SaveResultDto; +import fr.ird.observe.spi.result.AddEntityToUpdateStep; import fr.ird.observe.spi.service.ServiceContext; import io.ultreia.java4all.util.Dates; import org.apache.commons.lang3.time.DateUtils; @@ -39,6 +40,7 @@ import java.util.Date; import java.util.LinkedHashSet; import java.util.Objects; import java.util.Set; +import java.util.function.Consumer; import java.util.stream.Collectors; /** @@ -72,7 +74,7 @@ public class RouteSpi extends GeneratedRouteSpi { } @Override - public void onSave(ServiceContext context, Trip parent, Route entity, RouteDto dto, boolean needCopy) { + public Consumer<AddEntityToUpdateStep> onSave(ServiceContext context, Trip parent, Route entity, RouteDto dto, boolean needCopy) { boolean dateHasChanged = false; if (dto.isPersisted()) { @@ -85,18 +87,18 @@ public class RouteSpi extends GeneratedRouteSpi { if (dateHasChanged) { getDao(context).updateActivitiesDate(entity.getTopiaId(), new java.sql.Date(dto.getDate().getTime())); } - super.onSave(context, parent, entity, dto, needCopy); + return super.onSave(context, parent, entity, dto, needCopy); } @Override - protected SaveResultDto saveEntity(ServiceContext context, Trip parent, Route entity) { + protected SaveResultDto saveEntity(ServiceContext context, Trip parent, Route entity, Consumer<AddEntityToUpdateStep> extraConsumer) { if (TripSpi.updateEndDate(parent)) { return newSaveHelper(context) .update(Trip.SPI, parent) .update(this, entity) .build(entity); } - return super.saveEntity(context, parent, entity); + return super.saveEntity(context, parent, entity, extraConsumer); } @Override ===================================== core/persistence/resources/src/main/resources/fr/ird/observe/entities/data/ll/common/Trip/validation-update.json ===================================== @@ -25,6 +25,7 @@ "endDate": { "errors": [ "endDate <= now", + "endDate > any activity date", "endDate >= startDate", "endDate is mandatory" ] @@ -184,6 +185,7 @@ }, "startDate": { "errors": [ + "startDate < any activity date", "startDate <= now", "startDate is mandatory" ] ===================================== core/persistence/resources/src/main/resources/fr/ird/observe/entities/data/ll/landing/LandingPart/validation-update.json ===================================== @@ -1,4 +1,9 @@ { + "categoryMax": { + "errors": [ + "if filled, categoryMax > categoryMin" + ] + }, "conservation": { "errors": [ "check if referential conservation is disabled (only if validation is strong)" ===================================== core/persistence/resources/src/main/resources/fr/ird/observe/entities/data/ps/logbook/Activity/validation-update.json ===================================== @@ -29,6 +29,11 @@ "check if referential dataQuality is disabled (only if validation is not strong)" ] }, + "floatingObjectEmpty": { + "warnings": [ + "No DCP" + ] + }, "fpaZone": { "errors": [ "check if referential fpaZone is disabled (only if validation is strong)" ===================================== core/persistence/resources/src/main/resources/fr/ird/observe/entities/data/ps/logbook/Route/validation-update.json ===================================== @@ -1,4 +1,10 @@ { + "activity": { + "errors": [ + "activities quadrant check", + "activities time check" + ] + }, "comment": { "errors": [ "comment (if not null) is not a blank string", ===================================== core/persistence/resources/src/main/resources/fr/ird/observe/entities/data/ps/observation/Activity/validation-update.json ===================================== @@ -35,6 +35,11 @@ "ersId (if not null) is not a blank string" ] }, + "floatingObjectEmpty": { + "warnings": [ + "No DCP" + ] + }, "homeId": { "errors": [ "homeId (if not null) is not a blank string" @@ -44,18 +49,12 @@ "errors": [ "check latitude format", "latitude is mandatory" - ], - "warnings": [ - "check speed" ] }, "longitude": { "errors": [ "check longitude format", "longitude is mandatory" - ], - "warnings": [ - "check speed" ] }, "nextFpaZone": { @@ -138,13 +137,12 @@ "unique activity time on route" ], "warnings": [ - "check speed" + "Check speed" ] }, "vesselActivity": { "errors": [ "check if referential vesselActivity is disabled (only if validation is strong)", - "if end of search activity possible?", "vesselActivity is mandatory" ], "warnings": [ ===================================== core/persistence/resources/src/main/resources/fr/ird/observe/entities/data/ps/observation/Catch/validation-update.json ===================================== @@ -77,6 +77,7 @@ "species": { "errors": [ "check if referential species is disabled (only if validation is strong)", + "check missing observed system", "species is mandatory" ], "warnings": [ ===================================== core/persistence/resources/src/main/resources/fr/ird/observe/entities/data/ps/observation/Route/validation-update.json ===================================== @@ -1,4 +1,15 @@ { + "activity": { + "errors": [ + "activities quadrant check", + "activities speed check", + "activities time check" + ], + "warnings": [ + "activities speed check", + "end of search activity required" + ] + }, "comment": { "errors": [ "comment (if not null) is not a blank string", @@ -18,6 +29,10 @@ "endLogValue": { "errors": [ "endLogValue is a positive number" + ], + "warnings": [ + "loch matin < endLogValue ou l'un des deux lochs non renseigne", + "| endLogValue - loch Matin | < maxGap ou l'un des deux lochs non renseigne" ] }, "homeId": { @@ -30,7 +45,7 @@ "startLogValue is a positive number" ], "warnings": [ - "check loch matin ( supérieur a tout loch soir d'une route plus ancienne)" + "check loch matin ( superieur a tout loch soir d'une route plus ancienne)" ] } } \ No newline at end of file ===================================== server/runner/src/main/webResources/doc/api/public/data/ll/common/Trip/validation-update.json ===================================== @@ -25,6 +25,7 @@ "endDate": { "errors": [ "endDate <= now", + "endDate > any activity date", "endDate >= startDate", "endDate is mandatory" ] @@ -184,6 +185,7 @@ }, "startDate": { "errors": [ + "startDate < any activity date", "startDate <= now", "startDate is mandatory" ] ===================================== server/runner/src/main/webResources/doc/api/public/data/ll/landing/LandingPart/validation-update.json ===================================== @@ -1,4 +1,9 @@ { + "categoryMax": { + "errors": [ + "if filled, categoryMax > categoryMin" + ] + }, "conservation": { "errors": [ "check if referential conservation is disabled (only if validation is strong)" ===================================== server/runner/src/main/webResources/doc/api/public/data/ps/logbook/Activity/validation-update.json ===================================== @@ -29,6 +29,11 @@ "check if referential dataQuality is disabled (only if validation is not strong)" ] }, + "floatingObjectEmpty": { + "warnings": [ + "No DCP" + ] + }, "fpaZone": { "errors": [ "check if referential fpaZone is disabled (only if validation is strong)" ===================================== server/runner/src/main/webResources/doc/api/public/data/ps/logbook/Route/validation-update.json ===================================== @@ -1,4 +1,10 @@ { + "activity": { + "errors": [ + "activities quadrant check", + "activities time check" + ] + }, "comment": { "errors": [ "comment (if not null) is not a blank string", ===================================== server/runner/src/main/webResources/doc/api/public/data/ps/observation/Activity/validation-update.json ===================================== @@ -35,6 +35,11 @@ "ersId (if not null) is not a blank string" ] }, + "floatingObjectEmpty": { + "warnings": [ + "No DCP" + ] + }, "homeId": { "errors": [ "homeId (if not null) is not a blank string" @@ -44,18 +49,12 @@ "errors": [ "check latitude format", "latitude is mandatory" - ], - "warnings": [ - "check speed" ] }, "longitude": { "errors": [ "check longitude format", "longitude is mandatory" - ], - "warnings": [ - "check speed" ] }, "nextFpaZone": { @@ -138,13 +137,12 @@ "unique activity time on route" ], "warnings": [ - "check speed" + "Check speed" ] }, "vesselActivity": { "errors": [ "check if referential vesselActivity is disabled (only if validation is strong)", - "if end of search activity possible?", "vesselActivity is mandatory" ], "warnings": [ ===================================== server/runner/src/main/webResources/doc/api/public/data/ps/observation/Catch/validation-update.json ===================================== @@ -77,6 +77,7 @@ "species": { "errors": [ "check if referential species is disabled (only if validation is strong)", + "check missing observed system", "species is mandatory" ], "warnings": [ ===================================== server/runner/src/main/webResources/doc/api/public/data/ps/observation/Route/validation-update.json ===================================== @@ -1,4 +1,15 @@ { + "activity": { + "errors": [ + "activities quadrant check", + "activities speed check", + "activities time check" + ], + "warnings": [ + "activities speed check", + "end of search activity required" + ] + }, "comment": { "errors": [ "comment (if not null) is not a blank string", @@ -18,6 +29,10 @@ "endLogValue": { "errors": [ "endLogValue is a positive number" + ], + "warnings": [ + "loch matin < endLogValue ou l'un des deux lochs non renseigne", + "| endLogValue - loch Matin | < maxGap ou l'un des deux lochs non renseigne" ] }, "homeId": { @@ -30,7 +45,7 @@ "startLogValue is a positive number" ], "warnings": [ - "check loch matin ( supérieur a tout loch soir d'une route plus ancienne)" + "check loch matin ( superieur a tout loch soir d'une route plus ancienne)" ] } } \ No newline at end of file ===================================== toolkit/persistence/src/main/java/fr/ird/observe/spi/context/OpenableDtoEntityContext.java ===================================== @@ -56,6 +56,7 @@ import java.util.List; import java.util.Set; import java.util.TreeSet; import java.util.function.BiConsumer; +import java.util.function.Consumer; import java.util.function.Function; import java.util.stream.Collectors; import java.util.stream.Stream; @@ -95,13 +96,14 @@ public abstract class OpenableDtoEntityContext< public void onLoadForm(ServiceContext context, E entity, Form<D> form) { } - public void onSave(ServiceContext context, PE parent, E entity, D dto, boolean needCopy) { + public Consumer<AddEntityToUpdateStep> onSave(ServiceContext context, PE parent, E entity, D dto, boolean needCopy) { if (needCopy) { fromDto(context.getReferentialLocale(), entity, dto); } if (dto.isNotPersisted()) { addChildrenToParent(parent, entity); } + return null; } public Set<ToolkitIdDtoBean> getRealDependencies(ServiceContext context, Set<String> ids) { @@ -250,18 +252,16 @@ public abstract class OpenableDtoEntityContext< PE parent = parentSpi().loadEntity(context, parentId); E entity = loadOrCreateEntityFromDto(context, dto); checkLastUpdateDate(context, entity, dto); - onSave(context, parent, entity, dto, true); - return saveEntity(context, parent, entity); - } - - public void saveCallback(AddEntityToUpdateStep saveHelper, E entity) { + Consumer<AddEntityToUpdateStep> extraConsumer = onSave(context, parent, entity, dto, true); + return saveEntity(context, parent, entity, extraConsumer); } - protected SaveResultDto saveEntity(ServiceContext context, PE parent, E entity) { + protected SaveResultDto saveEntity(ServiceContext context, PE parent, E entity, Consumer<AddEntityToUpdateStep> extraConsumer) { AddEntityToUpdateStep saveHelper = newSaveHelper(context).update(this, entity); - saveCallback(saveHelper, entity); - return saveHelper - .build(entity); + if (extraConsumer != null) { + extraConsumer.accept(saveHelper); + } + return saveHelper.build(entity); } protected BiConsumer<E, R> getChildrenExtraConsumer(PE parent) { ===================================== toolkit/plugin/src/main/java/fr/ird/observe/toolkit/maven/plugin/server/definition/ValidationDefinitionTemplate.java ===================================== @@ -174,7 +174,7 @@ public class ValidationDefinitionTemplate { } Pair<String, String> pair = generateTypeDefinitionContent(validatorsByType, gson, dtoType); String createFileContent = pair.getLeft(); - String updateFileContent = pair.getLeft(); + String updateFileContent = pair.getRight(); Files.write(path.resolve(DtoEntityContext.VALIDATION_CREATE_CLASSIFIER), createFileContent.getBytes(StandardCharsets.UTF_8)); Files.write(path.resolve(DtoEntityContext.VALIDATION_UPDATE_CLASSIFIER), updateFileContent.getBytes(StandardCharsets.UTF_8)); View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/4ddd0436e61d7fddeecefcdf… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/4ddd0436e61d7fddeecefcdf… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] For the moment migration 9.2 does not require finalisation
by Tony CHEMIT (＠tchemit) July 17, 2023

July 17, 2023

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 4ddd0436 by Tony Chemit at 2023-07-17T13:45:52+02:00 For the moment migration 9.2 does not require finalisation - - - - - 1 changed file: - core/persistence/migration/src/main/java/fr/ird/observe/spi/migration/v9/DataSourceMigrationForVersion_9_2.java Changes: ===================================== core/persistence/migration/src/main/java/fr/ird/observe/spi/migration/v9/DataSourceMigrationForVersion_9_2.java ===================================== @@ -42,8 +42,8 @@ import java.util.List; public class DataSourceMigrationForVersion_9_2 extends ByMajorMigrationVersionResource { public DataSourceMigrationForVersion_9_2() { - super(Version.valueOf("9.2"), true); - ByMajorMigrationVersionResource.createResourceScriptVariables(this, "2023-07-20", "2023-07-20 00:00:00.000000"); + super(Version.valueOf("9.2"), false); + createResourceScriptVariables(this, "2023-07-20", "2023-07-20 00:00:00.000000"); } View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/4ddd0436e61d7fddeecefcdf6… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/4ddd0436e61d7fddeecefcdf6… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] 10 commits: Move to version 9.2.0-SNAPSHOT
by Tony CHEMIT (＠tchemit) July 17, 2023

July 17, 2023

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 046f8841 by Tony Chemit at 2023-07-16T12:13:43+02:00 Move to version 9.2.0-SNAPSHOT - - - - - b9fc24f4 by Tony Chemit at 2023-07-16T12:48:32+02:00 fix gitlab ci cache directory - - - - - 00ef5d95 by Tony Chemit at 2023-07-16T13:54:15+02:00 Move to persistence model 9.2 - - - - - f5d45df5 by Tony Chemit at 2023-07-16T13:54:15+02:00 Create migration directory if not exists - - - - - 23c501af by Tony Chemit at 2023-07-16T16:35:54+02:00 Clean imports in jaxx files - - - - - 0a61df1f by Tony Chemit at 2023-07-16T18:38:56+02:00 ll_observation.Catch.count devrait être NOT NULL - Closes #2714 - - - - - acb43924 by Tony Chemit at 2023-07-16T19:28:31+02:00 Fix tck extra script - - - - - 0ed88182 by Tony Chemit at 2023-07-16T19:29:39+02:00 Adapt migration 9.1 to make MigrateTckDatabases works again (mainly for empty databases) - - - - - 349c6bb3 by Tony Chemit at 2023-07-16T19:29:53+02:00 test more cases in MigrateTckDatabases - - - - - 1318666e by Tony Chemit at 2023-07-16T19:30:27+02:00 change persistence.previous.model.version to 9.1 (no need here to retest over and over the 9.0 → 9.1 migration) - - - - - 30 changed files: - .gitlab-ci.yml - client/configuration/pom.xml - client/core/pom.xml - client/datasource/actions/pom.xml - client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/consolidate/ConsolidateConfigUI.jaxx - client/datasource/editor/api-test/pom.xml - client/datasource/editor/api/pom.xml - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/layout/ContentLayoutUI.jaxx - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/referential/ContentReferentialUI.jaxx - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/navigation/search/criteria/SearchCriteriaUI.jaxx - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/wizard/tabs/ConfigUI.jaxx - client/datasource/editor/common/pom.xml - client/datasource/editor/common/src/main/java/fr/ird/observe/client/datasource/editor/common/referential/common/GearCharacteristicUI.jaxx - client/datasource/editor/common/src/main/java/fr/ird/observe/client/datasource/editor/common/referential/common/GearUI.jaxx - client/datasource/editor/common/src/main/java/fr/ird/observe/client/datasource/editor/common/referential/common/LengthWeightParameterUI.jaxx - client/datasource/editor/common/src/main/java/fr/ird/observe/client/datasource/editor/common/referential/common/PersonUI.jaxx - client/datasource/editor/common/src/main/java/fr/ird/observe/client/datasource/editor/common/referential/common/SpeciesGroupUI.jaxx - client/datasource/editor/common/src/main/java/fr/ird/observe/client/datasource/editor/common/referential/common/SpeciesListUI.jaxx - client/datasource/editor/common/src/main/java/fr/ird/observe/client/datasource/editor/common/referential/common/SpeciesUI.jaxx - client/datasource/editor/common/src/main/java/fr/ird/observe/client/datasource/editor/common/referential/common/VesselUI.jaxx - client/datasource/editor/ll/pom.xml - client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/common/TripGearUseFeaturesUI.jaxx - client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/common/TripUI.jaxx - client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/landing/LandingPartUI.jaxx - client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/landing/LandingUI.jaxx - client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/logbook/ActivitySampleUI.jaxx - client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/logbook/ActivityUI.jaxx - client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/logbook/SamplePartUI.jaxx - client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/logbook/SampleUI.jaxx - client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/logbook/SetCatchUI.jaxx The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/161d3d0e05fbf26ac64f3b3c… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/161d3d0e05fbf26ac64f3b3c… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe] Pushed new branch develop-9.1.x
by Tony CHEMIT (＠tchemit) July 16, 2023

July 16, 2023

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

1 0