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

Commits:

30 changed files:

Changes:

  • client-datasource-editor-api/src/main/i18n/getters/java.getter
    ... ... @@ -84,6 +84,7 @@ observe.runner.initStorage.choice.useRemoteStorage
    84 84 
     observe.runner.initStorage.done
    85 85 
     observe.runner.initStorage.label.local
    86 86 
     observe.runner.initStorage.local.db.error
    87 
    +observe.runner.initStorage.local.db.error.notAuthorized
    87 88 
     observe.runner.initStorage.title.create.local.db
    88 89 
     observe.runner.initStorage.title.load.remote.db
    89 90 
     observe.runner.initStorage.title.no.local.db.found

  • client-datasource-editor-api/src/main/i18n/templates/feedBackOnOpeningLocalDataSource_en_GB.ftl
    ... ... @@ -21,6 +21,12 @@
    21 21 
     <body>
    22 22 
     <h3>${errorTitle}</h3>
    23 23 
     <p><b>${error.message!""}</b></p>
    24 
    +<#if databaseLocked>
    25 
    +<p style="color: red;font-style: italic;font-weight: bold">
    26 
    +  Local database seems to be locked by another application, please check this before continue...
    27 
    +</p>
    28 
    +</#if>
    29 
    +
    24 30 
     <hr/>
    25 31 
     <p>At this point, we can produce a feed back archive with the local data source and any stuff to be able to fix the
    26 32 
       problem.</p>

  • client-datasource-editor-api/src/main/i18n/templates/feedBackOnOpeningLocalDataSource_es_ES.ftl
    ... ... @@ -22,6 +22,11 @@
    22 22 
     #TODO
    23 23 
     <h3>${errorTitle}</h3>
    24 24 
     <p><b>${error.message!""}</b></p>
    25 
    +<#if databaseLocked>
    26 
    +<p style="color: red;font-style: italic;font-weight: bold">
    27 
    +  Local database seems to be locked by another application, please check this before continue...
    28 
    +</p>
    29 
    +</#if>
    25 30
    26 31 
     <hr/>
    27 32 
     <p>At this point, we can produce a feed back archive with the local data source and any stuff to be able to fix the

  • client-datasource-editor-api/src/main/i18n/templates/feedBackOnOpeningLocalDataSource_fr_FR.ftl
    ... ... @@ -22,6 +22,12 @@
    22 22 
     <h3>${errorTitle}</h3>
    23 23 
     <p><b>${error.message!""}</b></p>
    24 24
    25 
    +<#if databaseLocked>
    26 
    +  <p style="color: red;font-style: italic;font-weight: bold">
    27 
    +    La base locale semble utilisée par une autre application, vérifier cela avant de continuer...
    28 
    +  </p>
    29 
    +
    30 
    +</#if>
    25 31 
     <hr/>
    26 32
    27 33 
     <br/>

  • client-datasource-editor-api/src/main/java/fr/ird/observe/client/datasource/editor/DataSourceEditorHelper.java
    ... ... @@ -37,6 +37,7 @@ import fr.ird.observe.services.configuration.DataSourceCreateConfigurationDto;
    37 37 
     import fr.ird.observe.services.configuration.ObserveDataSourceConfiguration;
    38 38 
     import fr.ird.observe.services.configuration.ObserveDataSourceInformation;
    39 39 
     import fr.ird.observe.services.configuration.topia.ObserveDataSourceConfigurationTopiaH2;
    40 
    +import fr.ird.observe.services.service.DatabaseConnexionNotAuthorizedException;
    40 41 
     import io.ultreia.java4all.i18n.I18n;
    41 42 
     import org.apache.logging.log4j.LogManager;
    42 43 
     import org.apache.logging.log4j.Logger;
    ... ... @@ -93,6 +94,16 @@ public class DataSourceEditorHelper {
    93 94 
                         mainUI.getMainUIBodyContentManager().getBodyTyped(DataSourceEditor.class, DataSourceEditorBodyContent.class).loadStorage(mainUI, dataSource);
    94 95
    95 96 
                         askToCreate = false;
    97 
    +                } catch (DatabaseConnexionNotAuthorizedException e) {
    98 
    +                    // May be data source is locked
    99 
    +                    log.error("Could not load local database", e);
    100 
    +                    JOptionPane.showMessageDialog(
    101 
    +                            mainUI,
    102 
    +                            t("observe.runner.initStorage.local.db.error.notAuthorized"),
    103 
    +                            t("observe.runner.title.error.dialog"),
    104 
    +                            JOptionPane.WARNING_MESSAGE
    105 
    +                    );
    106 
    +                    return;
    96 107 
                     } catch (Exception e) {
    97 108
    98 109 
                         if (lastAutomaticBackup != null) {

  • client-datasource-editor-api/src/main/java/fr/ird/observe/client/datasource/editor/loading/open/OpenLocalDataSourceFeedBackModel.java
    ... ... @@ -26,6 +26,7 @@ import fr.ird.observe.client.action.api.ActionStep;
    26 26 
     import fr.ird.observe.client.action.api.FeedBackBuilder;
    27 27 
     import fr.ird.observe.client.configuration.ClientConfig;
    28 28 
     import fr.ird.observe.client.datasource.editor.loading.LoadingDataSourceContext;
    29 
    +import fr.ird.observe.services.service.DatabaseConnexionNotAuthorizedException;
    29 30 
     import io.ultreia.java4all.application.template.spi.GenerateTemplate;
    30 31
    31 32 
     import java.util.List;
    ... ... @@ -37,7 +38,7 @@ import static io.ultreia.java4all.i18n.I18n.t;
    37 38 
     public class OpenLocalDataSourceFeedBackModel extends FeedBackBuilder.FeedBackBuilderModel {
    38 39
    39 40 
         public OpenLocalDataSourceFeedBackModel(ClientConfig config, List<ActionStep<LoadingDataSourceContext>> stepsFailed) {
    40 
    -        super(config, stepsFailed,t("observe.error.storage.could.not.open.data.source.title"));
    41 
    +        super(config, stepsFailed, t("observe.error.storage.could.not.open.data.source.title"));
    41 42 
         }
    42 43
    43 44 
         @Override
    ... ... @@ -45,5 +46,8 @@ public class OpenLocalDataSourceFeedBackModel extends FeedBackBuilder.FeedBackBu
    45 46 
             return OpenLocalDataSourceFeedBackModelTemplate.generate(this);
    46 47 
         }
    47 48
    49 
    +    public boolean isDatabaseLocked() {
    50 
    +        return getError() instanceof DatabaseConnexionNotAuthorizedException;
    51 
    +    }
    48 52 
     }
    49 53

  • client-datasource-editor-api/src/main/java/fr/ird/observe/client/datasource/editor/wizard/StorageUIModel.java
    ... ... @@ -184,6 +184,10 @@ public class StorageUIModel extends WizardModel<StorageStep> implements WithClie
    184 184 
          * Connexion status error (if any!).
    185 185 
          */
    186 186 
         protected String connexionStatusError;
    187 
    +    /**
    188 
    +     * Connexion status error (if any!).
    189 
    +     */
    190 
    +    protected Throwable connexionError;
    187 191 
         /**
    188 192 
          * Can use local data source?
    189 193 
          */
    ... ... @@ -1876,6 +1880,7 @@ public class StorageUIModel extends WizardModel<StorageStep> implements WithClie
    1876 1880 
                         if (e instanceof UndeclaredThrowableException) {
    1877 1881 
                             e = ((UndeclaredThrowableException) e).getUndeclaredThrowable();
    1878 1882 
                         }
    1883 
    +                    connexionError = e;
    1879 1884 
                         connexionStatusError = e.getMessage();
    1880 1885 
                         log.error("Error in test remote", e);
    1881 1886 
                         setConnexionStatus(ConnexionStatus.FAILED);
    ... ... @@ -1921,6 +1926,10 @@ public class StorageUIModel extends WizardModel<StorageStep> implements WithClie
    1921 1926 
             return connexionStatusError;
    1922 1927 
         }
    1923 1928
    1929 
    +    public Throwable getConnexionError() {
    1930 
    +        return connexionError;
    1931 
    +    }
    1932 
    +
    1924 1933 
         public boolean isShowMigrationSql() {
    1925 1934 
             return pgConfig.isShowMigrationSql();
    1926 1935 
         }

  • client-datasource-editor-ps/src/main/i18n/getters/jaxx.getter
    ... ... @@ -401,6 +401,8 @@ observe.referential.Referential.validityDateRange
    401 401 
     observe.referential.ps.common.SpeciesFate.discard
    402 402 
     observe.referential.ps.common.TransmittingBuoyType.technology
    403 403 
     observe.referential.ps.common.VesselActivity.allowFad
    404 
    +observe.referential.ps.landing.WeightCategory.sovLabel
    405 
    +observe.referential.ps.landing.WeightCategory.starLabel
    404 406 
     observe.referential.ps.localmarket.Packaging.harbour
    405 407 
     observe.referential.ps.localmarket.Packaging.weight
    406 408 
     observe.referential.ps.logbook.ObjectMaterial.biodegradable

  • client-datasource-editor-ps/src/main/java/fr/ird/observe/client/datasource/editor/content/data/ps/landing/LandingUIHandler.java
    ... ... @@ -37,6 +37,7 @@ import java.awt.Component;
    37 37 
     import java.beans.PropertyChangeListener;
    38 38 
     import java.util.Collections;
    39 39 
     import java.util.List;
    40 
    +import java.util.Objects;
    40 41 
     import java.util.stream.Collectors;
    41 42
    42 43 
     /**
    ... ... @@ -109,7 +110,7 @@ class LandingUIHandler extends ContentTableUIHandler<TripLandingDto, LandingDto,
    109 110 
                 newCategories = Collections.emptyList();
    110 111 
             } else {
    111 112 
                 List<WeightCategoryReference> referentialReferences = getModel().getReferenceCache().getReferentialReferences(LandingDto.PROPERTY_WEIGHT_CATEGORY);
    112 
    -            newCategories = referentialReferences.stream().filter(r -> r.getSpecies().equals(species)).collect(Collectors.toList());
    113 
    +            newCategories = referentialReferences.stream().filter(r -> Objects.equals(species, r.getSpecies())).collect(Collectors.toList());
    113 114 
                 WeightCategoryReference weightCategory = getModel().getTableEditBean().getWeightCategory();
    114 115 
                 if (weightCategory != null && newCategories.contains(weightCategory)) {
    115 116 
                     newCategory = weightCategory;

  • client-datasource-editor-ps/src/main/java/fr/ird/observe/client/datasource/editor/content/ref/ps/landing/WeightCategoryUI.jaxx
    ... ... @@ -81,6 +81,25 @@
    81 81 
           </cell>
    82 82 
         </row>
    83 83
    84 
    +    <!-- sovLabel -->
    85 
    +    <row>
    86 
    +      <cell anchor="west">
    87 
    +        <JLabel id='sovLabelLabel'/>
    88 
    +      </cell>
    89 
    +      <cell anchor='east' weightx="1" fill="both">
    90 
    +        <NormalTextEditor id='sovLabel'/>
    91 
    +      </cell>
    92 
    +    </row>
    93 
    +    <!-- starLabel -->
    94 
    +    <row>
    95 
    +      <cell anchor="west">
    96 
    +        <JLabel id='starLabelLabel'/>
    97 
    +      </cell>
    98 
    +      <cell anchor='east' weightx="1" fill="both">
    99 
    +        <NormalTextEditor id='starLabel'/>
    100 
    +      </cell>
    101 
    +    </row>
    102 
    +
    84 103 
         <!-- needComment -->
    85 104 
         <row>
    86 105 
           <cell anchor='east' weightx="1" fill="both" columns="2">

  • client-datasource-editor-ps/src/main/java/fr/ird/observe/client/datasource/editor/content/ref/ps/landing/WeightCategoryUI.jcss
    ... ... @@ -24,8 +24,3 @@
    24 24 
       font-style:"italic";
    25 25 
     }
    26 26
    27 
    -#species {
    28 
    -  property:{WeightCategoryDto.PROPERTY_SPECIES};
    29 
    -  selectedItem:{bean.getSpecies()};
    30 
    -}
    31 
    -

  • dto/src/main/java/fr/ird/observe/dto/decoration/ObserveI18nLabelsBuilder.java
    ... ... @@ -29,6 +29,9 @@ import fr.ird.observe.dto.data.DataDto;
    29 29 
     import fr.ird.observe.dto.referential.I18nReferentialDto;
    30 30 
     import fr.ird.observe.dto.referential.ReferentialDto;
    31 31 
     import fr.ird.observe.dto.referential.WithFormula;
    32 
    +import fr.ird.observe.dto.referential.common.SpeciesDto;
    33 
    +import fr.ird.observe.dto.referential.common.VesselSizeCategoryDto;
    34 
    +import fr.ird.observe.dto.referential.ps.landing.WeightCategoryDto;
    32 35 
     import fr.ird.observe.spi.type.TypeTranslators;
    33 36 
     import io.ultreia.java4all.i18n.spi.bean.BeanPropertyI18nKeyProducerSupport;
    34 37 
     import org.apache.commons.lang3.StringUtils;
    ... ... @@ -216,9 +219,11 @@ public class ObserveI18nLabelsBuilder extends BeanPropertyI18nKeyProducerSupport
    216 219
    217 220 
         private static final ImmutableSet<String> SKIP_LABEL = ImmutableSet.of(
    218 221 
                 "speciesLabel",
    219 
    -            "scientificLabel",
    220 
    -            "capacityLabel",
    221 
    -            "gaugeLabel",
    222 
    +            SpeciesDto.PROPERTY_SCIENTIFIC_LABEL,
    223 
    +            VesselSizeCategoryDto.PROPERTY_CAPACITY_LABEL,
    224 
    +            VesselSizeCategoryDto.PROPERTY_GAUGE_LABEL,
    225 
    +            WeightCategoryDto.PROPERTY_SOV_LABEL,
    226 
    +            WeightCategoryDto.PROPERTY_STAR_LABEL,
    222 227 
                 WithStartEndDate.PROPERTY_VALIDITY_RANGE_LABEL,
    223 228 
                 WithStartEndDate.PROPERTY_START_END_DATE_LABEL
    224 229 
         );

  • dto/src/main/models/Observe-05-referential-ps-landing.model
    ... ... @@ -4,3 +4,5 @@ referential.ps.landing.Fate > referential.I18nReferential
    4 4
    5 5 
     referential.ps.landing.WeightCategory > referential.I18nReferential >> reference.ReferentialDtoReferenceWithNoCodeAware | references=code,label,uri,species
    6 6 
     species {*:1} fr.ird.observe.dto.referential.common.SpeciesReference
    7 
    +sovLabel + {*:1} String | notNull
    8 
    +starLabel + {*:1} String | notNull

  • observe-i18n/src/main/i18n/translations/observe_en_GB.properties
    ... ... @@ -2195,6 +2195,8 @@ observe.referential.ps.common.TransmittingBuoyTypeDto.validation.technology.too.
    2195 2195 
     observe.referential.ps.common.VesselActivity.allowFad=Allow Fad ?
    2196 2196 
     observe.referential.ps.common.VesselActivity.type=Vessel activity (Seine)
    2197 2197 
     observe.referential.ps.landing.Fate.type=Fate
    2198 
    +observe.referential.ps.landing.WeightCategory.sovLabel=Sov label
    2199 
    +observe.referential.ps.landing.WeightCategory.starLabel=Star label
    2198 2200 
     observe.referential.ps.landing.WeightCategory.type=Weight category
    2199 2201 
     observe.referential.ps.localmarket.Packaging.harbour=Harbour
    2200 2202 
     observe.referential.ps.localmarket.Packaging.packagingType=Packaging type
    ... ... @@ -2265,6 +2267,7 @@ observe.runner.initStorage.choice.useRemoteStorage=Use a remote storage
    2265 2267 
     observe.runner.initStorage.done=Init of Persistent Service done.
    2266 2268 
     observe.runner.initStorage.label.local=Local database
    2267 2269 
     observe.runner.initStorage.local.db.error=Could not find local database, will load last backup (%s)
    2270 
    +observe.runner.initStorage.local.db.error.notAuthorized=Could not find local database, maybe it is locked. Please check.
    2268 2271 
     observe.runner.initStorage.title.create.local.db=Loading local database
    2269 2272 
     observe.runner.initStorage.title.load.remote.db=Load remote database
    2270 2273 
     observe.runner.initStorage.title.no.local.db.found=No local database found.

  • observe-i18n/src/main/i18n/translations/observe_es_ES.properties
    ... ... @@ -2195,6 +2195,8 @@ observe.referential.ps.common.TransmittingBuoyTypeDto.validation.technology.too.
    2195 2195 
     observe.referential.ps.common.VesselActivity.allowFad=Utilisation Object flottant ? \#TODO
    2196 2196 
     observe.referential.ps.common.VesselActivity.type=Actividad buque \#TODO-SP
    2197 2197 
     observe.referential.ps.landing.Fate.type=Fate \#TODO
    2198 
    +observe.referential.ps.landing.WeightCategory.sovLabel=Sov label \#TODO
    2199 
    +observe.referential.ps.landing.WeightCategory.starLabel=Star label \#TODO
    2198 2200 
     observe.referential.ps.landing.WeightCategory.type=Weight category \#
    2199 2201 
     observe.referential.ps.localmarket.Packaging.harbour=Harbour
    2200 2202 
     observe.referential.ps.localmarket.Packaging.packagingType=Packaging type
    ... ... @@ -2265,6 +2267,7 @@ observe.runner.initStorage.choice.useRemoteStorage=Usar la base de datos remota
    2265 2267 
     observe.runner.initStorage.done=Inicialización del servicio de persistencia terminado.
    2266 2268 
     observe.runner.initStorage.label.local=Base local
    2267 2269 
     observe.runner.initStorage.local.db.error=Imposible cargar la base local, se cargará el último backup
    2270 
    +observe.runner.initStorage.local.db.error.notAuthorized=Could not find local database, maybe it is locked. Please check. \#TODO
    2268 2271 
     observe.runner.initStorage.title.create.local.db=Cargando una base local
    2269 2272 
     observe.runner.initStorage.title.load.remote.db=Cargando una base remota
    2270 2273 
     observe.runner.initStorage.title.no.local.db.found=Ninguna base local fue encontrada

  • observe-i18n/src/main/i18n/translations/observe_fr_FR.properties
    ... ... @@ -2195,6 +2195,8 @@ observe.referential.ps.common.TransmittingBuoyTypeDto.validation.technology.too.
    2195 2195 
     observe.referential.ps.common.VesselActivity.allowFad=Utilisation Object flottant ?
    2196 2196 
     observe.referential.ps.common.VesselActivity.type=Activité bateau (Senne)
    2197 2197 
     observe.referential.ps.landing.Fate.type=Devenir
    2198 
    +observe.referential.ps.landing.WeightCategory.sovLabel=Sov libellé
    2199 
    +observe.referential.ps.landing.WeightCategory.starLabel=Star libellé
    2198 2200 
     observe.referential.ps.landing.WeightCategory.type=Catégorie de poids
    2199 2201 
     observe.referential.ps.localmarket.Packaging.harbour=Port
    2200 2202 
     observe.referential.ps.localmarket.Packaging.packagingType=Type de conditionnement
    ... ... @@ -2265,6 +2267,7 @@ observe.runner.initStorage.choice.useRemoteStorage=Utiliser une base distante
    2265 2267 
     observe.runner.initStorage.done=Initialisation du service de persistance terminé.
    2266 2268 
     observe.runner.initStorage.label.local=Base locale
    2267 2269 
     observe.runner.initStorage.local.db.error=Impossible de charger la base locale, la dernière sauvegarde (du %s) va être utilisée
    2270 
    +observe.runner.initStorage.local.db.error.notAuthorized=Impossible de charger la base locale, elle semble etre déjà utilisée par une autre application.
    2268 2271 
     observe.runner.initStorage.title.create.local.db=Chargement d'une base locale
    2269 2272 
     observe.runner.initStorage.title.load.remote.db=Chargement d'une base distante
    2270 2273 
     observe.runner.initStorage.title.no.local.db.found=Aucune base locale trouvée

  • persistence/src/main/java/fr/ird/observe/entities/migration/DataSourceMigrationForVersion_8_1.java
    ... ... @@ -69,8 +69,13 @@ public class DataSourceMigrationForVersion_8_1 extends MigrationVersionResource
    69 69 
             executor.addScript("07", "ps_common_adapt_trip");
    70 70 
             executor.addScript("08", "ps_logbook_create_data_model");
    71 71 
             executor.executeForPG(this::fixPostgisTriggers);
    72 
    +
    72 73 
             executor.addScript("10", "ps_landing_create_referential_model");
    73 
    -        executor.addScript("11", "ps_landing_create_data_model");
    74 
    +        executor.addScript("10", "ps_landing_create_data_model");
    75 
    +        if (withIds) {
    76 
    +            executor.addScript("10", "ps_landing_fill_referential");
    77 
    +        }
    78 
    +
    74 79 
             executor.addScript("12", "ps_wellplan_create_referential_model");
    75 80 
             executor.addScript("13", "ps_wellplan_create_data_model");
    76 81 
             executor.addScript("14", "ps_logbook_create_sample_referential_model");

  • persistence/src/main/models/Observe-05-referential-ps-landing.model
    ... ... @@ -4,3 +4,5 @@ referential.ps.landing.Fate > referential.I18nReferentialEntity | entity
    4 4
    5 5 
     referential.ps.landing.WeightCategory > referential.I18nReferentialEntity | entity
    6 6 
     species {*:1} referential.common.Species | lazy=false
    7 
    +sovLabel + {*:1} String
    8 
    +starLabel + {*:1} String

  • persistence/src/main/resources/db/migration/8.1/11_ps_landing_create_data_model-common.sql → persistence/src/main/resources/db/migration/8.1/10_ps_landing_create_data_model-common.sql

  • persistence/src/main/resources/db/migration/8.1/10_ps_landing_create_referential_model-common.sql
    ... ... @@ -22,7 +22,7 @@
    22 22 
     CREATE SCHEMA ps_landing;
    23 23
    24 24 
     CREATE TABLE ps_landing.Fate(topiaId VARCHAR(255) NOT NULL CONSTRAINT pk_ps_landing_Fate PRIMARY KEY, topiaVersion BIGINT NOT NULL, topiaCreateDate DATE, code VARCHAR(255) NOT NULL, uri VARCHAR(255), homeId VARCHAR(255), status INTEGER DEFAULT 1, needComment BOOLEAN DEFAULT FALSE,lastUpdateDate TIMESTAMP DEFAULT now() NOT NULL, label1 VARCHAR(255), label2 VARCHAR(255), label3 VARCHAR(255), label4 VARCHAR(255), label5 VARCHAR(255), label6 VARCHAR(255), label7 VARCHAR(255), label8 VARCHAR(255));
    25 
    -CREATE TABLE ps_landing.weightCategory(topiaId VARCHAR(255) NOT NULL CONSTRAINT pk_ps_landing_weightCategory PRIMARY KEY, topiaVersion BIGINT NOT NULL, topiaCreateDate TIMESTAMP, code VARCHAR(255), uri VARCHAR(255), homeId VARCHAR(255), status INTEGER DEFAULT 1, needComment BOOLEAN DEFAULT FALSE, lastUpdateDate TIMESTAMP DEFAULT now() NOT NULL, label1 VARCHAR(255), label2 VARCHAR(255), label3 VARCHAR(255), label4 VARCHAR(255), label5 VARCHAR(255), label6 VARCHAR(255), label7 VARCHAR(255), label8 VARCHAR(255), species VARCHAR(255));
    25 
    +CREATE TABLE ps_landing.weightCategory(topiaId VARCHAR(255) NOT NULL CONSTRAINT pk_ps_landing_weightCategory PRIMARY KEY, topiaVersion BIGINT NOT NULL, topiaCreateDate TIMESTAMP, code VARCHAR(255), uri VARCHAR(255), homeId VARCHAR(255), status INTEGER DEFAULT 1, needComment BOOLEAN DEFAULT FALSE, lastUpdateDate TIMESTAMP DEFAULT now() NOT NULL, label1 VARCHAR(255), label2 VARCHAR(255), label3 VARCHAR(255), label4 VARCHAR(255), label5 VARCHAR(255), label6 VARCHAR(255), label7 VARCHAR(255), label8 VARCHAR(255), sovLabel VARCHAR(255) NOT NULL, starLabel VARCHAR(255) NOT NULL, species VARCHAR(255));
    26 26
    27 27 
     ALTER TABLE ps_landing.weightCategory ADD CONSTRAINT fk_ps_landing_weightCategory_species FOREIGN KEY(species) REFERENCES common.species;
    28 28

  • persistence/src/main/resources/db/migration/8.1/10_ps_landing_fill_referential-common.sql
    1 
    +---
    2 
    +-- #%L
    3 
    +-- ObServe :: Persistence
    4 
    +-- %%
    5 
    +-- Copyright (C) 2008 - 2020 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 ps_landing.WeightCategory (topiaid, topiaversion,  code, status, lastUpdateDate, species, topiacreatedate, sovLabel, starLabel) VALUES ('fr.ird.referential.ps.landing.WeightCategory#1297580528897#0.9849989043584604',  0, 1,  1, ${CURRENT_TIMESTAMP}, 'fr.ird.referential.common.Species#1239832685474#0.8943253454598569',  '2011-02-13 08:02:06.279'::timestamp, 'Albacore -10',                        'Yellowfin R1 + R2+ R3');
    23 
    +INSERT INTO ps_landing.WeightCategory (topiaid, topiaversion,  code, status, lastUpdateDate, species, topiacreatedate, sovLabel, starLabel) VALUES ('fr.ird.referential.ps.landing.WeightCategory#1297580528897#0.37431829932158744', 0, 2,  1, ${CURRENT_TIMESTAMP}, 'fr.ird.referential.common.Species#1239832685474#0.8943253454598569',  '2011-02-13 08:02:06.288'::timestamp, 'Albacore +10',                        'GG');
    24 
    +INSERT INTO ps_landing.WeightCategory (topiaid, topiaversion,  code, status, lastUpdateDate, species, topiacreatedate, sovLabel, starLabel) VALUES ('fr.ird.referential.ps.landing.WeightCategory#1297580528897#0.5314676874701734',  0, 9,  1, ${CURRENT_TIMESTAMP}, 'fr.ird.referential.common.Species#1239832685474#0.8943253454598569',  '2011-02-13 08:02:06.288'::timestamp, 'Albacore ?',                          'Yellowfin ?');
    25 
    +INSERT INTO ps_landing.WeightCategory (topiaid, topiaversion,  code, status, lastUpdateDate, species, topiacreatedate, sovLabel, starLabel) VALUES ('fr.ird.referential.ps.landing.WeightCategory#1297580528897#0.12396399303506567', 0, 10, 1, ${CURRENT_TIMESTAMP}, 'fr.ird.referential.common.Species#1239832685474#0.8943253454598569',  '2011-02-13 08:02:06.288'::timestamp, 'Albacore frais (canneurs)',           'Albacore frais (canneurs)');
    26 
    +INSERT INTO ps_landing.WeightCategory (topiaid, topiaversion,  code, status, lastUpdateDate, species, topiacreatedate, sovLabel, starLabel) VALUES ('fr.ird.referential.ps.landing.WeightCategory#1297580528897#0.9880486795552492',  0, 50, 1, ${CURRENT_TIMESTAMP}, 'fr.ird.referential.common.Species#1239832685474#0.8943253454598569',  '2011-02-13 08:02:06.288'::timestamp, 'Inconnu',                             'GG + 13.6 kg');
    27 
    +INSERT INTO ps_landing.WeightCategory (topiaid, topiaversion,  code, status, lastUpdateDate, species, topiacreatedate, sovLabel, starLabel) VALUES ('fr.ird.referential.ps.landing.WeightCategory#1297580528897#0.846209974442883',   0, 51, 1, ${CURRENT_TIMESTAMP}, 'fr.ird.referential.common.Species#1239832685474#0.8943253454598569',  '2011-02-13 08:02:06.288'::timestamp, 'Inconnu',                             'R1 entre 13.6 et 3.4 kg');
    28 
    +INSERT INTO ps_landing.WeightCategory (topiaid, topiaversion,  code, status, lastUpdateDate, species, topiacreatedate, sovLabel, starLabel) VALUES ('fr.ird.referential.ps.landing.WeightCategory#1297580528897#0.7042864703615278',  0, 52, 1, ${CURRENT_TIMESTAMP}, 'fr.ird.referential.common.Species#1239832685474#0.8943253454598569',  '2011-02-13 08:02:06.288'::timestamp, 'Inconnu',                             'R2 entre 3.4 et 1.8 kg');
    29 
    +INSERT INTO ps_landing.WeightCategory (topiaid, topiaversion,  code, status, lastUpdateDate, species, topiacreatedate, sovLabel, starLabel) VALUES ('fr.ird.referential.ps.landing.WeightCategory#1297580528898#0.49007162713264407', 0, 53, 1, ${CURRENT_TIMESTAMP}, 'fr.ird.referential.common.Species#1239832685474#0.8943253454598569',  '2011-02-13 08:02:06.288'::timestamp, 'Inconnu',                             'R3 moins de 1.8 kg');
    30 
    +INSERT INTO ps_landing.WeightCategory (topiaid, topiaversion,  code, status, lastUpdateDate, species, topiacreatedate, sovLabel, starLabel) VALUES ('fr.ird.referential.ps.landing.WeightCategory#1297580528898#0.6025938943078754',  0, 70, 1, ${CURRENT_TIMESTAMP}, 'fr.ird.referential.common.Species#1239832685474#0.8943253454598569',  '2011-02-13 08:02:06.288'::timestamp , 'Inconnu',                             'GG + 13.6 kg');
    31 
    +INSERT INTO ps_landing.WeightCategory (topiaid, topiaversion,  code, status, lastUpdateDate, species, topiacreatedate, sovLabel, starLabel) VALUES ('fr.ird.referential.ps.landing.WeightCategory#1297580528898#0.7173389548457879',  0, 71, 1, ${CURRENT_TIMESTAMP}, 'fr.ird.referential.common.Species#1239832685474#0.8943253454598569',  '2011-02-13 08:02:06.288'::timestamp, 'Inconnu',                             'R1 entre 13.6 et 3.4 kg');
    32 
    +INSERT INTO ps_landing.WeightCategory (topiaid, topiaversion,  code, status, lastUpdateDate, species, topiacreatedate, sovLabel, starLabel) VALUES ('fr.ird.referential.ps.landing.WeightCategory#1297580528898#0.5739515277681424',  0, 72, 1, ${CURRENT_TIMESTAMP}, 'fr.ird.referential.common.Species#1239832685474#0.8943253454598569',  '2011-02-13 08:02:06.288'::timestamp, 'Inconnu',                             'R2 entre 3.4 et 1.8 kg');
    33 
    +INSERT INTO ps_landing.WeightCategory (topiaid, topiaversion,  code, status, lastUpdateDate, species, topiacreatedate, sovLabel, starLabel) VALUES ('fr.ird.referential.ps.landing.WeightCategory#1297580528898#0.9007932955815551',  0, 73, 1, ${CURRENT_TIMESTAMP}, 'fr.ird.referential.common.Species#1239832685474#0.8943253454598569',  '2011-02-13 08:02:06.288'::timestamp, 'Inconnu',                             'R3 moins de 1.8 kg');
    34 
    +INSERT INTO ps_landing.WeightCategory (topiaid, topiaversion,  code, status, lastUpdateDate, species, topiacreatedate, sovLabel, starLabel) VALUES ('fr.ird.referential.ps.landing.WeightCategory#1297580528898#0.9187448106864885',  0, 1,  1, ${CURRENT_TIMESTAMP}, 'fr.ird.referential.common.Species#1239832685474#0.975344121171992',   '2011-02-13 08:02:06.289'::timestamp, 'Listao - 1.8',                        'Skipjack R2 + R3');
    35 
    +INSERT INTO ps_landing.WeightCategory (topiaid, topiaversion,  code, status, lastUpdateDate, species, topiacreatedate, sovLabel, starLabel) VALUES ('fr.ird.referential.ps.landing.WeightCategory#1297580528898#0.25771673830083053', 0, 2,  1, ${CURRENT_TIMESTAMP}, 'fr.ird.referential.common.Species#1239832685474#0.975344121171992',   '2011-02-13 08:02:06.289'::timestamp, 'Listao + 1.8',                        'Skipjack R1 + Jumbo');
    36 
    +INSERT INTO ps_landing.WeightCategory (topiaid, topiaversion,  code, status, lastUpdateDate, species, topiacreatedate, sovLabel, starLabel) VALUES ('fr.ird.referential.ps.landing.WeightCategory#1297580528898#0.9366187356366772',  0, 3,  1, ${CURRENT_TIMESTAMP}, 'fr.ird.referential.common.Species#1239832685474#0.975344121171992',   '2011-02-13 08:02:06.289'::timestamp, 'Listao -1.5',                         'Skipjack ?');
    37 
    +INSERT INTO ps_landing.WeightCategory (topiaid, topiaversion,  code, status, lastUpdateDate, species, topiacreatedate, sovLabel, starLabel) VALUES ('fr.ird.referential.ps.landing.WeightCategory#1297580528898#0.45933952568779757', 0, 4,  1, ${CURRENT_TIMESTAMP}, 'fr.ird.referential.common.Species#1239832685474#0.975344121171992',   '2011-02-13 08:02:06.289'::timestamp, 'Listao 1.5 à 1.8',                    'Skipjack ?');
    38 
    +INSERT INTO ps_landing.WeightCategory (topiaid, topiaversion,  code, status, lastUpdateDate, species, topiacreatedate, sovLabel, starLabel) VALUES ('fr.ird.referential.ps.landing.WeightCategory#1297580528898#0.984474862871156',   0, 9,  1, ${CURRENT_TIMESTAMP}, 'fr.ird.referential.common.Species#1239832685474#0.975344121171992',   '2011-02-13 08:02:06.29'::timestamp,  'Listao ?',                            'Skipjack ?');
    39 
    +INSERT INTO ps_landing.WeightCategory (topiaid, topiaversion,  code, status, lastUpdateDate, species, topiacreatedate, sovLabel, starLabel) VALUES ('fr.ird.referential.ps.landing.WeightCategory#1297580528898#0.682911685142915',   0, 50, 1, ${CURRENT_TIMESTAMP}, 'fr.ird.referential.common.Species#1239832685474#0.975344121171992',   '2011-02-13 08:02:06.29'::timestamp,  '+3.4 Kg',                             'JUMBO + 3.4 kg');
    40 
    +INSERT INTO ps_landing.WeightCategory (topiaid, topiaversion,  code, status, lastUpdateDate, species, topiacreatedate, sovLabel, starLabel) VALUES ('fr.ird.referential.ps.landing.WeightCategory#1297580528899#0.7220987469827985',  0, 51, 1, ${CURRENT_TIMESTAMP}, 'fr.ird.referential.common.Species#1239832685474#0.975344121171992',   '2011-02-13 08:02:06.29'::timestamp,  '+1.8 Kg à +3.4 Kg',                   'R1 entre 3.4 et 1.8 kg');
    41 
    +INSERT INTO ps_landing.WeightCategory (topiaid, topiaversion,  code, status, lastUpdateDate, species, topiacreatedate, sovLabel, starLabel) VALUES ('fr.ird.referential.ps.landing.WeightCategory#1297580528899#0.04293797444920311', 0, 52, 1, ${CURRENT_TIMESTAMP}, 'fr.ird.referential.common.Species#1239832685474#0.975344121171992',   '2011-02-13 08:02:06.29'::timestamp,  '-1.8 Kg',                             'R2 entre 1.8 et 1.4 kg');
    42 
    +INSERT INTO ps_landing.WeightCategory (topiaid, topiaversion,  code, status, lastUpdateDate, species, topiacreatedate, sovLabel, starLabel) VALUES ('fr.ird.referential.ps.landing.WeightCategory#1297580528899#0.9216790161293088',  0, 53, 1, ${CURRENT_TIMESTAMP}, 'fr.ird.referential.common.Species#1239832685474#0.975344121171992',   '2011-02-13 08:02:06.29'::timestamp,  '-1.5 Kg',                             'R3 moins de 1.4 kg');
    43 
    +INSERT INTO ps_landing.WeightCategory (topiaid, topiaversion,  code, status, lastUpdateDate, species, topiacreatedate, sovLabel, starLabel) VALUES ('fr.ird.referential.ps.landing.WeightCategory#1297580528899#0.6371301485277248',  0, 70, 1, ${CURRENT_TIMESTAMP}, 'fr.ird.referential.common.Species#1239832685474#0.975344121171992',   '2011-02-13 08:02:06.29'::timestamp,  'Inconnu',                             'JUMBO + 3.4 kg');
    44 
    +INSERT INTO ps_landing.WeightCategory (topiaid, topiaversion,  code, status, lastUpdateDate, species, topiacreatedate, sovLabel, starLabel) VALUES ('fr.ird.referential.ps.landing.WeightCategory#1297580528899#0.09257426517648015', 0, 71, 1, ${CURRENT_TIMESTAMP}, 'fr.ird.referential.common.Species#1239832685474#0.975344121171992',   '2011-02-13 08:02:06.29'::timestamp,  'Inconnu',                             'R1 entre 3.4 et 1.8 kg');
    45 
    +INSERT INTO ps_landing.WeightCategory (topiaid, topiaversion,  code, status, lastUpdateDate, species, topiacreatedate, sovLabel, starLabel) VALUES ('fr.ird.referential.ps.landing.WeightCategory#1297580528899#0.5717845604984648',  0, 72, 1, ${CURRENT_TIMESTAMP}, 'fr.ird.referential.common.Species#1239832685474#0.975344121171992',   '2011-02-13 08:02:06.29'::timestamp,  'Inconnu',                             'R2 entre 1.8 et 1.4 kg');
    46 
    +INSERT INTO ps_landing.WeightCategory (topiaid, topiaversion,  code, status, lastUpdateDate, species, topiacreatedate, sovLabel, starLabel) VALUES ('fr.ird.referential.ps.landing.WeightCategory#1297580528899#0.3686414703255526',  0, 73, 1, ${CURRENT_TIMESTAMP}, 'fr.ird.referential.common.Species#1239832685474#0.975344121171992',   '2011-02-13 08:02:06.29'::timestamp,  'Inconnu',                             'R3 moins de 1.4 kg');
    47 
    +INSERT INTO ps_landing.WeightCategory (topiaid, topiaversion,  code, status, lastUpdateDate, species, topiacreatedate, sovLabel, starLabel) VALUES ('fr.ird.referential.ps.landing.WeightCategory#1297580528899#0.55718847508238',    0, 1,  1, ${CURRENT_TIMESTAMP}, 'fr.ird.referential.common.Species#1239832685475#0.13349466123905152', '2011-02-13 08:02:06.29'::timestamp,  'Patudo - 10',                         'Bigeye?');
    48 
    +INSERT INTO ps_landing.WeightCategory (topiaid, topiaversion,  code, status, lastUpdateDate, species, topiacreatedate, sovLabel, starLabel) VALUES ('fr.ird.referential.ps.landing.WeightCategory#1297580528899#0.1154225150942314',  0, 2,  1, ${CURRENT_TIMESTAMP}, 'fr.ird.referential.common.Species#1239832685475#0.13349466123905152', '2011-02-13 08:02:06.29'::timestamp,  'Patudo + 10',                         'Bigeye?');
    49 
    +INSERT INTO ps_landing.WeightCategory (topiaid, topiaversion,  code, status, lastUpdateDate, species, topiacreatedate, sovLabel, starLabel) VALUES ('fr.ird.referential.ps.landing.WeightCategory#1297580528899#0.2685200181978007',  0, 3,  1, ${CURRENT_TIMESTAMP}, 'fr.ird.referential.common.Species#1239832685475#0.13349466123905152', '2011-02-13 08:02:06.29'::timestamp,  'Patudo - 15',                         'Bigeye?');
    50 
    +INSERT INTO ps_landing.WeightCategory (topiaid, topiaversion,  code, status, lastUpdateDate, species, topiacreatedate, sovLabel, starLabel) VALUES ('fr.ird.referential.ps.landing.WeightCategory#1297580528900#0.6722831615934043',  0, 4,  1, ${CURRENT_TIMESTAMP}, 'fr.ird.referential.common.Species#1239832685475#0.13349466123905152', '2011-02-13 08:02:06.291'::timestamp, 'Patudo + 15',                         'Bigeye?');
    51 
    +INSERT INTO ps_landing.WeightCategory (topiaid, topiaversion,  code, status, lastUpdateDate, species, topiacreatedate, sovLabel, starLabel) VALUES ('fr.ird.referential.ps.landing.WeightCategory#1297580528900#0.19938872094926574', 0, 5,  1, ${CURRENT_TIMESTAMP}, 'fr.ird.referential.common.Species#1239832685475#0.13349466123905152', '2011-02-13 08:02:06.291'::timestamp, 'Patudo + 35',                         'Bigeye?');
    52 
    +INSERT INTO ps_landing.WeightCategory (topiaid, topiaversion,  code, status, lastUpdateDate, species, topiacreatedate, sovLabel, starLabel) VALUES ('fr.ird.referential.ps.landing.WeightCategory#1297580528900#0.5746266936785298',  0, 9,  1, ${CURRENT_TIMESTAMP}, 'fr.ird.referential.common.Species#1239832685475#0.13349466123905152', '2011-02-13 08:02:06.291'::timestamp, 'Patudo ?',                            'Bigeye ?');
    53 
    +INSERT INTO ps_landing.WeightCategory (topiaid, topiaversion,  code, status, lastUpdateDate, species, topiacreatedate, sovLabel, starLabel) VALUES ('fr.ird.referential.ps.landing.WeightCategory#1297580528900#0.25713892292707874', 0, 10, 1, ${CURRENT_TIMESTAMP}, 'fr.ird.referential.common.Species#1239832685475#0.13349466123905152', '2011-02-13 08:02:06.291'::timestamp, 'Patudo frais (canneurs)',             'Patudo frais (canneurs)');
    54 
    +INSERT INTO ps_landing.WeightCategory (topiaid, topiaversion,  code, status, lastUpdateDate, species, topiacreatedate, sovLabel, starLabel) VALUES ('fr.ird.referential.ps.landing.WeightCategory#1297580528900#0.6685982018841194',  0, 50, 1, ${CURRENT_TIMESTAMP}, 'fr.ird.referential.common.Species#1239832685475#0.13349466123905152', '2011-02-13 08:02:06.291'::timestamp, 'Inconnu',                             'GG + 13.6 kg');
    55 
    +INSERT INTO ps_landing.WeightCategory (topiaid, topiaversion,  code, status, lastUpdateDate, species, topiacreatedate, sovLabel, starLabel) VALUES ('fr.ird.referential.ps.landing.WeightCategory#1297580528900#0.6904127607618373',  0, 51, 1, ${CURRENT_TIMESTAMP}, 'fr.ird.referential.common.Species#1239832685475#0.13349466123905152', '2011-02-13 08:02:06.291'::timestamp, 'Inconnu',                             'R1 entre 13.6 et 3.4 kg');
    56 
    +INSERT INTO ps_landing.WeightCategory (topiaid, topiaversion,  code, status, lastUpdateDate, species, topiacreatedate, sovLabel, starLabel) VALUES ('fr.ird.referential.ps.landing.WeightCategory#1297580528900#0.2909239953543622',  0, 52, 1, ${CURRENT_TIMESTAMP}, 'fr.ird.referential.common.Species#1239832685475#0.13349466123905152', '2011-02-13 08:02:06.291'::timestamp, 'Inconnu',                             'R2 entre 3.4 et 1.8 kg');
    57 
    +INSERT INTO ps_landing.WeightCategory (topiaid, topiaversion,  code, status, lastUpdateDate, species, topiacreatedate, sovLabel, starLabel) VALUES ('fr.ird.referential.ps.landing.WeightCategory#1297580528900#0.9449657799790759',  0, 53, 1, ${CURRENT_TIMESTAMP}, 'fr.ird.referential.common.Species#1239832685475#0.13349466123905152', '2011-02-13 08:02:06.291'::timestamp, 'Inconnu',                             'R3 moins de 1.8 kg');
    58 
    +INSERT INTO ps_landing.WeightCategory (topiaid, topiaversion,  code, status, lastUpdateDate, species, topiacreatedate, sovLabel, starLabel) VALUES ('fr.ird.referential.ps.landing.WeightCategory#1297580528900#0.33597810152594676', 0, 70, 1, ${CURRENT_TIMESTAMP}, 'fr.ird.referential.common.Species#1239832685475#0.13349466123905152', '2011-02-13 08:02:06.291'::timestamp, 'Inconnu',                             'GG + 13.6 kg');
    59 
    +INSERT INTO ps_landing.WeightCategory (topiaid, topiaversion,  code, status, lastUpdateDate, species, topiacreatedate, sovLabel, starLabel) VALUES ('fr.ird.referential.ps.landing.WeightCategory#1297580528900#0.8237006835612211',  0, 71, 1, ${CURRENT_TIMESTAMP}, 'fr.ird.referential.common.Species#1239832685475#0.13349466123905152', '2011-02-13 08:02:06.291'::timestamp, 'Inconnu',                             'R1 entre 13.6 et 3.4 kg');
    60 
    +INSERT INTO ps_landing.WeightCategory (topiaid, topiaversion,  code, status, lastUpdateDate, species, topiacreatedate, sovLabel, starLabel) VALUES ('fr.ird.referential.ps.landing.WeightCategory#1297580528901#0.657751933189818',   0, 72, 1, ${CURRENT_TIMESTAMP}, 'fr.ird.referential.common.Species#1239832685475#0.13349466123905152', '2011-02-13 08:02:06.291'::timestamp, 'Inconnu',                             'R2 entre 3.4 et 1.8 kg');
    61 
    +INSERT INTO ps_landing.WeightCategory (topiaid, topiaversion,  code, status, lastUpdateDate, species, topiacreatedate, sovLabel, starLabel) VALUES ('fr.ird.referential.ps.landing.WeightCategory#1297580528901#0.5073081843096476',  0, 73, 1, ${CURRENT_TIMESTAMP}, 'fr.ird.referential.common.Species#1239832685475#0.13349466123905152', '2011-02-13 08:02:06.291'::timestamp, 'Inconnu',                             'R3 moins de 1.8 kg');
    62 
    +INSERT INTO ps_landing.WeightCategory (topiaid, topiaversion,  code, status, lastUpdateDate, species, topiacreatedate, sovLabel, starLabel) VALUES ('fr.ird.referential.ps.landing.WeightCategory#1297580528901#0.0836610498990451',  0, 2,  1, ${CURRENT_TIMESTAMP}, 'fr.ird.referential.common.Species#1239832685476#0.5618871286604711',  '2011-02-13 08:02:06.291'::timestamp, 'Germon ',                             'Albacora');
    63 
    +INSERT INTO ps_landing.WeightCategory (topiaid, topiaversion,  code, status, lastUpdateDate, species, topiacreatedate, sovLabel, starLabel) VALUES ('fr.ird.referential.ps.landing.WeightCategory#1297580528901#0.9643811025507996',  0, 9,  1, ${CURRENT_TIMESTAMP}, 'fr.ird.referential.common.Species#1239832685476#0.5618871286604711',  '2011-02-13 08:02:06.291'::timestamp, 'Germon ?',                            'Abacora ?');
    64 
    +INSERT INTO ps_landing.WeightCategory (topiaid, topiaversion,  code, status, lastUpdateDate, species, topiacreatedate, sovLabel, starLabel) VALUES ('fr.ird.referential.ps.landing.WeightCategory#1297580528901#0.9682190838497855',  0, 9,  1, ${CURRENT_TIMESTAMP}, 'fr.ird.referential.common.Species#1239832685477#0.8024257002747615',  '2011-02-13 08:02:06.291'::timestamp, 'Thonine ',                            'undefined');
    65 
    +INSERT INTO ps_landing.WeightCategory (topiaid, topiaversion,  code, status, lastUpdateDate, species, topiacreatedate, sovLabel, starLabel) VALUES ('fr.ird.referential.ps.landing.WeightCategory#1297580528901#0.45162453191323304', 0, 9,  1, ${CURRENT_TIMESTAMP}, 'fr.ird.referential.common.Species#1239832685477#0.3846921632590058',  '2011-02-13 08:02:06.291'::timestamp, 'Auxide ',                             'undefined');
    66 
    +INSERT INTO ps_landing.WeightCategory (topiaid, topiaversion,  code, status, lastUpdateDate, species, topiacreatedate, sovLabel, starLabel) VALUES ('fr.ird.referential.ps.landing.WeightCategory#1297580528901#0.9463330829438842',  0, 9,  1, ${CURRENT_TIMESTAMP}, 'fr.ird.referential.common.Species#1239832684157#0.9835191073325458',  '2011-02-13 08:02:06.291'::timestamp, 'Requins ',                            'undefined');
    67 
    +INSERT INTO ps_landing.WeightCategory (topiaid, topiaversion,  code, status, lastUpdateDate, species, topiacreatedate, sovLabel, starLabel) VALUES ('fr.ird.referential.ps.landing.WeightCategory#1297580528901#0.8486727929567192',  0, 9,  1, ${CURRENT_TIMESTAMP}, 'fr.ird.referential.common.Species#1433499266610#0.696541526820511',   '2011-02-13 08:02:06.291'::timestamp, 'Rejets',                              '?');
    68 
    +INSERT INTO ps_landing.WeightCategory (topiaid, topiaversion,  code, status, lastUpdateDate, species, topiacreatedate, sovLabel, starLabel) VALUES ('fr.ird.referential.ps.landing.WeightCategory#1297580528901#0.5077396278663612',  0, 1,  1, ${CURRENT_TIMESTAMP}, 'fr.ird.referential.common.Species#1433499266610#0.696541526820511',   '2011-02-13 08:02:06.291'::timestamp, 'Thonidés - 10 Kg',                    '?');
    69 
    +INSERT INTO ps_landing.WeightCategory (topiaid, topiaversion,  code, status, lastUpdateDate, species, topiacreatedate, sovLabel, starLabel) VALUES ('fr.ird.referential.ps.landing.WeightCategory#1297580528901#0.676520211264963',   0, 2,  1, ${CURRENT_TIMESTAMP}, 'fr.ird.referential.common.Species#1433499266610#0.696541526820511',   '2011-02-13 08:02:06.291'::timestamp, 'Thonidés +10 Kg',                     '?');
    70 
    +INSERT INTO ps_landing.WeightCategory (topiaid, topiaversion,  code, status, lastUpdateDate, species, topiacreatedate, sovLabel, starLabel) VALUES ('fr.ird.referential.ps.landing.WeightCategory#1297580528901#0.4959464977070138',  0, 9,  1, ${CURRENT_TIMESTAMP}, 'fr.ird.referential.common.Species#1433499266610#0.696541526820511',   '2011-02-13 08:02:06.291'::timestamp, 'Thonidés',                            '?');
    71 
    +INSERT INTO ps_landing.WeightCategory (topiaid, topiaversion,  code, status, lastUpdateDate, species, topiacreatedate, sovLabel, starLabel) VALUES ('fr.ird.referential.ps.landing.WeightCategory#1297580528902#0.76777812435383',    0, 10, 1, ${CURRENT_TIMESTAMP}, 'fr.ird.referential.common.Species#1433499266610#0.696541526820511',   '2011-02-13 08:02:06.292'::timestamp, 'Albacore et Patudo frais (canneurs)', 'Albacore et Patudo frais (canneurs)');
    72 
    +INSERT INTO ps_landing.WeightCategory (topiaid, topiaversion,  code, status, lastUpdateDate, species, topiacreatedate, sovLabel, starLabel) VALUES ('fr.ird.referential.ps.landing.WeightCategory#1297580528902#0.3176362508792657',  0, 50, 1, ${CURRENT_TIMESTAMP}, 'fr.ird.referential.common.Species#1433499266610#0.696541526820511',   '2011-02-13 08:02:06.292'::timestamp, 'SJ YF BE 3.4-10',                     '?');
    73 
    +INSERT INTO ps_landing.WeightCategory (topiaid, topiaversion,  code, status, lastUpdateDate, species, topiacreatedate, sovLabel, starLabel) VALUES ('fr.ird.referential.ps.landing.WeightCategory#1297580528902#0.6606118784093948',  0, 51, 1, ${CURRENT_TIMESTAMP}, 'fr.ird.referential.common.Species#1433499266610#0.696541526820511',   '2011-02-13 08:02:06.292'::timestamp, 'SJ YF BE 1.8-3.4',                    '?');
    74 
    +INSERT INTO ps_landing.WeightCategory (topiaid, topiaversion,  code, status, lastUpdateDate, species, topiacreatedate, sovLabel, starLabel) VALUES ('fr.ird.referential.ps.landing.WeightCategory#1297580528902#0.8531106782664439',  0, 52, 1, ${CURRENT_TIMESTAMP}, 'fr.ird.referential.common.Species#1433499266610#0.696541526820511',   '2011-02-13 08:02:06.292'::timestamp, 'SJ YF BE 1.5-1.8',                    '?');
    75 
    +INSERT INTO ps_landing.WeightCategory (topiaid, topiaversion,  code, status, lastUpdateDate, species, topiacreatedate, sovLabel, starLabel) VALUES ('fr.ird.referential.ps.landing.WeightCategory#1297580528902#0.1116407842625079',  0, 53, 1, ${CURRENT_TIMESTAMP}, 'fr.ird.referential.common.Species#1433499266610#0.696541526820511',   '2011-02-13 08:02:06.292'::timestamp, 'SJ YF BE 1-1.5',                      '?');
    76 
    +INSERT INTO ps_landing.WeightCategory (topiaid, topiaversion,  code, status, lastUpdateDate, species, topiacreatedate, sovLabel, starLabel) VALUES ('fr.ird.referential.ps.landing.WeightCategory#1297580528902#0.9969288992557673',  0, 54, 1, ${CURRENT_TIMESTAMP}, 'fr.ird.referential.common.Species#1433499266610#0.696541526820511',   '2011-02-13 08:02:06.292'::timestamp, 'SJ YF BE under 1',                    '?');
    77 
    +INSERT INTO ps_landing.WeightCategory (topiaid, topiaversion,  code, status, lastUpdateDate, species, topiacreatedate, sovLabel, starLabel) VALUES ('fr.ird.referential.ps.landing.WeightCategory#1297580528902#0.41727746602759885', 0, 9,  1, ${CURRENT_TIMESTAMP}, 'fr.ird.referential.common.Species#1239832685477#0.2673009297087321',  '2011-02-13 08:02:06.292'::timestamp, 'Thonine orientale',                   '?');
    78 
    +INSERT INTO ps_landing.WeightCategory (topiaid, topiaversion,  code, status, lastUpdateDate, species, topiacreatedate, sovLabel, starLabel) VALUES ('fr.ird.referential.ps.landing.WeightCategory#1297580528902#0.7829486684431057',  0, 9,  1, ${CURRENT_TIMESTAMP}, 'fr.ird.referential.common.Species#1239832685478#0.7676744877900202',  '2011-02-13 08:02:06.292'::timestamp, 'Thon mignon',                         '?');
    79 
    +INSERT INTO ps_landing.WeightCategory (topiaid, topiaversion,  code, status, lastUpdateDate, species, topiacreatedate, sovLabel, starLabel) VALUES ('fr.ird.referential.ps.landing.WeightCategory#1297580528902#0.014541584988570166',0, 9,  1, ${CURRENT_TIMESTAMP}, 'fr.ird.referential.common.Species#1239832685477#0.2908846499255108',  '2011-02-13 08:02:06.292'::timestamp, 'Thon à nageoires noires',             '?');
    80 
    +INSERT INTO ps_landing.WeightCategory (topiaid, topiaversion,  code, status, lastUpdateDate, species, topiacreatedate, sovLabel, starLabel) VALUES ('fr.ird.referential.ps.landing.WeightCategory#1297580528902#0.902691806614427',   0, 54, 1, ${CURRENT_TIMESTAMP}, 'fr.ird.referential.common.Species#1239832685474#0.8943253454598569',  '2011-02-13 08:02:06.292'::timestamp, 'YFT -3.4 Kg',                         '?');
    81 
    +INSERT INTO ps_landing.WeightCategory (topiaid, topiaversion,  code, status, lastUpdateDate, species, topiacreatedate, sovLabel, starLabel) VALUES ('fr.ird.referential.ps.landing.WeightCategory#1297580528902#0.6335347201678889',  0, 54, 1, ${CURRENT_TIMESTAMP}, 'fr.ird.referential.common.Species#1239832685474#0.975344121171992',   '2011-02-13 08:02:06.292'::timestamp, 'SKJ -3.4 Kg',                         '?');
    82 
    +INSERT INTO ps_landing.WeightCategory (topiaid, topiaversion,  code, status, lastUpdateDate, species, topiacreatedate, sovLabel, starLabel) VALUES ('fr.ird.referential.ps.landing.WeightCategory#1297580528903#0.49410286646783097', 0, 54, 1, ${CURRENT_TIMESTAMP}, 'fr.ird.referential.common.Species#1239832685475#0.13349466123905152', '2011-02-13 08:02:06.292'::timestamp, 'BET -3.4 Kg',                         '?');
    83 
    +UPDATE ps_landing.WeightCategory SET label2 = sovLabel, label1 = sovLabel || ' #TODO', label3 = sovLabel || ' #TODO';
    84 
    +
    85 
    +INSERT INTO ps_landing.Fate (topiaid, topiaversion, status, topiacreatedate, lastUpdateDate, code, label1) VALUES ('fr.ird.referential.ps.landing.Fate#1454009635524#0.1',       0, 1, '2016-01-28 00:00:00'::timestamp, ${CURRENT_TIMESTAMP}, 1, 'Castelli');
    86 
    +INSERT INTO ps_landing.Fate (topiaid, topiaversion, status, topiacreatedate, lastUpdateDate, code, label1) VALUES ('fr.ird.referential.ps.landing.Fate#1454009635524#0.2',       0, 1, '2016-01-28 00:00:00'::timestamp, ${CURRENT_TIMESTAMP}, 2, 'SCODI');
    87 
    +INSERT INTO ps_landing.Fate (topiaid, topiaversion, status, topiacreatedate, lastUpdateDate, code, label1) VALUES ('fr.ird.referential.ps.landing.Fate#1454009635524#0.3',       0, 1, '2016-01-28 00:00:00'::timestamp, ${CURRENT_TIMESTAMP}, 3, 'PFCI');
    88 
    +INSERT INTO ps_landing.Fate (topiaid, topiaversion, status, topiacreatedate, lastUpdateDate, code, label1) VALUES ('fr.ird.referential.ps.landing.Fate#1454009635524#0.4',       0, 1, '2016-01-28 00:00:00'::timestamp, ${CURRENT_TIMESTAMP}, 4, 'Cargo');
    89 
    +INSERT INTO ps_landing.Fate (topiaid, topiaversion, status, topiacreatedate, lastUpdateDate, code, label1) VALUES ('fr.ird.referential.ps.landing.Fate#1454009635524#0.5',       0, 1, '2016-01-28 00:00:00'::timestamp, ${CURRENT_TIMESTAMP}, 5, 'Conteneur');
    90 
    +INSERT INTO ps_landing.Fate (topiaid, topiaversion, status, topiacreatedate, lastUpdateDate, code, label1) VALUES ('fr.ird.referential.ps.landing.Fate#1454009635524#0.6',       0, 1, '2016-01-28 00:00:00'::timestamp, ${CURRENT_TIMESTAMP}, 6, 'SOGEF');
    91 
    +INSERT INTO ps_landing.Fate (topiaid, topiaversion, status, topiacreatedate, lastUpdateDate, code, label1) VALUES ('fr.ird.referential.ps.landing.Fate#1454009635524#0.7',       0, 1, '2016-01-28 00:00:00'::timestamp, ${CURRENT_TIMESTAMP}, 7, 'IOT');
    92 
    +INSERT INTO ps_landing.Fate (topiaid, topiaversion, status, topiacreatedate, lastUpdateDate, code, label1) VALUES ('fr.ird.referential.ps.landing.Fate#1454009635524#0.8',       0, 1, '2016-01-28 00:00:00'::timestamp, ${CURRENT_TIMESTAMP}, 8, 'PFOI');
    93 
    +INSERT INTO ps_landing.Fate (topiaid, topiaversion, status, topiacreatedate, lastUpdateDate, code, label1) VALUES ('fr.ird.referential.ps.landing.Fate#1454009635524#0.9',       0, 1, '2016-01-28 00:00:00'::timestamp, ${CURRENT_TIMESTAMP}, 9, 'SENEMER');
    94 
    +INSERT INTO ps_landing.Fate (topiaid, topiaversion, status, topiacreatedate, lastUpdateDate, code, label1) VALUES ('fr.ird.referential.ps.landing.Fate#1454009635524#0.10',      0, 1, '2016-01-28 00:00:00'::timestamp, ${CURRENT_TIMESTAMP}, 10, 'PIONNER FOOD CANNERY LTD');
    95 
    +INSERT INTO ps_landing.Fate (topiaid, topiaversion, status, topiacreatedate, lastUpdateDate, code, label1) VALUES ('fr.ird.referential.ps.landing.Fate#1454009635524#0.11',      0, 1, '2016-01-28 00:00:00'::timestamp, ${CURRENT_TIMESTAMP}, 11, 'SOCOFROID');
    96 
    +INSERT INTO ps_landing.Fate (topiaid, topiaversion, status, topiacreatedate, lastUpdateDate, code, label1) VALUES ('fr.ird.referential.ps.landing.Fate#1454009635524#0.12',      0, 1, '2016-01-28 00:00:00'::timestamp, ${CURRENT_TIMESTAMP}, 12, 'PFC TEMA');
    97 
    +INSERT INTO ps_landing.Fate (topiaid, topiaversion, status, topiacreatedate, lastUpdateDate, code, label1) VALUES ('fr.ird.referential.ps.landing.Fate#1454009635524#0.13',      0, 1, '2016-01-28 00:00:00'::timestamp, ${CURRENT_TIMESTAMP}, 13, 'AIRONE CI');
    98 
    +INSERT INTO ps_landing.Fate (topiaid, topiaversion, status, topiacreatedate, lastUpdateDate, code, label1) VALUES ('fr.ird.referential.ps.landing.Fate#1454009635524#0.14',      0, 1, '2016-01-28 00:00:00'::timestamp, ${CURRENT_TIMESTAMP}, 14, 'SCASA');
    99 
    +INSERT INTO ps_landing.Fate (topiaid, topiaversion, status, topiacreatedate, lastUpdateDate, code, label1) VALUES ('fr.ird.referential.ps.landing.Fate#1454009635524#0.15',      0, 1, '2016-01-28 00:00:00'::timestamp, ${CURRENT_TIMESTAMP}, 15, 'SOCEF');
    100 
    +INSERT INTO ps_landing.Fate (topiaid, topiaversion, status, topiacreatedate, lastUpdateDate, code, label1) VALUES ('fr.ird.referential.ps.landing.Fate#1464000000000#0.0001616', 0, 1, '2018-03-09 21:57:34'::timestamp, ${CURRENT_TIMESTAMP}, 16, 'PRINCES TUNA LIMITED');
    101 
    +INSERT INTO ps_landing.Fate (topiaid, topiaversion, status, topiacreatedate, lastUpdateDate, code, label1) VALUES ('fr.ird.referential.ps.landing.Fate#1454009635524#0.16',      1, 1, '2016-01-28 00:00:00'::timestamp, ${CURRENT_TIMESTAMP}, 999, 'Autre');
    102 
    +UPDATE ps_landing.Fate SET label2 = label1, label3 = label1;

  • test/src/main/resources/db/8.1/dataForTestLongline.sql.gz
    No preview for this file type
  • test/src/main/resources/db/8.1/dataForTestSeine.sql.gz
    No preview for this file type
  • test/src/main/resources/db/8.1/empty_h2.sql.gz
    No preview for this file type
  • test/src/main/resources/db/8.1/empty_pg.sql.gz
    No preview for this file type
  • test/src/main/resources/db/8.1/referentiel.sql.gz
    No preview for this file type
  • test/src/main/resources/fixtures/count-referential-seine.properties
    ... ... @@ -46,7 +46,7 @@ ps_logbook.objectmaterial=80
    46 46 
     ps_logbook.observedsystem=24
    47 47 
     ps_logbook.samplequality=5
    48 48 
     ps_logbook.sampletype=6
    49 
    -ps_landing.fate=0
    50 
    -ps_landing.weightcategory=0
    49 
    +ps_landing.fate=17
    50 
    +ps_landing.weightcategory=61
    51 51 
     ps_localmarket.packaging=49
    52 52 
     ps_localmarket.packagingtype=4

  • test/src/main/resources/fixtures/global.properties
    ... ... @@ -38,7 +38,7 @@ DATA_FORM_COUNT=55
    38 38 
     ENTITY_BINDER_REFERENTIAL_COUNT=87
    39 39
    40 40 
     # for fr.ird.observe.services.local.service.referential.differential.DifferentialModelTest
    41 
    -REFERENTIAL_COUNT=3194
    41 
    +REFERENTIAL_COUNT=3272
    42 42
    43 43 
     # for fr.ird.observe.validation.BeanValidatorDetectorTest
    44 44 
     VALIDATORS_COUNT=92

  • test/src/main/resources/fixtures/validate-service-referential.properties
    ... ... @@ -94,6 +94,9 @@ ps.logbook.SampleTypeDto=3
    94 94 
     ps.logbook.WeightCategoryDto=3
    95 95 
     #FIXME Should be 0 when I18n will be ok
    96 96 
     ps.logbook.WellsStateDto=1
    97 
    +ps.landing.FateDto=3
    98 
    +#FIXME Should be 0 when I18n will be ok
    99 
    +ps.landing.WeightCategoryDto=3
    97 100 
     ps.observation.DetectionModeDto=3
    98 101 
     #FIXME Should be 0 when I18n will be ok
    99 102 
     ps.observation.InformationSourceDto=1

  • validation/src/main/i18n/getters/validation-fields.getter
    ... ... @@ -459,6 +459,8 @@ observe.referential.common.Wind.speedRange
    459 459 
     observe.referential.common.Wind.waveHeight
    460 460 
     observe.referential.ll.observation.SensorBrand.brandName
    461 461 
     observe.referential.ps.common.TransmittingBuoyType.technology
    462 
    +observe.referential.ps.landing.WeightCategory.sovLabel
    463 
    +observe.referential.ps.landing.WeightCategory.starLabel
    462 464 
     observe.referential.ps.localmarket.Packaging.harbour
    463 465 
     observe.referential.ps.localmarket.Packaging.packagingType
    464 466 
     observe.referential.ps.logbook.ObjectMaterial.legacyCode

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