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

[Git][ultreiaio/ird-observe][develop] 6 commits: compute default tripsId in Report fixture
by Tony CHEMIT (＠tchemit) 14 Apr '22

14 Apr '22

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 128709a3 by Tony Chemit at 2022-04-14T14:09:58+02:00 compute default tripsId in Report fixture Split report fixtures - See ultreiaio/ird-observe#2242 - - - - - c3976e51 by Tony Chemit at 2022-04-14T14:38:08+02:00 Rapport LL : liste détaillée des captures - Closes #2243 - - - - - 56bbeb80 by Tony Chemit at 2022-04-14T14:38:08+02:00 Rapport LL : liste détaillée des débarquements - Closes #2245 - - - - - 6a742ce4 by Tony Chemit at 2022-04-14T14:38:36+02:00 Rapport LL : liste des activités - Closes #2251 - - - - - 3838748e by Tony Chemit at 2022-04-14T14:39:04+02:00 Rapport LL : liste détaillée des échantillons rattachés au niveau calée - Closes #2248 - - - - - 26124eaa by Tony Chemit at 2022-04-14T14:39:18+02:00 Rapport LL : liste détaillée des échantillons quelque soit leur type de rattachement - Closes #2250 - - - - - 30 changed files: - core/api/dto/src/main/resources/observe-reports.properties - + core/persistence/java/src/main/java/fr/ird/observe/spi/report/UnionAndSortLlLogbookSamples.java - core/services/test/src/main/java/fr/ird/observe/services/service/ReportFixture.java - core/services/test/src/main/java/fr/ird/observe/services/service/ReportServiceFixtures.java - core/services/test/src/main/java/fr/ird/observe/services/service/report/ll/TripLonglineGearUseFeaturesReportFixture.java → core/services/test/src/main/java/fr/ird/observe/services/service/report/ll/LlCommonTripGearUseFeaturesReportFixture.java - + core/services/test/src/main/java/fr/ird/observe/services/service/report/ll/LlLandingReportFixture.java - + core/services/test/src/main/java/fr/ird/observe/services/service/report/ll/LlLogbookActivitiesReportFixture.java - + core/services/test/src/main/java/fr/ird/observe/services/service/report/ll/LlLogbookCatchesReportFixture.java - + core/services/test/src/main/java/fr/ird/observe/services/service/report/ll/LlLogbookSamplesOnActivityReportFixture.java - + core/services/test/src/main/java/fr/ird/observe/services/service/report/ll/LlLogbookSamplesOnBothReportFixture.java - + core/services/test/src/main/java/fr/ird/observe/services/service/report/ll/LlLogbookSamplesOnTripReportFixture.java - core/services/test/src/main/java/fr/ird/observe/services/service/report/ps/TripSeineGearUseFeaturesReportFixture.java → core/services/test/src/main/java/fr/ird/observe/services/service/report/ps/PsCommonTripGearUseFeaturesReportFixture.java - core/services/test/src/main/java/fr/ird/observe/services/service/report/ps/localmarket/PsLocalmarketBatchReportFixture.java → core/services/test/src/main/java/fr/ird/observe/services/service/report/ps/PsLocalmarketBatchReportFixture.java - core/services/test/src/main/java/fr/ird/observe/services/service/report/ps/localmarket/PsLocalmarketSampleReportFixture.java → core/services/test/src/main/java/fr/ird/observe/services/service/report/ps/PsLocalmarketSampleReportFixture.java - core/services/test/src/main/java/fr/ird/observe/services/service/report/ps/localmarket/PsLocalmarketSurveyReportFixture.java → core/services/test/src/main/java/fr/ird/observe/services/service/report/ps/PsLocalmarketSurveyReportFixture.java - core/services/test/src/main/java/fr/ird/observe/services/service/report/ps/logbook/PsLogbookSampleMeasures.java → core/services/test/src/main/java/fr/ird/observe/services/service/report/ps/PsLogbookSampleMeasures.java - core/services/test/src/main/java/fr/ird/observe/services/service/report/ps/logbook/PsLogbookSampleSetReportFixture.java → core/services/test/src/main/java/fr/ird/observe/services/service/report/ps/PsLogbookSampleSetReportFixture.java - core/services/test/src/main/java/fr/ird/observe/services/service/report/ps/logbook/PsLogbookSampleSpeciesMeasures.java → core/services/test/src/main/java/fr/ird/observe/services/service/report/ps/PsLogbookSampleSpeciesMeasures.java - core/services/test/src/main/java/fr/ird/observe/services/service/report/ps/logbook/PsLogbookSampleSpeciesMeasuresCount.java → core/services/test/src/main/java/fr/ird/observe/services/service/report/ps/PsLogbookSampleSpeciesMeasuresCount.java - core/services/test/src/main/java/fr/ird/observe/services/service/report/ps/AccessoryCatchByGroupReportFixture.java → core/services/test/src/main/java/fr/ird/observe/services/service/report/ps/PsObservationAccessoryCatchByGroupReportFixture.java - core/services/test/src/main/java/fr/ird/observe/services/service/report/ps/AccessoryCatchReportFixture.java → core/services/test/src/main/java/fr/ird/observe/services/service/report/ps/PsObservationAccessoryCatchReportFixture.java - core/services/test/src/main/java/fr/ird/observe/services/service/report/ps/ActivityWithCommentReportFixture.java → core/services/test/src/main/java/fr/ird/observe/services/service/report/ps/PsObservationActivityWithCommentReportFixture.java - core/services/test/src/main/java/fr/ird/observe/services/service/report/ps/AllActivitiesReportFixture.java → core/services/test/src/main/java/fr/ird/observe/services/service/report/ps/PsObservationAllActivitiesReportFixture.java - core/services/test/src/main/java/fr/ird/observe/services/service/report/ps/DailySetAndCatchReportFixture.java → core/services/test/src/main/java/fr/ird/observe/services/service/report/ps/PsObservationDailySetAndCatchReportFixture.java - core/services/test/src/main/java/fr/ird/observe/services/service/report/ps/FobUsageMinimalReportFixture.java → core/services/test/src/main/java/fr/ird/observe/services/service/report/ps/PsObservationFobUsageExtendedReportFixture.java - core/services/test/src/main/java/fr/ird/observe/services/service/report/ps/FobUsageExtendedReportFixture.java → core/services/test/src/main/java/fr/ird/observe/services/service/report/ps/PsObservationFobUsageMinimalReportFixture.java - core/services/test/src/main/java/fr/ird/observe/services/service/report/ps/NonTargetDistributionLengthsReportFixture.java → core/services/test/src/main/java/fr/ird/observe/services/service/report/ps/PsObservationNonTargetDistributionLengthsReportFixture.java - core/services/test/src/main/java/fr/ird/observe/services/service/report/ps/TargetStoredDistributionLengthsLD1ReportFixture.java → core/services/test/src/main/java/fr/ird/observe/services/service/report/ps/PsObservationRepartionCaleeParCuveReportFixture.java - core/services/test/src/main/java/fr/ird/observe/services/service/report/ps/SetByAssociationReportFixture.java → core/services/test/src/main/java/fr/ird/observe/services/service/report/ps/PsObservationSetByAssociationReportFixture.java - core/services/test/src/main/java/fr/ird/observe/services/service/report/ps/TargetCatchByAssociationReportFixture.java → core/services/test/src/main/java/fr/ird/observe/services/service/report/ps/PsObservationTargetCatchByAssociationReportFixture.java The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/e0a589a1ae991f739e978338… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/e0a589a1ae991f739e978338… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] 5 commits: Déplacements de données PS d'une marée à une autre - See ultreiaio/ird-observe#2066
by Tony CHEMIT (＠tchemit) 13 Apr '22

13 Apr '22

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 33e91afe by Tony Chemit at 2022-04-12T20:42:03+02:00 Déplacements de données PS d'une marée à une autre - See ultreiaio/ird-observe#2066 - - - - - 316b6515 by Tony Chemit at 2022-04-13T23:13:05+02:00 Générer les script sql pour la suppression/recopie de toute entité (comme déjà fait pour les marée) - See ultreiaio/ird-observe#2175 - - - - - f13c367e by Tony Chemit at 2022-04-13T23:13:05+02:00 update hibernate - - - - - 33a0bb9a by Tony Chemit at 2022-04-13T23:13:05+02:00 update pom - - - - - e0a589a1 by Tony Chemit at 2022-04-13T23:15:31+02:00 Split report fixtures - See ultreiaio/ird-observe#2242 - - - - - 30 changed files: - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/actions/move/MoveAction.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/actions/move/MoveExecutor.java - − client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/actions/move/MoveRequest.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/actions/move/MoveRequestBuilder.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/actions/move/MoveTreeAdapter.java - client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/logbook/ActivitySampleUIHandler.java - client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/logbook/SampleListUIHandler.java - client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/logbook/SampleUIHandler.java - client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/logbook/sample/SampleUIHelper.java - client/datasource/editor/spi/src/main/java/fr/ird/observe/client/datasource/editor/spi/content/data/openable/GenerateContentOpenableUIMoveTreeAdapter.java - client/datasource/editor/spi/src/main/java/fr/ird/observe/client/datasource/editor/spi/content/helper/ContentUIHandlerHelper.java - core/api/services/src/main/java/fr/ird/observe/services/service/data/ll/common/TripService.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/SampleSpi.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/observation/ActivitySpi.java - core/persistence/java/src/main/java/fr/ird/observe/entities/data/ps/observation/RouteSpi.java - core/persistence/test/src/test/java/fr/ird/observe/persistence/test/request/DeletePartialRequestTest.java - core/persistence/test/src/test/java/fr/ird/observe/persistence/test/request/ReplicatePartialRequestTest.java - core/persistence/test/src/test/java/fr/ird/observe/persistence/test/request/ReplicateRequestTest.java - core/persistence/test/src/test/resources/fixtures/persistence/parent.properties - core/persistence/test/src/test/resources/fixtures/persistence/replicate_partial_count/data-ps-Landing-Logbook-Localmarket.properties - core/persistence/test/src/test/resources/fixtures/persistence/replicate_partial_count/data-ps-Logbook.properties - core/persistence/test/src/test/resources/fixtures/persistence/replicate_partial_count/data-ps-Observations-Logbook-Localmarket.properties - core/persistence/test/src/test/resources/fixtures/persistence/replicate_partial_count/data-ps-Observations-Logbook.properties The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/a97399deffdb4be951626158… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/a97399deffdb4be951626158… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] 2 commits: Add FIXME (remove slowQueriesThreshold, prefer TimeLog)
by Tony CHEMIT (＠tchemit) 12 Apr '22

12 Apr '22

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 46204afa by Tony Chemit at 2022-04-11T19:37:57+02:00 Add FIXME (remove slowQueriesThreshold, prefer TimeLog) - - - - - a97399de by Tony Chemit at 2022-04-12T11:07:00+02:00 Amélioration du calcul des référentiels manquants - Closes ultreiaio/ird-observe#2257 - - - - - 16 changed files: - client/core/src/main/java/fr/ird/observe/client/datasource/api/data/InsertMissingReferentialTask.java - client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/synchronize/data/actions/Apply.java - core/persistence/java/src/main/java/fr/ird/observe/entities/ObserveTopiaApplicationContext.java - core/persistence/java/src/main/java/fr/ird/observe/entities/ObserveTopiaPersistenceContext.java - + core/persistence/test/src/test/java/fr/ird/observe/persistence/test/request/GetReferentialIdsTest.java - + core/persistence/test/src/test/resources/fixtures/persistence/referential_ids_count/data-ll-all.properties - + core/persistence/test/src/test/resources/fixtures/persistence/referential_ids_count/data-ll.properties - + core/persistence/test/src/test/resources/fixtures/persistence/referential_ids_count/data-ps-all.properties - + core/persistence/test/src/test/resources/fixtures/persistence/referential_ids_count/data-ps.properties - core/services/local/src/main/java/fr/ird/observe/services/local/service/ObserveServiceLocal.java - core/services/local/src/main/java/fr/ird/observe/services/local/service/data/RootOpenableServiceLocalSupport.java - core/services/local/src/main/java/fr/ird/observe/services/local/service/referential/ReferentialServiceLocalSupport.java - core/services/test/src/main/java/fr/ird/observe/services/service/data/RootOpenableServiceFixtures.java - core/services/test/src/main/java/fr/ird/observe/services/service/referential/ReferentialServiceFixtures.java - core/services/test/src/main/resources/fixtures/fr/ird/observe/services/service/data/RootOpenableService.properties - server/core/src/main/filtered-resources/META-INF/mapping-api-client.wm Changes: ===================================== client/core/src/main/java/fr/ird/observe/client/datasource/api/data/InsertMissingReferentialTask.java ===================================== @@ -26,6 +26,7 @@ import fr.ird.observe.client.datasource.api.ObserveSwingDataSource; import fr.ird.observe.client.datasource.usage.UsageForDisplayUIHandler; import fr.ird.observe.dto.ProgressionModel; import fr.ird.observe.dto.ToolkitIdLabel; +import fr.ird.observe.dto.data.RootOpenableDto; import fr.ird.observe.dto.referential.ReferentialDto; import fr.ird.observe.services.service.referential.ReferentialService; import fr.ird.observe.spi.decoration.I18nDecoratorHelper; @@ -51,14 +52,16 @@ import static io.ultreia.java4all.i18n.I18n.t; */ public class InsertMissingReferentialTask extends DataTaskSupport { + private final Class<? extends RootOpenableDto> dataType; private final Collection<String> idsToCopy; - public static InsertMissingReferentialTask of(TaskSide taskSide, Collection<String> idsToCopy) { - return new InsertMissingReferentialTask(taskSide, idsToCopy); + public static InsertMissingReferentialTask of(TaskSide taskSide, Class<? extends RootOpenableDto> dataType, Collection<String> idsToCopy) { + return new InsertMissingReferentialTask(taskSide, dataType, idsToCopy); } - protected InsertMissingReferentialTask(TaskSide taskSide, Collection<String> idsToCopy) { + protected InsertMissingReferentialTask(TaskSide taskSide, Class<? extends RootOpenableDto> dataType, Collection<String> idsToCopy) { super(taskSide, taskSide.getCopyLabelKey(), taskSide.getCopyIcon()); + this.dataType = dataType; this.idsToCopy = Objects.requireNonNull(idsToCopy); } @@ -79,7 +82,7 @@ public class InsertMissingReferentialTask extends DataTaskSupport { ReferentialService targetReferentialService = targetSource.getReferentialService(); ReferentialIds targetSourceReferential = targetReferentialService.getReferentialIds(); MissingReferentialRequest missingReferentialRequest = MissingReferentialRequest.of(targetSourceReferential.getIds(), idsToCopy.toArray(new String[0])); - MissingReferentialResult missingReferentialResult = incomingSource.getReferentialService().computeMissingReferential(missingReferentialRequest); + MissingReferentialResult missingReferentialResult = incomingSource.getRootOpenableService().computeMissingReferential(dataType, missingReferentialRequest); progressModel.increments(); ===================================== client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/synchronize/data/actions/Apply.java ===================================== @@ -32,6 +32,7 @@ import fr.ird.observe.client.datasource.api.data.InsertMissingReferentialTask; import fr.ird.observe.client.datasource.api.data.TaskSide; import fr.ird.observe.client.datasource.api.data.UserCancelException; import fr.ird.observe.dto.ProgressionModel; +import fr.ird.observe.dto.data.RootOpenableDto; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.nuiton.jaxx.runtime.swing.wizard.ext.WizardState; @@ -68,6 +69,8 @@ public class Apply extends DataSynchroUIActionSupport { private WizardState doApply() { DataSynchroModel stepModel = ui.getStepModel(); + String moduleName = stepModel.getLeftSelectionDataModel().getConfig().getModuleName(); + Class<? extends RootOpenableDto> dataType = "ps".equals(moduleName) ? fr.ird.observe.dto.data.ps.common.TripDto.class : fr.ird.observe.dto.data.ll.common.TripDto.class; ObserveSwingDataSource leftSource = stepModel.getLeftSource(); ObserveSwingDataSource rightSource = stepModel.getRightSource(); DefaultListModel<DataTaskSupport> tasks = stepModel.getTasks(); @@ -105,12 +108,12 @@ public class Apply extends DataSynchroUIActionSupport { if (!idsToCopyToLeft.isEmpty()) { stepsCount.addAndGet(3); // first add missing referential to left - finalTasksToConsume.add(0, InsertMissingReferentialTask.of(TaskSide.FROM_RIGHT, idsToCopyToLeft)); + finalTasksToConsume.add(0, InsertMissingReferentialTask.of(TaskSide.FROM_RIGHT, dataType, idsToCopyToLeft)); } if (!idsToCopyToRight.isEmpty()) { stepsCount.addAndGet(3); // first add missing referential to right - finalTasksToConsume.add(0, InsertMissingReferentialTask.of(TaskSide.FROM_LEFT, idsToCopyToRight)); + finalTasksToConsume.add(0, InsertMissingReferentialTask.of(TaskSide.FROM_LEFT, dataType, idsToCopyToRight)); } int totalStep = stepsCount.get(); log.info("Total step computed: " + totalStep); ===================================== core/persistence/java/src/main/java/fr/ird/observe/entities/ObserveTopiaApplicationContext.java ===================================== @@ -28,7 +28,10 @@ import fr.ird.observe.dto.db.DatabaseNotFoundException; import fr.ird.observe.dto.db.configuration.ObserveDataSourceConfiguration; import fr.ird.observe.dto.referential.ReferentialDto; import fr.ird.observe.entities.data.DataGroupByEntity; +import fr.ird.observe.spi.ObservePersistenceBusinessProject; import fr.ird.observe.spi.module.BusinessProject; +import fr.ird.observe.spi.referential.ReferentialIds; +import fr.ird.observe.spi.referential.ReferentialIdsBuilder; import fr.ird.observe.spi.referential.differential.DifferentialMetaModel; import fr.ird.observe.spi.referential.synchro.OneSideSqlResultBuilder; import fr.ird.observe.spi.script.ToolkitEntitySqlScriptModel; @@ -48,7 +51,6 @@ import org.nuiton.topia.service.sql.plan.replicate.TopiaEntitySqlReplicatePlanMo import org.nuiton.topia.service.sql.request.ReplicatePartialRequestCallback; import org.nuiton.topia.service.sql.usage.TopiaEntitySqlUsageModel; -import java.time.Duration; import java.util.Date; import java.util.Set; import java.util.function.Consumer; @@ -75,7 +77,7 @@ public class ObserveTopiaApplicationContext extends AbstractObserveTopiaApplicat getTopiaFiresSupport(), getTopiaIdFactory(), getSessionRegistry(), - Duration.ofMinutes(1), + null,/* FIXME We dont not need this, this is too much for the purpose (creating thread... for counting time berk)...Duration.ofMinutes(1),*/ getConfiguration(), getDaoMapping() ) @@ -99,6 +101,11 @@ public class ObserveTopiaApplicationContext extends AbstractObserveTopiaApplicat return ObserveTopiaEntitySqlModelResource.get().newOneSideSqlResultBuilder(context, defaultLastUpdateDate); } + @Override + public ReferentialIds getReferentialIds(Class<? extends TopiaEntity> dataType, String... ids) { + return ReferentialIdsBuilder.builder(this, ObservePersistenceBusinessProject.get(), this, dataType, ids).build(this); + } + @Override public final TagValues getPersistenceTagValues() { return ObserveTopiaEntitySqlModelResource.get().getPersistenceTagValues(); ===================================== core/persistence/java/src/main/java/fr/ird/observe/entities/ObserveTopiaPersistenceContext.java ===================================== @@ -35,7 +35,6 @@ import fr.ird.observe.spi.navigation.parent.ObserveToParentIdProviderImpl; import fr.ird.observe.spi.report.ObserveDefaultReportRequestExecutor; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import org.nuiton.topia.persistence.TopiaEntity; import org.nuiton.topia.persistence.TopiaPersistenceContextConstructorParameterSupport; import org.nuiton.topia.persistence.internal.AbstractTopiaPersistenceContextConstructorParameter; import org.nuiton.topia.persistence.script.SqlScriptReader; @@ -81,11 +80,6 @@ public class ObserveTopiaPersistenceContext extends AbstractObserveTopiaPersiste return new ObserveDefaultReportRequestExecutor(referentialLocale, this, daoSupplier); } - @Override - public <E extends TopiaEntity> ToolkitTopiaDao<E> getDao(Class<E> entityClass) { - return (ToolkitTopiaDao<E>) super.getDao(entityClass); - } - @Override public ObserveToParentIdProvider getToParentIdProvider() { return (ObserveToParentIdProvider) super.getToParentIdProvider(); ===================================== core/persistence/test/src/test/java/fr/ird/observe/persistence/test/request/GetReferentialIdsTest.java ===================================== @@ -0,0 +1,106 @@ +package fr.ird.observe.persistence.test.request; + +/*- + * #%L + * ObServe Core :: Persistence :: Test + * %% + * Copyright (C) 2008 - 2022 IRD, Code Lutin, 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 fr.ird.observe.dto.BusinessDto; +import fr.ird.observe.dto.referential.ReferentialDto; +import fr.ird.observe.entities.ObserveTopiaApplicationContext; +import fr.ird.observe.persistence.test.ObservePersistenceFixtures; +import fr.ird.observe.persistence.test.PersistenceTestSupportRead; +import fr.ird.observe.spi.referential.ReferentialIds; +import fr.ird.observe.test.DatabaseName; +import fr.ird.observe.test.spi.DatabaseNameConfiguration; +import io.ultreia.java4all.lang.Objects2; +import org.junit.Assert; +import org.junit.Before; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.junit.runners.Parameterized; +import org.nuiton.topia.persistence.TopiaEntity; + +import java.util.Arrays; +import java.util.LinkedList; +import java.util.List; +import java.util.Map; +import java.util.Set; + +/** + * Created on 12/04/2022. + * + * @author Tony Chemit - dev(a)tchemit.fr + * @since 9.0.0 + */ +(a)RunWith(Parameterized.class) +(a)DatabaseNameConfiguration(DatabaseName.data) +public class GetReferentialIdsTest extends PersistenceTestSupportRead { + + @Parameterized.Parameter + public String classifier; + @Parameterized.Parameter(1) + public Class<? extends TopiaEntity> entityType; + @Parameterized.Parameter(2) + public Set<String> tripId; + private Map<String, Long> expectedResults; + + @Parameterized.Parameters(name = "{0}") + public static Iterable<Object[]> data() { + return Arrays.asList(new Object[]{CLASSIFIER_DATA_PS, fr.ird.observe.entities.data.ps.common.Trip.class, Set.of(ObservePersistenceFixtures.getPsCommonTripId())}, + new Object[]{CLASSIFIER_DATA_LL, fr.ird.observe.entities.data.ll.common.Trip.class, Set.of(ObservePersistenceFixtures.getLlCommonTripId())}, + new Object[]{CLASSIFIER_DATA_PS + "-all", fr.ird.observe.entities.data.ps.common.Trip.class, Set.of()}, + new Object[]{CLASSIFIER_DATA_LL + "-all", fr.ird.observe.entities.data.ll.common.Trip.class, Set.of()} + ); + } + + @Before + public void setUp() { + expectedResults = ObservePersistenceFixtures.loadFixturesMapCount("persistence/referential_ids_count/" + classifier); + } + + @Test + public void test() throws Exception { + + ObserveTopiaApplicationContext applicationContext = localTestMethodResource.getTopiaApplicationContext(); + ReferentialIds actual = applicationContext.getReferentialIds(entityType, tripId.toArray(new String[0])); + + if (!ObservePersistenceFixtures.WITH_ASSERT) { + List<String> actualList = new LinkedList<>(); + for (Map.Entry<Class<? extends ReferentialDto>, Set<String>> entry : actual.getIds().entrySet()) { + Class<? extends ReferentialDto> dtoType = entry.getKey(); + actualList.add(String.format("%s=%d", dtoType.getName(), entry.getValue().size())); + } + actualList.sort(String::compareTo); + System.out.println(String.join("\n", actualList)); + return; + } + for (Map.Entry<String, Long> entry : expectedResults.entrySet()) { + String table = entry.getKey(); + Class<? extends BusinessDto> dtoType = Objects2.forName(table); + Set<String> actualIds = actual.getIds().getOrDefault(dtoType, Set.of()); + int actualCount = actualIds.size(); + long expectedCount = expectedResults.get(table); + Assert.assertEquals("bad size for table: " + table, expectedCount, actualCount); + } + } + +} + ===================================== core/persistence/test/src/test/resources/fixtures/persistence/referential_ids_count/data-ll-all.properties ===================================== @@ -0,0 +1,62 @@ +### +# #%L +# ObServe Core :: Persistence :: Test +# %% +# Copyright (C) 2008 - 2022 IRD, Code Lutin, 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% +### +fr.ird.observe.dto.referential.common.DataQualityDto=1 +fr.ird.observe.dto.referential.common.FpaZoneDto=2 +fr.ird.observe.dto.referential.common.GearCharacteristicDto=1 +fr.ird.observe.dto.referential.common.GearDto=1 +fr.ird.observe.dto.referential.common.HarbourDto=3 +fr.ird.observe.dto.referential.common.LengthMeasureMethodDto=1 +fr.ird.observe.dto.referential.common.OceanDto=1 +fr.ird.observe.dto.referential.common.PersonDto=6 +fr.ird.observe.dto.referential.common.SexDto=3 +fr.ird.observe.dto.referential.common.SizeMeasureTypeDto=4 +fr.ird.observe.dto.referential.common.SpeciesDto=31 +fr.ird.observe.dto.referential.common.VesselDto=3 +fr.ird.observe.dto.referential.common.WeightMeasureMethodDto=2 +fr.ird.observe.dto.referential.common.WeightMeasureTypeDto=3 +fr.ird.observe.dto.referential.ll.common.BaitSettingStatusDto=3 +fr.ird.observe.dto.referential.ll.common.BaitTypeDto=4 +fr.ird.observe.dto.referential.ll.common.CatchFateDto=3 +fr.ird.observe.dto.referential.ll.common.HealthStatusDto=3 +fr.ird.observe.dto.referential.ll.common.HookSizeDto=3 +fr.ird.observe.dto.referential.ll.common.HookTypeDto=4 +fr.ird.observe.dto.referential.ll.common.LightsticksColorDto=1 +fr.ird.observe.dto.referential.ll.common.LightsticksTypeDto=1 +fr.ird.observe.dto.referential.ll.common.LineTypeDto=5 +fr.ird.observe.dto.referential.ll.common.MitigationTypeDto=3 +fr.ird.observe.dto.referential.ll.common.ObservationMethodDto=2 +fr.ird.observe.dto.referential.ll.common.OnBoardProcessingDto=1 +fr.ird.observe.dto.referential.ll.common.ProgramDto=3 +fr.ird.observe.dto.referential.ll.common.SettingShapeDto=4 +fr.ird.observe.dto.referential.ll.common.TripTypeDto=1 +fr.ird.observe.dto.referential.ll.common.VesselActivityDto=2 +fr.ird.observe.dto.referential.ll.landing.CompanyDto=2 +fr.ird.observe.dto.referential.ll.landing.DataSourceDto=1 +fr.ird.observe.dto.referential.ll.observation.EncounterTypeDto=2 +fr.ird.observe.dto.referential.ll.observation.HookPositionDto=4 +fr.ird.observe.dto.referential.ll.observation.ItemHorizontalPositionDto=1 +fr.ird.observe.dto.referential.ll.observation.ItemVerticalPositionDto=1 +fr.ird.observe.dto.referential.ll.observation.MaturityStatusDto=1 +fr.ird.observe.dto.referential.ll.observation.SensorBrandDto=2 +fr.ird.observe.dto.referential.ll.observation.SensorDataFormatDto=1 +fr.ird.observe.dto.referential.ll.observation.SensorTypeDto=1 +fr.ird.observe.dto.referential.ll.observation.StomachFullnessDto=1 ===================================== core/persistence/test/src/test/resources/fixtures/persistence/referential_ids_count/data-ll.properties ===================================== @@ -0,0 +1,60 @@ +### +# #%L +# ObServe Core :: Persistence :: Test +# %% +# Copyright (C) 2008 - 2022 IRD, Code Lutin, 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% +### +fr.ird.observe.dto.referential.common.DataQualityDto=1 +fr.ird.observe.dto.referential.common.FpaZoneDto=1 +fr.ird.observe.dto.referential.common.GearCharacteristicDto=1 +fr.ird.observe.dto.referential.common.GearDto=1 +fr.ird.observe.dto.referential.common.HarbourDto=2 +fr.ird.observe.dto.referential.common.LengthMeasureMethodDto=1 +fr.ird.observe.dto.referential.common.OceanDto=1 +fr.ird.observe.dto.referential.common.PersonDto=3 +fr.ird.observe.dto.referential.common.SexDto=2 +fr.ird.observe.dto.referential.common.SizeMeasureTypeDto=3 +fr.ird.observe.dto.referential.common.SpeciesDto=30 +fr.ird.observe.dto.referential.common.VesselDto=2 +fr.ird.observe.dto.referential.common.WeightMeasureMethodDto=2 +fr.ird.observe.dto.referential.common.WeightMeasureTypeDto=3 +fr.ird.observe.dto.referential.ll.common.BaitSettingStatusDto=3 +fr.ird.observe.dto.referential.ll.common.BaitTypeDto=4 +fr.ird.observe.dto.referential.ll.common.CatchFateDto=3 +fr.ird.observe.dto.referential.ll.common.HealthStatusDto=3 +fr.ird.observe.dto.referential.ll.common.HookSizeDto=3 +fr.ird.observe.dto.referential.ll.common.HookTypeDto=4 +fr.ird.observe.dto.referential.ll.common.LineTypeDto=5 +fr.ird.observe.dto.referential.ll.common.MitigationTypeDto=3 +fr.ird.observe.dto.referential.ll.common.ObservationMethodDto=1 +fr.ird.observe.dto.referential.ll.common.OnBoardProcessingDto=1 +fr.ird.observe.dto.referential.ll.common.ProgramDto=2 +fr.ird.observe.dto.referential.ll.common.SettingShapeDto=4 +fr.ird.observe.dto.referential.ll.common.TripTypeDto=1 +fr.ird.observe.dto.referential.ll.common.VesselActivityDto=2 +fr.ird.observe.dto.referential.ll.landing.CompanyDto=2 +fr.ird.observe.dto.referential.ll.landing.DataSourceDto=1 +fr.ird.observe.dto.referential.ll.observation.EncounterTypeDto=2 +fr.ird.observe.dto.referential.ll.observation.HookPositionDto=1 +fr.ird.observe.dto.referential.ll.observation.ItemHorizontalPositionDto=1 +fr.ird.observe.dto.referential.ll.observation.ItemVerticalPositionDto=1 +fr.ird.observe.dto.referential.ll.observation.MaturityStatusDto=1 +fr.ird.observe.dto.referential.ll.observation.SensorBrandDto=2 +fr.ird.observe.dto.referential.ll.observation.SensorDataFormatDto=1 +fr.ird.observe.dto.referential.ll.observation.SensorTypeDto=1 +fr.ird.observe.dto.referential.ll.observation.StomachFullnessDto=1 ===================================== core/persistence/test/src/test/resources/fixtures/persistence/referential_ids_count/data-ps-all.properties ===================================== @@ -0,0 +1,68 @@ +### +# #%L +# ObServe Core :: Persistence :: Test +# %% +# Copyright (C) 2008 - 2022 IRD, Code Lutin, 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% +### +fr.ird.observe.dto.referential.common.CountryDto=4 +fr.ird.observe.dto.referential.common.DataQualityDto=2 +fr.ird.observe.dto.referential.common.FpaZoneDto=4 +fr.ird.observe.dto.referential.common.GearCharacteristicDto=3 +fr.ird.observe.dto.referential.common.GearDto=15 +fr.ird.observe.dto.referential.common.HarbourDto=2 +fr.ird.observe.dto.referential.common.LengthMeasureMethodDto=3 +fr.ird.observe.dto.referential.common.OceanDto=2 +fr.ird.observe.dto.referential.common.PersonDto=7 +fr.ird.observe.dto.referential.common.SexDto=4 +fr.ird.observe.dto.referential.common.SizeMeasureTypeDto=7 +fr.ird.observe.dto.referential.common.SpeciesDto=52 +fr.ird.observe.dto.referential.common.SpeciesGroupReleaseModeDto=5 +fr.ird.observe.dto.referential.common.VesselDto=6 +fr.ird.observe.dto.referential.common.WeightMeasureMethodDto=4 +fr.ird.observe.dto.referential.common.WeightMeasureTypeDto=1 +fr.ird.observe.dto.referential.common.WindDto=9 +fr.ird.observe.dto.referential.ps.common.AcquisitionStatusDto=2 +fr.ird.observe.dto.referential.ps.common.ObjectMaterialDto=76 +fr.ird.observe.dto.referential.ps.common.ObjectOperationDto=5 +fr.ird.observe.dto.referential.ps.common.ObservedSystemDto=12 +fr.ird.observe.dto.referential.ps.common.ProgramDto=3 +fr.ird.observe.dto.referential.ps.common.ReasonForNoFishingDto=10 +fr.ird.observe.dto.referential.ps.common.ReasonForNullSetDto=6 +fr.ird.observe.dto.referential.ps.common.SampleTypeDto=2 +fr.ird.observe.dto.referential.ps.common.SchoolTypeDto=2 +fr.ird.observe.dto.referential.ps.common.SpeciesFateDto=11 +fr.ird.observe.dto.referential.ps.common.TransmittingBuoyOperationDto=3 +fr.ird.observe.dto.referential.ps.common.TransmittingBuoyOwnershipDto=4 +fr.ird.observe.dto.referential.ps.common.TransmittingBuoyTypeDto=10 +fr.ird.observe.dto.referential.ps.common.VesselActivityDto=19 +fr.ird.observe.dto.referential.ps.common.WeightCategoryDto=5 +fr.ird.observe.dto.referential.ps.landing.DestinationDto=2 +fr.ird.observe.dto.referential.ps.landing.FateDto=1 +fr.ird.observe.dto.referential.ps.localmarket.PackagingDto=2 +fr.ird.observe.dto.referential.ps.logbook.SampleQualityDto=1 +fr.ird.observe.dto.referential.ps.logbook.WellContentStatusDto=1 +fr.ird.observe.dto.referential.ps.logbook.WellSamplingConformityDto=1 +fr.ird.observe.dto.referential.ps.logbook.WellSamplingStatusDto=1 +fr.ird.observe.dto.referential.ps.observation.DetectionModeDto=6 +fr.ird.observe.dto.referential.ps.observation.InformationSourceDto=2 +fr.ird.observe.dto.referential.ps.observation.NonTargetCatchReleaseConformityDto=3 +fr.ird.observe.dto.referential.ps.observation.NonTargetCatchReleaseStatusDto=4 +fr.ird.observe.dto.referential.ps.observation.NonTargetCatchReleasingTimeDto=4 +fr.ird.observe.dto.referential.ps.observation.ReasonForDiscardDto=5 +fr.ird.observe.dto.referential.ps.observation.SpeciesStatusDto=4 +fr.ird.observe.dto.referential.ps.observation.SurroundingActivityDto=7 ===================================== core/persistence/test/src/test/resources/fixtures/persistence/referential_ids_count/data-ps.properties ===================================== @@ -0,0 +1,68 @@ +### +# #%L +# ObServe Core :: Persistence :: Test +# %% +# Copyright (C) 2008 - 2022 IRD, Code Lutin, 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% +### +fr.ird.observe.dto.referential.common.CountryDto=4 +fr.ird.observe.dto.referential.common.DataQualityDto=2 +fr.ird.observe.dto.referential.common.FpaZoneDto=2 +fr.ird.observe.dto.referential.common.GearCharacteristicDto=2 +fr.ird.observe.dto.referential.common.GearDto=1 +fr.ird.observe.dto.referential.common.HarbourDto=1 +fr.ird.observe.dto.referential.common.LengthMeasureMethodDto=3 +fr.ird.observe.dto.referential.common.OceanDto=1 +fr.ird.observe.dto.referential.common.PersonDto=3 +fr.ird.observe.dto.referential.common.SexDto=3 +fr.ird.observe.dto.referential.common.SizeMeasureTypeDto=5 +fr.ird.observe.dto.referential.common.SpeciesDto=20 +fr.ird.observe.dto.referential.common.SpeciesGroupReleaseModeDto=2 +fr.ird.observe.dto.referential.common.VesselDto=3 +fr.ird.observe.dto.referential.common.WeightMeasureMethodDto=4 +fr.ird.observe.dto.referential.common.WeightMeasureTypeDto=1 +fr.ird.observe.dto.referential.common.WindDto=6 +fr.ird.observe.dto.referential.ps.common.AcquisitionStatusDto=2 +fr.ird.observe.dto.referential.ps.common.ObjectMaterialDto=6 +fr.ird.observe.dto.referential.ps.common.ObjectOperationDto=3 +fr.ird.observe.dto.referential.ps.common.ObservedSystemDto=8 +fr.ird.observe.dto.referential.ps.common.ProgramDto=2 +fr.ird.observe.dto.referential.ps.common.ReasonForNoFishingDto=6 +fr.ird.observe.dto.referential.ps.common.ReasonForNullSetDto=2 +fr.ird.observe.dto.referential.ps.common.SampleTypeDto=2 +fr.ird.observe.dto.referential.ps.common.SchoolTypeDto=2 +fr.ird.observe.dto.referential.ps.common.SpeciesFateDto=6 +fr.ird.observe.dto.referential.ps.common.TransmittingBuoyOperationDto=3 +fr.ird.observe.dto.referential.ps.common.TransmittingBuoyOwnershipDto=3 +fr.ird.observe.dto.referential.ps.common.TransmittingBuoyTypeDto=5 +fr.ird.observe.dto.referential.ps.common.VesselActivityDto=12 +fr.ird.observe.dto.referential.ps.common.WeightCategoryDto=5 +fr.ird.observe.dto.referential.ps.landing.DestinationDto=2 +fr.ird.observe.dto.referential.ps.landing.FateDto=1 +fr.ird.observe.dto.referential.ps.localmarket.PackagingDto=2 +fr.ird.observe.dto.referential.ps.logbook.SampleQualityDto=1 +fr.ird.observe.dto.referential.ps.logbook.WellContentStatusDto=1 +fr.ird.observe.dto.referential.ps.logbook.WellSamplingConformityDto=1 +fr.ird.observe.dto.referential.ps.logbook.WellSamplingStatusDto=1 +fr.ird.observe.dto.referential.ps.observation.DetectionModeDto=6 +fr.ird.observe.dto.referential.ps.observation.InformationSourceDto=2 +fr.ird.observe.dto.referential.ps.observation.NonTargetCatchReleaseConformityDto=2 +fr.ird.observe.dto.referential.ps.observation.NonTargetCatchReleaseStatusDto=2 +fr.ird.observe.dto.referential.ps.observation.NonTargetCatchReleasingTimeDto=2 +fr.ird.observe.dto.referential.ps.observation.ReasonForDiscardDto=2 +fr.ird.observe.dto.referential.ps.observation.SpeciesStatusDto=2 +fr.ird.observe.dto.referential.ps.observation.SurroundingActivityDto=4 ===================================== core/services/local/src/main/java/fr/ird/observe/services/local/service/ObserveServiceLocal.java ===================================== @@ -86,6 +86,7 @@ import fr.ird.observe.spi.validation.ServiceValidationContext; import io.ultreia.java4all.util.TimeLog; import org.nuiton.validator.NuitonValidatorScope; +import java.nio.file.Path; import java.util.Date; import java.util.LinkedHashSet; import java.util.List; @@ -124,6 +125,11 @@ public abstract class ObserveServiceLocal implements ObserveService, ServiceCont return referentialLocale; } + @Override + public final Path getTemporaryDirectoryRoot() { + return serviceContext().serviceInitializer().getInitializerConfig().getTemporaryDirectoryRoot().toPath(); + } + @Override public final DecoratorService getDecoratorService() { return serviceContext.getDecoratorService(); ===================================== core/services/local/src/main/java/fr/ird/observe/services/local/service/data/RootOpenableServiceLocalSupport.java ===================================== @@ -40,6 +40,8 @@ import fr.ird.observe.services.service.data.MoveLayoutRequest; import fr.ird.observe.services.service.data.RootOpenableService; import fr.ird.observe.spi.GroupBySpiContext; import fr.ird.observe.spi.context.RootOpenableDtoEntityContext; +import fr.ird.observe.spi.referential.MissingReferentialRequest; +import fr.ird.observe.spi.referential.MissingReferentialResult; import java.util.Date; import java.util.List; @@ -142,5 +144,11 @@ public class RootOpenableServiceLocalSupport extends ObserveServiceLocal impleme RootOpenableDtoEntityContext<?, ?, ?, ?, ?> spi = fromRootOpenableDto(dtoType); spi.moveLayout(this, request); } + + @Override + public <D extends RootOpenableDto> MissingReferentialResult computeMissingReferential(Class<D> dtoType, MissingReferentialRequest request) { + RootOpenableDtoEntityContext<?, ?, ?, ?, ?> spi = fromRootOpenableDto(dtoType); + return getTopiaApplicationContext().computeMissingReferential(this, spi.toEntityType(), request); + } } ===================================== core/services/local/src/main/java/fr/ird/observe/services/local/service/referential/ReferentialServiceLocalSupport.java ===================================== @@ -35,8 +35,6 @@ import fr.ird.observe.services.local.service.ObserveServiceLocal; import fr.ird.observe.services.service.referential.ReferentialService; import fr.ird.observe.spi.context.ReferentialDtoEntityContext; import fr.ird.observe.spi.module.ObserveBusinessProject; -import fr.ird.observe.spi.referential.MissingReferentialRequest; -import fr.ird.observe.spi.referential.MissingReferentialResult; import fr.ird.observe.spi.referential.ReferentialIds; import fr.ird.observe.spi.referential.differential.DifferentialMetaModel; import org.nuiton.topia.persistence.script.TopiaSqlScript; @@ -159,11 +157,6 @@ class ReferentialServiceLocalSupport extends ObserveServiceLocal implements Refe return getTopiaPersistenceContext().getReferentialIds(ObserveBusinessProject.get()); } - @Override - public MissingReferentialResult computeMissingReferential(MissingReferentialRequest request) { - return getTopiaApplicationContext().computeMissingReferential(this, request, serviceContext().serviceInitializer().getInitializerConfig().getTemporaryDirectoryRoot().toPath()); - } - @Override public void insertMissingReferential(TopiaSqlScript sqlContent) { getTopiaPersistenceContext().executeSqlScript(sqlContent); ===================================== core/services/test/src/main/java/fr/ird/observe/services/service/data/RootOpenableServiceFixtures.java ===================================== @@ -46,6 +46,8 @@ import fr.ird.observe.services.service.ObserveServiceFixtures; import fr.ird.observe.services.service.ReferenceServiceFixtures; import fr.ird.observe.spi.module.BusinessModule; import fr.ird.observe.spi.module.ObserveBusinessProject; +import fr.ird.observe.spi.referential.MissingReferentialRequest; +import fr.ird.observe.spi.referential.MissingReferentialResult; import io.ultreia.java4all.lang.Strings; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; @@ -275,6 +277,18 @@ public class RootOpenableServiceFixtures extends GeneratedRootOpenableServiceFix return new RootOpenableServiceFixtures.SaveResult<>(createForm, createSave, updateForm, updateSave); } + + @Override + public void computeMissingReferential(ObserveServicesProvider servicesProvider, RootOpenableService service) { + String id = getProperty("computeMissingReferential.id"); + MissingReferentialResult actual = service.computeMissingReferential(TripDto.class, MissingReferentialRequest.of(Map.of(), id)); + Assert.assertNotNull(actual); + Assert.assertNotNull(actual.getSqlCode()); + Assert.assertNotNull(actual.getMissingIds()); + MissingReferentialResult actualNull = service.computeMissingReferential(TripDto.class, MissingReferentialRequest.of(actual.getMissingIds(), id)); + Assert.assertNull(actualNull); + } + @Override public void getGroupByValue(ObserveServicesProvider servicesProvider, RootOpenableService service) { for (Class<? extends RootOpenableDto> dtoType : ObserveBusinessProject.get().getRootOpenableDataTypes()) { ===================================== core/services/test/src/main/java/fr/ird/observe/services/service/referential/ReferentialServiceFixtures.java ===================================== @@ -30,13 +30,10 @@ import fr.ird.observe.dto.reference.ReferentialDtoReferenceSet; import fr.ird.observe.dto.referential.ps.common.ProgramDto; import fr.ird.observe.dto.result.SaveResultDto; import fr.ird.observe.services.ObserveServicesProvider; -import fr.ird.observe.spi.referential.MissingReferentialRequest; -import fr.ird.observe.spi.referential.MissingReferentialResult; import fr.ird.observe.spi.referential.ReferentialIds; import org.junit.Assert; import java.util.Collections; -import java.util.LinkedHashMap; import java.util.Set; public class ReferentialServiceFixtures extends GeneratedReferentialServiceFixtures { @@ -51,15 +48,6 @@ public class ReferentialServiceFixtures extends GeneratedReferentialServiceFixtu Assert.assertTrue(service.exists(ProgramDto.class, newId)); } - @Override - public void computeMissingReferential(ObserveServicesProvider servicesProvider, ReferentialService service) { - MissingReferentialResult actual = service.computeMissingReferential(MissingReferentialRequest.of( - new LinkedHashMap<>(), - getProperty("computeMissingReferential.id") - )); - Assert.assertNotNull(actual); - } - @Override public void delete(ObserveServicesProvider servicesProvider, ReferentialService service) { String id = getProperty("delete.id"); ===================================== core/services/test/src/main/resources/fixtures/fr/ird/observe/services/service/data/RootOpenableService.properties ===================================== @@ -19,6 +19,7 @@ # <http://www.gnu.org/licenses/gpl-3.0.html>. # #L% ### +computeMissingReferential.id=${PS_COMMON_TRIP} data.ll.common.Trip.dependencies.count=0 data.ll.common.Trip.getBrothers.count=0 data.ll.common.Trip.getBrothersFromParent.count=1 ===================================== server/core/src/main/filtered-resources/META-INF/mapping-api-client.wm ===================================== @@ -102,6 +102,7 @@ GET /data/OpenableService/loadForm data POST /data/OpenableService/move data.OpenableServiceRestApi.move GET /data/OpenableService/preCreate data.OpenableServiceRestApi.preCreate POST /data/OpenableService/save data.OpenableServiceRestApi.save +POST /data/RootOpenableService/computeMissingReferential data.RootOpenableServiceRestApi.computeMissingReferential DELETE /data/RootOpenableService/delete data.RootOpenableServiceRestApi.delete DELETE /data/RootOpenableService/deleteLayout data.RootOpenableServiceRestApi.deleteLayout GET /data/RootOpenableService/exists data.RootOpenableServiceRestApi.exists @@ -148,7 +149,6 @@ GET /data/ps/common/TripService/loadLogbookForm data GET /data/ps/common/TripService/preCreateLogbookFloatingObject data.ps.common.TripServiceRestApi.preCreateLogbookFloatingObject GET /data/ps/common/TripService/preCreateObservationFloatingObject data.ps.common.TripServiceRestApi.preCreateObservationFloatingObject POST /referential/ReferentialService/changeId referential.ReferentialServiceRestApi.changeId -POST /referential/ReferentialService/computeMissingReferential referential.ReferentialServiceRestApi.computeMissingReferential DELETE /referential/ReferentialService/delete referential.ReferentialServiceRestApi.delete GET /referential/ReferentialService/differentialMetaModel referential.ReferentialServiceRestApi.differentialMetaModel GET /referential/ReferentialService/exists referential.ReferentialServiceRestApi.exists View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/6f62a2f8ef0289a298716602… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/6f62a2f8ef0289a298716602… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] 3 commits: Souci sur importation d'une base espagnole - See ultreiaio/ird-observe#2255
by Tony CHEMIT (＠tchemit) 11 Apr '22

11 Apr '22

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 78507681 by Tony Chemit at 2022-04-11T18:30:28+02:00 Souci sur importation d'une base espagnole - See ultreiaio/ird-observe#2255 - - - - - 3b910d63 by Tony Chemit at 2022-04-11T18:30:28+02:00 Use case sensitive column names in Sql models - Closes ultreiaio/topia-extension#127 - - - - - 6f62a2f8 by Tony Chemit at 2022-04-11T18:30:28+02:00 Add extra mapping in CopyPlan model - Closes ultreiaio/topia-extension#128 - - - - - 2 changed files: - core/persistence/java/src/main/resources/META-INF/persistence/Observe/TopiaEntitySqlCopyPlanModel.json - core/persistence/java/src/main/resources/META-INF/persistence/Observe/TopiaEntitySqlDeletePlanModel.json The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/925e1fec4a4a2ed93b86adfb… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/925e1fec4a4a2ed93b86adfb… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] 11 commits: Improve Consumer API and introduce ReplicateLayoutRequest - See ultreiaio/topia-extension#123
by Tony CHEMIT (＠tchemit) 07 Apr '22

07 Apr '22

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 6365714d by Tony Chemit at 2022-04-07T19:13:54+02:00 Improve Consumer API and introduce ReplicateLayoutRequest - See ultreiaio/topia-extension#123 Déplacements de données PS d'une marée à une autre - See ultreiaio/ird-observe#2066 - - - - - a04e6b16 by Tony Chemit at 2022-04-07T19:13:54+02:00 clean ui model states - - - - - 54e40aa7 by Tony Chemit at 2022-04-07T19:13:54+02:00 Sur échantillonnage PS, permettre l'absence d'activités associées - Closes ultreiaio/ird-observe#2238 - - - - - 47e51212 by Tony Chemit at 2022-04-07T19:13:54+02:00 fix save and next entry code (not clicking on save button) - - - - - 8e576ae6 by Tony Chemit at 2022-04-07T19:13:54+02:00 fix can reset on new entry - - - - - f357a738 by Tony Chemit at 2022-04-07T19:13:54+02:00 update hibernate validator tidy pom update pom - - - - - be35ea7b by Tony Chemit at 2022-04-07T19:13:54+02:00 Entrer les identités de l'équipe de Dakar - See ultreiaio/ird-observe#2239 - - - - - a3e51d85 by Tony Chemit at 2022-04-07T19:13:54+02:00 add FIXME - - - - - ce855cdc by Tony Chemit at 2022-04-07T19:13:54+02:00 add FIXME on dependencies to update one day (some on webmotion, others for hibernate and h2) - - - - - d4a9d8c0 by Tony Chemit at 2022-04-07T19:13:54+02:00 topia-extension snapshot - - - - - 925e1fec by Tony Chemit at 2022-04-07T19:13:54+02:00 Can skip avdth test by adding -Davdth.skip=true - - - - - 30 changed files: - client/datasource/editor/api/src/main/i18n/getters/java.getter - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/layout/actions/DeleteLayoutTreeAdapter.java → client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/actions/delete/DeleteLayoutTreeAdapter.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/actions/move/MoveAction.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/actions/move/MoveRequestBuilder.java - + client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/actions/move/layout/MoveLayoutAction.java - + client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/actions/move/layout/MoveLayoutExecutor.java - + client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/actions/move/layout/MoveLayoutRequestBuilder.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/layout/actions/MoveLayoutTreeAdapter.java → client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/actions/move/layout/MoveLayoutTreeAdapter.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/edit/ContentEditUIModelStates.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/layout/ContentLayoutUIModel.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/layout/ContentLayoutUIModelStates.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/list/ContentListUIHandler.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/open/ContentOpenableUIHandler.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/open/ContentOpenableUIModelStates.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/ropen/ContentRootOpenableUIHandler.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/ropen/ContentRootOpenableUIModelStates.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/simple/ContentSimpleUIModelStatesSupport.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/table/ContentTableUI.jcss - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/table/ContentTableUIHandler.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/table/ContentTableUIModelStates.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/table/actions/entry/SaveAndNewEntry.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/navigation/tree/NavigationScope.java - client/datasource/editor/api/src/main/resources/fr/ird/observe/client/datasource/editor/api/content/data/table/CommonContentTableUI.jcss - client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/common/TripGearUseFeaturesUI.jcss - client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/common/TripUIHandler.java - client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/logbook/SetCatchUI.jcss - client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/observation/SetCatchUI.jcss - client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/common/TripGearUseFeaturesUI.jaxx - client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/common/TripGearUseFeaturesUI.jcss - − client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/common/TripUIHandler.java The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/f1e88f453d7be75463bc077e… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/f1e88f453d7be75463bc077e… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] 11 commits: Improve Consumer API and introduce ReplicateLayoutRequest - See ultreiaio/topia-extension#123
by Tony CHEMIT (＠tchemit) 07 Apr '22

07 Apr '22

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: a879e5e7 by Tony Chemit at 2022-04-07T17:25:40+02:00 Improve Consumer API and introduce ReplicateLayoutRequest - See ultreiaio/topia-extension#123 Déplacements de données PS d'une marée à une autre - See ultreiaio/ird-observe#2066 - - - - - 12bd2109 by Tony Chemit at 2022-04-07T17:25:40+02:00 clean ui model states - - - - - 376c8dd4 by Tony Chemit at 2022-04-07T17:25:40+02:00 Sur échantillonnage PS, permettre l'absence d'activités associées - Closes ultreiaio/ird-observe#2238 - - - - - 3c6b0108 by Tony Chemit at 2022-04-07T17:25:40+02:00 fix save and next entry code (not clicking on save button) - - - - - 642b1a08 by Tony Chemit at 2022-04-07T17:25:40+02:00 fix can reset on new entry - - - - - ffb4070c by Tony Chemit at 2022-04-07T17:25:40+02:00 update hibernate validator tidy pom update pom - - - - - e365296b by Tony Chemit at 2022-04-07T17:25:40+02:00 Entrer les identités de l'équipe de Dakar - See ultreiaio/ird-observe#2239 - - - - - 748d25cb by Tony Chemit at 2022-04-07T17:25:40+02:00 add FIXME - - - - - f4f3cbc7 by Tony Chemit at 2022-04-07T17:25:40+02:00 add FIXME on dependencies to update one day (some on webmotion, others for hibernate and h2) - - - - - 0e9c9459 by Tony Chemit at 2022-04-07T17:25:40+02:00 topia-extension snapshot - - - - - f1e88f45 by Tony Chemit at 2022-04-07T17:25:40+02:00 Can skip avdth test by adding -Davdth.skip=true - - - - - 30 changed files: - client/datasource/editor/api/src/main/i18n/getters/java.getter - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/layout/actions/DeleteLayoutTreeAdapter.java → client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/actions/delete/DeleteLayoutTreeAdapter.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/actions/move/MoveAction.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/actions/move/MoveRequestBuilder.java - + client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/actions/move/layout/MoveLayoutAction.java - + client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/actions/move/layout/MoveLayoutExecutor.java - + client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/actions/move/layout/MoveLayoutRequestBuilder.java - + client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/actions/move/layout/MoveLayoutTreeAdapter.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/edit/ContentEditUIModelStates.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/layout/ContentLayoutUIModel.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/layout/ContentLayoutUIModelStates.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/list/ContentListUIHandler.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/open/ContentOpenableUIHandler.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/open/ContentOpenableUIModelStates.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/ropen/ContentRootOpenableUIHandler.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/ropen/ContentRootOpenableUIModelStates.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/simple/ContentSimpleUIModelStatesSupport.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/table/ContentTableUI.jcss - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/table/ContentTableUIHandler.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/table/ContentTableUIModelStates.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/table/actions/entry/SaveAndNewEntry.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/navigation/tree/NavigationScope.java - client/datasource/editor/api/src/main/resources/fr/ird/observe/client/datasource/editor/api/content/data/table/CommonContentTableUI.jcss - client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/common/TripGearUseFeaturesUI.jcss - client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/common/TripUIHandler.java - client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/logbook/SetCatchUI.jcss - client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/observation/SetCatchUI.jcss - client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/common/TripGearUseFeaturesUI.jaxx - client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/common/TripGearUseFeaturesUI.jcss - client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/landing/TripLandingUI.jaxx The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/243f73092e4fd6d714d8553d… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/243f73092e4fd6d714d8553d… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] 10 commits: Improve Consumer API and introduce ReplicateLayoutRequest - See ultreiaio/topia-extension#123
by Tony CHEMIT (＠tchemit) 06 Apr '22

06 Apr '22

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 2e57301f by Tony Chemit at 2022-04-06T18:35:07+02:00 Improve Consumer API and introduce ReplicateLayoutRequest - See ultreiaio/topia-extension#123 Déplacements de données PS d'une marée à une autre - See ultreiaio/ird-observe#2066 - - - - - 6e0612a8 by Tony Chemit at 2022-04-06T18:35:07+02:00 clean ui model states - - - - - 287561a9 by Tony Chemit at 2022-04-06T18:35:07+02:00 Sur échantillonnage PS, permettre l'absence d'activités associées - Closes ultreiaio/ird-observe#2238 - - - - - fb743aa4 by Tony Chemit at 2022-04-06T18:35:07+02:00 fix save and next entry code (not clicking on save button) - - - - - ab844a83 by Tony Chemit at 2022-04-06T18:35:07+02:00 fix can reset on new entry - - - - - 6d8d6180 by Tony Chemit at 2022-04-06T18:35:07+02:00 update hibernate validator tidy pom update pom - - - - - 1979f3ee by Tony Chemit at 2022-04-06T18:35:07+02:00 Entrer les identités de l'équipe de Dakar - See ultreiaio/ird-observe#2239 - - - - - e3accbd4 by Tony Chemit at 2022-04-06T18:35:07+02:00 add FIXME - - - - - 8730c9ed by Tony Chemit at 2022-04-06T18:35:07+02:00 add FIXME on dependencies to update one day (some on webmotion, others for hibernate and h2) - - - - - 243f7309 by Tony Chemit at 2022-04-06T18:35:07+02:00 topia-extension snapshot - - - - - 30 changed files: - client/datasource/editor/api/src/main/i18n/getters/java.getter - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/layout/actions/DeleteLayoutTreeAdapter.java → client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/actions/delete/DeleteLayoutTreeAdapter.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/actions/move/MoveAction.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/actions/move/MoveRequestBuilder.java - + client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/actions/move/layout/MoveLayoutAction.java - + client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/actions/move/layout/MoveLayoutExecutor.java - + client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/actions/move/layout/MoveLayoutRequestBuilder.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/layout/actions/MoveLayoutTreeAdapter.java → client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/actions/move/layout/MoveLayoutTreeAdapter.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/edit/ContentEditUIModelStates.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/layout/ContentLayoutUIModel.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/layout/ContentLayoutUIModelStates.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/list/ContentListUIHandler.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/open/ContentOpenableUIHandler.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/open/ContentOpenableUIModelStates.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/ropen/ContentRootOpenableUIHandler.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/ropen/ContentRootOpenableUIModelStates.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/simple/ContentSimpleUIModelStatesSupport.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/table/ContentTableUI.jcss - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/table/ContentTableUIHandler.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/table/ContentTableUIModelStates.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/table/actions/entry/SaveAndNewEntry.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/navigation/tree/NavigationScope.java - client/datasource/editor/api/src/main/resources/fr/ird/observe/client/datasource/editor/api/content/data/table/CommonContentTableUI.jcss - client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/common/TripGearUseFeaturesUI.jcss - client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/common/TripUIHandler.java - client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/logbook/SetCatchUI.jcss - client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/observation/SetCatchUI.jcss - client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/common/TripGearUseFeaturesUI.jaxx - client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/common/TripGearUseFeaturesUI.jcss - − client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/common/TripUIHandler.java The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/8cf68decb6c42fe743496c3f… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/8cf68decb6c42fe743496c3f… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] 5 commits: Déplacements de données PS d'une marée à une autre - See ultreiaio/ird-observe#2066
by Tony CHEMIT (＠tchemit) 04 Apr '22

04 Apr '22

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 2fe21798 by Tony Chemit at 2022-04-04T17:03:51+02:00 Déplacements de données PS d'une marée à une autre - See ultreiaio/ird-observe#2066 - - - - - 9c7ff4b6 by Tony Chemit at 2022-04-04T17:03:51+02:00 clean ui model states - - - - - 5addce82 by Tony Chemit at 2022-04-04T17:03:51+02:00 Sur échantillonnage PS, permettre l'absence d'activités associées - Closes ultreiaio/ird-observe#2238 - - - - - f54439af by Tony Chemit at 2022-04-04T17:03:51+02:00 fix save and next entry code (not clicking on save button) - - - - - 8cf68dec by Tony Chemit at 2022-04-04T17:03:51+02:00 fix can reset on new entry - - - - - 30 changed files: - client/datasource/editor/api/src/main/i18n/getters/java.getter - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/layout/actions/DeleteLayoutTreeAdapter.java → client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/actions/delete/DeleteLayoutTreeAdapter.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/actions/move/MoveAction.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/actions/move/MoveRequestBuilder.java - + client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/actions/move/layout/MoveLayoutAction.java - + client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/actions/move/layout/MoveLayoutExecutor.java - + client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/actions/move/layout/MoveLayoutRequestBuilder.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/layout/actions/MoveLayoutTreeAdapter.java → client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/actions/move/layout/MoveLayoutTreeAdapter.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/edit/ContentEditUIModelStates.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/layout/ContentLayoutUIModel.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/layout/ContentLayoutUIModelStates.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/list/ContentListUIHandler.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/open/ContentOpenableUIHandler.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/open/ContentOpenableUIModelStates.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/ropen/ContentRootOpenableUIHandler.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/ropen/ContentRootOpenableUIModelStates.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/simple/ContentSimpleUIModelStatesSupport.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/table/ContentTableUI.jcss - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/table/ContentTableUIHandler.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/table/ContentTableUIModelStates.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/table/actions/entry/SaveAndNewEntry.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/navigation/tree/NavigationScope.java - client/datasource/editor/api/src/main/resources/fr/ird/observe/client/datasource/editor/api/content/data/table/CommonContentTableUI.jcss - client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/common/TripGearUseFeaturesUI.jcss - client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/common/TripUIHandler.java - client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/logbook/SetCatchUI.jcss - client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/observation/SetCatchUI.jcss - client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/common/TripGearUseFeaturesUI.jaxx - client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/common/TripGearUseFeaturesUI.jcss - − client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/common/TripUIHandler.java The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/b665bc12050266e3dc0394f4… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/b665bc12050266e3dc0394f4… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] 10 commits: Réorganisation de l'arbre de navigation pour mieux représenter les paquetages - Closes #2101
by Tony CHEMIT (＠tchemit) 02 Apr '22

02 Apr '22

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: cf0b3ddf by Tony Chemit at 2022-04-02T10:48:45+02:00 Réorganisation de l'arbre de navigation pour mieux représenter les paquetages - Closes #2101 - - - - - 3ab3b98e by Tony Chemit at 2022-04-02T10:48:45+02:00 Add loadForm method on DtoEntityContext - - - - - 210161ad by Tony Chemit at 2022-04-02T10:48:45+02:00 Clean ContentListUI init - - - - - 3f8d09fb by Tony Chemit at 2022-04-02T10:48:45+02:00 fix titled border spaces - - - - - 471ead45 by Tony Chemit at 2022-04-02T10:48:45+02:00 remove unused code - - - - - 1f4cb752 by Tony Chemit at 2022-04-02T10:48:45+02:00 clean jcss and fix some binding - - - - - 23c17fb3 by Tony Chemit at 2022-04-02T10:48:45+02:00 fix en i18n - - - - - b36c9220 by Tony Chemit at 2022-04-02T18:54:12+02:00 Déplacements de données PS d'une marée à une autre - See ultreiaio/ird-observe#2066 - - - - - d274c9d7 by Tony Chemit at 2022-04-02T18:54:12+02:00 clean ui model states - - - - - b665bc12 by Tony Chemit at 2022-04-02T18:54:12+02:00 Sur échantillonnage PS, permettre l'absence d'activités associées - Closes ultreiaio/ird-observe#2238 - - - - - 30 changed files: - client/core/src/main/resources/fr/ird/observe/client/ui/ObserveCommon.jcss - client/datasource/editor/api-test/src/main/java/fr/ird/observe/client/datasource/editor/api/NavigationModelNodeTestSupport.java - client/datasource/editor/api/src/main/i18n/getters/java.getter - client/datasource/editor/api/src/main/i18n/getters/jaxx.getter - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/ContentUIHandler.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/ContentUIInitializer.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/actions/delete/DeleteAction.java - + client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/actions/delete/DeleteLayoutTreeAdapter.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/actions/id/ShowIdExecutor.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/actions/id/ShowTechnicalInformations.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/actions/move/MoveAction.java - + client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/actions/move/MoveLayoutTreeAdapter.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/edit/ContentEditUI.jaxx - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/edit/ContentEditUI.jcss - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/edit/ContentEditUIModelStates.java - + 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/data/layout/ContentLayoutUI.jcss - + client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/layout/ContentLayoutUIHandler.java - + client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/layout/ContentLayoutUIInitializer.java - + client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/layout/ContentLayoutUIModel.java - + client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/layout/ContentLayoutUIModelStates.java - + client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/layout/ContentLayoutUINavigationCapability.java - + client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/layout/ContentLayoutUINavigationContext.java - + client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/layout/ContentLayoutUINavigationHandler.java - + client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/layout/ContentLayoutUINavigationInitializer.java - + client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/layout/ContentLayoutUINavigationNode.java - + client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/layout/ContentLayoutUIOpenExecutor.java - + client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/layout/actions/ContentLayoutUIAction.java - + client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/layout/actions/FixData.java - + client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/layout/actions/GotoData.java The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/50a311f969e38a15014ad219… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/50a311f969e38a15014ad219… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] 7 commits: Réorganisation de l'arbre de navigation pour mieux représenter les paquetages - Closes #2101
by Tony CHEMIT (＠tchemit) 01 Apr '22

01 Apr '22

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 0adbae6f by Tony Chemit at 2022-04-01T16:21:45+02:00 Réorganisation de l'arbre de navigation pour mieux représenter les paquetages - Closes #2101 - - - - - 9399ba44 by Tony Chemit at 2022-04-01T16:21:45+02:00 Add loadForm method on DtoEntityContext - - - - - de2590e3 by Tony Chemit at 2022-04-01T16:21:45+02:00 Clean ContentListUI init - - - - - f9875521 by Tony Chemit at 2022-04-01T16:21:45+02:00 fix titled border spaces - - - - - d91d4088 by Tony Chemit at 2022-04-01T16:21:45+02:00 remove unused code - - - - - d3a184d3 by Tony Chemit at 2022-04-01T17:10:02+02:00 clean jcss and fix some binding - - - - - 50a311f9 by Tony Chemit at 2022-04-01T17:10:02+02:00 fix en i18n - - - - - 30 changed files: - client/core/src/main/resources/fr/ird/observe/client/ui/ObserveCommon.jcss - client/datasource/editor/api-test/src/main/java/fr/ird/observe/client/datasource/editor/api/NavigationModelNodeTestSupport.java - client/datasource/editor/api/src/main/i18n/getters/java.getter - client/datasource/editor/api/src/main/i18n/getters/jaxx.getter - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/ContentUIHandler.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/actions/delete/DeleteAction.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/actions/id/ShowIdExecutor.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/actions/id/ShowTechnicalInformations.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/actions/move/MoveAction.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/edit/ContentEditUI.jaxx - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/edit/ContentEditUI.jcss - + 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/data/layout/ContentLayoutUI.jcss - + client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/layout/ContentLayoutUIHandler.java - + client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/layout/ContentLayoutUIInitializer.java - + client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/layout/ContentLayoutUIModel.java - + client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/layout/ContentLayoutUIModelStates.java - + client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/layout/ContentLayoutUINavigationCapability.java - + client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/layout/ContentLayoutUINavigationContext.java - + client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/layout/ContentLayoutUINavigationHandler.java - + client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/layout/ContentLayoutUINavigationInitializer.java - + client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/layout/ContentLayoutUINavigationNode.java - + client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/layout/ContentLayoutUIOpenExecutor.java - + client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/layout/actions/ContentLayoutUIAction.java - + client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/layout/actions/DeleteLayoutTreeAdapter.java - + client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/layout/actions/FixData.java - + client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/layout/actions/GotoData.java - + client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/layout/actions/MoveLayoutTreeAdapter.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/list/ContentListUI.jaxx - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/list/ContentListUI.jcss The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/f358939f42a520fea57e6133… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/f358939f42a520fea57e6133… You're receiving this email because of your account on gitlab.com.

1 0