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

Commits:

20 changed files:

Changes:

  • client/src/main/java/fr/ird/observe/client/ui/content/ref/common/PersonUI.jaxx
    ... ... @@ -148,5 +148,11 @@ public void decorateUniqueKeyTable(JTable table,
    148 148 
                        onStateChanged='getBean().setDataEntryOperator(dataEntryOperator.isSelected())'/>
    149 149 
           </cell>
    150 150 
         </row>
    151 
    +    <!-- is dataSource -->
    152 
    +    <row>
    153 
    +      <cell columns="2">
    154 
    +        <JCheckBox id='dataSource2' styleClass="skipI18n" onStateChanged='getBean().setDataSource(dataSource2.isSelected())'/>
    155 
    +      </cell>
    156 
    +    </row>
    151 157 
       </Table>
    152 158 
     </fr.ird.observe.client.ui.content.ref.ContentReferenceUI>

  • client/src/main/java/fr/ird/observe/client/ui/content/ref/common/PersonUI.jcss
    ... ... @@ -46,6 +46,11 @@
    46 46 
       selected:{bean.isDataEntryOperator()};
    47 47 
     }
    48 48
    49 
    +#dataSource2 {
    50 
    +  selected:{bean.isDataSource()};
    51 
    +  text:"observe.common.PersonDto.dataSource";
    52 
    +}
    53 
    +
    49 54 
     #country {
    50 55 
       property:{PersonDto.PROPERTY_COUNTRY};
    51 56 
       selectedItem:{bean.getCountry()};

  • client/src/main/java/fr/ird/observe/client/ui/content/ref/common/PersonUIModel.java
    ... ... @@ -45,6 +45,7 @@ public class PersonUIModel extends ContentReferenceUIModel<PersonDto, PersonRefe
    45 45 
                           PersonDto.PROPERTY_CAPTAIN,
    46 46 
                           PersonDto.PROPERTY_OBSERVER,
    47 47 
                           PersonDto.PROPERTY_DATA_ENTRY_OPERATOR,
    48 
    +                      PersonDto.PROPERTY_DATA_SOURCE,
    48 49 
                           PersonDto.PROPERTY_COUNTRY
    49 50 
                   },
    50 51 
                   new String[]{PersonDto.PROPERTY_CODE},
    ... ... @@ -54,6 +55,7 @@ public class PersonUIModel extends ContentReferenceUIModel<PersonDto, PersonRefe
    54 55 
                           PersonUI.BINDING_CAPTAIN_SELECTED,
    55 56 
                           PersonUI.BINDING_OBSERVER_SELECTED,
    56 57 
                           PersonUI.BINDING_DATA_ENTRY_OPERATOR_SELECTED,
    58 
    +                      PersonUI.BINDING_DATA_SOURCE2_SELECTED,
    57 59 
                           PersonUI.BINDING_COUNTRY_SELECTED_ITEM,
    58 60 
                   }
    59 61 
             );

  • client/src/main/resources/i18n/client_en_GB.properties
    ... ... @@ -807,6 +807,7 @@ observe.common.OpenableDto.action.reopen=Re-open
    807 807 
     observe.common.OpenableDto.action.reopen.tip=Reopen data
    808 808 
     observe.common.PersonDto.captain=Captain
    809 809 
     observe.common.PersonDto.dataEntryOperator=Data entry operator
    810 
    +observe.common.PersonDto.dataSource=Data source
    810 811 
     observe.common.PersonDto.observer=Observed
    811 812 
     observe.common.ProgramDto.action.goToOpen.short=Open program
    812 813 
     observe.common.ProgramDto.action.goToOpen.tip=Go to opened program

  • client/src/main/resources/i18n/client_es_ES.properties
    ... ... @@ -807,6 +807,7 @@ observe.common.OpenableDto.action.reopen=Reabrir
    807 807 
     observe.common.OpenableDto.action.reopen.tip=Reabrir la base de datos
    808 808 
     observe.common.PersonDto.captain=Patrón
    809 809 
     observe.common.PersonDto.dataEntryOperator=Operador de captación de datos
    810 
    +observe.common.PersonDto.dataSource=Data source \#TODO
    810 811 
     observe.common.PersonDto.observer=Observador
    811 812 
     observe.common.ProgramDto.action.goToOpen.short=Programa abierto
    812 813 
     observe.common.ProgramDto.action.goToOpen.tip=Acceder al programa abierto

  • client/src/main/resources/i18n/client_fr_FR.properties
    ... ... @@ -807,6 +807,7 @@ observe.common.OpenableDto.action.reopen=Rouvrir
    807 807 
     observe.common.OpenableDto.action.reopen.tip=Rouvrir la donnée
    808 808 
     observe.common.PersonDto.captain=Capitaine
    809 809 
     observe.common.PersonDto.dataEntryOperator=Saisisseur
    810 
    +observe.common.PersonDto.dataSource=Source d'information
    810 811 
     observe.common.PersonDto.observer=Observateur
    811 812 
     observe.common.ProgramDto.action.goToOpen.short=Programme ouvert
    812 813 
     observe.common.ProgramDto.action.goToOpen.tip=Accéder au programme ouvert

  • dto/src/main/java/fr/ird/observe/binder/referential/common/PersonDtoReferenceBinder.java
    ... ... @@ -45,7 +45,8 @@ public class PersonDtoReferenceBinder extends ReferentialDtoReferenceBinder<Pers
    45 45 
                                        dto.getLastName(),
    46 46 
                                        dto.isCaptain(),
    47 47 
                                        dto.isObserver(),
    48 
    -                                   dto.isDataEntryOperator());
    48 
    +                                   dto.isDataEntryOperator(),
    49 
    +                                   dto.isDataSource());
    49 50
    50 51 
         }
    51 52 
     }

  • dto/src/main/models/Observe.model
    ... ... @@ -414,12 +414,13 @@ referential.Organism > referential.I18nReferential
    414 414 
     description + {*:1} String
    415 415 
     country {*:1} fr.ird.observe.dto.referential.CountryReference
    416 416
    417 
    -referential.Person > referential.Referential | references=firstName,lastName,captain,observer,dataEntryOperator
    417 
    +referential.Person > referential.Referential | references=firstName,lastName,captain,observer,dataEntryOperator,dataSource
    418 418 
     lastName + {*:1} String
    419 419 
     firstName + {*:1} String
    420 420 
     observer + {*:1} boolean
    421 421 
     captain + {*:1} boolean
    422 422 
     dataEntryOperator + {*:1} boolean
    423 
    +dataSource + {*:1} boolean
    423 424 
     country {*:0..1} fr.ird.observe.dto.referential.CountryReference
    424 425
    425 426 
     referential.Program > referential.I18nReferential >> WithComment | references=code,label,gearType,gearTypePrefix,tripCount

  • persistence/src/main/java/fr/ird/observe/binder/referential/common/PersonEntityDtoBinder.java
    ... ... @@ -48,6 +48,7 @@ public class PersonEntityDtoBinder extends ReferentialEntityDtoBinderSupport<Per
    48 48 
             entity.setCaptain(dto.isCaptain());
    49 49 
             entity.setObserver(dto.isObserver());
    50 50 
             entity.setDataEntryOperator(dto.isDataEntryOperator());
    51 
    +        entity.setDataSource(dto.isDataSource());
    51 52 
             entity.setCountry(toEntity(dto.getCountry()));
    52 53
    53 54 
         }
    ... ... @@ -62,6 +63,7 @@ public class PersonEntityDtoBinder extends ReferentialEntityDtoBinderSupport<Per
    62 63 
             dto.setCaptain(entity.isCaptain());
    63 64 
             dto.setObserver(entity.isObserver());
    64 65 
             dto.setDataEntryOperator(entity.isDataEntryOperator());
    66 
    +        dto.setDataSource(entity.isDataSource());
    65 67 
             dto.setCountry(toReferentialReference(referentialLocale, entity.getCountry()));
    66 68
    67 69 
         }

  • persistence/src/main/java/fr/ird/observe/binder/referential/common/PersonEntityReferenceBinder.java
    ... ... @@ -46,7 +46,8 @@ public class PersonEntityReferenceBinder extends ReferentialEntityReferenceBinde
    46 46 
                                        dto.getLastName(),
    47 47 
                                        dto.isCaptain(),
    48 48 
                                        dto.isObserver(),
    49 
    -                                   dto.isDataEntryOperator());
    49 
    +                                   dto.isDataEntryOperator(),
    50 
    +                                   dto.isDataSource());
    50 51
    51 52 
         }
    52 53 
     }

  • persistence/src/main/java/fr/ird/observe/persistence/migration/DataSourceMigrationForVersion_8_0.java
    ... ... @@ -23,10 +23,16 @@ package fr.ird.observe.persistence.migration;
    23 23 
      */
    24 24
    25 25 
     import com.google.auto.service.AutoService;
    26 
    +import org.nuiton.topia.persistence.support.TopiaSqlQuery;
    26 27 
     import org.nuiton.topia.service.migration.resources.MigrationVersionResource;
    27 28 
     import org.nuiton.topia.service.migration.resources.MigrationVersionResourceExecutor;
    28 29 
     import org.nuiton.version.Versions;
    29 30
    31 
    +import java.sql.Connection;
    32 
    +import java.sql.PreparedStatement;
    33 
    +import java.sql.ResultSet;
    34 
    +import java.sql.SQLException;
    35 
    +
    30 36 
     /**
    31 37 
      * Created by tchemit on 18/05/2018.
    32 38 
      *
    ... ... @@ -46,6 +52,21 @@ public class DataSourceMigrationForVersion_8_0 extends MigrationVersionResource
    46 52 
             executor.addScript("01", "move_wind_referential");
    47 53 
             executor.addScript("02", "wind_i18n");
    48 54 
             executor.addScript("03", "update_vesseltype");
    55 
    +        executor.addScript("04", "update_person");
    56 
    +        Boolean withIds = executor.findSingleResult(new TopiaSqlQuery<Boolean>() {
    57 
    +            @Override
    58 
    +            public PreparedStatement prepareQuery(Connection connection) throws SQLException {
    59 
    +                return connection.prepareStatement("SELECT COUNT (*) FROM observe_common.person");
    60 
    +            }
    61 
    +
    62 
    +            @Override
    63 
    +            public Boolean prepareResult(ResultSet resultSet) throws SQLException {
    64 
    +                return resultSet.getInt(1) > 0;
    65 
    +            }
    66 
    +        });
    67 
    +        if (withIds) {
    68 
    +            executor.addScript("04", "update_person2");
    69 
    +        }
    49 70 
         }
    50 71
    51 72 
     }

  • persistence/src/main/models/Observe.model
    ... ... @@ -517,6 +517,7 @@ firstName + {*:1} String
    517 517 
     observer + {*:1} boolean
    518 518 
     captain + {*:1} boolean
    519 519 
     dataEntryOperator + {*:1} boolean
    520 
    +dataSource + {*:1} boolean
    520 521 
     country {*:0..1} referentiel.Country
    521 522
    522 523 
     referentiel.Program > referentiel.I18nReferentialEntity | entity

  • persistence/src/main/resources/db/migration/8.0/04_update_person-common.sql
    1 
    +---
    2 
    +-- #%L
    3 
    +-- ObServe :: Persistence
    4 
    +-- %%
    5 
    +-- Copyright (C) 2008 - 2018 IRD, Code Lutin, Ultreia.io
    6 
    +-- %%
    7 
    +-- This program is free software: you can redistribute it and/or modify
    8 
    +-- it under the terms of the GNU General Public License as
    9 
    +-- published by the Free Software Foundation, either version 3 of the
    10 
    +-- License, or (at your option) any later version.
    11 
    +--
    12 
    +-- This program is distributed in the hope that it will be useful,
    13 
    +-- but WITHOUT ANY WARRANTY; without even the implied warranty of
    14 
    +-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    15 
    +-- GNU General Public License for more details.
    16 
    +--
    17 
    +-- You should have received a copy of the GNU General Public
    18 
    +-- License along with this program.  If not, see
    19 
    +-- <http://www.gnu.org/licenses/gpl-3.0.html>.
    20 
    +-- #L%
    21 
    +---
    22 
    +ALTER TABLE observe_common.Person ADD COLUMN dataSource BOOLEAN DEFAULT FALSE;
    23 
    +ALTER TABLE observe_common.Person ALTER COLUMN observer SET DEFAULT FALSE;
    24 
    +ALTER TABLE observe_common.Person ALTER COLUMN captain SET DEFAULT FALSE;
    25 
    +ALTER TABLE observe_common.Person ALTER COLUMN dataEntryOperator SET DEFAULT FALSE;

  • persistence/src/main/resources/db/migration/8.0/04_update_person2-common.sql
    1 
    +---
    2 
    +-- #%L
    3 
    +-- ObServe :: Persistence
    4 
    +-- %%
    5 
    +-- Copyright (C) 2008 - 2018 IRD, Code Lutin, Ultreia.io
    6 
    +-- %%
    7 
    +-- This program is free software: you can redistribute it and/or modify
    8 
    +-- it under the terms of the GNU General Public License as
    9 
    +-- published by the Free Software Foundation, either version 3 of the
    10 
    +-- License, or (at your option) any later version.
    11 
    +--
    12 
    +-- This program is distributed in the hope that it will be useful,
    13 
    +-- but WITHOUT ANY WARRANTY; without even the implied warranty of
    14 
    +-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    15 
    +-- GNU General Public License for more details.
    16 
    +--
    17 
    +-- You should have received a copy of the GNU General Public
    18 
    +-- License along with this program.  If not, see
    19 
    +-- <http://www.gnu.org/licenses/gpl-3.0.html>.
    20 
    +-- #L%
    21 
    +---
    22 
    +INSERT INTO observe_common.Person(topiaid, topiaversion, topiacreatedate, lastupdatedate, status, needComment, dataSource, lastname, firstname, country) values ('fr.ird.observe.entities.referentiel.Person#666#01' , 0, CURRENT_DATE, CURRENT_TIMESTAMP, 1, false, true, 'Stephen',    'Andy', 'fr.ird.observe.entities.referentiel.Country#1239832675593#0.3601938043845213');
    23 
    +INSERT INTO observe_common.Person(topiaid, topiaversion, topiacreatedate, lastupdatedate, status, needComment, dataSource, lastname, firstname, country) values ('fr.ird.observe.entities.referentiel.Person#666#02' , 0, CURRENT_DATE, CURRENT_TIMESTAMP, 1, false, true, 'Vidot',      'Agnes', 'fr.ird.observe.entities.referentiel.Country#1239832675593#0.3601938043845213');
    24 
    +INSERT INTO observe_common.Person(topiaid, topiaversion, topiacreatedate, lastupdatedate, status, needComment, dataSource, lastname, firstname, country) values ('fr.ird.observe.entities.referentiel.Person#666#03' , 0, CURRENT_DATE, CURRENT_TIMESTAMP, 1, false, true, 'Boniface',   'Breta', 'fr.ird.observe.entities.referentiel.Country#1239832675593#0.3601938043845213');
    25 
    +INSERT INTO observe_common.Person(topiaid, topiaversion, topiacreatedate, lastupdatedate, status, needComment, dataSource, lastname, firstname, country) values ('fr.ird.observe.entities.referentiel.Person#666#04' , 0, CURRENT_DATE, CURRENT_TIMESTAMP, 1, false, true, 'Theresine',  'Bernard', 'fr.ird.observe.entities.referentiel.Country#1239832675593#0.3601938043845213');
    26 
    +INSERT INTO observe_common.Person(topiaid, topiaversion, topiacreatedate, lastupdatedate, status, needComment, dataSource, lastname, firstname, country) values ('fr.ird.observe.entities.referentiel.Person#666#05' , 0, CURRENT_DATE, CURRENT_TIMESTAMP, 1, false, true, 'Valentin',   'Bahiri', 'fr.ird.observe.entities.referentiel.Country#1239832675593#0.3601938043845213');
    27 
    +INSERT INTO observe_common.Person(topiaid, topiaversion, topiacreatedate, lastupdatedate, status, needComment, dataSource, lastname, firstname, country) values ('fr.ird.observe.entities.referentiel.Person#666#06' , 0, CURRENT_DATE, CURRENT_TIMESTAMP, 1, false, true, 'Julienne',   'Cynthia', 'fr.ird.observe.entities.referentiel.Country#1239832675593#0.3601938043845213');
    28 
    +INSERT INTO observe_common.Person(topiaid, topiaversion, topiacreatedate, lastupdatedate, status, needComment, dataSource, lastname, firstname, country) values ('fr.ird.observe.entities.referentiel.Person#666#07' , 0, CURRENT_DATE, CURRENT_TIMESTAMP, 1, false, true, 'Melanie',    'Cindy', 'fr.ird.observe.entities.referentiel.Country#1239832675593#0.3601938043845213');
    29 
    +INSERT INTO observe_common.Person(topiaid, topiaversion, topiacreatedate, lastupdatedate, status, needComment, dataSource, lastname, firstname, country) values ('fr.ird.observe.entities.referentiel.Person#666#08' , 0, CURRENT_DATE, CURRENT_TIMESTAMP, 1, false, true, 'Sopha',      'Davis', 'fr.ird.observe.entities.referentiel.Country#1239832675593#0.3601938043845213');
    30 
    +INSERT INTO observe_common.Person(topiaid, topiaversion, topiacreatedate, lastupdatedate, status, needComment, dataSource, lastname, firstname, country) values ('fr.ird.observe.entities.referentiel.Person#666#09' , 0, CURRENT_DATE, CURRENT_TIMESTAMP, 1, false, true, 'Augustin',   'Emilie', 'fr.ird.observe.entities.referentiel.Country#1239832675593#0.3601938043845213');
    31 
    +INSERT INTO observe_common.Person(topiaid, topiaversion, topiacreatedate, lastupdatedate, status, needComment, dataSource, lastname, firstname, country) values ('fr.ird.observe.entities.referentiel.Person#666#10' , 0, CURRENT_DATE, CURRENT_TIMESTAMP, 1, false, true, 'Rose',       'Hendricka', 'fr.ird.observe.entities.referentiel.Country#1239832675593#0.3601938043845213');
    32 
    +INSERT INTO observe_common.Person(topiaid, topiaversion, topiacreatedate, lastupdatedate, status, needComment, dataSource, lastname, firstname, country) values ('fr.ird.observe.entities.referentiel.Person#666#11' , 0, CURRENT_DATE, CURRENT_TIMESTAMP, 1, false, true, 'Melanie',    'Julienne', 'fr.ird.observe.entities.referentiel.Country#1239832675593#0.3601938043845213');
    33 
    +INSERT INTO observe_common.Person(topiaid, topiaversion, topiacreatedate, lastupdatedate, status, needComment, dataSource, lastname, firstname, country) values ('fr.ird.observe.entities.referentiel.Person#666#12' , 0, CURRENT_DATE, CURRENT_TIMESTAMP, 1, false, true, 'Sinon',      'James', 'fr.ird.observe.entities.referentiel.Country#1239832675593#0.3601938043845213');
    34 
    +INSERT INTO observe_common.Person(topiaid, topiaversion, topiacreatedate, lastupdatedate, status, needComment, dataSource, lastname, firstname, country) values ('fr.ird.observe.entities.referentiel.Person#666#13' , 0, CURRENT_DATE, CURRENT_TIMESTAMP, 1, false, true, 'Sinon',      'Marie-Claire', 'fr.ird.observe.entities.referentiel.Country#1239832675593#0.3601938043845213');
    35 
    +INSERT INTO observe_common.Person(topiaid, topiaversion, topiacreatedate, lastupdatedate, status, needComment, dataSource, lastname, firstname, country) values ('fr.ird.observe.entities.referentiel.Person#666#14' , 0, CURRENT_DATE, CURRENT_TIMESTAMP, 1, false, true, 'Savy',       'Marie Stella', 'fr.ird.observe.entities.referentiel.Country#1239832675593#0.3601938043845213');
    36 
    +INSERT INTO observe_common.Person(topiaid, topiaversion, topiacreatedate, lastupdatedate, status, needComment, dataSource, lastname, firstname, country) values ('fr.ird.observe.entities.referentiel.Person#666#15' , 0, CURRENT_DATE, CURRENT_TIMESTAMP, 1, false, true, 'Bamboche',   'Nattyfa', 'fr.ird.observe.entities.referentiel.Country#1239832675593#0.3601938043845213');
    37 
    +INSERT INTO observe_common.Person(topiaid, topiaversion, topiacreatedate, lastupdatedate, status, needComment, dataSource, lastname, firstname, country) values ('fr.ird.observe.entities.referentiel.Person#666#16' , 0, CURRENT_DATE, CURRENT_TIMESTAMP, 1, false, true, 'Pothin',     'Nikita', 'fr.ird.observe.entities.referentiel.Country#1239832675593#0.3601938043845213');
    38 
    +INSERT INTO observe_common.Person(topiaid, topiaversion, topiacreatedate, lastupdatedate, status, needComment, dataSource, lastname, firstname, country) values ('fr.ird.observe.entities.referentiel.Person#666#17' , 0, CURRENT_DATE, CURRENT_TIMESTAMP, 1, false, true, 'Dogley',     'Ruby', 'fr.ird.observe.entities.referentiel.Country#1239832675593#0.3601938043845213');
    39 
    +INSERT INTO observe_common.Person(topiaid, topiaversion, topiacreatedate, lastupdatedate, status, needComment, dataSource, lastname, firstname, country) values ('fr.ird.observe.entities.referentiel.Person#666#18' , 0, CURRENT_DATE, CURRENT_TIMESTAMP, 1, false, true, 'Quatre',     'Ron', 'fr.ird.observe.entities.referentiel.Country#1239832675593#0.3601938043845213');
    40 
    +INSERT INTO observe_common.Person(topiaid, topiaversion, topiacreatedate, lastupdatedate, status, needComment, dataSource, lastname, firstname, country) values ('fr.ird.observe.entities.referentiel.Person#666#19' , 0, CURRENT_DATE, CURRENT_TIMESTAMP, 1, false, true, 'Ramkalawan', 'Relix', 'fr.ird.observe.entities.referentiel.Country#1239832675593#0.3601938043845213');
    41 
    +INSERT INTO observe_common.Person(topiaid, topiaversion, topiacreatedate, lastupdatedate, status, needComment, dataSource, lastname, firstname, country) values ('fr.ird.observe.entities.referentiel.Person#666#20' , 0, CURRENT_DATE, CURRENT_TIMESTAMP, 1, false, true, 'Claude',     'Samantha', 'fr.ird.observe.entities.referentiel.Country#1239832675593#0.3601938043845213');
    42 
    +INSERT INTO observe_common.Person(topiaid, topiaversion, topiacreatedate, lastupdatedate, status, needComment, dataSource, lastname, firstname, country) values ('fr.ird.observe.entities.referentiel.Person#666#21' , 0, CURRENT_DATE, CURRENT_TIMESTAMP, 1, false, true, 'Pillay',     'Sandra', 'fr.ird.observe.entities.referentiel.Country#1239832675593#0.3601938043845213');
    43 
    +INSERT INTO observe_common.Person(topiaid, topiaversion, topiacreatedate, lastupdatedate, status, needComment, dataSource, lastname, firstname, country) values ('fr.ird.observe.entities.referentiel.Person#666#22' , 0, CURRENT_DATE, CURRENT_TIMESTAMP, 1, false, true, 'Labrosse',   'Valentina', 'fr.ird.observe.entities.referentiel.Country#1239832675593#0.3601938043845213');
    44 
    +INSERT INTO observe_common.Person(topiaid, topiaversion, topiacreatedate, lastupdatedate, status, needComment, dataSource, lastname, firstname, country) values ('fr.ird.observe.entities.referentiel.Person#666#23' , 0, CURRENT_DATE, CURRENT_TIMESTAMP, 1, false, true, 'Lagrenade',  'Vanessa', 'fr.ird.observe.entities.referentiel.Country#1239832675593#0.3601938043845213');
    45 
    +INSERT INTO observe_common.Person(topiaid, topiaversion, topiacreatedate, lastupdatedate, status, needComment, dataSource, lastname, firstname, country) values ('fr.ird.observe.entities.referentiel.Person#666#24' , 0, CURRENT_DATE, CURRENT_TIMESTAMP, 1, false, true, 'Savy',       'Vincent', 'fr.ird.observe.entities.referentiel.Country#1239832675593#0.3601938043845213');
    46 
    +INSERT INTO observe_common.Person(topiaid, topiaversion, topiacreatedate, lastupdatedate, status, needComment, dataSource, lastname, firstname, country) values ('fr.ird.observe.entities.referentiel.Person#666#25' , 0, CURRENT_DATE, CURRENT_TIMESTAMP, 1, false, true, 'Perikanan',  'Pengawas', 'fr.ird.observe.entities.referentiel.Country#1239832675593#0.3601938043845213');
    47 
    +

  • test/src/main/java/fr/ird/observe/test/ObserveFixtures.java
    ... ... @@ -258,7 +258,7 @@ public class ObserveFixtures {
    258 258 
                 .put("observe_common.ocean", 3L)
    259 259 
                 .put("observe_common.ocean_species", 500L)
    260 260 
                 .put("observe_common.organism", 9L)
    261 
    -            .put("observe_common.person", 512L)
    261 
    +            .put("observe_common.person", 537L)
    262 262 
                 .put("observe_common.program", 27L)
    263 263 
                 .put("observe_common.shipowner", 27L)
    264 264 
                 .put("observe_common.sex", 5L)

  • test/src/main/resources/db/8.0/dataForTestLongline.sql.gz The diff for this file was not included because it is too large.
  • test/src/main/resources/db/8.0/dataForTestSeine.sql.gz The diff for this file was not included because it is too large.
  • test/src/main/resources/db/8.0/empty_h2.sql.gz
    ... ... @@ -15,7 +15,7 @@ create table OBSERVE_COMMON.lengthWeightParameter (topiaId varchar(255) not null
    15 15 
     create table OBSERVE_COMMON.ocean (topiaId varchar(255) not null, topiaVersion bigint not null, topiaCreateDate timestamp, lastUpdateDate timestamp not null, code varchar(255), uri varchar(255), needComment boolean not null, status integer, label1 varchar(255), label2 varchar(255), label3 varchar(255), label4 varchar(255), label5 varchar(255), label6 varchar(255), label7 varchar(255), label8 varchar(255), primary key (topiaId));
    16 16 
     create table OBSERVE_COMMON.ocean_species (species varchar(255), ocean varchar(255) not null);
    17 17 
     create table OBSERVE_COMMON.organism (topiaId varchar(255) not null, topiaVersion bigint not null, topiaCreateDate timestamp, lastUpdateDate timestamp not null, code varchar(255), uri varchar(255), needComment boolean not null, status integer, label1 varchar(255), label2 varchar(255), label3 varchar(255), label4 varchar(255), label5 varchar(255), label6 varchar(255), label7 varchar(255), label8 varchar(255), country varchar(255), description varchar(255), primary key (topiaId));
    18 
    -create table OBSERVE_COMMON.person (topiaId varchar(255) not null, topiaVersion bigint not null, topiaCreateDate timestamp, lastUpdateDate timestamp not null, code varchar(255), uri varchar(255), needComment boolean not null, status integer, lastName varchar(255), firstName varchar(255), observer boolean, captain boolean, dataEntryOperator boolean, country varchar(255), primary key (topiaId));
    18 
    +create table OBSERVE_COMMON.person (topiaId varchar(255) not null, topiaVersion bigint not null, topiaCreateDate timestamp, lastUpdateDate timestamp not null, code varchar(255), uri varchar(255), needComment boolean not null, status integer, lastName varchar(255), firstName varchar(255), observer boolean, captain boolean, dataEntryOperator boolean, dataSource boolean, country varchar(255), primary key (topiaId));
    19 19 
     create table OBSERVE_COMMON.program (topiaId varchar(255) not null, topiaVersion bigint not null, topiaCreateDate timestamp, lastUpdateDate timestamp not null, code varchar(255), uri varchar(255), needComment boolean not null, status integer, label1 varchar(255), label2 varchar(255), label3 varchar(255), label4 varchar(255), label5 varchar(255), label6 varchar(255), label7 varchar(255), label8 varchar(255), organism varchar(255), nonTargetObservation integer, targetDiscardsObservation integer, samplesObservation integer, objectsObservation integer, detailledActivitiesObservation integer, mammalsObservation integer, birdsObservation integer, baitObservation integer, startDate timestamp, endDate timestamp, comment varchar(2147483647), gearType integer, primary key (topiaId));
    20 20 
     create table OBSERVE_COMMON.sex (topiaId varchar(255) not null, topiaVersion bigint not null, topiaCreateDate timestamp, lastUpdateDate timestamp not null, code varchar(255), uri varchar(255), needComment boolean not null, status integer, label1 varchar(255), label2 varchar(255), label3 varchar(255), label4 varchar(255), label5 varchar(255), label6 varchar(255), label7 varchar(255), label8 varchar(255), primary key (topiaId));
    21 21 
     create table OBSERVE_COMMON.shipOwner (topiaId varchar(255) not null, topiaVersion bigint not null, topiaCreateDate timestamp, lastUpdateDate timestamp not null, code varchar(255), uri varchar(255), needComment boolean not null, status integer, label varchar(255), startDate timestamp, endDate timestamp, country varchar(255), primary key (topiaId));

  • test/src/main/resources/db/8.0/empty_pg.sql.gz
    ... ... @@ -15,7 +15,7 @@ create table OBSERVE_COMMON.lengthWeightParameter (topiaId varchar(255) not null
    15 15 
     create table OBSERVE_COMMON.ocean (topiaId varchar(255) not null, topiaVersion int8 not null, topiaCreateDate timestamp, lastUpdateDate timestamp not null, code varchar(255), uri varchar(255), needComment boolean not null, status int4, label1 varchar(255), label2 varchar(255), label3 varchar(255), label4 varchar(255), label5 varchar(255), label6 varchar(255), label7 varchar(255), label8 varchar(255), primary key (topiaId));
    16 16 
     create table OBSERVE_COMMON.ocean_species (species varchar(255), ocean varchar(255) not null);
    17 17 
     create table OBSERVE_COMMON.organism (topiaId varchar(255) not null, topiaVersion int8 not null, topiaCreateDate timestamp, lastUpdateDate timestamp not null, code varchar(255), uri varchar(255), needComment boolean not null, status int4, label1 varchar(255), label2 varchar(255), label3 varchar(255), label4 varchar(255), label5 varchar(255), label6 varchar(255), label7 varchar(255), label8 varchar(255), country varchar(255), description varchar(255), primary key (topiaId));
    18 
    -create table OBSERVE_COMMON.person (topiaId varchar(255) not null, topiaVersion int8 not null, topiaCreateDate timestamp, lastUpdateDate timestamp not null, code varchar(255), uri varchar(255), needComment boolean not null, status int4, lastName varchar(255), firstName varchar(255), observer boolean, captain boolean, dataEntryOperator boolean, country varchar(255), primary key (topiaId));
    18 
    +create table OBSERVE_COMMON.person (topiaId varchar(255) not null, topiaVersion int8 not null, topiaCreateDate timestamp, lastUpdateDate timestamp not null, code varchar(255), uri varchar(255), needComment boolean not null, status int4, lastName varchar(255), firstName varchar(255), observer boolean, captain boolean, dataEntryOperator boolean, dataSource boolean, country varchar(255), primary key (topiaId));
    19 19 
     create table OBSERVE_COMMON.program (topiaId varchar(255) not null, topiaVersion int8 not null, topiaCreateDate timestamp, lastUpdateDate timestamp not null, code varchar(255), uri varchar(255), needComment boolean not null, status int4, label1 varchar(255), label2 varchar(255), label3 varchar(255), label4 varchar(255), label5 varchar(255), label6 varchar(255), label7 varchar(255), label8 varchar(255), organism varchar(255), nonTargetObservation int4, targetDiscardsObservation int4, samplesObservation int4, objectsObservation int4, detailledActivitiesObservation int4, mammalsObservation int4, birdsObservation int4, baitObservation int4, startDate timestamp, endDate timestamp, comment text, gearType int4, primary key (topiaId));
    20 20 
     create table OBSERVE_COMMON.sex (topiaId varchar(255) not null, topiaVersion int8 not null, topiaCreateDate timestamp, lastUpdateDate timestamp not null, code varchar(255), uri varchar(255), needComment boolean not null, status int4, label1 varchar(255), label2 varchar(255), label3 varchar(255), label4 varchar(255), label5 varchar(255), label6 varchar(255), label7 varchar(255), label8 varchar(255), primary key (topiaId));
    21 21 
     create table OBSERVE_COMMON.shipOwner (topiaId varchar(255) not null, topiaVersion int8 not null, topiaCreateDate timestamp, lastUpdateDate timestamp not null, code varchar(255), uri varchar(255), needComment boolean not null, status int4, label varchar(255), startDate timestamp, endDate timestamp, country varchar(255), primary key (topiaId));

  • test/src/main/resources/db/8.0/referentiel.sql.gz The diff for this file was not included because it is too large.

    • —
    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.