Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: e963c308 by tchemit at 2019-01-21T15:04:23Z fix species binding on TripLongline ui - - - - - 4 changed files: - client-core/src/main/java/fr/ird/observe/client/ui/content/data/ll/common/TripLonglineUI.jcss - validation/src/main/i18n/getters/validation-messages.getter - validation/src/main/resources/fr/ird/observe/dto/data/ll/common/TripLonglineDto-create-warning-validation.xml - validation/src/main/resources/fr/ird/observe/dto/data/ll/common/TripLonglineDto-update-warning-validation.xml Changes: ===================================== client-core/src/main/java/fr/ird/observe/client/ui/content/data/ll/common/TripLonglineUI.jcss ===================================== @@ -122,7 +122,6 @@ BigTextEditor { _propertyName: {TripLonglineDto.PROPERTY_START_DATE}; } - #noOfDaysLabel { font-style:italic; } @@ -150,6 +149,7 @@ BigTextEditor { } #species { + bean:{bean}; selected:{bean.getSpecies()}; showListLabel: true; universeLabel:{t("observe.common.TripLonglineDto.species.universe")}; ===================================== validation/src/main/i18n/getters/validation-messages.getter ===================================== @@ -1,103 +1 @@ -observe.validation.activity.duplicated.time -observe.validation.activity.null.dcp -observe.validation.activity.required.observedSystem.for.nonTargetCatch -observe.validation.activityLongline.endDate.after.currentTrip.startDate -observe.validation.activityLongline.endDate.before.currentTrip.endDate -observe.validation.activityLongline.startDate.after.currentTrip.startDate -observe.validation.activityLongline.startDate.before.currentTrip.endDate -observe.validation.catchLongline.required.count.when.acquisitionModeIsGrouped -observe.validation.catchLongline.required.position -observe.validation.field.mandatory -observe.validation.floatingObject.invalid.parts -observe.validation.floatingObject.required.comment.for.balise1 -observe.validation.floatingObject.required.comment.for.balise2 -observe.validation.floatingObject.size.supportVesselName -observe.validation.landingPartLongline.bound.categoryWeight -observe.validation.landingPartLongline.required.weightMeasureMethod -observe.validation.lengthFormula.endDate.before.startDate -observe.validation.lengthLengthParameter.invalid.inputOutputFormula -observe.validation.lengthLengthParameter.invalid.outputInputFormula -observe.validation.lengthLengthParameter.invalid.uniqueKey -observe.validation.lengthWeightParameter.invalid.lengthWeightFormula -observe.validation.lengthWeightParameter.invalid.uniqueKey -observe.validation.lengthWeightParameter.invalid.weightLengthFormula -observe.validation.nonTargetCatch.missing.observedSystem -observe.validation.nonTargetCatch.required.weightOrNombreEstime -observe.validation.nonTargetCatch.required.weightOrTailleMoyen -observe.validation.nonTargetCatch.uniqueKey -observe.validation.nonTargetSample.required.weight.or.taille -observe.validation.objectMaterial.invalid.validation -observe.validation.objectObservedSpecies.positive.count -observe.validation.referential.disabled -observe.validation.referential.label1.untranslated -observe.validation.referential.label3.untranslated -observe.validation.referentiel.bad.parentCode -observe.validation.referentiel.null.uri -observe.validation.referentiel.status.desactivated -observe.validation.referentiel.untranslated.label1 -observe.validation.referentiel.untranslated.label3 -observe.validation.required.haulingEndLatitude -observe.validation.required.haulingEndLongitude -observe.validation.required.haulingStartLatitude -observe.validation.required.haulingStartLongitude -observe.validation.required.latitude -observe.validation.required.longitude -observe.validation.required.quadrant -observe.validation.required.settingEndLatitude -observe.validation.required.settingEndLongitude -observe.validation.route.activityFinDeVeille.notAvailable -observe.validation.route.duplicated.date -observe.validation.route.invalid.date -observe.validation.route.invalid.endLogValue.maximum -observe.validation.route.invalid.endLogValue.minimum -observe.validation.route.invalid.quadrant -observe.validation.route.invalid.startLogValue -observe.validation.route.invalid.time -observe.validation.route.missing.activityFinDeVeille -observe.validation.route.positive.startLogValue -observe.validation.route.unclosed.activity -observe.validation.samplePart.required.sizeMeasureType.for.length -observe.validation.samplePart.required.weightMeasureType.for.weight -observe.validation.schoolEstimate.species.uniqueKey -observe.validation.set.bound.delay -observe.validation.set.delay.too.long -observe.validation.set.endDate.after.endPursingDate -observe.validation.set.endPursingDate.after.date -observe.validation.set.endPursingTimeStamp.after.startTime -observe.validation.set.endSetTimeStamp.after.endPursingTimeStamp -observe.validation.set.size.supportVesselName -observe.validation.set.startTime.after.time -observe.validation.setLongline.baitsComposition.uniqueKey -observe.validation.setLongline.branchlinesComposition.uniqueKey -observe.validation.setLongline.duplicated.homeId -observe.validation.setLongline.duplicated.number -observe.validation.setLongline.floatlinesComposition.uniqueKey -observe.validation.setLongline.haulingStartTimeStamp.before.haulingEndTimeStamp -observe.validation.setLongline.hooksComposition.uniqueKey -observe.validation.setLongline.settingEndTimeStamp.before.haulingStartTimeStamp -observe.validation.setLongline.settingStartTimeStamp.before.settingEndTimeStamp -observe.validation.species.length.bound -observe.validation.species.weight.bound -observe.validation.targetCatch.uniqueKey -observe.validation.targetDiscarded.uniqueKey -observe.validation.targetLength.bound.length -observe.validation.targetLength.bound.weight -observe.validation.targetLength.positive.length -observe.validation.targetLength.positive.weight -observe.validation.targetLength.required.taille -observe.validation.targetLength.required.weight.or.taille -observe.validation.tdr.deployementStart.before.fishingStart -observe.validation.tdr.fishingEnd.before.deployementEnd -observe.validation.tdr.fishingStart.before.fishingEnd -observe.validation.tdr.required.position -observe.validation.trip.endDate.after.now -observe.validation.trip.endDate.after.startDate -observe.validation.trip.invalid.date -observe.validation.trip.invalid.endDate -observe.validation.trip.invalid.formsUrl -observe.validation.trip.invalid.loch -observe.validation.trip.invalid.reportsUrl -observe.validation.trip.invalid.startDate -observe.validation.trip.startDate.after.now observe.validation.tripLongline.unclosed.activity -observe.validation.tripSeine.unclosed.route ===================================== validation/src/main/resources/fr/ird/observe/dto/data/ll/common/TripLonglineDto-create-warning-validation.xml ===================================== @@ -39,4 +39,9 @@ <message/> </field-validator> </field> + <field name="species"> + <field-validator type="collectionNotFilled" short-circuit="true"> + <message/> + </field-validator> + </field> </validators> ===================================== validation/src/main/resources/fr/ird/observe/dto/data/ll/common/TripLonglineDto-update-warning-validation.xml ===================================== @@ -49,4 +49,9 @@ <message/> </field-validator> </field> + <field name="species"> + <field-validator type="collectionNotFilled" short-circuit="true"> + <message/> + </field-validator> + </field> </validators> View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/e963c30845fef1c1fe4b86a87cf9... -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/e963c30845fef1c1fe4b86a87cf9... You're receiving this email because of your account on gitlab.com.
participants (1)
-
Tony CHEMIT