Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: edf005ef by Tony CHEMIT at 2018-05-24T09:57:18Z suppression des enumerations pour generer les constantes - - - - - 3 changed files: - dto/src/main/models/Observe.model - persistence/src/main/models/Observe.model - pom.xml Changes: ===================================== dto/src/main/models/Observe.model ===================================== --- a/dto/src/main/models/Observe.model +++ b/dto/src/main/models/Observe.model @@ -12,16 +12,6 @@ package fr.ird.observe.dto.form enum constants.ObserveDbRole -enum data.seine.SetSeineConstants -targetSampleCapture -endSetDate -endPursingDate -endSetTime -endPursingTime - -enum data.seine.TargetLengthConstants -totalWeight - interface ObserveDto interface WithComment @@ -791,7 +781,7 @@ meanWeight + {*:1} Integer species {*:1} fr.ird.observe.dto.referential.SpeciesReference weightMeasureMethod {*:0..1} fr.ird.observe.dto.referential.WeightMeasureMethodReference -data.seine.SetSeine > data.Commentable | references=comment +data.seine.SetSeine > data.Commentable | references=comment constants=targetSampleCapture,endSetDate,endPursingDate,endSetTime,endPursingTime startTime + {*:1} Date endPursingTimeStamp + {*:1} Date endSetTimeStamp + {*:1} Date @@ -837,7 +827,7 @@ reasonForDiscard {*:0..1} fr.ird.observe.dto.referential.seine.ReasonForDiscardR species {*:1} fr.ird.observe.dto.referential.SpeciesReference weightMeasureMethod {*:0..1} fr.ird.observe.dto.referential.WeightMeasureMethodReference -data.seine.TargetLength > data.Data | references=speciesLabel,length,count +data.seine.TargetLength > data.Data | references=speciesLabel,length,count constants=totalWeight length + {*:1} Float isLengthComputed + {*:1} boolean count + {*:1} Integer ===================================== persistence/src/main/models/Observe.model ===================================== --- a/persistence/src/main/models/Observe.model +++ b/persistence/src/main/models/Observe.model @@ -25,62 +25,6 @@ enum !fr.ird.observe.dto.data.seine.TypeTransmittingBuoyOperation enum !fr.ird.observe.dto.data.seine.DcpComputedValue -enum longline.ActivityLonglineObsConstants -date -time - -enum longline.BranchlineObsConstants -timerTimeOnBoardDate -timerTimeOnBoardTime - -enum longline.SetLonglineObsConstants -settingStartDate -settingStartTime -settingStartQuadrant -settingEndDate -settingEndTime -settingEndQuadrant -haulingStartDate -haulingStartTime -haulingStartQuadrant -haulingEndDate -haulingEndTime -haulingEndQuadrant -floatlinesCompositionProportionSum -branchlinesCompositionProportionSum -hooksCompositionProportionSum -baitsCompositionProportionSum - -enum longline.TdrObsConstants -deployementStartDate -deployementStartTime -deployementEndDate -deployementEndTime -fishingStartDate -fishingStartTime -fishingEndDate -fishingEndTime - -enum referentiel.FormulaSupportConstants -formulaOneValid -formulaTwoValid - -enum referentiel.HarbourConstants -quadrant - -enum referentiel.ProgramConstants -gearTypePrefix - -enum seine.SetConstants -targetSampleCapture -endSetDate -endPursingDate -endSetTime -endPursingTime - -enum seine.TargetLengthConstants -totalWeight - interface Activity interface LengthWeightComputable @@ -119,7 +63,7 @@ abstract ObserveDataEntity > ObserveEntity | entity abstract ObserveEntity >> fr.ird.observe.dto.reference.DtoReferenceAware | entity lastUpdateDate + {*:1} Date | notNull -longline.ActivityLonglineObs > ObserveDataEntity >> Activity | entity dbName=ActivityObs +longline.ActivityLonglineObs > ObserveDataEntity >> Activity | entity dbName=ActivityObs constants=date,time comment + {*:1} String | hibernateAttributeType=text timeStamp + {*:1} Date latitude + {*:1} Float @@ -154,7 +98,7 @@ catchLongline {*} longline.CatchLonglineObs | reverseDbName=basket tdr {*} longline.TdrObs | reverseDbName=basket setLongline {*:1} longline.SetLonglineObs | dbName=set -longline.BranchlineObs > ObserveDataEntity >> longline.LonglineCompositionEntity | entity +longline.BranchlineObs > ObserveDataEntity >> longline.LonglineCompositionEntity | entity constants=timerTimeOnBoardDate,timerTimeOnBoardTime comment + {*:1} String | hibernateAttributeType=text settingIdentifier + {*:1} Integer | notNull haulingIdentifier + {*:1} Integer @@ -267,7 +211,7 @@ sensorType {*:1} referentiel.longline.SensorType sensorDataFormat {*:0..1} referentiel.longline.SensorDataFormat sensorBrand {*:1} referentiel.longline.SensorBrand -longline.SetLonglineObs > ObserveDataEntity >> ObserveSet | entity dbName=SetObs +longline.SetLonglineObs > ObserveDataEntity >> ObserveSet | entity dbName=SetObs constants=settingStartDate,settingStartTime,settingStartQuadrant,settingEndDate,settingEndTime,settingEndQuadrant,haulingStartDate,haulingStartTime,haulingStartQuadrant,haulingEndDate,haulingEndTime,haulingEndQuadrant,floatlinesCompositionProportionSum,branchlinesCompositionProportionSum,hooksCompositionProportionSum,baitsCompositionProportionSum comment + {*:1} String | hibernateAttributeType=text homeId + {*:1} String number + {*:1} Integer @@ -351,7 +295,7 @@ size + {*:1} Float | sqlType=numeric sizeMeasureType {*:1} referentiel.SizeMeasureType lengthMeasureMethod {*:0..1} referentiel.LengthMeasureMethod -longline.TdrObs > ObserveDataEntity >> longline.LonglinePositionAware | entity +longline.TdrObs > ObserveDataEntity >> longline.LonglinePositionAware | entity constants=deployementStartDate,deployementStartTime,deployementEndDate,deployementEndTime,fishingStartDate,fishingStartTime,fishingEndDate,fishingEndTime homeId + {*:1} String floatline1Length + {*:1} Float | sqlType=numeric floatline2Length + {*:1} Float | sqlType=numeric @@ -447,7 +391,7 @@ iso3Code + {*:1} String referentiel.DataQuality > referentiel.I18nReferentialEntity | entity -abstract referentiel.FormulaSupport > referentiel.ObserveReferentialEntity | entity +abstract referentiel.FormulaSupport > referentiel.ObserveReferentialEntity | entity constants=formulaOneValid,formulaTwoValid coefficients + {*:1} String source + {*:1} String | hibernateAttributeType=text getCoefficientNames() Set<String> @@ -477,7 +421,7 @@ gearCaracteristicType {*:1} referentiel.GearCaracteristicType | lazy=false referentiel.GearCaracteristicType > referentiel.I18nReferentialEntity | entity -referentiel.Harbour > referentiel.ObserveReferentialEntity | entity +referentiel.Harbour > referentiel.ObserveReferentialEntity | entity constants=quadrant country {*:1} referentiel.Country locode + {*:1} String name + {*:1} String @@ -544,7 +488,7 @@ dataEntryOperator + {*:1} boolean dataSource + {*:1} boolean country {*:0..1} referentiel.Country -referentiel.Program > referentiel.I18nReferentialEntity | entity +referentiel.Program > referentiel.I18nReferentialEntity | entity constants=gearTypePrefix organism {*:1} referentiel.Organism | lazy=false nonTargetObservation + {*:1} int targetDiscardsObservation + {*:1} int @@ -891,7 +835,7 @@ setSeine {*:1} seine.SetSeine | naturalId dbName=set species {*:1} referentiel.Species | naturalId weightMeasureMethod {*:0..1} referentiel.WeightMeasureMethod -seine.SetSeine > ObserveDataEntity >> ObserveSet | entity dbName=Set +seine.SetSeine > ObserveDataEntity >> ObserveSet | entity dbName=Set constants=targetSampleCapture,endSetDate,endPursingDate,endSetTime,endPursingTime comment + {*:1} String | hibernateAttributeType=text startTime + {*:1} Date | hibernateAttributeType.java.util.Date=time endPursingTimeStamp + {*:1} Date @@ -946,7 +890,7 @@ weightMeasureMethod {*:0..1} referentiel.WeightMeasureMethod getSpecies() referentiel.Species setSpecies(species referentiel.Species) -seine.TargetLength > ObserveDataEntity >> LengthWeightComputable | entity +seine.TargetLength > ObserveDataEntity >> LengthWeightComputable | entity constants=totalWeight length + {*:1} Float | sqlType=numeric isLengthComputed + {*:1} boolean count + {*:1} Integer ===================================== pom.xml ===================================== --- a/pom.xml +++ b/pom.xml @@ -138,6 +138,8 @@ <properties> + <lib.version.java4all.eugene>3.0-alpha-22-SNAPSHOT</lib.version.java4all.eugene> + <organizationId>ultreiaio</organizationId> <projectId>ird-observe</projectId> <stageId>frirdobserve</stageId> @@ -163,7 +165,6 @@ <!--<lib.version.hibernate>5.2.10.Final</lib.version.hibernate>--> <!--can't use 1.4.197 (date has changed + blob also--> <lib.version.h2>1.4.196</lib.version.h2> - <lib.version.java4all.eugene>3.0-alpha-21</lib.version.java4all.eugene> <!-- license header configuration --> <license.licenseName>gpl_v3</license.licenseName> View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/edf005efb73ca005e700844cfc76... -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/edf005efb73ca005e700844cfc76... You're receiving this email because of your account on gitlab.com.