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

Commits:

4 changed files:

Changes:

  • client-core/src/main/java/fr/ird/observe/client/ui/content/data/ll/common/TripLonglineUI.jcss
    ... ... @@ -122,7 +122,6 @@ BigTextEditor {
    122 122
       _propertyName: {TripLonglineDto.PROPERTY_START_DATE};
    
    123 123
     }
    
    124 124
     
    
    125
    -
    
    126 125
     #noOfDaysLabel {
    
    127 126
       font-style:italic;
    
    128 127
     }
    
    ... ... @@ -150,6 +149,7 @@ BigTextEditor {
    150 149
     }
    
    151 150
     
    
    152 151
     #species {
    
    152
    +  bean:{bean};
    
    153 153
       selected:{bean.getSpecies()};
    
    154 154
       showListLabel: true;
    
    155 155
       universeLabel:{t("observe.common.TripLonglineDto.species.universe")};
    

  • validation/src/main/i18n/getters/validation-messages.getter
    1
    -observe.validation.activity.duplicated.time
    
    2
    -observe.validation.activity.null.dcp
    
    3
    -observe.validation.activity.required.observedSystem.for.nonTargetCatch
    
    4
    -observe.validation.activityLongline.endDate.after.currentTrip.startDate
    
    5
    -observe.validation.activityLongline.endDate.before.currentTrip.endDate
    
    6
    -observe.validation.activityLongline.startDate.after.currentTrip.startDate
    
    7
    -observe.validation.activityLongline.startDate.before.currentTrip.endDate
    
    8
    -observe.validation.catchLongline.required.count.when.acquisitionModeIsGrouped
    
    9
    -observe.validation.catchLongline.required.position
    
    10
    -observe.validation.field.mandatory
    
    11
    -observe.validation.floatingObject.invalid.parts
    
    12
    -observe.validation.floatingObject.required.comment.for.balise1
    
    13
    -observe.validation.floatingObject.required.comment.for.balise2
    
    14
    -observe.validation.floatingObject.size.supportVesselName
    
    15
    -observe.validation.landingPartLongline.bound.categoryWeight
    
    16
    -observe.validation.landingPartLongline.required.weightMeasureMethod
    
    17
    -observe.validation.lengthFormula.endDate.before.startDate
    
    18
    -observe.validation.lengthLengthParameter.invalid.inputOutputFormula
    
    19
    -observe.validation.lengthLengthParameter.invalid.outputInputFormula
    
    20
    -observe.validation.lengthLengthParameter.invalid.uniqueKey
    
    21
    -observe.validation.lengthWeightParameter.invalid.lengthWeightFormula
    
    22
    -observe.validation.lengthWeightParameter.invalid.uniqueKey
    
    23
    -observe.validation.lengthWeightParameter.invalid.weightLengthFormula
    
    24
    -observe.validation.nonTargetCatch.missing.observedSystem
    
    25
    -observe.validation.nonTargetCatch.required.weightOrNombreEstime
    
    26
    -observe.validation.nonTargetCatch.required.weightOrTailleMoyen
    
    27
    -observe.validation.nonTargetCatch.uniqueKey
    
    28
    -observe.validation.nonTargetSample.required.weight.or.taille
    
    29
    -observe.validation.objectMaterial.invalid.validation
    
    30
    -observe.validation.objectObservedSpecies.positive.count
    
    31
    -observe.validation.referential.disabled
    
    32
    -observe.validation.referential.label1.untranslated
    
    33
    -observe.validation.referential.label3.untranslated
    
    34
    -observe.validation.referentiel.bad.parentCode
    
    35
    -observe.validation.referentiel.null.uri
    
    36
    -observe.validation.referentiel.status.desactivated
    
    37
    -observe.validation.referentiel.untranslated.label1
    
    38
    -observe.validation.referentiel.untranslated.label3
    
    39
    -observe.validation.required.haulingEndLatitude
    
    40
    -observe.validation.required.haulingEndLongitude
    
    41
    -observe.validation.required.haulingStartLatitude
    
    42
    -observe.validation.required.haulingStartLongitude
    
    43
    -observe.validation.required.latitude
    
    44
    -observe.validation.required.longitude
    
    45
    -observe.validation.required.quadrant
    
    46
    -observe.validation.required.settingEndLatitude
    
    47
    -observe.validation.required.settingEndLongitude
    
    48
    -observe.validation.route.activityFinDeVeille.notAvailable
    
    49
    -observe.validation.route.duplicated.date
    
    50
    -observe.validation.route.invalid.date
    
    51
    -observe.validation.route.invalid.endLogValue.maximum
    
    52
    -observe.validation.route.invalid.endLogValue.minimum
    
    53
    -observe.validation.route.invalid.quadrant
    
    54
    -observe.validation.route.invalid.startLogValue
    
    55
    -observe.validation.route.invalid.time
    
    56
    -observe.validation.route.missing.activityFinDeVeille
    
    57
    -observe.validation.route.positive.startLogValue
    
    58
    -observe.validation.route.unclosed.activity
    
    59
    -observe.validation.samplePart.required.sizeMeasureType.for.length
    
    60
    -observe.validation.samplePart.required.weightMeasureType.for.weight
    
    61
    -observe.validation.schoolEstimate.species.uniqueKey
    
    62
    -observe.validation.set.bound.delay
    
    63
    -observe.validation.set.delay.too.long
    
    64
    -observe.validation.set.endDate.after.endPursingDate
    
    65
    -observe.validation.set.endPursingDate.after.date
    
    66
    -observe.validation.set.endPursingTimeStamp.after.startTime
    
    67
    -observe.validation.set.endSetTimeStamp.after.endPursingTimeStamp
    
    68
    -observe.validation.set.size.supportVesselName
    
    69
    -observe.validation.set.startTime.after.time
    
    70
    -observe.validation.setLongline.baitsComposition.uniqueKey
    
    71
    -observe.validation.setLongline.branchlinesComposition.uniqueKey
    
    72
    -observe.validation.setLongline.duplicated.homeId
    
    73
    -observe.validation.setLongline.duplicated.number
    
    74
    -observe.validation.setLongline.floatlinesComposition.uniqueKey
    
    75
    -observe.validation.setLongline.haulingStartTimeStamp.before.haulingEndTimeStamp
    
    76
    -observe.validation.setLongline.hooksComposition.uniqueKey
    
    77
    -observe.validation.setLongline.settingEndTimeStamp.before.haulingStartTimeStamp
    
    78
    -observe.validation.setLongline.settingStartTimeStamp.before.settingEndTimeStamp
    
    79
    -observe.validation.species.length.bound
    
    80
    -observe.validation.species.weight.bound
    
    81
    -observe.validation.targetCatch.uniqueKey
    
    82
    -observe.validation.targetDiscarded.uniqueKey
    
    83
    -observe.validation.targetLength.bound.length
    
    84
    -observe.validation.targetLength.bound.weight
    
    85
    -observe.validation.targetLength.positive.length
    
    86
    -observe.validation.targetLength.positive.weight
    
    87
    -observe.validation.targetLength.required.taille
    
    88
    -observe.validation.targetLength.required.weight.or.taille
    
    89
    -observe.validation.tdr.deployementStart.before.fishingStart
    
    90
    -observe.validation.tdr.fishingEnd.before.deployementEnd
    
    91
    -observe.validation.tdr.fishingStart.before.fishingEnd
    
    92
    -observe.validation.tdr.required.position
    
    93
    -observe.validation.trip.endDate.after.now
    
    94
    -observe.validation.trip.endDate.after.startDate
    
    95
    -observe.validation.trip.invalid.date
    
    96
    -observe.validation.trip.invalid.endDate
    
    97
    -observe.validation.trip.invalid.formsUrl
    
    98
    -observe.validation.trip.invalid.loch
    
    99
    -observe.validation.trip.invalid.reportsUrl
    
    100
    -observe.validation.trip.invalid.startDate
    
    101
    -observe.validation.trip.startDate.after.now
    
    102 1
     observe.validation.tripLongline.unclosed.activity
    103
    -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 @@
    39 39
           <message/>
    
    40 40
         </field-validator>
    
    41 41
       </field>
    
    42
    +  <field name="species">
    
    43
    +    <field-validator type="collectionNotFilled" short-circuit="true">
    
    44
    +      <message/>
    
    45
    +    </field-validator>
    
    46
    +  </field>
    
    42 47
     </validators>

  • validation/src/main/resources/fr/ird/observe/dto/data/ll/common/TripLonglineDto-update-warning-validation.xml
    ... ... @@ -49,4 +49,9 @@
    49 49
           <message/>
    
    50 50
         </field-validator>
    
    51 51
       </field>
    
    52
    +  <field name="species">
    
    53
    +    <field-validator type="collectionNotFilled" short-circuit="true">
    
    54
    +      <message/>
    
    55
    +    </field-validator>
    
    56
    +  </field>
    
    52 57
     </validators>