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

Commits:

14 changed files:

Changes:

  • persistence/src/main/models/Observe-01-referential-common.model
    ... ... @@ -187,3 +187,8 @@ referentiel.WeightMeasureType > referentiel.I18nReferentialEntity | entity
    187 187 
     referentiel.Wind > referentiel.I18nReferentialEntity | entity
    188 188 
     speedRange + {*:1} String
    189 189 
     waveHeight + {*:1} String
    190 
    +
    191 
    +referentiel.TransmittingBuoyOwnership > referentiel.I18nReferentialEntity | entity
    192 
    +
    193 
    +referentiel.SchoolType > referentiel.I18nReferentialEntity | entity
    194 
    +

  • persistence/src/main/models/Observe-03-referential-seine-obs.model
    1 
    +package fr.ird.observe.entities.referentiel.seine.obs | dbSchema=ps_observation
    1 2
    2 3 
     enum !fr.ird.observe.dto.data.seine.NonTargetCatchReleaseStatus
    3 4
    4 5 
     enum !fr.ird.observe.dto.data.seine.SchoolType
    5 6
    6 
    -referentiel.seine.DetectionMode > referentiel.I18nReferentialEntity | entity dbSchema=ps_observation
    7 
    +referentiel.seine.obs.DetectionMode > referentiel.I18nReferentialEntity | entity
    7 8
    8 
    -referentiel.seine.NonTargetCatchReleaseConformity > referentiel.I18nReferentialEntity | entity dbSchema=ps_observation
    9 
    +referentiel.seine.obs.NonTargetCatchReleaseConformity > referentiel.I18nReferentialEntity | entity
    9 10
    10 
    -referentiel.seine.NonTargetCatchReleaseStatus > referentiel.I18nReferentialEntity | entity dbSchema=ps_observation
    11 
    +referentiel.seine.obs.NonTargetCatchReleaseStatus > referentiel.I18nReferentialEntity | entity
    11 12
    12 
    -referentiel.seine.NonTargetCatchReleasingTime > referentiel.I18nReferentialEntity | entity dbSchema=ps_observation
    13 
    +referentiel.seine.obs.NonTargetCatchReleasingTime > referentiel.I18nReferentialEntity | entity
    13 14
    14 
    -referentiel.seine.ObjectMaterial > referentiel.I18nReferentialEntity | entity dbSchema=ps_observation
    15 
    +referentiel.seine.obs.ObjectMaterial > referentiel.I18nReferentialEntity | entity
    15 16 
     legacyCode + {*:1} String | hibernateAttributeType=text
    16 17 
     standardCode + {*:1} String
    17 18 
     biodegradable + {*:1} Boolean
    ... ... @@ -19,32 +20,32 @@ nonEntangling + {*:1} Boolean
    19 20 
     childrenMultiSelectable + {*:1} boolean | notNull
    20 21 
     childSelectionMandatory + {*:1} boolean | notNull
    21 22 
     parent {*:0..1} referentiel.seine.ObjectMaterial
    22 
    -objectMaterialType {*:1} referentiel.seine.ObjectMaterialType | lazy=false
    23 
    +objectMaterialType {*:1} referentiel.seine.obs.ObjectMaterialType | lazy=false
    23 24 
     validation + {*:1} String
    24 
    -getSimplifiedObjectMaterial() referentiel.seine.ObjectMaterial
    25 
    -getSimplifiedParentObjectMaterial() referentiel.seine.ObjectMaterial
    25 
    +getSimplifiedObjectMaterial() referentiel.seine.obs.ObjectMaterial
    26 
    +getSimplifiedParentObjectMaterial() referentiel.seine.obs.ObjectMaterial
    26 27
    27 
    -referentiel.seine.ObjectMaterialType > referentiel.I18nReferentialEntity | entity dbSchema=ps_observation
    28 
    +referentiel.seine.obs.ObjectMaterialType > referentiel.I18nReferentialEntity | entity
    28 29
    29 
    -referentiel.seine.ObjectOperation > referentiel.I18nReferentialEntity | entity dbSchema=ps_observation
    30 
    +referentiel.seine.obs.ObjectOperation > referentiel.I18nReferentialEntity | entity
    30 31 
     whenArriving + {*:1} boolean | notNull
    31 32 
     whenLeaving + {*:1} boolean | notNull
    32 33
    33 
    -referentiel.seine.ObservedSystem > referentiel.I18nReferentialEntity | entity dbSchema=ps_observation
    34 
    +referentiel.seine.obs.ObservedSystem > referentiel.I18nReferentialEntity | entity
    34 35 
     schoolType + {*:1} !fr.ird.observe.dto.data.seine.SchoolType
    35 36
    36 
    -referentiel.seine.ReasonForDiscard > referentiel.I18nReferentialEntity | entity dbSchema=ps_observation
    37 
    +referentiel.seine.obs.ReasonForDiscard > referentiel.I18nReferentialEntity | entity
    37 38
    38 
    -referentiel.seine.ReasonForNoFishing > referentiel.I18nReferentialEntity | entity dbSchema=ps_observation
    39 
    +referentiel.seine.obs.ReasonForNoFishing > referentiel.I18nReferentialEntity | entity
    39 40
    40 
    -referentiel.seine.ReasonForNullSet > referentiel.I18nReferentialEntity | entity dbSchema=ps_observation
    41 
    +referentiel.seine.obs.ReasonForNullSet > referentiel.I18nReferentialEntity | entity
    41 42
    42 
    -referentiel.seine.SpeciesStatus > referentiel.I18nReferentialEntity | entity dbSchema=ps_observation
    43 
    +referentiel.seine.obs.SpeciesStatus > referentiel.I18nReferentialEntity | entity
    43 44
    44 
    -referentiel.seine.SurroundingActivity > referentiel.I18nReferentialEntity | entity dbSchema=ps_observation
    45 
    +referentiel.seine.obs.SurroundingActivity > referentiel.I18nReferentialEntity | entity
    45 46
    46 
    -referentiel.seine.VesselActivitySeine > referentiel.I18nReferentialEntity | entity dbSchema=ps_observation dbName=VesselActivity
    47 
    +referentiel.seine.obs.VesselActivitySeine > referentiel.I18nReferentialEntity | entity dbName=VesselActivity
    47 48 
     allowFad + {*:1} boolean
    48 49
    49 
    -referentiel.seine.WeightCategorySeine > referentiel.I18nReferentialEntity | entity dbSchema=ps_observation dbName=WeightCategory
    50 
    +referentiel.seine.obs.WeightCategorySeine > referentiel.I18nReferentialEntity | entity dbName=WeightCategory
    50 51 
     species {*:1} referentiel.Species | lazy=false

  • persistence/src/main/models/Observe-04-referentiel-seine-logbook.model
    1 
    +package fr.ird.observe.entities.referentiel.seine.logbook | dbSchema=ps_logbook
    2 
    +
    3 
    +referentiel.seine.logbook.ObjectMaterial > referentiel.I18nReferentialEntity | entity
    4 
    +legacyCode + {*:1} String | hibernateAttributeType=text
    5 
    +standardCode + {*:1} String
    6 
    +biodegradable + {*:1} Boolean
    7 
    +nonEntangling + {*:1} Boolean
    8 
    +childrenMultiSelectable + {*:1} boolean | notNull
    9 
    +childSelectionMandatory + {*:1} boolean | notNull
    10 
    +parent {*:0..1} referentiel.seine.ObjectMaterial
    11 
    +objectMaterialType {*:1} referentiel.seine.logbook.ObjectMaterialType | lazy=false
    12 
    +validation + {*:1} String
    13 
    +getSimplifiedObjectMaterial() referentiel.seine.logbook.ObjectMaterial
    14 
    +getSimplifiedParentObjectMaterial() referentiel.seine.logbook.ObjectMaterial
    15 
    +
    16 
    +referentiel.seine.logbook.ObjectMaterialType > referentiel.I18nReferentialEntity | entity
    17 
    +
    18 
    +referentiel.seine.logbook.ObjectOperation > referentiel.I18nReferentialEntity | entity
    19 
    +whenArriving + {*:1} boolean | notNull
    20 
    +whenLeaving + {*:1} boolean | notNull

  • persistence/src/main/models/Observe-05-referentiel-seine-landing.model
    1 
    +package fr.ird.observe.entities.referentiel.seine.landing | dbSchema=ps_landing
    2 
    +
    3 
    +referentiel.seine.landing.WeightCategory > referentiel.I18nReferentialEntity | entity
    4 
    +species {*:1} referentiel.Species | lazy=false
    5 
    +
    6 
    +referentiel.seine.landing.Fate > referentiel.I18nReferentialEntity | entity

  • persistence/src/main/models/Observe-06-referentiel-seine-wellplan.model
    1 
    +package fr.ird.observe.entities.referentiel.seine.wellplan | dbSchema=ps_wellplan
    2 
    +
    3 
    +referentiel.seine.wellplan.WeightCategory > referentiel.I18nReferentialEntity | entity
    4 
    +species {*:1} referentiel.Species | lazy=false
    \ No newline at end of file

  • persistence/src/main/models/Observe-07-referentiel-seine-localmarket.model
    1 
    +package fr.ird.observe.entities.referentiel.seine.localmarket | dbSchema=ps_localmarket
    2 
    +
    3 
    +referentiel.seine.localmarket.PackagingType > referentiel.I18nReferentialEntity | entity
    4 
    +
    5 
    +referentiel.seine.localmarket.Packaging > referentiel.I18nReferentialEntity | entity
    \ No newline at end of file

  • persistence/src/main/models/Observe-11-referential-longline-obs.model
    1 
    +package fr.ird.observe.entities.referentiel.longline.obs | dbSchema=ll_observation
    1 2
    2 
    -referentiel.longline.BaitHaulingStatus > referentiel.I18nReferentialEntity | entity dbSchema=ll_observation
    3 
    +referentiel.longline.obs.BaitHaulingStatus > referentiel.I18nReferentialEntity | entity
    3 4
    4 
    -referentiel.longline.EncounterType > referentiel.I18nReferentialEntity | entity dbSchema=ll_observation
    5 
    +referentiel.longline.obs.EncounterType > referentiel.I18nReferentialEntity | entity
    5 6
    6 
    -referentiel.longline.HookPosition > referentiel.I18nReferentialEntity | entity dbSchema=ll_observation
    7 
    +referentiel.longline.obs.HookPosition > referentiel.I18nReferentialEntity | entity
    7 8
    8 
    -referentiel.longline.ItemHorizontalPosition > referentiel.I18nReferentialEntity | entity dbSchema=ll_observation
    9 
    +referentiel.longline.obs.ItemHorizontalPosition > referentiel.I18nReferentialEntity | entity
    9 10
    10 
    -referentiel.longline.ItemVerticalPosition > referentiel.I18nReferentialEntity | entity dbSchema=ll_observation
    11 
    +referentiel.longline.obs.ItemVerticalPosition > referentiel.I18nReferentialEntity | entity
    11 12
    12 
    -referentiel.longline.MaturityStatus > referentiel.I18nReferentialEntity | entity dbSchema=ll_observation
    13 
    +referentiel.longline.obs.MaturityStatus > referentiel.I18nReferentialEntity | entity
    13 14 
     lowerValue + {*:1} String
    14 15 
     upperValue + {*:1} String
    15 16
    16 
    -referentiel.longline.SensorBrand > referentiel.ObserveReferentialEntity | entity dbSchema=ll_observation
    17 
    +referentiel.longline.obs.SensorBrand > referentiel.ObserveReferentialEntity | entity
    17 18 
     brandName + {*:1} String
    18 19
    19 
    -referentiel.longline.SensorDataFormat > referentiel.I18nReferentialEntity | entity dbSchema=ll_observation
    20 
    +referentiel.longline.obs.SensorDataFormat > referentiel.I18nReferentialEntity | entity
    20 21
    21 
    -referentiel.longline.SensorType > referentiel.I18nReferentialEntity | entity dbSchema=ll_observation
    22 
    +referentiel.longline.obs.SensorType > referentiel.I18nReferentialEntity | entity
    22 23
    23 
    -referentiel.longline.StomacFullness > referentiel.I18nReferentialEntity | entity dbSchema=ll_observation
    24 
    +referentiel.longline.obs.StomacFullness > referentiel.I18nReferentialEntity | entity
    24 25

  • persistence/src/main/models/Observe-13-referential-longline-landing.model
    1 
    -referentiel.longline.Conservation > referentiel.I18nReferentialEntity | entity dbSchema=ll_landing
    1 
    +package fr.ird.observe.entities.referentiel.longline.landing | dbSchema=ll_landing
    2 2
    3 
    -referentiel.longline.DataSource > referentiel.I18nReferentialEntity | entity dbSchema=ll_landing
    3 
    +referentiel.longline.landing.Conservation > referentiel.I18nReferentialEntity | entity
    4 
    +
    5 
    +referentiel.longline.landing.DataSource > referentiel.I18nReferentialEntity | entity

  • persistence/src/main/models/Observe-21-data-seine-logbook.model
    1 
    +package fr.ird.observe.entities.data.seine.logbook | dbSchema=ps_logbook

  • persistence/src/main/models/Observe-22-data-seine-landing.model
    1 
    +package fr.ird.observe.entities.data.seine.landing | dbSchema=ps_landing
    \ No newline at end of file

  • persistence/src/main/models/Observe-23-data-seine-wellplan.model
    1 
    +package fr.ird.observe.entities.data.seine.wellplan | dbSchema=ps_wellplan
    \ No newline at end of file

  • persistence/src/main/models/Observe-24-data-seine-localmarket.model
    1 
    +package fr.ird.observe.entities.data.seine.localmarket | dbSchema=ps_localmarket
    \ No newline at end of file

  • persistence/src/main/models/Observe-40-data-common.model

  • pom.xml
    ... ... @@ -156,7 +156,7 @@
    156 156 
         <buildDate>${maven.build.timestamp}</buildDate>
    157 157
    158 158 
         <observeToolkitVersion>4.9</observeToolkitVersion>
    159 
    -    <!--<lib.version.java4all.topia>1.1.9</lib.version.java4all.topia>-->
    159 
    +    <lib.version.java4all.topia>1.1.10-SNAPSHOT</lib.version.java4all.topia>
    160 160 
         <!--<lib.version.java4all.eugene>3.0-alpha-22</lib.version.java4all.eugene>-->
    161 161 
         <!--<lib.version.java4all.jaxx>3.0-alpha-45-SNAPSHOT</lib.version.java4all.jaxx>-->
    162 162 
         <!--<lib.version.java4all.i18n>4.0-beta-3-SNAPSHOT</lib.version.java4all.i18n>-->

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