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

[Git][ultreiaio/ird-observe][develop] review referentials
by Tony CHEMIT 31 Jul '17

31 Jul '17

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: b092b50b by Tony CHEMIT at 2017-07-31T23:14:53+02:00 review referentials - - - - - 5 changed files: - persistence/src/main/resources/db/migration/6.901/09_fill_object_material-common.sql - services-topia/src/main/java/fr/ird/observe/services/topia/service/data/seine/FloatingObjectServiceTopia.java - test/src/main/resources/db/6.901/dataForTestLongline.sql.gz - test/src/main/resources/db/6.901/dataForTestSeine.sql.gz - test/src/main/resources/db/6.901/referentiel.sql.gz Changes: ===================================== persistence/src/main/resources/db/migration/6.901/09_fill_object_material-common.sql ===================================== --- a/persistence/src/main/resources/db/migration/6.901/09_fill_object_material-common.sql +++ b/persistence/src/main/resources/db/migration/6.901/09_fill_object_material-common.sql @@ -23,26 +23,26 @@ INSERT INTO observe_seine.objectMaterial (topiaid, topiaversion, topiacreatedate INSERT INTO observe_seine.objectMaterial (topiaid, topiaversion, topiacreatedate, lastupdatedate, needComment, status, legacyCode, standardCode, code, parent, label1, label2, label3, selectable, childrenMultiSelectable, childSelectionMandatory, objectMaterialType, validation, biodegradable, nonEntangling) values ('fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.1' , 0, CURRENT_DATE, CURRENT_TIMESTAMP, false, 1, NULL , 'FAD' , '1-1' , 'fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.01', 'FAD' , 'FAD' , 'FAD' , false, false, false, NULL , NULL , false, false); INSERT INTO observe_seine.objectMaterial (topiaid, topiaversion, topiacreatedate, lastupdatedate, needComment, status, legacyCode, standardCode, code, parent, label1, label2, label3, selectable, childrenMultiSelectable, childSelectionMandatory, objectMaterialType, validation, biodegradable, nonEntangling) values ('fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.2' , 0, CURRENT_DATE, CURRENT_TIMESTAMP, false, 1, '16' , 'DFAD' , '1-1-1' , 'fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.1' , 'DFAD (drifting FAD)' , 'DFAD (FAD dérivant)' , 'DFAD (FAD a la deriva)' , true , true , false, 'fr.ird.observe.entities.referentiel.seine.ObjectMaterialType#0#0', NULL , false, false); INSERT INTO observe_seine.objectMaterial (topiaid, topiaversion, topiacreatedate, lastupdatedate, needComment, status, legacyCode, standardCode, code, parent, label1, label2, label3, selectable, childrenMultiSelectable, childSelectionMandatory, objectMaterialType, validation, biodegradable, nonEntangling) values ('fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.55' , 0, CURRENT_DATE, CURRENT_TIMESTAMP, false, 1, NULL , NULL , '1-1-1-1' , 'fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.1' , 'Floating structure' , 'Structure flottante' , 'Parrilla' , false, false, false, NULL , NULL , false, false); -INSERT INTO observe_seine.objectMaterial (topiaid, topiaversion, topiacreatedate, lastupdatedate, needComment, status, legacyCode, standardCode, code, parent, label1, label2, label3, selectable, childrenMultiSelectable, childSelectionMandatory, objectMaterialType, validation, biodegradable, nonEntangling) values ('fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.6' , 0, CURRENT_DATE, CURRENT_TIMESTAMP, false, 1, NULL , NULL , '1-1-1-1-1' , 'fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.3' , 'Frame' , 'Chassis' , 'Estructura' , false, false, true , NULL , NULL , false, false); +INSERT INTO observe_seine.objectMaterial (topiaid, topiaversion, topiacreatedate, lastupdatedate, needComment, status, legacyCode, standardCode, code, parent, label1, label2, label3, selectable, childrenMultiSelectable, childSelectionMandatory, objectMaterialType, validation, biodegradable, nonEntangling) values ('fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.6' , 0, CURRENT_DATE, CURRENT_TIMESTAMP, false, 1, NULL , NULL , '1-1-1-1-1' , 'fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.55', 'Frame' , 'Chassis' , 'Estructura' , false, false, true , NULL , NULL , false, false); INSERT INTO observe_seine.objectMaterial (topiaid, topiaversion, topiacreatedate, lastupdatedate, needComment, status, legacyCode, standardCode, code, parent, label1, label2, label3, selectable, childrenMultiSelectable, childSelectionMandatory, objectMaterialType, validation, biodegradable, nonEntangling) values ('fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.7' , 0, CURRENT_DATE, CURRENT_TIMESTAMP, false, 1, '6, 15, 25' , NULL , '1-1-1-1-1-1' , 'fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.6' , 'Vegetal, canes,bamboo' , 'Végétal, tiges,bambou' , 'Bambú, cañas' , true , false, false, 'fr.ird.observe.entities.referentiel.seine.ObjectMaterialType#0#0', NULL , false, false); INSERT INTO observe_seine.objectMaterial (topiaid, topiaversion, topiacreatedate, lastupdatedate, needComment, status, legacyCode, standardCode, code, parent, label1, label2, label3, selectable, childrenMultiSelectable, childSelectionMandatory, objectMaterialType, validation, biodegradable, nonEntangling) values ('fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.8' , 0, CURRENT_DATE, CURRENT_TIMESTAMP, false, 1, '20, 21*,26' , NULL , '1-1-1-1-1-2' , 'fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.6' , 'Metallic or PVC' , 'Métal ou PVC' , 'Metállica ó PVC' , true , false, false, 'fr.ird.observe.entities.referentiel.seine.ObjectMaterialType#0#0', NULL , false, false); -INSERT INTO observe_seine.objectMaterial (topiaid, topiaversion, topiacreatedate, lastupdatedate, needComment, status, legacyCode, standardCode, code, parent, label1, label2, label3, selectable, childrenMultiSelectable, childSelectionMandatory, objectMaterialType, validation, biodegradable, nonEntangling) values ('fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.85' , 0, CURRENT_DATE, CURRENT_TIMESTAMP, false, 1, NULL , NULL , '1-1-1-1-1-3' , 'fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.6' , 'Mixed vegetal, and metallic or PVC' , 'A la fois végétal et métallique ou PVC' , 'Mixta (metálica ó PVC y cañas)' , true , false, false, 'fr.ird.observe.entities.referentiel.seine.ObjectMaterialType#0#0', NULL , false, false); -INSERT INTO observe_seine.objectMaterial (topiaid, topiaversion, topiacreatedate, lastupdatedate, needComment, status, legacyCode, standardCode, code, parent, label1, label2, label3, selectable, childrenMultiSelectable, childSelectionMandatory, objectMaterialType, validation, biodegradable, nonEntangling) values ('fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.9' , 0, CURRENT_DATE, CURRENT_TIMESTAMP, false, 1, NULL , NULL , '1-1-1-1-2' , 'fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.3' , 'Superior coverage' , 'Revêtement supérieur' , 'Recubrimiento superior' , false, true , true , NULL , NULL , false, false); +INSERT INTO observe_seine.objectMaterial (topiaid, topiaversion, topiacreatedate, lastupdatedate, needComment, status, legacyCode, standardCode, code, parent, label1, label2, label3, selectable, childrenMultiSelectable, childSelectionMandatory, objectMaterialType, validation, biodegradable, nonEntangling) values ('fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.87' , 0, CURRENT_DATE, CURRENT_TIMESTAMP, false, 1, NULL , NULL , '1-1-1-1-1-3' , 'fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.6' , 'Mixed vegetal, and metallic or PVC' , 'A la fois végétal et métallique ou PVC' , 'Mixta (metálica ó PVC y cañas)' , true , false, false, 'fr.ird.observe.entities.referentiel.seine.ObjectMaterialType#0#0', NULL , false, false); +INSERT INTO observe_seine.objectMaterial (topiaid, topiaversion, topiacreatedate, lastupdatedate, needComment, status, legacyCode, standardCode, code, parent, label1, label2, label3, selectable, childrenMultiSelectable, childSelectionMandatory, objectMaterialType, validation, biodegradable, nonEntangling) values ('fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.9' , 0, CURRENT_DATE, CURRENT_TIMESTAMP, false, 1, NULL , NULL , '1-1-1-1-2' , 'fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.55', 'Superior coverage' , 'Revêtement supérieur' , 'Recubrimiento superior' , false, true , true , NULL , NULL , false, false); INSERT INTO observe_seine.objectMaterial (topiaid, topiaversion, topiacreatedate, lastupdatedate, needComment, status, legacyCode, standardCode, code, parent, label1, label2, label3, selectable, childrenMultiSelectable, childSelectionMandatory, objectMaterialType, validation, biodegradable, nonEntangling) values ('fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.10' , 0, CURRENT_DATE, CURRENT_TIMESTAMP, false, 1, NULL , NULL , '1-1-1-1-2-1' , 'fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.9' , 'Net' , 'Filet' , 'Red' , false, true , false, NULL , NULL , false, false); INSERT INTO observe_seine.objectMaterial (topiaid, topiaversion, topiacreatedate, lastupdatedate, needComment, status, legacyCode, standardCode, code, parent, label1, label2, label3, selectable, childrenMultiSelectable, childSelectionMandatory, objectMaterialType, validation, biodegradable, nonEntangling) values ('fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.11' , 0, CURRENT_DATE, CURRENT_TIMESTAMP, false, 1, NULL , NULL , '1-1-1-1-2-1-1' , 'fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.10', 'Net with mesh ≤7cm' , 'Filet avec maillage ≤7cm' , 'Red con malla ≤7cm' , true , false, false, 'fr.ird.observe.entities.referentiel.seine.ObjectMaterialType#0#0', NULL , false, false); INSERT INTO observe_seine.objectMaterial (topiaid, topiaversion, topiacreatedate, lastupdatedate, needComment, status, legacyCode, standardCode, code, parent, label1, label2, label3, selectable, childrenMultiSelectable, childSelectionMandatory, objectMaterialType, validation, biodegradable, nonEntangling) values ('fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.12' , 0, CURRENT_DATE, CURRENT_TIMESTAMP, false, 1, NULL , NULL , '1-1-1-1-2-1-2' , 'fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.10', 'Net with mesh >7cm' , 'Filet avec maillage >7cm' , 'Red con malla >7cm' , true , false, false, 'fr.ird.observe.entities.referentiel.seine.ObjectMaterialType#0#0', NULL , false, false); INSERT INTO observe_seine.objectMaterial (topiaid, topiaversion, topiacreatedate, lastupdatedate, needComment, status, legacyCode, standardCode, code, parent, label1, label2, label3, selectable, childrenMultiSelectable, childSelectionMandatory, objectMaterialType, validation, biodegradable, nonEntangling) values ('fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.13' , 0, CURRENT_DATE, CURRENT_TIMESTAMP, false, 1, NULL , NULL , '1-1-1-1-2-2' , 'fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.9' , 'Coverage without mesh' , 'Revêtement sans maillage' , 'Recubrimiento sin malla' , true , false, false, 'fr.ird.observe.entities.referentiel.seine.ObjectMaterialType#0#0', NULL , false, false); INSERT INTO observe_seine.objectMaterial (topiaid, topiaversion, topiacreatedate, lastupdatedate, needComment, status, legacyCode, standardCode, code, parent, label1, label2, label3, selectable, childrenMultiSelectable, childSelectionMandatory, objectMaterialType, validation, biodegradable, nonEntangling) values ('fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.14' , 0, CURRENT_DATE, CURRENT_TIMESTAMP, false, 1, NULL , NULL , '1-1-1-1-2-3' , 'fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.9' , 'Not covered' , 'Non couvert' , 'Sin recubrimiento' , true , false, false, 'fr.ird.observe.entities.referentiel.seine.ObjectMaterialType#0#0', NULL , false, false); INSERT INTO observe_seine.objectMaterial (topiaid, topiaversion, topiacreatedate, lastupdatedate, needComment, status, legacyCode, standardCode, code, parent, label1, label2, label3, selectable, childrenMultiSelectable, childSelectionMandatory, objectMaterialType, validation, biodegradable, nonEntangling) values ('fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.15' , 0, CURRENT_DATE, CURRENT_TIMESTAMP, false, 1, NULL , NULL , '1-1-1-1-2-4' , 'fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.9' , 'Not visible' , 'Non visible' , 'No se ve' , true , false, false, 'fr.ird.observe.entities.referentiel.seine.ObjectMaterialType#0#0', NULL , false, false); -INSERT INTO observe_seine.objectMaterial (topiaid, topiaversion, topiacreatedate, lastupdatedate, needComment, status, legacyCode, standardCode, code, parent, label1, label2, label3, selectable, childrenMultiSelectable, childSelectionMandatory, objectMaterialType, validation, biodegradable, nonEntangling) values ('fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.16' , 0, CURRENT_DATE, CURRENT_TIMESTAMP, false, 1, NULL , NULL , '1-1-1-1-3' , 'fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.3' , 'Inferior coverage' , 'Revêtement inférieur' , 'Recubrimiento inferior' , false, true , true , NULL , NULL , false, false); +INSERT INTO observe_seine.objectMaterial (topiaid, topiaversion, topiacreatedate, lastupdatedate, needComment, status, legacyCode, standardCode, code, parent, label1, label2, label3, selectable, childrenMultiSelectable, childSelectionMandatory, objectMaterialType, validation, biodegradable, nonEntangling) values ('fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.16' , 0, CURRENT_DATE, CURRENT_TIMESTAMP, false, 1, NULL , NULL , '1-1-1-1-3' , 'fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.55', 'Inferior coverage' , 'Revêtement inférieur' , 'Recubrimiento inferior' , false, true , true , NULL , NULL , false, false); INSERT INTO observe_seine.objectMaterial (topiaid, topiaversion, topiacreatedate, lastupdatedate, needComment, status, legacyCode, standardCode, code, parent, label1, label2, label3, selectable, childrenMultiSelectable, childSelectionMandatory, objectMaterialType, validation, biodegradable, nonEntangling) values ('fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.17' , 0, CURRENT_DATE, CURRENT_TIMESTAMP, false, 1, NULL , NULL , '1-1-1-1-3-1' , 'fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.16', 'Net' , 'Filet' , 'Red' , false, true , false, NULL , NULL , false, false); INSERT INTO observe_seine.objectMaterial (topiaid, topiaversion, topiacreatedate, lastupdatedate, needComment, status, legacyCode, standardCode, code, parent, label1, label2, label3, selectable, childrenMultiSelectable, childSelectionMandatory, objectMaterialType, validation, biodegradable, nonEntangling) values ('fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.18' , 0, CURRENT_DATE, CURRENT_TIMESTAMP, false, 1, NULL , NULL , '1-1-1-1-3-1-1' , 'fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.17', 'Net with mesh ≤7cm' , 'Filet avec maillage ≤7cm' , 'Red con malla ≤7cm' , true , false, false, 'fr.ird.observe.entities.referentiel.seine.ObjectMaterialType#0#0', NULL , false, false); INSERT INTO observe_seine.objectMaterial (topiaid, topiaversion, topiacreatedate, lastupdatedate, needComment, status, legacyCode, standardCode, code, parent, label1, label2, label3, selectable, childrenMultiSelectable, childSelectionMandatory, objectMaterialType, validation, biodegradable, nonEntangling) values ('fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.19' , 0, CURRENT_DATE, CURRENT_TIMESTAMP, false, 1, NULL , NULL , '1-1-1-1-3-1-2' , 'fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.17', 'Net with mesh >7cm' , 'Filet avec maillage >7cm' , 'Red con malla >7cm' , true , false, false, 'fr.ird.observe.entities.referentiel.seine.ObjectMaterialType#0#0', NULL , false, false); INSERT INTO observe_seine.objectMaterial (topiaid, topiaversion, topiacreatedate, lastupdatedate, needComment, status, legacyCode, standardCode, code, parent, label1, label2, label3, selectable, childrenMultiSelectable, childSelectionMandatory, objectMaterialType, validation, biodegradable, nonEntangling) values ('fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.20' , 0, CURRENT_DATE, CURRENT_TIMESTAMP, false, 1, NULL , NULL , '1-1-1-1-3-2' , 'fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.16', 'Coverage without mesh' , 'Revêtement sans maillage' , 'Recubrimiento sin malla' , true , false, false, 'fr.ird.observe.entities.referentiel.seine.ObjectMaterialType#0#0', NULL , false, false); INSERT INTO observe_seine.objectMaterial (topiaid, topiaversion, topiacreatedate, lastupdatedate, needComment, status, legacyCode, standardCode, code, parent, label1, label2, label3, selectable, childrenMultiSelectable, childSelectionMandatory, objectMaterialType, validation, biodegradable, nonEntangling) values ('fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.21' , 0, CURRENT_DATE, CURRENT_TIMESTAMP, false, 1, NULL , NULL , '1-1-1-1-3-3' , 'fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.16', 'Not covered' , 'Non couvert' , 'Sin recubrimiento' , true , false, false, 'fr.ird.observe.entities.referentiel.seine.ObjectMaterialType#0#0', NULL , false, false); INSERT INTO observe_seine.objectMaterial (topiaid, topiaversion, topiacreatedate, lastupdatedate, needComment, status, legacyCode, standardCode, code, parent, label1, label2, label3, selectable, childrenMultiSelectable, childSelectionMandatory, objectMaterialType, validation, biodegradable, nonEntangling) values ('fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.22' , 0, CURRENT_DATE, CURRENT_TIMESTAMP, false, 1, NULL , NULL , '1-1-1-1-3-4' , 'fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.16', 'Not visible' , 'Non visible' , 'No se ve' , true , false, false, 'fr.ird.observe.entities.referentiel.seine.ObjectMaterialType#0#0', NULL , false, false); -INSERT INTO observe_seine.objectMaterial (topiaid, topiaversion, topiacreatedate, lastupdatedate, needComment, status, legacyCode, standardCode, code, parent, label1, label2, label3, selectable, childrenMultiSelectable, childSelectionMandatory, objectMaterialType, validation, biodegradable, nonEntangling) values ('fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.23' , 0, CURRENT_DATE, CURRENT_TIMESTAMP, false, 1, NULL , NULL , '1-1-1-1-4' , 'fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.3' , 'Modified' , 'Modifié' , 'Se modifica' , true , false, false, 'fr.ird.observe.entities.referentiel.seine.ObjectMaterialType#0#0', NULL , false, false); -INSERT INTO observe_seine.objectMaterial (topiaid, topiaversion, topiacreatedate, lastupdatedate, needComment, status, legacyCode, standardCode, code, parent, label1, label2, label3, selectable, childrenMultiSelectable, childSelectionMandatory, objectMaterialType, validation, biodegradable, nonEntangling) values ('fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.24' , 0, CURRENT_DATE, CURRENT_TIMESTAMP, false, 1, NULL , NULL , '1-1-1-1-5' , 'fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.3' , 'Replaced' , 'Remplacé' , 'Se reemplaza' , true , false, false, 'fr.ird.observe.entities.referentiel.seine.ObjectMaterialType#0#0', NULL , false, false); +INSERT INTO observe_seine.objectMaterial (topiaid, topiaversion, topiacreatedate, lastupdatedate, needComment, status, legacyCode, standardCode, code, parent, label1, label2, label3, selectable, childrenMultiSelectable, childSelectionMandatory, objectMaterialType, validation, biodegradable, nonEntangling) values ('fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.23' , 0, CURRENT_DATE, CURRENT_TIMESTAMP, false, 1, NULL , NULL , '1-1-1-1-4' , 'fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.55', 'Modified' , 'Modifié' , 'Se modifica' , true , false, false, 'fr.ird.observe.entities.referentiel.seine.ObjectMaterialType#0#0', NULL , false, false); +INSERT INTO observe_seine.objectMaterial (topiaid, topiaversion, topiacreatedate, lastupdatedate, needComment, status, legacyCode, standardCode, code, parent, label1, label2, label3, selectable, childrenMultiSelectable, childSelectionMandatory, objectMaterialType, validation, biodegradable, nonEntangling) values ('fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.24' , 0, CURRENT_DATE, CURRENT_TIMESTAMP, false, 1, NULL , NULL , '1-1-1-1-5' , 'fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.55', 'Replaced' , 'Remplacé' , 'Se reemplaza' , true , false, false, 'fr.ird.observe.entities.referentiel.seine.ObjectMaterialType#0#0', NULL , false, false); INSERT INTO observe_seine.objectMaterial (topiaid, topiaversion, topiacreatedate, lastupdatedate, needComment, status, legacyCode, standardCode, code, parent, label1, label2, label3, selectable, childrenMultiSelectable, childSelectionMandatory, objectMaterialType, validation, biodegradable, nonEntangling) values ('fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.85' , 0, CURRENT_DATE, CURRENT_TIMESTAMP, false, 1, NULL , NULL , '1-1-1-2' , 'fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.2' , 'Subsurface structure' , 'Structure immergée' , 'Rabo' , false, true , true , NULL , NULL , false, false); INSERT INTO observe_seine.objectMaterial (topiaid, topiaversion, topiacreatedate, lastupdatedate, needComment, status, legacyCode, standardCode, code, parent, label1, label2, label3, selectable, childrenMultiSelectable, childSelectionMandatory, objectMaterialType, validation, biodegradable, nonEntangling) values ('fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.25' , 0, CURRENT_DATE, CURRENT_TIMESTAMP, false, 1, NULL , NULL , '1-1-1-2-1' , 'fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.85', 'Net in sausage' , 'Filet saucisse' , 'Red en chorizo' , false, true , false, NULL , NULL , false, false); INSERT INTO observe_seine.objectMaterial (topiaid, topiaversion, topiacreatedate, lastupdatedate, needComment, status, legacyCode, standardCode, code, parent, label1, label2, label3, selectable, childrenMultiSelectable, childSelectionMandatory, objectMaterialType, validation, biodegradable, nonEntangling) values ('fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.26' , 0, CURRENT_DATE, CURRENT_TIMESTAMP, false, 0, NULL , NULL , '1-1-1-2-1-1' , 'fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.25', 'Net in sausage with mesh ≤7cm' , 'Filet saucisse avec maillage ≤7cm' , 'Red en chorizo con malla ≤7cm' , true , false, false, 'fr.ird.observe.entities.referentiel.seine.ObjectMaterialType#0#0', NULL , false, false); @@ -77,7 +77,7 @@ INSERT INTO observe_seine.objectMaterial (topiaid, topiaversion, topiacreatedate INSERT INTO observe_seine.objectMaterial (topiaid, topiaversion, topiacreatedate, lastupdatedate, needComment, status, legacyCode, standardCode, code, parent, label1, label2, label3, selectable, childrenMultiSelectable, childSelectionMandatory, objectMaterialType, validation, biodegradable, nonEntangling) values ('fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.52' , 0, CURRENT_DATE, CURRENT_TIMESTAMP, false, 1, NULL , 'VNLOG' , '1-2-1-1' , 'fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.51', 'VNLOG (vegetal NLOG)' , 'VNLOG (NLOG vegetal)' , 'VNLOG (NLOG vegetal)' , true , true , false, 'fr.ird.observe.entities.referentiel.seine.ObjectMaterialType#0#0', NULL , false, false); INSERT INTO observe_seine.objectMaterial (topiaid, topiaversion, topiacreatedate, lastupdatedate, needComment, status, legacyCode, standardCode, code, parent, label1, label2, label3, selectable, childrenMultiSelectable, childSelectionMandatory, objectMaterialType, validation, biodegradable, nonEntangling) values ('fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.53' , 0, CURRENT_DATE, CURRENT_TIMESTAMP, false, 1, '1' , NULL , '1-2-1-1-1' , 'fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.52', 'Straw heap' , 'Tas de paille' , 'Monton the hierba' , true , false, false, 'fr.ird.observe.entities.referentiel.seine.ObjectMaterialType#0#0', NULL , false, false); INSERT INTO observe_seine.objectMaterial (topiaid, topiaversion, topiacreatedate, lastupdatedate, needComment, status, legacyCode, standardCode, code, parent, label1, label2, label3, selectable, childrenMultiSelectable, childSelectionMandatory, objectMaterialType, validation, biodegradable, nonEntangling) values ('fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.54' , 0, CURRENT_DATE, CURRENT_TIMESTAMP, false, 1, '2' , NULL , '1-2-1-1-2' , 'fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.52', 'Palm tree, palm' , 'Palmier, palme' , 'Palma, hoja de palmera' , true , false, false, 'fr.ird.observe.entities.referentiel.seine.ObjectMaterialType#0#0', NULL , false, false); -INSERT INTO observe_seine.objectMaterial (topiaid, topiaversion, topiacreatedate, lastupdatedate, needComment, status, legacyCode, standardCode, code, parent, label1, label2, label3, selectable, childrenMultiSelectable, childSelectionMandatory, objectMaterialType, validation, biodegradable, nonEntangling) values ('fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.55' , 0, CURRENT_DATE, CURRENT_TIMESTAMP, false, 1, '3' , NULL , '1-2-1-1-3' , 'fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.52', 'Tree, branche' , 'Arbre, branche' , 'Árbol, rama' , true , false, false, 'fr.ird.observe.entities.referentiel.seine.ObjectMaterialType#0#0', NULL , false, false); +INSERT INTO observe_seine.objectMaterial (topiaid, topiaversion, topiacreatedate, lastupdatedate, needComment, status, legacyCode, standardCode, code, parent, label1, label2, label3, selectable, childrenMultiSelectable, childSelectionMandatory, objectMaterialType, validation, biodegradable, nonEntangling) values ('fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.88' , 0, CURRENT_DATE, CURRENT_TIMESTAMP, false, 1, '3' , NULL , '1-2-1-1-3' , 'fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.52', 'Tree, branche' , 'Arbre, branche' , 'Árbol, rama' , true , false, false, 'fr.ird.observe.entities.referentiel.seine.ObjectMaterialType#0#0', NULL , false, false); INSERT INTO observe_seine.objectMaterial (topiaid, topiaversion, topiacreatedate, lastupdatedate, needComment, status, legacyCode, standardCode, code, parent, label1, label2, label3, selectable, childrenMultiSelectable, childSelectionMandatory, objectMaterialType, validation, biodegradable, nonEntangling) values ('fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.56' , 0, CURRENT_DATE, CURRENT_TIMESTAMP, false, 1, NULL , 'ANLOG' , '1-2-1-2' , 'fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.51', 'ANLOG (animal NLOG)' , 'ANLOG (NLOG animal)' , 'ANLOG (NLOG animal)' , true , true , false, 'fr.ird.observe.entities.referentiel.seine.ObjectMaterialType#0#0', NULL , false, false); INSERT INTO observe_seine.objectMaterial (topiaid, topiaversion, topiacreatedate, lastupdatedate, needComment, status, legacyCode, standardCode, code, parent, label1, label2, label3, selectable, childrenMultiSelectable, childSelectionMandatory, objectMaterialType, validation, biodegradable, nonEntangling) values ('fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.57' , 0, CURRENT_DATE, CURRENT_TIMESTAMP, false, 1, '4, 5*, 24' , NULL , '1-2-1-2-1' , 'fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.56', 'Carrion' , 'Charogne' , 'Carroña' , true , false, false, 'fr.ird.observe.entities.referentiel.seine.ObjectMaterialType#0#0', NULL , false, false); INSERT INTO observe_seine.objectMaterial (topiaid, topiaversion, topiacreatedate, lastupdatedate, needComment, status, legacyCode, standardCode, code, parent, label1, label2, label3, selectable, childrenMultiSelectable, childSelectionMandatory, objectMaterialType, validation, biodegradable, nonEntangling) values ('fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.58' , 0, CURRENT_DATE, CURRENT_TIMESTAMP, false, 1, NULL , NULL , '1-2-1-2-2' , 'fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.56', 'Whale shark' , 'Requin-baleine' , 'Tiburón ballena' , true , false, false, 'fr.ird.observe.entities.referentiel.seine.ObjectMaterialType#0#0', NULL , false, false); ===================================== services-topia/src/main/java/fr/ird/observe/services/topia/service/data/seine/FloatingObjectServiceTopia.java ===================================== --- a/services-topia/src/main/java/fr/ird/observe/services/topia/service/data/seine/FloatingObjectServiceTopia.java +++ b/services-topia/src/main/java/fr/ird/observe/services/topia/service/data/seine/FloatingObjectServiceTopia.java @@ -29,6 +29,7 @@ import com.google.common.collect.Maps; import com.google.common.collect.Multimap; import fr.ird.observe.entities.referentiel.ObserveReferentialEntity; import fr.ird.observe.entities.referentiel.seine.ObjectMaterial; +import fr.ird.observe.entities.referentiel.seine.ObjectMaterialTopiaDao; import fr.ird.observe.entities.seine.ActivitySeine; import fr.ird.observe.entities.seine.FloatingObject; import fr.ird.observe.entities.seine.FloatingObjectPart; @@ -69,7 +70,8 @@ public class FloatingObjectServiceTopia extends ObserveServiceTopia implements F @Override public List<ObjectMaterialHierarchyDto> getObjectMaterialHierarchy() { - List<ObjectMaterial> objectMaterials = getTopiaPersistenceContext().getObjectMaterialDao().findAll(); + ObjectMaterialTopiaDao dao = getTopiaPersistenceContext().getObjectMaterialDao(); + List<ObjectMaterial> objectMaterials = dao.findAll(); return getObjectMaterialHierarchyDtos(objectMaterials); } @@ -233,7 +235,7 @@ public class FloatingObjectServiceTopia extends ObserveServiceTopia implements F private List<ObjectMaterialHierarchyDto> getObjectMaterialHierarchyDtos(List<ObjectMaterial> objectMaterials) { Multimap<String, ObjectMaterial> childrenByParent = ArrayListMultimap.create(); objectMaterials.forEach(o -> childrenByParent.put(Optional.ofNullable(o.getParent()).map(ObjectMaterial::getTopiaId).orElse(null), o)); - Collection<ObjectMaterial> topLevelMaterials = childrenByParent.get(null); + Collection<ObjectMaterial> topLevelMaterials = childrenByParent.get("fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.01"); ReferentialBinderSupport<ObserveReferentialEntity, ObjectMaterialDto> referentialBinder = getReferentialBinder(ObjectMaterialDto.class); ReferentialLocale referentialLocale = getReferentialLocale(); List<ObjectMaterialHierarchyDto> result = new LinkedList<>(); ===================================== test/src/main/resources/db/6.901/dataForTestLongline.sql.gz ===================================== Binary files a/test/src/main/resources/db/6.901/dataForTestLongline.sql.gz and b/test/src/main/resources/db/6.901/dataForTestLongline.sql.gz differ ===================================== test/src/main/resources/db/6.901/dataForTestSeine.sql.gz ===================================== Binary files a/test/src/main/resources/db/6.901/dataForTestSeine.sql.gz and b/test/src/main/resources/db/6.901/dataForTestSeine.sql.gz differ ===================================== test/src/main/resources/db/6.901/referentiel.sql.gz ===================================== Binary files a/test/src/main/resources/db/6.901/referentiel.sql.gz and b/test/src/main/resources/db/6.901/referentiel.sql.gz differ View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/b092b50bc2f6b787a39824bcf7d… --- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/b092b50bc2f6b787a39824bcf7d… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] update referential
by Tony CHEMIT 31 Jul '17

31 Jul '17

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: d937ebd3 by Tony CHEMIT at 2017-07-31T22:06:44+02:00 update referential - - - - - 1 changed file: - persistence/src/main/resources/db/migration/6.901/09_fill_object_material-common.sql Changes: ===================================== persistence/src/main/resources/db/migration/6.901/09_fill_object_material-common.sql ===================================== The diff for this file was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/d937ebd36b5a77b00001a572f78… --- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/d937ebd36b5a77b00001a572f78… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] Utilisation de wehnArriving et whenLeaving sur ObjectOperation pour piloter…
by Tony CHEMIT 31 Jul '17

31 Jul '17

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: b5cd741c by Tony CHEMIT at 2017-07-31T17:47:42+02:00 Utilisation de wehnArriving et whenLeaving sur ObjectOperation pour piloter l'édition des Object Parts - - - - - 6 changed files: - application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/seine/FloatingObjectPartsTreeNode.java - application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/seine/FloatingObjectUI.jcss - application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/seine/FloatingObjectUIHandler.java - application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/seine/FloatingObjectUIModel.java - services-topia/src/main/java/fr/ird/observe/services/binder/referential/seine/ObjectOperationBinder.java - services/src/main/java/fr/ird/observe/services/ObserveDtoInitializer.java Changes: ===================================== application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/seine/FloatingObjectPartsTreeNode.java ===================================== --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/seine/FloatingObjectPartsTreeNode.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/seine/FloatingObjectPartsTreeNode.java @@ -79,7 +79,18 @@ public class FloatingObjectPartsTreeNode extends AbstractMutableTreeTableNode im @Override public boolean isEditable(int column) { - return column > 0 && getUserObject().isSelectable(); + boolean result = column > 0 && getUserObject().isSelectable(); + if (result) { + switch (column) { + case 1: // when arriving + result = model.isArriving(); + break; + case 2: // when leaving + result = model.isLeaving(); + break; + } + } + return result; } @Override ===================================== application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/seine/FloatingObjectUI.jcss ===================================== --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/seine/FloatingObjectUI.jcss +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/seine/FloatingObjectUI.jcss @@ -45,11 +45,13 @@ BeanComboBox { #fromLeftToRight { _observeAction:{CopyFloatingObjectPartToRightAction.ACTION_NAME}; focusable:false; + enabled:{model.isLeaving() && model.isArriving()}; } #fromRightToLeft { _observeAction:{CopyFloatingObjectPartToLeftAction.ACTION_NAME}; focusable:false; + enabled:{model.isLeaving() && model.isArriving()}; } #objectOperationLabel { ===================================== application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/seine/FloatingObjectUIHandler.java ===================================== --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/seine/FloatingObjectUIHandler.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/seine/FloatingObjectUIHandler.java @@ -35,7 +35,9 @@ import fr.ird.observe.application.swing.ui.tree.navigation.nodes.NavigationTreeN import fr.ird.observe.services.dto.FloatingObjectReference; import fr.ird.observe.services.dto.form.Form; import fr.ird.observe.services.dto.reference.DataReference; +import fr.ird.observe.services.dto.reference.ReferentialReference; import fr.ird.observe.services.dto.referential.seine.ObjectMaterialDto; +import fr.ird.observe.services.dto.referential.seine.ObjectOperationDto; import fr.ird.observe.services.dto.result.SaveResultDto; import fr.ird.observe.services.dto.seine.ActivitySeineDto; import fr.ird.observe.services.dto.seine.FloatingObjectDto; @@ -338,6 +340,18 @@ public class FloatingObjectUIHandler extends ContentUIHandler<FloatingObjectDto, } }); + getBean().addPropertyChangeListener(FloatingObjectDto.PROPERTY_OBJECT_OPERATION, e -> updateMaterials((ReferentialReference) e.getNewValue())); + + } + + private void updateMaterials(ReferentialReference<ObjectOperationDto> operation) { + if (operation == null) { + getModel().setArriving(false); + getModel().setLeaving(false); + } else { + getModel().setArriving((Boolean) operation.getPropertyValue(ObjectOperationDto.PROPERTY_WHEN_ARRIVING)); + getModel().setLeaving((Boolean) operation.getPropertyValue(ObjectOperationDto.PROPERTY_WHEN_LEAVING)); + } } private static final Icon ICON_NOT_A_REFERENCE = SwingUtil.createImageIcon("star-empty.png"); ===================================== application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/seine/FloatingObjectUIModel.java ===================================== --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/seine/FloatingObjectUIModel.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/seine/FloatingObjectUIModel.java @@ -39,6 +39,8 @@ import java.util.List; import java.util.Map; import java.util.Optional; import java.util.Set; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; import org.jdesktop.swingx.treetable.DefaultMutableTreeTableNode; import org.nuiton.decorator.Decorator; @@ -59,6 +61,8 @@ public class FloatingObjectUIModel extends ContentUIModel<FloatingObjectDto> { private Map<String, ObjectMaterialDto> referentialMap; private FloatingObjectReference reference; + private boolean arriving; + private boolean leaving; public FloatingObjectUIModel() { super(FloatingObjectDto.class); @@ -74,6 +78,8 @@ public class FloatingObjectUIModel extends ContentUIModel<FloatingObjectDto> { private static final String PROPERTY_MATERIALS_TAB_VALID = "materialsTabValid"; public static final String PROPERTY_REFERENCE = "reference"; + public static final String PROPERTY_ARRIVING = "arriving"; + public static final String PROPERTY_LEAVING = "leaving"; public static final Set<String> GENERAL_TAB_PROPERTIES = ImmutableSet.<String>builder().add(FloatingObjectDto.PROPERTY_OBJECT_OPERATION, @@ -115,8 +121,12 @@ public class FloatingObjectUIModel extends ContentUIModel<FloatingObjectDto> { for (ObjectMaterialDto o : getAll()) { FloatingObjectPartDto partDto = new FloatingObjectPartDto(); partDto.setObjectMaterial(referenceBinderEngine.transformReferentialDtoToReference(referentialLocale, o)); - partDto.setWhenArriving(whenArriving.get(o)); - partDto.setWhenLeaving(whenLeaving.get(o)); + if (arriving) { + partDto.setWhenArriving(whenArriving.get(o)); + } + if (leaving) { + partDto.setWhenLeaving(whenLeaving.get(o)); + } result.add(partDto); } return result; @@ -195,4 +205,26 @@ public class FloatingObjectUIModel extends ContentUIModel<FloatingObjectDto> { return value == null ? t("observe.common.notComputed") : value ? t("observe.common.boolean.true") : t("observe.common.boolean.false"); } + public boolean isArriving() { + return arriving; + } + + /** Logger. */ + private static final Log log = LogFactory.getLog(FloatingObjectUIModel.class); + + public void setArriving(boolean arriving) { + this.arriving = arriving; + log.info("setArriving: " + arriving); + firePropertyChange(PROPERTY_ARRIVING, arriving); + } + + public boolean isLeaving() { + return leaving; + } + + public void setLeaving(boolean leaving) { + this.leaving = leaving; + log.info("setLeaving: " + leaving); + firePropertyChange(PROPERTY_LEAVING, leaving); + } } ===================================== services-topia/src/main/java/fr/ird/observe/services/binder/referential/seine/ObjectOperationBinder.java ===================================== --- a/services-topia/src/main/java/fr/ird/observe/services/binder/referential/seine/ObjectOperationBinder.java +++ b/services-topia/src/main/java/fr/ird/observe/services/binder/referential/seine/ObjectOperationBinder.java @@ -61,14 +61,14 @@ public class ObjectOperationBinder extends ReferentialBinderSupport<ObjectOperat @Override public ReferentialReference<ObjectOperationDto> toReferentialReference(ReferentialLocale referentialLocale, ObjectOperation entity) { - return toReferentialReference(entity, entity.getCode(), getLabel(referentialLocale, entity)); + return toReferentialReference(entity, entity.getCode(), getLabel(referentialLocale, entity), entity.isWhenArriving(), entity.isWhenLeaving()); } @Override public ReferentialReference<ObjectOperationDto> toReferentialReference(ReferentialLocale referentialLocale, ObjectOperationDto dto) { - return toReferentialReference(dto, dto.getCode(), getLabel(referentialLocale, dto)); + return toReferentialReference(dto, dto.getCode(), getLabel(referentialLocale, dto), dto.isWhenArriving(), dto.isWhenLeaving()); } } ===================================== services/src/main/java/fr/ird/observe/services/ObserveDtoInitializer.java ===================================== --- a/services/src/main/java/fr/ird/observe/services/ObserveDtoInitializer.java +++ b/services/src/main/java/fr/ird/observe/services/ObserveDtoInitializer.java @@ -269,9 +269,7 @@ class ObserveDtoInitializer { @Override public void initCountryDto() { - n("observe.type.country"); - n("observe.type.countries"); flushReferential(referentialDefaultDefinitionBuilder(CountryDto.class)); @@ -279,9 +277,7 @@ class ObserveDtoInitializer { @Override public void initFpaZoneDto() { - n("observe.type.fpaZone"); - n("observe.type.fpaZones"); flushReferential(referentialDefaultDefinitionBuilder(FpaZoneDto.class)); @@ -289,9 +285,7 @@ class ObserveDtoInitializer { @Override public void initGearCaracteristicTypeDto() { - n("observe.type.gearCaracteristicType"); - n("observe.type.gearCaracteristicTypes"); flushReferential(referentialDefaultDefinitionBuilder(GearCaracteristicTypeDto.class)); @@ -299,9 +293,7 @@ class ObserveDtoInitializer { @Override public void initGearCaracteristicDto() { - n("observe.type.gearCaracteristic"); - n("observe.type.gearCaracteristics"); flushReferential(referentialDefaultDefinitionBuilder(GearCaracteristicDto.class) .addProperty(String.class, GearCaracteristicDto.PROPERTY_GEAR_CARACTERISTIC_TYPE)); @@ -309,20 +301,14 @@ class ObserveDtoInitializer { @Override public void initGearDto() { - - n("observe.type.gear"); - n("observe.type.gears"); flushReferential(referentialDefaultDefinitionBuilder(GearDto.class)); } @Override public void initHarbourDto() { - - n("observe.type.harbour"); - n("observe.type.harbours"); flushReferential(referentialDefinitionBuilder2(HarbourDto.class) .addProperty(String.class, HarbourDto.PROPERTY_CODE) @@ -337,9 +323,7 @@ class ObserveDtoInitializer { @Override public void initSizeMeasureTypeDto() { - n("observe.type.sizeMeasureType"); - n("observe.type.sizeMeasureTypes"); flushReferential(referentialDefaultDefinitionBuilder(SizeMeasureTypeDto.class)); @@ -347,9 +331,7 @@ class ObserveDtoInitializer { @Override public void initOceanDto() { - n("observe.type.ocean"); - n("observe.type.oceans"); flushReferential(referentialDefaultDefinitionBuilder(OceanDto.class)); @@ -358,9 +340,7 @@ class ObserveDtoInitializer { @Override public void initSpeciesGroupReleaseModeDto() { - n("observe.type.speciesGroupReleaseMode"); - n("observe.type.speciesGroupReleaseModes"); flushReferential(referentialDefaultDefinitionBuilder(SpeciesGroupReleaseModeDto.class)); @@ -368,14 +348,13 @@ class ObserveDtoInitializer { @Override public void initSpeciesGroupDto() { - - + n("observe.type.speciesGroup"); + n("observe.type.speciesGroups"); flushReferential(referentialDefaultDefinitionBuilder(SpeciesGroupDto.class)); } @Override public void initSpeciesDto() { - n("observe.type.species"); flushReferential(referentialDefinitionBuilder(SpeciesDto.class) .addProperty(String.class, SpeciesDto.PROPERTY_FAO_CODE) @@ -387,16 +366,13 @@ class ObserveDtoInitializer { @Override public void initSpeciesListDto() { - n("observe.type.speciesList"); - n("observe.type.speciesLists"); flushReferential(referentialDefaultDefinitionBuilder(SpeciesListDto.class)); } @Override public void initSexDto() { - n("observe.type.sex"); n("observe.type.sexes"); flushReferential(referentialDefaultDefinitionBuilder(SexDto.class)); @@ -405,9 +381,7 @@ class ObserveDtoInitializer { @Override public void initLengthLengthParameterDto() { - n("observe.type.lengthLengthParameter"); - n("observe.type.lengthLengthParameters"); flushReferential(referentialDefinitionBuilder(LengthLengthParameterDto.class) .addProperty(String.class, LengthLengthParameterDto.PROPERTY_CODE) @@ -419,9 +393,7 @@ class ObserveDtoInitializer { @Override public void initLengthWeightParameterDto() { - n("observe.type.lengthWeightParameter"); - n("observe.type.lengthWeightParameters"); flushReferential(referentialDefinitionBuilder2(LengthWeightParameterDto.class) .addProperty(String.class, LengthWeightParameterDto.PROPERTY_CODE) @@ -435,18 +407,14 @@ class ObserveDtoInitializer { @Override public void initOrganismDto() { - n("observe.type.organism"); - n("observe.type.organisms"); flushReferential(referentialDefaultDefinitionBuilder(OrganismDto.class)); } @Override public void initPersonDto() { - n("observe.type.person"); - n("observe.type.persons"); flushReferential(referentialDefinitionBuilder2(PersonDto.class) .addProperty(String.class, PersonDto.PROPERTY_FIRST_NAME) @@ -458,8 +426,6 @@ class ObserveDtoInitializer { @Override public void initProgramDto() { - - n("observe.type.program"); n("observe.type.programs"); flushReferential(referentialDefinitionBuilder(ProgramDto.class) @@ -474,10 +440,7 @@ class ObserveDtoInitializer { @Override public void initShipOwnerDto() { - - n("observe.type.shipOwner"); - n("observe.type.shipOwners"); flushReferential(referentialDefaultDefinitionBuilder(ShipOwnerDto.class) .addProperty(String.class, ShipOwnerDto.PROPERTY_LABEL)); @@ -485,9 +448,7 @@ class ObserveDtoInitializer { @Override public void initVesselSizeCategoryDto() { - n("observe.type.vesselSizeCategory"); - n("observe.type.vesselSizeCategories"); flushReferential(referentialDefinitionBuilder2(VesselSizeCategoryDto.class) .addProperty(String.class, VesselSizeCategoryDto.PROPERTY_CODE) @@ -498,9 +459,7 @@ class ObserveDtoInitializer { @Override public void initVesselTypeDto() { - n("observe.type.vesselType"); - n("observe.type.vesselTypes"); flushReferential(referentialDefaultDefinitionBuilder(VesselTypeDto.class)); @@ -508,9 +467,7 @@ class ObserveDtoInitializer { @Override public void initVesselDto() { - n("observe.type.vessel"); - n("observe.type.vessels"); flushReferential(referentialDefaultDefinitionBuilder(VesselDto.class) .addProperty(String.class, VesselDto.PROPERTY_VESSEL_TYPE)); @@ -518,9 +475,7 @@ class ObserveDtoInitializer { @Override public void initWeightMeasureTypeDto() { - n("observe.type.weightMeasureType"); - n("observe.type.weightMeasureTypes"); flushReferential(referentialDefaultDefinitionBuilder(WeightMeasureTypeDto.class)); @@ -528,9 +483,7 @@ class ObserveDtoInitializer { @Override public void initBaitHaulingStatusDto() { - n("observe.type.baitHaulingStatus"); - n("observe.type.baitHaulingStatuses"); flushReferential(referentialDefaultDefinitionBuilder(BaitHaulingStatusDto.class)); @@ -538,9 +491,7 @@ class ObserveDtoInitializer { @Override public void initBaitSettingStatusDto() { - n("observe.type.baitSettingStatus"); - n("observe.type.baitSettingStatuses"); flushReferential(referentialDefaultDefinitionBuilder(BaitSettingStatusDto.class)); @@ -548,9 +499,7 @@ class ObserveDtoInitializer { @Override public void initBaitTypeDto() { - n("observe.type.baitType"); - n("observe.type.baitTypes"); flushReferential(referentialDefaultDefinitionBuilder(BaitTypeDto.class)); @@ -558,9 +507,7 @@ class ObserveDtoInitializer { @Override public void initCatchFateLonglineDto() { - n("observe.type.catchFateLongline"); - n("observe.type.catchFateLonglines"); flushReferential(referentialDefaultDefinitionBuilder(CatchFateLonglineDto.class)); @@ -568,9 +515,7 @@ class ObserveDtoInitializer { @Override public void initEncounterTypeDto() { - n("observe.type.encounterType"); - n("observe.type.encounterTypes"); flushReferential(referentialDefaultDefinitionBuilder(EncounterTypeDto.class)); @@ -578,7 +523,6 @@ class ObserveDtoInitializer { @Override public void initHealthnessDto() { - n("observe.type.healthness"); n("observe.type.healthnesses"); flushReferential(referentialDefaultDefinitionBuilder(HealthnessDto.class)); @@ -587,9 +531,7 @@ class ObserveDtoInitializer { @Override public void initHookPositionDto() { - n("observe.type.hookPosition"); - n("observe.type.hookPositions"); flushReferential(referentialDefaultDefinitionBuilder(HookPositionDto.class)); @@ -597,9 +539,7 @@ class ObserveDtoInitializer { @Override public void initHookSizeDto() { - n("observe.type.hookSize"); - n("observe.type.hookSizes"); flushReferential(referentialDefaultDefinitionBuilder(HookSizeDto.class)); @@ -607,9 +547,7 @@ class ObserveDtoInitializer { @Override public void initHookTypeDto() { - n("observe.type.hookType"); - n("observe.type.hookTypes"); flushReferential(referentialDefaultDefinitionBuilder(HookTypeDto.class)); @@ -617,9 +555,7 @@ class ObserveDtoInitializer { @Override public void initItemHorizontalPositionDto() { - n("observe.type.itemHorizontalPosition"); - n("observe.type.itemHorizontalPositions"); flushReferential(referentialDefaultDefinitionBuilder(ItemHorizontalPositionDto.class)); @@ -627,9 +563,7 @@ class ObserveDtoInitializer { @Override public void initItemVerticalPositionDto() { - n("observe.type.itemVerticalPosition"); - n("observe.type.itemVerticalPositions"); flushReferential(referentialDefaultDefinitionBuilder(ItemVerticalPositionDto.class)); @@ -637,9 +571,7 @@ class ObserveDtoInitializer { @Override public void initLightsticksColorDto() { - n("observe.type.lightsticksColor"); - n("observe.type.lightsticksColors"); flushReferential(referentialDefaultDefinitionBuilder(LightsticksColorDto.class)); @@ -647,9 +579,7 @@ class ObserveDtoInitializer { @Override public void initLightsticksTypeDto() { - n("observe.type.lightsticksType"); - n("observe.type.lightsticksTypes"); flushReferential(referentialDefaultDefinitionBuilder(LightsticksTypeDto.class)); @@ -657,9 +587,7 @@ class ObserveDtoInitializer { @Override public void initLineTypeDto() { - n("observe.type.lineType"); - n("observe.type.lineTypes"); flushReferential(referentialDefaultDefinitionBuilder(LineTypeDto.class)); @@ -667,9 +595,7 @@ class ObserveDtoInitializer { @Override public void initMaturityStatusDto() { - n("observe.type.maturityStatus"); - n("observe.type.maturityStatuses"); flushReferential(referentialDefaultDefinitionBuilder(MaturityStatusDto.class)); @@ -677,9 +603,7 @@ class ObserveDtoInitializer { @Override public void initMitigationTypeDto() { - n("observe.type.mitigationType"); - n("observe.type.mitigationTypes"); flushReferential(referentialDefaultDefinitionBuilder(MitigationTypeDto.class)); @@ -687,9 +611,7 @@ class ObserveDtoInitializer { @Override public void initSensorBrandDto() { - n("observe.type.sensorBrand"); - n("observe.type.sensorBrands"); flushReferential(referentialDefinitionBuilder2(SensorBrandDto.class) .addProperty(String.class, SensorBrandDto.PROPERTY_CODE) @@ -699,9 +621,7 @@ class ObserveDtoInitializer { @Override public void initSensorDataFormatDto() { - n("observe.type.sensorDataFormat"); - n("observe.type.sensorDataFormats"); flushReferential(referentialDefaultDefinitionBuilder(SensorDataFormatDto.class)); @@ -709,9 +629,7 @@ class ObserveDtoInitializer { @Override public void initSensorTypeDto() { - n("observe.type.sensorType"); - n("observe.type.sensorTypes"); flushReferential(referentialDefaultDefinitionBuilder(SensorTypeDto.class)); @@ -719,9 +637,7 @@ class ObserveDtoInitializer { @Override public void initSettingShapeDto() { - n("observe.type.settingShape"); - n("observe.type.settingShapes"); flushReferential(referentialDefaultDefinitionBuilder(SettingShapeDto.class)); @@ -729,9 +645,7 @@ class ObserveDtoInitializer { @Override public void initStomacFullnessDto() { - n("observe.type.stomacFullness"); - n("observe.type.stomacFullnesses"); flushReferential(referentialDefaultDefinitionBuilder(StomacFullnessDto.class)); @@ -739,9 +653,7 @@ class ObserveDtoInitializer { @Override public void initTripTypeDto() { - n("observe.type.tripType"); - n("observe.type.tripTypes"); flushReferential(referentialDefaultDefinitionBuilder(TripTypeDto.class)); @@ -749,9 +661,7 @@ class ObserveDtoInitializer { @Override public void initVesselActivityLonglineDto() { - n("observe.type.vesselActivityLongline"); - n("observe.type.vesselActivityLonglines"); flushReferential(referentialDefaultDefinitionBuilder(VesselActivityLonglineDto.class)); @@ -759,9 +669,7 @@ class ObserveDtoInitializer { @Override public void initDetectionModeDto() { - n("observe.type.detectionMode"); - n("observe.type.detectionModes"); flushReferential(referentialDefaultDefinitionBuilder(DetectionModeDto.class)); @@ -769,9 +677,7 @@ class ObserveDtoInitializer { @Override public void initObjectMaterialTypeDto() { - n("observe.type.objectMaterialType"); - n("observe.type.objectMaterialTypes"); flushReferential(referentialDefaultDefinitionBuilder(ObjectMaterialTypeDto.class)); @@ -779,9 +685,7 @@ class ObserveDtoInitializer { @Override public void initObjectMaterialDto() { - n("observe.type.objectMaterial"); - n("observe.type.objectMaterials"); flushReferential(referentialDefaultDefinitionBuilder(ObjectMaterialDto.class) .addProperty(String.class, ObjectMaterialDto.PROPERTY_PARENT) @@ -791,19 +695,17 @@ class ObserveDtoInitializer { @Override public void initObjectOperationDto() { - n("observe.type.objectOperation"); - n("observe.type.objectOperations"); - flushReferential(referentialDefaultDefinitionBuilder(ObjectOperationDto.class)); + flushReferential(referentialDefaultDefinitionBuilder(ObjectOperationDto.class) + .addProperty(boolean.class, ObjectOperationDto.PROPERTY_WHEN_ARRIVING) + .addProperty(boolean.class, ObjectOperationDto.PROPERTY_WHEN_LEAVING)); } @Override public void initObjectTypeDto() { - n("observe.type.objectType"); - n("observe.type.objectTypes"); flushReferential(referentialDefaultDefinitionBuilder(ObjectTypeDto.class)); @@ -811,9 +713,7 @@ class ObserveDtoInitializer { @Override public void initObservedSystemDto() { - n("observe.type.observedSystem"); - n("observe.type.observedSystems"); flushReferential(referentialDefaultDefinitionBuilder(ObservedSystemDto.class)); @@ -821,9 +721,7 @@ class ObserveDtoInitializer { @Override public void initReasonForDiscardDto() { - n("observe.type.reasonForDiscard"); - n("observe.type.reasonForDiscards"); flushReferential(referentialDefaultDefinitionBuilder(ReasonForDiscardDto.class)); @@ -831,9 +729,7 @@ class ObserveDtoInitializer { @Override public void initReasonForNoFishingDto() { - n("observe.type.reasonForNoFishing"); - n("observe.type.reasonForNoFishings"); flushReferential(referentialDefaultDefinitionBuilder(ReasonForNoFishingDto.class)); @@ -841,9 +737,7 @@ class ObserveDtoInitializer { @Override public void initReasonForNullSetDto() { - n("observe.type.reasonForNullSet"); - n("observe.type.reasonForNullSets"); flushReferential(referentialDefaultDefinitionBuilder(ReasonForNullSetDto.class)); @@ -860,7 +754,6 @@ class ObserveDtoInitializer { @Override public void initSpeciesStatusDto() { - n("observe.type.speciesStatus"); n("observe.type.speciesStatuses"); flushReferential(referentialDefaultDefinitionBuilder(SpeciesStatusDto.class)); @@ -869,7 +762,6 @@ class ObserveDtoInitializer { @Override public void initSurroundingActivityDto() { - n("observe.type.surroundingActivity"); n("observe.type.surroundingActivities"); flushReferential(referentialDefaultDefinitionBuilder(SurroundingActivityDto.class)); @@ -878,9 +770,7 @@ class ObserveDtoInitializer { @Override public void initTransmittingBuoyOperationDto() { - n("observe.type.transmittingBuoyOperation"); - n("observe.type.transmittingBuoyOperations"); flushReferential(referentialDefaultDefinitionBuilder(TransmittingBuoyOperationDto.class)); @@ -888,9 +778,7 @@ class ObserveDtoInitializer { @Override public void initTransmittingBuoyTypeDto() { - n("observe.type.transmittingBuoyType"); - n("observe.type.transmittingBuoyTypes"); flushReferential(referentialDefaultDefinitionBuilder(TransmittingBuoyTypeDto.class)); @@ -898,9 +786,7 @@ class ObserveDtoInitializer { @Override public void initVesselActivitySeineDto() { - n("observe.type.vesselActivitySeine"); - n("observe.type.vesselActivitySeines"); flushReferential(referentialDefaultDefinitionBuilder(VesselActivitySeineDto.class) .addProperty(boolean.class, VesselActivitySeineDto.PROPERTY_ALLOW_FAD)); @@ -909,9 +795,7 @@ class ObserveDtoInitializer { @Override public void initWeightCategoryDto() { - n("observe.type.weightCategory"); - n("observe.type.weightCategories"); flushReferential(referentialDefinitionBuilder(WeightCategoryDto.class) .addProperty(String.class, WeightCategoryDto.PROPERTY_CODE) @@ -920,9 +804,7 @@ class ObserveDtoInitializer { @Override public void initWindDto() { - n("observe.type.wind"); - n("observe.type.winds"); flushReferential(referentialDefinitionBuilder2(WindDto.class) .addProperty(String.class, WindDto.PROPERTY_CODE) @@ -975,10 +857,7 @@ class ObserveDtoInitializer { @Override public void initBasketDto() { - - n("observe.type.basket"); - n("observe.type.baskets"); flushData(dataDefinitionBuilder(BasketDto.class) .addProperty(Integer.class, BasketDto.PROPERTY_SETTING_IDENTIFIER) @@ -993,10 +872,7 @@ class ObserveDtoInitializer { @Override public void initBranchlineDto() { - - n("observe.type.branchline"); - n("observe.type.branchlines"); flushData(dataDefinitionBuilder(BranchlineDto.class) .addProperty(Integer.class, BranchlineDto.PROPERTY_SETTING_IDENTIFIER) @@ -1010,10 +886,7 @@ class ObserveDtoInitializer { @Override public void initBranchlinesCompositionDto() { - - n("observe.type.branchlinesComposition"); - n("observe.type.branchlinesCompositions"); flushData(dataDefinitionBuilder(BranchlinesCompositionDto.class) .addProperty(String.class, BranchlinesCompositionDto.PROPERTY_TOP_TYPE) @@ -1024,10 +897,7 @@ class ObserveDtoInitializer { @Override public void initCatchLonglineDto() { - - n("observe.type.catchLongline"); - n("observe.type.catchLonglines"); flushData(dataDefinitionBuilder(CatchLonglineDto.class) .addProperty(String.class, CatchLonglineDto.PROPERTY_HOME_ID)); @@ -1035,10 +905,7 @@ class ObserveDtoInitializer { @Override public void initEncounterDto() { - - n("observe.type.encounter"); - n("observe.type.encounters"); flushData(dataDefinitionBuilder(EncounterDto.class) .addProperty(String.class, EncounterDto.PROPERTY_ENCOUNTER_TYPE) @@ -1047,10 +914,7 @@ class ObserveDtoInitializer { @Override public void initFloatlinesCompositionDto() { - - n("observe.type.floatlinesComposition"); - n("observe.type.floatlinesCompositions"); flushData(dataDefinitionBuilder(FloatlinesCompositionDto.class) .addProperty(String.class, FloatlinesCompositionDto.PROPERTY_LINE_TYPE) @@ -1060,8 +924,6 @@ class ObserveDtoInitializer { @Override public void initGearUseFeaturesLonglineDto() { - - n("observe.type.gearUseFeaturesLongline"); n("observe.type.gearUseFeaturesLonglines"); flushData(dataDefinitionBuilder(GearUseFeaturesLonglineDto.class)); @@ -1069,8 +931,6 @@ class ObserveDtoInitializer { @Override public void initGearUseFeaturesMeasurementLonglineDto() { - - n("observe.type.gearUseFeaturesMeasurementLongline"); n("observe.type.gearUseFeaturesMeasurementLonglines"); flushData(dataDefinitionBuilder(GearUseFeaturesMeasurementLonglineDto.class)); @@ -1078,10 +938,7 @@ class ObserveDtoInitializer { @Override public void initHooksCompositionDto() { - - n("observe.type.hooksComposition"); - n("observe.type.hooksCompositions"); flushData(dataDefinitionBuilder(HooksCompositionDto.class) .addProperty(String.class, HooksCompositionDto.PROPERTY_HOOK_TYPE) @@ -1092,10 +949,7 @@ class ObserveDtoInitializer { @Override public void initSectionDto() { - - n("observe.type.section"); - n("observe.type.sections"); flushData(dataDefinitionBuilder(SectionDto.class) .addProperty(Integer.class, SectionDto.PROPERTY_SETTING_IDENTIFIER) @@ -1104,10 +958,7 @@ class ObserveDtoInitializer { @Override public void initSensorUsedDto() { - - n("observe.type.sensorUsed"); - n("observe.type.sensorUseds"); flushData(dataDefinitionBuilder(SensorUsedDto.class) .addProperty(String.class, SensorUsedDto.PROPERTY_SENSOR_TYPE)); @@ -1115,10 +966,7 @@ class ObserveDtoInitializer { @Override public void initSetLonglineDto() { - - n("observe.type.setLongline"); - n("observe.type.setLonglines"); flushData(dataDefinitionBuilder(SetLonglineDto.class) .addProperty(String.class, SetLonglineDto.PROPERTY_HOME_ID)); @@ -1126,8 +974,6 @@ class ObserveDtoInitializer { @Override public void initSetLonglineCatchDto() { - - n("observe.type.setLonglineCatch"); n("observe.type.setLonglineCatches"); flushData(dataDefinitionBuilder(SetLonglineCatchDto.class)); @@ -1175,10 +1021,7 @@ class ObserveDtoInitializer { @Override public void initTripLonglineDto() { - - n("observe.type.tripLongline"); - n("observe.type.tripLonglines"); flushData(dataDefinitionBuilder(TripLonglineDto.class) .addProperty(Date.class, TripLonglineDto.PROPERTY_START_DATE) @@ -1192,30 +1035,21 @@ class ObserveDtoInitializer { @Override public void initTripLonglineActivityDto() { - - n("observe.type.tripLonglineActivity"); - n("observe.type.tripLonglineActivities"); flushData(dataDefinitionBuilder(TripLonglineActivityDto.class)); } @Override public void initTripLonglineGearUseDto() { - - n("observe.type.tripLonglineGearUse"); - n("observe.type.tripLonglineGearUses"); flushData(dataDefinitionBuilder(TripLonglineGearUseDto.class)); } @Override public void initWeightMeasureDto() { - - n("observe.type.weightMeasure"); - n("observe.type.weightMeasures"); flushData(dataDefinitionBuilder(WeightMeasureDto.class) .addProperty(String.class, WeightMeasureDto.PROPERTY_WEIGHT_MEASURE_TYPE) @@ -1235,10 +1069,7 @@ class ObserveDtoInitializer { @Override public void initActivitySeineDto() { - - n("observe.type.activitySeine"); - n("observe.type.activitySeines"); flushData(dataDefinitionBuilder(ActivitySeineDto.class) .addProperty(Date.class, ActivitySeineDto.PROPERTY_TIME) @@ -1254,10 +1085,7 @@ class ObserveDtoInitializer { @Override public void initFloatingObjectDto() { - - n("observe.type.floatingObject"); - n("observe.type.floatingObjects"); flushData(dataDefinitionBuilder(FloatingObjectDto.class) .addProperty(String.class, FloatingObjectDto.PROPERTY_OBJECT_TYPE)); @@ -1265,19 +1093,13 @@ class ObserveDtoInitializer { @Override public void initFloatingObjectObservedSpeciesDto() { - - n("observe.type.floatingObjectObservedSpecies"); - flushData(dataDefinitionBuilder(FloatingObjectObservedSpeciesDto.class)); } @Override public void initFloatingObjectPartDto() { - - n("observe.type.floatingObjectPart"); - n("observe.type.floatingObjectParts"); flushData(dataDefinitionBuilder(FloatingObjectPartDto.class) .addProperty(String.class, FloatingObjectPartDto.PROPERTY_OBJECT_MATERIAL + "Id") @@ -1288,10 +1110,7 @@ class ObserveDtoInitializer { @Override public void initFloatingObjectSchoolEstimateDto() { - - n("observe.type.floatingObjectSchoolEstimate"); - n("observe.type.floatingObjectSchoolEstimates"); flushData(dataDefinitionBuilder(FloatingObjectSchoolEstimateDto.class)); @@ -1299,8 +1118,6 @@ class ObserveDtoInitializer { @Override public void initFloatingObjectTransmittingBuoyDto() { - - n("observe.type.floatingObjectTransmittingBuoy"); n("observe.type.floatingObjectTransmittingBuoys"); flushData(dataDefinitionBuilder(FloatingObjectTransmittingBuoyDto.class)); @@ -1308,8 +1125,6 @@ class ObserveDtoInitializer { @Override public void initGearUseFeaturesMeasurementSeineDto() { - - n("observe.type.gearUseFeaturesMeasurementSeine"); n("observe.type.gearUseFeaturesMeasurementSeines"); flushData(dataDefinitionBuilder(GearUseFeaturesMeasurementSeineDto.class)); @@ -1317,20 +1132,14 @@ class ObserveDtoInitializer { @Override public void initGearUseFeaturesSeineDto() { - - n("observe.type.gearUseFeaturesSeine"); - n("observe.type.gearUseFeaturesSeines"); flushData(dataDefinitionBuilder(GearUseFeaturesSeineDto.class)); } @Override public void initNonTargetCatchDto() { - - n("observe.type.nonTargetCatch"); - n("observe.type.nonTargetCatches"); flushData(dataDefinitionBuilder(NonTargetCatchDto.class) .addProperty(String.class, NonTargetCatchDto.PROPERTY_SPECIES) @@ -1339,10 +1148,7 @@ class ObserveDtoInitializer { @Override public void initNonTargetCatchReleaseDto() { - - n("observe.type.nonTargetCatchRelease"); - n("observe.type.nonTargetCatchReleases"); flushData(dataDefinitionBuilder(NonTargetCatchReleaseDto.class) .addProperty(String.class, NonTargetCatchReleaseDto.PROPERTY_SPECIES) @@ -1354,10 +1160,7 @@ class ObserveDtoInitializer { @Override public void initNonTargetLengthDto() { - - n("observe.type.nonTargetLength"); - n("observe.type.nonTargetLengths"); flushData(dataDefinitionBuilder(NonTargetLengthDto.class) .addProperty(String.class, NonTargetLengthDto.PROPERTY_SPECIES) @@ -1366,18 +1169,13 @@ class ObserveDtoInitializer { @Override public void initNonTargetSampleDto() { - - n("observe.type.nonTargetSample"); - n("observe.type.nonTargetSamples"); flushData(dataDefinitionBuilder(NonTargetSampleDto.class)); } @Override public void initObjectObservedSpeciesDto() { - - n("observe.type.objectObservedSpecies"); flushData(dataDefinitionBuilder(ObjectObservedSpeciesDto.class) .addProperty(String.class, ObjectObservedSpeciesDto.PROPERTY_SPECIES) @@ -1395,10 +1193,7 @@ class ObserveDtoInitializer { @Override public void initRouteDto() { - - n("observe.type.route"); - n("observe.type.routes"); flushData(dataDefinitionBuilder(RouteDto.class) .addProperty(Date.class, RouteDto.PROPERTY_DATE) @@ -1412,10 +1207,7 @@ class ObserveDtoInitializer { @Override public void initSchoolEstimateDto() { - - n("observe.type.schoolEstimate"); - n("observe.type.schoolEstimates"); flushData(dataDefinitionBuilder(SchoolEstimateDto.class) .addProperty(String.class, SchoolEstimateDto.PROPERTY_SPECIES) @@ -1425,10 +1217,7 @@ class ObserveDtoInitializer { @Override public void initSetSeineDto() { - - n("observe.type.setSeine"); - n("observe.type.setSeines"); flushData(dataDefinitionBuilder(SetSeineDto.class) .addProperty(String.class, SetSeineDto.PROPERTY_COMMENT)); @@ -1456,10 +1245,7 @@ class ObserveDtoInitializer { @Override public void initTargetCatchDto() { - - n("observe.type.targetCatch"); - n("observe.type.targetCatches"); flushData(dataDefinitionBuilder(TargetCatchDto.class) .addProperty(String.class, TargetCatchDto.PROPERTY_SPECIES)); @@ -1467,10 +1253,7 @@ class ObserveDtoInitializer { @Override public void initTargetLengthDto() { - - n("observe.type.targetLength"); - n("observe.type.targetLengths"); flushData(dataDefinitionBuilder(TargetLengthDto.class) .addProperty(String.class, TargetLengthDto.PROPERTY_SPECIES) @@ -1480,18 +1263,13 @@ class ObserveDtoInitializer { @Override public void initTargetSampleDto() { - - n("observe.type.targetSample"); - n("observe.type.targetSamples"); flushData(dataDefinitionBuilder(TargetSampleDto.class)); } @Override public void initTransmittingBuoyDto() { - - n("observe.type.transmittingBuoy"); n("observe.type.transmittingBuoys"); flushData(dataDefinitionBuilder(TransmittingBuoyDto.class) @@ -1503,10 +1281,7 @@ class ObserveDtoInitializer { @Override public void initTripSeineDto() { - - n("observe.type.tripSeine"); - n("observe.type.tripSeines"); flushData(dataDefinitionBuilder(TripSeineDto.class) .addProperty(Date.class, TripSeineDto.PROPERTY_START_DATE) @@ -1519,10 +1294,7 @@ class ObserveDtoInitializer { @Override public void initTripSeineGearUseDto() { - - n("observe.type.tripSeineGearUse"); - n("observe.type.tripSeineGearUses"); flushData(dataDefinitionBuilder(TripSeineGearUseDto.class)); } View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/b5cd741cf7599bd0addc9ff2b42… --- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/b5cd741cf7599bd0addc9ff2b42… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] 6 commits: Ajout du fichier de construction du référentiel ObjectMaterial
by Tony CHEMIT 31 Jul '17

31 Jul '17

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 5ecc9305 by Tony CHEMIT at 2017-07-31T11:54:29+02:00 Ajout du fichier de construction du référentiel ObjectMaterial - - - - - 5c7c2d1b by Tony CHEMIT at 2017-07-31T11:54:32+02:00 Suppression images inutiles - - - - - a935132e by Tony CHEMIT at 2017-07-31T12:57:58+02:00 fix les noms des colonnes pour l'import - - - - - 8809d805 by Tony CHEMIT at 2017-07-31T13:39:01+02:00 Lissage du fichier d'import (suppression des lignes à problème à repositionner - - - - - eaf05e9f by Tony CHEMIT at 2017-07-31T13:39:13+02:00 Ajout du générateur de fichier d'import - - - - - 4fb6584a by Tony CHEMIT at 2017-07-31T15:58:15+02:00 adaptation du ObjectMaterial - - - - - 21 changed files: - − doc/images/error.png - − doc/images/info.png - − doc/images/ok.png - − doc/images/question.png - − doc/images/warning.png - persistence/pom.xml - persistence/src/main/java/fr/ird/observe/persistence/migration/DataSourceMigrationForVersion_7_0.java - persistence/src/main/models/Observe.model - persistence/src/main/resources/db/migration/6.901/02_add_object_material-common.sql - + persistence/src/main/resources/db/migration/6.901/09_fill_object_material-common.sql - + persistence/src/main/resources/db/migration/6.901/referential-ObjectMaterial.csv - + persistence/src/test/java/fr/ird/observe/persistence/migration/GenerateReferentialObjectMaterial.java - services-topia/src/main/java/fr/ird/observe/services/binder/referential/seine/ObjectMaterialBinder.java - services-topia/src/test/java/fr/ird/observe/services/topia/service/actions/validate/ValidateServiceTopiaTest.java - services-topia/src/test/java/fr/ird/observe/services/topia/service/data/seine/FloatingObjectServiceTopiaTest.java - test/src/main/java/fr/ird/observe/test/ObserveFixtures.java - test/src/main/resources/db/6.901/dataForTestLongline.sql.gz - test/src/main/resources/db/6.901/dataForTestSeine.sql.gz - test/src/main/resources/db/6.901/empty_h2.sql.gz - test/src/main/resources/db/6.901/empty_pg.sql.gz - test/src/main/resources/db/6.901/referentiel.sql.gz Changes: ===================================== doc/images/error.png deleted ===================================== Binary files a/doc/images/error.png and /dev/null differ ===================================== doc/images/info.png deleted ===================================== Binary files a/doc/images/info.png and /dev/null differ ===================================== doc/images/ok.png deleted ===================================== Binary files a/doc/images/ok.png and /dev/null differ ===================================== doc/images/question.png deleted ===================================== Binary files a/doc/images/question.png and /dev/null differ ===================================== doc/images/warning.png deleted ===================================== Binary files a/doc/images/warning.png and /dev/null differ ===================================== persistence/pom.xml ===================================== --- a/persistence/pom.xml +++ b/persistence/pom.xml @@ -57,6 +57,11 @@ <groupId>org.nuiton</groupId> <artifactId>nuiton-version</artifactId> </dependency> + <dependency> + <groupId>org.nuiton</groupId> + <artifactId>nuiton-csv</artifactId> + <scope>test</scope> + </dependency>  <dependency> ===================================== persistence/src/main/java/fr/ird/observe/persistence/migration/DataSourceMigrationForVersion_7_0.java ===================================== --- a/persistence/src/main/java/fr/ird/observe/persistence/migration/DataSourceMigrationForVersion_7_0.java +++ b/persistence/src/main/java/fr/ird/observe/persistence/migration/DataSourceMigrationForVersion_7_0.java @@ -65,6 +65,7 @@ public class DataSourceMigrationForVersion_7_0 extends AbstractObserveMigrationC addScript("06", "add_non_target_catch_release", queries); addScript("07", "drop_table_sizemeasuretype", queries); addScript("08", "add_floating_object_fields", queries); + addScript("09", "fill_object_material", queries); } public static class H2DataSourceMigrationForVersion extends DataSourceMigrationForVersion_7_0 { ===================================== persistence/src/main/models/Observe.model ===================================== --- a/persistence/src/main/models/Observe.model +++ b/persistence/src/main/models/Observe.model @@ -654,7 +654,7 @@ nonEntangling + {*:1} boolean | notNull childrenMultiSelectable + {*:1} boolean | notNull childSelectionMandatory + {*:1} boolean | notNull parent {*:0..1} referentiel.seine.ObjectMaterial -objectMaterialType {*:1} referentiel.seine.ObjectMaterialType | notNull lazy=false +objectMaterialType {*:1} referentiel.seine.ObjectMaterialType | lazy=false validation + {*:1} String referentiel.seine.ObjectMaterialType > referentiel.I18nReferentialEntity | entity ===================================== persistence/src/main/resources/db/migration/6.901/02_add_object_material-common.sql ===================================== --- a/persistence/src/main/resources/db/migration/6.901/02_add_object_material-common.sql +++ b/persistence/src/main/resources/db/migration/6.901/02_add_object_material-common.sql @@ -35,48 +35,3 @@ ALTER TABLE observe_seine.objectMaterial ADD CONSTRAINT PK_OBJECT_MATERIAL PRIMA ALTER TABLE observe_seine.objectMaterial ADD CONSTRAINT FK_OBJECT_MATERIAL_PARENT FOREIGN KEY (parent) REFERENCES observe_seine.objectMaterial(topiaid); ALTER TABLE observe_seine.objectMaterial ADD CONSTRAINT FK_OBJECT_MATERIAL_OBJECT_MATERIAL_TYPE FOREIGN KEY (objectMaterialType) REFERENCES observe_seine.objectMaterialType(topiaid); INSERT INTO observe_common.LASTUPDATEDATE (topiaId, topiaversion, topiacreatedate, TYPE , LASTUPDATEDATE) values ('fr.ird.observe.entities.LastUpdateDate#666#901', 0,CURRENT_DATE, 'fr.ird.observe.entities.referentiel.seine.ObjectMaterial', CURRENT_TIMESTAMP); - -INSERT INTO observe_seine.objectMaterial (topiaid, topiaversion, topiacreatedate, lastupdatedate, needComment, status, legacyCode, standardCode, code, parent, label1, label2, selectable, childrenMultiSelectable, childSelectionMandatory, objectMaterialType, biodegradable, nonEntangling) values ('fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0', 0, CURRENT_DATE, CURRENT_TIMESTAMP, false, 1, '', '', '1', NULL,'Raft', 'Radeau', true, true, true, 'fr.ird.observe.entities.referentiel.seine.ObjectMaterialType#0#0', false, false); -INSERT INTO observe_seine.objectMaterial (topiaid, topiaversion, topiacreatedate, lastupdatedate, needComment, status, legacyCode, standardCode, code, parent, label1, label2, selectable, childrenMultiSelectable, childSelectionMandatory, objectMaterialType, biodegradable, nonEntangling) values ('fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#1', 0, CURRENT_DATE, CURRENT_TIMESTAMP, false, 1, '', '', '1-1', 'fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0', 'Frame', ' Chassis', FALSE, FALSE, TRUE, 'fr.ird.observe.entities.referentiel.seine.ObjectMaterialType#0#0', false, false); -INSERT INTO observe_seine.objectMaterial (topiaid, topiaversion, topiacreatedate, lastupdatedate, needComment, status, legacyCode, standardCode, code, parent, label1, label2, selectable, childrenMultiSelectable, childSelectionMandatory, objectMaterialType, biodegradable, nonEntangling) values ('fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#2', 0, CURRENT_DATE, CURRENT_TIMESTAMP, false, 1, '', '', '1-1-1', 'fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#1', 'Vegetal (including bamboo)', 'Végétal (dont bambou)', true, false, false, 'fr.ird.observe.entities.referentiel.seine.ObjectMaterialType#0#0', false, false); -INSERT INTO observe_seine.objectMaterial (topiaid, topiaversion, topiacreatedate, lastupdatedate, needComment, status, legacyCode, standardCode, code, parent, label1, label2, selectable, childrenMultiSelectable, childSelectionMandatory, objectMaterialType, biodegradable, nonEntangling) values ('fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#3', 0, CURRENT_DATE, CURRENT_TIMESTAMP, false, 1, '', '', '1-1-2', 'fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#1', 'Metal', 'Métal', true, false, false, 'fr.ird.observe.entities.referentiel.seine.ObjectMaterialType#0#0', false, false); -INSERT INTO observe_seine.objectMaterial (topiaid, topiaversion, topiacreatedate, lastupdatedate, needComment, status, legacyCode, standardCode, code, parent, label1, label2, selectable, childrenMultiSelectable, childSelectionMandatory, objectMaterialType, biodegradable, nonEntangling) values ('fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#4', 0, CURRENT_DATE, CURRENT_TIMESTAMP, false, 1, '', '', '1-1-3', 'fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#1','PVC', 'PVC', true, false, false, 'fr.ird.observe.entities.referentiel.seine.ObjectMaterialType#0#0', false, false); -INSERT INTO observe_seine.objectMaterial (topiaid, topiaversion, topiacreatedate, lastupdatedate, needComment, status, legacyCode, standardCode, code, parent, label1, label2, selectable, childrenMultiSelectable, childSelectionMandatory, objectMaterialType, biodegradable, nonEntangling) values ('fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#5', 0, CURRENT_DATE, CURRENT_TIMESTAMP, false, 1, '', '', '1-2', 'fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0', 'Coverage type', 'Type de couverture', false, true, true, 'fr.ird.observe.entities.referentiel.seine.ObjectMaterialType#0#0', false, false); -INSERT INTO observe_seine.objectMaterial (topiaid, topiaversion, topiacreatedate, lastupdatedate, needComment, status, legacyCode, standardCode, code, parent, label1, label2, selectable, childrenMultiSelectable, childSelectionMandatory, objectMaterialType, biodegradable, nonEntangling) values ('fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#6', 0, CURRENT_DATE, CURRENT_TIMESTAMP, false, 1, '', '', '1-2-1', 'fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#5', 'Net', 'Filet', FALSE, TRUE, FALSE, 'fr.ird.observe.entities.referentiel.seine.ObjectMaterialType#0#0', false, false); -INSERT INTO observe_seine.objectMaterial (topiaid, topiaversion, topiacreatedate, lastupdatedate, needComment, status, legacyCode, standardCode, code, parent, label1, label2, selectable, childrenMultiSelectable, childSelectionMandatory, objectMaterialType, biodegradable, nonEntangling) values ('fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#7', 0, CURRENT_DATE, CURRENT_TIMESTAMP, false, 1, '', '', '1-2-1-1', 'fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#6', 'Net with mesh <=3cm', 'Filet avec maille <=3cm', FALSE, TRUE, FALSE, 'fr.ird.observe.entities.referentiel.seine.ObjectMaterialType#0#0', false, false); -INSERT INTO observe_seine.objectMaterial (topiaid, topiaversion, topiacreatedate, lastupdatedate, needComment, status, legacyCode, standardCode, code, parent, label1, label2, selectable, childrenMultiSelectable, childSelectionMandatory, objectMaterialType, biodegradable, nonEntangling) values ('fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#8', 0, CURRENT_DATE, CURRENT_TIMESTAMP, false, 1, '', '', '1-2-1-1-1', 'fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#7', 'Net with mesh <=3cm above', 'Filet avec maille <=3cm dessus', true, false, false, 'fr.ird.observe.entities.referentiel.seine.ObjectMaterialType#0#0', false, false); -INSERT INTO observe_seine.objectMaterial (topiaid, topiaversion, topiacreatedate, lastupdatedate, needComment, status, legacyCode, standardCode, code, parent, label1, label2, selectable, childrenMultiSelectable, childSelectionMandatory, objectMaterialType, biodegradable, nonEntangling) values ('fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#9', 0, CURRENT_DATE, CURRENT_TIMESTAMP, false, 1, '', '', '1-2-1-1-2', 'fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#7', 'Net with mesh <=3cm behind', 'Filet avec maille <=3cm dessous', true, false, false, 'fr.ird.observe.entities.referentiel.seine.ObjectMaterialType#0#0', false, false); -INSERT INTO observe_seine.objectMaterial (topiaid, topiaversion, topiacreatedate, lastupdatedate, needComment, status, legacyCode, standardCode, code, parent, label1, label2, selectable, childrenMultiSelectable, childSelectionMandatory, objectMaterialType, biodegradable, nonEntangling) values ('fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#10', 0, CURRENT_DATE, CURRENT_TIMESTAMP, false, 1, '', '', '1-2-1-2', 'fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#6', 'Net with mesh >3cm', 'Filet avec maille >3cm', FALSE, FALSE, false, 'fr.ird.observe.entities.referentiel.seine.ObjectMaterialType#0#0', false, false); -INSERT INTO observe_seine.objectMaterial (topiaid, topiaversion, topiacreatedate, lastupdatedate, needComment, status, legacyCode, standardCode, code, parent, label1, label2, selectable, childrenMultiSelectable, childSelectionMandatory, objectMaterialType, biodegradable, nonEntangling) values ('fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#11', 0, CURRENT_DATE, CURRENT_TIMESTAMP, false, 1, '', '', '1-2-1-2-1', 'fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#10', 'Net with mesh >3cm above', 'Filet avec maille >3cm dessus', true, false, false, 'fr.ird.observe.entities.referentiel.seine.ObjectMaterialType#0#0', false, false); -INSERT INTO observe_seine.objectMaterial (topiaid, topiaversion, topiacreatedate, lastupdatedate, needComment, status, legacyCode, standardCode, code, parent, label1, label2, selectable, childrenMultiSelectable, childSelectionMandatory, objectMaterialType, biodegradable, nonEntangling) values ('fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#12', 0, CURRENT_DATE, CURRENT_TIMESTAMP, false, 1, '', '', '1-2-1-2-2', 'fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#10', 'Net with mesh >3cm behind', 'Filet avec maille >3cm dessous', true, false, false, 'fr.ird.observe.entities.referentiel.seine.ObjectMaterialType#0#0', false, false); -INSERT INTO observe_seine.objectMaterial (topiaid, topiaversion, topiacreatedate, lastupdatedate, needComment, status, legacyCode, standardCode, code, parent, label1, label2, selectable, childrenMultiSelectable, childSelectionMandatory, objectMaterialType, biodegradable, nonEntangling) values ('fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#13', 0, CURRENT_DATE, CURRENT_TIMESTAMP, false, 1, '', '', '1-2-2', 'fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#5', 'Coverage without mesh', 'Couverture sans maille', FALSE, FALSE, false, 'fr.ird.observe.entities.referentiel.seine.ObjectMaterialType#0#0', false, false); -INSERT INTO observe_seine.objectMaterial (topiaid, topiaversion, topiacreatedate, lastupdatedate, needComment, status, legacyCode, standardCode, code, parent, label1, label2, selectable, childrenMultiSelectable, childSelectionMandatory, objectMaterialType, biodegradable, nonEntangling) values ('fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#14', 0, CURRENT_DATE, CURRENT_TIMESTAMP, false, 1, '', '', '1-2-2-1', 'fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#13', 'Coverage without mesh above', 'Couverture sans maille dessus', true, false, false, 'fr.ird.observe.entities.referentiel.seine.ObjectMaterialType#0#0', false, false); -INSERT INTO observe_seine.objectMaterial (topiaid, topiaversion, topiacreatedate, lastupdatedate, needComment, status, legacyCode, standardCode, code, parent, label1, label2, selectable, childrenMultiSelectable, childSelectionMandatory, objectMaterialType, biodegradable, nonEntangling) values ('fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#15', 0, CURRENT_DATE, CURRENT_TIMESTAMP, false, 1, '', '', '1-2-2-2', 'fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#13', 'Coverage without mesh behind', 'Couverture sans maille dessous', true, false, false, 'fr.ird.observe.entities.referentiel.seine.ObjectMaterialType#0#0', false, false); -INSERT INTO observe_seine.objectMaterial (topiaid, topiaversion, topiacreatedate, lastupdatedate, needComment, status, legacyCode, standardCode, code, parent, label1, label2, selectable, childrenMultiSelectable, childSelectionMandatory, objectMaterialType, biodegradable, nonEntangling) values ('fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#16', 0, CURRENT_DATE, CURRENT_TIMESTAMP, false, 1, '', '', '1-2-3', 'fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#5', 'Not covered', 'Non couvert', FALSE, FALSE, false, 'fr.ird.observe.entities.referentiel.seine.ObjectMaterialType#0#0', false, false); -INSERT INTO observe_seine.objectMaterial (topiaid, topiaversion, topiacreatedate, lastupdatedate, needComment, status, legacyCode, standardCode, code, parent, label1, label2, selectable, childrenMultiSelectable, childSelectionMandatory, objectMaterialType, biodegradable, nonEntangling) values ('fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#17', 0, CURRENT_DATE, CURRENT_TIMESTAMP, false, 1, '', '', '1-2-3-1', 'fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#16', 'Not covered above', 'Non couvert dessus', true, false, false, 'fr.ird.observe.entities.referentiel.seine.ObjectMaterialType#0#0', false, false); -INSERT INTO observe_seine.objectMaterial (topiaid, topiaversion, topiacreatedate, lastupdatedate, needComment, status, legacyCode, standardCode, code, parent, label1, label2, selectable, childrenMultiSelectable, childSelectionMandatory, objectMaterialType, biodegradable, nonEntangling) values ('fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#18', 0, CURRENT_DATE, CURRENT_TIMESTAMP, false, 1, '', '', '1-2-3-2', 'fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#16', 'Not covered behind', 'Non couvert dessous', true, false, false, 'fr.ird.observe.entities.referentiel.seine.ObjectMaterialType#0#0', false, false); -INSERT INTO observe_seine.objectMaterial (topiaid, topiaversion, topiacreatedate, lastupdatedate, needComment, status, legacyCode, standardCode, code, parent, label1, label2, selectable, childrenMultiSelectable, childSelectionMandatory, objectMaterialType, biodegradable, nonEntangling) values ('fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#19', 0, CURRENT_DATE, CURRENT_TIMESTAMP, false, 1, '', '', '1-2-4', 'fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#5', 'Not visible', 'Non visible', false, false, false, 'fr.ird.observe.entities.referentiel.seine.ObjectMaterialType#0#0', false, false); -INSERT INTO observe_seine.objectMaterial (topiaid, topiaversion, topiacreatedate, lastupdatedate, needComment, status, legacyCode, standardCode, code, parent, label1, label2, selectable, childrenMultiSelectable, childSelectionMandatory, objectMaterialType, biodegradable, nonEntangling) values ('fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#20', 0, CURRENT_DATE, CURRENT_TIMESTAMP, false, 1, '', '', '1-2-4-1', 'fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#19', 'Not visible above', 'Non visible dessus', true, false, false, 'fr.ird.observe.entities.referentiel.seine.ObjectMaterialType#0#0', false, false); -INSERT INTO observe_seine.objectMaterial (topiaid, topiaversion, topiacreatedate, lastupdatedate, needComment, status, legacyCode, standardCode, code, parent, label1, label2, selectable, childrenMultiSelectable, childSelectionMandatory, objectMaterialType, biodegradable, nonEntangling) values ('fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#21', 0, CURRENT_DATE, CURRENT_TIMESTAMP, false, 1, '', '', '1-2-4-2', 'fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#19', 'Not visible behind', 'Non visible dessous', true, false, false, 'fr.ird.observe.entities.referentiel.seine.ObjectMaterialType#0#0', false, false); -INSERT INTO observe_seine.objectMaterial (topiaid, topiaversion, topiacreatedate, lastupdatedate, needComment, status, legacyCode, standardCode, code, parent, label1, label2, selectable, childrenMultiSelectable, childSelectionMandatory, objectMaterialType, biodegradable, nonEntangling) values ('fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#22', 0, CURRENT_DATE, CURRENT_TIMESTAMP, false, 1, '', '', '2', NULL, 'Underwater part', 'Partie immergée', false, true, true, 'fr.ird.observe.entities.referentiel.seine.ObjectMaterialType#0#0', false, false); -INSERT INTO observe_seine.objectMaterial (topiaid, topiaversion, topiacreatedate, lastupdatedate, needComment, status, legacyCode, standardCode, code, parent, label1, label2, selectable, childrenMultiSelectable, childSelectionMandatory, objectMaterialType, biodegradable, nonEntangling) values ('fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#23', 0, CURRENT_DATE, CURRENT_TIMESTAMP, false, 1, '', '', '2-1', 'fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#22', 'Net in sausage', 'Filet saucisse', FALSE, TRUE, FALSE, 'fr.ird.observe.entities.referentiel.seine.ObjectMaterialType#0#0', false, false); -INSERT INTO observe_seine.objectMaterial (topiaid, topiaversion, topiacreatedate, lastupdatedate, needComment, status, legacyCode, standardCode, code, parent, label1, label2, selectable, childrenMultiSelectable, childSelectionMandatory, objectMaterialType, biodegradable, nonEntangling) values ('fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#24', 0, CURRENT_DATE, CURRENT_TIMESTAMP, false, 1, '', '', '2-1-1', 'fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#24', 'Net in sausage <=3cm', 'Filet saucisse <=3cm', true, false, false, 'fr.ird.observe.entities.referentiel.seine.ObjectMaterialType#0#0', false, false); -INSERT INTO observe_seine.objectMaterial (topiaid, topiaversion, topiacreatedate, lastupdatedate, needComment, status, legacyCode, standardCode, code, parent, label1, label2, selectable, childrenMultiSelectable, childSelectionMandatory, objectMaterialType, biodegradable, nonEntangling) values ('fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#25', 0, CURRENT_DATE, CURRENT_TIMESTAMP, false, 1, '', '', '2-1-2', 'fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#24', 'Net in sausage >3cm', 'Filet saucisse >3cm', true, false, false, 'fr.ird.observe.entities.referentiel.seine.ObjectMaterialType#0#0', false, false); -INSERT INTO observe_seine.objectMaterial (topiaid, topiaversion, topiacreatedate, lastupdatedate, needComment, status, legacyCode, standardCode, code, parent, label1, label2, selectable, childrenMultiSelectable, childSelectionMandatory, objectMaterialType, biodegradable, nonEntangling) values ('fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#26', 0, CURRENT_DATE, CURRENT_TIMESTAMP, false, 1, '', '', '2-2', 'fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#22', 'Open net', 'Filet ouvert', FALSE, TRUE, FALSE, 'fr.ird.observe.entities.referentiel.seine.ObjectMaterialType#0#0', false, false); -INSERT INTO observe_seine.objectMaterial (topiaid, topiaversion, topiacreatedate, lastupdatedate, needComment, status, legacyCode, standardCode, code, parent, label1, label2, selectable, childrenMultiSelectable, childSelectionMandatory, objectMaterialType, biodegradable, nonEntangling) values ('fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#27', 0, CURRENT_DATE, CURRENT_TIMESTAMP, false, 1, '', '', '2-2-1', 'fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#26', 'Open net <= 3cm', 'Filet ouvert <=3cm', true, false, false, 'fr.ird.observe.entities.referentiel.seine.ObjectMaterialType#0#0', false, false); -INSERT INTO observe_seine.objectMaterial (topiaid, topiaversion, topiacreatedate, lastupdatedate, needComment, status, legacyCode, standardCode, code, parent, label1, label2, selectable, childrenMultiSelectable, childSelectionMandatory, objectMaterialType, biodegradable, nonEntangling) values ('fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#28', 0, CURRENT_DATE, CURRENT_TIMESTAMP, false, 1, '', '', '2-2-2', 'fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#26', 'Open net >3cm', 'Filet ouvert >3cm', true, false, false, 'fr.ird.observe.entities.referentiel.seine.ObjectMaterialType#0#0', false, false); -INSERT INTO observe_seine.objectMaterial (topiaid, topiaversion, topiacreatedate, lastupdatedate, needComment, status, legacyCode, standardCode, code, parent, label1, label2, selectable, childrenMultiSelectable, childSelectionMandatory, objectMaterialType, biodegradable, nonEntangling) values ('fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#29', 0, CURRENT_DATE, CURRENT_TIMESTAMP, false, 1, '', '', '2-3', 'fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#22', 'Single net pieces', 'Pièces de filets accolées', FALSE, TRUE, FALSE, 'fr.ird.observe.entities.referentiel.seine.ObjectMaterialType#0#0', false, false); -INSERT INTO observe_seine.objectMaterial (topiaid, topiaversion, topiacreatedate, lastupdatedate, needComment, status, legacyCode, standardCode, code, parent, label1, label2, selectable, childrenMultiSelectable, childSelectionMandatory, objectMaterialType, biodegradable, nonEntangling) values ('fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#30', 0, CURRENT_DATE, CURRENT_TIMESTAMP, false, 1, '', '', '2-3-1', 'fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#29', 'Single net pieces <=3cm', 'Pièces de filets accolées <=3cm', true, false, false, 'fr.ird.observe.entities.referentiel.seine.ObjectMaterialType#0#0', false, false); -INSERT INTO observe_seine.objectMaterial (topiaid, topiaversion, topiacreatedate, lastupdatedate, needComment, status, legacyCode, standardCode, code, parent, label1, label2, selectable, childrenMultiSelectable, childSelectionMandatory, objectMaterialType, biodegradable, nonEntangling) values ('fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#31', 0, CURRENT_DATE, CURRENT_TIMESTAMP, false, 1, '', '', '2-3-2', 'fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#29', 'Single net pieces >3cm', 'Pièces de filets accolées >3cm', true, false, false, 'fr.ird.observe.entities.referentiel.seine.ObjectMaterialType#0#0', false, false); -INSERT INTO observe_seine.objectMaterial (topiaid, topiaversion, topiacreatedate, lastupdatedate, needComment, status, legacyCode, standardCode, code, parent, label1, label2, selectable, childrenMultiSelectable, childSelectionMandatory, objectMaterialType, biodegradable, nonEntangling) values ('fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#32', 0, CURRENT_DATE, CURRENT_TIMESTAMP, false, 1, '', '', '2-4', 'fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#22', 'Rope/no mesh', 'Bout/sans maille', true, false, false, 'fr.ird.observe.entities.referentiel.seine.ObjectMaterialType#0#0', false, false); -INSERT INTO observe_seine.objectMaterial (topiaid, topiaversion, topiacreatedate, lastupdatedate, needComment, status, legacyCode, standardCode, code, parent, label1, label2, selectable, childrenMultiSelectable, childSelectionMandatory, objectMaterialType, biodegradable, nonEntangling) values ('fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#33', 0, CURRENT_DATE, CURRENT_TIMESTAMP, false, 1, '', '', '2-5', 'fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#22', 'Not visible', 'Pas visible', true, false, false, 'fr.ird.observe.entities.referentiel.seine.ObjectMaterialType#0#0', false, false); -INSERT INTO observe_seine.objectMaterial (topiaid, topiaversion, topiacreatedate, lastupdatedate, needComment, status, legacyCode, standardCode, code, parent, label1, label2, selectable, childrenMultiSelectable, childSelectionMandatory, objectMaterialType, biodegradable, nonEntangling) values ('fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#34', 0, CURRENT_DATE, CURRENT_TIMESTAMP, false, 1, '', '', '2-6', 'fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#22', 'No sub structure', 'Pas de mouillage', true, false, false, 'fr.ird.observe.entities.referentiel.seine.ObjectMaterialType#0#0', false, false); -INSERT INTO observe_seine.objectMaterial (topiaid, topiaversion, topiacreatedate, lastupdatedate, needComment, status, legacyCode, standardCode, code, parent, label1, label2, selectable, childrenMultiSelectable, childSelectionMandatory, objectMaterialType, biodegradable, nonEntangling) values ('fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#35', 0, CURRENT_DATE, CURRENT_TIMESTAMP, false, 1, '', '', '3', NULL, 'Other elements', 'Autres éléments', FALSE, TRUE, FALSE, 'fr.ird.observe.entities.referentiel.seine.ObjectMaterialType#0#0', false, false); -INSERT INTO observe_seine.objectMaterial (topiaid, topiaversion, topiacreatedate, lastupdatedate, needComment, status, legacyCode, standardCode, code, parent, label1, label2, selectable, childrenMultiSelectable, childSelectionMandatory, objectMaterialType, biodegradable, nonEntangling) values ('fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#36', 0, CURRENT_DATE, CURRENT_TIMESTAMP, false, 1, '', '', '3-1', 'fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#35', 'Platic containers', 'Bidons plastique', true, false, false, 'fr.ird.observe.entities.referentiel.seine.ObjectMaterialType#0#0', false, false); -INSERT INTO observe_seine.objectMaterial (topiaid, topiaversion, topiacreatedate, lastupdatedate, needComment, status, legacyCode, standardCode, code, parent, label1, label2, selectable, childrenMultiSelectable, childSelectionMandatory, objectMaterialType, biodegradable, nonEntangling) values ('fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#37', 0, CURRENT_DATE, CURRENT_TIMESTAMP, false, 1, '', '', '3-2', 'fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#35', 'Corks', 'Flotteurs', true, false, false, 'fr.ird.observe.entities.referentiel.seine.ObjectMaterialType#0#0', false, false); -INSERT INTO observe_seine.objectMaterial (topiaid, topiaversion, topiacreatedate, lastupdatedate, needComment, status, legacyCode, standardCode, code, parent, label1, label2, selectable, childrenMultiSelectable, childSelectionMandatory, objectMaterialType, biodegradable, nonEntangling) values ('fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#38', 0, CURRENT_DATE, CURRENT_TIMESTAMP, false, 1, '', '', '3-3', 'fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#35', 'Bags', 'Sacs', true, false, false, 'fr.ird.observe.entities.referentiel.seine.ObjectMaterialType#0#0', false, false); -INSERT INTO observe_seine.objectMaterial (topiaid, topiaversion, topiacreatedate, lastupdatedate, needComment, status, legacyCode, standardCode, code, parent, label1, label2, selectable, childrenMultiSelectable, childSelectionMandatory, objectMaterialType, biodegradable, nonEntangling) values ('fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#39', 0, CURRENT_DATE, CURRENT_TIMESTAMP, false, 1, '', '', '3-4', 'fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#35', 'Palms, canes', 'Palmes, tiges', true, false, false, 'fr.ird.observe.entities.referentiel.seine.ObjectMaterialType#0#0', false, false); -INSERT INTO observe_seine.objectMaterial (topiaid, topiaversion, topiacreatedate, lastupdatedate, needComment, status, legacyCode, standardCode, code, parent, label1, label2, selectable, childrenMultiSelectable, childSelectionMandatory, objectMaterialType, biodegradable, nonEntangling) values ('fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#40', 0, CURRENT_DATE, CURRENT_TIMESTAMP, false, 1, '', '', '3-5', 'fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#35', 'Color belts', 'Rubans colorés', true, false, false, 'fr.ird.observe.entities.referentiel.seine.ObjectMaterialType#0#1', false, false); -INSERT INTO observe_seine.objectMaterial (topiaid, topiaversion, topiacreatedate, lastupdatedate, needComment, status, legacyCode, standardCode, code, parent, label1, label2, selectable, childrenMultiSelectable, childSelectionMandatory, objectMaterialType, biodegradable, nonEntangling) values ('fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#41', 0, CURRENT_DATE, CURRENT_TIMESTAMP, false, 1, '', '', '3-6', 'fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#35', 'Weights', 'Poids', true, false, false, 'fr.ird.observe.entities.referentiel.seine.ObjectMaterialType#0#2', false, false); -INSERT INTO observe_seine.objectMaterial (topiaid, topiaversion, topiacreatedate, lastupdatedate, needComment, status, legacyCode, standardCode, code, parent, label1, label2, selectable, childrenMultiSelectable, childSelectionMandatory, objectMaterialType, biodegradable, nonEntangling) values ('fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#42', 0, CURRENT_DATE, CURRENT_TIMESTAMP, false, 1, '', '', '3-7', 'fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#35', 'Entangled animal', 'Animal maillé', true, false, false, 'fr.ird.observe.entities.referentiel.seine.ObjectMaterialType#0#3', false, false); -UPDATE observe_seine.objectMaterial set label3 = label2 || ' TODO'; ===================================== persistence/src/main/resources/db/migration/6.901/09_fill_object_material-common.sql ===================================== --- /dev/null +++ b/persistence/src/main/resources/db/migration/6.901/09_fill_object_material-common.sql @@ -0,0 +1,107 @@ +--- +-- #%L +-- ObServe :: Persistence +-- %% +-- Copyright (C) 2008 - 2017 IRD, Code Lutin, Ultreia.io +-- %% +-- This program is free software: you can redistribute it and/or modify +-- it under the terms of the GNU General Public License as +-- published by the Free Software Foundation, either version 3 of the +-- License, or (at your option) any later version. +-- +-- This program is distributed in the hope that it will be useful, +-- but WITHOUT ANY WARRANTY; without even the implied warranty of +-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +-- GNU General Public License for more details. +-- +-- You should have received a copy of the GNU General Public +-- License along with this program. If not, see +-- <http://www.gnu.org/licenses/gpl-3.0.html>. +-- #L% +--- +INSERT INTO observe_seine.objectMaterial (topiaid, topiaversion, topiacreatedate, lastupdatedate, needComment, status, legacyCode, standardCode, code, parent, label1, label2, label3, selectable, childrenMultiSelectable, childSelectionMandatory, objectMaterialType, validation, biodegradable, nonEntangling) values ('fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.1' , 0, CURRENT_DATE, CURRENT_TIMESTAMP, false, 1, NULL , 'FAD' , '1' , NULL , 'FAD' , 'FAD' , 'FAD' , false, false, false, NULL , NULL , false, false); +INSERT INTO observe_seine.objectMaterial (topiaid, topiaversion, topiacreatedate, lastupdatedate, needComment, status, legacyCode, standardCode, code, parent, label1, label2, label3, selectable, childrenMultiSelectable, childSelectionMandatory, objectMaterialType, validation, biodegradable, nonEntangling) values ('fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.2' , 0, CURRENT_DATE, CURRENT_TIMESTAMP, false, 1, '16' , 'DFAD' , '1-1' , 'fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.1' , 'DFAD (drifting FAD)' , 'DFAD (FAD dérivant)' , 'DFAD (FAD a la deriva)' , true , true , false, 'fr.ird.observe.entities.referentiel.seine.ObjectMaterialType#0#0', NULL , false, false); +INSERT INTO observe_seine.objectMaterial (topiaid, topiaversion, topiacreatedate, lastupdatedate, needComment, status, legacyCode, standardCode, code, parent, label1, label2, label3, selectable, childrenMultiSelectable, childSelectionMandatory, objectMaterialType, validation, biodegradable, nonEntangling) values ('fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.3' , 0, CURRENT_DATE, CURRENT_TIMESTAMP, false, 0, '19' , NULL , '1-1-1' , 'fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.2' , 'Experimental FAD' , 'Objet expérimental' , 'Objeto experimental' , true , false, false, 'fr.ird.observe.entities.referentiel.seine.ObjectMaterialType#0#0', NULL , false, false); +INSERT INTO observe_seine.objectMaterial (topiaid, topiaversion, topiacreatedate, lastupdatedate, needComment, status, legacyCode, standardCode, code, parent, label1, label2, label3, selectable, childrenMultiSelectable, childSelectionMandatory, objectMaterialType, validation, biodegradable, nonEntangling) values ('fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.4' , 0, CURRENT_DATE, CURRENT_TIMESTAMP, false, 0, '18' , NULL , '1-1-2' , 'fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.2' , 'Artificial FAD' , 'Objet artificiel' , 'Objeto artificial' , true , false, false, 'fr.ird.observe.entities.referentiel.seine.ObjectMaterialType#0#0', NULL , false, false); +INSERT INTO observe_seine.objectMaterial (topiaid, topiaversion, topiacreatedate, lastupdatedate, needComment, status, legacyCode, standardCode, code, parent, label1, label2, label3, selectable, childrenMultiSelectable, childSelectionMandatory, objectMaterialType, validation, biodegradable, nonEntangling) values ('fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.5' , 0, CURRENT_DATE, CURRENT_TIMESTAMP, false, 1, '27' , NULL , '1-1-3' , 'fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.2' , 'Several FAD entangled' , 'Plusieurs FAD' , 'Objectos enredados' , true , false, false, 'fr.ird.observe.entities.referentiel.seine.ObjectMaterialType#0#0', NULL , false, false); +INSERT INTO observe_seine.objectMaterial (topiaid, topiaversion, topiacreatedate, lastupdatedate, needComment, status, legacyCode, standardCode, code, parent, label1, label2, label3, selectable, childrenMultiSelectable, childSelectionMandatory, objectMaterialType, validation, biodegradable, nonEntangling) values ('fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.6' , 0, CURRENT_DATE, CURRENT_TIMESTAMP, false, 1, NULL , NULL , '1-1-1-1' , 'fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.3' , 'Frame' , 'Chassis' , 'Estructura' , false, false, true , NULL , NULL , false, false); +INSERT INTO observe_seine.objectMaterial (topiaid, topiaversion, topiacreatedate, lastupdatedate, needComment, status, legacyCode, standardCode, code, parent, label1, label2, label3, selectable, childrenMultiSelectable, childSelectionMandatory, objectMaterialType, validation, biodegradable, nonEntangling) values ('fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.7' , 0, CURRENT_DATE, CURRENT_TIMESTAMP, false, 1, '6, 15, 25' , NULL , '1-1-1-1-1' , 'fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.6' , 'Vegetal, canes,bamboo' , 'Végétal, tiges,bambou' , 'Bambú, cañas' , true , false, false, 'fr.ird.observe.entities.referentiel.seine.ObjectMaterialType#0#0', NULL , false, false); +INSERT INTO observe_seine.objectMaterial (topiaid, topiaversion, topiacreatedate, lastupdatedate, needComment, status, legacyCode, standardCode, code, parent, label1, label2, label3, selectable, childrenMultiSelectable, childSelectionMandatory, objectMaterialType, validation, biodegradable, nonEntangling) values ('fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.8' , 0, CURRENT_DATE, CURRENT_TIMESTAMP, false, 1, '20, 21*,26' , NULL , '1-1-1-1-2' , 'fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.6' , 'Metallic or PVC' , 'Métal ou PVC' , 'Metállica ó PVC' , true , false, false, 'fr.ird.observe.entities.referentiel.seine.ObjectMaterialType#0#0', NULL , false, false); +INSERT INTO observe_seine.objectMaterial (topiaid, topiaversion, topiacreatedate, lastupdatedate, needComment, status, legacyCode, standardCode, code, parent, label1, label2, label3, selectable, childrenMultiSelectable, childSelectionMandatory, objectMaterialType, validation, biodegradable, nonEntangling) values ('fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.9' , 0, CURRENT_DATE, CURRENT_TIMESTAMP, false, 1, NULL , NULL , '1-1-1-2' , 'fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.3' , 'Superior coverage' , 'Revêtement supérieur' , 'Recubrimiento superior' , false, true , true , NULL , NULL , false, false); +INSERT INTO observe_seine.objectMaterial (topiaid, topiaversion, topiacreatedate, lastupdatedate, needComment, status, legacyCode, standardCode, code, parent, label1, label2, label3, selectable, childrenMultiSelectable, childSelectionMandatory, objectMaterialType, validation, biodegradable, nonEntangling) values ('fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.10', 0, CURRENT_DATE, CURRENT_TIMESTAMP, false, 1, NULL , NULL , '1-1-1-2-1' , 'fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.9' , 'Net' , 'Filet' , 'Red' , false, true , false, NULL , NULL , false, false); +INSERT INTO observe_seine.objectMaterial (topiaid, topiaversion, topiacreatedate, lastupdatedate, needComment, status, legacyCode, standardCode, code, parent, label1, label2, label3, selectable, childrenMultiSelectable, childSelectionMandatory, objectMaterialType, validation, biodegradable, nonEntangling) values ('fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.11', 0, CURRENT_DATE, CURRENT_TIMESTAMP, false, 1, NULL , NULL , '1-1-1-2-1-1' , 'fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.10', 'Net with mesh ≤7cm' , 'Filet avec maillage ≤7cm' , 'Red con malla ≤7cm' , true , false, false, 'fr.ird.observe.entities.referentiel.seine.ObjectMaterialType#0#0', NULL , false, false); +INSERT INTO observe_seine.objectMaterial (topiaid, topiaversion, topiacreatedate, lastupdatedate, needComment, status, legacyCode, standardCode, code, parent, label1, label2, label3, selectable, childrenMultiSelectable, childSelectionMandatory, objectMaterialType, validation, biodegradable, nonEntangling) values ('fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.12', 0, CURRENT_DATE, CURRENT_TIMESTAMP, false, 1, NULL , NULL , '1-1-1-2-1-2' , 'fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.10', 'Net with mesh >7cm' , 'Filet avec maillage >7cm' , 'Red con malla >7cm' , true , false, false, 'fr.ird.observe.entities.referentiel.seine.ObjectMaterialType#0#0', NULL , false, false); +INSERT INTO observe_seine.objectMaterial (topiaid, topiaversion, topiacreatedate, lastupdatedate, needComment, status, legacyCode, standardCode, code, parent, label1, label2, label3, selectable, childrenMultiSelectable, childSelectionMandatory, objectMaterialType, validation, biodegradable, nonEntangling) values ('fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.13', 0, CURRENT_DATE, CURRENT_TIMESTAMP, false, 1, NULL , NULL , '1-1-1-2-2' , 'fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.9' , 'Coverage without mesh' , 'Revêtement sans maillage' , 'Recubrimiento sin malla' , true , false, false, 'fr.ird.observe.entities.referentiel.seine.ObjectMaterialType#0#0', NULL , false, false); +INSERT INTO observe_seine.objectMaterial (topiaid, topiaversion, topiacreatedate, lastupdatedate, needComment, status, legacyCode, standardCode, code, parent, label1, label2, label3, selectable, childrenMultiSelectable, childSelectionMandatory, objectMaterialType, validation, biodegradable, nonEntangling) values ('fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.14', 0, CURRENT_DATE, CURRENT_TIMESTAMP, false, 1, NULL , NULL , '1-1-1-2-3' , 'fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.9' , 'Not covered' , 'Non couvert' , 'Sin recubrimiento' , true , false, false, 'fr.ird.observe.entities.referentiel.seine.ObjectMaterialType#0#0', NULL , false, false); +INSERT INTO observe_seine.objectMaterial (topiaid, topiaversion, topiacreatedate, lastupdatedate, needComment, status, legacyCode, standardCode, code, parent, label1, label2, label3, selectable, childrenMultiSelectable, childSelectionMandatory, objectMaterialType, validation, biodegradable, nonEntangling) values ('fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.15', 0, CURRENT_DATE, CURRENT_TIMESTAMP, false, 1, NULL , NULL , '1-1-1-2-4' , 'fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.9' , 'Not visible' , 'Non visible' , 'No se ve' , true , false, false, 'fr.ird.observe.entities.referentiel.seine.ObjectMaterialType#0#0', NULL , false, false); +INSERT INTO observe_seine.objectMaterial (topiaid, topiaversion, topiacreatedate, lastupdatedate, needComment, status, legacyCode, standardCode, code, parent, label1, label2, label3, selectable, childrenMultiSelectable, childSelectionMandatory, objectMaterialType, validation, biodegradable, nonEntangling) values ('fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.16', 0, CURRENT_DATE, CURRENT_TIMESTAMP, false, 1, NULL , NULL , '1-1-1-3' , 'fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.3' , 'Inferior coverage' , 'Revêtement inférieur' , 'Recubrimiento inferior' , false, true , true , NULL , NULL , false, false); +INSERT INTO observe_seine.objectMaterial (topiaid, topiaversion, topiacreatedate, lastupdatedate, needComment, status, legacyCode, standardCode, code, parent, label1, label2, label3, selectable, childrenMultiSelectable, childSelectionMandatory, objectMaterialType, validation, biodegradable, nonEntangling) values ('fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.17', 0, CURRENT_DATE, CURRENT_TIMESTAMP, false, 1, NULL , NULL , '1-1-1-3-1' , 'fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.16', 'Net' , 'Filet' , 'Red' , false, true , false, NULL , NULL , false, false); +INSERT INTO observe_seine.objectMaterial (topiaid, topiaversion, topiacreatedate, lastupdatedate, needComment, status, legacyCode, standardCode, code, parent, label1, label2, label3, selectable, childrenMultiSelectable, childSelectionMandatory, objectMaterialType, validation, biodegradable, nonEntangling) values ('fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.18', 0, CURRENT_DATE, CURRENT_TIMESTAMP, false, 1, NULL , NULL , '1-1-1-3-1-1' , 'fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.17', 'Net with mesh ≤7cm' , 'Filet avec maillage ≤7cm' , 'Red con malla ≤7cm' , true , false, false, 'fr.ird.observe.entities.referentiel.seine.ObjectMaterialType#0#0', NULL , false, false); +INSERT INTO observe_seine.objectMaterial (topiaid, topiaversion, topiacreatedate, lastupdatedate, needComment, status, legacyCode, standardCode, code, parent, label1, label2, label3, selectable, childrenMultiSelectable, childSelectionMandatory, objectMaterialType, validation, biodegradable, nonEntangling) values ('fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.19', 0, CURRENT_DATE, CURRENT_TIMESTAMP, false, 1, NULL , NULL , '1-1-1-3-1-2' , 'fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.17', 'Net with mesh >7cm' , 'Filet avec maillage >7cm' , 'Red con malla >7cm' , true , false, false, 'fr.ird.observe.entities.referentiel.seine.ObjectMaterialType#0#0', NULL , false, false); +INSERT INTO observe_seine.objectMaterial (topiaid, topiaversion, topiacreatedate, lastupdatedate, needComment, status, legacyCode, standardCode, code, parent, label1, label2, label3, selectable, childrenMultiSelectable, childSelectionMandatory, objectMaterialType, validation, biodegradable, nonEntangling) values ('fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.20', 0, CURRENT_DATE, CURRENT_TIMESTAMP, false, 1, NULL , NULL , '1-1-1-3-2' , 'fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.16', 'Coverage without mesh' , 'Revêtement sans maillage' , 'Recubrimiento sin malla' , true , false, false, 'fr.ird.observe.entities.referentiel.seine.ObjectMaterialType#0#0', NULL , false, false); +INSERT INTO observe_seine.objectMaterial (topiaid, topiaversion, topiacreatedate, lastupdatedate, needComment, status, legacyCode, standardCode, code, parent, label1, label2, label3, selectable, childrenMultiSelectable, childSelectionMandatory, objectMaterialType, validation, biodegradable, nonEntangling) values ('fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.21', 0, CURRENT_DATE, CURRENT_TIMESTAMP, false, 1, NULL , NULL , '1-1-1-3-3' , 'fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.16', 'Not covered' , 'Non couvert' , 'Sin recubrimiento' , true , false, false, 'fr.ird.observe.entities.referentiel.seine.ObjectMaterialType#0#0', NULL , false, false); +INSERT INTO observe_seine.objectMaterial (topiaid, topiaversion, topiacreatedate, lastupdatedate, needComment, status, legacyCode, standardCode, code, parent, label1, label2, label3, selectable, childrenMultiSelectable, childSelectionMandatory, objectMaterialType, validation, biodegradable, nonEntangling) values ('fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.22', 0, CURRENT_DATE, CURRENT_TIMESTAMP, false, 1, NULL , NULL , '1-1-1-3-4' , 'fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.16', 'Not visible' , 'Non visible' , 'No se ve' , true , false, false, 'fr.ird.observe.entities.referentiel.seine.ObjectMaterialType#0#0', NULL , false, false); +INSERT INTO observe_seine.objectMaterial (topiaid, topiaversion, topiacreatedate, lastupdatedate, needComment, status, legacyCode, standardCode, code, parent, label1, label2, label3, selectable, childrenMultiSelectable, childSelectionMandatory, objectMaterialType, validation, biodegradable, nonEntangling) values ('fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.23', 0, CURRENT_DATE, CURRENT_TIMESTAMP, false, 1, NULL , NULL , '1-1-1-4' , 'fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.3' , 'Modified' , 'Modifié' , 'Se modifica' , true , false, false, 'fr.ird.observe.entities.referentiel.seine.ObjectMaterialType#0#0', NULL , false, false); +INSERT INTO observe_seine.objectMaterial (topiaid, topiaversion, topiacreatedate, lastupdatedate, needComment, status, legacyCode, standardCode, code, parent, label1, label2, label3, selectable, childrenMultiSelectable, childSelectionMandatory, objectMaterialType, validation, biodegradable, nonEntangling) values ('fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.24', 0, CURRENT_DATE, CURRENT_TIMESTAMP, false, 1, NULL , NULL , '1-1-1-5' , 'fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.3' , 'Replaced' , 'Remplacé' , 'Se reemplaza' , true , false, false, 'fr.ird.observe.entities.referentiel.seine.ObjectMaterialType#0#0', NULL , false, false); +INSERT INTO observe_seine.objectMaterial (topiaid, topiaversion, topiacreatedate, lastupdatedate, needComment, status, legacyCode, standardCode, code, parent, label1, label2, label3, selectable, childrenMultiSelectable, childSelectionMandatory, objectMaterialType, validation, biodegradable, nonEntangling) values ('fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.25', 0, CURRENT_DATE, CURRENT_TIMESTAMP, false, 1, NULL , NULL , '1-1-2-1' , 'fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.4' , 'Net in sausage' , 'Filet saucisse' , 'Red en chorizo' , false, true , false, NULL , NULL , false, false); +INSERT INTO observe_seine.objectMaterial (topiaid, topiaversion, topiacreatedate, lastupdatedate, needComment, status, legacyCode, standardCode, code, parent, label1, label2, label3, selectable, childrenMultiSelectable, childSelectionMandatory, objectMaterialType, validation, biodegradable, nonEntangling) values ('fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.26', 0, CURRENT_DATE, CURRENT_TIMESTAMP, false, 0, NULL , NULL , '1-1-2-1-1' , 'fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.25', 'Net in sausage with mesh ≤7cm' , 'Filet saucisse avec maillage ≤7cm' , 'Red en chorizo con malla ≤7cm' , true , false, false, 'fr.ird.observe.entities.referentiel.seine.ObjectMaterialType#0#0', NULL , false, false); +INSERT INTO observe_seine.objectMaterial (topiaid, topiaversion, topiacreatedate, lastupdatedate, needComment, status, legacyCode, standardCode, code, parent, label1, label2, label3, selectable, childrenMultiSelectable, childSelectionMandatory, objectMaterialType, validation, biodegradable, nonEntangling) values ('fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.27', 0, CURRENT_DATE, CURRENT_TIMESTAMP, false, 0, NULL , NULL , '1-1-2-1-2' , 'fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.25', 'Net in sausage with mesh >7cm' , 'Filet saucisse avec maillage >7cm' , 'Red en chorizo con malla >7cm' , true , false, false, 'fr.ird.observe.entities.referentiel.seine.ObjectMaterialType#0#0', NULL , false, false); +INSERT INTO observe_seine.objectMaterial (topiaid, topiaversion, topiacreatedate, lastupdatedate, needComment, status, legacyCode, standardCode, code, parent, label1, label2, label3, selectable, childrenMultiSelectable, childSelectionMandatory, objectMaterialType, validation, biodegradable, nonEntangling) values ('fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.28', 0, CURRENT_DATE, CURRENT_TIMESTAMP, false, 1, NULL , NULL , '1-1-2-2' , 'fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.4' , 'Open net' , 'Filet ouvert' , 'Red abierta' , false, true , false, NULL , NULL , false, false); +INSERT INTO observe_seine.objectMaterial (topiaid, topiaversion, topiacreatedate, lastupdatedate, needComment, status, legacyCode, standardCode, code, parent, label1, label2, label3, selectable, childrenMultiSelectable, childSelectionMandatory, objectMaterialType, validation, biodegradable, nonEntangling) values ('fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.29', 0, CURRENT_DATE, CURRENT_TIMESTAMP, false, 1, NULL , NULL , '1-1-2-2-1' , 'fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.28', 'Open net with mesh ≤7cm' , 'Filet ouvert avec maillage ≤7cm' , 'Red abierta con malla ≤7cm' , true , false, false, 'fr.ird.observe.entities.referentiel.seine.ObjectMaterialType#0#0', NULL , false, false); +INSERT INTO observe_seine.objectMaterial (topiaid, topiaversion, topiacreatedate, lastupdatedate, needComment, status, legacyCode, standardCode, code, parent, label1, label2, label3, selectable, childrenMultiSelectable, childSelectionMandatory, objectMaterialType, validation, biodegradable, nonEntangling) values ('fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.30', 0, CURRENT_DATE, CURRENT_TIMESTAMP, false, 1, NULL , NULL , '1-1-2-2-2' , 'fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.28', 'Open net with mesh >7cm' , 'Filet ouvert avec maillage >7cm' , 'Red abierta con malla >7cm' , true , false, false, 'fr.ird.observe.entities.referentiel.seine.ObjectMaterialType#0#0', NULL , false, false); +INSERT INTO observe_seine.objectMaterial (topiaid, topiaversion, topiacreatedate, lastupdatedate, needComment, status, legacyCode, standardCode, code, parent, label1, label2, label3, selectable, childrenMultiSelectable, childSelectionMandatory, objectMaterialType, validation, biodegradable, nonEntangling) values ('fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.31', 0, CURRENT_DATE, CURRENT_TIMESTAMP, false, 1, NULL , NULL , '1-1-2-3' , 'fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.4' , 'Single net pieces' , 'Pièces de filets accolées' , 'Paños de red sueltos' , false, true , false, NULL , NULL , false, false); +INSERT INTO observe_seine.objectMaterial (topiaid, topiaversion, topiacreatedate, lastupdatedate, needComment, status, legacyCode, standardCode, code, parent, label1, label2, label3, selectable, childrenMultiSelectable, childSelectionMandatory, objectMaterialType, validation, biodegradable, nonEntangling) values ('fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.32', 0, CURRENT_DATE, CURRENT_TIMESTAMP, false, 1, NULL , NULL , '1-1-2-3-1' , 'fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.31', 'Single net pieces with mesh ≤7cm' , 'Pièces de filets accolées avec maillage ≤7cm' , 'Paños de red sueltos con malla ≤7cm' , true , false, false, 'fr.ird.observe.entities.referentiel.seine.ObjectMaterialType#0#0', NULL , false, false); +INSERT INTO observe_seine.objectMaterial (topiaid, topiaversion, topiacreatedate, lastupdatedate, needComment, status, legacyCode, standardCode, code, parent, label1, label2, label3, selectable, childrenMultiSelectable, childSelectionMandatory, objectMaterialType, validation, biodegradable, nonEntangling) values ('fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.33', 0, CURRENT_DATE, CURRENT_TIMESTAMP, false, 1, NULL , NULL , '1-1-2-3-2' , 'fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.31', 'Single net pieces with mesh >7cm' , 'Pièces de filets accolées avec maillage >7cm' , 'Paños de red sueltos con malla >7cm' , true , false, false, 'fr.ird.observe.entities.referentiel.seine.ObjectMaterialType#0#0', NULL , false, false); +INSERT INTO observe_seine.objectMaterial (topiaid, topiaversion, topiacreatedate, lastupdatedate, needComment, status, legacyCode, standardCode, code, parent, label1, label2, label3, selectable, childrenMultiSelectable, childSelectionMandatory, objectMaterialType, validation, biodegradable, nonEntangling) values ('fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.34', 0, CURRENT_DATE, CURRENT_TIMESTAMP, false, 1, NULL , NULL , '1-1-2-4' , 'fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.4' , 'Rope/no mesh' , 'Bout/sans maillage' , 'Cabo/sin red' , true , false, false, 'fr.ird.observe.entities.referentiel.seine.ObjectMaterialType#0#0', NULL , false, false); +INSERT INTO observe_seine.objectMaterial (topiaid, topiaversion, topiacreatedate, lastupdatedate, needComment, status, legacyCode, standardCode, code, parent, label1, label2, label3, selectable, childrenMultiSelectable, childSelectionMandatory, objectMaterialType, validation, biodegradable, nonEntangling) values ('fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.35', 0, CURRENT_DATE, CURRENT_TIMESTAMP, false, 1, NULL , NULL , '1-1-2-5' , 'fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.4' , 'Not visible' , 'Pas visible' , 'No se ve' , true , false, false, 'fr.ird.observe.entities.referentiel.seine.ObjectMaterialType#0#0', NULL , false, false); +INSERT INTO observe_seine.objectMaterial (topiaid, topiaversion, topiacreatedate, lastupdatedate, needComment, status, legacyCode, standardCode, code, parent, label1, label2, label3, selectable, childrenMultiSelectable, childSelectionMandatory, objectMaterialType, validation, biodegradable, nonEntangling) values ('fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.36', 0, CURRENT_DATE, CURRENT_TIMESTAMP, false, 1, NULL , NULL , '1-1-2-6' , 'fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.4' , 'No subsurface structure' , 'Pas de mouillage' , 'Sin rabo' , true , false, false, 'fr.ird.observe.entities.referentiel.seine.ObjectMaterialType#0#0', NULL , false, false); +INSERT INTO observe_seine.objectMaterial (topiaid, topiaversion, topiacreatedate, lastupdatedate, needComment, status, legacyCode, standardCode, code, parent, label1, label2, label3, selectable, childrenMultiSelectable, childSelectionMandatory, objectMaterialType, validation, biodegradable, nonEntangling) values ('fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.37', 0, CURRENT_DATE, CURRENT_TIMESTAMP, false, 1, NULL , NULL , '1-1-2-7' , 'fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.4' , 'Modified' , 'Modifié' , 'Se modifica' , true , false, false, 'fr.ird.observe.entities.referentiel.seine.ObjectMaterialType#0#0', NULL , false, false); +INSERT INTO observe_seine.objectMaterial (topiaid, topiaversion, topiacreatedate, lastupdatedate, needComment, status, legacyCode, standardCode, code, parent, label1, label2, label3, selectable, childrenMultiSelectable, childSelectionMandatory, objectMaterialType, validation, biodegradable, nonEntangling) values ('fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.38', 0, CURRENT_DATE, CURRENT_TIMESTAMP, false, 1, NULL , NULL , '1-1-2-8' , 'fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.4' , 'Replaced' , 'Remplacé' , 'Se reemplaza' , true , false, false, 'fr.ird.observe.entities.referentiel.seine.ObjectMaterialType#0#0', NULL , false, false); +INSERT INTO observe_seine.objectMaterial (topiaid, topiaversion, topiacreatedate, lastupdatedate, needComment, status, legacyCode, standardCode, code, parent, label1, label2, label3, selectable, childrenMultiSelectable, childSelectionMandatory, objectMaterialType, validation, biodegradable, nonEntangling) values ('fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.39', 0, CURRENT_DATE, CURRENT_TIMESTAMP, false, 1, NULL , NULL , '1-1-3-1' , 'fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.5' , 'Containers' , 'Bidons plastique' , 'Garrafas plástico' , true , false, false, 'fr.ird.observe.entities.referentiel.seine.ObjectMaterialType#0#0', NULL , false, false); +INSERT INTO observe_seine.objectMaterial (topiaid, topiaversion, topiacreatedate, lastupdatedate, needComment, status, legacyCode, standardCode, code, parent, label1, label2, label3, selectable, childrenMultiSelectable, childSelectionMandatory, objectMaterialType, validation, biodegradable, nonEntangling) values ('fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.40', 0, CURRENT_DATE, CURRENT_TIMESTAMP, false, 1, NULL , NULL , '1-1-3-2' , 'fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.5' , 'Corks' , 'Flotteurs' , 'Corchos' , true , false, false, 'fr.ird.observe.entities.referentiel.seine.ObjectMaterialType#0#0', NULL , false, false); +INSERT INTO observe_seine.objectMaterial (topiaid, topiaversion, topiacreatedate, lastupdatedate, needComment, status, legacyCode, standardCode, code, parent, label1, label2, label3, selectable, childrenMultiSelectable, childSelectionMandatory, objectMaterialType, validation, biodegradable, nonEntangling) values ('fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.41', 0, CURRENT_DATE, CURRENT_TIMESTAMP, false, 1, NULL , NULL , '1-1-3-3' , 'fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.5' , 'Bags' , 'Sacs' , 'Sacos' , true , false, false, 'fr.ird.observe.entities.referentiel.seine.ObjectMaterialType#0#0', NULL , false, false); +INSERT INTO observe_seine.objectMaterial (topiaid, topiaversion, topiacreatedate, lastupdatedate, needComment, status, legacyCode, standardCode, code, parent, label1, label2, label3, selectable, childrenMultiSelectable, childSelectionMandatory, objectMaterialType, validation, biodegradable, nonEntangling) values ('fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.42', 0, CURRENT_DATE, CURRENT_TIMESTAMP, false, 1, NULL , NULL , '1-1-3-4' , 'fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.5' , 'Palms, canes' , 'Palmes, tiges' , 'Palmeras, cañas' , true , false, false, 'fr.ird.observe.entities.referentiel.seine.ObjectMaterialType#0#0', NULL , false, false); +INSERT INTO observe_seine.objectMaterial (topiaid, topiaversion, topiacreatedate, lastupdatedate, needComment, status, legacyCode, standardCode, code, parent, label1, label2, label3, selectable, childrenMultiSelectable, childSelectionMandatory, objectMaterialType, validation, biodegradable, nonEntangling) values ('fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.43', 0, CURRENT_DATE, CURRENT_TIMESTAMP, false, 1, NULL , NULL , '1-1-3-5' , 'fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.5' , 'Color belts' , 'Rubans colorés' , 'Cintas de colores' , true , false, false, 'fr.ird.observe.entities.referentiel.seine.ObjectMaterialType#0#0', NULL , false, false); +INSERT INTO observe_seine.objectMaterial (topiaid, topiaversion, topiacreatedate, lastupdatedate, needComment, status, legacyCode, standardCode, code, parent, label1, label2, label3, selectable, childrenMultiSelectable, childSelectionMandatory, objectMaterialType, validation, biodegradable, nonEntangling) values ('fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.44', 0, CURRENT_DATE, CURRENT_TIMESTAMP, false, 1, NULL , NULL , '1-1-3-6' , 'fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.5' , 'Weights' , 'Poids' , 'Peso' , true , false, false, 'fr.ird.observe.entities.referentiel.seine.ObjectMaterialType#0#0', NULL , false, false); +INSERT INTO observe_seine.objectMaterial (topiaid, topiaversion, topiacreatedate, lastupdatedate, needComment, status, legacyCode, standardCode, code, parent, label1, label2, label3, selectable, childrenMultiSelectable, childSelectionMandatory, objectMaterialType, validation, biodegradable, nonEntangling) values ('fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.45', 0, CURRENT_DATE, CURRENT_TIMESTAMP, false, 1, NULL , NULL , '1-1-3-7' , 'fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.5' , 'Entangled animal' , 'Animal maillé' , 'Animal enmallado' , true , false, false, 'fr.ird.observe.entities.referentiel.seine.ObjectMaterialType#0#0', NULL , false, false); +INSERT INTO observe_seine.objectMaterial (topiaid, topiaversion, topiacreatedate, lastupdatedate, needComment, status, legacyCode, standardCode, code, parent, label1, label2, label3, selectable, childrenMultiSelectable, childSelectionMandatory, objectMaterialType, validation, biodegradable, nonEntangling) values ('fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.46', 0, CURRENT_DATE, CURRENT_TIMESTAMP, false, 1, '7' , 'AFAD' , '1-2' , 'fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.1' , 'AFAD (anchored FAD)' , 'AFAD (FAD ancré)' , 'AFAD (FAD arraigado)' , true , true , false, 'fr.ird.observe.entities.referentiel.seine.ObjectMaterialType#0#0', NULL , false, false); +INSERT INTO observe_seine.objectMaterial (topiaid, topiaversion, topiacreatedate, lastupdatedate, needComment, status, legacyCode, standardCode, code, parent, label1, label2, label3, selectable, childrenMultiSelectable, childSelectionMandatory, objectMaterialType, validation, biodegradable, nonEntangling) values ('fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.47', 0, CURRENT_DATE, CURRENT_TIMESTAMP, false, 1, NULL , NULL , '1-2-1' , 'fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.46', 'Radar reflectors' , 'Réflecteurs radar' , 'Reflectores de radar' , true , false, false, 'fr.ird.observe.entities.referentiel.seine.ObjectMaterialType#0#0', NULL , false, false); +INSERT INTO observe_seine.objectMaterial (topiaid, topiaversion, topiacreatedate, lastupdatedate, needComment, status, legacyCode, standardCode, code, parent, label1, label2, label3, selectable, childrenMultiSelectable, childSelectionMandatory, objectMaterialType, validation, biodegradable, nonEntangling) values ('fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.48', 0, CURRENT_DATE, CURRENT_TIMESTAMP, false, 1, NULL , NULL , '1-2-2' , 'fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.46', 'Lighting' , 'Eclairage' , 'iluminación' , true , false, false, 'fr.ird.observe.entities.referentiel.seine.ObjectMaterialType#0#0', NULL , false, false); +INSERT INTO observe_seine.objectMaterial (topiaid, topiaversion, topiacreatedate, lastupdatedate, needComment, status, legacyCode, standardCode, code, parent, label1, label2, label3, selectable, childrenMultiSelectable, childSelectionMandatory, objectMaterialType, validation, biodegradable, nonEntangling) values ('fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.49', 0, CURRENT_DATE, CURRENT_TIMESTAMP, false, 1, NULL , NULL , '1-2-3' , 'fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.46', 'Visual range (in nautical miles)' , 'Rayon de visibilité (en miles nautiques)' , 'Rango de visibilidad' , true , false, false, 'fr.ird.observe.entities.referentiel.seine.ObjectMaterialType#0#1', 'x >= 0.1 && x <= 50' , false, false); +INSERT INTO observe_seine.objectMaterial (topiaid, topiaversion, topiacreatedate, lastupdatedate, needComment, status, legacyCode, standardCode, code, parent, label1, label2, label3, selectable, childrenMultiSelectable, childSelectionMandatory, objectMaterialType, validation, biodegradable, nonEntangling) values ('fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.50', 0, CURRENT_DATE, CURRENT_TIMESTAMP, false, 1, NULL , 'LOG' , '2' , NULL , 'LOG' , 'LOG' , 'LOG' , true , true , false, NULL , NULL , false, false); +INSERT INTO observe_seine.objectMaterial (topiaid, topiaversion, topiacreatedate, lastupdatedate, needComment, status, legacyCode, standardCode, code, parent, label1, label2, label3, selectable, childrenMultiSelectable, childSelectionMandatory, objectMaterialType, validation, biodegradable, nonEntangling) values ('fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.51', 0, CURRENT_DATE, CURRENT_TIMESTAMP, false, 1, NULL , 'NLOG' , '2-1' , 'fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.50', 'NLOG (natural LOG)' , 'NLOG (LOG naturel)' , 'NLOG (LOG natural)' , true , true , false, 'fr.ird.observe.entities.referentiel.seine.ObjectMaterialType#0#0', NULL , false, false); +INSERT INTO observe_seine.objectMaterial (topiaid, topiaversion, topiacreatedate, lastupdatedate, needComment, status, legacyCode, standardCode, code, parent, label1, label2, label3, selectable, childrenMultiSelectable, childSelectionMandatory, objectMaterialType, validation, biodegradable, nonEntangling) values ('fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.52', 0, CURRENT_DATE, CURRENT_TIMESTAMP, false, 1, NULL , 'VNLOG' , '2-1-1' , 'fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.51', 'VNLOG (vegetal NLOG)' , 'VNLOG (NLOG vegetal)' , 'VNLOG (NLOG vegetal)' , true , true , false, 'fr.ird.observe.entities.referentiel.seine.ObjectMaterialType#0#0', NULL , false, false); +INSERT INTO observe_seine.objectMaterial (topiaid, topiaversion, topiacreatedate, lastupdatedate, needComment, status, legacyCode, standardCode, code, parent, label1, label2, label3, selectable, childrenMultiSelectable, childSelectionMandatory, objectMaterialType, validation, biodegradable, nonEntangling) values ('fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.53', 0, CURRENT_DATE, CURRENT_TIMESTAMP, false, 1, '1' , NULL , '2-1-1-1' , 'fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.52', 'Straw heap' , 'Tas de paille' , 'Monton the hierba' , true , false, false, 'fr.ird.observe.entities.referentiel.seine.ObjectMaterialType#0#0', NULL , false, false); +INSERT INTO observe_seine.objectMaterial (topiaid, topiaversion, topiacreatedate, lastupdatedate, needComment, status, legacyCode, standardCode, code, parent, label1, label2, label3, selectable, childrenMultiSelectable, childSelectionMandatory, objectMaterialType, validation, biodegradable, nonEntangling) values ('fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.54', 0, CURRENT_DATE, CURRENT_TIMESTAMP, false, 1, '2' , NULL , '2-1-1-2' , 'fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.52', 'Palm tree, palm' , 'Palmier, palme' , 'Palma, hoja de palmera' , true , false, false, 'fr.ird.observe.entities.referentiel.seine.ObjectMaterialType#0#0', NULL , false, false); +INSERT INTO observe_seine.objectMaterial (topiaid, topiaversion, topiacreatedate, lastupdatedate, needComment, status, legacyCode, standardCode, code, parent, label1, label2, label3, selectable, childrenMultiSelectable, childSelectionMandatory, objectMaterialType, validation, biodegradable, nonEntangling) values ('fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.55', 0, CURRENT_DATE, CURRENT_TIMESTAMP, false, 1, '3' , NULL , '2-1-1-3' , 'fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.52', 'Tree, branche' , 'Arbre, branche' , 'Árbol, rama' , true , false, false, 'fr.ird.observe.entities.referentiel.seine.ObjectMaterialType#0#0', NULL , false, false); +INSERT INTO observe_seine.objectMaterial (topiaid, topiaversion, topiacreatedate, lastupdatedate, needComment, status, legacyCode, standardCode, code, parent, label1, label2, label3, selectable, childrenMultiSelectable, childSelectionMandatory, objectMaterialType, validation, biodegradable, nonEntangling) values ('fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.56', 0, CURRENT_DATE, CURRENT_TIMESTAMP, false, 1, NULL , 'ANLOG' , '2-1-2' , 'fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.51', 'ANLOG (animal NLOG)' , 'ANLOG (NLOG animal)' , 'ANLOG (NLOG animal)' , true , true , false, 'fr.ird.observe.entities.referentiel.seine.ObjectMaterialType#0#0', NULL , false, false); +INSERT INTO observe_seine.objectMaterial (topiaid, topiaversion, topiacreatedate, lastupdatedate, needComment, status, legacyCode, standardCode, code, parent, label1, label2, label3, selectable, childrenMultiSelectable, childSelectionMandatory, objectMaterialType, validation, biodegradable, nonEntangling) values ('fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.57', 0, CURRENT_DATE, CURRENT_TIMESTAMP, false, 1, '4, 5*, 24' , NULL , '2-1-2-1' , 'fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.56', 'Carrion' , 'Charogne' , 'Carroña' , true , false, false, 'fr.ird.observe.entities.referentiel.seine.ObjectMaterialType#0#0', NULL , false, false); +INSERT INTO observe_seine.objectMaterial (topiaid, topiaversion, topiacreatedate, lastupdatedate, needComment, status, legacyCode, standardCode, code, parent, label1, label2, label3, selectable, childrenMultiSelectable, childSelectionMandatory, objectMaterialType, validation, biodegradable, nonEntangling) values ('fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.58', 0, CURRENT_DATE, CURRENT_TIMESTAMP, false, 1, NULL , NULL , '2-1-2-2' , 'fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.56', 'Whale shark' , 'Requin-baleine' , 'Tiburón ballena' , true , false, false, 'fr.ird.observe.entities.referentiel.seine.ObjectMaterialType#0#0', NULL , false, false); +INSERT INTO observe_seine.objectMaterial (topiaid, topiaversion, topiacreatedate, lastupdatedate, needComment, status, legacyCode, standardCode, code, parent, label1, label2, label3, selectable, childrenMultiSelectable, childSelectionMandatory, objectMaterialType, validation, biodegradable, nonEntangling) values ('fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.59', 0, CURRENT_DATE, CURRENT_TIMESTAMP, false, 1, NULL , 'ALOG' , '2-2' , 'fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.50', 'ALOG (artificial LOG)' , 'ALOG (LOG artificiel)' , 'ALOG (LOG artificial)' , true , true , false, 'fr.ird.observe.entities.referentiel.seine.ObjectMaterialType#0#0', NULL , false, false); +INSERT INTO observe_seine.objectMaterial (topiaid, topiaversion, topiacreatedate, lastupdatedate, needComment, status, legacyCode, standardCode, code, parent, label1, label2, label3, selectable, childrenMultiSelectable, childSelectionMandatory, objectMaterialType, validation, biodegradable, nonEntangling) values ('fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.60', 0, CURRENT_DATE, CURRENT_TIMESTAMP, false, 1, '10' , NULL , '2-2-1' , 'fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.59', 'Case, big board' , 'Caisse, grosse planche' , 'Caja, gran tablero' , true , false, false, 'fr.ird.observe.entities.referentiel.seine.ObjectMaterialType#0#0', NULL , false, false); +INSERT INTO observe_seine.objectMaterial (topiaid, topiaversion, topiacreatedate, lastupdatedate, needComment, status, legacyCode, standardCode, code, parent, label1, label2, label3, selectable, childrenMultiSelectable, childSelectionMandatory, objectMaterialType, validation, biodegradable, nonEntangling) values ('fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.61', 0, CURRENT_DATE, CURRENT_TIMESTAMP, false, 1, '13' , NULL , '2-2-2' , 'fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.59', 'Plastic object' , 'Objet plastique' , 'Objeto de plastico' , true , false, false, 'fr.ird.observe.entities.referentiel.seine.ObjectMaterialType#0#0', NULL , false, false); +INSERT INTO observe_seine.objectMaterial (topiaid, topiaversion, topiacreatedate, lastupdatedate, needComment, status, legacyCode, standardCode, code, parent, label1, label2, label3, selectable, childrenMultiSelectable, childSelectionMandatory, objectMaterialType, validation, biodegradable, nonEntangling) values ('fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.62', 0, CURRENT_DATE, CURRENT_TIMESTAMP, false, 1, '17' , NULL , '2-2-3' , 'fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.59', 'Metallic object' , 'Objet métallique' , 'Objeto de metal' , true , false, false, 'fr.ird.observe.entities.referentiel.seine.ObjectMaterialType#0#0', NULL , false, false); +INSERT INTO observe_seine.objectMaterial (topiaid, topiaversion, topiacreatedate, lastupdatedate, needComment, status, legacyCode, standardCode, code, parent, label1, label2, label3, selectable, childrenMultiSelectable, childSelectionMandatory, objectMaterialType, validation, biodegradable, nonEntangling) values ('fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.63', 0, CURRENT_DATE, CURRENT_TIMESTAMP, false, 1, NULL , 'FALOG' , '2-2-4' , 'fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.59', 'FALOG (fishing ALOG)' , 'FALOG (ALOG pêche)' , 'FALOG (ALOG pesca)' , true , true , false, 'fr.ird.observe.entities.referentiel.seine.ObjectMaterialType#0#0', NULL , false, false); +INSERT INTO observe_seine.objectMaterial (topiaid, topiaversion, topiacreatedate, lastupdatedate, needComment, status, legacyCode, standardCode, code, parent, label1, label2, label3, selectable, childrenMultiSelectable, childSelectionMandatory, objectMaterialType, validation, biodegradable, nonEntangling) values ('fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.64', 0, CURRENT_DATE, CURRENT_TIMESTAMP, false, 1, '11' , NULL , '2-2-4-1' , 'fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.63', 'Rope, cable' , 'Cordage, câble' , 'Cuerda, cable' , true , false, false, 'fr.ird.observe.entities.referentiel.seine.ObjectMaterialType#0#0', NULL , false, false); +INSERT INTO observe_seine.objectMaterial (topiaid, topiaversion, topiacreatedate, lastupdatedate, needComment, status, legacyCode, standardCode, code, parent, label1, label2, label3, selectable, childrenMultiSelectable, childSelectionMandatory, objectMaterialType, validation, biodegradable, nonEntangling) values ('fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.65', 0, CURRENT_DATE, CURRENT_TIMESTAMP, false, 1, '12' , NULL , '2-2-4-2' , 'fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.63', 'Net, piece of net' , 'Filet, morceau de filet' , 'Red, pedazo de red' , true , false, false, 'fr.ird.observe.entities.referentiel.seine.ObjectMaterialType#0#0', NULL , false, false); +INSERT INTO observe_seine.objectMaterial (topiaid, topiaversion, topiacreatedate, lastupdatedate, needComment, status, legacyCode, standardCode, code, parent, label1, label2, label3, selectable, childrenMultiSelectable, childSelectionMandatory, objectMaterialType, validation, biodegradable, nonEntangling) values ('fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.66', 0, CURRENT_DATE, CURRENT_TIMESTAMP, false, 1, NULL , NULL , '2-2-4-3' , 'fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.63', 'Inert plastic buoy' , 'Bouée plastique inerte' , 'Boya de plástico inerte' , true , false, false, 'fr.ird.observe.entities.referentiel.seine.ObjectMaterialType#0#0', NULL , false, false); +INSERT INTO observe_seine.objectMaterial (topiaid, topiaversion, topiacreatedate, lastupdatedate, needComment, status, legacyCode, standardCode, code, parent, label1, label2, label3, selectable, childrenMultiSelectable, childSelectionMandatory, objectMaterialType, validation, biodegradable, nonEntangling) values ('fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.67', 0, CURRENT_DATE, CURRENT_TIMESTAMP, false, 1, NULL , 'HALOG' , '2-2-5' , 'fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.59', 'HALOG (not fishing ALOG)' , 'HALOG (ALOG non pêche)' , 'HALOG (HALOG no pesca)' , true , true , false, 'fr.ird.observe.entities.referentiel.seine.ObjectMaterialType#0#0', NULL , false, false); +INSERT INTO observe_seine.objectMaterial (topiaid, topiaversion, topiacreatedate, lastupdatedate, needComment, status, legacyCode, standardCode, code, parent, label1, label2, label3, selectable, childrenMultiSelectable, childSelectionMandatory, objectMaterialType, validation, biodegradable, nonEntangling) values ('fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.68', 0, CURRENT_DATE, CURRENT_TIMESTAMP, false, 1, NULL , NULL , '4' , NULL , 'Other properties' , 'Autres propriétés' , 'Otras propiedades' , false, true , false, NULL , NULL , false, false); +INSERT INTO observe_seine.objectMaterial (topiaid, topiaversion, topiacreatedate, lastupdatedate, needComment, status, legacyCode, standardCode, code, parent, label1, label2, label3, selectable, childrenMultiSelectable, childSelectionMandatory, objectMaterialType, validation, biodegradable, nonEntangling) values ('fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.69', 0, CURRENT_DATE, CURRENT_TIMESTAMP, false, 1, NULL , NULL , '4-1' , 'fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.68', 'Biodegradable' , 'Matériaux' , 'Materiales' , true , false, false, 'fr.ird.observe.entities.referentiel.seine.ObjectMaterialType#0#0', NULL , false, false); +INSERT INTO observe_seine.objectMaterial (topiaid, topiaversion, topiacreatedate, lastupdatedate, needComment, status, legacyCode, standardCode, code, parent, label1, label2, label3, selectable, childrenMultiSelectable, childSelectionMandatory, objectMaterialType, validation, biodegradable, nonEntangling) values ('fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.70', 0, CURRENT_DATE, CURRENT_TIMESTAMP, false, 1, '22' , NULL , '4-2' , 'fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.68', 'Non entangling' , 'Non maillant' , NULL , true , false, false, 'fr.ird.observe.entities.referentiel.seine.ObjectMaterialType#0#0', NULL , false, false); +INSERT INTO observe_seine.objectMaterial (topiaid, topiaversion, topiacreatedate, lastupdatedate, needComment, status, legacyCode, standardCode, code, parent, label1, label2, label3, selectable, childrenMultiSelectable, childSelectionMandatory, objectMaterialType, validation, biodegradable, nonEntangling) values ('fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.71', 0, CURRENT_DATE, CURRENT_TIMESTAMP, false, 1, '23' , NULL , '4-3' , 'fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.68', 'Entangling' , 'Maillant' , 'Enmallante' , true , false, false, 'fr.ird.observe.entities.referentiel.seine.ObjectMaterialType#0#0', NULL , false, false); +INSERT INTO observe_seine.objectMaterial (topiaid, topiaversion, topiacreatedate, lastupdatedate, needComment, status, legacyCode, standardCode, code, parent, label1, label2, label3, selectable, childrenMultiSelectable, childSelectionMandatory, objectMaterialType, validation, biodegradable, nonEntangling) values ('fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.72', 0, CURRENT_DATE, CURRENT_TIMESTAMP, false, 1, NULL , NULL , '4-4' , 'fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.68', 'Depth (in m)' , 'Profondeur (en m)' , 'Profundidad (en m)' , true , false, false, 'fr.ird.observe.entities.referentiel.seine.ObjectMaterialType#0#2', 'x >= 0 && x <= 100' , false, false); +INSERT INTO observe_seine.objectMaterial (topiaid, topiaversion, topiacreatedate, lastupdatedate, needComment, status, legacyCode, standardCode, code, parent, label1, label2, label3, selectable, childrenMultiSelectable, childSelectionMandatory, objectMaterialType, validation, biodegradable, nonEntangling) values ('fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.73', 0, CURRENT_DATE, CURRENT_TIMESTAMP, false, 1, NULL , NULL , '4-5' , 'fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.68', 'Area (in m2)' , 'Surface (en m2)' , 'Superficie (en m2)' , true , false, false, 'fr.ird.observe.entities.referentiel.seine.ObjectMaterialType#0#1', 'x >= 0.5 && x <= 50' , false, false); +INSERT INTO observe_seine.objectMaterial (topiaid, topiaversion, topiacreatedate, lastupdatedate, needComment, status, legacyCode, standardCode, code, parent, label1, label2, label3, selectable, childrenMultiSelectable, childSelectionMandatory, objectMaterialType, validation, biodegradable, nonEntangling) values ('fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.74', 0, CURRENT_DATE, CURRENT_TIMESTAMP, false, 1, NULL , NULL , '4-6' , 'fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.68', 'Size of largest mesh' , 'Taille de la maille la plus grande (en mm)' , 'Talla de la malla más grandes (en mm)' , true , false, false, 'fr.ird.observe.entities.referentiel.seine.ObjectMaterialType#0#2', 'x >= 5 && x <= 200' , false, false); +INSERT INTO observe_seine.objectMaterial (topiaid, topiaversion, topiacreatedate, lastupdatedate, needComment, status, legacyCode, standardCode, code, parent, label1, label2, label3, selectable, childrenMultiSelectable, childSelectionMandatory, objectMaterialType, validation, biodegradable, nonEntangling) values ('fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.75', 0, CURRENT_DATE, CURRENT_TIMESTAMP, false, 1, NULL , NULL , '4-7' , 'fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.68', 'FOB identifier' , 'Identifiant du FOB' , 'Identificador del FOB' , true , false, false, 'fr.ird.observe.entities.referentiel.seine.ObjectMaterialType#0#3', 'len(x) >= 3 && len(x) <= 64' , false, false); +INSERT INTO observe_seine.objectMaterial (topiaid, topiaversion, topiacreatedate, lastupdatedate, needComment, status, legacyCode, standardCode, code, parent, label1, label2, label3, selectable, childrenMultiSelectable, childSelectionMandatory, objectMaterialType, validation, biodegradable, nonEntangling) values ('fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.76', 0, CURRENT_DATE, CURRENT_TIMESTAMP, false, 1, NULL , NULL , '4-8' , 'fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.68', 'Number of FOB of this' , 'Nombre de FOB de ce type emmêlés' , NULL , true , false, false, 'fr.ird.observe.entities.referentiel.seine.ObjectMaterialType#0#2', 'x >= 2 && x <= 100' , false, false); +INSERT INTO observe_seine.objectMaterial (topiaid, topiaversion, topiacreatedate, lastupdatedate, needComment, status, legacyCode, standardCode, code, parent, label1, label2, label3, selectable, childrenMultiSelectable, childSelectionMandatory, objectMaterialType, validation, biodegradable, nonEntangling) values ('fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.77', 0, CURRENT_DATE, CURRENT_TIMESTAMP, false, 0, NULL , NULL , '6' , NULL , 'Legacy codes' , 'Anciens codes' , 'Códigos antiguos' , false, true , false, NULL , NULL , false, false); +INSERT INTO observe_seine.objectMaterial (topiaid, topiaversion, topiacreatedate, lastupdatedate, needComment, status, legacyCode, standardCode, code, parent, label1, label2, label3, selectable, childrenMultiSelectable, childSelectionMandatory, objectMaterialType, validation, biodegradable, nonEntangling) values ('fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.78', 0, CURRENT_DATE, CURRENT_TIMESTAMP, false, 0, '99' , NULL , '6-1' , 'fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.77', 'Other, unknown' , 'Autre, inconnu' , 'Otro, desconocido' , true , false, false, 'fr.ird.observe.entities.referentiel.seine.ObjectMaterialType#0#0', NULL , false, false); +INSERT INTO observe_seine.objectMaterial (topiaid, topiaversion, topiacreatedate, lastupdatedate, needComment, status, legacyCode, standardCode, code, parent, label1, label2, label3, selectable, childrenMultiSelectable, childSelectionMandatory, objectMaterialType, validation, biodegradable, nonEntangling) values ('fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.79', 0, CURRENT_DATE, CURRENT_TIMESTAMP, false, 0, '14' , 'ALOG' , '6-2' , 'fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.77', 'One of the previous (10, 11, 12, 13) tagged' , 'Un des antérieurs (10, 11, 12, 13) balisé' , 'Una de los anterior (10, 11, 12, 13) con Baliza' , true , false, false, 'fr.ird.observe.entities.referentiel.seine.ObjectMaterialType#0#0', NULL , false, false); +INSERT INTO observe_seine.objectMaterial (topiaid, topiaversion, topiacreatedate, lastupdatedate, needComment, status, legacyCode, standardCode, code, parent, label1, label2, label3, selectable, childrenMultiSelectable, childSelectionMandatory, objectMaterialType, validation, biodegradable, nonEntangling) values ('fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.80', 0, CURRENT_DATE, CURRENT_TIMESTAMP, false, 0, '8' , NULL , '6-3' , 'fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.77', 'Tuna seiner (or skiff)' , 'Thonier (ou skiff)' , 'Atunero (oó panga)' , true , false, false, 'fr.ird.observe.entities.referentiel.seine.ObjectMaterialType#0#0', NULL , false, false); +INSERT INTO observe_seine.objectMaterial (topiaid, topiaversion, topiacreatedate, lastupdatedate, needComment, status, legacyCode, standardCode, code, parent, label1, label2, label3, selectable, childrenMultiSelectable, childSelectionMandatory, objectMaterialType, validation, biodegradable, nonEntangling) values ('fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.81', 0, CURRENT_DATE, CURRENT_TIMESTAMP, false, 0, '9' , NULL , '6-4' , 'fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.77', 'Supply' , 'Bateau d’appui' , 'Macicero' , true , false, false, 'fr.ird.observe.entities.referentiel.seine.ObjectMaterialType#0#0', NULL , false, false); +INSERT INTO observe_seine.objectMaterial (topiaid, topiaversion, topiacreatedate, lastupdatedate, needComment, status, legacyCode, standardCode, code, parent, label1, label2, label3, selectable, childrenMultiSelectable, childSelectionMandatory, objectMaterialType, validation, biodegradable, nonEntangling) values ('fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.82', 0, CURRENT_DATE, CURRENT_TIMESTAMP, false, 0, '5*, 6*, 21*' , NULL , '6-5' , 'fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.77', 'Tagged' , 'Balisé' , 'Marcado' , true , false, false, 'fr.ird.observe.entities.referentiel.seine.ObjectMaterialType#0#0', NULL , false, false); +INSERT INTO observe_seine.objectMaterial (topiaid, topiaversion, topiacreatedate, lastupdatedate, needComment, status, legacyCode, standardCode, code, parent, label1, label2, label3, selectable, childrenMultiSelectable, childSelectionMandatory, objectMaterialType, validation, biodegradable, nonEntangling) values ('fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.83', 0, CURRENT_DATE, CURRENT_TIMESTAMP, false, 1, NULL , NULL , '7-1-1' , 'fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.2' , 'Raft' , 'Radeau' , 'Parrilla' , true , true , true , 'fr.ird.observe.entities.referentiel.seine.ObjectMaterialType#0#0', NULL , false, false); +INSERT INTO observe_seine.objectMaterial (topiaid, topiaversion, topiacreatedate, lastupdatedate, needComment, status, legacyCode, standardCode, code, parent, label1, label2, label3, selectable, childrenMultiSelectable, childSelectionMandatory, objectMaterialType, validation, biodegradable, nonEntangling) values ('fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.84', 0, CURRENT_DATE, CURRENT_TIMESTAMP, false, 0, NULL , NULL , '7-1-1-1-3' , 'fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.6' , 'Mixed vegetal and metallic or PVC' , NULL , 'Mixta (metálica o PVC y cañas)' , false, false, false, NULL , NULL , false, false); +INSERT INTO observe_seine.objectMaterial (topiaid, topiaversion, topiacreatedate, lastupdatedate, needComment, status, legacyCode, standardCode, code, parent, label1, label2, label3, selectable, childrenMultiSelectable, childSelectionMandatory, objectMaterialType, validation, biodegradable, nonEntangling) values ('fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.85', 0, CURRENT_DATE, CURRENT_TIMESTAMP, false, 1, NULL , NULL , '7-1-2' , 'fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.6' , 'Subsurface structure' , 'Structure immergée' , 'Rabo' , false, true , true , NULL , NULL , false, false); +INSERT INTO observe_seine.objectMaterial (topiaid, topiaversion, topiacreatedate, lastupdatedate, needComment, status, legacyCode, standardCode, code, parent, label1, label2, label3, selectable, childrenMultiSelectable, childSelectionMandatory, objectMaterialType, validation, biodegradable, nonEntangling) values ('fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.86', 0, CURRENT_DATE, CURRENT_TIMESTAMP, false, 1, NULL , NULL , '7-1-3' , 'fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.2' , 'Other components' , 'Autres éléments' , 'Otros componentes' , false, true , false, NULL , NULL , false, false); ===================================== persistence/src/main/resources/db/migration/6.901/referential-ObjectMaterial.csv ===================================== --- /dev/null +++ b/persistence/src/main/resources/db/migration/6.901/referential-ObjectMaterial.csv @@ -0,0 +1,87 @@ +code,parent,legacyCode,standardCode,label1,label2,label3,dataType,validation,selectable,childrenMultiSelectable,childSelectionMandatory,status,biodegradable,nonEntangling +1,,,FAD,FAD,FAD,FAD,,,FALSE,FALSE,FALSE,TRUE,, +1-1,1,16,DFAD,DFAD (drifting FAD),DFAD (FAD dérivant),DFAD (FAD a la deriva),Boolean,,TRUE,TRUE,FALSE,TRUE,, +1-1-1,1-1,19,,Experimental FAD,Objet expérimental,Objeto experimental,Boolean,,TRUE,,,FALSE,, +1-1-2,1-1,18,,Artificial FAD,Objet artificiel,Objeto artificial,Boolean,,TRUE,,,FALSE,, +1-1-3,1-1,27,,Several FAD entangled,Plusieurs FAD,Objectos enredados,Boolean,,TRUE,,,TRUE,, +1-1-1-1,1-1-1,,,Frame,Chassis,Estructura,,,FALSE,FALSE,TRUE,TRUE,, +1-1-1-1-1,1-1-1-1,"6, 15, 25",,"Vegetal, canes,bamboo","Végétal, tiges,bambou","Bambú, cañas",Boolean,,TRUE,,,TRUE,, +1-1-1-1-2,1-1-1-1,"20, 21*,26",,Metallic or PVC,Métal ou PVC,Metállica ó PVC,Boolean,,TRUE,,,TRUE,, +1-1-1-2,1-1-1,,,Superior coverage,Revêtement supérieur,Recubrimiento superior,,,FALSE,TRUE,TRUE,TRUE,, +1-1-1-2-1,1-1-1-2,,,Net,Filet,Red,,,FALSE,TRUE,FALSE,TRUE,, +1-1-1-2-1-1,1-1-1-2-1,,,Net with mesh ≤7cm,Filet avec maillage ≤7cm,Red con malla ≤7cm,Boolean,,TRUE,,FALSE,TRUE,, +1-1-1-2-1-2,1-1-1-2-1,,,Net with mesh >7cm,Filet avec maillage >7cm,Red con malla >7cm,Boolean,,TRUE,,FALSE,TRUE,, +1-1-1-2-2,1-1-1-2,,,Coverage without mesh,Revêtement sans maillage,Recubrimiento sin malla,Boolean,,TRUE,,FALSE,TRUE,, +1-1-1-2-3,1-1-1-2,,,Not covered,Non couvert,Sin recubrimiento,Boolean,,TRUE,,FALSE,TRUE,, +1-1-1-2-4,1-1-1-2,,,Not visible,Non visible,No se ve,Boolean,,TRUE,,,TRUE,, +1-1-1-3,1-1-1,,,Inferior coverage,Revêtement inférieur,Recubrimiento inferior,,,FALSE,TRUE,TRUE,TRUE,, +1-1-1-3-1,1-1-1-3,,,Net,Filet,Red,,,FALSE,TRUE,FALSE,TRUE,, +1-1-1-3-1-1,1-1-1-3-1,,,Net with mesh ≤7cm,Filet avec maillage ≤7cm,Red con malla ≤7cm,Boolean,,TRUE,,FALSE,TRUE,, +1-1-1-3-1-2,1-1-1-3-1,,,Net with mesh >7cm,Filet avec maillage >7cm,Red con malla >7cm,Boolean,,TRUE,,FALSE,TRUE,, +1-1-1-3-2,1-1-1-3,,,Coverage without mesh,Revêtement sans maillage,Recubrimiento sin malla,Boolean,,TRUE,,FALSE,TRUE,, +1-1-1-3-3,1-1-1-3,,,Not covered,Non couvert,Sin recubrimiento,Boolean,,TRUE,,FALSE,TRUE,, +1-1-1-3-4,1-1-1-3,,,Not visible,Non visible,No se ve,Boolean,,TRUE,,,TRUE,, +1-1-1-4,1-1-1,,,Modified,Modifié,Se modifica,Boolean,,TRUE,,,TRUE,, +1-1-1-5,1-1-1,,,Replaced,Remplacé,Se reemplaza,Boolean,,TRUE,,,TRUE,, +1-1-2-1,1-1-2,,,Net in sausage,Filet saucisse,Red en chorizo,,,FALSE,TRUE,FALSE,TRUE,, +1-1-2-1-1,1-1-2-1,,,Net in sausage with mesh ≤7cm,Filet saucisse avec maillage ≤7cm,Red en chorizo con malla ≤7cm,Boolean,,TRUE,,,FALSE,, +1-1-2-1-2,1-1-2-1,,,Net in sausage with mesh >7cm,Filet saucisse avec maillage >7cm,Red en chorizo con malla >7cm,Boolean,,TRUE,,,FALSE,, +1-1-2-2,1-1-2,,,Open net,Filet ouvert,Red abierta,,,FALSE,TRUE,FALSE,TRUE,, +1-1-2-2-1,1-1-2-2,,,Open net with mesh ≤7cm,Filet ouvert avec maillage ≤7cm,Red abierta con malla ≤7cm,Boolean,,TRUE,,,TRUE,, +1-1-2-2-2,1-1-2-2,,,Open net with mesh >7cm,Filet ouvert avec maillage >7cm,Red abierta con malla >7cm,Boolean,,TRUE,,,TRUE,, +1-1-2-3,1-1-2,,,Single net pieces,Pièces de filets accolées,Paños de red sueltos,,,FALSE,TRUE,FALSE,TRUE,, +1-1-2-3-1,1-1-2-3,,,Single net pieces with mesh ≤7cm,Pièces de filets accolées avec maillage ≤7cm,Paños de red sueltos con malla ≤7cm,Boolean,,TRUE,,,TRUE,, +1-1-2-3-2,1-1-2-3,,,Single net pieces with mesh >7cm,Pièces de filets accolées avec maillage >7cm,Paños de red sueltos con malla >7cm,Boolean,,TRUE,,,TRUE,, +1-1-2-4,1-1-2,,,Rope/no mesh,Bout/sans maillage,Cabo/sin red,Boolean,,TRUE,,,TRUE,, +1-1-2-5,1-1-2,,,Not visible,Pas visible,No se ve,Boolean,,TRUE,,,TRUE,, +1-1-2-6,1-1-2,,,No subsurface structure,Pas de mouillage,Sin rabo,Boolean,,TRUE,,,TRUE,, +1-1-2-7,1-1-2,,,Modified,Modifié,Se modifica,Boolean,,TRUE,,,TRUE,, +1-1-2-8,1-1-2,,,Replaced,Remplacé,Se reemplaza,Boolean,,TRUE,,,TRUE,, +1-1-3-1,1-1-3,,,Containers,Bidons plastique,Garrafas plástico,Boolean,,TRUE,,,TRUE,, +1-1-3-2,1-1-3,,,Corks,Flotteurs,Corchos,Boolean,,TRUE,,,TRUE,, +1-1-3-3,1-1-3,,,Bags,Sacs,Sacos,Boolean,,TRUE,,,TRUE,, +1-1-3-4,1-1-3,,,"Palms, canes","Palmes, tiges","Palmeras, cañas",Boolean,,TRUE,,,TRUE,, +1-1-3-5,1-1-3,,,Color belts,Rubans colorés,Cintas de colores,Boolean,,TRUE,,,TRUE,, +1-1-3-6,1-1-3,,,Weights,Poids,Peso,Boolean,,TRUE,,,TRUE,, +1-1-3-7,1-1-3,,,Entangled animal,Animal maillé,Animal enmallado,Boolean,,TRUE,,,TRUE,, +1-2,1,7,AFAD,AFAD (anchored FAD),AFAD (FAD ancré),AFAD (FAD arraigado),Boolean,,TRUE,TRUE,FALSE,TRUE,, +1-2-1,1-2,,,Radar reflectors,Réflecteurs radar,Reflectores de radar,Boolean,,TRUE,,FALSE,TRUE,, +1-2-2,1-2,,,Lighting,Eclairage,iluminación,Boolean,,TRUE,,FALSE,TRUE,, +1-2-3,1-2,,,Visual range (in nautical miles),Rayon de visibilité (en miles nautiques),Rango de visibilidad,float1,x >= 0.1 && x <= 50,TRUE,,FALSE,TRUE,, +2,,,LOG,LOG,LOG,LOG,,,TRUE,TRUE,FALSE,TRUE,, +2-1,2,,NLOG,NLOG (natural LOG),NLOG (LOG naturel),NLOG (LOG natural),Boolean,,TRUE,TRUE,FALSE,TRUE,, +2-1-1,2-1,,VNLOG,VNLOG (vegetal NLOG),VNLOG (NLOG vegetal),VNLOG (NLOG vegetal),Boolean,,TRUE,TRUE,FALSE,TRUE,, +2-1-1-1,2-1-1,1,,Straw heap,Tas de paille,Monton the hierba,Boolean,,TRUE,,,TRUE,, +2-1-1-2,2-1-1,2,,"Palm tree, palm","Palmier, palme","Palma, hoja de palmera",Boolean,,TRUE,,,TRUE,, +2-1-1-3,2-1-1,3,,"Tree, branche","Arbre, branche","Árbol, rama",Boolean,,TRUE,,,TRUE,, +2-1-2,2-1,,ANLOG,ANLOG (animal NLOG),ANLOG (NLOG animal),ANLOG (NLOG animal),Boolean,,TRUE,TRUE,FALSE,TRUE,, +2-1-2-1,2-1-2,"4, 5*, 24",,Carrion,Charogne,Carroña,Boolean,,TRUE,,,TRUE,, +2-1-2-2,2-1-2,,,Whale shark,Requin-baleine,Tiburón ballena,Boolean,,TRUE,,,TRUE,, +2-2,2,,ALOG,ALOG (artificial LOG),ALOG (LOG artificiel),ALOG (LOG artificial),Boolean,,TRUE,TRUE,FALSE,TRUE,, +2-2-1,2-2,10,,"Case, big board","Caisse, grosse planche","Caja, gran tablero",Boolean,,TRUE,,,TRUE,, +2-2-2,2-2,13,,Plastic object,Objet plastique,Objeto de plastico,Boolean,,TRUE,,,TRUE,, +2-2-3,2-2,17,,Metallic object,Objet métallique,Objeto de metal,Boolean,,TRUE,,,TRUE,, +2-2-4,2-2,,FALOG,FALOG (fishing ALOG),FALOG (ALOG pêche),FALOG (ALOG pesca),Boolean,,TRUE,TRUE,,TRUE,, +2-2-4-1,2-2-4,11,,"Rope, cable","Cordage, câble","Cuerda, cable",Boolean,,TRUE,,,TRUE,, +2-2-4-2,2-2-4,12,,"Net, piece of net","Filet, morceau de filet","Red, pedazo de red",Boolean,,TRUE,,,TRUE,, +2-2-4-3,2-2-4,,,Inert plastic buoy,Bouée plastique inerte,Boya de plástico inerte,Boolean,,TRUE,,,TRUE,, +2-2-5,2-2,,HALOG,HALOG (not fishing ALOG),HALOG (ALOG non pêche),HALOG (HALOG no pesca),Boolean,,TRUE,TRUE,FALSE,TRUE,, +4,,,,Other properties,Autres propriétés,Otras propiedades,,,FALSE,TRUE,FALSE,TRUE,, +4-1,4,,,Biodegradable,Matériaux,Materiales,Boolean,,TRUE,,,TRUE,, +4-2,4,22,,Non entangling,Non maillant,,Boolean,,TRUE,,,TRUE,, +4-3,4,23,,Entangling,Maillant,Enmallante,Boolean,,TRUE,,,TRUE,, +4-4,4,,,Depth (in m),Profondeur (en m),Profundidad (en m),Integer,x >= 0 && x <= 100,TRUE,,,TRUE,, +4-5,4,,,Area (in m2),Surface (en m2),Superficie (en m2),float1,x >= 0.5 && x <= 50,TRUE,,,TRUE,, +4-6,4,,,Size of largest mesh,Taille de la maille la plus grande (en mm),Talla de la malla más grandes (en mm),Integer,x >= 5 && x <= 200,TRUE,,,TRUE,, +4-7,4,,,FOB identifier,Identifiant du FOB,Identificador del FOB,String,len(x) >= 3 && len(x) <= 64,TRUE,,,TRUE,, +4-8,4,,,Number of FOB of this,Nombre de FOB de ce type emmêlés,,Integer,x >= 2 && x <= 100,TRUE,,,TRUE,, +6,,,,Legacy codes,Anciens codes,Códigos antiguos,,,FALSE,TRUE,FALSE,FALSE,, +6-1,6,99,,"Other, unknown","Autre, inconnu","Otro, desconocido",Boolean,,TRUE,,,,, +6-2,6,14,ALOG,"One of the previous (10, 11, 12, 13) tagged","Un des antérieurs (10, 11, 12, 13) balisé","Una de los anterior (10, 11, 12, 13) con Baliza",Boolean,,TRUE,,,,, +6-3,6,8,,Tuna seiner (or skiff),Thonier (ou skiff),Atunero (oó panga),Boolean,,TRUE,,,,, +6-4,6,9,,Supply,Bateau d’appui,Macicero,Boolean,,TRUE,,,,, +6-5,6,"5*, 6*, 21*",,Tagged,Balisé,Marcado,Boolean,,TRUE,,,FALSE,, +7-1-1,1-1,,,Raft,Radeau,Parrilla,Boolean,,TRUE,TRUE,TRUE,TRUE,, +7-1-1-1-3,1-1-1-1,,,Mixed vegetal and metallic or PVC,,Mixta (metálica o PVC y cañas),,,,,,,, +7-1-2,1-1-1-1,,,Subsurface structure,Structure immergée,Rabo,,,FALSE,TRUE,TRUE,TRUE,, +7-1-3,1-1,,,Other components,Autres éléments,Otros componentes,,,FALSE,TRUE,FALSE,TRUE,, \ No newline at end of file ===================================== persistence/src/test/java/fr/ird/observe/persistence/migration/GenerateReferentialObjectMaterial.java ===================================== --- /dev/null +++ b/persistence/src/test/java/fr/ird/observe/persistence/migration/GenerateReferentialObjectMaterial.java @@ -0,0 +1,184 @@ +package fr.ird.observe.persistence.migration; + +/*- + * #%L + * ObServe :: Persistence + * %% + * Copyright (C) 2008 - 2017 IRD, Code Lutin, Ultreia.io + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ + +import com.google.common.collect.ImmutableMap; +import fr.ird.observe.common.constants.ReferenceStatus; +import fr.ird.observe.entities.referentiel.seine.ObjectMaterial; +import fr.ird.observe.entities.referentiel.seine.ObjectMaterialImpl; +import java.io.BufferedReader; +import java.io.BufferedWriter; +import java.io.File; +import java.io.IOException; +import java.nio.file.Files; +import java.nio.file.Path; +import java.util.Collection; +import org.apache.commons.lang3.mutable.MutableInt; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.junit.Test; +import org.nuiton.csv.Common; +import org.nuiton.csv.Import; +import org.nuiton.csv.ext.AbstractImportModel; + +/** + * Created by tchemit on 31/07/17. + * + * @author Tony Chemit - dev(a)tchemit.fr + */ +public class GenerateReferentialObjectMaterial { + + // Lines to fxi and readd to file + + + /** Logger. */ + private static final Log log = LogFactory.getLog(GenerateReferentialObjectMaterial.class); + + private static final String INSERT = "INSERT INTO observe_seine.objectMaterial (topiaid, topiaversion, topiacreatedate, lastupdatedate, needComment, status, legacyCode, standardCode, code, parent, label1, label2, label3, selectable, childrenMultiSelectable, childSelectionMandatory, objectMaterialType, validation, biodegradable, nonEntangling) values (%-65s, 0, CURRENT_DATE, CURRENT_TIMESTAMP, false, %s, %-15s, %-10s, %-15s, %-65s, %-50s, %-50s, %-50s, %-5s, %-5s, %-5s, %-66s, %-30s, %-5s, %-5s);"; + + @Test + public void generate() throws IOException { + + + Path dir = new File("").getAbsoluteFile().toPath() + .resolve("src") + .resolve("main") + .resolve("resources") + .resolve("db") + .resolve("migration") + .resolve("6.901"); + + Path sourcePath = dir.resolve("referential-ObjectMaterial.csv"); + Path targetPath = dir.resolve("09_fill_object_material-common.sql"); + + Collection<ObjectMaterial> data = loadData(sourcePath); + + try (BufferedWriter writer = Files.newBufferedWriter(targetPath)) { + + for (ObjectMaterial datum : data) { + + String row = String.format(INSERT + , getValue(datum.getTopiaId()) + , datum.getStatus().ordinal() + , getValue(datum.getLegacyCode()) + , getValue(datum.getStandardCode()) + , getValue(datum.getCode()) + , getValue(datum.getParent() == null ? "" : datum.getParent().getTopiaId()) + , getValue(datum.getLabel1()) + , getValue(datum.getLabel2()) + , getValue(datum.getLabel3()) + , datum.isSelectable() + , datum.isChildrenMultiSelectable() + , datum.isChildSelectionMandatory() + , getValue(datum.getLabel5()==null?"":datum.getLabel5()) + , getValue(datum.getValidation()) + , datum.isBiodegradable() + , datum.isNonEntangling() + ); + writer.append(row); + writer.newLine(); + + } + } + + } + + private String getValue(String value) { + return value.isEmpty() ? "NULL" : ("'" + value + "'"); + } + + private Collection<ObjectMaterial> loadData(Path sourcePath) throws IOException { + + ImmutableMap.Builder<String, ObjectMaterial> result = ImmutableMap.builder(); + MutableInt idIndex = new MutableInt(0); + try (BufferedReader reader = Files.newBufferedReader(sourcePath)) { + Import.newImport(new ImportModel(), reader).forEach(objectMaterial -> { + + objectMaterial.setTopiaId("fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0." + idIndex.incrementAndGet()); + + log.info(String.format("Loading %s (%s)", objectMaterial.getCode(), objectMaterial.getTopiaId())); + String dataType = objectMaterial.getLabel5(); + objectMaterial.setLabel5(null); + if (dataType != null) { + switch (dataType.trim().toLowerCase()) { + case "boolean": + objectMaterial.setLabel5("fr.ird.observe.entities.referentiel.seine.ObjectMaterialType#0#0"); + break; + case "integer": + objectMaterial.setLabel5("fr.ird.observe.entities.referentiel.seine.ObjectMaterialType#0#2"); + break; + case "string": + objectMaterial.setLabel5("fr.ird.observe.entities.referentiel.seine.ObjectMaterialType#0#3"); + break; + case "float1": + objectMaterial.setLabel5("fr.ird.observe.entities.referentiel.seine.ObjectMaterialType#0#1"); + break; + + } + } + String status = objectMaterial.getLabel6(); + objectMaterial.setLabel6(null); + Boolean statusB = status == null ? null : Boolean.valueOf(status); + objectMaterial.setStatus(statusB != null && statusB ? ReferenceStatus.enabled : ReferenceStatus.disabled); + result.put(objectMaterial.getCode(), objectMaterial); + }); + } + ImmutableMap<String, ObjectMaterial> map = result.build(); + for (ObjectMaterial objectMaterial : map.values()) { + String parentCode = objectMaterial.getLabel4(); + objectMaterial.setLabel4(null); + if (parentCode != null) { + ObjectMaterial parent = map.get(parentCode); + objectMaterial.setParent(parent); + } + } + return map.values(); + } + + private static class ImportModel extends AbstractImportModel<ObjectMaterial> { + + ImportModel() { + super(','); + newMandatoryColumn(ObjectMaterial.PROPERTY_CODE); + newMandatoryColumn(ObjectMaterial.PROPERTY_LEGACY_CODE); + newMandatoryColumn(ObjectMaterial.PROPERTY_STANDARD_CODE); + newMandatoryColumn(ObjectMaterial.PROPERTY_BIODEGRADABLE, Common.PRIMITIVE_BOOLEAN); + newMandatoryColumn(ObjectMaterial.PROPERTY_NON_ENTANGLING, Common.PRIMITIVE_BOOLEAN); + newMandatoryColumn(ObjectMaterial.PROPERTY_SELECTABLE, Common.PRIMITIVE_BOOLEAN); + newMandatoryColumn(ObjectMaterial.PROPERTY_CHILD_SELECTION_MANDATORY, Common.PRIMITIVE_BOOLEAN); + newMandatoryColumn(ObjectMaterial.PROPERTY_CHILDREN_MULTI_SELECTABLE, Common.PRIMITIVE_BOOLEAN); + newMandatoryColumn(ObjectMaterial.PROPERTY_LABEL1); + newMandatoryColumn(ObjectMaterial.PROPERTY_LABEL2); + newMandatoryColumn(ObjectMaterial.PROPERTY_LABEL3); + newMandatoryColumn(ObjectMaterial.PROPERTY_VALIDATION); + newMandatoryColumn("parent", ObjectMaterial.PROPERTY_LABEL4); + newMandatoryColumn("dataType", ObjectMaterial.PROPERTY_LABEL5); + newMandatoryColumn("status", ObjectMaterial.PROPERTY_LABEL6); + } + + @Override + public ObjectMaterial newEmptyInstance() { + return new ObjectMaterialImpl(); + } + } +} ===================================== services-topia/src/main/java/fr/ird/observe/services/binder/referential/seine/ObjectMaterialBinder.java ===================================== --- a/services-topia/src/main/java/fr/ird/observe/services/binder/referential/seine/ObjectMaterialBinder.java +++ b/services-topia/src/main/java/fr/ird/observe/services/binder/referential/seine/ObjectMaterialBinder.java @@ -22,6 +22,7 @@ package fr.ird.observe.services.binder.referential.seine; * #L% */ +import fr.ird.observe.entities.referentiel.I18nReferentialEntity; import fr.ird.observe.entities.referentiel.seine.ObjectMaterial; import fr.ird.observe.entities.referentiel.seine.ObjectMaterialType; import fr.ird.observe.services.binder.referential.ReferentialBinderSupport; @@ -80,7 +81,7 @@ public class ObjectMaterialBinder extends ReferentialBinderSupport<ObjectMateria return toReferentialReference(entity, entity.getCode(), getLabel(referentialLocale, entity), Optional.ofNullable(entity.getParent()).map(ObjectMaterial::getTopiaId).orElse(null), - entity.getObjectMaterialType().getTopiaId(), + Optional.ofNullable(entity.getObjectMaterialType()).map(I18nReferentialEntity::getTopiaId).orElse(null), entity.getValidation()); } ===================================== services-topia/src/test/java/fr/ird/observe/services/topia/service/actions/validate/ValidateServiceTopiaTest.java ===================================== --- a/services-topia/src/test/java/fr/ird/observe/services/topia/service/actions/validate/ValidateServiceTopiaTest.java +++ b/services-topia/src/test/java/fr/ird/observe/services/topia/service/actions/validate/ValidateServiceTopiaTest.java @@ -199,7 +199,7 @@ public class ValidateServiceTopiaTest extends AbstractServiceTopiaTest { assertValidateResultForReferentialDtoType(resultByType, ObjectOperationDto.class, 10); assertValidateResultForReferentialDtoType(resultByType, ObjectTypeDto.class, 23); assertValidateResultForReferentialDtoType(resultByType, ObjectMaterialTypeDto.class, 4); - assertValidateResultForReferentialDtoType(resultByType, ObjectMaterialDto.class, 43); + assertValidateResultForReferentialDtoType(resultByType, ObjectMaterialDto.class, 86); assertValidateResultForReferentialDtoType(resultByType, ObservedSystemDto.class, 21); assertValidateResultForReferentialDtoType(resultByType, ReasonForDiscardDto.class, 5); assertValidateResultForReferentialDtoType(resultByType, ReasonForNoFishingDto.class, 13); ===================================== services-topia/src/test/java/fr/ird/observe/services/topia/service/data/seine/FloatingObjectServiceTopiaTest.java ===================================== --- a/services-topia/src/test/java/fr/ird/observe/services/topia/service/data/seine/FloatingObjectServiceTopiaTest.java +++ b/services-topia/src/test/java/fr/ird/observe/services/topia/service/data/seine/FloatingObjectServiceTopiaTest.java @@ -52,7 +52,7 @@ public class FloatingObjectServiceTopiaTest extends AbstractServiceTopiaTest { List<ObjectMaterialHierarchyDto> form = service.getObjectMaterialHierarchy(); Assert.assertNotNull(form); - Assert.assertEquals(3, form.size()); + Assert.assertEquals(4, form.size()); } ===================================== test/src/main/java/fr/ird/observe/test/ObserveFixtures.java ===================================== --- a/test/src/main/java/fr/ird/observe/test/ObserveFixtures.java +++ b/test/src/main/java/fr/ird/observe/test/ObserveFixtures.java @@ -101,7 +101,7 @@ public class ObserveFixtures { .<String, Long>builder() .put("observe_seine.detectionmode", 11L) .put("observe_seine.objectoperation", 10L) - .put("observe_seine.objectmaterial", 43L) + .put("observe_seine.objectmaterial", 86L) .put("observe_seine.objectmaterialtype", 4L) .put("observe_seine.objecttype", 27L) .put("observe_seine.observedsystem", 21L) ===================================== test/src/main/resources/db/6.901/dataForTestLongline.sql.gz ===================================== Binary files a/test/src/main/resources/db/6.901/dataForTestLongline.sql.gz and b/test/src/main/resources/db/6.901/dataForTestLongline.sql.gz differ ===================================== test/src/main/resources/db/6.901/dataForTestSeine.sql.gz ===================================== Binary files a/test/src/main/resources/db/6.901/dataForTestSeine.sql.gz and b/test/src/main/resources/db/6.901/dataForTestSeine.sql.gz differ ===================================== test/src/main/resources/db/6.901/empty_h2.sql.gz ===================================== Binary files a/test/src/main/resources/db/6.901/empty_h2.sql.gz and b/test/src/main/resources/db/6.901/empty_h2.sql.gz differ ===================================== test/src/main/resources/db/6.901/empty_pg.sql.gz ===================================== Binary files a/test/src/main/resources/db/6.901/empty_pg.sql.gz and b/test/src/main/resources/db/6.901/empty_pg.sql.gz differ ===================================== test/src/main/resources/db/6.901/referentiel.sql.gz ===================================== Binary files a/test/src/main/resources/db/6.901/referentiel.sql.gz and b/test/src/main/resources/db/6.901/referentiel.sql.gz differ View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/373c225e2fc2c2e52d1159558a… --- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/373c225e2fc2c2e52d1159558a… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] 2 commits: Ajout du fichier de construction du référentiel ObjectMaterial
by Tony CHEMIT 31 Jul '17

31 Jul '17

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: bded8c15 by Tony CHEMIT at 2017-07-31T11:52:51+02:00 Ajout du fichier de construction du référentiel ObjectMaterial - - - - - 373c225e by Tony CHEMIT at 2017-07-31T11:53:00+02:00 Suppression images inutiles - - - - - 6 changed files: - − doc/images/error.png - − doc/images/info.png - − doc/images/ok.png - − doc/images/question.png - − doc/images/warning.png - + persistence/src/main/resources/db/migration/6.901/referential-ObjectMaterial.csv Changes: ===================================== doc/images/error.png deleted ===================================== Binary files a/doc/images/error.png and /dev/null differ ===================================== doc/images/info.png deleted ===================================== Binary files a/doc/images/info.png and /dev/null differ ===================================== doc/images/ok.png deleted ===================================== Binary files a/doc/images/ok.png and /dev/null differ ===================================== doc/images/question.png deleted ===================================== Binary files a/doc/images/question.png and /dev/null differ ===================================== doc/images/warning.png deleted ===================================== Binary files a/doc/images/warning.png and /dev/null differ ===================================== persistence/src/main/resources/db/migration/6.901/referential-ObjectMaterial.csv ===================================== --- /dev/null +++ b/persistence/src/main/resources/db/migration/6.901/referential-ObjectMaterial.csv @@ -0,0 +1,87 @@ +Code,parent,legacyCode,standardCode,label1,label2,label3,dataType,validation,selectable,childrenMultiSelectable,childSelectionMandatory,status,biodegradable,nonTangling +1,,,FAD,FAD,FAD,FAD,,,FALSE,FALSE,FALSE,TRUE,, +1-1,1,16,DFAD,DFAD (drifting FAD),DFAD (FAD dérivant),DFAD (FAD a la deriva),Boolean,,TRUE,TRUE,FALSE,TRUE,, +1-1-1,1-1,19,,Experimental FAD,Objet expérimental,Objeto experimental,Boolean,,TRUE,,,FALSE,, +1-1-2,1-1,18,,Artificial FAD,Objet artificiel,Objeto artificial,Boolean,,TRUE,,,FALSE,, +1-1-3,1-1,27,,Several FAD entangled,Plusieurs FAD,Objectos enredados,Boolean,,TRUE,,,TRUE,, +1-1-1,1-1,,,Raft,Radeau,Parrilla,Boolean,,TRUE,TRUE,TRUE,TRUE,, +1-1-1-1,1-1-1,,,Frame,Chassis,Estructura,,,FALSE,FALSE,TRUE,TRUE,, +1-1-1-1-1,1-1-1-1,"6, 15, 25",,"Vegetal, canes,bamboo","Végétal, tiges,bambou","Bambú, cañas",Boolean,,TRUE,,,TRUE,, +1-1-1-1-2,1-1-1-1,"20, 21*,26",,Metallic or PVC,Métal ou PVC,Metállica ó PVC,Boolean,,TRUE,,,TRUE,, +1-1-1-1-3,1-1-1-1,,,Mixed vegetal and metallic or PVC,,Mixta (metálica o PVC y cañas),,,,,,,, +1-1-1-2,1-1-1,,,Superior coverage,Revêtement supérieur,Recubrimiento superior,,,FALSE,TRUE,TRUE,TRUE,, +1-1-1-2-1,1-1-1-2,,,Net,Filet,Red,,,FALSE,TRUE,FALSE,TRUE,, +1-1-1-2-1-1,1-1-1-2-1,,,Net with mesh <=7cm,Filet avec maillage ≤7cm,Red con malla <=7cm,Boolean,,TRUE,,FALSE,TRUE,, +1-1-1-2-1-2,1-1-1-2-1,,,Net with mesh >7cm,Filet avec maillage >7cm,Red con malla >7cm,Boolean,,TRUE,,FALSE,TRUE,, +1-1-1-2-2,1-1-1-2,,,Coverage without mesh,Revêtement sans maillage,Recubrimiento sin malla,Boolean,,TRUE,,FALSE,TRUE,, +1-1-1-2-3,1-1-1-2,,,Not covered,Non couvert,Sin recubrimiento,Boolean,,TRUE,,FALSE,TRUE,, +1-1-1-2-4,1-1-1-2,,,Not visible,Non visible,No se ve,Boolean,,TRUE,,,TRUE,, +1-1-1-3,1-1-1,,,Inferior coverage,Revêtement inférieur,Recubrimiento inferior,,,FALSE,TRUE,TRUE,TRUE,, +1-1-1-3-1,1-1-1-3,,,Net,Filet,Red,,,FALSE,TRUE,FALSE,TRUE,, +1-1-1-3-1-1,1-1-1-3-1,,,Net with mesh <=7cm,Filet avec maillage ≤7cm,Red con malla <=7cm,Boolean,,TRUE,,FALSE,TRUE,, +1-1-1-3-1-2,1-1-1-3-1,,,Net with mesh >7cm,Filet avec maillage >7cm,Red con malla >7cm,Boolean,,TRUE,,FALSE,TRUE,, +1-1-1-3-2,1-1-1-3,,,Coverage without mesh,Revêtement sans maillage,Recubrimiento sin malla,Boolean,,TRUE,,FALSE,TRUE,, +1-1-1-3-3,1-1-1-3,,,Not covered,Non couvert,Sin recubrimiento,Boolean,,TRUE,,FALSE,TRUE,, +1-1-1-3-4,1-1-1-3,,,Not visible,Non visible,No se ve,Boolean,,TRUE,,,TRUE,, +1-1-1-4,1-1-1,,,Modified,Modifié,Se modifica,Boolean,,TRUE,,,TRUE,, +1-1-1-5,1-1-1,,,Replaced,Remplacé,Se reemplaza,Boolean,,TRUE,,,TRUE,, +1-1-2,1-1-1-1,,,Subsurface structure,Structure immergée,Rabo,,,FALSE,TRUE,TRUE,TRUE,, +1-1-2-1,1-1-2,,,Net in sausage,Filet saucisse,Red en chorizo,,,FALSE,TRUE,FALSE,TRUE,, +1-1-2-1-1,1-1-2-1,,,Net in sausage with mesh <=7cm,Filet saucisse avec maillage <=7cm,Red en chorizo con malla <=7cm,Boolean,,TRUE,,,FALSE,, +1-1-2-1-2,1-1-2-1,,,Net in sausage with mesh >7cm,Filet saucisse avec maillage >7cm,Red en chorizo con malla >7cm,Boolean,,TRUE,,,FALSE,, +1-1-2-2,1-1-2,,,Open net,Filet ouvert,Red abierta,,,FALSE,TRUE,FALSE,TRUE,, +1-1-2-2-1,1-1-2-2,,,Open net with mesh <=7cm,Filet ouvert avec maillage <=7cm,Red abierta con malla <=7cm,Boolean,,TRUE,,,TRUE,, +1-1-2-2-2,1-1-2-2,,,Open net with mesh >7cm,Filet ouvert avec maillage >7cm,Red abierta con malla >7cm,Boolean,,TRUE,,,TRUE,, +1-1-2-3,1-1-2,,,Single net pieces,Pièces de filets accolées,Paños de red sueltos,,,FALSE,TRUE,FALSE,TRUE,, +1-1-2-3-1,1-1-2-3,,,Single net pieces with mesh <=7cm,Pièces de filets accolées avec maillage <=7cm,Paños de red sueltos con malla <=7cm,Boolean,,TRUE,,,TRUE,, +1-1-2-3-2,1-1-2-3,,,Single net pieces with mesh >7cm,Pièces de filets accolées avec maillage >7cm,Paños de red sueltos con malla >7cm,Boolean,,TRUE,,,TRUE,, +1-1-2-4,1-1-2,,,Rope/no mesh,Bout/sans maillage,Cabo/sin red,Boolean,,TRUE,,,TRUE,, +1-1-2-5,1-1-2,,,Not visible,Pas visible,No se ve,Boolean,,TRUE,,,TRUE,, +1-1-2-6,1-1-2,,,No subsurface structure,Pas de mouillage,Sin rabo,Boolean,,TRUE,,,TRUE,, +1-1-2-7,1-1-2,,,Modified,Modifié,Se modifica,Boolean,,TRUE,,,TRUE,, +1-1-2-8,1-1-2,,,Replaced,Remplacé,Se reemplaza,Boolean,,TRUE,,,TRUE,, +1-1-3,1-1,,,Other components,Autres éléments,Otros componentes,,,FALSE,TRUE,FALSE,TRUE,, +1-1-3-1,1-1-3,,,Containers,Bidons plastique,Garrafas plástico,Boolean,,TRUE,,,TRUE,, +1-1-3-2,1-1-3,,,Corks,Flotteurs,Corchos,Boolean,,TRUE,,,TRUE,, +1-1-3-3,1-1-3,,,Bags,Sacs,Sacos,Boolean,,TRUE,,,TRUE,, +1-1-3-4,1-1-3,,,"Palms, canes","Palmes, tiges","Palmeras, cañas",Boolean,,TRUE,,,TRUE,, +1-1-3-5,1-1-3,,,Color belts,Rubans colorés,Cintas de colores,Boolean,,TRUE,,,TRUE,, +1-1-3-6,1-1-3,,,Weights,Poids,Peso,Boolean,,TRUE,,,TRUE,, +1-1-3-7,1-1-3,,,Entangled animal,Animal maillé,Animal enmallado,Boolean,,TRUE,,,TRUE,, +1-2,1,7,AFAD,AFAD (anchored FAD),AFAD (FAD ancré),AFAD (FAD arraigado),Boolean,,TRUE,TRUE,FALSE,TRUE,, +1-2-1,1-2,,,Radar reflectors,Réflecteurs radar,Reflectores de radar,Boolean,,TRUE,,FALSE,TRUE,, +1-2-2,1-2,,,Lighting,Eclairage,iluminación,Boolean,,TRUE,,FALSE,TRUE,, +1-2-3,1-2,,,Visual range (in nautical miles),Rayon de visibilité (en miles nautiques),Rango de visibilidad,Float,X ≥ 0.1 && x ≤ 50,TRUE,,FALSE,TRUE,, +2,,,LOG,LOG,LOG,LOG,,,TRUE,TRUE,FALSE,TRUE,, +2-1,2,,NLOG,NLOG (natural LOG),NLOG (LOG naturel),NLOG (LOG natural),Boolean,,TRUE,TRUE,FALSE,TRUE,, +2-1-1,2-1,,VNLOG,VNLOG (vegetal NLOG),VNLOG (NLOG vegetal),VNLOG (NLOG vegetal),Boolean,,TRUE,TRUE,FALSE,TRUE,, +2-1-1-1,2-1-1,1,,Straw heap,Tas de paille,Monton the hierba,Boolean,,TRUE,,,TRUE,, +2-1-1-2,2-1-1,2,,"Palm tree, palm","Palmier, palme","Palma, hoja de palmera",Boolean,,TRUE,,,TRUE,, +2-1-1-3,2-1-1,3,,"Tree, branche","Arbre, branche","Árbol, rama",Boolean,,TRUE,,,TRUE,, +2-1-2,2-1,,ANLOG,ANLOG (animal NLOG),ANLOG (NLOG animal),ANLOG (NLOG animal),Boolean,,TRUE,TRUE,FALSE,TRUE,, +2-1-2-1,2-1-2,"4, 5*, 24",,Carrion,Charogne,Carroña,Boolean,,TRUE,,,TRUE,, +2-1-2-2,2-1-2,,,Whale shark,Requin-baleine,Tiburón ballena,Boolean,,TRUE,,,TRUE,, +2-2,2,,ALOG,ALOG (artificial LOG),ALOG (LOG artificiel),ALOG (LOG artificial),Boolean,,TRUE,TRUE,FALSE,TRUE,, +2-2-1,2-2,10,,"Case, big board","Caisse, grosse planche","Caja, gran tablero",Boolean,,TRUE,,,TRUE,, +2-2-2,2-2,13,,Plastic object,Objet plastique,Objeto de plastico,Boolean,,TRUE,,,TRUE,, +2-2-3,2-2,17,,Metallic object,Objet métallique,Objeto de metal,Boolean,,TRUE,,,TRUE,, +2-2-4,2-2,,FALOG,FALOG (fishing ALOG),FALOG (ALOG pêche),FALOG (ALOG pesca),Boolean,,TRUE,TRUE,,TRUE,, +2-2-4-1,2-2-4,11,,"Rope, cable","Cordage, câble","Cuerda, cable",Boolean,,TRUE,,,TRUE,, +2-2-4-2,2-2-4,12,,"Net, piece of net","Filet, morceau de filet","Red, pedazo de red",Boolean,,TRUE,,,TRUE,, +2-2-4-3,2-2-4,,,Inert plastic buoy,Bouée plastique inerte,Boya de plástico inerte,Boolean,,TRUE,,,TRUE,, +2-2-5,2-2,,HALOG,HALOG (not fishing ALOG),HALOG (ALOG non pêche),HALOG (HALOG no pesca),Boolean,,TRUE,TRUE,FALSE,TRUE,, +4,,,,Other properties,Autres propriétés,Otras propiedades,,,FALSE,TRUE,FALSE,TRUE,, +4-1,4,,,Biodegradable,Matériaux,Materiales,Boolean,,TRUE,,,TRUE,, +4-2,4,22,,Non entangling,Non maillant,,Boolean,,TRUE,,,TRUE,, +4-3,4,23,,Entangling,Maillant,Enmallante,Boolean,,TRUE,,,TRUE,, +4-4,4,,,Depth (in m),Profondeur (en m),Profundidad (en m),Integer,x >=0 && x ≤ 100,TRUE,,,TRUE,, +4-5,4,,,Area (in m2),Surface (en m2),Superficie (en m2),Float,X ≥ 0.5 && x ≤ 50,TRUE,,,TRUE,, +4-6,4,,,Size of largest mesh,Taille de la maille la plus grande (en mm),Talla de la malla más grandes (en mm),Integer,X ≥ 5 && x ≤ 200,TRUE,,,TRUE,, +4-7,4,,,FOB identifier,Identifiant du FOB,Identificador del FOB,String,len(x) ≥ 3 && len(x) ≤ 64,TRUE,,,TRUE,, +4-8,4,,,Number of FOB of this,Nombre de FOB de ce type emmêlés,,Integer,X ≥ 2 && x ≤ 100,TRUE,,,TRUE,, +6,,,,Legacy codes,Anciens codes,Códigos antiguos,,,FALSE,TRUE,FALSE,FALSE,, +6-1,6,99,,"Other, unknown","Autre, inconnu","Otro, desconocido",Boolean,,TRUE,,,,, +6-2,6,14,ALOG,"One of the previous (10, 11, 12, 13) tagged","Un des antérieurs (10, 11, 12, 13) balisé","Una de los anterior (10, 11, 12, 13) con Baliza",Boolean,,TRUE,,,,, +6-3,6,8,,Tuna seiner (or skiff),Thonier (ou skiff),Atunero (oó panga),Boolean,,TRUE,,,,, +6-4,6,9,,Supply,Bateau d’appui,Macicero,Boolean,,TRUE,,,,, +6-5,6,"5*, 6*, 21*",,Tagged,Balisé,Marcado,Boolean,,TRUE,,,FALSE,, View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/b01ded0cb48f1b1a669dbef4bd… --- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/b01ded0cb48f1b1a669dbef4bd… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] Speed up connection opening (See #805)
by Tony CHEMIT 31 Jul '17

31 Jul '17

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: b01ded0c by Tony CHEMIT at 2017-07-31T11:22:30+02:00 Speed up connection opening (See #805) - - - - - 4 changed files: - application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/storage/UseRemoteConfigurationUIAction.java - application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/storage/UseServerConfigurationUIAction.java - application-swing/src/main/java/fr/ird/observe/application/swing/ui/storage/tabs/ChooseDbModeUI.jcss - application-swing/src/main/java/fr/ird/observe/application/swing/ui/storage/tabs/ChooseDbModeUIHandler.java Changes: ===================================== application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/storage/UseRemoteConfigurationUIAction.java ===================================== --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/storage/UseRemoteConfigurationUIAction.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/storage/UseRemoteConfigurationUIAction.java @@ -78,7 +78,8 @@ public class UseRemoteConfigurationUIAction extends AbstractUIAction { SwingUtilities.invokeLater(() -> { configUI.getTestRemoteAction().doClick(); if (ConnexionStatus.SUCCESS == configUI.getModel().getConnexionStatus()) { - parentContainer.getNextAction().requestFocusInWindow(); + parentContainer.getNextAction().doClick(); + parentContainer.getApplyAction().doClick(); } }); } ===================================== application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/storage/UseServerConfigurationUIAction.java ===================================== --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/storage/UseServerConfigurationUIAction.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/storage/UseServerConfigurationUIAction.java @@ -79,7 +79,8 @@ public class UseServerConfigurationUIAction extends AbstractUIAction { SwingUtilities.invokeLater(() -> { configUI.getTestRemoteAction().doClick(); if (ConnexionStatus.SUCCESS == configUI.getModel().getConnexionStatus()) { - parentContainer.getNextAction().requestFocusInWindow(); + parentContainer.getNextAction().doClick(); + parentContainer.getApplyAction().doClick(); } }); ===================================== application-swing/src/main/java/fr/ird/observe/application/swing/ui/storage/tabs/ChooseDbModeUI.jcss ===================================== --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/storage/tabs/ChooseDbModeUI.jcss +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/storage/tabs/ChooseDbModeUI.jcss @@ -37,6 +37,7 @@ text:{I18nEnumHelper.getLabel(DbMode.USE_LOCAL)}; enabled:{model.isCanUseLocalService()}; selected:{model.getDbMode() == DbMode.USE_LOCAL}; + _changeStep:true; } #createLocalMode { @@ -51,6 +52,7 @@ text:{I18nEnumHelper.getLabel(DbMode.USE_REMOTE)}; enabled:{model.isCanUseRemoteService()}; selected:{model.getDbMode() == DbMode.USE_REMOTE}; + _changeStep:true; } #useServerMode { @@ -58,6 +60,7 @@ text:{I18nEnumHelper.getLabel(DbMode.USE_SERVER)}; enabled:{model.isCanUseServerService()}; selected:{model.getDbMode() == DbMode.USE_SERVER}; + _changeStep:true; } #dbModeContent { @@ -87,12 +90,14 @@ text:{getHandler().updateInternalDumpModeLabel(config.isInitialDumpExist())}; visible:{getHandler().updateCreationModeLayout(config.isInitialDumpExist(), importInternalDumpMode)}; selected:{model.getCreationMode() == CreationMode.IMPORT_INTERNAL_DUMP}; + _changeStep:true; } #importExternalDumpMode { value:{CreationMode.IMPORT_EXTERNAL_DUMP}; text:{I18nEnumHelper.getLabel(CreationMode.IMPORT_EXTERNAL_DUMP)}; selected:{model.getCreationMode() == CreationMode.IMPORT_EXTERNAL_DUMP}; + _changeStep:true; } /** non utilisé dans cette version d'ObServe */ @@ -102,18 +107,21 @@ value:{CreationMode.IMPORT_LOCAL_STORAGE}; text:{I18nEnumHelper.getLabel(CreationMode.IMPORT_LOCAL_STORAGE)}; selected:{model.getCreationMode() == CreationMode.IMPORT_LOCAL_STORAGE}; + _changeStep:true; } #importRemoteStorageMode { value:{CreationMode.IMPORT_REMOTE_STORAGE}; text:{I18nEnumHelper.getLabel(CreationMode.IMPORT_REMOTE_STORAGE)}; selected:{model.getCreationMode() == CreationMode.IMPORT_REMOTE_STORAGE}; + _changeStep:true; } #importServerStorageMode { value:{CreationMode.IMPORT_SERVER_STORAGE}; text:{I18nEnumHelper.getLabel(CreationMode.IMPORT_SERVER_STORAGE)}; selected:{model.getCreationMode() == CreationMode.IMPORT_SERVER_STORAGE}; + _changeStep:true; } #migrationContent { ===================================== application-swing/src/main/java/fr/ird/observe/application/swing/ui/storage/tabs/ChooseDbModeUIHandler.java ===================================== --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/storage/tabs/ChooseDbModeUIHandler.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/storage/tabs/ChooseDbModeUIHandler.java @@ -26,15 +26,26 @@ import fr.ird.observe.application.swing.I18nEnumHelper; import fr.ird.observe.application.swing.ObserveSwingApplicationContext; import fr.ird.observe.application.swing.ObserveTextGenerator; import fr.ird.observe.application.swing.configuration.constants.CreationMode; +import fr.ird.observe.application.swing.ui.ObserveKeyStrokes; import fr.ird.observe.application.swing.ui.storage.StorageStep; +import fr.ird.observe.application.swing.ui.storage.StorageUI; import fr.ird.observe.application.swing.ui.storage.StorageUIModel; import java.awt.Component; +import java.awt.event.ActionEvent; import java.beans.PropertyChangeListener; import java.io.File; import java.util.Date; +import java.util.Enumeration; +import javax.swing.AbstractAction; +import javax.swing.AbstractButton; +import javax.swing.ActionMap; +import javax.swing.InputMap; +import javax.swing.JComponent; import javax.swing.JPanel; import javax.swing.JRadioButton; +import javax.swing.KeyStroke; import org.nuiton.jaxx.runtime.spi.UIHandler; +import org.nuiton.jaxx.runtime.swing.JAXXButtonGroup; import static org.nuiton.i18n.I18n.t; @@ -61,6 +72,35 @@ public class ChooseDbModeUIHandler extends StorageTabUIHandler<ChooseDbModeUI> i model.addPropertyChangeListener(StorageUIModel.DB_MODE_PROPERTY_NAME, listener); model.addPropertyChangeListener(StorageUIModel.CREATION_MODE_PROPERTY_NAME, listener); ui.setDescriptionText(t(StorageStep.CHOOSE_DB_MODE.getDescription())); + + addGroupMnemonic(ui.getDbMode(), "pressed F"); + addGroupMnemonic(ui.getCreationMode(), "ctrl F"); + + } + + private void addGroupMnemonic(JAXXButtonGroup buttonGroup, String keystrokePrefix) { + Enumeration<AbstractButton> elements = buttonGroup.getElements(); + int index = 1; + InputMap inputMap = ui.getInputMap(JComponent.WHEN_ANCESTOR_OF_FOCUSED_COMPONENT); + ActionMap actionMap = ui.getActionMap(); + while (elements.hasMoreElements()) { + AbstractButton abstractButton = elements.nextElement(); + KeyStroke k = KeyStroke.getKeyStroke(keystrokePrefix + (index++)); + String actionName = abstractButton.getName(); + inputMap.put(k, actionName); + actionMap.put(actionName, new AbstractAction() { + @Override + public void actionPerformed(ActionEvent e) { + abstractButton.doClick(); + Boolean changeStep = (Boolean) abstractButton.getClientProperty("changeStep"); + if (changeStep != null && changeStep) { + StorageUI parentContainer = ui.getParentContainer(StorageUI.class); + parentContainer.getNextAction().doClick(); + } + } + }); + ObserveKeyStrokes.addKeyStroke(abstractButton, k); + } } protected String updateInternalDumpModeLabel(@SuppressWarnings("unused") boolean dumpExist) { View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/b01ded0cb48f1b1a669dbef4bd1… --- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/b01ded0cb48f1b1a669dbef4bd1… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] Revue de différents points du contrat AZTI
by Tony CHEMIT 30 Jul '17

30 Jul '17

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 267af9ac by Tony CHEMIT at 2017-07-31T01:33:27+02:00 Revue de différents points du contrat AZTI - - - - - 30 changed files: - application-swing-validation/pom.xml - − application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/SpeciesGroupReleaseStatusDto-ui-create-error-validation.xml - − application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/SpeciesGroupReleaseStatusDto-ui-create-warning-validation.xml - − application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/SpeciesGroupReleaseStatusDto-ui-update-error-validation.xml - − application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/SpeciesGroupReleaseStatusDto-ui-update-warning-validation.xml - application-swing-validation/src/main/resources/fr/ird/observe/services/dto/seine/NonTargetCatchReleaseDto-ui-update-error-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/java/fr/ird/observe/application/swing/ui/ObserveMainUI.jaxx - application-swing/src/main/java/fr/ird/observe/application/swing/ui/ObserveMainUIHandler.java - application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/content/CloseOpenUIAction.java - application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/content/CopyFloatingObjectPartToLeftAction.java - application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/content/CopyFloatingObjectPartToRightAction.java - application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/content/ReOpenUIAction.java - application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ContentUIManager.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/ref/impl/common/SpeciesGroupReleaseStatusUI.jaxx - − application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/common/SpeciesGroupReleaseStatusUIHandler.java - − application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/common/SpeciesGroupReleaseStatusUIModel.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/seine/ObjectMaterialUI.jaxx The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/267af9ac9f959351a438a5f0824… --- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/267af9ac9f959351a438a5f0824… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] optimize dependencies
by Tony CHEMIT 28 Jul '17

28 Jul '17

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: ebe8a901 by Tony CHEMIT at 2017-07-28T21:05:17+02:00 optimize dependencies - - - - - 1 changed file: - toolbox-maven-plugin/pom.xml Changes: ===================================== toolbox-maven-plugin/pom.xml ===================================== --- a/toolbox-maven-plugin/pom.xml +++ b/toolbox-maven-plugin/pom.xml @@ -47,22 +47,9 @@ <artifactId>nuiton-validator</artifactId> </dependency> <dependency> - <groupId>org.apache.commons</groupId> - <artifactId>commons-lang3</artifactId> - </dependency> - <dependency> <groupId>com.google.code.gson</groupId> <artifactId>gson</artifactId> </dependency> - <dependency> - <groupId>org.reflections</groupId> - <artifactId>reflections</artifactId> - </dependency> - - <dependency> - <groupId>org.atteo</groupId> - <artifactId>evo-inflector</artifactId> - </dependency>  View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/ebe8a901a567abd00e59e486c69… --- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/ebe8a901a567abd00e59e486c69… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] 2 commits: Re-add supportVesselName on FloatingObject (See #803) (update test databases)
by Tony CHEMIT 28 Jul '17

28 Jul '17

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: b88780bc by Tony CHEMIT at 2017-07-28T20:10:25+02:00 Re-add supportVesselName on FloatingObject (See #803) (update test databases) - - - - - 1a9e2945 by Tony CHEMIT at 2017-07-28T21:01:14+02:00 Maintenant on check les validator i18n field dans services-runner mais d'ici on n'exporte pas i18n même si on pourrait le croire^^ - - - - - 24 changed files: - application-swing-validation/pom.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 - services-runner/pom.xml - + services-runner/src/main/resources/i18n/services-runner_en_GB.properties - + services-runner/src/main/resources/i18n/services-runner_es_ES.properties - + services-runner/src/main/resources/i18n/services-runner_fr_FR.properties - services-validation/pom.xml - services-validation/src/main/resources/i18n/services-validation_en_GB.properties - services-validation/src/main/resources/i18n/services-validation_es_ES.properties - services-validation/src/main/resources/i18n/services-validation_fr_FR.properties - services/pom.xml - services/src/main/java/fr/ird/observe/services/ObserveDtoInitializer.java - services/src/main/java/fr/ird/observe/services/decoration/ObserveI18nDecoratorHelper.java - services/src/main/resources/i18n/services_en_GB.properties - services/src/main/resources/i18n/services_es_ES.properties - services/src/main/resources/i18n/services_fr_FR.properties - test/src/main/resources/db/6.901/dataForTestLongline.sql.gz - test/src/main/resources/db/6.901/dataForTestSeine.sql.gz - test/src/main/resources/db/6.901/empty_h2.sql.gz - test/src/main/resources/db/6.901/empty_pg.sql.gz - test/src/main/resources/db/6.901/referentiel.sql.gz - toolbox-maven-plugin/src/main/java/fr/ird/observe/maven/plugins/toolbox/GenerateI18nValidatorFieldsMojo.java Changes: ===================================== application-swing-validation/pom.xml ===================================== --- a/application-swing-validation/pom.xml +++ b/application-swing-validation/pom.xml @@ -117,24 +117,6 @@ <plugins> <plugin> - <artifactId>maven-compiler-plugin</artifactId> - <executions> - <execution> - <id>compile-generated-sources</id> - <goals> - <goal>compile</goal> - </goals> - <phase>process-classes</phase> - <configuration> - <includes> - <include>**/I18nValidatorHelper.java</include> - </includes> - </configuration> - </execution> - </executions> - </plugin> - - <plugin> <groupId>${project.groupId}</groupId> <artifactId>toolbox-maven-plugin</artifactId> <version>${project.version}</version> @@ -143,15 +125,6 @@ </configuration> <executions> <execution> - <id>generate-i18n-validator-fields</id> - <goals> - <goal>generate-i18n-validator-fields</goal> - </goals> - <configuration> - <prefix>observe.common.</prefix> - </configuration> - </execution> - <execution> <id>generate-validators-descriptor</id> <goals> <goal>generate-validators-descriptor</goal> @@ -176,22 +149,12 @@ <goals> <goal>parserJava</goal> </goals> - <phase>process-classes</phase> - <configuration> - <entries> - <entry> - <specificGoal>parserJava</specificGoal> - <basedir>${project.build.directory}/generated-sources/java</basedir> - </entry> - </entries> - </configuration> </execution> <execution> <id>parse-validation</id> <goals> <goal>parserValidation</goal> </goals> - <phase>process-classes</phase> <configuration> <entries> <entry> @@ -208,7 +171,6 @@ <goals> <goal>gen</goal> </goals> - <phase>process-classes</phase> </execution> </executions> </plugin> ===================================== application-swing-validation/src/main/resources/i18n/application-swing-validation_en_GB.properties ===================================== --- a/application-swing-validation/src/main/resources/i18n/application-swing-validation_en_GB.properties +++ b/application-swing-validation/src/main/resources/i18n/application-swing-validation_en_GB.properties @@ -1,206 +1,3 @@ -observe.common.activityLongline=Activity -observe.common.activitySeine=Activity -observe.common.baitHaulingStatus=Bait hauling status -observe.common.baitSettingStatus=Bait setting status -observe.common.baitType=Bait type -observe.common.baitsComposition=Baits composition -observe.common.baitsCompositionProportionSum=Baits composition proportion sum -observe.common.basket=Basket -observe.common.basketsPerSectionCount=Basket per section count -observe.common.branchline=Branchline -observe.common.branchlineLength=Branchline length -observe.common.branchlinesComposition=Branchlines composition -observe.common.branchlinesCompositionProportionSum=Branchlines composition proportion sum -observe.common.branchlinesPerBasketCount=Branchlines per basket count -observe.common.brandName=Brand name -observe.common.capacity=Capacity -observe.common.capacityLabel=Capacity label -observe.common.captain=Captain -observe.common.catchFateLongline=Catch fate -observe.common.catchHealthness=Catch healthness -observe.common.catchWeight=Catch weight -observe.common.changeDate=Change date -observe.common.code=Code -observe.common.coefficients=Coefficients -observe.common.comment=Comment -observe.common.count=Count -observe.common.country=Country -observe.common.currentDirection=Current direction -observe.common.currentFpaZone=Current Fpa zone -observe.common.currentSpeed=Current speed -observe.common.dataEntryOperator=Data entry operator -observe.common.date=Date -observe.common.daysAtSeaCount=Days at sea count -observe.common.departureHarbour=Departure harbour -observe.common.deployementEnd=Deployement end -observe.common.description=Description -observe.common.detectionMode=Detection mode -observe.common.detectionTime=Detection time -observe.common.discardHealthness=Discard healthness -observe.common.distance=Distance -observe.common.encounterType=Encounter type -observe.common.endDate=End date -observe.common.endLogValue=End log value -observe.common.endPursingDate=End pursing date -observe.common.endPursingTimeStamp=End pursing timestamp -observe.common.endSetDate=End set date -observe.common.endSetTimeStamp=End set timestamp -observe.common.firstName=First name -observe.common.fishingEnd=Fishing end -observe.common.fishingStart=Fishing start -observe.common.flagCountry=Flag country -observe.common.fleetCountry=Fleet country -observe.common.floatingObjectEmpty=Floating object empty -observe.common.floatline1Length=floatline 1 length -observe.common.floatline2Length=floatline 2 length -observe.common.floatlinesComposition=floatlines composition -observe.common.floatlinesCompositionProportionSum=floatlines composition proportion sum -observe.common.formsUrl=Forms url -observe.common.fpaZone=Fpa zone -observe.common.gaugeLabel=Gauge label -observe.common.gear=Gear -observe.common.gearCaracteristicType=Gear caracteristic type -observe.common.gearType=Gear type -observe.common.gearUseFeaturesLongline=Gear use features -observe.common.gearUseFeaturesSeine=Gear use features -observe.common.gonadeWeight=Gonade weight -observe.common.haulingBreaks=Hauling breaks -observe.common.haulingDirectionSameAsSetting=Hauling direction same as setting -observe.common.haulingEndLatitude=Hauling end latitude -observe.common.haulingEndLongitude=Hauling end longitude -observe.common.haulingEndQuadrant=Hauling end quadrant -observe.common.haulingEndTimeStamp=Hauling end timeStamp -observe.common.haulingStartLatitude=Hauling start latitude -observe.common.haulingStartLongitude=Hauling start longitude -observe.common.haulingStartQuadrant=Hauling start quadrant -observe.common.haulingStartTimeStamp=Hauling start timeStamp -observe.common.hookOffset=Hook offset -observe.common.hookPosition=Hook position -observe.common.hookSize=Hook size -observe.common.hookType=Hook type -observe.common.hooksComposition=hooks composition -observe.common.hooksCompositionProportionSum=hooks composition proportion sum -observe.common.individualSize=Individual size -observe.common.individualWeight=Individual weight -observe.common.inputSizeMeasureType=Input size measure type -observe.common.iso2Code=Iso 2 code -observe.common.iso3Code=Iso 3 code -observe.common.itemHorizontalPosition=Item horizontal position -observe.common.itemVerticalPosition=Item vertical position -observe.common.keelCode=Keel code -observe.common.label1=English label -observe.common.label2=French label -observe.common.label3=Spanish label -observe.common.landingHarbour=Landing harbour -observe.common.lastName=Last name -observe.common.latitude=Latitude -observe.common.length=Length -observe.common.lightsticksColor=Lightsticks color -observe.common.lightsticksPerBasketCount=Lightsticks per basket count -observe.common.lightsticksType=Lightsticks type -observe.common.lineType=Line type -observe.common.locode=Locode -observe.common.longitude=Longitude -observe.common.maturityStatus=Maturity status -observe.common.maxDepthTargeted=Max depth targeted -observe.common.maxGearDepth=Max gear depth -observe.common.meanLength=Mean length -observe.common.meanWeight=Mean weight -observe.common.name=Name -observe.common.nextFpaZone=Next Fpa zone -observe.common.nonTargetCatch=Non target catch -observe.common.nonTargetCatchReleaseStatus=Release state -observe.common.number=Number -observe.common.objectFate=Object fate -observe.common.objectOperation=Object operation -observe.common.objectType=Object type -observe.common.observedSystem=Observed system -observe.common.observedSystemDistance=Observed system distance -observe.common.observer=Observed -observe.common.ocean=Ocean -observe.common.organism=Organism -observe.common.outputInputFormula=Output to Input formula -observe.common.outputSizeMeasureType=Output size measure type -observe.common.power=Power -observe.common.previousFpaZone=Previous Fpa zone -observe.common.proportion=Proportion -observe.common.quadrant=Quadrant -observe.common.reasonForDiscard=Reason for discad -observe.common.reasonForNoFishing=Reason for no fishing -observe.common.reasonForNullSet=Reason for null set -observe.common.releaseTime=Release time -observe.common.reportsUrl=Reports url -observe.common.route=Route -observe.common.schoolEstimate=School estimate -observe.common.schoolMeanDepth=School mean depth -observe.common.schoolThickness=School thickness -observe.common.schoolTopDepth=School top depth -observe.common.seaSurfaceTemperature=Sea surface temperature -observe.common.searchMaximum=Search maximum -observe.common.section=Section -observe.common.sensorBrand=Sensor brand -observe.common.sensorDataFormat=Sensor data format -observe.common.sensorSerialNo=Sensor serial no -observe.common.sensorType=Sensor type -observe.common.settingEndLatitude=Setting end latitude -observe.common.settingEndLongitude=Setting end longitude -observe.common.settingEndQuadrant=Setting end quadrant -observe.common.settingEndTimeStamp=Setting end timeStamp -observe.common.settingShape=Setting shape -observe.common.settingStartLatitude=Setting start latitude -observe.common.settingStartLongitude=Setting start longitude -observe.common.settingStartQuadrant=Setting start quadrant -observe.common.settingStartTimeStamp=Setting start timeStamp -observe.common.settingVesselSpeed=Setting vessel speed -observe.common.shipOwner=Ship owner -observe.common.shooterSpeed=Shooter speed -observe.common.sizeMeasureType=Size measure type -observe.common.snapWeight=Snap weight -observe.common.species=Species -observe.common.speciesCatch=Species -observe.common.speciesFate=Species fate -observe.common.speciesGroup=Species group -observe.common.speciesGroupReleaseMode=Release mode -observe.common.speciesStatus=Species status -observe.common.speedRange=Speed range -observe.common.startDate=Start date -observe.common.startLogValue=Start log value -observe.common.startTime=Sart time -observe.common.status=Status -observe.common.stomacFullness=Stomac fullness -observe.common.supportVesselName=Support vessel name -observe.common.surroundingActivity=Surrounding activity -observe.common.swivelWeight=Swivel weight -observe.common.targetCatch=Target catch -observe.common.time=Time -observe.common.timeBetweenHooks=Time between hooks -observe.common.topType=Top type -observe.common.totalBasketsCount=Total baskets count -observe.common.totalCount=Count -observe.common.totalHooksCount=Total hooks count -observe.common.totalSectionsCount=Total section count -observe.common.totalWeight=Total weight -observe.common.tracelineLength=Traceline length -observe.common.tracelineType=Traceline type -observe.common.transmittingBuoyOperation=Transmitting buoy operation -observe.common.transmittingBuoyType=Transmitting buoy type -observe.common.tripType=Trip type -observe.common.type=Type -observe.common.uri=Uri -observe.common.vessel=Boat -observe.common.vesselActivityLongline=Vessel activity -observe.common.vesselActivitySeine=Vessel activity -observe.common.vesselSizeCategory=Vessel size category -observe.common.vesselSpeed=Vessel spped -observe.common.vesselType=Vessel type -observe.common.waveHeight=Wave weight -observe.common.weight=Weight -observe.common.weightCategory=Weight category -observe.common.weightLengthFormula=Weight length formula -observe.common.well=Well -observe.common.wind=Wind -observe.common.wormsId=Worms id -observe.common.yearService=Year service validator.ui.activity.bound.latitude=Latitude must be between %1$s and %2$s. validator.ui.activity.bound.longitude=Longitude must be between %1$s and %2$s. validator.ui.activity.bound.seaSurfaceTemperature=Temperature must be between %1$s and %2$s. @@ -314,6 +111,7 @@ validator.ui.floatingObject.required.comment.for.type=A comment is required for validator.ui.floatingObject.required.objectFate=Object fate must be filled. validator.ui.floatingObject.required.objectOperation=Object operation must be filled. validator.ui.floatingObject.required.type=Type must be filled. +validator.ui.floatingObject.size.supportVesselName=Support vessel name size can not exceed 1024 characters. validator.ui.floatlinesComposition.bound.length=Length must be between %1$s and %2$s. validator.ui.floatlinesComposition.bound.proportion=Proportion must be between %1$s and %2$s. validator.ui.floatlinesComposition.desactivated.lineType=Selected line type is disabled. ===================================== application-swing-validation/src/main/resources/i18n/application-swing-validation_es_ES.properties ===================================== --- a/application-swing-validation/src/main/resources/i18n/application-swing-validation_es_ES.properties +++ b/application-swing-validation/src/main/resources/i18n/application-swing-validation_es_ES.properties @@ -1,206 +1,3 @@ -observe.common.activityLongline=Actividad -observe.common.activitySeine=Actividad -observe.common.baitHaulingStatus=Estatuto del cebo en el arrastre -observe.common.baitSettingStatus=Estatuto del cebo en la calada -observe.common.baitType=Tipo de cebo -observe.common.baitsComposition=Cebo -observe.common.baitsCompositionProportionSum=Suma de los proporciónes de cebo (%) -observe.common.basket=Cesta -observe.common.basketsPerSectionCount=Número de cestas por sección -observe.common.branchline=Arponcillo -observe.common.branchlineLength=Arponcillo (m) -observe.common.branchlinesComposition=Arponcillos -observe.common.branchlinesCompositionProportionSum=Suma de los proporciónes de arponcillos (%) -observe.common.branchlinesPerBasketCount=Número de anzuelos por cesta -observe.common.brandName=Marca -observe.common.capacity=Capacidad de transporte -observe.common.capacityLabel=Texto capacidad -observe.common.captain=Patrón -observe.common.catchFateLongline=Futuro de la captura -observe.common.catchHealthness=Salud a la captura -observe.common.catchWeight=Peso estimado (en t) -observe.common.changeDate=Fecha de carga -observe.common.code=Identificación -observe.common.coefficients=Coeficientes -observe.common.comment=Comentarios -observe.common.count=Número -observe.common.country=País -observe.common.currentDirection=Direction du courant (°) -observe.common.currentFpaZone=Zona FPA actual -observe.common.currentSpeed=Velocidad del corriente (nd) -observe.common.dataEntryOperator=Operador de captación de datos -observe.common.date=Día de observación -observe.common.daysAtSeaCount=Numero de días en el mar -observe.common.departureHarbour=Puerto de embarque -observe.common.deployementEnd=Fin de despliegue -observe.common.description=Descripción -observe.common.detectionMode=Modo de detección -observe.common.detectionTime=Heure de détection \#TODO -observe.common.discardHealthness=Salud al rechazo -observe.common.distance=Distancia (m) -observe.common.encounterType=Tipo de encuentro -observe.common.endDate=Fecha de fin -observe.common.endLogValue=Corredera de tarde (millas) -observe.common.endPursingDate=Fecha de fin de calado de la red -observe.common.endPursingTimeStamp=Fecha - Hora de fin de calado de la red -observe.common.endSetDate=Fecha de fin de calado de la red -observe.common.endSetTimeStamp=Fecha - Hora de fin de validez -observe.common.firstName=Número -observe.common.fishingEnd=Fin de pesca -observe.common.fishingStart=Inicio de pesca -observe.common.flagCountry=Bandera -observe.common.fleetCountry=País -observe.common.floatingObjectEmpty=Objeto flotante vacía -observe.common.floatline1Length=Orinque 1 (m) -observe.common.floatline2Length=Orinque 2 (m) -observe.common.floatlinesComposition=Orinques -observe.common.floatlinesCompositionProportionSum=Suma de los proporciónes de los orinques (%) -observe.common.formsUrl=URL de los formularios -observe.common.fpaZone=Zona FPA -observe.common.gaugeLabel=Texto «Capacidad» -observe.common.gear=Equipamiento -observe.common.gearCaracteristicType=Tipo de característica de equipamientos -observe.common.gearType=Tipo de arte de pesca -observe.common.gearUseFeaturesLongline=Equipamiento -observe.common.gearUseFeaturesSeine=Equipamiento -observe.common.gonadeWeight=Peso de las gonadas (g) -observe.common.haulingBreaks=Número de cortes -observe.common.haulingDirectionSameAsSetting=Sentido del arrastre idéntico a lo de la calada -observe.common.haulingEndLatitude=Arrastre Latitud -observe.common.haulingEndLongitude=Arrastre Longitud -observe.common.haulingEndQuadrant=Arrastre Quadrant -observe.common.haulingEndTimeStamp=Timestamp de fin -observe.common.haulingStartLatitude=Arrastre Latitud -observe.common.haulingStartLongitude=Arrastre Longitud -observe.common.haulingStartQuadrant=Arrastre Quadrant -observe.common.haulingStartTimeStamp=Timestamp del inicio -observe.common.hookOffset=Offset anzuelo (°) -observe.common.hookPosition=Posición del anzuelo -observe.common.hookSize=Tamaño -observe.common.hookType=Tipo de anzuelo -observe.common.hooksComposition=Anzuelos -observe.common.hooksCompositionProportionSum=Suma de los proporciónes de anzuelos (%) -observe.common.individualSize=Tamaño (cm) -observe.common.individualWeight=Peso (kg) -observe.common.inputSizeMeasureType=Type de mensuration d'entrée \#TODO -observe.common.iso2Code=Código ISO-2 -observe.common.iso3Code=Código ISO-3 -observe.common.itemHorizontalPosition=Localización del elemento sobre la línea principal -observe.common.itemVerticalPosition=Localización del elemento sobre el arponcillo -observe.common.keelCode=Código de Quilla -observe.common.label1=Texto en inglés -observe.common.label2=Texto en francés -observe.common.label3=Nombre -observe.common.landingHarbour=Puerto de desembarque -observe.common.lastName=Nombre -observe.common.latitude=Latitud -observe.common.length=Longitud eslora total -observe.common.lightsticksColor=Color de barrita de luz -observe.common.lightsticksPerBasketCount=Número de barrita de luz por cesta -observe.common.lightsticksType=Tipo de barrita de luz -observe.common.lineType=Tipo de línea -observe.common.locode=Locode -observe.common.longitude=Longitude -observe.common.maturityStatus=Maturidad -observe.common.maxDepthTargeted=Profundidad máxima deseada -observe.common.maxGearDepth=Profundidad máxima (m) -observe.common.meanLength=Talla media (en cm) -observe.common.meanWeight=Peso medio (en Kg) -observe.common.name=Nombre -observe.common.nextFpaZone=Zona FPA penetrada -observe.common.nonTargetCatch=Fauna accesoria conservada o descartada -observe.common.nonTargetCatchReleaseStatus=État à la libération \#TODO -observe.common.number=Número -observe.common.objectFate=Devenir de objeto -observe.common.objectOperation=Operación sobre la baliza -observe.common.objectType=Tipo de objeto -observe.common.observedSystem=Sistema observado -observe.common.observedSystemDistance=Distancia al sistema observado (millas con 1 decimal) -observe.common.observer=Observador -observe.common.ocean=Océano -observe.common.organism=Organismo -observe.common.outputInputFormula=Formule Sortie vers Entrée \#TODO -observe.common.outputSizeMeasureType=Type de mensuration de sortie \#TODO -observe.common.power=Potencia del motor principal -observe.common.previousFpaZone=La zona FPA de que se salió -observe.common.proportion=Proporción (%) -observe.common.quadrant=Quadrant -observe.common.reasonForDiscard=Razón de descarte -observe.common.reasonForNoFishing=Razón de no pesca Senne -observe.common.reasonForNullSet=Causa de lance nulo -observe.common.releaseTime=Heure de libération \#TODO -observe.common.reportsUrl=URL del informe -observe.common.route=Ruta -observe.common.schoolEstimate=Estimación del banco -observe.common.schoolMeanDepth=Profundidad media (m) -observe.common.schoolThickness=Grossor del banco (m) -observe.common.schoolTopDepth=Profundidad de la cumbre (m) -observe.common.seaSurfaceTemperature=Temperatura en superficie (°) -observe.common.searchMaximum=Velocidad máxima de prospección -observe.common.section=Sección -observe.common.sensorBrand=Marca de sensor -observe.common.sensorDataFormat=Formato de los datos del sensor -observe.common.sensorSerialNo=Número de serie -observe.common.sensorType=Tipo de sensor -observe.common.settingEndLatitude=Calada Latitud -observe.common.settingEndLongitude=Calada longitud -observe.common.settingEndQuadrant=Calada quadrant -observe.common.settingEndTimeStamp=Timestamp de fin -observe.common.settingShape=Forma de la calada -observe.common.settingStartLatitude=Calada Latitud -observe.common.settingStartLongitude=Calada longitud -observe.common.settingStartQuadrant=Calada quadrant -observe.common.settingStartTimeStamp=Timestamp de inicio -observe.common.settingVesselSpeed=Velocidad del barco (nd) -observe.common.shipOwner=Armateur \#TODO -observe.common.shooterSpeed=Velocidad shooter (nd) -observe.common.sizeMeasureType=Tipo de medida -observe.common.snapWeight=Peso snap (kg) -observe.common.species=Especie -observe.common.speciesCatch=Especie -observe.common.speciesFate=Devenir de fauna -observe.common.speciesGroup=Grupo de especie de fauna -observe.common.speciesGroupReleaseMode=Mode de libération \#TODO -observe.common.speciesStatus=Estado de especie -observe.common.speedRange=Texto velocidad del viento -observe.common.startDate=Fecha de comienzo -observe.common.startLogValue=Corredera de mañana (millas) -observe.common.startTime=Fecha - Heuro de inicio de validez -observe.common.status=Estado -observe.common.stomacFullness=Nivel de llenado del estomago -observe.common.supportVesselName=Nombre del macicero -observe.common.surroundingActivity=Actividad circundante -observe.common.swivelWeight=Peso de el destorcedor (kg) -observe.common.targetCatch=Captura de atún -observe.common.time=Hora -observe.common.timeBetweenHooks=Temps entre anzuelos (s) -observe.common.topType=Tipo parte superior -observe.common.totalBasketsCount=Número total de baskets -observe.common.totalCount=Número estimado -observe.common.totalHooksCount=Número total d'arponcillos -observe.common.totalSectionsCount=Número total de secciones -observe.common.totalWeight=Peso -observe.common.tracelineLength=Parte baja (m) -observe.common.tracelineType=Tipo bajo de línea -observe.common.transmittingBuoyOperation=Operación sobre baliza -observe.common.transmittingBuoyType=Tipo de baliza -observe.common.tripType=Tipo de marea -observe.common.type=Type \#TODO -observe.common.uri=URI -observe.common.vessel=Barco -observe.common.vesselActivityLongline=Actividad buque -observe.common.vesselActivitySeine=Actividad buque -observe.common.vesselSizeCategory=Capacidad -observe.common.vesselSpeed=Velocidad del barco (nd) -observe.common.vesselType=Pesquería -observe.common.waveHeight=Texto descriptivo de «altura media de la ola» -observe.common.weight=Peso (en t) -observe.common.weightCategory=Categoría de peso -observe.common.weightLengthFormula=Relación de tallas -observe.common.well=Cuba -observe.common.wind=Fuerza del viento -observe.common.wormsId=Worms -observe.common.yearService=año de entrada en servicio validator.ui.activity.bound.latitude=La latitud dada debe estar comprendida entre %1$s y %2$s. validator.ui.activity.bound.longitude=La longitud dada debe estar comprendida entre %1$s y %2$s. validator.ui.activity.bound.seaSurfaceTemperature=La temperatura debe estar comprendida entre %1$s y %2$s. @@ -314,6 +111,7 @@ validator.ui.floatingObject.required.comment.for.type=Se requiere un comentario validator.ui.floatingObject.required.objectFate=Se recomienda seleccionar un futuro (devenir). validator.ui.floatingObject.required.objectOperation=Es obligatorio seleccionar un operación. validator.ui.floatingObject.required.type=Es obligatorio seleccionar un tipo de objeto. +validator.ui.floatingObject.size.supportVesselName=Support vessel name size can not exceed 1024 characters. \#TODO validator.ui.floatlinesComposition.bound.length=La longitud debe ser entre %s y %s. validator.ui.floatlinesComposition.bound.proportion=La proporción debe ser entre %s y %s. validator.ui.floatlinesComposition.desactivated.lineType=El tipo seleccionado está desactivado. ===================================== application-swing-validation/src/main/resources/i18n/application-swing-validation_fr_FR.properties ===================================== --- a/application-swing-validation/src/main/resources/i18n/application-swing-validation_fr_FR.properties +++ b/application-swing-validation/src/main/resources/i18n/application-swing-validation_fr_FR.properties @@ -1,206 +1,3 @@ -observe.common.activityLongline=Activité -observe.common.activitySeine=Activité -observe.common.baitHaulingStatus=Statut appât au virage -observe.common.baitSettingStatus=Statut appât au filage -observe.common.baitType=Type d'appât -observe.common.baitsComposition=Appâts -observe.common.baitsCompositionProportionSum=Somme des proportions d'appâts (%) -observe.common.basket=Panier -observe.common.basketsPerSectionCount=Nombre de panier par section -observe.common.branchline=Avançon -observe.common.branchlineLength=Longueur Avançon (m) -observe.common.branchlinesComposition=Avançons -observe.common.branchlinesCompositionProportionSum=Somme des proportions d'avançons (%) -observe.common.branchlinesPerBasketCount=Nombre d'hameçons par panier -observe.common.brandName=Marque -observe.common.capacity=Capacité transport (m³) -observe.common.capacityLabel=Libellé capacité -observe.common.captain=Capitaine -observe.common.catchFateLongline=Devenir -observe.common.catchHealthness=Santé à la capture -observe.common.catchWeight=Poids estimé (en t) -observe.common.changeDate=Date changement pavillon -observe.common.code=Identifiant -observe.common.coefficients=Coefficients -observe.common.comment=Commentaire -observe.common.count=Nombre -observe.common.country=Pays -observe.common.currentDirection=Direction du courant (°) -observe.common.currentFpaZone=Zone FPA actuelle -observe.common.currentSpeed=Vitesse du courant (nd) -observe.common.dataEntryOperator=Saisisseur -observe.common.date=Jour d'observation -observe.common.daysAtSeaCount=Nombre de jours à l'eau -observe.common.departureHarbour=Port de départ -observe.common.deployementEnd=Fin déploiement -observe.common.description=Description -observe.common.detectionMode=Mode détection -observe.common.detectionTime=Heure de détection -observe.common.discardHealthness=Santé au rejet -observe.common.distance=Distance (m) -observe.common.encounterType=Type -observe.common.endDate=Fin de validité -observe.common.endLogValue=Loch du soir (milles) -observe.common.endPursingDate=Date de fin coulissage -observe.common.endPursingTimeStamp=Date - Heure de fin coulissage -observe.common.endSetDate=Date fin calée -observe.common.endSetTimeStamp=Date - Heure de fin de validité -observe.common.firstName=Prénom -observe.common.fishingEnd=Fin pêche -observe.common.fishingStart=Début pêche -observe.common.flagCountry=Pavillon -observe.common.fleetCountry=Flotte -observe.common.floatingObjectEmpty=Objet flottant vide -observe.common.floatline1Length=Orin 1 (m) -observe.common.floatline2Length=Orin 2 (m) -observe.common.floatlinesComposition=Orins -observe.common.floatlinesCompositionProportionSum=Somme des proportions d'orins (%) -observe.common.formsUrl=URL des formulaires -observe.common.fpaZone=Zone FPA -observe.common.gaugeLabel=Libellé jauge -observe.common.gear=Equipement -observe.common.gearCaracteristicType=Type de caractéristique -observe.common.gearType=Type d'engin -observe.common.gearUseFeaturesLongline=Équipements -observe.common.gearUseFeaturesSeine=Équipements -observe.common.gonadeWeight=Poids des gonades (g) -observe.common.haulingBreaks=Nombre de coupures -observe.common.haulingDirectionSameAsSetting=Sens du virage identique à celui du filage -observe.common.haulingEndLatitude=Latitude de fin de virage -observe.common.haulingEndLongitude=Longitude de fin de virage -observe.common.haulingEndQuadrant=Quadrant de fin de virage -observe.common.haulingEndTimeStamp=Horodatage fin -observe.common.haulingStartLatitude=Latitude de début de virage -observe.common.haulingStartLongitude=Longitude de début de virage -observe.common.haulingStartQuadrant=Quadrant de début de virage -observe.common.haulingStartTimeStamp=Horodatage début -observe.common.hookOffset=Offset hameçon (°) -observe.common.hookPosition=Position de l'hameçon -observe.common.hookSize=Taille d'hameçon -observe.common.hookType=Type d'hameçon -observe.common.hooksComposition=Hameçons -observe.common.hooksCompositionProportionSum=Somme des proportions d'hameçons (%) -observe.common.individualSize=Taille (cm) -observe.common.individualWeight=Poids (kg) -observe.common.inputSizeMeasureType=Type de mensuration d'entrée -observe.common.iso2Code=code ISO-2 -observe.common.iso3Code=Code ISO-3 -observe.common.itemHorizontalPosition=Position sur la ligne -observe.common.itemVerticalPosition=Position verticale -observe.common.keelCode=Code quille -observe.common.label1=Libellé anglais -observe.common.label2=Libellé français -observe.common.label3=Libellé espagnol -observe.common.landingHarbour=Port d'arrivée -observe.common.lastName=Nom -observe.common.latitude=Latitude -observe.common.length=Longueur hors tout -observe.common.lightsticksColor=Couleur de cyalumes -observe.common.lightsticksPerBasketCount=Nombre de cyalumes par panier -observe.common.lightsticksType=Type de cyalumes -observe.common.lineType=Type de ligne -observe.common.locode=Locode -observe.common.longitude=Longitude -observe.common.maturityStatus=Maturité sexuelle -observe.common.maxDepthTargeted=Profondeur maximum ciblée -observe.common.maxGearDepth=Profondeur maximum (m) -observe.common.meanLength=Taille moyenne (en cm) -observe.common.meanWeight=Poids moyen (en Kg) -observe.common.name=Nom -observe.common.nextFpaZone=Zone FPA pénétrée -observe.common.nonTargetCatch=Faune accessoire conservée ou rejetée -observe.common.nonTargetCatchReleaseStatus=État à la libération -observe.common.number=Nombre -observe.common.objectFate=Devenir de l'objet -observe.common.objectOperation=Opération sur l'objet -observe.common.objectType=Type d'objet -observe.common.observedSystem=Système observé -observe.common.observedSystemDistance=Distance système observé (en milles avec 1 décimale) -observe.common.observer=Observateur -observe.common.ocean=Océan -observe.common.organism=Organisme -observe.common.outputInputFormula=Formule sortie -> entrée -observe.common.outputSizeMeasureType=Type de mensuration de sortie -observe.common.power=Puissance moteur principal -observe.common.previousFpaZone=Zone FPA quittée -observe.common.proportion=Proportion (%) -observe.common.quadrant=Quadrant -observe.common.reasonForDiscard=Raison rejet -observe.common.reasonForNoFishing=Raison de non coup de Senne -observe.common.reasonForNullSet=Cause coup nul -observe.common.releaseTime=Heure de libération -observe.common.reportsUrl=URL de rapport -observe.common.route=Route -observe.common.schoolEstimate=Estimation banc -observe.common.schoolMeanDepth=Profondeur moyenne (m) -observe.common.schoolThickness=Épaisseur du banc (m) -observe.common.schoolTopDepth=Profondeur sommet (m) -observe.common.seaSurfaceTemperature=Température surface (°) -observe.common.searchMaximum=Vitesse maximale -observe.common.section=Section -observe.common.sensorBrand=Marque -observe.common.sensorDataFormat=Format de données -observe.common.sensorSerialNo=Numéro de série -observe.common.sensorType=Type -observe.common.settingEndLatitude=Latitude de fin de filage -observe.common.settingEndLongitude=Longitude de fin de filage -observe.common.settingEndQuadrant=Quadrant de fin de filage -observe.common.settingEndTimeStamp=Horodatage fin -observe.common.settingShape=Forme du filage -observe.common.settingStartLatitude=Latitude de début de filage -observe.common.settingStartLongitude=Longitude de début de filage -observe.common.settingStartQuadrant=Quadrant de début de filage -observe.common.settingStartTimeStamp=Horodatage début -observe.common.settingVesselSpeed=Vitesse bateau (nd) -observe.common.shipOwner=Armateur -observe.common.shooterSpeed=Vitesse shooter (nd) -observe.common.sizeMeasureType=Type de mensuration -observe.common.snapWeight=Poids snap (kg) -observe.common.species=Espèce -observe.common.speciesCatch=Espèce -observe.common.speciesFate=Devenir espèce -observe.common.speciesGroup=Groupe espèce -observe.common.speciesGroupReleaseMode=Mode de libération -observe.common.speciesStatus=Statut faune observée -observe.common.speedRange=Libellé vitesse vent -observe.common.startDate=Début de validité -observe.common.startLogValue=Loch du matin (milles) -observe.common.startTime=Date - Heure de début de validité -observe.common.status=Statut -observe.common.stomacFullness=État de l'estomac -observe.common.supportVesselName=Nom supply -observe.common.surroundingActivity=Activité environnante -observe.common.swivelWeight=Poids de l'émerillon (kg) -observe.common.targetCatch=Capture cible -observe.common.time=Heure -observe.common.timeBetweenHooks=Temps entre hameçons (s) -observe.common.topType=Type -observe.common.totalBasketsCount=Nombre de paniers -observe.common.totalCount=Nombre estimé -observe.common.totalHooksCount=Nombre total d'avançons -observe.common.totalSectionsCount=Nombre total de sections -observe.common.totalWeight=Poids -observe.common.tracelineLength=Partie basse (m) -observe.common.tracelineType=Type bas de ligne -observe.common.transmittingBuoyOperation=Opération balise -observe.common.transmittingBuoyType=Type de balise -observe.common.tripType=Type de marée -observe.common.type=Type -observe.common.uri=URI -observe.common.vessel=Bateau -observe.common.vesselActivityLongline=Activité bateau -observe.common.vesselActivitySeine=Activité bateau -observe.common.vesselSizeCategory=Catégorie de bateau -observe.common.vesselSpeed=Vitesse bateau (nd) -observe.common.vesselType=Type de pêcherie -observe.common.waveHeight=Libellé Hauteur moyenne vagues -observe.common.weight=Poids (en t) -observe.common.weightCategory=Catégorie de poids -observe.common.weightLengthFormula=Relation Taille -observe.common.well=Cuve -observe.common.wind=Vent Beaufort -observe.common.wormsId=Worms -observe.common.yearService=Année de mise en service validator.ui.activity.bound.latitude=La latitude doit être comprise entre %1$s et %2$s. validator.ui.activity.bound.longitude=La longitude doit être comprise entre %1$s et %2$s. validator.ui.activity.bound.seaSurfaceTemperature=La température doit être comprise entre %1$s et %2$s. @@ -314,6 +111,7 @@ validator.ui.floatingObject.required.comment.for.type=Un commentaire est requis validator.ui.floatingObject.required.objectFate=La sélection d'un devenir d'objet est conseillée. validator.ui.floatingObject.required.objectOperation=La sélection d'une opération d'objet est obligatoire. validator.ui.floatingObject.required.type=La sélection d'un type d'objet est obligatoire. +validator.ui.floatingObject.size.supportVesselName=La taille du nom supply est limitée à 1024 caractères. validator.ui.floatlinesComposition.bound.length=La longueur doit être comprise entre %s et %s. validator.ui.floatlinesComposition.bound.proportion=La proportion doit être comprise entre %s et %s. validator.ui.floatlinesComposition.desactivated.lineType=Le type sélectionnée est désactivée. ===================================== services-runner/pom.xml ===================================== --- a/services-runner/pom.xml +++ b/services-runner/pom.xml @@ -21,7 +21,8 @@ #L% --> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> <parent> @@ -110,6 +111,13 @@ <scope>test</scope> </dependency> + <dependency> + <groupId>io.ultreia.java4all.i18n</groupId> + <artifactId>i18n-api</artifactId> + <version>${nuitonI18nVersion}</version> + <scope>test</scope> + </dependency> +  <dependency> @@ -118,4 +126,95 @@ </dependency> </dependencies> + + <build> + + <resources> + <resource> + <directory>${project.basedir}/src/main/resources</directory> + <excludes> + <exclude>i18n/**</exclude> + </excludes> + </resource> + </resources> + <plugins> + <plugin> + <groupId>${project.groupId}</groupId> + <artifactId>toolbox-maven-plugin</artifactId> + <version>${project.version}</version> + <executions> + <execution> + <id>generate-i18n-validator-fields-for-service</id> + <goals> + <goal>generate-i18n-validator-fields</goal> + </goals> + <phase>generate-sources</phase> + <configuration> + <className>ServiceI18nValidatorHelper</className> + <prefix>observe.common.</prefix> + <validatorsFile>${project.basedir}/main/resources/validators.xml</validatorsFile> + <sourceRoot>${project.parent.basedir}/services-validation/src/main/resources</sourceRoot> + </configuration> + </execution> + <execution> + <id>generate-i18n-validator-fields-for-swing</id> + <goals> + <goal>generate-i18n-validator-fields</goal> + </goals> + <phase>generate-sources</phase> + <configuration> + <className>ApplicationSwingI18nValidatorHelper</className> + <prefix>observe.common.</prefix> + <validatorsFile>${project.basedir}/main/resources/validators.xml</validatorsFile> + <sourceRoot>${project.parent.basedir}/application-swing-validation/src/main/resources</sourceRoot> + </configuration> + </execution> + </executions> + <dependencies> + <dependency> + <groupId>${project.groupId}</groupId> + <artifactId>persistence</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>${project.groupId}</groupId> + <artifactId>services-validation</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>${project.groupId}</groupId> + <artifactId>application-swing-validation</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>io.ultreia.java4all.i18n</groupId> + <artifactId>i18n-api</artifactId> + <version>${nuitonI18nVersion}</version> + </dependency> + </dependencies> + </plugin> + + <plugin> + <groupId>io.ultreia.java4all.i18n</groupId> + <artifactId>i18n-maven-plugin</artifactId> + <executions> + <execution> + <id>scan-sources</id> + <goals> + <goal>parserJava</goal> + <goal>gen</goal> + </goals> + <configuration> + <entries> + <entry> + <basedir>${project.build.directory}/generated-sources/java/</basedir> + </entry> + </entries> + </configuration> + </execution> + </executions> + </plugin> + + </plugins> + </build> </project> ===================================== services-runner/src/main/resources/i18n/services-runner_en_GB.properties ===================================== --- /dev/null +++ b/services-runner/src/main/resources/i18n/services-runner_en_GB.properties ===================================== services-runner/src/main/resources/i18n/services-runner_es_ES.properties ===================================== --- /dev/null +++ b/services-runner/src/main/resources/i18n/services-runner_es_ES.properties ===================================== services-runner/src/main/resources/i18n/services-runner_fr_FR.properties ===================================== --- /dev/null +++ b/services-runner/src/main/resources/i18n/services-runner_fr_FR.properties ===================================== services-validation/pom.xml ===================================== --- a/services-validation/pom.xml +++ b/services-validation/pom.xml @@ -78,10 +78,6 @@ <artifactId>nuiton-utils</artifactId> </dependency> <dependency> - <groupId>io.ultreia.java4all.i18n</groupId> - <artifactId>i18n-api</artifactId> - </dependency> - <dependency> <groupId>org.nuiton.topia</groupId> <artifactId>topia-persistence</artifactId> </dependency> @@ -131,15 +127,6 @@ </configuration> <executions> <execution> - <id>generate-i18n-validator-fields</id> - <goals> - <goal>generate-i18n-validator-fields</goal> - </goals> - <configuration> - <prefix>observe.common.</prefix> - </configuration> - </execution> - <execution> <id>generate-validators-descriptor</id> <goals> <goal>generate-validators-descriptor</goal> @@ -159,46 +146,18 @@ </dependency> </dependencies> </plugin> - - <plugin> - <artifactId>maven-compiler-plugin</artifactId> - <executions> - <execution> - <id>compile-generated-sources</id> - <goals> - <goal>compile</goal> - </goals> - <phase>process-classes</phase> - <configuration> - <includes> - <include>**/I18nValidatorHelper.java</include> - </includes> - </configuration> - </execution> - </executions> - </plugin> <plugin> <groupId>io.ultreia.java4all.i18n</groupId> <artifactId>i18n-maven-plugin</artifactId> <executions> <execution> <id>parse-java</id> - <phase>process-classes</phase> <goals> <goal>parserJava</goal> </goals> - <configuration> - <entries> - <entry> - <specificGoal>parserJava</specificGoal> - <basedir>${project.build.directory}/generated-sources/java</basedir> - </entry> - </entries> - </configuration> </execution> <execution> <id>parse-validation</id> - <phase>process-classes</phase> <goals> <goal>parserValidation</goal> </goals> @@ -215,12 +174,18 @@ </execution> <execution> <id>gen</id> - <phase>process-classes</phase> <goals> <goal>gen</goal> </goals> </execution> </executions> + <dependencies> + <dependency> + <groupId>${project.groupId}</groupId> + <artifactId>services</artifactId> + <version>${project.version}</version> + </dependency> + </dependencies> </plugin> </plugins> ===================================== services-validation/src/main/resources/i18n/services-validation_en_GB.properties ===================================== --- a/services-validation/src/main/resources/i18n/services-validation_en_GB.properties +++ b/services-validation/src/main/resources/i18n/services-validation_en_GB.properties @@ -1,207 +1,3 @@ -observe.common.activitySeine=Activity -observe.common.baitHaulingStatus=Bait hauling status -observe.common.baitSettingStatus=Bait setting status -observe.common.baitType=Bait type -observe.common.baitsComposition=Baits composition -observe.common.baitsCompositionProportionSum=Baits composition proportion sum -observe.common.basket=Basket -observe.common.basketsPerSectionCount=Basket per section count -observe.common.branchline=Branchline -observe.common.branchlineLength=Branchline length -observe.common.branchlinesComposition=Branchlines composition -observe.common.branchlinesCompositionProportionSum=Branchlines composition proportion sum -observe.common.branchlinesPerBasketCount=Branchlines per basket count -observe.common.brandName=Brand name -observe.common.capacity=Capacity -observe.common.capacityLabel=Capacity label -observe.common.captain=Captain -observe.common.catchFateLongline=Catch fate -observe.common.catchHealthness=Catch healthness -observe.common.catchWeight=Catch weight -observe.common.changeDate=Change date -observe.common.code=Code -observe.common.coefficients=Coefficients -observe.common.comment=Comment -observe.common.count=Count -observe.common.country=Country -observe.common.currentDirection=Current direction -observe.common.currentSpeed=Current speed -observe.common.dataEntryOperator=Data entry operator -observe.common.date=Date -observe.common.daysAtSeaCount=Days at sea count -observe.common.departureHarbour=Departure harbour -observe.common.deployementEnd=Deployement end -observe.common.description=Description -observe.common.detectionMode=Detection mode -observe.common.detectionTime=Detection time -observe.common.discardHealthness=Discard healthness -observe.common.distance=Distance -observe.common.encounterType=Encounter type -observe.common.endDate=End date -observe.common.endLogValue=End log value -observe.common.endPursingDate=End pursing date -observe.common.endPursingTimeStamp=End pursing timestamp -observe.common.endSetDate=End set date -observe.common.endSetTimeStamp=End set timestamp -observe.common.faoCode=Fao code -observe.common.firstName=First name -observe.common.fishingEnd=Fishing end -observe.common.fishingStart=Fishing start -observe.common.flagCountry=Flag country -observe.common.fleetCountry=Fleet country -observe.common.floatingObject=Floating object -observe.common.floatline1Length=floatline 1 length -observe.common.floatline2Length=floatline 2 length -observe.common.floatlinesComposition=floatlines composition -observe.common.floatlinesCompositionProportionSum=floatlines composition proportion sum -observe.common.formsUrl=Forms url -observe.common.fpaZone=Fpa zone -observe.common.gaugeLabel=Gauge label -observe.common.gear=Gear -observe.common.gearCaracteristicType=Gear caracteristic type -observe.common.gearUseFeaturesSeine=Gear use features -observe.common.gonadeWeight=Gonade weight -observe.common.haulingBreaks=Hauling breaks -observe.common.haulingDirectionSameAsSetting=Hauling direction same as setting -observe.common.haulingEndLatitude=Hauling end latitude -observe.common.haulingEndLongitude=Hauling end longitude -observe.common.haulingEndQuadrant=Hauling end quadrant -observe.common.haulingEndTimeStamp=Hauling end timeStamp -observe.common.haulingStartLatitude=Hauling start latitude -observe.common.haulingStartLongitude=Hauling start longitude -observe.common.haulingStartQuadrant=Hauling start quadrant -observe.common.haulingStartTimeStamp=Hauling start timeStamp -observe.common.homeId=Home id -observe.common.hookOffset=Hook offset -observe.common.hookPosition=Hook position -observe.common.hookSize=Hook size -observe.common.hookType=Hook type -observe.common.hooksComposition=hooks composition -observe.common.hooksCompositionProportionSum=hooks composition proportion sum -observe.common.individualSize=Individual size -observe.common.individualWeight=Individual weight -observe.common.inputOutputFormula=Input to Output formula -observe.common.iso2Code=Iso 2 code -observe.common.iso3Code=Iso 3 code -observe.common.itemHorizontalPosition=Item horizontal position -observe.common.itemVerticalPosition=Item vertical position -observe.common.keelCode=Keel code -observe.common.label=Label -observe.common.label1=English label -observe.common.label2=French label -observe.common.label3=Spanish label -observe.common.landingHarbour=Landing harbour -observe.common.lastName=Last name -observe.common.latitude=Latitude -observe.common.length=Length -observe.common.lengthWeightFormula=Length weight formula -observe.common.lightsticksColor=Lightsticks color -observe.common.lightsticksPerBasketCount=Lightsticks per basket count -observe.common.lightsticksType=Lightsticks type -observe.common.lineType=Line type -observe.common.locode=Locode -observe.common.longitude=Longitude -observe.common.maturityStatus=Maturity status -observe.common.maxDepthTargeted=Max depth targeted -observe.common.maxGearDepth=Max gear depth -observe.common.meanLength=Mean length -observe.common.meanWeight=Mean weight -observe.common.name=Name -observe.common.nonTargetCatch=Non target catch -observe.common.nonTargetCatchReleaseStatusType=Release state -observe.common.number=Number -observe.common.objectFate=Object fate -observe.common.objectMaterialType=Type -observe.common.objectOperation=Object operation -observe.common.objectType=Object type -observe.common.observedSystem=Observed system -observe.common.observedSystemDistance=Observed system distance -observe.common.observer=Observed -observe.common.ocean=Ocean -observe.common.organism=Organism -observe.common.outputInputFormula=Output to Input formula -observe.common.power=Power -observe.common.proportion=Proportion -observe.common.quadrant=Quadrant -observe.common.reasonForDiscard=Reason for discad -observe.common.reasonForNoFishing=Reason for no fishing -observe.common.reasonForNullSet=Reason for null set -observe.common.releaseTime=Release time -observe.common.reportsUrl=Reports url -observe.common.route=Route -observe.common.schoolEstimate=School estimate -observe.common.schoolMeanDepth=School mean depth -observe.common.schoolThickness=School thickness -observe.common.schoolTopDepth=School top depth -observe.common.scientificLabel=Scientific label -observe.common.seaSurfaceTemperature=Sea surface temperature -observe.common.searchMaximum=Search maximum -observe.common.section=Section -observe.common.sensorBrand=Sensor brand -observe.common.sensorDataFormat=Sensor data format -observe.common.sensorSerialNo=Sensor serial no -observe.common.sensorType=Sensor type -observe.common.settingEndLatitude=Setting end latitude -observe.common.settingEndLongitude=Setting end longitude -observe.common.settingEndQuadrant=Setting end quadrant -observe.common.settingEndTimeStamp=Setting end timeStamp -observe.common.settingIdentifier=Setting -observe.common.settingShape=Setting shape -observe.common.settingStartLatitude=Setting start latitude -observe.common.settingStartLongitude=Setting start longitude -observe.common.settingStartQuadrant=Setting start quadrant -observe.common.settingStartTimeStamp=Setting start timeStamp -observe.common.settingVesselSpeed=Setting vessel speed -observe.common.sex=Sex -observe.common.shipOwner=Ship owner -observe.common.shooterSpeed=Shooter speed -observe.common.sizeMeasureType=Size measure type -observe.common.snapWeight=Snap weight -observe.common.species=Species -observe.common.speciesCatch=Species -observe.common.speciesFate=Species fate -observe.common.speciesGroup=Species group -observe.common.speciesGroupReleaseMode=Release mode -observe.common.speciesGroupReleaseStatus=Release state -observe.common.speciesStatus=Species status -observe.common.speedRange=Speed range -observe.common.startDate=Start date -observe.common.startLogValue=Start log value -observe.common.startTime=Sart time -observe.common.status=Status -observe.common.stomacFullness=Stomac fullness -observe.common.supportVesselName=Support vessel name -observe.common.surroundingActivity=Surrounding activity -observe.common.swivelWeight=Swivel weight -observe.common.targetCatch=Target catch -observe.common.time=Time -observe.common.timeBetweenHooks=Time between hooks -observe.common.topType=Top type -observe.common.totalBasketsCount=Total baskets count -observe.common.totalCount=Count -observe.common.totalHooksCount=Total hooks count -observe.common.totalSectionsCount=Total section count -observe.common.totalWeight=Total weight -observe.common.tracelineLength=Traceline length -observe.common.tracelineType=Traceline type -observe.common.transmittingBuoyOperation=Transmitting buoy operation -observe.common.transmittingBuoyType=Transmitting buoy type -observe.common.tripType=Trip type -observe.common.type=Type -observe.common.uri=Uri -observe.common.vessel=Boat -observe.common.vesselActivityLongline=Vessel activity -observe.common.vesselSizeCategory=Vessel size category -observe.common.vesselSpeed=Vessel spped -observe.common.vesselType=Vessel type -observe.common.waveHeight=Wave weight -observe.common.weight=Weight -observe.common.weightCategory=Weight category -observe.common.weightLengthFormula=Weight length formula -observe.common.well=Well -observe.common.wind=Wind -observe.common.wormsId=Worms id -observe.common.yearService=Year service validator.service.activity.bound.latitude=Latitude must be between %1$s and %2$s. validator.service.activity.bound.longitude=Longitude must be between %1$s and %2$s. validator.service.activity.bound.seaSurfaceTemperature=Temperature must be between %1$s and %2$s. @@ -305,6 +101,7 @@ validator.service.floatingObject.required.comment.for.type=A comment is required validator.service.floatingObject.required.objectFate=Object fate must be filled. validator.service.floatingObject.required.objectOperation=Object operation must be filled. validator.service.floatingObject.required.type=Type must be filled. +validator.service.floatingObject.size.supportVesselName=Support vessel name size can not exceed 1024 characters. validator.service.floatlinesComposition.bound.length=Length must be between %1$s and %2$s. validator.service.floatlinesComposition.bound.proportion=Proportion must be between %1$s and %2$s. validator.service.floatlinesComposition.desactivated.lineType=Selected line type is disabled. ===================================== services-validation/src/main/resources/i18n/services-validation_es_ES.properties ===================================== --- a/services-validation/src/main/resources/i18n/services-validation_es_ES.properties +++ b/services-validation/src/main/resources/i18n/services-validation_es_ES.properties @@ -1,207 +1,3 @@ -observe.common.activitySeine=Actividad -observe.common.baitHaulingStatus=Estatuto del cebo en el arrastre -observe.common.baitSettingStatus=Estatuto del cebo en la calada -observe.common.baitType=Tipo de cebo -observe.common.baitsComposition=Cebo -observe.common.baitsCompositionProportionSum=Suma de los proporciónes de cebo (%) -observe.common.basket=Cesta -observe.common.basketsPerSectionCount=Número de cestas por sección -observe.common.branchline=Arponcillo -observe.common.branchlineLength=Arponcillo (m) -observe.common.branchlinesComposition=Arponcillos -observe.common.branchlinesCompositionProportionSum=Suma de los proporciónes de arponcillos (%) -observe.common.branchlinesPerBasketCount=Número de anzuelos por cesta -observe.common.brandName=Marca -observe.common.capacity=Capacidad de transporte -observe.common.capacityLabel=Texto capacidad -observe.common.captain=Patrón -observe.common.catchFateLongline=Futuro de la captura -observe.common.catchHealthness=Salud a la captura -observe.common.catchWeight=Peso estimado (en t) -observe.common.changeDate=Fecha de carga -observe.common.code=Identificación -observe.common.coefficients=Coeficientes -observe.common.comment=Comentarios -observe.common.count=Número -observe.common.country=País -observe.common.currentDirection=Direction du courant (°) -observe.common.currentSpeed=Velocidad del corriente (nd) -observe.common.dataEntryOperator=Operador de captación de datos -observe.common.date=Día de observación -observe.common.daysAtSeaCount=Numero de días en el mar -observe.common.departureHarbour=Puerto de embarque -observe.common.deployementEnd=Fin de despliegue -observe.common.description=Descripción -observe.common.detectionMode=Modo de detección -observe.common.detectionTime=Heure de détection \#TODO -observe.common.discardHealthness=Salud al rechazo -observe.common.distance=Distancia (m) -observe.common.encounterType=Tipo de encuentro -observe.common.endDate=Fecha de fin -observe.common.endLogValue=Corredera de tarde (millas) -observe.common.endPursingDate=Fecha de fin de calado de la red -observe.common.endPursingTimeStamp=Fecha - Hora de fin de calado de la red -observe.common.endSetDate=Fecha de fin de calado de la red -observe.common.endSetTimeStamp=Fecha - Hora de fin de validez -observe.common.faoCode=Codigo FAO -observe.common.firstName=Número -observe.common.fishingEnd=Fin de pesca -observe.common.fishingStart=Inicio de pesca -observe.common.flagCountry=Bandera -observe.common.fleetCountry=País -observe.common.floatingObject=Objeto flotante -observe.common.floatline1Length=Orinque 1 (m) -observe.common.floatline2Length=Orinque 2 (m) -observe.common.floatlinesComposition=Orinques -observe.common.floatlinesCompositionProportionSum=Suma de los proporciónes de los orinques (%) -observe.common.formsUrl=URL de los formularios -observe.common.fpaZone=Zona FPA -observe.common.gaugeLabel=Texto «Capacidad» -observe.common.gear=Equipamiento -observe.common.gearCaracteristicType=Tipo de característica de equipamientos -observe.common.gearUseFeaturesSeine=Equipamiento -observe.common.gonadeWeight=Peso de las gonadas (g) -observe.common.haulingBreaks=Número de cortes -observe.common.haulingDirectionSameAsSetting=Sentido del arrastre idéntico a lo de la calada -observe.common.haulingEndLatitude=Arrastre Latitud -observe.common.haulingEndLongitude=Arrastre Longitud -observe.common.haulingEndQuadrant=Arrastre Quadrant -observe.common.haulingEndTimeStamp=Timestamp de fin -observe.common.haulingStartLatitude=Arrastre Latitud -observe.common.haulingStartLongitude=Arrastre Longitud -observe.common.haulingStartQuadrant=Arrastre Quadrant -observe.common.haulingStartTimeStamp=Timestamp del inicio -observe.common.homeId=Identificador -observe.common.hookOffset=Offset anzuelo (°) -observe.common.hookPosition=Posición del anzuelo -observe.common.hookSize=Tamaño -observe.common.hookType=Tipo de anzuelo -observe.common.hooksComposition=Anzuelos -observe.common.hooksCompositionProportionSum=Suma de los proporciónes de anzuelos (%) -observe.common.individualSize=Tamaño (cm) -observe.common.individualWeight=Peso (kg) -observe.common.inputOutputFormula=Formule Entrée vers Sortie \#TODO -observe.common.iso2Code=Código ISO-2 -observe.common.iso3Code=Código ISO-3 -observe.common.itemHorizontalPosition=Localización del elemento sobre la línea principal -observe.common.itemVerticalPosition=Localización del elemento sobre el arponcillo -observe.common.keelCode=Código de Quilla -observe.common.label=Texto -observe.common.label1=Texto en inglés -observe.common.label2=Texto en francés -observe.common.label3=Nombre -observe.common.landingHarbour=Puerto de desembarque -observe.common.lastName=Nombre -observe.common.latitude=Latitud -observe.common.length=Longitud eslora total -observe.common.lengthWeightFormula=Relación de peso -observe.common.lightsticksColor=Color de barrita de luz -observe.common.lightsticksPerBasketCount=Número de barrita de luz por cesta -observe.common.lightsticksType=Tipo de barrita de luz -observe.common.lineType=Tipo de línea -observe.common.locode=Locode -observe.common.longitude=Longitude -observe.common.maturityStatus=Maturidad -observe.common.maxDepthTargeted=Profundidad máxima deseada -observe.common.maxGearDepth=Profundidad máxima (m) -observe.common.meanLength=Talla media (en cm) -observe.common.meanWeight=Peso medio (en Kg) -observe.common.name=Nombre -observe.common.nonTargetCatch=Fauna accesoria conservada o descartada -observe.common.nonTargetCatchReleaseStatusType=État à la libération \#TODO -observe.common.number=Número -observe.common.objectFate=Devenir de objeto -observe.common.objectMaterialType=Type \#TODO -observe.common.objectOperation=Operación sobre la baliza -observe.common.objectType=Tipo de objeto -observe.common.observedSystem=Sistema observado -observe.common.observedSystemDistance=Distancia al sistema observado (millas con 1 decimal) -observe.common.observer=Observador -observe.common.ocean=Océano -observe.common.organism=Organismo -observe.common.outputInputFormula=Formule Sortie vers Entrée \#TODO -observe.common.power=Potencia del motor principal -observe.common.proportion=Proporción (%) -observe.common.quadrant=Quadrant -observe.common.reasonForDiscard=Razón de descarte -observe.common.reasonForNoFishing=Razón de no pesca Senne -observe.common.reasonForNullSet=Causa de lance nulo -observe.common.releaseTime=Heure de libération \#TODO -observe.common.reportsUrl=URL del informe -observe.common.route=Ruta -observe.common.schoolEstimate=Estimación del banco -observe.common.schoolMeanDepth=Profundidad media (m) -observe.common.schoolThickness=Grossor del banco (m) -observe.common.schoolTopDepth=Profundidad de la cumbre (m) -observe.common.scientificLabel=Texto científico -observe.common.seaSurfaceTemperature=Temperatura en superficie (°) -observe.common.searchMaximum=Velocidad máxima de prospección -observe.common.section=Sección -observe.common.sensorBrand=Marca de sensor -observe.common.sensorDataFormat=Formato de los datos del sensor -observe.common.sensorSerialNo=Número de serie -observe.common.sensorType=Tipo de sensor -observe.common.settingEndLatitude=Calada Latitud -observe.common.settingEndLongitude=Calada longitud -observe.common.settingEndQuadrant=Calada quadrant -observe.common.settingEndTimeStamp=Timestamp de fin -observe.common.settingIdentifier=Calada -observe.common.settingShape=Forma de la calada -observe.common.settingStartLatitude=Calada Latitud -observe.common.settingStartLongitude=Calada longitud -observe.common.settingStartQuadrant=Calada quadrant -observe.common.settingStartTimeStamp=Timestamp de inicio -observe.common.settingVesselSpeed=Velocidad del barco (nd) -observe.common.sex=Sexo -observe.common.shipOwner=Armateur \#TODO -observe.common.shooterSpeed=Velocidad shooter (nd) -observe.common.sizeMeasureType=Tipo de medida -observe.common.snapWeight=Peso snap (kg) -observe.common.species=Especie -observe.common.speciesCatch=Especie -observe.common.speciesFate=Devenir de fauna -observe.common.speciesGroup=Grupo de especie de fauna -observe.common.speciesGroupReleaseMode=Mode de libération \#TODO -observe.common.speciesGroupReleaseStatus=État à la libération \#TODO -observe.common.speciesStatus=Estado de especie -observe.common.speedRange=Texto velocidad del viento -observe.common.startDate=Fecha de comienzo -observe.common.startLogValue=Corredera de mañana (millas) -observe.common.startTime=Fecha - Heuro de inicio de validez -observe.common.status=Estado -observe.common.stomacFullness=Nivel de llenado del estomago -observe.common.supportVesselName=Nombre del macicero -observe.common.surroundingActivity=Actividad circundante -observe.common.swivelWeight=Peso de el destorcedor (kg) -observe.common.targetCatch=Captura de atún -observe.common.time=Hora -observe.common.timeBetweenHooks=Temps entre anzuelos (s) -observe.common.topType=Tipo parte superior -observe.common.totalBasketsCount=Número total de baskets -observe.common.totalCount=Número estimado -observe.common.totalHooksCount=Número total d'arponcillos -observe.common.totalSectionsCount=Número total de secciones -observe.common.totalWeight=Peso -observe.common.tracelineLength=Parte baja (m) -observe.common.tracelineType=Tipo bajo de línea -observe.common.transmittingBuoyOperation=Operación sobre baliza -observe.common.transmittingBuoyType=Tipo de baliza -observe.common.tripType=Tipo de marea -observe.common.type=Type \#TODO -observe.common.uri=URI -observe.common.vessel=Barco -observe.common.vesselActivityLongline=Actividad buque -observe.common.vesselSizeCategory=Capacidad -observe.common.vesselSpeed=Velocidad del barco (nd) -observe.common.vesselType=Pesquería -observe.common.waveHeight=Texto descriptivo de «altura media de la ola» -observe.common.weight=Peso (en t) -observe.common.weightCategory=Categoría de peso -observe.common.weightLengthFormula=Relación de tallas -observe.common.well=Cuba -observe.common.wind=Fuerza del viento -observe.common.wormsId=Worms -observe.common.yearService=año de entrada en servicio validator.service.activity.bound.latitude=La latitud dada debe estar comprendida entre %1$s y %2$s. validator.service.activity.bound.longitude=La longitud dada debe estar comprendida entre %1$s y %2$s. validator.service.activity.bound.seaSurfaceTemperature=La temperatura debe estar comprendida entre %1$s y %2$s. @@ -305,6 +101,7 @@ validator.service.floatingObject.required.comment.for.type=Se requiere un coment validator.service.floatingObject.required.objectFate=Se recomienda seleccionar un futuro (devenir). validator.service.floatingObject.required.objectOperation=Es obligatorio seleccionar un operación. validator.service.floatingObject.required.type=Es obligatorio seleccionar un tipo de objeto. +validator.service.floatingObject.size.supportVesselName=Support vessel name size can not exceed 1024 characters. \#TODO validator.service.floatlinesComposition.bound.length=La longitud debe ser entre %s y %s. validator.service.floatlinesComposition.bound.proportion=La proporción debe ser entre %s y %s. validator.service.floatlinesComposition.desactivated.lineType=El tipo seleccionado está desactivado. ===================================== services-validation/src/main/resources/i18n/services-validation_fr_FR.properties ===================================== --- a/services-validation/src/main/resources/i18n/services-validation_fr_FR.properties +++ b/services-validation/src/main/resources/i18n/services-validation_fr_FR.properties @@ -1,207 +1,3 @@ -observe.common.activitySeine=Activité -observe.common.baitHaulingStatus=Statut appât au virage -observe.common.baitSettingStatus=Statut appât au filage -observe.common.baitType=Type d'appât -observe.common.baitsComposition=Appâts -observe.common.baitsCompositionProportionSum=Somme des proportions d'appâts (%) -observe.common.basket=Panier -observe.common.basketsPerSectionCount=Nombre de panier par section -observe.common.branchline=Avançon -observe.common.branchlineLength=Longueur Avançon (m) -observe.common.branchlinesComposition=Avançons -observe.common.branchlinesCompositionProportionSum=Somme des proportions d'avançons (%) -observe.common.branchlinesPerBasketCount=Nombre d'hameçons par panier -observe.common.brandName=Marque -observe.common.capacity=Capacité transport (m³) -observe.common.capacityLabel=Libellé capacité -observe.common.captain=Capitaine -observe.common.catchFateLongline=Devenir -observe.common.catchHealthness=Santé à la capture -observe.common.catchWeight=Poids estimé (en t) -observe.common.changeDate=Date changement pavillon -observe.common.code=Identifiant -observe.common.coefficients=Coefficients -observe.common.comment=Commentaire -observe.common.count=Nombre -observe.common.country=Pays -observe.common.currentDirection=Direction du courant (°) -observe.common.currentSpeed=Vitesse du courant (nd) -observe.common.dataEntryOperator=Saisisseur -observe.common.date=Jour d'observation -observe.common.daysAtSeaCount=Nombre de jours à l'eau -observe.common.departureHarbour=Port de départ -observe.common.deployementEnd=Fin déploiement -observe.common.description=Description -observe.common.detectionMode=Mode détection -observe.common.detectionTime=Heure de détection -observe.common.discardHealthness=Santé au rejet -observe.common.distance=Distance (m) -observe.common.encounterType=Type -observe.common.endDate=Fin de validité -observe.common.endLogValue=Loch du soir (milles) -observe.common.endPursingDate=Date de fin coulissage -observe.common.endPursingTimeStamp=Date - Heure de fin coulissage -observe.common.endSetDate=Date fin calée -observe.common.endSetTimeStamp=Date - Heure de fin de validité -observe.common.faoCode=Code FAO -observe.common.firstName=Prénom -observe.common.fishingEnd=Fin pêche -observe.common.fishingStart=Début pêche -observe.common.flagCountry=Pavillon -observe.common.fleetCountry=Flotte -observe.common.floatingObject=Objet flottant -observe.common.floatline1Length=Orin 1 (m) -observe.common.floatline2Length=Orin 2 (m) -observe.common.floatlinesComposition=Orins -observe.common.floatlinesCompositionProportionSum=Somme des proportions d'orins (%) -observe.common.formsUrl=URL des formulaires -observe.common.fpaZone=Zone FPA -observe.common.gaugeLabel=Libellé jauge -observe.common.gear=Equipement -observe.common.gearCaracteristicType=Type de caractéristique -observe.common.gearUseFeaturesSeine=Équipements -observe.common.gonadeWeight=Poids des gonades (g) -observe.common.haulingBreaks=Nombre de coupures -observe.common.haulingDirectionSameAsSetting=Sens du virage identique à celui du filage -observe.common.haulingEndLatitude=Latitude de fin de virage -observe.common.haulingEndLongitude=Longitude de fin de virage -observe.common.haulingEndQuadrant=Quadrant de fin de virage -observe.common.haulingEndTimeStamp=Horodatage fin -observe.common.haulingStartLatitude=Latitude de début de virage -observe.common.haulingStartLongitude=Longitude de début de virage -observe.common.haulingStartQuadrant=Quadrant de début de virage -observe.common.haulingStartTimeStamp=Horodatage début -observe.common.homeId=Identifiant -observe.common.hookOffset=Offset hameçon (°) -observe.common.hookPosition=Position de l'hameçon -observe.common.hookSize=Taille d'hameçon -observe.common.hookType=Type d'hameçon -observe.common.hooksComposition=Hameçons -observe.common.hooksCompositionProportionSum=Somme des proportions d'hameçons (%) -observe.common.individualSize=Taille (cm) -observe.common.individualWeight=Poids (kg) -observe.common.inputOutputFormula=Formule entrée -> sortie -observe.common.iso2Code=code ISO-2 -observe.common.iso3Code=Code ISO-3 -observe.common.itemHorizontalPosition=Position sur la ligne -observe.common.itemVerticalPosition=Position verticale -observe.common.keelCode=Code quille -observe.common.label=Libellé -observe.common.label1=Libellé anglais -observe.common.label2=Libellé français -observe.common.label3=Libellé espagnol -observe.common.landingHarbour=Port d'arrivée -observe.common.lastName=Nom -observe.common.latitude=Latitude -observe.common.length=Longueur hors tout -observe.common.lengthWeightFormula=Relation Poids -observe.common.lightsticksColor=Couleur de cyalumes -observe.common.lightsticksPerBasketCount=Nombre de cyalumes par panier -observe.common.lightsticksType=Type de cyalumes -observe.common.lineType=Type de ligne -observe.common.locode=Locode -observe.common.longitude=Longitude -observe.common.maturityStatus=Maturité sexuelle -observe.common.maxDepthTargeted=Profondeur maximum ciblée -observe.common.maxGearDepth=Profondeur maximum (m) -observe.common.meanLength=Taille moyenne (en cm) -observe.common.meanWeight=Poids moyen (en Kg) -observe.common.name=Nom -observe.common.nonTargetCatch=Faune accessoire conservée ou rejetée -observe.common.nonTargetCatchReleaseStatusType=État à la libération -observe.common.number=Nombre -observe.common.objectFate=Devenir de l'objet -observe.common.objectMaterialType=Type -observe.common.objectOperation=Opération sur l'objet -observe.common.objectType=Type d'objet -observe.common.observedSystem=Système observé -observe.common.observedSystemDistance=Distance système observé (en milles avec 1 décimale) -observe.common.observer=Observateur -observe.common.ocean=Océan -observe.common.organism=Organisme -observe.common.outputInputFormula=Formule sortie -> entrée -observe.common.power=Puissance moteur principal -observe.common.proportion=Proportion (%) -observe.common.quadrant=Quadrant -observe.common.reasonForDiscard=Raison rejet -observe.common.reasonForNoFishing=Raison de non coup de Senne -observe.common.reasonForNullSet=Cause coup nul -observe.common.releaseTime=Heure de libération -observe.common.reportsUrl=URL de rapport -observe.common.route=Route -observe.common.schoolEstimate=Estimation banc -observe.common.schoolMeanDepth=Profondeur moyenne (m) -observe.common.schoolThickness=Épaisseur du banc (m) -observe.common.schoolTopDepth=Profondeur sommet (m) -observe.common.scientificLabel=Libellé scientifique -observe.common.seaSurfaceTemperature=Température surface (°) -observe.common.searchMaximum=Vitesse maximale -observe.common.section=Section -observe.common.sensorBrand=Marque -observe.common.sensorDataFormat=Format de données -observe.common.sensorSerialNo=Numéro de série -observe.common.sensorType=Type -observe.common.settingEndLatitude=Latitude de fin de filage -observe.common.settingEndLongitude=Longitude de fin de filage -observe.common.settingEndQuadrant=Quadrant de fin de filage -observe.common.settingEndTimeStamp=Horodatage fin -observe.common.settingIdentifier=Filage -observe.common.settingShape=Forme du filage -observe.common.settingStartLatitude=Latitude de début de filage -observe.common.settingStartLongitude=Longitude de début de filage -observe.common.settingStartQuadrant=Quadrant de début de filage -observe.common.settingStartTimeStamp=Horodatage début -observe.common.settingVesselSpeed=Vitesse bateau (nd) -observe.common.sex=Sexe -observe.common.shipOwner=Armateur -observe.common.shooterSpeed=Vitesse shooter (nd) -observe.common.sizeMeasureType=Type de mensuration -observe.common.snapWeight=Poids snap (kg) -observe.common.species=Espèce -observe.common.speciesCatch=Espèce -observe.common.speciesFate=Devenir espèce -observe.common.speciesGroup=Groupe espèce -observe.common.speciesGroupReleaseMode=Mode de libération -observe.common.speciesGroupReleaseStatus=État à la libération -observe.common.speciesStatus=Statut faune observée -observe.common.speedRange=Libellé vitesse vent -observe.common.startDate=Début de validité -observe.common.startLogValue=Loch du matin (milles) -observe.common.startTime=Date - Heure de début de validité -observe.common.status=Statut -observe.common.stomacFullness=État de l'estomac -observe.common.supportVesselName=Nom supply -observe.common.surroundingActivity=Activité environnante -observe.common.swivelWeight=Poids de l'émerillon (kg) -observe.common.targetCatch=Capture cible -observe.common.time=Heure -observe.common.timeBetweenHooks=Temps entre hameçons (s) -observe.common.topType=Type -observe.common.totalBasketsCount=Nombre de paniers -observe.common.totalCount=Nombre estimé -observe.common.totalHooksCount=Nombre total d'avançons -observe.common.totalSectionsCount=Nombre total de sections -observe.common.totalWeight=Poids -observe.common.tracelineLength=Partie basse (m) -observe.common.tracelineType=Type bas de ligne -observe.common.transmittingBuoyOperation=Opération balise -observe.common.transmittingBuoyType=Type de balise -observe.common.tripType=Type de marée -observe.common.type=Type -observe.common.uri=URI -observe.common.vessel=Bateau -observe.common.vesselActivityLongline=Activité bateau -observe.common.vesselSizeCategory=Catégorie de bateau -observe.common.vesselSpeed=Vitesse bateau (nd) -observe.common.vesselType=Type de pêcherie -observe.common.waveHeight=Libellé Hauteur moyenne vagues -observe.common.weight=Poids (en t) -observe.common.weightCategory=Catégorie de poids -observe.common.weightLengthFormula=Relation Taille -observe.common.well=Cuve -observe.common.wind=Vent Beaufort -observe.common.wormsId=Worms -observe.common.yearService=Année de mise en service validator.service.activity.bound.latitude=La latitude doit être comprise entre %1$s et %2$s. validator.service.activity.bound.longitude=La longitude doit être comprise entre %1$s et %2$s. validator.service.activity.bound.seaSurfaceTemperature=La température doit être comprise entre %1$s et %2$s. @@ -305,6 +101,7 @@ validator.service.floatingObject.required.comment.for.type=Un commentaire est re validator.service.floatingObject.required.objectFate=La sélection d'un devenir d'objet est conseillée. validator.service.floatingObject.required.objectOperation=La sélection d'une opération d'objet est obligatoire. validator.service.floatingObject.required.type=La sélection d'un type d'objet est obligatoire. +validator.service.floatingObject.size.supportVesselName=La taille du nom supply est limitée à 1024 caractères. validator.service.floatlinesComposition.bound.length=La longueur doit être comprise entre %s et %s. validator.service.floatlinesComposition.bound.proportion=La proportion doit être comprise entre %s et %s. validator.service.floatlinesComposition.desactivated.lineType=Le type sélectionnée est désactivée. ===================================== services/pom.xml ===================================== --- a/services/pom.xml +++ b/services/pom.xml @@ -231,8 +231,6 @@ </execution> </executions> </plugin> - - </plugins> </build> ===================================== services/src/main/java/fr/ird/observe/services/ObserveDtoInitializer.java ===================================== --- a/services/src/main/java/fr/ird/observe/services/ObserveDtoInitializer.java +++ b/services/src/main/java/fr/ird/observe/services/ObserveDtoInitializer.java @@ -1142,18 +1142,21 @@ class ObserveDtoInitializer { n("observe.type.setLonglineCatch"); - n("observe.type.setLonglineCatches"); flushData(dataDefinitionBuilder(SetLonglineCatchDto.class)); } @Override public void initSetLonglineDetailCompositionDto() { + n("observe.type.setLonglineDetailComposition"); + n("observe.type.setLonglineDetailCompositions"); flushData(dataDefinitionBuilder(SetLonglineDetailCompositionDto.class)); } @Override public void initSetLonglineGlobalCompositionDto() { + n("observe.type.setLonglineGlobalComposition"); + n("observe.type.setLonglineGlobalCompositions"); flushData(dataDefinitionBuilder(SetLonglineGlobalCompositionDto.class)); } @@ -1169,10 +1172,7 @@ class ObserveDtoInitializer { @Override public void initSizeMeasureDto() { - - n("observe.type.sizeMeasure"); - n("observe.type.sizeMeasures"); flushData(dataDefinitionBuilder(SizeMeasureDto.class) .addProperty(String.class, SizeMeasureDto.PROPERTY_SIZE_MEASURE_TYPE) @@ -1181,10 +1181,7 @@ class ObserveDtoInitializer { @Override public void initTdrDto() { - - n("observe.type.tdr"); - n("observe.type.tdrs"); flushData(dataDefinitionBuilder(TdrDto.class).addProperty(String.class, TdrDto.PROPERTY_HOME_ID)); } ===================================== services/src/main/java/fr/ird/observe/services/decoration/ObserveI18nDecoratorHelper.java ===================================== --- a/services/src/main/java/fr/ird/observe/services/decoration/ObserveI18nDecoratorHelper.java +++ b/services/src/main/java/fr/ird/observe/services/decoration/ObserveI18nDecoratorHelper.java @@ -33,6 +33,7 @@ import org.apache.commons.lang3.StringUtils; import org.atteo.evo.inflector.English; +import static org.nuiton.i18n.I18n.n; import static org.nuiton.i18n.I18n.t; /** @@ -111,4 +112,215 @@ public class ObserveI18nDecoratorHelper { return getUnchecked((Class) key); } } + + static { + n("observe.common.activityLongline"); + n("observe.common.activitySeine"); + n("observe.common.baitHaulingStatus"); + n("observe.common.baitSettingStatus"); + n("observe.common.baitType"); + n("observe.common.baitsComposition"); + n("observe.common.baitsCompositionProportionSum"); + n("observe.common.basket"); + n("observe.common.basketsPerSectionCount"); + n("observe.common.branchline"); + n("observe.common.branchlineLength"); + n("observe.common.branchlinesComposition"); + n("observe.common.branchlinesCompositionProportionSum"); + n("observe.common.branchlinesPerBasketCount"); + n("observe.common.brandName"); + n("observe.common.capacity"); + n("observe.common.capacityLabel"); + n("observe.common.captain"); + n("observe.common.catchFateLongline"); + n("observe.common.catchHealthness"); + n("observe.common.catchWeight"); + n("observe.common.changeDate"); + n("observe.common.code"); + n("observe.common.coefficients"); + n("observe.common.comment"); + n("observe.common.count"); + n("observe.common.country"); + n("observe.common.currentDirection"); + n("observe.common.currentFpaZone"); + n("observe.common.currentSpeed"); + n("observe.common.dataEntryOperator"); + n("observe.common.date"); + n("observe.common.departureHarbour"); + n("observe.common.deployementEnd"); + n("observe.common.description"); + n("observe.common.detectionMode"); + n("observe.common.detectionTime"); + n("observe.common.discardHealthness"); + n("observe.common.distance"); + n("observe.common.encounterType"); + n("observe.common.endDate"); + n("observe.common.endLogValue"); + n("observe.common.endPursingDate"); + n("observe.common.endPursingTimeStamp"); + n("observe.common.endSetDate"); + n("observe.common.endSetTimeStamp"); + n("observe.common.faoCode"); + n("observe.common.firstName"); + n("observe.common.fishingEnd"); + n("observe.common.fishingStart"); + n("observe.common.flagCountry"); + n("observe.common.fleetCountry"); + n("observe.common.floatingObjectEmpty"); + n("observe.common.floatline1Length"); + n("observe.common.floatline2Length"); + n("observe.common.floatlinesComposition"); + n("observe.common.floatlinesCompositionProportionSum"); + n("observe.common.formsUrl"); + n("observe.common.fpaZone"); + n("observe.common.gaugeLabel"); + n("observe.common.gear"); + n("observe.common.gearCaracteristicType"); + n("observe.common.gearType"); + n("observe.common.gearUseFeaturesLongline"); + n("observe.common.gearUseFeaturesSeine"); + n("observe.common.gonadeWeight"); + n("observe.common.haulingBreaks"); + n("observe.common.haulingDirectionSameAsSetting"); + n("observe.common.haulingEndLatitude"); + n("observe.common.haulingEndLongitude"); + n("observe.common.haulingEndQuadrant"); + n("observe.common.haulingEndTimeStamp"); + n("observe.common.haulingStartLatitude"); + n("observe.common.haulingStartLongitude"); + n("observe.common.haulingStartQuadrant"); + n("observe.common.haulingStartTimeStamp"); + n("observe.common.homeId"); + n("observe.common.hookOffset"); + n("observe.common.hookPosition"); + n("observe.common.hookSize"); + n("observe.common.hookType"); + n("observe.common.hooksComposition"); + n("observe.common.hooksCompositionProportionSum"); + n("observe.common.individualSize"); + n("observe.common.individualWeight"); + n("observe.common.inputOutputFormula"); + n("observe.common.inputSizeMeasureType"); + n("observe.common.iso2Code"); + n("observe.common.iso3Code"); + n("observe.common.itemHorizontalPosition"); + n("observe.common.itemVerticalPosition"); + n("observe.common.keelCode"); + n("observe.common.label"); + n("observe.common.label1"); + n("observe.common.label2"); + n("observe.common.label3"); + n("observe.common.landingHarbour"); + n("observe.common.lastName"); + n("observe.common.latitude"); + n("observe.common.length"); + n("observe.common.lengthWeightFormula"); + n("observe.common.lightsticksColor"); + n("observe.common.lightsticksPerBasketCount"); + n("observe.common.lightsticksType"); + n("observe.common.lineType"); + n("observe.common.locode"); + n("observe.common.longitude"); + n("observe.common.maturityStatus"); + n("observe.common.maxDepthTargeted"); + n("observe.common.maxGearDepth"); + n("observe.common.meanLength"); + n("observe.common.meanWeight"); + n("observe.common.name"); + n("observe.common.nextFpaZone"); + n("observe.common.nonTargetCatch"); + n("observe.common.nonTargetCatchReleaseStatus"); + n("observe.common.number"); + n("observe.common.objectOperation"); + n("observe.common.objectType"); + n("observe.common.observedSystem"); + n("observe.common.observedSystemDistance"); + n("observe.common.observer"); + n("observe.common.ocean"); + n("observe.common.organism"); + n("observe.common.outputInputFormula"); + n("observe.common.outputSizeMeasureType"); + n("observe.common.power"); + n("observe.common.previousFpaZone"); + n("observe.common.proportion"); + n("observe.common.quadrant"); + n("observe.common.reasonForDiscard"); + n("observe.common.reasonForNoFishing"); + n("observe.common.reasonForNullSet"); + n("observe.common.releaseTime"); + n("observe.common.reportsUrl"); + n("observe.common.route"); + n("observe.common.schoolEstimate"); + n("observe.common.schoolMeanDepth"); + n("observe.common.schoolThickness"); + n("observe.common.schoolTopDepth"); + n("observe.common.scientificLabel"); + n("observe.common.seaSurfaceTemperature"); + n("observe.common.searchMaximum"); + n("observe.common.section"); + n("observe.common.sensorBrand"); + n("observe.common.sensorDataFormat"); + n("observe.common.sensorSerialNo"); + n("observe.common.sensorType"); + n("observe.common.settingEndLatitude"); + n("observe.common.settingEndLongitude"); + n("observe.common.settingEndQuadrant"); + n("observe.common.settingEndTimeStamp"); + n("observe.common.settingIdentifier"); + n("observe.common.settingShape"); + n("observe.common.settingStartLatitude"); + n("observe.common.settingStartLongitude"); + n("observe.common.settingStartQuadrant"); + n("observe.common.settingStartTimeStamp"); + n("observe.common.settingVesselSpeed"); + n("observe.common.sex"); + n("observe.common.shipOwner"); + n("observe.common.shooterSpeed"); + n("observe.common.sizeMeasureType"); + n("observe.common.snapWeight"); + n("observe.common.species"); + n("observe.common.speciesCatch"); + n("observe.common.speciesFate"); + n("observe.common.speciesGroup"); + n("observe.common.speciesGroupReleaseMode"); + n("observe.common.speciesStatus"); + n("observe.common.speedRange"); + n("observe.common.startDate"); + n("observe.common.startLogValue"); + n("observe.common.startTime"); + n("observe.common.status"); + n("observe.common.stomacFullness"); + n("observe.common.supportVesselName"); + n("observe.common.surroundingActivity"); + n("observe.common.swivelWeight"); + n("observe.common.targetCatch"); + n("observe.common.time"); + n("observe.common.timeBetweenHooks"); + n("observe.common.topType"); + n("observe.common.totalBasketsCount"); + n("observe.common.totalCount"); + n("observe.common.totalHooksCount"); + n("observe.common.totalSectionsCount"); + n("observe.common.totalWeight"); + n("observe.common.tracelineLength"); + n("observe.common.tracelineType"); + n("observe.common.transmittingBuoyOperation"); + n("observe.common.transmittingBuoyType"); + n("observe.common.tripType"); + n("observe.common.uri"); + n("observe.common.vessel"); + n("observe.common.vesselActivityLongline"); + n("observe.common.vesselActivitySeine"); + n("observe.common.vesselSizeCategory"); + n("observe.common.vesselSpeed"); + n("observe.common.vesselType"); + n("observe.common.waveHeight"); + n("observe.common.weight"); + n("observe.common.weightCategory"); + n("observe.common.weightLengthFormula"); + n("observe.common.well"); + n("observe.common.wind"); + n("observe.common.wormsId"); + n("observe.common.yearService"); + } } ===================================== services/src/main/resources/i18n/services_en_GB.properties ===================================== --- a/services/src/main/resources/i18n/services_en_GB.properties +++ b/services/src/main/resources/i18n/services_en_GB.properties @@ -1,15 +1,138 @@ +observe.common.activityLongline=Activity +observe.common.activitySeine=Activity +observe.common.baitHaulingStatus=Bait hauling status +observe.common.baitSettingStatus=Bait setting status +observe.common.baitType=Bait type +observe.common.baitsComposition=Baits composition +observe.common.baitsCompositionProportionSum=Baits composition proportion sum +observe.common.basket=Basket +observe.common.basketsPerSectionCount=Basket per section count +observe.common.branchline=Branchline +observe.common.branchlineLength=Branchline length +observe.common.branchlinesComposition=Branchlines composition +observe.common.branchlinesCompositionProportionSum=Branchlines composition proportion sum +observe.common.branchlinesPerBasketCount=Branchlines per basket count +observe.common.brandName=Brand name +observe.common.capacity=Capacity +observe.common.capacityLabel=Capacity label +observe.common.captain=Captain +observe.common.catchFateLongline=Catch fate +observe.common.catchHealthness=Catch healthness +observe.common.catchWeight=Catch weight +observe.common.changeDate=Change date +observe.common.code=Code +observe.common.coefficients=Coefficients +observe.common.comment=Comment +observe.common.count=Count +observe.common.country=Country +observe.common.currentDirection=Current direction +observe.common.currentFpaZone=Current Fpa zone +observe.common.currentSpeed=Current speed +observe.common.dataEntryOperator=Data entry operator +observe.common.date=Date +observe.common.daysAtSeaCount=Days at sea count +observe.common.departureHarbour=Departure harbour +observe.common.deployementEnd=Deployement end +observe.common.description=Description +observe.common.detectionMode=Detection mode +observe.common.detectionTime=Detection time +observe.common.discardHealthness=Discard healthness +observe.common.distance=Distance +observe.common.encounterType=Encounter type +observe.common.endDate=End date +observe.common.endLogValue=End log value +observe.common.endPursingDate=End pursing date +observe.common.endPursingTimeStamp=End pursing timestamp +observe.common.endSetDate=End set date +observe.common.endSetTimeStamp=End set timestamp observe.common.faoCode=Fao code +observe.common.firstName=First name +observe.common.fishingEnd=Fishing end +observe.common.fishingStart=Fishing start +observe.common.flagCountry=Flag country +observe.common.fleetCountry=Fleet country +observe.common.floatingObject=Floating object +observe.common.floatingObjectEmpty=Empty floating object +observe.common.floatline1Length=floatline 1 length +observe.common.floatline2Length=floatline 2 length +observe.common.floatlinesComposition=floatlines composition +observe.common.floatlinesCompositionProportionSum=floatlines composition proportion sum +observe.common.formsUrl=Forms url +observe.common.fpaZone=Fpa zone +observe.common.gaugeLabel=Gauge label +observe.common.gear=Gear +observe.common.gearCaracteristicType=Gear caracteristic type +observe.common.gearType=Gear type +observe.common.gearUseFeaturesLongline=Gear use features +observe.common.gearUseFeaturesSeine=Gear use features +observe.common.gonadeWeight=Gonade weight observe.common.gps.activity=Activity observe.common.gps.gpsPoint=Gps point +observe.common.haulingBreaks=Hauling breaks +observe.common.haulingDirectionSameAsSetting=Hauling direction same as setting +observe.common.haulingEndLatitude=Hauling end latitude +observe.common.haulingEndLongitude=Hauling end longitude +observe.common.haulingEndQuadrant=Hauling end quadrant +observe.common.haulingEndTimeStamp=Hauling end timeStamp observe.common.haulingIdentifier=Hauling identifier +observe.common.haulingStartLatitude=Hauling start latitude +observe.common.haulingStartLongitude=Hauling start longitude +observe.common.haulingStartQuadrant=Hauling start quadrant +observe.common.haulingStartTimeStamp=Hauling start timeStamp observe.common.homeId=Home id +observe.common.hookOffset=Hook offset +observe.common.hookPosition=Hook position +observe.common.hookSize=Hook size +observe.common.hookType=Hook type +observe.common.hooksComposition=hooks composition +observe.common.hooksCompositionProportionSum=hooks composition proportion sum observe.common.inconnu=Unknown +observe.common.individualSize=Individual size +observe.common.individualWeight=Individual weight observe.common.inputOutputFormula=Input to Output formula +observe.common.inputSizeMeasureType=Input size measure type +observe.common.iso2Code=Iso 2 code +observe.common.iso3Code=Iso 3 code +observe.common.itemHorizontalPosition=Item horizontal position +observe.common.itemVerticalPosition=Item vertical position +observe.common.keelCode=Keel code observe.common.label=Label +observe.common.label1=English label +observe.common.label2=French label +observe.common.label3=Spanish label +observe.common.landingHarbour=Landing harbour +observe.common.lastName=Last name +observe.common.latitude=Latitude +observe.common.length=Length observe.common.lengthWeightFormula=Length weight formula +observe.common.lightsticksColor=Lightsticks color +observe.common.lightsticksPerBasketCount=Lightsticks per basket count +observe.common.lightsticksType=Lightsticks type +observe.common.lineType=Line type +observe.common.locode=Locode +observe.common.longitude=Longitude +observe.common.maturityStatus=Maturity status +observe.common.maxDepthTargeted=Max depth targeted +observe.common.maxGearDepth=Max gear depth +observe.common.meanLength=Mean length +observe.common.meanWeight=Mean weight +observe.common.name=Name +observe.common.nextFpaZone=Next Fpa zone observe.common.nocode=Nocode +observe.common.nonTargetCatch=Non target catch +observe.common.nonTargetCatchReleaseStatus=Release state +observe.common.nonTargetCatchReleaseStatusType=Release state observe.common.none=None +observe.common.number=Number +observe.common.objectFate=Object fate +observe.common.objectMaterialType=Type +observe.common.objectOperation=Object operation +observe.common.objectType=Object type +observe.common.observedSystem=Observed system +observe.common.observedSystemDistance=Observed system distance +observe.common.observer=Observed observe.common.observerLabel=Observer label +observe.common.ocean=Ocean observe.common.ocean/label1=Ocean observe.common.ocean/label2=Ocean observe.common.ocean/label3=Ocean @@ -18,11 +141,82 @@ observe.common.ocean/label5=Ocean observe.common.ocean/label6=Ocean observe.common.ocean/label7=Ocean observe.common.ocean/label8=Ocean +observe.common.organism=Organism +observe.common.outputInputFormula=Output to Input formula +observe.common.outputSizeMeasureType=Output size measure type +observe.common.power=Power +observe.common.previousFpaZone=Previous Fpa zone observe.common.program=Program +observe.common.proportion=Proportion +observe.common.quadrant=Quadrant +observe.common.reasonForDiscard=Reason for discad +observe.common.reasonForNoFishing=Reason for no fishing +observe.common.reasonForNullSet=Reason for null set +observe.common.releaseTime=Release time +observe.common.reportsUrl=Reports url +observe.common.route=Route +observe.common.schoolEstimate=School estimate +observe.common.schoolMeanDepth=School mean depth +observe.common.schoolThickness=School thickness +observe.common.schoolTopDepth=School top depth observe.common.scientificLabel=Scientific label +observe.common.seaSurfaceTemperature=Sea surface temperature +observe.common.searchMaximum=Search maximum +observe.common.section=Section +observe.common.sensorBrand=Sensor brand +observe.common.sensorDataFormat=Sensor data format +observe.common.sensorSerialNo=Sensor serial no +observe.common.sensorType=Sensor type +observe.common.settingEndLatitude=Setting end latitude +observe.common.settingEndLongitude=Setting end longitude +observe.common.settingEndQuadrant=Setting end quadrant +observe.common.settingEndTimeStamp=Setting end timeStamp observe.common.settingIdentifier=Setting +observe.common.settingShape=Setting shape +observe.common.settingStartLatitude=Setting start latitude +observe.common.settingStartLongitude=Setting start longitude +observe.common.settingStartQuadrant=Setting start quadrant +observe.common.settingStartTimeStamp=Setting start timeStamp +observe.common.settingVesselSpeed=Setting vessel speed observe.common.sex=Sex +observe.common.shipOwner=Ship owner +observe.common.shooterSpeed=Shooter speed +observe.common.sizeMeasureType=Size measure type +observe.common.snapWeight=Snap weight +observe.common.species=Species observe.common.species/scientificLabel=Scientific label +observe.common.speciesCatch=Species +observe.common.speciesFate=Species fate +observe.common.speciesGroup=Species group +observe.common.speciesGroupReleaseMode=Release mode +observe.common.speciesGroupReleaseStatus=Release state +observe.common.speciesStatus=Species status +observe.common.speedRange=Speed range +observe.common.startDate=Start date +observe.common.startLogValue=Start log value +observe.common.startTime=Sart time +observe.common.status=Status +observe.common.stomacFullness=Stomac fullness +observe.common.supportVesselName=Support vessel name +observe.common.surroundingActivity=Surrounding activity +observe.common.swivelWeight=Swivel weight +observe.common.targetCatch=Target catch +observe.common.time=Time +observe.common.timeBetweenHooks=Time between hooks +observe.common.topType=Top type +observe.common.totalBasketsCount=Total baskets count +observe.common.totalCount=Count +observe.common.totalHooksCount=Total hooks count +observe.common.totalSectionsCount=Total section count +observe.common.totalWeight=Total weight +observe.common.tracelineLength=Traceline length +observe.common.tracelineType=Traceline type +observe.common.transmittingBuoyOperation=Transmitting buoy operation +observe.common.transmittingBuoyType=Transmitting buoy type +observe.common.tripType=Trip type +observe.common.type=Type +observe.common.uri=Uri +observe.common.vessel=Boat observe.common.vessel/label1=Vessel observe.common.vessel/label2=Vessel observe.common.vessel/label3=Vessel @@ -31,6 +225,8 @@ observe.common.vessel/label5=Vessel observe.common.vessel/label6=Vessel observe.common.vessel/label7=Vessel observe.common.vessel/label8=Vessel +observe.common.vesselActivityLongline=Vessel activity +observe.common.vesselActivitySeine=Vessel activity observe.common.vesselActivitySeine/label1=Vessel activity observe.common.vesselActivitySeine/label2=Vessel activity observe.common.vesselActivitySeine/label3=Vessel activity @@ -39,6 +235,17 @@ observe.common.vesselActivitySeine/label5=Vessel activity observe.common.vesselActivitySeine/label6=Vessel activity observe.common.vesselActivitySeine/label7=Vessel activity observe.common.vesselActivitySeine/label8=Vessel activity +observe.common.vesselSizeCategory=Vessel size category +observe.common.vesselSpeed=Vessel spped +observe.common.vesselType=Vessel type +observe.common.waveHeight=Wave weight +observe.common.weight=Weight +observe.common.weightCategory=Weight category +observe.common.weightLengthFormula=Weight length formula +observe.common.well=Well +observe.common.wind=Wind +observe.common.wormsId=Worms id +observe.common.yearService=Year service observe.type.activityLongline=Activity observe.type.activityLonglineEncounter=Encounter observe.type.activityLonglineEncounters=Encounters ===================================== services/src/main/resources/i18n/services_es_ES.properties ===================================== --- a/services/src/main/resources/i18n/services_es_ES.properties +++ b/services/src/main/resources/i18n/services_es_ES.properties @@ -1,15 +1,138 @@ +observe.common.activityLongline=Actividad +observe.common.activitySeine=Actividad +observe.common.baitHaulingStatus=Estatuto del cebo en el arrastre +observe.common.baitSettingStatus=Estatuto del cebo en la calada +observe.common.baitType=Tipo de cebo +observe.common.baitsComposition=Cebo +observe.common.baitsCompositionProportionSum=Suma de los proporciónes de cebo (%) +observe.common.basket=Cesta +observe.common.basketsPerSectionCount=Número de cestas por sección +observe.common.branchline=Arponcillo +observe.common.branchlineLength=Arponcillo (m) +observe.common.branchlinesComposition=Arponcillos +observe.common.branchlinesCompositionProportionSum=Suma de los proporciónes de arponcillos (%) +observe.common.branchlinesPerBasketCount=Número de anzuelos por cesta +observe.common.brandName=Marca +observe.common.capacity=Capacidad de transporte +observe.common.capacityLabel=Texto capacidad +observe.common.captain=Patrón +observe.common.catchFateLongline=Futuro de la captura +observe.common.catchHealthness=Salud a la captura +observe.common.catchWeight=Peso estimado (en t) +observe.common.changeDate=Fecha de carga +observe.common.code=Identificación +observe.common.coefficients=Coeficientes +observe.common.comment=Comentarios +observe.common.count=Número +observe.common.country=País +observe.common.currentDirection=Direction du courant (°) +observe.common.currentFpaZone=Zona FPA actual +observe.common.currentSpeed=Velocidad del corriente (nd) +observe.common.dataEntryOperator=Operador de captación de datos +observe.common.date=Día de observación +observe.common.daysAtSeaCount=Numero de días en el mar +observe.common.departureHarbour=Puerto de embarque +observe.common.deployementEnd=Fin de despliegue +observe.common.description=Descripción +observe.common.detectionMode=Modo de detección +observe.common.detectionTime=Heure de détection \#TODO +observe.common.discardHealthness=Salud al rechazo +observe.common.distance=Distancia (m) +observe.common.encounterType=Tipo de encuentro +observe.common.endDate=Fecha de fin +observe.common.endLogValue=Corredera de tarde (millas) +observe.common.endPursingDate=Fecha de fin de calado de la red +observe.common.endPursingTimeStamp=Fecha - Hora de fin de calado de la red +observe.common.endSetDate=Fecha de fin de calado de la red +observe.common.endSetTimeStamp=Fecha - Hora de fin de validez observe.common.faoCode=Codigo FAO +observe.common.firstName=Número +observe.common.fishingEnd=Fin de pesca +observe.common.fishingStart=Inicio de pesca +observe.common.flagCountry=Bandera +observe.common.fleetCountry=País +observe.common.floatingObject=Objeto flotante +observe.common.floatingObjectEmpty=Objeto flotante vacía +observe.common.floatline1Length=Orinque 1 (m) +observe.common.floatline2Length=Orinque 2 (m) +observe.common.floatlinesComposition=Orinques +observe.common.floatlinesCompositionProportionSum=Suma de los proporciónes de los orinques (%) +observe.common.formsUrl=URL de los formularios +observe.common.fpaZone=Zona FPA +observe.common.gaugeLabel=Texto «Capacidad» +observe.common.gear=Equipamiento +observe.common.gearCaracteristicType=Tipo de característica de equipamientos +observe.common.gearType=Tipo de arte de pesca +observe.common.gearUseFeaturesLongline=Equipamiento +observe.common.gearUseFeaturesSeine=Equipamiento +observe.common.gonadeWeight=Peso de las gonadas (g) observe.common.gps.activity=Actividad observe.common.gps.gpsPoint=Punto GPS +observe.common.haulingBreaks=Número de cortes +observe.common.haulingDirectionSameAsSetting=Sentido del arrastre idéntico a lo de la calada +observe.common.haulingEndLatitude=Arrastre Latitud +observe.common.haulingEndLongitude=Arrastre Longitud +observe.common.haulingEndQuadrant=Arrastre Quadrant +observe.common.haulingEndTimeStamp=Timestamp de fin observe.common.haulingIdentifier=Arrastre +observe.common.haulingStartLatitude=Arrastre Latitud +observe.common.haulingStartLongitude=Arrastre Longitud +observe.common.haulingStartQuadrant=Arrastre Quadrant +observe.common.haulingStartTimeStamp=Timestamp del inicio observe.common.homeId=Identificador +observe.common.hookOffset=Offset anzuelo (°) +observe.common.hookPosition=Posición del anzuelo +observe.common.hookSize=Tamaño +observe.common.hookType=Tipo de anzuelo +observe.common.hooksComposition=Anzuelos +observe.common.hooksCompositionProportionSum=Suma de los proporciónes de anzuelos (%) observe.common.inconnu=desconocido +observe.common.individualSize=Tamaño (cm) +observe.common.individualWeight=Peso (kg) observe.common.inputOutputFormula=Formule Entrée vers Sortie \#TODO +observe.common.inputSizeMeasureType=Type de mensuration d'entrée \#TODO +observe.common.iso2Code=Código ISO-2 +observe.common.iso3Code=Código ISO-3 +observe.common.itemHorizontalPosition=Localización del elemento sobre la línea principal +observe.common.itemVerticalPosition=Localización del elemento sobre el arponcillo +observe.common.keelCode=Código de Quilla observe.common.label=Texto +observe.common.label1=Texto en inglés +observe.common.label2=Texto en francés +observe.common.label3=Nombre +observe.common.landingHarbour=Puerto de desembarque +observe.common.lastName=Nombre +observe.common.latitude=Latitud +observe.common.length=Longitud eslora total observe.common.lengthWeightFormula=Relación de peso +observe.common.lightsticksColor=Color de barrita de luz +observe.common.lightsticksPerBasketCount=Número de barrita de luz por cesta +observe.common.lightsticksType=Tipo de barrita de luz +observe.common.lineType=Tipo de línea +observe.common.locode=Locode +observe.common.longitude=Longitude +observe.common.maturityStatus=Maturidad +observe.common.maxDepthTargeted=Profundidad máxima deseada +observe.common.maxGearDepth=Profundidad máxima (m) +observe.common.meanLength=Talla media (en cm) +observe.common.meanWeight=Peso medio (en Kg) +observe.common.name=Nombre +observe.common.nextFpaZone=Zona FPA penetrada observe.common.nocode=codigo ausente +observe.common.nonTargetCatch=Fauna accesoria conservada o descartada +observe.common.nonTargetCatchReleaseStatus=État à la libération \#TODO +observe.common.nonTargetCatchReleaseStatusType=État à la libération \#TODO observe.common.none=Ninguno +observe.common.number=Número +observe.common.objectFate=Devenir de objeto +observe.common.objectMaterialType=Type \#TODO +observe.common.objectOperation=Operación sobre la baliza +observe.common.objectType=Tipo de objeto +observe.common.observedSystem=Sistema observado +observe.common.observedSystemDistance=Distancia al sistema observado (millas con 1 decimal) +observe.common.observer=Observador observe.common.observerLabel=Observador +observe.common.ocean=Océano observe.common.ocean/label1=Océano observe.common.ocean/label2=Océano observe.common.ocean/label3=Océano @@ -18,11 +141,82 @@ observe.common.ocean/label5=Océano observe.common.ocean/label6=Océano observe.common.ocean/label7=Océano observe.common.ocean/label8=Océano +observe.common.organism=Organismo +observe.common.outputInputFormula=Formule Sortie vers Entrée \#TODO +observe.common.outputSizeMeasureType=Type de mensuration de sortie \#TODO +observe.common.power=Potencia del motor principal +observe.common.previousFpaZone=La zona FPA de que se salió observe.common.program=Programa +observe.common.proportion=Proporción (%) +observe.common.quadrant=Quadrant +observe.common.reasonForDiscard=Razón de descarte +observe.common.reasonForNoFishing=Razón de no pesca Senne +observe.common.reasonForNullSet=Causa de lance nulo +observe.common.releaseTime=Heure de libération \#TODO +observe.common.reportsUrl=URL del informe +observe.common.route=Ruta +observe.common.schoolEstimate=Estimación del banco +observe.common.schoolMeanDepth=Profundidad media (m) +observe.common.schoolThickness=Grossor del banco (m) +observe.common.schoolTopDepth=Profundidad de la cumbre (m) observe.common.scientificLabel=Texto científico +observe.common.seaSurfaceTemperature=Temperatura en superficie (°) +observe.common.searchMaximum=Velocidad máxima de prospección +observe.common.section=Sección +observe.common.sensorBrand=Marca de sensor +observe.common.sensorDataFormat=Formato de los datos del sensor +observe.common.sensorSerialNo=Número de serie +observe.common.sensorType=Tipo de sensor +observe.common.settingEndLatitude=Calada Latitud +observe.common.settingEndLongitude=Calada longitud +observe.common.settingEndQuadrant=Calada quadrant +observe.common.settingEndTimeStamp=Timestamp de fin observe.common.settingIdentifier=Calada +observe.common.settingShape=Forma de la calada +observe.common.settingStartLatitude=Calada Latitud +observe.common.settingStartLongitude=Calada longitud +observe.common.settingStartQuadrant=Calada quadrant +observe.common.settingStartTimeStamp=Timestamp de inicio +observe.common.settingVesselSpeed=Velocidad del barco (nd) observe.common.sex=Sexo +observe.common.shipOwner=Armateur \#TODO +observe.common.shooterSpeed=Velocidad shooter (nd) +observe.common.sizeMeasureType=Tipo de medida +observe.common.snapWeight=Peso snap (kg) +observe.common.species=Especie observe.common.species/scientificLabel=Especie +observe.common.speciesCatch=Especie +observe.common.speciesFate=Devenir de fauna +observe.common.speciesGroup=Grupo de especie de fauna +observe.common.speciesGroupReleaseMode=Mode de libération \#TODO +observe.common.speciesGroupReleaseStatus=État à la libération \#TODO +observe.common.speciesStatus=Estado de especie +observe.common.speedRange=Texto velocidad del viento +observe.common.startDate=Fecha de comienzo +observe.common.startLogValue=Corredera de mañana (millas) +observe.common.startTime=Fecha - Heuro de inicio de validez +observe.common.status=Estado +observe.common.stomacFullness=Nivel de llenado del estomago +observe.common.supportVesselName=Nombre del macicero +observe.common.surroundingActivity=Actividad circundante +observe.common.swivelWeight=Peso de el destorcedor (kg) +observe.common.targetCatch=Captura de atún +observe.common.time=Hora +observe.common.timeBetweenHooks=Temps entre anzuelos (s) +observe.common.topType=Tipo parte superior +observe.common.totalBasketsCount=Número total de baskets +observe.common.totalCount=Número estimado +observe.common.totalHooksCount=Número total d'arponcillos +observe.common.totalSectionsCount=Número total de secciones +observe.common.totalWeight=Peso +observe.common.tracelineLength=Parte baja (m) +observe.common.tracelineType=Tipo bajo de línea +observe.common.transmittingBuoyOperation=Operación sobre baliza +observe.common.transmittingBuoyType=Tipo de baliza +observe.common.tripType=Tipo de marea +observe.common.type=Type \#TODO +observe.common.uri=URI +observe.common.vessel=Barco observe.common.vessel/label1=Buque observe.common.vessel/label2=Buque observe.common.vessel/label3=Buque @@ -31,6 +225,8 @@ observe.common.vessel/label5=Buque observe.common.vessel/label6=Buque observe.common.vessel/label7=Buque observe.common.vessel/label8=Buque +observe.common.vesselActivityLongline=Actividad buque +observe.common.vesselActivitySeine=Actividad buque observe.common.vesselActivitySeine/label1=Actividad buque observe.common.vesselActivitySeine/label2=Actividad buque observe.common.vesselActivitySeine/label3=Actividad buque @@ -39,6 +235,17 @@ observe.common.vesselActivitySeine/label5=Actividad buque observe.common.vesselActivitySeine/label6=Actividad buque observe.common.vesselActivitySeine/label7=Actividad buque observe.common.vesselActivitySeine/label8=Actividad buque +observe.common.vesselSizeCategory=Capacidad +observe.common.vesselSpeed=Velocidad del barco (nd) +observe.common.vesselType=Pesquería +observe.common.waveHeight=Texto descriptivo de «altura media de la ola» +observe.common.weight=Peso (en t) +observe.common.weightCategory=Categoría de peso +observe.common.weightLengthFormula=Relación de tallas +observe.common.well=Cuba +observe.common.wind=Fuerza del viento +observe.common.wormsId=Worms +observe.common.yearService=año de entrada en servicio observe.type.activityLongline=Actividad observe.type.activityLonglineEncounter=Encuentro observe.type.activityLonglineEncounters=Encuentros ===================================== services/src/main/resources/i18n/services_fr_FR.properties ===================================== --- a/services/src/main/resources/i18n/services_fr_FR.properties +++ b/services/src/main/resources/i18n/services_fr_FR.properties @@ -1,15 +1,138 @@ +observe.common.activityLongline=Activité +observe.common.activitySeine=Activité +observe.common.baitHaulingStatus=Statut appât au virage +observe.common.baitSettingStatus=Statut appât au filage +observe.common.baitType=Type d'appât +observe.common.baitsComposition=Appâts +observe.common.baitsCompositionProportionSum=Somme des proportions d'appâts (%) +observe.common.basket=Panier +observe.common.basketsPerSectionCount=Nombre de panier par section +observe.common.branchline=Avançon +observe.common.branchlineLength=Longueur Avançon (m) +observe.common.branchlinesComposition=Avançons +observe.common.branchlinesCompositionProportionSum=Somme des proportions d'avançons (%) +observe.common.branchlinesPerBasketCount=Nombre d'hameçons par panier +observe.common.brandName=Marque +observe.common.capacity=Capacité transport (m³) +observe.common.capacityLabel=Libellé capacité +observe.common.captain=Capitaine +observe.common.catchFateLongline=Devenir +observe.common.catchHealthness=Santé à la capture +observe.common.catchWeight=Poids estimé (en t) +observe.common.changeDate=Date changement pavillon +observe.common.code=Identifiant +observe.common.coefficients=Coefficients +observe.common.comment=Commentaire +observe.common.count=Nombre +observe.common.country=Pays +observe.common.currentDirection=Direction du courant (°) +observe.common.currentFpaZone=Zone FPA actuelle +observe.common.currentSpeed=Vitesse du courant (nd) +observe.common.dataEntryOperator=Saisisseur +observe.common.date=Jour d'observation +observe.common.daysAtSeaCount=Nombre de jours à l'eau +observe.common.departureHarbour=Port de départ +observe.common.deployementEnd=Fin déploiement +observe.common.description=Description +observe.common.detectionMode=Mode détection +observe.common.detectionTime=Heure de détection +observe.common.discardHealthness=Santé au rejet +observe.common.distance=Distance (m) +observe.common.encounterType=Type +observe.common.endDate=Fin de validité +observe.common.endLogValue=Loch du soir (milles) +observe.common.endPursingDate=Date de fin coulissage +observe.common.endPursingTimeStamp=Date - Heure de fin coulissage +observe.common.endSetDate=Date fin calée +observe.common.endSetTimeStamp=Date - Heure de fin de validité observe.common.faoCode=Code FAO +observe.common.firstName=Prénom +observe.common.fishingEnd=Fin pêche +observe.common.fishingStart=Début pêche +observe.common.flagCountry=Pavillon +observe.common.fleetCountry=Flotte +observe.common.floatingObject=Objet flottant +observe.common.floatingObjectEmpty=Objet flottant vide +observe.common.floatline1Length=Orin 1 (m) +observe.common.floatline2Length=Orin 2 (m) +observe.common.floatlinesComposition=Orins +observe.common.floatlinesCompositionProportionSum=Somme des proportions d'orins (%) +observe.common.formsUrl=URL des formulaires +observe.common.fpaZone=Zone FPA +observe.common.gaugeLabel=Libellé jauge +observe.common.gear=Equipement +observe.common.gearCaracteristicType=Type de caractéristique +observe.common.gearType=Type d'engin +observe.common.gearUseFeaturesLongline=Équipements +observe.common.gearUseFeaturesSeine=Équipements +observe.common.gonadeWeight=Poids des gonades (g) observe.common.gps.activity=Activité observe.common.gps.gpsPoint=Point GPS +observe.common.haulingBreaks=Nombre de coupures +observe.common.haulingDirectionSameAsSetting=Sens du virage identique à celui du filage +observe.common.haulingEndLatitude=Latitude de fin de virage +observe.common.haulingEndLongitude=Longitude de fin de virage +observe.common.haulingEndQuadrant=Quadrant de fin de virage +observe.common.haulingEndTimeStamp=Horodatage fin observe.common.haulingIdentifier=Virage +observe.common.haulingStartLatitude=Latitude de début de virage +observe.common.haulingStartLongitude=Longitude de début de virage +observe.common.haulingStartQuadrant=Quadrant de début de virage +observe.common.haulingStartTimeStamp=Horodatage début observe.common.homeId=Identifiant +observe.common.hookOffset=Offset hameçon (°) +observe.common.hookPosition=Position de l'hameçon +observe.common.hookSize=Taille d'hameçon +observe.common.hookType=Type d'hameçon +observe.common.hooksComposition=Hameçons +observe.common.hooksCompositionProportionSum=Somme des proportions d'hameçons (%) observe.common.inconnu=inconnu +observe.common.individualSize=Taille (cm) +observe.common.individualWeight=Poids (kg) observe.common.inputOutputFormula=Formule entrée -> sortie +observe.common.inputSizeMeasureType=Type de mensuration d'entrée +observe.common.iso2Code=code ISO-2 +observe.common.iso3Code=Code ISO-3 +observe.common.itemHorizontalPosition=Position sur la ligne +observe.common.itemVerticalPosition=Position verticale +observe.common.keelCode=Code quille observe.common.label=Libellé +observe.common.label1=Libellé anglais +observe.common.label2=Libellé français +observe.common.label3=Libellé espagnol +observe.common.landingHarbour=Port d'arrivée +observe.common.lastName=Nom +observe.common.latitude=Latitude +observe.common.length=Longueur hors tout observe.common.lengthWeightFormula=Relation Poids +observe.common.lightsticksColor=Couleur de cyalumes +observe.common.lightsticksPerBasketCount=Nombre de cyalumes par panier +observe.common.lightsticksType=Type de cyalumes +observe.common.lineType=Type de ligne +observe.common.locode=Locode +observe.common.longitude=Longitude +observe.common.maturityStatus=Maturité sexuelle +observe.common.maxDepthTargeted=Profondeur maximum ciblée +observe.common.maxGearDepth=Profondeur maximum (m) +observe.common.meanLength=Taille moyenne (en cm) +observe.common.meanWeight=Poids moyen (en Kg) +observe.common.name=Nom +observe.common.nextFpaZone=Zone FPA pénétrée observe.common.nocode=code absent +observe.common.nonTargetCatch=Faune accessoire conservée ou rejetée +observe.common.nonTargetCatchReleaseStatus=État à la libération +observe.common.nonTargetCatchReleaseStatusType=État à la libération observe.common.none=Aucun +observe.common.number=Nombre +observe.common.objectFate=Devenir de l'objet +observe.common.objectMaterialType=Type +observe.common.objectOperation=Opération sur l'objet +observe.common.objectType=Type d'objet +observe.common.observedSystem=Système observé +observe.common.observedSystemDistance=Distance système observé (en milles avec 1 décimale) +observe.common.observer=Observateur observe.common.observerLabel=Observateur +observe.common.ocean=Océan observe.common.ocean/label1=Océan observe.common.ocean/label2=Océan observe.common.ocean/label3=Océan @@ -18,11 +141,82 @@ observe.common.ocean/label5=Océan observe.common.ocean/label6=Océan observe.common.ocean/label7=Océan observe.common.ocean/label8=Océan +observe.common.organism=Organisme +observe.common.outputInputFormula=Formule sortie -> entrée +observe.common.outputSizeMeasureType=Type de mensuration de sortie +observe.common.power=Puissance moteur principal +observe.common.previousFpaZone=Zone FPA quittée observe.common.program=Programme +observe.common.proportion=Proportion (%) +observe.common.quadrant=Quadrant +observe.common.reasonForDiscard=Raison rejet +observe.common.reasonForNoFishing=Raison de non coup de Senne +observe.common.reasonForNullSet=Cause coup nul +observe.common.releaseTime=Heure de libération +observe.common.reportsUrl=URL de rapport +observe.common.route=Route +observe.common.schoolEstimate=Estimation banc +observe.common.schoolMeanDepth=Profondeur moyenne (m) +observe.common.schoolThickness=Épaisseur du banc (m) +observe.common.schoolTopDepth=Profondeur sommet (m) observe.common.scientificLabel=Libellé scientifique +observe.common.seaSurfaceTemperature=Température surface (°) +observe.common.searchMaximum=Vitesse maximale +observe.common.section=Section +observe.common.sensorBrand=Marque +observe.common.sensorDataFormat=Format de données +observe.common.sensorSerialNo=Numéro de série +observe.common.sensorType=Type +observe.common.settingEndLatitude=Latitude de fin de filage +observe.common.settingEndLongitude=Longitude de fin de filage +observe.common.settingEndQuadrant=Quadrant de fin de filage +observe.common.settingEndTimeStamp=Horodatage fin observe.common.settingIdentifier=Filage +observe.common.settingShape=Forme du filage +observe.common.settingStartLatitude=Latitude de début de filage +observe.common.settingStartLongitude=Longitude de début de filage +observe.common.settingStartQuadrant=Quadrant de début de filage +observe.common.settingStartTimeStamp=Horodatage début +observe.common.settingVesselSpeed=Vitesse bateau (nd) observe.common.sex=Sexe +observe.common.shipOwner=Armateur +observe.common.shooterSpeed=Vitesse shooter (nd) +observe.common.sizeMeasureType=Type de mensuration +observe.common.snapWeight=Poids snap (kg) +observe.common.species=Espèce observe.common.species/scientificLabel=Espèce +observe.common.speciesCatch=Espèce +observe.common.speciesFate=Devenir espèce +observe.common.speciesGroup=Groupe espèce +observe.common.speciesGroupReleaseMode=Mode de libération +observe.common.speciesGroupReleaseStatus=État à la libération +observe.common.speciesStatus=Statut faune observée +observe.common.speedRange=Libellé vitesse vent +observe.common.startDate=Début de validité +observe.common.startLogValue=Loch du matin (milles) +observe.common.startTime=Date - Heure de début de validité +observe.common.status=Statut +observe.common.stomacFullness=État de l'estomac +observe.common.supportVesselName=Nom supply +observe.common.surroundingActivity=Activité environnante +observe.common.swivelWeight=Poids de l'émerillon (kg) +observe.common.targetCatch=Capture cible +observe.common.time=Heure +observe.common.timeBetweenHooks=Temps entre hameçons (s) +observe.common.topType=Type +observe.common.totalBasketsCount=Nombre de paniers +observe.common.totalCount=Nombre estimé +observe.common.totalHooksCount=Nombre total d'avançons +observe.common.totalSectionsCount=Nombre total de sections +observe.common.totalWeight=Poids +observe.common.tracelineLength=Partie basse (m) +observe.common.tracelineType=Type bas de ligne +observe.common.transmittingBuoyOperation=Opération balise +observe.common.transmittingBuoyType=Type de balise +observe.common.tripType=Type de marée +observe.common.type=Type +observe.common.uri=URI +observe.common.vessel=Bateau observe.common.vessel/label1=Bateau observe.common.vessel/label2=Bateau observe.common.vessel/label3=Bateau @@ -31,6 +225,8 @@ observe.common.vessel/label5=Bateau observe.common.vessel/label6=Bateau observe.common.vessel/label7=Bateau observe.common.vessel/label8=Bateau +observe.common.vesselActivityLongline=Activité bateau +observe.common.vesselActivitySeine=Activité bateau observe.common.vesselActivitySeine/label1=Activité bateau observe.common.vesselActivitySeine/label2=Activité bateau observe.common.vesselActivitySeine/label3=Activité bateau @@ -39,6 +235,17 @@ observe.common.vesselActivitySeine/label5=Activité bateau observe.common.vesselActivitySeine/label6=Activité bateau observe.common.vesselActivitySeine/label7=Activité bateau observe.common.vesselActivitySeine/label8=Activité bateau +observe.common.vesselSizeCategory=Catégorie de bateau +observe.common.vesselSpeed=Vitesse bateau (nd) +observe.common.vesselType=Type de pêcherie +observe.common.waveHeight=Libellé Hauteur moyenne vagues +observe.common.weight=Poids (en t) +observe.common.weightCategory=Catégorie de poids +observe.common.weightLengthFormula=Relation Taille +observe.common.well=Cuve +observe.common.wind=Vent Beaufort +observe.common.wormsId=Worms +observe.common.yearService=Année de mise en service observe.type.activityLongline=Activité observe.type.activityLonglineEncounter=Rencontre observe.type.activityLonglineEncounters=Rencontres ===================================== test/src/main/resources/db/6.901/dataForTestLongline.sql.gz ===================================== Binary files a/test/src/main/resources/db/6.901/dataForTestLongline.sql.gz and b/test/src/main/resources/db/6.901/dataForTestLongline.sql.gz differ ===================================== test/src/main/resources/db/6.901/dataForTestSeine.sql.gz ===================================== Binary files a/test/src/main/resources/db/6.901/dataForTestSeine.sql.gz and b/test/src/main/resources/db/6.901/dataForTestSeine.sql.gz differ ===================================== test/src/main/resources/db/6.901/empty_h2.sql.gz ===================================== Binary files a/test/src/main/resources/db/6.901/empty_h2.sql.gz and b/test/src/main/resources/db/6.901/empty_h2.sql.gz differ ===================================== test/src/main/resources/db/6.901/empty_pg.sql.gz ===================================== Binary files a/test/src/main/resources/db/6.901/empty_pg.sql.gz and b/test/src/main/resources/db/6.901/empty_pg.sql.gz differ ===================================== test/src/main/resources/db/6.901/referentiel.sql.gz ===================================== Binary files a/test/src/main/resources/db/6.901/referentiel.sql.gz and b/test/src/main/resources/db/6.901/referentiel.sql.gz differ ===================================== toolbox-maven-plugin/src/main/java/fr/ird/observe/maven/plugins/toolbox/GenerateI18nValidatorFieldsMojo.java ===================================== --- a/toolbox-maven-plugin/src/main/java/fr/ird/observe/maven/plugins/toolbox/GenerateI18nValidatorFieldsMojo.java +++ b/toolbox-maven-plugin/src/main/java/fr/ird/observe/maven/plugins/toolbox/GenerateI18nValidatorFieldsMojo.java @@ -117,13 +117,13 @@ class GenerateI18nValidatorFieldsMojo extends GenerateValidatorMojoSupport { getLog().info("Generate to " + getOutputFile()); - List<String> compileSourceRoots = getProject().getCompileSourceRoots(); + List<String> compileSourceRoots = getProject().getTestCompileSourceRoots(); if (!compileSourceRoots.contains(outputDirectory.getAbsolutePath())) { - getLog().info("Add to compile source root: " + outputDirectory); + getLog().info("Add to test compile source root: " + outputDirectory); - getProject().addCompileSourceRoot(outputDirectory.getAbsolutePath()); + getProject().addTestCompileSourceRoot(outputDirectory.getAbsolutePath()); } Set<String> fields = new TreeSet<>(); View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/9397b4c723d582d402c5d2e309… --- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/9397b4c723d582d402c5d2e309… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] Remove application-swing-decoration module and move code to services module (closes #804)
by Tony CHEMIT 28 Jul '17

28 Jul '17

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 9397b4c7 by Tony CHEMIT at 2017-07-28T19:11:50+02:00 Remove application-swing-decoration module and move code to services module (closes #804) - - - - - 30 changed files: - CONTRIBUTING.md - − application-swing-decoration/LICENSE.txt - − application-swing-decoration/README.md - − application-swing-decoration/pom.xml - − application-swing-decoration/src/license/THIRD-PARTY.properties - application-swing-validation/pom.xml - application-swing-validation/src/main/java/fr/ird/observe/application/swing/validators/ActivitySimpleSpeedDtoValidator.java - application-swing-validation/src/main/java/fr/ird/observe/application/swing/validators/ActivitySpeedDtoValidator.java - application-swing-validation/src/main/java/fr/ird/observe/application/swing/validators/OpenableDtoFieldValidator.java - application-swing-validation/src/main/java/fr/ird/observe/application/swing/validators/SetLonglineUniqueHomeIdDtoValidator.java - application-swing-validation/src/main/java/fr/ird/observe/application/swing/validators/SetLonglineUniqueNumberDtoValidator.java - application-swing/pom.xml - application-swing/src/main/java/fr/ird/observe/application/swing/ObserveSwingApplicationContext.java - application-swing/src/main/java/fr/ird/observe/application/swing/ui/ObserveMainUIInitializer.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/actions/content/MoveActivityLonglineUIAction.java - application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/content/MoveActivityLonglinesUIAction.java - application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/content/MoveActivitySeineUIAction.java - application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/content/MoveActivitySeinesUIAction.java - application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/content/MoveRouteUIAction.java - application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/content/MoveRoutesUIAction.java - application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/content/MoveTripUIAction.java - application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/menu/config/ReloadResourcesAction.java - application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/menu/config/ShowConfigAction.java - application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/AdminTabUIHandler.java - application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/export/ExportModel.java - application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/export/ExportUIHandler.java - application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/data/DataSynchroUIHandler.java - application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/data/task/DataSynchronizeTaskSupport.java - application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/referential/legacy/ObsoleteReferentialReferenceListCellRenderer.java The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/9397b4c723d582d402c5d2e3094… --- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/9397b4c723d582d402c5d2e3094… You're receiving this email because of your account on gitlab.com.

1 0