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

Commits:

18 changed files:

Changes:

  • client/i18n/src/main/i18n/translations/observe_en_GB.properties
    ... ... @@ -374,14 +374,12 @@ observe.data.ll.common.Trip.associatedActivityCount=Number of activities matched
    374 374 
     observe.data.ll.common.Trip.associatedFishingOperationCount=Number of fishing operations matched
    375 375 
     observe.data.ll.common.Trip.availableData=Available data
    376 376 
     observe.data.ll.common.Trip.ersId=Id ERS
    377 
    -observe.data.ll.common.Trip.generalComment=Comment
    378 377 
     observe.data.ll.common.Trip.generalTab=Common characteristics
    379 378 
     observe.data.ll.common.Trip.list.message.none=No trip for current program
    380 379 
     observe.data.ll.common.Trip.list.navigation.node=Trip
    381 380 
     observe.data.ll.common.Trip.list.title=List of trips
    382 381 
     observe.data.ll.common.Trip.logbookActivityCount=Number of activities
    383 382 
     observe.data.ll.common.Trip.logbookAvailability=Logbook and associated data
    384 
    -observe.data.ll.common.Trip.logbookComment=Comment
    385 383 
     observe.data.ll.common.Trip.logbookFishingOperationCount=Number of fishing operations
    386 384 
     observe.data.ll.common.Trip.logbookTab=Logbook and associated data
    387 385 
     observe.data.ll.common.Trip.mapTab=Map
    ... ... @@ -391,7 +389,6 @@ observe.data.ll.common.Trip.noOfCrewMembers=Number of crew
    391 389 
     observe.data.ll.common.Trip.noOfDays=Duration (days)
    392 390 
     observe.data.ll.common.Trip.observationsActivityCount=Number of activities
    393 391 
     observe.data.ll.common.Trip.observationsAvailability=Observations
    394 
    -observe.data.ll.common.Trip.observationsComment=Comment
    395 392 
     observe.data.ll.common.Trip.observationsFishingOperationCount=Number of fishing operations
    396 393 
     observe.data.ll.common.Trip.observationsTab=Observations
    397 394 
     observe.data.ll.common.Trip.species=Target species

  • client/i18n/src/main/i18n/translations/observe_es_ES.properties
    ... ... @@ -374,14 +374,12 @@ observe.data.ll.common.Trip.associatedActivityCount=Número de actividades coinc
    374 374 
     observe.data.ll.common.Trip.associatedFishingOperationCount=Número de operaciones de pesca coincidentes
    375 375 
     observe.data.ll.common.Trip.availableData=Données disponibles
    376 376 
     observe.data.ll.common.Trip.ersId=Id ERS
    377 
    -observe.data.ll.common.Trip.generalComment=Comentarios
    378 377 
     observe.data.ll.common.Trip.generalTab=General características
    379 378 
     observe.data.ll.common.Trip.list.message.none=Ninguna marea para el programa actual
    380 379 
     observe.data.ll.common.Trip.list.navigation.node=Marea
    381 380 
     observe.data.ll.common.Trip.list.title=List of trips
    382 381 
     observe.data.ll.common.Trip.logbookActivityCount=Número de actividades
    383 382 
     observe.data.ll.common.Trip.logbookAvailability=Diario de pesca y datos asociados
    384 
    -observe.data.ll.common.Trip.logbookComment=Comentarios
    385 383 
     observe.data.ll.common.Trip.logbookFishingOperationCount=Número de operaciones de pesca
    386 384 
     observe.data.ll.common.Trip.logbookTab=Diario de pesca y datos asociados
    387 385 
     observe.data.ll.common.Trip.mapTab=Mapa
    ... ... @@ -391,7 +389,6 @@ observe.data.ll.common.Trip.noOfCrewMembers=Nombre d'équipage
    391 389 
     observe.data.ll.common.Trip.noOfDays=Duración (días)
    392 390 
     observe.data.ll.common.Trip.observationsActivityCount=Número de actividades
    393 391 
     observe.data.ll.common.Trip.observationsAvailability=Observaciones
    394 
    -observe.data.ll.common.Trip.observationsComment=Comentarios
    395 392 
     observe.data.ll.common.Trip.observationsFishingOperationCount=Número de operaciones de pesca
    396 393 
     observe.data.ll.common.Trip.observationsTab=Observaciones
    397 394 
     observe.data.ll.common.Trip.species=Especie objetivo

  • client/i18n/src/main/i18n/translations/observe_fr_FR.properties
    ... ... @@ -374,14 +374,12 @@ observe.data.ll.common.Trip.associatedActivityCount=Nombres d'activités associ
    374 374 
     observe.data.ll.common.Trip.associatedFishingOperationCount=Nombre d'opérations de pêche associées
    375 375 
     observe.data.ll.common.Trip.availableData=Données disponibles
    376 376 
     observe.data.ll.common.Trip.ersId=Id ERS
    377 
    -observe.data.ll.common.Trip.generalComment=Commentaire
    378 377 
     observe.data.ll.common.Trip.generalTab=Caractéristiques communes
    379 378 
     observe.data.ll.common.Trip.list.message.none=Aucune marée pour le programme courant
    380 379 
     observe.data.ll.common.Trip.list.navigation.node=Marée
    381 380 
     observe.data.ll.common.Trip.list.title=Liste de marées
    382 381 
     observe.data.ll.common.Trip.logbookActivityCount=Nombres d'activités
    383 382 
     observe.data.ll.common.Trip.logbookAvailability=Livre de bord et données associées
    384 
    -observe.data.ll.common.Trip.logbookComment=Commentaire
    385 383 
     observe.data.ll.common.Trip.logbookFishingOperationCount=Nombre d'opérations de pêche
    386 384 
     observe.data.ll.common.Trip.logbookTab=Livre de bord et données associées
    387 385 
     observe.data.ll.common.Trip.mapTab=Carte
    ... ... @@ -391,7 +389,6 @@ observe.data.ll.common.Trip.noOfCrewMembers=Nombre d'équipage
    391 389 
     observe.data.ll.common.Trip.noOfDays=Durée (jours)
    392 390 
     observe.data.ll.common.Trip.observationsActivityCount=Nombres d'activités
    393 391 
     observe.data.ll.common.Trip.observationsAvailability=Données d'observation
    394 
    -observe.data.ll.common.Trip.observationsComment=Commentaire
    395 392 
     observe.data.ll.common.Trip.observationsFishingOperationCount=Nombre d'opérations de pêche
    396 393 
     observe.data.ll.common.Trip.observationsTab=Données d'observation
    397 394 
     observe.data.ll.common.Trip.species=Espèces ciblées

  • models/dto/src/main/models/Observe-00-common.model
    ... ... @@ -25,10 +25,6 @@ interface data.ActivityAware > DtoAndReferenceAware
    25 25
    26 26 
     interface DtoParentAware > DtoAndReferenceAware
    27 27
    28 
    -interface WithComment
    29 
    -getComment() String
    30 
    -setComment(comment String)
    31 
    -
    32 28 
     interface reference.DataReference > fr.ird.observe.dto.ObserveDto
    33 29
    34 30 
     interface reference.ReferentialReference > fr.ird.observe.dto.ObserveDto
    ... ... @@ -40,14 +36,13 @@ lastUpdateDate + {*:1} Date
    40 36 
     abstract data.Data > Id | skip
    41 37 
     homeId + {*:1} String
    42 38
    43 
    -abstract data.Commentable > data.Data >> WithComment
    44 
    -comment + {*:1} String
    45 
    -
    46 
    -abstract data.Openable > data.Commentable
    39 
    +abstract data.Openable > data.Data
    47 40
    48 
    -abstract data.Editable > data.Commentable
    41 
    +abstract data.Editable > data.Data
    42 
    +comment + {*:1} String
    49 43
    50 
    -abstract data.Simple > data.Commentable
    44 
    +abstract data.Simple > data.Data
    45 
    +comment + {*:1} String
    51 46
    52 47 
     data.DataFile >> ObserveDto | skip
    53 48 
     content + {*:1} !byte[]

  • models/dto/src/main/models/Observe-01-referential-common.model
    ... ... @@ -94,7 +94,7 @@ dataEntryOperator + {*:1} boolean
    94 94 
     dataSource + {*:1} boolean
    95 95 
     country {*:0..1} fr.ird.observe.dto.referential.common.CountryReference | notNull
    96 96
    97 
    -referential.common.Program > referential.I18nReferential >> WithComment WithStartEndDate | references=code,label,uri,gearType,gearTypePrefix,tripCount,startDate,endDate NavigationEntryPoint
    97 
    +referential.common.Program > referential.I18nReferential >> WithStartEndDate | references=code,label,uri,gearType,gearTypePrefix,tripCount,startDate,endDate NavigationEntryPoint
    98 98 
     nonTargetObservation + {*:1} int
    99 99 
     targetDiscardsObservation + {*:1} int
    100 100 
     samplesObservation + {*:1} int

  • models/dto/src/main/models/Observe-20-data-ps-observation.model
    ... ... @@ -3,6 +3,7 @@ package fr.ird.observe.dto.data.ps.observation | form=self packagePriority=20
    3 3 
     interface data.ps.observation.TargetSampleAware
    4 4
    5 5 
     data.ps.observation.Activity > data.Openable >> data.ActivityAware | references=time,latitude,longitude,vesselActivity,set comparator=time navigationParent=data.ps.observation.Route
    6 
    +comment + {*:1} String
    6 7 
     time + {*:1} Date | notNull
    7 8 
     latitude + {*:1} Float | notNull
    8 9 
     longitude + {*:1} Float | notNull
    ... ... @@ -56,7 +57,8 @@ objectMaterial {*:1} fr.ird.observe.dto.referential.ps.common.ObjectMaterialRefe
    56 57 
     data.ps.observation.FloatingObjectSchoolEstimate > data.Simple | form=data.ps.observation.ObjectSchoolEstimate mainDto=data.ps.observation.FloatingObject
    57 58 
     objectSchoolEstimate {*} data.ps.observation.ObjectSchoolEstimate
    58 59
    59 
    -data.ps.observation.NonTargetCatch > data.Commentable | references=speciesLabel,speciesFateLabel
    60 
    +data.ps.observation.NonTargetCatch > data.Data | references=speciesLabel,speciesFateLabel
    61 
    +comment + {*:1} String
    60 62 
     catchWeight + {*:1} Float | positiveNumber
    61 63 
     catchWeightComputedSource + {*:1} !fr.ird.observe.dto.data.ps.NonTargetCatchComputedValueSource
    62 64 
     meanWeight + {*:1} Float | positiveNumber
    ... ... @@ -74,7 +76,8 @@ species {*:1} fr.ird.observe.dto.referential.common.SpeciesReference | notNull
    74 76 
     weightMeasureMethod {*:0..1} fr.ird.observe.dto.referential.common.WeightMeasureMethodReference
    75 77 
     lengthMeasureMethod {*:0..1} fr.ird.observe.dto.referential.common.LengthMeasureMethodReference
    76 78
    77 
    -data.ps.observation.NonTargetCatchRelease > data.Commentable | references=speciesLabel,speciesGroupReleaseModeLabel,statusLabel,conformityLabel,releasingTimeLabel,length
    79 
    +data.ps.observation.NonTargetCatchRelease > data.Data | references=speciesLabel,speciesGroupReleaseModeLabel,statusLabel,conformityLabel,releasingTimeLabel,length
    80 
    +comment + {*:1} String
    78 81 
     length + {*:1} Float | positiveNumber
    79 82 
     count + {*:1} Integer | notNull strictlyPositiveNumber
    80 83 
     acquisitionMode + {*:1} int
    ... ... @@ -119,6 +122,7 @@ species {*:1} fr.ird.observe.dto.referential.common.SpeciesReference | notNull
    119 122 
     weightMeasureMethod {*:0..1} fr.ird.observe.dto.referential.common.WeightMeasureMethodReference
    120 123
    121 124 
     data.ps.observation.Route > data.Openable | references=date,comment comparator=date navigationParent=data.ps.common.Trip
    125 
    +comment + {*:1} String
    122 126 
     date + {*:1} Date | notNull
    123 127 
     startLogValue + {*:1} Float | positiveNumber
    124 128 
     endLogValue + {*:1} Float | positiveNumber
    ... ... @@ -176,10 +180,12 @@ data.ps.observation.SetDiscardedTargetCatch > data.Simple | form=data.ps.observa
    176 180 
     targetDiscardCatchCompositionEstimatedByObserver + {*:1} boolean
    177 181 
     targetCatch {*} data.ps.observation.DiscardedTargetCatch | ordered
    178 182
    179 
    -data.ps.observation.TargetCatch > data.Commentable | references=well
    183 
    +data.ps.observation.TargetCatch > data.Data | references=well
    184 
    +comment + {*:1} String
    180 185 
     well + {*:1} String
    181 186
    182 
    -data.ps.observation.KeptTargetCatch > data.Commentable | references=speciesLabel,well,catchWeight mainDto=data.ps.observation.TargetCatch
    187 
    +data.ps.observation.KeptTargetCatch > data.Data | references=speciesLabel,well,catchWeight mainDto=data.ps.observation.TargetCatch
    188 
    +comment + {*:1} String
    183 189 
     catchWeight + {*:1} Float | notNull positiveNumber
    184 190 
     hasSample + {*:1} boolean
    185 191 
     well + {*:1} String
    ... ... @@ -187,7 +193,8 @@ weightCategory {*:1} fr.ird.observe.dto.referential.ps.observation.WeightCategor
    187 193 
     species {*:1} fr.ird.observe.dto.referential.common.SpeciesReference | notNull
    188 194 
     weightMeasureMethod {*:0..1} fr.ird.observe.dto.referential.common.WeightMeasureMethodReference
    189 195
    190 
    -data.ps.observation.DiscardedTargetCatch > data.Commentable | references=speciesLabel,catchWeight mainDto=data.ps.observation.TargetCatch
    196 
    +data.ps.observation.DiscardedTargetCatch > data.Data | references=speciesLabel,catchWeight mainDto=data.ps.observation.TargetCatch
    197 
    +comment + {*:1} String
    191 198 
     catchWeight + {*:1} Float | notNull positiveNumber
    192 199 
     hasSample + {*:1} boolean
    193 200 
     broughtOnDeck + {*:1} Boolean
    ... ... @@ -229,7 +236,8 @@ discarded + {*:1} Boolean
    229 236 
     targetLength + {*} data.ps.observation.TargetLength | ordered
    230 237 
     availableSpeciesIds + {*} String | unique
    231 238
    232 
    -data.ps.observation.TransmittingBuoy > data.Commentable | references=code,comment,transmittingBuoyTypeLabel,transmittingBuoyOperationLabel
    239 
    +data.ps.observation.TransmittingBuoy > data.Data | references=code,comment,transmittingBuoyTypeLabel,transmittingBuoyOperationLabel
    240 
    +comment + {*:1} String
    233 241 
     code + {*:1} String | mayNotNull
    234 242 
     transmittingBuoyOwnership + {*:1} fr.ird.observe.dto.referential.ps.common.TransmittingBuoyOwnershipReference
    235 243 
     transmittingBuoyType {*:1} fr.ird.observe.dto.referential.ps.common.TransmittingBuoyTypeReference | notNull

  • models/dto/src/main/models/Observe-25-data-ps.model
    1 1 
     package fr.ird.observe.dto.data.ps.common | form=self packagePriority=25
    2 2
    3 
    -data.ps.common.GearUseFeatures > data.Commentable | references=gearLabel,number,usedInTrip
    3 
    +data.ps.common.GearUseFeatures > data.Data | references=gearLabel,number,usedInTrip
    4 
    +comment + {*:1} String
    4 5 
     number + {*:1} Integer | notNull positiveNumber
    5 6 
     usedInTrip + {*:1} Boolean
    6 7 
     gearUseFeaturesMeasurement + {*} data.ps.common.GearUseFeaturesMeasurement | ordered
    ... ... @@ -11,6 +12,7 @@ measurementValue + {*:1} String
    11 12 
     gearCharacteristic {*:1} fr.ird.observe.dto.referential.common.GearCharacteristicReference
    12 13
    13 14 
     data.ps.common.Trip > data.Openable >> data.TripAware | references=startDate,endDate,program,routeSize,vessel,observerLabel comparator=startDate navigationParent=referential.common.Program
    15 
    +comment + {*:1} String
    14 16 
     startDate + {*:1} Date | notNull
    15 17 
     endDate + {*:1} Date | notNull
    16 18 
     checkLevel + {*:1} int

  • models/dto/src/main/models/Observe-30-data-ll-observation.model
    ... ... @@ -4,7 +4,8 @@ interface data.ll.observation.LonglineElementAware > DtoParentAware
    4 4
    5 5 
     interface data.ll.observation.LonglinePositionAware
    6 6
    7 
    -abstract data.ll.observation.LonglinePosition > data.Commentable >> data.ll.observation.LonglinePositionAware
    7 
    +abstract data.ll.observation.LonglinePosition > data.Data >> data.ll.observation.LonglinePositionAware
    8 
    +comment + {*:1} String
    8 9 
     section {*:0..1} fr.ird.observe.dto.data.ll.observation.SectionReference
    9 10 
     basket {*:0..1} fr.ird.observe.dto.data.ll.observation.BasketReference
    10 11 
     branchline {*:0..1} fr.ird.observe.dto.data.ll.observation.BranchlineReference
    ... ... @@ -17,6 +18,7 @@ baskets {*:*} fr.ird.observe.dto.data.ll.observation.BasketReference
    17 18 
     branchlines {*:*} fr.ird.observe.dto.data.ll.observation.BranchlineReference
    18 19
    19 20 
     data.ll.observation.Activity > data.Openable >> data.ActivityAware | references=timeStamp,latitude,longitude,vesselActivity,set comparator=timeStamp navigationParent=data.ll.common.Trip
    21 
    +comment + {*:1} String
    20 22 
     timeStamp + {*:1} Date
    21 23 
     latitude + {*:1} Float | notNull
    22 24 
     longitude + {*:1} Float | notNull

  • models/dto/src/main/models/Observe-31-data-ll-logbook.model
    ... ... @@ -14,6 +14,7 @@ weightMeasureType {*:0..1} fr.ird.observe.dto.referential.common.WeightMeasureTy
    14 14 
     weightMeasureMethod {*:0..1} fr.ird.observe.dto.referential.common.WeightMeasureMethodReference
    15 15
    16 16 
     data.ll.logbook.Sample > data.Openable | references=timeStamp,latitude,longitude comparator=timeStamp EditableService=ActivitySampleService navigationParent=data.ll.common.Trip navigationExtraParent=data.ll.logbook.Activity
    17 
    +comment + {*:1} String
    17 18 
     timeStamp + {*:1} Date | notNull
    18 19 
     latitude + {*:1} Float
    19 20 
     longitude + {*:1} Float
    ... ... @@ -21,6 +22,7 @@ quadrant + {*:1} Integer
    21 22 
     samplePart + {*} fr.ird.observe.dto.data.ll.logbook.SamplePartDto | ordered
    22 23
    23 24 
     data.ll.logbook.Activity > data.Openable >> data.ActivityAware | references=startTimeStamp,endTimeStamp,latitude,longitude,vesselActivity,set,sample,relatedObservedActivity comparator=startTimeStamp navigationParent=data.ll.common.Trip
    25 
    +comment + {*:1} String
    24 26 
     startTimeStamp + {*:1} Date | notNull
    25 27 
     endTimeStamp + {*:1} Date | mayNotNull
    26 28 
     latitude + {*:1} Float | mayNotNull
    ... ... @@ -128,7 +130,8 @@ hookOffset + {*:1} Integer | positiveNumber
    128 130 
     hookType {*:1} fr.ird.observe.dto.referential.ll.common.HookTypeReference | notNull
    129 131 
     hookSize {*:1} fr.ird.observe.dto.referential.ll.common.HookSizeReference
    130 132
    131 
    -data.ll.logbook.Catch > data.Commentable | references=homeId
    133 
    +data.ll.logbook.Catch > data.Data | references=homeId
    134 
    +comment + {*:1} String
    132 135 
     count + {*:1} Integer | positiveNumber
    133 136 
     totalWeight + {*:1} Float | positiveNumber
    134 137 
     hookWhenDiscarded + {*:1} Boolean

  • models/dto/src/main/models/Observe-32-data-ll-landing.model
    ... ... @@ -12,6 +12,7 @@ weightMeasureMethod {*:0..1} fr.ird.observe.dto.referential.common.WeightMeasure
    12 12 
     dataQuality {*:0..1} fr.ird.observe.dto.referential.common.DataQualityReference
    13 13
    14 14 
     data.ll.landing.Landing > data.Openable | references=startDate,harbourLabel,vesselLabel comparator=startDate navigationParent=data.ll.common.Trip
    15 
    +comment + {*:1} String
    15 16 
     startDate + {*:1} Date
    16 17 
     endDate + {*:1} Date
    17 18 
     dataSource {*:1} fr.ird.observe.dto.referential.ll.landing.DataSourceReference

  • models/dto/src/main/models/Observe-35-data-ll.model
    1 1 
     package fr.ird.observe.dto.data.ll.common | form=self packagePriority=35
    2 2
    3 
    -data.ll.common.GearUseFeatures > data.Commentable | references=gearLabel,number,usedInTrip
    3 
    +data.ll.common.GearUseFeatures > data.Data | references=gearLabel,number,usedInTrip
    4 
    +comment + {*:1} String
    4 5 
     number + {*:1} Integer | notNull positiveNumber
    5 6 
     usedInTrip + {*:1} Boolean
    6 7 
     gearUseFeaturesMeasurement + {*} data.ll.common.GearUseFeaturesMeasurement | ordered

  • services/i18n/src/main/i18n/translations/services_en_GB.properties
    ... ... @@ -174,9 +174,12 @@ observe.data.ll.common.GearUseFeatures.type=Gear uses features
    174 174 
     observe.data.ll.common.GearUseFeaturesMeasurement.gearCharacteristic=Gear caracteristic
    175 175 
     observe.data.ll.common.GearUseFeaturesMeasurement.type=Measurement type
    176 176 
     observe.data.ll.common.Trip.activityObs=Activity
    177 
    +observe.data.ll.common.Trip.generalComment=General comment
    178 
    +observe.data.ll.common.Trip.logbookComment=Logbook comment
    177 179 
     observe.data.ll.common.Trip.logbookDataEntryOperator=Data entry operator
    178 180 
     observe.data.ll.common.Trip.logbookDataQuality=Data quality
    179 181 
     observe.data.ll.common.Trip.observationMethod=Observations method
    182 
    +observe.data.ll.common.Trip.observationsComment=Observations comment
    180 183 
     observe.data.ll.common.Trip.observationsDataEntryOperator=Data entry operator
    181 184 
     observe.data.ll.common.Trip.observationsDataQuality=Data quality
    182 185 
     observe.data.ll.common.Trip.tripType=Trip type

  • services/i18n/src/main/i18n/translations/services_es_ES.properties
    ... ... @@ -174,9 +174,12 @@ observe.data.ll.common.GearUseFeatures.type=Equipamiento
    174 174 
     observe.data.ll.common.GearUseFeaturesMeasurement.gearCharacteristic=Característica
    175 175 
     observe.data.ll.common.GearUseFeaturesMeasurement.type=Tipo
    176 176 
     observe.data.ll.common.Trip.activityObs=Actividad
    177 
    +observe.data.ll.common.Trip.generalComment=General Comentarios
    178 
    +observe.data.ll.common.Trip.logbookComment=Logbook Comentarios
    177 179 
     observe.data.ll.common.Trip.logbookDataEntryOperator=Operador de captación de datos
    178 180 
     observe.data.ll.common.Trip.logbookDataQuality=Qualité de donnée \#TODO
    179 181 
     observe.data.ll.common.Trip.observationMethod=Observations method \#TODO
    182 
    +observe.data.ll.common.Trip.observationsComment=Observations Comentarios
    180 183 
     observe.data.ll.common.Trip.observationsDataEntryOperator=Operador de captación de datos
    181 184 
     observe.data.ll.common.Trip.observationsDataQuality=Qualité de donnée \#TODO
    182 185 
     observe.data.ll.common.Trip.tripType=Tipo de marea

  • services/i18n/src/main/i18n/translations/services_fr_FR.properties
    ... ... @@ -174,9 +174,12 @@ observe.data.ll.common.GearUseFeatures.type=Équipement
    174 174 
     observe.data.ll.common.GearUseFeaturesMeasurement.gearCharacteristic=Caractéristique
    175 175 
     observe.data.ll.common.GearUseFeaturesMeasurement.type=Type de mesure
    176 176 
     observe.data.ll.common.Trip.activityObs=Activité
    177 
    +observe.data.ll.common.Trip.generalComment=Commentaire générale
    178 
    +observe.data.ll.common.Trip.logbookComment=Commentaire Livre de bord
    177 179 
     observe.data.ll.common.Trip.logbookDataEntryOperator=Opérateur de saisie
    178 180 
     observe.data.ll.common.Trip.logbookDataQuality=Qualité de donnée
    179 181 
     observe.data.ll.common.Trip.observationMethod=Méthode d'observations
    182 
    +observe.data.ll.common.Trip.observationsComment=Commentaire Observations
    180 183 
     observe.data.ll.common.Trip.observationsDataEntryOperator=Opérateur de saisie
    181 184 
     observe.data.ll.common.Trip.observationsDataQuality=Qualité de donnée
    182 185 
     observe.data.ll.common.Trip.tripType=Type de marée

  • services/validation/src/main/i18n/getters/validation-fields.getter
    ... ... @@ -30,9 +30,12 @@ observe.data.ll.common.GearUseFeatures.gear
    30 30 
     observe.data.ll.common.GearUseFeatures.number
    31 31 
     observe.data.ll.common.GearUseFeaturesMeasurement.gearCharacteristic
    32 32 
     observe.data.ll.common.Trip.activityObs
    33 
    +observe.data.ll.common.Trip.generalComment
    34 
    +observe.data.ll.common.Trip.logbookComment
    33 35 
     observe.data.ll.common.Trip.logbookDataEntryOperator
    34 36 
     observe.data.ll.common.Trip.logbookDataQuality
    35 37 
     observe.data.ll.common.Trip.observationMethod
    38 
    +observe.data.ll.common.Trip.observationsComment
    36 39 
     observe.data.ll.common.Trip.observationsDataEntryOperator
    37 40 
     observe.data.ll.common.Trip.observationsDataQuality
    38 41 
     observe.data.ll.common.Trip.tripType

  • services/validation/src/main/resources/fr/ird/observe/dto/data/ll/common/TripDto-create-error-validation.xml
    ... ... @@ -67,4 +67,37 @@
    67 67 
           <message/>
    68 68 
         </field-validator>
    69 69 
       </field>
    70 
    +  <field name="generalComment">
    71 
    +    <!-- comment length -->
    72 
    +    <field-validator type="commentLengthFieldDto">
    73 
    +      <message/>
    74 
    +    </field-validator>
    75 
    +    <!-- comment needed from one of the selected referential -->
    76 
    +    <field-validator type="commentNeeded" short-circuit="true">
    77 
    +      <param name="propertyNames">captain,departureHarbour,landingHarbour,ocean,program,species,tripType,vessel</param>
    78 
    +      <message/>
    79 
    +    </field-validator>
    80 
    +  </field>
    81 
    +  <field name="observationsComment">
    82 
    +    <!-- comment length -->
    83 
    +    <field-validator type="commentLengthFieldDto">
    84 
    +      <message/>
    85 
    +    </field-validator>
    86 
    +    <!-- comment needed from one of the selected referential -->
    87 
    +    <field-validator type="commentNeeded" short-circuit="true">
    88 
    +      <param name="propertyNames">observationMethod,observationsDataEntryOperator,observationsDataQuality,observer</param>
    89 
    +      <message/>
    90 
    +    </field-validator>
    91 
    +  </field>
    92 
    +  <field name="logbookComment">
    93 
    +    <!-- comment length -->
    94 
    +    <field-validator type="commentLengthFieldDto">
    95 
    +      <message/>
    96 
    +    </field-validator>
    97 
    +    <!-- comment needed from one of the selected referential -->
    98 
    +    <field-validator type="commentNeeded" short-circuit="true">
    99 
    +      <param name="propertyNames">logbookDataEntryOperator,logbookDataQuality</param>
    100 
    +      <message/>
    101 
    +    </field-validator>
    102 
    +  </field>
    70 103 
     </validators>

  • services/validation/src/main/resources/fr/ird/observe/dto/data/ll/common/TripDto-update-error-validation.xml
    ... ... @@ -105,4 +105,37 @@
    105 105 
           <message/>
    106 106 
         </field-validator>
    107 107 
       </field>
    108 
    +  <field name="generalComment">
    109 
    +    <!-- comment length -->
    110 
    +    <field-validator type="commentLengthFieldDto">
    111 
    +      <message/>
    112 
    +    </field-validator>
    113 
    +    <!-- comment needed from one of the selected referential -->
    114 
    +    <field-validator type="commentNeeded" short-circuit="true">
    115 
    +      <param name="propertyNames">captain,departureHarbour,landingHarbour,ocean,program,species,tripType,vessel</param>
    116 
    +      <message/>
    117 
    +    </field-validator>
    118 
    +  </field>
    119 
    +  <field name="observationsComment">
    120 
    +    <!-- comment length -->
    121 
    +    <field-validator type="commentLengthFieldDto">
    122 
    +      <message/>
    123 
    +    </field-validator>
    124 
    +    <!-- comment needed from one of the selected referential -->
    125 
    +    <field-validator type="commentNeeded" short-circuit="true">
    126 
    +      <param name="propertyNames">observationMethod,observationsDataEntryOperator,observationsDataQuality,observer</param>
    127 
    +      <message/>
    128 
    +    </field-validator>
    129 
    +  </field>
    130 
    +  <field name="logbookComment">
    131 
    +    <!-- comment length -->
    132 
    +    <field-validator type="commentLengthFieldDto">
    133 
    +      <message/>
    134 
    +    </field-validator>
    135 
    +    <!-- comment needed from one of the selected referential -->
    136 
    +    <field-validator type="commentNeeded" short-circuit="true">
    137 
    +      <param name="propertyNames">logbookDataEntryOperator,logbookDataQuality</param>
    138 
    +      <message/>
    139 
    +    </field-validator>
    140 
    +  </field>
    108 141 
     </validators>

  • toolkit/dto/src/main/java/fr/ird/observe/dto/WithComment.java deleted
    1 
    -package fr.ird.observe.dto;
    2 
    -
    3 
    -/*-
    4 
    - * #%L
    5 
    - * ObServe Toolkit :: Dto
    6 
    - * %%
    7 
    - * Copyright (C) 2008 - 2020 IRD, Code Lutin, Ultreia.io
    8 
    - * %%
    9 
    - * This program is free software: you can redistribute it and/or modify
    10 
    - * it under the terms of the GNU General Public License as
    11 
    - * published by the Free Software Foundation, either version 3 of the
    12 
    - * License, or (at your option) any later version.
    13 
    - *
    14 
    - * This program is distributed in the hope that it will be useful,
    15 
    - * but WITHOUT ANY WARRANTY; without even the implied warranty of
    16 
    - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    17 
    - * GNU General Public License for more details.
    18 
    - *
    19 
    - * You should have received a copy of the GNU General Public
    20 
    - * License along with this program.  If not, see
    21 
    - * <http://www.gnu.org/licenses/gpl-3.0.html>.
    22 
    - * #L%
    23 
    - */
    24 
    -
    25 
    -import java.beans.PropertyChangeListener;
    26 
    -
    27 
    -/**
    28 
    - * Created on 21/12/16.
    29 
    - *
    30 
    - * @author Tony Chemit - dev@tchemit.fr
    31 
    - * @since 6.0
    32 
    - */
    33 
    -public interface WithComment {
    34 
    -
    35 
    -    String PROPERTY_COMMENT = "comment";
    36 
    -
    37 
    -    String getComment();
    38 
    -
    39 
    -    void setComment(String comment);
    40 
    -
    41 
    -    void addPropertyChangeListener(PropertyChangeListener listener);
    42 
    -
    43 
    -    void removePropertyChangeListener(PropertyChangeListener listener);
    44 
    -
    45 
    -    void addPropertyChangeListener(String propertyName, PropertyChangeListener listener);
    46 
    -
    47 
    -    void removePropertyChangeListener(String propertyName, PropertyChangeListener listener);
    48 
    -
    49 
    -}

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