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

[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

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

July 16, 2023

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

1 0

[Git][ultreiaio/ird-observe][pages] 4 commits: Site checkin for project ObServe (version 9.1.6)
by Tony CHEMIT (＠tchemit) July 16, 2023

July 16, 2023

Tony CHEMIT pushed to branch pages at ultreiaio / ird-observe Commits: cc94fdfd by Tony Chemit at 2023-07-16T11:38:46+02:00 Site checkin for project ObServe (version 9.1.6) - - - - - ec4f55eb by Tony Chemit at 2023-07-16T11:43:21+02:00 Site checkin for project ObServe (version 9.1.6) - - - - - d628f2fa by Tony Chemit at 2023-07-16T11:45:10+02:00 Site checkin for project ObServe (version 9.1.6) - - - - - 91789215 by Tony Chemit at 2023-07-16T11:50:28+02:00 Site checkin for project ObServe (version 9.1.6) - - - - - 1 changed file: - versions.json Changes: ===================================== versions.json ===================================== @@ -1,6 +1,6 @@ { - "latest": "16/07/2023 09:30 UTC", - "9.1.6": "16/07/2023 09:30 UTC", + "latest": "16/07/2023 09:50 UTC", + "9.1.6": "16/07/2023 09:50 UTC", "9.1.5": "25/06/2023 16:09 UTC", "9.1.4": "01/06/2023 18:40 UTC", "9.1.3": "20/05/2023 12:37 UTC", View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/d6cf79121f37c6fa0fe2aa52… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/d6cf79121f37c6fa0fe2aa52… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][pages] 2 commits: Site checkin for project ObServe (version 9.1.6)
by Tony CHEMIT (＠tchemit) July 16, 2023

July 16, 2023

Tony CHEMIT pushed to branch pages at ultreiaio / ird-observe Commits: 65d8d358 by Tony Chemit at 2023-07-16T11:26:36+02:00 Site checkin for project ObServe (version 9.1.6) - - - - - d6cf7912 by Tony Chemit at 2023-07-16T11:30:38+02:00 Site checkin for project ObServe (version 9.1.6) - - - - - 8 changed files: - + 9.1.6/CHANGELOG.html - + 9.1.6/architecture-logicielle.html - + 9.1.6/avdth/common.html - + 9.1.6/avdth/index.html - + 9.1.6/avdth/landing.html - + 9.1.6/avdth/local_market.html - + 9.1.6/avdth/logbook.html - + 9.1.6/avdth/referential.html The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/9c68f8282254c9f3df48efeb… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/9c68f8282254c9f3df48efeb… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe] Deleted branch release/9.1.6
by Tony CHEMIT (＠tchemit) July 15, 2023

July 15, 2023

Tony CHEMIT deleted branch release/9.1.6 at ultreiaio / ird-observe -- You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe] Pushed new tag v9.1.6
by Tony CHEMIT (＠tchemit) July 15, 2023

July 15, 2023

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

1 0

[Git][ultreiaio/ird-observe][release/9.1.6] [jgitflow-maven-plugin]updating poms for branch'release/9.1.6' with non-snapshot versions[skip ci]
by Tony CHEMIT (＠tchemit) July 15, 2023

July 15, 2023

Tony CHEMIT pushed to branch release/9.1.6 at ultreiaio / ird-observe Commits: e5c59b39 by Tony Chemit at 2023-07-15T12:53:27+02:00 [jgitflow-maven-plugin]updating poms for branch'release/9.1.6' with non-snapshot versions[skip ci] - - - - - 30 changed files: - client/configuration/pom.xml - client/core/pom.xml - client/datasource/actions/pom.xml - client/datasource/editor/api-test/pom.xml - client/datasource/editor/api/pom.xml - client/datasource/editor/common/pom.xml - client/datasource/editor/ll/pom.xml - client/datasource/editor/pom.xml - client/datasource/editor/ps/pom.xml - client/datasource/editor/spi/pom.xml - client/datasource/pom.xml - client/pom.xml - client/runner/pom.xml - core/api/dto-consolidation/pom.xml - core/api/dto-decoration/pom.xml - core/api/dto-validation/pom.xml - core/api/dto/pom.xml - core/api/pom.xml - core/api/services/pom.xml - core/api/tree/pom.xml - core/api/validation/pom.xml - core/persistence/avdth/pom.xml - core/persistence/consolidation/pom.xml - core/persistence/decoration/pom.xml - core/persistence/java/pom.xml - core/persistence/migration/pom.xml - core/persistence/pom.xml - core/persistence/report/pom.xml - core/persistence/resources/pom.xml - core/persistence/test/pom.xml The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/e5c59b39c6bf01ff5b41c1b2f… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/e5c59b39c6bf01ff5b41c1b2f… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][master] 26 commits: [jgitflow-maven-plugin]updating poms for 9.1.6-SNAPSHOT development[skip ci]
by Tony CHEMIT (＠tchemit) July 15, 2023

July 15, 2023

Tony CHEMIT pushed to branch master at ultreiaio / ird-observe Commits: 7b51f26e by Tony Chemit at 2023-06-25T17:23:02+02:00 [jgitflow-maven-plugin]updating poms for 9.1.6-SNAPSHOT development[skip ci] - - - - - e0053ea1 by Tony Chemit at 2023-06-25T17:59:18+02:00 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts[skip ci] - - - - - 43a9a5d8 by Tony Chemit at 2023-06-25T17:59:19+02:00 [jgitflow-maven-plugin]merging 'master' into 'develop' - - - - - 2dc2704b by Tony Chemit at 2023-06-25T17:59:21+02:00 [jgitflow-maven-plugin]Updating develop poms back to pre merge state[skip ci] - - - - - 1893557b by Tony Chemit at 2023-06-27T17:47:43+02:00 update pom - - - - - d16a6f6f by Tony Chemit at 2023-06-27T17:47:43+02:00 ajout chiffrage azti 2023 - - - - - de5d255c by Tony Chemit at 2023-06-27T17:47:43+02:00 Une clef de traduction n'a pas le bon format - - - - - c2810a10 by Tony Chemit at 2023-06-29T16:56:03+02:00 chiffrage azti 2023 v2 - - - - - bb14f8ce by Tony Chemit at 2023-06-29T19:29:24+02:00 chiffrage azti 2023 v3 - - - - - 43554699 by Tony Chemit at 2023-07-06T09:45:08+02:00 chiffrage azti 2023 v4 - - - - - c9a15077 by Tony Chemit at 2023-07-06T12:13:25+02:00 Remove FIXME (JAXX 3.0.23 fix it) - - - - - b738487f by Tony Chemit at 2023-07-12T17:30:22+02:00 update pom - - - - - 9d954457 by Tony Chemit at 2023-07-12T17:30:22+02:00 Problème d'accès aux fonctions postgis - Closes #2757 - - - - - 5e6c417f by Tony Chemit at 2023-07-12T17:30:22+02:00 Amélioration du feedback en mode serveur - Closes #2758 - - - - - c228c1e4 by Tony Chemit at 2023-07-12T17:30:22+02:00 Sur le tableau d'affichage des lots de marché local, afficher le champ date - Closes #2753 - - - - - 07cd622b by Tony Chemit at 2023-07-12T17:30:22+02:00 L'action voir les utilisations du référentiel ne doit pas être accessible si l'utilisateur ne peut pas voir les données - Closes #2759 - - - - - 9d9ea87d by Tony Chemit at 2023-07-12T17:45:00+02:00 Sur l'UI référentiel Conditionnement, le champ poids moyen n'est pas visible - Closes #2752 - - - - - 6fbc4793 by Tony Chemit at 2023-07-12T19:03:20+02:00 Séquence du focus sur PS / Logbook / Activité - Closes #2747 - - - - - 009322bb by Tony Chemit at 2023-07-13T17:26:48+02:00 Do not delete log configuration file when using snapshot - - - - - c7b2088e by Tony Chemit at 2023-07-13T17:27:44+02:00 in SwingReferentialSynchronizeTask, add isLeftModified method, since isLEft method does not give us if left is modified - - - - - b9e9118e by Tony Chemit at 2023-07-15T11:22:24+02:00 Add new report operation SubtractColum - See #2754 - - - - - 94ff09bc by Tony Chemit at 2023-07-15T11:23:15+02:00 Erreur de calcul sur les tonnages du tableau de synthèse 'Vérification des plans de cuve' - Close #2754 - - - - - 88eb3ac5 by Tony Chemit at 2023-07-15T12:14:02+02:00 Sur enregistrement d'une nouvelle donnée, déplacement non souhaité de l'arbre vers la droite - Close #2749 - - - - - ddb70750 by Tony Chemit at 2023-07-15T12:52:34+02:00 Update changelog for v.9.1.6 [skip CI] - - - - - e5c59b39 by Tony Chemit at 2023-07-15T12:53:27+02:00 [jgitflow-maven-plugin]updating poms for branch'release/9.1.6' with non-snapshot versions[skip ci] - - - - - 9b9b81d0 by Tony Chemit at 2023-07-15T13:17:28+02:00 [jgitflow-maven-plugin]merging 'release/9.1.6' into 'master' - - - - - 30 changed files: - CHANGELOG.md - client/configuration/pom.xml - client/configuration/src/main/java/fr/ird/observe/client/configuration/ClientConfig.java - client/core/pom.xml - client/core/src/main/java/fr/ird/observe/client/datasource/api/action/FeedBackBuilderModel.java - client/core/src/main/java/fr/ird/observe/client/datasource/api/action/TechnicalErrorFeedBackBuilderModel.java - client/datasource/actions/pom.xml - client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/synchronize/referential/ng/actions/Apply.java - client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/synchronize/referential/ng/task/SwingReferentialSynchronizeTask.java - 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/RunObserveListener.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/referential/ContentReferentialUI.jcss - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/referential/actions/ShowUsagesReferential.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/navigation/NavigationTree.java - client/datasource/editor/common/pom.xml - client/datasource/editor/ll/pom.xml - client/datasource/editor/ll/src/main/i18n/getters/java.getter - client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/observation/SetDetailCompositionUIModelStates.java - client/datasource/editor/pom.xml - client/datasource/editor/ps/pom.xml - client/datasource/editor/ps/src/main/i18n/getters/jaxx.getter - client/datasource/editor/ps/src/main/i18n/getters/navigation.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/referential/localmarket/PackagingUI.jaxx - client/datasource/editor/spi/pom.xml - client/datasource/pom.xml - client/pom.xml The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/c33e078c9d34a82a62029963… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/c33e078c9d34a82a62029963… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] 5 commits: [jgitflow-maven-plugin]updating poms for branch'release/9.1.6' with non-snapshot versions[skip ci]
by Tony CHEMIT (＠tchemit) July 15, 2023

July 15, 2023

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: e5c59b39 by Tony Chemit at 2023-07-15T12:53:27+02:00 [jgitflow-maven-plugin]updating poms for branch'release/9.1.6' with non-snapshot versions[skip ci] - - - - - 9b9b81d0 by Tony Chemit at 2023-07-15T13:17:28+02:00 [jgitflow-maven-plugin]merging 'release/9.1.6' into 'master' - - - - - 59534757 by Tony Chemit at 2023-07-15T13:17:35+02:00 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts[skip ci] - - - - - 761e89c9 by Tony Chemit at 2023-07-15T13:17:36+02:00 [jgitflow-maven-plugin]merging 'master' into 'develop' - - - - - 161d3d0e by Tony Chemit at 2023-07-15T13:17:37+02:00 [jgitflow-maven-plugin]Updating develop poms back to pre merge state[skip ci] - - - - - 0 changed files: Changes: View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/9d3db2422dcec903e8b18ab9… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/9d3db2422dcec903e8b18ab9… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe] Pushed new branch release/9.1.6
by Tony CHEMIT (＠tchemit) July 15, 2023

July 15, 2023

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

1 0

[Git][ultreiaio/ird-observe][develop] [jgitflow-maven-plugin]updating poms for 9.1.7-SNAPSHOT development[skip ci]
by Tony CHEMIT (＠tchemit) July 15, 2023

July 15, 2023

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 9d3db242 by Tony Chemit at 2023-07-15T12:53:08+02:00 [jgitflow-maven-plugin]updating poms for 9.1.7-SNAPSHOT development[skip ci] - - - - - 30 changed files: - client/configuration/pom.xml - client/core/pom.xml - client/datasource/actions/pom.xml - client/datasource/editor/api-test/pom.xml - client/datasource/editor/api/pom.xml - client/datasource/editor/common/pom.xml - client/datasource/editor/ll/pom.xml - client/datasource/editor/pom.xml - client/datasource/editor/ps/pom.xml - client/datasource/editor/spi/pom.xml - client/datasource/pom.xml - client/pom.xml - client/runner/pom.xml - core/api/dto-consolidation/pom.xml - core/api/dto-decoration/pom.xml - core/api/dto-validation/pom.xml - core/api/dto/pom.xml - core/api/pom.xml - core/api/services/pom.xml - core/api/tree/pom.xml - core/api/validation/pom.xml - core/persistence/avdth/pom.xml - core/persistence/consolidation/pom.xml - core/persistence/decoration/pom.xml - core/persistence/java/pom.xml - core/persistence/migration/pom.xml - core/persistence/pom.xml - core/persistence/report/pom.xml - core/persistence/resources/pom.xml - core/persistence/test/pom.xml The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/9d3db2422dcec903e8b18ab98… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/9d3db2422dcec903e8b18ab98… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] Update changelog for v.9.1.6 [skip CI]
by Tony CHEMIT (＠tchemit) July 15, 2023

July 15, 2023

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: ddb70750 by Tony Chemit at 2023-07-15T12:52:34+02:00 Update changelog for v.9.1.6 [skip CI] - - - - - 1 changed file: - CHANGELOG.md Changes: ===================================== CHANGELOG.md ===================================== @@ -1,7 +1,27 @@ # ObServe changelog * Author [Tony Chemit](mailto:dev@tchemit.fr) - * Last generated at 2023-06-25 17:21. + * Last generated at 2023-07-15 12:19. + +## Version [9.1.6](https://gitlab.com/ultreiaio/ird-observe/-/milestones/270) + +**Closed at 2023-07-15.** + +### Download + * [Client (observe-9.1.6-client.zip)](https://repo1.maven.org/maven2/fr/ird/observe/ob…) + * [Serveur (observe-9.1.6.war)](https://repo1.maven.org/maven2/fr/ird/observe/observe/9…) + * [Serveur (observe-9.1.6-server.zip)](https://repo1.maven.org/maven2/fr/ird/observe/ob…) + +### Issues + * [[Type::Anomalie 2747]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2747) **Séquence du focus sur PS / Logbook / Activité** (Thanks to Tony CHEMIT) (Reported by Pascal Cauquil) + * [[Type::Anomalie 2752]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2752) **Sur l'UI référentiel Conditionnement, le champ poids moyen n'est pas visible** (Thanks to Tony CHEMIT) (Reported by Pascal Cauquil) + * [[Type::Anomalie 2754]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2754) **Erreur de calcul sur les tonnages du tableau de synthèse 'Vérification des plans de cuve'** (Thanks to Tony CHEMIT) (Reported by Pascal Cauquil) + * [[Type::Anomalie 2757]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2757) **Problème d'accès aux fonctions postgis** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Type::Anomalie 2759]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2759) **L'action voir les utilisations du référentiel ne doit pas être accessible si l'utilisateur ne peut pas voir les données** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Type::Evolution 2723]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2723) **Améliorer le comportement de l'UI traduction** (Thanks to Tony CHEMIT) (Reported by Pascal Cauquil) + * [[Type::Evolution 2749]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2749) **Sur enregistrement d'une nouvelle donnée, déplacement non souhaité de l'arbre vers la droite** (Thanks to Tony CHEMIT) (Reported by Pascal Cauquil) + * [[Type::Evolution 2753]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2753) **Sur le tableau d'affichage des lots de marché local, afficher le champ date** (Thanks to Tony CHEMIT) (Reported by Pascal Cauquil) + * [[Type::Evolution 2758]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2758) **Amélioration du feedback en mode serveur** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) ## Version [9.1.5](https://gitlab.com/ultreiaio/ird-observe/-/milestones/268) @@ -12,7 +32,6 @@ * [Serveur (observe-9.1.5.war)](https://repo1.maven.org/maven2/fr/ird/observe/observe/9…) * [Serveur (observe-9.1.5-server.zip)](https://repo1.maven.org/maven2/fr/ird/observe/ob…) - ### Issues * [[Type::Anomalie 2713]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2713) **Affichage des types date sur l'UI de synchro avancée de référentiel** (Thanks to Tony CHEMIT) (Reported by Pascal Cauquil) * [[Type::Anomalie 2718]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2718) **Rendre visible les heures de début et de fin de chaque sous-échantillon et faciliter leur saisie** (Thanks to Pascal Cauquil) (Reported by Pascal Cauquil) View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/ddb70750d04ac71b7c11819a8… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/ddb70750d04ac71b7c11819a8… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] Sur enregistrement d'une nouvelle donnée, déplacement non souhaité de l'arbre...
by Tony CHEMIT (＠tchemit) July 15, 2023

July 15, 2023

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 88eb3ac5 by Tony Chemit at 2023-07-15T12:14:02+02:00 Sur enregistrement d'une nouvelle donnée, déplacement non souhaité de l'arbre vers la droite - Close #2749 - - - - - 1 changed file: - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/navigation/NavigationTree.java Changes: ===================================== client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/navigation/NavigationTree.java ===================================== @@ -31,6 +31,8 @@ import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.jdesktop.swingx.JXTree; +import javax.swing.JScrollBar; +import javax.swing.JScrollPane; import javax.swing.SwingUtilities; import javax.swing.text.Position; import javax.swing.tree.TreeNode; @@ -139,6 +141,8 @@ public class NavigationTree extends JXTree implements WithClientUIContextApi { if (then != null) { then.run(); } + // See https://gitlab.com/ultreiaio/ird-observe/-/issues/2749 + resetHorizontalScrollBar(); } public void reSelectSafeNode(TreeNode node) { @@ -167,6 +171,7 @@ public class NavigationTree extends JXTree implements WithClientUIContextApi { TreePath path = new TreePath(getModel().getPathToRoot(node)); setSelectionPath(path); SwingUtilities.invokeLater(() -> scrollPathToVisible(path)); + resetHorizontalScrollBar(); } /** @@ -233,4 +238,10 @@ public class NavigationTree extends JXTree implements WithClientUIContextApi { addTreeSelectionListener(selectionListener); addMouseListener(selectionListener); } + + public void resetHorizontalScrollBar() { + JScrollPane scrollPane = (JScrollPane) SwingUtilities.getAncestorOfClass(JScrollPane.class, this); + JScrollBar horizontalScrollBar = scrollPane.getHorizontalScrollBar(); + SwingUtilities.invokeLater(() -> horizontalScrollBar.setValue(0)); + } } View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/88eb3ac50e725474941569f4f… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/88eb3ac50e725474941569f4f… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] 2 commits: Add new report operation SubtractColum - See #2754
by Tony CHEMIT (＠tchemit) July 15, 2023

July 15, 2023

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: b9e9118e by Tony Chemit at 2023-07-15T11:22:24+02:00 Add new report operation SubtractColum - See #2754 - - - - - 94ff09bc by Tony Chemit at 2023-07-15T11:23:15+02:00 Erreur de calcul sur les tonnages du tableau de synthèse 'Vérification des plans de cuve' - Close #2754 - - - - - 6 changed files: - core/persistence/report/src/main/resources/observe-reports.properties - core/services/local/src/test/java/fr/ird/observe/services/local/service/ReportServiceLocalReadTest.java - core/services/test/src/main/resources/fixtures/fr/ird/observe/services/service/ReportService-psLogbookWellPlanCheck.properties - model/src/main/resources/observe-reports-legacy.properties - src/site/markdown/report/embedded-operations.md - + toolkit/api-report/src/main/java/fr/ird/observe/report/operations/SubtractColum.java Changes: ===================================== core/persistence/report/src/main/resources/observe-reports.properties ===================================== @@ -937,7 +937,19 @@ Sum(CASE ct.species.id When 'fr.ird.referential.common.Species#1239832685474#0.8 When 'fr.ird.referential.common.Species#1239832685474#0.975344121171992' Then 0.0 \ When 'fr.ird.referential.common.Species#1239832685475#0.13349466123905152' Then 0.0 \ When 'fr.ird.referential.common.Species#1239832685476#0.5618871286604711' Then 0.0 \ -Else ct.weight End),\ +Else ct.weight End) \ +From TripImpl t \ +Join t.routeLogbook r \ +Join r.activity a \ +Join a.catches ct \ +Join t.vessel vessel \ +Left Join a.vesselActivity vesselActivity \ +Where t.id In :tripId and vesselActivity.id = 'fr.ird.referential.ps.common.VesselActivity#1239832675369#0.12552908048322586' \ +Group By vessel.code,vessel.label2,t.startDate,t.endDate,r.date,a.time,a.number \ +Order By vessel.code,t.startDate,r.date,a.time +report.psLogbookWellPlanCheck.request.2.location=12,0 +report.psLogbookWellPlanCheck.request.2.layout=row +report.psLogbookWellPlanCheck.request.2.request=Select \ Sum(CASE was.species.id When 'fr.ird.referential.common.Species#1239832685474#0.8943253454598569' Then was.weight Else 0.0 End), \ Sum(CASE was.species.id When 'fr.ird.referential.common.Species#1239832685474#0.975344121171992' Then was.weight Else 0.0 End), \ Sum(CASE was.species.id When 'fr.ird.referential.common.Species#1239832685475#0.13349466123905152' Then was.weight Else 0.0 End), \ @@ -946,24 +958,50 @@ Sum(CASE was.species.id When 'fr.ird.referential.common.Species#1239832685474#0. When 'fr.ird.referential.common.Species#1239832685474#0.975344121171992' Then 0.0 \ When 'fr.ird.referential.common.Species#1239832685475#0.13349466123905152' Then 0.0 \ When 'fr.ird.referential.common.Species#1239832685476#0.5618871286604711' Then 0.0 \ -Else was.weight End),\ -Sum(ct.weight), \ -Sum(was.weight), \ -Sum(ct.weight) - Sum(was.weight) \ +Else was.weight End) \ From TripImpl t \ Join t.well w \ Join w.wellActivity wa \ Join wa.wellActivitySpecies was \ Join t.routeLogbook r \ Join r.activity a \ +Join t.vessel vessel \ +Left Join a.vesselActivity vesselActivity \ +Where t.id In :tripId and wa.activity = a and vesselActivity.id = 'fr.ird.referential.ps.common.VesselActivity#1239832675369#0.12552908048322586' \ +Group By vessel.code,vessel.label2,t.startDate,t.endDate,r.date,a.time,a.number \ +Order By vessel.code,t.startDate,r.date,a.time +report.psLogbookWellPlanCheck.request.3.location=17,0 +report.psLogbookWellPlanCheck.request.3.layout=row +report.psLogbookWellPlanCheck.request.3.request=Select \ +Sum(ct.weight) \ +From TripImpl t \ +Join t.routeLogbook r \ +Join r.activity a \ Join a.catches ct \ Join t.vessel vessel \ Left Join a.vesselActivity vesselActivity \ +Where t.id In :tripId and vesselActivity.id = 'fr.ird.referential.ps.common.VesselActivity#1239832675369#0.12552908048322586' \ +Group By vessel.code,vessel.label2,t.startDate,t.endDate,r.date,a.time,a.number \ +Order By vessel.code,t.startDate,r.date,a.time +report.psLogbookWellPlanCheck.request.4.location=18,0 +report.psLogbookWellPlanCheck.request.4.layout=row +report.psLogbookWellPlanCheck.request.4.request=Select \ +Sum(was.weight) \ +From TripImpl t \ +Join t.well w \ +Join w.wellActivity wa \ +Join wa.wellActivitySpecies was \ +Join t.routeLogbook r \ +Join r.activity a \ +Join t.vessel vessel \ +Left Join a.vesselActivity vesselActivity \ Where t.id In :tripId and wa.activity = a and vesselActivity.id = 'fr.ird.referential.ps.common.VesselActivity#1239832675369#0.12552908048322586' \ Group By vessel.code,vessel.label2,t.startDate,t.endDate,r.date,a.time,a.number \ Order By vessel.code,t.startDate,r.date,a.time -report.psLogbookWellPlanCheck.operations.1.type=SumColumn -report.psLogbookWellPlanCheck.operations.1.parameters=0|6 +report.psLogbookWellPlanCheck.operations.1.type=SubtractColum +report.psLogbookWellPlanCheck.operations.1.parameters=17|18|19 +report.psLogbookWellPlanCheck.operations.2.type=SumColumn +report.psLogbookWellPlanCheck.operations.2.parameters=0|6 report.psObservationActivityWithComment.modelType=PS report.psObservationActivityWithComment.name=Observations - Activités avec comment et leurs positions report.psObservationActivityWithComment.description=Afficher les activités avec comment et leurs positions géographiques ===================================== core/services/local/src/test/java/fr/ird/observe/services/local/service/ReportServiceLocalReadTest.java ===================================== @@ -95,4 +95,11 @@ public class ReportServiceLocalReadTest extends GeneratedReportServiceLocalReadT ReportService service = getService(); fixtures.executeReport(service, "psObservationCatchTotalCountByGroupAndSpeciesFateDiscardPerAssociation"); } + + @Test + @Ignore + public void executeReportPsLogbookWellPlanCheck() { + ReportService service = getService(); + fixtures.executeReport(service, "psLogbookWellPlanCheck"); + } } ===================================== core/services/test/src/main/resources/fixtures/fr/ird/observe/services/service/ReportService-psLogbookWellPlanCheck.properties ===================================== @@ -19,14 +19,14 @@ # <http://www.gnu.org/licenses/gpl-3.0.html>. # #L% ### -result.0=483^CAP BOJADOR^30/3/2019^8/4/2019^30/3/2019^1^15:12^0.0^123.0^43.0^0.0^0.0^0.0^0.0^24.0^0.0^0.0^166.0^24.0^142.0 +result.0=483^CAP BOJADOR^30/3/2019^8/4/2019^30/3/2019^1^15:12^0.0^123.0^43.0^0.0^0.0^0.0^0.0^12.0^0.0^0.0^166.0^12.0^154.0 result.columns=20 result.rows=1 syntax.columns=20 syntax.columnsHeader=Code bateau^Nom bateau^Date départ^Date arrivée^Date de route^Numéro activité^Heure activité^Logbook YFT^Logbook SKJ^Logbook BET^Logbook ALB^Logbook Autres^Plan de cuves YFT^Plan de cuves SKJ^Plan de cuves BET^Plan de cuves ALB^Plan de cuves Autres^Logbook Total^Plan de cuves Total^Différence syntax.description=Livre de bord - Vérification des plan de cuves syntax.name=Livre de bord - Vérification des plan de cuves -syntax.nbRequests=1 +syntax.nbRequests=4 syntax.rows=-1 syntax.rowsHeader= tripIds=${PS_COMMON_TRIP},${PS_COMMON_TRIP_MOVE} ===================================== model/src/main/resources/observe-reports-legacy.properties ===================================== @@ -1407,48 +1407,78 @@ Plan de cuves Autres,\ Logbook Total,\ Plan de cuves Total,\ Différence -report.psLogbookWellPlanCheck.operations.1=SumColumn:0|6 -report.psLogbookWellPlanCheck.request.1=0,0|row|\ -Select vessel.code,\ - vessel.label2,\ - concat(day(t.startDate), '/', month(t.startDate), '/', year(t.startDate)), \ - concat(day(t.endDate), '/', month(t.endDate), '/', year(t.endDate)), \ - concat(day(r.date), '/', month(r.date), '/', year(r.date)), \ - a.number, \ - concat(hour(a.time), ':', minute(a.time)), \ - Sum(CASE ct.species.id When 'fr.ird.referential.common.Species#1239832685474#0.8943253454598569' Then ct.weight Else 0.0 End), \ - Sum(CASE ct.species.id When 'fr.ird.referential.common.Species#1239832685474#0.975344121171992' Then ct.weight Else 0.0 End), \ - Sum(CASE ct.species.id When 'fr.ird.referential.common.Species#1239832685475#0.13349466123905152' Then ct.weight Else 0.0 End), \ - Sum(CASE ct.species.id When 'fr.ird.referential.common.Species#1239832685476#0.5618871286604711' Then ct.weight Else 0.0 End), \ - Sum(CASE ct.species.id When 'fr.ird.referential.common.Species#1239832685474#0.8943253454598569' Then 0.0 \ - When 'fr.ird.referential.common.Species#1239832685474#0.975344121171992' Then 0.0 \ - When 'fr.ird.referential.common.Species#1239832685475#0.13349466123905152' Then 0.0 \ - When 'fr.ird.referential.common.Species#1239832685476#0.5618871286604711' Then 0.0 \ - Else ct.weight End),\ - Sum(CASE was.species.id When 'fr.ird.referential.common.Species#1239832685474#0.8943253454598569' Then was.weight Else 0.0 End), \ - Sum(CASE was.species.id When 'fr.ird.referential.common.Species#1239832685474#0.975344121171992' Then was.weight Else 0.0 End), \ - Sum(CASE was.species.id When 'fr.ird.referential.common.Species#1239832685475#0.13349466123905152' Then was.weight Else 0.0 End), \ - Sum(CASE was.species.id When 'fr.ird.referential.common.Species#1239832685476#0.5618871286604711' Then was.weight Else 0.0 End), \ - Sum(CASE was.species.id When 'fr.ird.referential.common.Species#1239832685474#0.8943253454598569' Then 0.0 \ - When 'fr.ird.referential.common.Species#1239832685474#0.975344121171992' Then 0.0 \ - When 'fr.ird.referential.common.Species#1239832685475#0.13349466123905152' Then 0.0 \ - When 'fr.ird.referential.common.Species#1239832685476#0.5618871286604711' Then 0.0 \ - Else was.weight End),\ - Sum(ct.weight), \ - Sum(was.weight), \ - Sum(ct.weight) - Sum(was.weight) \ +report.psLogbookWellPlanCheck.request.1=0,0|row|Select vessel.code,\ +vessel.label2,\ +concat(day(t.startDate), '/', month(t.startDate), '/', year(t.startDate)), \ +concat(day(t.endDate), '/', month(t.endDate), '/', year(t.endDate)), \ +concat(day(r.date), '/', month(r.date), '/', year(r.date)), \ +a.number, \ +concat(hour(a.time), ':', minute(a.time)), \ +Sum(CASE ct.species.id When 'fr.ird.referential.common.Species#1239832685474#0.8943253454598569' Then ct.weight Else 0.0 End), \ +Sum(CASE ct.species.id When 'fr.ird.referential.common.Species#1239832685474#0.975344121171992' Then ct.weight Else 0.0 End), \ +Sum(CASE ct.species.id When 'fr.ird.referential.common.Species#1239832685475#0.13349466123905152' Then ct.weight Else 0.0 End), \ +Sum(CASE ct.species.id When 'fr.ird.referential.common.Species#1239832685476#0.5618871286604711' Then ct.weight Else 0.0 End), \ +Sum(CASE ct.species.id When 'fr.ird.referential.common.Species#1239832685474#0.8943253454598569' Then 0.0 \ +When 'fr.ird.referential.common.Species#1239832685474#0.975344121171992' Then 0.0 \ +When 'fr.ird.referential.common.Species#1239832685475#0.13349466123905152' Then 0.0 \ +When 'fr.ird.referential.common.Species#1239832685476#0.5618871286604711' Then 0.0 \ +Else ct.weight End) \ +From TripImpl t \ +Join t.routeLogbook r \ +Join r.activity a \ +Join a.catches ct \ +Join t.vessel vessel \ +Left Join a.vesselActivity vesselActivity \ +Where t.id In :tripId and vesselActivity.id = 'fr.ird.referential.ps.common.VesselActivity#1239832675369#0.12552908048322586' \ +Group By vessel.code,vessel.label2,t.startDate,t.endDate,r.date,a.time,a.number \ +Order By vessel.code,t.startDate,r.date,a.time +report.psLogbookWellPlanCheck.request.2=12,0|row|Select \ +Sum(CASE was.species.id When 'fr.ird.referential.common.Species#1239832685474#0.8943253454598569' Then was.weight Else 0.0 End), \ +Sum(CASE was.species.id When 'fr.ird.referential.common.Species#1239832685474#0.975344121171992' Then was.weight Else 0.0 End), \ +Sum(CASE was.species.id When 'fr.ird.referential.common.Species#1239832685475#0.13349466123905152' Then was.weight Else 0.0 End), \ +Sum(CASE was.species.id When 'fr.ird.referential.common.Species#1239832685476#0.5618871286604711' Then was.weight Else 0.0 End), \ +Sum(CASE was.species.id When 'fr.ird.referential.common.Species#1239832685474#0.8943253454598569' Then 0.0 \ +When 'fr.ird.referential.common.Species#1239832685474#0.975344121171992' Then 0.0 \ +When 'fr.ird.referential.common.Species#1239832685475#0.13349466123905152' Then 0.0 \ +When 'fr.ird.referential.common.Species#1239832685476#0.5618871286604711' Then 0.0 \ +Else was.weight End) \ From TripImpl t \ Join t.well w \ Join w.wellActivity wa \ Join wa.wellActivitySpecies was \ Join t.routeLogbook r \ Join r.activity a \ +Join t.vessel vessel \ +Left Join a.vesselActivity vesselActivity \ +Where t.id In :tripId and wa.activity = a and vesselActivity.id = 'fr.ird.referential.ps.common.VesselActivity#1239832675369#0.12552908048322586' \ +Group By vessel.code,vessel.label2,t.startDate,t.endDate,r.date,a.time,a.number \ +Order By vessel.code,t.startDate,r.date,a.time +report.psLogbookWellPlanCheck.request.3=17,0|row|Select \ +Sum(ct.weight) \ +From TripImpl t \ +Join t.routeLogbook r \ +Join r.activity a \ Join a.catches ct \ Join t.vessel vessel \ Left Join a.vesselActivity vesselActivity \ +Where t.id In :tripId and vesselActivity.id = 'fr.ird.referential.ps.common.VesselActivity#1239832675369#0.12552908048322586' \ +Group By vessel.code,vessel.label2,t.startDate,t.endDate,r.date,a.time,a.number \ +Order By vessel.code,t.startDate,r.date,a.time +report.psLogbookWellPlanCheck.request.4=18,0|row|Select \ +Sum(was.weight) \ +From TripImpl t \ +Join t.well w \ +Join w.wellActivity wa \ +Join wa.wellActivitySpecies was \ +Join t.routeLogbook r \ +Join r.activity a \ +Join t.vessel vessel \ +Left Join a.vesselActivity vesselActivity \ Where t.id In :tripId and wa.activity = a and vesselActivity.id = 'fr.ird.referential.ps.common.VesselActivity#1239832675369#0.12552908048322586' \ Group By vessel.code,vessel.label2,t.startDate,t.endDate,r.date,a.time,a.number \ Order By vessel.code,t.startDate,r.date,a.time +report.psLogbookWellPlanCheck.operations.1=SubtractColum:17|18|19 +report.psLogbookWellPlanCheck.operations.2=SumColumn:0|6 ############################################ ## Marché local - Lots ############################################ ===================================== src/site/markdown/report/embedded-operations.md ===================================== @@ -215,6 +215,28 @@ report.xxx.operations.1.parameters=0|1 Ici on commence la somme à partir de la ligne **0** et la colonne **1**. +### SubtractColum + +Cette opération permet de réaliser la soustraction de deux colonnes, ligne par ligne et de consigner le résultat dans une nouvelle colonne. + +Le résultat sera un **entier avec décimales** (on arrondit à 4 décimales). + +**À noter que si une ligne contient des valeurs non numériques, la soustraction n'est pas effectuée et la valeur de la +celulle sera *-***. + +L'opéréation doit être paramétrée pour indiquer les deux colonnes à traiter et où inscrire le résultat de la soustraction. + +Le paramétrage est donc trois numéros de colonne codifié sous la forme ```column1|column2|targetColumn```. + +Exemple d'utilisation + +```properties +report.xxx.operations.1.type=SubtractColum +report.xxx.operations.1.parameters=0|1|2 +``` + +Ici on soustrait la colonne 0 à la colonne 1 et on consigne le résultat dans la colonne 2. + ## Opérations spécifiques à ObServe Ces opérations étant utilisées uniquement dans les rapport embarqués, elles ne possèdent aucun paramétrage. ===================================== toolkit/api-report/src/main/java/fr/ird/observe/report/operations/SubtractColum.java ===================================== @@ -0,0 +1,96 @@ +package fr.ird.observe.report.operations; + +/*- + * #%L + * ObServe Toolkit :: API :: Report + * %% + * Copyright (C) 2008 - 2023 IRD, Ultreia.io + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ + +import com.google.auto.service.AutoService; +import fr.ird.observe.report.Report; +import fr.ird.observe.report.ReportOperationConsumer; +import fr.ird.observe.report.ReportRequestExecutor; +import io.ultreia.java4all.lang.Numbers; +import io.ultreia.java4all.util.matrix.DataMatrix; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; + +import java.io.Serializable; +import java.util.Set; + +/** + * To subtract two columns values and place it in a new column. + * <p> + * Created on 15/07/2023. + * + * @author Tony Chemit - dev(a)tchemit.fr + * @since 9.1.6 + */ +(a)AutoService(ReportOperationConsumer.class) +public class SubtractColum implements ReportOperationConsumer { + private static final Logger log = LogManager.getLogger(SubtractColum.class); + + @Override + public DataMatrix consume(String parameters, ReportRequestExecutor requestExecutor, Report report, Set<String> tripId, DataMatrix incoming) { + if (parameters.isEmpty()) { + throw new IllegalStateException(String.format("parameters of operation %s can't not be null (format: column1|column2|targetColumn)", getClass().getName())); + } + String[] split = parameters.trim().split("\\|"); + if (split.length != 3) { + throw new IllegalStateException(String.format("parameters of operation %s must have three parameters (format: column1|column2|targetColumn), but was: %s", getClass().getName(), parameters.trim())); + } + int column1 = Integer.parseInt(split[0]); + int column2 = Integer.parseInt(split[1]); + int targetColumn = Integer.parseInt(split[2]); + + int height = incoming.getHeight(); + + DataMatrix tmpMatrix = createTmpMatrix(targetColumn, 0, 1, height); + for (int row = 0; row < height; row++) { + Object sumRow = getSubtract(row, column1, column2, incoming); + tmpMatrix.setValue(0, row, sumRow); + } + return DataMatrix.merge(incoming, tmpMatrix); + } + + protected Object getSubtract(int row, int column1, int column2, DataMatrix incoming) { + + Double v1 = getValue(row, column1, incoming); + Double v2 = getValue(row, column2, incoming); + if (v1 == null || v2 == null) { + return "-"; + } + float result = (float) (v1 - v2); + return Numbers.roundFourDigits(result); + } + + protected Double getValue(int x, int y, DataMatrix incoming) { + Serializable o = incoming.getValue(y, x); + if (o == null || "null".equals(o)) { + return null; + } + try { + return Double.parseDouble(o.toString()); + } catch (NumberFormatException e) { + // une des données de la colonne n'est pas un count on sort directement + log.debug(String.format("Could not convert %s to number", o), e); + return null; + } + } +} View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/c7b2088ebca03ddd98058cb4… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/c7b2088ebca03ddd98058cb4… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] 2 commits: Do not delete log configuration file when using snapshot
by Tony CHEMIT (＠tchemit) July 13, 2023

July 13, 2023

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 009322bb by Tony Chemit at 2023-07-13T17:26:48+02:00 Do not delete log configuration file when using snapshot - - - - - c7b2088e by Tony Chemit at 2023-07-13T17:27:44+02:00 in SwingReferentialSynchronizeTask, add isLeftModified method, since isLEft method does not give us if left is modified - - - - - 4 changed files: - client/configuration/src/main/java/fr/ird/observe/client/configuration/ClientConfig.java - client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/synchronize/referential/ng/actions/Apply.java - client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/synchronize/referential/ng/task/SwingReferentialSynchronizeTask.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/RunObserveListener.java Changes: ===================================== client/configuration/src/main/java/fr/ird/observe/client/configuration/ClientConfig.java ===================================== @@ -320,11 +320,8 @@ public class ClientConfig extends GeneratedClientConfig implements TripMapConfig } } - public File initLog() throws IOException { + public File initLog() { File logFile = getLogConfigurationFile(); - if (isVersionSnapshot()) { - Files.deleteIfExists(logFile.toPath()); - } log.info(String.format("Loading user log file at %s", logFile)); ObserveUtil.loadLogConfiguration(ClientResources.LOG_CONFIGURATION_FILE, null, logFile.toPath(), this); ===================================== client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/synchronize/referential/ng/actions/Apply.java ===================================== @@ -87,7 +87,7 @@ public class Apply extends ReferentialSynchroUIActionSupport { Iterator<SwingReferentialSynchronizeTask> iterator = tasksForOneReferential.iterator(); while (iterator.hasNext()) { SwingReferentialSynchronizeTask task = iterator.next(); - if (task.isLeft()) { + if (task.isLeftModified()) { leftModified = true; } else { rightModified = true; ===================================== client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/synchronize/referential/ng/task/SwingReferentialSynchronizeTask.java ===================================== @@ -75,6 +75,13 @@ public class SwingReferentialSynchronizeTask implements WithClientUIContextApi { return left; } + public final boolean isLeftModified() { + if (left) { + return !taskType.toOtherSide(); + } + return taskType.toOtherSide(); + } + public final SynchronizeTaskType getTaskType() { return taskType; } ===================================== client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/RunObserveListener.java ===================================== @@ -60,7 +60,6 @@ import javax.script.ScriptException; import javax.swing.JOptionPane; import javax.swing.UIManager; import java.io.File; -import java.io.IOException; import java.lang.reflect.InvocationTargetException; import java.util.Arrays; import java.util.Date; @@ -313,7 +312,7 @@ public class RunObserveListener implements ApplicationRunnerListener, WithClient UIHelper.handlingError(event.getException()); } - public void initLog(ClientConfig config) throws IOException { + public void initLog(ClientConfig config) { File logFile = config.initLog(); View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/6fbc47933358d0626ff28ca6… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/6fbc47933358d0626ff28ca6… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] 9 commits: chiffrage azti 2023 v4
by Tony CHEMIT (＠tchemit) July 12, 2023

July 12, 2023

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 43554699 by Tony Chemit at 2023-07-06T09:45:08+02:00 chiffrage azti 2023 v4 - - - - - c9a15077 by Tony Chemit at 2023-07-06T12:13:25+02:00 Remove FIXME (JAXX 3.0.23 fix it) - - - - - b738487f by Tony Chemit at 2023-07-12T17:30:22+02:00 update pom - - - - - 9d954457 by Tony Chemit at 2023-07-12T17:30:22+02:00 Problème d'accès aux fonctions postgis - Closes #2757 - - - - - 5e6c417f by Tony Chemit at 2023-07-12T17:30:22+02:00 Amélioration du feedback en mode serveur - Closes #2758 - - - - - c228c1e4 by Tony Chemit at 2023-07-12T17:30:22+02:00 Sur le tableau d'affichage des lots de marché local, afficher le champ date - Closes #2753 - - - - - 07cd622b by Tony Chemit at 2023-07-12T17:30:22+02:00 L'action voir les utilisations du référentiel ne doit pas être accessible si l'utilisateur ne peut pas voir les données - Closes #2759 - - - - - 9d9ea87d by Tony Chemit at 2023-07-12T17:45:00+02:00 Sur l'UI référentiel Conditionnement, le champ poids moyen n'est pas visible - Closes #2752 - - - - - 6fbc4793 by Tony Chemit at 2023-07-12T19:03:20+02:00 Séquence du focus sur PS / Logbook / Activité - Closes #2747 - - - - - 24 changed files: - client/core/src/main/java/fr/ird/observe/client/datasource/api/action/FeedBackBuilderModel.java - client/core/src/main/java/fr/ird/observe/client/datasource/api/action/TechnicalErrorFeedBackBuilderModel.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/referential/ContentReferentialUI.jcss - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/referential/actions/ShowUsagesReferential.java - client/datasource/editor/ps/src/main/i18n/getters/jaxx.getter - client/datasource/editor/ps/src/main/i18n/getters/navigation.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/referential/localmarket/PackagingUI.jaxx - client/runner/src/main/assembly/dist/scripts/postgresql/extra/01_0_create-postgis-functions.sql - client/runner/src/main/assembly/dist/scripts/postgresql/extra/01_1_create-postgis-referential.sql - client/runner/src/main/assembly/dist/scripts/postgresql/extra/01_2_create-postgis-ps.sql - client/runner/src/main/assembly/dist/scripts/postgresql/extra/01_3_create-postgis-ll.sql - core/api/dto-decoration/src/main/i18n/getters/labels.getter - core/services/i18n/src/main/i18n/translations/services_en_GB.properties - core/services/i18n/src/main/i18n/translations/services_es_ES.properties - core/services/i18n/src/main/i18n/translations/services_fr_FR.properties - doc/specs/azti-2023/observe-azti-2023.md - model/src/main/models/Observe/dto/class/containerChildDataDtoProperties.properties - pom.xml - toolkit/api-datasource/src/main/java/fr/ird/observe/datasource/security/WithPermission.java - toolkit/api/src/main/java/fr/ird/observe/dto/ObserveUtil.java - toolkit/persistence/src/main/java/org/nuiton/topia/persistence/security/SecurityScriptHelper.java Changes: ===================================== client/core/src/main/java/fr/ird/observe/client/datasource/api/action/FeedBackBuilderModel.java ===================================== @@ -24,6 +24,8 @@ package fr.ird.observe.client.datasource.api.action; import fr.ird.observe.client.configuration.ClientConfig; import fr.ird.observe.client.util.UIHelper; +import fr.ird.observe.dto.ObserveUtil; +import io.ultreia.java4all.http.HResponseErrorException; import io.ultreia.java4all.i18n.I18n; import org.nuiton.jaxx.runtime.context.JAXXContextEntryDef; import org.nuiton.jaxx.runtime.context.JAXXInitialContext; @@ -149,8 +151,15 @@ public abstract class FeedBackBuilderModel { public String getErrorStack() { StringWriter w = new StringWriter(); + Exception error = getError(); try (PrintWriter writer = new PrintWriter(w)) { - getError().printStackTrace(writer); + error.printStackTrace(writer); + } + if (error instanceof HResponseErrorException) { + w.append("\n-------------------------------------------------------------------------------------------\n"); + String prettyFormat = ObserveUtil.toPrettyFormat(((HResponseErrorException) error).getError().getMessage()); + w.append(prettyFormat); + w.append("\n-------------------------------------------------------------------------------------------\n"); } return w.toString(); } ===================================== client/core/src/main/java/fr/ird/observe/client/datasource/api/action/TechnicalErrorFeedBackBuilderModel.java ===================================== @@ -23,8 +23,10 @@ package fr.ird.observe.client.datasource.api.action; */ import fr.ird.observe.client.configuration.ClientConfig; +import fr.ird.observe.dto.ObserveUtil; import fr.ird.observe.dto.ProgressionModel; import io.ultreia.java4all.application.template.spi.GenerateTemplate; +import io.ultreia.java4all.http.HResponseErrorException; import io.ultreia.java4all.i18n.I18n; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; @@ -71,7 +73,14 @@ public class TechnicalErrorFeedBackBuilderModel extends FeedBackBuilderModel { ActionContext context = new ActionContext(new ProgressionModel(), config); TechnicalActionStep step = new TechnicalActionStep(context, false, true); step.setOutputError(error); - log.error("A technical error report", error); + StringBuilder message = new StringBuilder("A technical error report"); + if (error instanceof HResponseErrorException) { + message.append("\n-------------------------------------------------------------------------------------------\n"); + String prettyFormat = ObserveUtil.toPrettyFormat(((HResponseErrorException) error).getError().getMessage()); + message.append(prettyFormat); + message.append("\n-------------------------------------------------------------------------------------------\n"); + } + log.error(message.toString(), error); step.setOutputState(ActionStepOutputState.FAILED); return step; } ===================================== client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/referential/ContentReferentialUI.jcss ===================================== @@ -98,10 +98,6 @@ JLabel { enabled:{!states.isCreatingMode() && (states.isEditing() || states.isSelectedBean())}; } -#showUsages { - enabled:{showTechnicalInformations.isEnabled()}; -} - #showUniqueKeys { enabled:{showTechnicalInformations.isEnabled()}; } ===================================== client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/referential/actions/ShowUsagesReferential.java ===================================== @@ -22,10 +22,12 @@ package fr.ird.observe.client.datasource.editor.api.content.referential.actions; * #L% */ +import fr.ird.observe.client.datasource.api.ObserveSwingDataSource; import fr.ird.observe.client.datasource.editor.api.ObserveKeyStrokesEditorApi; import fr.ird.observe.client.datasource.editor.api.content.actions.ConfigureMenuAction; import fr.ird.observe.client.datasource.editor.api.content.referential.ContentReferentialUI; import fr.ird.observe.client.datasource.editor.api.content.referential.ContentReferentialUIModel; +import fr.ird.observe.client.datasource.editor.api.content.referential.ContentReferentialUIModelStates; import fr.ird.observe.client.datasource.usage.UsageForDisplayUI; import fr.ird.observe.client.datasource.usage.UsagesGetter; import fr.ird.observe.decoration.DecoratorService; @@ -57,6 +59,11 @@ public final class ShowUsagesReferential<D extends ReferentialDto, R extends Ref public static <D extends ReferentialDto, R extends ReferentialDtoReference, U extends ContentReferentialUI<D, R, U>> void installAction(U ui) { ShowUsagesReferential<D, R, U> action = new ShowUsagesReferential<>(ui.getModel().getScope().getMainType()); init(ui, ui.getShowUsages(), action); + ui.getModel().getStates().addPropertyChangeListener(ContentReferentialUIModelStates.PROPERTY_SELECTED_BEAN_REFERENCE, evt -> { + ReferentialDtoReference newValue = (ReferentialDtoReference) evt.getNewValue(); + ObserveSwingDataSource mainDataSource = ui.getModel().getDataSourcesManager().getMainDataSource(); + action.setEnabled(newValue != null && (mainDataSource.isLocal() || mainDataSource.canReadAll())); + }); } public ShowUsagesReferential(Class<D> dataType) { ===================================== client/datasource/editor/ps/src/main/i18n/getters/jaxx.getter ===================================== @@ -268,5 +268,6 @@ observe.referential.ps.localmarket.Buyer.email observe.referential.ps.localmarket.Buyer.phone observe.referential.ps.localmarket.Packaging.batchComposition observe.referential.ps.localmarket.Packaging.batchWeightType +observe.referential.ps.localmarket.Packaging.meanWeight observe.ui.view.form observe.ui.view.message ===================================== client/datasource/editor/ps/src/main/i18n/getters/navigation.getter ===================================== @@ -67,6 +67,8 @@ observe.data.ps.localmarket.Batch.action.save observe.data.ps.localmarket.Batch.action.save.tip observe.data.ps.localmarket.Batch.count observe.data.ps.localmarket.Batch.count.short +observe.data.ps.localmarket.Batch.date +observe.data.ps.localmarket.Batch.date.short observe.data.ps.localmarket.Batch.title observe.data.ps.localmarket.Batch.type observe.data.ps.localmarket.Batch.weight ===================================== client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/logbook/ActivityUI.jaxx ===================================== @@ -19,7 +19,8 @@ --> <fr.ird.observe.client.datasource.editor.api.content.data.open.ContentOpenableUI - beanScope="bean" i18n="fr.ird.observe.dto.data.ps.logbook.ActivityDto" superGenericType='ActivityDto, ActivityUI'> + beanScope="bean" i18n="fr.ird.observe.dto.data.ps.logbook.ActivityDto" + superGenericType='ActivityDto, ActivityUI'> <import> fr.ird.observe.dto.data.ps.logbook.ActivityDto @@ -70,226 +71,230 @@ </BeanValidator> <JPanel id="contentBody" layout='{new BorderLayout()}'> - <Table insets="0" fill="both" constraints='BorderLayout.CENTER'> - <row> - <cell anchor="north" weightx="1"> - <JTabbedPane id='mainTabbedPane'> - <tab id='generalTab' i18nProperty=""> - <Table fill="both" anchor="north"> + <JTabbedPane id='mainTabbedPane' constraints='BorderLayout.NORTH'> + <tab id='generalTab' i18nProperty=""> + <Table fill="both" anchor="north"> + <row> + <cell columns="2"> + <Table fill="both"> + <row> + <cell> + <JLabel styleClass="skipI18n"/> + </cell> + </row> <row> <cell anchor='west'> <JLabel id='numberLabel'/> </cell> - <cell anchor="east"> + <cell anchor="east" weightx="1"> <NumberEditor id='number' styleClass="int6"/> </cell> - <cell rows="2" fill="both" columns="2" weightx="1"> - <JPanel layout="{new BorderLayout()}"> - <JLabel id='coordinateLabel' constraints='BorderLayout.NORTH' styleClass="center"/> - <CoordinatesEditor id='coordinate' constraints='BorderLayout.CENTER'/> - </JPanel> - </cell> </row> <row> <cell columns="2"> <TimeEditor id='time' styleClass="i18n"/> </cell> </row> + </Table> + </cell> + <cell fill="both" columns="2" weightx="1"> + <JPanel layout="{new BorderLayout()}"> + <JLabel id='coordinateLabel' constraints='BorderLayout.NORTH' styleClass="center"/> + <CoordinatesEditor id='coordinate' constraints='BorderLayout.CENTER'/> + </JPanel> + </cell> + </row> + <row> + <cell anchor='west' columns="4"> + <JPanel layout="{new GridLayout(0, 1)}"> + <JLabel id='vesselActivityInformation' styleClass="skipI18n information"/> + <JLabel id='vesselActivityInformation2' styleClass="skipI18n information"/> + </JPanel> + </cell> + </row> + <row> + <cell anchor='west'> + <JLabel id='vesselActivityLabel'/> + </cell> + <cell anchor='east' columns="3"> + <FilterableComboBox id='vesselActivity' genericType='VesselActivityReference'/> + </cell> + </row> + <row> + <cell anchor='west'> + <JLabel id='fpaZoneLabel'/> + </cell> + <cell columns="3"> + <FilterableComboBox id='fpaZone' genericType='FpaZoneReference'/> + </cell> + </row> + <row> + <cell anchor='west'> + <JLabel id='originalDataModifiedLabel'/> + </cell> + <cell anchor='west'> + <BeanCheckBox id='originalDataModified' styleClass="skipI18n"/> + </cell> + <cell anchor='center' fill="both" rows="2" columns="2"> + <JPanel layout="{new BorderLayout()}"> + <JLabel id='coordinateOriginalLabel' constraints='BorderLayout.NORTH' styleClass="center"/> + <JButton id='copyFirstCoordinate'/> + <CoordinatesEditor id='coordinateOriginal' constraints='BorderLayout.CENTER'/> + </JPanel> + </cell> + </row> + <row> + <cell anchor='west'> + <JLabel id='vmsDivergentLabel'/> + </cell> + <cell anchor='west'> + <BeanCheckBox id='vmsDivergent' styleClass="skipI18n"/> + </cell> + </row> + <row> + <cell anchor='west'> + <JLabel id='dataQualityLabel'/> + </cell> + <cell columns="3"> + <FilterableComboBox id='dataQuality' genericType='DataQualityReference'/> + </cell> + </row> + <row> + <cell> + <JLabel id='informationSourceLabel'/> + </cell> + <cell columns="3"> + <FilterableComboBox id='informationSource' genericType='InformationSourceReference'/> + </cell> + </row> + <row> + <cell anchor='west'> + <JLabel id='relatedObservedActivityLabel'/> + </cell> + <cell columns="3"> + <FilterableComboBox id='relatedObservedActivity' genericType='fr.ird.observe.dto.data.ps.observation.ActivityReference'/> + </cell> + </row> + <row> + <cell columns="4"> + <BigTextEditor id="comment"/> + </cell> + </row> + </Table> + </tab> + <tab id='measurementsTab' i18nProperty=""> + <Table insets='0' weightx="1" weighty="1"> + <row> + <cell fill="both"> + <Table fill="both" id="physicalMeasurements"> <row> - <cell anchor='west' columns="4"> - <JPanel layout="{new GridLayout(0, 1)}"> - <JLabel id='vesselActivityInformation' styleClass="skipI18n information"/> - <JLabel id='vesselActivityInformation2' styleClass="skipI18n information"/> - </JPanel> + <cell anchor='west'> + <JLabel id='seaSurfaceTemperatureLabel'/> + </cell> + <cell anchor='east' weightx="1"> + <TemperatureEditor id='seaSurfaceTemperature'/> </cell> </row> <row> - <cell anchor='west'> - <JLabel id='vesselActivityLabel'/> + <cell> + <JLabel id='windLabel'/> </cell> - <cell anchor='east' columns="3"> - <FilterableComboBox id='vesselActivity' genericType='VesselActivityReference'/> + <cell> + <FilterableComboBox id='wind' genericType='WindReference'/> </cell> </row> <row> - <cell anchor='west'> - <JLabel id='fpaZoneLabel'/> + <cell> + <JLabel id='windDirectionLabel'/> </cell> - <cell columns="3"> - <FilterableComboBox id='fpaZone' genericType='FpaZoneReference'/> + <cell> + <NumberEditor id='windDirection' styleClass="int6"/> </cell> </row> <row> - <cell anchor='west'> - <JLabel id='originalDataModifiedLabel'/> - </cell> - <cell anchor='west'> - <BeanCheckBox id='originalDataModified' styleClass="skipI18n"/> + <cell> + <JLabel id='currentSpeedLabel'/> </cell> - <cell anchor='center' fill="both" rows="2" columns="2"> - <JPanel layout="{new BorderLayout()}"> - <JLabel id='coordinateOriginalLabel' constraints='BorderLayout.NORTH' styleClass="center"/> - <JButton id='copyFirstCoordinate'/> - <CoordinatesEditor id='coordinateOriginal' constraints='BorderLayout.CENTER'/> - </JPanel> + <cell> + <NumberEditor id='currentSpeed' styleClass="float1"/> </cell> </row> <row> - <cell anchor='west'> - <JLabel id='vmsDivergentLabel'/> + <cell> + <JLabel id='currentDirectionLabel'/> </cell> - <cell anchor='west'> - <BeanCheckBox id='vmsDivergent' styleClass="skipI18n"/> + <cell> + <NumberEditor id='currentDirection' styleClass="int6"/> </cell> </row> + </Table> + </cell> + </row> + <row> + <cell fill="both"> + <Table fill="both" id="setMeasurements"> <row> <cell anchor='west'> - <JLabel id='dataQualityLabel'/> + <JLabel id='reasonForNoFishingLabel'/> </cell> - <cell columns="3"> - <FilterableComboBox id='dataQuality' genericType='DataQualityReference'/> + <cell anchor='east'> + <FilterableComboBox id='reasonForNoFishing' genericType='ReasonForNoFishingReference' styleClass="setEnabled"/> </cell> </row> <row> - <cell> - <JLabel id='informationSourceLabel'/> + <cell anchor='west'> + <JLabel id='setSuccessStatusLabel'/> </cell> - <cell columns="3"> - <FilterableComboBox id='informationSource' genericType='InformationSourceReference'/> + <cell anchor='east'> + <FilterableComboBox id='setSuccessStatus' genericType='SetSuccessStatusReference' styleClass="reasonForNoFishingNotFilled"/> </cell> </row> <row> <cell anchor='west'> - <JLabel id='relatedObservedActivityLabel'/> + <JLabel id='reasonForNullSetLabel'/> </cell> - <cell columns="3"> - <FilterableComboBox id='relatedObservedActivity' genericType='fr.ird.observe.dto.data.ps.observation.ActivityReference'/> + <cell anchor='east' fill='both'> + <FilterableComboBox id='reasonForNullSet' genericType='ReasonForNullSetReference'/> </cell> </row> - </Table> - </tab> - <tab id='measurementsTab' i18nProperty=""> - <Table insets='0' weightx="1" weighty="1"> <row> - <cell fill="both"> - <Table fill="both" id="physicalMeasurements"> - <row> - <cell anchor='west'> - <JLabel id='seaSurfaceTemperatureLabel'/> - </cell> - <cell anchor='east' weightx="1"> - <TemperatureEditor id='seaSurfaceTemperature'/> - </cell> - </row> - <row> - <cell> - <JLabel id='windLabel'/> - </cell> - <cell> - <FilterableComboBox id='wind' genericType='WindReference'/> - </cell> - </row> - <row> - <cell> - <JLabel id='windDirectionLabel'/> - </cell> - <cell> - <NumberEditor id='windDirection' styleClass="int6"/> - </cell> - </row> - <row> - <cell> - <JLabel id='currentSpeedLabel'/> - </cell> - <cell> - <NumberEditor id='currentSpeed' styleClass="float1"/> - </cell> - </row> - <row> - <cell> - <JLabel id='currentDirectionLabel'/> - </cell> - <cell> - <NumberEditor id='currentDirection' styleClass="int6"/> - </cell> - </row> - </Table> + <cell anchor='west'> + <JLabel id='schoolTypeLabel'/> + </cell> + <cell anchor='east' weightx="1"> + <FilterableComboBox id='schoolType' genericType='SchoolTypeReference' styleClass="reasonForNoFishingNotFilled"/> </cell> </row> <row> - <cell fill="both"> - <Table fill="both" id="setMeasurements"> - <row> - <cell anchor='west'> - <JLabel id='reasonForNoFishingLabel'/> - </cell> - <cell anchor='east'> - <FilterableComboBox id='reasonForNoFishing' genericType='ReasonForNoFishingReference' styleClass="setEnabled"/> - </cell> - </row> - <row> - <cell anchor='west'> - <JLabel id='setSuccessStatusLabel'/> - </cell> - <cell anchor='east'> - <FilterableComboBox id='setSuccessStatus' genericType='SetSuccessStatusReference' styleClass="reasonForNoFishingNotFilled"/> - </cell> - </row> - <row> - <cell anchor='west'> - <JLabel id='reasonForNullSetLabel'/> - </cell> - <cell anchor='east' fill='both'> - <FilterableComboBox id='reasonForNullSet' genericType='ReasonForNullSetReference'/> - </cell> - </row> - <row> - <cell anchor='west'> - <JLabel id='schoolTypeLabel'/> - </cell> - <cell anchor='east' weightx="1"> - <FilterableComboBox id='schoolType' genericType='SchoolTypeReference' styleClass="reasonForNoFishingNotFilled"/> - </cell> - </row> - <row> - <cell anchor='west'> - <JLabel id='setCountLabel'/> - </cell> - <cell anchor='east' fill="both"> - <NumberEditor id='setCount' styleClass="int6 reasonForNoFishingNotFilled"/> - </cell> - </row> - <row> - <cell> - <JLabel id='totalWeightLabel'/> - </cell> - <cell> - <NumberEditor id='totalWeight' styleClass="float3 reasonForNoFishingNotFilled"/> - </cell> - </row> - </Table> + <cell anchor='west'> + <JLabel id='setCountLabel'/> + </cell> + <cell anchor='east' fill="both"> + <NumberEditor id='setCount' styleClass="int6 reasonForNoFishingNotFilled"/> </cell> </row> <row> - <cell weighty="1"> - <JLabel styleClass="skipI18n"/> + <cell> + <JLabel id='totalWeightLabel'/> + </cell> + <cell> + <NumberEditor id='totalWeight' styleClass="float3 reasonForNoFishingNotFilled"/> </cell> </row> </Table> - - </tab> - <tab id="observedSystemTab" i18nProperty=""> - <DoubleList id='observedSystem' genericType='ObservedSystemReference'/> - </tab> - </JTabbedPane> - </cell> - </row> - <row> - <cell fill="both" weighty="1"> - <BigTextEditor id="comment"/> - </cell> - </row> - </Table> + </cell> + </row> + <row> + <cell weighty="1"> + <JLabel styleClass="skipI18n"/> + </cell> + </row> + </Table> + </tab> + <tab id="observedSystemTab" i18nProperty=""> + <DoubleList id='observedSystem' genericType='ObservedSystemReference'/> + </tab> + </JTabbedPane> </JPanel> <JMenuItem id='addSet'/> ===================================== client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/logbook/ActivityUI.jcss ===================================== @@ -58,6 +58,10 @@ border:{new TitledBorder(t("observe.data.ps.logbook.Activity.setMeasurements") + " ")}; } +#copyFirstCoordinate { + focusable:false; +} + .setEnabled { enabled:{states.isSetEnabled()}; } ===================================== client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/logbook/ActivityUIHandler.java ===================================== @@ -100,16 +100,10 @@ class ActivityUIHandler extends GeneratedActivityUIHandler { ActivityUI ui = getUi(); - ActivityDto bean = getModel().getStates().getBean(); if (Objects.equals(true, newValue)) { // original data modified ui.getCoordinateOriginal().setEnabled(true); - //FIXME In jaxx should be done by previous statement - ui.getCoordinateOriginal().getGlobalResetButton().setEnabled(true); - ui.getCoordinateOriginal().getDmdFormat().setEnabled(true); - ui.getCoordinateOriginal().getDmsFormat().setEnabled(true); - ui.getCoordinateOriginal().getDdFormat().setEnabled(true); ui.getCopyFirstCoordinate().setEnabled(true); } else { @@ -117,11 +111,6 @@ class ActivityUIHandler extends GeneratedActivityUIHandler { // original data not modified ui.getCoordinateOriginal().getGlobalResetButton().doClick(); ui.getCoordinateOriginal().setEnabled(false); - //FIXME In jaxx should be done by previous statement - ui.getCoordinateOriginal().getGlobalResetButton().setEnabled(false); - ui.getCoordinateOriginal().getDmdFormat().setEnabled(false); - ui.getCoordinateOriginal().getDmsFormat().setEnabled(false); - ui.getCoordinateOriginal().getDdFormat().setEnabled(false); ui.getCopyFirstCoordinate().setEnabled(false); } } ===================================== client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/referential/localmarket/PackagingUI.jaxx ===================================== @@ -32,6 +32,7 @@ fr.ird.observe.dto.referential.common.HarbourReference org.nuiton.jaxx.widgets.datetime.DateEditor + org.nuiton.jaxx.widgets.number.NumberEditor org.nuiton.jaxx.widgets.text.NormalTextEditor io.ultreia.java4all.jaxx.widgets.combobox.BeanEnumEditor io.ultreia.java4all.jaxx.widgets.choice.BeanCheckBox @@ -69,6 +70,14 @@ <FilterableComboBox id='batchWeightType' genericType='BatchWeightTypeReference'/> </cell> </row> + <row> + <cell anchor='west'> + <JLabel id='meanWeightLabel'/> + </cell> + <cell anchor='east' weightx="1" fill="both"> + <NumberEditor id='meanWeight' styleClass="float4"/> + </cell> + </row> <row> <cell anchor='west'> <JLabel id='validityDateRangeLabel'/> ===================================== client/runner/src/main/assembly/dist/scripts/postgresql/extra/01_0_create-postgis-functions.sql ===================================== @@ -41,7 +41,7 @@ BEGIN return NEW; END IF; RAISE NOTICE 'Will compute the_geom for %.% % - latitude % and longitude %', TG_TABLE_SCHEMA, TG_TABLE_NAME, NEW.topiaId, NEW.latitude, NEW.longitude; - NEW.the_geom := ST_SetSRID(ST_MakePoint(NEW.longitude::double precision, NEW.latitude::double precision), 4326); + NEW.the_geom := public.ST_SetSRID(public.ST_MakePoint(NEW.longitude, NEW.latitude), 4326); RAISE NOTICE 'Computed for %.% % latitude % and longitude %, the_geom %', TG_TABLE_SCHEMA, TG_TABLE_NAME, NEW.topiaId, NEW.latitude, NEW.longitude, NEW.the_geom; RETURN NEW; END @@ -69,7 +69,7 @@ BEGIN return NEW; END IF; RAISE NOTICE 'Will compute the_geom for %.% % - latitudeOriginal % and longitudeOriginal %', TG_TABLE_SCHEMA, TG_TABLE_NAME, NEW.topiaId, NEW.latitudeOriginal, NEW.longitudeOriginal; - NEW.the_geom_original := ST_SetSRID(ST_MakePoint(NEW.longitudeOriginal::double precision, NEW.latitudeOriginal::double precision), 4326); + NEW.the_geom_original := public.ST_SetSRID(public.ST_MakePoint(NEW.longitudeOriginal, NEW.latitudeOriginal), 4326); RAISE NOTICE 'Computed for %.% % latitudeOriginal % and longitudeOriginal %, the_geom_original %', TG_TABLE_SCHEMA, TG_TABLE_NAME, NEW.topiaId, NEW.latitudeOriginal, NEW.longitudeOriginal, NEW.the_geom_original; RETURN NEW; END @@ -98,7 +98,7 @@ BEGIN return NEW; END IF; RAISE NOTICE 'Will compute the_geom for %.% % - settingStartLatitude % and settingStartLongitude %', TG_TABLE_SCHEMA, TG_TABLE_NAME, NEW.topiaId, NEW.settingStartLatitude, NEW.settingStartLongitude; - NEW.the_geom_settingStart := ST_SetSRID(ST_MakePoint(NEW.settingStartLongitude::double precision, NEW.settingStartLatitude::double precision), 4326); + NEW.the_geom_settingStart := public.ST_SetSRID(public.ST_MakePoint(NEW.settingStartLongitude, NEW.settingStartLatitude), 4326); RAISE NOTICE 'Computed for %.% % settingStartLatitude % and settingStartLongitude %, the_geom_settingStart %', TG_TABLE_SCHEMA, TG_TABLE_NAME, NEW.topiaId, NEW.settingStartLatitude, NEW.settingStartLongitude, NEW.the_geom_settingStart; RETURN NEW; END @@ -126,7 +126,7 @@ BEGIN return NEW; END IF; RAISE NOTICE 'Will compute the_geom for %.% % - settingEndLatitude % and settingEndLongitude %', TG_TABLE_SCHEMA, TG_TABLE_NAME, NEW.topiaId, NEW.settingEndLatitude, NEW.settingEndLongitude; - NEW.the_geom_settingEnd := ST_SetSRID(ST_MakePoint(NEW.settingEndLongitude::double precision, NEW.settingEndLatitude::double precision), 4326); + NEW.the_geom_settingEnd := public.ST_SetSRID(public.ST_MakePoint(NEW.settingEndLongitude, NEW.settingEndLatitude), 4326); RAISE NOTICE 'Computed for %.% % settingEndLatitude % and settingEndLongitude %, the_geom_settingEnd %', TG_TABLE_SCHEMA, TG_TABLE_NAME, NEW.topiaId, NEW.settingEndLatitude, NEW.settingEndLongitude, NEW.the_geom_settingEnd; RETURN NEW; END @@ -154,7 +154,7 @@ BEGIN return NEW; END IF; RAISE NOTICE 'Will compute the_geom for %.% % - haulingStartLatitude % and haulingStartLongitude %', TG_TABLE_SCHEMA, TG_TABLE_NAME, NEW.topiaId, NEW.haulingStartLatitude, NEW.haulingStartLongitude; - NEW.the_geom_haulingStart := ST_SetSRID(ST_MakePoint(NEW.haulingStartLongitude::double precision, NEW.haulingStartLatitude::double precision), 4326); + NEW.the_geom_haulingStart := public.ST_SetSRID(public.ST_MakePoint(NEW.haulingStartLongitude, NEW.haulingStartLatitude), 4326); RAISE NOTICE 'Computed for %.% % haulingStartLatitude % and haulingStartLongitude %, the_geom_haulingStart %', TG_TABLE_SCHEMA, TG_TABLE_NAME, NEW.topiaId, NEW.haulingStartLatitude, NEW.haulingStartLongitude, NEW.the_geom_haulingStart; RETURN NEW; END @@ -182,7 +182,7 @@ BEGIN return NEW; END IF; RAISE NOTICE 'Will compute the_geom for %.% % - haulingEndLatitude % and haulingEndLongitude %', TG_TABLE_SCHEMA, TG_TABLE_NAME, NEW.topiaId, NEW.haulingEndLatitude, NEW.haulingEndLongitude; - NEW.the_geom_haulingEnd := ST_SetSRID(ST_MakePoint(NEW.haulingEndLongitude::double precision, NEW.haulingEndLatitude::double precision), 4326); + NEW.the_geom_haulingEnd := public.ST_SetSRID(public.ST_MakePoint(NEW.haulingEndLongitude, NEW.haulingEndLatitude), 4326); RAISE NOTICE 'Computed for %.% % haulingEndLatitude % and haulingEndLongitude %, the_geom_haulingEnd %', TG_TABLE_SCHEMA, TG_TABLE_NAME, NEW.topiaId, NEW.haulingEndLatitude, NEW.haulingEndLongitude, NEW.the_geom_haulingEnd; RETURN NEW; END ===================================== client/runner/src/main/assembly/dist/scripts/postgresql/extra/01_1_create-postgis-referential.sql ===================================== @@ -23,4 +23,4 @@ ALTER TABLE common.harbour ADD COLUMN the_geom geometry(Point, 4326); CREATE INDEX IF NOT EXISTS idx_harbour_gist ON common.harbour USING GIST (the_geom); DROP TRIGGER IF EXISTS tr_sync_common_harbour_the_geom ON common.harbour; CREATE TRIGGER tr_sync_common_harbour_the_geom BEFORE INSERT OR UPDATE OF latitude, longitude ON common.harbour FOR EACH ROW EXECUTE PROCEDURE sync_the_geom_default(); -UPDATE common.harbour SET the_geom = ST_SetSRID(ST_MakePoint(longitude::double precision,latitude::double precision), 4326) WHERE latitude IS NOT NULL AND longitude IS NOT NULL AND the_geom IS NULL; +UPDATE common.harbour SET the_geom = public.ST_SetSRID(public.ST_MakePoint(longitude,latitude), 4326) WHERE latitude IS NOT NULL AND longitude IS NOT NULL AND the_geom IS NULL; ===================================== client/runner/src/main/assembly/dist/scripts/postgresql/extra/01_2_create-postgis-ps.sql ===================================== @@ -24,29 +24,29 @@ ALTER TABLE ps_observation.activity ADD COLUMN the_geom geometry(Point, 4326); CREATE INDEX IF NOT EXISTS idx_ps_observation_activity_gist ON ps_observation.activity USING GIST (the_geom); DROP TRIGGER IF EXISTS tr_sync_ps_observation_activity_the_geom ON ps_observation.activity; CREATE TRIGGER tr_sync_ps_observation_activity_the_geom BEFORE INSERT OR UPDATE OF latitude, longitude ON ps_observation.activity FOR EACH ROW EXECUTE PROCEDURE sync_the_geom_default(); -UPDATE ps_observation.activity SET the_geom = ST_SetSRID(ST_MakePoint(longitude::double precision,latitude::double precision), 4326) WHERE latitude IS NOT NULL AND longitude IS NOT NULL AND the_geom IS NULL; +UPDATE ps_observation.activity SET the_geom = public.ST_SetSRID(public.ST_MakePoint(longitude,latitude), 4326) WHERE latitude IS NOT NULL AND longitude IS NOT NULL AND the_geom IS NULL; ALTER TABLE ps_observation.transmittingbuoy ADD COLUMN the_geom geometry(Point, 4326); CREATE INDEX IF NOT EXISTS idx_ps_observation_transmittingbuoy_gist ON ps_observation.TransmittingBuoy USING GIST (the_geom); DROP TRIGGER IF EXISTS tr_sync_ps_observation_transmittingbuoy_the_geom ON ps_observation.TransmittingBuoy; CREATE TRIGGER tr_sync_ps_observation_transmittingbuoy_the_geom BEFORE INSERT OR UPDATE OF latitude, longitude ON ps_observation.TransmittingBuoy FOR EACH ROW EXECUTE PROCEDURE sync_the_geom_default(); -UPDATE ps_observation.TransmittingBuoy SET the_geom = ST_SetSRID(ST_MakePoint(longitude::double precision, latitude::double precision), 4326) WHERE latitude IS NOT NULL AND longitude IS NOT NULL AND the_geom IS NULL; +UPDATE ps_observation.TransmittingBuoy SET the_geom = public.ST_SetSRID(public.ST_MakePoint(longitude, latitude), 4326) WHERE latitude IS NOT NULL AND longitude IS NOT NULL AND the_geom IS NULL; ALTER TABLE ps_logbook.activity ADD COLUMN the_geom geometry(Point, 4326); CREATE INDEX IF NOT EXISTS idx_ps_logbook_activity_gist ON ps_logbook.activity USING GIST (the_geom); DROP TRIGGER IF EXISTS tr_sync_ps_logbook_activity_the_geom ON ps_logbook.activity; CREATE TRIGGER tr_sync_ps_logbook_activity_the_geom BEFORE INSERT OR UPDATE OF latitude, longitude ON ps_logbook.activity FOR EACH ROW EXECUTE PROCEDURE sync_the_geom_default(); -UPDATE ps_logbook.activity SET the_geom = ST_SetSRID(ST_MakePoint(longitude::double precision,latitude::double precision), 4326) WHERE latitude IS NOT NULL AND longitude IS NOT NULL AND the_geom IS NULL; +UPDATE ps_logbook.activity SET the_geom = public.ST_SetSRID(public.ST_MakePoint(longitude,latitude), 4326) WHERE latitude IS NOT NULL AND longitude IS NOT NULL AND the_geom IS NULL; ALTER TABLE ps_logbook.activity ADD COLUMN the_geom_original geometry(Point, 4326); CREATE INDEX IF NOT EXISTS idx_ps_logbook_activity_original_gist ON ps_logbook.activity USING GIST (the_geom_original); DROP TRIGGER IF EXISTS tr_sync_ps_logbook_activity_the_geom_original ON ps_logbook.activity; CREATE TRIGGER tr_sync_ps_logbook_activity_the_geom_original BEFORE INSERT OR UPDATE OF latitudeOriginal, longitudeOriginal ON ps_logbook.activity FOR EACH ROW EXECUTE PROCEDURE sync_the_geom_original(); -UPDATE ps_logbook.activity SET the_geom_original = ST_SetSRID(ST_MakePoint(latitudeOriginal::double precision, longitudeOriginal::double precision), 4326) WHERE latitudeOriginal IS NOT NULL AND longitudeOriginal IS NOT NULL AND the_geom_original IS NULL; +UPDATE ps_logbook.activity SET the_geom_original = public.ST_SetSRID(public.ST_MakePoint(latitudeOriginal, longitudeOriginal), 4326) WHERE latitudeOriginal IS NOT NULL AND longitudeOriginal IS NOT NULL AND the_geom_original IS NULL; ALTER TABLE ps_logbook.transmittingbuoy ADD COLUMN the_geom geometry(Point, 4326); CREATE INDEX IF NOT EXISTS idx_ps_logbook_transmittingbuoy_gist ON ps_logbook.TransmittingBuoy USING GIST (the_geom); DROP TRIGGER IF EXISTS tr_sync_ps_logbook_transmittingbuoy_the_geom ON ps_logbook.TransmittingBuoy; CREATE TRIGGER tr_sync_ps_logbook_transmittingbuoy_the_geom BEFORE INSERT OR UPDATE OF latitude, longitude ON ps_logbook.TransmittingBuoy FOR EACH ROW EXECUTE PROCEDURE sync_the_geom_default(); -UPDATE ps_logbook.TransmittingBuoy SET the_geom = ST_SetSRID(ST_MakePoint(longitude::double precision, latitude::double precision), 4326) WHERE latitude IS NOT NULL AND longitude IS NOT NULL AND the_geom IS NULL; +UPDATE ps_logbook.TransmittingBuoy SET the_geom = public.ST_SetSRID(public.ST_MakePoint(longitude, latitude), 4326) WHERE latitude IS NOT NULL AND longitude IS NOT NULL AND the_geom IS NULL; ===================================== client/runner/src/main/assembly/dist/scripts/postgresql/extra/01_3_create-postgis-ll.sql ===================================== @@ -24,68 +24,68 @@ ALTER TABLE ll_observation.activity ADD COLUMN the_geom geometry(Point, 4326); CREATE INDEX IF NOT EXISTS idx_ll_observation_activity_gist ON ll_observation.activity USING GIST (the_geom); DROP TRIGGER IF EXISTS tr_sync_ll_observation_activity_the_geom ON ll_observation.activity; CREATE TRIGGER tr_sync_ll_observation_activity_the_geom BEFORE INSERT OR UPDATE OF latitude, longitude ON ll_observation.activity FOR EACH ROW EXECUTE PROCEDURE sync_the_geom_default(); -UPDATE ll_observation.activity SET the_geom = ST_SetSRID(ST_MakePoint(longitude::double precision, latitude::double precision), 4326) WHERE the_geom IS NULL; +UPDATE ll_observation.activity SET the_geom = public.ST_SetSRID(public.ST_MakePoint(longitude, latitude), 4326) WHERE the_geom IS NULL; ALTER TABLE ll_observation.set ADD COLUMN the_geom_settingstart geometry(Point, 4326); -DROP INDEX IF EXISTS idx_ll_observation_set_gist_settingstart; -CREATE INDEX IF NOT EXISTS idx_ll_observation_set_gist_settingstart ON ll_observation.set USING GIST (the_geom_settingstart); +DROP INDEX IF EXISTS idx_ll_observation_set_gipublic.ST_settingstart; +CREATE INDEX IF NOT EXISTS idx_ll_observation_set_gipublic.ST_settingstart ON ll_observation.set USING GIST (the_geom_settingstart); DROP TRIGGER IF EXISTS tr_sync_ll_observation_set_the_geom_settingstart ON ll_observation.set; CREATE TRIGGER tr_sync_ll_observation_set_the_geom_settingstart BEFORE INSERT OR UPDATE OF settingStartLatitude, settingStartLongitude ON ll_observation.set FOR EACH ROW EXECUTE PROCEDURE sync_the_geom_settingStart(); -UPDATE ll_observation.set SET the_geom_settingstart = ST_SetSRID(ST_MakePoint(settingStartLongitude::double precision, settingStartLatitude::double precision), 4326) WHERE the_geom_settingstart IS NULL; +UPDATE ll_observation.set SET the_geom_settingstart = public.ST_SetSRID(public.ST_MakePoint(settingStartLongitude, settingStartLatitude), 4326) WHERE the_geom_settingstart IS NULL; ALTER TABLE ll_observation.set ADD COLUMN the_geom_settingend geometry(Point, 4326); -DROP INDEX IF EXISTS idx_ll_observation_set_gist_settingend; -CREATE INDEX IF NOT EXISTS idx_ll_observation_set_gist_settingend ON ll_observation.set USING GIST (the_geom_settingend); +DROP INDEX IF EXISTS idx_ll_observation_set_gipublic.ST_settingend; +CREATE INDEX IF NOT EXISTS idx_ll_observation_set_gipublic.ST_settingend ON ll_observation.set USING GIST (the_geom_settingend); DROP TRIGGER IF EXISTS tr_sync_ll_observation_set_the_geom_settingend ON ll_observation.set; CREATE TRIGGER tr_sync_ll_observation_set_the_geom_settingend BEFORE INSERT OR UPDATE OF settingEndLatitude, settingEndLongitude ON ll_observation.set FOR EACH ROW EXECUTE PROCEDURE sync_the_geom_settingEnd(); -UPDATE ll_observation.set SET the_geom_settingend = ST_SetSRID(ST_MakePoint(settingEndLongitude::double precision, settingEndLatitude::double precision), 4326) WHERE the_geom_settingend IS NULL; +UPDATE ll_observation.set SET the_geom_settingend = public.ST_SetSRID(public.ST_MakePoint(settingEndLongitude, settingEndLatitude), 4326) WHERE the_geom_settingend IS NULL; ALTER TABLE ll_observation.set ADD COLUMN the_geom_haulingstart geometry(Point, 4326); -DROP INDEX IF EXISTS idx_ll_observation_set_gist_haulingstart; -CREATE INDEX IF NOT EXISTS idx_ll_observation_set_gist_haulingstart ON ll_observation.set USING GIST (the_geom_haulingstart); +DROP INDEX IF EXISTS idx_ll_observation_set_gipublic.ST_haulingstart; +CREATE INDEX IF NOT EXISTS idx_ll_observation_set_gipublic.ST_haulingstart ON ll_observation.set USING GIST (the_geom_haulingstart); DROP TRIGGER IF EXISTS tr_sync_ll_observation_set_the_geom_haulingstart ON ll_observation.set; CREATE TRIGGER tr_sync_ll_observation_set_the_geom_haulingstart BEFORE INSERT OR UPDATE OF haulingStartLatitude, haulingStartLongitude ON ll_observation.set FOR EACH ROW EXECUTE PROCEDURE sync_the_geom_haulingStart(); -UPDATE ll_observation.set SET the_geom_haulingstart = ST_SetSRID(ST_MakePoint(haulingStartLongitude::double precision, haulingStartLatitude::double precision), 4326) WHERE the_geom_haulingstart IS NULL; +UPDATE ll_observation.set SET the_geom_haulingstart = public.ST_SetSRID(public.ST_MakePoint(haulingStartLongitude, haulingStartLatitude), 4326) WHERE the_geom_haulingstart IS NULL; ALTER TABLE ll_observation.set ADD COLUMN the_geom_haulingend geometry(Point, 4326); -DROP INDEX IF EXISTS idx_ll_observation_set_gist_haulingend; -CREATE INDEX IF NOT EXISTS idx_ll_observation_set_gist_haulingend ON ll_observation.set USING GIST (the_geom_haulingend); +DROP INDEX IF EXISTS idx_ll_observation_set_gipublic.ST_haulingend; +CREATE INDEX IF NOT EXISTS idx_ll_observation_set_gipublic.ST_haulingend ON ll_observation.set USING GIST (the_geom_haulingend); DROP TRIGGER IF EXISTS tr_sync_ll_observation_set_the_geom_haulingend ON ll_observation.set; CREATE TRIGGER tr_sync_ll_observation_set_the_geom_haulingend BEFORE INSERT OR UPDATE OF haulingEndLatitude, haulingEndLongitude ON ll_observation.set FOR EACH ROW EXECUTE PROCEDURE sync_the_geom_haulingEnd(); -UPDATE ll_observation.set SET the_geom_haulingend = ST_SetSRID(ST_MakePoint(haulingEndLongitude::double precision, haulingEndLatitude::double precision), 4326) WHERE the_geom_haulingend IS NULL; +UPDATE ll_observation.set SET the_geom_haulingend = public.ST_SetSRID(public.ST_MakePoint(haulingEndLongitude, haulingEndLatitude), 4326) WHERE the_geom_haulingend IS NULL; ALTER TABLE ll_logbook.activity ADD COLUMN the_geom geometry(Point, 4326); CREATE INDEX IF NOT EXISTS idx_ll_logbook_activity_gist ON ll_logbook.activity USING GIST (the_geom); DROP TRIGGER IF EXISTS tr_sync_ll_logbook_activity_the_geom ON ll_logbook.activity; CREATE TRIGGER tr_sync_ll_logbook_activity_the_geom BEFORE INSERT OR UPDATE OF latitude, longitude ON ll_logbook.activity FOR EACH ROW EXECUTE PROCEDURE sync_the_geom_default(); -UPDATE ll_logbook.activity SET the_geom = ST_SetSRID(ST_MakePoint(longitude, latitude), 4326) WHERE latitude IS NOT NULL AND longitude IS NOT NULL AND the_geom IS NULL; +UPDATE ll_logbook.activity SET the_geom = public.ST_SetSRID(public.ST_MakePoint(longitude, latitude), 4326) WHERE latitude IS NOT NULL AND longitude IS NOT NULL AND the_geom IS NULL; ALTER TABLE ll_logbook.set ADD COLUMN the_geom_settingstart geometry(Point, 4326); -CREATE INDEX IF NOT EXISTS idx_ll_logbook_set_gist_settingstart ON ll_logbook.set USING GIST (the_geom_settingstart); +CREATE INDEX IF NOT EXISTS idx_ll_logbook_set_gipublic.ST_settingstart ON ll_logbook.set USING GIST (the_geom_settingstart); DROP TRIGGER IF EXISTS tr_sync_ll_logbook_set_the_geom_settingstart ON ll_logbook.set; CREATE TRIGGER tr_sync_ll_logbook_set_the_geom_settingstart BEFORE INSERT OR UPDATE OF settingStartLatitude, settingStartLongitude ON ll_logbook.set FOR EACH ROW EXECUTE PROCEDURE sync_the_geom_settingStart(); -UPDATE ll_logbook.set SET the_geom_settingstart = ST_SetSRID(ST_MakePoint(settingStartLongitude::double precision, settingStartLatitude::double precision), 4326) WHERE settingStartLongitude IS NOT NULL AND settingStartLatitude IS NOT NULL AND the_geom_settingstart IS NULL; +UPDATE ll_logbook.set SET the_geom_settingstart = public.ST_SetSRID(public.ST_MakePoint(settingStartLongitude, settingStartLatitude), 4326) WHERE settingStartLongitude IS NOT NULL AND settingStartLatitude IS NOT NULL AND the_geom_settingstart IS NULL; ALTER TABLE ll_logbook.set ADD COLUMN the_geom_settingend geometry(Point, 4326); -CREATE INDEX IF NOT EXISTS idx_ll_logbook_set_gist_settingend ON ll_logbook.set USING GIST (the_geom_settingend); +CREATE INDEX IF NOT EXISTS idx_ll_logbook_set_gipublic.ST_settingend ON ll_logbook.set USING GIST (the_geom_settingend); DROP TRIGGER IF EXISTS tr_sync_ll_logbook_set_the_geom_settingend ON ll_logbook.set; CREATE TRIGGER tr_sync_ll_logbook_set_the_geom_settingend BEFORE INSERT OR UPDATE OF settingEndLatitude, settingEndLongitude ON ll_logbook.set FOR EACH ROW EXECUTE PROCEDURE sync_the_geom_settingEnd(); -UPDATE ll_logbook.set SET the_geom_settingend = ST_SetSRID(ST_MakePoint(settingEndLongitude::double precision, settingEndLatitude::double precision), 4326) WHERE settingEndLongitude IS NOT NULL AND settingEndLatitude IS NOT NULL AND the_geom_settingend IS NULL; +UPDATE ll_logbook.set SET the_geom_settingend = public.ST_SetSRID(public.ST_MakePoint(settingEndLongitude, settingEndLatitude), 4326) WHERE settingEndLongitude IS NOT NULL AND settingEndLatitude IS NOT NULL AND the_geom_settingend IS NULL; ALTER TABLE ll_logbook.set ADD COLUMN the_geom_haulingstart geometry(Point, 4326); -CREATE INDEX IF NOT EXISTS idx_ll_logbook_set_gist_haulingstart ON ll_logbook.set USING GIST (the_geom_haulingstart); +CREATE INDEX IF NOT EXISTS idx_ll_logbook_set_gipublic.ST_haulingstart ON ll_logbook.set USING GIST (the_geom_haulingstart); DROP TRIGGER IF EXISTS tr_sync_ll_logbook_set_the_geom_haulingstart ON ll_logbook.set; CREATE TRIGGER tr_sync_ll_logbook_set_the_geom_haulingstart BEFORE INSERT OR UPDATE OF haulingStartLatitude, haulingStartLongitude ON ll_logbook.set FOR EACH ROW EXECUTE PROCEDURE sync_the_geom_haulingStart(); -UPDATE ll_logbook.set SET the_geom_haulingstart = ST_SetSRID(ST_MakePoint(haulingStartLongitude::double precision, haulingStartLatitude::double precision), 4326) WHERE haulingStartLongitude IS NOT NULL AND haulingStartLatitude IS NOT NULL AND the_geom_haulingstart IS NULL; +UPDATE ll_logbook.set SET the_geom_haulingstart = public.ST_SetSRID(public.ST_MakePoint(haulingStartLongitude, haulingStartLatitude), 4326) WHERE haulingStartLongitude IS NOT NULL AND haulingStartLatitude IS NOT NULL AND the_geom_haulingstart IS NULL; ALTER TABLE ll_logbook.set ADD COLUMN the_geom_haulingend geometry(Point, 4326); -CREATE INDEX IF NOT EXISTS idx_ll_logbook_set_gist_haulingend ON ll_logbook.set USING GIST (the_geom_haulingend); +CREATE INDEX IF NOT EXISTS idx_ll_logbook_set_gipublic.ST_haulingend ON ll_logbook.set USING GIST (the_geom_haulingend); DROP TRIGGER IF EXISTS tr_sync_ll_logbook_set_the_geom_haulingend ON ll_logbook.set; CREATE TRIGGER tr_sync_ll_logbook_set_the_geom_haulingend BEFORE INSERT OR UPDATE OF haulingEndLatitude, haulingEndLongitude ON ll_logbook.set FOR EACH ROW EXECUTE PROCEDURE sync_the_geom_haulingEnd(); -UPDATE ll_logbook.set SET the_geom_haulingend = ST_SetSRID(ST_MakePoint(haulingEndLongitude::double precision, haulingEndLatitude::double precision), 4326) WHERE haulingEndLongitude IS NOT NULL AND haulingEndLatitude IS NOT NULL AND the_geom_haulingend IS NULL; +UPDATE ll_logbook.set SET the_geom_haulingend = public.ST_SetSRID(public.ST_MakePoint(haulingEndLongitude, haulingEndLatitude), 4326) WHERE haulingEndLongitude IS NOT NULL AND haulingEndLatitude IS NOT NULL AND the_geom_haulingend IS NULL; ALTER TABLE ll_landing.landing ADD COLUMN the_geom geometry(Point, 4326); CREATE INDEX IF NOT EXISTS idx_ll_landing_landing_gist ON ll_landing.landing USING GIST (the_geom); DROP TRIGGER IF EXISTS tr_sync_ll_landing_landing_the_geom ON ll_landing.landing; CREATE TRIGGER tr_sync_ll_landing_landing_the_geom BEFORE INSERT OR UPDATE OF latitude, longitude ON ll_landing.landing FOR EACH ROW EXECUTE PROCEDURE sync_the_geom_default(); -UPDATE ll_landing.landing SET the_geom = ST_SetSRID(ST_MakePoint(longitude::double precision, latitude::double precision), 4326) WHERE latitude IS NOT NULL AND longitude IS NOT NULL AND the_geom IS NULL; +UPDATE ll_landing.landing SET the_geom = public.ST_SetSRID(public.ST_MakePoint(longitude, latitude), 4326) WHERE latitude IS NOT NULL AND longitude IS NOT NULL AND the_geom IS NULL; ===================================== core/api/dto-decoration/src/main/i18n/getters/labels.getter ===================================== @@ -840,6 +840,7 @@ observe.data.ps.localmarket.Batch.buyer observe.data.ps.localmarket.Batch.count observe.data.ps.localmarket.Batch.count.short observe.data.ps.localmarket.Batch.date +observe.data.ps.localmarket.Batch.date.short observe.data.ps.localmarket.Batch.title observe.data.ps.localmarket.Batch.type observe.data.ps.localmarket.Batch.weight ===================================== core/services/i18n/src/main/i18n/translations/services_en_GB.properties ===================================== @@ -1004,6 +1004,7 @@ observe.data.ps.localmarket.Batch.count=Count observe.data.ps.localmarket.Batch.count.short=Count observe.data.ps.localmarket.Batch.count.validation.required=Count or weight must be filled (but not both). observe.data.ps.localmarket.Batch.date=Date +observe.data.ps.localmarket.Batch.date.short=Date observe.data.ps.localmarket.Batch.title=Batches observe.data.ps.localmarket.Batch.type=Batch observe.data.ps.localmarket.Batch.validation.date.after.currentPsCommonTrip.endDate=Date (%2$s) must be after trip end date (%1$s). ===================================== core/services/i18n/src/main/i18n/translations/services_es_ES.properties ===================================== @@ -1004,6 +1004,7 @@ observe.data.ps.localmarket.Batch.count=Count observe.data.ps.localmarket.Batch.count.short=Count observe.data.ps.localmarket.Batch.count.validation.required=TODO observe.data.ps.localmarket.Batch.date=Date +observe.data.ps.localmarket.Batch.date.short=Date observe.data.ps.localmarket.Batch.title=Local market Batches observe.data.ps.localmarket.Batch.type=Local market Batches observe.data.ps.localmarket.Batch.validation.date.after.currentPsCommonTrip.endDate=Date (%2$s) must be after trip end date (%1$s). \#TODO ===================================== core/services/i18n/src/main/i18n/translations/services_fr_FR.properties ===================================== @@ -1004,6 +1004,7 @@ observe.data.ps.localmarket.Batch.count=Nombre observe.data.ps.localmarket.Batch.count.short=Effectif observe.data.ps.localmarket.Batch.count.validation.required=Le nombre ou le poids doit être renseigné (mais pas les deux). observe.data.ps.localmarket.Batch.date=Date +observe.data.ps.localmarket.Batch.date.short=Date observe.data.ps.localmarket.Batch.title=Lots observe.data.ps.localmarket.Batch.type=Lot observe.data.ps.localmarket.Batch.validation.date.after.currentPsCommonTrip.endDate=La date (%2$s) doit être supérieure ou égale à la date de fin de marée (%1$s). ===================================== doc/specs/azti-2023/observe-azti-2023.md ===================================== @@ -1,7 +1,7 @@ # Introduction -* Ce document décrit notre réponse technique suite à la demande de développements complémentaires par l'AZTI et l'IRD. -* Rédigé le 29/06/2023 à Saint Cybardeaux (16170) +* Ce document décrit un chiffrage suite à la demande de développements complémentaires par l'AZTI et l'IRD. +* Rédigé le 06/07/2023 à Saint Cybardeaux (16170) * Auteur *Tony Chemit*, société *Ultreia.io* \newpage @@ -10,60 +10,65 @@ ## (2707) Faire évoluer l'UI équipement du bateau pour autoriser la gestion de listes de référence - * ajout d'un nouveau type **date** (1J) - * ajout du nouveau type **liste de choix** (1.5J) - * contraindre les caractéristiques d'équipement (common.gearcharacteristic) autorisées pour un équipement (common.gear) donné (3J) - * remplir les référentiels correctement via migration (3J) +* ajout d'un nouveau type **date** (1J) +* ajout du nouveau type **liste de choix** (1.5J) +* contraindre les caractéristiques d'équipement (common.gearcharacteristic) autorisées pour un équipement (common.gear) donné (3J) +* remplir les référentiels correctement via migration (3J) ## (2708) Ajout de deux nouveaux champs et listes déroulantes sur le formulaire bonnes pratiques de remise à l'eau - * ajout du nouveau référentiel Zone de manipulation (0.5J) - * ajout du champs Numéro de salabarde (0.5J) +* ajout du nouveau référentiel Zone de manipulation (0.5J) +* ajout du champs Numéro de salabarde (0.5J) ## (2215) Améliorer le rapport de validation - * ajout méta-données et configuration de la validation (0.5J) - * catégoriser des nouvelles informations permettant d'identifier les objets (2J) +* ajout méta-données et configuration de la validation (0.5J) +* catégoriser des nouvelles informations permettant d'identifier les objets (2J) ## (2449) Nouveaux flags allowSet et fpaZoneMode sur les types d'activités bateau - * ajout du flag **allowSet** et utilisation à tous les endroits propices (1J) - * ajout du flag **allowFpaZoneChange** (1J) +* ajout du flag **allowSet** et utilisation à tous les endroits propices (1J) +* ajout du flag **allowFpaZoneChange** (1J) ## (2497) Filtrage des devenirs pour les données observation et logbooks - * ajout des deux nouveaux flags **observation** et **logbook** (PS et LL) (0.5J) - * mise en place des valeurs associées via migration et utilisation sur les formulaires concernés (0.5J) +* ajout des deux nouveaux flags **observation** et **logbook** (PS et LL) (0.5J) +* mise en place des valeurs associées via migration et utilisation sur les formulaires concernés (0.5J) ## (2498) Filtrage des types d'activité bateau pour les données observation et logbooks - * ajout du nouveau flag (PS et LL) (1J) - * remplissage du référentiel et utilisation sur les deux formulaires (1J) +* ajout du nouveau flag (PS et LL) (1J) +* remplissage du référentiel et utilisation sur les deux formulaires (1J) ## (2706) Améliorer l'identification des enregistrements dans l'UI de validation batch - * ajouter les clefs métiers qui remontent jusqu'à la marée (2J) +* ajouter les clefs métiers qui remontent jusqu'à la marée (2J) La modification du rapport est traité dans un autre ticket. ## (2725) Contrôler la syntaxe des id balises par une expression régulière propre à chaque modèle de balise - * ajout du nouveau champs **regex** (0.5J) - * mise à jour du référentiel via migration (1.5J) - * mise en place de la validation via ce champs (1J) +* ajout du nouveau champs **regex** (0.5J) +* mise à jour du référentiel via migration (1.5J) +* mise en place de la validation via ce champs (1J) ## (2729) 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é) - * ajout du champs **activitiesAcquisitionMode** au niveau de la marée (0.5J) - * positionnement de ce nouveau champs via migration embarqué et AVDTH (0.5J) - * mise en place du mode horaire (0.5J) - * mise en place du mode indexé (0.5J) +* ajout du champs **activitiesAcquisitionMode** au niveau de la marée (0.5J) +* positionnement de ce nouveau champs via migration embarqué et AVDTH (0.5J) +* mise en place du mode horaire (0.5J) +* mise en place du mode indexé (0.5J) ## (2740) En PS / logbook, ajouter 2 champs previousFpaZone et nextFpaZone - * ajout des deux nouveaux champs *previousFpaZone* et *nextFpaZone* (0.25J) - * renommage du champs *fpaZone* en *currentFpaZone* (0.25J) - * pilotage de ces champs via le drapeau sur vesselActivity (0.5J) +* ajout des deux nouveaux champs *previousFpaZone* et *nextFpaZone* (0.25J) +* renommage du champs *fpaZone* en *currentFpaZone* (0.25J) +* pilotage de ces champs via le drapeau sur vesselActivity (0.5J) + +## (2750) Effectuer un différentiel sur l'UI de synchro de marées + +* calcul du différentiel entre les deux sources de données (1J) +* adaptation de l'arbre de navigation pour n'afficher que les marées différentes (2J) # Chiffrage global @@ -81,7 +86,13 @@ La modification du rapport est traité dans un autre ticket. | (2725) Contrôler la syntaxe des id balises par une expression régulière propre à chaque modèle de balise | 3 | | (2729) 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é) | 2 | | (2740) En PS / logbook, ajouter 2 champs previousFpaZone et nextFpaZone | 1 | -| Gestion de projet | 2.5 | +| (2750) Effectuer un différentiel sur l'UI de synchro de marées | 3 | +| Gestion de projet | 5 | +| Total | 33 | +| *Remises offertes* | | +| Gestion de projet | -2.5 | +| (2750) Effectuer un différentiel sur l'UI de synchro de marées | -3 | | Total | 27.5 | -Le prix total est de **14 850 €**. +* Prix total (sans remise) : **17 280€** +* Prix total (avec remise) : **14 850€** ===================================== model/src/main/models/Observe/dto/class/containerChildDataDtoProperties.properties ===================================== @@ -37,7 +37,7 @@ data.ll.observation.SensorUsed=sensorType,sensorBrand,sensorDataFormat,sensorSer data.ll.observation.Tdr=homeId,serialNo,sensorBrand,hasData data.ps.common.GearUseFeatures=gear,number,usedInTrip,comment data.ps.landing.Landing=species,weightCategory,weight,destination,fate,fateVessel -data.ps.localmarket.Batch=species,packaging,count,weight +data.ps.localmarket.Batch=species,packaging,count,weight,date data.ps.localmarket.SampleSpecies=species,sizeMeasureType,measuredCount,comment data.ps.logbook.Catch=species,weightCategory,speciesFate,well,weight,count,comment data.ps.logbook.SampleSpecies=subSampleNumber,species,sizeMeasureType,measuredCount,totalCount,startTime,endTime,comment ===================================== pom.xml ===================================== @@ -23,7 +23,7 @@ <parent> <groupId>io.ultreia.maven</groupId> <artifactId>pom</artifactId> - <version>2023.31</version> + <version>2023.33</version> </parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> ===================================== toolkit/api-datasource/src/main/java/fr/ird/observe/datasource/security/WithPermission.java ===================================== @@ -41,6 +41,10 @@ public interface WithPermission { return canExecute(Permission.READ_REFERENTIAL); } + default boolean canReadAll() { + return canReadReferential() && canReadData(); + } + default String getReferentialPermissionLabel() { String result; if (canWriteReferential()) { ===================================== toolkit/api/src/main/java/fr/ird/observe/dto/ObserveUtil.java ===================================== @@ -22,6 +22,10 @@ package fr.ird.observe.dto; * #L% */ +import com.google.gson.Gson; +import com.google.gson.GsonBuilder; +import com.google.gson.JsonObject; +import com.google.gson.JsonParser; import fr.ird.observe.spi.module.BusinessModule; import fr.ird.observe.spi.module.BusinessSubModule; import io.ultreia.java4all.config.ApplicationConfig; @@ -248,5 +252,16 @@ public class ObserveUtil { return !isEmpty(o); } - + /** + * + * @param jsonString the json string in compact mode + * @return the gson in a pretty mode + */ + public static String toPrettyFormat(String jsonString) + { + JsonObject json = JsonParser.parseString(jsonString).getAsJsonObject(); + + Gson gson = new GsonBuilder().setPrettyPrinting().create(); + return gson.toJson(json); + } } ===================================== toolkit/persistence/src/main/java/org/nuiton/topia/persistence/security/SecurityScriptHelper.java ===================================== @@ -191,6 +191,9 @@ public class SecurityScriptHelper { protected void createSecurityScript(Path scriptPath, Set<DataSourceUserDto> users) throws IOException { Set<String> schemas = new LinkedHashSet<>(); MigrationServiceSqlHelper migrationServiceSqlHelper = MigrationServiceSqlHelper.CURRENT; + // We need to add this schema, postgis function are in it + // See https://gitlab.com/ultreiaio/ird-observe/-/issues/2757 + schemas.add("public"); schemas.add(migrationServiceSqlHelper.schemaName()); schemas.addAll(applicationContext.getSchemaNames()); Path blobIdsPath = scriptPath.getParent().resolve(scriptPath.toFile().getName().replace(".sql", ".blob-ids")); View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/bb14f8ce4cd86e36bc322bf5… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/bb14f8ce4cd86e36bc322bf5… You're receiving this email because of your account on gitlab.com.

1 0