Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe

Commits:

3 changed files:

Changes:

  • persistence/src/main/resources/db/migration/6.901/09_fill_object_material-common.sql
    ... ... @@ -21,12 +21,11 @@
    21 21 
     ---
    22 22 
     INSERT INTO observe_seine.objectMaterial (topiaid, topiaversion, topiacreatedate, lastupdatedate, needComment, status, 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);
    23 23 
     INSERT INTO observe_seine.objectMaterial (topiaid, topiaversion, topiacreatedate, lastupdatedate, needComment, status, 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);
    24 
    -INSERT INTO observe_seine.objectMaterial (topiaid, topiaversion, topiacreatedate, lastupdatedate, needComment, status, 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);
    25 
    -INSERT INTO observe_seine.objectMaterial (topiaid, topiaversion, topiacreatedate, lastupdatedate, needComment, status, 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);
    26 
    -INSERT INTO observe_seine.objectMaterial (topiaid, topiaversion, topiacreatedate, lastupdatedate, needComment, status, 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);
    24 
    +INSERT INTO observe_seine.objectMaterial (topiaid, topiaversion, topiacreatedate, lastupdatedate, needComment, status, legacyCode, standardCode, code, parent, label1, label2, label3, selectable, childrenMultiSelectable, childSelectionMandatory, objectMaterialType, validation, biodegradable, nonEntangling) values ('fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.3', 0, CURRENT_DATE, CURRENT_TIMESTAMP, false,  1, NULL           , NULL      , '1-1-1'        , 'fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.2' , 'Raft'                                            , 'Radeau'                                          , 'Parrilla'                                        , true , true , true , 'fr.ird.observe.entities.referentiel.seine.ObjectMaterialType#0#0', NULL                          , false, false);
    27 25 
     INSERT INTO observe_seine.objectMaterial (topiaid, topiaversion, topiacreatedate, lastupdatedate, needComment, status, 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);
    28 26 
     INSERT INTO observe_seine.objectMaterial (topiaid, topiaversion, topiacreatedate, lastupdatedate, needComment, status, 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);
    29 27 
     INSERT INTO observe_seine.objectMaterial (topiaid, topiaversion, topiacreatedate, lastupdatedate, needComment, status, 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);
    28 
    +INSERT INTO observe_seine.objectMaterial (topiaid, topiaversion, topiacreatedate, lastupdatedate, needComment, status, legacyCode, standardCode, code, parent, label1, label2, label3, selectable, childrenMultiSelectable, childSelectionMandatory, objectMaterialType, validation, biodegradable, nonEntangling) values ('fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.84', 0, CURRENT_DATE, CURRENT_TIMESTAMP, false,  0, NULL           , NULL      , '1-1-1-1-3'    , 'fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.6' , 'Mixed vegetal and metallic or PVC'               , NULL                                              , 'Mixta (metálica o PVC y cañas)'                  , false, false, false, NULL                                                              , NULL                          , false, false);
    30 29 
     INSERT INTO observe_seine.objectMaterial (topiaid, topiaversion, topiacreatedate, lastupdatedate, needComment, status, 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);
    31 30 
     INSERT INTO observe_seine.objectMaterial (topiaid, topiaversion, topiacreatedate, lastupdatedate, needComment, status, 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);
    32 31 
     INSERT INTO observe_seine.objectMaterial (topiaid, topiaversion, topiacreatedate, lastupdatedate, needComment, status, legacyCode, standardCode, code, parent, label1, label2, label3, selectable, childrenMultiSelectable, childSelectionMandatory, objectMaterialType, validation, biodegradable, nonEntangling) values ('fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.11', 0, CURRENT_DATE, CURRENT_TIMESTAMP, false,  1, NULL           , NULL      , '1-1-1-2-1-1'  , 'fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.10', 'Net with mesh ≤7cm'                              , 'Filet avec maillage ≤7cm'                        , 'Red con malla ≤7cm'                              , true , false, false, 'fr.ird.observe.entities.referentiel.seine.ObjectMaterialType#0#0', NULL                          , false, false);
    ... ... @@ -43,6 +42,7 @@ INSERT INTO observe_seine.objectMaterial (topiaid, topiaversion, topiacreatedate
    43 42 
     INSERT INTO observe_seine.objectMaterial (topiaid, topiaversion, topiacreatedate, lastupdatedate, needComment, status, 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);
    44 43 
     INSERT INTO observe_seine.objectMaterial (topiaid, topiaversion, topiacreatedate, lastupdatedate, needComment, status, 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);
    45 44 
     INSERT INTO observe_seine.objectMaterial (topiaid, topiaversion, topiacreatedate, lastupdatedate, needComment, status, 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);
    45 
    +INSERT INTO observe_seine.objectMaterial (topiaid, topiaversion, topiacreatedate, lastupdatedate, needComment, status, legacyCode, standardCode, code, parent, label1, label2, label3, selectable, childrenMultiSelectable, childSelectionMandatory, objectMaterialType, validation, biodegradable, nonEntangling) values ('fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.4', 0, CURRENT_DATE, CURRENT_TIMESTAMP, false,  1, NULL           , NULL      , '1-1-2'        , 'fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.6' , 'Subsurface structure'                            , 'Structure immergée'                              , 'Rabo'                                            , false, true , true , NULL                                                              , NULL                          , false, false);
    46 46 
     INSERT INTO observe_seine.objectMaterial (topiaid, topiaversion, topiacreatedate, lastupdatedate, needComment, status, 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);
    47 47 
     INSERT INTO observe_seine.objectMaterial (topiaid, topiaversion, topiacreatedate, lastupdatedate, needComment, status, 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);
    48 48 
     INSERT INTO observe_seine.objectMaterial (topiaid, topiaversion, topiacreatedate, lastupdatedate, needComment, status, legacyCode, standardCode, code, parent, label1, label2, label3, selectable, childrenMultiSelectable, childSelectionMandatory, objectMaterialType, validation, biodegradable, nonEntangling) values ('fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.27', 0, CURRENT_DATE, CURRENT_TIMESTAMP, false,  0, NULL           , NULL      , '1-1-2-1-2'    , 'fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.25', 'Net in sausage with mesh >7cm'                   , 'Filet saucisse avec maillage >7cm'               , 'Red en chorizo con malla >7cm'                   , true , false, false, 'fr.ird.observe.entities.referentiel.seine.ObjectMaterialType#0#0', NULL                          , false, false);
    ... ... @@ -57,6 +57,7 @@ INSERT INTO observe_seine.objectMaterial (topiaid, topiaversion, topiacreatedate
    57 57 
     INSERT INTO observe_seine.objectMaterial (topiaid, topiaversion, topiacreatedate, lastupdatedate, needComment, status, 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);
    58 58 
     INSERT INTO observe_seine.objectMaterial (topiaid, topiaversion, topiacreatedate, lastupdatedate, needComment, status, 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);
    59 59 
     INSERT INTO observe_seine.objectMaterial (topiaid, topiaversion, topiacreatedate, lastupdatedate, needComment, status, 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);
    60 
    +INSERT INTO observe_seine.objectMaterial (topiaid, topiaversion, topiacreatedate, lastupdatedate, needComment, status, legacyCode, standardCode, code, parent, label1, label2, label3, selectable, childrenMultiSelectable, childSelectionMandatory, objectMaterialType, validation, biodegradable, nonEntangling) values ('fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.5', 0, CURRENT_DATE, CURRENT_TIMESTAMP, false,  1, NULL           , NULL      , '1-1-3'        , 'fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.2' , 'Other components'                                , 'Autres éléments'                                 , 'Otros componentes'                               , false, true , false, NULL                                                              , NULL                          , false, false);
    60 61 
     INSERT INTO observe_seine.objectMaterial (topiaid, topiaversion, topiacreatedate, lastupdatedate, needComment, status, 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);
    61 62 
     INSERT INTO observe_seine.objectMaterial (topiaid, topiaversion, topiacreatedate, lastupdatedate, needComment, status, 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);
    62 63 
     INSERT INTO observe_seine.objectMaterial (topiaid, topiaversion, topiacreatedate, lastupdatedate, needComment, status, legacyCode, standardCode, code, parent, label1, label2, label3, selectable, childrenMultiSelectable, childSelectionMandatory, objectMaterialType, validation, biodegradable, nonEntangling) values ('fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.41', 0, CURRENT_DATE, CURRENT_TIMESTAMP, false,  1, NULL           , NULL      , '1-1-3-3'      , 'fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.5' , 'Bags'                                            , 'Sacs'                                            , 'Sacos'                                           , true , false, false, 'fr.ird.observe.entities.referentiel.seine.ObjectMaterialType#0#0', NULL                          , false, false);
    ... ... @@ -64,6 +65,9 @@ INSERT INTO observe_seine.objectMaterial (topiaid, topiaversion, topiacreatedate
    64 65 
     INSERT INTO observe_seine.objectMaterial (topiaid, topiaversion, topiacreatedate, lastupdatedate, needComment, status, 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);
    65 66 
     INSERT INTO observe_seine.objectMaterial (topiaid, topiaversion, topiacreatedate, lastupdatedate, needComment, status, 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);
    66 67 
     INSERT INTO observe_seine.objectMaterial (topiaid, topiaversion, topiacreatedate, lastupdatedate, needComment, status, 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);
    68 
    +INSERT INTO observe_seine.objectMaterial (topiaid, topiaversion, topiacreatedate, lastupdatedate, needComment, status, legacyCode, standardCode, code, parent, label1, label2, label3, selectable, childrenMultiSelectable, childSelectionMandatory, objectMaterialType, validation, biodegradable, nonEntangling) values ('fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.83' , 0, CURRENT_DATE, CURRENT_TIMESTAMP, false,  0, '19'           , NULL      , '1-1-4'        , 'fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.2' , 'Experimental FAD'                                , 'Objet expérimental'                              , 'Objeto experimental'                             , true , false, false, 'fr.ird.observe.entities.referentiel.seine.ObjectMaterialType#0#0', NULL                          , false, false);
    69 
    +INSERT INTO observe_seine.objectMaterial (topiaid, topiaversion, topiacreatedate, lastupdatedate, needComment, status, legacyCode, standardCode, code, parent, label1, label2, label3, selectable, childrenMultiSelectable, childSelectionMandatory, objectMaterialType, validation, biodegradable, nonEntangling) values ('fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.85' , 0, CURRENT_DATE, CURRENT_TIMESTAMP, false,  0, '18'           , NULL      , '1-1-5'        , 'fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.2' , 'Artificial FAD'                                  , 'Objet artificiel'                                , 'Objeto artificial'                               , true , false, false, 'fr.ird.observe.entities.referentiel.seine.ObjectMaterialType#0#0', NULL                          , false, false);
    70 
    +INSERT INTO observe_seine.objectMaterial (topiaid, topiaversion, topiacreatedate, lastupdatedate, needComment, status, legacyCode, standardCode, code, parent, label1, label2, label3, selectable, childrenMultiSelectable, childSelectionMandatory, objectMaterialType, validation, biodegradable, nonEntangling) values ('fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.86' , 0, CURRENT_DATE, CURRENT_TIMESTAMP, false,  1, '27'           , NULL      , '1-1-6'        , 'fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.2' , 'Several FAD entangled'                           , 'Plusieurs FAD'                                   , 'Objectos enredados'                              , true , false, false, 'fr.ird.observe.entities.referentiel.seine.ObjectMaterialType#0#0', NULL                          , false, false);
    67 71 
     INSERT INTO observe_seine.objectMaterial (topiaid, topiaversion, topiacreatedate, lastupdatedate, needComment, status, 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);
    68 72 
     INSERT INTO observe_seine.objectMaterial (topiaid, topiaversion, topiacreatedate, lastupdatedate, needComment, status, 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);
    69 73 
     INSERT INTO observe_seine.objectMaterial (topiaid, topiaversion, topiacreatedate, lastupdatedate, needComment, status, legacyCode, standardCode, code, parent, label1, label2, label3, selectable, childrenMultiSelectable, childSelectionMandatory, objectMaterialType, validation, biodegradable, nonEntangling) values ('fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.48', 0, CURRENT_DATE, CURRENT_TIMESTAMP, false,  1, NULL           , NULL      , '1-2-2'        , 'fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.46', 'Lighting'                                        , 'Eclairage'                                       , 'iluminación'                                     , true , false, false, 'fr.ird.observe.entities.referentiel.seine.ObjectMaterialType#0#0', NULL                          , false, false);
    ... ... @@ -100,8 +104,4 @@ INSERT INTO observe_seine.objectMaterial (topiaid, topiaversion, topiacreatedate
    100 104 
     INSERT INTO observe_seine.objectMaterial (topiaid, topiaversion, topiacreatedate, lastupdatedate, needComment, status, 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);
    101 105 
     INSERT INTO observe_seine.objectMaterial (topiaid, topiaversion, topiacreatedate, lastupdatedate, needComment, status, 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);
    102 106 
     INSERT INTO observe_seine.objectMaterial (topiaid, topiaversion, topiacreatedate, lastupdatedate, needComment, status, 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);
    103 
    -INSERT INTO observe_seine.objectMaterial (topiaid, topiaversion, topiacreatedate, lastupdatedate, needComment, status, 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);
    104 
    -INSERT INTO observe_seine.objectMaterial (topiaid, topiaversion, topiacreatedate, lastupdatedate, needComment, status, 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);
    105 
    -INSERT INTO observe_seine.objectMaterial (topiaid, topiaversion, topiacreatedate, lastupdatedate, needComment, status, 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);
    106 
    -INSERT INTO observe_seine.objectMaterial (topiaid, topiaversion, topiacreatedate, lastupdatedate, needComment, status, 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);
    107 
    -INSERT INTO observe_seine.objectMaterial (topiaid, topiaversion, topiacreatedate, lastupdatedate, needComment, status, 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);
    107 
    +INSERT INTO observe_seine.objectMaterial (topiaid, topiaversion, topiacreatedate, lastupdatedate, needComment, status, legacyCode, standardCode, code, parent, label1, label2, label3, selectable, childrenMultiSelectable, childSelectionMandatory, objectMaterialType, validation, biodegradable, nonEntangling) values ('fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.82', 0, CURRENT_DATE, CURRENT_TIMESTAMP, false,  0, '5*, 6*, 21*'  , NULL      , '6-5'          , 'fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.77', 'Tagged'                                          , 'Balisé'                                          , 'Marcado'                                         , true , false, false, 'fr.ird.observe.entities.referentiel.seine.ObjectMaterialType#0#0', NULL                          , false, false);
    \ No newline at end of file

  • services-local/src/main/java/fr/ird/observe/services/local/service/data/seine/FloatingObjectServiceLocal.java
    ... ... @@ -238,7 +238,7 @@ public class FloatingObjectServiceLocal extends ObserveServiceLocal implements F
    238 238 
         private List<ObjectMaterialHierarchyDto> getObjectMaterialHierarchyDtos(List<ObjectMaterial> objectMaterials) {
    239 239 
             Multimap<String, ObjectMaterial> childrenByParent = ArrayListMultimap.create();
    240 240 
             objectMaterials.forEach(o -> childrenByParent.put(Optional.ofNullable(o.getParent()).map(ObjectMaterial::getTopiaId).orElse(null), o));
    241 
    -        Collection<ObjectMaterial> topLevelMaterials = childrenByParent.get("fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.01");
    241 
    +        Collection<ObjectMaterial> topLevelMaterials = childrenByParent.get(null);
    242 242 
             ReferentialEntityDtoBinderSupport<ObjectMaterialDto, ObserveReferentialEntity> referentialBinder = OBJECT_MATERIAL_SPI.toEntityBinder();
    243 243 
             ReferentialLocale referentialLocale = getReferentialLocale();
    244 244 
             List<ObjectMaterialHierarchyDto> result = new LinkedList<>();

  • services-local/src/test/java/fr/ird/observe/services/local/service/data/seine/FloatingObjectServiceLocalTest.java
    ... ... @@ -52,7 +52,7 @@ public class FloatingObjectServiceLocalTest extends ServiceLocalTestSupport {
    52 52
    53 53 
             List<ObjectMaterialHierarchyDto> form = service.getObjectMaterialHierarchy();
    54 54 
             Assert.assertNotNull(form);
    55 
    -        Assert.assertEquals(4, form.size());
    55 
    +        Assert.assertEquals(1, form.size());
    56 56
    57 57 
         }
    58 58

    • —
    View it on GitLab.
    You're receiving this email because of your account on gitlab.com. If you'd like to receive fewer emails, you can adjust your notification settings.