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

[Git][ultreiaio/ird-observe][develop] 9 commits: fix option type
by Tony CHEMIT 31 Mar '18

31 Mar '18

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 0819d723 by Tony CHEMIT at 2018-03-30T18:37:36Z fix option type - - - - - 394dce0e by Tony CHEMIT at 2018-03-31T17:07:14Z fix some references API - - - - - b7ab82c3 by Tony CHEMIT at 2018-03-31T17:07:35Z add more log levels in tests - - - - - 798bd698 by Tony CHEMIT at 2018-03-31T17:08:30Z fix i18n typo - - - - - a03e3fd2 by Tony CHEMIT at 2018-03-31T17:09:49Z improve gis triggers (if not migration can't work since it will trigger the gis computation on each activity changed, and here we modify all activities...) - - - - - afbe1e2e by Tony CHEMIT at 2018-03-31T17:11:19Z improve longline position api (but still could be improved ?) - - - - - 756024b9 by Tony CHEMIT at 2018-03-31T17:12:03Z improve sql request api (requires now db version) - - - - - 74ba1e01 by Tony CHEMIT at 2018-03-31T17:28:29Z optimize dependences + add missing license header - - - - - 0aac62ba by Tony CHEMIT at 2018-03-31T17:38:19Z fix a template - - - - - 30 changed files: - client-configuration/src/main/config/Client.ini - client/src/main/assembly/dist/obstuna-admin/extra/create-postgis-1-activity.sql → client/src/main/assembly/dist/obstuna-admin/extra/01_create-postgis-1-activity.sql - client/src/main/assembly/dist/obstuna-admin/extra/create-postgis-2-harbour.sql → client/src/main/assembly/dist/obstuna-admin/extra/02_create-postgis-2-harbour.sql - client/src/main/assembly/dist/obstuna-admin/extra/create-postgis-3-activity-seine.sql → client/src/main/assembly/dist/obstuna-admin/extra/03_create-postgis-3-activity-seine.sql - client/src/main/assembly/dist/obstuna-admin/extra/create-postgis-4-activity-longine.sql → client/src/main/assembly/dist/obstuna-admin/extra/04_create-postgis-4-activity-longine.sql - client/src/main/assembly/dist/obstuna-admin/extra/function_enhanced_sets_school_types.sql → client/src/main/assembly/dist/obstuna-admin/extra/05_function_enhanced_sets_school_types.sql - client/src/main/ftl/dataSourceConnectionReport_en.ftl - client/src/main/ftl/dataSourceConnectionReport_es.ftl - client/src/main/ftl/dataSourceConnectionReport_fr.ftl - client/src/main/java/fr/ird/observe/client/ui/admin/save/SaveLocalUIHandler.java - client/src/main/java/fr/ird/observe/client/ui/content/data/longline/EncounterUIHandler.java - client/src/main/java/fr/ird/observe/client/ui/storage/StorageUIHandler.java - client/src/main/java/fr/ird/observe/client/ui/storage/StorageUIModel.java - client/src/main/resources/i18n/client_en_GB.properties - client/src/main/resources/i18n/client_es_ES.properties - client/src/main/resources/i18n/client_fr_FR.properties - dto/src/main/java/fr/ird/observe/binder/data/longline/BasketDtoReferenceBinder.java - dto/src/main/java/fr/ird/observe/binder/data/longline/BranchlineDtoReferenceBinder.java - − dto/src/main/java/fr/ird/observe/dto/data/longline/BasketWithSectionIdDto.java - dto/src/main/java/fr/ird/observe/dto/data/longline/BasketWithSectionIdReference.java - − dto/src/main/java/fr/ird/observe/dto/data/longline/BranchlineWithBasketIdDto.java - dto/src/main/java/fr/ird/observe/dto/data/longline/BranchlineWithBasketIdReference.java - dto/src/main/models/Observe.model - persistence/pom.xml - persistence/src/main/java/fr/ird/observe/binder/data/longline/BasketEntityReferenceBinder.java - persistence/src/main/java/fr/ird/observe/binder/data/longline/BranchlineEntityReferenceBinder.java - persistence/src/main/java/fr/ird/observe/persistence/ObserveTopiaApplicationContext.java - persistence/src/main/java/fr/ird/observe/persistence/ObserveTopiaConfiguration.java - persistence/src/main/java/fr/ird/observe/persistence/migration/DataSourceMigrationForVersion_7_0_RC_4.java - + persistence/src/main/resources/db/migration/6.1/00_fix_trigger-PG.sql The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/b6ac983e58f1feb565b59b1a9d… --- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/b6ac983e58f1feb565b59b1a9d… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] Correction des labels sur les enums avec methods
by Tony CHEMIT 30 Mar '18

30 Mar '18

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: b6ac983e by Tony CHEMIT at 2018-03-30T14:44:36Z Correction des labels sur les enums avec methods - - - - - 25 changed files: - client/pom.xml - client/src/main/java/fr/ird/observe/client/ui/actions/main/menu/admin/LaunchAdminActionSupport.java - client/src/main/java/fr/ird/observe/client/ui/admin/AdminStep.java - client/src/main/java/fr/ird/observe/client/ui/admin/AdminTabUIHandler.java - client/src/main/java/fr/ird/observe/client/ui/admin/AdminUIHandler.java - client/src/main/java/fr/ird/observe/client/ui/admin/resume/ShowResumeUIHandler.java - client/src/main/java/fr/ird/observe/client/ui/admin/synchronize/referential/ng/ReferentialSynchroConfigUI.jaxx - client/src/main/java/fr/ird/observe/client/ui/admin/synchronize/referential/ng/ReferentialSynchroModel.java - client/src/main/java/fr/ird/observe/client/ui/admin/validate/ValidateConfigUI.jaxx - client/src/main/java/fr/ird/observe/client/ui/content/ContentUIInitializer.java - client/src/main/java/fr/ird/observe/client/ui/content/data/seine/FloatingObjectUIModel.java - client/src/main/java/fr/ird/observe/client/ui/content/data/seine/NonTargetCatchReleaseStatusesUI.java - client/src/main/java/fr/ird/observe/client/ui/content/data/seine/SetSeineUIHandler.java - client/src/main/java/fr/ird/observe/client/ui/storage/ObstunaAdminAction.java - client/src/main/java/fr/ird/observe/client/ui/storage/StorageStep.java - client/src/main/java/fr/ird/observe/client/ui/storage/StorageUIHandler.java - client/src/main/java/fr/ird/observe/client/ui/storage/StorageUIModel.java - client/src/main/java/fr/ird/observe/client/ui/storage/tabs/ChooseDbModeUI.jaxx - client/src/main/java/fr/ird/observe/client/ui/storage/tabs/ChooseDbModeUIHandler.java - client/src/main/java/fr/ird/observe/client/ui/storage/tabs/ConfigReferentielUI.jaxx - client/src/main/java/fr/ird/observe/client/ui/storage/tabs/ConfigUI.jaxx - client/src/main/java/fr/ird/observe/client/ui/storage/tabs/StorageTabUI.jaxx - client/src/main/java/fr/ird/observe/client/ui/util/tripMap/TripMapContentBuilder.java - dto/pom.xml - + dto/src/main/java/fr/ird/observe/dto/I18nEnumHelper.java Changes: ===================================== client/pom.xml ===================================== --- a/client/pom.xml +++ b/client/pom.xml @@ -687,7 +687,6 @@ <goal>parse-java-enumerations</goal> </goals> <configuration> - <generateHelper>true</generateHelper> <enumerationSets> <enumerationSet> <name>label</name> ===================================== client/src/main/java/fr/ird/observe/client/ui/actions/main/menu/admin/LaunchAdminActionSupport.java ===================================== --- a/client/src/main/java/fr/ird/observe/client/ui/actions/main/menu/admin/LaunchAdminActionSupport.java +++ b/client/src/main/java/fr/ird/observe/client/ui/actions/main/menu/admin/LaunchAdminActionSupport.java @@ -22,7 +22,7 @@ package fr.ird.observe.client.ui.actions.main.menu.admin; * #L% */ -import fr.ird.observe.client.I18nEnumHelper; +import fr.ird.observe.dto.I18nEnumHelper; import fr.ird.observe.client.ObserveSwingApplicationContext; import fr.ird.observe.client.ui.ObserveMainUI; import fr.ird.observe.client.ui.actions.main.menu.MenuActionSupport; ===================================== client/src/main/java/fr/ird/observe/client/ui/admin/AdminStep.java ===================================== --- a/client/src/main/java/fr/ird/observe/client/ui/admin/AdminStep.java +++ b/client/src/main/java/fr/ird/observe/client/ui/admin/AdminStep.java @@ -21,7 +21,7 @@ */ package fr.ird.observe.client.ui.admin; -import fr.ird.observe.client.I18nEnumHelper; +import fr.ird.observe.dto.I18nEnumHelper; import fr.ird.observe.client.constants.DbMode; import fr.ird.observe.client.ui.util.UIHelper; import fr.ird.observe.client.ui.admin.config.ConfigUI; ===================================== client/src/main/java/fr/ird/observe/client/ui/admin/AdminTabUIHandler.java ===================================== --- a/client/src/main/java/fr/ird/observe/client/ui/admin/AdminTabUIHandler.java +++ b/client/src/main/java/fr/ird/observe/client/ui/admin/AdminTabUIHandler.java @@ -21,7 +21,7 @@ */ package fr.ird.observe.client.ui.admin; -import fr.ird.observe.client.I18nEnumHelper; +import fr.ird.observe.dto.I18nEnumHelper; import fr.ird.observe.client.ObserveRunner; import fr.ird.observe.client.ObserveSwingApplicationContext; import fr.ird.observe.client.db.ObserveSwingDataSource; ===================================== client/src/main/java/fr/ird/observe/client/ui/admin/AdminUIHandler.java ===================================== --- a/client/src/main/java/fr/ird/observe/client/ui/admin/AdminUIHandler.java +++ b/client/src/main/java/fr/ird/observe/client/ui/admin/AdminUIHandler.java @@ -21,7 +21,7 @@ */ package fr.ird.observe.client.ui.admin; -import fr.ird.observe.client.I18nEnumHelper; +import fr.ird.observe.dto.I18nEnumHelper; import fr.ird.observe.client.ObserveActionExecutor; import fr.ird.observe.client.ObserveRunner; import fr.ird.observe.client.ui.ObserveKeyStrokes; ===================================== client/src/main/java/fr/ird/observe/client/ui/admin/resume/ShowResumeUIHandler.java ===================================== --- a/client/src/main/java/fr/ird/observe/client/ui/admin/resume/ShowResumeUIHandler.java +++ b/client/src/main/java/fr/ird/observe/client/ui/admin/resume/ShowResumeUIHandler.java @@ -21,7 +21,7 @@ */ package fr.ird.observe.client.ui.admin.resume; -import fr.ird.observe.client.I18nEnumHelper; +import fr.ird.observe.dto.I18nEnumHelper; import fr.ird.observe.client.ui.util.UIHelper; import fr.ird.observe.client.ui.admin.AdminStep; import fr.ird.observe.client.ui.admin.AdminTabUIHandler; ===================================== client/src/main/java/fr/ird/observe/client/ui/admin/synchronize/referential/ng/ReferentialSynchroConfigUI.jaxx ===================================== --- a/client/src/main/java/fr/ird/observe/client/ui/admin/synchronize/referential/ng/ReferentialSynchroConfigUI.jaxx +++ b/client/src/main/java/fr/ird/observe/client/ui/admin/synchronize/referential/ng/ReferentialSynchroConfigUI.jaxx @@ -28,7 +28,7 @@ <import> fr.ird.observe.client.configuration.ClientConfig fr.ird.observe.client.constants.ReferentialSynchronizeMode - fr.ird.observe.client.I18nEnumHelper + fr.ird.observe.dto.I18nEnumHelper fr.ird.observe.client.ui.admin.AdminUIModel fr.ird.observe.client.constants.ValidationModelMode ===================================== client/src/main/java/fr/ird/observe/client/ui/admin/synchronize/referential/ng/ReferentialSynchroModel.java ===================================== --- a/client/src/main/java/fr/ird/observe/client/ui/admin/synchronize/referential/ng/ReferentialSynchroModel.java +++ b/client/src/main/java/fr/ird/observe/client/ui/admin/synchronize/referential/ng/ReferentialSynchroModel.java @@ -22,7 +22,7 @@ package fr.ird.observe.client.ui.admin.synchronize.referential.ng; * #L% */ -import fr.ird.observe.client.I18nEnumHelper; +import fr.ird.observe.dto.I18nEnumHelper; import fr.ird.observe.client.constants.ReferentialSynchronizeMode; import fr.ird.observe.client.db.ObserveSwingDataSource; import fr.ird.observe.client.ui.admin.AdminActionModel; ===================================== client/src/main/java/fr/ird/observe/client/ui/admin/validate/ValidateConfigUI.jaxx ===================================== --- a/client/src/main/java/fr/ird/observe/client/ui/admin/validate/ValidateConfigUI.jaxx +++ b/client/src/main/java/fr/ird/observe/client/ui/admin/validate/ValidateConfigUI.jaxx @@ -26,7 +26,7 @@ <JPanel id="validateConfig"> <import> - fr.ird.observe.client.I18nEnumHelper + fr.ird.observe.dto.I18nEnumHelper fr.ird.observe.client.ui.admin.AdminUIModel fr.ird.observe.client.constants.ValidationModelMode ===================================== client/src/main/java/fr/ird/observe/client/ui/content/ContentUIInitializer.java ===================================== --- a/client/src/main/java/fr/ird/observe/client/ui/content/ContentUIInitializer.java +++ b/client/src/main/java/fr/ird/observe/client/ui/content/ContentUIInitializer.java @@ -24,7 +24,7 @@ package fr.ird.observe.client.ui.content; import com.google.common.collect.ImmutableMap; import com.google.common.collect.Lists; -import fr.ird.observe.client.I18nEnumHelper; +import fr.ird.observe.dto.I18nEnumHelper; import fr.ird.observe.client.ObserveSwingApplicationContext; import fr.ird.observe.client.ui.ObserveKeyStrokes; import fr.ird.observe.client.ui.actions.UIActionSupport; ===================================== client/src/main/java/fr/ird/observe/client/ui/content/data/seine/FloatingObjectUIModel.java ===================================== --- a/client/src/main/java/fr/ird/observe/client/ui/content/data/seine/FloatingObjectUIModel.java +++ b/client/src/main/java/fr/ird/observe/client/ui/content/data/seine/FloatingObjectUIModel.java @@ -25,7 +25,7 @@ package fr.ird.observe.client.ui.content.data.seine; import com.google.common.collect.ImmutableSet; import fr.ird.observe.spi.DtoModelHelper; import fr.ird.observe.binder.referential.ReferentialDtoReferenceBinder; -import fr.ird.observe.client.I18nEnumHelper; +import fr.ird.observe.dto.I18nEnumHelper; import fr.ird.observe.client.ObserveSwingApplicationContext; import fr.ird.observe.client.ui.content.ContentUIModel; import fr.ird.observe.dto.data.seine.DcpComputedValue; ===================================== client/src/main/java/fr/ird/observe/client/ui/content/data/seine/NonTargetCatchReleaseStatusesUI.java ===================================== --- a/client/src/main/java/fr/ird/observe/client/ui/content/data/seine/NonTargetCatchReleaseStatusesUI.java +++ b/client/src/main/java/fr/ird/observe/client/ui/content/data/seine/NonTargetCatchReleaseStatusesUI.java @@ -22,7 +22,7 @@ package fr.ird.observe.client.ui.content.data.seine; * #L% */ -import fr.ird.observe.client.I18nEnumHelper; +import fr.ird.observe.dto.I18nEnumHelper; import fr.ird.observe.dto.data.seine.NonTargetCatchReleaseStatus; import java.awt.GridLayout; import java.util.Objects; ===================================== client/src/main/java/fr/ird/observe/client/ui/content/data/seine/SetSeineUIHandler.java ===================================== --- a/client/src/main/java/fr/ird/observe/client/ui/content/data/seine/SetSeineUIHandler.java +++ b/client/src/main/java/fr/ird/observe/client/ui/content/data/seine/SetSeineUIHandler.java @@ -22,7 +22,7 @@ package fr.ird.observe.client.ui.content.data.seine; import fr.ird.observe.spi.DtoModelHelper; -import fr.ird.observe.client.I18nEnumHelper; +import fr.ird.observe.dto.I18nEnumHelper; import fr.ird.observe.client.db.ClientDataContext; import fr.ird.observe.client.db.ObserveSwingDataSource; import fr.ird.observe.client.db.constants.DataContextType; ===================================== client/src/main/java/fr/ird/observe/client/ui/storage/ObstunaAdminAction.java ===================================== --- a/client/src/main/java/fr/ird/observe/client/ui/storage/ObstunaAdminAction.java +++ b/client/src/main/java/fr/ird/observe/client/ui/storage/ObstunaAdminAction.java @@ -23,7 +23,7 @@ package fr.ird.observe.client.ui.storage; import com.google.common.base.Preconditions; import com.google.common.collect.ImmutableSet; -import fr.ird.observe.client.I18nEnumHelper; +import fr.ird.observe.dto.I18nEnumHelper; import fr.ird.observe.client.ObserveSwingApplicationContext; import fr.ird.observe.client.constants.DbMode; import fr.ird.observe.client.db.ObserveSwingDataSource; @@ -276,6 +276,9 @@ public enum ObstunaAdminAction { } }; + public String getLabel() { + return I18nEnumHelper.getLabel(this); + } /** Logger */ private static final Log log = LogFactory.getLog(ObstunaAdminAction.class); ===================================== client/src/main/java/fr/ird/observe/client/ui/storage/StorageStep.java ===================================== --- a/client/src/main/java/fr/ird/observe/client/ui/storage/StorageStep.java +++ b/client/src/main/java/fr/ird/observe/client/ui/storage/StorageStep.java @@ -21,7 +21,7 @@ */ package fr.ird.observe.client.ui.storage; -import fr.ird.observe.client.I18nEnumHelper; +import fr.ird.observe.dto.I18nEnumHelper; import org.nuiton.jaxx.runtime.swing.wizard.WizardStep; /** ===================================== client/src/main/java/fr/ird/observe/client/ui/storage/StorageUIHandler.java ===================================== --- a/client/src/main/java/fr/ird/observe/client/ui/storage/StorageUIHandler.java +++ b/client/src/main/java/fr/ird/observe/client/ui/storage/StorageUIHandler.java @@ -22,7 +22,7 @@ package fr.ird.observe.client.ui.storage; import com.google.common.base.Preconditions; -import fr.ird.observe.client.I18nEnumHelper; +import fr.ird.observe.dto.I18nEnumHelper; import fr.ird.observe.client.ObserveActionExecutor; import fr.ird.observe.client.ObserveRunner; import fr.ird.observe.client.ObserveSwingApplicationContext; ===================================== client/src/main/java/fr/ird/observe/client/ui/storage/StorageUIModel.java ===================================== --- a/client/src/main/java/fr/ird/observe/client/ui/storage/StorageUIModel.java +++ b/client/src/main/java/fr/ird/observe/client/ui/storage/StorageUIModel.java @@ -21,7 +21,7 @@ */ package fr.ird.observe.client.ui.storage; -import fr.ird.observe.client.I18nEnumHelper; +import fr.ird.observe.dto.I18nEnumHelper; import fr.ird.observe.client.ObserveSwingApplicationContext; import fr.ird.observe.client.ObserveSwingTechnicalException; import fr.ird.observe.client.configuration.ClientConfig; ===================================== client/src/main/java/fr/ird/observe/client/ui/storage/tabs/ChooseDbModeUI.jaxx ===================================== --- a/client/src/main/java/fr/ird/observe/client/ui/storage/tabs/ChooseDbModeUI.jaxx +++ b/client/src/main/java/fr/ird/observe/client/ui/storage/tabs/ChooseDbModeUI.jaxx @@ -26,7 +26,7 @@ <StorageTabUI> <import> - fr.ird.observe.client.I18nEnumHelper + fr.ird.observe.dto.I18nEnumHelper fr.ird.observe.client.ObserveSwingApplicationContext fr.ird.observe.client.configuration.ClientConfig fr.ird.observe.client.ui.util.UIHelper ===================================== client/src/main/java/fr/ird/observe/client/ui/storage/tabs/ChooseDbModeUIHandler.java ===================================== --- a/client/src/main/java/fr/ird/observe/client/ui/storage/tabs/ChooseDbModeUIHandler.java +++ b/client/src/main/java/fr/ird/observe/client/ui/storage/tabs/ChooseDbModeUIHandler.java @@ -22,7 +22,7 @@ package fr.ird.observe.client.ui.storage.tabs; * #L% */ -import fr.ird.observe.client.I18nEnumHelper; +import fr.ird.observe.dto.I18nEnumHelper; import fr.ird.observe.client.ObserveSwingApplicationContext; import fr.ird.observe.client.ObserveTextGenerator; import fr.ird.observe.client.constants.CreationMode; ===================================== client/src/main/java/fr/ird/observe/client/ui/storage/tabs/ConfigReferentielUI.jaxx ===================================== --- a/client/src/main/java/fr/ird/observe/client/ui/storage/tabs/ConfigReferentielUI.jaxx +++ b/client/src/main/java/fr/ird/observe/client/ui/storage/tabs/ConfigReferentielUI.jaxx @@ -26,7 +26,7 @@ <StorageTabUI> <import> - fr.ird.observe.client.I18nEnumHelper + fr.ird.observe.dto.I18nEnumHelper fr.ird.observe.client.constants.CreationMode fr.ird.observe.client.ui.storage.StorageStep ===================================== client/src/main/java/fr/ird/observe/client/ui/storage/tabs/ConfigUI.jaxx ===================================== --- a/client/src/main/java/fr/ird/observe/client/ui/storage/tabs/ConfigUI.jaxx +++ b/client/src/main/java/fr/ird/observe/client/ui/storage/tabs/ConfigUI.jaxx @@ -27,7 +27,7 @@ <StorageTabUI> <import> - fr.ird.observe.client.I18nEnumHelper + fr.ird.observe.dto.I18nEnumHelper fr.ird.observe.client.constants.ConnexionStatus fr.ird.observe.client.ui.actions.storage.SaveCurrentRemoteConfigurationUIAction fr.ird.observe.client.ui.actions.storage.SaveCurrentServerConfigurationUIAction ===================================== client/src/main/java/fr/ird/observe/client/ui/storage/tabs/StorageTabUI.jaxx ===================================== --- a/client/src/main/java/fr/ird/observe/client/ui/storage/tabs/StorageTabUI.jaxx +++ b/client/src/main/java/fr/ird/observe/client/ui/storage/tabs/StorageTabUI.jaxx @@ -28,7 +28,7 @@ implements='org.nuiton.jaxx.runtime.swing.wizard.WizardStepUI<StorageStep, StorageUIModel>'> <import> - fr.ird.observe.client.I18nEnumHelper + fr.ird.observe.dto.I18nEnumHelper fr.ird.observe.client.ui.util.UIHelper fr.ird.observe.client.ui.storage.StorageStep fr.ird.observe.client.ui.storage.StorageUIModel ===================================== client/src/main/java/fr/ird/observe/client/ui/util/tripMap/TripMapContentBuilder.java ===================================== --- a/client/src/main/java/fr/ird/observe/client/ui/util/tripMap/TripMapContentBuilder.java +++ b/client/src/main/java/fr/ird/observe/client/ui/util/tripMap/TripMapContentBuilder.java @@ -30,7 +30,7 @@ import com.vividsolutions.jts.geom.GeometryFactory; import com.vividsolutions.jts.geom.LineString; import com.vividsolutions.jts.geom.Point; import com.vividsolutions.jts.geom.Polygon; -import fr.ird.observe.client.I18nEnumHelper; +import fr.ird.observe.dto.I18nEnumHelper; import fr.ird.observe.client.ObserveSwingTechnicalException; import fr.ird.observe.dto.data.TripMapPoint; import fr.ird.observe.dto.data.TripMapPointType; ===================================== dto/pom.xml ===================================== --- a/dto/pom.xml +++ b/dto/pom.xml @@ -164,7 +164,6 @@ <goal>parse-java-enumerations</goal> </goals> <configuration> - <generateHelper>true</generateHelper> <enumerationSets> <enumerationSet> <name>label</name> ===================================== dto/src/main/java/fr/ird/observe/dto/I18nEnumHelper.java ===================================== --- /dev/null +++ b/dto/src/main/java/fr/ird/observe/dto/I18nEnumHelper.java @@ -0,0 +1,64 @@ +package fr.ird.observe.dto; + +/*- + * #%L + * ObServe :: Dto + * %% + * Copyright (C) 2008 - 2017 IRD, Code Lutin, Ultreia.io + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ + +import java.util.Locale; + +import static org.nuiton.i18n.I18n.l; +import static org.nuiton.i18n.I18n.t; + +public class I18nEnumHelper { + + public static <E extends Enum<E>> String getLabel(E e) { + return t(getLabelKey(e)); + } + + public static <E extends Enum<E>> String getLabel(Locale locale, E e) { + return l(locale, getLabelKey(e)); + } + + public static <E extends Enum<E>> String getDescription(E e) { + return t(getDescriptionKey(e)); + } + + public static <E extends Enum<E>> String getDescription(Locale locale, E e) { + return l(locale, getDescriptionKey(e)); + } + + private static <E extends Enum<E>> String getLabelKey(E e) { + return "observe.constant." + getClassSimpleName(e) + "." + e.name(); + } + + private static <E extends Enum<E>> String getDescriptionKey(E e) { + return "observe.constant." + getClassSimpleName(e) + "." + e.name() + ".description"; + } + + private static <E extends Enum<E>> String getClassSimpleName(E e) { + String result = e.getClass().getSimpleName(); + if (result.isEmpty()) { + result = e.getClass().getEnclosingClass().getSimpleName(); + } + return result; + } + +} View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/b6ac983e58f1feb565b59b1a9d4… --- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/b6ac983e58f1feb565b59b1a9d4… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] Ajout du référentiel observe_common.DataQuality (Closes #895)
by Tony CHEMIT 30 Mar '18

30 Mar '18

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 8d64b798 by Tony CHEMIT at 2018-03-30T13:53:41Z Ajout du référentiel observe_common.DataQuality (Closes #895) - - - - - 30 changed files: - client/src/main/java/fr/ird/observe/client/ui/content/data/longline/TripLonglineUI.jaxx - client/src/main/java/fr/ird/observe/client/ui/content/data/longline/TripLonglineUI.jcss - client/src/main/java/fr/ird/observe/client/ui/content/data/seine/TripSeineUI.jaxx - client/src/main/java/fr/ird/observe/client/ui/content/data/seine/TripSeineUI.jcss - + client/src/main/java/fr/ird/observe/client/ui/content/ref/common/DataQualityUI.jaxx - + client/src/main/java/fr/ird/observe/client/ui/content/ref/common/DataQualityUIHandler.java - + client/src/main/java/fr/ird/observe/client/ui/content/ref/common/DataQualityUIModel.java - + dto/src/main/java/fr/ird/observe/binder/referential/common/DataQualityDtoReferenceBinder.java - dto/src/main/java/fr/ird/observe/dto/decoration/DecoratorService.java - dto/src/main/java/fr/ird/observe/spi/DtoModelClasses.java - dto/src/main/models/Observe.model - dto/src/main/resources/i18n/dto_en_GB.properties - dto/src/main/resources/i18n/dto_es_ES.properties - dto/src/main/resources/i18n/dto_fr_FR.properties - persistence/src/main/java/fr/ird/observe/binder/data/longline/ActivityLonglineEntityDtoBinder.java - persistence/src/main/java/fr/ird/observe/binder/data/longline/TripLonglineEntityDtoBinder.java - persistence/src/main/java/fr/ird/observe/binder/data/seine/ActivitySeineEntityDtoBinder.java - persistence/src/main/java/fr/ird/observe/binder/data/seine/TripSeineEntityDtoBinder.java - + persistence/src/main/java/fr/ird/observe/binder/referential/common/DataQualityEntityDtoBinder.java - + persistence/src/main/java/fr/ird/observe/binder/referential/common/DataQualityEntityReferenceBinder.java - persistence/src/main/java/fr/ird/observe/persistence/Entities.java - persistence/src/main/java/fr/ird/observe/persistence/migration/DataSourceMigrationForVersion_6_0.java - persistence/src/main/java/fr/ird/observe/persistence/migration/DataSourceMigrationForVersion_7_0.java - persistence/src/main/java/fr/ird/observe/persistence/migration/DataSourceMigrationForVersion_7_0_RC_4.java - persistence/src/main/java/fr/ird/observe/persistence/migration/DataSourceMigrationForVersion_7_0_RC_6.java - persistence/src/main/models/Observe.model - persistence/src/main/resources/db/migration/6.901/01_add_object_operation-H2.sql → persistence/src/main/resources/db/migration/6.1/01_add_object_operation-H2.sql - persistence/src/main/resources/db/migration/6.901/01_add_object_operation-PG.sql → persistence/src/main/resources/db/migration/6.1/01_add_object_operation-PG.sql - persistence/src/main/resources/db/migration/6.901/02_add_object_material-common.sql → persistence/src/main/resources/db/migration/6.1/02_add_object_material-common.sql - persistence/src/main/resources/db/migration/6.901/03_add_floating_object_part-common.sql → persistence/src/main/resources/db/migration/6.1/03_add_floating_object_part-common.sql The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/8d64b7980b2ad6f7e3242221652… --- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/8d64b7980b2ad6f7e3242221652… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] 4 commits: fix some content icon + title
by Tony CHEMIT 30 Mar '18

30 Mar '18

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 548eca52 by Tony CHEMIT at 2018-03-30T07:28:59Z fix some content icon + title - - - - - bcb948a9 by Tony CHEMIT at 2018-03-30T07:49:55Z correction du menu contextuel sur l'arbre de navigation - - - - - 68ffc006 by Tony CHEMIT at 2018-03-30T11:31:59Z ajustement suite à la suppression du FOB (pour le calcul du type simplifié il faut alors prendre en compte la nullité...) (See #577) - - - - - 7da77641 by Tony CHEMIT at 2018-03-30T11:32:01Z Ajout du référentiel observe_common.DataQuality (Closes #895) - - - - - 30 changed files: - client/src/main/java/fr/ird/observe/client/ui/content/ContentMode.java - client/src/main/java/fr/ird/observe/client/ui/content/ContentUIHandler.java - client/src/main/java/fr/ird/observe/client/ui/content/data/longline/TripLonglinesUIHandler.java - client/src/main/java/fr/ird/observe/client/ui/content/data/seine/TripSeinesUIHandler.java - + client/src/main/java/fr/ird/observe/client/ui/content/ref/common/DataQualityUI.jaxx - + client/src/main/java/fr/ird/observe/client/ui/content/ref/common/DataQualityUIHandler.java - + client/src/main/java/fr/ird/observe/client/ui/content/ref/common/DataQualityUIModel.java - client/src/main/java/fr/ird/observe/client/ui/tree/ObserveNavigationTreeShowPopupAction.java - + dto/src/main/java/fr/ird/observe/binder/referential/common/DataQualityDtoReferenceBinder.java - dto/src/main/java/fr/ird/observe/dto/decoration/DecoratorService.java - dto/src/main/java/fr/ird/observe/spi/DtoModelClasses.java - dto/src/main/models/Observe.model - dto/src/main/resources/i18n/dto_en_GB.properties - dto/src/main/resources/i18n/dto_es_ES.properties - dto/src/main/resources/i18n/dto_fr_FR.properties - + persistence/src/main/java/fr/ird/observe/binder/referential/common/DataQualityEntityDtoBinder.java - + persistence/src/main/java/fr/ird/observe/binder/referential/common/DataQualityEntityReferenceBinder.java - persistence/src/main/java/fr/ird/observe/entities/referentiel/seine/ObjectMaterialImpl.java - persistence/src/main/java/fr/ird/observe/persistence/Entities.java - persistence/src/main/java/fr/ird/observe/persistence/migration/DataSourceMigrationForVersion_6_0.java - persistence/src/main/java/fr/ird/observe/persistence/migration/DataSourceMigrationForVersion_7_0.java - persistence/src/main/java/fr/ird/observe/persistence/migration/DataSourceMigrationForVersion_7_0_RC_4.java - persistence/src/main/java/fr/ird/observe/persistence/migration/DataSourceMigrationForVersion_7_0_RC_6.java - persistence/src/main/models/Observe.model - persistence/src/main/resources/db/migration/6.901/01_add_object_operation-H2.sql → persistence/src/main/resources/db/migration/6.1/01_add_object_operation-H2.sql - persistence/src/main/resources/db/migration/6.901/01_add_object_operation-PG.sql → persistence/src/main/resources/db/migration/6.1/01_add_object_operation-PG.sql - persistence/src/main/resources/db/migration/6.901/02_add_object_material-common.sql → persistence/src/main/resources/db/migration/6.1/02_add_object_material-common.sql - persistence/src/main/resources/db/migration/6.901/03_add_floating_object_part-common.sql → persistence/src/main/resources/db/migration/6.1/03_add_floating_object_part-common.sql - persistence/src/main/resources/db/migration/6.901/04_remove_dcp_fields-common.sql → persistence/src/main/resources/db/migration/6.1/04_remove_dcp_fields-common.sql - persistence/src/main/resources/db/migration/6.901/05_add_species_group_release_mode-common.sql → persistence/src/main/resources/db/migration/6.1/05_add_species_group_release_mode-common.sql The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/05fc08fdf5b79c6e2784f65db1… --- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/05fc08fdf5b79c6e2784f65db1… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe] Pushed new branch v8_navigation_tree
by Tony CHEMIT 30 Mar '18

30 Mar '18

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

1 0

[Git][ultreiaio/ird-observe][develop] correction du référentiel ObjectMaterial (See #577)
by Tony CHEMIT 28 Mar '18

28 Mar '18

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 05fc08fd by Tony CHEMIT at 2018-03-28T17:00:02Z correction du référentiel ObjectMaterial (See #577) - - - - - 3 changed files: - persistence/src/main/resources/db/migration/6.901/09_fill_object_material-common.sql - services-local/src/main/java/fr/ird/observe/services/local/service/data/seine/FloatingObjectServiceLocal.java - services-local/src/test/java/fr/ird/observe/services/local/service/data/seine/FloatingObjectServiceLocalTest.java Changes: ===================================== persistence/src/main/resources/db/migration/6.901/09_fill_object_material-common.sql ===================================== --- a/persistence/src/main/resources/db/migration/6.901/09_fill_object_material-common.sql +++ b/persistence/src/main/resources/db/migration/6.901/09_fill_object_material-common.sql @@ -21,12 +21,11 @@ --- INSERT INTO observe_seine.objectMaterial (topiaid, topiaversion, topiacreatedate, lastupdatedate, needComment, status, legacyCode, standardCode, code, parent, label1, label2, label3, selectable, childrenMultiSelectable, childSelectionMandatory, objectMaterialType, validation, biodegradable, nonEntangling) values ('fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.1' , 0, CURRENT_DATE, CURRENT_TIMESTAMP, false, 1, NULL , 'FAD' , '1' , NULL , 'FAD' , 'FAD' , 'FAD' , false, false, false, NULL , NULL , false, false); INSERT INTO observe_seine.objectMaterial (topiaid, topiaversion, topiacreatedate, lastupdatedate, needComment, status, legacyCode, standardCode, code, parent, label1, label2, label3, selectable, childrenMultiSelectable, childSelectionMandatory, objectMaterialType, validation, biodegradable, nonEntangling) values ('fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.2' , 0, CURRENT_DATE, CURRENT_TIMESTAMP, false, 1, '16' , 'DFAD' , '1-1' , 'fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.1' , 'DFAD (drifting FAD)' , 'DFAD (FAD dérivant)' , 'DFAD (FAD a la deriva)' , true , true , false, 'fr.ird.observe.entities.referentiel.seine.ObjectMaterialType#0#0', NULL , false, false); -INSERT INTO observe_seine.objectMaterial (topiaid, topiaversion, topiacreatedate, lastupdatedate, needComment, status, legacyCode, standardCode, code, parent, label1, label2, label3, selectable, childrenMultiSelectable, childSelectionMandatory, objectMaterialType, validation, biodegradable, nonEntangling) values ('fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.3' , 0, CURRENT_DATE, CURRENT_TIMESTAMP, false, 0, '19' , NULL , '1-1-1' , 'fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.2' , 'Experimental FAD' , 'Objet expérimental' , 'Objeto experimental' , true , false, false, 'fr.ird.observe.entities.referentiel.seine.ObjectMaterialType#0#0', NULL , false, false); -INSERT INTO observe_seine.objectMaterial (topiaid, topiaversion, topiacreatedate, lastupdatedate, needComment, status, legacyCode, standardCode, code, parent, label1, label2, label3, selectable, childrenMultiSelectable, childSelectionMandatory, objectMaterialType, validation, biodegradable, nonEntangling) values ('fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.4' , 0, CURRENT_DATE, CURRENT_TIMESTAMP, false, 0, '18' , NULL , '1-1-2' , 'fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.2' , 'Artificial FAD' , 'Objet artificiel' , 'Objeto artificial' , true , false, false, 'fr.ird.observe.entities.referentiel.seine.ObjectMaterialType#0#0', NULL , false, false); -INSERT INTO observe_seine.objectMaterial (topiaid, topiaversion, topiacreatedate, lastupdatedate, needComment, status, legacyCode, standardCode, code, parent, label1, label2, label3, selectable, childrenMultiSelectable, childSelectionMandatory, objectMaterialType, validation, biodegradable, nonEntangling) values ('fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.5' , 0, CURRENT_DATE, CURRENT_TIMESTAMP, false, 1, '27' , NULL , '1-1-3' , 'fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.2' , 'Several FAD entangled' , 'Plusieurs FAD' , 'Objectos enredados' , true , false, false, 'fr.ird.observe.entities.referentiel.seine.ObjectMaterialType#0#0', NULL , false, false); +INSERT INTO observe_seine.objectMaterial (topiaid, topiaversion, topiacreatedate, lastupdatedate, needComment, status, legacyCode, standardCode, code, parent, label1, label2, label3, selectable, childrenMultiSelectable, childSelectionMandatory, objectMaterialType, validation, biodegradable, nonEntangling) values ('fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.3', 0, CURRENT_DATE, CURRENT_TIMESTAMP, false, 1, NULL , NULL , '1-1-1' , 'fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.2' , 'Raft' , 'Radeau' , 'Parrilla' , true , true , true , 'fr.ird.observe.entities.referentiel.seine.ObjectMaterialType#0#0', NULL , false, false); INSERT INTO observe_seine.objectMaterial (topiaid, topiaversion, topiacreatedate, lastupdatedate, needComment, status, legacyCode, standardCode, code, parent, label1, label2, label3, selectable, childrenMultiSelectable, childSelectionMandatory, objectMaterialType, validation, biodegradable, nonEntangling) values ('fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.6' , 0, CURRENT_DATE, CURRENT_TIMESTAMP, false, 1, NULL , NULL , '1-1-1-1' , 'fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.3' , 'Frame' , 'Chassis' , 'Estructura' , false, false, true , NULL , NULL , false, false); INSERT INTO observe_seine.objectMaterial (topiaid, topiaversion, topiacreatedate, lastupdatedate, needComment, status, legacyCode, standardCode, code, parent, label1, label2, label3, selectable, childrenMultiSelectable, childSelectionMandatory, objectMaterialType, validation, biodegradable, nonEntangling) values ('fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.7' , 0, CURRENT_DATE, CURRENT_TIMESTAMP, false, 1, '6, 15, 25' , NULL , '1-1-1-1-1' , 'fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.6' , 'Vegetal, canes,bamboo' , 'Végétal, tiges,bambou' , 'Bambú, cañas' , true , false, false, 'fr.ird.observe.entities.referentiel.seine.ObjectMaterialType#0#0', NULL , false, false); INSERT INTO observe_seine.objectMaterial (topiaid, topiaversion, topiacreatedate, lastupdatedate, needComment, status, legacyCode, standardCode, code, parent, label1, label2, label3, selectable, childrenMultiSelectable, childSelectionMandatory, objectMaterialType, validation, biodegradable, nonEntangling) values ('fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.8' , 0, CURRENT_DATE, CURRENT_TIMESTAMP, false, 1, '20, 21*,26' , NULL , '1-1-1-1-2' , 'fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.6' , 'Metallic or PVC' , 'Métal ou PVC' , 'Metállica ó PVC' , true , false, false, 'fr.ird.observe.entities.referentiel.seine.ObjectMaterialType#0#0', NULL , false, false); +INSERT INTO observe_seine.objectMaterial (topiaid, topiaversion, topiacreatedate, lastupdatedate, needComment, status, legacyCode, standardCode, code, parent, label1, label2, label3, selectable, childrenMultiSelectable, childSelectionMandatory, objectMaterialType, validation, biodegradable, nonEntangling) values ('fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.84', 0, CURRENT_DATE, CURRENT_TIMESTAMP, false, 0, NULL , NULL , '1-1-1-1-3' , 'fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.6' , 'Mixed vegetal and metallic or PVC' , NULL , 'Mixta (metálica o PVC y cañas)' , false, false, false, NULL , NULL , false, false); INSERT INTO observe_seine.objectMaterial (topiaid, topiaversion, topiacreatedate, lastupdatedate, needComment, status, legacyCode, standardCode, code, parent, label1, label2, label3, selectable, childrenMultiSelectable, childSelectionMandatory, objectMaterialType, validation, biodegradable, nonEntangling) values ('fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.9' , 0, CURRENT_DATE, CURRENT_TIMESTAMP, false, 1, NULL , NULL , '1-1-1-2' , 'fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.3' , 'Superior coverage' , 'Revêtement supérieur' , 'Recubrimiento superior' , false, true , true , NULL , NULL , false, false); INSERT INTO observe_seine.objectMaterial (topiaid, topiaversion, topiacreatedate, lastupdatedate, needComment, status, legacyCode, standardCode, code, parent, label1, label2, label3, selectable, childrenMultiSelectable, childSelectionMandatory, objectMaterialType, validation, biodegradable, nonEntangling) values ('fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.10', 0, CURRENT_DATE, CURRENT_TIMESTAMP, false, 1, NULL , NULL , '1-1-1-2-1' , 'fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.9' , 'Net' , 'Filet' , 'Red' , false, true , false, NULL , NULL , false, false); INSERT INTO observe_seine.objectMaterial (topiaid, topiaversion, topiacreatedate, lastupdatedate, needComment, status, legacyCode, standardCode, code, parent, label1, label2, label3, selectable, childrenMultiSelectable, childSelectionMandatory, objectMaterialType, validation, biodegradable, nonEntangling) values ('fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.11', 0, CURRENT_DATE, CURRENT_TIMESTAMP, false, 1, NULL , NULL , '1-1-1-2-1-1' , 'fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.10', 'Net with mesh ≤7cm' , 'Filet avec maillage ≤7cm' , 'Red con malla ≤7cm' , true , false, false, 'fr.ird.observe.entities.referentiel.seine.ObjectMaterialType#0#0', NULL , false, false); @@ -43,6 +42,7 @@ INSERT INTO observe_seine.objectMaterial (topiaid, topiaversion, topiacreatedate INSERT INTO observe_seine.objectMaterial (topiaid, topiaversion, topiacreatedate, lastupdatedate, needComment, status, legacyCode, standardCode, code, parent, label1, label2, label3, selectable, childrenMultiSelectable, childSelectionMandatory, objectMaterialType, validation, biodegradable, nonEntangling) values ('fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.22', 0, CURRENT_DATE, CURRENT_TIMESTAMP, false, 1, NULL , NULL , '1-1-1-3-4' , 'fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.16', 'Not visible' , 'Non visible' , 'No se ve' , true , false, false, 'fr.ird.observe.entities.referentiel.seine.ObjectMaterialType#0#0', NULL , false, false); INSERT INTO observe_seine.objectMaterial (topiaid, topiaversion, topiacreatedate, lastupdatedate, needComment, status, legacyCode, standardCode, code, parent, label1, label2, label3, selectable, childrenMultiSelectable, childSelectionMandatory, objectMaterialType, validation, biodegradable, nonEntangling) values ('fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.23', 0, CURRENT_DATE, CURRENT_TIMESTAMP, false, 1, NULL , NULL , '1-1-1-4' , 'fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.3' , 'Modified' , 'Modifié' , 'Se modifica' , true , false, false, 'fr.ird.observe.entities.referentiel.seine.ObjectMaterialType#0#0', NULL , false, false); INSERT INTO observe_seine.objectMaterial (topiaid, topiaversion, topiacreatedate, lastupdatedate, needComment, status, legacyCode, standardCode, code, parent, label1, label2, label3, selectable, childrenMultiSelectable, childSelectionMandatory, objectMaterialType, validation, biodegradable, nonEntangling) values ('fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.24', 0, CURRENT_DATE, CURRENT_TIMESTAMP, false, 1, NULL , NULL , '1-1-1-5' , 'fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.3' , 'Replaced' , 'Remplacé' , 'Se reemplaza' , true , false, false, 'fr.ird.observe.entities.referentiel.seine.ObjectMaterialType#0#0', NULL , false, false); +INSERT INTO observe_seine.objectMaterial (topiaid, topiaversion, topiacreatedate, lastupdatedate, needComment, status, legacyCode, standardCode, code, parent, label1, label2, label3, selectable, childrenMultiSelectable, childSelectionMandatory, objectMaterialType, validation, biodegradable, nonEntangling) values ('fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.4', 0, CURRENT_DATE, CURRENT_TIMESTAMP, false, 1, NULL , NULL , '1-1-2' , 'fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.6' , 'Subsurface structure' , 'Structure immergée' , 'Rabo' , false, true , true , NULL , NULL , false, false); INSERT INTO observe_seine.objectMaterial (topiaid, topiaversion, topiacreatedate, lastupdatedate, needComment, status, legacyCode, standardCode, code, parent, label1, label2, label3, selectable, childrenMultiSelectable, childSelectionMandatory, objectMaterialType, validation, biodegradable, nonEntangling) values ('fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.25', 0, CURRENT_DATE, CURRENT_TIMESTAMP, false, 1, NULL , NULL , '1-1-2-1' , 'fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.4' , 'Net in sausage' , 'Filet saucisse' , 'Red en chorizo' , false, true , false, NULL , NULL , false, false); INSERT INTO observe_seine.objectMaterial (topiaid, topiaversion, topiacreatedate, lastupdatedate, needComment, status, legacyCode, standardCode, code, parent, label1, label2, label3, selectable, childrenMultiSelectable, childSelectionMandatory, objectMaterialType, validation, biodegradable, nonEntangling) values ('fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.26', 0, CURRENT_DATE, CURRENT_TIMESTAMP, false, 0, NULL , NULL , '1-1-2-1-1' , 'fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.25', 'Net in sausage with mesh ≤7cm' , 'Filet saucisse avec maillage ≤7cm' , 'Red en chorizo con malla ≤7cm' , true , false, false, 'fr.ird.observe.entities.referentiel.seine.ObjectMaterialType#0#0', NULL , false, false); INSERT INTO observe_seine.objectMaterial (topiaid, topiaversion, topiacreatedate, lastupdatedate, needComment, status, legacyCode, standardCode, code, parent, label1, label2, label3, selectable, childrenMultiSelectable, childSelectionMandatory, objectMaterialType, validation, biodegradable, nonEntangling) values ('fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.27', 0, CURRENT_DATE, CURRENT_TIMESTAMP, false, 0, NULL , NULL , '1-1-2-1-2' , 'fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.25', 'Net in sausage with mesh >7cm' , 'Filet saucisse avec maillage >7cm' , 'Red en chorizo con malla >7cm' , true , false, false, 'fr.ird.observe.entities.referentiel.seine.ObjectMaterialType#0#0', NULL , false, false); @@ -57,6 +57,7 @@ INSERT INTO observe_seine.objectMaterial (topiaid, topiaversion, topiacreatedate INSERT INTO observe_seine.objectMaterial (topiaid, topiaversion, topiacreatedate, lastupdatedate, needComment, status, legacyCode, standardCode, code, parent, label1, label2, label3, selectable, childrenMultiSelectable, childSelectionMandatory, objectMaterialType, validation, biodegradable, nonEntangling) values ('fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.36', 0, CURRENT_DATE, CURRENT_TIMESTAMP, false, 1, NULL , NULL , '1-1-2-6' , 'fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.4' , 'No subsurface structure' , 'Pas de mouillage' , 'Sin rabo' , true , false, false, 'fr.ird.observe.entities.referentiel.seine.ObjectMaterialType#0#0', NULL , false, false); INSERT INTO observe_seine.objectMaterial (topiaid, topiaversion, topiacreatedate, lastupdatedate, needComment, status, legacyCode, standardCode, code, parent, label1, label2, label3, selectable, childrenMultiSelectable, childSelectionMandatory, objectMaterialType, validation, biodegradable, nonEntangling) values ('fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.37', 0, CURRENT_DATE, CURRENT_TIMESTAMP, false, 1, NULL , NULL , '1-1-2-7' , 'fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.4' , 'Modified' , 'Modifié' , 'Se modifica' , true , false, false, 'fr.ird.observe.entities.referentiel.seine.ObjectMaterialType#0#0', NULL , false, false); INSERT INTO observe_seine.objectMaterial (topiaid, topiaversion, topiacreatedate, lastupdatedate, needComment, status, legacyCode, standardCode, code, parent, label1, label2, label3, selectable, childrenMultiSelectable, childSelectionMandatory, objectMaterialType, validation, biodegradable, nonEntangling) values ('fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.38', 0, CURRENT_DATE, CURRENT_TIMESTAMP, false, 1, NULL , NULL , '1-1-2-8' , 'fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.4' , 'Replaced' , 'Remplacé' , 'Se reemplaza' , true , false, false, 'fr.ird.observe.entities.referentiel.seine.ObjectMaterialType#0#0', NULL , false, false); +INSERT INTO observe_seine.objectMaterial (topiaid, topiaversion, topiacreatedate, lastupdatedate, needComment, status, legacyCode, standardCode, code, parent, label1, label2, label3, selectable, childrenMultiSelectable, childSelectionMandatory, objectMaterialType, validation, biodegradable, nonEntangling) values ('fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.5', 0, CURRENT_DATE, CURRENT_TIMESTAMP, false, 1, NULL , NULL , '1-1-3' , 'fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.2' , 'Other components' , 'Autres éléments' , 'Otros componentes' , false, true , false, NULL , NULL , false, false); INSERT INTO observe_seine.objectMaterial (topiaid, topiaversion, topiacreatedate, lastupdatedate, needComment, status, legacyCode, standardCode, code, parent, label1, label2, label3, selectable, childrenMultiSelectable, childSelectionMandatory, objectMaterialType, validation, biodegradable, nonEntangling) values ('fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.39', 0, CURRENT_DATE, CURRENT_TIMESTAMP, false, 1, NULL , NULL , '1-1-3-1' , 'fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.5' , 'Containers' , 'Bidons plastique' , 'Garrafas plástico' , true , false, false, 'fr.ird.observe.entities.referentiel.seine.ObjectMaterialType#0#0', NULL , false, false); INSERT INTO observe_seine.objectMaterial (topiaid, topiaversion, topiacreatedate, lastupdatedate, needComment, status, legacyCode, standardCode, code, parent, label1, label2, label3, selectable, childrenMultiSelectable, childSelectionMandatory, objectMaterialType, validation, biodegradable, nonEntangling) values ('fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.40', 0, CURRENT_DATE, CURRENT_TIMESTAMP, false, 1, NULL , NULL , '1-1-3-2' , 'fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.5' , 'Corks' , 'Flotteurs' , 'Corchos' , true , false, false, 'fr.ird.observe.entities.referentiel.seine.ObjectMaterialType#0#0', NULL , false, false); INSERT INTO observe_seine.objectMaterial (topiaid, topiaversion, topiacreatedate, lastupdatedate, needComment, status, legacyCode, standardCode, code, parent, label1, label2, label3, selectable, childrenMultiSelectable, childSelectionMandatory, objectMaterialType, validation, biodegradable, nonEntangling) values ('fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.41', 0, CURRENT_DATE, CURRENT_TIMESTAMP, false, 1, NULL , NULL , '1-1-3-3' , 'fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.5' , 'Bags' , 'Sacs' , 'Sacos' , true , false, false, 'fr.ird.observe.entities.referentiel.seine.ObjectMaterialType#0#0', NULL , false, false); @@ -64,6 +65,9 @@ INSERT INTO observe_seine.objectMaterial (topiaid, topiaversion, topiacreatedate INSERT INTO observe_seine.objectMaterial (topiaid, topiaversion, topiacreatedate, lastupdatedate, needComment, status, legacyCode, standardCode, code, parent, label1, label2, label3, selectable, childrenMultiSelectable, childSelectionMandatory, objectMaterialType, validation, biodegradable, nonEntangling) values ('fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.43', 0, CURRENT_DATE, CURRENT_TIMESTAMP, false, 1, NULL , NULL , '1-1-3-5' , 'fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.5' , 'Color belts' , 'Rubans colorés' , 'Cintas de colores' , true , false, false, 'fr.ird.observe.entities.referentiel.seine.ObjectMaterialType#0#0', NULL , false, false); INSERT INTO observe_seine.objectMaterial (topiaid, topiaversion, topiacreatedate, lastupdatedate, needComment, status, legacyCode, standardCode, code, parent, label1, label2, label3, selectable, childrenMultiSelectable, childSelectionMandatory, objectMaterialType, validation, biodegradable, nonEntangling) values ('fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.44', 0, CURRENT_DATE, CURRENT_TIMESTAMP, false, 1, NULL , NULL , '1-1-3-6' , 'fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.5' , 'Weights' , 'Poids' , 'Peso' , true , false, false, 'fr.ird.observe.entities.referentiel.seine.ObjectMaterialType#0#0', NULL , false, false); INSERT INTO observe_seine.objectMaterial (topiaid, topiaversion, topiacreatedate, lastupdatedate, needComment, status, legacyCode, standardCode, code, parent, label1, label2, label3, selectable, childrenMultiSelectable, childSelectionMandatory, objectMaterialType, validation, biodegradable, nonEntangling) values ('fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.45', 0, CURRENT_DATE, CURRENT_TIMESTAMP, false, 1, NULL , NULL , '1-1-3-7' , 'fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.5' , 'Entangled animal' , 'Animal maillé' , 'Animal enmallado' , true , false, false, 'fr.ird.observe.entities.referentiel.seine.ObjectMaterialType#0#0', NULL , false, false); +INSERT INTO observe_seine.objectMaterial (topiaid, topiaversion, topiacreatedate, lastupdatedate, needComment, status, legacyCode, standardCode, code, parent, label1, label2, label3, selectable, childrenMultiSelectable, childSelectionMandatory, objectMaterialType, validation, biodegradable, nonEntangling) values ('fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.83' , 0, CURRENT_DATE, CURRENT_TIMESTAMP, false, 0, '19' , NULL , '1-1-4' , 'fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.2' , 'Experimental FAD' , 'Objet expérimental' , 'Objeto experimental' , true , false, false, 'fr.ird.observe.entities.referentiel.seine.ObjectMaterialType#0#0', NULL , false, false); +INSERT INTO observe_seine.objectMaterial (topiaid, topiaversion, topiacreatedate, lastupdatedate, needComment, status, legacyCode, standardCode, code, parent, label1, label2, label3, selectable, childrenMultiSelectable, childSelectionMandatory, objectMaterialType, validation, biodegradable, nonEntangling) values ('fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.85' , 0, CURRENT_DATE, CURRENT_TIMESTAMP, false, 0, '18' , NULL , '1-1-5' , 'fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.2' , 'Artificial FAD' , 'Objet artificiel' , 'Objeto artificial' , true , false, false, 'fr.ird.observe.entities.referentiel.seine.ObjectMaterialType#0#0', NULL , false, false); +INSERT INTO observe_seine.objectMaterial (topiaid, topiaversion, topiacreatedate, lastupdatedate, needComment, status, legacyCode, standardCode, code, parent, label1, label2, label3, selectable, childrenMultiSelectable, childSelectionMandatory, objectMaterialType, validation, biodegradable, nonEntangling) values ('fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.86' , 0, CURRENT_DATE, CURRENT_TIMESTAMP, false, 1, '27' , NULL , '1-1-6' , 'fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.2' , 'Several FAD entangled' , 'Plusieurs FAD' , 'Objectos enredados' , true , false, false, 'fr.ird.observe.entities.referentiel.seine.ObjectMaterialType#0#0', NULL , false, false); INSERT INTO observe_seine.objectMaterial (topiaid, topiaversion, topiacreatedate, lastupdatedate, needComment, status, legacyCode, standardCode, code, parent, label1, label2, label3, selectable, childrenMultiSelectable, childSelectionMandatory, objectMaterialType, validation, biodegradable, nonEntangling) values ('fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.46', 0, CURRENT_DATE, CURRENT_TIMESTAMP, false, 1, '7' , 'AFAD' , '1-2' , 'fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.1' , 'AFAD (anchored FAD)' , 'AFAD (FAD ancré)' , 'AFAD (FAD arraigado)' , true , true , false, 'fr.ird.observe.entities.referentiel.seine.ObjectMaterialType#0#0', NULL , false, false); INSERT INTO observe_seine.objectMaterial (topiaid, topiaversion, topiacreatedate, lastupdatedate, needComment, status, legacyCode, standardCode, code, parent, label1, label2, label3, selectable, childrenMultiSelectable, childSelectionMandatory, objectMaterialType, validation, biodegradable, nonEntangling) values ('fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.47', 0, CURRENT_DATE, CURRENT_TIMESTAMP, false, 1, NULL , NULL , '1-2-1' , 'fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.46', 'Radar reflectors' , 'Réflecteurs radar' , 'Reflectores de radar' , true , false, false, 'fr.ird.observe.entities.referentiel.seine.ObjectMaterialType#0#0', NULL , false, false); INSERT INTO observe_seine.objectMaterial (topiaid, topiaversion, topiacreatedate, lastupdatedate, needComment, status, legacyCode, standardCode, code, parent, label1, label2, label3, selectable, childrenMultiSelectable, childSelectionMandatory, objectMaterialType, validation, biodegradable, nonEntangling) values ('fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.48', 0, CURRENT_DATE, CURRENT_TIMESTAMP, false, 1, NULL , NULL , '1-2-2' , 'fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.46', 'Lighting' , 'Eclairage' , 'iluminación' , true , false, false, 'fr.ird.observe.entities.referentiel.seine.ObjectMaterialType#0#0', NULL , false, false); @@ -100,8 +104,4 @@ INSERT INTO observe_seine.objectMaterial (topiaid, topiaversion, topiacreatedate INSERT INTO observe_seine.objectMaterial (topiaid, topiaversion, topiacreatedate, lastupdatedate, needComment, status, legacyCode, standardCode, code, parent, label1, label2, label3, selectable, childrenMultiSelectable, childSelectionMandatory, objectMaterialType, validation, biodegradable, nonEntangling) values ('fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.79', 0, CURRENT_DATE, CURRENT_TIMESTAMP, false, 0, '14' , 'ALOG' , '6-2' , 'fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.77', 'One of the previous (10, 11, 12, 13) tagged' , 'Un des antérieurs (10, 11, 12, 13) balisé' , 'Una de los anterior (10, 11, 12, 13) con Baliza' , true , false, false, 'fr.ird.observe.entities.referentiel.seine.ObjectMaterialType#0#0', NULL , false, false); INSERT INTO observe_seine.objectMaterial (topiaid, topiaversion, topiacreatedate, lastupdatedate, needComment, status, legacyCode, standardCode, code, parent, label1, label2, label3, selectable, childrenMultiSelectable, childSelectionMandatory, objectMaterialType, validation, biodegradable, nonEntangling) values ('fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.80', 0, CURRENT_DATE, CURRENT_TIMESTAMP, false, 0, '8' , NULL , '6-3' , 'fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.77', 'Tuna seiner (or skiff)' , 'Thonier (ou skiff)' , 'Atunero (oó panga)' , true , false, false, 'fr.ird.observe.entities.referentiel.seine.ObjectMaterialType#0#0', NULL , false, false); INSERT INTO observe_seine.objectMaterial (topiaid, topiaversion, topiacreatedate, lastupdatedate, needComment, status, legacyCode, standardCode, code, parent, label1, label2, label3, selectable, childrenMultiSelectable, childSelectionMandatory, objectMaterialType, validation, biodegradable, nonEntangling) values ('fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.81', 0, CURRENT_DATE, CURRENT_TIMESTAMP, false, 0, '9' , NULL , '6-4' , 'fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.77', 'Supply' , 'Bateau d’appui' , 'Macicero' , true , false, false, 'fr.ird.observe.entities.referentiel.seine.ObjectMaterialType#0#0', NULL , false, false); -INSERT INTO observe_seine.objectMaterial (topiaid, topiaversion, topiacreatedate, lastupdatedate, needComment, status, legacyCode, standardCode, code, parent, label1, label2, label3, selectable, childrenMultiSelectable, childSelectionMandatory, objectMaterialType, validation, biodegradable, nonEntangling) values ('fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.82', 0, CURRENT_DATE, CURRENT_TIMESTAMP, false, 0, '5*, 6*, 21*' , NULL , '6-5' , 'fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.77', 'Tagged' , 'Balisé' , 'Marcado' , true , false, false, 'fr.ird.observe.entities.referentiel.seine.ObjectMaterialType#0#0', NULL , false, false); -INSERT INTO observe_seine.objectMaterial (topiaid, topiaversion, topiacreatedate, lastupdatedate, needComment, status, legacyCode, standardCode, code, parent, label1, label2, label3, selectable, childrenMultiSelectable, childSelectionMandatory, objectMaterialType, validation, biodegradable, nonEntangling) values ('fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.83', 0, CURRENT_DATE, CURRENT_TIMESTAMP, false, 1, NULL , NULL , '7-1-1' , 'fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.2' , 'Raft' , 'Radeau' , 'Parrilla' , true , true , true , 'fr.ird.observe.entities.referentiel.seine.ObjectMaterialType#0#0', NULL , false, false); -INSERT INTO observe_seine.objectMaterial (topiaid, topiaversion, topiacreatedate, lastupdatedate, needComment, status, legacyCode, standardCode, code, parent, label1, label2, label3, selectable, childrenMultiSelectable, childSelectionMandatory, objectMaterialType, validation, biodegradable, nonEntangling) values ('fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.84', 0, CURRENT_DATE, CURRENT_TIMESTAMP, false, 0, NULL , NULL , '7-1-1-1-3' , 'fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.6' , 'Mixed vegetal and metallic or PVC' , NULL , 'Mixta (metálica o PVC y cañas)' , false, false, false, NULL , NULL , false, false); -INSERT INTO observe_seine.objectMaterial (topiaid, topiaversion, topiacreatedate, lastupdatedate, needComment, status, legacyCode, standardCode, code, parent, label1, label2, label3, selectable, childrenMultiSelectable, childSelectionMandatory, objectMaterialType, validation, biodegradable, nonEntangling) values ('fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.85', 0, CURRENT_DATE, CURRENT_TIMESTAMP, false, 1, NULL , NULL , '7-1-2' , 'fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.6' , 'Subsurface structure' , 'Structure immergée' , 'Rabo' , false, true , true , NULL , NULL , false, false); -INSERT INTO observe_seine.objectMaterial (topiaid, topiaversion, topiacreatedate, lastupdatedate, needComment, status, legacyCode, standardCode, code, parent, label1, label2, label3, selectable, childrenMultiSelectable, childSelectionMandatory, objectMaterialType, validation, biodegradable, nonEntangling) values ('fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.86', 0, CURRENT_DATE, CURRENT_TIMESTAMP, false, 1, NULL , NULL , '7-1-3' , 'fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.2' , 'Other components' , 'Autres éléments' , 'Otros componentes' , false, true , false, NULL , NULL , false, false); +INSERT INTO observe_seine.objectMaterial (topiaid, topiaversion, topiacreatedate, lastupdatedate, needComment, status, legacyCode, standardCode, code, parent, label1, label2, label3, selectable, childrenMultiSelectable, childSelectionMandatory, objectMaterialType, validation, biodegradable, nonEntangling) values ('fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.82', 0, CURRENT_DATE, CURRENT_TIMESTAMP, false, 0, '5*, 6*, 21*' , NULL , '6-5' , 'fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.77', 'Tagged' , 'Balisé' , 'Marcado' , true , false, false, 'fr.ird.observe.entities.referentiel.seine.ObjectMaterialType#0#0', NULL , false, false); \ No newline at end of file ===================================== services-local/src/main/java/fr/ird/observe/services/local/service/data/seine/FloatingObjectServiceLocal.java ===================================== --- a/services-local/src/main/java/fr/ird/observe/services/local/service/data/seine/FloatingObjectServiceLocal.java +++ b/services-local/src/main/java/fr/ird/observe/services/local/service/data/seine/FloatingObjectServiceLocal.java @@ -238,7 +238,7 @@ public class FloatingObjectServiceLocal extends ObserveServiceLocal implements F private List<ObjectMaterialHierarchyDto> getObjectMaterialHierarchyDtos(List<ObjectMaterial> objectMaterials) { Multimap<String, ObjectMaterial> childrenByParent = ArrayListMultimap.create(); objectMaterials.forEach(o -> childrenByParent.put(Optional.ofNullable(o.getParent()).map(ObjectMaterial::getTopiaId).orElse(null), o)); - Collection<ObjectMaterial> topLevelMaterials = childrenByParent.get("fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.01"); + Collection<ObjectMaterial> topLevelMaterials = childrenByParent.get(null); ReferentialEntityDtoBinderSupport<ObjectMaterialDto, ObserveReferentialEntity> referentialBinder = OBJECT_MATERIAL_SPI.toEntityBinder(); ReferentialLocale referentialLocale = getReferentialLocale(); List<ObjectMaterialHierarchyDto> result = new LinkedList<>(); ===================================== services-local/src/test/java/fr/ird/observe/services/local/service/data/seine/FloatingObjectServiceLocalTest.java ===================================== --- a/services-local/src/test/java/fr/ird/observe/services/local/service/data/seine/FloatingObjectServiceLocalTest.java +++ b/services-local/src/test/java/fr/ird/observe/services/local/service/data/seine/FloatingObjectServiceLocalTest.java @@ -52,7 +52,7 @@ public class FloatingObjectServiceLocalTest extends ServiceLocalTestSupport { List<ObjectMaterialHierarchyDto> form = service.getObjectMaterialHierarchy(); Assert.assertNotNull(form); - Assert.assertEquals(4, form.size()); + Assert.assertEquals(1, form.size()); } View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/05fc08fdf5b79c6e2784f65db1d… --- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/05fc08fdf5b79c6e2784f65db1d… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] let's go back to version RC-10, and make a release soon \o/
by Tony CHEMIT 28 Mar '18

28 Mar '18

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 419b01b0 by Tony CHEMIT at 2018-03-28T15:05:44Z let's go back to version RC-10, and make a release soon \o/ - - - - - 13 changed files: - client-configuration/pom.xml - client/pom.xml - dto/pom.xml - observe/pom.xml - persistence/pom.xml - pom.xml - server-configuration/pom.xml - server/pom.xml - services-client/pom.xml - services-local/pom.xml - services/pom.xml - test/pom.xml - validation/pom.xml Changes: ===================================== client-configuration/pom.xml ===================================== --- a/client-configuration/pom.xml +++ b/client-configuration/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.0-RC-9-SNAPSHOT</version> + <version>7.0-RC-10-SNAPSHOT</version> </parent> <artifactId>client-configuration</artifactId> ===================================== client/pom.xml ===================================== --- a/client/pom.xml +++ b/client/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.0-RC-9-SNAPSHOT</version> + <version>7.0-RC-10-SNAPSHOT</version> </parent> <artifactId>client</artifactId> ===================================== dto/pom.xml ===================================== --- a/dto/pom.xml +++ b/dto/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.0-RC-9-SNAPSHOT</version> + <version>7.0-RC-10-SNAPSHOT</version> </parent> <artifactId>dto</artifactId> ===================================== observe/pom.xml ===================================== --- a/observe/pom.xml +++ b/observe/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.0-RC-9-SNAPSHOT</version> + <version>7.0-RC-10-SNAPSHOT</version> </parent> <artifactId>observe</artifactId> ===================================== persistence/pom.xml ===================================== --- a/persistence/pom.xml +++ b/persistence/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.0-RC-9-SNAPSHOT</version> + <version>7.0-RC-10-SNAPSHOT</version> </parent> <artifactId>persistence</artifactId> ===================================== pom.xml ===================================== --- a/pom.xml +++ b/pom.xml @@ -31,7 +31,7 @@ <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.0-RC-9-SNAPSHOT</version> + <version>7.0-RC-10-SNAPSHOT</version> <packaging>pom</packaging> <name>ObServe :: Pom</name> ===================================== server-configuration/pom.xml ===================================== --- a/server-configuration/pom.xml +++ b/server-configuration/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.0-RC-9-SNAPSHOT</version> + <version>7.0-RC-10-SNAPSHOT</version> </parent> <artifactId>server-configuration</artifactId> ===================================== server/pom.xml ===================================== --- a/server/pom.xml +++ b/server/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.0-RC-9-SNAPSHOT</version> + <version>7.0-RC-10-SNAPSHOT</version> </parent> <artifactId>server</artifactId> ===================================== services-client/pom.xml ===================================== --- a/services-client/pom.xml +++ b/services-client/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.0-RC-9-SNAPSHOT</version> + <version>7.0-RC-10-SNAPSHOT</version> </parent> <artifactId>services-client</artifactId> ===================================== services-local/pom.xml ===================================== --- a/services-local/pom.xml +++ b/services-local/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.0-RC-9-SNAPSHOT</version> + <version>7.0-RC-10-SNAPSHOT</version> </parent> <artifactId>services-local</artifactId> ===================================== services/pom.xml ===================================== --- a/services/pom.xml +++ b/services/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.0-RC-9-SNAPSHOT</version> + <version>7.0-RC-10-SNAPSHOT</version> </parent> <artifactId>services</artifactId> ===================================== test/pom.xml ===================================== --- a/test/pom.xml +++ b/test/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.0-RC-9-SNAPSHOT</version> + <version>7.0-RC-10-SNAPSHOT</version> </parent> <artifactId>test</artifactId> ===================================== validation/pom.xml ===================================== --- a/validation/pom.xml +++ b/validation/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.0-RC-9-SNAPSHOT</version> + <version>7.0-RC-10-SNAPSHOT</version> </parent> <artifactId>validation</artifactId> View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/419b01b064a2a74aa9ea897534d… --- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/419b01b064a2a74aa9ea897534d… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] use last pom and infra + realign versions
by Tony CHEMIT 28 Mar '18

28 Mar '18

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 254f8576 by Tony CHEMIT at 2018-03-28T15:02:53Z use last pom and infra + realign versions - - - - - 30 changed files: - .gitlab-ci.yml - + .mvn/mono-module-site - + .mvn/pom.gitflow.develop - + .mvn/pom.gitflow.master - + .mvn/pom.organizationId - + .mvn/pom.projectId - + .mvn/pom.stageId - + client-configuration/.mvn/add-build-number - + client-configuration/.mvn/generate-application-config - + client-configuration/.mvn/i18n-generate - + client-configuration/.mvn/i18n-parse-java - + client-configuration/.mvn/i18n-parse-java-enumerations - + client-configuration/.mvn/pom.gitflow.develop - + client-configuration/.mvn/pom.gitflow.master - + client-configuration/.mvn/pom.organizationId - + client-configuration/.mvn/pom.projectId - + client-configuration/.mvn/pom.stageId - client-configuration/pom.xml - + client/.mvn/add-build-number - + client/.mvn/add-geotools-repository - + client/.mvn/application-assembly - + client/.mvn/i18n-bundle - + client/.mvn/i18n-check-i18n-artifacts - + client/.mvn/i18n-generate - + client/.mvn/i18n-parse-java - + client/.mvn/i18n-parse-java-enumerations - + client/.mvn/jaxx-generate - + client/.mvn/pom.gitflow.develop - + client/.mvn/pom.gitflow.master - + client/.mvn/pom.organizationId The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/254f85768bd759da5def4b67e39… --- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/254f85768bd759da5def4b67e39… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe] Deleted branch develop-o
by Tony CHEMIT 28 Mar '18

28 Mar '18

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

1 0

[Git][ultreiaio/ird-observe] Deleted branch develop-ng
by Tony CHEMIT 28 Mar '18

28 Mar '18

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

1 0