Tony CHEMIT pushed to branch develop 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
    ... ... @@ -186,6 +188,7 @@ observe.data.ps.observation.Catch.action.save
    186 188 
     observe.data.ps.observation.Catch.action.save.tip
    187 189 
     observe.data.ps.observation.Catch.catchWeight
    188 190 
     observe.data.ps.observation.Catch.catchWeight.short
    191 
    +observe.data.ps.observation.Catch.informationSource.short
    189 192 
     observe.data.ps.observation.Catch.maxWeight
    190 193 
     observe.data.ps.observation.Catch.maxWeight.short
    191 194 
     observe.data.ps.observation.Catch.meanLength
    ... ... @@ -201,6 +204,7 @@ observe.data.ps.observation.Catch.title
    201 204 
     observe.data.ps.observation.Catch.totalCount
    202 205 
     observe.data.ps.observation.Catch.totalCount.short
    203 206 
     observe.data.ps.observation.Catch.type
    207 
    +observe.data.ps.observation.Catch.weightMeasureMethod.short
    204 208 
     observe.data.ps.observation.FloatingObject.action.add
    205 209 
     observe.data.ps.observation.FloatingObject.action.add.tip
    206 210 
     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
    ... ... @@ -1066,6 +1066,7 @@ observe.data.ps.observation.Catch.catchWeight.short
    1066 1066 
     observe.data.ps.observation.Catch.catchWeightComputed.computed.tip
    1067 1067 
     observe.data.ps.observation.Catch.catchWeightComputed.observed.tip
    1068 1068 
     observe.data.ps.observation.Catch.catchWeightTotalCount
    1069 
    +observe.data.ps.observation.Catch.informationSource.short
    1069 1070 
     observe.data.ps.observation.Catch.maxWeight
    1070 1071 
     observe.data.ps.observation.Catch.maxWeight.short
    1071 1072 
     observe.data.ps.observation.Catch.meanLength
    ... ... @@ -1090,6 +1091,7 @@ observe.data.ps.observation.Catch.totalCountComputed.computed.tip
    1090 1091 
     observe.data.ps.observation.Catch.totalCountComputed.observed.tip
    1091 1092 
     observe.data.ps.observation.Catch.type
    1092 1093 
     observe.data.ps.observation.Catch.weightMeasureMethod
    1094 
    +observe.data.ps.observation.Catch.weightMeasureMethod.short
    1093 1095 
     observe.data.ps.observation.FloatingObject.action.add
    1094 1096 
     observe.data.ps.observation.FloatingObject.action.add.tip
    1095 1097 
     observe.data.ps.observation.FloatingObject.buoysTab

  • core/services/i18n/src/main/i18n/translations/services_en_GB.properties
    ... ... @@ -1276,6 +1276,7 @@ observe.data.ps.observation.Catch.catchWeight.validation.required=Weight or esti
    1276 1276 
     observe.data.ps.observation.Catch.catchWeightComputed.computed.tip=Catch weight was computed (%s)
    1277 1277 
     observe.data.ps.observation.Catch.catchWeightComputed.observed.tip=Catch weight was observed
    1278 1278 
     observe.data.ps.observation.Catch.catchWeightTotalCount=Total weight estimated (in t) / Estimated count
    1279 
    +observe.data.ps.observation.Catch.informationSource.short=Information source
    1279 1280 
     observe.data.ps.observation.Catch.maxWeight=Upper weight limit (in kg)
    1280 1281 
     observe.data.ps.observation.Catch.maxWeight.short=Max weight (in kg)
    1281 1282 
     observe.data.ps.observation.Catch.meanLength=Mean length (in cm)
    ... ... @@ -1304,6 +1305,7 @@ observe.data.ps.observation.Catch.totalCountComputed.observed.tip=Count was obse
    1304 1305 
     observe.data.ps.observation.Catch.type=Catch
    1305 1306 
     observe.data.ps.observation.Catch.validation.missing.observedSystem=One of the following observed system %s must be filled for the selected species.
    1306 1307 
     observe.data.ps.observation.Catch.weightMeasureMethod=Total weight measure method
    1308 
    +observe.data.ps.observation.Catch.weightMeasureMethod.short=Total weight measure method
    1307 1309 
     observe.data.ps.observation.FloatingObject.action.add=Add FAD
    1308 1310 
     observe.data.ps.observation.FloatingObject.action.add.tip=Add a FAD to the activity
    1309 1311 
     observe.data.ps.observation.FloatingObject.buoysTab=Beacon

  • core/services/i18n/src/main/i18n/translations/services_es_ES.properties
    ... ... @@ -1276,6 +1276,7 @@ observe.data.ps.observation.Catch.catchWeight.validation.required=Debe seleccion
    1276 1276 
     observe.data.ps.observation.Catch.catchWeightComputed.computed.tip=Peso estimado calculado
    1277 1277 
     observe.data.ps.observation.Catch.catchWeightComputed.observed.tip=Peso estimado observado
    1278 1278 
     observe.data.ps.observation.Catch.catchWeightTotalCount=Pesos total estimados (en t) / Número estimado
    1279 
    +observe.data.ps.observation.Catch.informationSource.short=Information source TODO
    1279 1280 
     observe.data.ps.observation.Catch.maxWeight=Upper weight limit (in kg) TODO
    1280 1281 
     observe.data.ps.observation.Catch.maxWeight.short=Max weight (in kg)
    1281 1282 
     observe.data.ps.observation.Catch.meanLength=Talla media (en cm)
    ... ... @@ -1291,7 +1292,7 @@ observe.data.ps.observation.Catch.meanWeightComputed.observed.tip=El peso medio
    1291 1292 
     observe.data.ps.observation.Catch.meanWeightMeanLength=Peso medio (en kg) / Talla media (en cm)
    1292 1293 
     observe.data.ps.observation.Catch.minMaxWeight=Lower / upper weight limit (in kg) TODO
    1293 1294 
     observe.data.ps.observation.Catch.minWeight=Lower weight limit (in kg) TODO
    1294 
    -observe.data.ps.observation.Catch.minWeight.short=Max weight (in kg)
    1295 
    +observe.data.ps.observation.Catch.minWeight.short=Max weight
    1295 1296 
     observe.data.ps.observation.Catch.reasonForDiscard=Razón del descarte
    1296 1297 
     observe.data.ps.observation.Catch.reasonForDiscard.short=Razón del descarte
    1297 1298 
     observe.data.ps.observation.Catch.speciesFate.short=Devenir
    ... ... @@ -1304,6 +1305,7 @@ observe.data.ps.observation.Catch.totalCountComputed.observed.tip=El número est
    1304 1305 
     observe.data.ps.observation.Catch.type=Captura
    1305 1306 
     observe.data.ps.observation.Catch.validation.missing.observedSystem=One of the following observed system %s must be filled for the selected species. \#TODO
    1306 1307 
     observe.data.ps.observation.Catch.weightMeasureMethod=Método de medición de total peso
    1308 
    +observe.data.ps.observation.Catch.weightMeasureMethod.short=Método de medición de total peso
    1307 1309 
     observe.data.ps.observation.FloatingObject.action.add=Añadir un FOB
    1308 1310 
     observe.data.ps.observation.FloatingObject.action.add.tip=Añadir un objeto flotante a la actividad
    1309 1311 
     observe.data.ps.observation.FloatingObject.buoysTab=Baliza

  • core/services/i18n/src/main/i18n/translations/services_fr_FR.properties
    ... ... @@ -1276,22 +1276,23 @@ observe.data.ps.observation.Catch.catchWeight.validation.required=Une des deux v
    1276 1276 
     observe.data.ps.observation.Catch.catchWeightComputed.computed.tip=Le poids estimé a été calculé (%s)
    1277 1277 
     observe.data.ps.observation.Catch.catchWeightComputed.observed.tip=Le poids estimé a été observé
    1278 1278 
     observe.data.ps.observation.Catch.catchWeightTotalCount=Poids total estimé (en t) / Nombre estimé
    1279 
    +observe.data.ps.observation.Catch.informationSource.short=Origine de l'information
    1279 1280 
     observe.data.ps.observation.Catch.maxWeight=Borne de poids supérieure (en kg)
    1280 
    -observe.data.ps.observation.Catch.maxWeight.short=Poids max (en kg)
    1281 
    +observe.data.ps.observation.Catch.maxWeight.short=P max
    1281 1282 
     observe.data.ps.observation.Catch.meanLength=Taille moyenne (en cm)
    1282 1283 
     observe.data.ps.observation.Catch.meanLength.short=Taille
    1283 1284 
     observe.data.ps.observation.Catch.meanLength.validation.notFilled=Une des deux valeurs (poids moyen ou taille moyenne) devrait être renseignée.
    1284 1285 
     observe.data.ps.observation.Catch.meanLengthComputed.computed.tip=La taille moyenne a été calculée (%s)
    1285 1286 
     observe.data.ps.observation.Catch.meanLengthComputed.observed.tip=La taille moyenne a été observée
    1286 1287 
     observe.data.ps.observation.Catch.meanWeight=Poids moyen (en kg)
    1287 
    -observe.data.ps.observation.Catch.meanWeight.short=Poids moy
    1288 
    +observe.data.ps.observation.Catch.meanWeight.short=P moy
    1288 1289 
     observe.data.ps.observation.Catch.meanWeight.validation.notFilled=Une des deux valeurs (poids moyen ou taille moyenne) devrait être renseignée.
    1289 1290 
     observe.data.ps.observation.Catch.meanWeightComputed.computed.tip=Le poids moyen a été calculé (%s)
    1290 1291 
     observe.data.ps.observation.Catch.meanWeightComputed.observed.tip=Le poids moyen a été observé
    1291 1292 
     observe.data.ps.observation.Catch.meanWeightMeanLength=Poids moyen (en kg) / Taille moyenne (en cm)
    1292 1293 
     observe.data.ps.observation.Catch.minMaxWeight=Borne de poids inférieure / supérieure (en kg)
    1293 1294 
     observe.data.ps.observation.Catch.minWeight=Borne de poids inférieure (en kg)
    1294 
    -observe.data.ps.observation.Catch.minWeight.short=Poids min (en kg)
    1295 
    +observe.data.ps.observation.Catch.minWeight.short=P min
    1295 1296 
     observe.data.ps.observation.Catch.reasonForDiscard=Raison rejet
    1296 1297 
     observe.data.ps.observation.Catch.reasonForDiscard.short=Raison rejet
    1297 1298 
     observe.data.ps.observation.Catch.speciesFate.short=Devenir
    ... ... @@ -1304,6 +1305,7 @@ observe.data.ps.observation.Catch.totalCountComputed.observed.tip=Le nombre esti
    1304 1305 
     observe.data.ps.observation.Catch.type=Captures
    1305 1306 
     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.
    1306 1307 
     observe.data.ps.observation.Catch.weightMeasureMethod=Méthode de mesure du poids total
    1308 
    +observe.data.ps.observation.Catch.weightMeasureMethod.short=Méthode de mesure du poids total
    1307 1309 
     observe.data.ps.observation.FloatingObject.action.add=Ajouter un DCP
    1308 1310 
     observe.data.ps.observation.FloatingObject.action.add.tip=Ajouter un objet flottant à l'activité
    1309 1311 
     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.WellActivity=activity,wellActivitySpecies
    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