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

Commits:

8 changed files:

Changes:

  • client/datasource/editor/ps/src/main/i18n/getters/jaxx.getter
    ... ... @@ -187,9 +187,12 @@ observe.data.ps.observation.Activity.previousFpaZone
    187 187 
     observe.data.ps.observation.Activity.surroundingActivity
    188 188 
     observe.data.ps.observation.Activity.time
    189 189 
     observe.data.ps.observation.Catch.catchWeight
    190 
    +observe.data.ps.observation.Catch.catchWeightTotalCount
    190 191 
     observe.data.ps.observation.Catch.maxWeight
    191 192 
     observe.data.ps.observation.Catch.meanLength
    192 193 
     observe.data.ps.observation.Catch.meanWeight
    194 
    +observe.data.ps.observation.Catch.meanWeightMeanLength
    195 
    +observe.data.ps.observation.Catch.minMaxWeight
    193 196 
     observe.data.ps.observation.Catch.minWeight
    194 197 
     observe.data.ps.observation.Catch.reasonForDiscard
    195 198 
     observe.data.ps.observation.Catch.totalCount

  • client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/observation/SetCatchUI.jaxx
    ... ... @@ -62,8 +62,6 @@
    62 62 
                        errorTableModel='{getErrorTableModel()}' context='update'/>
    63 63
    64 64 
         <Table id='editorPanel' fill='both' insets='1' beanScope="tableEditBean">
    65 
    -
    66 
    -        <!-- species -->
    67 65 
             <row>
    68 66 
                 <cell>
    69 67 
                     <JLabel id='speciesLabel'/>
    ... ... @@ -72,8 +70,6 @@
    72 70 
                     <FilterableComboBox id='species' genericType='SpeciesReference'/>
    73 71 
                 </cell>
    74 72 
             </row>
    75 
    -
    76 
    -        <!-- speciesFate -->
    77 73 
             <row>
    78 74 
                 <cell>
    79 75 
                     <JLabel id='speciesFateLabel'/>
    ... ... @@ -82,8 +78,6 @@
    82 78 
                     <FilterableComboBox id='speciesFate' genericType='SpeciesFateReference'/>
    83 79 
                 </cell>
    84 80 
             </row>
    85 
    -
    86 
    -        <!-- raison rejet  -->
    87 81 
             <row>
    88 82 
                 <cell>
    89 83 
                     <JLabel id='reasonForDiscardLabel'/>
    ... ... @@ -92,18 +86,17 @@
    92 86 
                     <FilterableComboBox id='reasonForDiscard' genericType='ReasonForDiscardReference'/>
    93 87 
                 </cell>
    94 88 
             </row>
    95 
    -
    96 
    -        <!-- weight estime -->
    97 89 
             <row>
    98 90 
                 <cell>
    99 
    -                <JLabel id='catchWeightLabel'/>
    91 
    +                <JLabel id='catchWeightTotalCountLabel'/>
    100 92 
                 </cell>
    101 93 
                 <cell weightx='1' anchor='east'>
    102 
    -                <NumberEditor id='catchWeight' styleClass="float3"/>
    94 
    +                <JPanel layout="{new GridLayout()}">
    95 
    +                    <NumberEditor id='catchWeight' styleClass="float3"/>
    96 
    +                    <NumberEditor id='totalCount' styleClass="int6"/>
    97 
    +                </JPanel>
    103 98 
                 </cell>
    104 99 
             </row>
    105 
    -
    106 
    -        <!-- weightMeasureMethod -->
    107 100 
             <row>
    108 101 
                 <cell>
    109 102 
                     <JLabel id='weightMeasureMethodLabel'/>
    ... ... @@ -112,53 +105,28 @@
    112 105 
                     <FilterableComboBox id='weightMeasureMethod' genericType='WeightMeasureMethodReference'/>
    113 106 
                 </cell>
    114 107 
             </row>
    115 
    -
    116 
    -        <!-- count estime -->
    117 108 
             <row>
    118 109 
                 <cell>
    119 
    -                <JLabel id='totalCountLabel'/>
    110 
    +                <JLabel id='minMaxWeightLabel'/>
    120 111 
                 </cell>
    121 112 
                 <cell weightx='1'>
    122 
    -                <NumberEditor id='totalCount' styleClass="int6"/>
    123 
    -
    113 
    +                <JPanel layout="{new GridLayout()}">
    114 
    +                    <NumberEditor id='minWeight' styleClass="float2"/>
    115 
    +                    <NumberEditor id='maxWeight' styleClass="float2"/>
    116 
    +                </JPanel>
    124 117 
                 </cell>
    125 118 
             </row>
    126 119 
             <row>
    127 120 
                 <cell>
    128 
    -                <JLabel id='minWeightLabel'/>
    121 
    +                <JLabel id='meanWeightMeanLengthLabel'/>
    129 122 
                 </cell>
    130 123 
                 <cell weightx='1'>
    131 
    -                <NumberEditor id='minWeight' styleClass="float2"/>
    124 
    +                <JPanel layout="{new GridLayout()}">
    125 
    +                    <NumberEditor id='meanWeight' styleClass="float2"/>
    126 
    +                    <NumberEditor id='meanLength' styleClass="float2"/>
    127 
    +                </JPanel>
    132 128 
                 </cell>
    133 129 
             </row>
    134 
    -        <row>
    135 
    -            <cell>
    136 
    -                <JLabel id='meanWeightLabel'/>
    137 
    -            </cell>
    138 
    -            <cell weightx='1'>
    139 
    -                <NumberEditor id='meanWeight' styleClass="float2"/>
    140 
    -            </cell>
    141 
    -        </row>
    142 
    -        <row>
    143 
    -            <cell>
    144 
    -                <JLabel id='maxWeightLabel'/>
    145 
    -            </cell>
    146 
    -            <cell weightx='1'>
    147 
    -                <NumberEditor id='maxWeight' styleClass="float2"/>
    148 
    -            </cell>
    149 
    -        </row>
    150 
    -
    151 
    -        <!-- taille moyenne -->
    152 
    -        <row>
    153 
    -            <cell>
    154 
    -                <JLabel id='meanLengthLabel'/>
    155 
    -            </cell>
    156 
    -            <cell weightx='1'>
    157 
    -                <NumberEditor id='meanLength' styleClass="float2"/>
    158 
    -            </cell>
    159 
    -        </row>
    160 
    -
    161 
    -        <!-- well -->
    162 130 
             <row>
    163 131 
                 <cell>
    164 132 
                     <JLabel id='wellLabel'/>
    ... ... @@ -167,8 +135,6 @@
    167 135 
                     <NormalTextEditor id='well'/>
    168 136 
                 </cell>
    169 137 
             </row>
    170 
    -
    171 
    -        <!-- informationSource -->
    172 138 
             <row>
    173 139 
                 <cell>
    174 140 
                     <JLabel id='informationSourceLabel'/>
    ... ... @@ -177,8 +143,6 @@
    177 143 
                     <FilterableComboBox id='informationSource' genericType='InformationSourceReference'/>
    178 144 
                 </cell>
    179 145 
             </row>
    180 
    -
    181 
    -        <!-- comment -->
    182 146 
             <row>
    183 147 
                 <cell columns='3' weighty='1'>
    184 148 
                     <BigTextEditor id="comment"/>

  • core/api/services/src/main/i18n/getters/labels.getter
    ... ... @@ -1065,6 +1065,7 @@ observe.data.ps.observation.Catch.catchWeight
    1065 1065 
     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 
    +observe.data.ps.observation.Catch.catchWeightTotalCount
    1068 1069 
     observe.data.ps.observation.Catch.maxWeight
    1069 1070 
     observe.data.ps.observation.Catch.maxWeight.short
    1070 1071 
     observe.data.ps.observation.Catch.meanLength
    ... ... @@ -1075,6 +1076,8 @@ observe.data.ps.observation.Catch.meanWeight
    1075 1076 
     observe.data.ps.observation.Catch.meanWeight.short
    1076 1077 
     observe.data.ps.observation.Catch.meanWeightComputed.computed.tip
    1077 1078 
     observe.data.ps.observation.Catch.meanWeightComputed.observed.tip
    1079 
    +observe.data.ps.observation.Catch.meanWeightMeanLength
    1080 
    +observe.data.ps.observation.Catch.minMaxWeight
    1078 1081 
     observe.data.ps.observation.Catch.minWeight
    1079 1082 
     observe.data.ps.observation.Catch.minWeight.short
    1080 1083 
     observe.data.ps.observation.Catch.reasonForDiscard

  • core/services/i18n/src/main/i18n/translations/services_en_GB.properties
    ... ... @@ -1275,6 +1275,7 @@ observe.data.ps.observation.Catch.catchWeight.short=Weight
    1275 1275 
     observe.data.ps.observation.Catch.catchWeight.validation.required=Weight or estimated count must be filled
    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 
    +observe.data.ps.observation.Catch.catchWeightTotalCount=Total weight estimated (in t) / Estimated count
    1278 1279 
     observe.data.ps.observation.Catch.maxWeight=Upper weight limit (in kg)
    1279 1280 
     observe.data.ps.observation.Catch.maxWeight.short=Max weight (in kg)
    1280 1281 
     observe.data.ps.observation.Catch.meanLength=Mean length (in cm)
    ... ... @@ -1287,6 +1288,8 @@ observe.data.ps.observation.Catch.meanWeight.short=Mean weight
    1287 1288 
     observe.data.ps.observation.Catch.meanWeight.validation.notFilled=Weight or mean size must be filled.
    1288 1289 
     observe.data.ps.observation.Catch.meanWeightComputed.computed.tip=Mean weight was computed (%s)
    1289 1290 
     observe.data.ps.observation.Catch.meanWeightComputed.observed.tip=Mean weight was observed
    1291 
    +observe.data.ps.observation.Catch.meanWeightMeanLength=Mean weight (in kg) / Mean length (in cm)
    1292 
    +observe.data.ps.observation.Catch.minMaxWeight=Lower / upper weight limit (in kg)
    1290 1293 
     observe.data.ps.observation.Catch.minWeight=Lower weight limit (in kg)
    1291 1294 
     observe.data.ps.observation.Catch.minWeight.short=Min weight (in kg)
    1292 1295 
     observe.data.ps.observation.Catch.reasonForDiscard=Reason for discard

  • core/services/i18n/src/main/i18n/translations/services_es_ES.properties
    ... ... @@ -1275,6 +1275,7 @@ observe.data.ps.observation.Catch.catchWeight.short=Peso
    1275 1275 
     observe.data.ps.observation.Catch.catchWeight.validation.required=Debe seleccionar uno de los dos valores (peso o count)
    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 
    +observe.data.ps.observation.Catch.catchWeightTotalCount=Pesos total estimados (en t) / Número estimado
    1278 1279 
     observe.data.ps.observation.Catch.maxWeight=Upper weight limit (in kg) TODO
    1279 1280 
     observe.data.ps.observation.Catch.maxWeight.short=Max weight (in kg)
    1280 1281 
     observe.data.ps.observation.Catch.meanLength=Talla media (en cm)
    ... ... @@ -1287,6 +1288,8 @@ observe.data.ps.observation.Catch.meanWeight.short=Peso medio
    1287 1288 
     observe.data.ps.observation.Catch.meanWeight.validation.notFilled=Debe seleccionar uno de los dos valores (peso medio o talla media).
    1288 1289 
     observe.data.ps.observation.Catch.meanWeightComputed.computed.tip=El peso medio se calculó
    1289 1290 
     observe.data.ps.observation.Catch.meanWeightComputed.observed.tip=El peso medio se observó
    1291 
    +observe.data.ps.observation.Catch.meanWeightMeanLength=Peso medio (en kg) / Talla media (en cm)
    1292 
    +observe.data.ps.observation.Catch.minMaxWeight=Lower / upper weight limit (in kg) TODO
    1290 1293 
     observe.data.ps.observation.Catch.minWeight=Lower weight limit (in kg) TODO
    1291 1294 
     observe.data.ps.observation.Catch.minWeight.short=Max weight (in kg)
    1292 1295 
     observe.data.ps.observation.Catch.reasonForDiscard=Razón del descarte

  • core/services/i18n/src/main/i18n/translations/services_fr_FR.properties
    ... ... @@ -1275,6 +1275,7 @@ observe.data.ps.observation.Catch.catchWeight.short=Poids
    1275 1275 
     observe.data.ps.observation.Catch.catchWeight.validation.required=Une des deux valeurs (poids ou taille moyenne) devrait être renseignée.
    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 
    +observe.data.ps.observation.Catch.catchWeightTotalCount=Poids total estimé (en t) / Nombre estimé
    1278 1279 
     observe.data.ps.observation.Catch.maxWeight=Borne de poids supérieure (en kg)
    1279 1280 
     observe.data.ps.observation.Catch.maxWeight.short=Poids max (en kg)
    1280 1281 
     observe.data.ps.observation.Catch.meanLength=Taille moyenne (en cm)
    ... ... @@ -1287,6 +1288,8 @@ observe.data.ps.observation.Catch.meanWeight.short=Poids moy
    1287 1288 
     observe.data.ps.observation.Catch.meanWeight.validation.notFilled=Une des deux valeurs (poids moyen ou taille moyenne) devrait être renseignée.
    1288 1289 
     observe.data.ps.observation.Catch.meanWeightComputed.computed.tip=Le poids moyen a été calculé (%s)
    1289 1290 
     observe.data.ps.observation.Catch.meanWeightComputed.observed.tip=Le poids moyen a été observé
    1291 
    +observe.data.ps.observation.Catch.meanWeightMeanLength=Poids moyen (en kg) / Taille moyenne (en cm)
    1292 
    +observe.data.ps.observation.Catch.minMaxWeight=Borne de poids inférieure / supérieure (en kg)
    1290 1293 
     observe.data.ps.observation.Catch.minWeight=Borne de poids inférieure (en kg)
    1291 1294 
     observe.data.ps.observation.Catch.minWeight.short=Poids min (en kg)
    1292 1295 
     observe.data.ps.observation.Catch.reasonForDiscard=Raison rejet

  • model/src/main/models/Observe/dto/class/i18nLabels.properties
    ... ... @@ -84,7 +84,7 @@ data.ps.logbook.Well=well,wellVessel,wellFactory,wellSamplingConformity,wellSamp
    84 84 
     data.ps.logbook.WellActivity=activity,wellActivitySpecies
    85 85 
     data.ps.logbook.WellActivitySpecies=species,weight,weightCategory,count,setSpeciesNumber
    86 86 
     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 
    -data.ps.observation.Catch=catchWeight,comment,informationSource,lengthMeasureMethod,meanLength,minWeight,maxWeight,meanWeight,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
    87 
    +data.ps.observation.Catch=catchWeight,catchWeightTotalCount,meanWeightMeanLength,comment,informationSource,lengthMeasureMethod,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 88 
     data.ps.observation.FloatingObject=materialsValid,objectOperation,supportVesselName,country,vessel,computedBiodegradable,computedNonEntangling,computedSimplifiedObjectType,computedValues,generalTab,buoysTab,materialsTab,notComputed,type.short
    89 89 
     data.ps.observation.NonTargetCatchRelease=comment,conformity,count,length,lengthMeasureMethod,releasingTime,sex,status,species,speciesGroupReleaseMode,message.cantAdd
    90 90 
     data.ps.observation.ObjectObservedSpecies=count,species,speciesStatus

  • model/src/main/models/Observe/dto/class/i18nOverrideLabels.properties
    ... ... @@ -23,7 +23,7 @@ data.ll.common.Trip=species
    23 23 
     data.ll.landing.Landing=vessel
    24 24 
     data.ps.localmarket.Sample=well
    25 25 
     data.ps.logbook.Catch=weightMeasureMethod.validation.required
    26 
    -data.ps.observation.Catch=minWeight,maxWeight,weightMeasureMethod
    26 
    +data.ps.observation.Catch=minWeight,maxWeight,minMaxWeight,weightMeasureMethod
    27 27 
     data.ps.observation.SchoolEstimate=species
    28 28 
     data.ps.observation.Set=startTime,haulingStartTimeStamp,haulingEndTimeStamp,endTimeStamp
    29 29 
     referential.common.Species=codeAndHomeId

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