Observe-commits
Threads by month
- ----- 2026 -----
- June
- May
- April
- March
- February
- January
- ----- 2025 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2024 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2023 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2022 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2021 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2020 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2019 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2018 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2017 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2016 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2015 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2014 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2013 -----
- December
- November
- October
- September
- 7199 discussions
Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe
Commits:
2677570a by Tony CHEMIT at 2017-08-01T14:18:09+02:00
update some libraries
- - - - -
1 changed file:
- pom.xml
Changes:
=====================================
pom.xml
=====================================
--- a/pom.xml
+++ b/pom.xml
@@ -171,7 +171,7 @@
<eugenePluginVersion>3.0-alpha-11</eugenePluginVersion>
<processorPluginVersion>1.3</processorPluginVersion>
- <jaxxVersion>3.0-alpha-8</jaxxVersion>
+ <jaxxVersion>3.0-alpha-9</jaxxVersion>
<nuitonI18nVersion>4.0-alpha-3</nuitonI18nVersion>
<nuitonConfigVersion>3.2</nuitonConfigVersion>
<topiaVersion>3.2.1</topiaVersion>
@@ -181,14 +181,14 @@
<nuitonVersionVersion>1.0-rc-2</nuitonVersionVersion>
<httpVersion>1.0.2</httpVersion>
<xworkVersion>2.3.33</xworkVersion>
- <flexmarkVersion>0.22.14</flexmarkVersion>
+ <flexmarkVersion>0.22.18</flexmarkVersion>
<hibernateVersion>5.1.8.Final</hibernateVersion>
<sl4jVersion>1.7.25</sl4jVersion>
<swingXVersion>1.6.5-1</swingXVersion>
<reflectionsVersion>0.9.11</reflectionsVersion>
<webmotionVersion>2.5.3</webmotionVersion>
<httpComponentsVersion>4.5.3</httpComponentsVersion>
- <geoToolsVersion>17.1</geoToolsVersion>
+ <geoToolsVersion>17.2</geoToolsVersion>
<guavaVersion>22.0</guavaVersion>
<!-- license header configuration -->
View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/2677570a682d5c06858abe604cb…
---
View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/2677570a682d5c06858abe604cb…
You're receiving this email because of your account on gitlab.com.
1
0
[Git][ultreiaio/ird-observe][develop] Speed up connection opening (See #805) (focus on first widget)
by Tony CHEMIT 01 Aug '17
by Tony CHEMIT 01 Aug '17
01 Aug '17
Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe
Commits:
bf756391 by Tony CHEMIT at 2017-08-01T13:50:16+02:00
Speed up connection opening (See #805) (focus on first widget)
- - - - -
1 changed file:
- client/src/main/java/fr/ird/observe/client/ui/storage/StorageUIHandler.java
Changes:
=====================================
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
@@ -33,7 +33,6 @@ import fr.ird.observe.client.configuration.constants.CreationMode;
import fr.ird.observe.client.configuration.constants.DbMode;
import fr.ird.observe.client.db.ObserveSwingDataSource;
import fr.ird.observe.client.db.constants.ConnexionStatus;
-import fr.ird.observe.services.decoration.DecoratorService;
import fr.ird.observe.client.ui.ObserveKeyStrokes;
import fr.ird.observe.client.ui.ObserveMainUI;
import fr.ird.observe.client.ui.UIHelper;
@@ -48,6 +47,7 @@ import fr.ird.observe.services.configuration.ObserveDataSourceInformation;
import fr.ird.observe.services.configuration.rest.ObserveDataSourceConfigurationRest;
import fr.ird.observe.services.configuration.topia.ObserveDataSourceConfigurationTopiaH2;
import fr.ird.observe.services.configuration.topia.ObserveDataSourceConfigurationTopiaPG;
+import fr.ird.observe.services.decoration.DecoratorService;
import fr.ird.observe.services.dto.ObserveDbUserDto;
import fr.ird.observe.services.dto.source.DataSourceCreateConfigurationDto;
import fr.ird.observe.services.service.sql.AddSqlScriptProducerRequest;
@@ -105,7 +105,7 @@ public class StorageUIHandler implements UIHandler<StorageUI> {
SwingUtilities.invokeLater(() -> {
JComponent focusOwner = getFocusComponent(ui.getModel().getStep());
if (focusOwner != null) {
- focusOwner.grabFocus();
+ UIHelper.askFocus(focusOwner);
}
});
@@ -113,7 +113,7 @@ public class StorageUIHandler implements UIHandler<StorageUI> {
ui.setVisible(true);
}
- public JComponent getFocusComponent(StorageStep newStep) {
+ private JComponent getFocusComponent(StorageStep newStep) {
DbMode dbMode = ui.getModel().getDbMode();
JComponent focusOwner;
@@ -198,7 +198,7 @@ public class StorageUIHandler implements UIHandler<StorageUI> {
return focusOwner;
}
- public void onStepChanged(StorageStep oldStep, StorageStep newStep) {
+ void onStepChanged(StorageStep oldStep, StorageStep newStep) {
if (newStep == null) {
return;
}
@@ -292,14 +292,13 @@ public class StorageUIHandler implements UIHandler<StorageUI> {
}
-
JComponent focusComponent = getFocusComponent(newStep);
if (focusComponent != null) {
- focusComponent.requestFocusInWindow();
+ UIHelper.askFocus(focusComponent);
}
}
- public void launchApply() {
+ void launchApply() {
ui.getModel().setAlreadyApplied(true);
@@ -329,7 +328,7 @@ public class StorageUIHandler implements UIHandler<StorageUI> {
}
}
- public void launchCancel() {
+ void launchCancel() {
Runnable action = WizardUILancher.CANCEL_DEF.getContextValue(ui);
@@ -587,7 +586,7 @@ public class StorageUIHandler implements UIHandler<StorageUI> {
* @param dumpProducerService le service de dump
* @param dst le fichier de sauvegarde
*/
- public void backupLocalDatabase(SqlScriptProducerService dumpProducerService, File dst) {
+ private void backupLocalDatabase(SqlScriptProducerService dumpProducerService, File dst) {
if (dst == null) {
throw new IllegalArgumentException(
"file where to backup can not be null");
@@ -709,7 +708,7 @@ public class StorageUIHandler implements UIHandler<StorageUI> {
model.init(ui, dataSourceConfiguration);
}
- protected void initSelectData(StorageUI ui) {
+ private void initSelectData(StorageUI ui) {
StorageUIModel model = ui.getModel();
@@ -777,7 +776,7 @@ public class StorageUIHandler implements UIHandler<StorageUI> {
}
}
- protected void updateSecurity(StorageUIModel model, RolesTableModel roleModel) {
+ private void updateSecurity(StorageUIModel model, RolesTableModel roleModel) {
SecurityModel security = model.getSecurityModel();
@@ -817,7 +816,7 @@ public class StorageUIHandler implements UIHandler<StorageUI> {
}
- protected String computeReport(StorageStep step) {
+ private String computeReport(StorageStep step) {
if (log.isDebugEnabled()) {
log.debug("Build report from step " + step);
}
View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/bf756391ccec24ea3435e104119…
---
View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/bf756391ccec24ea3435e104119…
You're receiving this email because of your account on gitlab.com.
1
0
[Git][ultreiaio/ird-observe][develop] Revoir la gestion d'erreur sur l'api Rest (Close #801)
by Tony CHEMIT 01 Aug '17
by Tony CHEMIT 01 Aug '17
01 Aug '17
Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe
Commits:
128cdb55 by Tony CHEMIT at 2017-08-01T13:42:33+02:00
Revoir la gestion d'erreur sur l'api Rest (Close #801)
- - - - -
20 changed files:
- client/src/main/java/fr/ird/observe/client/ObserveTextGenerator.java
- client/src/main/java/fr/ird/observe/client/ui/content/impl/seine/FloatingObjectUIHandler.java
- client/src/main/java/fr/ird/observe/client/ui/content/impl/seine/FloatingObjectUIModel.java
- pom.xml
- server/src/main/filtered-resources/mapping
- server/src/main/java/fr/ird/observe/server/ObserveWebApplicationListener.java
- server/src/main/java/fr/ird/observe/server/controller/v1/ObserveWebErrorController.java
- server/src/main/java/fr/ird/observe/server/injector/ImmutableSetInjector.java
- services-rest/src/main/java/fr/ird/observe/services/rest/ObserveServiceRestClientContext.java
- services-rest/src/main/java/fr/ird/observe/services/rest/ObserveServiceRestClientSupport.java
- − services-rest/src/main/java/fr/ird/observe/services/rest/ObserveServiceRestErrorException.java
- − services-rest/src/main/java/fr/ird/observe/services/rest/ObserveServiceRestNotAvailableException.java
- services-rest/src/test/java/fr/ird/observe/services/rest/service/PingServiceRestTest.java
- services-topia/src/main/java/fr/ird/observe/services/topia/service/data/seine/FloatingObjectServiceTopia.java
- services/src/main/java/fr/ird/observe/services/dto/AbstractObserveDto.java
- services/src/main/java/fr/ird/observe/services/dto/source/DataSourceCreateConfigurationDto.java
- services/src/main/java/fr/ird/observe/services/gson/ObserveDtoGsonSupplier.java
- − services/src/main/java/fr/ird/observe/services/gson/ObserveHttpErrorAdapter.java
- − services/src/main/java/fr/ird/observe/services/http/ObserveHttpError.java
- services/src/main/java/fr/ird/observe/services/service/data/seine/FloatingObjectService.java
Changes:
=====================================
client/src/main/java/fr/ird/observe/client/ObserveTextGenerator.java
=====================================
--- a/client/src/main/java/fr/ird/observe/client/ObserveTextGenerator.java
+++ b/client/src/main/java/fr/ird/observe/client/ObserveTextGenerator.java
@@ -51,29 +51,27 @@ public class ObserveTextGenerator {
private static final Log log = LogFactory.getLog(ObserveTextGenerator.class);
- protected static final String DATA_SOURCE_CONFIGURATION_TEMPLATE = "dataSourceConfiguration.ftl";
+ private static final String DATA_SOURCE_CONFIGURATION_TEMPLATE = "dataSourceConfiguration.ftl";
- protected static final String CONNEXION_TEST_RESULT_TEMPLATE = "connexionTestResult.ftl";
+ private static final String CONNEXION_TEST_RESULT_TEMPLATE = "connexionTestResult.ftl";
- protected static final String DATA_SOURCE_SELECT_MODE_RESUME_TEMPLATE = "dataSourceSelectModeResume.ftl";
+ private static final String DATA_SOURCE_SELECT_MODE_RESUME_TEMPLATE = "dataSourceSelectModeResume.ftl";
- protected static final String DATA_SOURCE_CONNECTION_REPORT_TEMPLATE = "dataSourceConnectionReport.ftl";
+ private static final String DATA_SOURCE_CONNECTION_REPORT_TEMPLATE = "dataSourceConnectionReport.ftl";
- protected static final String DATA_SOURCE_INFORMATION_TEMPLATE = "dataSourceInformation.ftl";
+ private static final String DATA_SOURCE_INFORMATION_TEMPLATE = "dataSourceInformation.ftl";
- protected static final String DATA_SOURCE_POLICY_TEMPLATE = "dataSourcePolicy.ftl";
+ private static final String DATA_SOURCE_POLICY_TEMPLATE = "dataSourcePolicy.ftl";
- protected static final String ABOUT_TEMPLATE = "about.ftl";
+ private static final String ABOUT_TEMPLATE = "about.ftl";
- protected static final String TRANSLATE_TEMPLATE = "translate.ftl";
+ private static final String INIT_STORAGE_TEMPLATE = "initStorage.ftl";
- protected static final String INIT_STORAGE_TEMPLATE = "initStorage.ftl";
+ private final Configuration freemarkerConfiguration;
- protected final Configuration freemarkerConfiguration;
+ private final ClientConfig observeConfiguration;
- protected final ClientConfig observeConfiguration;
-
- public ObserveTextGenerator(ClientConfig observeConfiguration) {
+ ObserveTextGenerator(ClientConfig observeConfiguration) {
this.observeConfiguration = observeConfiguration;
freemarkerConfiguration = new Configuration(Configuration.DEFAULT_INCOMPATIBLE_IMPROVEMENTS);
@@ -116,7 +114,7 @@ public class ObserveTextGenerator {
return generateHtml(DATA_SOURCE_POLICY_TEMPLATE, model);
}
- public String getInitStorage(ObserveSwingApplicationDataSourcesManager.InitStorageModel model) {
+ String getInitStorage(ObserveSwingApplicationDataSourcesManager.InitStorageModel model) {
return generateHtml(INIT_STORAGE_TEMPLATE, model);
}
@@ -128,15 +126,6 @@ public class ObserveTextGenerator {
return generateHtml(ABOUT_TEMPLATE, model);
}
- public String getTranslate(File model) {
- try {
- URL url = model.toURI().toURL();
- return generateHtml(TRANSLATE_TEMPLATE, ImmutableMap.of("file", url));
- } catch (MalformedURLException e) {
- throw new ObserveSwingTechnicalException(e);
- }
- }
-
protected String generateHtml(Locale locale, String templateName, Object model) {
try {
=====================================
client/src/main/java/fr/ird/observe/client/ui/content/impl/seine/FloatingObjectUIHandler.java
=====================================
--- a/client/src/main/java/fr/ird/observe/client/ui/content/impl/seine/FloatingObjectUIHandler.java
+++ b/client/src/main/java/fr/ird/observe/client/ui/content/impl/seine/FloatingObjectUIHandler.java
@@ -247,8 +247,8 @@ public class FloatingObjectUIHandler extends ContentUIHandler<FloatingObjectDto,
SaveResultDto saveResult = getFloatingObjectService().save(activityId, bean);
saveResult.toDto(bean);
- List<FloatingObjectPartDto> parts = getModel().toParts();
- getFloatingObjectService().save(saveResult.getId(), parts);
+ ImmutableSet<FloatingObjectPartDto> parts = getModel().toParts();
+ getFloatingObjectService().saveParts(saveResult.getId(), parts);
saveResult.toDto(bean);
return true;
=====================================
client/src/main/java/fr/ird/observe/client/ui/content/impl/seine/FloatingObjectUIModel.java
=====================================
--- a/client/src/main/java/fr/ird/observe/client/ui/content/impl/seine/FloatingObjectUIModel.java
+++ b/client/src/main/java/fr/ird/observe/client/ui/content/impl/seine/FloatingObjectUIModel.java
@@ -34,7 +34,6 @@ import fr.ird.observe.services.dto.seine.FloatingObjectPartDto;
import fr.ird.observe.services.dto.seine.ObjectMaterialHierarchyDto;
import java.util.LinkedHashMap;
import java.util.LinkedHashSet;
-import java.util.LinkedList;
import java.util.List;
import java.util.Map;
import java.util.Optional;
@@ -77,9 +76,9 @@ public class FloatingObjectUIModel extends ContentUIModel<FloatingObjectDto> {
public static final String PROPERTY_GENERAL_TAB_VALID = "generalTabValid";
private static final String PROPERTY_MATERIALS_TAB_VALID = "materialsTabValid";
- public static final String PROPERTY_REFERENCE = "reference";
- public static final String PROPERTY_ARRIVING = "arriving";
- public static final String PROPERTY_LEAVING = "leaving";
+ static final String PROPERTY_REFERENCE = "reference";
+ private static final String PROPERTY_ARRIVING = "arriving";
+ private static final String PROPERTY_LEAVING = "leaving";
public static final Set<String> GENERAL_TAB_PROPERTIES =
ImmutableSet.<String>builder().add(FloatingObjectDto.PROPERTY_OBJECT_OPERATION,
@@ -90,7 +89,7 @@ public class FloatingObjectUIModel extends ContentUIModel<FloatingObjectDto> {
ImmutableSet.<String>builder().add(FloatingObjectDto.PROPERTY_COMMENT).build();
protected boolean generalTabValid;
- protected boolean materialsTabValid;
+ private boolean materialsTabValid;
private final Map<ObjectMaterialDto, String> whenArriving;
private final Map<ObjectMaterialDto, String> whenLeaving;
@@ -116,8 +115,8 @@ public class FloatingObjectUIModel extends ContentUIModel<FloatingObjectDto> {
}
- public List<FloatingObjectPartDto> toParts() {
- List<FloatingObjectPartDto> result = new LinkedList<>();
+ ImmutableSet<FloatingObjectPartDto> toParts() {
+ ImmutableSet.Builder<FloatingObjectPartDto> result = ImmutableSet.builder();
for (ObjectMaterialDto o : getAll()) {
FloatingObjectPartDto partDto = new FloatingObjectPartDto();
partDto.setObjectMaterial(referenceBinderEngine.transformReferentialDtoToReference(referentialLocale, o));
@@ -129,7 +128,7 @@ public class FloatingObjectUIModel extends ContentUIModel<FloatingObjectDto> {
}
result.add(partDto);
}
- return result;
+ return result.build();
}
public void reset() {
@@ -151,7 +150,7 @@ public class FloatingObjectUIModel extends ContentUIModel<FloatingObjectDto> {
return alls;
}
- public void setReferentialMap(Map<String, ObjectMaterialDto> referentialMap) {
+ void setReferentialMap(Map<String, ObjectMaterialDto> referentialMap) {
this.referentialMap = referentialMap;
}
@@ -171,7 +170,7 @@ public class FloatingObjectUIModel extends ContentUIModel<FloatingObjectDto> {
whenLeaving.put(dto, value);
}
- public DefaultMutableTreeTableNode createRoot(Decorator<ObjectMaterialDto> decoratorByType, List<ObjectMaterialHierarchyDto> referential) {
+ DefaultMutableTreeTableNode createRoot(Decorator<ObjectMaterialDto> decoratorByType, List<ObjectMaterialHierarchyDto> referential) {
DefaultMutableTreeTableNode root = new DefaultMutableTreeTableNode();
for (ObjectMaterialHierarchyDto dto : referential) {
root.add(new FloatingObjectPartsTreeNode(decoratorByType, this, dto));
=====================================
pom.xml
=====================================
--- a/pom.xml
+++ b/pom.xml
@@ -179,7 +179,7 @@
<nuitonUtilsVersion>3.0-rc-18</nuitonUtilsVersion>
<nuitonConverterVersion>1.0</nuitonConverterVersion>
<nuitonVersionVersion>1.0-rc-2</nuitonVersionVersion>
- <httpVersion>1.0.2-SNAPSHOT</httpVersion>
+ <httpVersion>1.0.2</httpVersion>
<xworkVersion>2.3.33</xworkVersion>
<flexmarkVersion>0.22.14</flexmarkVersion>
<hibernateVersion>5.1.8.Final</hibernateVersion>
=====================================
server/src/main/filtered-resources/mapping
=====================================
--- a/server/src/main/filtered-resources/mapping
+++ b/server/src/main/filtered-resources/mapping
@@ -161,7 +161,7 @@ GET /api/v1/data/seine/FloatingObjectService/loadReferenceToRead
GET /api/v1/data/seine/FloatingObjectService/preCreate v1.data.seine.FloatingObjectServiceRestApi.preCreate
GET /api/v1/data/seine/FloatingObjectService/retainExistingIds v1.data.seine.FloatingObjectServiceRestApi.retainExistingIds
POST /api/v1/data/seine/FloatingObjectService/save v1.data.seine.FloatingObjectServiceRestApi.save
-POST /api/v1/data/seine/FloatingObjectService/save v1.data.seine.FloatingObjectServiceRestApi.save
+POST /api/v1/data/seine/FloatingObjectService/saveParts v1.data.seine.FloatingObjectServiceRestApi.saveParts
GET /api/v1/data/seine/NonTargetCatchReleaseService/getSampleSpecies v1.data.seine.NonTargetCatchReleaseServiceRestApi.getSampleSpecies
GET /api/v1/data/seine/NonTargetCatchReleaseService/loadForm v1.data.seine.NonTargetCatchReleaseServiceRestApi.loadForm
POST /api/v1/data/seine/NonTargetCatchReleaseService/save v1.data.seine.NonTargetCatchReleaseServiceRestApi.save
=====================================
server/src/main/java/fr/ird/observe/server/ObserveWebApplicationListener.java
=====================================
--- a/server/src/main/java/fr/ird/observe/server/ObserveWebApplicationListener.java
+++ b/server/src/main/java/fr/ird/observe/server/ObserveWebApplicationListener.java
@@ -77,7 +77,7 @@ public class ObserveWebApplicationListener implements WebMotionServerListener {
context.addInjector(new ObserveReferenceSetRequestInjector(gson));
context.addInjector(new DateInjector(HRequestBuilder.DATE_PATTERN));
context.addInjector(new SqlScriptProducerRequestInjector(gson));
- context.addInjector(new ImmutableSetInjector());
+ context.addInjector(new ImmutableSetInjector(gson));
context.addConverter(new ObserveDtoConverter(gson), ObserveDbUserDto.class);
context.getServletContext().setAttribute(ObserveWebApplicationContext.APPLICATION_CONTEXT_PARAMETER, applicationContext);
=====================================
server/src/main/java/fr/ird/observe/server/controller/v1/ObserveWebErrorController.java
=====================================
--- a/server/src/main/java/fr/ird/observe/server/controller/v1/ObserveWebErrorController.java
+++ b/server/src/main/java/fr/ird/observe/server/controller/v1/ObserveWebErrorController.java
@@ -22,7 +22,7 @@ package fr.ird.observe.server.controller.v1;
* #L%
*/
-import fr.ird.observe.services.http.ObserveHttpError;
+import io.ultreia.java4all.http.HResponseError;
import fr.ird.observe.services.security.ObserveWebSecurityExceptionSupport;
import fr.ird.observe.services.security.UnauthorizedException;
import java.lang.reflect.InvocationTargetException;
@@ -42,7 +42,7 @@ import org.debux.webmotion.server.call.HttpContext;
*/
public class ObserveWebErrorController extends WebMotionController {
- public ObserveHttpError error(HttpContext.ErrorData errorData) {
+ public HResponseError error(HttpContext.ErrorData errorData) {
@SuppressWarnings("ThrowableResultOfMethodCallIgnored")
Throwable exception = errorData.getException();
@@ -96,10 +96,10 @@ public class ObserveWebErrorController extends WebMotionController {
}
- return new ObserveHttpError(statusCode,
- exception == null ? null : exception.getClass(),
- message,
- exception);
+ return new HResponseError(statusCode,
+ exception == null ? null : exception.getClass(),
+ message,
+ exception);
}
=====================================
server/src/main/java/fr/ird/observe/server/injector/ImmutableSetInjector.java
=====================================
--- a/server/src/main/java/fr/ird/observe/server/injector/ImmutableSetInjector.java
+++ b/server/src/main/java/fr/ird/observe/server/injector/ImmutableSetInjector.java
@@ -23,7 +23,9 @@ package fr.ird.observe.server.injector;
*/
import com.google.common.collect.ImmutableSet;
+import com.google.gson.Gson;
import java.lang.reflect.Type;
+import java.util.Collection;
import java.util.Objects;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -47,6 +49,11 @@ public class ImmutableSetInjector implements ExecutorParametersInjectorHandler.I
/** Logger. */
private static final Log log = LogFactory.getLog(ImmutableSetInjector.class);
+ private final Gson gson;
+
+ public ImmutableSetInjector(Gson gson) {
+ this.gson = gson;
+ }
@Override
public Object getValue(Mapping mapping, Call call, String name, Class<?> type, Type generic) {
@@ -54,11 +61,8 @@ public class ImmutableSetInjector implements ExecutorParametersInjectorHandler.I
ImmutableSet result = null;
if (ImmutableSet.class.isAssignableFrom(type)) {
- // Type des objets contenu dans le set
- // Type[] actualTypeArguments = ((ParameterizedType) generic).getActualTypeArguments();
- // Type subType = actualTypeArguments[0];
- ImmutableSet.Builder builder = ImmutableSet.builder();
+ ImmutableSet.Builder<Object> builder = ImmutableSet.builder();
if (call.getParameterTree().getObject() != null) {
Call.ParameterTree parameterTree = call.getParameterTree().getObject().get(name);
@@ -66,9 +70,8 @@ public class ImmutableSetInjector implements ExecutorParametersInjectorHandler.I
Objects.requireNonNull(parameterTree, "Le paramètre " + name + " n'as pas été trouvé, recompiler (parameter)!");
String[] values = (String[]) parameterTree.getValue();
- for (String value : values) {
- builder.add(value);
- }
+ Collection o = gson.fromJson(values[0], generic);
+ builder.addAll(o);
}
result = builder.build();
@@ -81,4 +84,5 @@ public class ImmutableSetInjector implements ExecutorParametersInjectorHandler.I
return result;
}
+
}
=====================================
services-rest/src/main/java/fr/ird/observe/services/rest/ObserveServiceRestClientContext.java
=====================================
--- a/services-rest/src/main/java/fr/ird/observe/services/rest/ObserveServiceRestClientContext.java
+++ b/services-rest/src/main/java/fr/ird/observe/services/rest/ObserveServiceRestClientContext.java
@@ -56,11 +56,11 @@ public class ObserveServiceRestClientContext {
this.locateService = locateService;
}
- public ObserveRequestBuilderFactory getRequestBuilderFactory() {
+ ObserveRequestBuilderFactory getRequestBuilderFactory() {
return requestBuilderFactory;
}
- public HResponseBuilder getResponseBuilder() {
+ HResponseBuilder getResponseBuilder() {
return responseBuilder;
}
@@ -68,23 +68,19 @@ public class ObserveServiceRestClientContext {
return initializer;
}
- public String getSpeciesListConfigurationAsString() {
+ String getSpeciesListConfigurationAsString() {
return speciesListConfigurationAsString;
}
- public Optional<ObserveDataSourceConnectionRest> getDataSourceConnection() {
- return (Optional) initializer.getDataSourceConnection();
- }
-
public Optional<ObserveDataSourceConfiguration> getDataSourceConfiguration() {
return initializer.getDataSourceConfiguration();
}
- public boolean withApplicationLocale() {
+ boolean withApplicationLocale() {
return getApplicationLocale() != null;
}
- public Locale getApplicationLocale() {
+ Locale getApplicationLocale() {
return initializer.getApplicationLocale();
}
@@ -92,7 +88,7 @@ public class ObserveServiceRestClientContext {
return initializer.getReferentialLocale();
}
- public boolean withReferentialLocale() {
+ boolean withReferentialLocale() {
return getReferentialLocale() != null;
}
@@ -101,7 +97,7 @@ public class ObserveServiceRestClientContext {
return getServiceUrl() + suffix;
}
- String getServiceUrl() {
+ private String getServiceUrl() {
String serviceUrl;
if (initializer.withDataSourceConnection()) {
=====================================
services-rest/src/main/java/fr/ird/observe/services/rest/ObserveServiceRestClientSupport.java
=====================================
--- a/services-rest/src/main/java/fr/ird/observe/services/rest/ObserveServiceRestClientSupport.java
+++ b/services-rest/src/main/java/fr/ird/observe/services/rest/ObserveServiceRestClientSupport.java
@@ -25,7 +25,6 @@ package fr.ird.observe.services.rest;
import com.google.gson.Gson;
import fr.ird.observe.services.service.ObserveService;
import io.ultreia.java4all.http.HRequest;
-import io.ultreia.java4all.http.HRequestBuilder;
import io.ultreia.java4all.http.HResponse;
import io.ultreia.java4all.http.HRestClientService;
import org.nuiton.util.TimeLog;
@@ -52,7 +51,7 @@ public class ObserveServiceRestClientSupport implements HRestClientService, Obse
}
@Override
- public HRequestBuilder create(String baseUrl) {
+ public ObserveRequestBuilder create(String baseUrl) {
return getRequestBuilderFactory().create(serviceContext, baseUrl);
}
@@ -61,6 +60,8 @@ public class ObserveServiceRestClientSupport implements HRestClientService, Obse
long t0 = TimeLog.getTime();
try {
return serviceContext.getResponseBuilder().executeRequest(request, expectedStatusCode);
+ } catch (RuntimeException e) {
+ throw e;
} catch (Exception e) {
throw new IllegalStateException("Can't execute request " + request, e);
} finally {
@@ -73,6 +74,8 @@ public class ObserveServiceRestClientSupport implements HRestClientService, Obse
long t0 = TimeLog.getTime();
try {
return serviceContext.getResponseBuilder().executeRequest(request);
+ } catch (RuntimeException e) {
+ throw e;
} catch (Exception e) {
throw new IllegalStateException("Can't execute request " + request, e);
} finally {
=====================================
services-rest/src/main/java/fr/ird/observe/services/rest/ObserveServiceRestErrorException.java deleted
=====================================
--- a/services-rest/src/main/java/fr/ird/observe/services/rest/ObserveServiceRestErrorException.java
+++ /dev/null
@@ -1,38 +0,0 @@
-package fr.ird.observe.services.rest;
-
-/*-
- * #%L
- * ObServe :: Services REST Implementation
- * %%
- * 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%
- */
-
-/**
- * @author Sylvain Bavencoff - bavencoff(a)codelutin.com
- */
-public class ObserveServiceRestErrorException extends RuntimeException {
-
- private static final long serialVersionUID = 1L;
-
- public ObserveServiceRestErrorException() {
- }
-
- public ObserveServiceRestErrorException(String message) {
- super(message);
- }
-}
=====================================
services-rest/src/main/java/fr/ird/observe/services/rest/ObserveServiceRestNotAvailableException.java deleted
=====================================
--- a/services-rest/src/main/java/fr/ird/observe/services/rest/ObserveServiceRestNotAvailableException.java
+++ /dev/null
@@ -1,49 +0,0 @@
-package fr.ird.observe.services.rest;
-
-/*
- * #%L
- * ObServe :: Services REST Implementation
- * %%
- * 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.net.URL;
-
-/**
- * Exception à retourner quand le service n'est pas accessible.
- * <p>
- * Created on 06/09/15.
- *
- * @author Tony Chemit - dev(a)tchemit.fr
- */
-public class ObserveServiceRestNotAvailableException extends RuntimeException {
-
- private static final long serialVersionUID = 1L;
-
- private final URL serverUrl;
-
- public ObserveServiceRestNotAvailableException(URL serverUrl) {
- super("Server " + serverUrl + " not available");
- this.serverUrl = serverUrl;
- }
-
- public URL getServerUrl() {
- return serverUrl;
- }
-
-}
=====================================
services-rest/src/test/java/fr/ird/observe/services/rest/service/PingServiceRestTest.java
=====================================
--- a/services-rest/src/test/java/fr/ird/observe/services/rest/service/PingServiceRestTest.java
+++ b/services-rest/src/test/java/fr/ird/observe/services/rest/service/PingServiceRestTest.java
@@ -22,13 +22,12 @@ package fr.ird.observe.services.rest.service;
* #L%
*/
-import fr.ird.observe.services.rest.ObserveServiceRestNotAvailableException;
import fr.ird.observe.services.configuration.rest.ObserveDataSourceConfigurationRest;
import fr.ird.observe.services.service.PingService;
-import org.junit.Test;
-
+import io.ultreia.java4all.http.HResponseNotAvailableException;
import java.net.MalformedURLException;
import java.net.URL;
+import org.junit.Test;
/**
* Created on 07/09/15.
@@ -37,7 +36,7 @@ import java.net.URL;
*/
public class PingServiceRestTest extends AbstractServiceRestTest {
- @Test(expected = ObserveServiceRestNotAvailableException.class)
+ @Test(expected = HResponseNotAvailableException.class)
public void testPingWithBadServerUrl() throws MalformedURLException, CloneNotSupportedException {
ObserveDataSourceConfigurationRest dataSourceConfiguration = restTestMethodResource.getDataSourceConfiguration().clone();
=====================================
services-topia/src/main/java/fr/ird/observe/services/topia/service/data/seine/FloatingObjectServiceTopia.java
=====================================
--- a/services-topia/src/main/java/fr/ird/observe/services/topia/service/data/seine/FloatingObjectServiceTopia.java
+++ b/services-topia/src/main/java/fr/ird/observe/services/topia/service/data/seine/FloatingObjectServiceTopia.java
@@ -184,7 +184,7 @@ public class FloatingObjectServiceTopia extends ObserveServiceTopia implements F
}
@Override
- public SaveResultDto save(String floatingObjectId, List<FloatingObjectPartDto> dtos) {
+ public SaveResultDto saveParts(String floatingObjectId, ImmutableSet<FloatingObjectPartDto> floatingObjectParts) {
FloatingObject floatingObject = loadEntity(FloatingObjectDto.class, floatingObjectId);
ImmutableMap<String, ObjectMaterial> objectMaterialsMap = Maps.uniqueIndex(getTopiaPersistenceContext().getObjectMaterialDao().findAll(), ObjectMaterial::getTopiaId);
@@ -192,7 +192,7 @@ public class FloatingObjectServiceTopia extends ObserveServiceTopia implements F
FloatingObjectPartTopiaDao dao = getTopiaPersistenceContext().getFloatingObjectPartDao();
Set<String> remainingIds = new LinkedHashSet<>();
List<FloatingObjectPart> toSave = new LinkedList<>();
- for (FloatingObjectPartDto dto : dtos) {
+ for (FloatingObjectPartDto dto : floatingObjectParts) {
FloatingObjectPart floatingObjectPart = existingMap.get(dto.getObjectMaterial().getCode());
if (floatingObjectPart != null) {
String topiaId = floatingObjectPart.getTopiaId();
=====================================
services/src/main/java/fr/ird/observe/services/dto/AbstractObserveDto.java
=====================================
--- a/services/src/main/java/fr/ird/observe/services/dto/AbstractObserveDto.java
+++ b/services/src/main/java/fr/ird/observe/services/dto/AbstractObserveDto.java
@@ -32,7 +32,7 @@ import org.nuiton.util.CollectionUtil;
* @author Tony Chemit - dev(a)tchemit.fr
* @since 7.0
*/
-public abstract class AbstractObserveDto extends AbstractSerializableBean {
+public abstract class AbstractObserveDto extends AbstractSerializableBean implements ObserveDto{
private static final long serialVersionUID = 1L;
=====================================
services/src/main/java/fr/ird/observe/services/dto/source/DataSourceCreateConfigurationDto.java
=====================================
--- a/services/src/main/java/fr/ird/observe/services/dto/source/DataSourceCreateConfigurationDto.java
+++ b/services/src/main/java/fr/ird/observe/services/dto/source/DataSourceCreateConfigurationDto.java
@@ -39,31 +39,31 @@ public class DataSourceCreateConfigurationDto extends AbstractObserveDto {
/**
* Le contenu de la base à importer (Optionel).
*/
- protected byte[] optionalImportDatabase;
+ private byte[] optionalImportDatabase;
/**
* Une configuration de la dataSource à utiliser pour importer le référentiel (Optionel).
*/
- protected ObserveDataSourceConfiguration optionalImportReferentialDataSourceConfiguration;
+ private ObserveDataSourceConfiguration optionalImportReferentialDataSourceConfiguration;
/**
* Une configuration de la dataSource à utiliser pour importer des données (Optionel).
*/
- protected ObserveDataSourceConfiguration optionalImportDataDataSourceConfiguration;
+ private ObserveDataSourceConfiguration optionalImportDataDataSourceConfiguration;
/**
* Les données à importer (ids des marées) (Optionel).
*/
- protected ImmutableSet<String> optionalImportDataIds;
+ private ImmutableSet<String> optionalImportDataIds;
/**
* Pour autoriser la création d'une base vide (utilisé pour les bases temporaires)
*/
- protected boolean canCreateEmptyDatabase;
+ private boolean canCreateEmptyDatabase;
private boolean leaveOpenSource;
- public boolean isCanCreateEmptyDatabase() {
+ private boolean isCanCreateEmptyDatabase() {
return canCreateEmptyDatabase;
}
=====================================
services/src/main/java/fr/ird/observe/services/gson/ObserveDtoGsonSupplier.java
=====================================
--- a/services/src/main/java/fr/ird/observe/services/gson/ObserveDtoGsonSupplier.java
+++ b/services/src/main/java/fr/ird/observe/services/gson/ObserveDtoGsonSupplier.java
@@ -47,8 +47,9 @@ import fr.ird.observe.services.gson.reference.DataReferenceSetAdapter;
import fr.ird.observe.services.gson.reference.ReferentialReferenceAdapter;
import fr.ird.observe.services.gson.reference.ReferentialReferenceSetAdapter;
import fr.ird.observe.services.gson.reference.UnknownReferenceAdapter;
-import fr.ird.observe.services.http.ObserveHttpError;
+import io.ultreia.java4all.http.HResponseError;
import fr.ird.observe.services.service.actions.report.ReportVariable;
+import io.ultreia.java4all.http.HResponseErrorAdapter;
import java.sql.Blob;
import java.util.Collection;
import java.util.Date;
@@ -144,7 +145,7 @@ public class ObserveDtoGsonSupplier implements Supplier<Gson> {
gsonBuilder.registerTypeAdapter(Form.class, new FormAdapter());
gsonBuilder.registerTypeAdapter(ReportVariable.class, new ReportVariableAdapter());
gsonBuilder.registerTypeAdapter(Version.class, new VersionAdapter());
- gsonBuilder.registerTypeAdapter(ObserveHttpError.class, new ObserveHttpErrorAdapter());
+ gsonBuilder.registerTypeAdapter(HResponseError.class, new HResponseErrorAdapter());
gsonBuilder.enableComplexMapKeySerialization();
}
=====================================
services/src/main/java/fr/ird/observe/services/gson/ObserveHttpErrorAdapter.java deleted
=====================================
--- a/services/src/main/java/fr/ird/observe/services/gson/ObserveHttpErrorAdapter.java
+++ /dev/null
@@ -1,58 +0,0 @@
-package fr.ird.observe.services.gson;
-
-/*-
- * #%L
- * ObServe :: Services
- * %%
- * 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 com.google.gson.JsonDeserializationContext;
-import com.google.gson.JsonDeserializer;
-import com.google.gson.JsonElement;
-import com.google.gson.JsonObject;
-import com.google.gson.JsonParseException;
-import fr.ird.observe.services.http.ObserveHttpError;
-import java.lang.reflect.Type;
-
-/**
- * @author Sylvain Bavencoff - bavencoff(a)codelutin.com
- */
-public class ObserveHttpErrorAdapter implements JsonDeserializer<ObserveHttpError> {
- @Override
- public ObserveHttpError deserialize(JsonElement json, Type typeOfT, JsonDeserializationContext context) throws JsonParseException {
-
- JsonObject jsonObject = json.getAsJsonObject();
-
- Integer httpCode = context.deserialize(jsonObject.get(ObserveHttpError.PROPERTY_HTTP_CODE), Integer.class);
-
- String message = context.deserialize(jsonObject.get(ObserveHttpError.PROPERTY_MESSAGE), String.class);
-
- Class exceptionType = context.deserialize(jsonObject.get(ObserveHttpError.PROPERTY_EXECPTION_TYPE), Class.class);
-
- Throwable exception = null;
-
- if (exceptionType != null) {
-
- exception = context.deserialize(jsonObject.get(ObserveHttpError.PROPERTY_EXCEPTION), exceptionType);
-
- }
-
- return new ObserveHttpError(httpCode, exceptionType, message, exception);
- }
-}
=====================================
services/src/main/java/fr/ird/observe/services/http/ObserveHttpError.java deleted
=====================================
--- a/services/src/main/java/fr/ird/observe/services/http/ObserveHttpError.java
+++ /dev/null
@@ -1,68 +0,0 @@
-package fr.ird.observe.services.http;
-
-/*-
- * #%L
- * ObServe :: Services
- * %%
- * 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%
- */
-
-/**
- * @author Sylvain Bavencoff - bavencoff(a)codelutin.com
- */
-public class ObserveHttpError {
-
- public static final String PROPERTY_HTTP_CODE = "httpCode";
-
- public static final String PROPERTY_EXECPTION_TYPE = "exceptionType";
-
- public static final String PROPERTY_MESSAGE = "message";
-
- public static final String PROPERTY_EXCEPTION = "exception";
-
- protected final Integer httpCode;
-
- protected final Class<?> exceptionType;
-
- protected final String message;
-
- protected final Throwable exception;
-
- public ObserveHttpError(Integer httpCode, Class<?> exceptionType, String message, Throwable exception) {
- this.httpCode = httpCode;
- this.exceptionType = exceptionType;
- this.message = message;
- this.exception = exception;
- }
-
- public Integer getHttpCode() {
- return httpCode;
- }
-
- public Class<?> getExceptionType() {
- return exceptionType;
- }
-
- public String getMessage() {
- return message;
- }
-
- public Throwable getException() {
- return exception;
- }
-}
=====================================
services/src/main/java/fr/ird/observe/services/service/data/seine/FloatingObjectService.java
=====================================
--- a/services/src/main/java/fr/ird/observe/services/service/data/seine/FloatingObjectService.java
+++ b/services/src/main/java/fr/ird/observe/services/service/data/seine/FloatingObjectService.java
@@ -89,7 +89,7 @@ public interface FloatingObjectService extends ObserveService {
@Write
@WriteDataPermission
@Post
- SaveResultDto save(String floatingObjectId, List<FloatingObjectPartDto> dtos);
+ SaveResultDto saveParts(String floatingObjectId, ImmutableSet<FloatingObjectPartDto> floatingObjectParts);
@Write
@WriteDataPermission
View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/128cdb55e5c3d45be71a81a9145…
---
View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/128cdb55e5c3d45be71a81a9145…
You're receiving this email because of your account on gitlab.com.
1
0
[Git][ultreiaio/ird-observe][develop] Réorganisation des modules (client server)
by Tony CHEMIT 01 Aug '17
by Tony CHEMIT 01 Aug '17
01 Aug '17
Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe
Commits:
2d993451 by Tony CHEMIT at 2017-08-01T08:29:27+02:00
Réorganisation des modules (client server)
- - - - -
30 changed files:
- CONTRIBUTING.md
- − application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/LightsticksColorDto-ui-create-error-validation.xml
- − application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/LightsticksColorDto-ui-create-warning-validation.xml
- − application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/LightsticksColorDto-ui-update-error-validation.xml
- − application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/LightsticksColorDto-ui-update-warning-validation.xml
- − application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/LightsticksTypeDto-ui-create-error-validation.xml
- − application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/LightsticksTypeDto-ui-create-warning-validation.xml
- − application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/LightsticksTypeDto-ui-update-error-validation.xml
- − application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/LightsticksTypeDto-ui-update-warning-validation.xml
- − application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/LineTypeDto-ui-create-error-validation.xml
- − application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/LineTypeDto-ui-create-warning-validation.xml
- − application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/LineTypeDto-ui-update-error-validation.xml
- − application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/LineTypeDto-ui-update-warning-validation.xml
- − application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/MaturityStatusDto-ui-create-error-validation.xml
- − application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/MaturityStatusDto-ui-create-warning-validation.xml
- − application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/MaturityStatusDto-ui-update-error-validation.xml
- − application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/MaturityStatusDto-ui-update-warning-validation.xml
- − application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/MitigationTypeDto-ui-create-error-validation.xml
- − application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/MitigationTypeDto-ui-create-warning-validation.xml
- − application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/MitigationTypeDto-ui-update-error-validation.xml
- − application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/MitigationTypeDto-ui-update-warning-validation.xml
- − application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/SensorBrandDto-ui-create-error-validation.xml
- − application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/SensorBrandDto-ui-create-warning-validation.xml
- − application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/SensorBrandDto-ui-update-error-validation.xml
- − application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/SensorBrandDto-ui-update-warning-validation.xml
- − application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/SensorDataFormatDto-ui-create-error-validation.xml
- − application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/SensorDataFormatDto-ui-create-warning-validation.xml
- − application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/SensorDataFormatDto-ui-update-error-validation.xml
- − application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/SensorDataFormatDto-ui-update-warning-validation.xml
- − application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/SensorTypeDto-ui-create-error-validation.xml
The diff was not included because it is too large.
View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/2d993451c10eacef340be3d426a…
---
View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/2d993451c10eacef340be3d426a…
You're receiving this email because of your account on gitlab.com.
1
0
Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe
Commits:
b092b50b by Tony CHEMIT at 2017-07-31T23:14:53+02:00
review referentials
- - - - -
5 changed files:
- persistence/src/main/resources/db/migration/6.901/09_fill_object_material-common.sql
- services-topia/src/main/java/fr/ird/observe/services/topia/service/data/seine/FloatingObjectServiceTopia.java
- test/src/main/resources/db/6.901/dataForTestLongline.sql.gz
- test/src/main/resources/db/6.901/dataForTestSeine.sql.gz
- test/src/main/resources/db/6.901/referentiel.sql.gz
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
@@ -23,26 +23,26 @@ 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.1' , 0, CURRENT_DATE, CURRENT_TIMESTAMP, false, 1, NULL , 'FAD' , '1-1' , 'fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.01', '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-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.55' , 0, CURRENT_DATE, CURRENT_TIMESTAMP, false, 1, NULL , NULL , '1-1-1-1' , 'fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.1' , 'Floating structure' , 'Structure flottante' , 'Parrilla' , 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.6' , 0, CURRENT_DATE, CURRENT_TIMESTAMP, false, 1, NULL , NULL , '1-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.6' , 0, CURRENT_DATE, CURRENT_TIMESTAMP, false, 1, NULL , NULL , '1-1-1-1-1' , 'fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.55', '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-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-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.85' , 0, CURRENT_DATE, CURRENT_TIMESTAMP, false, 1, NULL , NULL , '1-1-1-1-1-3' , 'fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.6' , 'Mixed vegetal, and metallic or PVC' , 'A la fois végétal et métallique ou PVC' , 'Mixta (metálica ó PVC y 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.9' , 0, CURRENT_DATE, CURRENT_TIMESTAMP, false, 1, NULL , NULL , '1-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.87' , 0, CURRENT_DATE, CURRENT_TIMESTAMP, false, 1, NULL , NULL , '1-1-1-1-1-3' , 'fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.6' , 'Mixed vegetal, and metallic or PVC' , 'A la fois végétal et métallique ou PVC' , 'Mixta (metálica ó PVC y 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.9' , 0, CURRENT_DATE, CURRENT_TIMESTAMP, false, 1, NULL , NULL , '1-1-1-1-2' , 'fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.55', '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-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-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);
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.12' , 0, CURRENT_DATE, CURRENT_TIMESTAMP, false, 1, NULL , NULL , '1-1-1-1-2-1-2' , '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);
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.13' , 0, CURRENT_DATE, CURRENT_TIMESTAMP, false, 1, NULL , NULL , '1-1-1-1-2-2' , 'fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.9' , 'Coverage without mesh' , 'Revêtement sans maillage' , 'Recubrimiento sin malla' , 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.14' , 0, CURRENT_DATE, CURRENT_TIMESTAMP, false, 1, NULL , NULL , '1-1-1-1-2-3' , 'fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.9' , 'Not covered' , 'Non couvert' , 'Sin recubrimiento' , 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.15' , 0, CURRENT_DATE, CURRENT_TIMESTAMP, false, 1, NULL , NULL , '1-1-1-1-2-4' , 'fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.9' , '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.16' , 0, CURRENT_DATE, CURRENT_TIMESTAMP, false, 1, NULL , NULL , '1-1-1-1-3' , 'fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.3' , 'Inferior coverage' , 'Revêtement inférieur' , 'Recubrimiento inferior' , 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.16' , 0, CURRENT_DATE, CURRENT_TIMESTAMP, false, 1, NULL , NULL , '1-1-1-1-3' , 'fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.55', 'Inferior coverage' , 'Revêtement inférieur' , 'Recubrimiento inferior' , 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.17' , 0, CURRENT_DATE, CURRENT_TIMESTAMP, false, 1, NULL , NULL , '1-1-1-1-3-1' , 'fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.16', '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.18' , 0, CURRENT_DATE, CURRENT_TIMESTAMP, false, 1, NULL , NULL , '1-1-1-1-3-1-1' , 'fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.17', '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);
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.19' , 0, CURRENT_DATE, CURRENT_TIMESTAMP, false, 1, NULL , NULL , '1-1-1-1-3-1-2' , 'fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.17', '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);
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.20' , 0, CURRENT_DATE, CURRENT_TIMESTAMP, false, 1, NULL , NULL , '1-1-1-1-3-2' , 'fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.16', 'Coverage without mesh' , 'Revêtement sans maillage' , 'Recubrimiento sin malla' , 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.21' , 0, CURRENT_DATE, CURRENT_TIMESTAMP, false, 1, NULL , NULL , '1-1-1-1-3-3' , 'fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.16', 'Not covered' , 'Non couvert' , 'Sin recubrimiento' , 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.22' , 0, CURRENT_DATE, CURRENT_TIMESTAMP, false, 1, NULL , NULL , '1-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-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-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.23' , 0, CURRENT_DATE, CURRENT_TIMESTAMP, false, 1, NULL , NULL , '1-1-1-1-4' , 'fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.55', '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-1-5' , 'fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.55', '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.85' , 0, CURRENT_DATE, CURRENT_TIMESTAMP, false, 1, NULL , NULL , '1-1-1-2' , 'fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.2' , '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-1-2-1' , 'fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.85', '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-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);
@@ -77,7 +77,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.52' , 0, CURRENT_DATE, CURRENT_TIMESTAMP, false, 1, NULL , 'VNLOG' , '1-2-1-1' , 'fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.51', 'VNLOG (vegetal NLOG)' , 'VNLOG (NLOG vegetal)' , 'VNLOG (NLOG vegetal)' , 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.53' , 0, CURRENT_DATE, CURRENT_TIMESTAMP, false, 1, '1' , NULL , '1-2-1-1-1' , 'fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.52', 'Straw heap' , 'Tas de paille' , 'Monton the hierba' , 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.54' , 0, CURRENT_DATE, CURRENT_TIMESTAMP, false, 1, '2' , NULL , '1-2-1-1-2' , 'fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.52', 'Palm tree, palm' , 'Palmier, palme' , 'Palma, hoja de palmera' , 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.55' , 0, CURRENT_DATE, CURRENT_TIMESTAMP, false, 1, '3' , NULL , '1-2-1-1-3' , 'fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.52', 'Tree, branche' , 'Arbre, branche' , 'Árbol, rama' , 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.88' , 0, CURRENT_DATE, CURRENT_TIMESTAMP, false, 1, '3' , NULL , '1-2-1-1-3' , 'fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.52', 'Tree, branche' , 'Arbre, branche' , 'Árbol, rama' , 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.56' , 0, CURRENT_DATE, CURRENT_TIMESTAMP, false, 1, NULL , 'ANLOG' , '1-2-1-2' , 'fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.51', 'ANLOG (animal NLOG)' , 'ANLOG (NLOG animal)' , 'ANLOG (NLOG animal)' , 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.57' , 0, CURRENT_DATE, CURRENT_TIMESTAMP, false, 1, '4, 5*, 24' , NULL , '1-2-1-2-1' , 'fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.56', 'Carrion' , 'Charogne' , 'Carroña' , 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.58' , 0, CURRENT_DATE, CURRENT_TIMESTAMP, false, 1, NULL , NULL , '1-2-1-2-2' , 'fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.56', 'Whale shark' , 'Requin-baleine' , 'Tiburón ballena' , true , false, false, 'fr.ird.observe.entities.referentiel.seine.ObjectMaterialType#0#0', NULL , false, false);
=====================================
services-topia/src/main/java/fr/ird/observe/services/topia/service/data/seine/FloatingObjectServiceTopia.java
=====================================
--- a/services-topia/src/main/java/fr/ird/observe/services/topia/service/data/seine/FloatingObjectServiceTopia.java
+++ b/services-topia/src/main/java/fr/ird/observe/services/topia/service/data/seine/FloatingObjectServiceTopia.java
@@ -29,6 +29,7 @@ import com.google.common.collect.Maps;
import com.google.common.collect.Multimap;
import fr.ird.observe.entities.referentiel.ObserveReferentialEntity;
import fr.ird.observe.entities.referentiel.seine.ObjectMaterial;
+import fr.ird.observe.entities.referentiel.seine.ObjectMaterialTopiaDao;
import fr.ird.observe.entities.seine.ActivitySeine;
import fr.ird.observe.entities.seine.FloatingObject;
import fr.ird.observe.entities.seine.FloatingObjectPart;
@@ -69,7 +70,8 @@ public class FloatingObjectServiceTopia extends ObserveServiceTopia implements F
@Override
public List<ObjectMaterialHierarchyDto> getObjectMaterialHierarchy() {
- List<ObjectMaterial> objectMaterials = getTopiaPersistenceContext().getObjectMaterialDao().findAll();
+ ObjectMaterialTopiaDao dao = getTopiaPersistenceContext().getObjectMaterialDao();
+ List<ObjectMaterial> objectMaterials = dao.findAll();
return getObjectMaterialHierarchyDtos(objectMaterials);
}
@@ -233,7 +235,7 @@ public class FloatingObjectServiceTopia extends ObserveServiceTopia 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(null);
+ Collection<ObjectMaterial> topLevelMaterials = childrenByParent.get("fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.01");
ReferentialBinderSupport<ObserveReferentialEntity, ObjectMaterialDto> referentialBinder = getReferentialBinder(ObjectMaterialDto.class);
ReferentialLocale referentialLocale = getReferentialLocale();
List<ObjectMaterialHierarchyDto> result = new LinkedList<>();
=====================================
test/src/main/resources/db/6.901/dataForTestLongline.sql.gz
=====================================
Binary files a/test/src/main/resources/db/6.901/dataForTestLongline.sql.gz and b/test/src/main/resources/db/6.901/dataForTestLongline.sql.gz differ
=====================================
test/src/main/resources/db/6.901/dataForTestSeine.sql.gz
=====================================
Binary files a/test/src/main/resources/db/6.901/dataForTestSeine.sql.gz and b/test/src/main/resources/db/6.901/dataForTestSeine.sql.gz differ
=====================================
test/src/main/resources/db/6.901/referentiel.sql.gz
=====================================
Binary files a/test/src/main/resources/db/6.901/referentiel.sql.gz and b/test/src/main/resources/db/6.901/referentiel.sql.gz differ
View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/b092b50bc2f6b787a39824bcf7d…
---
View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/b092b50bc2f6b787a39824bcf7d…
You're receiving this email because of your account on gitlab.com.
1
0
Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe
Commits:
d937ebd3 by Tony CHEMIT at 2017-07-31T22:06:44+02:00
update referential
- - - - -
1 changed file:
- persistence/src/main/resources/db/migration/6.901/09_fill_object_material-common.sql
Changes:
=====================================
persistence/src/main/resources/db/migration/6.901/09_fill_object_material-common.sql
=====================================
The diff for this file was not included because it is too large.
View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/d937ebd36b5a77b00001a572f78…
---
View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/d937ebd36b5a77b00001a572f78…
You're receiving this email because of your account on gitlab.com.
1
0
[Git][ultreiaio/ird-observe][develop] Utilisation de wehnArriving et whenLeaving sur ObjectOperation pour piloter…
by Tony CHEMIT 31 Jul '17
by Tony CHEMIT 31 Jul '17
31 Jul '17
Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe
Commits:
b5cd741c by Tony CHEMIT at 2017-07-31T17:47:42+02:00
Utilisation de wehnArriving et whenLeaving sur ObjectOperation pour piloter l'édition des Object Parts
- - - - -
6 changed files:
- application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/seine/FloatingObjectPartsTreeNode.java
- application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/seine/FloatingObjectUI.jcss
- application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/seine/FloatingObjectUIHandler.java
- application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/seine/FloatingObjectUIModel.java
- services-topia/src/main/java/fr/ird/observe/services/binder/referential/seine/ObjectOperationBinder.java
- services/src/main/java/fr/ird/observe/services/ObserveDtoInitializer.java
Changes:
=====================================
application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/seine/FloatingObjectPartsTreeNode.java
=====================================
--- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/seine/FloatingObjectPartsTreeNode.java
+++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/seine/FloatingObjectPartsTreeNode.java
@@ -79,7 +79,18 @@ public class FloatingObjectPartsTreeNode extends AbstractMutableTreeTableNode im
@Override
public boolean isEditable(int column) {
- return column > 0 && getUserObject().isSelectable();
+ boolean result = column > 0 && getUserObject().isSelectable();
+ if (result) {
+ switch (column) {
+ case 1: // when arriving
+ result = model.isArriving();
+ break;
+ case 2: // when leaving
+ result = model.isLeaving();
+ break;
+ }
+ }
+ return result;
}
@Override
=====================================
application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/seine/FloatingObjectUI.jcss
=====================================
--- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/seine/FloatingObjectUI.jcss
+++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/seine/FloatingObjectUI.jcss
@@ -45,11 +45,13 @@ BeanComboBox {
#fromLeftToRight {
_observeAction:{CopyFloatingObjectPartToRightAction.ACTION_NAME};
focusable:false;
+ enabled:{model.isLeaving() && model.isArriving()};
}
#fromRightToLeft {
_observeAction:{CopyFloatingObjectPartToLeftAction.ACTION_NAME};
focusable:false;
+ enabled:{model.isLeaving() && model.isArriving()};
}
#objectOperationLabel {
=====================================
application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/seine/FloatingObjectUIHandler.java
=====================================
--- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/seine/FloatingObjectUIHandler.java
+++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/seine/FloatingObjectUIHandler.java
@@ -35,7 +35,9 @@ import fr.ird.observe.application.swing.ui.tree.navigation.nodes.NavigationTreeN
import fr.ird.observe.services.dto.FloatingObjectReference;
import fr.ird.observe.services.dto.form.Form;
import fr.ird.observe.services.dto.reference.DataReference;
+import fr.ird.observe.services.dto.reference.ReferentialReference;
import fr.ird.observe.services.dto.referential.seine.ObjectMaterialDto;
+import fr.ird.observe.services.dto.referential.seine.ObjectOperationDto;
import fr.ird.observe.services.dto.result.SaveResultDto;
import fr.ird.observe.services.dto.seine.ActivitySeineDto;
import fr.ird.observe.services.dto.seine.FloatingObjectDto;
@@ -338,6 +340,18 @@ public class FloatingObjectUIHandler extends ContentUIHandler<FloatingObjectDto,
}
});
+ getBean().addPropertyChangeListener(FloatingObjectDto.PROPERTY_OBJECT_OPERATION, e -> updateMaterials((ReferentialReference) e.getNewValue()));
+
+ }
+
+ private void updateMaterials(ReferentialReference<ObjectOperationDto> operation) {
+ if (operation == null) {
+ getModel().setArriving(false);
+ getModel().setLeaving(false);
+ } else {
+ getModel().setArriving((Boolean) operation.getPropertyValue(ObjectOperationDto.PROPERTY_WHEN_ARRIVING));
+ getModel().setLeaving((Boolean) operation.getPropertyValue(ObjectOperationDto.PROPERTY_WHEN_LEAVING));
+ }
}
private static final Icon ICON_NOT_A_REFERENCE = SwingUtil.createImageIcon("star-empty.png");
=====================================
application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/seine/FloatingObjectUIModel.java
=====================================
--- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/seine/FloatingObjectUIModel.java
+++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/seine/FloatingObjectUIModel.java
@@ -39,6 +39,8 @@ import java.util.List;
import java.util.Map;
import java.util.Optional;
import java.util.Set;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
import org.jdesktop.swingx.treetable.DefaultMutableTreeTableNode;
import org.nuiton.decorator.Decorator;
@@ -59,6 +61,8 @@ public class FloatingObjectUIModel extends ContentUIModel<FloatingObjectDto> {
private Map<String, ObjectMaterialDto> referentialMap;
private FloatingObjectReference reference;
+ private boolean arriving;
+ private boolean leaving;
public FloatingObjectUIModel() {
super(FloatingObjectDto.class);
@@ -74,6 +78,8 @@ public class FloatingObjectUIModel extends ContentUIModel<FloatingObjectDto> {
private static final String PROPERTY_MATERIALS_TAB_VALID = "materialsTabValid";
public static final String PROPERTY_REFERENCE = "reference";
+ public static final String PROPERTY_ARRIVING = "arriving";
+ public static final String PROPERTY_LEAVING = "leaving";
public static final Set<String> GENERAL_TAB_PROPERTIES =
ImmutableSet.<String>builder().add(FloatingObjectDto.PROPERTY_OBJECT_OPERATION,
@@ -115,8 +121,12 @@ public class FloatingObjectUIModel extends ContentUIModel<FloatingObjectDto> {
for (ObjectMaterialDto o : getAll()) {
FloatingObjectPartDto partDto = new FloatingObjectPartDto();
partDto.setObjectMaterial(referenceBinderEngine.transformReferentialDtoToReference(referentialLocale, o));
- partDto.setWhenArriving(whenArriving.get(o));
- partDto.setWhenLeaving(whenLeaving.get(o));
+ if (arriving) {
+ partDto.setWhenArriving(whenArriving.get(o));
+ }
+ if (leaving) {
+ partDto.setWhenLeaving(whenLeaving.get(o));
+ }
result.add(partDto);
}
return result;
@@ -195,4 +205,26 @@ public class FloatingObjectUIModel extends ContentUIModel<FloatingObjectDto> {
return value == null ? t("observe.common.notComputed") : value ? t("observe.common.boolean.true") : t("observe.common.boolean.false");
}
+ public boolean isArriving() {
+ return arriving;
+ }
+
+ /** Logger. */
+ private static final Log log = LogFactory.getLog(FloatingObjectUIModel.class);
+
+ public void setArriving(boolean arriving) {
+ this.arriving = arriving;
+ log.info("setArriving: " + arriving);
+ firePropertyChange(PROPERTY_ARRIVING, arriving);
+ }
+
+ public boolean isLeaving() {
+ return leaving;
+ }
+
+ public void setLeaving(boolean leaving) {
+ this.leaving = leaving;
+ log.info("setLeaving: " + leaving);
+ firePropertyChange(PROPERTY_LEAVING, leaving);
+ }
}
=====================================
services-topia/src/main/java/fr/ird/observe/services/binder/referential/seine/ObjectOperationBinder.java
=====================================
--- a/services-topia/src/main/java/fr/ird/observe/services/binder/referential/seine/ObjectOperationBinder.java
+++ b/services-topia/src/main/java/fr/ird/observe/services/binder/referential/seine/ObjectOperationBinder.java
@@ -61,14 +61,14 @@ public class ObjectOperationBinder extends ReferentialBinderSupport<ObjectOperat
@Override
public ReferentialReference<ObjectOperationDto> toReferentialReference(ReferentialLocale referentialLocale, ObjectOperation entity) {
- return toReferentialReference(entity, entity.getCode(), getLabel(referentialLocale, entity));
+ return toReferentialReference(entity, entity.getCode(), getLabel(referentialLocale, entity), entity.isWhenArriving(), entity.isWhenLeaving());
}
@Override
public ReferentialReference<ObjectOperationDto> toReferentialReference(ReferentialLocale referentialLocale, ObjectOperationDto dto) {
- return toReferentialReference(dto, dto.getCode(), getLabel(referentialLocale, dto));
+ return toReferentialReference(dto, dto.getCode(), getLabel(referentialLocale, dto), dto.isWhenArriving(), dto.isWhenLeaving());
}
}
=====================================
services/src/main/java/fr/ird/observe/services/ObserveDtoInitializer.java
=====================================
--- a/services/src/main/java/fr/ird/observe/services/ObserveDtoInitializer.java
+++ b/services/src/main/java/fr/ird/observe/services/ObserveDtoInitializer.java
@@ -269,9 +269,7 @@ class ObserveDtoInitializer {
@Override
public void initCountryDto() {
-
n("observe.type.country");
-
n("observe.type.countries");
flushReferential(referentialDefaultDefinitionBuilder(CountryDto.class));
@@ -279,9 +277,7 @@ class ObserveDtoInitializer {
@Override
public void initFpaZoneDto() {
-
n("observe.type.fpaZone");
-
n("observe.type.fpaZones");
flushReferential(referentialDefaultDefinitionBuilder(FpaZoneDto.class));
@@ -289,9 +285,7 @@ class ObserveDtoInitializer {
@Override
public void initGearCaracteristicTypeDto() {
-
n("observe.type.gearCaracteristicType");
-
n("observe.type.gearCaracteristicTypes");
flushReferential(referentialDefaultDefinitionBuilder(GearCaracteristicTypeDto.class));
@@ -299,9 +293,7 @@ class ObserveDtoInitializer {
@Override
public void initGearCaracteristicDto() {
-
n("observe.type.gearCaracteristic");
-
n("observe.type.gearCaracteristics");
flushReferential(referentialDefaultDefinitionBuilder(GearCaracteristicDto.class)
.addProperty(String.class, GearCaracteristicDto.PROPERTY_GEAR_CARACTERISTIC_TYPE));
@@ -309,20 +301,14 @@ class ObserveDtoInitializer {
@Override
public void initGearDto() {
-
-
n("observe.type.gear");
-
n("observe.type.gears");
flushReferential(referentialDefaultDefinitionBuilder(GearDto.class));
}
@Override
public void initHarbourDto() {
-
-
n("observe.type.harbour");
-
n("observe.type.harbours");
flushReferential(referentialDefinitionBuilder2(HarbourDto.class)
.addProperty(String.class, HarbourDto.PROPERTY_CODE)
@@ -337,9 +323,7 @@ class ObserveDtoInitializer {
@Override
public void initSizeMeasureTypeDto() {
-
n("observe.type.sizeMeasureType");
-
n("observe.type.sizeMeasureTypes");
flushReferential(referentialDefaultDefinitionBuilder(SizeMeasureTypeDto.class));
@@ -347,9 +331,7 @@ class ObserveDtoInitializer {
@Override
public void initOceanDto() {
-
n("observe.type.ocean");
-
n("observe.type.oceans");
flushReferential(referentialDefaultDefinitionBuilder(OceanDto.class));
@@ -358,9 +340,7 @@ class ObserveDtoInitializer {
@Override
public void initSpeciesGroupReleaseModeDto() {
-
n("observe.type.speciesGroupReleaseMode");
-
n("observe.type.speciesGroupReleaseModes");
flushReferential(referentialDefaultDefinitionBuilder(SpeciesGroupReleaseModeDto.class));
@@ -368,14 +348,13 @@ class ObserveDtoInitializer {
@Override
public void initSpeciesGroupDto() {
-
-
+ n("observe.type.speciesGroup");
+ n("observe.type.speciesGroups");
flushReferential(referentialDefaultDefinitionBuilder(SpeciesGroupDto.class));
}
@Override
public void initSpeciesDto() {
-
n("observe.type.species");
flushReferential(referentialDefinitionBuilder(SpeciesDto.class)
.addProperty(String.class, SpeciesDto.PROPERTY_FAO_CODE)
@@ -387,16 +366,13 @@ class ObserveDtoInitializer {
@Override
public void initSpeciesListDto() {
-
n("observe.type.speciesList");
-
n("observe.type.speciesLists");
flushReferential(referentialDefaultDefinitionBuilder(SpeciesListDto.class));
}
@Override
public void initSexDto() {
-
n("observe.type.sex");
n("observe.type.sexes");
flushReferential(referentialDefaultDefinitionBuilder(SexDto.class));
@@ -405,9 +381,7 @@ class ObserveDtoInitializer {
@Override
public void initLengthLengthParameterDto() {
-
n("observe.type.lengthLengthParameter");
-
n("observe.type.lengthLengthParameters");
flushReferential(referentialDefinitionBuilder(LengthLengthParameterDto.class)
.addProperty(String.class, LengthLengthParameterDto.PROPERTY_CODE)
@@ -419,9 +393,7 @@ class ObserveDtoInitializer {
@Override
public void initLengthWeightParameterDto() {
-
n("observe.type.lengthWeightParameter");
-
n("observe.type.lengthWeightParameters");
flushReferential(referentialDefinitionBuilder2(LengthWeightParameterDto.class)
.addProperty(String.class, LengthWeightParameterDto.PROPERTY_CODE)
@@ -435,18 +407,14 @@ class ObserveDtoInitializer {
@Override
public void initOrganismDto() {
-
n("observe.type.organism");
-
n("observe.type.organisms");
flushReferential(referentialDefaultDefinitionBuilder(OrganismDto.class));
}
@Override
public void initPersonDto() {
-
n("observe.type.person");
-
n("observe.type.persons");
flushReferential(referentialDefinitionBuilder2(PersonDto.class)
.addProperty(String.class, PersonDto.PROPERTY_FIRST_NAME)
@@ -458,8 +426,6 @@ class ObserveDtoInitializer {
@Override
public void initProgramDto() {
-
-
n("observe.type.program");
n("observe.type.programs");
flushReferential(referentialDefinitionBuilder(ProgramDto.class)
@@ -474,10 +440,7 @@ class ObserveDtoInitializer {
@Override
public void initShipOwnerDto() {
-
-
n("observe.type.shipOwner");
-
n("observe.type.shipOwners");
flushReferential(referentialDefaultDefinitionBuilder(ShipOwnerDto.class)
.addProperty(String.class, ShipOwnerDto.PROPERTY_LABEL));
@@ -485,9 +448,7 @@ class ObserveDtoInitializer {
@Override
public void initVesselSizeCategoryDto() {
-
n("observe.type.vesselSizeCategory");
-
n("observe.type.vesselSizeCategories");
flushReferential(referentialDefinitionBuilder2(VesselSizeCategoryDto.class)
.addProperty(String.class, VesselSizeCategoryDto.PROPERTY_CODE)
@@ -498,9 +459,7 @@ class ObserveDtoInitializer {
@Override
public void initVesselTypeDto() {
-
n("observe.type.vesselType");
-
n("observe.type.vesselTypes");
flushReferential(referentialDefaultDefinitionBuilder(VesselTypeDto.class));
@@ -508,9 +467,7 @@ class ObserveDtoInitializer {
@Override
public void initVesselDto() {
-
n("observe.type.vessel");
-
n("observe.type.vessels");
flushReferential(referentialDefaultDefinitionBuilder(VesselDto.class)
.addProperty(String.class, VesselDto.PROPERTY_VESSEL_TYPE));
@@ -518,9 +475,7 @@ class ObserveDtoInitializer {
@Override
public void initWeightMeasureTypeDto() {
-
n("observe.type.weightMeasureType");
-
n("observe.type.weightMeasureTypes");
flushReferential(referentialDefaultDefinitionBuilder(WeightMeasureTypeDto.class));
@@ -528,9 +483,7 @@ class ObserveDtoInitializer {
@Override
public void initBaitHaulingStatusDto() {
-
n("observe.type.baitHaulingStatus");
-
n("observe.type.baitHaulingStatuses");
flushReferential(referentialDefaultDefinitionBuilder(BaitHaulingStatusDto.class));
@@ -538,9 +491,7 @@ class ObserveDtoInitializer {
@Override
public void initBaitSettingStatusDto() {
-
n("observe.type.baitSettingStatus");
-
n("observe.type.baitSettingStatuses");
flushReferential(referentialDefaultDefinitionBuilder(BaitSettingStatusDto.class));
@@ -548,9 +499,7 @@ class ObserveDtoInitializer {
@Override
public void initBaitTypeDto() {
-
n("observe.type.baitType");
-
n("observe.type.baitTypes");
flushReferential(referentialDefaultDefinitionBuilder(BaitTypeDto.class));
@@ -558,9 +507,7 @@ class ObserveDtoInitializer {
@Override
public void initCatchFateLonglineDto() {
-
n("observe.type.catchFateLongline");
-
n("observe.type.catchFateLonglines");
flushReferential(referentialDefaultDefinitionBuilder(CatchFateLonglineDto.class));
@@ -568,9 +515,7 @@ class ObserveDtoInitializer {
@Override
public void initEncounterTypeDto() {
-
n("observe.type.encounterType");
-
n("observe.type.encounterTypes");
flushReferential(referentialDefaultDefinitionBuilder(EncounterTypeDto.class));
@@ -578,7 +523,6 @@ class ObserveDtoInitializer {
@Override
public void initHealthnessDto() {
-
n("observe.type.healthness");
n("observe.type.healthnesses");
flushReferential(referentialDefaultDefinitionBuilder(HealthnessDto.class));
@@ -587,9 +531,7 @@ class ObserveDtoInitializer {
@Override
public void initHookPositionDto() {
-
n("observe.type.hookPosition");
-
n("observe.type.hookPositions");
flushReferential(referentialDefaultDefinitionBuilder(HookPositionDto.class));
@@ -597,9 +539,7 @@ class ObserveDtoInitializer {
@Override
public void initHookSizeDto() {
-
n("observe.type.hookSize");
-
n("observe.type.hookSizes");
flushReferential(referentialDefaultDefinitionBuilder(HookSizeDto.class));
@@ -607,9 +547,7 @@ class ObserveDtoInitializer {
@Override
public void initHookTypeDto() {
-
n("observe.type.hookType");
-
n("observe.type.hookTypes");
flushReferential(referentialDefaultDefinitionBuilder(HookTypeDto.class));
@@ -617,9 +555,7 @@ class ObserveDtoInitializer {
@Override
public void initItemHorizontalPositionDto() {
-
n("observe.type.itemHorizontalPosition");
-
n("observe.type.itemHorizontalPositions");
flushReferential(referentialDefaultDefinitionBuilder(ItemHorizontalPositionDto.class));
@@ -627,9 +563,7 @@ class ObserveDtoInitializer {
@Override
public void initItemVerticalPositionDto() {
-
n("observe.type.itemVerticalPosition");
-
n("observe.type.itemVerticalPositions");
flushReferential(referentialDefaultDefinitionBuilder(ItemVerticalPositionDto.class));
@@ -637,9 +571,7 @@ class ObserveDtoInitializer {
@Override
public void initLightsticksColorDto() {
-
n("observe.type.lightsticksColor");
-
n("observe.type.lightsticksColors");
flushReferential(referentialDefaultDefinitionBuilder(LightsticksColorDto.class));
@@ -647,9 +579,7 @@ class ObserveDtoInitializer {
@Override
public void initLightsticksTypeDto() {
-
n("observe.type.lightsticksType");
-
n("observe.type.lightsticksTypes");
flushReferential(referentialDefaultDefinitionBuilder(LightsticksTypeDto.class));
@@ -657,9 +587,7 @@ class ObserveDtoInitializer {
@Override
public void initLineTypeDto() {
-
n("observe.type.lineType");
-
n("observe.type.lineTypes");
flushReferential(referentialDefaultDefinitionBuilder(LineTypeDto.class));
@@ -667,9 +595,7 @@ class ObserveDtoInitializer {
@Override
public void initMaturityStatusDto() {
-
n("observe.type.maturityStatus");
-
n("observe.type.maturityStatuses");
flushReferential(referentialDefaultDefinitionBuilder(MaturityStatusDto.class));
@@ -677,9 +603,7 @@ class ObserveDtoInitializer {
@Override
public void initMitigationTypeDto() {
-
n("observe.type.mitigationType");
-
n("observe.type.mitigationTypes");
flushReferential(referentialDefaultDefinitionBuilder(MitigationTypeDto.class));
@@ -687,9 +611,7 @@ class ObserveDtoInitializer {
@Override
public void initSensorBrandDto() {
-
n("observe.type.sensorBrand");
-
n("observe.type.sensorBrands");
flushReferential(referentialDefinitionBuilder2(SensorBrandDto.class)
.addProperty(String.class, SensorBrandDto.PROPERTY_CODE)
@@ -699,9 +621,7 @@ class ObserveDtoInitializer {
@Override
public void initSensorDataFormatDto() {
-
n("observe.type.sensorDataFormat");
-
n("observe.type.sensorDataFormats");
flushReferential(referentialDefaultDefinitionBuilder(SensorDataFormatDto.class));
@@ -709,9 +629,7 @@ class ObserveDtoInitializer {
@Override
public void initSensorTypeDto() {
-
n("observe.type.sensorType");
-
n("observe.type.sensorTypes");
flushReferential(referentialDefaultDefinitionBuilder(SensorTypeDto.class));
@@ -719,9 +637,7 @@ class ObserveDtoInitializer {
@Override
public void initSettingShapeDto() {
-
n("observe.type.settingShape");
-
n("observe.type.settingShapes");
flushReferential(referentialDefaultDefinitionBuilder(SettingShapeDto.class));
@@ -729,9 +645,7 @@ class ObserveDtoInitializer {
@Override
public void initStomacFullnessDto() {
-
n("observe.type.stomacFullness");
-
n("observe.type.stomacFullnesses");
flushReferential(referentialDefaultDefinitionBuilder(StomacFullnessDto.class));
@@ -739,9 +653,7 @@ class ObserveDtoInitializer {
@Override
public void initTripTypeDto() {
-
n("observe.type.tripType");
-
n("observe.type.tripTypes");
flushReferential(referentialDefaultDefinitionBuilder(TripTypeDto.class));
@@ -749,9 +661,7 @@ class ObserveDtoInitializer {
@Override
public void initVesselActivityLonglineDto() {
-
n("observe.type.vesselActivityLongline");
-
n("observe.type.vesselActivityLonglines");
flushReferential(referentialDefaultDefinitionBuilder(VesselActivityLonglineDto.class));
@@ -759,9 +669,7 @@ class ObserveDtoInitializer {
@Override
public void initDetectionModeDto() {
-
n("observe.type.detectionMode");
-
n("observe.type.detectionModes");
flushReferential(referentialDefaultDefinitionBuilder(DetectionModeDto.class));
@@ -769,9 +677,7 @@ class ObserveDtoInitializer {
@Override
public void initObjectMaterialTypeDto() {
-
n("observe.type.objectMaterialType");
-
n("observe.type.objectMaterialTypes");
flushReferential(referentialDefaultDefinitionBuilder(ObjectMaterialTypeDto.class));
@@ -779,9 +685,7 @@ class ObserveDtoInitializer {
@Override
public void initObjectMaterialDto() {
-
n("observe.type.objectMaterial");
-
n("observe.type.objectMaterials");
flushReferential(referentialDefaultDefinitionBuilder(ObjectMaterialDto.class)
.addProperty(String.class, ObjectMaterialDto.PROPERTY_PARENT)
@@ -791,19 +695,17 @@ class ObserveDtoInitializer {
@Override
public void initObjectOperationDto() {
-
n("observe.type.objectOperation");
-
n("observe.type.objectOperations");
- flushReferential(referentialDefaultDefinitionBuilder(ObjectOperationDto.class));
+ flushReferential(referentialDefaultDefinitionBuilder(ObjectOperationDto.class)
+ .addProperty(boolean.class, ObjectOperationDto.PROPERTY_WHEN_ARRIVING)
+ .addProperty(boolean.class, ObjectOperationDto.PROPERTY_WHEN_LEAVING));
}
@Override
public void initObjectTypeDto() {
-
n("observe.type.objectType");
-
n("observe.type.objectTypes");
flushReferential(referentialDefaultDefinitionBuilder(ObjectTypeDto.class));
@@ -811,9 +713,7 @@ class ObserveDtoInitializer {
@Override
public void initObservedSystemDto() {
-
n("observe.type.observedSystem");
-
n("observe.type.observedSystems");
flushReferential(referentialDefaultDefinitionBuilder(ObservedSystemDto.class));
@@ -821,9 +721,7 @@ class ObserveDtoInitializer {
@Override
public void initReasonForDiscardDto() {
-
n("observe.type.reasonForDiscard");
-
n("observe.type.reasonForDiscards");
flushReferential(referentialDefaultDefinitionBuilder(ReasonForDiscardDto.class));
@@ -831,9 +729,7 @@ class ObserveDtoInitializer {
@Override
public void initReasonForNoFishingDto() {
-
n("observe.type.reasonForNoFishing");
-
n("observe.type.reasonForNoFishings");
flushReferential(referentialDefaultDefinitionBuilder(ReasonForNoFishingDto.class));
@@ -841,9 +737,7 @@ class ObserveDtoInitializer {
@Override
public void initReasonForNullSetDto() {
-
n("observe.type.reasonForNullSet");
-
n("observe.type.reasonForNullSets");
flushReferential(referentialDefaultDefinitionBuilder(ReasonForNullSetDto.class));
@@ -860,7 +754,6 @@ class ObserveDtoInitializer {
@Override
public void initSpeciesStatusDto() {
-
n("observe.type.speciesStatus");
n("observe.type.speciesStatuses");
flushReferential(referentialDefaultDefinitionBuilder(SpeciesStatusDto.class));
@@ -869,7 +762,6 @@ class ObserveDtoInitializer {
@Override
public void initSurroundingActivityDto() {
-
n("observe.type.surroundingActivity");
n("observe.type.surroundingActivities");
flushReferential(referentialDefaultDefinitionBuilder(SurroundingActivityDto.class));
@@ -878,9 +770,7 @@ class ObserveDtoInitializer {
@Override
public void initTransmittingBuoyOperationDto() {
-
n("observe.type.transmittingBuoyOperation");
-
n("observe.type.transmittingBuoyOperations");
flushReferential(referentialDefaultDefinitionBuilder(TransmittingBuoyOperationDto.class));
@@ -888,9 +778,7 @@ class ObserveDtoInitializer {
@Override
public void initTransmittingBuoyTypeDto() {
-
n("observe.type.transmittingBuoyType");
-
n("observe.type.transmittingBuoyTypes");
flushReferential(referentialDefaultDefinitionBuilder(TransmittingBuoyTypeDto.class));
@@ -898,9 +786,7 @@ class ObserveDtoInitializer {
@Override
public void initVesselActivitySeineDto() {
-
n("observe.type.vesselActivitySeine");
-
n("observe.type.vesselActivitySeines");
flushReferential(referentialDefaultDefinitionBuilder(VesselActivitySeineDto.class)
.addProperty(boolean.class, VesselActivitySeineDto.PROPERTY_ALLOW_FAD));
@@ -909,9 +795,7 @@ class ObserveDtoInitializer {
@Override
public void initWeightCategoryDto() {
-
n("observe.type.weightCategory");
-
n("observe.type.weightCategories");
flushReferential(referentialDefinitionBuilder(WeightCategoryDto.class)
.addProperty(String.class, WeightCategoryDto.PROPERTY_CODE)
@@ -920,9 +804,7 @@ class ObserveDtoInitializer {
@Override
public void initWindDto() {
-
n("observe.type.wind");
-
n("observe.type.winds");
flushReferential(referentialDefinitionBuilder2(WindDto.class)
.addProperty(String.class, WindDto.PROPERTY_CODE)
@@ -975,10 +857,7 @@ class ObserveDtoInitializer {
@Override
public void initBasketDto() {
-
-
n("observe.type.basket");
-
n("observe.type.baskets");
flushData(dataDefinitionBuilder(BasketDto.class)
.addProperty(Integer.class, BasketDto.PROPERTY_SETTING_IDENTIFIER)
@@ -993,10 +872,7 @@ class ObserveDtoInitializer {
@Override
public void initBranchlineDto() {
-
-
n("observe.type.branchline");
-
n("observe.type.branchlines");
flushData(dataDefinitionBuilder(BranchlineDto.class)
.addProperty(Integer.class, BranchlineDto.PROPERTY_SETTING_IDENTIFIER)
@@ -1010,10 +886,7 @@ class ObserveDtoInitializer {
@Override
public void initBranchlinesCompositionDto() {
-
-
n("observe.type.branchlinesComposition");
-
n("observe.type.branchlinesCompositions");
flushData(dataDefinitionBuilder(BranchlinesCompositionDto.class)
.addProperty(String.class, BranchlinesCompositionDto.PROPERTY_TOP_TYPE)
@@ -1024,10 +897,7 @@ class ObserveDtoInitializer {
@Override
public void initCatchLonglineDto() {
-
-
n("observe.type.catchLongline");
-
n("observe.type.catchLonglines");
flushData(dataDefinitionBuilder(CatchLonglineDto.class)
.addProperty(String.class, CatchLonglineDto.PROPERTY_HOME_ID));
@@ -1035,10 +905,7 @@ class ObserveDtoInitializer {
@Override
public void initEncounterDto() {
-
-
n("observe.type.encounter");
-
n("observe.type.encounters");
flushData(dataDefinitionBuilder(EncounterDto.class)
.addProperty(String.class, EncounterDto.PROPERTY_ENCOUNTER_TYPE)
@@ -1047,10 +914,7 @@ class ObserveDtoInitializer {
@Override
public void initFloatlinesCompositionDto() {
-
-
n("observe.type.floatlinesComposition");
-
n("observe.type.floatlinesCompositions");
flushData(dataDefinitionBuilder(FloatlinesCompositionDto.class)
.addProperty(String.class, FloatlinesCompositionDto.PROPERTY_LINE_TYPE)
@@ -1060,8 +924,6 @@ class ObserveDtoInitializer {
@Override
public void initGearUseFeaturesLonglineDto() {
-
-
n("observe.type.gearUseFeaturesLongline");
n("observe.type.gearUseFeaturesLonglines");
flushData(dataDefinitionBuilder(GearUseFeaturesLonglineDto.class));
@@ -1069,8 +931,6 @@ class ObserveDtoInitializer {
@Override
public void initGearUseFeaturesMeasurementLonglineDto() {
-
-
n("observe.type.gearUseFeaturesMeasurementLongline");
n("observe.type.gearUseFeaturesMeasurementLonglines");
flushData(dataDefinitionBuilder(GearUseFeaturesMeasurementLonglineDto.class));
@@ -1078,10 +938,7 @@ class ObserveDtoInitializer {
@Override
public void initHooksCompositionDto() {
-
-
n("observe.type.hooksComposition");
-
n("observe.type.hooksCompositions");
flushData(dataDefinitionBuilder(HooksCompositionDto.class)
.addProperty(String.class, HooksCompositionDto.PROPERTY_HOOK_TYPE)
@@ -1092,10 +949,7 @@ class ObserveDtoInitializer {
@Override
public void initSectionDto() {
-
-
n("observe.type.section");
-
n("observe.type.sections");
flushData(dataDefinitionBuilder(SectionDto.class)
.addProperty(Integer.class, SectionDto.PROPERTY_SETTING_IDENTIFIER)
@@ -1104,10 +958,7 @@ class ObserveDtoInitializer {
@Override
public void initSensorUsedDto() {
-
-
n("observe.type.sensorUsed");
-
n("observe.type.sensorUseds");
flushData(dataDefinitionBuilder(SensorUsedDto.class)
.addProperty(String.class, SensorUsedDto.PROPERTY_SENSOR_TYPE));
@@ -1115,10 +966,7 @@ class ObserveDtoInitializer {
@Override
public void initSetLonglineDto() {
-
-
n("observe.type.setLongline");
-
n("observe.type.setLonglines");
flushData(dataDefinitionBuilder(SetLonglineDto.class)
.addProperty(String.class, SetLonglineDto.PROPERTY_HOME_ID));
@@ -1126,8 +974,6 @@ class ObserveDtoInitializer {
@Override
public void initSetLonglineCatchDto() {
-
-
n("observe.type.setLonglineCatch");
n("observe.type.setLonglineCatches");
flushData(dataDefinitionBuilder(SetLonglineCatchDto.class));
@@ -1175,10 +1021,7 @@ class ObserveDtoInitializer {
@Override
public void initTripLonglineDto() {
-
-
n("observe.type.tripLongline");
-
n("observe.type.tripLonglines");
flushData(dataDefinitionBuilder(TripLonglineDto.class)
.addProperty(Date.class, TripLonglineDto.PROPERTY_START_DATE)
@@ -1192,30 +1035,21 @@ class ObserveDtoInitializer {
@Override
public void initTripLonglineActivityDto() {
-
-
n("observe.type.tripLonglineActivity");
-
n("observe.type.tripLonglineActivities");
flushData(dataDefinitionBuilder(TripLonglineActivityDto.class));
}
@Override
public void initTripLonglineGearUseDto() {
-
-
n("observe.type.tripLonglineGearUse");
-
n("observe.type.tripLonglineGearUses");
flushData(dataDefinitionBuilder(TripLonglineGearUseDto.class));
}
@Override
public void initWeightMeasureDto() {
-
-
n("observe.type.weightMeasure");
-
n("observe.type.weightMeasures");
flushData(dataDefinitionBuilder(WeightMeasureDto.class)
.addProperty(String.class, WeightMeasureDto.PROPERTY_WEIGHT_MEASURE_TYPE)
@@ -1235,10 +1069,7 @@ class ObserveDtoInitializer {
@Override
public void initActivitySeineDto() {
-
-
n("observe.type.activitySeine");
-
n("observe.type.activitySeines");
flushData(dataDefinitionBuilder(ActivitySeineDto.class)
.addProperty(Date.class, ActivitySeineDto.PROPERTY_TIME)
@@ -1254,10 +1085,7 @@ class ObserveDtoInitializer {
@Override
public void initFloatingObjectDto() {
-
-
n("observe.type.floatingObject");
-
n("observe.type.floatingObjects");
flushData(dataDefinitionBuilder(FloatingObjectDto.class)
.addProperty(String.class, FloatingObjectDto.PROPERTY_OBJECT_TYPE));
@@ -1265,19 +1093,13 @@ class ObserveDtoInitializer {
@Override
public void initFloatingObjectObservedSpeciesDto() {
-
-
n("observe.type.floatingObjectObservedSpecies");
-
flushData(dataDefinitionBuilder(FloatingObjectObservedSpeciesDto.class));
}
@Override
public void initFloatingObjectPartDto() {
-
-
n("observe.type.floatingObjectPart");
-
n("observe.type.floatingObjectParts");
flushData(dataDefinitionBuilder(FloatingObjectPartDto.class)
.addProperty(String.class, FloatingObjectPartDto.PROPERTY_OBJECT_MATERIAL + "Id")
@@ -1288,10 +1110,7 @@ class ObserveDtoInitializer {
@Override
public void initFloatingObjectSchoolEstimateDto() {
-
-
n("observe.type.floatingObjectSchoolEstimate");
-
n("observe.type.floatingObjectSchoolEstimates");
flushData(dataDefinitionBuilder(FloatingObjectSchoolEstimateDto.class));
@@ -1299,8 +1118,6 @@ class ObserveDtoInitializer {
@Override
public void initFloatingObjectTransmittingBuoyDto() {
-
-
n("observe.type.floatingObjectTransmittingBuoy");
n("observe.type.floatingObjectTransmittingBuoys");
flushData(dataDefinitionBuilder(FloatingObjectTransmittingBuoyDto.class));
@@ -1308,8 +1125,6 @@ class ObserveDtoInitializer {
@Override
public void initGearUseFeaturesMeasurementSeineDto() {
-
-
n("observe.type.gearUseFeaturesMeasurementSeine");
n("observe.type.gearUseFeaturesMeasurementSeines");
flushData(dataDefinitionBuilder(GearUseFeaturesMeasurementSeineDto.class));
@@ -1317,20 +1132,14 @@ class ObserveDtoInitializer {
@Override
public void initGearUseFeaturesSeineDto() {
-
-
n("observe.type.gearUseFeaturesSeine");
-
n("observe.type.gearUseFeaturesSeines");
flushData(dataDefinitionBuilder(GearUseFeaturesSeineDto.class));
}
@Override
public void initNonTargetCatchDto() {
-
-
n("observe.type.nonTargetCatch");
-
n("observe.type.nonTargetCatches");
flushData(dataDefinitionBuilder(NonTargetCatchDto.class)
.addProperty(String.class, NonTargetCatchDto.PROPERTY_SPECIES)
@@ -1339,10 +1148,7 @@ class ObserveDtoInitializer {
@Override
public void initNonTargetCatchReleaseDto() {
-
-
n("observe.type.nonTargetCatchRelease");
-
n("observe.type.nonTargetCatchReleases");
flushData(dataDefinitionBuilder(NonTargetCatchReleaseDto.class)
.addProperty(String.class, NonTargetCatchReleaseDto.PROPERTY_SPECIES)
@@ -1354,10 +1160,7 @@ class ObserveDtoInitializer {
@Override
public void initNonTargetLengthDto() {
-
-
n("observe.type.nonTargetLength");
-
n("observe.type.nonTargetLengths");
flushData(dataDefinitionBuilder(NonTargetLengthDto.class)
.addProperty(String.class, NonTargetLengthDto.PROPERTY_SPECIES)
@@ -1366,18 +1169,13 @@ class ObserveDtoInitializer {
@Override
public void initNonTargetSampleDto() {
-
-
n("observe.type.nonTargetSample");
-
n("observe.type.nonTargetSamples");
flushData(dataDefinitionBuilder(NonTargetSampleDto.class));
}
@Override
public void initObjectObservedSpeciesDto() {
-
-
n("observe.type.objectObservedSpecies");
flushData(dataDefinitionBuilder(ObjectObservedSpeciesDto.class)
.addProperty(String.class, ObjectObservedSpeciesDto.PROPERTY_SPECIES)
@@ -1395,10 +1193,7 @@ class ObserveDtoInitializer {
@Override
public void initRouteDto() {
-
-
n("observe.type.route");
-
n("observe.type.routes");
flushData(dataDefinitionBuilder(RouteDto.class)
.addProperty(Date.class, RouteDto.PROPERTY_DATE)
@@ -1412,10 +1207,7 @@ class ObserveDtoInitializer {
@Override
public void initSchoolEstimateDto() {
-
-
n("observe.type.schoolEstimate");
-
n("observe.type.schoolEstimates");
flushData(dataDefinitionBuilder(SchoolEstimateDto.class)
.addProperty(String.class, SchoolEstimateDto.PROPERTY_SPECIES)
@@ -1425,10 +1217,7 @@ class ObserveDtoInitializer {
@Override
public void initSetSeineDto() {
-
-
n("observe.type.setSeine");
-
n("observe.type.setSeines");
flushData(dataDefinitionBuilder(SetSeineDto.class)
.addProperty(String.class, SetSeineDto.PROPERTY_COMMENT));
@@ -1456,10 +1245,7 @@ class ObserveDtoInitializer {
@Override
public void initTargetCatchDto() {
-
-
n("observe.type.targetCatch");
-
n("observe.type.targetCatches");
flushData(dataDefinitionBuilder(TargetCatchDto.class)
.addProperty(String.class, TargetCatchDto.PROPERTY_SPECIES));
@@ -1467,10 +1253,7 @@ class ObserveDtoInitializer {
@Override
public void initTargetLengthDto() {
-
-
n("observe.type.targetLength");
-
n("observe.type.targetLengths");
flushData(dataDefinitionBuilder(TargetLengthDto.class)
.addProperty(String.class, TargetLengthDto.PROPERTY_SPECIES)
@@ -1480,18 +1263,13 @@ class ObserveDtoInitializer {
@Override
public void initTargetSampleDto() {
-
-
n("observe.type.targetSample");
-
n("observe.type.targetSamples");
flushData(dataDefinitionBuilder(TargetSampleDto.class));
}
@Override
public void initTransmittingBuoyDto() {
-
-
n("observe.type.transmittingBuoy");
n("observe.type.transmittingBuoys");
flushData(dataDefinitionBuilder(TransmittingBuoyDto.class)
@@ -1503,10 +1281,7 @@ class ObserveDtoInitializer {
@Override
public void initTripSeineDto() {
-
-
n("observe.type.tripSeine");
-
n("observe.type.tripSeines");
flushData(dataDefinitionBuilder(TripSeineDto.class)
.addProperty(Date.class, TripSeineDto.PROPERTY_START_DATE)
@@ -1519,10 +1294,7 @@ class ObserveDtoInitializer {
@Override
public void initTripSeineGearUseDto() {
-
-
n("observe.type.tripSeineGearUse");
-
n("observe.type.tripSeineGearUses");
flushData(dataDefinitionBuilder(TripSeineGearUseDto.class));
}
View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/b5cd741cf7599bd0addc9ff2b42…
---
View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/b5cd741cf7599bd0addc9ff2b42…
You're receiving this email because of your account on gitlab.com.
1
0
[Git][ultreiaio/ird-observe][develop] 6 commits: Ajout du fichier de construction du référentiel ObjectMaterial
by Tony CHEMIT 31 Jul '17
by Tony CHEMIT 31 Jul '17
31 Jul '17
Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe
Commits:
5ecc9305 by Tony CHEMIT at 2017-07-31T11:54:29+02:00
Ajout du fichier de construction du référentiel ObjectMaterial
- - - - -
5c7c2d1b by Tony CHEMIT at 2017-07-31T11:54:32+02:00
Suppression images inutiles
- - - - -
a935132e by Tony CHEMIT at 2017-07-31T12:57:58+02:00
fix les noms des colonnes pour l'import
- - - - -
8809d805 by Tony CHEMIT at 2017-07-31T13:39:01+02:00
Lissage du fichier d'import (suppression des lignes à problème à repositionner
- - - - -
eaf05e9f by Tony CHEMIT at 2017-07-31T13:39:13+02:00
Ajout du générateur de fichier d'import
- - - - -
4fb6584a by Tony CHEMIT at 2017-07-31T15:58:15+02:00
adaptation du ObjectMaterial
- - - - -
21 changed files:
- − doc/images/error.png
- − doc/images/info.png
- − doc/images/ok.png
- − doc/images/question.png
- − doc/images/warning.png
- persistence/pom.xml
- persistence/src/main/java/fr/ird/observe/persistence/migration/DataSourceMigrationForVersion_7_0.java
- persistence/src/main/models/Observe.model
- persistence/src/main/resources/db/migration/6.901/02_add_object_material-common.sql
- + persistence/src/main/resources/db/migration/6.901/09_fill_object_material-common.sql
- + persistence/src/main/resources/db/migration/6.901/referential-ObjectMaterial.csv
- + persistence/src/test/java/fr/ird/observe/persistence/migration/GenerateReferentialObjectMaterial.java
- services-topia/src/main/java/fr/ird/observe/services/binder/referential/seine/ObjectMaterialBinder.java
- services-topia/src/test/java/fr/ird/observe/services/topia/service/actions/validate/ValidateServiceTopiaTest.java
- services-topia/src/test/java/fr/ird/observe/services/topia/service/data/seine/FloatingObjectServiceTopiaTest.java
- test/src/main/java/fr/ird/observe/test/ObserveFixtures.java
- test/src/main/resources/db/6.901/dataForTestLongline.sql.gz
- test/src/main/resources/db/6.901/dataForTestSeine.sql.gz
- test/src/main/resources/db/6.901/empty_h2.sql.gz
- test/src/main/resources/db/6.901/empty_pg.sql.gz
- test/src/main/resources/db/6.901/referentiel.sql.gz
Changes:
=====================================
doc/images/error.png deleted
=====================================
Binary files a/doc/images/error.png and /dev/null differ
=====================================
doc/images/info.png deleted
=====================================
Binary files a/doc/images/info.png and /dev/null differ
=====================================
doc/images/ok.png deleted
=====================================
Binary files a/doc/images/ok.png and /dev/null differ
=====================================
doc/images/question.png deleted
=====================================
Binary files a/doc/images/question.png and /dev/null differ
=====================================
doc/images/warning.png deleted
=====================================
Binary files a/doc/images/warning.png and /dev/null differ
=====================================
persistence/pom.xml
=====================================
--- a/persistence/pom.xml
+++ b/persistence/pom.xml
@@ -57,6 +57,11 @@
<groupId>org.nuiton</groupId>
<artifactId>nuiton-version</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.nuiton</groupId>
+ <artifactId>nuiton-csv</artifactId>
+ <scope>test</scope>
+ </dependency>
<!-- commons -->
<dependency>
=====================================
persistence/src/main/java/fr/ird/observe/persistence/migration/DataSourceMigrationForVersion_7_0.java
=====================================
--- a/persistence/src/main/java/fr/ird/observe/persistence/migration/DataSourceMigrationForVersion_7_0.java
+++ b/persistence/src/main/java/fr/ird/observe/persistence/migration/DataSourceMigrationForVersion_7_0.java
@@ -65,6 +65,7 @@ public class DataSourceMigrationForVersion_7_0 extends AbstractObserveMigrationC
addScript("06", "add_non_target_catch_release", queries);
addScript("07", "drop_table_sizemeasuretype", queries);
addScript("08", "add_floating_object_fields", queries);
+ addScript("09", "fill_object_material", queries);
}
public static class H2DataSourceMigrationForVersion extends DataSourceMigrationForVersion_7_0 {
=====================================
persistence/src/main/models/Observe.model
=====================================
--- a/persistence/src/main/models/Observe.model
+++ b/persistence/src/main/models/Observe.model
@@ -654,7 +654,7 @@ nonEntangling + {*:1} boolean | notNull
childrenMultiSelectable + {*:1} boolean | notNull
childSelectionMandatory + {*:1} boolean | notNull
parent {*:0..1} referentiel.seine.ObjectMaterial
-objectMaterialType {*:1} referentiel.seine.ObjectMaterialType | notNull lazy=false
+objectMaterialType {*:1} referentiel.seine.ObjectMaterialType | lazy=false
validation + {*:1} String
referentiel.seine.ObjectMaterialType > referentiel.I18nReferentialEntity | entity
=====================================
persistence/src/main/resources/db/migration/6.901/02_add_object_material-common.sql
=====================================
--- a/persistence/src/main/resources/db/migration/6.901/02_add_object_material-common.sql
+++ b/persistence/src/main/resources/db/migration/6.901/02_add_object_material-common.sql
@@ -35,48 +35,3 @@ ALTER TABLE observe_seine.objectMaterial ADD CONSTRAINT PK_OBJECT_MATERIAL PRIMA
ALTER TABLE observe_seine.objectMaterial ADD CONSTRAINT FK_OBJECT_MATERIAL_PARENT FOREIGN KEY (parent) REFERENCES observe_seine.objectMaterial(topiaid);
ALTER TABLE observe_seine.objectMaterial ADD CONSTRAINT FK_OBJECT_MATERIAL_OBJECT_MATERIAL_TYPE FOREIGN KEY (objectMaterialType) REFERENCES observe_seine.objectMaterialType(topiaid);
INSERT INTO observe_common.LASTUPDATEDATE (topiaId, topiaversion, topiacreatedate, TYPE , LASTUPDATEDATE) values ('fr.ird.observe.entities.LastUpdateDate#666#901', 0,CURRENT_DATE, 'fr.ird.observe.entities.referentiel.seine.ObjectMaterial', CURRENT_TIMESTAMP);
-
-INSERT INTO observe_seine.objectMaterial (topiaid, topiaversion, topiacreatedate, lastupdatedate, needComment, status, legacyCode, standardCode, code, parent, label1, label2, selectable, childrenMultiSelectable, childSelectionMandatory, objectMaterialType, biodegradable, nonEntangling) values ('fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0', 0, CURRENT_DATE, CURRENT_TIMESTAMP, false, 1, '', '', '1', NULL,'Raft', 'Radeau', true, true, true, 'fr.ird.observe.entities.referentiel.seine.ObjectMaterialType#0#0', false, false);
-INSERT INTO observe_seine.objectMaterial (topiaid, topiaversion, topiacreatedate, lastupdatedate, needComment, status, legacyCode, standardCode, code, parent, label1, label2, selectable, childrenMultiSelectable, childSelectionMandatory, objectMaterialType, biodegradable, nonEntangling) values ('fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#1', 0, CURRENT_DATE, CURRENT_TIMESTAMP, false, 1, '', '', '1-1', 'fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0', 'Frame', ' Chassis', FALSE, FALSE, TRUE, 'fr.ird.observe.entities.referentiel.seine.ObjectMaterialType#0#0', false, false);
-INSERT INTO observe_seine.objectMaterial (topiaid, topiaversion, topiacreatedate, lastupdatedate, needComment, status, legacyCode, standardCode, code, parent, label1, label2, selectable, childrenMultiSelectable, childSelectionMandatory, objectMaterialType, biodegradable, nonEntangling) values ('fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#2', 0, CURRENT_DATE, CURRENT_TIMESTAMP, false, 1, '', '', '1-1-1', 'fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#1', 'Vegetal (including bamboo)', 'Végétal (dont bambou)', true, false, false, 'fr.ird.observe.entities.referentiel.seine.ObjectMaterialType#0#0', false, false);
-INSERT INTO observe_seine.objectMaterial (topiaid, topiaversion, topiacreatedate, lastupdatedate, needComment, status, legacyCode, standardCode, code, parent, label1, label2, selectable, childrenMultiSelectable, childSelectionMandatory, objectMaterialType, biodegradable, nonEntangling) values ('fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#3', 0, CURRENT_DATE, CURRENT_TIMESTAMP, false, 1, '', '', '1-1-2', 'fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#1', 'Metal', 'Métal', true, false, false, 'fr.ird.observe.entities.referentiel.seine.ObjectMaterialType#0#0', false, false);
-INSERT INTO observe_seine.objectMaterial (topiaid, topiaversion, topiacreatedate, lastupdatedate, needComment, status, legacyCode, standardCode, code, parent, label1, label2, selectable, childrenMultiSelectable, childSelectionMandatory, objectMaterialType, biodegradable, nonEntangling) values ('fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#4', 0, CURRENT_DATE, CURRENT_TIMESTAMP, false, 1, '', '', '1-1-3', 'fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#1','PVC', 'PVC', true, false, false, 'fr.ird.observe.entities.referentiel.seine.ObjectMaterialType#0#0', false, false);
-INSERT INTO observe_seine.objectMaterial (topiaid, topiaversion, topiacreatedate, lastupdatedate, needComment, status, legacyCode, standardCode, code, parent, label1, label2, selectable, childrenMultiSelectable, childSelectionMandatory, objectMaterialType, biodegradable, nonEntangling) values ('fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#5', 0, CURRENT_DATE, CURRENT_TIMESTAMP, false, 1, '', '', '1-2', 'fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0', 'Coverage type', 'Type de couverture', false, true, true, 'fr.ird.observe.entities.referentiel.seine.ObjectMaterialType#0#0', false, false);
-INSERT INTO observe_seine.objectMaterial (topiaid, topiaversion, topiacreatedate, lastupdatedate, needComment, status, legacyCode, standardCode, code, parent, label1, label2, selectable, childrenMultiSelectable, childSelectionMandatory, objectMaterialType, biodegradable, nonEntangling) values ('fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#6', 0, CURRENT_DATE, CURRENT_TIMESTAMP, false, 1, '', '', '1-2-1', 'fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#5', 'Net', 'Filet', FALSE, TRUE, FALSE, 'fr.ird.observe.entities.referentiel.seine.ObjectMaterialType#0#0', false, false);
-INSERT INTO observe_seine.objectMaterial (topiaid, topiaversion, topiacreatedate, lastupdatedate, needComment, status, legacyCode, standardCode, code, parent, label1, label2, selectable, childrenMultiSelectable, childSelectionMandatory, objectMaterialType, biodegradable, nonEntangling) values ('fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#7', 0, CURRENT_DATE, CURRENT_TIMESTAMP, false, 1, '', '', '1-2-1-1', 'fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#6', 'Net with mesh <=3cm', 'Filet avec maille <=3cm', FALSE, TRUE, FALSE, 'fr.ird.observe.entities.referentiel.seine.ObjectMaterialType#0#0', false, false);
-INSERT INTO observe_seine.objectMaterial (topiaid, topiaversion, topiacreatedate, lastupdatedate, needComment, status, legacyCode, standardCode, code, parent, label1, label2, selectable, childrenMultiSelectable, childSelectionMandatory, objectMaterialType, biodegradable, nonEntangling) values ('fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#8', 0, CURRENT_DATE, CURRENT_TIMESTAMP, false, 1, '', '', '1-2-1-1-1', 'fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#7', 'Net with mesh <=3cm above', 'Filet avec maille <=3cm dessus', true, false, false, 'fr.ird.observe.entities.referentiel.seine.ObjectMaterialType#0#0', false, false);
-INSERT INTO observe_seine.objectMaterial (topiaid, topiaversion, topiacreatedate, lastupdatedate, needComment, status, legacyCode, standardCode, code, parent, label1, label2, selectable, childrenMultiSelectable, childSelectionMandatory, objectMaterialType, biodegradable, nonEntangling) values ('fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#9', 0, CURRENT_DATE, CURRENT_TIMESTAMP, false, 1, '', '', '1-2-1-1-2', 'fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#7', 'Net with mesh <=3cm behind', 'Filet avec maille <=3cm dessous', true, false, false, 'fr.ird.observe.entities.referentiel.seine.ObjectMaterialType#0#0', false, false);
-INSERT INTO observe_seine.objectMaterial (topiaid, topiaversion, topiacreatedate, lastupdatedate, needComment, status, legacyCode, standardCode, code, parent, label1, label2, selectable, childrenMultiSelectable, childSelectionMandatory, objectMaterialType, biodegradable, nonEntangling) values ('fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#10', 0, CURRENT_DATE, CURRENT_TIMESTAMP, false, 1, '', '', '1-2-1-2', 'fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#6', 'Net with mesh >3cm', 'Filet avec maille >3cm', FALSE, FALSE, false, 'fr.ird.observe.entities.referentiel.seine.ObjectMaterialType#0#0', false, false);
-INSERT INTO observe_seine.objectMaterial (topiaid, topiaversion, topiacreatedate, lastupdatedate, needComment, status, legacyCode, standardCode, code, parent, label1, label2, selectable, childrenMultiSelectable, childSelectionMandatory, objectMaterialType, biodegradable, nonEntangling) values ('fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#11', 0, CURRENT_DATE, CURRENT_TIMESTAMP, false, 1, '', '', '1-2-1-2-1', 'fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#10', 'Net with mesh >3cm above', 'Filet avec maille >3cm dessus', true, false, false, 'fr.ird.observe.entities.referentiel.seine.ObjectMaterialType#0#0', false, false);
-INSERT INTO observe_seine.objectMaterial (topiaid, topiaversion, topiacreatedate, lastupdatedate, needComment, status, legacyCode, standardCode, code, parent, label1, label2, selectable, childrenMultiSelectable, childSelectionMandatory, objectMaterialType, biodegradable, nonEntangling) values ('fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#12', 0, CURRENT_DATE, CURRENT_TIMESTAMP, false, 1, '', '', '1-2-1-2-2', 'fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#10', 'Net with mesh >3cm behind', 'Filet avec maille >3cm dessous', true, false, false, 'fr.ird.observe.entities.referentiel.seine.ObjectMaterialType#0#0', false, false);
-INSERT INTO observe_seine.objectMaterial (topiaid, topiaversion, topiacreatedate, lastupdatedate, needComment, status, legacyCode, standardCode, code, parent, label1, label2, selectable, childrenMultiSelectable, childSelectionMandatory, objectMaterialType, biodegradable, nonEntangling) values ('fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#13', 0, CURRENT_DATE, CURRENT_TIMESTAMP, false, 1, '', '', '1-2-2', 'fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#5', 'Coverage without mesh', 'Couverture sans maille', FALSE, FALSE, false, 'fr.ird.observe.entities.referentiel.seine.ObjectMaterialType#0#0', false, false);
-INSERT INTO observe_seine.objectMaterial (topiaid, topiaversion, topiacreatedate, lastupdatedate, needComment, status, legacyCode, standardCode, code, parent, label1, label2, selectable, childrenMultiSelectable, childSelectionMandatory, objectMaterialType, biodegradable, nonEntangling) values ('fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#14', 0, CURRENT_DATE, CURRENT_TIMESTAMP, false, 1, '', '', '1-2-2-1', 'fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#13', 'Coverage without mesh above', 'Couverture sans maille dessus', true, false, false, 'fr.ird.observe.entities.referentiel.seine.ObjectMaterialType#0#0', false, false);
-INSERT INTO observe_seine.objectMaterial (topiaid, topiaversion, topiacreatedate, lastupdatedate, needComment, status, legacyCode, standardCode, code, parent, label1, label2, selectable, childrenMultiSelectable, childSelectionMandatory, objectMaterialType, biodegradable, nonEntangling) values ('fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#15', 0, CURRENT_DATE, CURRENT_TIMESTAMP, false, 1, '', '', '1-2-2-2', 'fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#13', 'Coverage without mesh behind', 'Couverture sans maille dessous', true, false, false, 'fr.ird.observe.entities.referentiel.seine.ObjectMaterialType#0#0', false, false);
-INSERT INTO observe_seine.objectMaterial (topiaid, topiaversion, topiacreatedate, lastupdatedate, needComment, status, legacyCode, standardCode, code, parent, label1, label2, selectable, childrenMultiSelectable, childSelectionMandatory, objectMaterialType, biodegradable, nonEntangling) values ('fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#16', 0, CURRENT_DATE, CURRENT_TIMESTAMP, false, 1, '', '', '1-2-3', 'fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#5', 'Not covered', 'Non couvert', FALSE, FALSE, false, 'fr.ird.observe.entities.referentiel.seine.ObjectMaterialType#0#0', false, false);
-INSERT INTO observe_seine.objectMaterial (topiaid, topiaversion, topiacreatedate, lastupdatedate, needComment, status, legacyCode, standardCode, code, parent, label1, label2, selectable, childrenMultiSelectable, childSelectionMandatory, objectMaterialType, biodegradable, nonEntangling) values ('fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#17', 0, CURRENT_DATE, CURRENT_TIMESTAMP, false, 1, '', '', '1-2-3-1', 'fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#16', 'Not covered above', 'Non couvert dessus', true, false, false, 'fr.ird.observe.entities.referentiel.seine.ObjectMaterialType#0#0', false, false);
-INSERT INTO observe_seine.objectMaterial (topiaid, topiaversion, topiacreatedate, lastupdatedate, needComment, status, legacyCode, standardCode, code, parent, label1, label2, selectable, childrenMultiSelectable, childSelectionMandatory, objectMaterialType, biodegradable, nonEntangling) values ('fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#18', 0, CURRENT_DATE, CURRENT_TIMESTAMP, false, 1, '', '', '1-2-3-2', 'fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#16', 'Not covered behind', 'Non couvert dessous', true, false, false, 'fr.ird.observe.entities.referentiel.seine.ObjectMaterialType#0#0', false, false);
-INSERT INTO observe_seine.objectMaterial (topiaid, topiaversion, topiacreatedate, lastupdatedate, needComment, status, legacyCode, standardCode, code, parent, label1, label2, selectable, childrenMultiSelectable, childSelectionMandatory, objectMaterialType, biodegradable, nonEntangling) values ('fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#19', 0, CURRENT_DATE, CURRENT_TIMESTAMP, false, 1, '', '', '1-2-4', 'fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#5', 'Not visible', 'Non visible', false, false, false, 'fr.ird.observe.entities.referentiel.seine.ObjectMaterialType#0#0', false, false);
-INSERT INTO observe_seine.objectMaterial (topiaid, topiaversion, topiacreatedate, lastupdatedate, needComment, status, legacyCode, standardCode, code, parent, label1, label2, selectable, childrenMultiSelectable, childSelectionMandatory, objectMaterialType, biodegradable, nonEntangling) values ('fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#20', 0, CURRENT_DATE, CURRENT_TIMESTAMP, false, 1, '', '', '1-2-4-1', 'fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#19', 'Not visible above', 'Non visible dessus', true, false, false, 'fr.ird.observe.entities.referentiel.seine.ObjectMaterialType#0#0', false, false);
-INSERT INTO observe_seine.objectMaterial (topiaid, topiaversion, topiacreatedate, lastupdatedate, needComment, status, legacyCode, standardCode, code, parent, label1, label2, selectable, childrenMultiSelectable, childSelectionMandatory, objectMaterialType, biodegradable, nonEntangling) values ('fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#21', 0, CURRENT_DATE, CURRENT_TIMESTAMP, false, 1, '', '', '1-2-4-2', 'fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#19', 'Not visible behind', 'Non visible dessous', true, false, false, 'fr.ird.observe.entities.referentiel.seine.ObjectMaterialType#0#0', false, false);
-INSERT INTO observe_seine.objectMaterial (topiaid, topiaversion, topiacreatedate, lastupdatedate, needComment, status, legacyCode, standardCode, code, parent, label1, label2, selectable, childrenMultiSelectable, childSelectionMandatory, objectMaterialType, biodegradable, nonEntangling) values ('fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#22', 0, CURRENT_DATE, CURRENT_TIMESTAMP, false, 1, '', '', '2', NULL, 'Underwater part', 'Partie immergée', false, true, true, 'fr.ird.observe.entities.referentiel.seine.ObjectMaterialType#0#0', false, false);
-INSERT INTO observe_seine.objectMaterial (topiaid, topiaversion, topiacreatedate, lastupdatedate, needComment, status, legacyCode, standardCode, code, parent, label1, label2, selectable, childrenMultiSelectable, childSelectionMandatory, objectMaterialType, biodegradable, nonEntangling) values ('fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#23', 0, CURRENT_DATE, CURRENT_TIMESTAMP, false, 1, '', '', '2-1', 'fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#22', 'Net in sausage', 'Filet saucisse', FALSE, TRUE, FALSE, 'fr.ird.observe.entities.referentiel.seine.ObjectMaterialType#0#0', false, false);
-INSERT INTO observe_seine.objectMaterial (topiaid, topiaversion, topiacreatedate, lastupdatedate, needComment, status, legacyCode, standardCode, code, parent, label1, label2, selectable, childrenMultiSelectable, childSelectionMandatory, objectMaterialType, biodegradable, nonEntangling) values ('fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#24', 0, CURRENT_DATE, CURRENT_TIMESTAMP, false, 1, '', '', '2-1-1', 'fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#24', 'Net in sausage <=3cm', 'Filet saucisse <=3cm', true, false, false, 'fr.ird.observe.entities.referentiel.seine.ObjectMaterialType#0#0', false, false);
-INSERT INTO observe_seine.objectMaterial (topiaid, topiaversion, topiacreatedate, lastupdatedate, needComment, status, legacyCode, standardCode, code, parent, label1, label2, selectable, childrenMultiSelectable, childSelectionMandatory, objectMaterialType, biodegradable, nonEntangling) values ('fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#25', 0, CURRENT_DATE, CURRENT_TIMESTAMP, false, 1, '', '', '2-1-2', 'fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#24', 'Net in sausage >3cm', 'Filet saucisse >3cm', true, false, false, 'fr.ird.observe.entities.referentiel.seine.ObjectMaterialType#0#0', false, false);
-INSERT INTO observe_seine.objectMaterial (topiaid, topiaversion, topiacreatedate, lastupdatedate, needComment, status, legacyCode, standardCode, code, parent, label1, label2, selectable, childrenMultiSelectable, childSelectionMandatory, objectMaterialType, biodegradable, nonEntangling) values ('fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#26', 0, CURRENT_DATE, CURRENT_TIMESTAMP, false, 1, '', '', '2-2', 'fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#22', 'Open net', 'Filet ouvert', FALSE, TRUE, FALSE, 'fr.ird.observe.entities.referentiel.seine.ObjectMaterialType#0#0', false, false);
-INSERT INTO observe_seine.objectMaterial (topiaid, topiaversion, topiacreatedate, lastupdatedate, needComment, status, legacyCode, standardCode, code, parent, label1, label2, selectable, childrenMultiSelectable, childSelectionMandatory, objectMaterialType, biodegradable, nonEntangling) values ('fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#27', 0, CURRENT_DATE, CURRENT_TIMESTAMP, false, 1, '', '', '2-2-1', 'fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#26', 'Open net <= 3cm', 'Filet ouvert <=3cm', true, false, false, 'fr.ird.observe.entities.referentiel.seine.ObjectMaterialType#0#0', false, false);
-INSERT INTO observe_seine.objectMaterial (topiaid, topiaversion, topiacreatedate, lastupdatedate, needComment, status, legacyCode, standardCode, code, parent, label1, label2, selectable, childrenMultiSelectable, childSelectionMandatory, objectMaterialType, biodegradable, nonEntangling) values ('fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#28', 0, CURRENT_DATE, CURRENT_TIMESTAMP, false, 1, '', '', '2-2-2', 'fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#26', 'Open net >3cm', 'Filet ouvert >3cm', true, false, false, 'fr.ird.observe.entities.referentiel.seine.ObjectMaterialType#0#0', false, false);
-INSERT INTO observe_seine.objectMaterial (topiaid, topiaversion, topiacreatedate, lastupdatedate, needComment, status, legacyCode, standardCode, code, parent, label1, label2, selectable, childrenMultiSelectable, childSelectionMandatory, objectMaterialType, biodegradable, nonEntangling) values ('fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#29', 0, CURRENT_DATE, CURRENT_TIMESTAMP, false, 1, '', '', '2-3', 'fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#22', 'Single net pieces', 'Pièces de filets accolées', FALSE, TRUE, FALSE, 'fr.ird.observe.entities.referentiel.seine.ObjectMaterialType#0#0', false, false);
-INSERT INTO observe_seine.objectMaterial (topiaid, topiaversion, topiacreatedate, lastupdatedate, needComment, status, legacyCode, standardCode, code, parent, label1, label2, selectable, childrenMultiSelectable, childSelectionMandatory, objectMaterialType, biodegradable, nonEntangling) values ('fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#30', 0, CURRENT_DATE, CURRENT_TIMESTAMP, false, 1, '', '', '2-3-1', 'fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#29', 'Single net pieces <=3cm', 'Pièces de filets accolées <=3cm', true, false, false, 'fr.ird.observe.entities.referentiel.seine.ObjectMaterialType#0#0', false, false);
-INSERT INTO observe_seine.objectMaterial (topiaid, topiaversion, topiacreatedate, lastupdatedate, needComment, status, legacyCode, standardCode, code, parent, label1, label2, selectable, childrenMultiSelectable, childSelectionMandatory, objectMaterialType, biodegradable, nonEntangling) values ('fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#31', 0, CURRENT_DATE, CURRENT_TIMESTAMP, false, 1, '', '', '2-3-2', 'fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#29', 'Single net pieces >3cm', 'Pièces de filets accolées >3cm', true, false, false, 'fr.ird.observe.entities.referentiel.seine.ObjectMaterialType#0#0', false, false);
-INSERT INTO observe_seine.objectMaterial (topiaid, topiaversion, topiacreatedate, lastupdatedate, needComment, status, legacyCode, standardCode, code, parent, label1, label2, selectable, childrenMultiSelectable, childSelectionMandatory, objectMaterialType, biodegradable, nonEntangling) values ('fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#32', 0, CURRENT_DATE, CURRENT_TIMESTAMP, false, 1, '', '', '2-4', 'fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#22', 'Rope/no mesh', 'Bout/sans maille', true, false, false, 'fr.ird.observe.entities.referentiel.seine.ObjectMaterialType#0#0', false, false);
-INSERT INTO observe_seine.objectMaterial (topiaid, topiaversion, topiacreatedate, lastupdatedate, needComment, status, legacyCode, standardCode, code, parent, label1, label2, selectable, childrenMultiSelectable, childSelectionMandatory, objectMaterialType, biodegradable, nonEntangling) values ('fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#33', 0, CURRENT_DATE, CURRENT_TIMESTAMP, false, 1, '', '', '2-5', 'fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#22', 'Not visible', 'Pas visible', true, false, false, 'fr.ird.observe.entities.referentiel.seine.ObjectMaterialType#0#0', false, false);
-INSERT INTO observe_seine.objectMaterial (topiaid, topiaversion, topiacreatedate, lastupdatedate, needComment, status, legacyCode, standardCode, code, parent, label1, label2, selectable, childrenMultiSelectable, childSelectionMandatory, objectMaterialType, biodegradable, nonEntangling) values ('fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#34', 0, CURRENT_DATE, CURRENT_TIMESTAMP, false, 1, '', '', '2-6', 'fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#22', 'No sub structure', 'Pas de mouillage', true, false, false, 'fr.ird.observe.entities.referentiel.seine.ObjectMaterialType#0#0', false, false);
-INSERT INTO observe_seine.objectMaterial (topiaid, topiaversion, topiacreatedate, lastupdatedate, needComment, status, legacyCode, standardCode, code, parent, label1, label2, selectable, childrenMultiSelectable, childSelectionMandatory, objectMaterialType, biodegradable, nonEntangling) values ('fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#35', 0, CURRENT_DATE, CURRENT_TIMESTAMP, false, 1, '', '', '3', NULL, 'Other elements', 'Autres éléments', FALSE, TRUE, FALSE, 'fr.ird.observe.entities.referentiel.seine.ObjectMaterialType#0#0', false, false);
-INSERT INTO observe_seine.objectMaterial (topiaid, topiaversion, topiacreatedate, lastupdatedate, needComment, status, legacyCode, standardCode, code, parent, label1, label2, selectable, childrenMultiSelectable, childSelectionMandatory, objectMaterialType, biodegradable, nonEntangling) values ('fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#36', 0, CURRENT_DATE, CURRENT_TIMESTAMP, false, 1, '', '', '3-1', 'fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#35', 'Platic containers', 'Bidons plastique', true, false, false, 'fr.ird.observe.entities.referentiel.seine.ObjectMaterialType#0#0', false, false);
-INSERT INTO observe_seine.objectMaterial (topiaid, topiaversion, topiacreatedate, lastupdatedate, needComment, status, legacyCode, standardCode, code, parent, label1, label2, selectable, childrenMultiSelectable, childSelectionMandatory, objectMaterialType, biodegradable, nonEntangling) values ('fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#37', 0, CURRENT_DATE, CURRENT_TIMESTAMP, false, 1, '', '', '3-2', 'fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#35', 'Corks', 'Flotteurs', true, false, false, 'fr.ird.observe.entities.referentiel.seine.ObjectMaterialType#0#0', false, false);
-INSERT INTO observe_seine.objectMaterial (topiaid, topiaversion, topiacreatedate, lastupdatedate, needComment, status, legacyCode, standardCode, code, parent, label1, label2, selectable, childrenMultiSelectable, childSelectionMandatory, objectMaterialType, biodegradable, nonEntangling) values ('fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#38', 0, CURRENT_DATE, CURRENT_TIMESTAMP, false, 1, '', '', '3-3', 'fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#35', 'Bags', 'Sacs', true, false, false, 'fr.ird.observe.entities.referentiel.seine.ObjectMaterialType#0#0', false, false);
-INSERT INTO observe_seine.objectMaterial (topiaid, topiaversion, topiacreatedate, lastupdatedate, needComment, status, legacyCode, standardCode, code, parent, label1, label2, selectable, childrenMultiSelectable, childSelectionMandatory, objectMaterialType, biodegradable, nonEntangling) values ('fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#39', 0, CURRENT_DATE, CURRENT_TIMESTAMP, false, 1, '', '', '3-4', 'fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#35', 'Palms, canes', 'Palmes, tiges', true, false, false, 'fr.ird.observe.entities.referentiel.seine.ObjectMaterialType#0#0', false, false);
-INSERT INTO observe_seine.objectMaterial (topiaid, topiaversion, topiacreatedate, lastupdatedate, needComment, status, legacyCode, standardCode, code, parent, label1, label2, selectable, childrenMultiSelectable, childSelectionMandatory, objectMaterialType, biodegradable, nonEntangling) values ('fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#40', 0, CURRENT_DATE, CURRENT_TIMESTAMP, false, 1, '', '', '3-5', 'fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#35', 'Color belts', 'Rubans colorés', true, false, false, 'fr.ird.observe.entities.referentiel.seine.ObjectMaterialType#0#1', false, false);
-INSERT INTO observe_seine.objectMaterial (topiaid, topiaversion, topiacreatedate, lastupdatedate, needComment, status, legacyCode, standardCode, code, parent, label1, label2, selectable, childrenMultiSelectable, childSelectionMandatory, objectMaterialType, biodegradable, nonEntangling) values ('fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#41', 0, CURRENT_DATE, CURRENT_TIMESTAMP, false, 1, '', '', '3-6', 'fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#35', 'Weights', 'Poids', true, false, false, 'fr.ird.observe.entities.referentiel.seine.ObjectMaterialType#0#2', false, false);
-INSERT INTO observe_seine.objectMaterial (topiaid, topiaversion, topiacreatedate, lastupdatedate, needComment, status, legacyCode, standardCode, code, parent, label1, label2, selectable, childrenMultiSelectable, childSelectionMandatory, objectMaterialType, biodegradable, nonEntangling) values ('fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#42', 0, CURRENT_DATE, CURRENT_TIMESTAMP, false, 1, '', '', '3-7', 'fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#35', 'Entangled animal', 'Animal maillé', true, false, false, 'fr.ird.observe.entities.referentiel.seine.ObjectMaterialType#0#3', false, false);
-UPDATE observe_seine.objectMaterial set label3 = label2 || ' TODO';
=====================================
persistence/src/main/resources/db/migration/6.901/09_fill_object_material-common.sql
=====================================
--- /dev/null
+++ b/persistence/src/main/resources/db/migration/6.901/09_fill_object_material-common.sql
@@ -0,0 +1,107 @@
+---
+-- #%L
+-- ObServe :: Persistence
+-- %%
+-- 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%
+---
+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.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.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);
+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.12', 0, CURRENT_DATE, CURRENT_TIMESTAMP, false, 1, NULL , NULL , '1-1-1-2-1-2' , '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);
+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.13', 0, CURRENT_DATE, CURRENT_TIMESTAMP, false, 1, NULL , NULL , '1-1-1-2-2' , 'fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.9' , 'Coverage without mesh' , 'Revêtement sans maillage' , 'Recubrimiento sin malla' , 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.14', 0, CURRENT_DATE, CURRENT_TIMESTAMP, false, 1, NULL , NULL , '1-1-1-2-3' , 'fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.9' , 'Not covered' , 'Non couvert' , 'Sin recubrimiento' , 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.15', 0, CURRENT_DATE, CURRENT_TIMESTAMP, false, 1, NULL , NULL , '1-1-1-2-4' , 'fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.9' , '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.16', 0, CURRENT_DATE, CURRENT_TIMESTAMP, false, 1, NULL , NULL , '1-1-1-3' , 'fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.3' , 'Inferior coverage' , 'Revêtement inférieur' , 'Recubrimiento inferior' , 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.17', 0, CURRENT_DATE, CURRENT_TIMESTAMP, false, 1, NULL , NULL , '1-1-1-3-1' , 'fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.16', '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.18', 0, CURRENT_DATE, CURRENT_TIMESTAMP, false, 1, NULL , NULL , '1-1-1-3-1-1' , 'fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.17', '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);
+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.19', 0, CURRENT_DATE, CURRENT_TIMESTAMP, false, 1, NULL , NULL , '1-1-1-3-1-2' , 'fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.17', '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);
+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.20', 0, CURRENT_DATE, CURRENT_TIMESTAMP, false, 1, NULL , NULL , '1-1-1-3-2' , 'fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.16', 'Coverage without mesh' , 'Revêtement sans maillage' , 'Recubrimiento sin malla' , 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.21', 0, CURRENT_DATE, CURRENT_TIMESTAMP, false, 1, NULL , NULL , '1-1-1-3-3' , 'fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.16', 'Not covered' , 'Non couvert' , 'Sin recubrimiento' , 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.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.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);
+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.28', 0, CURRENT_DATE, CURRENT_TIMESTAMP, false, 1, NULL , NULL , '1-1-2-2' , 'fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.4' , 'Open net' , 'Filet ouvert' , 'Red abierta' , 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.29', 0, CURRENT_DATE, CURRENT_TIMESTAMP, false, 1, NULL , NULL , '1-1-2-2-1' , 'fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.28', 'Open net with mesh ≤7cm' , 'Filet ouvert avec maillage ≤7cm' , 'Red abierta 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.30', 0, CURRENT_DATE, CURRENT_TIMESTAMP, false, 1, NULL , NULL , '1-1-2-2-2' , 'fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.28', 'Open net with mesh >7cm' , 'Filet ouvert avec maillage >7cm' , 'Red abierta 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.31', 0, CURRENT_DATE, CURRENT_TIMESTAMP, false, 1, NULL , NULL , '1-1-2-3' , 'fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.4' , 'Single net pieces' , 'Pièces de filets accolées' , 'Paños de red sueltos' , 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.32', 0, CURRENT_DATE, CURRENT_TIMESTAMP, false, 1, NULL , NULL , '1-1-2-3-1' , 'fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.31', 'Single net pieces with mesh ≤7cm' , 'Pièces de filets accolées avec maillage ≤7cm' , 'Paños de red sueltos 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.33', 0, CURRENT_DATE, CURRENT_TIMESTAMP, false, 1, NULL , NULL , '1-1-2-3-2' , 'fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.31', 'Single net pieces with mesh >7cm' , 'Pièces de filets accolées avec maillage >7cm' , 'Paños de red sueltos 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.34', 0, CURRENT_DATE, CURRENT_TIMESTAMP, false, 1, NULL , NULL , '1-1-2-4' , 'fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.4' , 'Rope/no mesh' , 'Bout/sans maillage' , 'Cabo/sin red' , 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.35', 0, CURRENT_DATE, CURRENT_TIMESTAMP, false, 1, NULL , NULL , '1-1-2-5' , 'fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.4' , 'Not visible' , 'Pas 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.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.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);
+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.42', 0, CURRENT_DATE, CURRENT_TIMESTAMP, false, 1, NULL , NULL , '1-1-3-4' , 'fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.5' , 'Palms, canes' , 'Palmes, tiges' , 'Palmeras, 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.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.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);
+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.49', 0, CURRENT_DATE, CURRENT_TIMESTAMP, false, 1, NULL , NULL , '1-2-3' , 'fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.46', 'Visual range (in nautical miles)' , 'Rayon de visibilité (en miles nautiques)' , 'Rango de visibilidad' , true , false, false, 'fr.ird.observe.entities.referentiel.seine.ObjectMaterialType#0#1', 'x >= 0.1 && x <= 50' , 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.50', 0, CURRENT_DATE, CURRENT_TIMESTAMP, false, 1, NULL , 'LOG' , '2' , NULL , 'LOG' , 'LOG' , 'LOG' , true , 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.51', 0, CURRENT_DATE, CURRENT_TIMESTAMP, false, 1, NULL , 'NLOG' , '2-1' , 'fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.50', 'NLOG (natural LOG)' , 'NLOG (LOG naturel)' , 'NLOG (LOG natural)' , 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.52', 0, CURRENT_DATE, CURRENT_TIMESTAMP, false, 1, NULL , 'VNLOG' , '2-1-1' , 'fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.51', 'VNLOG (vegetal NLOG)' , 'VNLOG (NLOG vegetal)' , 'VNLOG (NLOG vegetal)' , 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.53', 0, CURRENT_DATE, CURRENT_TIMESTAMP, false, 1, '1' , NULL , '2-1-1-1' , 'fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.52', 'Straw heap' , 'Tas de paille' , 'Monton the hierba' , 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.54', 0, CURRENT_DATE, CURRENT_TIMESTAMP, false, 1, '2' , NULL , '2-1-1-2' , 'fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.52', 'Palm tree, palm' , 'Palmier, palme' , 'Palma, hoja de palmera' , 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.55', 0, CURRENT_DATE, CURRENT_TIMESTAMP, false, 1, '3' , NULL , '2-1-1-3' , 'fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.52', 'Tree, branche' , 'Arbre, branche' , 'Árbol, rama' , 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.56', 0, CURRENT_DATE, CURRENT_TIMESTAMP, false, 1, NULL , 'ANLOG' , '2-1-2' , 'fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.51', 'ANLOG (animal NLOG)' , 'ANLOG (NLOG animal)' , 'ANLOG (NLOG animal)' , 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.57', 0, CURRENT_DATE, CURRENT_TIMESTAMP, false, 1, '4, 5*, 24' , NULL , '2-1-2-1' , 'fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.56', 'Carrion' , 'Charogne' , 'Carroña' , 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.58', 0, CURRENT_DATE, CURRENT_TIMESTAMP, false, 1, NULL , NULL , '2-1-2-2' , 'fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.56', 'Whale shark' , 'Requin-baleine' , 'Tiburón ballena' , 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.59', 0, CURRENT_DATE, CURRENT_TIMESTAMP, false, 1, NULL , 'ALOG' , '2-2' , 'fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.50', 'ALOG (artificial LOG)' , 'ALOG (LOG artificiel)' , 'ALOG (LOG artificial)' , 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.60', 0, CURRENT_DATE, CURRENT_TIMESTAMP, false, 1, '10' , NULL , '2-2-1' , 'fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.59', 'Case, big board' , 'Caisse, grosse planche' , 'Caja, gran tablero' , 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.61', 0, CURRENT_DATE, CURRENT_TIMESTAMP, false, 1, '13' , NULL , '2-2-2' , 'fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.59', 'Plastic object' , 'Objet plastique' , 'Objeto de plastico' , 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.62', 0, CURRENT_DATE, CURRENT_TIMESTAMP, false, 1, '17' , NULL , '2-2-3' , 'fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.59', 'Metallic object' , 'Objet métallique' , 'Objeto de metal' , 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.63', 0, CURRENT_DATE, CURRENT_TIMESTAMP, false, 1, NULL , 'FALOG' , '2-2-4' , 'fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.59', 'FALOG (fishing ALOG)' , 'FALOG (ALOG pêche)' , 'FALOG (ALOG pesca)' , 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.64', 0, CURRENT_DATE, CURRENT_TIMESTAMP, false, 1, '11' , NULL , '2-2-4-1' , 'fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.63', 'Rope, cable' , 'Cordage, câble' , 'Cuerda, cable' , 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.65', 0, CURRENT_DATE, CURRENT_TIMESTAMP, false, 1, '12' , NULL , '2-2-4-2' , 'fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.63', 'Net, piece of net' , 'Filet, morceau de filet' , 'Red, pedazo de red' , 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.66', 0, CURRENT_DATE, CURRENT_TIMESTAMP, false, 1, NULL , NULL , '2-2-4-3' , 'fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.63', 'Inert plastic buoy' , 'Bouée plastique inerte' , 'Boya de plástico inerte' , 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.67', 0, CURRENT_DATE, CURRENT_TIMESTAMP, false, 1, NULL , 'HALOG' , '2-2-5' , 'fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.59', 'HALOG (not fishing ALOG)' , 'HALOG (ALOG non pêche)' , 'HALOG (HALOG no pesca)' , 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.68', 0, CURRENT_DATE, CURRENT_TIMESTAMP, false, 1, NULL , NULL , '4' , NULL , 'Other properties' , 'Autres propriétés' , 'Otras propiedades' , 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.69', 0, CURRENT_DATE, CURRENT_TIMESTAMP, false, 1, NULL , NULL , '4-1' , 'fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.68', 'Biodegradable' , 'Matériaux' , 'Materiales' , 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.70', 0, CURRENT_DATE, CURRENT_TIMESTAMP, false, 1, '22' , NULL , '4-2' , 'fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.68', 'Non entangling' , 'Non maillant' , NULL , 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.71', 0, CURRENT_DATE, CURRENT_TIMESTAMP, false, 1, '23' , NULL , '4-3' , 'fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.68', 'Entangling' , 'Maillant' , 'Enmallante' , 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.72', 0, CURRENT_DATE, CURRENT_TIMESTAMP, false, 1, NULL , NULL , '4-4' , 'fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.68', 'Depth (in m)' , 'Profondeur (en m)' , 'Profundidad (en m)' , true , false, false, 'fr.ird.observe.entities.referentiel.seine.ObjectMaterialType#0#2', 'x >= 0 && x <= 100' , 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.73', 0, CURRENT_DATE, CURRENT_TIMESTAMP, false, 1, NULL , NULL , '4-5' , 'fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.68', 'Area (in m2)' , 'Surface (en m2)' , 'Superficie (en m2)' , true , false, false, 'fr.ird.observe.entities.referentiel.seine.ObjectMaterialType#0#1', 'x >= 0.5 && x <= 50' , 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.74', 0, CURRENT_DATE, CURRENT_TIMESTAMP, false, 1, NULL , NULL , '4-6' , 'fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.68', 'Size of largest mesh' , 'Taille de la maille la plus grande (en mm)' , 'Talla de la malla más grandes (en mm)' , true , false, false, 'fr.ird.observe.entities.referentiel.seine.ObjectMaterialType#0#2', 'x >= 5 && x <= 200' , 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.75', 0, CURRENT_DATE, CURRENT_TIMESTAMP, false, 1, NULL , NULL , '4-7' , 'fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.68', 'FOB identifier' , 'Identifiant du FOB' , 'Identificador del FOB' , true , false, false, 'fr.ird.observe.entities.referentiel.seine.ObjectMaterialType#0#3', 'len(x) >= 3 && len(x) <= 64' , 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.76', 0, CURRENT_DATE, CURRENT_TIMESTAMP, false, 1, NULL , NULL , '4-8' , 'fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.68', 'Number of FOB of this' , 'Nombre de FOB de ce type emmêlés' , NULL , true , false, false, 'fr.ird.observe.entities.referentiel.seine.ObjectMaterialType#0#2', 'x >= 2 && x <= 100' , 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.77', 0, CURRENT_DATE, CURRENT_TIMESTAMP, false, 0, NULL , NULL , '6' , NULL , 'Legacy codes' , 'Anciens codes' , 'Códigos antiguos' , 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.78', 0, CURRENT_DATE, CURRENT_TIMESTAMP, false, 0, '99' , NULL , '6-1' , 'fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.77', 'Other, unknown' , 'Autre, inconnu' , 'Otro, desconocido' , 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.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);
=====================================
persistence/src/main/resources/db/migration/6.901/referential-ObjectMaterial.csv
=====================================
--- /dev/null
+++ b/persistence/src/main/resources/db/migration/6.901/referential-ObjectMaterial.csv
@@ -0,0 +1,87 @@
+code,parent,legacyCode,standardCode,label1,label2,label3,dataType,validation,selectable,childrenMultiSelectable,childSelectionMandatory,status,biodegradable,nonEntangling
+1,,,FAD,FAD,FAD,FAD,,,FALSE,FALSE,FALSE,TRUE,,
+1-1,1,16,DFAD,DFAD (drifting FAD),DFAD (FAD dérivant),DFAD (FAD a la deriva),Boolean,,TRUE,TRUE,FALSE,TRUE,,
+1-1-1,1-1,19,,Experimental FAD,Objet expérimental,Objeto experimental,Boolean,,TRUE,,,FALSE,,
+1-1-2,1-1,18,,Artificial FAD,Objet artificiel,Objeto artificial,Boolean,,TRUE,,,FALSE,,
+1-1-3,1-1,27,,Several FAD entangled,Plusieurs FAD,Objectos enredados,Boolean,,TRUE,,,TRUE,,
+1-1-1-1,1-1-1,,,Frame,Chassis,Estructura,,,FALSE,FALSE,TRUE,TRUE,,
+1-1-1-1-1,1-1-1-1,"6, 15, 25",,"Vegetal, canes,bamboo","Végétal, tiges,bambou","Bambú, cañas",Boolean,,TRUE,,,TRUE,,
+1-1-1-1-2,1-1-1-1,"20, 21*,26",,Metallic or PVC,Métal ou PVC,Metállica ó PVC,Boolean,,TRUE,,,TRUE,,
+1-1-1-2,1-1-1,,,Superior coverage,Revêtement supérieur,Recubrimiento superior,,,FALSE,TRUE,TRUE,TRUE,,
+1-1-1-2-1,1-1-1-2,,,Net,Filet,Red,,,FALSE,TRUE,FALSE,TRUE,,
+1-1-1-2-1-1,1-1-1-2-1,,,Net with mesh ≤7cm,Filet avec maillage ≤7cm,Red con malla ≤7cm,Boolean,,TRUE,,FALSE,TRUE,,
+1-1-1-2-1-2,1-1-1-2-1,,,Net with mesh >7cm,Filet avec maillage >7cm,Red con malla >7cm,Boolean,,TRUE,,FALSE,TRUE,,
+1-1-1-2-2,1-1-1-2,,,Coverage without mesh,Revêtement sans maillage,Recubrimiento sin malla,Boolean,,TRUE,,FALSE,TRUE,,
+1-1-1-2-3,1-1-1-2,,,Not covered,Non couvert,Sin recubrimiento,Boolean,,TRUE,,FALSE,TRUE,,
+1-1-1-2-4,1-1-1-2,,,Not visible,Non visible,No se ve,Boolean,,TRUE,,,TRUE,,
+1-1-1-3,1-1-1,,,Inferior coverage,Revêtement inférieur,Recubrimiento inferior,,,FALSE,TRUE,TRUE,TRUE,,
+1-1-1-3-1,1-1-1-3,,,Net,Filet,Red,,,FALSE,TRUE,FALSE,TRUE,,
+1-1-1-3-1-1,1-1-1-3-1,,,Net with mesh ≤7cm,Filet avec maillage ≤7cm,Red con malla ≤7cm,Boolean,,TRUE,,FALSE,TRUE,,
+1-1-1-3-1-2,1-1-1-3-1,,,Net with mesh >7cm,Filet avec maillage >7cm,Red con malla >7cm,Boolean,,TRUE,,FALSE,TRUE,,
+1-1-1-3-2,1-1-1-3,,,Coverage without mesh,Revêtement sans maillage,Recubrimiento sin malla,Boolean,,TRUE,,FALSE,TRUE,,
+1-1-1-3-3,1-1-1-3,,,Not covered,Non couvert,Sin recubrimiento,Boolean,,TRUE,,FALSE,TRUE,,
+1-1-1-3-4,1-1-1-3,,,Not visible,Non visible,No se ve,Boolean,,TRUE,,,TRUE,,
+1-1-1-4,1-1-1,,,Modified,Modifié,Se modifica,Boolean,,TRUE,,,TRUE,,
+1-1-1-5,1-1-1,,,Replaced,Remplacé,Se reemplaza,Boolean,,TRUE,,,TRUE,,
+1-1-2-1,1-1-2,,,Net in sausage,Filet saucisse,Red en chorizo,,,FALSE,TRUE,FALSE,TRUE,,
+1-1-2-1-1,1-1-2-1,,,Net in sausage with mesh ≤7cm,Filet saucisse avec maillage ≤7cm,Red en chorizo con malla ≤7cm,Boolean,,TRUE,,,FALSE,,
+1-1-2-1-2,1-1-2-1,,,Net in sausage with mesh >7cm,Filet saucisse avec maillage >7cm,Red en chorizo con malla >7cm,Boolean,,TRUE,,,FALSE,,
+1-1-2-2,1-1-2,,,Open net,Filet ouvert,Red abierta,,,FALSE,TRUE,FALSE,TRUE,,
+1-1-2-2-1,1-1-2-2,,,Open net with mesh ≤7cm,Filet ouvert avec maillage ≤7cm,Red abierta con malla ≤7cm,Boolean,,TRUE,,,TRUE,,
+1-1-2-2-2,1-1-2-2,,,Open net with mesh >7cm,Filet ouvert avec maillage >7cm,Red abierta con malla >7cm,Boolean,,TRUE,,,TRUE,,
+1-1-2-3,1-1-2,,,Single net pieces,Pièces de filets accolées,Paños de red sueltos,,,FALSE,TRUE,FALSE,TRUE,,
+1-1-2-3-1,1-1-2-3,,,Single net pieces with mesh ≤7cm,Pièces de filets accolées avec maillage ≤7cm,Paños de red sueltos con malla ≤7cm,Boolean,,TRUE,,,TRUE,,
+1-1-2-3-2,1-1-2-3,,,Single net pieces with mesh >7cm,Pièces de filets accolées avec maillage >7cm,Paños de red sueltos con malla >7cm,Boolean,,TRUE,,,TRUE,,
+1-1-2-4,1-1-2,,,Rope/no mesh,Bout/sans maillage,Cabo/sin red,Boolean,,TRUE,,,TRUE,,
+1-1-2-5,1-1-2,,,Not visible,Pas visible,No se ve,Boolean,,TRUE,,,TRUE,,
+1-1-2-6,1-1-2,,,No subsurface structure,Pas de mouillage,Sin rabo,Boolean,,TRUE,,,TRUE,,
+1-1-2-7,1-1-2,,,Modified,Modifié,Se modifica,Boolean,,TRUE,,,TRUE,,
+1-1-2-8,1-1-2,,,Replaced,Remplacé,Se reemplaza,Boolean,,TRUE,,,TRUE,,
+1-1-3-1,1-1-3,,,Containers,Bidons plastique,Garrafas plástico,Boolean,,TRUE,,,TRUE,,
+1-1-3-2,1-1-3,,,Corks,Flotteurs,Corchos,Boolean,,TRUE,,,TRUE,,
+1-1-3-3,1-1-3,,,Bags,Sacs,Sacos,Boolean,,TRUE,,,TRUE,,
+1-1-3-4,1-1-3,,,"Palms, canes","Palmes, tiges","Palmeras, cañas",Boolean,,TRUE,,,TRUE,,
+1-1-3-5,1-1-3,,,Color belts,Rubans colorés,Cintas de colores,Boolean,,TRUE,,,TRUE,,
+1-1-3-6,1-1-3,,,Weights,Poids,Peso,Boolean,,TRUE,,,TRUE,,
+1-1-3-7,1-1-3,,,Entangled animal,Animal maillé,Animal enmallado,Boolean,,TRUE,,,TRUE,,
+1-2,1,7,AFAD,AFAD (anchored FAD),AFAD (FAD ancré),AFAD (FAD arraigado),Boolean,,TRUE,TRUE,FALSE,TRUE,,
+1-2-1,1-2,,,Radar reflectors,Réflecteurs radar,Reflectores de radar,Boolean,,TRUE,,FALSE,TRUE,,
+1-2-2,1-2,,,Lighting,Eclairage,iluminación,Boolean,,TRUE,,FALSE,TRUE,,
+1-2-3,1-2,,,Visual range (in nautical miles),Rayon de visibilité (en miles nautiques),Rango de visibilidad,float1,x >= 0.1 && x <= 50,TRUE,,FALSE,TRUE,,
+2,,,LOG,LOG,LOG,LOG,,,TRUE,TRUE,FALSE,TRUE,,
+2-1,2,,NLOG,NLOG (natural LOG),NLOG (LOG naturel),NLOG (LOG natural),Boolean,,TRUE,TRUE,FALSE,TRUE,,
+2-1-1,2-1,,VNLOG,VNLOG (vegetal NLOG),VNLOG (NLOG vegetal),VNLOG (NLOG vegetal),Boolean,,TRUE,TRUE,FALSE,TRUE,,
+2-1-1-1,2-1-1,1,,Straw heap,Tas de paille,Monton the hierba,Boolean,,TRUE,,,TRUE,,
+2-1-1-2,2-1-1,2,,"Palm tree, palm","Palmier, palme","Palma, hoja de palmera",Boolean,,TRUE,,,TRUE,,
+2-1-1-3,2-1-1,3,,"Tree, branche","Arbre, branche","Árbol, rama",Boolean,,TRUE,,,TRUE,,
+2-1-2,2-1,,ANLOG,ANLOG (animal NLOG),ANLOG (NLOG animal),ANLOG (NLOG animal),Boolean,,TRUE,TRUE,FALSE,TRUE,,
+2-1-2-1,2-1-2,"4, 5*, 24",,Carrion,Charogne,Carroña,Boolean,,TRUE,,,TRUE,,
+2-1-2-2,2-1-2,,,Whale shark,Requin-baleine,Tiburón ballena,Boolean,,TRUE,,,TRUE,,
+2-2,2,,ALOG,ALOG (artificial LOG),ALOG (LOG artificiel),ALOG (LOG artificial),Boolean,,TRUE,TRUE,FALSE,TRUE,,
+2-2-1,2-2,10,,"Case, big board","Caisse, grosse planche","Caja, gran tablero",Boolean,,TRUE,,,TRUE,,
+2-2-2,2-2,13,,Plastic object,Objet plastique,Objeto de plastico,Boolean,,TRUE,,,TRUE,,
+2-2-3,2-2,17,,Metallic object,Objet métallique,Objeto de metal,Boolean,,TRUE,,,TRUE,,
+2-2-4,2-2,,FALOG,FALOG (fishing ALOG),FALOG (ALOG pêche),FALOG (ALOG pesca),Boolean,,TRUE,TRUE,,TRUE,,
+2-2-4-1,2-2-4,11,,"Rope, cable","Cordage, câble","Cuerda, cable",Boolean,,TRUE,,,TRUE,,
+2-2-4-2,2-2-4,12,,"Net, piece of net","Filet, morceau de filet","Red, pedazo de red",Boolean,,TRUE,,,TRUE,,
+2-2-4-3,2-2-4,,,Inert plastic buoy,Bouée plastique inerte,Boya de plástico inerte,Boolean,,TRUE,,,TRUE,,
+2-2-5,2-2,,HALOG,HALOG (not fishing ALOG),HALOG (ALOG non pêche),HALOG (HALOG no pesca),Boolean,,TRUE,TRUE,FALSE,TRUE,,
+4,,,,Other properties,Autres propriétés,Otras propiedades,,,FALSE,TRUE,FALSE,TRUE,,
+4-1,4,,,Biodegradable,Matériaux,Materiales,Boolean,,TRUE,,,TRUE,,
+4-2,4,22,,Non entangling,Non maillant,,Boolean,,TRUE,,,TRUE,,
+4-3,4,23,,Entangling,Maillant,Enmallante,Boolean,,TRUE,,,TRUE,,
+4-4,4,,,Depth (in m),Profondeur (en m),Profundidad (en m),Integer,x >= 0 && x <= 100,TRUE,,,TRUE,,
+4-5,4,,,Area (in m2),Surface (en m2),Superficie (en m2),float1,x >= 0.5 && x <= 50,TRUE,,,TRUE,,
+4-6,4,,,Size of largest mesh,Taille de la maille la plus grande (en mm),Talla de la malla más grandes (en mm),Integer,x >= 5 && x <= 200,TRUE,,,TRUE,,
+4-7,4,,,FOB identifier,Identifiant du FOB,Identificador del FOB,String,len(x) >= 3 && len(x) <= 64,TRUE,,,TRUE,,
+4-8,4,,,Number of FOB of this,Nombre de FOB de ce type emmêlés,,Integer,x >= 2 && x <= 100,TRUE,,,TRUE,,
+6,,,,Legacy codes,Anciens codes,Códigos antiguos,,,FALSE,TRUE,FALSE,FALSE,,
+6-1,6,99,,"Other, unknown","Autre, inconnu","Otro, desconocido",Boolean,,TRUE,,,,,
+6-2,6,14,ALOG,"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",Boolean,,TRUE,,,,,
+6-3,6,8,,Tuna seiner (or skiff),Thonier (ou skiff),Atunero (oó panga),Boolean,,TRUE,,,,,
+6-4,6,9,,Supply,Bateau d’appui,Macicero,Boolean,,TRUE,,,,,
+6-5,6,"5*, 6*, 21*",,Tagged,Balisé,Marcado,Boolean,,TRUE,,,FALSE,,
+7-1-1,1-1,,,Raft,Radeau,Parrilla,Boolean,,TRUE,TRUE,TRUE,TRUE,,
+7-1-1-1-3,1-1-1-1,,,Mixed vegetal and metallic or PVC,,Mixta (metálica o PVC y cañas),,,,,,,,
+7-1-2,1-1-1-1,,,Subsurface structure,Structure immergée,Rabo,,,FALSE,TRUE,TRUE,TRUE,,
+7-1-3,1-1,,,Other components,Autres éléments,Otros componentes,,,FALSE,TRUE,FALSE,TRUE,,
\ No newline at end of file
=====================================
persistence/src/test/java/fr/ird/observe/persistence/migration/GenerateReferentialObjectMaterial.java
=====================================
--- /dev/null
+++ b/persistence/src/test/java/fr/ird/observe/persistence/migration/GenerateReferentialObjectMaterial.java
@@ -0,0 +1,184 @@
+package fr.ird.observe.persistence.migration;
+
+/*-
+ * #%L
+ * ObServe :: Persistence
+ * %%
+ * 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 com.google.common.collect.ImmutableMap;
+import fr.ird.observe.common.constants.ReferenceStatus;
+import fr.ird.observe.entities.referentiel.seine.ObjectMaterial;
+import fr.ird.observe.entities.referentiel.seine.ObjectMaterialImpl;
+import java.io.BufferedReader;
+import java.io.BufferedWriter;
+import java.io.File;
+import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.util.Collection;
+import org.apache.commons.lang3.mutable.MutableInt;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.junit.Test;
+import org.nuiton.csv.Common;
+import org.nuiton.csv.Import;
+import org.nuiton.csv.ext.AbstractImportModel;
+
+/**
+ * Created by tchemit on 31/07/17.
+ *
+ * @author Tony Chemit - dev(a)tchemit.fr
+ */
+public class GenerateReferentialObjectMaterial {
+
+ // Lines to fxi and readd to file
+
+
+ /** Logger. */
+ private static final Log log = LogFactory.getLog(GenerateReferentialObjectMaterial.class);
+
+ private static final String INSERT = "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 (%-65s, 0, CURRENT_DATE, CURRENT_TIMESTAMP, false, %s, %-15s, %-10s, %-15s, %-65s, %-50s, %-50s, %-50s, %-5s, %-5s, %-5s, %-66s, %-30s, %-5s, %-5s);";
+
+ @Test
+ public void generate() throws IOException {
+
+
+ Path dir = new File("").getAbsoluteFile().toPath()
+ .resolve("src")
+ .resolve("main")
+ .resolve("resources")
+ .resolve("db")
+ .resolve("migration")
+ .resolve("6.901");
+
+ Path sourcePath = dir.resolve("referential-ObjectMaterial.csv");
+ Path targetPath = dir.resolve("09_fill_object_material-common.sql");
+
+ Collection<ObjectMaterial> data = loadData(sourcePath);
+
+ try (BufferedWriter writer = Files.newBufferedWriter(targetPath)) {
+
+ for (ObjectMaterial datum : data) {
+
+ String row = String.format(INSERT
+ , getValue(datum.getTopiaId())
+ , datum.getStatus().ordinal()
+ , getValue(datum.getLegacyCode())
+ , getValue(datum.getStandardCode())
+ , getValue(datum.getCode())
+ , getValue(datum.getParent() == null ? "" : datum.getParent().getTopiaId())
+ , getValue(datum.getLabel1())
+ , getValue(datum.getLabel2())
+ , getValue(datum.getLabel3())
+ , datum.isSelectable()
+ , datum.isChildrenMultiSelectable()
+ , datum.isChildSelectionMandatory()
+ , getValue(datum.getLabel5()==null?"":datum.getLabel5())
+ , getValue(datum.getValidation())
+ , datum.isBiodegradable()
+ , datum.isNonEntangling()
+ );
+ writer.append(row);
+ writer.newLine();
+
+ }
+ }
+
+ }
+
+ private String getValue(String value) {
+ return value.isEmpty() ? "NULL" : ("'" + value + "'");
+ }
+
+ private Collection<ObjectMaterial> loadData(Path sourcePath) throws IOException {
+
+ ImmutableMap.Builder<String, ObjectMaterial> result = ImmutableMap.builder();
+ MutableInt idIndex = new MutableInt(0);
+ try (BufferedReader reader = Files.newBufferedReader(sourcePath)) {
+ Import.newImport(new ImportModel(), reader).forEach(objectMaterial -> {
+
+ objectMaterial.setTopiaId("fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0." + idIndex.incrementAndGet());
+
+ log.info(String.format("Loading %s (%s)", objectMaterial.getCode(), objectMaterial.getTopiaId()));
+ String dataType = objectMaterial.getLabel5();
+ objectMaterial.setLabel5(null);
+ if (dataType != null) {
+ switch (dataType.trim().toLowerCase()) {
+ case "boolean":
+ objectMaterial.setLabel5("fr.ird.observe.entities.referentiel.seine.ObjectMaterialType#0#0");
+ break;
+ case "integer":
+ objectMaterial.setLabel5("fr.ird.observe.entities.referentiel.seine.ObjectMaterialType#0#2");
+ break;
+ case "string":
+ objectMaterial.setLabel5("fr.ird.observe.entities.referentiel.seine.ObjectMaterialType#0#3");
+ break;
+ case "float1":
+ objectMaterial.setLabel5("fr.ird.observe.entities.referentiel.seine.ObjectMaterialType#0#1");
+ break;
+
+ }
+ }
+ String status = objectMaterial.getLabel6();
+ objectMaterial.setLabel6(null);
+ Boolean statusB = status == null ? null : Boolean.valueOf(status);
+ objectMaterial.setStatus(statusB != null && statusB ? ReferenceStatus.enabled : ReferenceStatus.disabled);
+ result.put(objectMaterial.getCode(), objectMaterial);
+ });
+ }
+ ImmutableMap<String, ObjectMaterial> map = result.build();
+ for (ObjectMaterial objectMaterial : map.values()) {
+ String parentCode = objectMaterial.getLabel4();
+ objectMaterial.setLabel4(null);
+ if (parentCode != null) {
+ ObjectMaterial parent = map.get(parentCode);
+ objectMaterial.setParent(parent);
+ }
+ }
+ return map.values();
+ }
+
+ private static class ImportModel extends AbstractImportModel<ObjectMaterial> {
+
+ ImportModel() {
+ super(',');
+ newMandatoryColumn(ObjectMaterial.PROPERTY_CODE);
+ newMandatoryColumn(ObjectMaterial.PROPERTY_LEGACY_CODE);
+ newMandatoryColumn(ObjectMaterial.PROPERTY_STANDARD_CODE);
+ newMandatoryColumn(ObjectMaterial.PROPERTY_BIODEGRADABLE, Common.PRIMITIVE_BOOLEAN);
+ newMandatoryColumn(ObjectMaterial.PROPERTY_NON_ENTANGLING, Common.PRIMITIVE_BOOLEAN);
+ newMandatoryColumn(ObjectMaterial.PROPERTY_SELECTABLE, Common.PRIMITIVE_BOOLEAN);
+ newMandatoryColumn(ObjectMaterial.PROPERTY_CHILD_SELECTION_MANDATORY, Common.PRIMITIVE_BOOLEAN);
+ newMandatoryColumn(ObjectMaterial.PROPERTY_CHILDREN_MULTI_SELECTABLE, Common.PRIMITIVE_BOOLEAN);
+ newMandatoryColumn(ObjectMaterial.PROPERTY_LABEL1);
+ newMandatoryColumn(ObjectMaterial.PROPERTY_LABEL2);
+ newMandatoryColumn(ObjectMaterial.PROPERTY_LABEL3);
+ newMandatoryColumn(ObjectMaterial.PROPERTY_VALIDATION);
+ newMandatoryColumn("parent", ObjectMaterial.PROPERTY_LABEL4);
+ newMandatoryColumn("dataType", ObjectMaterial.PROPERTY_LABEL5);
+ newMandatoryColumn("status", ObjectMaterial.PROPERTY_LABEL6);
+ }
+
+ @Override
+ public ObjectMaterial newEmptyInstance() {
+ return new ObjectMaterialImpl();
+ }
+ }
+}
=====================================
services-topia/src/main/java/fr/ird/observe/services/binder/referential/seine/ObjectMaterialBinder.java
=====================================
--- a/services-topia/src/main/java/fr/ird/observe/services/binder/referential/seine/ObjectMaterialBinder.java
+++ b/services-topia/src/main/java/fr/ird/observe/services/binder/referential/seine/ObjectMaterialBinder.java
@@ -22,6 +22,7 @@ package fr.ird.observe.services.binder.referential.seine;
* #L%
*/
+import fr.ird.observe.entities.referentiel.I18nReferentialEntity;
import fr.ird.observe.entities.referentiel.seine.ObjectMaterial;
import fr.ird.observe.entities.referentiel.seine.ObjectMaterialType;
import fr.ird.observe.services.binder.referential.ReferentialBinderSupport;
@@ -80,7 +81,7 @@ public class ObjectMaterialBinder extends ReferentialBinderSupport<ObjectMateria
return toReferentialReference(entity,
entity.getCode(), getLabel(referentialLocale, entity),
Optional.ofNullable(entity.getParent()).map(ObjectMaterial::getTopiaId).orElse(null),
- entity.getObjectMaterialType().getTopiaId(),
+ Optional.ofNullable(entity.getObjectMaterialType()).map(I18nReferentialEntity::getTopiaId).orElse(null),
entity.getValidation());
}
=====================================
services-topia/src/test/java/fr/ird/observe/services/topia/service/actions/validate/ValidateServiceTopiaTest.java
=====================================
--- a/services-topia/src/test/java/fr/ird/observe/services/topia/service/actions/validate/ValidateServiceTopiaTest.java
+++ b/services-topia/src/test/java/fr/ird/observe/services/topia/service/actions/validate/ValidateServiceTopiaTest.java
@@ -199,7 +199,7 @@ public class ValidateServiceTopiaTest extends AbstractServiceTopiaTest {
assertValidateResultForReferentialDtoType(resultByType, ObjectOperationDto.class, 10);
assertValidateResultForReferentialDtoType(resultByType, ObjectTypeDto.class, 23);
assertValidateResultForReferentialDtoType(resultByType, ObjectMaterialTypeDto.class, 4);
- assertValidateResultForReferentialDtoType(resultByType, ObjectMaterialDto.class, 43);
+ assertValidateResultForReferentialDtoType(resultByType, ObjectMaterialDto.class, 86);
assertValidateResultForReferentialDtoType(resultByType, ObservedSystemDto.class, 21);
assertValidateResultForReferentialDtoType(resultByType, ReasonForDiscardDto.class, 5);
assertValidateResultForReferentialDtoType(resultByType, ReasonForNoFishingDto.class, 13);
=====================================
services-topia/src/test/java/fr/ird/observe/services/topia/service/data/seine/FloatingObjectServiceTopiaTest.java
=====================================
--- a/services-topia/src/test/java/fr/ird/observe/services/topia/service/data/seine/FloatingObjectServiceTopiaTest.java
+++ b/services-topia/src/test/java/fr/ird/observe/services/topia/service/data/seine/FloatingObjectServiceTopiaTest.java
@@ -52,7 +52,7 @@ public class FloatingObjectServiceTopiaTest extends AbstractServiceTopiaTest {
List<ObjectMaterialHierarchyDto> form = service.getObjectMaterialHierarchy();
Assert.assertNotNull(form);
- Assert.assertEquals(3, form.size());
+ Assert.assertEquals(4, form.size());
}
=====================================
test/src/main/java/fr/ird/observe/test/ObserveFixtures.java
=====================================
--- a/test/src/main/java/fr/ird/observe/test/ObserveFixtures.java
+++ b/test/src/main/java/fr/ird/observe/test/ObserveFixtures.java
@@ -101,7 +101,7 @@ public class ObserveFixtures {
.<String, Long>builder()
.put("observe_seine.detectionmode", 11L)
.put("observe_seine.objectoperation", 10L)
- .put("observe_seine.objectmaterial", 43L)
+ .put("observe_seine.objectmaterial", 86L)
.put("observe_seine.objectmaterialtype", 4L)
.put("observe_seine.objecttype", 27L)
.put("observe_seine.observedsystem", 21L)
=====================================
test/src/main/resources/db/6.901/dataForTestLongline.sql.gz
=====================================
Binary files a/test/src/main/resources/db/6.901/dataForTestLongline.sql.gz and b/test/src/main/resources/db/6.901/dataForTestLongline.sql.gz differ
=====================================
test/src/main/resources/db/6.901/dataForTestSeine.sql.gz
=====================================
Binary files a/test/src/main/resources/db/6.901/dataForTestSeine.sql.gz and b/test/src/main/resources/db/6.901/dataForTestSeine.sql.gz differ
=====================================
test/src/main/resources/db/6.901/empty_h2.sql.gz
=====================================
Binary files a/test/src/main/resources/db/6.901/empty_h2.sql.gz and b/test/src/main/resources/db/6.901/empty_h2.sql.gz differ
=====================================
test/src/main/resources/db/6.901/empty_pg.sql.gz
=====================================
Binary files a/test/src/main/resources/db/6.901/empty_pg.sql.gz and b/test/src/main/resources/db/6.901/empty_pg.sql.gz differ
=====================================
test/src/main/resources/db/6.901/referentiel.sql.gz
=====================================
Binary files a/test/src/main/resources/db/6.901/referentiel.sql.gz and b/test/src/main/resources/db/6.901/referentiel.sql.gz differ
View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/373c225e2fc2c2e52d1159558a…
---
View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/373c225e2fc2c2e52d1159558a…
You're receiving this email because of your account on gitlab.com.
1
0
[Git][ultreiaio/ird-observe][develop] 2 commits: Ajout du fichier de construction du référentiel ObjectMaterial
by Tony CHEMIT 31 Jul '17
by Tony CHEMIT 31 Jul '17
31 Jul '17
Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe
Commits:
bded8c15 by Tony CHEMIT at 2017-07-31T11:52:51+02:00
Ajout du fichier de construction du référentiel ObjectMaterial
- - - - -
373c225e by Tony CHEMIT at 2017-07-31T11:53:00+02:00
Suppression images inutiles
- - - - -
6 changed files:
- − doc/images/error.png
- − doc/images/info.png
- − doc/images/ok.png
- − doc/images/question.png
- − doc/images/warning.png
- + persistence/src/main/resources/db/migration/6.901/referential-ObjectMaterial.csv
Changes:
=====================================
doc/images/error.png deleted
=====================================
Binary files a/doc/images/error.png and /dev/null differ
=====================================
doc/images/info.png deleted
=====================================
Binary files a/doc/images/info.png and /dev/null differ
=====================================
doc/images/ok.png deleted
=====================================
Binary files a/doc/images/ok.png and /dev/null differ
=====================================
doc/images/question.png deleted
=====================================
Binary files a/doc/images/question.png and /dev/null differ
=====================================
doc/images/warning.png deleted
=====================================
Binary files a/doc/images/warning.png and /dev/null differ
=====================================
persistence/src/main/resources/db/migration/6.901/referential-ObjectMaterial.csv
=====================================
--- /dev/null
+++ b/persistence/src/main/resources/db/migration/6.901/referential-ObjectMaterial.csv
@@ -0,0 +1,87 @@
+Code,parent,legacyCode,standardCode,label1,label2,label3,dataType,validation,selectable,childrenMultiSelectable,childSelectionMandatory,status,biodegradable,nonTangling
+1,,,FAD,FAD,FAD,FAD,,,FALSE,FALSE,FALSE,TRUE,,
+1-1,1,16,DFAD,DFAD (drifting FAD),DFAD (FAD dérivant),DFAD (FAD a la deriva),Boolean,,TRUE,TRUE,FALSE,TRUE,,
+1-1-1,1-1,19,,Experimental FAD,Objet expérimental,Objeto experimental,Boolean,,TRUE,,,FALSE,,
+1-1-2,1-1,18,,Artificial FAD,Objet artificiel,Objeto artificial,Boolean,,TRUE,,,FALSE,,
+1-1-3,1-1,27,,Several FAD entangled,Plusieurs FAD,Objectos enredados,Boolean,,TRUE,,,TRUE,,
+1-1-1,1-1,,,Raft,Radeau,Parrilla,Boolean,,TRUE,TRUE,TRUE,TRUE,,
+1-1-1-1,1-1-1,,,Frame,Chassis,Estructura,,,FALSE,FALSE,TRUE,TRUE,,
+1-1-1-1-1,1-1-1-1,"6, 15, 25",,"Vegetal, canes,bamboo","Végétal, tiges,bambou","Bambú, cañas",Boolean,,TRUE,,,TRUE,,
+1-1-1-1-2,1-1-1-1,"20, 21*,26",,Metallic or PVC,Métal ou PVC,Metállica ó PVC,Boolean,,TRUE,,,TRUE,,
+1-1-1-1-3,1-1-1-1,,,Mixed vegetal and metallic or PVC,,Mixta (metálica o PVC y cañas),,,,,,,,
+1-1-1-2,1-1-1,,,Superior coverage,Revêtement supérieur,Recubrimiento superior,,,FALSE,TRUE,TRUE,TRUE,,
+1-1-1-2-1,1-1-1-2,,,Net,Filet,Red,,,FALSE,TRUE,FALSE,TRUE,,
+1-1-1-2-1-1,1-1-1-2-1,,,Net with mesh <=7cm,Filet avec maillage ≤7cm,Red con malla <=7cm,Boolean,,TRUE,,FALSE,TRUE,,
+1-1-1-2-1-2,1-1-1-2-1,,,Net with mesh >7cm,Filet avec maillage >7cm,Red con malla >7cm,Boolean,,TRUE,,FALSE,TRUE,,
+1-1-1-2-2,1-1-1-2,,,Coverage without mesh,Revêtement sans maillage,Recubrimiento sin malla,Boolean,,TRUE,,FALSE,TRUE,,
+1-1-1-2-3,1-1-1-2,,,Not covered,Non couvert,Sin recubrimiento,Boolean,,TRUE,,FALSE,TRUE,,
+1-1-1-2-4,1-1-1-2,,,Not visible,Non visible,No se ve,Boolean,,TRUE,,,TRUE,,
+1-1-1-3,1-1-1,,,Inferior coverage,Revêtement inférieur,Recubrimiento inferior,,,FALSE,TRUE,TRUE,TRUE,,
+1-1-1-3-1,1-1-1-3,,,Net,Filet,Red,,,FALSE,TRUE,FALSE,TRUE,,
+1-1-1-3-1-1,1-1-1-3-1,,,Net with mesh <=7cm,Filet avec maillage ≤7cm,Red con malla <=7cm,Boolean,,TRUE,,FALSE,TRUE,,
+1-1-1-3-1-2,1-1-1-3-1,,,Net with mesh >7cm,Filet avec maillage >7cm,Red con malla >7cm,Boolean,,TRUE,,FALSE,TRUE,,
+1-1-1-3-2,1-1-1-3,,,Coverage without mesh,Revêtement sans maillage,Recubrimiento sin malla,Boolean,,TRUE,,FALSE,TRUE,,
+1-1-1-3-3,1-1-1-3,,,Not covered,Non couvert,Sin recubrimiento,Boolean,,TRUE,,FALSE,TRUE,,
+1-1-1-3-4,1-1-1-3,,,Not visible,Non visible,No se ve,Boolean,,TRUE,,,TRUE,,
+1-1-1-4,1-1-1,,,Modified,Modifié,Se modifica,Boolean,,TRUE,,,TRUE,,
+1-1-1-5,1-1-1,,,Replaced,Remplacé,Se reemplaza,Boolean,,TRUE,,,TRUE,,
+1-1-2,1-1-1-1,,,Subsurface structure,Structure immergée,Rabo,,,FALSE,TRUE,TRUE,TRUE,,
+1-1-2-1,1-1-2,,,Net in sausage,Filet saucisse,Red en chorizo,,,FALSE,TRUE,FALSE,TRUE,,
+1-1-2-1-1,1-1-2-1,,,Net in sausage with mesh <=7cm,Filet saucisse avec maillage <=7cm,Red en chorizo con malla <=7cm,Boolean,,TRUE,,,FALSE,,
+1-1-2-1-2,1-1-2-1,,,Net in sausage with mesh >7cm,Filet saucisse avec maillage >7cm,Red en chorizo con malla >7cm,Boolean,,TRUE,,,FALSE,,
+1-1-2-2,1-1-2,,,Open net,Filet ouvert,Red abierta,,,FALSE,TRUE,FALSE,TRUE,,
+1-1-2-2-1,1-1-2-2,,,Open net with mesh <=7cm,Filet ouvert avec maillage <=7cm,Red abierta con malla <=7cm,Boolean,,TRUE,,,TRUE,,
+1-1-2-2-2,1-1-2-2,,,Open net with mesh >7cm,Filet ouvert avec maillage >7cm,Red abierta con malla >7cm,Boolean,,TRUE,,,TRUE,,
+1-1-2-3,1-1-2,,,Single net pieces,Pièces de filets accolées,Paños de red sueltos,,,FALSE,TRUE,FALSE,TRUE,,
+1-1-2-3-1,1-1-2-3,,,Single net pieces with mesh <=7cm,Pièces de filets accolées avec maillage <=7cm,Paños de red sueltos con malla <=7cm,Boolean,,TRUE,,,TRUE,,
+1-1-2-3-2,1-1-2-3,,,Single net pieces with mesh >7cm,Pièces de filets accolées avec maillage >7cm,Paños de red sueltos con malla >7cm,Boolean,,TRUE,,,TRUE,,
+1-1-2-4,1-1-2,,,Rope/no mesh,Bout/sans maillage,Cabo/sin red,Boolean,,TRUE,,,TRUE,,
+1-1-2-5,1-1-2,,,Not visible,Pas visible,No se ve,Boolean,,TRUE,,,TRUE,,
+1-1-2-6,1-1-2,,,No subsurface structure,Pas de mouillage,Sin rabo,Boolean,,TRUE,,,TRUE,,
+1-1-2-7,1-1-2,,,Modified,Modifié,Se modifica,Boolean,,TRUE,,,TRUE,,
+1-1-2-8,1-1-2,,,Replaced,Remplacé,Se reemplaza,Boolean,,TRUE,,,TRUE,,
+1-1-3,1-1,,,Other components,Autres éléments,Otros componentes,,,FALSE,TRUE,FALSE,TRUE,,
+1-1-3-1,1-1-3,,,Containers,Bidons plastique,Garrafas plástico,Boolean,,TRUE,,,TRUE,,
+1-1-3-2,1-1-3,,,Corks,Flotteurs,Corchos,Boolean,,TRUE,,,TRUE,,
+1-1-3-3,1-1-3,,,Bags,Sacs,Sacos,Boolean,,TRUE,,,TRUE,,
+1-1-3-4,1-1-3,,,"Palms, canes","Palmes, tiges","Palmeras, cañas",Boolean,,TRUE,,,TRUE,,
+1-1-3-5,1-1-3,,,Color belts,Rubans colorés,Cintas de colores,Boolean,,TRUE,,,TRUE,,
+1-1-3-6,1-1-3,,,Weights,Poids,Peso,Boolean,,TRUE,,,TRUE,,
+1-1-3-7,1-1-3,,,Entangled animal,Animal maillé,Animal enmallado,Boolean,,TRUE,,,TRUE,,
+1-2,1,7,AFAD,AFAD (anchored FAD),AFAD (FAD ancré),AFAD (FAD arraigado),Boolean,,TRUE,TRUE,FALSE,TRUE,,
+1-2-1,1-2,,,Radar reflectors,Réflecteurs radar,Reflectores de radar,Boolean,,TRUE,,FALSE,TRUE,,
+1-2-2,1-2,,,Lighting,Eclairage,iluminación,Boolean,,TRUE,,FALSE,TRUE,,
+1-2-3,1-2,,,Visual range (in nautical miles),Rayon de visibilité (en miles nautiques),Rango de visibilidad,Float,X ≥ 0.1 && x ≤ 50,TRUE,,FALSE,TRUE,,
+2,,,LOG,LOG,LOG,LOG,,,TRUE,TRUE,FALSE,TRUE,,
+2-1,2,,NLOG,NLOG (natural LOG),NLOG (LOG naturel),NLOG (LOG natural),Boolean,,TRUE,TRUE,FALSE,TRUE,,
+2-1-1,2-1,,VNLOG,VNLOG (vegetal NLOG),VNLOG (NLOG vegetal),VNLOG (NLOG vegetal),Boolean,,TRUE,TRUE,FALSE,TRUE,,
+2-1-1-1,2-1-1,1,,Straw heap,Tas de paille,Monton the hierba,Boolean,,TRUE,,,TRUE,,
+2-1-1-2,2-1-1,2,,"Palm tree, palm","Palmier, palme","Palma, hoja de palmera",Boolean,,TRUE,,,TRUE,,
+2-1-1-3,2-1-1,3,,"Tree, branche","Arbre, branche","Árbol, rama",Boolean,,TRUE,,,TRUE,,
+2-1-2,2-1,,ANLOG,ANLOG (animal NLOG),ANLOG (NLOG animal),ANLOG (NLOG animal),Boolean,,TRUE,TRUE,FALSE,TRUE,,
+2-1-2-1,2-1-2,"4, 5*, 24",,Carrion,Charogne,Carroña,Boolean,,TRUE,,,TRUE,,
+2-1-2-2,2-1-2,,,Whale shark,Requin-baleine,Tiburón ballena,Boolean,,TRUE,,,TRUE,,
+2-2,2,,ALOG,ALOG (artificial LOG),ALOG (LOG artificiel),ALOG (LOG artificial),Boolean,,TRUE,TRUE,FALSE,TRUE,,
+2-2-1,2-2,10,,"Case, big board","Caisse, grosse planche","Caja, gran tablero",Boolean,,TRUE,,,TRUE,,
+2-2-2,2-2,13,,Plastic object,Objet plastique,Objeto de plastico,Boolean,,TRUE,,,TRUE,,
+2-2-3,2-2,17,,Metallic object,Objet métallique,Objeto de metal,Boolean,,TRUE,,,TRUE,,
+2-2-4,2-2,,FALOG,FALOG (fishing ALOG),FALOG (ALOG pêche),FALOG (ALOG pesca),Boolean,,TRUE,TRUE,,TRUE,,
+2-2-4-1,2-2-4,11,,"Rope, cable","Cordage, câble","Cuerda, cable",Boolean,,TRUE,,,TRUE,,
+2-2-4-2,2-2-4,12,,"Net, piece of net","Filet, morceau de filet","Red, pedazo de red",Boolean,,TRUE,,,TRUE,,
+2-2-4-3,2-2-4,,,Inert plastic buoy,Bouée plastique inerte,Boya de plástico inerte,Boolean,,TRUE,,,TRUE,,
+2-2-5,2-2,,HALOG,HALOG (not fishing ALOG),HALOG (ALOG non pêche),HALOG (HALOG no pesca),Boolean,,TRUE,TRUE,FALSE,TRUE,,
+4,,,,Other properties,Autres propriétés,Otras propiedades,,,FALSE,TRUE,FALSE,TRUE,,
+4-1,4,,,Biodegradable,Matériaux,Materiales,Boolean,,TRUE,,,TRUE,,
+4-2,4,22,,Non entangling,Non maillant,,Boolean,,TRUE,,,TRUE,,
+4-3,4,23,,Entangling,Maillant,Enmallante,Boolean,,TRUE,,,TRUE,,
+4-4,4,,,Depth (in m),Profondeur (en m),Profundidad (en m),Integer,x >=0 && x ≤ 100,TRUE,,,TRUE,,
+4-5,4,,,Area (in m2),Surface (en m2),Superficie (en m2),Float,X ≥ 0.5 && x ≤ 50,TRUE,,,TRUE,,
+4-6,4,,,Size of largest mesh,Taille de la maille la plus grande (en mm),Talla de la malla más grandes (en mm),Integer,X ≥ 5 && x ≤ 200,TRUE,,,TRUE,,
+4-7,4,,,FOB identifier,Identifiant du FOB,Identificador del FOB,String,len(x) ≥ 3 && len(x) ≤ 64,TRUE,,,TRUE,,
+4-8,4,,,Number of FOB of this,Nombre de FOB de ce type emmêlés,,Integer,X ≥ 2 && x ≤ 100,TRUE,,,TRUE,,
+6,,,,Legacy codes,Anciens codes,Códigos antiguos,,,FALSE,TRUE,FALSE,FALSE,,
+6-1,6,99,,"Other, unknown","Autre, inconnu","Otro, desconocido",Boolean,,TRUE,,,,,
+6-2,6,14,ALOG,"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",Boolean,,TRUE,,,,,
+6-3,6,8,,Tuna seiner (or skiff),Thonier (ou skiff),Atunero (oó panga),Boolean,,TRUE,,,,,
+6-4,6,9,,Supply,Bateau d’appui,Macicero,Boolean,,TRUE,,,,,
+6-5,6,"5*, 6*, 21*",,Tagged,Balisé,Marcado,Boolean,,TRUE,,,FALSE,,
View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/b01ded0cb48f1b1a669dbef4bd…
---
View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/b01ded0cb48f1b1a669dbef4bd…
You're receiving this email because of your account on gitlab.com.
1
0
[Git][ultreiaio/ird-observe][develop] Speed up connection opening (See #805)
by Tony CHEMIT 31 Jul '17
by Tony CHEMIT 31 Jul '17
31 Jul '17
Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe
Commits:
b01ded0c by Tony CHEMIT at 2017-07-31T11:22:30+02:00
Speed up connection opening (See #805)
- - - - -
4 changed files:
- application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/storage/UseRemoteConfigurationUIAction.java
- application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/storage/UseServerConfigurationUIAction.java
- application-swing/src/main/java/fr/ird/observe/application/swing/ui/storage/tabs/ChooseDbModeUI.jcss
- application-swing/src/main/java/fr/ird/observe/application/swing/ui/storage/tabs/ChooseDbModeUIHandler.java
Changes:
=====================================
application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/storage/UseRemoteConfigurationUIAction.java
=====================================
--- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/storage/UseRemoteConfigurationUIAction.java
+++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/storage/UseRemoteConfigurationUIAction.java
@@ -78,7 +78,8 @@ public class UseRemoteConfigurationUIAction extends AbstractUIAction {
SwingUtilities.invokeLater(() -> {
configUI.getTestRemoteAction().doClick();
if (ConnexionStatus.SUCCESS == configUI.getModel().getConnexionStatus()) {
- parentContainer.getNextAction().requestFocusInWindow();
+ parentContainer.getNextAction().doClick();
+ parentContainer.getApplyAction().doClick();
}
});
}
=====================================
application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/storage/UseServerConfigurationUIAction.java
=====================================
--- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/storage/UseServerConfigurationUIAction.java
+++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/storage/UseServerConfigurationUIAction.java
@@ -79,7 +79,8 @@ public class UseServerConfigurationUIAction extends AbstractUIAction {
SwingUtilities.invokeLater(() -> {
configUI.getTestRemoteAction().doClick();
if (ConnexionStatus.SUCCESS == configUI.getModel().getConnexionStatus()) {
- parentContainer.getNextAction().requestFocusInWindow();
+ parentContainer.getNextAction().doClick();
+ parentContainer.getApplyAction().doClick();
}
});
=====================================
application-swing/src/main/java/fr/ird/observe/application/swing/ui/storage/tabs/ChooseDbModeUI.jcss
=====================================
--- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/storage/tabs/ChooseDbModeUI.jcss
+++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/storage/tabs/ChooseDbModeUI.jcss
@@ -37,6 +37,7 @@
text:{I18nEnumHelper.getLabel(DbMode.USE_LOCAL)};
enabled:{model.isCanUseLocalService()};
selected:{model.getDbMode() == DbMode.USE_LOCAL};
+ _changeStep:true;
}
#createLocalMode {
@@ -51,6 +52,7 @@
text:{I18nEnumHelper.getLabel(DbMode.USE_REMOTE)};
enabled:{model.isCanUseRemoteService()};
selected:{model.getDbMode() == DbMode.USE_REMOTE};
+ _changeStep:true;
}
#useServerMode {
@@ -58,6 +60,7 @@
text:{I18nEnumHelper.getLabel(DbMode.USE_SERVER)};
enabled:{model.isCanUseServerService()};
selected:{model.getDbMode() == DbMode.USE_SERVER};
+ _changeStep:true;
}
#dbModeContent {
@@ -87,12 +90,14 @@
text:{getHandler().updateInternalDumpModeLabel(config.isInitialDumpExist())};
visible:{getHandler().updateCreationModeLayout(config.isInitialDumpExist(), importInternalDumpMode)};
selected:{model.getCreationMode() == CreationMode.IMPORT_INTERNAL_DUMP};
+ _changeStep:true;
}
#importExternalDumpMode {
value:{CreationMode.IMPORT_EXTERNAL_DUMP};
text:{I18nEnumHelper.getLabel(CreationMode.IMPORT_EXTERNAL_DUMP)};
selected:{model.getCreationMode() == CreationMode.IMPORT_EXTERNAL_DUMP};
+ _changeStep:true;
}
/** non utilisé dans cette version d'ObServe */
@@ -102,18 +107,21 @@
value:{CreationMode.IMPORT_LOCAL_STORAGE};
text:{I18nEnumHelper.getLabel(CreationMode.IMPORT_LOCAL_STORAGE)};
selected:{model.getCreationMode() == CreationMode.IMPORT_LOCAL_STORAGE};
+ _changeStep:true;
}
#importRemoteStorageMode {
value:{CreationMode.IMPORT_REMOTE_STORAGE};
text:{I18nEnumHelper.getLabel(CreationMode.IMPORT_REMOTE_STORAGE)};
selected:{model.getCreationMode() == CreationMode.IMPORT_REMOTE_STORAGE};
+ _changeStep:true;
}
#importServerStorageMode {
value:{CreationMode.IMPORT_SERVER_STORAGE};
text:{I18nEnumHelper.getLabel(CreationMode.IMPORT_SERVER_STORAGE)};
selected:{model.getCreationMode() == CreationMode.IMPORT_SERVER_STORAGE};
+ _changeStep:true;
}
#migrationContent {
=====================================
application-swing/src/main/java/fr/ird/observe/application/swing/ui/storage/tabs/ChooseDbModeUIHandler.java
=====================================
--- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/storage/tabs/ChooseDbModeUIHandler.java
+++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/storage/tabs/ChooseDbModeUIHandler.java
@@ -26,15 +26,26 @@ import fr.ird.observe.application.swing.I18nEnumHelper;
import fr.ird.observe.application.swing.ObserveSwingApplicationContext;
import fr.ird.observe.application.swing.ObserveTextGenerator;
import fr.ird.observe.application.swing.configuration.constants.CreationMode;
+import fr.ird.observe.application.swing.ui.ObserveKeyStrokes;
import fr.ird.observe.application.swing.ui.storage.StorageStep;
+import fr.ird.observe.application.swing.ui.storage.StorageUI;
import fr.ird.observe.application.swing.ui.storage.StorageUIModel;
import java.awt.Component;
+import java.awt.event.ActionEvent;
import java.beans.PropertyChangeListener;
import java.io.File;
import java.util.Date;
+import java.util.Enumeration;
+import javax.swing.AbstractAction;
+import javax.swing.AbstractButton;
+import javax.swing.ActionMap;
+import javax.swing.InputMap;
+import javax.swing.JComponent;
import javax.swing.JPanel;
import javax.swing.JRadioButton;
+import javax.swing.KeyStroke;
import org.nuiton.jaxx.runtime.spi.UIHandler;
+import org.nuiton.jaxx.runtime.swing.JAXXButtonGroup;
import static org.nuiton.i18n.I18n.t;
@@ -61,6 +72,35 @@ public class ChooseDbModeUIHandler extends StorageTabUIHandler<ChooseDbModeUI> i
model.addPropertyChangeListener(StorageUIModel.DB_MODE_PROPERTY_NAME, listener);
model.addPropertyChangeListener(StorageUIModel.CREATION_MODE_PROPERTY_NAME, listener);
ui.setDescriptionText(t(StorageStep.CHOOSE_DB_MODE.getDescription()));
+
+ addGroupMnemonic(ui.getDbMode(), "pressed F");
+ addGroupMnemonic(ui.getCreationMode(), "ctrl F");
+
+ }
+
+ private void addGroupMnemonic(JAXXButtonGroup buttonGroup, String keystrokePrefix) {
+ Enumeration<AbstractButton> elements = buttonGroup.getElements();
+ int index = 1;
+ InputMap inputMap = ui.getInputMap(JComponent.WHEN_ANCESTOR_OF_FOCUSED_COMPONENT);
+ ActionMap actionMap = ui.getActionMap();
+ while (elements.hasMoreElements()) {
+ AbstractButton abstractButton = elements.nextElement();
+ KeyStroke k = KeyStroke.getKeyStroke(keystrokePrefix + (index++));
+ String actionName = abstractButton.getName();
+ inputMap.put(k, actionName);
+ actionMap.put(actionName, new AbstractAction() {
+ @Override
+ public void actionPerformed(ActionEvent e) {
+ abstractButton.doClick();
+ Boolean changeStep = (Boolean) abstractButton.getClientProperty("changeStep");
+ if (changeStep != null && changeStep) {
+ StorageUI parentContainer = ui.getParentContainer(StorageUI.class);
+ parentContainer.getNextAction().doClick();
+ }
+ }
+ });
+ ObserveKeyStrokes.addKeyStroke(abstractButton, k);
+ }
}
protected String updateInternalDumpModeLabel(@SuppressWarnings("unused") boolean dumpExist) {
View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/b01ded0cb48f1b1a669dbef4bd1…
---
View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/b01ded0cb48f1b1a669dbef4bd1…
You're receiving this email because of your account on gitlab.com.
1
0