Tony CHEMIT pushed to branch develop-9.0.x at ultreiaio / ird-observe
Commits:
-
ffe04d3e
by Tony Chemit at 2022-11-13T10:53:48+01:00
-
7c8b227d
by Tony Chemit at 2022-11-13T10:53:48+01:00
10 changed files:
- client/datasource/editor/ps/src/main/i18n/getters/jaxx.getter
- client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/observation/SetCatchUI.jaxx
- core/api/services/src/main/i18n/getters/labels.getter
- core/persistence/resources/src/main/resources/db/migration/v9/9.0/99_2_drop_tables-H2.sql
- core/persistence/resources/src/main/resources/db/migration/v9/9.0/99_2_drop_tables-PG.sql
- core/services/i18n/src/main/i18n/translations/services_en_GB.properties
- core/services/i18n/src/main/i18n/translations/services_es_ES.properties
- core/services/i18n/src/main/i18n/translations/services_fr_FR.properties
- model/src/main/models/Observe/dto/class/i18nLabels.properties
- model/src/main/models/Observe/dto/class/i18nOverrideLabels.properties
Changes:
| ... | ... | @@ -183,9 +183,12 @@ observe.data.ps.observation.Activity.previousFpaZone |
| 183 | 183 | observe.data.ps.observation.Activity.surroundingActivity
|
| 184 | 184 | observe.data.ps.observation.Activity.time
|
| 185 | 185 | observe.data.ps.observation.Catch.catchWeight
|
| 186 | +observe.data.ps.observation.Catch.catchWeightTotalCount
|
|
| 186 | 187 | observe.data.ps.observation.Catch.maxWeight
|
| 187 | 188 | observe.data.ps.observation.Catch.meanLength
|
| 188 | 189 | observe.data.ps.observation.Catch.meanWeight
|
| 190 | +observe.data.ps.observation.Catch.meanWeightMeanLength
|
|
| 191 | +observe.data.ps.observation.Catch.minMaxWeight
|
|
| 189 | 192 | observe.data.ps.observation.Catch.minWeight
|
| 190 | 193 | observe.data.ps.observation.Catch.reasonForDiscard
|
| 191 | 194 | observe.data.ps.observation.Catch.totalCount
|
| ... | ... | @@ -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"/>
|
| ... | ... | @@ -1028,6 +1028,7 @@ observe.data.ps.observation.Catch.catchWeight |
| 1028 | 1028 | 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 | +observe.data.ps.observation.Catch.catchWeightTotalCount
|
|
| 1031 | 1032 | observe.data.ps.observation.Catch.maxWeight
|
| 1032 | 1033 | observe.data.ps.observation.Catch.maxWeight.short
|
| 1033 | 1034 | observe.data.ps.observation.Catch.meanLength
|
| ... | ... | @@ -1038,6 +1039,8 @@ observe.data.ps.observation.Catch.meanWeight |
| 1038 | 1039 | observe.data.ps.observation.Catch.meanWeight.short
|
| 1039 | 1040 | observe.data.ps.observation.Catch.meanWeightComputed.computed.tip
|
| 1040 | 1041 | observe.data.ps.observation.Catch.meanWeightComputed.observed.tip
|
| 1042 | +observe.data.ps.observation.Catch.meanWeightMeanLength
|
|
| 1043 | +observe.data.ps.observation.Catch.minMaxWeight
|
|
| 1041 | 1044 | observe.data.ps.observation.Catch.minWeight
|
| 1042 | 1045 | observe.data.ps.observation.Catch.minWeight.short
|
| 1043 | 1046 | observe.data.ps.observation.Catch.reasonForDiscard
|
| ... | ... | @@ -25,12 +25,12 @@ ALTER TABLE ps_observation.Set DROP COLUMN targetdiscardcatchcompositionestimate |
| 25 | 25 | ALTER TABLE ll_common.Trip DROP COLUMN program;
|
| 26 | 26 | ALTER TABLE ps_common.Trip DROP COLUMN program;
|
| 27 | 27 | |
| 28 | --- DROP TABLE ps_observation.NonTargetLength;
|
|
| 29 | --- DROP TABLE ps_observation.NonTargetSample;
|
|
| 30 | --- DROP TABLE ps_observation.NonTargetCatch;
|
|
| 31 | --- DROP TABLE ps_observation.TargetCatch;
|
|
| 32 | --- DROP TABLE ps_observation.TargetSample;
|
|
| 33 | --- DROP TABLE ps_observation.TargetLength;
|
|
| 28 | +DROP TABLE ps_observation.NonTargetLength;
|
|
| 29 | +DROP TABLE ps_observation.NonTargetSample;
|
|
| 30 | +DROP TABLE ps_observation.NonTargetCatch;
|
|
| 31 | +DROP TABLE ps_observation.TargetCatch;
|
|
| 32 | +DROP TABLE ps_observation.TargetSample;
|
|
| 33 | +DROP TABLE ps_observation.TargetLength;
|
|
| 34 | 34 | DROP TABLE ps_observation.ReasonForNullSet;
|
| 35 | 35 | DROP TABLE ps_observation.ReasonForNoFishing;
|
| 36 | 36 | DROP TABLE ps_observation.WeightCategory;
|
| ... | ... | @@ -25,12 +25,12 @@ ALTER TABLE ps_observation.Set DROP COLUMN targetdiscardcatchcompositionestimate |
| 25 | 25 | ALTER TABLE ll_common.Trip DROP COLUMN program CASCADE;
|
| 26 | 26 | ALTER TABLE ps_common.Trip DROP COLUMN program CASCADE;
|
| 27 | 27 | |
| 28 | --- DROP TABLE ps_observation.NonTargetLength CASCADE;
|
|
| 29 | --- DROP TABLE ps_observation.NonTargetSample CASCADE;
|
|
| 30 | --- DROP TABLE ps_observation.NonTargetCatch CASCADE;
|
|
| 31 | --- DROP TABLE ps_observation.TargetLength CASCADE;
|
|
| 32 | --- DROP TABLE ps_observation.TargetSample CASCADE;
|
|
| 33 | --- DROP TABLE ps_observation.TargetCatch CASCADE;
|
|
| 28 | +DROP TABLE ps_observation.NonTargetLength CASCADE;
|
|
| 29 | +DROP TABLE ps_observation.NonTargetSample CASCADE;
|
|
| 30 | +DROP TABLE ps_observation.NonTargetCatch CASCADE;
|
|
| 31 | +DROP TABLE ps_observation.TargetLength CASCADE;
|
|
| 32 | +DROP TABLE ps_observation.TargetSample CASCADE;
|
|
| 33 | +DROP TABLE ps_observation.TargetCatch CASCADE;
|
|
| 34 | 34 | DROP TABLE ps_observation.ReasonForNullSet CASCADE;
|
| 35 | 35 | DROP TABLE ps_observation.ReasonForNoFishing CASCADE;
|
| 36 | 36 | DROP TABLE ps_observation.WeightCategory CASCADE;
|
| ... | ... | @@ -1232,6 +1232,7 @@ observe.data.ps.observation.Catch.catchWeight.short=Weight |
| 1232 | 1232 | observe.data.ps.observation.Catch.catchWeight.validation.required=Weight or estimated count must be filled
|
| 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 | +observe.data.ps.observation.Catch.catchWeightTotalCount=Total weight estimated (in t) / Estimated count
|
|
| 1235 | 1236 | observe.data.ps.observation.Catch.maxWeight=Upper weight limit (in kg)
|
| 1236 | 1237 | observe.data.ps.observation.Catch.maxWeight.short=Max weight (in kg)
|
| 1237 | 1238 | observe.data.ps.observation.Catch.meanLength=Mean length (in cm)
|
| ... | ... | @@ -1244,6 +1245,8 @@ observe.data.ps.observation.Catch.meanWeight.short=Mean weight |
| 1244 | 1245 | observe.data.ps.observation.Catch.meanWeight.validation.notFilled=Weight or mean size must be filled.
|
| 1245 | 1246 | observe.data.ps.observation.Catch.meanWeightComputed.computed.tip=Mean weight was computed (%s)
|
| 1246 | 1247 | observe.data.ps.observation.Catch.meanWeightComputed.observed.tip=Mean weight was observed
|
| 1248 | +observe.data.ps.observation.Catch.meanWeightMeanLength=Mean weight (in kg) / Mean length (in cm)
|
|
| 1249 | +observe.data.ps.observation.Catch.minMaxWeight=Lower / upper weight limit (in kg)
|
|
| 1247 | 1250 | observe.data.ps.observation.Catch.minWeight=Lower weight limit (in kg)
|
| 1248 | 1251 | observe.data.ps.observation.Catch.minWeight.short=Min weight (in kg)
|
| 1249 | 1252 | observe.data.ps.observation.Catch.reasonForDiscard=Reason for discard
|
| ... | ... | @@ -1232,6 +1232,7 @@ observe.data.ps.observation.Catch.catchWeight.short=Peso |
| 1232 | 1232 | observe.data.ps.observation.Catch.catchWeight.validation.required=Debe seleccionar uno de los dos valores (peso o count)
|
| 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 | +observe.data.ps.observation.Catch.catchWeightTotalCount=Pesos total estimados (en t) / Número estimado
|
|
| 1235 | 1236 | observe.data.ps.observation.Catch.maxWeight=Upper weight limit (in kg) TODO
|
| 1236 | 1237 | observe.data.ps.observation.Catch.maxWeight.short=Max weight (in kg)
|
| 1237 | 1238 | observe.data.ps.observation.Catch.meanLength=Talla media (en cm)
|
| ... | ... | @@ -1244,6 +1245,8 @@ observe.data.ps.observation.Catch.meanWeight.short=Peso medio |
| 1244 | 1245 | observe.data.ps.observation.Catch.meanWeight.validation.notFilled=Debe seleccionar uno de los dos valores (peso medio o talla media).
|
| 1245 | 1246 | observe.data.ps.observation.Catch.meanWeightComputed.computed.tip=El peso medio se calculó
|
| 1246 | 1247 | observe.data.ps.observation.Catch.meanWeightComputed.observed.tip=El peso medio se observó
|
| 1248 | +observe.data.ps.observation.Catch.meanWeightMeanLength=Peso medio (en kg) / Talla media (en cm)
|
|
| 1249 | +observe.data.ps.observation.Catch.minMaxWeight=Lower / upper weight limit (in kg) TODO
|
|
| 1247 | 1250 | observe.data.ps.observation.Catch.minWeight=Lower weight limit (in kg) TODO
|
| 1248 | 1251 | observe.data.ps.observation.Catch.minWeight.short=Max weight (in kg)
|
| 1249 | 1252 | observe.data.ps.observation.Catch.reasonForDiscard=Razón del descarte
|
| ... | ... | @@ -1232,6 +1232,7 @@ observe.data.ps.observation.Catch.catchWeight.short=Poids |
| 1232 | 1232 | observe.data.ps.observation.Catch.catchWeight.validation.required=Une des deux valeurs (poids ou taille moyenne) devrait être renseignée.
|
| 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 | +observe.data.ps.observation.Catch.catchWeightTotalCount=Poids total estimé (en t) / Nombre estimé
|
|
| 1235 | 1236 | observe.data.ps.observation.Catch.maxWeight=Borne de poids supérieure (en kg)
|
| 1236 | 1237 | observe.data.ps.observation.Catch.maxWeight.short=Poids max (en kg)
|
| 1237 | 1238 | observe.data.ps.observation.Catch.meanLength=Taille moyenne (en cm)
|
| ... | ... | @@ -1244,6 +1245,8 @@ observe.data.ps.observation.Catch.meanWeight.short=Poids moy |
| 1244 | 1245 | observe.data.ps.observation.Catch.meanWeight.validation.notFilled=Une des deux valeurs (poids moyen ou taille moyenne) devrait être renseignée.
|
| 1245 | 1246 | observe.data.ps.observation.Catch.meanWeightComputed.computed.tip=Le poids moyen a été calculé (%s)
|
| 1246 | 1247 | observe.data.ps.observation.Catch.meanWeightComputed.observed.tip=Le poids moyen a été observé
|
| 1248 | +observe.data.ps.observation.Catch.meanWeightMeanLength=Poids moyen (en kg) / Taille moyenne (en cm)
|
|
| 1249 | +observe.data.ps.observation.Catch.minMaxWeight=Borne de poids inférieure / supérieure (en kg)
|
|
| 1247 | 1250 | observe.data.ps.observation.Catch.minWeight=Borne de poids inférieure (en kg)
|
| 1248 | 1251 | observe.data.ps.observation.Catch.minWeight.short=Poids min (en kg)
|
| 1249 | 1252 | observe.data.ps.observation.Catch.reasonForDiscard=Raison rejet
|
| ... | ... | @@ -82,7 +82,7 @@ data.ps.logbook.SampleSpeciesMeasure=count,sizeClass |
| 82 | 82 | data.ps.logbook.TransmittingBuoy=comment,code,transmittingBuoyOwnership,transmittingBuoyType,transmittingBuoyOperation,country,vessel,latitude,longitude,quadrant
|
| 83 | 83 | data.ps.logbook.WellPlan=activity,species,weight,weightCategory,well,wellSamplingConformity,wellSamplingStatus
|
| 84 | 84 | 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
|
| 85 | -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
|
|
| 85 | +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
|
|
| 86 | 86 | data.ps.observation.FloatingObject=materialsValid,objectOperation,supportVesselName,country,vessel,computedBiodegradable,computedNonEntangling,computedSimplifiedObjectType,computedValues,generalTab,buoysTab,materialsTab,notComputed,type.short
|
| 87 | 87 | data.ps.observation.NonTargetCatchRelease=comment,conformity,count,length,lengthMeasureMethod,releasingTime,sex,status,species,speciesGroupReleaseMode,message.cantAdd
|
| 88 | 88 | data.ps.observation.ObjectObservedSpecies=count,species,speciesStatus
|
| ... | ... | @@ -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 |