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

[Git][ultreiaio/ird-observe][develop-5.x] 2 commits: Erreur lors de synchros avec la base IEO (See #772)
by Tony CHEMIT 08 Jun '17

08 Jun '17

Tony CHEMIT pushed to branch develop-5.x at ultreiaio / ird-observe Commits: bbf265de by Tony CHEMIT at 2017-06-08T09:33:42+02:00 Erreur lors de synchros avec la base IEO (See #772) - - - - - 85a40b54 by Tony CHEMIT at 2017-06-08T09:44:42+02:00 prepare release 5.4 - - - - - 4 changed files: - application-swing/pom.xml - pom.xml - services-topia/src/main/java/fr/ird/observe/services/topia/service/actions/synchro/referential/sql/InsertSqlWithCascadeStatementGenerator.java - services-topia/src/main/java/fr/ird/observe/services/topia/service/actions/synchro/referential/sql/UpdateSqlWithCascadeStatementGenerator.java Changes: ===================================== application-swing/pom.xml ===================================== --- a/application-swing/pom.xml +++ b/application-swing/pom.xml @@ -35,7 +35,6 @@ <description>ObServe Application Swing</description> <properties> - <maven.deploy.skip>true</maven.deploy.skip>  <jaxx.addProjectClassPath>true</jaxx.addProjectClassPath> @@ -955,7 +954,9 @@ <transformer implementation="org.apache.maven.plugins.shade.resource.XmlAppendingTransformer"> <resource>xwork.xml</resource> </transformer> - + <transformer implementation="org.apache.maven.plugins.shade.resource.DontIncludeResourceTransformer"> + <resource>CHANGELOG.txt</resource> + </transformer> <transformer implementation="org.apache.maven.plugins.shade.resource.DontIncludeResourceTransformer"> <resource>LICENSE.txt</resource> </transformer> @@ -1001,12 +1002,7 @@ <transformer implementation="org.apache.maven.plugins.shade.resource.DontIncludeResourceTransformer"> <resource>NOTICE.txt</resource> </transformer> - <transformer implementation="org.apache.maven.plugins.shade.resource.DontIncludeResourceTransformer"> - <resource>META-INF/CHANGELOG.txt</resource> - </transformer> <transformer implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer" /> -  -  <transformer implementation="org.apache.maven.plugins.shade.resource.IncludeResourceTransformer"> <file>README.md</file> @@ -1024,9 +1020,12 @@ <file>${project.build.outputDirectory}/META-INF/${applicationName}-LICENSE.txt</file> <resource>META-INF/${applicationName}-LICENSE.txt</resource> </transformer> - <transformer implementation="org.apache.maven.plugins.shade.resource.IncludeResourceTransformer"> - <file>${project.build.directory}/generated-sources/licenses/META-INF/${applicationName}-CHANGELOG.txt</file> + <file>${project.build.directory}/generated-sources/license/CHANGELOG.txt</file> + <resource>CHANGELOG.txt</resource> + </transformer> + <transformer implementation="org.apache.maven.plugins.shade.resource.IncludeResourceTransformer"> + <file>${project.build.directory}/generated-sources/license/META-INF/${applicationName}-CHANGELOG.txt</file> <resource>META-INF/${applicationName}-CHANGELOG.txt</resource> </transformer> ===================================== pom.xml ===================================== --- a/pom.xml +++ b/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>io.ultreia.maven</groupId> <artifactId>pom</artifactId> - <version>9</version> + <version>10</version> </parent> <groupId>fr.ird.observe</groupId> @@ -35,7 +35,7 @@ <version>5.3.8-SNAPSHOT</version> <packaging>pom</packaging> - <name>ObServe</name> + <name>ObServe :: Pom</name> <description>Projet ObServe</description> <url>https://ultreiaio.gitlab.io/ird-observe</url> <inceptionYear>2008</inceptionYear> @@ -228,6 +228,8 @@ <jgitflow.developBranchName>develop-5.x</jgitflow.developBranchName> <jgitflow.masterBranchName>master-5.x</jgitflow.masterBranchName> +  + <maven.deploy.skip>true</maven.deploy.skip> </properties> <dependencyManagement> @@ -793,6 +795,11 @@ <artifactId>nuiton-version</artifactId> <version>${nuitonVersionVersion}</version> </dependency> + <dependency> + <groupId>org.apache.velocity</groupId> + <artifactId>velocity</artifactId> + <version>1.7</version> + </dependency> </dependencies> </plugin> @@ -871,7 +878,7 @@ <releaseArtifact> <groupId>fr.ird.observe</groupId> <artifactId>observe</artifactId> - <name>Client</name> + <name>Application</name> <type>zip</type> </releaseArtifact> <releaseArtifact> @@ -905,6 +912,9 @@ <modules> <module>observe</module> </modules> + <properties> + <devMode>false</devMode> + </properties> </profile> <profile> ===================================== services-topia/src/main/java/fr/ird/observe/services/topia/service/actions/synchro/referential/sql/InsertSqlWithCascadeStatementGenerator.java ===================================== --- a/services-topia/src/main/java/fr/ird/observe/services/topia/service/actions/synchro/referential/sql/InsertSqlWithCascadeStatementGenerator.java +++ b/services-topia/src/main/java/fr/ird/observe/services/topia/service/actions/synchro/referential/sql/InsertSqlWithCascadeStatementGenerator.java @@ -25,12 +25,11 @@ package fr.ird.observe.services.topia.service.actions.synchro.referential.sql; import com.google.common.collect.Multimap; import fr.ird.observe.services.dto.referential.ReferentialDto; import fr.ird.observe.services.dto.referential.ReferentialReference; +import java.util.List; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.topia.persistence.metadata.TopiaMetadataEntity; -import java.util.List; - /** * Pour générer une requète sql d'ajout à partir d'un référentiel donné et aussi tous les inserts manquants * @@ -79,6 +78,9 @@ public abstract class InsertSqlWithCascadeStatementGenerator<R extends Referenti public String generateSql(R referentialDto) { + if (sqlBuilder.length() > 0) { + sqlBuilder.delete(0, sqlBuilder.length()); + } String sql = delegateGenerator.generateSql(referentialDto); sqlBuilder.append(sql); return sqlBuilder.toString(); ===================================== services-topia/src/main/java/fr/ird/observe/services/topia/service/actions/synchro/referential/sql/UpdateSqlWithCascadeStatementGenerator.java ===================================== --- a/services-topia/src/main/java/fr/ird/observe/services/topia/service/actions/synchro/referential/sql/UpdateSqlWithCascadeStatementGenerator.java +++ b/services-topia/src/main/java/fr/ird/observe/services/topia/service/actions/synchro/referential/sql/UpdateSqlWithCascadeStatementGenerator.java @@ -76,7 +76,9 @@ public abstract class UpdateSqlWithCascadeStatementGenerator<R extends Referenti protected abstract <D extends ReferentialDto> String insertMissingReferential(Class<D> referentialType, String id); public String generateSql(R referentialDto) { - + if (sqlBuilder.length() > 0) { + sqlBuilder.delete(0, sqlBuilder.length()); + } String sql = delegateGenerator.generateSql(referentialDto); sqlBuilder.append(sql); return sqlBuilder.toString(); View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/a5f7d0b5ba129adc8316c8b755… --- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/a5f7d0b5ba129adc8316c8b755… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop-7.x] Fix migration scripts for pg (See #612)
by Tony CHEMIT 02 Jun '17

02 Jun '17

Tony CHEMIT pushed to branch develop-7.x at ultreiaio / ird-observe Commits: 405b85cc by Tony CHEMIT at 2017-06-02T15:17:33+02:00 Fix migration scripts for pg (See #612) - - - - - 3 changed files: - persistence/src/main/resources/db/migration/6.901/01_add_object_operation-common.sql → persistence/src/main/resources/db/migration/6.901/01_add_object_operation-H2.sql - + persistence/src/main/resources/db/migration/6.901/01_add_object_operation-PG.sql - persistence/src/main/resources/db/migration/6.901/02_add_object_material-common.sql Changes: ===================================== persistence/src/main/resources/db/migration/6.901/01_add_object_operation-common.sql → persistence/src/main/resources/db/migration/6.901/01_add_object_operation-H2.sql ===================================== --- a/persistence/src/main/resources/db/migration/6.901/01_add_object_operation-common.sql +++ b/persistence/src/main/resources/db/migration/6.901/01_add_object_operation-H2.sql @@ -63,5 +63,8 @@ INSERT INTO observe_seine.objectOperation (topiaid, topiaversion, topiacreatedat UPDATE OBSERVE_COMMON.LASTUPDATEDATE SET LASTUPDATEDATE = CURRENT_TIMESTAMP WHERE type = 'fr.ird.observe.entities.referentiel.seine.ObjectOperation'; ALTER TABLE observe_seine.floatingObject ALTER COLUMN objectOperation2 RENAME TO objectOperation; + +ALTER TABLE observe_seine.floatingObject RENAME objectOperation2 TO objectOperation; + ALTER TABLE observe_seine.floatingObject ADD CONSTRAINT fk_floatingobject_objectOperation FOREIGN KEY (objectOperation) REFERENCES observe_seine.objectOperation(topiaid); ===================================== persistence/src/main/resources/db/migration/6.901/01_add_object_operation-PG.sql ===================================== --- /dev/null +++ b/persistence/src/main/resources/db/migration/6.901/01_add_object_operation-PG.sql @@ -0,0 +1,68 @@ +--- +-- #%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% +--- +ALTER TABLE observe_seine.floatingObject ADD COLUMN objectOperation2 CHARACTER VARYING (256); + +UPDATE observe_seine.floatingObject set objectOperation2 = 'fr.ird.observe.entities.referentiel.seine.ObjectOperation#0#1' WHERE objectOperation = 'fr.ird.observe.entities.referentiel.seine.ObjectOperation#1239832686248#0.8669327599318251'; + +UPDATE observe_seine.floatingObject set objectOperation2 = 'fr.ird.observe.entities.referentiel.seine.ObjectOperation#0#5' WHERE objectOperation = 'fr.ird.observe.entities.referentiel.seine.ObjectOperation#1239832686249#0.7838704130950722' AND objectFate = 'fr.ird.observe.entities.referentiel.seine.ObjectFate#1239832683674#0.32469201752917276'; +UPDATE observe_seine.floatingObject set objectOperation2 = 'fr.ird.observe.entities.referentiel.seine.ObjectOperation#0#4' WHERE objectOperation = 'fr.ird.observe.entities.referentiel.seine.ObjectOperation#1239832686249#0.7838704130950722' AND objectFate = 'fr.ird.observe.entities.referentiel.seine.ObjectFate#1239832683675#0.7559688295127481'; +UPDATE observe_seine.floatingObject set objectOperation2 = 'fr.ird.observe.entities.referentiel.seine.ObjectOperation#0#6' WHERE objectOperation = 'fr.ird.observe.entities.referentiel.seine.ObjectOperation#1239832686249#0.7838704130950722' AND objectFate = 'fr.ird.observe.entities.referentiel.seine.ObjectFate#1239832683675#0.88526017739943'; +UPDATE observe_seine.floatingObject set objectOperation2 = 'fr.ird.observe.entities.referentiel.seine.ObjectOperation#0#7' WHERE objectOperation = 'fr.ird.observe.entities.referentiel.seine.ObjectOperation#1239832686249#0.7838704130950722' AND objectFate = 'fr.ird.observe.entities.referentiel.seine.ObjectFate#1239832683675#0.190123844350496'; +UPDATE observe_seine.floatingObject set objectOperation2 = 'fr.ird.observe.entities.referentiel.seine.ObjectOperation#0#8' WHERE objectOperation = 'fr.ird.observe.entities.referentiel.seine.ObjectOperation#1239832686249#0.7838704130950722' AND objectFate = 'fr.ird.observe.entities.referentiel.seine.ObjectFate#1396860761530#0.8869464242156488'; +UPDATE observe_seine.floatingObject set objectOperation2 = 'fr.ird.observe.entities.referentiel.seine.ObjectOperation#0#4' WHERE objectOperation = 'fr.ird.observe.entities.referentiel.seine.ObjectOperation#1239832686249#0.7838704130950722' AND objectFate not in ('fr.ird.observe.entities.referentiel.seine.ObjectFate#1239832683674#0.32469201752917276','fr.ird.observe.entities.referentiel.seine.ObjectFate#1239832683675#0.7559688295127481','fr.ird.observe.entities.referentiel.seine.ObjectFate#1239832683675#0.88526017739943','fr.ird.observe.entities.referentiel.seine.ObjectFate#1239832683675#0.190123844350496', 'fr.ird.observe.entities.referentiel.seine.ObjectFate#1396860761530#0.8869464242156488'); + +UPDATE observe_seine.floatingObject set objectOperation2 = 'fr.ird.observe.entities.referentiel.seine.ObjectOperation#0#5' WHERE objectOperation = 'fr.ird.observe.entities.referentiel.seine.ObjectOperation#1239832686249#0.8268884472438458' AND objectFate = 'fr.ird.observe.entities.referentiel.seine.ObjectFate#1239832683674#0.32469201752917276'; +UPDATE observe_seine.floatingObject set objectOperation2 = 'fr.ird.observe.entities.referentiel.seine.ObjectOperation#0#4' WHERE objectOperation = 'fr.ird.observe.entities.referentiel.seine.ObjectOperation#1239832686249#0.8268884472438458' AND objectFate = 'fr.ird.observe.entities.referentiel.seine.ObjectFate#1239832683675#0.7559688295127481'; +UPDATE observe_seine.floatingObject set objectOperation2 = 'fr.ird.observe.entities.referentiel.seine.ObjectOperation#0#6' WHERE objectOperation = 'fr.ird.observe.entities.referentiel.seine.ObjectOperation#1239832686249#0.8268884472438458' AND objectFate = 'fr.ird.observe.entities.referentiel.seine.ObjectFate#1239832683675#0.88526017739943'; +UPDATE observe_seine.floatingObject set objectOperation2 = 'fr.ird.observe.entities.referentiel.seine.ObjectOperation#0#7' WHERE objectOperation = 'fr.ird.observe.entities.referentiel.seine.ObjectOperation#1239832686249#0.8268884472438458' AND objectFate = 'fr.ird.observe.entities.referentiel.seine.ObjectFate#1239832683675#0.190123844350496'; +UPDATE observe_seine.floatingObject set objectOperation2 = 'fr.ird.observe.entities.referentiel.seine.ObjectOperation#0#8' WHERE objectOperation = 'fr.ird.observe.entities.referentiel.seine.ObjectOperation#1239832686249#0.8268884472438458' AND objectFate = 'fr.ird.observe.entities.referentiel.seine.ObjectFate#1396860761530#0.8869464242156488'; +UPDATE observe_seine.floatingObject set objectOperation2 = 'fr.ird.observe.entities.referentiel.seine.ObjectOperation#0#2' WHERE objectOperation = 'fr.ird.observe.entities.referentiel.seine.ObjectOperation#1239832686249#0.8268884472438458' AND objectFate not in ('fr.ird.observe.entities.referentiel.seine.ObjectFate#1239832683674#0.32469201752917276','fr.ird.observe.entities.referentiel.seine.ObjectFate#1239832683675#0.7559688295127481','fr.ird.observe.entities.referentiel.seine.ObjectFate#1239832683675#0.88526017739943','fr.ird.observe.entities.referentiel.seine.ObjectFate#1239832683675#0.190123844350496', 'fr.ird.observe.entities.referentiel.seine.ObjectFate#1396860761530#0.8869464242156488'); + +UPDATE observe_seine.floatingObject set objectOperation2 = 'fr.ird.observe.entities.referentiel.seine.ObjectOperation#0#5' WHERE objectOperation = 'fr.ird.observe.entities.referentiel.seine.ObjectOperation#1239832686249#0.8431519556575698' AND objectFate = 'fr.ird.observe.entities.referentiel.seine.ObjectFate#1239832683674#0.32469201752917276'; +UPDATE observe_seine.floatingObject set objectOperation2 = 'fr.ird.observe.entities.referentiel.seine.ObjectOperation#0#4' WHERE objectOperation = 'fr.ird.observe.entities.referentiel.seine.ObjectOperation#1239832686249#0.8431519556575698' AND objectFate = 'fr.ird.observe.entities.referentiel.seine.ObjectFate#1239832683675#0.7559688295127481'; +UPDATE observe_seine.floatingObject set objectOperation2 = 'fr.ird.observe.entities.referentiel.seine.ObjectOperation#0#6' WHERE objectOperation = 'fr.ird.observe.entities.referentiel.seine.ObjectOperation#1239832686249#0.8431519556575698' AND objectFate = 'fr.ird.observe.entities.referentiel.seine.ObjectFate#1239832683675#0.88526017739943'; +UPDATE observe_seine.floatingObject set objectOperation2 = 'fr.ird.observe.entities.referentiel.seine.ObjectOperation#0#7' WHERE objectOperation = 'fr.ird.observe.entities.referentiel.seine.ObjectOperation#1239832686249#0.8431519556575698' AND objectFate = 'fr.ird.observe.entities.referentiel.seine.ObjectFate#1239832683675#0.190123844350496'; +UPDATE observe_seine.floatingObject set objectOperation2 = 'fr.ird.observe.entities.referentiel.seine.ObjectOperation#0#8' WHERE objectOperation = 'fr.ird.observe.entities.referentiel.seine.ObjectOperation#1239832686249#0.8431519556575698' AND objectFate = 'fr.ird.observe.entities.referentiel.seine.ObjectFate#1396860761530#0.8869464242156488'; +UPDATE observe_seine.floatingObject set objectOperation2 = 'fr.ird.observe.entities.referentiel.seine.ObjectOperation#0#2' WHERE objectOperation = 'fr.ird.observe.entities.referentiel.seine.ObjectOperation#1239832686249#0.8431519556575698' AND objectFate not in ('fr.ird.observe.entities.referentiel.seine.ObjectFate#1239832683674#0.32469201752917276','fr.ird.observe.entities.referentiel.seine.ObjectFate#1239832683675#0.7559688295127481','fr.ird.observe.entities.referentiel.seine.ObjectFate#1239832683675#0.88526017739943','fr.ird.observe.entities.referentiel.seine.ObjectFate#1239832683675#0.190123844350496', 'fr.ird.observe.entities.referentiel.seine.ObjectFate#1396860761530#0.8869464242156488'); + +alter table observe_seine.floatingObject drop COLUMN objectOperation; +alter table observe_seine.floatingObject drop COLUMN objectFate; +drop table observe_seine.objectFate; + +delete from observe_seine.objectOperation; + +INSERT INTO observe_seine.objectOperation (topiaid, topiaversion, topiacreatedate, lastupdatedate, status, code, label1, label2, label3, needComment) values ('fr.ird.observe.entities.referentiel.seine.ObjectOperation#0#1' , 0, CURRENT_DATE, CURRENT_TIMESTAMP, 1, '1' ,'Deployment', 'Mise à l''eau', 'Mise à l''eau TODO', false); +INSERT INTO observe_seine.objectOperation (topiaid, topiaversion, topiacreatedate, lastupdatedate, status, code, label1, label2, label3, needComment) values ('fr.ird.observe.entities.referentiel.seine.ObjectOperation#0#2' , 0, CURRENT_DATE, CURRENT_TIMESTAMP, 1, '2' ,'Visit', 'Visite', 'Visite TODO', false); +INSERT INTO observe_seine.objectOperation (topiaid, topiaversion, topiacreatedate, lastupdatedate, status, code, label1, label2, label3, needComment) values ('fr.ird.observe.entities.referentiel.seine.ObjectOperation#0#3' , 0, CURRENT_DATE, CURRENT_TIMESTAMP, 0, '3' ,'Fishing', 'Pêche', 'Pêche TODO', true); +INSERT INTO observe_seine.objectOperation (topiaid, topiaversion, topiacreatedate, lastupdatedate, status, code, label1, label2, label3, needComment) values ('fr.ird.observe.entities.referentiel.seine.ObjectOperation#0#4' , 0, CURRENT_DATE, CURRENT_TIMESTAMP, 1, '4' ,'Removal', 'Retrait', 'Retrait TODO', false); +INSERT INTO observe_seine.objectOperation (topiaid, topiaversion, topiacreatedate, lastupdatedate, status, code, label1, label2, label3, needComment) values ('fr.ird.observe.entities.referentiel.seine.ObjectOperation#0#5' , 0, CURRENT_DATE, CURRENT_TIMESTAMP, 1, '5' ,'Abandonned (without tag, not destroyed, not sunk)', 'Abandonné (sans balise, non détruit, non coulé)', 'Abandonné (sans balise, non détruit, non coulé) TODO', false); +INSERT INTO observe_seine.objectOperation (topiaid, topiaversion, topiacreatedate, lastupdatedate, status, code, label1, label2, label3, needComment) values ('fr.ird.observe.entities.referentiel.seine.ObjectOperation#0#6' , 0, CURRENT_DATE, CURRENT_TIMESTAMP, 1, '6' ,'Destroyed', 'Détruit', 'Détruit TODO', false); +INSERT INTO observe_seine.objectOperation (topiaid, topiaversion, topiacreatedate, lastupdatedate, status, code, label1, label2, label3, needComment) values ('fr.ird.observe.entities.referentiel.seine.ObjectOperation#0#7' , 0, CURRENT_DATE, CURRENT_TIMESTAMP, 1, '7' ,'Sunk', 'Coulé', 'Coulé TODO', false); +INSERT INTO observe_seine.objectOperation (topiaid, topiaversion, topiacreatedate, lastupdatedate, status, code, label1, label2, label3, needComment) values ('fr.ird.observe.entities.referentiel.seine.ObjectOperation#0#8' , 0, CURRENT_DATE, CURRENT_TIMESTAMP, 1, '8' ,'Modified or reinforced', 'Modification ou renforcement', 'Modification ou renforcement TODO', false); +INSERT INTO observe_seine.objectOperation (topiaid, topiaversion, topiacreatedate, lastupdatedate, status, code, label1, label2, label3, needComment) values ('fr.ird.observe.entities.referentiel.seine.ObjectOperation#0#9' , 0, CURRENT_DATE, CURRENT_TIMESTAMP, 1, '9' ,'Replacement', 'Remplacement', 'Remplacement TODO', false); +INSERT INTO observe_seine.objectOperation (topiaid, topiaversion, topiacreatedate, lastupdatedate, status, code, label1, label2, label3, needComment) values ('fr.ird.observe.entities.referentiel.seine.ObjectOperation#0#10', 0, CURRENT_DATE, CURRENT_TIMESTAMP, 1, '10','Other (to be precised)', 'Autre (préciser dans les notes)', 'Autre (préciser dans les notes) TODO', true); +UPDATE OBSERVE_COMMON.LASTUPDATEDATE SET LASTUPDATEDATE = CURRENT_TIMESTAMP WHERE type = 'fr.ird.observe.entities.referentiel.seine.ObjectOperation'; + +ALTER TABLE observe_seine.floatingObject RENAME objectOperation2 TO objectOperation; + +ALTER TABLE observe_seine.floatingObject ADD CONSTRAINT fk_floatingobject_objectOperation FOREIGN KEY (objectOperation) REFERENCES observe_seine.objectOperation(topiaid); + ===================================== 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 @@ -24,47 +24,47 @@ ALTER TABLE observe_seine.objectMaterial ADD CONSTRAINT PK_OBJECT_MATERIAL PRIMA INSERT INTO observe_common.LASTUPDATEDATE (topiaId, topiaversion, topiacreatedate, TYPE , LASTUPDATEDATE) values ('fr.ird.observe.entities.LastUpdateDate#666#900', 0,CURRENT_DATE, 'fr.ird.observe.entities.referentiel.seine.ObjectMaterial', CURRENT_TIMESTAMP); delete from observe_seine.objectMaterial ; -INSERT INTO observe_seine.objectMaterial (topiaid, topiaversion, topiacreatedate, lastupdatedate, status, needComment, code, parentCode, label1, label2, selectable, childrenMultiSelectable, childSelectionMandatory, usedInSimpleForm, usedInDetailledForm) values ('fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0', 0, CURRENT_DATE, CURRENT_TIMESTAMP, false, 1, '1', NULL, 'Raft', 'Radeau', true, true, true, true, true); -INSERT INTO observe_seine.objectMaterial (topiaid, topiaversion, topiacreatedate, lastupdatedate, status, needComment, code, parentCode, label1, label2, selectable, childrenMultiSelectable, childSelectionMandatory, usedInSimpleForm, usedInDetailledForm) values ('fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#1', 0, CURRENT_DATE, CURRENT_TIMESTAMP, false, 1, '1-1', '1', 'Frame', ' Chassis', FALSE, FALSE, TRUE, false, true); -INSERT INTO observe_seine.objectMaterial (topiaid, topiaversion, topiacreatedate, lastupdatedate, status, needComment, code, parentCode, label1, label2, selectable, childrenMultiSelectable, childSelectionMandatory, usedInSimpleForm, usedInDetailledForm) values ('fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#2', 0, CURRENT_DATE, CURRENT_TIMESTAMP, false, 1, '1-1-1', '1-1', 'Vegetal (including bamboo)', 'Végétal (dont bambou)', true, false, false, false, true); -INSERT INTO observe_seine.objectMaterial (topiaid, topiaversion, topiacreatedate, lastupdatedate, status, needComment, code, parentCode, label1, label2, selectable, childrenMultiSelectable, childSelectionMandatory, usedInSimpleForm, usedInDetailledForm) values ('fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#3', 0, CURRENT_DATE, CURRENT_TIMESTAMP, false, 1, '1-1-2', '1-1', 'Metal', 'Métal', true, false, false, false, true); -INSERT INTO observe_seine.objectMaterial (topiaid, topiaversion, topiacreatedate, lastupdatedate, status, needComment, code, parentCode, label1, label2, selectable, childrenMultiSelectable, childSelectionMandatory, usedInSimpleForm, usedInDetailledForm) values ('fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#4', 0, CURRENT_DATE, CURRENT_TIMESTAMP, false, 1, '1-1-3', '1-1','PVC', 'PVC', true, false, false, false, true); -INSERT INTO observe_seine.objectMaterial (topiaid, topiaversion, topiacreatedate, lastupdatedate, status, needComment, code, parentCode, label1, label2, selectable, childrenMultiSelectable, childSelectionMandatory, usedInSimpleForm, usedInDetailledForm) values ('fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#5', 0, CURRENT_DATE, CURRENT_TIMESTAMP, false, 1, '1-2', '1', 'Coverage type', 'Type de couverture', false, true, true, false, true); -INSERT INTO observe_seine.objectMaterial (topiaid, topiaversion, topiacreatedate, lastupdatedate, status, needComment, code, parentCode, label1, label2, selectable, childrenMultiSelectable, childSelectionMandatory, usedInSimpleForm, usedInDetailledForm) values ('fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#6', 0, CURRENT_DATE, CURRENT_TIMESTAMP, false, 1, '1-2-1', '1-2', 'Net', 'Filet', FALSE, TRUE, FALSE, false, true); -INSERT INTO observe_seine.objectMaterial (topiaid, topiaversion, topiacreatedate, lastupdatedate, status, needComment, code, parentCode, label1, label2, selectable, childrenMultiSelectable, childSelectionMandatory, usedInSimpleForm, usedInDetailledForm) values ('fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#7', 0, CURRENT_DATE, CURRENT_TIMESTAMP, false, 1, '1-2-1-1', '1-2-1', 'Net with mesh <=3cm', 'Filet avec maille <=3cm', FALSE, TRUE, FALSE, false, true); -INSERT INTO observe_seine.objectMaterial (topiaid, topiaversion, topiacreatedate, lastupdatedate, status, needComment, code, parentCode, label1, label2, selectable, childrenMultiSelectable, childSelectionMandatory, usedInSimpleForm, usedInDetailledForm) values ('fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#8', 0, CURRENT_DATE, CURRENT_TIMESTAMP, false, 1, '1-2-1-1-1', '1-2-1-1', 'Net with mesh <=3cm above', 'Filet avec maille <=3cm dessus', true, false, false, false, true); -INSERT INTO observe_seine.objectMaterial (topiaid, topiaversion, topiacreatedate, lastupdatedate, status, needComment, code, parentCode, label1, label2, selectable, childrenMultiSelectable, childSelectionMandatory, usedInSimpleForm, usedInDetailledForm) values ('fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#9', 0, CURRENT_DATE, CURRENT_TIMESTAMP, false, 1, '1-2-1-1-2', '1-2-1-1', 'Net with mesh <=3cm behind', 'Filet avec maille <=3cm dessous', true, false, false, false, true); -INSERT INTO observe_seine.objectMaterial (topiaid, topiaversion, topiacreatedate, lastupdatedate, status, needComment, code, parentCode, label1, label2, selectable, childrenMultiSelectable, childSelectionMandatory, usedInSimpleForm, usedInDetailledForm) values ('fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#10', 0, CURRENT_DATE, CURRENT_TIMESTAMP, false, 1, '1-2-1-2', '1-2-1', 'Net with mesh >3cm', 'Filet avec maille >3cm', FALSE, FALSE, false, false, true); -INSERT INTO observe_seine.objectMaterial (topiaid, topiaversion, topiacreatedate, lastupdatedate, status, needComment, code, parentCode, label1, label2, selectable, childrenMultiSelectable, childSelectionMandatory, usedInSimpleForm, usedInDetailledForm) values ('fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#11', 0, CURRENT_DATE, CURRENT_TIMESTAMP, false, 1, '1-2-1-2-1', '1-2-1-2', 'Net with mesh >3cm above', 'Filet avec maille >3cm dessus', true, false, false, false, true); -INSERT INTO observe_seine.objectMaterial (topiaid, topiaversion, topiacreatedate, lastupdatedate, status, needComment, code, parentCode, label1, label2, selectable, childrenMultiSelectable, childSelectionMandatory, usedInSimpleForm, usedInDetailledForm) values ('fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#12', 0, CURRENT_DATE, CURRENT_TIMESTAMP, false, 1, '1-2-1-2-2', '1-2-1-2', 'Net with mesh >3cm behind', 'Filet avec maille >3cm dessous', true, false, false, false, true); -INSERT INTO observe_seine.objectMaterial (topiaid, topiaversion, topiacreatedate, lastupdatedate, status, needComment, code, parentCode, label1, label2, selectable, childrenMultiSelectable, childSelectionMandatory, usedInSimpleForm, usedInDetailledForm) values ('fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#13', 0, CURRENT_DATE, CURRENT_TIMESTAMP, false, 1, '1-2-2', '1-2', 'Coverage without mesh', 'Couverture sans maille', FALSE, FALSE, false, false, true); -INSERT INTO observe_seine.objectMaterial (topiaid, topiaversion, topiacreatedate, lastupdatedate, status, needComment, code, parentCode, label1, label2, selectable, childrenMultiSelectable, childSelectionMandatory, usedInSimpleForm, usedInDetailledForm) values ('fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#14', 0, CURRENT_DATE, CURRENT_TIMESTAMP, false, 1, '1-2-2-1', '1-2-2', 'Coverage without mesh above', 'Couverture sans maille dessus', true, false, false, false, true); -INSERT INTO observe_seine.objectMaterial (topiaid, topiaversion, topiacreatedate, lastupdatedate, status, needComment, code, parentCode, label1, label2, selectable, childrenMultiSelectable, childSelectionMandatory, usedInSimpleForm, usedInDetailledForm) values ('fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#15', 0, CURRENT_DATE, CURRENT_TIMESTAMP, false, 1, '1-2-2-2', '1-2-2', 'Coverage without mesh behind', 'Couverture sans maille dessous', true, false, false, false, true); -INSERT INTO observe_seine.objectMaterial (topiaid, topiaversion, topiacreatedate, lastupdatedate, status, needComment, code, parentCode, label1, label2, selectable, childrenMultiSelectable, childSelectionMandatory, usedInSimpleForm, usedInDetailledForm) values ('fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#16', 0, CURRENT_DATE, CURRENT_TIMESTAMP, false, 1, '1-2-3', '1-2', 'Not covered', 'Non couvert', FALSE, FALSE, false, false, true); -INSERT INTO observe_seine.objectMaterial (topiaid, topiaversion, topiacreatedate, lastupdatedate, status, needComment, code, parentCode, label1, label2, selectable, childrenMultiSelectable, childSelectionMandatory, usedInSimpleForm, usedInDetailledForm) values ('fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#17', 0, CURRENT_DATE, CURRENT_TIMESTAMP, false, 1, '1-2-3-1', '1-2-3', 'Not covered above', 'Non couvert dessus', true, false, false, false, true); -INSERT INTO observe_seine.objectMaterial (topiaid, topiaversion, topiacreatedate, lastupdatedate, status, needComment, code, parentCode, label1, label2, selectable, childrenMultiSelectable, childSelectionMandatory, usedInSimpleForm, usedInDetailledForm) values ('fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#18', 0, CURRENT_DATE, CURRENT_TIMESTAMP, false, 1, '1-2-3-2', '1-2-3', 'Not covered behind', 'Non couvert dessous', true, false, false, false, true); -INSERT INTO observe_seine.objectMaterial (topiaid, topiaversion, topiacreatedate, lastupdatedate, status, needComment, code, parentCode, label1, label2, selectable, childrenMultiSelectable, childSelectionMandatory, usedInSimpleForm, usedInDetailledForm) values ('fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#19', 0, CURRENT_DATE, CURRENT_TIMESTAMP, false, 1, '1-2-4', '1-2', 'Not visible', 'Non visible', false, false, false, false, true); -INSERT INTO observe_seine.objectMaterial (topiaid, topiaversion, topiacreatedate, lastupdatedate, status, needComment, code, parentCode, label1, label2, selectable, childrenMultiSelectable, childSelectionMandatory, usedInSimpleForm, usedInDetailledForm) values ('fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#20', 0, CURRENT_DATE, CURRENT_TIMESTAMP, false, 1, '1-2-4-1', '1-2-4', 'Not visible above', 'Non visible dessus', true, false, false, false, true); -INSERT INTO observe_seine.objectMaterial (topiaid, topiaversion, topiacreatedate, lastupdatedate, status, needComment, code, parentCode, label1, label2, selectable, childrenMultiSelectable, childSelectionMandatory, usedInSimpleForm, usedInDetailledForm) values ('fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#21', 0, CURRENT_DATE, CURRENT_TIMESTAMP, false, 1, '1-2-4-2', '1-2-4', 'Not visible behind', 'Non visible dessous', true, false, false, false, true); -INSERT INTO observe_seine.objectMaterial (topiaid, topiaversion, topiacreatedate, lastupdatedate, status, needComment, code, parentCode, label1, label2, selectable, childrenMultiSelectable, childSelectionMandatory, usedInSimpleForm, usedInDetailledForm) 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, false, true); -INSERT INTO observe_seine.objectMaterial (topiaid, topiaversion, topiacreatedate, lastupdatedate, status, needComment, code, parentCode, label1, label2, selectable, childrenMultiSelectable, childSelectionMandatory, usedInSimpleForm, usedInDetailledForm) values ('fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#23', 0, CURRENT_DATE, CURRENT_TIMESTAMP, false, 1, '2-1', '2', 'Net in sausage', 'Filet saucisse', FALSE, TRUE, FALSE, false, true); -INSERT INTO observe_seine.objectMaterial (topiaid, topiaversion, topiacreatedate, lastupdatedate, status, needComment, code, parentCode, label1, label2, selectable, childrenMultiSelectable, childSelectionMandatory, usedInSimpleForm, usedInDetailledForm) values ('fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#24', 0, CURRENT_DATE, CURRENT_TIMESTAMP, false, 1, '2-1-1', '2-1', 'Net in sausage <=3cm', 'Filet saucisse <=3cm', true, false, false, false, true); -INSERT INTO observe_seine.objectMaterial (topiaid, topiaversion, topiacreatedate, lastupdatedate, status, needComment, code, parentCode, label1, label2, selectable, childrenMultiSelectable, childSelectionMandatory, usedInSimpleForm, usedInDetailledForm) values ('fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#25', 0, CURRENT_DATE, CURRENT_TIMESTAMP, false, 1, '2-1-2', '2-1', 'Net in sausage >3cm', 'Filet saucisse >3cm', true, false, false, false, true); -INSERT INTO observe_seine.objectMaterial (topiaid, topiaversion, topiacreatedate, lastupdatedate, status, needComment, code, parentCode, label1, label2, selectable, childrenMultiSelectable, childSelectionMandatory, usedInSimpleForm, usedInDetailledForm) values ('fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#26', 0, CURRENT_DATE, CURRENT_TIMESTAMP, false, 1, '2-2', '2', 'Open net', 'Filet ouvert', FALSE, TRUE, FALSE, false, true); -INSERT INTO observe_seine.objectMaterial (topiaid, topiaversion, topiacreatedate, lastupdatedate, status, needComment, code, parentCode, label1, label2, selectable, childrenMultiSelectable, childSelectionMandatory, usedInSimpleForm, usedInDetailledForm) values ('fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#27', 0, CURRENT_DATE, CURRENT_TIMESTAMP, false, 1, '2-2-1', '2-2', 'Open net <= 3cm', 'Filet ouvert <=3cm', true, false, false, false, true); -INSERT INTO observe_seine.objectMaterial (topiaid, topiaversion, topiacreatedate, lastupdatedate, status, needComment, code, parentCode, label1, label2, selectable, childrenMultiSelectable, childSelectionMandatory, usedInSimpleForm, usedInDetailledForm) values ('fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#28', 0, CURRENT_DATE, CURRENT_TIMESTAMP, false, 1, '2-2-2', '2-2', 'Open net >3cm', 'Filet ouvert >3cm', true, false, false, false, true); -INSERT INTO observe_seine.objectMaterial (topiaid, topiaversion, topiacreatedate, lastupdatedate, status, needComment, code, parentCode, label1, label2, selectable, childrenMultiSelectable, childSelectionMandatory, usedInSimpleForm, usedInDetailledForm) values ('fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#29', 0, CURRENT_DATE, CURRENT_TIMESTAMP, false, 1, '2-3', '2', 'Single net pieces', 'Pièces de filets accolées', FALSE, TRUE, FALSE, false, true); -INSERT INTO observe_seine.objectMaterial (topiaid, topiaversion, topiacreatedate, lastupdatedate, status, needComment, code, parentCode, label1, label2, selectable, childrenMultiSelectable, childSelectionMandatory, usedInSimpleForm, usedInDetailledForm) values ('fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#30', 0, CURRENT_DATE, CURRENT_TIMESTAMP, false, 1, '2-3-1', '2-3', 'Single net pieces <=3cm', 'Pièces de filets accolées <=3cm', true, false, false, false, true); -INSERT INTO observe_seine.objectMaterial (topiaid, topiaversion, topiacreatedate, lastupdatedate, status, needComment, code, parentCode, label1, label2, selectable, childrenMultiSelectable, childSelectionMandatory, usedInSimpleForm, usedInDetailledForm) values ('fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#31', 0, CURRENT_DATE, CURRENT_TIMESTAMP, false, 1, '2-3-2', '2-3', 'Single net pieces >3cm', 'Pièces de filets accolées >3cm', true, false, false, false, true); -INSERT INTO observe_seine.objectMaterial (topiaid, topiaversion, topiacreatedate, lastupdatedate, status, needComment, code, parentCode, label1, label2, selectable, childrenMultiSelectable, childSelectionMandatory, usedInSimpleForm, usedInDetailledForm) values ('fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#32', 0, CURRENT_DATE, CURRENT_TIMESTAMP, false, 1, '2-4', '2', 'Rope/no mesh', 'Bout/sans maille', true, false, false, false, true); -INSERT INTO observe_seine.objectMaterial (topiaid, topiaversion, topiacreatedate, lastupdatedate, status, needComment, code, parentCode, label1, label2, selectable, childrenMultiSelectable, childSelectionMandatory, usedInSimpleForm, usedInDetailledForm) values ('fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#33', 0, CURRENT_DATE, CURRENT_TIMESTAMP, false, 1, '2-5', '2', 'Not visible', 'Pas visible', true, false, false, false, true); -INSERT INTO observe_seine.objectMaterial (topiaid, topiaversion, topiacreatedate, lastupdatedate, status, needComment, code, parentCode, label1, label2, selectable, childrenMultiSelectable, childSelectionMandatory, usedInSimpleForm, usedInDetailledForm) values ('fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#34', 0, CURRENT_DATE, CURRENT_TIMESTAMP, false, 1, '2-6', '2', 'No sub structure', 'Pas de mouillage', true, false, false, false, true); -INSERT INTO observe_seine.objectMaterial (topiaid, topiaversion, topiacreatedate, lastupdatedate, status, needComment, code, parentCode, label1, label2, selectable, childrenMultiSelectable, childSelectionMandatory, usedInSimpleForm, usedInDetailledForm) 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, true, true); -INSERT INTO observe_seine.objectMaterial (topiaid, topiaversion, topiacreatedate, lastupdatedate, status, needComment, code, parentCode, label1, label2, selectable, childrenMultiSelectable, childSelectionMandatory, usedInSimpleForm, usedInDetailledForm) values ('fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#36', 0, CURRENT_DATE, CURRENT_TIMESTAMP, false, 1, '3-1', '3', 'Platic containers', 'Bidons plastique', true, false, false, true, true); -INSERT INTO observe_seine.objectMaterial (topiaid, topiaversion, topiacreatedate, lastupdatedate, status, needComment, code, parentCode, label1, label2, selectable, childrenMultiSelectable, childSelectionMandatory, usedInSimpleForm, usedInDetailledForm) values ('fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#37', 0, CURRENT_DATE, CURRENT_TIMESTAMP, false, 1, '3-2', '3', 'Corks', 'Flotteurs', true, false, false, true, true); -INSERT INTO observe_seine.objectMaterial (topiaid, topiaversion, topiacreatedate, lastupdatedate, status, needComment, code, parentCode, label1, label2, selectable, childrenMultiSelectable, childSelectionMandatory, usedInSimpleForm, usedInDetailledForm) values ('fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#38', 0, CURRENT_DATE, CURRENT_TIMESTAMP, false, 1, '3-3', '3', 'Bags', 'Sacs', true, false, false, true, true); -INSERT INTO observe_seine.objectMaterial (topiaid, topiaversion, topiacreatedate, lastupdatedate, status, needComment, code, parentCode, label1, label2, selectable, childrenMultiSelectable, childSelectionMandatory, usedInSimpleForm, usedInDetailledForm) values ('fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#39', 0, CURRENT_DATE, CURRENT_TIMESTAMP, false, 1, '3-4', '3', 'Palms, canes', 'Palmes, tiges', true, false, false, true, true); -INSERT INTO observe_seine.objectMaterial (topiaid, topiaversion, topiacreatedate, lastupdatedate, status, needComment, code, parentCode, label1, label2, selectable, childrenMultiSelectable, childSelectionMandatory, usedInSimpleForm, usedInDetailledForm) values ('fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#40', 0, CURRENT_DATE, CURRENT_TIMESTAMP, false, 1, '3-5', '3', 'Color belts', 'Rubans colorés', true, false, false, true, true); -INSERT INTO observe_seine.objectMaterial (topiaid, topiaversion, topiacreatedate, lastupdatedate, status, needComment, code, parentCode, label1, label2, selectable, childrenMultiSelectable, childSelectionMandatory, usedInSimpleForm, usedInDetailledForm) values ('fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#41', 0, CURRENT_DATE, CURRENT_TIMESTAMP, false, 1, '3-6', '3', 'Weights', 'Poids', true, false, false, true, true); -INSERT INTO observe_seine.objectMaterial (topiaid, topiaversion, topiacreatedate, lastupdatedate, status, needComment, code, parentCode, label1, label2, selectable, childrenMultiSelectable, childSelectionMandatory, usedInSimpleForm, usedInDetailledForm) values ('fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#42', 0, CURRENT_DATE, CURRENT_TIMESTAMP, false, 1, '3-7', '3', 'Entangled animal', 'Animal maillé', true, false, false, true, true); +INSERT INTO observe_seine.objectMaterial (topiaid, topiaversion, topiacreatedate, lastupdatedate, needComment, status, code, parentCode, label1, label2, selectable, childrenMultiSelectable, childSelectionMandatory, usedInSimpleForm, usedInDetailledForm) values ('fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0', 0, CURRENT_DATE, CURRENT_TIMESTAMP, false, 1, '1', NULL, 'Raft', 'Radeau', true, true, true, true, true); +INSERT INTO observe_seine.objectMaterial (topiaid, topiaversion, topiacreatedate, lastupdatedate, needComment, status, code, parentCode, label1, label2, selectable, childrenMultiSelectable, childSelectionMandatory, usedInSimpleForm, usedInDetailledForm) values ('fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#1', 0, CURRENT_DATE, CURRENT_TIMESTAMP, false, 1, '1-1', '1', 'Frame', ' Chassis', FALSE, FALSE, TRUE, false, true); +INSERT INTO observe_seine.objectMaterial (topiaid, topiaversion, topiacreatedate, lastupdatedate, needComment, status, code, parentCode, label1, label2, selectable, childrenMultiSelectable, childSelectionMandatory, usedInSimpleForm, usedInDetailledForm) values ('fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#2', 0, CURRENT_DATE, CURRENT_TIMESTAMP, false, 1, '1-1-1', '1-1', 'Vegetal (including bamboo)', 'Végétal (dont bambou)', true, false, false, false, true); +INSERT INTO observe_seine.objectMaterial (topiaid, topiaversion, topiacreatedate, lastupdatedate, needComment, status, code, parentCode, label1, label2, selectable, childrenMultiSelectable, childSelectionMandatory, usedInSimpleForm, usedInDetailledForm) values ('fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#3', 0, CURRENT_DATE, CURRENT_TIMESTAMP, false, 1, '1-1-2', '1-1', 'Metal', 'Métal', true, false, false, false, true); +INSERT INTO observe_seine.objectMaterial (topiaid, topiaversion, topiacreatedate, lastupdatedate, needComment, status, code, parentCode, label1, label2, selectable, childrenMultiSelectable, childSelectionMandatory, usedInSimpleForm, usedInDetailledForm) values ('fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#4', 0, CURRENT_DATE, CURRENT_TIMESTAMP, false, 1, '1-1-3', '1-1','PVC', 'PVC', true, false, false, false, true); +INSERT INTO observe_seine.objectMaterial (topiaid, topiaversion, topiacreatedate, lastupdatedate, needComment, status, code, parentCode, label1, label2, selectable, childrenMultiSelectable, childSelectionMandatory, usedInSimpleForm, usedInDetailledForm) values ('fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#5', 0, CURRENT_DATE, CURRENT_TIMESTAMP, false, 1, '1-2', '1', 'Coverage type', 'Type de couverture', false, true, true, false, true); +INSERT INTO observe_seine.objectMaterial (topiaid, topiaversion, topiacreatedate, lastupdatedate, needComment, status, code, parentCode, label1, label2, selectable, childrenMultiSelectable, childSelectionMandatory, usedInSimpleForm, usedInDetailledForm) values ('fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#6', 0, CURRENT_DATE, CURRENT_TIMESTAMP, false, 1, '1-2-1', '1-2', 'Net', 'Filet', FALSE, TRUE, FALSE, false, true); +INSERT INTO observe_seine.objectMaterial (topiaid, topiaversion, topiacreatedate, lastupdatedate, needComment, status, code, parentCode, label1, label2, selectable, childrenMultiSelectable, childSelectionMandatory, usedInSimpleForm, usedInDetailledForm) values ('fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#7', 0, CURRENT_DATE, CURRENT_TIMESTAMP, false, 1, '1-2-1-1', '1-2-1', 'Net with mesh <=3cm', 'Filet avec maille <=3cm', FALSE, TRUE, FALSE, false, true); +INSERT INTO observe_seine.objectMaterial (topiaid, topiaversion, topiacreatedate, lastupdatedate, needComment, status, code, parentCode, label1, label2, selectable, childrenMultiSelectable, childSelectionMandatory, usedInSimpleForm, usedInDetailledForm) values ('fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#8', 0, CURRENT_DATE, CURRENT_TIMESTAMP, false, 1, '1-2-1-1-1', '1-2-1-1', 'Net with mesh <=3cm above', 'Filet avec maille <=3cm dessus', true, false, false, false, true); +INSERT INTO observe_seine.objectMaterial (topiaid, topiaversion, topiacreatedate, lastupdatedate, needComment, status, code, parentCode, label1, label2, selectable, childrenMultiSelectable, childSelectionMandatory, usedInSimpleForm, usedInDetailledForm) values ('fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#9', 0, CURRENT_DATE, CURRENT_TIMESTAMP, false, 1, '1-2-1-1-2', '1-2-1-1', 'Net with mesh <=3cm behind', 'Filet avec maille <=3cm dessous', true, false, false, false, true); +INSERT INTO observe_seine.objectMaterial (topiaid, topiaversion, topiacreatedate, lastupdatedate, needComment, status, code, parentCode, label1, label2, selectable, childrenMultiSelectable, childSelectionMandatory, usedInSimpleForm, usedInDetailledForm) values ('fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#10', 0, CURRENT_DATE, CURRENT_TIMESTAMP, false, 1, '1-2-1-2', '1-2-1', 'Net with mesh >3cm', 'Filet avec maille >3cm', FALSE, FALSE, false, false, true); +INSERT INTO observe_seine.objectMaterial (topiaid, topiaversion, topiacreatedate, lastupdatedate, needComment, status, code, parentCode, label1, label2, selectable, childrenMultiSelectable, childSelectionMandatory, usedInSimpleForm, usedInDetailledForm) values ('fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#11', 0, CURRENT_DATE, CURRENT_TIMESTAMP, false, 1, '1-2-1-2-1', '1-2-1-2', 'Net with mesh >3cm above', 'Filet avec maille >3cm dessus', true, false, false, false, true); +INSERT INTO observe_seine.objectMaterial (topiaid, topiaversion, topiacreatedate, lastupdatedate, needComment, status, code, parentCode, label1, label2, selectable, childrenMultiSelectable, childSelectionMandatory, usedInSimpleForm, usedInDetailledForm) values ('fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#12', 0, CURRENT_DATE, CURRENT_TIMESTAMP, false, 1, '1-2-1-2-2', '1-2-1-2', 'Net with mesh >3cm behind', 'Filet avec maille >3cm dessous', true, false, false, false, true); +INSERT INTO observe_seine.objectMaterial (topiaid, topiaversion, topiacreatedate, lastupdatedate, needComment, status, code, parentCode, label1, label2, selectable, childrenMultiSelectable, childSelectionMandatory, usedInSimpleForm, usedInDetailledForm) values ('fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#13', 0, CURRENT_DATE, CURRENT_TIMESTAMP, false, 1, '1-2-2', '1-2', 'Coverage without mesh', 'Couverture sans maille', FALSE, FALSE, false, false, true); +INSERT INTO observe_seine.objectMaterial (topiaid, topiaversion, topiacreatedate, lastupdatedate, needComment, status, code, parentCode, label1, label2, selectable, childrenMultiSelectable, childSelectionMandatory, usedInSimpleForm, usedInDetailledForm) values ('fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#14', 0, CURRENT_DATE, CURRENT_TIMESTAMP, false, 1, '1-2-2-1', '1-2-2', 'Coverage without mesh above', 'Couverture sans maille dessus', true, false, false, false, true); +INSERT INTO observe_seine.objectMaterial (topiaid, topiaversion, topiacreatedate, lastupdatedate, needComment, status, code, parentCode, label1, label2, selectable, childrenMultiSelectable, childSelectionMandatory, usedInSimpleForm, usedInDetailledForm) values ('fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#15', 0, CURRENT_DATE, CURRENT_TIMESTAMP, false, 1, '1-2-2-2', '1-2-2', 'Coverage without mesh behind', 'Couverture sans maille dessous', true, false, false, false, true); +INSERT INTO observe_seine.objectMaterial (topiaid, topiaversion, topiacreatedate, lastupdatedate, needComment, status, code, parentCode, label1, label2, selectable, childrenMultiSelectable, childSelectionMandatory, usedInSimpleForm, usedInDetailledForm) values ('fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#16', 0, CURRENT_DATE, CURRENT_TIMESTAMP, false, 1, '1-2-3', '1-2', 'Not covered', 'Non couvert', FALSE, FALSE, false, false, true); +INSERT INTO observe_seine.objectMaterial (topiaid, topiaversion, topiacreatedate, lastupdatedate, needComment, status, code, parentCode, label1, label2, selectable, childrenMultiSelectable, childSelectionMandatory, usedInSimpleForm, usedInDetailledForm) values ('fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#17', 0, CURRENT_DATE, CURRENT_TIMESTAMP, false, 1, '1-2-3-1', '1-2-3', 'Not covered above', 'Non couvert dessus', true, false, false, false, true); +INSERT INTO observe_seine.objectMaterial (topiaid, topiaversion, topiacreatedate, lastupdatedate, needComment, status, code, parentCode, label1, label2, selectable, childrenMultiSelectable, childSelectionMandatory, usedInSimpleForm, usedInDetailledForm) values ('fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#18', 0, CURRENT_DATE, CURRENT_TIMESTAMP, false, 1, '1-2-3-2', '1-2-3', 'Not covered behind', 'Non couvert dessous', true, false, false, false, true); +INSERT INTO observe_seine.objectMaterial (topiaid, topiaversion, topiacreatedate, lastupdatedate, needComment, status, code, parentCode, label1, label2, selectable, childrenMultiSelectable, childSelectionMandatory, usedInSimpleForm, usedInDetailledForm) values ('fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#19', 0, CURRENT_DATE, CURRENT_TIMESTAMP, false, 1, '1-2-4', '1-2', 'Not visible', 'Non visible', false, false, false, false, true); +INSERT INTO observe_seine.objectMaterial (topiaid, topiaversion, topiacreatedate, lastupdatedate, needComment, status, code, parentCode, label1, label2, selectable, childrenMultiSelectable, childSelectionMandatory, usedInSimpleForm, usedInDetailledForm) values ('fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#20', 0, CURRENT_DATE, CURRENT_TIMESTAMP, false, 1, '1-2-4-1', '1-2-4', 'Not visible above', 'Non visible dessus', true, false, false, false, true); +INSERT INTO observe_seine.objectMaterial (topiaid, topiaversion, topiacreatedate, lastupdatedate, needComment, status, code, parentCode, label1, label2, selectable, childrenMultiSelectable, childSelectionMandatory, usedInSimpleForm, usedInDetailledForm) values ('fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#21', 0, CURRENT_DATE, CURRENT_TIMESTAMP, false, 1, '1-2-4-2', '1-2-4', 'Not visible behind', 'Non visible dessous', true, false, false, false, true); +INSERT INTO observe_seine.objectMaterial (topiaid, topiaversion, topiacreatedate, lastupdatedate, needComment, status, code, parentCode, label1, label2, selectable, childrenMultiSelectable, childSelectionMandatory, usedInSimpleForm, usedInDetailledForm) 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, false, true); +INSERT INTO observe_seine.objectMaterial (topiaid, topiaversion, topiacreatedate, lastupdatedate, needComment, status, code, parentCode, label1, label2, selectable, childrenMultiSelectable, childSelectionMandatory, usedInSimpleForm, usedInDetailledForm) values ('fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#23', 0, CURRENT_DATE, CURRENT_TIMESTAMP, false, 1, '2-1', '2', 'Net in sausage', 'Filet saucisse', FALSE, TRUE, FALSE, false, true); +INSERT INTO observe_seine.objectMaterial (topiaid, topiaversion, topiacreatedate, lastupdatedate, needComment, status, code, parentCode, label1, label2, selectable, childrenMultiSelectable, childSelectionMandatory, usedInSimpleForm, usedInDetailledForm) values ('fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#24', 0, CURRENT_DATE, CURRENT_TIMESTAMP, false, 1, '2-1-1', '2-1', 'Net in sausage <=3cm', 'Filet saucisse <=3cm', true, false, false, false, true); +INSERT INTO observe_seine.objectMaterial (topiaid, topiaversion, topiacreatedate, lastupdatedate, needComment, status, code, parentCode, label1, label2, selectable, childrenMultiSelectable, childSelectionMandatory, usedInSimpleForm, usedInDetailledForm) values ('fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#25', 0, CURRENT_DATE, CURRENT_TIMESTAMP, false, 1, '2-1-2', '2-1', 'Net in sausage >3cm', 'Filet saucisse >3cm', true, false, false, false, true); +INSERT INTO observe_seine.objectMaterial (topiaid, topiaversion, topiacreatedate, lastupdatedate, needComment, status, code, parentCode, label1, label2, selectable, childrenMultiSelectable, childSelectionMandatory, usedInSimpleForm, usedInDetailledForm) values ('fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#26', 0, CURRENT_DATE, CURRENT_TIMESTAMP, false, 1, '2-2', '2', 'Open net', 'Filet ouvert', FALSE, TRUE, FALSE, false, true); +INSERT INTO observe_seine.objectMaterial (topiaid, topiaversion, topiacreatedate, lastupdatedate, needComment, status, code, parentCode, label1, label2, selectable, childrenMultiSelectable, childSelectionMandatory, usedInSimpleForm, usedInDetailledForm) values ('fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#27', 0, CURRENT_DATE, CURRENT_TIMESTAMP, false, 1, '2-2-1', '2-2', 'Open net <= 3cm', 'Filet ouvert <=3cm', true, false, false, false, true); +INSERT INTO observe_seine.objectMaterial (topiaid, topiaversion, topiacreatedate, lastupdatedate, needComment, status, code, parentCode, label1, label2, selectable, childrenMultiSelectable, childSelectionMandatory, usedInSimpleForm, usedInDetailledForm) values ('fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#28', 0, CURRENT_DATE, CURRENT_TIMESTAMP, false, 1, '2-2-2', '2-2', 'Open net >3cm', 'Filet ouvert >3cm', true, false, false, false, true); +INSERT INTO observe_seine.objectMaterial (topiaid, topiaversion, topiacreatedate, lastupdatedate, needComment, status, code, parentCode, label1, label2, selectable, childrenMultiSelectable, childSelectionMandatory, usedInSimpleForm, usedInDetailledForm) values ('fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#29', 0, CURRENT_DATE, CURRENT_TIMESTAMP, false, 1, '2-3', '2', 'Single net pieces', 'Pièces de filets accolées', FALSE, TRUE, FALSE, false, true); +INSERT INTO observe_seine.objectMaterial (topiaid, topiaversion, topiacreatedate, lastupdatedate, needComment, status, code, parentCode, label1, label2, selectable, childrenMultiSelectable, childSelectionMandatory, usedInSimpleForm, usedInDetailledForm) values ('fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#30', 0, CURRENT_DATE, CURRENT_TIMESTAMP, false, 1, '2-3-1', '2-3', 'Single net pieces <=3cm', 'Pièces de filets accolées <=3cm', true, false, false, false, true); +INSERT INTO observe_seine.objectMaterial (topiaid, topiaversion, topiacreatedate, lastupdatedate, needComment, status, code, parentCode, label1, label2, selectable, childrenMultiSelectable, childSelectionMandatory, usedInSimpleForm, usedInDetailledForm) values ('fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#31', 0, CURRENT_DATE, CURRENT_TIMESTAMP, false, 1, '2-3-2', '2-3', 'Single net pieces >3cm', 'Pièces de filets accolées >3cm', true, false, false, false, true); +INSERT INTO observe_seine.objectMaterial (topiaid, topiaversion, topiacreatedate, lastupdatedate, needComment, status, code, parentCode, label1, label2, selectable, childrenMultiSelectable, childSelectionMandatory, usedInSimpleForm, usedInDetailledForm) values ('fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#32', 0, CURRENT_DATE, CURRENT_TIMESTAMP, false, 1, '2-4', '2', 'Rope/no mesh', 'Bout/sans maille', true, false, false, false, true); +INSERT INTO observe_seine.objectMaterial (topiaid, topiaversion, topiacreatedate, lastupdatedate, needComment, status, code, parentCode, label1, label2, selectable, childrenMultiSelectable, childSelectionMandatory, usedInSimpleForm, usedInDetailledForm) values ('fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#33', 0, CURRENT_DATE, CURRENT_TIMESTAMP, false, 1, '2-5', '2', 'Not visible', 'Pas visible', true, false, false, false, true); +INSERT INTO observe_seine.objectMaterial (topiaid, topiaversion, topiacreatedate, lastupdatedate, needComment, status, code, parentCode, label1, label2, selectable, childrenMultiSelectable, childSelectionMandatory, usedInSimpleForm, usedInDetailledForm) values ('fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#34', 0, CURRENT_DATE, CURRENT_TIMESTAMP, false, 1, '2-6', '2', 'No sub structure', 'Pas de mouillage', true, false, false, false, true); +INSERT INTO observe_seine.objectMaterial (topiaid, topiaversion, topiacreatedate, lastupdatedate, needComment, status, code, parentCode, label1, label2, selectable, childrenMultiSelectable, childSelectionMandatory, usedInSimpleForm, usedInDetailledForm) 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, true, true); +INSERT INTO observe_seine.objectMaterial (topiaid, topiaversion, topiacreatedate, lastupdatedate, needComment, status, code, parentCode, label1, label2, selectable, childrenMultiSelectable, childSelectionMandatory, usedInSimpleForm, usedInDetailledForm) values ('fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#36', 0, CURRENT_DATE, CURRENT_TIMESTAMP, false, 1, '3-1', '3', 'Platic containers', 'Bidons plastique', true, false, false, true, true); +INSERT INTO observe_seine.objectMaterial (topiaid, topiaversion, topiacreatedate, lastupdatedate, needComment, status, code, parentCode, label1, label2, selectable, childrenMultiSelectable, childSelectionMandatory, usedInSimpleForm, usedInDetailledForm) values ('fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#37', 0, CURRENT_DATE, CURRENT_TIMESTAMP, false, 1, '3-2', '3', 'Corks', 'Flotteurs', true, false, false, true, true); +INSERT INTO observe_seine.objectMaterial (topiaid, topiaversion, topiacreatedate, lastupdatedate, needComment, status, code, parentCode, label1, label2, selectable, childrenMultiSelectable, childSelectionMandatory, usedInSimpleForm, usedInDetailledForm) values ('fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#38', 0, CURRENT_DATE, CURRENT_TIMESTAMP, false, 1, '3-3', '3', 'Bags', 'Sacs', true, false, false, true, true); +INSERT INTO observe_seine.objectMaterial (topiaid, topiaversion, topiacreatedate, lastupdatedate, needComment, status, code, parentCode, label1, label2, selectable, childrenMultiSelectable, childSelectionMandatory, usedInSimpleForm, usedInDetailledForm) values ('fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#39', 0, CURRENT_DATE, CURRENT_TIMESTAMP, false, 1, '3-4', '3', 'Palms, canes', 'Palmes, tiges', true, false, false, true, true); +INSERT INTO observe_seine.objectMaterial (topiaid, topiaversion, topiacreatedate, lastupdatedate, needComment, status, code, parentCode, label1, label2, selectable, childrenMultiSelectable, childSelectionMandatory, usedInSimpleForm, usedInDetailledForm) values ('fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#40', 0, CURRENT_DATE, CURRENT_TIMESTAMP, false, 1, '3-5', '3', 'Color belts', 'Rubans colorés', true, false, false, true, true); +INSERT INTO observe_seine.objectMaterial (topiaid, topiaversion, topiacreatedate, lastupdatedate, needComment, status, code, parentCode, label1, label2, selectable, childrenMultiSelectable, childSelectionMandatory, usedInSimpleForm, usedInDetailledForm) values ('fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#41', 0, CURRENT_DATE, CURRENT_TIMESTAMP, false, 1, '3-6', '3', 'Weights', 'Poids', true, false, false, true, true); +INSERT INTO observe_seine.objectMaterial (topiaid, topiaversion, topiacreatedate, lastupdatedate, needComment, status, code, parentCode, label1, label2, selectable, childrenMultiSelectable, childSelectionMandatory, usedInSimpleForm, usedInDetailledForm) values ('fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#42', 0, CURRENT_DATE, CURRENT_TIMESTAMP, false, 1, '3-7', '3', 'Entangled animal', 'Animal maillé', true, false, false, true, true); UPDATE observe_seine.objectMaterial set label3 = label2 || ' TODO'; View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/405b85cc79bb9d4632f9d8cee19… --- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/405b85cc79bb9d4632f9d8cee19… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop-7.x] Add NonTargetCatchReleased ui (See #612)
by Tony CHEMIT 02 Jun '17

02 Jun '17

Tony CHEMIT pushed to branch develop-7.x at ultreiaio / ird-observe Commits: 77f1dcf2 by Tony CHEMIT at 2017-06-02T13:32:21+02:00 Add NonTargetCatchReleased ui (See #612) - - - - - 30 changed files: - application-swing-decoration/src/main/resources/i18n/application-swing-decoration_es_ES.properties - application-swing-decoration/src/main/resources/i18n/application-swing-decoration_fr_FR.properties - application-swing-validation/src/main/resources/fr/ird/observe/services/dto/seine/NonTargetCatchReleasedDto-ui-update-error-validation.xml - application-swing-validation/src/main/resources/fr/ird/observe/services/dto/seine/NonTargetCatchReleasedDto-ui-update-warning-validation.xml - application-swing-validation/src/main/resources/i18n/application-swing-validation_en_GB.properties - application-swing-validation/src/main/resources/i18n/application-swing-validation_es_ES.properties - application-swing-validation/src/main/resources/i18n/application-swing-validation_fr_FR.properties - application-swing/src/main/java/fr/ird/observe/application/swing/db/ObserveSwingDataSource.java - application-swing/src/main/java/fr/ird/observe/application/swing/ui/UIHelper.java - application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ObserveFocusManager.java - application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/CatchLonglineUIModel.java - + application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/NonTargetCatchReleaseStatesUI.java - + application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/NonTargetCatchReleasedTableModel.java - + application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/NonTargetCatchReleasedUI.jaxx - + application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/NonTargetCatchReleasedUI.jcss - + application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/NonTargetCatchReleasedUIHandler.java - + application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/NonTargetCatchReleasedUIModel.java - + application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/navigation/nodes/seine/NonTargetCatchesReleasedSeineNavigationTreeNode.java - application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/navigation/nodes/seine/SetSeineNavigationTreeNode.java - application-swing/src/main/resources/i18n/application-swing_en_GB.properties - application-swing/src/main/resources/i18n/application-swing_es_ES.properties - application-swing/src/main/resources/i18n/application-swing_fr_FR.properties - application-web/src/main/filtered-resources/mapping - application-web/src/main/java/fr/ird/observe/application/web/controller/v1/referential/ReferentialServiceController.java - common/src/main/java/fr/ird/observe/common/constants/seine/NonTargetCatchReleasedStateType.java - + persistence/src/main/java/fr/ird/observe/entities/seine/NonTargetCatchReleasedImpl.java - persistence/src/main/resources/db/migration/6.901/07_add_non_target_catch_released-common.sql - services-binder/src/main/java/fr/ird/observe/services/binder/data/seine/NonTargetCatchReleasedBinder.java - services-binder/src/main/java/fr/ird/observe/services/binder/data/seine/SetSeineNonTargetCatchReleasedDtoBinder.java - services-binder/src/main/java/fr/ird/observe/services/binder/referential/common/SpeciesBinder.java The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/77f1dcf2e1c5c6fb05e40cc4049… --- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/77f1dcf2e1c5c6fb05e40cc4049… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop-7.x] Add NonTargetCatchReleased ui (See #612)
by Tony CHEMIT 02 Jun '17

02 Jun '17

Tony CHEMIT pushed to branch develop-7.x at ultreiaio / ird-observe Commits: e4b64bde by Tony CHEMIT at 2017-06-02T13:14:47+02:00 Add NonTargetCatchReleased ui (See #612) - - - - - 30 changed files: - application-swing-decoration/src/main/resources/i18n/application-swing-decoration_es_ES.properties - application-swing-decoration/src/main/resources/i18n/application-swing-decoration_fr_FR.properties - application-swing-validation/src/main/resources/fr/ird/observe/services/dto/seine/NonTargetCatchReleasedDto-ui-update-error-validation.xml - application-swing-validation/src/main/resources/fr/ird/observe/services/dto/seine/NonTargetCatchReleasedDto-ui-update-warning-validation.xml - application-swing-validation/src/main/resources/i18n/application-swing-validation_en_GB.properties - application-swing-validation/src/main/resources/i18n/application-swing-validation_es_ES.properties - application-swing-validation/src/main/resources/i18n/application-swing-validation_fr_FR.properties - application-swing/src/main/java/fr/ird/observe/application/swing/db/ObserveSwingDataSource.java - application-swing/src/main/java/fr/ird/observe/application/swing/ui/UIHelper.java - application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ObserveFocusManager.java - application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/CatchLonglineUIModel.java - + application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/NonTargetCatchReleaseStatesUI.java - + application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/NonTargetCatchReleasedTableModel.java - + application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/NonTargetCatchReleasedUI.jaxx - + application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/NonTargetCatchReleasedUI.jcss - + application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/NonTargetCatchReleasedUIHandler.java - + application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/NonTargetCatchReleasedUIModel.java - + application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/navigation/nodes/seine/NonTargetCatchesReleasedSeineNavigationTreeNode.java - application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/navigation/nodes/seine/SetSeineNavigationTreeNode.java - application-swing/src/main/resources/i18n/application-swing_en_GB.properties - application-swing/src/main/resources/i18n/application-swing_es_ES.properties - application-swing/src/main/resources/i18n/application-swing_fr_FR.properties - application-web/src/main/filtered-resources/mapping - application-web/src/main/java/fr/ird/observe/application/web/controller/v1/referential/ReferentialServiceController.java - common/src/main/java/fr/ird/observe/common/constants/seine/NonTargetCatchReleasedStateType.java - + persistence/src/main/java/fr/ird/observe/entities/seine/NonTargetCatchReleasedImpl.java - persistence/src/main/resources/db/migration/6.901/07_add_non_target_catch_released-common.sql - services-binder/src/main/java/fr/ird/observe/services/binder/data/seine/NonTargetCatchReleasedBinder.java - services-binder/src/main/java/fr/ird/observe/services/binder/data/seine/SetSeineNonTargetCatchReleasedDtoBinder.java - services-binder/src/main/java/fr/ird/observe/services/binder/referential/common/SpeciesBinder.java The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/e4b64bde2e7406b7f56c5725fe3… --- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/e4b64bde2e7406b7f56c5725fe3… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop-7.x] Add NonTargetCatchReleased ui (See #612)
by Tony CHEMIT 02 Jun '17

02 Jun '17

Tony CHEMIT pushed to branch develop-7.x at ultreiaio / ird-observe Commits: 2c77fee5 by Tony CHEMIT at 2017-06-02T12:51:06+02:00 Add NonTargetCatchReleased ui (See #612) - - - - - 30 changed files: - application-swing-decoration/src/main/resources/i18n/application-swing-decoration_es_ES.properties - application-swing-decoration/src/main/resources/i18n/application-swing-decoration_fr_FR.properties - application-swing-validation/src/main/resources/fr/ird/observe/services/dto/seine/NonTargetCatchReleasedDto-ui-update-error-validation.xml - application-swing-validation/src/main/resources/fr/ird/observe/services/dto/seine/NonTargetCatchReleasedDto-ui-update-warning-validation.xml - application-swing-validation/src/main/resources/i18n/application-swing-validation_en_GB.properties - application-swing-validation/src/main/resources/i18n/application-swing-validation_es_ES.properties - application-swing-validation/src/main/resources/i18n/application-swing-validation_fr_FR.properties - application-swing/src/main/java/fr/ird/observe/application/swing/db/ObserveSwingDataSource.java - application-swing/src/main/java/fr/ird/observe/application/swing/ui/UIHelper.java - application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ObserveFocusManager.java - application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/CatchLonglineUIModel.java - + application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/NonTargetCatchReleaseStatesUI.java - + application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/NonTargetCatchReleasedTableModel.java - + application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/NonTargetCatchReleasedUI.jaxx - + application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/NonTargetCatchReleasedUI.jcss - + application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/NonTargetCatchReleasedUIHandler.java - + application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/NonTargetCatchReleasedUIModel.java - + application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/navigation/nodes/seine/NonTargetCatchesReleasedSeineNavigationTreeNode.java - application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/navigation/nodes/seine/SetSeineNavigationTreeNode.java - application-swing/src/main/resources/i18n/application-swing_en_GB.properties - application-swing/src/main/resources/i18n/application-swing_es_ES.properties - application-swing/src/main/resources/i18n/application-swing_fr_FR.properties - application-web/src/main/filtered-resources/mapping - application-web/src/main/java/fr/ird/observe/application/web/controller/v1/referential/ReferentialServiceController.java - common/src/main/java/fr/ird/observe/common/constants/seine/NonTargetCatchReleasedStateType.java - + persistence/src/main/java/fr/ird/observe/entities/seine/NonTargetCatchReleasedImpl.java - persistence/src/main/resources/db/migration/6.901/07_add_non_target_catch_released-common.sql - services-binder/src/main/java/fr/ird/observe/services/binder/data/seine/NonTargetCatchReleasedBinder.java - services-binder/src/main/java/fr/ird/observe/services/binder/data/seine/SetSeineNonTargetCatchReleasedDtoBinder.java - services-binder/src/main/java/fr/ird/observe/services/binder/referential/common/SpeciesBinder.java The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/2c77fee56a4412606c7559774c7… --- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/2c77fee56a4412606c7559774c7… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop-7.x] Add NonTargetCatchReleased ui (See #612)
by Tony CHEMIT 01 Jun '17

01 Jun '17

Tony CHEMIT pushed to branch develop-7.x at ultreiaio / ird-observe Commits: 0dc1243f by Tony CHEMIT at 2017-06-01T16:57:29+02:00 Add NonTargetCatchReleased ui (See #612) - - - - - 30 changed files: - application-swing-validation/src/main/resources/fr/ird/observe/services/dto/seine/NonTargetCatchReleasedDto-ui-update-error-validation.xml - application-swing/src/main/java/fr/ird/observe/application/swing/db/ObserveSwingDataSource.java - application-swing/src/main/java/fr/ird/observe/application/swing/ui/UIHelper.java - application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ObserveFocusManager.java - application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/CatchLonglineUIModel.java - + application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/NonTargetCatchReleasedTableModel.java - + application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/NonTargetCatchReleasedUI.jaxx - + application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/NonTargetCatchReleasedUI.jcss - + application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/NonTargetCatchReleasedUIHandler.java - + application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/NonTargetCatchReleasedUIModel.java - + application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/navigation/nodes/seine/NonTargetCatchesReleasedSeineNavigationTreeNode.java - application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/navigation/nodes/seine/SetSeineNavigationTreeNode.java - application-swing/src/main/resources/i18n/application-swing_en_GB.properties - application-swing/src/main/resources/i18n/application-swing_es_ES.properties - application-swing/src/main/resources/i18n/application-swing_fr_FR.properties - application-web/src/main/filtered-resources/mapping - application-web/src/main/java/fr/ird/observe/application/web/controller/v1/referential/ReferentialServiceController.java - common/src/main/java/fr/ird/observe/common/constants/seine/NonTargetCatchReleasedStateType.java - + persistence/src/main/java/fr/ird/observe/entities/seine/NonTargetCatchReleasedImpl.java - persistence/src/main/resources/db/migration/6.901/07_add_non_target_catch_released-common.sql - services-binder/src/main/java/fr/ird/observe/services/binder/data/seine/NonTargetCatchReleasedBinder.java - services-binder/src/main/java/fr/ird/observe/services/binder/data/seine/SetSeineNonTargetCatchReleasedDtoBinder.java - services-binder/src/main/java/fr/ird/observe/services/binder/referential/common/SpeciesBinder.java - services-binder/src/test/java/fr/ird/observe/services/binder/BinderEngineMetadataTest.java - services-topia/src/main/java/fr/ird/observe/services/topia/service/referential/ReferentialServiceTopia.java - services-validation/src/main/resources/fr/ird/observe/entities/seine/NonTargetCatchReleased-service-error-validation.xml - services/src/main/java/fr/ird/observe/services/ObserveDataReferenceSets.java - services/src/main/java/fr/ird/observe/services/ObserveReferentialReferenceSets.java - services/src/main/java/fr/ird/observe/services/ObserveServicesProvider.java - + services/src/main/java/fr/ird/observe/services/dto/seine/NonTargetCatchReleasedDto.java The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/0dc1243f292f38d8cf07f14c638… --- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/0dc1243f292f38d8cf07f14c638… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop-7.x] Add NonTargetCatchReleased data (See #612)
by Tony CHEMIT 01 Jun '17

01 Jun '17

Tony CHEMIT pushed to branch develop-7.x at ultreiaio / ird-observe Commits: 65fd0249 by Tony CHEMIT at 2017-06-01T12:03:46+02:00 Add NonTargetCatchReleased data (See #612) - - - - - 30 changed files: - application-swing-decoration/src/main/java/fr/ird/observe/application/swing/decoration/DecoratorService.java - + application-swing-decoration/src/main/java/fr/ird/observe/application/swing/decoration/decorators/NonTargetCatchReleasedDecorator.java - application-swing-decoration/src/main/resources/i18n/application-swing-decoration_en_GB.properties - application-swing-decoration/src/main/resources/i18n/application-swing-decoration_es_ES.properties - application-swing-decoration/src/main/resources/i18n/application-swing-decoration_fr_FR.properties - + application-swing-validation/src/main/resources/fr/ird/observe/services/dto/seine/NonTargetCatchReleasedDto-ui-update-error-validation.xml - + application-swing-validation/src/main/resources/fr/ird/observe/services/dto/seine/NonTargetCatchReleasedDto-ui-update-warning-validation.xml - application-swing-validation/src/main/resources/i18n/application-swing-validation_en_GB.properties - application-swing-validation/src/main/resources/i18n/application-swing-validation_es_ES.properties - application-swing-validation/src/main/resources/i18n/application-swing-validation_fr_FR.properties - application-swing-validation/src/test/java/fr/ird/observe/application/swing/validation/BeanValidatorDetectorTest.java - application-swing/pom.xml - application-swing/src/main/resources/i18n/application-swing_en_GB.properties - application-swing/src/main/resources/i18n/application-swing_es_ES.properties - application-swing/src/main/resources/i18n/application-swing_fr_FR.properties - application-web/src/main/filtered-resources/mapping - + application-web/src/main/java/fr/ird/observe/application/web/controller/v1/data/seine/NonTargetCatchReleasedServiceController.java - + common/src/main/java/fr/ird/observe/common/constants/seine/NonTargetCatchReleasedStateType.java - persistence/src/main/java/fr/ird/observe/persistence/Entities.java - persistence/src/main/java/fr/ird/observe/persistence/migration/DataSourceMigrationForVersion_7_0.java - + persistence/src/main/resources/db/migration/6.901/07_add_non_target_catch_released-common.sql - persistence/src/main/xmi/observe-seine.zargo - persistence/src/main/xmi/observe.ini - services-binder/src/main/java/fr/ird/observe/services/binder/BinderEngineInitializer.java - + services-binder/src/main/java/fr/ird/observe/services/binder/data/seine/NonTargetCatchReleasedBinder.java - + services-binder/src/main/java/fr/ird/observe/services/binder/data/seine/NonTargetCatchReleasedStateBinder.java - + services-binder/src/main/java/fr/ird/observe/services/binder/data/seine/SetSeineNonTargetCatchReleasedDtoBinder.java - services-binder/src/test/java/fr/ird/observe/services/binder/BinderEngineMetadataTest.java - + services-topia/src/main/java/fr/ird/observe/services/topia/service/data/seine/NonTargetCatchReleasedServiceTopia.java - services-validation/pom.xml The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/65fd0249e367381ecaa42e2290d… --- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/65fd0249e367381ecaa42e2290d… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop-7.x] Add SpeciesGroupRelease referentials (See #612)
by Tony CHEMIT 31 May '17

31 May '17

Tony CHEMIT pushed to branch develop-7.x at ultreiaio / ird-observe Commits: 7ea61b56 by Tony CHEMIT at 2017-05-31T21:41:59+02:00 Add SpeciesGroupRelease referentials (See #612) - - - - - 30 changed files: - application-swing-decoration/src/main/java/fr/ird/observe/application/swing/decoration/DecoratorService.java - application-swing-decoration/src/main/resources/i18n/application-swing-decoration_en_GB.properties - application-swing-decoration/src/main/resources/i18n/application-swing-decoration_es_ES.properties - application-swing-decoration/src/main/resources/i18n/application-swing-decoration_fr_FR.properties - + application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/SpeciesGroupReleaseModeDto-ui-create-error-validation.xml - + application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/SpeciesGroupReleaseModeDto-ui-create-warning-validation.xml - + application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/SpeciesGroupReleaseModeDto-ui-update-error-validation.xml - + application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/SpeciesGroupReleaseModeDto-ui-update-warning-validation.xml - + application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/SpeciesGroupReleaseStateDto-ui-create-error-validation.xml - + application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/SpeciesGroupReleaseStateDto-ui-create-warning-validation.xml - + application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/SpeciesGroupReleaseStateDto-ui-update-error-validation.xml - + application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/SpeciesGroupReleaseStateDto-ui-update-warning-validation.xml - application-swing-validation/src/test/java/fr/ird/observe/application/swing/validation/BeanValidatorDetectorTest.java - application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/seine/SetSeineUIModel.java - + application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/common/SpeciesGroupReleaseModeUI.jaxx - + application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/common/SpeciesGroupReleaseModeUIHandler.java - + application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/common/SpeciesGroupReleaseModeUIModel.java - + application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/common/SpeciesGroupReleaseStateUI.jaxx - + application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/common/SpeciesGroupReleaseStateUIHandler.java - + application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/common/SpeciesGroupReleaseStateUIModel.java - application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/common/SpeciesGroupUI.jaxx - application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/common/SpeciesGroupUI.jcss - application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/common/SpeciesGroupUIHandler.java - application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/common/SpeciesGroupUIModel.java - application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/common/SpeciesListUIHandler.java - application-swing/src/main/resources/i18n/application-swing_en_GB.properties - application-swing/src/main/resources/i18n/application-swing_es_ES.properties - application-swing/src/main/resources/i18n/application-swing_fr_FR.properties - persistence/src/main/java/fr/ird/observe/persistence/Entities.java - persistence/src/main/java/fr/ird/observe/persistence/migration/AbstractObserveMigrationCallBack.java The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/7ea61b56ad8abd1a6d3c2db6c81… --- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/7ea61b56ad8abd1a6d3c2db6c81… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop-7.x] Remove dcp fields (See #711)
by Tony CHEMIT 31 May '17

31 May '17

Tony CHEMIT pushed to branch develop-7.x at ultreiaio / ird-observe Commits: 2012c764 by Tony CHEMIT at 2017-05-31T14:58:04+02:00 Remove dcp fields (See #711) - - - - - 16 changed files: - application-swing-validation/src/main/resources/fr/ird/observe/services/dto/seine/FloatingObjectDto-ui-create-error-validation.xml - − application-swing-validation/src/main/resources/fr/ird/observe/services/dto/seine/FloatingObjectDto-ui-create-warning-validation.xml - application-swing-validation/src/main/resources/fr/ird/observe/services/dto/seine/FloatingObjectDto-ui-update-error-validation.xml - − application-swing-validation/src/main/resources/fr/ird/observe/services/dto/seine/FloatingObjectDto-ui-update-warning-validation.xml - application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/seine/FloatingObjectUI.jaxx - 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 - persistence/src/main/java/fr/ird/observe/persistence/migration/DataSourceMigrationForVersion_7_0.java - + persistence/src/main/resources/db/migration/6.901/04_remove_dcp_fields_H2.sql - + persistence/src/main/resources/db/migration/6.901/04_remove_dcp_fields_PG.sql - persistence/src/main/xmi/observe-seine.zargo - services-binder/src/main/java/fr/ird/observe/services/binder/data/seine/FloatingObjectBinder.java - services-validation/src/main/resources/fr/ird/observe/entities/seine/FloatingObject-service-error-validation.xml - − services-validation/src/main/resources/fr/ird/observe/entities/seine/FloatingObject-service-warning-validation.xml - services/src/main/xmi/observe-services-dto-seine.zargo Changes: ===================================== application-swing-validation/src/main/resources/fr/ird/observe/services/dto/seine/FloatingObjectDto-ui-create-error-validation.xml ===================================== --- a/application-swing-validation/src/main/resources/fr/ird/observe/services/dto/seine/FloatingObjectDto-ui-create-error-validation.xml +++ b/application-swing-validation/src/main/resources/fr/ird/observe/services/dto/seine/FloatingObjectDto-ui-create-error-validation.xml @@ -60,16 +60,6 @@ </field> - <field name="daysAtSeaCount"> - -  - <field-validator type="int" short-circuit="true"> - <param name="min">0</param> - <message>validator.ui.floatingObject.positive.daysAtSeaCount</message> - </field-validator> - - </field> - <field name="comment">  ===================================== application-swing-validation/src/main/resources/fr/ird/observe/services/dto/seine/FloatingObjectDto-ui-create-warning-validation.xml deleted ===================================== --- a/application-swing-validation/src/main/resources/fr/ird/observe/services/dto/seine/FloatingObjectDto-ui-create-warning-validation.xml +++ /dev/null @@ -1,38 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - - -<!DOCTYPE validators PUBLIC - "-//Apache Struts//XWork Validator 1.0.3//EN" - "http://struts.apache.org/dtds/xwork-validator-1.0.3.dtd"> -<validators> - - <field name="daysAtSeaCount"> - -  - <field-validator type="required" short-circuit="true"> - <message>validator.ui.floatingObject.null.daysAtSeaCount</message> - </field-validator> - - </field> - -</validators> ===================================== application-swing-validation/src/main/resources/fr/ird/observe/services/dto/seine/FloatingObjectDto-ui-update-error-validation.xml ===================================== --- a/application-swing-validation/src/main/resources/fr/ird/observe/services/dto/seine/FloatingObjectDto-ui-update-error-validation.xml +++ b/application-swing-validation/src/main/resources/fr/ird/observe/services/dto/seine/FloatingObjectDto-ui-update-error-validation.xml @@ -60,16 +60,6 @@ </field> - <field name="daysAtSeaCount"> - -  - <field-validator type="int" short-circuit="true"> - <param name="min">0</param> - <message>validator.ui.floatingObject.positive.daysAtSeaCount</message> - </field-validator> - - </field> - <field name="comment">  ===================================== application-swing-validation/src/main/resources/fr/ird/observe/services/dto/seine/FloatingObjectDto-ui-update-warning-validation.xml deleted ===================================== --- a/application-swing-validation/src/main/resources/fr/ird/observe/services/dto/seine/FloatingObjectDto-ui-update-warning-validation.xml +++ /dev/null @@ -1,38 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - - -<!DOCTYPE validators PUBLIC - "-//Apache Struts//XWork Validator 1.0.3//EN" - "http://struts.apache.org/dtds/xwork-validator-1.0.3.dtd"> -<validators> - - <field name="daysAtSeaCount"> - -  - <field-validator type="required" short-circuit="true"> - <message>validator.ui.floatingObject.null.daysAtSeaCount</message> - </field-validator> - - </field> - -</validators> ===================================== application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/seine/FloatingObjectUI.jaxx ===================================== --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/seine/FloatingObjectUI.jaxx +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/seine/FloatingObjectUI.jaxx @@ -86,14 +86,6 @@ </cell> </row> <row> - <cell anchor='west'> - <JLabel id='daysAtSeaCountLabel'/> - </cell> - <cell anchor='east' weightx="1"> - <NumberEditor id='daysAtSeaCount' constructorParams='this' styleClass="int6"/> - </cell> - </row> - <row> <cell columns='2' fill="both" weighty="0.7"> <JComment id="comment"/> </cell> ===================================== 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 @@ -72,18 +72,6 @@ BeanComboBox { selectedItem:{bean.getObjectType()}; } -#daysAtSeaCountLabel { - text:"observe.common.daysAtSeaCount"; - labelFor:{daysAtSeaCount}; -} - -#daysAtSeaCount { - bean:{bean}; - property:{FloatingObjectDto.PROPERTY_DAYS_AT_SEA_COUNT}; - numberValue:{bean.getDaysAtSeaCount()}; - showReset:true; -} - #comment { title:"observe.common.comment.floatingObject"; } ===================================== 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 @@ -207,8 +207,7 @@ public class FloatingObjectUIHandler extends ContentUIHandler<FloatingObjectDto, getTypeI18nKey(FloatingObjectDto.class), t("observe.content.floatingObject.message.updating")); } - super.startEditUI(FloatingObjectUI.BINDING_DAYS_AT_SEA_COUNT_NUMBER_VALUE, - FloatingObjectUI.BINDING_OBJECT_TYPE_SELECTED_ITEM, + super.startEditUI(FloatingObjectUI.BINDING_OBJECT_TYPE_SELECTED_ITEM, FloatingObjectUI.BINDING_COMMENT_MODEL); contentUIModel.setModified(create); } ===================================== 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 @@ -72,7 +72,6 @@ public class FloatingObjectUIModel extends ContentUIModel<FloatingObjectDto> { public static final Set<String> GENERAL_TAB_PROPERTIES = ImmutableSet.<String>builder().add(FloatingObjectDto.PROPERTY_OBJECT_OPERATION, FloatingObjectDto.PROPERTY_OBJECT_TYPE, - FloatingObjectDto.PROPERTY_DAYS_AT_SEA_COUNT, FloatingObjectDto.PROPERTY_COMMENT).build(); static final Set<String> MATERIALS_TAB_PROPERTIES = ===================================== 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 @@ -49,6 +49,7 @@ public class DataSourceMigrationForVersion_7_0 extends AbstractObserveMigrationC addScript("01", "add_object_operation", queries); addScript("02", "add_object_material", queries); addScript("03", "add_floating_object_part", queries); + addScript("04", "remove_dcp_fields", queries); } public static class H2DataSourceMigrationForVersion extends DataSourceMigrationForVersion_7_0 { ===================================== persistence/src/main/resources/db/migration/6.901/04_remove_dcp_fields_H2.sql ===================================== --- /dev/null +++ b/persistence/src/main/resources/db/migration/6.901/04_remove_dcp_fields_H2.sql @@ -0,0 +1,23 @@ +--- +-- #%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% +--- +ALTER TABLE observe_seine.FloatingObject DROP COLUMN DAYSATSEACOUNT; + ===================================== persistence/src/main/resources/db/migration/6.901/04_remove_dcp_fields_PG.sql ===================================== --- /dev/null +++ b/persistence/src/main/resources/db/migration/6.901/04_remove_dcp_fields_PG.sql @@ -0,0 +1,23 @@ +--- +-- #%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% +--- +ALTER TABLE observe_seine.FloatingObject DROP COLUMN DAYSATSEACOUNT; + ===================================== persistence/src/main/xmi/observe-seine.zargo ===================================== Binary files a/persistence/src/main/xmi/observe-seine.zargo and b/persistence/src/main/xmi/observe-seine.zargo differ ===================================== services-binder/src/main/java/fr/ird/observe/services/binder/data/seine/FloatingObjectBinder.java ===================================== --- a/services-binder/src/main/java/fr/ird/observe/services/binder/data/seine/FloatingObjectBinder.java +++ b/services-binder/src/main/java/fr/ird/observe/services/binder/data/seine/FloatingObjectBinder.java @@ -48,7 +48,6 @@ public class FloatingObjectBinder extends DataBinderSupport<FloatingObject, Floa copyDtoDataFieldsToEntity(dto, entity); - entity.setDaysAtSeaCount(dto.getDaysAtSeaCount()); entity.setObjectOperation(toEntity(dto.getObjectOperation(), ObjectOperation.class)); entity.setObjectType(toEntity(dto.getObjectType(), ObjectType.class)); @@ -59,7 +58,6 @@ public class FloatingObjectBinder extends DataBinderSupport<FloatingObject, Floa copyEntityDataFieldsToDto(entity, dto); - dto.setDaysAtSeaCount(entity.getDaysAtSeaCount()); dto.setObjectOperation(toReferentialReference(referentialLocale, entity.getObjectOperation(), ObjectOperationDto.class)); dto.setObjectType(toReferentialReference(referentialLocale, entity.getObjectType(), ObjectTypeDto.class)); ===================================== services-validation/src/main/resources/fr/ird/observe/entities/seine/FloatingObject-service-error-validation.xml ===================================== --- a/services-validation/src/main/resources/fr/ird/observe/entities/seine/FloatingObject-service-error-validation.xml +++ b/services-validation/src/main/resources/fr/ird/observe/entities/seine/FloatingObject-service-error-validation.xml @@ -60,16 +60,6 @@ </field> - <field name="daysAtSeaCount"> - -  - <field-validator type="int" short-circuit="true"> - <param name="min">0</param> - <message>validator.service.floatingObject.positive.daysAtSeaCount</message> - </field-validator> - - </field> - <field name="comment">  ===================================== services-validation/src/main/resources/fr/ird/observe/entities/seine/FloatingObject-service-warning-validation.xml deleted ===================================== --- a/services-validation/src/main/resources/fr/ird/observe/entities/seine/FloatingObject-service-warning-validation.xml +++ /dev/null @@ -1,38 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - - -<!DOCTYPE validators PUBLIC - "-//Apache Struts//XWork Validator 1.0.3//EN" - "http://struts.apache.org/dtds/xwork-validator-1.0.3.dtd"> -<validators> - - <field name="daysAtSeaCount"> - -  - <field-validator type="required" short-circuit="true"> - <message>validator.service.floatingObject.null.daysAtSeaCount</message> - </field-validator> - - </field> - -</validators> ===================================== services/src/main/xmi/observe-services-dto-seine.zargo ===================================== Binary files a/services/src/main/xmi/observe-services-dto-seine.zargo and b/services/src/main/xmi/observe-services-dto-seine.zargo differ View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/2012c7642c50068912170643966… --- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/2012c7642c50068912170643966… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop-7.x] Add FloatingObjectPart ui (See #577)
by Tony CHEMIT 31 May '17

31 May '17

Tony CHEMIT pushed to branch develop-7.x at ultreiaio / ird-observe Commits: 5e9ebeec by Tony CHEMIT at 2017-05-31T14:38:42+02:00 Add FloatingObjectPart ui (See #577) - - - - - 30 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.jaxx - 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 - application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/seine/SetSeineUIHandler.java - application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/seine/SetSeineUIModel.java - application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/open/impl/seine/ActivitySeineUIModel.java - application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/navigation/NavigationTree.java - application-swing/src/main/resources/i18n/application-swing_en_GB.properties - application-swing/src/main/resources/i18n/application-swing_es_ES.properties - application-swing/src/main/resources/i18n/application-swing_fr_FR.properties - persistence/src/main/resources/db/migration/6.901/02_add_object_material-H2.sql - persistence/src/main/resources/db/migration/6.901/02_add_object_material-PG.sql - persistence/src/main/resources/db/migration/6.901/03_add_floating_object_part-H2.sql - persistence/src/main/resources/db/migration/6.901/03_add_floating_object_part-PG.sql - persistence/src/main/xmi/observe.ini - services-binder/src/main/java/fr/ird/observe/services/binder/BinderEngineInitializer.java - services-binder/src/main/java/fr/ird/observe/services/binder/data/seine/FloatingObjectPartBinder.java - services-topia/pom.xml - services-topia/src/main/java/fr/ird/observe/services/topia/ObserveServiceTopia.java - services-topia/src/main/java/fr/ird/observe/services/topia/service/data/seine/FloatingObjectServiceTopia.java - services-topia/src/test/java/fr/ird/observe/services/topia/DataSourcesForTestManager.java - services-topia/src/test/java/fr/ird/observe/services/topia/service/data/seine/FloatingObjectServiceTopiaTest.java - services-topia/src/test/java/fr/ird/observe/services/topia/service/sql/MigrateTestsDatabases.java - services/src/main/java/fr/ird/observe/services/ObserveDataReferenceSets.java - services/src/main/java/fr/ird/observe/services/dto/seine/ObjectMaterialHierarchyDto.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 The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/5e9ebeecb0fac37c3c946e3b17f… --- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/5e9ebeecb0fac37c3c946e3b17f… You're receiving this email because of your account on gitlab.com.

1 0