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

[Git][ultreiaio/ird-observe][develop] Nouveau critère de classement pour l'arbre : type de bateau - Closes #2332
by Tony CHEMIT (＠tchemit) May 9, 2022

May 9, 2022

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 29b6cc5b by Tony Chemit at 2022-05-09T18:15:34+02:00 Nouveau critère de classement pour l'arbre : type de bateau - Closes #2332 - - - - - 13 changed files: - core/api/dto/src/test/java/fr/ird/observe/spi/mapping/ObserveDataGroupByDtoToDefinitionMappingTest.java - core/api/dto/src/test/java/fr/ird/observe/spi/module/ObserveBusinessProjectTest.java - core/api/dto/src/test/resources/fixtures/api.properties - core/api/tree/src/main/resources/META-INF/mapping/ObserveDtoToNavigationTreePathMapping.json - core/api/tree/src/main/resources/META-INF/mapping/ObserveDtoToSelectionTreePathMapping.json - core/api/tree/src/test/resources/fixtures/api-tree.properties - core/persistence/java/src/main/resources/fr/ird/observe/entities/data/ll/common/TripImpl.hbm.xml - core/persistence/java/src/test/resources/fixtures/persistence.properties - model/src/main/models/Observe/persistence/class/groupBy.properties - model/src/main/resources/META-INF/navigation/Observe-metamodel.json - model/src/main/resources/META-INF/navigation/Observe-tree-navigation-model.json - model/src/main/resources/META-INF/navigation/Observe-tree-selection-model.json - model/src/test/resources/fixtures/model.properties Changes: ===================================== core/api/dto/src/test/java/fr/ird/observe/spi/mapping/ObserveDataGroupByDtoToDefinitionMappingTest.java ===================================== @@ -47,33 +47,27 @@ public class ObserveDataGroupByDtoToDefinitionMappingTest { public void getGroupByDefinitions() { ObserveBusinessProject businessProject = ObserveBusinessProject.get(); ObserveDataGroupByDtoToDefinitionMapping mapping = ObserveDataGroupByDtoToDefinitionMapping.get(); - int psCount; - int llCount; { List<DataGroupByDtoDefinition<fr.ird.observe.dto.data.ll.common.TripDto, ?>> definitions = mapping.getDefinitions(fr.ird.observe.dto.data.ll.common.TripDto.class); Assert.assertNotNull(definitions); Assert.assertFalse(definitions.isEmpty()); - psCount = definitions.size(); List<DataGroupByDtoDefinition<?, ?>> definitions2 = mapping.getDefinitions(businessProject.getLlBusinessModule()); Assert.assertNotNull(definitions2); Assert.assertFalse(definitions2.isEmpty()); - Assert.assertEquals(psCount, definitions2.size()); + int expectedCount = ObserveApiFixtures.getIntegerProperty("DataGroupByDtoToDefinitionMapping.count.ll"); + ObserveApiFixtures.assertFixture("DataGroupByDtoToDefinitionMapping.count.ll", expectedCount, definitions2.size()); } { List<DataGroupByDtoDefinition<fr.ird.observe.dto.data.ps.common.TripDto, ?>> definitions = mapping.getDefinitions(fr.ird.observe.dto.data.ps.common.TripDto.class); Assert.assertNotNull(definitions); Assert.assertFalse(definitions.isEmpty()); - llCount = definitions.size(); - List<DataGroupByDtoDefinition<?, ?>> definitions2 = mapping.getDefinitions(businessProject.getLlBusinessModule()); + List<DataGroupByDtoDefinition<?, ?>> definitions2 = mapping.getDefinitions(businessProject.getPsBusinessModule()); Assert.assertNotNull(definitions2); Assert.assertFalse(definitions2.isEmpty()); - Assert.assertEquals(llCount, definitions2.size()); + int expectedCount = ObserveApiFixtures.getIntegerProperty("DataGroupByDtoToDefinitionMapping.count.ps"); + ObserveApiFixtures.assertFixture("DataGroupByDtoToDefinitionMapping.count.ps", expectedCount, definitions2.size()); } - Assert.assertEquals(psCount, llCount); - - int expectedCount = ObserveApiFixtures.getIntegerProperty("DataGroupByDtoToDefinitionMapping.count"); - ObserveApiFixtures.assertFixture("DataGroupByDtoToDefinitionMapping.count", expectedCount, psCount + llCount); } @Test ===================================== core/api/dto/src/test/java/fr/ird/observe/spi/module/ObserveBusinessProjectTest.java ===================================== @@ -25,7 +25,6 @@ package fr.ird.observe.spi.module; import fr.ird.observe.ObserveApiFixtures; import fr.ird.observe.dto.DtoToReference; import fr.ird.observe.dto.data.DataDto; -import fr.ird.observe.dto.data.DataGroupByDto; import fr.ird.observe.dto.data.DataGroupByDtoDefinition; import fr.ird.observe.dto.data.RootOpenableDto; import fr.ird.observe.dto.data.ps.observation.SchoolEstimateDto; @@ -77,33 +76,27 @@ public class ObserveBusinessProjectTest extends TestSupportWithConfig { @Test public void getGroupByDefinitions() { - int psCount; - int llCount; { List<DataGroupByDtoDefinition<fr.ird.observe.dto.data.ll.common.TripDto, ?>> definitions = businessProject.getDataGroupByDtoDefinitions(fr.ird.observe.dto.data.ll.common.TripDto.class); Assert.assertNotNull(definitions); Assert.assertFalse(definitions.isEmpty()); - psCount = definitions.size(); - List<DataGroupByDtoDefinition<?, ?>> definitions2 = businessProject.getPsBusinessModule().getDataGroupByDtoDefinitions(); + List<DataGroupByDtoDefinition<?, ?>> definitions2 = businessProject.getLlBusinessModule().getDataGroupByDtoDefinitions(); Assert.assertNotNull(definitions2); Assert.assertFalse(definitions2.isEmpty()); - Assert.assertEquals(psCount, definitions2.size()); + int expectedCount = ObserveApiFixtures.getIntegerProperty("DataGroupByDtoToDefinitionMapping.count.ll"); + ObserveApiFixtures.assertFixture("DataGroupByDtoToDefinitionMapping.count.ll", expectedCount, definitions2.size()); } { List<DataGroupByDtoDefinition<fr.ird.observe.dto.data.ps.common.TripDto, ?>> definitions = businessProject.getDataGroupByDtoDefinitions(fr.ird.observe.dto.data.ps.common.TripDto.class); Assert.assertNotNull(definitions); Assert.assertFalse(definitions.isEmpty()); - llCount = definitions.size(); - List<DataGroupByDtoDefinition<?, ?>> definitions2 = businessProject.getLlBusinessModule().getDataGroupByDtoDefinitions(); + List<DataGroupByDtoDefinition<?, ?>> definitions2 = businessProject.getPsBusinessModule().getDataGroupByDtoDefinitions(); Assert.assertNotNull(definitions2); Assert.assertFalse(definitions2.isEmpty()); - Assert.assertEquals(llCount, definitions2.size()); + int expectedCount = ObserveApiFixtures.getIntegerProperty("DataGroupByDtoToDefinitionMapping.count.ps"); + ObserveApiFixtures.assertFixture("DataGroupByDtoToDefinitionMapping.count.ps", expectedCount, definitions2.size()); } - Assert.assertEquals(psCount, llCount); - - int expectedCount = ObserveApiFixtures.getIntegerProperty("DataGroupByDtoToDefinitionMapping.count"); - ObserveApiFixtures.assertFixture("DataGroupByDtoToDefinitionMapping.count", expectedCount, psCount + llCount); } @Test @@ -146,7 +139,7 @@ public class ObserveBusinessProjectTest extends TestSupportWithConfig { } } - private <D extends RootOpenableDto, G extends DataGroupByDto<D>> void groupByDecoration(Class<D> dtoType) { + private <D extends RootOpenableDto> void groupByDecoration(Class<D> dtoType) { List<DataGroupByDtoDefinition<D, ?>> definitions = businessProject.getDataGroupByDtoDefinitions(dtoType); Assert.assertNotNull("could not find groupBy definitions for:" + dtoType.getName(), definitions); for (DataGroupByDtoDefinition<D, ?> definition : definitions) { ===================================== core/api/dto/src/test/resources/fixtures/api.properties ===================================== @@ -21,8 +21,10 @@ ### DATA_FORM_COUNT=58 REFERENTIAL_FORM_COUNT=91 -DECORATOR_DEFINITIONS_COUNT=574 -DataGroupByDtoToDefinitionMapping.count=24 +DECORATOR_DEFINITIONS_COUNT=576 +DataGroupByDtoToDefinitionMapping.count.ps=12 +DataGroupByDtoToDefinitionMapping.count.ll=13 +DataGroupByDtoToDefinitionMapping.count=25 ReferenceDtoToDtoClassMapping.count=157 DtoToReferenceDtoMapping.count=157 DtoToFormDtoMapping.count=168 ===================================== core/api/tree/src/main/resources/META-INF/mapping/ObserveDtoToNavigationTreePathMapping.json ===================================== @@ -12,7 +12,8 @@ "/dataLlCommonTripGroupByLogbookDataEntryOperator:${TripGroupByLogbookDataEntryOperator}/${Trip}/gearUseFeatures", "/dataLlCommonTripGroupByVessel:${TripGroupByVessel}/${Trip}/gearUseFeatures", "/dataLlCommonTripGroupByDepartureHarbour:${TripGroupByDepartureHarbour}/${Trip}/gearUseFeatures", - "/dataLlCommonTripGroupByLandingHarbour:${TripGroupByLandingHarbour}/${Trip}/gearUseFeatures" + "/dataLlCommonTripGroupByLandingHarbour:${TripGroupByLandingHarbour}/${Trip}/gearUseFeatures", + "/dataLlCommonTripGroupByTripType:${TripGroupByTripType}/${Trip}/gearUseFeatures" ], "fr.ird.observe.dto.data.ll.common.TripDto": [ "/dataLlCommonTrip:${Trip}", @@ -27,7 +28,8 @@ "/dataLlCommonTripGroupByLogbookDataEntryOperator:${TripGroupByLogbookDataEntryOperator}/${Trip}", "/dataLlCommonTripGroupByVessel:${TripGroupByVessel}/${Trip}", "/dataLlCommonTripGroupByDepartureHarbour:${TripGroupByDepartureHarbour}/${Trip}", - "/dataLlCommonTripGroupByLandingHarbour:${TripGroupByLandingHarbour}/${Trip}" + "/dataLlCommonTripGroupByLandingHarbour:${TripGroupByLandingHarbour}/${Trip}", + "/dataLlCommonTripGroupByTripType:${TripGroupByTripType}/${Trip}" ], "fr.ird.observe.dto.data.ll.common.TripGroupByCaptainDto": [ "/dataLlCommonTripGroupByCaptain:${TripGroupByCaptain}" @@ -62,6 +64,9 @@ "fr.ird.observe.dto.data.ll.common.TripGroupByStartDateDto": [ "/dataLlCommonTripGroupByStartDate:${TripGroupByStartDate}" ], + "fr.ird.observe.dto.data.ll.common.TripGroupByTripTypeDto": [ + "/dataLlCommonTripGroupByTripType:${TripGroupByTripType}" + ], "fr.ird.observe.dto.data.ll.common.TripGroupByVesselDto": [ "/dataLlCommonTripGroupByVessel:${TripGroupByVessel}" ], @@ -78,7 +83,8 @@ "/dataLlCommonTripGroupByLogbookDataEntryOperator:${TripGroupByLogbookDataEntryOperator}/${Trip}/landing/${Landing}", "/dataLlCommonTripGroupByVessel:${TripGroupByVessel}/${Trip}/landing/${Landing}", "/dataLlCommonTripGroupByDepartureHarbour:${TripGroupByDepartureHarbour}/${Trip}/landing/${Landing}", - "/dataLlCommonTripGroupByLandingHarbour:${TripGroupByLandingHarbour}/${Trip}/landing/${Landing}" + "/dataLlCommonTripGroupByLandingHarbour:${TripGroupByLandingHarbour}/${Trip}/landing/${Landing}", + "/dataLlCommonTripGroupByTripType:${TripGroupByTripType}/${Trip}/landing/${Landing}" ], "fr.ird.observe.dto.data.ll.logbook.ActivityDto": [ "/dataLlCommonTrip:${Trip}/activityLogbook/${Activity}", @@ -93,7 +99,8 @@ "/dataLlCommonTripGroupByLogbookDataEntryOperator:${TripGroupByLogbookDataEntryOperator}/${Trip}/activityLogbook/${Activity}", "/dataLlCommonTripGroupByVessel:${TripGroupByVessel}/${Trip}/activityLogbook/${Activity}", "/dataLlCommonTripGroupByDepartureHarbour:${TripGroupByDepartureHarbour}/${Trip}/activityLogbook/${Activity}", - "/dataLlCommonTripGroupByLandingHarbour:${TripGroupByLandingHarbour}/${Trip}/activityLogbook/${Activity}" + "/dataLlCommonTripGroupByLandingHarbour:${TripGroupByLandingHarbour}/${Trip}/activityLogbook/${Activity}", + "/dataLlCommonTripGroupByTripType:${TripGroupByTripType}/${Trip}/activityLogbook/${Activity}" ], "fr.ird.observe.dto.data.ll.logbook.ActivitySampleDto": [ "/dataLlCommonTrip:${Trip}/activityLogbook/${Activity}/sample:${ActivitySample}", @@ -108,7 +115,8 @@ "/dataLlCommonTripGroupByLogbookDataEntryOperator:${TripGroupByLogbookDataEntryOperator}/${Trip}/activityLogbook/${Activity}/sample:${ActivitySample}", "/dataLlCommonTripGroupByVessel:${TripGroupByVessel}/${Trip}/activityLogbook/${Activity}/sample:${ActivitySample}", "/dataLlCommonTripGroupByDepartureHarbour:${TripGroupByDepartureHarbour}/${Trip}/activityLogbook/${Activity}/sample:${ActivitySample}", - "/dataLlCommonTripGroupByLandingHarbour:${TripGroupByLandingHarbour}/${Trip}/activityLogbook/${Activity}/sample:${ActivitySample}" + "/dataLlCommonTripGroupByLandingHarbour:${TripGroupByLandingHarbour}/${Trip}/activityLogbook/${Activity}/sample:${ActivitySample}", + "/dataLlCommonTripGroupByTripType:${TripGroupByTripType}/${Trip}/activityLogbook/${Activity}/sample:${ActivitySample}" ], "fr.ird.observe.dto.data.ll.logbook.CatchDto": [ "/dataLlCommonTrip:${Trip}/activityLogbook/${Activity}/set:${Set}/catches", @@ -123,7 +131,8 @@ "/dataLlCommonTripGroupByLogbookDataEntryOperator:${TripGroupByLogbookDataEntryOperator}/${Trip}/activityLogbook/${Activity}/set:${Set}/catches", "/dataLlCommonTripGroupByVessel:${TripGroupByVessel}/${Trip}/activityLogbook/${Activity}/set:${Set}/catches", "/dataLlCommonTripGroupByDepartureHarbour:${TripGroupByDepartureHarbour}/${Trip}/activityLogbook/${Activity}/set:${Set}/catches", - "/dataLlCommonTripGroupByLandingHarbour:${TripGroupByLandingHarbour}/${Trip}/activityLogbook/${Activity}/set:${Set}/catches" + "/dataLlCommonTripGroupByLandingHarbour:${TripGroupByLandingHarbour}/${Trip}/activityLogbook/${Activity}/set:${Set}/catches", + "/dataLlCommonTripGroupByTripType:${TripGroupByTripType}/${Trip}/activityLogbook/${Activity}/set:${Set}/catches" ], "fr.ird.observe.dto.data.ll.logbook.SampleDto": [ "/dataLlCommonTrip:${Trip}/sample/${Sample}", @@ -138,7 +147,8 @@ "/dataLlCommonTripGroupByLogbookDataEntryOperator:${TripGroupByLogbookDataEntryOperator}/${Trip}/sample/${Sample}", "/dataLlCommonTripGroupByVessel:${TripGroupByVessel}/${Trip}/sample/${Sample}", "/dataLlCommonTripGroupByDepartureHarbour:${TripGroupByDepartureHarbour}/${Trip}/sample/${Sample}", - "/dataLlCommonTripGroupByLandingHarbour:${TripGroupByLandingHarbour}/${Trip}/sample/${Sample}" + "/dataLlCommonTripGroupByLandingHarbour:${TripGroupByLandingHarbour}/${Trip}/sample/${Sample}", + "/dataLlCommonTripGroupByTripType:${TripGroupByTripType}/${Trip}/sample/${Sample}" ], "fr.ird.observe.dto.data.ll.logbook.SetDto": [ "/dataLlCommonTrip:${Trip}/activityLogbook/${Activity}/set:${Set}", @@ -153,7 +163,8 @@ "/dataLlCommonTripGroupByLogbookDataEntryOperator:${TripGroupByLogbookDataEntryOperator}/${Trip}/activityLogbook/${Activity}/set:${Set}", "/dataLlCommonTripGroupByVessel:${TripGroupByVessel}/${Trip}/activityLogbook/${Activity}/set:${Set}", "/dataLlCommonTripGroupByDepartureHarbour:${TripGroupByDepartureHarbour}/${Trip}/activityLogbook/${Activity}/set:${Set}", - "/dataLlCommonTripGroupByLandingHarbour:${TripGroupByLandingHarbour}/${Trip}/activityLogbook/${Activity}/set:${Set}" + "/dataLlCommonTripGroupByLandingHarbour:${TripGroupByLandingHarbour}/${Trip}/activityLogbook/${Activity}/set:${Set}", + "/dataLlCommonTripGroupByTripType:${TripGroupByTripType}/${Trip}/activityLogbook/${Activity}/set:${Set}" ], "fr.ird.observe.dto.data.ll.logbook.SetGlobalCompositionDto": [ "/dataLlCommonTrip:${Trip}/activityLogbook/${Activity}/set:${Set}/setGlobalComposition", @@ -168,7 +179,8 @@ "/dataLlCommonTripGroupByLogbookDataEntryOperator:${TripGroupByLogbookDataEntryOperator}/${Trip}/activityLogbook/${Activity}/set:${Set}/setGlobalComposition", "/dataLlCommonTripGroupByVessel:${TripGroupByVessel}/${Trip}/activityLogbook/${Activity}/set:${Set}/setGlobalComposition", "/dataLlCommonTripGroupByDepartureHarbour:${TripGroupByDepartureHarbour}/${Trip}/activityLogbook/${Activity}/set:${Set}/setGlobalComposition", - "/dataLlCommonTripGroupByLandingHarbour:${TripGroupByLandingHarbour}/${Trip}/activityLogbook/${Activity}/set:${Set}/setGlobalComposition" + "/dataLlCommonTripGroupByLandingHarbour:${TripGroupByLandingHarbour}/${Trip}/activityLogbook/${Activity}/set:${Set}/setGlobalComposition", + "/dataLlCommonTripGroupByTripType:${TripGroupByTripType}/${Trip}/activityLogbook/${Activity}/set:${Set}/setGlobalComposition" ], "fr.ird.observe.dto.data.ll.observation.ActivityDto": [ "/dataLlCommonTrip:${Trip}/activityObs/${Activity}", @@ -183,7 +195,8 @@ "/dataLlCommonTripGroupByLogbookDataEntryOperator:${TripGroupByLogbookDataEntryOperator}/${Trip}/activityObs/${Activity}", "/dataLlCommonTripGroupByVessel:${TripGroupByVessel}/${Trip}/activityObs/${Activity}", "/dataLlCommonTripGroupByDepartureHarbour:${TripGroupByDepartureHarbour}/${Trip}/activityObs/${Activity}", - "/dataLlCommonTripGroupByLandingHarbour:${TripGroupByLandingHarbour}/${Trip}/activityObs/${Activity}" + "/dataLlCommonTripGroupByLandingHarbour:${TripGroupByLandingHarbour}/${Trip}/activityObs/${Activity}", + "/dataLlCommonTripGroupByTripType:${TripGroupByTripType}/${Trip}/activityObs/${Activity}" ], "fr.ird.observe.dto.data.ll.observation.CatchDto": [ "/dataLlCommonTrip:${Trip}/activityObs/${Activity}/set:${Set}/catches", @@ -198,7 +211,8 @@ "/dataLlCommonTripGroupByLogbookDataEntryOperator:${TripGroupByLogbookDataEntryOperator}/${Trip}/activityObs/${Activity}/set:${Set}/catches", "/dataLlCommonTripGroupByVessel:${TripGroupByVessel}/${Trip}/activityObs/${Activity}/set:${Set}/catches", "/dataLlCommonTripGroupByDepartureHarbour:${TripGroupByDepartureHarbour}/${Trip}/activityObs/${Activity}/set:${Set}/catches", - "/dataLlCommonTripGroupByLandingHarbour:${TripGroupByLandingHarbour}/${Trip}/activityObs/${Activity}/set:${Set}/catches" + "/dataLlCommonTripGroupByLandingHarbour:${TripGroupByLandingHarbour}/${Trip}/activityObs/${Activity}/set:${Set}/catches", + "/dataLlCommonTripGroupByTripType:${TripGroupByTripType}/${Trip}/activityObs/${Activity}/set:${Set}/catches" ], "fr.ird.observe.dto.data.ll.observation.EncounterDto": [ "/dataLlCommonTrip:${Trip}/activityObs/${Activity}/encounter", @@ -213,7 +227,8 @@ "/dataLlCommonTripGroupByLogbookDataEntryOperator:${TripGroupByLogbookDataEntryOperator}/${Trip}/activityObs/${Activity}/encounter", "/dataLlCommonTripGroupByVessel:${TripGroupByVessel}/${Trip}/activityObs/${Activity}/encounter", "/dataLlCommonTripGroupByDepartureHarbour:${TripGroupByDepartureHarbour}/${Trip}/activityObs/${Activity}/encounter", - "/dataLlCommonTripGroupByLandingHarbour:${TripGroupByLandingHarbour}/${Trip}/activityObs/${Activity}/encounter" + "/dataLlCommonTripGroupByLandingHarbour:${TripGroupByLandingHarbour}/${Trip}/activityObs/${Activity}/encounter", + "/dataLlCommonTripGroupByTripType:${TripGroupByTripType}/${Trip}/activityObs/${Activity}/encounter" ], "fr.ird.observe.dto.data.ll.observation.SensorUsedDto": [ "/dataLlCommonTrip:${Trip}/activityObs/${Activity}/sensorUsed", @@ -228,7 +243,8 @@ "/dataLlCommonTripGroupByLogbookDataEntryOperator:${TripGroupByLogbookDataEntryOperator}/${Trip}/activityObs/${Activity}/sensorUsed", "/dataLlCommonTripGroupByVessel:${TripGroupByVessel}/${Trip}/activityObs/${Activity}/sensorUsed", "/dataLlCommonTripGroupByDepartureHarbour:${TripGroupByDepartureHarbour}/${Trip}/activityObs/${Activity}/sensorUsed", - "/dataLlCommonTripGroupByLandingHarbour:${TripGroupByLandingHarbour}/${Trip}/activityObs/${Activity}/sensorUsed" + "/dataLlCommonTripGroupByLandingHarbour:${TripGroupByLandingHarbour}/${Trip}/activityObs/${Activity}/sensorUsed", + "/dataLlCommonTripGroupByTripType:${TripGroupByTripType}/${Trip}/activityObs/${Activity}/sensorUsed" ], "fr.ird.observe.dto.data.ll.observation.SetDetailCompositionDto": [ "/dataLlCommonTrip:${Trip}/activityObs/${Activity}/set:${Set}/setDetailComposition", @@ -243,7 +259,8 @@ "/dataLlCommonTripGroupByLogbookDataEntryOperator:${TripGroupByLogbookDataEntryOperator}/${Trip}/activityObs/${Activity}/set:${Set}/setDetailComposition", "/dataLlCommonTripGroupByVessel:${TripGroupByVessel}/${Trip}/activityObs/${Activity}/set:${Set}/setDetailComposition", "/dataLlCommonTripGroupByDepartureHarbour:${TripGroupByDepartureHarbour}/${Trip}/activityObs/${Activity}/set:${Set}/setDetailComposition", - "/dataLlCommonTripGroupByLandingHarbour:${TripGroupByLandingHarbour}/${Trip}/activityObs/${Activity}/set:${Set}/setDetailComposition" + "/dataLlCommonTripGroupByLandingHarbour:${TripGroupByLandingHarbour}/${Trip}/activityObs/${Activity}/set:${Set}/setDetailComposition", + "/dataLlCommonTripGroupByTripType:${TripGroupByTripType}/${Trip}/activityObs/${Activity}/set:${Set}/setDetailComposition" ], "fr.ird.observe.dto.data.ll.observation.SetDto": [ "/dataLlCommonTrip:${Trip}/activityObs/${Activity}/set:${Set}", @@ -258,7 +275,8 @@ "/dataLlCommonTripGroupByLogbookDataEntryOperator:${TripGroupByLogbookDataEntryOperator}/${Trip}/activityObs/${Activity}/set:${Set}", "/dataLlCommonTripGroupByVessel:${TripGroupByVessel}/${Trip}/activityObs/${Activity}/set:${Set}", "/dataLlCommonTripGroupByDepartureHarbour:${TripGroupByDepartureHarbour}/${Trip}/activityObs/${Activity}/set:${Set}", - "/dataLlCommonTripGroupByLandingHarbour:${TripGroupByLandingHarbour}/${Trip}/activityObs/${Activity}/set:${Set}" + "/dataLlCommonTripGroupByLandingHarbour:${TripGroupByLandingHarbour}/${Trip}/activityObs/${Activity}/set:${Set}", + "/dataLlCommonTripGroupByTripType:${TripGroupByTripType}/${Trip}/activityObs/${Activity}/set:${Set}" ], "fr.ird.observe.dto.data.ll.observation.SetGlobalCompositionDto": [ "/dataLlCommonTrip:${Trip}/activityObs/${Activity}/set:${Set}/setGlobalComposition", @@ -273,7 +291,8 @@ "/dataLlCommonTripGroupByLogbookDataEntryOperator:${TripGroupByLogbookDataEntryOperator}/${Trip}/activityObs/${Activity}/set:${Set}/setGlobalComposition", "/dataLlCommonTripGroupByVessel:${TripGroupByVessel}/${Trip}/activityObs/${Activity}/set:${Set}/setGlobalComposition", "/dataLlCommonTripGroupByDepartureHarbour:${TripGroupByDepartureHarbour}/${Trip}/activityObs/${Activity}/set:${Set}/setGlobalComposition", - "/dataLlCommonTripGroupByLandingHarbour:${TripGroupByLandingHarbour}/${Trip}/activityObs/${Activity}/set:${Set}/setGlobalComposition" + "/dataLlCommonTripGroupByLandingHarbour:${TripGroupByLandingHarbour}/${Trip}/activityObs/${Activity}/set:${Set}/setGlobalComposition", + "/dataLlCommonTripGroupByTripType:${TripGroupByTripType}/${Trip}/activityObs/${Activity}/set:${Set}/setGlobalComposition" ], "fr.ird.observe.dto.data.ll.observation.TdrDto": [ "/dataLlCommonTrip:${Trip}/activityObs/${Activity}/set:${Set}/tdr", @@ -288,7 +307,8 @@ "/dataLlCommonTripGroupByLogbookDataEntryOperator:${TripGroupByLogbookDataEntryOperator}/${Trip}/activityObs/${Activity}/set:${Set}/tdr", "/dataLlCommonTripGroupByVessel:${TripGroupByVessel}/${Trip}/activityObs/${Activity}/set:${Set}/tdr", "/dataLlCommonTripGroupByDepartureHarbour:${TripGroupByDepartureHarbour}/${Trip}/activityObs/${Activity}/set:${Set}/tdr", - "/dataLlCommonTripGroupByLandingHarbour:${TripGroupByLandingHarbour}/${Trip}/activityObs/${Activity}/set:${Set}/tdr" + "/dataLlCommonTripGroupByLandingHarbour:${TripGroupByLandingHarbour}/${Trip}/activityObs/${Activity}/set:${Set}/tdr", + "/dataLlCommonTripGroupByTripType:${TripGroupByTripType}/${Trip}/activityObs/${Activity}/set:${Set}/tdr" ], "fr.ird.observe.dto.data.ps.common.GearUseFeaturesDto": [ "/dataPsCommonTrip:${Trip}/gearUseFeatures", ===================================== core/api/tree/src/main/resources/META-INF/mapping/ObserveDtoToSelectionTreePathMapping.json ===================================== @@ -12,7 +12,8 @@ "/dataLlCommonTripGroupByLogbookDataEntryOperator:${TripGroupByLogbookDataEntryOperator}/${Trip}", "/dataLlCommonTripGroupByVessel:${TripGroupByVessel}/${Trip}", "/dataLlCommonTripGroupByDepartureHarbour:${TripGroupByDepartureHarbour}/${Trip}", - "/dataLlCommonTripGroupByLandingHarbour:${TripGroupByLandingHarbour}/${Trip}" + "/dataLlCommonTripGroupByLandingHarbour:${TripGroupByLandingHarbour}/${Trip}", + "/dataLlCommonTripGroupByTripType:${TripGroupByTripType}/${Trip}" ], "fr.ird.observe.dto.data.ll.common.TripGroupByCaptainDto": [ "/dataLlCommonTripGroupByCaptain:${TripGroupByCaptain}" @@ -47,6 +48,9 @@ "fr.ird.observe.dto.data.ll.common.TripGroupByStartDateDto": [ "/dataLlCommonTripGroupByStartDate:${TripGroupByStartDate}" ], + "fr.ird.observe.dto.data.ll.common.TripGroupByTripTypeDto": [ + "/dataLlCommonTripGroupByTripType:${TripGroupByTripType}" + ], "fr.ird.observe.dto.data.ll.common.TripGroupByVesselDto": [ "/dataLlCommonTripGroupByVessel:${TripGroupByVessel}" ], ===================================== core/api/tree/src/test/resources/fixtures/api-tree.properties ===================================== @@ -19,5 +19,5 @@ # <http://www.gnu.org/licenses/gpl-3.0.html>. # #L% ### -SelectionMapping.count=141 -NavigationMapping.count=648 +SelectionMapping.count=143 +NavigationMapping.count=666 ===================================== core/persistence/java/src/main/resources/fr/ird/observe/entities/data/ll/common/TripImpl.hbm.xml ===================================== @@ -449,6 +449,24 @@ ]]></sql-query> <sql-query name="fr.ird.observe.entities.data.ll.common.Trip::groupBy::landingHarbour::count::null" read-only="true"><![CDATA[ SELECT COUNT(e.topiaId) FROM ll_common.trip e WHERE e.landingHarbour IS NULL; +]]></sql-query> + <sql-query name="fr.ird.observe.entities.data.ll.common.Trip::groupBy::tripType::count::all" read-only="true"><![CDATA[ + SELECT p.topiaId, COUNT(e.topiaId) FROM ll_common.trip e RIGHT JOIN ll_common.tripType p ON e.tripType = p.topiaId GROUP BY p.topiaId ORDER BY p.topiaId; +]]></sql-query> + <sql-query name="fr.ird.observe.entities.data.ll.common.Trip::groupBy::tripType::count::all-noDisabled" read-only="true"><![CDATA[ + SELECT p.topiaId, COUNT(e.topiaId) FROM ll_common.trip e RIGHT JOIN ll_common.tripType p ON e.tripType = p.topiaId WHERE p.status = 1 GROUP BY p.topiaId ORDER BY p.topiaId; +]]></sql-query> + <sql-query name="fr.ird.observe.entities.data.ll.common.Trip::groupBy::tripType::count::all-noEmpty" read-only="true"><![CDATA[ + SELECT p.topiaId, COUNT(e.topiaId) FROM ll_common.trip e LEFT JOIN ll_common.tripType p ON e.tripType = p.topiaId GROUP BY p.topiaId ORDER BY p.topiaId; +]]></sql-query> + <sql-query name="fr.ird.observe.entities.data.ll.common.Trip::groupBy::tripType::count::all-noEmpty-noDisabled" read-only="true"><![CDATA[ + SELECT p.topiaId, COUNT(e.topiaId) FROM ll_common.trip e LEFT JOIN ll_common.tripType p ON e.tripType = p.topiaId WHERE p.status = 1 GROUP BY p.topiaId ORDER BY p.topiaId; +]]></sql-query> + <sql-query name="fr.ird.observe.entities.data.ll.common.Trip::groupBy::tripType::count::one" read-only="true"><![CDATA[ + SELECT COUNT(e.topiaId) FROM ll_common.trip e WHERE e.tripType = ?; +]]></sql-query> + <sql-query name="fr.ird.observe.entities.data.ll.common.Trip::groupBy::tripType::count::null" read-only="true"><![CDATA[ + SELECT COUNT(e.topiaId) FROM ll_common.trip e WHERE e.tripType IS NULL; ]]></sql-query> <database-object> <create>CREATE INDEX idx_ll_common_gearusefeatures_trip ON ll_common.gearUseFeatures(trip)</create> ===================================== core/persistence/java/src/test/resources/fixtures/persistence.properties ===================================== @@ -19,7 +19,7 @@ # <http://www.gnu.org/licenses/gpl-3.0.html>. # #L% ### -DECORATOR_DEFINITIONS_COUNT=792 -DataGroupByEntityToDefinitionMapping.count=24 +DECORATOR_DEFINITIONS_COUNT=796 +DataGroupByEntityToDefinitionMapping.count=25 EntityToDtoClassMapping.count=308 DtoToEntityContextMapping.count=185 ===================================== model/src/main/models/Observe/persistence/class/groupBy.properties ===================================== @@ -19,5 +19,5 @@ # <http://www.gnu.org/licenses/gpl-3.0.html>. # #L% ### -data.ll.common.Trip=startDate,endDate,observationsProgram:p.observation = TRUE,logbookProgram:p.logbook = TRUE,ocean,observer:p.observer = TRUE,captain:p.captain = TRUE,observationsDataEntryOperator:p.dataEntryOperator = TRUE,logbookDataEntryOperator:p.dataEntryOperator = TRUE,vessel,departureHarbour,landingHarbour +data.ll.common.Trip=startDate,endDate,observationsProgram:p.observation = TRUE,logbookProgram:p.logbook = TRUE,ocean,observer:p.observer = TRUE,captain:p.captain = TRUE,observationsDataEntryOperator:p.dataEntryOperator = TRUE,logbookDataEntryOperator:p.dataEntryOperator = TRUE,vessel,departureHarbour,landingHarbour,tripType data.ps.common.Trip=startDate,endDate,observationsProgram:p.observation = TRUE,logbookProgram:p.logbook = TRUE,ocean,observer:p.observer = TRUE,captain:p.captain = TRUE,observationsDataEntryOperator:p.dataEntryOperator = TRUE,logbookDataEntryOperator:p.dataEntryOperator = TRUE,vessel,departureHarbour,landingHarbour ===================================== model/src/main/resources/META-INF/navigation/Observe-metamodel.json ===================================== @@ -85,7 +85,8 @@ "logbookDataEntryOperator → referential.common.Person", "vessel → referential.common.Vessel", "departureHarbour → referential.common.Harbour", - "landingHarbour → referential.common.Harbour" + "landingHarbour → referential.common.Harbour", + "tripType → referential.ll.common.TripType" ], "children": [ "gearUseFeatures → ONE → 02.01 → Table → data.ll.common.GearUseFeatures", ===================================== model/src/main/resources/META-INF/navigation/Observe-tree-navigation-model.json ===================================== @@ -29,6 +29,7 @@ "dataLlCommonTripGroupByVessel → MANY → data.ll.common.TripGroupByVessel", "dataLlCommonTripGroupByDepartureHarbour → MANY → data.ll.common.TripGroupByDepartureHarbour", "dataLlCommonTripGroupByLandingHarbour → MANY → data.ll.common.TripGroupByLandingHarbour", + "dataLlCommonTripGroupByTripType → MANY → data.ll.common.TripGroupByTripType", "dataLlCommonTrip → MANY → data.ll.common.Trip", "referentialCommon → ONE → referential.common.ReferentialPackage", "referentialLlCommon → ONE → referential.ll.common.ReferentialPackage", @@ -627,6 +628,17 @@ "children → MANY → data.ll.common.Trip" ] }, + { + "parentClassNames": [ + "Root" + ], + "className": "data.ll.common.TripGroupByTripType", + "type": "data.ll.common.TripGroupByTripType", + "nodeType": "RootOpenFilter", + "children": [ + "children → MANY → data.ll.common.Trip" + ] + }, { "parentClassNames": [ "Root", @@ -641,7 +653,8 @@ "data.ll.common.TripGroupByLogbookDataEntryOperator", "data.ll.common.TripGroupByVessel", "data.ll.common.TripGroupByDepartureHarbour", - "data.ll.common.TripGroupByLandingHarbour" + "data.ll.common.TripGroupByLandingHarbour", + "data.ll.common.TripGroupByTripType" ], "className": "data.ll.common.Trip", "type": "data.ll.common.Trip", ===================================== model/src/main/resources/META-INF/navigation/Observe-tree-selection-model.json ===================================== @@ -29,6 +29,7 @@ "dataLlCommonTripGroupByVessel → MANY → data.ll.common.TripGroupByVessel", "dataLlCommonTripGroupByDepartureHarbour → MANY → data.ll.common.TripGroupByDepartureHarbour", "dataLlCommonTripGroupByLandingHarbour → MANY → data.ll.common.TripGroupByLandingHarbour", + "dataLlCommonTripGroupByTripType → MANY → data.ll.common.TripGroupByTripType", "dataLlCommonTrip → MANY → data.ll.common.Trip", "referentialCommon → ONE → referential.common.ReferentialPackage", "referentialLlCommon → ONE → referential.ll.common.ReferentialPackage", @@ -325,6 +326,17 @@ "children → MANY → data.ll.common.Trip" ] }, + { + "parentClassNames": [ + "Root" + ], + "className": "data.ll.common.TripGroupByTripType", + "type": "data.ll.common.TripGroupByTripType", + "nodeType": "RootOpenFilter", + "children": [ + "children → MANY → data.ll.common.Trip" + ] + }, { "parentClassNames": [ "Root", @@ -339,7 +351,8 @@ "data.ll.common.TripGroupByLogbookDataEntryOperator", "data.ll.common.TripGroupByVessel", "data.ll.common.TripGroupByDepartureHarbour", - "data.ll.common.TripGroupByLandingHarbour" + "data.ll.common.TripGroupByLandingHarbour", + "data.ll.common.TripGroupByTripType" ], "className": "data.ll.common.Trip", "type": "data.ll.common.Trip", ===================================== model/src/test/resources/fixtures/model.properties ===================================== @@ -22,6 +22,6 @@ Metamodel.count.root=11 Metamodel.count.nodes=141 Metamodel.id.count.nodes=20 -Metamodel.tree.selection.count.nodes=127 -Metamodel.tree.navigation.count.nodes=177 +Metamodel.tree.selection.count.nodes=128 +Metamodel.tree.navigation.count.nodes=178 Metamodel.parent.count=62 View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/29b6cc5b677840d6381259b4a… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/29b6cc5b677840d6381259b4a… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] 3 commits: Sur échantillons PS, un contrôle de validation imparfait - Closes #2295
by Tony CHEMIT (＠tchemit) May 9, 2022

May 9, 2022

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: d1d8df8e by Tony Chemit at 2022-05-09T17:14:00+02:00 Sur échantillons PS, un contrôle de validation imparfait - Closes #2295 - - - - - 2ab1abf6 by Tony Chemit at 2022-05-09T17:14:00+02:00 Le gestionnaire de connexion directe a une petite imperfection - Closes #2330 - - - - - 18f96f99 by Tony Chemit at 2022-05-09T17:14:00+02:00 Dans le gestionnaire de connexions, l'onglet serveurs pourrait être le premier - Closes #2286 - - - - - 15 changed files: - client/core/src/main/i18n/getters/java.getter - client/core/src/main/java/fr/ird/observe/client/datasource/presets/actions/Create.java - client/core/src/main/java/fr/ird/observe/client/datasource/presets/actions/TestRemote.java - client/core/src/main/java/fr/ird/observe/client/datasource/presets/actions/TestServer.java - client/runner/src/main/i18n/translations/client-runner_en_GB.properties - client/runner/src/main/i18n/translations/client-runner_es_ES.properties - client/runner/src/main/i18n/translations/client-runner_fr_FR.properties - core/persistence/resources/src/main/resources/fr/ird/observe/entities/data/ps/logbook/Sample/validation-create.json - core/persistence/resources/src/main/resources/fr/ird/observe/entities/data/ps/logbook/Sample/validation-update.json - core/services/test/src/main/resources/fixtures/fr/ird/observe/services/service/ValidateService-referentialResult.json - model/src/main/models/Observe/dto/attribute/notNullIf.properties - server/runner/src/main/webResources/doc/api/public/data/ps/logbook/Sample/validation-create-error.xml - server/runner/src/main/webResources/doc/api/public/data/ps/logbook/Sample/validation-create.json - server/runner/src/main/webResources/doc/api/public/data/ps/logbook/Sample/validation-update-error.xml - server/runner/src/main/webResources/doc/api/public/data/ps/logbook/Sample/validation-update.json Changes: ===================================== client/core/src/main/i18n/getters/java.getter ===================================== @@ -135,6 +135,9 @@ observe.ui.datasource.editor.actions.data.import.result observe.ui.datasource.editor.actions.data.import.title.require.add.missing.referential observe.ui.datasource.editor.actions.data.insertMissingReferentialToLeft observe.ui.datasource.editor.actions.data.insertMissingReferentialToRight +observe.ui.datasource.storage.config.test.message.failure +observe.ui.datasource.storage.config.test.message.success +observe.ui.datasource.storage.config.test.title observe.ui.datasource.storage.error.badUrl observe.ui.datasource.storage.error.dbVersionMismatch observe.ui.datasource.storage.error.serverVersionMismatch ===================================== client/core/src/main/java/fr/ird/observe/client/datasource/presets/actions/Create.java ===================================== @@ -48,15 +48,6 @@ public class Create extends RemotePresetsUIActionSupport { protected void doActionPerformed(ActionEvent e, RemotePresetsUI ui) { switch (ui.getTabs().getSelectedIndex()) { - case 0: { - RemoteDataSourceConfiguration configuration = new RemoteDataSourceConfiguration(); - List<RemoteDataSourceConfiguration> configurations = new ArrayList<>(ui.getModel().getRemoteDataSourceConfigurations()); - configurations.add(configuration); - ui.getModel().setRemoteDataSourceConfigurations(configurations); - ui.getModel().setRemoteCreateMode(true); - ui.getRemoteConfigurations().setSelectedValue(configuration, true); - } - break; case 1: { ServerDataSourceConfiguration configuration = new ServerDataSourceConfiguration(); List<ServerDataSourceConfiguration> configurations = new ArrayList<>(ui.getModel().getServerDataSourceConfigurations()); @@ -66,6 +57,15 @@ public class Create extends RemotePresetsUIActionSupport { ui.getServerConfigurations().setSelectedValue(configuration, true); } break; + case 0: { + RemoteDataSourceConfiguration configuration = new RemoteDataSourceConfiguration(); + List<RemoteDataSourceConfiguration> configurations = new ArrayList<>(ui.getModel().getRemoteDataSourceConfigurations()); + configurations.add(configuration); + ui.getModel().setRemoteDataSourceConfigurations(configurations); + ui.getModel().setRemoteCreateMode(true); + ui.getRemoteConfigurations().setSelectedValue(configuration, true); + } + break; } } ===================================== client/core/src/main/java/fr/ird/observe/client/datasource/presets/actions/TestRemote.java ===================================== @@ -54,6 +54,7 @@ public class TestRemote extends RemoteActionSupport { String connexionStatusError = null; Version modelVersion = getClientConfig().getModelVersion(); + config.setModelVersion(modelVersion); ObserveSwingDataSource dataSource = getDataSourcesManager().newDataSource(config); try { ObserveDataSourceInformation dataSourceInformation = dataSource.checkCanConnect(false); @@ -74,9 +75,9 @@ public class TestRemote extends RemoteActionSupport { } } finally { if (connexionStatusError == null) { - displayInfo("Test de connexion", "Le connexion a été établie avec succès."); + displayWarning(t("observe.ui.datasource.storage.config.test.title"), t("observe.ui.datasource.storage.config.test.message.success")); } else { - displayWarning("Test de connexion", "Le test de connexion a échoué :\n" + connexionStatusError); + displayWarning(t("observe.ui.datasource.storage.config.test.title"), t("observe.ui.datasource.storage.config.test.message.failure", connexionStatusError)); } } } ===================================== client/core/src/main/java/fr/ird/observe/client/datasource/presets/actions/TestServer.java ===================================== @@ -103,9 +103,9 @@ public class TestServer extends ServerActionSupport { } } finally { if (connexionStatusError == null) { - displayInfo("Test de connexion", "Le connexion a été établie avec succès."); + displayInfo(t("observe.ui.datasource.storage.config.test.title"), t("observe.ui.datasource.storage.config.test.message.success")); } else { - displayWarning("Test de connexion", "Le test de connexion a échoué :\n" + connexionStatusError); + displayWarning(t("observe.ui.datasource.storage.config.test.title"), t("observe.ui.datasource.storage.config.test.message.failure", connexionStatusError)); } } } ===================================== client/runner/src/main/i18n/translations/client-runner_en_GB.properties ===================================== @@ -688,6 +688,9 @@ observe.ui.datasource.storage.config.referentiel.mode=Referential import mode observe.ui.datasource.storage.config.referentiel.storage=Central data source configuration observe.ui.datasource.storage.config.right.storage=Right data source configuration observe.ui.datasource.storage.config.source.storage=Configuration of data source to update +observe.ui.datasource.storage.config.test.message.failure=The connexion has failed\: %s +observe.ui.datasource.storage.config.test.message.success=The connexion was successful +observe.ui.datasource.storage.config.test.title=Testing connexion observe.ui.datasource.storage.error.badUrl=The url format is not valid (%s) observe.ui.datasource.storage.error.dbVersionMismatch=Version of remote database (%s) is not compliant with the model version (%s) observe.ui.datasource.storage.error.serverVersionMismatch=Remote server version (%s) is not compliant with the client version (%s) ===================================== client/runner/src/main/i18n/translations/client-runner_es_ES.properties ===================================== @@ -688,6 +688,9 @@ observe.ui.datasource.storage.config.referentiel.mode=Modo de importación del r observe.ui.datasource.storage.config.referentiel.storage=Configuración de la base de referencia observe.ui.datasource.storage.config.right.storage=Configuration de la base de la derecha observe.ui.datasource.storage.config.source.storage=Configuración de la base de la izquierda +observe.ui.datasource.storage.config.test.message.failure=The connexion has failed\: %s \#TODO +observe.ui.datasource.storage.config.test.message.success=The connexion was successful \#TODO +observe.ui.datasource.storage.config.test.title=Testing connexion \#TODO observe.ui.datasource.storage.error.badUrl=Error en el formato de la dirección (URL) %s observe.ui.datasource.storage.error.dbVersionMismatch=La versión de la base remota (%s) no es compatible con la versión del modelo (%s). observe.ui.datasource.storage.error.serverVersionMismatch=La versión del servidor remoto (%s) no es compatible con la versión del modelo (%s) ===================================== client/runner/src/main/i18n/translations/client-runner_fr_FR.properties ===================================== @@ -688,6 +688,9 @@ observe.ui.datasource.storage.config.referentiel.mode=Mode d'import du référen observe.ui.datasource.storage.config.referentiel.storage=Configuration de la base de référence observe.ui.datasource.storage.config.right.storage=Configuration de la base de droite observe.ui.datasource.storage.config.source.storage=Configuration de la base à mettre à jour +observe.ui.datasource.storage.config.test.message.failure=Le test de connexion a échoué \: \n %s +observe.ui.datasource.storage.config.test.message.success=Le connexion a été établie avec succès. +observe.ui.datasource.storage.config.test.title=Testing connexion observe.ui.datasource.storage.error.badUrl=Erreur dans le format de l'URL %s observe.ui.datasource.storage.error.dbVersionMismatch=La version de la base distante (%s) n'est pas compatible avec la version du modèle (%s) observe.ui.datasource.storage.error.serverVersionMismatch=La version du serveur distant (%s) n'est pas compatible avec la version du client (%s) ===================================== core/persistence/resources/src/main/resources/fr/ird/observe/entities/data/ps/logbook/Sample/validation-create.json ===================================== @@ -3,7 +3,7 @@ "errors": [ "0.0 <= bigsWeight <= 200.0", "bigsWeight is a positive number", - "bigsWeight is mandatory except if (smallsWeight == null && bigsWeight == null && totalWeight == null) || (totalWeight != null && totalWeight > 0)", + "bigsWeight is mandatory except if (totalWeight != null && totalWeight > 0)", "bigsWeight not allowed if totalWeight filled" ] }, @@ -54,7 +54,7 @@ "errors": [ "0.0 <= smallsWeight <= 200.0", "smallsWeight is a positive number", - "smallsWeight is mandatory except if (smallsWeight == null && bigsWeight == null && totalWeight == null) || (totalWeight != null && totalWeight > 0)", + "smallsWeight is mandatory except if (totalWeight != null && totalWeight > 0)", "smallsWeight not allowed if totalWeight filled" ] }, @@ -67,7 +67,7 @@ "errors": [ "0.0 <= totalWeight <= 200.0", "totalWeight is a positive number", - "totalWeight is mandatory except if (smallsWeight == null && bigsWeight == null && totalWeight == null) || (bigsWeight != null && bigsWeight >= 0 && smallsWeight != null && smallsWeight >= 0)", + "totalWeight is mandatory except if (bigsWeight != null && bigsWeight >= 0 && smallsWeight != null && smallsWeight >= 0)", "totalWeight not allowed if bigsWeight and smallsWeight filled" ] }, ===================================== core/persistence/resources/src/main/resources/fr/ird/observe/entities/data/ps/logbook/Sample/validation-update.json ===================================== @@ -3,7 +3,7 @@ "errors": [ "0.0 <= bigsWeight <= 200.0", "bigsWeight is a positive number", - "bigsWeight is mandatory except if (smallsWeight == null && bigsWeight == null && totalWeight == null) || (totalWeight != null && totalWeight > 0)", + "bigsWeight is mandatory except if (totalWeight != null && totalWeight > 0)", "bigsWeight not allowed if totalWeight filled" ] }, @@ -54,7 +54,7 @@ "errors": [ "0.0 <= smallsWeight <= 200.0", "smallsWeight is a positive number", - "smallsWeight is mandatory except if (smallsWeight == null && bigsWeight == null && totalWeight == null) || (totalWeight != null && totalWeight > 0)", + "smallsWeight is mandatory except if (totalWeight != null && totalWeight > 0)", "smallsWeight not allowed if totalWeight filled" ] }, @@ -67,7 +67,7 @@ "errors": [ "0.0 <= totalWeight <= 200.0", "totalWeight is a positive number", - "totalWeight is mandatory except if (smallsWeight == null && bigsWeight == null && totalWeight == null) || (bigsWeight != null && bigsWeight >= 0 && smallsWeight != null && smallsWeight >= 0)", + "totalWeight is mandatory except if (bigsWeight != null && bigsWeight >= 0 && smallsWeight != null && smallsWeight >= 0)", "totalWeight not allowed if bigsWeight and smallsWeight filled" ] }, ===================================== core/services/test/src/main/resources/fixtures/fr/ird/observe/services/service/ValidateService-referentialResult.json ===================================== @@ -118397,6 +118397,33 @@ } ] }, + { + "reference": { + "type": "fr.ird.observe.dto.referential.ll.landing.DataSourceReference", + "content": { + "code": "R Dogley", + "label": "Ruby Dogley (Technicien SFA)", + "needComment": false, + "enabled": true, + "id": "fr.ird.referential.ll.landing.DataSource#1651919221463#0.13484675401101676", + "lastUpdateDate": "2022-05-07T14:27:01.463Z", + "topiaVersion": 1, + "topiaCreateDate": "2022-05-07T14:25:57.747Z" + } + }, + "messages": [ + { + "fieldName": "label1", + "scope": "WARNING", + "message": "Le libellé anglais n\u0027est pas traduit." + }, + { + "fieldName": "label3", + "scope": "WARNING", + "message": "Le libellé espagnol n\u0027est pas traduit." + } + ] + }, { "reference": { "type": "fr.ird.observe.dto.referential.ll.landing.DataSourceReference", ===================================== model/src/main/models/Observe/dto/attribute/notNullIf.properties ===================================== @@ -48,9 +48,9 @@ data.ps.logbook.Activity.attribute.longitude=floatingObjectEnabled && !setEnable data.ps.logbook.Activity.attribute.quadrant=floatingObjectEnabled && !setEnabled data.ps.logbook.Activity.attribute.setCount=!setEnabled data.ps.logbook.Activity.attribute.setSuccessStatus=!setEnabled || reasonForNoFishing != null -data.ps.logbook.Sample.attribute.bigsWeight=(smallsWeight == null && bigsWeight == null && totalWeight == null) || (totalWeight != null && totalWeight > 0) -data.ps.logbook.Sample.attribute.smallsWeight=(smallsWeight == null && bigsWeight == null && totalWeight == null) || (totalWeight != null && totalWeight > 0) -data.ps.logbook.Sample.attribute.totalWeight=(smallsWeight == null && bigsWeight == null && totalWeight == null) || (bigsWeight != null && bigsWeight >= 0 && smallsWeight != null && smallsWeight >= 0) +data.ps.logbook.Sample.attribute.bigsWeight=(totalWeight != null && totalWeight > 0) +data.ps.logbook.Sample.attribute.smallsWeight=(totalWeight != null && totalWeight > 0) +data.ps.logbook.Sample.attribute.totalWeight=(bigsWeight != null && bigsWeight >= 0 && smallsWeight != null && smallsWeight >= 0) data.ps.observation.Catch.attribute.catchWeight=totalCount != null data.ps.observation.Catch.attribute.totalCount=catchWeight != null data.ps.observation.SampleMeasure.attribute.length=acquisitionMode == 1 && weight != null ===================================== server/runner/src/main/webResources/doc/api/public/data/ps/logbook/Sample/validation-create-error.xml ===================================== @@ -25,9 +25,9 @@ <validators> <field name="bigsWeight"> -  +  <field-validator type="mandatory" short-circuit="true"> - <param name="skip"><![CDATA[ (smallsWeight == null && bigsWeight == null && totalWeight == null) || (totalWeight != null && totalWeight > 0) ]]></param> + <param name="skip"><![CDATA[ (totalWeight != null && totalWeight > 0) ]]></param> <message>observe.data.ps.logbook.Sample.bigsWeight.validation.required</message> </field-validator> @@ -111,9 +111,9 @@ </field> <field name="smallsWeight"> -  +  <field-validator type="mandatory" short-circuit="true"> - <param name="skip"><![CDATA[ (smallsWeight == null && bigsWeight == null && totalWeight == null) || (totalWeight != null && totalWeight > 0) ]]></param> + <param name="skip"><![CDATA[ (totalWeight != null && totalWeight > 0) ]]></param> <message>observe.data.ps.logbook.Sample.smallsWeight.validation.required</message> </field-validator> @@ -144,9 +144,9 @@ </field> <field name="totalWeight"> -  +  <field-validator type="mandatory" short-circuit="true"> - <param name="skip"><![CDATA[ (smallsWeight == null && bigsWeight == null && totalWeight == null) || (bigsWeight != null && bigsWeight >= 0 && smallsWeight != null && smallsWeight >= 0) ]]></param> + <param name="skip"><![CDATA[ (bigsWeight != null && bigsWeight >= 0 && smallsWeight != null && smallsWeight >= 0) ]]></param> <message>observe.data.ps.logbook.Sample.totalWeight.validation.required</message> </field-validator> ===================================== server/runner/src/main/webResources/doc/api/public/data/ps/logbook/Sample/validation-create.json ===================================== @@ -3,7 +3,7 @@ "errors": [ "0.0 <= bigsWeight <= 200.0", "bigsWeight is a positive number", - "bigsWeight is mandatory except if (smallsWeight == null && bigsWeight == null && totalWeight == null) || (totalWeight != null && totalWeight > 0)", + "bigsWeight is mandatory except if (totalWeight != null && totalWeight > 0)", "bigsWeight not allowed if totalWeight filled" ] }, @@ -54,7 +54,7 @@ "errors": [ "0.0 <= smallsWeight <= 200.0", "smallsWeight is a positive number", - "smallsWeight is mandatory except if (smallsWeight == null && bigsWeight == null && totalWeight == null) || (totalWeight != null && totalWeight > 0)", + "smallsWeight is mandatory except if (totalWeight != null && totalWeight > 0)", "smallsWeight not allowed if totalWeight filled" ] }, @@ -67,7 +67,7 @@ "errors": [ "0.0 <= totalWeight <= 200.0", "totalWeight is a positive number", - "totalWeight is mandatory except if (smallsWeight == null && bigsWeight == null && totalWeight == null) || (bigsWeight != null && bigsWeight >= 0 && smallsWeight != null && smallsWeight >= 0)", + "totalWeight is mandatory except if (bigsWeight != null && bigsWeight >= 0 && smallsWeight != null && smallsWeight >= 0)", "totalWeight not allowed if bigsWeight and smallsWeight filled" ] }, ===================================== server/runner/src/main/webResources/doc/api/public/data/ps/logbook/Sample/validation-update-error.xml ===================================== @@ -25,9 +25,9 @@ <validators> <field name="bigsWeight"> -  +  <field-validator type="mandatory" short-circuit="true"> - <param name="skip"><![CDATA[ (smallsWeight == null && bigsWeight == null && totalWeight == null) || (totalWeight != null && totalWeight > 0) ]]></param> + <param name="skip"><![CDATA[ (totalWeight != null && totalWeight > 0) ]]></param> <message>observe.data.ps.logbook.Sample.bigsWeight.validation.required</message> </field-validator> @@ -111,9 +111,9 @@ </field> <field name="smallsWeight"> -  +  <field-validator type="mandatory" short-circuit="true"> - <param name="skip"><![CDATA[ (smallsWeight == null && bigsWeight == null && totalWeight == null) || (totalWeight != null && totalWeight > 0) ]]></param> + <param name="skip"><![CDATA[ (totalWeight != null && totalWeight > 0) ]]></param> <message>observe.data.ps.logbook.Sample.smallsWeight.validation.required</message> </field-validator> @@ -144,9 +144,9 @@ </field> <field name="totalWeight"> -  +  <field-validator type="mandatory" short-circuit="true"> - <param name="skip"><![CDATA[ (smallsWeight == null && bigsWeight == null && totalWeight == null) || (bigsWeight != null && bigsWeight >= 0 && smallsWeight != null && smallsWeight >= 0) ]]></param> + <param name="skip"><![CDATA[ (bigsWeight != null && bigsWeight >= 0 && smallsWeight != null && smallsWeight >= 0) ]]></param> <message>observe.data.ps.logbook.Sample.totalWeight.validation.required</message> </field-validator> ===================================== server/runner/src/main/webResources/doc/api/public/data/ps/logbook/Sample/validation-update.json ===================================== @@ -3,7 +3,7 @@ "errors": [ "0.0 <= bigsWeight <= 200.0", "bigsWeight is a positive number", - "bigsWeight is mandatory except if (smallsWeight == null && bigsWeight == null && totalWeight == null) || (totalWeight != null && totalWeight > 0)", + "bigsWeight is mandatory except if (totalWeight != null && totalWeight > 0)", "bigsWeight not allowed if totalWeight filled" ] }, @@ -54,7 +54,7 @@ "errors": [ "0.0 <= smallsWeight <= 200.0", "smallsWeight is a positive number", - "smallsWeight is mandatory except if (smallsWeight == null && bigsWeight == null && totalWeight == null) || (totalWeight != null && totalWeight > 0)", + "smallsWeight is mandatory except if (totalWeight != null && totalWeight > 0)", "smallsWeight not allowed if totalWeight filled" ] }, @@ -67,7 +67,7 @@ "errors": [ "0.0 <= totalWeight <= 200.0", "totalWeight is a positive number", - "totalWeight is mandatory except if (smallsWeight == null && bigsWeight == null && totalWeight == null) || (bigsWeight != null && bigsWeight >= 0 && smallsWeight != null && smallsWeight >= 0)", + "totalWeight is mandatory except if (bigsWeight != null && bigsWeight >= 0 && smallsWeight != null && smallsWeight >= 0)", "totalWeight not allowed if bigsWeight and smallsWeight filled" ] }, View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/24ab1f48fe37f892ce32d37e… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/24ab1f48fe37f892ce32d37e… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][pages] Site checkin for project ObServe (version 9.0.0-RC-31)
by Tony CHEMIT (＠tchemit) May 8, 2022

May 8, 2022

Tony CHEMIT pushed to branch pages at ultreiaio / ird-observe Commits: 739842bf by Tony Chemit at 2022-05-08T15:43:10+02:00 Site checkin for project ObServe (version 9.0.0-RC-31) - - - - - 8 changed files: - + 9.0.0-RC-31/CHANGELOG.html - + 9.0.0-RC-31/architecture-logicielle.html - + 9.0.0-RC-31/avdth/common.html - + 9.0.0-RC-31/avdth/index.html - + 9.0.0-RC-31/avdth/landing.html - + 9.0.0-RC-31/avdth/local_market.html - + 9.0.0-RC-31/avdth/logbook.html - + 9.0.0-RC-31/avdth/referential.html The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/739842bfc221b604b1f9190fe… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/739842bfc221b604b1f9190fe… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe] Deleted branch release/9.0.0-RC-31
by Tony CHEMIT (＠tchemit) May 8, 2022

May 8, 2022

Tony CHEMIT deleted branch release/9.0.0-RC-31 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.0.0-RC-31
by Tony CHEMIT (＠tchemit) May 8, 2022

May 8, 2022

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

1 0

[Git][ultreiaio/ird-observe][release/9.0.0-RC-31] [jgitflow-maven-plugin]updating poms for branch'release/9.0.0-RC-31' with...
by Tony CHEMIT (＠tchemit) May 8, 2022

May 8, 2022

Tony CHEMIT pushed to branch release/9.0.0-RC-31 at ultreiaio / ird-observe Commits: 39417615 by Tony Chemit at 2022-05-08T15:11:30+02:00 [jgitflow-maven-plugin]updating poms for branch'release/9.0.0-RC-31' 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/pom.xml - core/api/pom.xml - core/api/services/pom.xml - core/api/tree/pom.xml - core/api/validation/pom.xml - core/persistence/java/pom.xml - core/persistence/pom.xml - core/persistence/resources/pom.xml - core/persistence/test/pom.xml - core/pom.xml - core/services/client/pom.xml - core/services/i18n/pom.xml - core/services/local/pom.xml - core/services/pom.xml - core/services/test/pom.xml - model/pom.xml - observe/pom.xml The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/39417615ea0f776f62ef0d85e… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/39417615ea0f776f62ef0d85e… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][master] 25 commits: [jgitflow-maven-plugin]updating poms for 9.0.0-RC-31-SNAPSHOT development[skip ci]
by Tony CHEMIT (＠tchemit) May 8, 2022

May 8, 2022

Tony CHEMIT pushed to branch master at ultreiaio / ird-observe Commits: 580b85fc by Tony Chemit at 2022-05-04T12:55:46+02:00 [jgitflow-maven-plugin]updating poms for 9.0.0-RC-31-SNAPSHOT development[skip ci] - - - - - 99573b16 by Tony Chemit at 2022-05-04T13:24:39+02:00 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts[skip ci] - - - - - 1f349c22 by Tony Chemit at 2022-05-04T13:24:40+02:00 [jgitflow-maven-plugin]merging 'master' into 'develop' - - - - - 623bb9b0 by Tony Chemit at 2022-05-04T13:24:41+02:00 [jgitflow-maven-plugin]Updating develop poms back to pre merge state[skip ci] - - - - - 1085ee5f by Tony Chemit at 2022-05-04T13:41:49+02:00 fix https over git - - - - - c7695b5c by Tony Chemit at 2022-05-04T13:42:39+02:00 Rendre les associations océan/quandrants configurables - See ultreiaio/ird-observe#2310 - - - - - 8b67ca59 by Tony Chemit at 2022-05-05T08:43:35+02:00 Déplacement d'échantillon d'une activité vers sa propre marée semble impossible - See ultreiaio/ird-observe#2317 - - - - - 8b0f2602 by Tony Chemit at 2022-05-05T08:43:35+02:00 Erreur sur déplacement d'échantillon d'activité à activité - See ultreiaio/ird-observe#2316 - - - - - 5b80c563 by Tony Chemit at 2022-05-05T08:43:35+02:00 Fix StackOverFLowError - - - - - 514f8801 by Tony Chemit at 2022-05-05T08:43:35+02:00 Amélioration de l'affichage des nœuds feuilles - See ultreiaio/ird-observe#2321 - - - - - 6709863a by Tony Chemit at 2022-05-05T13:09:42+02:00 Déplacement d'échantillon d'une activité vers sa propre marée semble impossible - See ultreiaio/ird-observe#2317 - - - - - d2446f54 by Tony Chemit at 2022-05-05T13:09:42+02:00 Replace TopiaFireSupport by a simple propertyChangeSupport - Closes ultreiaio/topia-extension#132 - - - - - 502ce77f by Tony Chemit at 2022-05-05T13:09:42+02:00 update pom - - - - - 6b53076c by Tony Chemit at 2022-05-05T13:09:42+02:00 add missing ConsolidateDataService fixtures - - - - - a3804063 by Tony Chemit at 2022-05-05T13:10:13+02:00 toolkit in snapshot - - - - - 3c78b13f by Tony Chemit at 2022-05-08T08:55:50+02:00 Standardiser l'affichage des statistiques LL dans l'arbre - Closes #2328 - - - - - ceb0b011 by Tony Chemit at 2022-05-08T08:55:50+02:00 Intégrer cette référence ll_landing.dataSource dans la migration 9.0.0 - Closes ultreiaio/ird-observe#2326 - - - - - f2bf0322 by Tony Chemit at 2022-05-08T10:12:46+02:00 add emptyNodePropertyName in Open data navigation scope (rather than compute it at runtime) - - - - - 5454e05c by Tony Chemit at 2022-05-08T15:01:17+02:00 Erreur sur déplacement d'un échantillon de la marée vers une de ses activités - Closes ultreiaio/ird-observe#2315 - - - - - 0504cef6 by Tony Chemit at 2022-05-08T15:01:17+02:00 Renforcer le modèle ar des clés d'unicité sur certaines clés étrangères - Closes #2329 - - - - - ea3b7a2e by Tony Chemit at 2022-05-08T15:01:17+02:00 update pom - - - - - 88be9501 by Tony Chemit at 2022-05-08T15:04:51+02:00 Update changelog for v.9.0.0-RC-31 [skip CI] - - - - - a55e0587 by Tony Chemit at 2022-05-08T15:07:09+02:00 update toolkit - - - - - 39417615 by Tony Chemit at 2022-05-08T15:11:30+02:00 [jgitflow-maven-plugin]updating poms for branch'release/9.0.0-RC-31' with non-snapshot versions[skip ci] - - - - - f4a69240 by Tony Chemit at 2022-05-08T15:41:56+02:00 [jgitflow-maven-plugin]merging 'release/9.0.0-RC-31' into 'master' - - - - - 30 changed files: - CHANGELOG.md - 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/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/actions/move/MoveTreeAdapter.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/TripUIHelper.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/edit/ContentEditUIModel.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/edit/ContentEditUINavigationInitializer.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/edit/ContentEditUINavigationNode.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/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/list/ContentListUIModelStates.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/list/ContentListUINavigationHandler.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/list/ContentListUINavigationInitializer.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/list/ContentListUINavigationNode.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/open/ContentOpenableUIModel.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/open/ContentOpenableUINavigationHandler.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/open/ContentOpenableUINavigationInitializer.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/open/ContentOpenableUINavigationNode.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/rlist/ContentRootListUIModelStates.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/rlist/ContentRootListUINavigationInitializer.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/rlist/ContentRootListUINavigationNode.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/ropen/ContentRootOpenableUINavigationHandler.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/ropen/ContentRootOpenableUINavigationInitializer.java The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/152e5e29d8383abb0430bfc3… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/152e5e29d8383abb0430bfc3… 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.0.0-RC-31' with...
by Tony CHEMIT (＠tchemit) May 8, 2022

May 8, 2022

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 39417615 by Tony Chemit at 2022-05-08T15:11:30+02:00 [jgitflow-maven-plugin]updating poms for branch'release/9.0.0-RC-31' with non-snapshot versions[skip ci] - - - - - f4a69240 by Tony Chemit at 2022-05-08T15:41:56+02:00 [jgitflow-maven-plugin]merging 'release/9.0.0-RC-31' into 'master' - - - - - d31597a1 by Tony Chemit at 2022-05-08T15:42:01+02:00 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts[skip ci] - - - - - e114c595 by Tony Chemit at 2022-05-08T15:42:02+02:00 [jgitflow-maven-plugin]merging 'master' into 'develop' - - - - - 24ab1f48 by Tony Chemit at 2022-05-08T15:42:03+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/0b8eba3154a62e402267350d… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/0b8eba3154a62e402267350d… 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.0.0-RC-32-SNAPSHOT development[skip ci]
by Tony CHEMIT (＠tchemit) May 8, 2022

May 8, 2022

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 0b8eba31 by Tony Chemit at 2022-05-08T15:11:01+02:00 [jgitflow-maven-plugin]updating poms for 9.0.0-RC-32-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/pom.xml - core/api/pom.xml - core/api/services/pom.xml - core/api/tree/pom.xml - core/api/validation/pom.xml - core/persistence/java/pom.xml - core/persistence/pom.xml - core/persistence/resources/pom.xml - core/persistence/test/pom.xml - core/pom.xml - core/services/client/pom.xml - core/services/i18n/pom.xml - core/services/local/pom.xml - core/services/pom.xml - core/services/test/pom.xml - model/pom.xml - observe/pom.xml The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/0b8eba3154a62e402267350db… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/0b8eba3154a62e402267350db… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe] Pushed new branch release/9.0.0-RC-31
by Tony CHEMIT (＠tchemit) May 8, 2022

May 8, 2022

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

1 0