Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: bb5030cb by Tony CHEMIT at 2017-06-30T12:19:42+02:00 Utilisation d'un modèle textuel pour le developpement (See #786) (mise en documentation des modèles zargo) - - - - - 15 changed files: - + doc/modelisation/zargo/v5/observe-common.zargo - + doc/modelisation/zargo/v5/observe-longline.zargo - + doc/modelisation/zargo/v5/observe-seine.zargo - + doc/modelisation/zargo/v5/observe.ini - persistence/src/main/xmi/observe-common.zargo → doc/modelisation/zargo/v7/observe-common.zargo - persistence/src/main/xmi/observe-longline.zargo → doc/modelisation/zargo/v7/observe-longline.zargo - persistence/src/main/xmi/observe-seine.zargo → doc/modelisation/zargo/v7/observe-seine.zargo - persistence/src/main/xmi/observe.ini → doc/modelisation/zargo/v7/observe.ini - persistence/src/main/models/Observe.friendmodel → persistence/src/main/models/Observe.model - services/src/main/models/Observe.friendmodel → services/src/main/models/Observe.model - − services/src/main/xmi/observe-services-dto-common.zargo - − services/src/main/xmi/observe-services-dto-longline.zargo - − services/src/main/xmi/observe-services-dto-seine.zargo - − services/src/main/xmi/observe-services-dto.ini - + src/site/markdown/model.md Changes: ===================================== doc/modelisation/zargo/v5/observe-common.zargo ===================================== Binary files /dev/null and b/doc/modelisation/zargo/v5/observe-common.zargo differ ===================================== doc/modelisation/zargo/v5/observe-longline.zargo ===================================== Binary files /dev/null and b/doc/modelisation/zargo/v5/observe-longline.zargo differ ===================================== doc/modelisation/zargo/v5/observe-seine.zargo ===================================== Binary files /dev/null and b/doc/modelisation/zargo/v5/observe-seine.zargo differ ===================================== doc/modelisation/zargo/v5/observe.ini ===================================== --- /dev/null +++ b/doc/modelisation/zargo/v5/observe.ini @@ -0,0 +1,295 @@ +[model] +attributeType.Boolean = java.lang.Boolean +attributeType.Float = java.lang.Float +attributeType.Integer = java.lang.Integer +attributeType.Long = java.lang.Long +attributeType.String = java.lang.String +generateForeignKeyNames = true +generateOperatorForDAOHelper = true +generatePropertyChangeSupport = true +indexForeignKeys = true +notGenerateToString = true +useEnumerationName = false +version = @observe.model.version@ + +[package fr.ird.observe.entities] +dbSchema = OBSERVE_COMMON + +[package fr.ird.observe.entities.longline] +dbSchema = OBSERVE_LONGLINE + +[package fr.ird.observe.entities.referentiel] +dbSchema = OBSERVE_COMMON + +[package fr.ird.observe.entities.referentiel.longline] +dbSchema = OBSERVE_LONGLINE + +[package fr.ird.observe.entities.referentiel.seine] +dbSchema = OBSERVE_SEINE + +[package fr.ird.observe.entities.seine] +dbSchema = OBSERVE_SEINE + +[class fr.ird.observe.entities.CommentableEntity] +comment.hibernateAttributeType = text + +[class fr.ird.observe.entities.ObserveEntity] +lastUpdateDate.notNull = true + +[class fr.ird.observe.entities.longline.ActivityLongline] +dbName = Activity +encounter.reverseDbName = activity +sensorUsed.reverseDbName = activity +setLongline.dbName = set +vesselActivityLongline.dbName = vesselActivity +vesselActivityLongline.lazy = false + +[class fr.ird.observe.entities.longline.Basket] +branchline.orderBy = settingIdentifier +branchline.unique = true +settingIdentifier.notNull = true + +[class fr.ird.observe.entities.longline.Branchline] +branchlineLength.sqlType = numeric +catchLongline.dbName = catch +hookSize.sqlType = numeric +settingIdentifier.notNull = true +snapWeight.sqlType = numeric +swivelWeight.sqlType = numeric +tracelineLength.sqlType = numeric + +[class fr.ird.observe.entities.longline.BranchlinesComposition] +length.sqlType = numeric + +[class fr.ird.observe.entities.longline.CatchLongline] +dbName = Catch +beatDiameter.sqlType = numeric +catchFateLongline.dbName = catchFate +gonadeWeight.sqlType = numeric +predator.manyToManyTableName = catch_predator +predator.reverseDbName = catch +sizeMeasure.reverseDbName = catch +totalWeight.sqlType = numeric +weightMeasure.reverseDbName = catch + +[class fr.ird.observe.entities.longline.Encounter] +distance.sqlType = numeric + +[class fr.ird.observe.entities.longline.FloatlinesComposition] +length.sqlType = numeric + +[class fr.ird.observe.entities.longline.GearUseFeaturesLongline] +dbName = GearUseFeatures +gearUseFeaturesMeasurement.orderBy = topiaCreateDate +gearUseFeaturesMeasurement.reverseDbName = gearUseFeatures +gearUseFeaturesMeasurement.unique = true + +[class fr.ird.observe.entities.longline.GearUseFeaturesMeasurementLongline] +dbName = GearUseFeaturesMeasurement +gearCaracteristic.notNull = true + +[class fr.ird.observe.entities.longline.HooksComposition] +hookSize.sqlType = numeric + +[class fr.ird.observe.entities.longline.Section] +basket.orderBy = settingIdentifier +basket.unique = true +setLongline.dbName = set +settingIdentifier.notNull = true + +[class fr.ird.observe.entities.longline.SetLongline] +dbName = Set +baitsComposition.reverseDbName = set +branchlinesComposition.reverseDbName = set +catchLongline.reverseDbName = set +catchLongline.unique = true +floatlinesComposition.reverseDbName = set +haulingEndLatitude.sqlType = numeric +haulingEndLongitude.sqlType = numeric +haulingStartLatitude.sqlType = numeric +haulingStartLongitude.sqlType = numeric +hooksComposition.reverseDbName = set +mitigationType.manyToManyTableName = mitigationtype_set +mitigationType.reverseDbName = set +section.orderBy = settingIdentifier +section.reverseDbName = set +section.unique = true +settingEndLatitude.sqlType = numeric +settingEndLongitude.sqlType = numeric +settingStartLatitude.sqlType = numeric +settingStartLongitude.sqlType = numeric +settingVesselSpeed.sqlType = numeric +shooterSpeed.sqlType = numeric +snapWeight.sqlType = numeric +swivelWeight.sqlType = numeric +tdr.reverseDbName = set + +[class fr.ird.observe.entities.longline.SizeMeasure] +size.sqlType = numeric + +[class fr.ird.observe.entities.longline.Tdr] +floatline1Length.sqlType = numeric +floatline2Length.sqlType = numeric + +[class fr.ird.observe.entities.longline.TdrRecord] +depth.sqlType = numeric +temperature.sqlType = numeric + +[class fr.ird.observe.entities.longline.TripLongline] +dbName = Trip +activityLongline.reverseDbName = trip +activityLongline.unique = true +gearUseFeaturesLongline.orderBy = topiaCreateDate +gearUseFeaturesLongline.reverseDbName = trip +gearUseFeaturesLongline.unique = true + +[class fr.ird.observe.entities.longline.WeightMeasure] +weight.sqlType = numeric + +[class fr.ird.observe.entities.referentiel.Gear] +gearCaracteristic.lazy = false + +[class fr.ird.observe.entities.referentiel.GearCaracteristic] +gearCaracteristicType.lazy = false + +[class fr.ird.observe.entities.referentiel.LengthWeightParameter] +ocean.lazy = false +ocean.notNull = true +sex.lazy = false +sex.notNull = true +species.lazy = false +species.notNull = true + +[class fr.ird.observe.entities.referentiel.Organism] +country.lazy = false + +[class fr.ird.observe.entities.referentiel.Program] +comment.hibernateAttributeType = text +organism.lazy = false + +[class fr.ird.observe.entities.referentiel.Species] +maxLength.sqlType = numeric +maxWeight.sqlType = numeric +minLength.sqlType = numeric +minWeight.sqlType = numeric +ocean.lazy = false +speciesGroup.lazy = false + +[class fr.ird.observe.entities.referentiel.SpeciesList] +species.lazy = false + +[class fr.ird.observe.entities.referentiel.Vessel] +capacity.sqlType = numeric +comment.hibernateAttributeType = text +flagCountry.lazy = false +length.sqlType = numeric +searchMaximum.sqlType = numeric +vesselSizeCategory.lazy = false +vesselType.lazy = false + +[class fr.ird.observe.entities.referentiel.longline.CatchFateLongline] +dbName = CatchFate + +[class fr.ird.observe.entities.referentiel.longline.VesselActivityLongline] +dbName = VesselActivity + +[class fr.ird.observe.entities.referentiel.seine.VesselActivitySeine] +dbName = VesselActivity + +[class fr.ird.observe.entities.referentiel.seine.WeightCategory] +species.lazy = false + +[class fr.ird.observe.entities.seine.ActivitySeine] +dbName = Activity +floatingObject.reverseDbName = activity +floatingObject.unique = true +latitude.sqlType = numeric +longitude.sqlType = numeric +observedSystem.manyToManyTableName = activity_observedSystem +observedSystem.reverseDbName = activity +observedSystem.unique = true +observedSystemDistance.sqlType = numeric +seaSurfaceTemperature.sqlType = numeric +setSeine.dbName = set +time.hibernateAttributeType.java.util.Date = time +vesselActivitySeine.dbName = vesselActivity +vesselSpeed.sqlType = numeric + +[class fr.ird.observe.entities.seine.FloatingObject] +transmittingBuoy.unique = true + +[class fr.ird.observe.entities.seine.GearUseFeaturesMeasurementSeine] +dbName = GearUseFeaturesMeasurement +gearCaracteristic.notNull = true + +[class fr.ird.observe.entities.seine.GearUseFeaturesSeine] +dbName = GearUseFeatures +gearUseFeaturesMeasurement.orderBy = topiaCreateDate +gearUseFeaturesMeasurement.reverseDbName = gearUseFeatures + +[class fr.ird.observe.entities.seine.NonTargetCatch] +catchWeight.sqlType = numeric +meanLength.sqlType = numeric +meanWeight.sqlType = numeric + +[class fr.ird.observe.entities.seine.NonTargetLength] +length.sqlType = numeric +sex.lazy = false +weight.sqlType = numeric + +[class fr.ird.observe.entities.seine.NonTargetSample] +nonTargetLength.unique = true + +[class fr.ird.observe.entities.seine.Route] +activitySeine.orderBy = time +activitySeine.unique = true +date.hibernateAttributeType.java.util.Date = date +endLogValue.sqlType = numeric +startLogValue.sqlType = numeric + +[class fr.ird.observe.entities.seine.SchoolEstimate] +naturalIdMutable = true +setSeine.dbName = set +setSeine.naturalId = true +species.naturalId = true + +[class fr.ird.observe.entities.seine.SetSeine] +dbName = Set +currentSpeed.sqlType = numeric +nonTargetCatch.reverseDbName = set +nonTargetSample.reverseDbName = set +nonTargetSample.unique = true +schoolEstimate.reverseDbName = set +startTime.hibernateAttributeType.java.util.Date = time +targetCatch.reverseDbName = set +targetSample.reverseDbName = set +targetSample.unique = true + +[class fr.ird.observe.entities.seine.TargetCatch] +naturalIdMutable = true +catchWeight.sqlType = numeric +discarded.naturalId = true +reasonForDiscard.naturalId = true +reasonForDiscard.notNull = false +setSeine.dbName = set +setSeine.naturalId = true +weightCategory.naturalId = true +well.naturalId = true +well.notNull = false + +[class fr.ird.observe.entities.seine.TargetLength] +length.sqlType = numeric +weight.sqlType = numeric + +[class fr.ird.observe.entities.seine.TargetSample] +targetLength.unique = true + +[class fr.ird.observe.entities.seine.TripSeine] +dbName = Trip +endDate.hibernateAttributeType.java.util.Date = date +gearUseFeaturesSeine.orderBy = topiaCreateDate +gearUseFeaturesSeine.reverseDbName = trip +route.orderBy = date +route.reverseDbName = trip +route.unique = true +startDate.hibernateAttributeType.java.util.Date = date ===================================== persistence/src/main/xmi/observe-common.zargo → doc/modelisation/zargo/v7/observe-common.zargo ===================================== Binary files a/persistence/src/main/xmi/observe-common.zargo and b/doc/modelisation/zargo/v7/observe-common.zargo differ ===================================== persistence/src/main/xmi/observe-longline.zargo → doc/modelisation/zargo/v7/observe-longline.zargo ===================================== Binary files a/persistence/src/main/xmi/observe-longline.zargo and b/doc/modelisation/zargo/v7/observe-longline.zargo differ ===================================== persistence/src/main/xmi/observe-seine.zargo → doc/modelisation/zargo/v7/observe-seine.zargo ===================================== Binary files a/persistence/src/main/xmi/observe-seine.zargo and b/doc/modelisation/zargo/v7/observe-seine.zargo differ ===================================== persistence/src/main/xmi/observe.ini → doc/modelisation/zargo/v7/observe.ini ===================================== ===================================== persistence/src/main/models/Observe.friendmodel → persistence/src/main/models/Observe.model ===================================== --- a/persistence/src/main/models/Observe.friendmodel +++ b/persistence/src/main/models/Observe.model @@ -1,4 +1,5 @@ -model Observe | generatePropertyChangeSupport generateForeignKeyNames notGenerateToString generateOperatorForDAOHelper indexForeignKeys attributeType.Boolean=java.lang.Boolean attributeType.Float=java.lang.Float attributeType.Integer=java.lang.Integer attributeType.Long=java.lang.Long attributeType.String=java.lang.String defaultPackage=fr.ird.observe.entities useEnumerationName=false version=6.901 +model Observe | generatePropertyChangeSupport generateForeignKeyNames notGenerateToString generateOperatorForDAOHelper indexForeignKeys attributeType.Boolean=java.lang.Boolean attributeType.Float=java.lang.Float attributeType.Integer=java.lang.Integer attributeType.Long=java.lang.Long attributeType.String=java.lang.String useEnumerationName=false +model Observe | defaultPackage=fr.ird.observe.entities version=@observe.model.version@ package fr.ird.observe.common | skip package fr.ird.observe.entities | dbSchema=OBSERVE_COMMON ===================================== services/src/main/models/Observe.friendmodel → services/src/main/models/Observe.model ===================================== --- a/services/src/main/models/Observe.friendmodel +++ b/services/src/main/models/Observe.model @@ -1,4 +1,5 @@ -model Observe | java8 classNameSuffix=Dto defaultPackage=fr.ird.observe.services.dto superClass=fr.ird.observe.services.dto.AbstractObserveDto version=@observe.model.version@ +model Observe | java8 classNameSuffix=Dto superClass=fr.ird.observe.services.dto.AbstractObserveDto +model Observe | defaultPackage=fr.ird.observe.services.dto version=@observe.model.version@ package fr.ird.observe.common | skip package fr.ird.observe.services.dto | bean ===================================== services/src/main/xmi/observe-services-dto-common.zargo deleted ===================================== Binary files a/services/src/main/xmi/observe-services-dto-common.zargo and /dev/null differ ===================================== services/src/main/xmi/observe-services-dto-longline.zargo deleted ===================================== Binary files a/services/src/main/xmi/observe-services-dto-longline.zargo and /dev/null differ ===================================== services/src/main/xmi/observe-services-dto-seine.zargo deleted ===================================== Binary files a/services/src/main/xmi/observe-services-dto-seine.zargo and /dev/null differ ===================================== services/src/main/xmi/observe-services-dto.ini deleted ===================================== --- a/services/src/main/xmi/observe-services-dto.ini +++ /dev/null @@ -1,309 +0,0 @@ -[model] -java8 = true -classNameSuffix = Dto -superClass = fr.ird.observe.services.dto.AbstractObserveDto -version = @observe.model.version@ -defaultPackage=fr.ird.observe.services.dto - -[package fr.ird.observe.common] -skip= true - -[package fr.ird.observe.services.dto] -bean = true - -[class fr.ird.observe.services.dto.TripMap] -points.ordered = true -points.unique = true - -[class fr.ird.observe.services.dto.longline.ActivityLongline] -fpaZone.attributeGeneric = fr.ird.observe.services.dto.referential.FpaZoneDto -setLongline.attributeGeneric = fr.ird.observe.services.dto.longline.SetLonglineDto -vesselActivityLongline.attributeGeneric = fr.ird.observe.services.dto.referential.longline.VesselActivityLonglineDto - -[class fr.ird.observe.services.dto.longline.BaitsComposition] -baitSettingStatus.attributeGeneric = fr.ird.observe.services.dto.referential.longline.BaitSettingStatusDto -baitType.attributeGeneric = fr.ird.observe.services.dto.referential.longline.BaitTypeDto - -[class fr.ird.observe.services.dto.longline.Basket] -branchline.ordered = true -branchline.unique = true - -[class fr.ird.observe.services.dto.longline.Branchline] -baitHaulingStatus.attributeGeneric = fr.ird.observe.services.dto.referential.longline.BaitHaulingStatusDto -baitSettingStatus.attributeGeneric = fr.ird.observe.services.dto.referential.longline.BaitSettingStatusDto -baitType.attributeGeneric = fr.ird.observe.services.dto.referential.longline.BaitTypeDto -hookSize.attributeGeneric = fr.ird.observe.services.dto.referential.longline.HookSizeDto -hookType.attributeGeneric = fr.ird.observe.services.dto.referential.longline.HookTypeDto -topType.attributeGeneric = fr.ird.observe.services.dto.referential.longline.LineTypeDto -tracelineType.attributeGeneric = fr.ird.observe.services.dto.referential.longline.LineTypeDto - -[class fr.ird.observe.services.dto.longline.BranchlinesComposition] -topType.attributeGeneric = fr.ird.observe.services.dto.referential.longline.LineTypeDto -tracelineType.attributeGeneric = fr.ird.observe.services.dto.referential.longline.LineTypeDto - -[class fr.ird.observe.services.dto.longline.CatchLongline] -basket.attributeGeneric = fr.ird.observe.services.dto.longline.BasketDto -branchline.attributeGeneric = fr.ird.observe.services.dto.longline.BranchlineDto -catchFateLongline.attributeGeneric = fr.ird.observe.services.dto.referential.longline.CatchFateLonglineDto -catchHealthness.attributeGeneric = fr.ird.observe.services.dto.referential.longline.HealthnessDto -discardHealthness.attributeGeneric = fr.ird.observe.services.dto.referential.longline.HealthnessDto -hookPosition.attributeGeneric = fr.ird.observe.services.dto.referential.longline.HookPositionDto -maturityStatus.attributeGeneric = fr.ird.observe.services.dto.referential.longline.MaturityStatusDto -predator.attributeGeneric = fr.ird.observe.services.dto.referential.SpeciesDto -section.attributeGeneric = fr.ird.observe.services.dto.longline.SectionDto -sex.attributeGeneric = fr.ird.observe.services.dto.referential.SexDto -speciesCatch.attributeGeneric = fr.ird.observe.services.dto.referential.SpeciesDto -stomacFullness.attributeGeneric = fr.ird.observe.services.dto.referential.longline.StomacFullnessDto - -[class fr.ird.observe.services.dto.longline.Encounter] -encounterType.attributeGeneric = fr.ird.observe.services.dto.referential.longline.EncounterTypeDto -species.attributeGeneric = fr.ird.observe.services.dto.referential.SpeciesDto - -[class fr.ird.observe.services.dto.longline.FloatlinesComposition] -lineType.attributeGeneric = fr.ird.observe.services.dto.referential.longline.LineTypeDto - -[class fr.ird.observe.services.dto.longline.GearUseFeaturesLongline] -gear.attributeGeneric = fr.ird.observe.services.dto.referential.GearDto -gearUseFeaturesMeasurement.ordered = true -gearUseFeaturesMeasurement.unique = true - -[class fr.ird.observe.services.dto.longline.GearUseFeaturesMeasurementLongline] -gearCaracteristic.attributeGeneric = fr.ird.observe.services.dto.referential.GearCaracteristicDto - -[class fr.ird.observe.services.dto.longline.HooksComposition] -hookSize.attributeGeneric = fr.ird.observe.services.dto.referential.longline.HookSizeDto -hookType.attributeGeneric = fr.ird.observe.services.dto.referential.longline.HookTypeDto - -[class fr.ird.observe.services.dto.longline.Section] -basket.ordered = true -basket.unique = true - -[class fr.ird.observe.services.dto.longline.SensorUsed] -sensorBrand.attributeGeneric = fr.ird.observe.services.dto.referential.longline.SensorBrandDto -sensorDataFormat.attributeGeneric = fr.ird.observe.services.dto.referential.longline.SensorDataFormatDto -sensorType.attributeGeneric = fr.ird.observe.services.dto.referential.longline.SensorTypeDto - -[class fr.ird.observe.services.dto.longline.SetLongline] -lightsticksColor.attributeGeneric = fr.ird.observe.services.dto.referential.longline.LightsticksColorDto -lightsticksType.attributeGeneric = fr.ird.observe.services.dto.referential.longline.LightsticksTypeDto -lineType.attributeGeneric = fr.ird.observe.services.dto.referential.longline.LineTypeDto -settingShape.attributeGeneric = fr.ird.observe.services.dto.referential.longline.SettingShapeDto - -[class fr.ird.observe.services.dto.longline.SetLonglineCatch] -baskets.attributeGeneric = fr.ird.observe.services.dto.longline.BasketDto -branchlines.attributeGeneric = fr.ird.observe.services.dto.longline.BranchlineDto -sections.attributeGeneric = fr.ird.observe.services.dto.longline.SectionDto -catchLongline.ordered = true - -[class fr.ird.observe.services.dto.longline.SetLonglineDetailComposition] -section.ordered = true -section.unique = true - -[class fr.ird.observe.services.dto.longline.SetLonglineGlobalComposition] -mitigationType.attributeGeneric = fr.ird.observe.services.dto.referential.longline.MitigationTypeDto - -[class fr.ird.observe.services.dto.longline.SetLonglineStub] -activityLongline.attributeGeneric = fr.ird.observe.services.dto.longline.ActivityLonglineDto -activityLongline.unique = true - -[class fr.ird.observe.services.dto.longline.SetLonglineTdr] -baskets.attributeGeneric = fr.ird.observe.services.dto.longline.BasketDto -branchlines.attributeGeneric = fr.ird.observe.services.dto.longline.BranchlineDto -sections.attributeGeneric = fr.ird.observe.services.dto.longline.SectionDto - -[class fr.ird.observe.services.dto.longline.SizeMeasure] -sizeMeasureType.attributeGeneric = fr.ird.observe.services.dto.referential.SizeMeasureTypeDto - -[class fr.ird.observe.services.dto.longline.Tdr] -basket.attributeGeneric = fr.ird.observe.services.dto.longline.BasketDto -branchline.attributeGeneric = fr.ird.observe.services.dto.longline.BranchlineDto -itemHorizontalPosition.attributeGeneric = fr.ird.observe.services.dto.referential.longline.ItemHorizontalPositionDto -itemVerticalPosition.attributeGeneric = fr.ird.observe.services.dto.referential.longline.ItemVerticalPositionDto -section.attributeGeneric = fr.ird.observe.services.dto.longline.SectionDto -sensorBrand.attributeGeneric = fr.ird.observe.services.dto.referential.longline.SensorBrandDto -species.attributeGeneric = fr.ird.observe.services.dto.referential.SpeciesDto - -[class fr.ird.observe.services.dto.longline.TripLongline] -activityLongline.ordered = true -activityLongline.unique = true -captain.attributeGeneric = fr.ird.observe.services.dto.referential.PersonDto -dataEntryOperator.attributeGeneric = fr.ird.observe.services.dto.referential.PersonDto -departureHarbour.attributeGeneric = fr.ird.observe.services.dto.referential.HarbourDto -landingHarbour.attributeGeneric = fr.ird.observe.services.dto.referential.HarbourDto -observer.attributeGeneric = fr.ird.observe.services.dto.referential.PersonDto -ocean.attributeGeneric = fr.ird.observe.services.dto.referential.OceanDto -program.attributeGeneric = fr.ird.observe.services.dto.referential.ProgramDto -tripType.attributeGeneric = fr.ird.observe.services.dto.referential.longline.TripTypeDto -vessel.attributeGeneric = fr.ird.observe.services.dto.referential.VesselDto - -[class fr.ird.observe.services.dto.longline.TripLonglineGearUse] -gearUseFeaturesLongline.ordered = true -gearUseFeaturesLongline.unique = true - -[class fr.ird.observe.services.dto.longline.WeightMeasure] -weightMeasureType.attributeGeneric = fr.ird.observe.services.dto.referential.WeightMeasureTypeDto - -[class fr.ird.observe.services.dto.referential.Gear] -gearCaracteristic.attributeGeneric = fr.ird.observe.services.dto.referential.GearCaracteristic -gearCaracteristic.ordered = true - -[class fr.ird.observe.services.dto.referential.GearCaracteristic] -gearCaracteristicType.attributeGeneric = fr.ird.observe.services.dto.referential.GearCaracteristicType - -[class fr.ird.observe.services.dto.referential.Harbour] -country.attributeGeneric = fr.ird.observe.services.dto.referential.Country - -[class fr.ird.observe.services.dto.referential.LengthLengthParameter] -inpuSizeMeasureType.attributeGeneric = fr.ird.observe.services.dto.referential.SizeMeasureType -outputSizeMeasureType.attributeGeneric = fr.ird.observe.services.dto.referential.SizeMeasureType - -[class fr.ird.observe.services.dto.referential.LengthWeightParameter] -ocean.attributeGeneric = fr.ird.observe.services.dto.referential.Ocean -sex.attributeGeneric = fr.ird.observe.services.dto.referential.Sex -species.attributeGeneric = fr.ird.observe.services.dto.referential.Species -sizeMeasureType.attributeGeneric = fr.ird.observe.services.dto.referential.SizeMeasureType - -[class fr.ird.observe.services.dto.referential.Organism] -country.attributeGeneric = fr.ird.observe.services.dto.referential.Country - -[class fr.ird.observe.services.dto.referential.Person] -country.attributeGeneric = fr.ird.observe.services.dto.referential.Country - -[class fr.ird.observe.services.dto.referential.Program] -organism.attributeGeneric = fr.ird.observe.services.dto.referential.Organism - -[class fr.ird.observe.services.dto.referential.ShipOwner] -country.attributeGeneric = fr.ird.observe.services.dto.referential.Country - -[class fr.ird.observe.services.dto.referential.Species] -ocean.attributeGeneric = fr.ird.observe.services.dto.referential.Ocean -ocean.ordered = true -speciesGroup.attributeGeneric = fr.ird.observe.services.dto.referential.SpeciesGroup -sizeMeasureType.attributeGeneric = fr.ird.observe.services.dto.referential.SizeMeasureType - -[class fr.ird.observe.services.dto.referential.SpeciesGroup] -speciesGroupReleaseMode.attributeGeneric = fr.ird.observe.services.dto.referential.SpeciesGroupReleaseMode -speciesGroupReleaseMode.ordered = true -speciesGroupReleaseStatus.attributeGeneric = fr.ird.observe.services.dto.referential.SpeciesGroupReleaseStatus -speciesGroupReleaseStatus.ordered = true - -[class fr.ird.observe.services.dto.referential.SpeciesList] -species.attributeGeneric = fr.ird.observe.services.dto.referential.Species -species.ordered = true - -[class fr.ird.observe.services.dto.referential.Vessel] -flagCountry.attributeGeneric = fr.ird.observe.services.dto.referential.Country -vesselSizeCategory.attributeGeneric = fr.ird.observe.services.dto.referential.VesselSizeCategory -vesselType.attributeGeneric = fr.ird.observe.services.dto.referential.VesselType -shipOwner.attributeGeneric = fr.ird.observe.services.dto.referential.ShipOwner - -[class fr.ird.observe.services.dto.referential.seine.WeightCategory] -species.attributeGeneric = fr.ird.observe.services.dto.referential.Species - -[class fr.ird.observe.services.dto.seine.ActivitySeine] -currentFpaZone.attributeGeneric = fr.ird.observe.services.dto.referential.FpaZoneDto -detectionMode.attributeGeneric = fr.ird.observe.services.dto.referential.seine.DetectionModeDto -nextFpaZone.attributeGeneric = fr.ird.observe.services.dto.referential.FpaZoneDto -observedSystem.attributeGeneric = fr.ird.observe.services.dto.referential.seine.ObservedSystemDto -previousFpaZone.attributeGeneric = fr.ird.observe.services.dto.referential.FpaZoneDto -reasonForNoFishing.attributeGeneric = fr.ird.observe.services.dto.referential.seine.ReasonForNoFishingDto -setSeine.attributeGeneric = fr.ird.observe.services.dto.seine.SetSeineDto -surroundingActivity.attributeGeneric = fr.ird.observe.services.dto.referential.seine.SurroundingActivityDto -vesselActivitySeine.attributeGeneric = fr.ird.observe.services.dto.referential.seine.VesselActivitySeineDto -wind.attributeGeneric = fr.ird.observe.services.dto.referential.seine.WindDto - -[class fr.ird.observe.services.dto.seine.FloatingObject] -objectOperation.attributeGeneric = fr.ird.observe.services.dto.referential.seine.ObjectOperationDto -objectType.attributeGeneric = fr.ird.observe.services.dto.referential.seine.ObjectTypeDto - -[class fr.ird.observe.services.dto.referential.seine.ObjectMaterial] -parent.attributeGeneric = fr.ird.observe.services.dto.referential.seine.ObjectMaterialDto - -[class fr.ird.observe.services.dto.seine.FloatingObjectPart] -objectMaterial.attributeGeneric = fr.ird.observe.services.dto.referential.seine.ObjectMaterialDto - -[class fr.ird.observe.services.dto.seine.GearUseFeaturesMeasurementSeine] -gearCaracteristic.attributeGeneric = fr.ird.observe.services.dto.referential.GearCaracteristicDto - -[class fr.ird.observe.services.dto.seine.GearUseFeaturesSeine] -gear.attributeGeneric = fr.ird.observe.services.dto.referential.GearDto -gearUseFeaturesMeasurement.unique = true - -[class fr.ird.observe.services.dto.seine.NonTargetCatch] -reasonForDiscard.attributeGeneric = fr.ird.observe.services.dto.referential.seine.ReasonForDiscardDto -species.attributeGeneric = fr.ird.observe.services.dto.referential.SpeciesDto -speciesFate.attributeGeneric = fr.ird.observe.services.dto.referential.seine.SpeciesFateDto - -[class fr.ird.observe.services.dto.seine.NonTargetCatchRelease] -reasonForDiscard.attributeGeneric = fr.ird.observe.services.dto.referential.seine.ReasonForDiscardDto -species.attributeGeneric = fr.ird.observe.services.dto.referential.SpeciesDto -sex.attributeGeneric = fr.ird.observe.services.dto.referential.SexDto -speciesGroupReleaseMode.attributeGeneric = fr.ird.observe.services.dto.referential.SpeciesGroupReleaseModeDto -nonTargetCatchReleaseStatus.ordered = true - -[class fr.ird.observe.services.dto.seine.NonTargetCatchReleaseStatus] -speciesGroupReleaseStatus.attributeGeneric = fr.ird.observe.services.dto.referential.SpeciesGroupReleaseStatusDto - -[class fr.ird.observe.services.dto.seine.NonTargetLength] -sex.attributeGeneric = fr.ird.observe.services.dto.referential.Sex -species.attributeGeneric = fr.ird.observe.services.dto.referential.Species -speciesFate.attributeGeneric = fr.ird.observe.services.dto.referential.seine.SpeciesFate -sizeMeasureType.attributeGeneric = fr.ird.observe.services.dto.referential.SizeMeasureType - -[class fr.ird.observe.services.dto.seine.NonTargetSample] -nonTargetLength.unique = true -speciesFate.attributeGeneric = fr.ird.observe.services.dto.referential.seine.SpeciesFateDto - -[class fr.ird.observe.services.dto.seine.ObjectObservedSpecies] -species.attributeGeneric = fr.ird.observe.services.dto.referential.SpeciesDto -speciesStatus.attributeGeneric = fr.ird.observe.services.dto.referential.seine.SpeciesStatusDto - -[class fr.ird.observe.services.dto.seine.ObjectSchoolEstimate] -species.attributeGeneric = fr.ird.observe.services.dto.referential.SpeciesDto - -[class fr.ird.observe.services.dto.seine.Route] -activitySeine.ordered = true -activitySeine.unique = true - -[class fr.ird.observe.services.dto.seine.SchoolEstimate] -species.attributeGeneric = fr.ird.observe.services.dto.referential.SpeciesDto - -[class fr.ird.observe.services.dto.seine.SetSeine] -reasonForNullSet.attributeGeneric = fr.ird.observe.services.dto.referential.seine.ReasonForNullSetDto - -[class fr.ird.observe.services.dto.seine.SetSeineNonTargetCatchRelease] -nonTargetCatchRelease.ordered = true - -[class fr.ird.observe.services.dto.seine.TargetCatch] -reasonForDiscard.attributeGeneric = fr.ird.observe.services.dto.referential.seine.ReasonForDiscardDto -species.attributeGeneric = fr.ird.observe.services.dto.referential.SpeciesDto -weightCategory.attributeGeneric = fr.ird.observe.services.dto.referential.seine.WeightCategoryDto - -[class fr.ird.observe.services.dto.seine.TargetLength] -sex.attributeGeneric = fr.ird.observe.services.dto.referential.SexDto -species.attributeGeneric = fr.ird.observe.services.dto.referential.SpeciesDto -sizeMeasureType.attributeGeneric = fr.ird.observe.services.dto.referential.SizeMeasureTypeDto - -[class fr.ird.observe.services.dto.seine.TargetSample] -targetLength.unique = true - -[class fr.ird.observe.services.dto.seine.TransmittingBuoy] -country.attributeGeneric = fr.ird.observe.services.dto.referential.CountryDto -transmittingBuoyOperation.attributeGeneric = fr.ird.observe.services.dto.referential.seine.TransmittingBuoyOperationDto -transmittingBuoyType.attributeGeneric = fr.ird.observe.services.dto.referential.seine.TransmittingBuoyTypeDto - -[class fr.ird.observe.services.dto.seine.TripSeine] -captain.attributeGeneric = fr.ird.observe.services.dto.referential.PersonDto -dataEntryOperator.attributeGeneric = fr.ird.observe.services.dto.referential.PersonDto -departureHarbour.attributeGeneric = fr.ird.observe.services.dto.referential.HarbourDto -landingHarbour.attributeGeneric = fr.ird.observe.services.dto.referential.HarbourDto -observer.attributeGeneric = fr.ird.observe.services.dto.referential.PersonDto -ocean.attributeGeneric = fr.ird.observe.services.dto.referential.OceanDto -program.attributeGeneric = fr.ird.observe.services.dto.referential.ProgramDto -route.ordered = true -route.unique = true -vessel.attributeGeneric = fr.ird.observe.services.dto.referential.VesselDto - -[class fr.ird.observe.services.dto.seine.TripSeineGearUse] -gearUseFeaturesSeine.ordered = true -gearUseFeaturesSeine.unique = true ===================================== src/site/markdown/model.md ===================================== --- /dev/null +++ b/src/site/markdown/model.md @@ -0,0 +1,19 @@ +# ObServe - model + +Vous trouverez sur cette page les liens vers la modélisation de la couche de persistence. + +Nous maintenons pour le moment deux versions de ce modèle sur le format *zargo*. + +## Version 5 + +* [model commun](https://gitlab.com/ultreiaio/ird-observe/blob/develop/doc/modelisation/zargo...) +* [model senne](https://gitlab.com/ultreiaio/ird-observe/blob/develop/doc/modelisation/zargo...) +* [model palangre](https://gitlab.com/ultreiaio/ird-observe/blob/develop/doc/modelisation/zargo...) +* [model properties](https://gitlab.com/ultreiaio/ird-observe/blob/develop/doc/modelisation/zargo...) + +## Version 7 + +* [model commun](https://gitlab.com/ultreiaio/ird-observe/blob/develop/doc/modelisation/zargo...) +* [model senne](https://gitlab.com/ultreiaio/ird-observe/blob/develop/doc/modelisation/zargo...) +* [model palangre](https://gitlab.com/ultreiaio/ird-observe/blob/develop/doc/modelisation/zargo...) +* [model properties](https://gitlab.com/ultreiaio/ird-observe/blob/develop/doc/modelisation/zargo...) View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/bb5030cbea78041d713f63b9deb6... --- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/bb5030cbea78041d713f63b9deb6... You're receiving this email because of your account on gitlab.com.