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

Commits:

25 changed files:

Changes:

  • client-datasource-editor-ps/src/main/java/fr/ird/observe/client/datasource/editor/content/ref/ps/logbook/WellsStateUI.jaxx
    1 
    +<!--
    2 
    +  #%L
    3 
    +  ObServe :: Client DataSource Editor PS
    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 
    +  This program is distributed in the hope that it will be useful,
    12 
    +  but WITHOUT ANY WARRANTY; without even the implied warranty of
    13 
    +  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    14 
    +  GNU General Public License for more details.
    15 
    +  You should have received a copy of the GNU General Public
    16 
    +  License along with this program.  If not, see
    17 
    +  <http://www.gnu.org/licenses/gpl-3.0.html>.
    18 
    +  #L%
    19 
    +  -->
    20 
    +
    21 
    +<fr.ird.observe.client.datasource.editor.content.ref.ContentI18nReferentialUI beanScope="bean"
    22 
    +                                                                              i18n="fr.ird.observe.dto.referential.ps.logbook.WellsStateDto"
    23 
    +                                                                              superGenericType='WellsStateDto, WellsStateReference, WellsStateUI'>
    24 
    +
    25 
    +  <import>
    26 
    +    fr.ird.observe.dto.reference.ReferentialDtoReference
    27 
    +    fr.ird.observe.dto.referential.ps.logbook.WellsStateDto
    28 
    +    fr.ird.observe.dto.referential.ps.logbook.WellsStateReference
    29 
    +    fr.ird.observe.client.util.UIHelper
    30 
    +
    31 
    +    io.ultreia.java4all.jaxx.widgets.combobox.JaxxComboBox
    32 
    +    org.nuiton.jaxx.widgets.text.NormalTextEditor
    33 
    +    fr.ird.observe.client.util.BeanEnumEditor
    34 
    +    fr.ird.observe.client.util.BeanCheckBox
    35 
    +
    36 
    +    static fr.ird.observe.client.util.UIHelper.getStringValue
    37 
    +    fr.ird.observe.dto.referential.ReferenceStatus
    38 
    +  </import>
    39 
    +
    40 
    +  <!-- validator -->
    41 
    +  <BeanValidator id='validator' autoField='true'
    42 
    +                 beanClass='fr.ird.observe.dto.referential.ps.logbook.WellsStateDto'
    43 
    +                 context='create' errorTableModel='{getErrorTableModel()}'>
    44 
    +    <field name="enabled" component="status"/>
    45 
    +  </BeanValidator>
    46 
    +
    47 
    +  <!-- model -->
    48 
    +  <WellsStateUIModel id='model' constructorParams='@override'/>
    49 
    +
    50 
    +  <!-- edit bean -->
    51 
    +  <WellsStateDto id='bean'/>
    52 
    +
    53 
    +  <Table id='editTable'>
    54 
    +
    55 
    +    <!-- uri -->
    56 
    +    <row>
    57 
    +      <cell anchor="west">
    58 
    +        <JLabel id='uriLabel'/>
    59 
    +      </cell>
    60 
    +      <cell anchor='east' weightx="1" fill="both">
    61 
    +        <NormalTextEditor id='uri'/>
    62 
    +      </cell>
    63 
    +    </row>
    64 
    +
    65 
    +    <!-- code / status -->
    66 
    +    <row>
    67 
    +      <cell anchor="west">
    68 
    +        <JLabel id='codeStatusLabel'/>
    69 
    +      </cell>
    70 
    +      <cell anchor='east' weightx="1" fill="both">
    71 
    +        <JPanel id='codeStatusPanel' layout='{new BorderLayout()}'>
    72 
    +          <NormalTextEditor id='code' constraints='BorderLayout.WEST'/>
    73 
    +          <BeanEnumEditor id='status' constructorParams='ReferenceStatus.class' genericType='ReferenceStatus' constraints='BorderLayout.CENTER'/>
    74 
    +        </JPanel>
    75 
    +      </cell>
    76 
    +    </row>
    77 
    +
    78 
    +    <!-- needComment -->
    79 
    +    <row>
    80 
    +      <cell anchor='east' weightx="1" fill="both" columns="2">
    81 
    +        <BeanCheckBox id='needComment'/>
    82 
    +      </cell>
    83 
    +    </row>
    84 
    +  </Table>
    85 
    +
    86 
    +</fr.ird.observe.client.datasource.editor.content.ref.ContentI18nReferentialUI>

  • client-datasource-editor-ps/src/main/java/fr/ird/observe/client/datasource/editor/content/ref/ps/logbook/WellsStateUIHandler.java
    1 
    +package fr.ird.observe.client.datasource.editor.content.ref.ps.logbook;
    2 
    +
    3 
    +/*-
    4 
    + * #%L
    5 
    + * ObServe :: Client DataSource Editor PS
    6 
    + * %%
    7 
    + * Copyright (C) 2008 - 2020 IRD, Code Lutin, Ultreia.io
    8 
    + * %%
    9 
    + * This program is free software: you can redistribute it and/or modify
    10 
    + * it under the terms of the GNU General Public License as
    11 
    + * published by the Free Software Foundation, either version 3 of the
    12 
    + * License, or (at your option) any later version.
    13 
    + *
    14 
    + * This program is distributed in the hope that it will be useful,
    15 
    + * but WITHOUT ANY WARRANTY; without even the implied warranty of
    16 
    + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    17 
    + * GNU General Public License for more details.
    18 
    + *
    19 
    + * You should have received a copy of the GNU General Public
    20 
    + * License along with this program.  If not, see
    21 
    + * <http://www.gnu.org/licenses/gpl-3.0.html>.
    22 
    + * #L%
    23 
    + */
    24 
    +
    25 
    +import fr.ird.observe.client.datasource.editor.content.ref.ContentReferentialUIHandler;
    26 
    +import fr.ird.observe.dto.referential.ps.logbook.WellsStateDto;
    27 
    +import fr.ird.observe.dto.referential.ps.logbook.WellsStateReference;
    28 
    +import org.nuiton.jaxx.runtime.spi.UIHandler;
    29 
    +
    30 
    +/**
    31 
    + * Created on 23/08/2020.
    32 
    + *
    33 
    + * @author Tony Chemit - dev@tchemit.fr
    34 
    + * @since 8.1.0
    35 
    + */
    36 
    +public class WellsStateUIHandler
    37 
    +extends ContentReferentialUIHandler<WellsStateDto, WellsStateReference, WellsStateUI> implements UIHandler<WellsStateUI> {
    38 
    +
    39 
    +}

  • client-datasource-editor-ps/src/main/java/fr/ird/observe/client/datasource/editor/content/ref/ps/logbook/WellsStateUIModel.java
    1 
    +package fr.ird.observe.client.datasource.editor.content.ref.ps.logbook;
    2 
    +
    3 
    +/*-
    4 
    + * #%L
    5 
    + * ObServe :: Client DataSource Editor PS
    6 
    + * %%
    7 
    + * Copyright (C) 2008 - 2020 IRD, Code Lutin, Ultreia.io
    8 
    + * %%
    9 
    + * This program is free software: you can redistribute it and/or modify
    10 
    + * it under the terms of the GNU General Public License as
    11 
    + * published by the Free Software Foundation, either version 3 of the
    12 
    + * License, or (at your option) any later version.
    13 
    + *
    14 
    + * This program is distributed in the hope that it will be useful,
    15 
    + * but WITHOUT ANY WARRANTY; without even the implied warranty of
    16 
    + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    17 
    + * GNU General Public License for more details.
    18 
    + *
    19 
    + * You should have received a copy of the GNU General Public
    20 
    + * License along with this program.  If not, see
    21 
    + * <http://www.gnu.org/licenses/gpl-3.0.html>.
    22 
    + * #L%
    23 
    + */
    24 
    +
    25 
    +import fr.ird.observe.client.datasource.editor.content.ref.ContentReferentialUIModel;
    26 
    +import fr.ird.observe.dto.referential.ps.logbook.WellsStateDto;
    27 
    +import fr.ird.observe.dto.referential.ps.logbook.WellsStateReference;
    28 
    +
    29 
    +/**
    30 
    + * Created on 23/08/2020.
    31 
    + *
    32 
    + * @author Tony Chemit - dev@tchemit.fr
    33 
    + * @since 8.1.0
    34 
    + */
    35 
    +public class WellsStateUIModel  extends ContentReferentialUIModel<WellsStateDto, WellsStateReference> {
    36 
    +
    37 
    +    public WellsStateUIModel() {
    38 
    +        super(WellsStateDto.class);
    39 
    +    }
    40 
    +
    41 
    +}

  • dto/src/main/i18n/getters/eugene.getter
    ... ... @@ -109,6 +109,7 @@ observe.referential.ps.common.TransmittingBuoyOwnership.type
    109 109 
     observe.referential.ps.common.TransmittingBuoyType.type
    110 110 
     observe.referential.ps.common.VesselActivity.type
    111 111 
     observe.referential.ps.logbook.WeightCategory.type
    112 
    +observe.referential.ps.logbook.WellsState.type
    112 113 
     observe.referential.ps.observation.DetectionMode.type
    113 114 
     observe.referential.ps.observation.InformationSource.type
    114 115 
     observe.referential.ps.observation.NonTargetCatchReleaseConformity.type

  • dto/src/main/java/fr/ird/observe/dto/decoration/init/ReferentialPsLogbookModelDecoratorInitializer.java
    ... ... @@ -24,14 +24,16 @@ package fr.ird.observe.dto.decoration.init;
    24 24
    25 25 
     import fr.ird.observe.dto.decoration.DecoratorService;
    26 26 
     import fr.ird.observe.dto.referential.ps.logbook.WeightCategoryDto;
    27 
    +import fr.ird.observe.dto.referential.ps.logbook.WellsStateDto;
    27 28 
     import fr.ird.observe.dto.referential.ps.logbook.WeightCategoryReference;
    29 
    +import fr.ird.observe.dto.referential.ps.logbook.WellsStateReference;
    28 30 
     import fr.ird.observe.spi.model.initializer.ObserveReferentialPsLogbookModelInitializer;
    29 31
    30 32 
     /**
    31 33 
      * Created on 23/08/2020.
    32 34 
      *
    33 35 
      * @author Tony Chemit - dev@tchemit.fr
    34 
    - * @since
    36 
    + * @since 8.1.0
    35 37 
      */
    36 38 
     public class ReferentialPsLogbookModelDecoratorInitializer  extends ModelDecoratorInitializerSupport implements ObserveReferentialPsLogbookModelInitializer {
    37 39 
         public ReferentialPsLogbookModelDecoratorInitializer(DecoratorService decoratorService) {
    ... ... @@ -42,4 +44,8 @@ public class ReferentialPsLogbookModelDecoratorInitializer extends ModelDecorat
    42 44 
         public void initPsLogbookWeightCategoryDto() {
    43 45 
             registerDefaultReferentialAndReferentialReferenceDecorator(WeightCategoryDto.class, WeightCategoryReference.class, libelle);
    44 46 
         }
    47 
    +    @Override
    48 
    +    public void initPsLogbookWellsStateDto() {
    49 
    +        registerDefaultReferentialAndReferentialReferenceDecorator(WellsStateDto.class, WellsStateReference.class, libelle);
    50 
    +    }
    45 51 
     }

  • dto/src/main/java/fr/ird/observe/spi/DtoModelClasses.java
    ... ... @@ -92,7 +92,8 @@ public class DtoModelClasses {
    92 92 
                 fr.ird.observe.dto.referential.ps.observation.ObservedSystemDto.class
    93 93 
         );
    94 94 
         public static final ImmutableSet<Class<? extends ReferentialDto>> SEINE_LOGBOOK_REFERENTIAL_TYPES = ImmutableSet.of(
    95 
    -            fr.ird.observe.dto.referential.ps.logbook.WeightCategoryDto.class
    95 
    +            fr.ird.observe.dto.referential.ps.logbook.WeightCategoryDto.class,
    96 
    +            fr.ird.observe.dto.referential.ps.logbook.WellsStateDto.class
    96 97 
         );
    97 98
    98 99 
         public static final ImmutableSet<Class<? extends ReferentialDto>> SEINE_REFERENTIAL_TYPES = ImmutableSet.<Class<? extends ReferentialDto>>builder()

  • dto/src/main/models/Observe-04-referential-ps-logbook.model
    ... ... @@ -2,3 +2,5 @@ package fr.ird.observe.dto.referential.ps.logbook | form=self packagePriority=4
    2 2
    3 3 
     referential.ps.logbook.WeightCategory > referential.I18nReferential >> reference.ReferentialDtoReferenceWithNoCodeAware | references=code,label,uri,species
    4 4 
     species {*:1} fr.ird.observe.dto.referential.common.SpeciesReference | notNull
    5 
    +
    6 
    +referential.ps.logbook.WellsState > referential.I18nReferential

  • observe-i18n/src/main/i18n/translations/observe_en_GB.properties
    ... ... @@ -1843,6 +1843,7 @@ observe.referential.ps.common.TransmittingBuoyTypeDto.validation.technology.too.
    1843 1843 
     observe.referential.ps.common.VesselActivity.allowFad=Allow Fad ?
    1844 1844 
     observe.referential.ps.common.VesselActivity.type=Vessel activity (Seine)
    1845 1845 
     observe.referential.ps.logbook.WeightCategory.type=Weight category
    1846 
    +observe.referential.ps.logbook.WellsState.type=Wells state
    1846 1847 
     observe.referential.ps.observation.DetectionMode.type=Detection mode
    1847 1848 
     observe.referential.ps.observation.InformationSource.type=Information source
    1848 1849 
     observe.referential.ps.observation.NonTargetCatchReleaseConformity.type=Release conformity

  • observe-i18n/src/main/i18n/translations/observe_es_ES.properties
    ... ... @@ -1843,6 +1843,7 @@ observe.referential.ps.common.TransmittingBuoyTypeDto.validation.technology.too.
    1843 1843 
     observe.referential.ps.common.VesselActivity.allowFad=Utilisation Object flottant ? \#TODO
    1844 1844 
     observe.referential.ps.common.VesselActivity.type=Actividad buque \#TODO-SP
    1845 1845 
     observe.referential.ps.logbook.WeightCategory.type=Categoría de peso
    1846 
    +observe.referential.ps.logbook.WellsState.type=Wells state \#TODO
    1846 1847 
     observe.referential.ps.observation.DetectionMode.type=Modo de detección
    1847 1848 
     observe.referential.ps.observation.InformationSource.type=Information source \#TODO
    1848 1849 
     observe.referential.ps.observation.NonTargetCatchReleaseConformity.type=Conformidad en la liberacion de especies no objetivo

  • observe-i18n/src/main/i18n/translations/observe_fr_FR.properties
    ... ... @@ -1843,6 +1843,7 @@ observe.referential.ps.common.TransmittingBuoyTypeDto.validation.technology.too.
    1843 1843 
     observe.referential.ps.common.VesselActivity.allowFad=Utilisation Object flottant ?
    1844 1844 
     observe.referential.ps.common.VesselActivity.type=Activité bateau (Senne)
    1845 1845 
     observe.referential.ps.logbook.WeightCategory.type=Catégorie de poids
    1846 
    +observe.referential.ps.logbook.WellsState.type=État de remplissage des cuves
    1846 1847 
     observe.referential.ps.observation.DetectionMode.type=Mode détection
    1847 1848 
     observe.referential.ps.observation.InformationSource.type=Origine de l'information
    1848 1849 
     observe.referential.ps.observation.NonTargetCatchReleaseConformity.type=Conformité à la libération

  • persistence/src/main/java/fr/ird/observe/entities/Entities.java
    ... ... @@ -97,6 +97,7 @@ public class Entities {
    97 97 
                         ObserveEntityEnum.ps_observation_ObservedSystem,
    98 98
    99 99 
                         ObserveEntityEnum.ps_logbook_WeightCategory,
    100 
    +                    ObserveEntityEnum.ps_logbook_WellsState,
    100 101
    101 102 
                         ObserveEntityEnum.ll_common_BaitSettingStatus,
    102 103 
                         ObserveEntityEnum.ll_common_BaitType,

  • persistence/src/main/java/fr/ird/observe/entities/migration/DataSourceMigrationForVersion_8_1.java
    ... ... @@ -48,6 +48,7 @@ public class DataSourceMigrationForVersion_8_1 extends MigrationVersionResource
    48 48
    49 49 
             executor.addScript("01","ps_observation_add_referential_InformationSource");
    50 50 
             executor.addScript("02","ps_logbook_move_referential_weightCategory");
    51 
    +        executor.addScript("03","ps_logbook_add_referential_wellsState");
    51 52 
         }
    52 53
    53 54 
     }

  • persistence/src/main/models/Observe-04-referential-ps-logbook.model
    ... ... @@ -2,3 +2,5 @@ package fr.ird.observe.entities.referential.ps.logbook | entity dbSchema=ps_logb
    2 2
    3 3 
     referential.ps.logbook.WeightCategory > referential.I18nReferentialEntity | entity
    4 4 
     species {*:1} referential.common.Species | lazy=false
    5 
    +
    6 
    +referential.ps.logbook.WellsState > referential.I18nReferentialEntity | entity

  • persistence/src/main/resources/db/migration/8.1/03_ps_logbook_add_referential_wellsState-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 
    +CREATE TABLE ps_logbook.WellsState(topiaId VARCHAR(255) NOT NULL,topiaVersion BIGINT NOT NULL, topiaCreateDate DATE, lastUpdateDate TIMESTAMP NOT NULL, code VARCHAR(255), status INTEGER DEFAULT 1, needComment BOOLEAN DEFAULT false, uri VARCHAR(255), homeId VARCHAR(255), label1 VARCHAR(255), label2 VARCHAR(255), label3 VARCHAR(255),label4 VARCHAR(255),label5 VARCHAR(255),label6 VARCHAR(255),label7 VARCHAR(255),label8 VARCHAR(255));
    23 
    +ALTER TABLE ps_logbook.WellsState ADD CONSTRAINT PK_WellsState PRIMARY KEY(topiaid);
    24 
    +INSERT INTO common.LASTUPDATEDATE(topiaId, topiaversion, topiacreatedate, TYPE , LASTUPDATEDATE) values ('fr.ird.observe.entities.LastUpdateDate#666#2003', 0, '2020-08-23'::date, 'fr.ird.observe.entities.referentiel.ps.logbook.WellsState', '2020-08-23 10:57:53.455000'::timestamp);
    25 
    +
    26 
    +INSERT INTO ps_logbook.WellsState(topiaid, topiaversion, topiacreatedate, lastupdatedate, status, needComment, code, label1, label2, label3) values ('fr.ird.referential.ps.logbook.WellsState#666#01' , 0, '2020-08-23'::date, '2020-08-23 10:57:53.455000'::timestamp, 1, false, '1',      'Wells empty'              , 'Cuves vides'              , 'Wells empty #TODO');
    27 
    +INSERT INTO ps_logbook.WellsState(topiaid, topiaversion, topiacreatedate, lastupdatedate, status, needComment, code, label1, label2, label3) values ('fr.ird.referential.ps.logbook.WellsState#666#02' , 0, '2020-08-23'::date, '2020-08-23 10:57:53.455000'::timestamp, 1, false, '2',      ' Wells not empty'    , 'Cuves non vides'    , 'Wells not empty #TODO');

  • test/src/main/java/fr/ird/observe/test/ObserveFixtures.java
    ... ... @@ -51,6 +51,7 @@ public class ObserveFixtures {
    51 51 
                 "fr.ird.observe.dto.referential.common.",
    52 52 
                 "fr.ird.observe.dto.referential.ps.common.",
    53 53 
                 "fr.ird.observe.dto.referential.ps.observation.",
    54 
    +            "fr.ird.observe.dto.referential.ps.logbook.",
    54 55 
                 "fr.ird.observe.dto.referential.ll.common.",
    55 56 
                 "fr.ird.observe.dto.referential.ll.observation.",
    56 57 
                 "fr.ird.observe.dto.referential.ll.logbook.",
    ... ... @@ -58,6 +59,7 @@ public class ObserveFixtures {
    58 59 
                 "fr.ird.observe.dto.data.",
    59 60 
                 "fr.ird.observe.dto.data.ps.common.",
    60 61 
                 "fr.ird.observe.dto.data.ps.observation.",
    62 
    +            "fr.ird.observe.dto.data.ps.logbook.",
    61 63 
                 "fr.ird.observe.dto.data.ll.common.",
    62 64 
                 "fr.ird.observe.dto.data.ll.observation.",
    63 65 
                 "fr.ird.observe.dto.data.ll.logbook.",

  • 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-common.properties
    ... ... @@ -27,7 +27,7 @@ common.gear_gearcharacteristic=29
    27 27 
     common.gearcharacteristic=22
    28 28 
     common.gearcharacteristictype=6
    29 29 
     common.harbour=74
    30 
    -common.lastupdatedate=123
    30 
    +common.lastupdatedate=124
    31 31 
     common.lengthlengthparameter=0
    32 32 
     common.lengthmeasuremethod=4
    33 33 
     common.lengthweightparameter=361

  • test/src/main/resources/fixtures/count-referential-seine.properties
    ... ... @@ -40,3 +40,4 @@ ps_observation.reasonfornullset=10
    40 40 
     ps_observation.speciesstatus=4
    41 41 
     ps_observation.surroundingactivity=8
    42 42 
     ps_logbook.weightcategory=110
    43 
    +ps_logbook.wellsstate=2

  • test/src/main/resources/fixtures/global.properties
    ... ... @@ -33,7 +33,7 @@ GEAR_USE_FEATURES_SEINE_ID_1=fr.ird.data.ps.common.GearUseFeatures#1440486230661
    33 33 
     SPECIES_GROUP_ID=fr.ird.referential.common.SpeciesGroup#1239832683689#0.7120116158620075
    34 34 
     REFERENCE_DATA_COUNT=45
    35 35 
     # for fr.ird.observe.services.local.service.referential.differential.DifferentialModelTest
    36 
    -REFERENTIAL_COUNT=3022
    36 
    +REFERENTIAL_COUNT=3024
    37 37 
     # was 59
    38 38 
     DATA_FORM_COUNT=42
    39 39 
     VALIDATORS_COUNT=46
    ... ... @@ -44,11 +44,11 @@ VALIDATOR_UPDATE_REFERENTIAL_COUNT=3
    44 44 
     VALIDATOR_UPDATE_ENTITY_DATA_COUNT=40
    45 45 
     VALIDATOR_UPDATE_EXTRA_CREATE_DATA_COUNT=9
    46 46 
     ENTITIES_LIMIT_SIZE=100
    47 
    -ENTITY_BINDER_REFERENTIAL_COUNT=78
    47 
    +ENTITY_BINDER_REFERENTIAL_COUNT=79
    48 48 
     # was 130
    49 49 
     VALIDATOR_CREATE_ENTITY_DATA_COUNT_REAL=45
    50 50 
     # was 133
    51 51 
     VALIDATOR_UPDATE_ENTITY_DATA_COUNT_REAL=45
    52 
    -VALIDATOR_UPDATE_REFERENTIAL_COUNT_REAL=78
    53 
    -VALIDATOR_CREATE_REFERENTIAL_COUNT_REAL=78
    52 
    +VALIDATOR_UPDATE_REFERENTIAL_COUNT_REAL=79
    53 
    +VALIDATOR_CREATE_REFERENTIAL_COUNT_REAL=79
    54 54

  • test/src/main/resources/fixtures/validate-service-referential.properties
    ... ... @@ -19,83 +19,85 @@
    19 19 
     # <http://www.gnu.org/licenses/gpl-3.0.html>.
    20 20 
     # #L%
    21 21 
     ###
    22 
    -DataQualityDto=1
    23 
    -SpeciesGroupReleaseModeDto=1
    24 
    -SettingShapeDto=3
    25 
    -BaitHaulingStatusDto=3
    26 
    -ObservationMethodDto=1
    27 
    -TransmittingBuoyOperationDto=3
    22 
    +common.DataQualityDto=1
    23 
    +common.SpeciesGroupReleaseModeDto=1
    24 
    +ll.common.SettingShapeDto=3
    25 
    +ll.observation.BaitHaulingStatusDto=3
    26 
    +ll.common.ObservationMethodDto=1
    27 
    +ps.common.TransmittingBuoyOperationDto=3
    28 28 
     ps.logbook.WeightCategoryDto=3
    29 
    -LengthMeasureMethodDto=1
    30 
    -WeightMeasureMethodDto=1
    31 
    -ReasonForNoFishingDto=3
    32 
    -ObservedSystemDto=4
    29 
    +common.LengthMeasureMethodDto=1
    30 
    +common.WeightMeasureMethodDto=1
    31 
    +ps.observation.ReasonForNoFishingDto=3
    32 
    +ps.observation.ObservedSystemDto=4
    33 33 
     #FIXME We were at 20 just before usage of application-context...
    34 
    -SpeciesDto=14
    35 
    -PersonDto=4
    36 
    -HookPositionDto=1
    37 
    -HookTypeDto=1
    38 
    -SpeciesListDto=2
    39 
    -LightsticksColorDto=2
    40 
    -BaitSettingStatusDto=1
    41 
    -VesselTypeDto=3
    42 
    -SexDto=2
    43 
    -NonTargetCatchReleaseConformityDto=2
    44 
    -MaturityStatusDto=3
    45 
    -LengthWeightParameterDto=3
    46 
    -NonTargetCatchReleaseStatusDto=2
    47 
    -SurroundingActivityDto=3
    48 
    -ItemVerticalPositionDto=1
    49 
    -OceanDto=3
    34 
    +common.SpeciesDto=14
    35 
    +common.PersonDto=4
    36 
    +ll.observation.HookPositionDto=1
    37 
    +ll.common.HookTypeDto=1
    38 
    +common.SpeciesListDto=2
    39 
    +ll.common.LightsticksColorDto=2
    40 
    +ll.common.BaitSettingStatusDto=1
    41 
    +common.VesselTypeDto=3
    42 
    +common.SexDto=2
    43 
    +ps.observation.NonTargetCatchReleaseConformityDto=2
    44 
    +ll.observation.MaturityStatusDto=3
    45 
    +common.LengthWeightParameterDto=3
    46 
    +ps.observation.NonTargetCatchReleaseStatusDto=2
    47 
    +ps.observation.SurroundingActivityDto=3
    48 
    +ll.observation.ItemVerticalPositionDto=1
    49 
    +common.OceanDto=3
    50 50 
     ps.common.VesselActivityDto=4
    51 
    -HarbourDto=8
    52 
    -HealthStatusDto=1
    53 
    -ObjectOperationDto=2
    54 
    -SensorDataFormatDto=1
    55 
    -ObjectMaterialTypeDto=2
    51 
    +common.HarbourDto=8
    52 
    +ll.common.HealthStatusDto=1
    53 
    +ps.common.ObjectOperationDto=2
    54 
    +ll.observation.SensorDataFormatDto=1
    55 
    +ps.common.ObjectMaterialTypeDto=2
    56 56 
     #FIXME We were at 6 just before usage of application-context...
    57 
    -CountryDto=5
    58 
    -ReasonForNullSetDto=3
    59 
    -FpaZoneDto=5
    60 
    -NonTargetCatchReleasingTimeDto=1
    61 
    -EncounterTypeDto=1
    62 
    -VesselDto=10
    63 
    -MitigationTypeDto=1
    64 
    -VesselSizeCategoryDto=1
    65 
    -SizeMeasureTypeDto=3
    66 
    -ShipOwnerDto=3
    67 
    -CatchFateDto=1
    68 
    -GearCharacteristicTypeDto=2
    69 
    -GearCharacteristicDto=1
    70 
    -ReasonForDiscardDto=3
    71 
    -WeightMeasureTypeDto=1
    72 
    -LightsticksTypeDto=1
    57 
    +common.CountryDto=5
    58 
    +ps.observation.ReasonForNullSetDto=3
    59 
    +common.FpaZoneDto=5
    60 
    +ps.observation.NonTargetCatchReleasingTimeDto=1
    61 
    +ll.observation.EncounterTypeDto=1
    62 
    +common.VesselDto=10
    63 
    +ll.common.MitigationTypeDto=1
    64 
    +common.VesselSizeCategoryDto=1
    65 
    +common.SizeMeasureTypeDto=3
    66 
    +common.ShipOwnerDto=3
    67 
    +ll.common.CatchFateDto=1
    68 
    +common.GearCharacteristicTypeDto=2
    69 
    +common.GearCharacteristicDto=1
    70 
    +ps.observation.ReasonForDiscardDto=3
    71 
    +common.WeightMeasureTypeDto=1
    72 
    +ll.common.LightsticksTypeDto=1
    73 73 
     #FIXME Should be 0 when I18n will be ok
    74 
    -InformationSourceDto=1
    75 
    -ItemHorizontalPositionDto=3
    76 
    -OrganismDto=4
    77 
    -GearDto=2
    78 
    -DetectionModeDto=3
    79 
    -HookSizeDto=3
    80 
    -SensorBrandDto=1
    81 
    -SensorTypeDto=3
    82 
    -TransmittingBuoyTypeDto=3
    83 
    -SpeciesFateDto=3
    84 
    -WindDto=1
    85 
    -SpeciesStatusDto=3
    74 
    +ps.observation.InformationSourceDto=1
    75 
    +#FIXME Should be 0 when I18n will be ok
    76 
    +ps.logbook.WellsStateDto=1
    77 
    +ll.observation.ItemHorizontalPositionDto=3
    78 
    +common.OrganismDto=4
    79 
    +common.GearDto=2
    80 
    +ps.observation.DetectionModeDto=3
    81 
    +ll.common.HookSizeDto=3
    82 
    +ll.observation.SensorBrandDto=1
    83 
    +ll.observation.SensorTypeDto=3
    84 
    +ps.common.TransmittingBuoyTypeDto=3
    85 
    +ps.common.SpeciesFateDto=3
    86 
    +common.WindDto=1
    87 
    +ps.observation.SpeciesStatusDto=3
    86 88 
     ll.common.VesselActivityDto=2
    87 
    -ObjectMaterialDto=11
    89 
    +ps.observation.ObjectMaterialDto=11
    88 90 
     #FIXME We were at 3 just before usage of application-context...
    89 
    -LineTypeDto=2
    91 
    +ll.common.LineTypeDto=2
    90 92 
     #FIXME We were at 9 just before usage of application-context...
    91 
    -ProgramDto=8
    92 
    -BaitTypeDto=3
    93 
    -SpeciesGroupDto=2
    94 
    -StomachFullnessDto=3
    95 
    -ConservationDto=1
    96 
    -OnBoardProcessingDto=1
    97 
    -DataSourceDto=2
    98 
    -TripTypeDto=1
    99 
    -CompagniesDto=3
    100 
    -SchoolTypeDto=1
    101 
    -TransmittingBuoyOwnershipDto=2
    93 
    +common.ProgramDto=8
    94 
    +ll.common.BaitTypeDto=3
    95 
    +common.SpeciesGroupDto=2
    96 
    +ll.observation.StomachFullnessDto=3
    97 
    +ll.landing.ConservationDto=1
    98 
    +ll.common.OnBoardProcessingDto=1
    99 
    +ll.landing.DataSourceDto=2
    100 
    +ll.common.TripTypeDto=1
    101 
    +ll.landing.CompagniesDto=3
    102 
    +ps.common.SchoolTypeDto=1
    103 
    +ps.common.TransmittingBuoyOwnershipDto=2

  • test/src/main/resources/fixtures/validate-service-seine-trips.properties
    ... ... @@ -19,12 +19,12 @@
    19 19 
     # <http://www.gnu.org/licenses/gpl-3.0.html>.
    20 20 
     # #L%
    21 21 
     ###
    22 
    -TripDto=5
    23 
    -RouteDto=3
    24 
    -ActivityDto=11
    25 
    -TransmittingBuoyDto=2
    26 
    -SetDto=3
    27 
    -CatchDto=4
    28 
    -SizeDto=2
    29 
    -FloatingObjectDto=1
    30 
    -FloatingObjectPartDto=1
    22 
    +ps.common.TripDto=5
    23 
    +ps.observation.RouteDto=3
    24 
    +ps.observation.ActivityDto=11
    25 
    +ps.observation.TransmittingBuoyDto=2
    26 
    +ps.observation.SetDto=3
    27 
    +ps.observation.CatchDto=4
    28 
    +ps.observation.SizeDto=2
    29 
    +ps.observation.FloatingObjectDto=1
    30 
    +ps.observation.FloatingObjectPartDto=1

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