Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: dc340121 by Tony Chemit at 2021-01-01T11:14:06+01:00 Validateur needcomment récalcitrant - Closes #1714 - - - - - 18 changed files: - client/i18n/src/main/i18n/translations/observe_en_GB.properties - client/i18n/src/main/i18n/translations/observe_es_ES.properties - client/i18n/src/main/i18n/translations/observe_fr_FR.properties - models/dto/src/main/models/Observe-00-common.model - models/dto/src/main/models/Observe-01-referential-common.model - models/dto/src/main/models/Observe-20-data-ps-observation.model - models/dto/src/main/models/Observe-25-data-ps.model - models/dto/src/main/models/Observe-30-data-ll-observation.model - models/dto/src/main/models/Observe-31-data-ll-logbook.model - models/dto/src/main/models/Observe-32-data-ll-landing.model - models/dto/src/main/models/Observe-35-data-ll.model - services/i18n/src/main/i18n/translations/services_en_GB.properties - services/i18n/src/main/i18n/translations/services_es_ES.properties - services/i18n/src/main/i18n/translations/services_fr_FR.properties - services/validation/src/main/i18n/getters/validation-fields.getter - services/validation/src/main/resources/fr/ird/observe/dto/data/ll/common/TripDto-create-error-validation.xml - services/validation/src/main/resources/fr/ird/observe/dto/data/ll/common/TripDto-update-error-validation.xml - − toolkit/dto/src/main/java/fr/ird/observe/dto/WithComment.java 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 observe.data.ll.common.Trip.associatedFishingOperationCount=Number of fishing operations matched observe.data.ll.common.Trip.availableData=Available data observe.data.ll.common.Trip.ersId=Id ERS -observe.data.ll.common.Trip.generalComment=Comment observe.data.ll.common.Trip.generalTab=Common characteristics observe.data.ll.common.Trip.list.message.none=No trip for current program observe.data.ll.common.Trip.list.navigation.node=Trip observe.data.ll.common.Trip.list.title=List of trips observe.data.ll.common.Trip.logbookActivityCount=Number of activities observe.data.ll.common.Trip.logbookAvailability=Logbook and associated data -observe.data.ll.common.Trip.logbookComment=Comment observe.data.ll.common.Trip.logbookFishingOperationCount=Number of fishing operations observe.data.ll.common.Trip.logbookTab=Logbook and associated data observe.data.ll.common.Trip.mapTab=Map @@ -391,7 +389,6 @@ observe.data.ll.common.Trip.noOfCrewMembers=Number of crew observe.data.ll.common.Trip.noOfDays=Duration (days) observe.data.ll.common.Trip.observationsActivityCount=Number of activities observe.data.ll.common.Trip.observationsAvailability=Observations -observe.data.ll.common.Trip.observationsComment=Comment observe.data.ll.common.Trip.observationsFishingOperationCount=Number of fishing operations observe.data.ll.common.Trip.observationsTab=Observations 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 observe.data.ll.common.Trip.associatedFishingOperationCount=Número de operaciones de pesca coincidentes observe.data.ll.common.Trip.availableData=Données disponibles observe.data.ll.common.Trip.ersId=Id ERS -observe.data.ll.common.Trip.generalComment=Comentarios observe.data.ll.common.Trip.generalTab=General características observe.data.ll.common.Trip.list.message.none=Ninguna marea para el programa actual observe.data.ll.common.Trip.list.navigation.node=Marea observe.data.ll.common.Trip.list.title=List of trips observe.data.ll.common.Trip.logbookActivityCount=Número de actividades observe.data.ll.common.Trip.logbookAvailability=Diario de pesca y datos asociados -observe.data.ll.common.Trip.logbookComment=Comentarios observe.data.ll.common.Trip.logbookFishingOperationCount=Número de operaciones de pesca observe.data.ll.common.Trip.logbookTab=Diario de pesca y datos asociados observe.data.ll.common.Trip.mapTab=Mapa @@ -391,7 +389,6 @@ observe.data.ll.common.Trip.noOfCrewMembers=Nombre d'équipage observe.data.ll.common.Trip.noOfDays=Duración (días) observe.data.ll.common.Trip.observationsActivityCount=Número de actividades observe.data.ll.common.Trip.observationsAvailability=Observaciones -observe.data.ll.common.Trip.observationsComment=Comentarios observe.data.ll.common.Trip.observationsFishingOperationCount=Número de operaciones de pesca observe.data.ll.common.Trip.observationsTab=Observaciones 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 observe.data.ll.common.Trip.associatedFishingOperationCount=Nombre d'opérations de pêche associées observe.data.ll.common.Trip.availableData=Données disponibles observe.data.ll.common.Trip.ersId=Id ERS -observe.data.ll.common.Trip.generalComment=Commentaire observe.data.ll.common.Trip.generalTab=Caractéristiques communes observe.data.ll.common.Trip.list.message.none=Aucune marée pour le programme courant observe.data.ll.common.Trip.list.navigation.node=Marée observe.data.ll.common.Trip.list.title=Liste de marées observe.data.ll.common.Trip.logbookActivityCount=Nombres d'activités observe.data.ll.common.Trip.logbookAvailability=Livre de bord et données associées -observe.data.ll.common.Trip.logbookComment=Commentaire observe.data.ll.common.Trip.logbookFishingOperationCount=Nombre d'opérations de pêche observe.data.ll.common.Trip.logbookTab=Livre de bord et données associées observe.data.ll.common.Trip.mapTab=Carte @@ -391,7 +389,6 @@ observe.data.ll.common.Trip.noOfCrewMembers=Nombre d'équipage observe.data.ll.common.Trip.noOfDays=Durée (jours) observe.data.ll.common.Trip.observationsActivityCount=Nombres d'activités observe.data.ll.common.Trip.observationsAvailability=Données d'observation -observe.data.ll.common.Trip.observationsComment=Commentaire observe.data.ll.common.Trip.observationsFishingOperationCount=Nombre d'opérations de pêche observe.data.ll.common.Trip.observationsTab=Données d'observation 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 interface DtoParentAware > DtoAndReferenceAware -interface WithComment -getComment() String -setComment(comment String) - interface reference.DataReference > fr.ird.observe.dto.ObserveDto interface reference.ReferentialReference > fr.ird.observe.dto.ObserveDto @@ -40,14 +36,13 @@ lastUpdateDate + {*:1} Date abstract data.Data > Id | skip homeId + {*:1} String -abstract data.Commentable > data.Data >> WithComment -comment + {*:1} String - -abstract data.Openable > data.Commentable +abstract data.Openable > data.Data -abstract data.Editable > data.Commentable +abstract data.Editable > data.Data +comment + {*:1} String -abstract data.Simple > data.Commentable +abstract data.Simple > data.Data +comment + {*:1} String data.DataFile >> ObserveDto | skip content + {*:1} !byte[] ===================================== models/dto/src/main/models/Observe-01-referential-common.model ===================================== @@ -94,7 +94,7 @@ dataEntryOperator + {*:1} boolean dataSource + {*:1} boolean country {*:0..1} fr.ird.observe.dto.referential.common.CountryReference | notNull -referential.common.Program > referential.I18nReferential >> WithComment WithStartEndDate | references=code,label,uri,gearType,gearTypePrefix,tripCount,startDate,endDate NavigationEntryPoint +referential.common.Program > referential.I18nReferential >> WithStartEndDate | references=code,label,uri,gearType,gearTypePrefix,tripCount,startDate,endDate NavigationEntryPoint nonTargetObservation + {*:1} int targetDiscardsObservation + {*:1} int 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 interface data.ps.observation.TargetSampleAware data.ps.observation.Activity > data.Openable >> data.ActivityAware | references=time,latitude,longitude,vesselActivity,set comparator=time navigationParent=data.ps.observation.Route +comment + {*:1} String time + {*:1} Date | notNull latitude + {*:1} Float | notNull longitude + {*:1} Float | notNull @@ -56,7 +57,8 @@ objectMaterial {*:1} fr.ird.observe.dto.referential.ps.common.ObjectMaterialRefe data.ps.observation.FloatingObjectSchoolEstimate > data.Simple | form=data.ps.observation.ObjectSchoolEstimate mainDto=data.ps.observation.FloatingObject objectSchoolEstimate {*} data.ps.observation.ObjectSchoolEstimate -data.ps.observation.NonTargetCatch > data.Commentable | references=speciesLabel,speciesFateLabel +data.ps.observation.NonTargetCatch > data.Data | references=speciesLabel,speciesFateLabel +comment + {*:1} String catchWeight + {*:1} Float | positiveNumber catchWeightComputedSource + {*:1} !fr.ird.observe.dto.data.ps.NonTargetCatchComputedValueSource meanWeight + {*:1} Float | positiveNumber @@ -74,7 +76,8 @@ species {*:1} fr.ird.observe.dto.referential.common.SpeciesReference | notNull weightMeasureMethod {*:0..1} fr.ird.observe.dto.referential.common.WeightMeasureMethodReference lengthMeasureMethod {*:0..1} fr.ird.observe.dto.referential.common.LengthMeasureMethodReference -data.ps.observation.NonTargetCatchRelease > data.Commentable | references=speciesLabel,speciesGroupReleaseModeLabel,statusLabel,conformityLabel,releasingTimeLabel,length +data.ps.observation.NonTargetCatchRelease > data.Data | references=speciesLabel,speciesGroupReleaseModeLabel,statusLabel,conformityLabel,releasingTimeLabel,length +comment + {*:1} String length + {*:1} Float | positiveNumber count + {*:1} Integer | notNull strictlyPositiveNumber acquisitionMode + {*:1} int @@ -119,6 +122,7 @@ species {*:1} fr.ird.observe.dto.referential.common.SpeciesReference | notNull weightMeasureMethod {*:0..1} fr.ird.observe.dto.referential.common.WeightMeasureMethodReference data.ps.observation.Route > data.Openable | references=date,comment comparator=date navigationParent=data.ps.common.Trip +comment + {*:1} String date + {*:1} Date | notNull startLogValue + {*:1} Float | positiveNumber endLogValue + {*:1} Float | positiveNumber @@ -176,10 +180,12 @@ data.ps.observation.SetDiscardedTargetCatch > data.Simple | form=data.ps.observa targetDiscardCatchCompositionEstimatedByObserver + {*:1} boolean targetCatch {*} data.ps.observation.DiscardedTargetCatch | ordered -data.ps.observation.TargetCatch > data.Commentable | references=well +data.ps.observation.TargetCatch > data.Data | references=well +comment + {*:1} String well + {*:1} String -data.ps.observation.KeptTargetCatch > data.Commentable | references=speciesLabel,well,catchWeight mainDto=data.ps.observation.TargetCatch +data.ps.observation.KeptTargetCatch > data.Data | references=speciesLabel,well,catchWeight mainDto=data.ps.observation.TargetCatch +comment + {*:1} String catchWeight + {*:1} Float | notNull positiveNumber hasSample + {*:1} boolean well + {*:1} String @@ -187,7 +193,8 @@ weightCategory {*:1} fr.ird.observe.dto.referential.ps.observation.WeightCategor species {*:1} fr.ird.observe.dto.referential.common.SpeciesReference | notNull weightMeasureMethod {*:0..1} fr.ird.observe.dto.referential.common.WeightMeasureMethodReference -data.ps.observation.DiscardedTargetCatch > data.Commentable | references=speciesLabel,catchWeight mainDto=data.ps.observation.TargetCatch +data.ps.observation.DiscardedTargetCatch > data.Data | references=speciesLabel,catchWeight mainDto=data.ps.observation.TargetCatch +comment + {*:1} String catchWeight + {*:1} Float | notNull positiveNumber hasSample + {*:1} boolean broughtOnDeck + {*:1} Boolean @@ -229,7 +236,8 @@ discarded + {*:1} Boolean targetLength + {*} data.ps.observation.TargetLength | ordered availableSpeciesIds + {*} String | unique -data.ps.observation.TransmittingBuoy > data.Commentable | references=code,comment,transmittingBuoyTypeLabel,transmittingBuoyOperationLabel +data.ps.observation.TransmittingBuoy > data.Data | references=code,comment,transmittingBuoyTypeLabel,transmittingBuoyOperationLabel +comment + {*:1} String code + {*:1} String | mayNotNull transmittingBuoyOwnership + {*:1} fr.ird.observe.dto.referential.ps.common.TransmittingBuoyOwnershipReference transmittingBuoyType {*:1} fr.ird.observe.dto.referential.ps.common.TransmittingBuoyTypeReference | notNull ===================================== models/dto/src/main/models/Observe-25-data-ps.model ===================================== @@ -1,6 +1,7 @@ package fr.ird.observe.dto.data.ps.common | form=self packagePriority=25 -data.ps.common.GearUseFeatures > data.Commentable | references=gearLabel,number,usedInTrip +data.ps.common.GearUseFeatures > data.Data | references=gearLabel,number,usedInTrip +comment + {*:1} String number + {*:1} Integer | notNull positiveNumber usedInTrip + {*:1} Boolean gearUseFeaturesMeasurement + {*} data.ps.common.GearUseFeaturesMeasurement | ordered @@ -11,6 +12,7 @@ measurementValue + {*:1} String gearCharacteristic {*:1} fr.ird.observe.dto.referential.common.GearCharacteristicReference data.ps.common.Trip > data.Openable >> data.TripAware | references=startDate,endDate,program,routeSize,vessel,observerLabel comparator=startDate navigationParent=referential.common.Program +comment + {*:1} String startDate + {*:1} Date | notNull endDate + {*:1} Date | notNull checkLevel + {*:1} int ===================================== models/dto/src/main/models/Observe-30-data-ll-observation.model ===================================== @@ -4,7 +4,8 @@ interface data.ll.observation.LonglineElementAware > DtoParentAware interface data.ll.observation.LonglinePositionAware -abstract data.ll.observation.LonglinePosition > data.Commentable >> data.ll.observation.LonglinePositionAware +abstract data.ll.observation.LonglinePosition > data.Data >> data.ll.observation.LonglinePositionAware +comment + {*:1} String section {*:0..1} fr.ird.observe.dto.data.ll.observation.SectionReference basket {*:0..1} fr.ird.observe.dto.data.ll.observation.BasketReference branchline {*:0..1} fr.ird.observe.dto.data.ll.observation.BranchlineReference @@ -17,6 +18,7 @@ baskets {*:*} fr.ird.observe.dto.data.ll.observation.BasketReference branchlines {*:*} fr.ird.observe.dto.data.ll.observation.BranchlineReference data.ll.observation.Activity > data.Openable >> data.ActivityAware | references=timeStamp,latitude,longitude,vesselActivity,set comparator=timeStamp navigationParent=data.ll.common.Trip +comment + {*:1} String timeStamp + {*:1} Date latitude + {*:1} Float | notNull 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 weightMeasureMethod {*:0..1} fr.ird.observe.dto.referential.common.WeightMeasureMethodReference data.ll.logbook.Sample > data.Openable | references=timeStamp,latitude,longitude comparator=timeStamp EditableService=ActivitySampleService navigationParent=data.ll.common.Trip navigationExtraParent=data.ll.logbook.Activity +comment + {*:1} String timeStamp + {*:1} Date | notNull latitude + {*:1} Float longitude + {*:1} Float @@ -21,6 +22,7 @@ quadrant + {*:1} Integer samplePart + {*} fr.ird.observe.dto.data.ll.logbook.SamplePartDto | ordered data.ll.logbook.Activity > data.Openable >> data.ActivityAware | references=startTimeStamp,endTimeStamp,latitude,longitude,vesselActivity,set,sample,relatedObservedActivity comparator=startTimeStamp navigationParent=data.ll.common.Trip +comment + {*:1} String startTimeStamp + {*:1} Date | notNull endTimeStamp + {*:1} Date | mayNotNull latitude + {*:1} Float | mayNotNull @@ -128,7 +130,8 @@ hookOffset + {*:1} Integer | positiveNumber hookType {*:1} fr.ird.observe.dto.referential.ll.common.HookTypeReference | notNull hookSize {*:1} fr.ird.observe.dto.referential.ll.common.HookSizeReference -data.ll.logbook.Catch > data.Commentable | references=homeId +data.ll.logbook.Catch > data.Data | references=homeId +comment + {*:1} String count + {*:1} Integer | positiveNumber totalWeight + {*:1} Float | positiveNumber 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 dataQuality {*:0..1} fr.ird.observe.dto.referential.common.DataQualityReference data.ll.landing.Landing > data.Openable | references=startDate,harbourLabel,vesselLabel comparator=startDate navigationParent=data.ll.common.Trip +comment + {*:1} String startDate + {*:1} Date endDate + {*:1} Date dataSource {*:1} fr.ird.observe.dto.referential.ll.landing.DataSourceReference ===================================== models/dto/src/main/models/Observe-35-data-ll.model ===================================== @@ -1,6 +1,7 @@ package fr.ird.observe.dto.data.ll.common | form=self packagePriority=35 -data.ll.common.GearUseFeatures > data.Commentable | references=gearLabel,number,usedInTrip +data.ll.common.GearUseFeatures > data.Data | references=gearLabel,number,usedInTrip +comment + {*:1} String number + {*:1} Integer | notNull positiveNumber usedInTrip + {*:1} Boolean 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 observe.data.ll.common.GearUseFeaturesMeasurement.gearCharacteristic=Gear caracteristic observe.data.ll.common.GearUseFeaturesMeasurement.type=Measurement type observe.data.ll.common.Trip.activityObs=Activity +observe.data.ll.common.Trip.generalComment=General comment +observe.data.ll.common.Trip.logbookComment=Logbook comment observe.data.ll.common.Trip.logbookDataEntryOperator=Data entry operator observe.data.ll.common.Trip.logbookDataQuality=Data quality observe.data.ll.common.Trip.observationMethod=Observations method +observe.data.ll.common.Trip.observationsComment=Observations comment observe.data.ll.common.Trip.observationsDataEntryOperator=Data entry operator observe.data.ll.common.Trip.observationsDataQuality=Data quality 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 observe.data.ll.common.GearUseFeaturesMeasurement.gearCharacteristic=Característica observe.data.ll.common.GearUseFeaturesMeasurement.type=Tipo observe.data.ll.common.Trip.activityObs=Actividad +observe.data.ll.common.Trip.generalComment=General Comentarios +observe.data.ll.common.Trip.logbookComment=Logbook Comentarios observe.data.ll.common.Trip.logbookDataEntryOperator=Operador de captación de datos observe.data.ll.common.Trip.logbookDataQuality=Qualité de donnée \#TODO observe.data.ll.common.Trip.observationMethod=Observations method \#TODO +observe.data.ll.common.Trip.observationsComment=Observations Comentarios observe.data.ll.common.Trip.observationsDataEntryOperator=Operador de captación de datos observe.data.ll.common.Trip.observationsDataQuality=Qualité de donnée \#TODO 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 observe.data.ll.common.GearUseFeaturesMeasurement.gearCharacteristic=Caractéristique observe.data.ll.common.GearUseFeaturesMeasurement.type=Type de mesure observe.data.ll.common.Trip.activityObs=Activité +observe.data.ll.common.Trip.generalComment=Commentaire générale +observe.data.ll.common.Trip.logbookComment=Commentaire Livre de bord observe.data.ll.common.Trip.logbookDataEntryOperator=Opérateur de saisie observe.data.ll.common.Trip.logbookDataQuality=Qualité de donnée observe.data.ll.common.Trip.observationMethod=Méthode d'observations +observe.data.ll.common.Trip.observationsComment=Commentaire Observations observe.data.ll.common.Trip.observationsDataEntryOperator=Opérateur de saisie observe.data.ll.common.Trip.observationsDataQuality=Qualité de donnée 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 observe.data.ll.common.GearUseFeatures.number observe.data.ll.common.GearUseFeaturesMeasurement.gearCharacteristic observe.data.ll.common.Trip.activityObs +observe.data.ll.common.Trip.generalComment +observe.data.ll.common.Trip.logbookComment observe.data.ll.common.Trip.logbookDataEntryOperator observe.data.ll.common.Trip.logbookDataQuality observe.data.ll.common.Trip.observationMethod +observe.data.ll.common.Trip.observationsComment observe.data.ll.common.Trip.observationsDataEntryOperator observe.data.ll.common.Trip.observationsDataQuality 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 @@ <message/> </field-validator> </field> + <field name="generalComment"> + <!-- comment length --> + <field-validator type="commentLengthFieldDto"> + <message/> + </field-validator> + <!-- comment needed from one of the selected referential --> + <field-validator type="commentNeeded" short-circuit="true"> + <param name="propertyNames">captain,departureHarbour,landingHarbour,ocean,program,species,tripType,vessel</param> + <message/> + </field-validator> + </field> + <field name="observationsComment"> + <!-- comment length --> + <field-validator type="commentLengthFieldDto"> + <message/> + </field-validator> + <!-- comment needed from one of the selected referential --> + <field-validator type="commentNeeded" short-circuit="true"> + <param name="propertyNames">observationMethod,observationsDataEntryOperator,observationsDataQuality,observer</param> + <message/> + </field-validator> + </field> + <field name="logbookComment"> + <!-- comment length --> + <field-validator type="commentLengthFieldDto"> + <message/> + </field-validator> + <!-- comment needed from one of the selected referential --> + <field-validator type="commentNeeded" short-circuit="true"> + <param name="propertyNames">logbookDataEntryOperator,logbookDataQuality</param> + <message/> + </field-validator> + </field> </validators> ===================================== services/validation/src/main/resources/fr/ird/observe/dto/data/ll/common/TripDto-update-error-validation.xml ===================================== @@ -105,4 +105,37 @@ <message/> </field-validator> </field> + <field name="generalComment"> + <!-- comment length --> + <field-validator type="commentLengthFieldDto"> + <message/> + </field-validator> + <!-- comment needed from one of the selected referential --> + <field-validator type="commentNeeded" short-circuit="true"> + <param name="propertyNames">captain,departureHarbour,landingHarbour,ocean,program,species,tripType,vessel</param> + <message/> + </field-validator> + </field> + <field name="observationsComment"> + <!-- comment length --> + <field-validator type="commentLengthFieldDto"> + <message/> + </field-validator> + <!-- comment needed from one of the selected referential --> + <field-validator type="commentNeeded" short-circuit="true"> + <param name="propertyNames">observationMethod,observationsDataEntryOperator,observationsDataQuality,observer</param> + <message/> + </field-validator> + </field> + <field name="logbookComment"> + <!-- comment length --> + <field-validator type="commentLengthFieldDto"> + <message/> + </field-validator> + <!-- comment needed from one of the selected referential --> + <field-validator type="commentNeeded" short-circuit="true"> + <param name="propertyNames">logbookDataEntryOperator,logbookDataQuality</param> + <message/> + </field-validator> + </field> </validators> ===================================== toolkit/dto/src/main/java/fr/ird/observe/dto/WithComment.java deleted ===================================== @@ -1,49 +0,0 @@ -package fr.ird.observe.dto; - -/*- - * #%L - * ObServe Toolkit :: Dto - * %% - * Copyright (C) 2008 - 2020 IRD, Code Lutin, Ultreia.io - * %% - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public - * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-3.0.html>. - * #L% - */ - -import java.beans.PropertyChangeListener; - -/** - * Created on 21/12/16. - * - * @author Tony Chemit - dev@tchemit.fr - * @since 6.0 - */ -public interface WithComment { - - String PROPERTY_COMMENT = "comment"; - - String getComment(); - - void setComment(String comment); - - void addPropertyChangeListener(PropertyChangeListener listener); - - void removePropertyChangeListener(PropertyChangeListener listener); - - void addPropertyChangeListener(String propertyName, PropertyChangeListener listener); - - void removePropertyChangeListener(String propertyName, PropertyChangeListener listener); - -} View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/dc3401215eabecfe1d3e4b9ea8... -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/dc3401215eabecfe1d3e4b9ea8... You're receiving this email because of your account on gitlab.com.