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

Commits:

5 changed files:

Changes:

  • core/api/dto-decoration/src/main/i18n/getters/labels.getter
    ... ... @@ -1142,6 +1142,8 @@ observe.data.ps.observation.SampleMeasure.action.save
    1142 1142
     observe.data.ps.observation.SampleMeasure.action.save.tip
    
    1143 1143
     observe.data.ps.observation.SampleMeasure.count
    
    1144 1144
     observe.data.ps.observation.SampleMeasure.count.short
    
    1145
    +observe.data.ps.observation.SampleMeasure.isLengthComputed
    
    1146
    +observe.data.ps.observation.SampleMeasure.isWeightComputed
    
    1145 1147
     observe.data.ps.observation.SampleMeasure.length
    
    1146 1148
     observe.data.ps.observation.SampleMeasure.length.short
    
    1147 1149
     observe.data.ps.observation.SampleMeasure.lengthCountWeight
    

  • core/services/i18n/src/main/i18n/translations/services_en_GB.properties
    ... ... @@ -1364,6 +1364,8 @@ observe.data.ps.observation.SampleMeasure.action.save=Insert this sample measure
    1364 1364
     observe.data.ps.observation.SampleMeasure.action.save.tip=Insert this sample measure
    
    1365 1365
     observe.data.ps.observation.SampleMeasure.count=Count
    
    1366 1366
     observe.data.ps.observation.SampleMeasure.count.short=Count
    
    1367
    +observe.data.ps.observation.SampleMeasure.isLengthComputed=Is length computed?
    
    1368
    +observe.data.ps.observation.SampleMeasure.isWeightComputed=Is weight computed?
    
    1367 1369
     observe.data.ps.observation.SampleMeasure.length=Length
    
    1368 1370
     observe.data.ps.observation.SampleMeasure.length.short=Length
    
    1369 1371
     observe.data.ps.observation.SampleMeasure.length.validation.required=Weight or size must be filled.
    

  • core/services/i18n/src/main/i18n/translations/services_es_ES.properties
    ... ... @@ -1364,6 +1364,8 @@ observe.data.ps.observation.SampleMeasure.action.save=Insertar este muestreo
    1364 1364
     observe.data.ps.observation.SampleMeasure.action.save.tip=Insertar muestreo de fauna asociada
    
    1365 1365
     observe.data.ps.observation.SampleMeasure.count=Grupo de tallas
    
    1366 1366
     observe.data.ps.observation.SampleMeasure.count.short=Grupo de tallas
    
    1367
    +observe.data.ps.observation.SampleMeasure.isLengthComputed=Is length computed? \#TODO
    
    1368
    +observe.data.ps.observation.SampleMeasure.isWeightComputed=Is weight computed? \#TODO
    
    1367 1369
     observe.data.ps.observation.SampleMeasure.length=Talla
    
    1368 1370
     observe.data.ps.observation.SampleMeasure.length.short=Talla
    
    1369 1371
     observe.data.ps.observation.SampleMeasure.length.validation.required=TODO
    

  • core/services/i18n/src/main/i18n/translations/services_fr_FR.properties
    ... ... @@ -1364,6 +1364,8 @@ observe.data.ps.observation.SampleMeasure.action.save=Insérer cet échantillon
    1364 1364
     observe.data.ps.observation.SampleMeasure.action.save.tip=Insérer cet échantillon
    
    1365 1365
     observe.data.ps.observation.SampleMeasure.count=Effectif
    
    1366 1366
     observe.data.ps.observation.SampleMeasure.count.short=Effectif
    
    1367
    +observe.data.ps.observation.SampleMeasure.isLengthComputed=La taille est-elle calculée ?
    
    1368
    +observe.data.ps.observation.SampleMeasure.isWeightComputed=Le poids est-il calculé ?
    
    1367 1369
     observe.data.ps.observation.SampleMeasure.length=Longueur
    
    1368 1370
     observe.data.ps.observation.SampleMeasure.length.short=Longueur
    
    1369 1371
     observe.data.ps.observation.SampleMeasure.length.validation.required=Au moins une des valeurs (taille / poids) doit être renseignée.
    

  • model/src/main/models/Observe/dto/class/i18nLabels.properties
    ... ... @@ -91,7 +91,7 @@ data.ps.observation.ObjectObservedSpecies=count,species,speciesStatus
    91 91
     data.ps.observation.ObjectSchoolEstimate=species,totalWeight,weightMeasureMethod
    
    92 92
     data.ps.observation.Route=activity,comment,date,endLogValue,startLogValue,choice.create.fin.veille.activity,choice.not.create.fin.veille.activity.and.continue,message.need.fin.veille.activity,action.move.all,action.move.all.choose.parent.message,action.move.all.choose.parent.title
    
    93 93
     data.ps.observation.Sample=species,sampleMeasure,speciesFate,length.computed.tip,length.observed.tip,message.cantAdd,weight.computed.tip,weight.observed.tip
    
    94
    -data.ps.observation.SampleMeasure=comment,count,length,lengthMeasureMethod,picturesReferences,sex,sizeMeasureType,species,speciesFate,tagNumber,weight,weightMeasureMethod,weightMeasureType,type,lengthCountWeight,picturesReferencesTagNumber
    
    94
    +data.ps.observation.SampleMeasure=comment,count,length,lengthMeasureMethod,picturesReferences,sex,sizeMeasureType,species,speciesFate,tagNumber,weight,weightMeasureMethod,weightMeasureType,type,lengthCountWeight,picturesReferencesTagNumber,isWeightComputed,isLengthComputed
    
    95 95
     data.ps.observation.SchoolEstimate=meanWeight,species,totalWeight,weightMeasureMethod
    
    96 96
     data.ps.observation.Set=currentDirection,currentMeasureDepth,currentSpeed,endDate,endTime,endTimeStamp,haulingEndTimeStamp,haulingStartTimeStamp,maxGearDepth,reasonForNullSet,schoolMeanDepth,schoolThickness,schoolTopDepth,schoolType,startTime,supportVesselName,generalTab,measurementsTab,message.information.schoolType,schoolType.not.fill,sonarUsedAvantSet
    
    97 97
     data.ps.observation.SpeciesFateDiscardMode=label,nullValue,falseValue,trueValue