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

Commits:

3 changed files:

Changes:

  • core/api/dto-decoration/src/main/resources/META-INF/i18n/Observe-labels.properties
    ... ... @@ -20,7 +20,7 @@
    20 20
     # #L%
    
    21 21
     ###
    
    22 22
     #Generated by org.nuiton.i18n.plugin.GenerateI18nLabelsMojo
    
    23
    -#Fri Feb 03 18:33:01 CET 2023
    
    23
    +#Sun Feb 12 12:28:43 CET 2023
    
    24 24
     observe.Business.createDate=observe.Common.createDate
    
    25 25
     observe.Business.homeId=observe.Common.homeId
    
    26 26
     observe.Business.id=observe.Common.id
    
    ... ... @@ -1488,6 +1488,8 @@ observe.data.ps.logbook.FloatingObjectPart.id=observe.Common.id
    1488 1488
     observe.data.ps.logbook.FloatingObjectPart.label=observe.Common.label
    
    1489 1489
     observe.data.ps.logbook.FloatingObjectPart.lastUpdateDate=observe.Common.lastUpdateDate
    
    1490 1490
     observe.data.ps.logbook.FloatingObjectPart.version=observe.Common.version
    
    1491
    +observe.data.ps.logbook.FloatingObjectPart.whenArriving=observe.Common.whenArriving
    
    1492
    +observe.data.ps.logbook.FloatingObjectPart.whenLeaving=observe.Common.whenLeaving
    
    1491 1493
     observe.data.ps.logbook.Route.comment=observe.Common.comment
    
    1492 1494
     observe.data.ps.logbook.Route.createDate=observe.Common.createDate
    
    1493 1495
     observe.data.ps.logbook.Route.homeId=observe.Common.homeId
    
    ... ... @@ -1694,6 +1696,8 @@ observe.data.ps.observation.FloatingObjectPart.id=observe.Common.id
    1694 1696
     observe.data.ps.observation.FloatingObjectPart.label=observe.Common.label
    
    1695 1697
     observe.data.ps.observation.FloatingObjectPart.lastUpdateDate=observe.Common.lastUpdateDate
    
    1696 1698
     observe.data.ps.observation.FloatingObjectPart.version=observe.Common.version
    
    1699
    +observe.data.ps.observation.FloatingObjectPart.whenArriving=observe.Common.whenArriving
    
    1700
    +observe.data.ps.observation.FloatingObjectPart.whenLeaving=observe.Common.whenLeaving
    
    1697 1701
     observe.data.ps.observation.NonTargetCatchRelease.comment=observe.Common.comment
    
    1698 1702
     observe.data.ps.observation.NonTargetCatchRelease.comment.short=observe.Common.comment.short
    
    1699 1703
     observe.data.ps.observation.NonTargetCatchRelease.createDate=observe.Common.createDate
    

  • model/src/main/models/Observe/dto/class/i18nLabels.properties
    ... ... @@ -73,6 +73,7 @@ data.ps.logbook.Activity=date,observedSystem.available,observedSystem.selected,c
    73 73
     data.ps.logbook.ActivityStub=date,comment,latitude,longitude,number,quadrant,seaSurfaceTemperature,time,vesselActivity
    
    74 74
     data.ps.logbook.Catch=comment,species,speciesFate,weight,weightCategory,weightMeasureMethod,well,weight.validation.required,weightMeasureMethod.validation.required
    
    75 75
     data.ps.logbook.FloatingObject=materialsValid,objectOperation,quadrant,supportVesselName,country,vessel,computedBiodegradable,computedNonEntangling,computedSimplifiedObjectType,computedValues,generalTab,buoysTab,materialsTab,notComputed,type.short
    
    76
    +data.ps.logbook.FloatingObjectPart=whenArriving,whenLeaving
    
    76 77
     data.ps.logbook.Route=activity,comment,date,fishingTime,timeAtSea
    
    77 78
     data.ps.logbook.Sample=number,activity,bigsWeight,comment,person,sampleQuality,sampleType,smallsWeight,superSample,totalWeight,well,generalTab,activityTab,notSuperSample.with.moreThanOne.sampleSpecies.message,notSuperSample.with.moreThanOne.sampleSpecies.title,personTab,psSampler.available,psSampler.selected
    
    78 79
     data.ps.logbook.SampleActivity=activity,weightedWeight
    
    ... ... @@ -86,6 +87,7 @@ data.ps.logbook.WellActivitySpecies=species,weight,weightCategory,count,setSpeci
    86 87
     data.ps.observation.Activity=date,coordinate,observedSystem.available,observedSystem.selected,comment,comment2,currentFpaZone,dataQuality,detectionMode,ersId,floatingObjectEmpty,latitude,longitude,nextFpaZone,nonTargetCatchSpecies,observedSystem,observedSystemDistance,previousFpaZone,quadrant,reasonForNoFishing,seaSurfaceTemperature,surroundingActivity,time,vesselActivity,vesselSpeed,wind,generalTab,error.no.activity.6,measurementsTab,observedSystemTab
    
    87 88
     data.ps.observation.Catch=catchWeight,catchWeightTotalCount,meanWeightMeanLength,comment,informationSource,sizeMeasureMethod,meanLength,minWeight,maxWeight,meanWeight,minMaxWeight,reasonForDiscard,species,speciesFate,totalCount,weightMeasureMethod,well,catchWeightComputed.computed.tip,catchWeightComputed.observed.tip,meanLengthComputed.computed.tip,meanLengthComputed.observed.tip,meanWeightComputed.computed.tip,meanWeightComputed.observed.tip,totalCountComputed.computed.tip,totalCountComputed.observed.tip
    
    88 89
     data.ps.observation.FloatingObject=materialsValid,objectOperation,supportVesselName,country,vessel,computedBiodegradable,computedNonEntangling,computedSimplifiedObjectType,computedValues,generalTab,buoysTab,materialsTab,notComputed,type.short
    
    90
    +data.ps.observation.FloatingObjectPart=whenArriving,whenLeaving
    
    89 91
     data.ps.observation.NonTargetCatchRelease=comment,conformity,count,length,sizeMeasureMethod,releasingTime,sex,status,species,speciesGroupReleaseMode,message.cantAdd
    
    90 92
     data.ps.observation.ObjectObservedSpecies=count,species,speciesStatus
    
    91 93
     data.ps.observation.ObjectSchoolEstimate=species,totalWeight,weightMeasureMethod
    

  • pom.xml
    ... ... @@ -23,7 +23,7 @@
    23 23
       <parent>
    
    24 24
         <groupId>io.ultreia.maven</groupId>
    
    25 25
         <artifactId>pom</artifactId>
    
    26
    -    <version>2023.5</version>
    
    26
    +    <version>2023.6</version>
    
    27 27
       </parent>
    
    28 28
       <groupId>fr.ird.observe</groupId>
    
    29 29
       <artifactId>ird-observe</artifactId>