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

Commits:

20 changed files:

Changes:

  • client/datasource/editor/ps/src/main/i18n/getters/jaxx.getter
    ... ... @@ -151,6 +151,7 @@ observe.data.ps.logbook.Activity.setCount
    151 151
     observe.data.ps.logbook.Activity.time
    
    152 152
     observe.data.ps.logbook.Activity.totalWeight
    
    153 153
     observe.data.ps.logbook.Activity.vmsDivergent
    
    154
    +observe.data.ps.logbook.Catch.count
    
    154 155
     observe.data.ps.logbook.Catch.weight
    
    155 156
     observe.data.ps.logbook.FloatingObject.buoysTab
    
    156 157
     observe.data.ps.logbook.FloatingObject.materialsTab
    

  • client/datasource/editor/ps/src/main/i18n/getters/navigation.getter
    ... ... @@ -106,6 +106,8 @@ observe.data.ps.logbook.Activity.type
    106 106
     observe.data.ps.logbook.Catch.action.create
    
    107 107
     observe.data.ps.logbook.Catch.action.save
    
    108 108
     observe.data.ps.logbook.Catch.action.save.tip
    
    109
    +observe.data.ps.logbook.Catch.count
    
    110
    +observe.data.ps.logbook.Catch.count.short
    
    109 111
     observe.data.ps.logbook.Catch.speciesFate.short
    
    110 112
     observe.data.ps.logbook.Catch.title
    
    111 113
     observe.data.ps.logbook.Catch.type
    

  • client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/logbook/ActivityCatchUI.jaxx
    ... ... @@ -107,6 +107,15 @@
    107 107
             <JaxxComboBox id='weightMeasureMethod' genericType='WeightMeasureMethodReference'/>
    
    108 108
           </cell>
    
    109 109
         </row>
    
    110
    +    <!-- count -->
    
    111
    +    <row>
    
    112
    +      <cell anchor='west'>
    
    113
    +        <JLabel id='countLabel'/>
    
    114
    +      </cell>
    
    115
    +      <cell anchor='east' weightx="1" fill="both">
    
    116
    +        <NormalTextEditor id='count'/>
    
    117
    +      </cell>
    
    118
    +    </row>
    
    110 119
         <!-- well -->
    
    111 120
         <row>
    
    112 121
           <cell>
    

  • models/definition/src/main/models/Observe/dto/21-data-ps-logbook.model
    ... ... @@ -43,6 +43,7 @@ number + {*:1} Integer
    43 43
     data.ps.logbook.Catch > data.ContainerChild >> data.WellIdAware data.WithSimpleComment
    
    44 44
     comment + {*:1} String
    
    45 45
     weight + {*:1} Float
    
    46
    +count + {*:1} Integer
    
    46 47
     well + {*:1} String
    
    47 48
     speciesFate {*:0..1} referential.ps.common.SpeciesFateReference
    
    48 49
     species {*:1} referential.common.SpeciesReference
    

  • models/definition/src/main/models/Observe/dto/attribute/strictlyPositiveNumber.properties
    ... ... @@ -28,6 +28,7 @@ data.ps.localmarket.SampleSpeciesMeasure.attribute.sizeClass=true
    28 28
     data.ps.localmarket.Survey.attribute.number=true
    
    29 29
     data.ps.logbook.Activity.attribute.number=true
    
    30 30
     data.ps.logbook.Activity.attribute.seaSurfaceTemperature=true
    
    31
    +data.ps.logbook.Catch.attribute.count=true
    
    31 32
     data.ps.logbook.Sample.attribute.number=true
    
    32 33
     data.ps.logbook.SampleSpeciesMeasure.attribute.count=true
    
    33 34
     data.ps.logbook.SampleSpeciesMeasure.attribute.sizeClass=true
    

  • models/definition/src/main/models/Observe/dto/class/containerChildDataDtoProperties.properties
    ... ... @@ -40,7 +40,7 @@ data.ps.landing.Landing=species,weightCategory,weight,destination,fate,fateVesse
    40 40
     data.ps.localmarket.Batch=species,packaging,count,weight
    
    41 41
     data.ps.localmarket.SampleSpecies=species,sizeMeasureType,measuredCount,comment
    
    42 42
     data.ps.localmarket.SurveyPart=species,proportion
    
    43
    -data.ps.logbook.Catch=species,speciesFate,weightCategory,well,weight,comment
    
    43
    +data.ps.logbook.Catch=species,speciesFate,weightCategory,well,weight,count,comment
    
    44 44
     data.ps.logbook.SampleSpecies=subSampleNumber,species,sizeMeasureType,measuredCount,totalCount,comment
    
    45 45
     data.ps.logbook.WellPlan=activity,well,species,weightCategory,weight
    
    46 46
     data.ps.observation.Catch=species,speciesFate,reasonForDiscard,well,catchWeight,totalCount,meanWeight,meanLength,comment
    

  • models/definition/src/main/models/Observe/persistence/21-data-ps-logbook.model
    ... ... @@ -36,6 +36,7 @@ species {*:1} referential.common.Species
    36 36
     weightCategory {*:0..1} referential.ps.logbook.WeightCategory
    
    37 37
     speciesFate {*:0..1} referential.ps.common.SpeciesFate
    
    38 38
     weight + {*:1} Float
    
    39
    +count + {*:1} Integer
    
    39 40
     weightMeasureMethod {*:0..1} referential.common.WeightMeasureMethod
    
    40 41
     well + {*:1} String
    
    41 42
     
    

  • models/dto/i18n/src/main/i18n/getters/labels.getter
    ... ... @@ -877,6 +877,7 @@ observe.data.ps.logbook.Activity.vmsDivergent
    877 877
     observe.data.ps.logbook.Catch.action.create
    
    878 878
     observe.data.ps.logbook.Catch.action.save
    
    879 879
     observe.data.ps.logbook.Catch.action.save.tip
    
    880
    +observe.data.ps.logbook.Catch.count.short
    
    880 881
     observe.data.ps.logbook.Catch.speciesFate.short
    
    881 882
     observe.data.ps.logbook.Catch.title
    
    882 883
     observe.data.ps.logbook.Catch.type
    

  • models/persistence/migration/src/main/resources/db/migration/9.0/05_create-schema-ps_logbook-H2.sql
    ... ... @@ -22,7 +22,7 @@
    22 22
     CREATE SCHEMA ps_logbook;
    
    23 23
     create table ps_logbook.activity (topiaId varchar(255) not null, topiaVersion bigint not null, topiaCreateDate timestamp not null, lastUpdateDate timestamp default CURRENT_TIMESTAMP not null, homeId varchar(255), comment varchar(8192), time time, latitude numeric not null, longitude numeric not null, latitudeOriginal numeric, longitudeOriginal numeric, originalDataModified boolean default false not null, vmsDivergent boolean default false not null, positionCorrected boolean default false not null, number integer not null, setCount integer, seaSurfaceTemperature numeric, windDirection integer, vesselActivity varchar(255) not null, wind varchar(255), totalWeight numeric, currentSpeed numeric, currentDirection integer, schoolType varchar(255), relatedObservedActivity varchar(255), fpaZone varchar(255), dataQuality varchar(255), informationSource varchar(255), route varchar(255) not null, primary key (topiaId));
    
    24 24
     create table ps_logbook.activity_observedsystem (activity varchar(255) not null, observedSystem varchar(255) not null, primary key (activity, observedSystem));
    
    25
    -create table ps_logbook.catch (topiaId varchar(255) not null, topiaVersion bigint not null, topiaCreateDate timestamp not null, lastUpdateDate timestamp default CURRENT_TIMESTAMP not null, homeId varchar(255), comment varchar(8192), species varchar(255) not null, weightCategory varchar(255), speciesFate varchar(255) not null, weight numeric not null, weightMeasureMethod varchar(255) not null, well varchar(255), activity varchar(255) not null, activity_idx integer, primary key (topiaId));
    
    25
    +create table ps_logbook.catch (topiaId varchar(255) not null, topiaVersion bigint not null, topiaCreateDate timestamp not null, lastUpdateDate timestamp default CURRENT_TIMESTAMP not null, homeId varchar(255), comment varchar(8192), species varchar(255) not null, weightCategory varchar(255), speciesFate varchar(255) not null, weight numeric not null, count integer, weightMeasureMethod varchar(255) not null, well varchar(255), activity varchar(255) not null, activity_idx integer, primary key (topiaId));
    
    26 26
     create table ps_logbook.floatingObject (topiaId varchar(255) not null, topiaVersion bigint not null, topiaCreateDate timestamp not null, lastUpdateDate timestamp default CURRENT_TIMESTAMP not null, homeId varchar(255), comment varchar(8192), objectOperation varchar(255), supportVesselName varchar(32), computedWhenArrivingBiodegradable varchar(255), computedWhenArrivingNonEntangling varchar(255), computedWhenArrivingSimplifiedObjectType varchar(255), computedWhenLeavingBiodegradable varchar(255), computedWhenLeavingNonEntangling varchar(255), computedWhenLeavingSimplifiedObjectType varchar(255), activity varchar(255) not null, primary key (topiaId));
    
    27 27
     create table ps_logbook.floatingObjectPart (topiaId varchar(255) not null, topiaVersion bigint not null, topiaCreateDate timestamp not null, lastUpdateDate timestamp default CURRENT_TIMESTAMP not null, homeId varchar(255), whenArriving varchar(255), whenLeaving varchar(255), objectMaterial varchar(255) not null, floatingObject varchar(255) not null, primary key (topiaId));
    
    28 28
     create table ps_logbook.informationSource (topiaId varchar(255) not null, topiaVersion bigint not null, topiaCreateDate timestamp not null, lastUpdateDate timestamp default CURRENT_TIMESTAMP not null, code varchar(255), uri varchar(255), homeId varchar(255), needComment boolean default false not null, status integer not null, label1 varchar(255) not null, label2 varchar(255) not null, label3 varchar(255) not null, label4 varchar(255), label5 varchar(255), label6 varchar(255), label7 varchar(255), label8 varchar(255), primary key (topiaId));
    

  • models/persistence/migration/src/main/resources/db/migration/9.0/05_create-schema-ps_logbook-PG.sql
    ... ... @@ -22,7 +22,7 @@
    22 22
     CREATE SCHEMA ps_logbook;
    
    23 23
     create table ps_logbook.activity (topiaId varchar(255) not null, topiaVersion bigint not null, topiaCreateDate timestamp not null, lastUpdateDate timestamp default CURRENT_TIMESTAMP not null, homeId varchar(255), comment varchar(8192), time time, latitude numeric not null, longitude numeric not null, latitudeOriginal numeric, longitudeOriginal numeric, originalDataModified boolean default false not null, vmsDivergent boolean default false not null, positionCorrected boolean default false not null, number integer not null, setCount integer, seaSurfaceTemperature numeric, windDirection integer, vesselActivity varchar(255) not null, wind varchar(255), totalWeight numeric, currentSpeed numeric, currentDirection integer, schoolType varchar(255), relatedObservedActivity varchar(255), fpaZone varchar(255), dataQuality varchar(255), informationSource varchar(255), route varchar(255) not null, primary key (topiaId));
    
    24 24
     create table ps_logbook.activity_observedsystem (activity varchar(255) not null, observedSystem varchar(255) not null, primary key (activity, observedSystem));
    
    25
    -create table ps_logbook.catch (topiaId varchar(255) not null, topiaVersion bigint not null, topiaCreateDate timestamp not null, lastUpdateDate timestamp default CURRENT_TIMESTAMP not null, homeId varchar(255), comment varchar(8192), species varchar(255) not null, weightCategory varchar(255), speciesFate varchar(255) not null, weight numeric not null, weightMeasureMethod varchar(255) not null, well varchar(255), activity varchar(255) not null, activity_idx integer, primary key (topiaId));
    
    25
    +create table ps_logbook.catch (topiaId varchar(255) not null, topiaVersion bigint not null, topiaCreateDate timestamp not null, lastUpdateDate timestamp default CURRENT_TIMESTAMP not null, homeId varchar(255), comment varchar(8192), species varchar(255) not null, weightCategory varchar(255), speciesFate varchar(255) not null, weight numeric not null, count integer, weightMeasureMethod varchar(255) not null, well varchar(255), activity varchar(255) not null, activity_idx integer, primary key (topiaId));
    
    26 26
     create table ps_logbook.floatingObject (topiaId varchar(255) not null, topiaVersion bigint not null, topiaCreateDate timestamp not null, lastUpdateDate timestamp default CURRENT_TIMESTAMP not null, homeId varchar(255), comment varchar(8192), objectOperation varchar(255), supportVesselName varchar(32), computedWhenArrivingBiodegradable varchar(255), computedWhenArrivingNonEntangling varchar(255), computedWhenArrivingSimplifiedObjectType varchar(255), computedWhenLeavingBiodegradable varchar(255), computedWhenLeavingNonEntangling varchar(255), computedWhenLeavingSimplifiedObjectType varchar(255), activity varchar(255) not null, primary key (topiaId));
    
    27 27
     create table ps_logbook.floatingObjectPart (topiaId varchar(255) not null, topiaVersion bigint not null, topiaCreateDate timestamp not null, lastUpdateDate timestamp default CURRENT_TIMESTAMP not null, homeId varchar(255), whenArriving varchar(255), whenLeaving varchar(255), objectMaterial varchar(255) not null, floatingObject varchar(255) not null, primary key (topiaId));
    
    28 28
     create table ps_logbook.informationSource (topiaId varchar(255) not null, topiaVersion bigint not null, topiaCreateDate timestamp not null, lastUpdateDate timestamp default CURRENT_TIMESTAMP not null, code varchar(255), uri varchar(255), homeId varchar(255), needComment boolean default false not null, status integer not null, label1 varchar(255) not null, label2 varchar(255) not null, label3 varchar(255) not null, label4 varchar(255), label5 varchar(255), label6 varchar(255), label7 varchar(255), label8 varchar(255), primary key (topiaId));
    

  • models/persistence/migration/src/main/resources/db/migration/9.0/05_full-schema-ps_logbook-H2.sql
    ... ... @@ -22,7 +22,7 @@
    22 22
     CREATE SCHEMA ps_logbook;
    
    23 23
     create table ps_logbook.activity (topiaId varchar(255) not null, topiaVersion bigint not null, topiaCreateDate timestamp not null, lastUpdateDate timestamp default CURRENT_TIMESTAMP not null, homeId varchar(255), comment varchar(8192), time time, latitude numeric not null, longitude numeric not null, latitudeOriginal numeric, longitudeOriginal numeric, originalDataModified boolean default false not null, vmsDivergent boolean default false not null, positionCorrected boolean default false not null, number integer not null, setCount integer, seaSurfaceTemperature numeric, windDirection integer, vesselActivity varchar(255) not null, wind varchar(255), totalWeight numeric, currentSpeed numeric, currentDirection integer, schoolType varchar(255), relatedObservedActivity varchar(255), fpaZone varchar(255), dataQuality varchar(255), informationSource varchar(255), route varchar(255) not null, primary key (topiaId));
    
    24 24
     create table ps_logbook.activity_observedsystem (activity varchar(255) not null, observedSystem varchar(255) not null, primary key (activity, observedSystem));
    
    25
    -create table ps_logbook.catch (topiaId varchar(255) not null, topiaVersion bigint not null, topiaCreateDate timestamp not null, lastUpdateDate timestamp default CURRENT_TIMESTAMP not null, homeId varchar(255), comment varchar(8192), species varchar(255) not null, weightCategory varchar(255), speciesFate varchar(255) not null, weight numeric not null, weightMeasureMethod varchar(255) not null, well varchar(255), activity varchar(255) not null, activity_idx integer, primary key (topiaId));
    
    25
    +create table ps_logbook.catch (topiaId varchar(255) not null, topiaVersion bigint not null, topiaCreateDate timestamp not null, lastUpdateDate timestamp default CURRENT_TIMESTAMP not null, homeId varchar(255), comment varchar(8192), species varchar(255) not null, weightCategory varchar(255), speciesFate varchar(255) not null, weight numeric not null, count integer, weightMeasureMethod varchar(255) not null, well varchar(255), activity varchar(255) not null, activity_idx integer, primary key (topiaId));
    
    26 26
     create table ps_logbook.floatingObject (topiaId varchar(255) not null, topiaVersion bigint not null, topiaCreateDate timestamp not null, lastUpdateDate timestamp default CURRENT_TIMESTAMP not null, homeId varchar(255), comment varchar(8192), objectOperation varchar(255), supportVesselName varchar(32), computedWhenArrivingBiodegradable varchar(255), computedWhenArrivingNonEntangling varchar(255), computedWhenArrivingSimplifiedObjectType varchar(255), computedWhenLeavingBiodegradable varchar(255), computedWhenLeavingNonEntangling varchar(255), computedWhenLeavingSimplifiedObjectType varchar(255), activity varchar(255) not null, primary key (topiaId));
    
    27 27
     create table ps_logbook.floatingObjectPart (topiaId varchar(255) not null, topiaVersion bigint not null, topiaCreateDate timestamp not null, lastUpdateDate timestamp default CURRENT_TIMESTAMP not null, homeId varchar(255), whenArriving varchar(255), whenLeaving varchar(255), objectMaterial varchar(255) not null, floatingObject varchar(255) not null, primary key (topiaId));
    
    28 28
     create table ps_logbook.informationSource (topiaId varchar(255) not null, topiaVersion bigint not null, topiaCreateDate timestamp not null, lastUpdateDate timestamp default CURRENT_TIMESTAMP not null, code varchar(255), uri varchar(255), homeId varchar(255), needComment boolean default false not null, status integer not null, label1 varchar(255) not null, label2 varchar(255) not null, label3 varchar(255) not null, label4 varchar(255), label5 varchar(255), label6 varchar(255), label7 varchar(255), label8 varchar(255), primary key (topiaId));
    

  • models/persistence/migration/src/main/resources/db/migration/9.0/05_full-schema-ps_logbook-PG.sql
    ... ... @@ -22,7 +22,7 @@
    22 22
     CREATE SCHEMA ps_logbook;
    
    23 23
     create table ps_logbook.activity (topiaId varchar(255) not null, topiaVersion bigint not null, topiaCreateDate timestamp not null, lastUpdateDate timestamp default CURRENT_TIMESTAMP not null, homeId varchar(255), comment varchar(8192), time time, latitude numeric not null, longitude numeric not null, latitudeOriginal numeric, longitudeOriginal numeric, originalDataModified boolean default false not null, vmsDivergent boolean default false not null, positionCorrected boolean default false not null, number integer not null, setCount integer, seaSurfaceTemperature numeric, windDirection integer, vesselActivity varchar(255) not null, wind varchar(255), totalWeight numeric, currentSpeed numeric, currentDirection integer, schoolType varchar(255), relatedObservedActivity varchar(255), fpaZone varchar(255), dataQuality varchar(255), informationSource varchar(255), route varchar(255) not null, primary key (topiaId));
    
    24 24
     create table ps_logbook.activity_observedsystem (activity varchar(255) not null, observedSystem varchar(255) not null, primary key (activity, observedSystem));
    
    25
    -create table ps_logbook.catch (topiaId varchar(255) not null, topiaVersion bigint not null, topiaCreateDate timestamp not null, lastUpdateDate timestamp default CURRENT_TIMESTAMP not null, homeId varchar(255), comment varchar(8192), species varchar(255) not null, weightCategory varchar(255), speciesFate varchar(255) not null, weight numeric not null, weightMeasureMethod varchar(255) not null, well varchar(255), activity varchar(255) not null, activity_idx integer, primary key (topiaId));
    
    25
    +create table ps_logbook.catch (topiaId varchar(255) not null, topiaVersion bigint not null, topiaCreateDate timestamp not null, lastUpdateDate timestamp default CURRENT_TIMESTAMP not null, homeId varchar(255), comment varchar(8192), species varchar(255) not null, weightCategory varchar(255), speciesFate varchar(255) not null, weight numeric not null, count integer, weightMeasureMethod varchar(255) not null, well varchar(255), activity varchar(255) not null, activity_idx integer, primary key (topiaId));
    
    26 26
     create table ps_logbook.floatingObject (topiaId varchar(255) not null, topiaVersion bigint not null, topiaCreateDate timestamp not null, lastUpdateDate timestamp default CURRENT_TIMESTAMP not null, homeId varchar(255), comment varchar(8192), objectOperation varchar(255), supportVesselName varchar(32), computedWhenArrivingBiodegradable varchar(255), computedWhenArrivingNonEntangling varchar(255), computedWhenArrivingSimplifiedObjectType varchar(255), computedWhenLeavingBiodegradable varchar(255), computedWhenLeavingNonEntangling varchar(255), computedWhenLeavingSimplifiedObjectType varchar(255), activity varchar(255) not null, primary key (topiaId));
    
    27 27
     create table ps_logbook.floatingObjectPart (topiaId varchar(255) not null, topiaVersion bigint not null, topiaCreateDate timestamp not null, lastUpdateDate timestamp default CURRENT_TIMESTAMP not null, homeId varchar(255), whenArriving varchar(255), whenLeaving varchar(255), objectMaterial varchar(255) not null, floatingObject varchar(255) not null, primary key (topiaId));
    
    28 28
     create table ps_logbook.informationSource (topiaId varchar(255) not null, topiaVersion bigint not null, topiaCreateDate timestamp not null, lastUpdateDate timestamp default CURRENT_TIMESTAMP not null, code varchar(255), uri varchar(255), homeId varchar(255), needComment boolean default false not null, status integer not null, label1 varchar(255) not null, label2 varchar(255) not null, label3 varchar(255) not null, label4 varchar(255), label5 varchar(255), label6 varchar(255), label7 varchar(255), label8 varchar(255), primary key (topiaId));
    

  • models/persistence/migration/src/main/resources/db/migration/9.0/observe_create-schema-H2.sql
    ... ... @@ -155,7 +155,7 @@ create table ps_localmarket.survey (topiaId varchar(255) not null, topiaVersion
    155 155
     create table ps_localmarket.surveyPart (topiaId varchar(255) not null, topiaVersion bigint not null, topiaCreateDate timestamp not null, lastUpdateDate timestamp default CURRENT_TIMESTAMP not null, homeId varchar(255), species varchar(255) not null, proportion integer not null, survey varchar(255) not null, primary key (topiaId));
    
    156 156
     create table ps_logbook.activity (topiaId varchar(255) not null, topiaVersion bigint not null, topiaCreateDate timestamp not null, lastUpdateDate timestamp default CURRENT_TIMESTAMP not null, homeId varchar(255), comment varchar(8192), time time, latitude numeric not null, longitude numeric not null, latitudeOriginal numeric, longitudeOriginal numeric, originalDataModified boolean default false not null, vmsDivergent boolean default false not null, positionCorrected boolean default false not null, number integer not null, setCount integer, seaSurfaceTemperature numeric, windDirection integer, vesselActivity varchar(255) not null, wind varchar(255), totalWeight numeric, currentSpeed numeric, currentDirection integer, schoolType varchar(255), relatedObservedActivity varchar(255), fpaZone varchar(255), dataQuality varchar(255), informationSource varchar(255), route varchar(255) not null, primary key (topiaId));
    
    157 157
     create table ps_logbook.activity_observedsystem (activity varchar(255) not null, observedSystem varchar(255) not null, primary key (activity, observedSystem));
    
    158
    -create table ps_logbook.catch (topiaId varchar(255) not null, topiaVersion bigint not null, topiaCreateDate timestamp not null, lastUpdateDate timestamp default CURRENT_TIMESTAMP not null, homeId varchar(255), comment varchar(8192), species varchar(255) not null, weightCategory varchar(255), speciesFate varchar(255) not null, weight numeric not null, weightMeasureMethod varchar(255) not null, well varchar(255), activity varchar(255) not null, activity_idx integer, primary key (topiaId));
    
    158
    +create table ps_logbook.catch (topiaId varchar(255) not null, topiaVersion bigint not null, topiaCreateDate timestamp not null, lastUpdateDate timestamp default CURRENT_TIMESTAMP not null, homeId varchar(255), comment varchar(8192), species varchar(255) not null, weightCategory varchar(255), speciesFate varchar(255) not null, weight numeric not null, count integer, weightMeasureMethod varchar(255) not null, well varchar(255), activity varchar(255) not null, activity_idx integer, primary key (topiaId));
    
    159 159
     create table ps_logbook.floatingObject (topiaId varchar(255) not null, topiaVersion bigint not null, topiaCreateDate timestamp not null, lastUpdateDate timestamp default CURRENT_TIMESTAMP not null, homeId varchar(255), comment varchar(8192), objectOperation varchar(255), supportVesselName varchar(32), computedWhenArrivingBiodegradable varchar(255), computedWhenArrivingNonEntangling varchar(255), computedWhenArrivingSimplifiedObjectType varchar(255), computedWhenLeavingBiodegradable varchar(255), computedWhenLeavingNonEntangling varchar(255), computedWhenLeavingSimplifiedObjectType varchar(255), activity varchar(255) not null, primary key (topiaId));
    
    160 160
     create table ps_logbook.floatingObjectPart (topiaId varchar(255) not null, topiaVersion bigint not null, topiaCreateDate timestamp not null, lastUpdateDate timestamp default CURRENT_TIMESTAMP not null, homeId varchar(255), whenArriving varchar(255), whenLeaving varchar(255), objectMaterial varchar(255) not null, floatingObject varchar(255) not null, primary key (topiaId));
    
    161 161
     create table ps_logbook.informationSource (topiaId varchar(255) not null, topiaVersion bigint not null, topiaCreateDate timestamp not null, lastUpdateDate timestamp default CURRENT_TIMESTAMP not null, code varchar(255), uri varchar(255), homeId varchar(255), needComment boolean default false not null, status integer not null, label1 varchar(255) not null, label2 varchar(255) not null, label3 varchar(255) not null, label4 varchar(255), label5 varchar(255), label6 varchar(255), label7 varchar(255), label8 varchar(255), primary key (topiaId));
    

  • models/persistence/migration/src/main/resources/db/migration/9.0/observe_create-schema-PG.sql
    ... ... @@ -155,7 +155,7 @@ create table ps_localmarket.survey (topiaId varchar(255) not null, topiaVersion
    155 155
     create table ps_localmarket.surveyPart (topiaId varchar(255) not null, topiaVersion bigint not null, topiaCreateDate timestamp not null, lastUpdateDate timestamp default CURRENT_TIMESTAMP not null, homeId varchar(255), species varchar(255) not null, proportion integer not null, survey varchar(255) not null, primary key (topiaId));
    
    156 156
     create table ps_logbook.activity (topiaId varchar(255) not null, topiaVersion bigint not null, topiaCreateDate timestamp not null, lastUpdateDate timestamp default CURRENT_TIMESTAMP not null, homeId varchar(255), comment varchar(8192), time time, latitude numeric not null, longitude numeric not null, latitudeOriginal numeric, longitudeOriginal numeric, originalDataModified boolean default false not null, vmsDivergent boolean default false not null, positionCorrected boolean default false not null, number integer not null, setCount integer, seaSurfaceTemperature numeric, windDirection integer, vesselActivity varchar(255) not null, wind varchar(255), totalWeight numeric, currentSpeed numeric, currentDirection integer, schoolType varchar(255), relatedObservedActivity varchar(255), fpaZone varchar(255), dataQuality varchar(255), informationSource varchar(255), route varchar(255) not null, primary key (topiaId));
    
    157 157
     create table ps_logbook.activity_observedsystem (activity varchar(255) not null, observedSystem varchar(255) not null, primary key (activity, observedSystem));
    
    158
    -create table ps_logbook.catch (topiaId varchar(255) not null, topiaVersion bigint not null, topiaCreateDate timestamp not null, lastUpdateDate timestamp default CURRENT_TIMESTAMP not null, homeId varchar(255), comment varchar(8192), species varchar(255) not null, weightCategory varchar(255), speciesFate varchar(255) not null, weight numeric not null, weightMeasureMethod varchar(255) not null, well varchar(255), activity varchar(255) not null, activity_idx integer, primary key (topiaId));
    
    158
    +create table ps_logbook.catch (topiaId varchar(255) not null, topiaVersion bigint not null, topiaCreateDate timestamp not null, lastUpdateDate timestamp default CURRENT_TIMESTAMP not null, homeId varchar(255), comment varchar(8192), species varchar(255) not null, weightCategory varchar(255), speciesFate varchar(255) not null, weight numeric not null, count integer, weightMeasureMethod varchar(255) not null, well varchar(255), activity varchar(255) not null, activity_idx integer, primary key (topiaId));
    
    159 159
     create table ps_logbook.floatingObject (topiaId varchar(255) not null, topiaVersion bigint not null, topiaCreateDate timestamp not null, lastUpdateDate timestamp default CURRENT_TIMESTAMP not null, homeId varchar(255), comment varchar(8192), objectOperation varchar(255), supportVesselName varchar(32), computedWhenArrivingBiodegradable varchar(255), computedWhenArrivingNonEntangling varchar(255), computedWhenArrivingSimplifiedObjectType varchar(255), computedWhenLeavingBiodegradable varchar(255), computedWhenLeavingNonEntangling varchar(255), computedWhenLeavingSimplifiedObjectType varchar(255), activity varchar(255) not null, primary key (topiaId));
    
    160 160
     create table ps_logbook.floatingObjectPart (topiaId varchar(255) not null, topiaVersion bigint not null, topiaCreateDate timestamp not null, lastUpdateDate timestamp default CURRENT_TIMESTAMP not null, homeId varchar(255), whenArriving varchar(255), whenLeaving varchar(255), objectMaterial varchar(255) not null, floatingObject varchar(255) not null, primary key (topiaId));
    
    161 161
     create table ps_logbook.informationSource (topiaId varchar(255) not null, topiaVersion bigint not null, topiaCreateDate timestamp not null, lastUpdateDate timestamp default CURRENT_TIMESTAMP not null, code varchar(255), uri varchar(255), homeId varchar(255), needComment boolean default false not null, status integer not null, label1 varchar(255) not null, label2 varchar(255) not null, label3 varchar(255) not null, label4 varchar(255), label5 varchar(255), label6 varchar(255), label7 varchar(255), label8 varchar(255), primary key (topiaId));
    

  • models/persistence/migration/src/main/resources/db/migration/9.0/observe_full-schema-H2.sql
    ... ... @@ -155,7 +155,7 @@ create table ps_localmarket.survey (topiaId varchar(255) not null, topiaVersion
    155 155
     create table ps_localmarket.surveyPart (topiaId varchar(255) not null, topiaVersion bigint not null, topiaCreateDate timestamp not null, lastUpdateDate timestamp default CURRENT_TIMESTAMP not null, homeId varchar(255), species varchar(255) not null, proportion integer not null, survey varchar(255) not null, primary key (topiaId));
    
    156 156
     create table ps_logbook.activity (topiaId varchar(255) not null, topiaVersion bigint not null, topiaCreateDate timestamp not null, lastUpdateDate timestamp default CURRENT_TIMESTAMP not null, homeId varchar(255), comment varchar(8192), time time, latitude numeric not null, longitude numeric not null, latitudeOriginal numeric, longitudeOriginal numeric, originalDataModified boolean default false not null, vmsDivergent boolean default false not null, positionCorrected boolean default false not null, number integer not null, setCount integer, seaSurfaceTemperature numeric, windDirection integer, vesselActivity varchar(255) not null, wind varchar(255), totalWeight numeric, currentSpeed numeric, currentDirection integer, schoolType varchar(255), relatedObservedActivity varchar(255), fpaZone varchar(255), dataQuality varchar(255), informationSource varchar(255), route varchar(255) not null, primary key (topiaId));
    
    157 157
     create table ps_logbook.activity_observedsystem (activity varchar(255) not null, observedSystem varchar(255) not null, primary key (activity, observedSystem));
    
    158
    -create table ps_logbook.catch (topiaId varchar(255) not null, topiaVersion bigint not null, topiaCreateDate timestamp not null, lastUpdateDate timestamp default CURRENT_TIMESTAMP not null, homeId varchar(255), comment varchar(8192), species varchar(255) not null, weightCategory varchar(255), speciesFate varchar(255) not null, weight numeric not null, weightMeasureMethod varchar(255) not null, well varchar(255), activity varchar(255) not null, activity_idx integer, primary key (topiaId));
    
    158
    +create table ps_logbook.catch (topiaId varchar(255) not null, topiaVersion bigint not null, topiaCreateDate timestamp not null, lastUpdateDate timestamp default CURRENT_TIMESTAMP not null, homeId varchar(255), comment varchar(8192), species varchar(255) not null, weightCategory varchar(255), speciesFate varchar(255) not null, weight numeric not null, count integer, weightMeasureMethod varchar(255) not null, well varchar(255), activity varchar(255) not null, activity_idx integer, primary key (topiaId));
    
    159 159
     create table ps_logbook.floatingObject (topiaId varchar(255) not null, topiaVersion bigint not null, topiaCreateDate timestamp not null, lastUpdateDate timestamp default CURRENT_TIMESTAMP not null, homeId varchar(255), comment varchar(8192), objectOperation varchar(255), supportVesselName varchar(32), computedWhenArrivingBiodegradable varchar(255), computedWhenArrivingNonEntangling varchar(255), computedWhenArrivingSimplifiedObjectType varchar(255), computedWhenLeavingBiodegradable varchar(255), computedWhenLeavingNonEntangling varchar(255), computedWhenLeavingSimplifiedObjectType varchar(255), activity varchar(255) not null, primary key (topiaId));
    
    160 160
     create table ps_logbook.floatingObjectPart (topiaId varchar(255) not null, topiaVersion bigint not null, topiaCreateDate timestamp not null, lastUpdateDate timestamp default CURRENT_TIMESTAMP not null, homeId varchar(255), whenArriving varchar(255), whenLeaving varchar(255), objectMaterial varchar(255) not null, floatingObject varchar(255) not null, primary key (topiaId));
    
    161 161
     create table ps_logbook.informationSource (topiaId varchar(255) not null, topiaVersion bigint not null, topiaCreateDate timestamp not null, lastUpdateDate timestamp default CURRENT_TIMESTAMP not null, code varchar(255), uri varchar(255), homeId varchar(255), needComment boolean default false not null, status integer not null, label1 varchar(255) not null, label2 varchar(255) not null, label3 varchar(255) not null, label4 varchar(255), label5 varchar(255), label6 varchar(255), label7 varchar(255), label8 varchar(255), primary key (topiaId));
    

  • models/persistence/migration/src/main/resources/db/migration/9.0/observe_full-schema-PG.sql
    ... ... @@ -155,7 +155,7 @@ create table ps_localmarket.survey (topiaId varchar(255) not null, topiaVersion
    155 155
     create table ps_localmarket.surveyPart (topiaId varchar(255) not null, topiaVersion bigint not null, topiaCreateDate timestamp not null, lastUpdateDate timestamp default CURRENT_TIMESTAMP not null, homeId varchar(255), species varchar(255) not null, proportion integer not null, survey varchar(255) not null, primary key (topiaId));
    
    156 156
     create table ps_logbook.activity (topiaId varchar(255) not null, topiaVersion bigint not null, topiaCreateDate timestamp not null, lastUpdateDate timestamp default CURRENT_TIMESTAMP not null, homeId varchar(255), comment varchar(8192), time time, latitude numeric not null, longitude numeric not null, latitudeOriginal numeric, longitudeOriginal numeric, originalDataModified boolean default false not null, vmsDivergent boolean default false not null, positionCorrected boolean default false not null, number integer not null, setCount integer, seaSurfaceTemperature numeric, windDirection integer, vesselActivity varchar(255) not null, wind varchar(255), totalWeight numeric, currentSpeed numeric, currentDirection integer, schoolType varchar(255), relatedObservedActivity varchar(255), fpaZone varchar(255), dataQuality varchar(255), informationSource varchar(255), route varchar(255) not null, primary key (topiaId));
    
    157 157
     create table ps_logbook.activity_observedsystem (activity varchar(255) not null, observedSystem varchar(255) not null, primary key (activity, observedSystem));
    
    158
    -create table ps_logbook.catch (topiaId varchar(255) not null, topiaVersion bigint not null, topiaCreateDate timestamp not null, lastUpdateDate timestamp default CURRENT_TIMESTAMP not null, homeId varchar(255), comment varchar(8192), species varchar(255) not null, weightCategory varchar(255), speciesFate varchar(255) not null, weight numeric not null, weightMeasureMethod varchar(255) not null, well varchar(255), activity varchar(255) not null, activity_idx integer, primary key (topiaId));
    
    158
    +create table ps_logbook.catch (topiaId varchar(255) not null, topiaVersion bigint not null, topiaCreateDate timestamp not null, lastUpdateDate timestamp default CURRENT_TIMESTAMP not null, homeId varchar(255), comment varchar(8192), species varchar(255) not null, weightCategory varchar(255), speciesFate varchar(255) not null, weight numeric not null, count integer, weightMeasureMethod varchar(255) not null, well varchar(255), activity varchar(255) not null, activity_idx integer, primary key (topiaId));
    
    159 159
     create table ps_logbook.floatingObject (topiaId varchar(255) not null, topiaVersion bigint not null, topiaCreateDate timestamp not null, lastUpdateDate timestamp default CURRENT_TIMESTAMP not null, homeId varchar(255), comment varchar(8192), objectOperation varchar(255), supportVesselName varchar(32), computedWhenArrivingBiodegradable varchar(255), computedWhenArrivingNonEntangling varchar(255), computedWhenArrivingSimplifiedObjectType varchar(255), computedWhenLeavingBiodegradable varchar(255), computedWhenLeavingNonEntangling varchar(255), computedWhenLeavingSimplifiedObjectType varchar(255), activity varchar(255) not null, primary key (topiaId));
    
    160 160
     create table ps_logbook.floatingObjectPart (topiaId varchar(255) not null, topiaVersion bigint not null, topiaCreateDate timestamp not null, lastUpdateDate timestamp default CURRENT_TIMESTAMP not null, homeId varchar(255), whenArriving varchar(255), whenLeaving varchar(255), objectMaterial varchar(255) not null, floatingObject varchar(255) not null, primary key (topiaId));
    
    161 161
     create table ps_logbook.informationSource (topiaId varchar(255) not null, topiaVersion bigint not null, topiaCreateDate timestamp not null, lastUpdateDate timestamp default CURRENT_TIMESTAMP not null, code varchar(255), uri varchar(255), homeId varchar(255), needComment boolean default false not null, status integer not null, label1 varchar(255) not null, label2 varchar(255) not null, label3 varchar(255) not null, label4 varchar(255), label5 varchar(255), label6 varchar(255), label7 varchar(255), label8 varchar(255), primary key (topiaId));
    

  • services/i18n/src/main/i18n/translations/services_en_GB.properties
    ... ... @@ -1053,6 +1053,8 @@ observe.data.ps.logbook.Activity.vmsDivergent=Vms divergent?
    1053 1053
     observe.data.ps.logbook.Catch.action.create=Create a new catch
    
    1054 1054
     observe.data.ps.logbook.Catch.action.save=Insert this catch
    
    1055 1055
     observe.data.ps.logbook.Catch.action.save.tip=Insert this catch
    
    1056
    +observe.data.ps.logbook.Catch.count=Count
    
    1057
    +observe.data.ps.logbook.Catch.count.short=Count
    
    1056 1058
     observe.data.ps.logbook.Catch.speciesFate.short=Species fate
    
    1057 1059
     observe.data.ps.logbook.Catch.title=Catches
    
    1058 1060
     observe.data.ps.logbook.Catch.type=Catch
    

  • services/i18n/src/main/i18n/translations/services_es_ES.properties
    ... ... @@ -1053,6 +1053,8 @@ observe.data.ps.logbook.Activity.vmsDivergent=Vms divergent?\#TODO
    1053 1053
     observe.data.ps.logbook.Catch.action.create=Crear una captura
    
    1054 1054
     observe.data.ps.logbook.Catch.action.save=Insertar captura
    
    1055 1055
     observe.data.ps.logbook.Catch.action.save.tip=Insertar captura
    
    1056
    +observe.data.ps.logbook.Catch.count=Count
    
    1057
    +observe.data.ps.logbook.Catch.count.short=Count
    
    1056 1058
     observe.data.ps.logbook.Catch.speciesFate.short=Devenir
    
    1057 1059
     observe.data.ps.logbook.Catch.title=Captura
    
    1058 1060
     observe.data.ps.logbook.Catch.type=Captura
    

  • services/i18n/src/main/i18n/translations/services_fr_FR.properties
    ... ... @@ -1053,6 +1053,8 @@ observe.data.ps.logbook.Activity.vmsDivergent=Divergence Vms ?
    1053 1053
     observe.data.ps.logbook.Catch.action.create=Nouvelle capture
    
    1054 1054
     observe.data.ps.logbook.Catch.action.save=Insérer cette capture
    
    1055 1055
     observe.data.ps.logbook.Catch.action.save.tip=Insérer cette capture
    
    1056
    +observe.data.ps.logbook.Catch.count=Nombre d'individus
    
    1057
    +observe.data.ps.logbook.Catch.count.short=Nombre
    
    1056 1058
     observe.data.ps.logbook.Catch.speciesFate.short=Devenir
    
    1057 1059
     observe.data.ps.logbook.Catch.title=Captures
    
    1058 1060
     observe.data.ps.logbook.Catch.type=Captures
    

  • services/validation/src/main/i18n/getters/eugene.getter
    ... ... @@ -256,6 +256,7 @@ observe.data.ps.logbook.Activity.floatingObjectEmpty
    256 256
     observe.data.ps.logbook.Activity.number
    
    257 257
     observe.data.ps.logbook.Activity.time
    
    258 258
     observe.data.ps.logbook.Activity.totalWeight
    
    259
    +observe.data.ps.logbook.Catch.count
    
    259 260
     observe.data.ps.logbook.Catch.weight
    
    260 261
     observe.data.ps.logbook.FloatingObject.materialsValid
    
    261 262
     observe.data.ps.logbook.FloatingObjectPart.objectMaterial