[Git][ultreiaio/ird-observe][develop] 3 commits: LL observations/captures : ajout de champs dans le tableau récapitulatif - Closes #2908 - Observe-commits

26 Jun 2024


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


Commits:
c3cddc7b by Tony Chemit at 2024-06-26T12:43:49+02:00
LL observations/captures : ajout de champs dans le tableau récapitulatif - Closes #2908

- - - - -
7c133af8 by Tony Chemit at 2024-06-26T12:45:31+02:00
 Dans le cas d'une opération activité 34, toujours ajouter le matériaux balise seule sur le FOB - Closes #2910

- - - - -
be609a9e by Tony Chemit at 2024-06-26T13:05:23+02:00
 Sur le formulaire Schéma détaillé de palangre, onglet "Composition", tableau "Paniers", préciser l'unité dans les en-têtes des colonnes - Closes #2905

- - - - -


7 changed files:

- client/datasource/editor/ll/src/main/i18n/getters/navigation.getter
- core/api/dto-decoration/src/main/i18n/getters/labels.getter
- core/persistence/avdth/src/main/java/fr/ird/observe/persistence/avdth/data/logbook/FloatingObjectReader.java
- 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/containerChildDataDtoProperties.properties


Changes:

=====================================
client/datasource/editor/ll/src/main/i18n/getters/navigation.getter
=====================================
@@ -202,7 +202,11 @@ observe.data.ll.observation.Catch.action.save
 observe.data.ll.observation.Catch.action.save.tip
 observe.data.ll.observation.Catch.count
 observe.data.ll.observation.Catch.count.short
+observe.data.ll.observation.Catch.number
+observe.data.ll.observation.Catch.number.short
 observe.data.ll.observation.Catch.title
+observe.data.ll.observation.Catch.totalWeight
+observe.data.ll.observation.Catch.totalWeight.short
 observe.data.ll.observation.Catch.type
 observe.data.ll.observation.Encounter.action.create
 observe.data.ll.observation.Encounter.action.save


=====================================
core/api/dto-decoration/src/main/i18n/getters/labels.getter
=====================================
@@ -658,9 +658,11 @@ observe.data.ll.observation.Catch.depredatedTab
 observe.data.ll.observation.Catch.foodAndSexualTab
 observe.data.ll.observation.Catch.noBranchlineSelected
 observe.data.ll.observation.Catch.number
+observe.data.ll.observation.Catch.number.short
 observe.data.ll.observation.Catch.sizeMeasuresTab
 observe.data.ll.observation.Catch.title
 observe.data.ll.observation.Catch.totalWeight
+observe.data.ll.observation.Catch.totalWeight.short
 observe.data.ll.observation.Catch.type
 observe.data.ll.observation.Catch.weightMeasuresTab
 observe.data.ll.observation.Encounter.action.create


=====================================
core/persistence/avdth/src/main/java/fr/ird/observe/persistence/avdth/data/logbook/FloatingObjectReader.java
=====================================
@@ -417,6 +417,12 @@ public class FloatingObjectReader extends DataReader<FloatingObject> {
             addObjectMaterial(vesselActivityCode, objectMaterialUsed, dataContext.getObjectMaterialCarrion(), whenArriving, whenLeaving, entity);
             addDefaultObjectMaterialOnUnknownObjectType = false;
         }
+        if (vesselActivityCode.equals("34")) {
+            // add ObjectMaterial 2-2-4-4
+            // See https://gitlab.com/ultreiaio/ird-observe/-/issues/2910
+            addObjectMaterial(vesselActivityCode, objectMaterialUsed, dataContext.getObjectMaterialAlone(), whenArriving, whenLeaving, entity);
+            addDefaultObjectMaterialOnUnknownObjectType = false;
+        }
         if (floatingObjectExistsInAvdth) {
             // simple mapping
             ObjectMaterial objectMaterial = getObjectMaterialByObjectTypeCode(dataContext, objectTypeCode);


=====================================
core/services/i18n/src/main/i18n/translations/services_en_GB.properties
=====================================
@@ -52,8 +52,8 @@ observe.Common.batches.selected=Selected batches
 observe.Common.beatDiameter=Beat diameter (cm)
 observe.Common.branchline=Branchline
 observe.Common.branchline.short=Branchline
-observe.Common.branchlineLength=Branchline length
-observe.Common.branchlineLength.short=Branchline length
+observe.Common.branchlineLength=Branchline length (m)
+observe.Common.branchlineLength.short=Branchline length (m)
 observe.Common.branchlinesComposition=Branchlines composition
 observe.Common.branchlinesComposition.validation.uniqueKey=Tuple (topType/type/size) must be unique, value at index %s is duplicated.
 observe.Common.branchlinesCompositionProportionSum=Branchlines composition proportion sum
@@ -64,7 +64,7 @@ observe.Common.catchFate=Fate
 observe.Common.catchFate.short=Fate
 observe.Common.catchHealthStatus=Catch health status
 observe.Common.catchHealthStatus.short=Catch health status
-observe.Common.categoryMax=Weight category max (Kg) (Kg)
+observe.Common.categoryMax=Weight category max (Kg)
 observe.Common.categoryMax.short=Cat max
 observe.Common.categoryMin=Category min
 observe.Common.categoryMin.short=Cat min
@@ -128,10 +128,10 @@ observe.Common.fishingEndDepth=Depth at fishing end (m)
 observe.Common.fishingStart=Fishing start
 observe.Common.fishingStartDepth=Depth at fishing start (m)
 observe.Common.floatingObject.comment=Floating object comment
-observe.Common.floatline1Length=Floatline 1 length
-observe.Common.floatline1Length.short=Floatline 1 length
-observe.Common.floatline2Length=Floatline 2 length
-observe.Common.floatline2Length.short=Floatline 2 length
+observe.Common.floatline1Length=Floatline 1 length (m)
+observe.Common.floatline1Length.short=Floatline 1 length (m)
+observe.Common.floatline2Length=Floatline 2 length (m)
+observe.Common.floatline2Length.short=Floatline 2 length (m)
 observe.Common.floatlinesComposition=floatlines composition
 observe.Common.floatlinesComposition.validation.uniqueKey=Tuple (type/length) must be unique, value at index %s is duplicated.
 observe.Common.floatlinesCompositionProportionSum=floatlines composition proportion sum
@@ -368,8 +368,8 @@ observe.Common.totalLightsticksCount=Total number of lightsticks
 observe.Common.totalLineLength=Total line length
 observe.Common.totalSectionsCount=Total sections
 observe.Common.traceCutOff=Trace cut off
-observe.Common.tracelineLength=Traceline length
-observe.Common.tracelineLength.short=Traceline length
+observe.Common.tracelineLength=Traceline length (m)
+observe.Common.tracelineLength.short=Traceline length (m)
 observe.Common.tracelineType=Traceline type
 observe.Common.tracelineType.short=Traceline type
 observe.Common.transmittingBuoyOperation=Transmitting buoy operation
@@ -790,9 +790,11 @@ observe.data.ll.observation.Catch.depredatedTab=Depredation
 observe.data.ll.observation.Catch.foodAndSexualTab=Food and sexual maturity
 observe.data.ll.observation.Catch.noBranchlineSelected=No branchline selected
 observe.data.ll.observation.Catch.number=Hauling number
+observe.data.ll.observation.Catch.number.short=Hauling number
 observe.data.ll.observation.Catch.sizeMeasuresTab=Sizes
 observe.data.ll.observation.Catch.title=Catches
 observe.data.ll.observation.Catch.totalWeight=Total weight (kg)
+observe.data.ll.observation.Catch.totalWeight.short=Total weight (kg)
 observe.data.ll.observation.Catch.type=Catch
 observe.data.ll.observation.Catch.weightMeasuresTab=Weights
 observe.data.ll.observation.Encounter.action.create=Create a new encounter


=====================================
core/services/i18n/src/main/i18n/translations/services_es_ES.properties
=====================================
@@ -52,8 +52,8 @@ observe.Common.batches.selected=Selected batches
 observe.Common.beatDiameter=Diametro de la mordedura (cm)
 observe.Common.branchline=Branchline
 observe.Common.branchline.short=Arponcillo
-observe.Common.branchlineLength=Longitud Arponcillo
-observe.Common.branchlineLength.short=Longitud Arponcillo
+observe.Common.branchlineLength=Longitud Arponcillo (m)
+observe.Common.branchlineLength.short=Longitud Arponcillo (m)
 observe.Common.branchlinesComposition=Arponcillos
 observe.Common.branchlinesComposition.validation.uniqueKey=La tupla (tipo alto/tipo bajo/tamaño) debe ser única, la tupa ya está utilizada, value at index %s is duplicated.
 observe.Common.branchlinesCompositionProportionSum=Suma de los proporciónes de arponcillos (%)
@@ -128,10 +128,10 @@ observe.Common.fishingEndDepth=Profundidad en fin de pesca (m)
 observe.Common.fishingStart=Inicio de pesca
 observe.Common.fishingStartDepth=Profundidad en inicio de pesca (m)
 observe.Common.floatingObject.comment=Comentarios de objeto
-observe.Common.floatline1Length=Longitud 1 del orinque
-observe.Common.floatline1Length.short=Longitud 1 del orinque
-observe.Common.floatline2Length=Longitud 2 del orinque
-observe.Common.floatline2Length.short=Longitud 2 del orinque
+observe.Common.floatline1Length=Longitud 1 del orinque (m)
+observe.Common.floatline1Length.short=Longitud 1 del orinque (m)
+observe.Common.floatline2Length=Longitud 2 del orinque (m)
+observe.Common.floatline2Length.short=Longitud 2 del orinque (m)
 observe.Common.floatlinesComposition=Orinques
 observe.Common.floatlinesComposition.validation.uniqueKey=La tupla (tipo/longitud) debe ser única, la tupa ya está utilizada, value at index %s is duplicated.
 observe.Common.floatlinesCompositionProportionSum=Suma de los proporciónes de los orinques (%)
@@ -368,8 +368,8 @@ observe.Common.totalLightsticksCount=Número total de barras de luz
 observe.Common.totalLineLength=Total line length\#TODO
 observe.Common.totalSectionsCount=totalSectionsCount \#TODO
 observe.Common.traceCutOff=Bajo de línea cortada
-observe.Common.tracelineLength=Parte baja
-observe.Common.tracelineLength.short=Parte baja
+observe.Common.tracelineLength=Parte baja (m)
+observe.Common.tracelineLength.short=Parte baja (m)
 observe.Common.tracelineType=Tipo bajo de línea
 observe.Common.tracelineType.short=Tipo bajo de línea
 observe.Common.transmittingBuoyOperation=Operación sobre baliza
@@ -790,9 +790,11 @@ observe.data.ll.observation.Catch.depredatedTab=Depredación
 observe.data.ll.observation.Catch.foodAndSexualTab=Alimentación y maturidad sexual
 observe.data.ll.observation.Catch.noBranchlineSelected=No branchline selected \#TODO
 observe.data.ll.observation.Catch.number=Número de virada
+observe.data.ll.observation.Catch.number.short=Número de virada
 observe.data.ll.observation.Catch.sizeMeasuresTab=Tamaños (cm)
 observe.data.ll.observation.Catch.title=Capturas
 observe.data.ll.observation.Catch.totalWeight=Peso total (kg)
+observe.data.ll.observation.Catch.totalWeight.short=Peso total (kg)
 observe.data.ll.observation.Catch.type=Captura
 observe.data.ll.observation.Catch.weightMeasuresTab=Pesos (kg)
 observe.data.ll.observation.Encounter.action.create=Crear una nueva encuentro


=====================================
core/services/i18n/src/main/i18n/translations/services_fr_FR.properties
=====================================
@@ -52,8 +52,8 @@ observe.Common.batches.selected=Lots sélectionnés
 observe.Common.beatDiameter=Diamètre de la morsure (cm)
 observe.Common.branchline=Avançon
 observe.Common.branchline.short=Avançon
-observe.Common.branchlineLength=Longueur Avançon
-observe.Common.branchlineLength.short=Longueur Avançon
+observe.Common.branchlineLength=Longueur Avançon (m)
+observe.Common.branchlineLength.short=Longueur Avançon (m)
 observe.Common.branchlinesComposition=Avançons
 observe.Common.branchlinesComposition.validation.uniqueKey=Le tuple (type haut/type bas/taille) doit être unique, la donnée de rang %s est invalide.
 observe.Common.branchlinesCompositionProportionSum=Somme des proportions d'avançons (%)
@@ -128,10 +128,10 @@ observe.Common.fishingEndDepth=Profondeur en fin de pêche (m)
 observe.Common.fishingStart=Début pêche
 observe.Common.fishingStartDepth=Profondeur en début de pêche (m)
 observe.Common.floatingObject.comment=Commentaire sur l'objet flottant
-observe.Common.floatline1Length=Longueur 1 d'orin
-observe.Common.floatline1Length.short=Longueur 1 d'orin
-observe.Common.floatline2Length=Longueur 2 d'orin
-observe.Common.floatline2Length.short=Longueur 2 d'orin
+observe.Common.floatline1Length=Longueur 1 d'orin (m)
+observe.Common.floatline1Length.short=Longueur 1 d'orin (m)
+observe.Common.floatline2Length=Longueur 2 d'orin (m)
+observe.Common.floatline2Length.short=Longueur 2 d'orin (m)
 observe.Common.floatlinesComposition=Orins
 observe.Common.floatlinesComposition.validation.uniqueKey=Le tuple (type/longueur) doit être unique, la donnée de rang %s est invalide.
 observe.Common.floatlinesCompositionProportionSum=Somme des proportions d'orins (%)
@@ -368,8 +368,8 @@ observe.Common.totalLightsticksCount=Nombre total de cyalumes
 observe.Common.totalLineLength=Longueur totale de la ligne
 observe.Common.totalSectionsCount=Nombre total de sections
 observe.Common.traceCutOff=Bas de ligne coupé
-observe.Common.tracelineLength=Longueur bas de ligne
-observe.Common.tracelineLength.short=Longueur bas de ligne
+observe.Common.tracelineLength=Longueur bas de ligne (m)
+observe.Common.tracelineLength.short=Longueur bas de ligne (m)
 observe.Common.tracelineType=Type bas de ligne
 observe.Common.tracelineType.short=Type bas de ligne
 observe.Common.transmittingBuoyOperation=Opération balise
@@ -790,9 +790,11 @@ observe.data.ll.observation.Catch.depredatedTab=Déprédation
 observe.data.ll.observation.Catch.foodAndSexualTab=Alimentation et maturité sexuelle
 observe.data.ll.observation.Catch.noBranchlineSelected=Aucun avançon sélectionné
 observe.data.ll.observation.Catch.number=Numéro au virage
+observe.data.ll.observation.Catch.number.short=Numéro au virage
 observe.data.ll.observation.Catch.sizeMeasuresTab=Tailles (cm)
 observe.data.ll.observation.Catch.title=Captures
 observe.data.ll.observation.Catch.totalWeight=Poids total (kg)
+observe.data.ll.observation.Catch.totalWeight.short=Poids total (kg)
 observe.data.ll.observation.Catch.type=Capture
 observe.data.ll.observation.Catch.weightMeasuresTab=Poids (kg)
 observe.data.ll.observation.Encounter.action.create=Nouvelle rencontre


=====================================
model/src/main/models/Observe/dto/class/containerChildDataDtoProperties.properties
=====================================
@@ -29,7 +29,7 @@ data.ll.logbook.HooksComposition=hookType,hookSize,hookOffset,proportion
 data.ll.logbook.SamplePart=species,count,sizeMeasureType,length,weightMeasureType,weight,sex
 data.ll.observation.BaitsComposition=baitType,baitSettingStatus,individualSize,individualWeight,proportion
 data.ll.observation.BranchlinesComposition=topType,tracelineType,length,tracelineLength,proportion
-data.ll.observation.Catch=section,basket,branchline,species,acquisitionMode,count,catchHealthStatus,catchFate,discardHealthStatus,depredated,comment
+data.ll.observation.Catch=number,section,basket,branchline,species,acquisitionMode,count,catchHealthStatus,catchFate,discardHealthStatus,depredated,totalWeight,comment
 data.ll.observation.Encounter=encounterType,species,distance,count
 data.ll.observation.FloatlinesComposition=lineType,length,proportion
 data.ll.observation.HooksComposition=hookType,hookSize,hookOffset,proportion



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

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

    

[Git][ultreiaio/ird-observe][develop] 3 commits: LL observations/captures : ajout de champs dans le tableau récapitulatif - Closes #2908

Tony CHEMIT (＠tchemit)

tags

participants (1)