[Git][ultreiaio/ird-observe][develop-9.0.x] 2 commits: Adaptation de la validation et du formulaire Captures suite à la nouvelle...

13 Nov 2022

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
 Adaptation de la validation et du formulaire Captures suite à la nouvelle migration v9 - Closes #2526

- - - - -
7c8b227d by Tony Chemit at 2022-11-13T10:53:48+01:00
Revert "FIXME - Do not drop table until release time"

This reverts commit 73c88a1f12625a827361ececc852b783e4a0941d.

- - - - -


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:

=====================================
client/datasource/editor/ps/src/main/i18n/getters/jaxx.getter
=====================================
@@ -183,9 +183,12 @@ observe.data.ps.observation.Activity.previousFpaZone
 observe.data.ps.observation.Activity.surroundingActivity
 observe.data.ps.observation.Activity.time
 observe.data.ps.observation.Catch.catchWeight
+observe.data.ps.observation.Catch.catchWeightTotalCount
 observe.data.ps.observation.Catch.maxWeight
 observe.data.ps.observation.Catch.meanLength
 observe.data.ps.observation.Catch.meanWeight
+observe.data.ps.observation.Catch.meanWeightMeanLength
+observe.data.ps.observation.Catch.minMaxWeight
 observe.data.ps.observation.Catch.minWeight
 observe.data.ps.observation.Catch.reasonForDiscard
 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 @@
                    errorTableModel='{getErrorTableModel()}' context='update'/>
 
     <Table id='editorPanel' fill='both' insets='1' beanScope="tableEditBean">
-
-        
         <row>
             <cell>
                 <JLabel id='speciesLabel'/>
@@ -72,8 +70,6 @@
                 <FilterableComboBox id='species' genericType='SpeciesReference'/>
             </cell>
         </row>
-
-        
         <row>
             <cell>
                 <JLabel id='speciesFateLabel'/>
@@ -82,8 +78,6 @@
                 <FilterableComboBox id='speciesFate' genericType='SpeciesFateReference'/>
             </cell>
         </row>
-
-        
         <row>
             <cell>
                 <JLabel id='reasonForDiscardLabel'/>
@@ -92,18 +86,17 @@
                 <FilterableComboBox id='reasonForDiscard' genericType='ReasonForDiscardReference'/>
             </cell>
         </row>
-
-        
         <row>
             <cell>
-                <JLabel id='catchWeightLabel'/>
+                <JLabel id='catchWeightTotalCountLabel'/>
             </cell>
             <cell weightx='1' anchor='east'>
-                <NumberEditor id='catchWeight' styleClass="float3"/>
+                <JPanel layout="{new GridLayout()}">
+                    <NumberEditor id='catchWeight' styleClass="float3"/>
+                    <NumberEditor id='totalCount' styleClass="int6"/>
+                </JPanel>
             </cell>
         </row>
-
-        
         <row>
             <cell>
                 <JLabel id='weightMeasureMethodLabel'/>
@@ -112,53 +105,28 @@
                 <FilterableComboBox id='weightMeasureMethod' genericType='WeightMeasureMethodReference'/>
             </cell>
         </row>
-
-        
         <row>
             <cell>
-                <JLabel id='totalCountLabel'/>
+                <JLabel id='minMaxWeightLabel'/>
             </cell>
             <cell weightx='1'>
-                <NumberEditor id='totalCount' styleClass="int6"/>
-
+                <JPanel layout="{new GridLayout()}">
+                    <NumberEditor id='minWeight' styleClass="float2"/>
+                    <NumberEditor id='maxWeight' styleClass="float2"/>
+                </JPanel>
             </cell>
         </row>
         <row>
             <cell>
-                <JLabel id='minWeightLabel'/>
+                <JLabel id='meanWeightMeanLengthLabel'/>
             </cell>
             <cell weightx='1'>
-                <NumberEditor id='minWeight' styleClass="float2"/>
+                <JPanel layout="{new GridLayout()}">
+                    <NumberEditor id='meanWeight' styleClass="float2"/>
+                    <NumberEditor id='meanLength' styleClass="float2"/>
+                </JPanel>
             </cell>
         </row>
-        <row>
-            <cell>
-                <JLabel id='meanWeightLabel'/>
-            </cell>
-            <cell weightx='1'>
-                <NumberEditor id='meanWeight' styleClass="float2"/>
-            </cell>
-        </row>
-        <row>
-            <cell>
-                <JLabel id='maxWeightLabel'/>
-            </cell>
-            <cell weightx='1'>
-                <NumberEditor id='maxWeight' styleClass="float2"/>
-            </cell>
-        </row>
-
-        
-        <row>
-            <cell>
-                <JLabel id='meanLengthLabel'/>
-            </cell>
-            <cell weightx='1'>
-                <NumberEditor id='meanLength' styleClass="float2"/>
-            </cell>
-        </row>
-
-        
         <row>
             <cell>
                 <JLabel id='wellLabel'/>
@@ -167,8 +135,6 @@
                 <NormalTextEditor id='well'/>
             </cell>
         </row>
-
-        
         <row>
             <cell>
                 <JLabel id='informationSourceLabel'/>
@@ -177,8 +143,6 @@
                 <FilterableComboBox id='informationSource' genericType='InformationSourceReference'/>
             </cell>
         </row>
-
-        
         <row>
             <cell columns='3' weighty='1'>
                 <BigTextEditor id="comment"/>


=====================================
core/api/services/src/main/i18n/getters/labels.getter
=====================================
@@ -1028,6 +1028,7 @@ observe.data.ps.observation.Catch.catchWeight
 observe.data.ps.observation.Catch.catchWeight.short
 observe.data.ps.observation.Catch.catchWeightComputed.computed.tip
 observe.data.ps.observation.Catch.catchWeightComputed.observed.tip
+observe.data.ps.observation.Catch.catchWeightTotalCount
 observe.data.ps.observation.Catch.maxWeight
 observe.data.ps.observation.Catch.maxWeight.short
 observe.data.ps.observation.Catch.meanLength
@@ -1038,6 +1039,8 @@ observe.data.ps.observation.Catch.meanWeight
 observe.data.ps.observation.Catch.meanWeight.short
 observe.data.ps.observation.Catch.meanWeightComputed.computed.tip
 observe.data.ps.observation.Catch.meanWeightComputed.observed.tip
+observe.data.ps.observation.Catch.meanWeightMeanLength
+observe.data.ps.observation.Catch.minMaxWeight
 observe.data.ps.observation.Catch.minWeight
 observe.data.ps.observation.Catch.minWeight.short
 observe.data.ps.observation.Catch.reasonForDiscard


=====================================
core/persistence/resources/src/main/resources/db/migration/v9/9.0/99_2_drop_tables-H2.sql
=====================================
@@ -25,12 +25,12 @@ ALTER TABLE ps_observation.Set DROP COLUMN targetdiscardcatchcompositionestimate
 ALTER TABLE ll_common.Trip DROP COLUMN program;
 ALTER TABLE ps_common.Trip DROP COLUMN program;

--- DROP TABLE ps_observation.NonTargetLength;
--- DROP TABLE ps_observation.NonTargetSample;
--- DROP TABLE ps_observation.NonTargetCatch;
--- DROP TABLE ps_observation.TargetCatch;
--- DROP TABLE ps_observation.TargetSample;
--- DROP TABLE ps_observation.TargetLength;
+DROP TABLE ps_observation.NonTargetLength;
+DROP TABLE ps_observation.NonTargetSample;
+DROP TABLE ps_observation.NonTargetCatch;
+DROP TABLE ps_observation.TargetCatch;
+DROP TABLE ps_observation.TargetSample;
+DROP TABLE ps_observation.TargetLength;
 DROP TABLE ps_observation.ReasonForNullSet;
 DROP TABLE ps_observation.ReasonForNoFishing;
 DROP TABLE ps_observation.WeightCategory;


=====================================
core/persistence/resources/src/main/resources/db/migration/v9/9.0/99_2_drop_tables-PG.sql
=====================================
@@ -25,12 +25,12 @@ ALTER TABLE ps_observation.Set DROP COLUMN targetdiscardcatchcompositionestimate
 ALTER TABLE ll_common.Trip DROP COLUMN program CASCADE;
 ALTER TABLE ps_common.Trip DROP COLUMN program CASCADE;
 
--- DROP TABLE ps_observation.NonTargetLength CASCADE;
--- DROP TABLE ps_observation.NonTargetSample CASCADE;
--- DROP TABLE ps_observation.NonTargetCatch CASCADE;
--- DROP TABLE ps_observation.TargetLength CASCADE;
--- DROP TABLE ps_observation.TargetSample CASCADE;
--- DROP TABLE ps_observation.TargetCatch CASCADE;
+DROP TABLE ps_observation.NonTargetLength CASCADE;
+DROP TABLE ps_observation.NonTargetSample CASCADE;
+DROP TABLE ps_observation.NonTargetCatch CASCADE;
+DROP TABLE ps_observation.TargetLength CASCADE;
+DROP TABLE ps_observation.TargetSample CASCADE;
+DROP TABLE ps_observation.TargetCatch CASCADE;
 DROP TABLE ps_observation.ReasonForNullSet CASCADE;
 DROP TABLE ps_observation.ReasonForNoFishing CASCADE;
 DROP TABLE ps_observation.WeightCategory CASCADE;


=====================================
core/services/i18n/src/main/i18n/translations/services_en_GB.properties
=====================================
@@ -1232,6 +1232,7 @@ observe.data.ps.observation.Catch.catchWeight.short=Weight
 observe.data.ps.observation.Catch.catchWeight.validation.required=Weight or estimated count must be filled
 observe.data.ps.observation.Catch.catchWeightComputed.computed.tip=Catch weight was computed (%s)
 observe.data.ps.observation.Catch.catchWeightComputed.observed.tip=Catch weight was observed
+observe.data.ps.observation.Catch.catchWeightTotalCount=Total weight estimated (in t) / Estimated count
 observe.data.ps.observation.Catch.maxWeight=Upper weight limit (in kg)
 observe.data.ps.observation.Catch.maxWeight.short=Max weight (in kg)
 observe.data.ps.observation.Catch.meanLength=Mean length (in cm)
@@ -1244,6 +1245,8 @@ observe.data.ps.observation.Catch.meanWeight.short=Mean weight
 observe.data.ps.observation.Catch.meanWeight.validation.notFilled=Weight or mean size must be filled.
 observe.data.ps.observation.Catch.meanWeightComputed.computed.tip=Mean weight was computed (%s)
 observe.data.ps.observation.Catch.meanWeightComputed.observed.tip=Mean weight was observed
+observe.data.ps.observation.Catch.meanWeightMeanLength=Mean weight (in kg) / Mean length (in cm)
+observe.data.ps.observation.Catch.minMaxWeight=Lower / upper weight limit (in kg)
 observe.data.ps.observation.Catch.minWeight=Lower weight limit (in kg)
 observe.data.ps.observation.Catch.minWeight.short=Min weight (in kg)
 observe.data.ps.observation.Catch.reasonForDiscard=Reason for discard


=====================================
core/services/i18n/src/main/i18n/translations/services_es_ES.properties
=====================================
@@ -1232,6 +1232,7 @@ observe.data.ps.observation.Catch.catchWeight.short=Peso
 observe.data.ps.observation.Catch.catchWeight.validation.required=Debe seleccionar uno de los dos valores (peso o count)
 observe.data.ps.observation.Catch.catchWeightComputed.computed.tip=Peso estimado calculado
 observe.data.ps.observation.Catch.catchWeightComputed.observed.tip=Peso estimado observado
+observe.data.ps.observation.Catch.catchWeightTotalCount=Pesos total estimados (en t) / Número estimado
 observe.data.ps.observation.Catch.maxWeight=Upper weight limit (in kg) TODO
 observe.data.ps.observation.Catch.maxWeight.short=Max weight (in kg)
 observe.data.ps.observation.Catch.meanLength=Talla media (en cm)
@@ -1244,6 +1245,8 @@ observe.data.ps.observation.Catch.meanWeight.short=Peso medio
 observe.data.ps.observation.Catch.meanWeight.validation.notFilled=Debe seleccionar uno de los dos valores (peso medio o talla media).
 observe.data.ps.observation.Catch.meanWeightComputed.computed.tip=El peso medio se calculó
 observe.data.ps.observation.Catch.meanWeightComputed.observed.tip=El peso medio se observó
+observe.data.ps.observation.Catch.meanWeightMeanLength=Peso medio (en kg) / Talla media (en cm)
+observe.data.ps.observation.Catch.minMaxWeight=Lower / upper weight limit (in kg) TODO
 observe.data.ps.observation.Catch.minWeight=Lower weight limit (in kg) TODO
 observe.data.ps.observation.Catch.minWeight.short=Max weight (in kg)
 observe.data.ps.observation.Catch.reasonForDiscard=Razón del descarte


=====================================
core/services/i18n/src/main/i18n/translations/services_fr_FR.properties
=====================================
@@ -1232,6 +1232,7 @@ observe.data.ps.observation.Catch.catchWeight.short=Poids
 observe.data.ps.observation.Catch.catchWeight.validation.required=Une des deux valeurs (poids ou taille moyenne) devrait être renseignée.
 observe.data.ps.observation.Catch.catchWeightComputed.computed.tip=Le poids estimé a été calculé (%s)
 observe.data.ps.observation.Catch.catchWeightComputed.observed.tip=Le poids estimé a été observé
+observe.data.ps.observation.Catch.catchWeightTotalCount=Poids total estimé (en t) / Nombre estimé
 observe.data.ps.observation.Catch.maxWeight=Borne de poids supérieure (en kg)
 observe.data.ps.observation.Catch.maxWeight.short=Poids max (en kg)
 observe.data.ps.observation.Catch.meanLength=Taille moyenne (en cm)
@@ -1244,6 +1245,8 @@ observe.data.ps.observation.Catch.meanWeight.short=Poids moy
 observe.data.ps.observation.Catch.meanWeight.validation.notFilled=Une des deux valeurs (poids moyen ou taille moyenne) devrait être renseignée.
 observe.data.ps.observation.Catch.meanWeightComputed.computed.tip=Le poids moyen a été calculé (%s)
 observe.data.ps.observation.Catch.meanWeightComputed.observed.tip=Le poids moyen a été observé
+observe.data.ps.observation.Catch.meanWeightMeanLength=Poids moyen (en kg) / Taille moyenne (en cm)
+observe.data.ps.observation.Catch.minMaxWeight=Borne de poids inférieure / supérieure (en kg)
 observe.data.ps.observation.Catch.minWeight=Borne de poids inférieure (en kg)
 observe.data.ps.observation.Catch.minWeight.short=Poids min (en kg)
 observe.data.ps.observation.Catch.reasonForDiscard=Raison rejet


=====================================
model/src/main/models/Observe/dto/class/i18nLabels.properties
=====================================
@@ -82,7 +82,7 @@ data.ps.logbook.SampleSpeciesMeasure=count,sizeClass
 data.ps.logbook.TransmittingBuoy=comment,code,transmittingBuoyOwnership,transmittingBuoyType,transmittingBuoyOperation,country,vessel,latitude,longitude,quadrant
 data.ps.logbook.WellPlan=activity,species,weight,weightCategory,well,wellSamplingConformity,wellSamplingStatus
 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
-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
+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
 data.ps.observation.FloatingObject=materialsValid,objectOperation,supportVesselName,country,vessel,computedBiodegradable,computedNonEntangling,computedSimplifiedObjectType,computedValues,generalTab,buoysTab,materialsTab,notComputed,type.short
 data.ps.observation.NonTargetCatchRelease=comment,conformity,count,length,lengthMeasureMethod,releasingTime,sex,status,species,speciesGroupReleaseMode,message.cantAdd
 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
 data.ll.landing.Landing=vessel
 data.ps.localmarket.Sample=well
 data.ps.logbook.Catch=weightMeasureMethod.validation.required
-data.ps.observation.Catch=minWeight,maxWeight,weightMeasureMethod
+data.ps.observation.Catch=minWeight,maxWeight,minMaxWeight,weightMeasureMethod
 data.ps.observation.SchoolEstimate=species
 data.ps.observation.Set=startTime,haulingStartTimeStamp,haulingEndTimeStamp,endTimeStamp
 referential.common.Species=codeAndHomeId



View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/df3efb6fa50e0a5cd7c82df97...

-- 
View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/df3efb6fa50e0a5cd7c82df97...
You're receiving this email because of your account on gitlab.com.

    

Tony CHEMIT (＠tchemit)

tags

participants (1)