Tony CHEMIT pushed to branch develop-9.x at ultreiaio / ird-observe Commits: bdbecacd by tchemit at 2018-12-11T12:40:22Z stash new model - - - - - 14 changed files: - persistence/src/main/models/Observe-01-referential-common.model - persistence/src/main/models/Observe-03-referential-seine-obs.model - + persistence/src/main/models/Observe-04-referentiel-seine-logbook.model - + persistence/src/main/models/Observe-05-referentiel-seine-landing.model - + persistence/src/main/models/Observe-06-referentiel-seine-wellplan.model - + persistence/src/main/models/Observe-07-referentiel-seine-localmarket.model - persistence/src/main/models/Observe-11-referential-longline-obs.model - persistence/src/main/models/Observe-13-referential-longline-landing.model - + persistence/src/main/models/Observe-21-data-seine-logbook.model - + persistence/src/main/models/Observe-22-data-seine-landing.model - + persistence/src/main/models/Observe-23-data-seine-wellplan.model - + persistence/src/main/models/Observe-24-data-seine-localmarket.model - + persistence/src/main/models/Observe-40-data-common.model - pom.xml Changes: ===================================== persistence/src/main/models/Observe-01-referential-common.model ===================================== @@ -187,3 +187,8 @@ referentiel.WeightMeasureType > referentiel.I18nReferentialEntity | entity referentiel.Wind > referentiel.I18nReferentialEntity | entity speedRange + {*:1} String waveHeight + {*:1} String + +referentiel.TransmittingBuoyOwnership > referentiel.I18nReferentialEntity | entity + +referentiel.SchoolType > referentiel.I18nReferentialEntity | entity + ===================================== persistence/src/main/models/Observe-03-referential-seine-obs.model ===================================== @@ -1,17 +1,18 @@ +package fr.ird.observe.entities.referentiel.seine.obs | dbSchema=ps_observation enum !fr.ird.observe.dto.data.seine.NonTargetCatchReleaseStatus enum !fr.ird.observe.dto.data.seine.SchoolType -referentiel.seine.DetectionMode > referentiel.I18nReferentialEntity | entity dbSchema=ps_observation +referentiel.seine.obs.DetectionMode > referentiel.I18nReferentialEntity | entity -referentiel.seine.NonTargetCatchReleaseConformity > referentiel.I18nReferentialEntity | entity dbSchema=ps_observation +referentiel.seine.obs.NonTargetCatchReleaseConformity > referentiel.I18nReferentialEntity | entity -referentiel.seine.NonTargetCatchReleaseStatus > referentiel.I18nReferentialEntity | entity dbSchema=ps_observation +referentiel.seine.obs.NonTargetCatchReleaseStatus > referentiel.I18nReferentialEntity | entity -referentiel.seine.NonTargetCatchReleasingTime > referentiel.I18nReferentialEntity | entity dbSchema=ps_observation +referentiel.seine.obs.NonTargetCatchReleasingTime > referentiel.I18nReferentialEntity | entity -referentiel.seine.ObjectMaterial > referentiel.I18nReferentialEntity | entity dbSchema=ps_observation +referentiel.seine.obs.ObjectMaterial > referentiel.I18nReferentialEntity | entity legacyCode + {*:1} String | hibernateAttributeType=text standardCode + {*:1} String biodegradable + {*:1} Boolean @@ -19,32 +20,32 @@ nonEntangling + {*:1} Boolean childrenMultiSelectable + {*:1} boolean | notNull childSelectionMandatory + {*:1} boolean | notNull parent {*:0..1} referentiel.seine.ObjectMaterial -objectMaterialType {*:1} referentiel.seine.ObjectMaterialType | lazy=false +objectMaterialType {*:1} referentiel.seine.obs.ObjectMaterialType | lazy=false validation + {*:1} String -getSimplifiedObjectMaterial() referentiel.seine.ObjectMaterial -getSimplifiedParentObjectMaterial() referentiel.seine.ObjectMaterial +getSimplifiedObjectMaterial() referentiel.seine.obs.ObjectMaterial +getSimplifiedParentObjectMaterial() referentiel.seine.obs.ObjectMaterial -referentiel.seine.ObjectMaterialType > referentiel.I18nReferentialEntity | entity dbSchema=ps_observation +referentiel.seine.obs.ObjectMaterialType > referentiel.I18nReferentialEntity | entity -referentiel.seine.ObjectOperation > referentiel.I18nReferentialEntity | entity dbSchema=ps_observation +referentiel.seine.obs.ObjectOperation > referentiel.I18nReferentialEntity | entity whenArriving + {*:1} boolean | notNull whenLeaving + {*:1} boolean | notNull -referentiel.seine.ObservedSystem > referentiel.I18nReferentialEntity | entity dbSchema=ps_observation +referentiel.seine.obs.ObservedSystem > referentiel.I18nReferentialEntity | entity schoolType + {*:1} !fr.ird.observe.dto.data.seine.SchoolType -referentiel.seine.ReasonForDiscard > referentiel.I18nReferentialEntity | entity dbSchema=ps_observation +referentiel.seine.obs.ReasonForDiscard > referentiel.I18nReferentialEntity | entity -referentiel.seine.ReasonForNoFishing > referentiel.I18nReferentialEntity | entity dbSchema=ps_observation +referentiel.seine.obs.ReasonForNoFishing > referentiel.I18nReferentialEntity | entity -referentiel.seine.ReasonForNullSet > referentiel.I18nReferentialEntity | entity dbSchema=ps_observation +referentiel.seine.obs.ReasonForNullSet > referentiel.I18nReferentialEntity | entity -referentiel.seine.SpeciesStatus > referentiel.I18nReferentialEntity | entity dbSchema=ps_observation +referentiel.seine.obs.SpeciesStatus > referentiel.I18nReferentialEntity | entity -referentiel.seine.SurroundingActivity > referentiel.I18nReferentialEntity | entity dbSchema=ps_observation +referentiel.seine.obs.SurroundingActivity > referentiel.I18nReferentialEntity | entity -referentiel.seine.VesselActivitySeine > referentiel.I18nReferentialEntity | entity dbSchema=ps_observation dbName=VesselActivity +referentiel.seine.obs.VesselActivitySeine > referentiel.I18nReferentialEntity | entity dbName=VesselActivity allowFad + {*:1} boolean -referentiel.seine.WeightCategorySeine > referentiel.I18nReferentialEntity | entity dbSchema=ps_observation dbName=WeightCategory +referentiel.seine.obs.WeightCategorySeine > referentiel.I18nReferentialEntity | entity dbName=WeightCategory species {*:1} referentiel.Species | lazy=false ===================================== persistence/src/main/models/Observe-04-referentiel-seine-logbook.model ===================================== @@ -0,0 +1,20 @@ +package fr.ird.observe.entities.referentiel.seine.logbook | dbSchema=ps_logbook + +referentiel.seine.logbook.ObjectMaterial > referentiel.I18nReferentialEntity | entity +legacyCode + {*:1} String | hibernateAttributeType=text +standardCode + {*:1} String +biodegradable + {*:1} Boolean +nonEntangling + {*:1} Boolean +childrenMultiSelectable + {*:1} boolean | notNull +childSelectionMandatory + {*:1} boolean | notNull +parent {*:0..1} referentiel.seine.ObjectMaterial +objectMaterialType {*:1} referentiel.seine.logbook.ObjectMaterialType | lazy=false +validation + {*:1} String +getSimplifiedObjectMaterial() referentiel.seine.logbook.ObjectMaterial +getSimplifiedParentObjectMaterial() referentiel.seine.logbook.ObjectMaterial + +referentiel.seine.logbook.ObjectMaterialType > referentiel.I18nReferentialEntity | entity + +referentiel.seine.logbook.ObjectOperation > referentiel.I18nReferentialEntity | entity +whenArriving + {*:1} boolean | notNull +whenLeaving + {*:1} boolean | notNull ===================================== persistence/src/main/models/Observe-05-referentiel-seine-landing.model ===================================== @@ -0,0 +1,6 @@ +package fr.ird.observe.entities.referentiel.seine.landing | dbSchema=ps_landing + +referentiel.seine.landing.WeightCategory > referentiel.I18nReferentialEntity | entity +species {*:1} referentiel.Species | lazy=false + +referentiel.seine.landing.Fate > referentiel.I18nReferentialEntity | entity ===================================== persistence/src/main/models/Observe-06-referentiel-seine-wellplan.model ===================================== @@ -0,0 +1,4 @@ +package fr.ird.observe.entities.referentiel.seine.wellplan | dbSchema=ps_wellplan + +referentiel.seine.wellplan.WeightCategory > referentiel.I18nReferentialEntity | entity +species {*:1} referentiel.Species | lazy=false \ No newline at end of file ===================================== persistence/src/main/models/Observe-07-referentiel-seine-localmarket.model ===================================== @@ -0,0 +1,5 @@ +package fr.ird.observe.entities.referentiel.seine.localmarket | dbSchema=ps_localmarket + +referentiel.seine.localmarket.PackagingType > referentiel.I18nReferentialEntity | entity + +referentiel.seine.localmarket.Packaging > referentiel.I18nReferentialEntity | entity \ No newline at end of file ===================================== persistence/src/main/models/Observe-11-referential-longline-obs.model ===================================== @@ -1,24 +1,25 @@ +package fr.ird.observe.entities.referentiel.longline.obs | dbSchema=ll_observation -referentiel.longline.BaitHaulingStatus > referentiel.I18nReferentialEntity | entity dbSchema=ll_observation +referentiel.longline.obs.BaitHaulingStatus > referentiel.I18nReferentialEntity | entity -referentiel.longline.EncounterType > referentiel.I18nReferentialEntity | entity dbSchema=ll_observation +referentiel.longline.obs.EncounterType > referentiel.I18nReferentialEntity | entity -referentiel.longline.HookPosition > referentiel.I18nReferentialEntity | entity dbSchema=ll_observation +referentiel.longline.obs.HookPosition > referentiel.I18nReferentialEntity | entity -referentiel.longline.ItemHorizontalPosition > referentiel.I18nReferentialEntity | entity dbSchema=ll_observation +referentiel.longline.obs.ItemHorizontalPosition > referentiel.I18nReferentialEntity | entity -referentiel.longline.ItemVerticalPosition > referentiel.I18nReferentialEntity | entity dbSchema=ll_observation +referentiel.longline.obs.ItemVerticalPosition > referentiel.I18nReferentialEntity | entity -referentiel.longline.MaturityStatus > referentiel.I18nReferentialEntity | entity dbSchema=ll_observation +referentiel.longline.obs.MaturityStatus > referentiel.I18nReferentialEntity | entity lowerValue + {*:1} String upperValue + {*:1} String -referentiel.longline.SensorBrand > referentiel.ObserveReferentialEntity | entity dbSchema=ll_observation +referentiel.longline.obs.SensorBrand > referentiel.ObserveReferentialEntity | entity brandName + {*:1} String -referentiel.longline.SensorDataFormat > referentiel.I18nReferentialEntity | entity dbSchema=ll_observation +referentiel.longline.obs.SensorDataFormat > referentiel.I18nReferentialEntity | entity -referentiel.longline.SensorType > referentiel.I18nReferentialEntity | entity dbSchema=ll_observation +referentiel.longline.obs.SensorType > referentiel.I18nReferentialEntity | entity -referentiel.longline.StomacFullness > referentiel.I18nReferentialEntity | entity dbSchema=ll_observation +referentiel.longline.obs.StomacFullness > referentiel.I18nReferentialEntity | entity ===================================== persistence/src/main/models/Observe-13-referential-longline-landing.model ===================================== @@ -1,3 +1,5 @@ -referentiel.longline.Conservation > referentiel.I18nReferentialEntity | entity dbSchema=ll_landing +package fr.ird.observe.entities.referentiel.longline.landing | dbSchema=ll_landing -referentiel.longline.DataSource > referentiel.I18nReferentialEntity | entity dbSchema=ll_landing +referentiel.longline.landing.Conservation > referentiel.I18nReferentialEntity | entity + +referentiel.longline.landing.DataSource > referentiel.I18nReferentialEntity | entity ===================================== persistence/src/main/models/Observe-21-data-seine-logbook.model ===================================== @@ -0,0 +1 @@ +package fr.ird.observe.entities.data.seine.logbook | dbSchema=ps_logbook ===================================== persistence/src/main/models/Observe-22-data-seine-landing.model ===================================== @@ -0,0 +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 ===================================== @@ -0,0 +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 ===================================== @@ -0,0 +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 @@ <buildDate>${maven.build.timestamp}</buildDate> <observeToolkitVersion>4.9</observeToolkitVersion> - <!--<lib.version.java4all.topia>1.1.9</lib.version.java4all.topia>--> + <lib.version.java4all.topia>1.1.10-SNAPSHOT</lib.version.java4all.topia> <!--<lib.version.java4all.eugene>3.0-alpha-22</lib.version.java4all.eugene>--> <!--<lib.version.java4all.jaxx>3.0-alpha-45-SNAPSHOT</lib.version.java4all.jaxx>--> <!--<lib.version.java4all.i18n>4.0-beta-3-SNAPSHOT</lib.version.java4all.i18n>--> View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/bdbecacd443a22db012e1f07423b... -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/bdbecacd443a22db012e1f07423b... You're receiving this email because of your account on gitlab.com.