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

[Git][ultreiaio/ird-observe][develop-9] 10 commits: update pom
by Tony CHEMIT (＠tchemit) 15 Apr '21

15 Apr '21

Tony CHEMIT pushed to branch develop-9 at ultreiaio / ird-observe Commits: c30dea02 by Tony Chemit at 2021-04-13T14:09:22+02:00 update pom - - - - - 6f7099ce by Tony Chemit at 2021-04-13T14:09:22+02:00 Introduce models-navigation modules - - - - - 9bca6b7e by Tony Chemit at 2021-04-13T14:09:22+02:00 try to fix gitlab ci build - - - - - e62e8d00 by Tony Chemit at 2021-04-14T12:25:36+02:00 Improve decorators: now can use the dto one for his entity :) Still improve the new Navigation API. - - - - - 8a1688bb by Tony Chemit at 2021-04-14T20:29:24+02:00 Introduce models-navigation modules - - - - - 80fed944 by Tony Chemit at 2021-04-14T20:29:38+02:00 Fix on icon path - - - - - 2c8c51f2 by Tony Chemit at 2021-04-15T15:10:54+02:00 Use now new Selection tree using generated selection tree API. - - - - - eab31f1a by Tony Chemit at 2021-04-15T15:27:01+02:00 Use now new Selection tree using generated selection tree API. - - - - - d593a167 by Tony Chemit at 2021-04-15T15:57:30+02:00 Use now new Selection tree using generated selection tree API. - - - - - 9b7ccba8 by Tony Chemit at 2021-04-15T20:20:17+02:00 Use now new Selection tree using generated selection tree API. - - - - - 30 changed files: - client/configuration/pom.xml - client/configuration/src/main/java/fr/ird/observe/client/configuration/ClientConfig.java - client/core/src/main/java/fr/ird/observe/client/datasource/api/ObserveSwingDataSource.java - client/core/src/main/java/fr/ird/observe/client/datasource/api/cache/ReferencesFilter.java - client/core/src/main/java/fr/ird/observe/client/datasource/api/cache/ReferencesFilterHelper.java - client/core/src/main/java/fr/ird/observe/client/main/body/ClientConfigUI.java - − client/core/src/main/resources/icons/checkBox.png - − client/core/src/main/resources/icons/checkBoxIndeterminateSelected.png - − client/core/src/main/resources/icons/checkBoxSelected.png - client/core/src/main/resources/observe-ui.properties - client/datasource/actions/pom.xml - client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/actions/DataManager.java - client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/config/SelectDataModel.java - client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/config/SelectDataUI.jaxx - client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/config/SelectDataUIHandler.java - client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/config/actions/SelectData.java - client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/consolidate/actions/Start.java - client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/export/TripEntry.java - client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/export/actions/Prepare.java - client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/pairing/ll/actions/ActivityLlPairingUIActionSupport.java - client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/pairing/ll/actions/Prepare.java - client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/pairing/tree/node/ActivityPairingProgramNode.java - client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/report/ReportModel.java - client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/report/ReportUIHandler.java - client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/synchronize/data/DataSynchroModel.java - client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/synchronize/data/DataSynchroUIHandler.java - client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/synchronize/data/actions/Apply.java - client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/synchronize/data/actions/Start.java - client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/synchronize/data/task/CopyToLeftDataSynchronizeTask.java - client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/synchronize/data/task/CopyToRightDataSynchronizeTask.java The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/f9246046c9fbba60b8473186… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/f9246046c9fbba60b8473186… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop-9] Introduce models-navigation modules
by Tony CHEMIT (＠tchemit) 12 Apr '21

12 Apr '21

Tony CHEMIT pushed to branch develop-9 at ultreiaio / ird-observe Commits: f9246046 by Tony Chemit at 2021-04-12T18:09:24+02:00 Introduce models-navigation modules - - - - - 3 changed files: - models/dto/java/src/main/java/fr/ird/observe/spi/module/ObserveBusinessModule.java - models/persistence/java/src/main/i18n/getters/java.getter - models/persistence/java/src/main/java/fr/ird/observe/entities/tree/TreeBuilderSupport.java Changes: ===================================== models/dto/java/src/main/java/fr/ird/observe/spi/module/ObserveBusinessModule.java ===================================== @@ -42,6 +42,10 @@ public interface ObserveBusinessModule { return gearType != null && Objects.equals(gearType, program.getGearType()); } + default boolean accept(GearType gearType) { + return Objects.equals(getGearType(), gearType); + } + /** * @return accepted gear type for this module ({@code null} value means does not use gear type). */ ===================================== models/persistence/java/src/main/i18n/getters/java.getter ===================================== @@ -1,3 +1,4 @@ +observe.data.Data.program observe.error.DuplicateLengthWeightParameterException observe.error.LengthLengthParameterNotFoundException observe.error.LengthWeightParameterNotFoundException ===================================== models/persistence/java/src/main/java/fr/ird/observe/entities/tree/TreeBuilderSupport.java ===================================== @@ -22,10 +22,8 @@ package fr.ird.observe.entities.tree; * #L% */ -import com.google.common.collect.ArrayListMultimap; import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableSet; -import com.google.common.collect.Maps; import fr.ird.observe.dto.data.ps.common.TripReference; import fr.ird.observe.dto.decoration.DecoratorServiceSupport; import fr.ird.observe.dto.referential.ReferentialDto; @@ -33,6 +31,7 @@ import fr.ird.observe.dto.referential.ReferentialLocale; import fr.ird.observe.dto.referential.common.PersonReference; import fr.ird.observe.dto.referential.common.ProgramReference; import fr.ird.observe.dto.referential.common.VesselReference; +import fr.ird.observe.entities.Entity; import fr.ird.observe.entities.ObserveTopiaPersistenceContextSupport; import fr.ird.observe.entities.referential.common.Person; import fr.ird.observe.entities.referential.common.Program; @@ -44,6 +43,7 @@ import fr.ird.observe.spi.module.ObserveBusinessProject; import fr.ird.observe.spi.module.ps.BusinessModule; import fr.ird.observe.tree.ToolkitTreeNode; import fr.ird.observe.tree.ToolkitTreeNodeBean; +import fr.ird.observe.tree.ToolkitTreeNodeBuildChildrenInterceptor; import fr.ird.observe.tree.io.ToolkitTreeFlatModel; import fr.ird.observe.tree.io.ToolkitTreeFlatModelRootRequest; import fr.ird.observe.tree.io.ToolkitTreeFlatModelWriter; @@ -57,6 +57,8 @@ import java.util.Map; import java.util.TreeMap; import java.util.stream.Collectors; +import static io.ultreia.java4all.i18n.I18n.t; + /** * Created on 12/04/2021. * @@ -95,40 +97,35 @@ class TreeBuilderSupport implements WithPermission { fr.ird.observe.spi.module.ll.BusinessModule llBusinessModule = project.getLlBusinessModule(); boolean acceptPsModule = request.acceptedModule(psBusinessModule); boolean acceptLlModule = request.acceptedModule(llBusinessModule); - List<ProgramReference> programList = Program.toReferenceSet(referentialLocale, Program.getDao(persistenceContext).getProgramList(request, tripCountByProgram, acceptPsModule, acceptLlModule).stream(), now).toList(); - programById = Maps.uniqueIndex(programList, ProgramReference::getId); + List<Program> programList = Program.getDao(persistenceContext).getProgramList(request, tripCountByProgram, acceptPsModule, acceptLlModule); + programById = Program.uniqueIndex(referentialLocale, persistenceContext); personById = Person.uniqueIndex(referentialLocale, persistenceContext); vesselById = Vessel.uniqueIndex(referentialLocale, persistenceContext); - decoratorService.installDecorator(ProgramReference.class, programList.stream()); if (acceptPsModule) { - List<ProgramReference> psProgramList = programList.stream().filter(psBusinessModule::accept).collect(Collectors.toList()); + List<Program> psProgramList = programList.stream().filter(p -> psBusinessModule.accept(p.getGearType())).collect(Collectors.toList()); log.info(String.format("Found %d PS program(s).", psProgramList.size())); - for (ProgramReference program : psProgramList) { - builder.addReference("ps:", program).put("$$tripCount", tripCountByProgram.get(program.getId())); + for (Program program : psProgramList) { + String id = program.getTopiaId(); + addEntity(builder, "ps:", program).put("$$tripCount", tripCountByProgram.get(id)); if (loadTrip) { - ArrayListMultimap<String, TripReference> psTripByProgram = ArrayListMultimap.create(); - List<TripReference> trips = fr.ird.observe.entities.data.ps.common.Trip.SPI.getDao(persistenceContext).getChildren(referentialLocale, program.getId(), programById, personById, vesselById); - trips.forEach(t -> psTripByProgram.put(t.getProgram().getId(), t)); + List<TripReference> trips = fr.ird.observe.entities.data.ps.common.Trip.SPI.getDao(persistenceContext).getChildren(referentialLocale, id, programById, personById, vesselById); decoratorService.installDecorator(TripReference.class, trips.stream()); - String prefix = "ps:" + program.getId(); - List<TripReference> tripList = psTripByProgram.get(program.getId()); - tripList.forEach(r -> builder.addReference(prefix, r)); + String prefix = "ps:" + id; + trips.forEach(r -> builder.addReference(prefix, r)); } } } if (acceptLlModule) { - List<ProgramReference> llProgramList = programList.stream().filter(llBusinessModule::accept).collect(Collectors.toList()); + List<Program> llProgramList = programList.stream().filter(p -> llBusinessModule.accept(p.getGearType())).collect(Collectors.toList()); log.info(String.format("Found %d LL program(s).", llProgramList.size())); - for (ProgramReference program : llProgramList) { - builder.addReference("ll:", program).put("$$tripCount", tripCountByProgram.get(program.getId())); + for (Program program : llProgramList) { + String id = program.getTopiaId(); + addEntity(builder, "ll:", program).put("$$tripCount", tripCountByProgram.get(id)); if (loadTrip) { - ArrayListMultimap<String, fr.ird.observe.dto.data.ll.common.TripReference> llTripByProgram = ArrayListMultimap.create(); - List<fr.ird.observe.dto.data.ll.common.TripReference> trips = fr.ird.observe.entities.data.ll.common.Trip.SPI.getDao(persistenceContext).getChildren(referentialLocale, program.getId(), programById, personById, vesselById); + List<fr.ird.observe.dto.data.ll.common.TripReference> trips = fr.ird.observe.entities.data.ll.common.Trip.SPI.getDao(persistenceContext).getChildren(referentialLocale, id, programById, personById, vesselById); decoratorService.installDecorator(fr.ird.observe.dto.data.ll.common.TripReference.class, trips.stream()); - trips.forEach(t -> llTripByProgram.put(t.getProgram().getId(), t)); - String prefix = "ll:" + program.getId(); - List<fr.ird.observe.dto.data.ll.common.TripReference> tripList = llTripByProgram.get(program.getId()); - tripList.forEach(r -> builder.addReference(prefix, r)); + String prefix = "ll:" + id; + trips.forEach(r -> builder.addReference(prefix, r)); } } } @@ -143,6 +140,13 @@ class TreeBuilderSupport implements WithPermission { return builder.build(); } + + public Map<String, Object> addEntity(ToolkitTreeFlatModelWriter builder, String prefix, Entity entity) { + Map<String, Object> states = builder.addShortId(prefix, entity.getTopiaId(), entity.getLastUpdateDate()); + states.put(ToolkitTreeNodeBuildChildrenInterceptor.$$_DATA, entity); + return states; + } + protected Long countReferential(Class<? extends ReferentialDto> dtoType) { return PersistenceBusinessProject.fromReferentialDto(dtoType).getDao(persistenceContext).count(); } @@ -156,15 +160,16 @@ class TreeBuilderSupport implements WithPermission { protected void interceptProgram(ToolkitTreeNode node) { ToolkitTreeNodeBean userObject = node.getUserObject(); - ProgramReference reference = userObject.popState("$$reference"); - userObject.copy(reference.toShortDto()); + Program entity = userObject.popState(ToolkitTreeNodeBuildChildrenInterceptor.$$_DATA); Integer tripCount = userObject.popState("$$tripCount"); - userObject.addState(ToolkitTreeNodeBean.STATE_TEXT, reference.getLongLabel()); + String label = String.format("[%s] %s %s", entity.getGearType().getPrefix(), t("observe.data.Data.program"), entity.getLabel(referentialLocale)); + userObject.addState(ToolkitTreeNodeBean.STATE_TEXT, label); userObject.addState(ToolkitTreeNodeBean.STATE_COUNT, tripCount == null ? 0 : tripCount); - userObject.addState(ToolkitTreeNodeBean.STATE_ENABLED, reference.isEnabled()); + userObject.addState(ToolkitTreeNodeBean.STATE_ENABLED, entity.isEnabled()); userObject.addState(ToolkitTreeNodeBean.STATE_EDITABLE, canWriteData()); } + @Override public final Permission getCredentials() { return permission.getCredentials(); View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/f9246046c9fbba60b84731864… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/f9246046c9fbba60b84731864… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop-9] 3 commits: Introduce models-navigation modules
by Tony CHEMIT (＠tchemit) 12 Apr '21

12 Apr '21

Tony CHEMIT pushed to branch develop-9 at ultreiaio / ird-observe Commits: 57dbe28a by Tony Chemit at 2021-04-12T14:58:33+02:00 Introduce models-navigation modules - - - - - 9a5007fb by Tony Chemit at 2021-04-12T14:59:13+02:00 update pom - - - - - 8f4efa4c by Tony Chemit at 2021-04-12T16:36:30+02:00 try to fix gitlab ci build - - - - - 30 changed files: - − client/core/src/main/resources/icons/checkBox.png - − client/core/src/main/resources/icons/checkBoxIndeterminateSelected.png - − client/core/src/main/resources/icons/checkBoxSelected.png - client/core/src/main/resources/observe-ui.properties - client/datasource/editor/api/pom.xml - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/selection/SelectionTreeCellRenderer.java - client/i18n/src/main/i18n/translations/observe_en_GB.properties - client/i18n/src/main/i18n/translations/observe_es_ES.properties - client/i18n/src/main/i18n/translations/observe_fr_FR.properties - models/definition/pom.xml - models/dto/java/pom.xml - models/navigation/edit/pom.xml - models/navigation/edit/src/test/java/fr/ird/observe/navigation/edit/RootEditNodeTest.java - models/navigation/pom.xml - models/navigation/select/pom.xml - models/navigation/select/src/test/java/fr/ird/observe/navigation/select/RootSelectNodeTest.java - models/tree/README.md → models/navigation/tree/.mvn/i18n - models/tree/navigation/.mvn/pom.gitflow.develop → models/navigation/tree/.mvn/pom.gitflow.develop - models/tree/navigation/.mvn/pom.gitflow.master → models/navigation/tree/.mvn/pom.gitflow.master - models/tree/navigation/.mvn/pom.organizationId → models/navigation/tree/.mvn/pom.organizationId - models/tree/navigation/.mvn/pom.projectId → models/navigation/tree/.mvn/pom.projectId - models/tree/navigation/.mvn/pom.stageId → models/navigation/tree/.mvn/pom.stageId - models/tree/LICENSE.txt → models/navigation/tree/LICENSE.txt - models/tree/navigation/README.md → models/navigation/tree/README.md - models/tree/navigation/pom.xml → models/navigation/tree/pom.xml - models/tree/navigation/src/license/THIRD-PARTY.properties → models/navigation/tree/src/license/THIRD-PARTY.properties - + models/navigation/tree/src/main/i18n/getters/tree.getter - + models/navigation/tree/src/test/java/fr/ird/observe/tree/TreeFixtures.java - + models/navigation/tree/src/test/java/fr/ird/observe/tree/navigation/DtoToNavigationTreePathMappingTest.java - + models/navigation/tree/src/test/java/fr/ird/observe/tree/navigation/DtoToTreeNavigationNodeClassMappingTest.java The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/25672a0a86cc3601d2cf60ab… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/25672a0a86cc3601d2cf60ab… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop-9] Introduce models-navigation modules
by Tony CHEMIT (＠tchemit) 10 Apr '21

10 Apr '21

Tony CHEMIT pushed to branch develop-9 at ultreiaio / ird-observe Commits: 25672a0a by Tony Chemit at 2021-04-11T00:41:40+02:00 Introduce models-navigation modules - - - - - 30 changed files: - − client/core/src/main/resources/icons/checkBox.png - − client/core/src/main/resources/icons/checkBoxIndeterminateSelected.png - − client/core/src/main/resources/icons/checkBoxSelected.png - client/core/src/main/resources/observe-ui.properties - client/datasource/editor/api/pom.xml - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/selection/SelectionTreeCellRenderer.java - client/i18n/src/main/i18n/translations/observe_en_GB.properties - client/i18n/src/main/i18n/translations/observe_es_ES.properties - client/i18n/src/main/i18n/translations/observe_fr_FR.properties - models/definition/pom.xml - models/dto/java/pom.xml - models/navigation/edit/pom.xml - models/navigation/edit/src/test/java/fr/ird/observe/navigation/edit/RootEditNodeTest.java - models/navigation/pom.xml - models/navigation/select/pom.xml - models/navigation/select/src/test/java/fr/ird/observe/navigation/select/RootSelectNodeTest.java - models/tree/README.md → models/navigation/tree/.mvn/i18n - models/tree/navigation/.mvn/pom.gitflow.develop → models/navigation/tree/.mvn/pom.gitflow.develop - models/tree/navigation/.mvn/pom.gitflow.master → models/navigation/tree/.mvn/pom.gitflow.master - models/tree/navigation/.mvn/pom.organizationId → models/navigation/tree/.mvn/pom.organizationId - models/tree/navigation/.mvn/pom.projectId → models/navigation/tree/.mvn/pom.projectId - models/tree/navigation/.mvn/pom.stageId → models/navigation/tree/.mvn/pom.stageId - models/tree/LICENSE.txt → models/navigation/tree/LICENSE.txt - models/tree/navigation/README.md → models/navigation/tree/README.md - models/tree/navigation/pom.xml → models/navigation/tree/pom.xml - models/tree/navigation/src/license/THIRD-PARTY.properties → models/navigation/tree/src/license/THIRD-PARTY.properties - + models/navigation/tree/src/main/i18n/getters/tree.getter - + models/navigation/tree/src/test/java/fr/ird/observe/tree/TreeFixtures.java - + models/navigation/tree/src/test/java/fr/ird/observe/tree/navigation/DtoToNavigationTreePathMappingTest.java - + models/navigation/tree/src/test/java/fr/ird/observe/tree/navigation/DtoToTreeNavigationNodeClassMappingTest.java The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/25672a0a86cc3601d2cf60ab2… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/25672a0a86cc3601d2cf60ab2… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop-9] 3 commits: update pom
by Tony CHEMIT (＠tchemit) 09 Apr '21

09 Apr '21

Tony CHEMIT pushed to branch develop-9 at ultreiaio / ird-observe Commits: 2d974249 by Tony Chemit at 2021-04-09T10:34:10+02:00 update pom - - - - - d414606d by Tony Chemit at 2021-04-09T10:34:10+02:00 Introduce models-navigation modules - - - - - e4ae22dc by Tony Chemit at 2021-04-09T18:35:20+02:00 Introduce ToParentProvider and continue nice generation - - - - - 30 changed files: - − client/core/src/main/resources/icons/checkBox.png - − client/core/src/main/resources/icons/checkBoxIndeterminateSelected.png - − client/core/src/main/resources/icons/checkBoxSelected.png - client/core/src/main/resources/observe-ui.properties - client/datasource/editor/api/pom.xml - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/selection/SelectionTreeCellRenderer.java - client/i18n/src/main/i18n/translations/observe_en_GB.properties - client/i18n/src/main/i18n/translations/observe_es_ES.properties - client/i18n/src/main/i18n/translations/observe_fr_FR.properties - models/definition/pom.xml - models/dto/java/pom.xml - models/navigation/edit/pom.xml - models/navigation/edit/src/test/java/fr/ird/observe/navigation/edit/RootEditNodeTest.java - models/navigation/pom.xml - models/navigation/select/pom.xml - models/navigation/select/src/test/java/fr/ird/observe/navigation/select/RootSelectNodeTest.java - models/tree/README.md → models/navigation/tree/.mvn/i18n - models/tree/navigation/.mvn/pom.gitflow.develop → models/navigation/tree/.mvn/pom.gitflow.develop - models/tree/navigation/.mvn/pom.gitflow.master → models/navigation/tree/.mvn/pom.gitflow.master - models/tree/navigation/.mvn/pom.organizationId → models/navigation/tree/.mvn/pom.organizationId - models/tree/navigation/.mvn/pom.projectId → models/navigation/tree/.mvn/pom.projectId - models/tree/navigation/.mvn/pom.stageId → models/navigation/tree/.mvn/pom.stageId - models/tree/LICENSE.txt → models/navigation/tree/LICENSE.txt - models/tree/navigation/README.md → models/navigation/tree/README.md - models/tree/navigation/pom.xml → models/navigation/tree/pom.xml - models/tree/navigation/src/license/THIRD-PARTY.properties → models/navigation/tree/src/license/THIRD-PARTY.properties - + models/navigation/tree/src/main/i18n/getters/tree.getter - + models/navigation/tree/src/main/java/fr/ird/observe/tree/ObserveTreeFlatModelWriter.java - + models/navigation/tree/src/main/java/fr/ird/observe/tree/navigation/NavigationTreeFlatModelWriter.java - + models/navigation/tree/src/main/java/fr/ird/observe/tree/selection/SelectionTreeFlatModelWriter.java The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/39ae1dc49282f5c2e0c9e908… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/39ae1dc49282f5c2e0c9e908… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop-9] Introduce models-navigation modules
by Tony CHEMIT (＠tchemit) 08 Apr '21

08 Apr '21

Tony CHEMIT pushed to branch develop-9 at ultreiaio / ird-observe Commits: 39ae1dc4 by Tony Chemit at 2021-04-08T18:02:25+02:00 Introduce models-navigation modules - - - - - 30 changed files: - − client/core/src/main/resources/icons/checkBox.png - − client/core/src/main/resources/icons/checkBoxIndeterminateSelected.png - − client/core/src/main/resources/icons/checkBoxSelected.png - client/core/src/main/resources/observe-ui.properties - client/datasource/editor/api/pom.xml - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/selection/SelectionTreeCellRenderer.java - client/i18n/src/main/i18n/translations/observe_en_GB.properties - client/i18n/src/main/i18n/translations/observe_es_ES.properties - client/i18n/src/main/i18n/translations/observe_fr_FR.properties - models/definition/pom.xml - models/dto/java/pom.xml - models/dto/java/src/main/i18n/getters/java.getter - models/navigation/edit/pom.xml - models/navigation/edit/src/test/java/fr/ird/observe/navigation/edit/RootEditNodeTest.java - models/navigation/pom.xml - models/navigation/select/pom.xml - models/navigation/select/src/test/java/fr/ird/observe/navigation/select/RootSelectNodeTest.java - models/tree/README.md → models/navigation/tree/.mvn/i18n - models/tree/navigation/.mvn/pom.gitflow.develop → models/navigation/tree/.mvn/pom.gitflow.develop - models/tree/navigation/.mvn/pom.gitflow.master → models/navigation/tree/.mvn/pom.gitflow.master - models/tree/navigation/.mvn/pom.organizationId → models/navigation/tree/.mvn/pom.organizationId - models/tree/navigation/.mvn/pom.projectId → models/navigation/tree/.mvn/pom.projectId - models/tree/navigation/.mvn/pom.stageId → models/navigation/tree/.mvn/pom.stageId - models/tree/LICENSE.txt → models/navigation/tree/LICENSE.txt - models/tree/navigation/README.md → models/navigation/tree/README.md - models/tree/navigation/pom.xml → models/navigation/tree/pom.xml - models/tree/navigation/src/license/THIRD-PARTY.properties → models/navigation/tree/src/license/THIRD-PARTY.properties - + models/navigation/tree/src/main/i18n/getters/tree.getter - + models/navigation/tree/src/main/java/fr/ird/observe/tree/ObserveTreeNodeResultBuilder.java - + models/navigation/tree/src/main/java/fr/ird/observe/tree/navigation/NavigationTreeNodeResultBuilder.java The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/39ae1dc49282f5c2e0c9e908e… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/39ae1dc49282f5c2e0c9e908e… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop-9] 2 commits: Introduce models-navigation modules
by Tony CHEMIT (＠tchemit) 08 Apr '21

08 Apr '21

Tony CHEMIT pushed to branch develop-9 at ultreiaio / ird-observe Commits: c332046e by Tony Chemit at 2021-04-08T13:00:13+02:00 Introduce models-navigation modules - - - - - a6df8353 by Tony Chemit at 2021-04-08T13:01:11+02:00 Introduce models-navigation modules - - - - - 30 changed files: - − client/core/src/main/resources/icons/checkBox.png - − client/core/src/main/resources/icons/checkBoxIndeterminateSelected.png - − client/core/src/main/resources/icons/checkBoxSelected.png - client/core/src/main/resources/observe-ui.properties - client/datasource/editor/api/pom.xml - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/selection/SelectionTreeCellRenderer.java - client/i18n/src/main/i18n/translations/observe_en_GB.properties - client/i18n/src/main/i18n/translations/observe_es_ES.properties - client/i18n/src/main/i18n/translations/observe_fr_FR.properties - models/definition/pom.xml - models/dto/java/pom.xml - models/navigation/edit/pom.xml - models/navigation/edit/src/test/java/fr/ird/observe/navigation/edit/RootEditNodeTest.java - models/navigation/select/pom.xml - models/navigation/select/src/test/java/fr/ird/observe/navigation/select/RootSelectNodeTest.java - + models/tree/navigation/.mvn/i18n - models/tree/navigation/pom.xml - + models/tree/navigation/src/main/i18n/getters/tree.getter - + models/tree/navigation/src/test/java/fr/ird/observe/navigation/tree/DtoToNavigationTreePathMappingTest.java - + models/tree/navigation/src/test/java/fr/ird/observe/navigation/tree/DtoToTreeNavigationNodeClassMappingTest.java - + models/tree/navigation/src/test/java/fr/ird/observe/navigation/tree/RootNavigationTreeNodeTest.java - + models/tree/navigation/src/test/java/fr/ird/observe/navigation/tree/ToolkitTreeNodeBuilderTest.java - + models/tree/selection/.mvn/i18n - models/tree/selection/pom.xml - + models/tree/selection/src/main/i18n/getters/tree.getter - + models/tree/selection/src/test/java/fr/ird/observe/selection/tree/DtoToSelectionTreePathMappingTest.java - + models/tree/selection/src/test/java/fr/ird/observe/selection/tree/DtoToTreeSelectionNodeClassMappingTest.java - + models/tree/selection/src/test/java/fr/ird/observe/selection/tree/RootSelectionTreeNodeTest.java - + models/tree/selection/src/test/java/fr/ird/observe/selection/tree/ToolkitTreeNodeBuilderTest.java - server/core/pom.xml The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/991db909e940e58c0a34fca0… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/991db909e940e58c0a34fca0… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop-9] Introduce models-navigation modules
by Tony CHEMIT (＠tchemit) 08 Apr '21

08 Apr '21

Tony CHEMIT pushed to branch develop-9 at ultreiaio / ird-observe Commits: 991db909 by Tony Chemit at 2021-04-08T12:57:33+02:00 Introduce models-navigation modules - - - - - 30 changed files: - − client/core/src/main/resources/icons/checkBox.png - − client/core/src/main/resources/icons/checkBoxIndeterminateSelected.png - − client/core/src/main/resources/icons/checkBoxSelected.png - client/core/src/main/resources/observe-ui.properties - client/datasource/editor/api/pom.xml - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/selection/SelectionTreeCellRenderer.java - client/i18n/src/main/i18n/translations/observe_en_GB.properties - client/i18n/src/main/i18n/translations/observe_es_ES.properties - client/i18n/src/main/i18n/translations/observe_fr_FR.properties - models/definition/pom.xml - models/dto/java/pom.xml - models/navigation/edit/pom.xml - models/navigation/edit/src/test/java/fr/ird/observe/navigation/edit/RootEditNodeTest.java - models/navigation/select/pom.xml - models/navigation/select/src/test/java/fr/ird/observe/navigation/select/RootSelectNodeTest.java - models/tree/navigation/pom.xml - + models/tree/navigation/src/main/i18n/getters/tree.getter - + models/tree/navigation/src/test/java/fr/ird/observe/navigation/tree/DtoToNavigationTreePathMappingTest.java - + models/tree/navigation/src/test/java/fr/ird/observe/navigation/tree/DtoToTreeNavigationNodeClassMappingTest.java - + models/tree/navigation/src/test/java/fr/ird/observe/navigation/tree/RootNavigationTreeNodeTest.java - + models/tree/navigation/src/test/java/fr/ird/observe/navigation/tree/ToolkitTreeNodeBuilderTest.java - models/tree/selection/pom.xml - + models/tree/selection/src/main/i18n/getters/tree.getter - + models/tree/selection/src/test/java/fr/ird/observe/selection/tree/DtoToSelectionTreePathMappingTest.java - + models/tree/selection/src/test/java/fr/ird/observe/selection/tree/DtoToTreeSelectionNodeClassMappingTest.java - + models/tree/selection/src/test/java/fr/ird/observe/selection/tree/RootSelectionTreeNodeTest.java - + models/tree/selection/src/test/java/fr/ird/observe/selection/tree/ToolkitTreeNodeBuilderTest.java - server/core/pom.xml - server/core/src/main/filtered-resources/mapping - services/api-test/pom.xml The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/991db909e940e58c0a34fca0e… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/991db909e940e58c0a34fca0e… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop-9] 2 commits: update pom
by Tony CHEMIT (＠tchemit) 06 Apr '21

06 Apr '21

Tony CHEMIT pushed to branch develop-9 at ultreiaio / ird-observe Commits: ea7605a5 by Tony Chemit at 2021-04-06T14:07:32+02:00 update pom - - - - - a898c0b6 by Tony Chemit at 2021-04-07T01:33:08+02:00 Introduce models-navigation modules - - - - - 30 changed files: - − client/core/src/main/resources/icons/checkBox.png - − client/core/src/main/resources/icons/checkBoxIndeterminateSelected.png - − client/core/src/main/resources/icons/checkBoxSelected.png - client/core/src/main/resources/observe-ui.properties - client/datasource/editor/api/pom.xml - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/selection/SelectionTreeCellRenderer.java - client/i18n/src/main/i18n/translations/observe_en_GB.properties - client/i18n/src/main/i18n/translations/observe_es_ES.properties - client/i18n/src/main/i18n/translations/observe_fr_FR.properties - models/definition/pom.xml - models/navigation/edit/pom.xml - models/navigation/select/pom.xml - + models/tree/navigation/.mvn/i18n/parse-java - models/tree/navigation/pom.xml - + models/tree/navigation/src/main/i18n/getters/java.getter - + models/tree/navigation/src/main/java/fr/ird/observe/navigation/tree/ObserveNavigationTreeModelRequest.java - + models/tree/navigation/src/main/java/fr/ird/observe/navigation/tree/ObserveNavigationTreeModelResult.java - + models/tree/navigation/src/test/java/fr/ird/observe/navigation/tree/RootNavigationTreeNodeTest.java - + models/tree/navigation/src/test/java/fr/ird/observe/navigation/tree/ToolkitTreeNodeBuilderTest.java - + models/tree/selection/.mvn/i18n/parse-java - models/tree/selection/pom.xml - + models/tree/selection/src/main/i18n/getters/java.getter - + models/tree/selection/src/main/java/fr/ird/observe/selection/tree/ObserveSelectionTreeModelRequest.java - + models/tree/selection/src/main/java/fr/ird/observe/selection/tree/ObserveSelectionTreeModelResult.java - + models/tree/selection/src/test/java/fr/ird/observe/selection/tree/RootSelectionTreeNodeTest.java - pom.xml - services/i18n/pom.xml - services/i18n/src/main/i18n/translations/services_en_GB.properties - services/i18n/src/main/i18n/translations/services_es_ES.properties - services/i18n/src/main/i18n/translations/services_fr_FR.properties The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/740107410b99c7895e5eaee4… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/740107410b99c7895e5eaee4… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop-9] 2 commits: Introduce models-navigation modules
by Tony CHEMIT (＠tchemit) 03 Apr '21

03 Apr '21

Tony CHEMIT pushed to branch develop-9 at ultreiaio / ird-observe Commits: f375876c by Tony Chemit at 2021-04-03T23:35:46+02:00 Introduce models-navigation modules - - - - - 74010741 by Tony Chemit at 2021-04-03T23:35:46+02:00 Do not generate Edit/Select Model from Dto model since we can't fix nicely order and in persistence model, we have precisely this order^^ - - - - - 30 changed files: - client/configuration/pom.xml - client/core/pom.xml - client/datasource/editor/api/pom.xml - client/datasource/editor/ll/pom.xml - client/datasource/editor/ps/pom.xml - client/datasource/editor/spi/pom.xml - − models/definition/src/main/models/Observe/dto/class/navigationParent.properties - models/definition/src/main/models/Observe/dto/class/navigationEntryPoint.properties → models/definition/src/main/models/Observe/persistence/class/navigationNodeExtraType.properties - models/dto/java/pom.xml - models/navigation/descriptor/src/test/java/fr/ird/observe/navigation/descriptor/RootNavigationNodeDescriptorTest.java - + models/navigation/edit/.mvn/pom.gitflow.develop - + models/navigation/edit/.mvn/pom.gitflow.master - + models/navigation/edit/.mvn/pom.organizationId - + models/navigation/edit/.mvn/pom.projectId - + models/navigation/edit/.mvn/pom.stageId - + models/navigation/edit/LICENSE.txt - + models/navigation/edit/README.md - + models/navigation/edit/pom.xml - + models/navigation/edit/src/license/THIRD-PARTY.properties - models/dto/java/src/main/java/fr/ird/observe/navigation/edit/ll/common/TripCloseCallback.java → models/navigation/edit/src/main/java/fr/ird/observe/navigation/edit/ll/common/TripCloseCallback.java - models/dto/java/src/main/java/fr/ird/observe/navigation/edit/ps/common/TripCloseCallback.java → models/navigation/edit/src/main/java/fr/ird/observe/navigation/edit/ps/common/TripCloseCallback.java - models/dto/java/src/test/java/fr/ird/observe/navigation/edit/ProjectEditModelManagerTest.java → models/navigation/edit/src/test/java/fr/ird/observe/navigation/edit/ProjectEditModelManagerTest.java - models/dto/java/src/test/java/fr/ird/observe/navigation/edit/ProjectEditModelTest.java → models/navigation/edit/src/test/java/fr/ird/observe/navigation/edit/ProjectEditModelTest.java - + models/navigation/edit/src/test/java/fr/ird/observe/navigation/edit/RootEditNodeTest.java - models/dto/java/src/test/java/fr/ird/observe/navigation/select/ll/ModuleSelectModelTest.java → models/navigation/edit/src/test/java/fr/ird/observe/navigation/edit/ll/ModuleEditModelTest.java - models/dto/java/src/test/java/fr/ird/observe/navigation/edit/ps/ModuleEditModelTest.java → models/navigation/edit/src/test/java/fr/ird/observe/navigation/edit/ps/ModuleEditModelTest.java - models/navigation/pom.xml - + models/navigation/select/.mvn/pom.gitflow.develop - + models/navigation/select/.mvn/pom.gitflow.master - + models/navigation/select/.mvn/pom.organizationId The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/e45c94358f67181fd8945ce4… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/e45c94358f67181fd8945ce4… You're receiving this email because of your account on gitlab.com.

1 0