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

Commits:

7 changed files:

Changes:

  • client/datasource/editor/ps/src/main/i18n/getters/navigation.getter
    ... ... @@ -6,6 +6,7 @@ observe.Common.fate
    6 6 
     observe.Common.fate.short
    7 7 
     observe.Common.fateVessel
    8 8 
     observe.Common.fateVessel.short
    9 
    +observe.Common.informationSource
    9 10 
     observe.Common.list.message.none
    10 11 
     observe.Common.measuredCount
    11 12 
     observe.Common.measuredCount.short
    ... ... @@ -23,6 +24,7 @@ observe.Common.usedInTrip
    23 24 
     observe.Common.usedInTrip.short
    24 25 
     observe.Common.weightCategory
    25 26 
     observe.Common.weightCategory.short
    27 
    +observe.Common.weightMeasureMethod
    26 28 
     observe.Common.well
    27 29 
     observe.Common.well.short
    28 30 
     observe.data.GearUseFeatures.action.create
    ... ... @@ -177,6 +179,7 @@ observe.data.ps.observation.Catch.action.save
    177 179 
     observe.data.ps.observation.Catch.action.save.tip
    178 180 
     observe.data.ps.observation.Catch.catchWeight
    179 181 
     observe.data.ps.observation.Catch.catchWeight.short
    182 
    +observe.data.ps.observation.Catch.informationSource.short
    180 183 
     observe.data.ps.observation.Catch.maxWeight
    181 184 
     observe.data.ps.observation.Catch.maxWeight.short
    182 185 
     observe.data.ps.observation.Catch.meanLength
    ... ... @@ -192,6 +195,7 @@ observe.data.ps.observation.Catch.title
    192 195 
     observe.data.ps.observation.Catch.totalCount
    193 196 
     observe.data.ps.observation.Catch.totalCount.short
    194 197 
     observe.data.ps.observation.Catch.type
    198 
    +observe.data.ps.observation.Catch.weightMeasureMethod.short
    195 199 
     observe.data.ps.observation.FloatingObject.action.add
    196 200 
     observe.data.ps.observation.FloatingObject.action.add.tip
    197 201 
     observe.data.ps.observation.FloatingObject.navigation.unsaved

  • client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/observation/SetCatchUITableModel.java
    ... ... @@ -121,13 +121,27 @@ class SetCatchUITableModel extends GeneratedSetCatchUITableModel {
    121 121
    122 122 
         @Override
    123 123 
         public void initTableUISize(JTable table) {
    124 
    +        // species
    125 
    +        // speciesFate
    126 
    +        // reasonForDiscard
    127 
    +        // catchWeight
    124 128 
             UIHelper.fixTableColumnWidth(table, 3, 55);
    125 
    -        UIHelper.fixTableColumnWidth(table, 4, 65);
    126 
    -        UIHelper.fixTableColumnWidth(table, 5, 75);
    127 
    -        UIHelper.fixTableColumnWidth(table, 6, 55);
    129 
    +        // totalCount
    130 
    +        UIHelper.fixTableColumnWidth(table, 4, 55);
    131 
    +        // weightMeasureMethod
    132 
    +        // minWeight
    133 
    +        UIHelper.fixTableColumnWidth(table, 6, 50);
    134 
    +        // maxWeight
    128 135 
             UIHelper.fixTableColumnWidth(table, 7, 50);
    136 
    +        // meanWeight
    129 137 
             UIHelper.fixTableColumnWidth(table, 8, 50);
    138 
    +        // meanLength
    130 139 
             UIHelper.fixTableColumnWidth(table, 9, 50);
    140 
    +        // well
    141 
    +        UIHelper.fixTableColumnWidth(table, 10, 50);
    142 
    +        // informationSource
    143 
    +        // comment
    144 
    +        UIHelper.fixTableColumnWidth(table, 12, 50);
    131 145 
         }
    132 146
    133 147 
         @Override

  • core/api/services/src/main/i18n/getters/labels.getter
    ... ... @@ -1029,6 +1029,7 @@ observe.data.ps.observation.Catch.catchWeight.short
    1029 1029 
     observe.data.ps.observation.Catch.catchWeightComputed.computed.tip
    1030 1030 
     observe.data.ps.observation.Catch.catchWeightComputed.observed.tip
    1031 1031 
     observe.data.ps.observation.Catch.catchWeightTotalCount
    1032 
    +observe.data.ps.observation.Catch.informationSource.short
    1032 1033 
     observe.data.ps.observation.Catch.maxWeight
    1033 1034 
     observe.data.ps.observation.Catch.maxWeight.short
    1034 1035 
     observe.data.ps.observation.Catch.meanLength
    ... ... @@ -1053,6 +1054,7 @@ observe.data.ps.observation.Catch.totalCountComputed.computed.tip
    1053 1054 
     observe.data.ps.observation.Catch.totalCountComputed.observed.tip
    1054 1055 
     observe.data.ps.observation.Catch.type
    1055 1056 
     observe.data.ps.observation.Catch.weightMeasureMethod
    1057 
    +observe.data.ps.observation.Catch.weightMeasureMethod.short
    1056 1058 
     observe.data.ps.observation.FloatingObject.action.add
    1057 1059 
     observe.data.ps.observation.FloatingObject.action.add.tip
    1058 1060 
     observe.data.ps.observation.FloatingObject.buoysTab

  • core/services/i18n/src/main/i18n/translations/services_en_GB.properties
    ... ... @@ -1233,6 +1233,7 @@ observe.data.ps.observation.Catch.catchWeight.validation.required=Weight or esti
    1233 1233 
     observe.data.ps.observation.Catch.catchWeightComputed.computed.tip=Catch weight was computed (%s)
    1234 1234 
     observe.data.ps.observation.Catch.catchWeightComputed.observed.tip=Catch weight was observed
    1235 1235 
     observe.data.ps.observation.Catch.catchWeightTotalCount=Total weight estimated (in t) / Estimated count
    1236 
    +observe.data.ps.observation.Catch.informationSource.short=Information source
    1236 1237 
     observe.data.ps.observation.Catch.maxWeight=Upper weight limit (in kg)
    1237 1238 
     observe.data.ps.observation.Catch.maxWeight.short=Max weight (in kg)
    1238 1239 
     observe.data.ps.observation.Catch.meanLength=Mean length (in cm)
    ... ... @@ -1261,6 +1262,7 @@ observe.data.ps.observation.Catch.totalCountComputed.observed.tip=Count was obse
    1261 1262 
     observe.data.ps.observation.Catch.type=Catch
    1262 1263 
     observe.data.ps.observation.Catch.validation.missing.observedSystem=One of the following observed system %s must be filled for the selected species.
    1263 1264 
     observe.data.ps.observation.Catch.weightMeasureMethod=Total weight measure method
    1265 
    +observe.data.ps.observation.Catch.weightMeasureMethod.short=Total weight measure method
    1264 1266 
     observe.data.ps.observation.FloatingObject.action.add=Add FAD
    1265 1267 
     observe.data.ps.observation.FloatingObject.action.add.tip=Add a FAD to the activity
    1266 1268 
     observe.data.ps.observation.FloatingObject.buoysTab=Beacon

  • core/services/i18n/src/main/i18n/translations/services_es_ES.properties
    ... ... @@ -1233,6 +1233,7 @@ observe.data.ps.observation.Catch.catchWeight.validation.required=Debe seleccion
    1233 1233 
     observe.data.ps.observation.Catch.catchWeightComputed.computed.tip=Peso estimado calculado
    1234 1234 
     observe.data.ps.observation.Catch.catchWeightComputed.observed.tip=Peso estimado observado
    1235 1235 
     observe.data.ps.observation.Catch.catchWeightTotalCount=Pesos total estimados (en t) / Número estimado
    1236 
    +observe.data.ps.observation.Catch.informationSource.short=Information source TODO
    1236 1237 
     observe.data.ps.observation.Catch.maxWeight=Upper weight limit (in kg) TODO
    1237 1238 
     observe.data.ps.observation.Catch.maxWeight.short=Max weight (in kg)
    1238 1239 
     observe.data.ps.observation.Catch.meanLength=Talla media (en cm)
    ... ... @@ -1248,7 +1249,7 @@ observe.data.ps.observation.Catch.meanWeightComputed.observed.tip=El peso medio
    1248 1249 
     observe.data.ps.observation.Catch.meanWeightMeanLength=Peso medio (en kg) / Talla media (en cm)
    1249 1250 
     observe.data.ps.observation.Catch.minMaxWeight=Lower / upper weight limit (in kg) TODO
    1250 1251 
     observe.data.ps.observation.Catch.minWeight=Lower weight limit (in kg) TODO
    1251 
    -observe.data.ps.observation.Catch.minWeight.short=Max weight (in kg)
    1252 
    +observe.data.ps.observation.Catch.minWeight.short=Max weight
    1252 1253 
     observe.data.ps.observation.Catch.reasonForDiscard=Razón del descarte
    1253 1254 
     observe.data.ps.observation.Catch.reasonForDiscard.short=Razón del descarte
    1254 1255 
     observe.data.ps.observation.Catch.speciesFate.short=Devenir
    ... ... @@ -1261,6 +1262,7 @@ observe.data.ps.observation.Catch.totalCountComputed.observed.tip=El número est
    1261 1262 
     observe.data.ps.observation.Catch.type=Captura
    1262 1263 
     observe.data.ps.observation.Catch.validation.missing.observedSystem=One of the following observed system %s must be filled for the selected species. \#TODO
    1263 1264 
     observe.data.ps.observation.Catch.weightMeasureMethod=Método de medición de total peso
    1265 
    +observe.data.ps.observation.Catch.weightMeasureMethod.short=Método de medición de total peso
    1264 1266 
     observe.data.ps.observation.FloatingObject.action.add=Añadir un FOB
    1265 1267 
     observe.data.ps.observation.FloatingObject.action.add.tip=Añadir un objeto flotante a la actividad
    1266 1268 
     observe.data.ps.observation.FloatingObject.buoysTab=Baliza

  • core/services/i18n/src/main/i18n/translations/services_fr_FR.properties
    ... ... @@ -1233,22 +1233,23 @@ observe.data.ps.observation.Catch.catchWeight.validation.required=Une des deux v
    1233 1233 
     observe.data.ps.observation.Catch.catchWeightComputed.computed.tip=Le poids estimé a été calculé (%s)
    1234 1234 
     observe.data.ps.observation.Catch.catchWeightComputed.observed.tip=Le poids estimé a été observé
    1235 1235 
     observe.data.ps.observation.Catch.catchWeightTotalCount=Poids total estimé (en t) / Nombre estimé
    1236 
    +observe.data.ps.observation.Catch.informationSource.short=Origine de l'information
    1236 1237 
     observe.data.ps.observation.Catch.maxWeight=Borne de poids supérieure (en kg)
    1237 
    -observe.data.ps.observation.Catch.maxWeight.short=Poids max (en kg)
    1238 
    +observe.data.ps.observation.Catch.maxWeight.short=P max
    1238 1239 
     observe.data.ps.observation.Catch.meanLength=Taille moyenne (en cm)
    1239 1240 
     observe.data.ps.observation.Catch.meanLength.short=Taille
    1240 1241 
     observe.data.ps.observation.Catch.meanLength.validation.notFilled=Une des deux valeurs (poids moyen ou taille moyenne) devrait être renseignée.
    1241 1242 
     observe.data.ps.observation.Catch.meanLengthComputed.computed.tip=La taille moyenne a été calculée (%s)
    1242 1243 
     observe.data.ps.observation.Catch.meanLengthComputed.observed.tip=La taille moyenne a été observée
    1243 1244 
     observe.data.ps.observation.Catch.meanWeight=Poids moyen (en kg)
    1244 
    -observe.data.ps.observation.Catch.meanWeight.short=Poids moy
    1245 
    +observe.data.ps.observation.Catch.meanWeight.short=P moy
    1245 1246 
     observe.data.ps.observation.Catch.meanWeight.validation.notFilled=Une des deux valeurs (poids moyen ou taille moyenne) devrait être renseignée.
    1246 1247 
     observe.data.ps.observation.Catch.meanWeightComputed.computed.tip=Le poids moyen a été calculé (%s)
    1247 1248 
     observe.data.ps.observation.Catch.meanWeightComputed.observed.tip=Le poids moyen a été observé
    1248 1249 
     observe.data.ps.observation.Catch.meanWeightMeanLength=Poids moyen (en kg) / Taille moyenne (en cm)
    1249 1250 
     observe.data.ps.observation.Catch.minMaxWeight=Borne de poids inférieure / supérieure (en kg)
    1250 1251 
     observe.data.ps.observation.Catch.minWeight=Borne de poids inférieure (en kg)
    1251 
    -observe.data.ps.observation.Catch.minWeight.short=Poids min (en kg)
    1252 
    +observe.data.ps.observation.Catch.minWeight.short=P min
    1252 1253 
     observe.data.ps.observation.Catch.reasonForDiscard=Raison rejet
    1253 1254 
     observe.data.ps.observation.Catch.reasonForDiscard.short=Raison rejet
    1254 1255 
     observe.data.ps.observation.Catch.speciesFate.short=Devenir
    ... ... @@ -1261,6 +1262,7 @@ observe.data.ps.observation.Catch.totalCountComputed.observed.tip=Le nombre esti
    1261 1262 
     observe.data.ps.observation.Catch.type=Captures
    1262 1263 
     observe.data.ps.observation.Catch.validation.missing.observedSystem=Un des systèmes observés %s doit être sélectionné pour l'espèce sélectionnée.
    1263 1264 
     observe.data.ps.observation.Catch.weightMeasureMethod=Méthode de mesure du poids total
    1265 
    +observe.data.ps.observation.Catch.weightMeasureMethod.short=Méthode de mesure du poids total
    1264 1266 
     observe.data.ps.observation.FloatingObject.action.add=Ajouter un DCP
    1265 1267 
     observe.data.ps.observation.FloatingObject.action.add.tip=Ajouter un objet flottant à l'activité
    1266 1268 
     observe.data.ps.observation.FloatingObject.buoysTab=Balise

  • model/src/main/models/Observe/dto/class/containerChildDataDtoProperties.properties
    ... ... @@ -42,7 +42,7 @@ data.ps.localmarket.SampleSpecies=species,sizeMeasureType,measuredCount,comment
    42 42 
     data.ps.logbook.Catch=species,weightCategory,speciesFate,well,weight,count,comment
    43 43 
     data.ps.logbook.SampleSpecies=subSampleNumber,species,sizeMeasureType,measuredCount,totalCount,comment
    44 44 
     data.ps.logbook.WellPlan=activity,well,species,weightCategory,weight
    45 
    -data.ps.observation.Catch=species,speciesFate,reasonForDiscard,well,catchWeight,totalCount,minWeight,meanWeight,maxWeight,meanLength,comment
    45 
    +data.ps.observation.Catch=species,speciesFate,reasonForDiscard,catchWeight,totalCount,weightMeasureMethod,minWeight,maxWeight,meanWeight,meanLength,well,informationSource,comment
    46 46 
     data.ps.observation.NonTargetCatchRelease=species,sex,speciesGroupReleaseMode,conformity,releasingTime,length,comment
    47 47 
     data.ps.observation.ObjectObservedSpecies=species,speciesStatus,count
    48 48 
     data.ps.observation.ObjectSchoolEstimate=species,totalWeight

    • —
    View it on GitLab.
    You're receiving this email because of your account on gitlab.com. Manage all notifications · Help