Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe
Commits:
-
609a7959
by Tony Chemit at 2024-06-26T13:11:08+02:00
-
14d5e257
by Tony Chemit at 2024-06-26T13:11:08+02:00
-
13c7c369
by Tony Chemit at 2024-06-26T13:11:08+02:00
-
45e04e17
by Tony Chemit at 2024-06-26T13:11:08+02:00
8 changed files:
- CHANGELOG.md
- 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:
| 1 | 1 | # ObServe changelog
|
| 2 | 2 | |
| 3 | 3 | * Author [Tony Chemit](mailto:dev@tchemit.fr)
|
| 4 | - * Last generated at 2024-05-22 10:52.
|
|
| 4 | + * Last generated at 2024-06-26 13:09.
|
|
| 5 | + |
|
| 6 | +## Version [9.3.6](https://gitlab.com/ultreiaio/ird-observe/-/milestones/283)
|
|
| 7 | + |
|
| 8 | +**Closed at 2024-06-26.**
|
|
| 9 | + |
|
| 10 | +### Download
|
|
| 11 | +* [Client (observe-9.3.6-client.zip)](https://repo1.maven.org/maven2/fr/ird/observe/observe/9.3.6/observe-9.3.6-client.zip)
|
|
| 12 | +* [Serveur (observe-9.3.6.war)](https://repo1.maven.org/maven2/fr/ird/observe/observe/9.3.6/observe-9.3.6.war)
|
|
| 13 | +* [Serveur (observe-9.3.6-server.zip)](https://repo1.maven.org/maven2/fr/ird/observe/observe/9.3.6/observe-9.3.6-server.zip)
|
|
| 14 | + |
|
| 15 | + |
|
| 16 | +### Issues
|
|
| 17 | + * [[Type::Anomalie 2887]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2887) **En synchro avancée de données, la modification de la configuration des arbres de navigation ne fonctionne plus** (Thanks to Tony CHEMIT) (Reported by Pascal Cauquil)
|
|
| 18 | + * [[Type::Anomalie 2889]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2889) **Les transcodages ASSOC ne sont plus totalement respectés par l'importeur AVDTH** (Thanks to Tony CHEMIT) (Reported by Pascal Cauquil)
|
|
| 19 | + * [[Type::Anomalie 2890]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2890) **Sur synchro avancée de données, on ne peut plus changer le classement de l'arbre** (Thanks to Tony CHEMIT) (Reported by Pascal Cauquil)
|
|
| 20 | + * [[Type::Anomalie 2891]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2891) **L'utilisation du bouton de création d'un FOB brut (sans présélection) ne fonctionne plus en mode serveur** (Thanks to Tony CHEMIT) (Reported by Pascal Cauquil)
|
|
| 21 | + * [[Type::Anomalie 2896]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2896) **Une règle de migration AVDTH ASSOC non respectée** (Thanks to Tony CHEMIT) (Reported by Pascal Cauquil)
|
|
| 22 | + * [[Type::Anomalie 2899]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2899) **Amélioration du code de mise à jour sql pour les associations lors de remplacement de référentiel** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT)
|
|
| 23 | + * [[Type::Evolution 2888]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2888) **En synchro avancée de données, amélioration de la gestion des droits des bases utilisées** (Thanks to Tony CHEMIT) (Reported by Pascal Cauquil)
|
|
| 24 | + * [[Type::Evolution 2892]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2892) **Empêcher l 'assistant synchro données avancées de poursuivre si les 2 bases n'ont pas un droit saisisseur au minimum** (Thanks to Pascal Cauquil) (Reported by Pascal Cauquil)
|
|
| 25 | + * [[Type::Evolution 2905]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2905) **Sur le formulaire Schéma détaillé de palangre, onglet "Composition", tableau "Paniers", préciser l'unité dans les en-têtes des colonnes** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT)
|
|
| 26 | + * [[Type::Evolution 2908]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2908) **LL observations/captures : ajout de champs dans le tableau récapitulatif** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT)
|
|
| 27 | + * [[Type::Evolution 2910]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2910) **Dans le cas d'une opération activité 34, toujours ajouter le matériaux balise seule sur le FOB** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT)
|
|
| 5 | 28 | |
| 6 | 29 | ## Version [9.3.5](https://gitlab.com/ultreiaio/ird-observe/-/milestones/282)
|
| 7 | 30 | |
| ... | ... | @@ -12,7 +35,6 @@ |
| 12 | 35 | * [Serveur (observe-9.3.5.war)](https://repo1.maven.org/maven2/fr/ird/observe/observe/9.3.5/observe-9.3.5.war)
|
| 13 | 36 | * [Serveur (observe-9.3.5-server.zip)](https://repo1.maven.org/maven2/fr/ird/observe/observe/9.3.5/observe-9.3.5-server.zip)
|
| 14 | 37 | |
| 15 | - |
|
| 16 | 38 | ### Issues
|
| 17 | 39 | * [[Type::Anomalie 2884]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2884) **Le système de conservation du dernier chemin utilisé pour une sauvegarde empêche le logiciel de redémarrer si le volume utilisé n'existe plus** (Thanks to Tony CHEMIT) (Reported by Pascal Cauquil)
|
| 18 | 40 | * [[Type::Anomalie 2885]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2885) **Le répertoire à utiliser pour les sauvegardes n'est pas mis à jour dans la configuration lors d'un sauvegarde pendant un nouvel import** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT)
|
| ... | ... | @@ -202,7 +202,11 @@ observe.data.ll.observation.Catch.action.save |
| 202 | 202 | observe.data.ll.observation.Catch.action.save.tip
|
| 203 | 203 | observe.data.ll.observation.Catch.count
|
| 204 | 204 | observe.data.ll.observation.Catch.count.short
|
| 205 | +observe.data.ll.observation.Catch.number
|
|
| 206 | +observe.data.ll.observation.Catch.number.short
|
|
| 205 | 207 | observe.data.ll.observation.Catch.title
|
| 208 | +observe.data.ll.observation.Catch.totalWeight
|
|
| 209 | +observe.data.ll.observation.Catch.totalWeight.short
|
|
| 206 | 210 | observe.data.ll.observation.Catch.type
|
| 207 | 211 | observe.data.ll.observation.Encounter.action.create
|
| 208 | 212 | observe.data.ll.observation.Encounter.action.save
|
| ... | ... | @@ -658,9 +658,11 @@ observe.data.ll.observation.Catch.depredatedTab |
| 658 | 658 | observe.data.ll.observation.Catch.foodAndSexualTab
|
| 659 | 659 | observe.data.ll.observation.Catch.noBranchlineSelected
|
| 660 | 660 | observe.data.ll.observation.Catch.number
|
| 661 | +observe.data.ll.observation.Catch.number.short
|
|
| 661 | 662 | observe.data.ll.observation.Catch.sizeMeasuresTab
|
| 662 | 663 | observe.data.ll.observation.Catch.title
|
| 663 | 664 | observe.data.ll.observation.Catch.totalWeight
|
| 665 | +observe.data.ll.observation.Catch.totalWeight.short
|
|
| 664 | 666 | observe.data.ll.observation.Catch.type
|
| 665 | 667 | observe.data.ll.observation.Catch.weightMeasuresTab
|
| 666 | 668 | observe.data.ll.observation.Encounter.action.create
|
| ... | ... | @@ -417,6 +417,12 @@ public class FloatingObjectReader extends DataReader<FloatingObject> { |
| 417 | 417 | addObjectMaterial(vesselActivityCode, objectMaterialUsed, dataContext.getObjectMaterialCarrion(), whenArriving, whenLeaving, entity);
|
| 418 | 418 | addDefaultObjectMaterialOnUnknownObjectType = false;
|
| 419 | 419 | }
|
| 420 | + if (vesselActivityCode.equals("34")) {
|
|
| 421 | + // add ObjectMaterial 2-2-4-4
|
|
| 422 | + // See https://gitlab.com/ultreiaio/ird-observe/-/issues/2910
|
|
| 423 | + addObjectMaterial(vesselActivityCode, objectMaterialUsed, dataContext.getObjectMaterialAlone(), whenArriving, whenLeaving, entity);
|
|
| 424 | + addDefaultObjectMaterialOnUnknownObjectType = false;
|
|
| 425 | + }
|
|
| 420 | 426 | if (floatingObjectExistsInAvdth) {
|
| 421 | 427 | // simple mapping
|
| 422 | 428 | ObjectMaterial objectMaterial = getObjectMaterialByObjectTypeCode(dataContext, objectTypeCode);
|
| ... | ... | @@ -52,8 +52,8 @@ observe.Common.batches.selected=Selected batches |
| 52 | 52 | observe.Common.beatDiameter=Beat diameter (cm)
|
| 53 | 53 | observe.Common.branchline=Branchline
|
| 54 | 54 | observe.Common.branchline.short=Branchline
|
| 55 | -observe.Common.branchlineLength=Branchline length
|
|
| 56 | -observe.Common.branchlineLength.short=Branchline length
|
|
| 55 | +observe.Common.branchlineLength=Branchline length (m)
|
|
| 56 | +observe.Common.branchlineLength.short=Branchline length (m)
|
|
| 57 | 57 | observe.Common.branchlinesComposition=Branchlines composition
|
| 58 | 58 | observe.Common.branchlinesComposition.validation.uniqueKey=Tuple (topType/type/size) must be unique, value at index %s is duplicated.
|
| 59 | 59 | observe.Common.branchlinesCompositionProportionSum=Branchlines composition proportion sum
|
| ... | ... | @@ -64,7 +64,7 @@ observe.Common.catchFate=Fate |
| 64 | 64 | observe.Common.catchFate.short=Fate
|
| 65 | 65 | observe.Common.catchHealthStatus=Catch health status
|
| 66 | 66 | observe.Common.catchHealthStatus.short=Catch health status
|
| 67 | -observe.Common.categoryMax=Weight category max (Kg) (Kg)
|
|
| 67 | +observe.Common.categoryMax=Weight category max (Kg)
|
|
| 68 | 68 | observe.Common.categoryMax.short=Cat max
|
| 69 | 69 | observe.Common.categoryMin=Category min
|
| 70 | 70 | observe.Common.categoryMin.short=Cat min
|
| ... | ... | @@ -128,10 +128,10 @@ observe.Common.fishingEndDepth=Depth at fishing end (m) |
| 128 | 128 | observe.Common.fishingStart=Fishing start
|
| 129 | 129 | observe.Common.fishingStartDepth=Depth at fishing start (m)
|
| 130 | 130 | observe.Common.floatingObject.comment=Floating object comment
|
| 131 | -observe.Common.floatline1Length=Floatline 1 length
|
|
| 132 | -observe.Common.floatline1Length.short=Floatline 1 length
|
|
| 133 | -observe.Common.floatline2Length=Floatline 2 length
|
|
| 134 | -observe.Common.floatline2Length.short=Floatline 2 length
|
|
| 131 | +observe.Common.floatline1Length=Floatline 1 length (m)
|
|
| 132 | +observe.Common.floatline1Length.short=Floatline 1 length (m)
|
|
| 133 | +observe.Common.floatline2Length=Floatline 2 length (m)
|
|
| 134 | +observe.Common.floatline2Length.short=Floatline 2 length (m)
|
|
| 135 | 135 | observe.Common.floatlinesComposition=floatlines composition
|
| 136 | 136 | observe.Common.floatlinesComposition.validation.uniqueKey=Tuple (type/length) must be unique, value at index %s is duplicated.
|
| 137 | 137 | observe.Common.floatlinesCompositionProportionSum=floatlines composition proportion sum
|
| ... | ... | @@ -368,8 +368,8 @@ observe.Common.totalLightsticksCount=Total number of lightsticks |
| 368 | 368 | observe.Common.totalLineLength=Total line length
|
| 369 | 369 | observe.Common.totalSectionsCount=Total sections
|
| 370 | 370 | observe.Common.traceCutOff=Trace cut off
|
| 371 | -observe.Common.tracelineLength=Traceline length
|
|
| 372 | -observe.Common.tracelineLength.short=Traceline length
|
|
| 371 | +observe.Common.tracelineLength=Traceline length (m)
|
|
| 372 | +observe.Common.tracelineLength.short=Traceline length (m)
|
|
| 373 | 373 | observe.Common.tracelineType=Traceline type
|
| 374 | 374 | observe.Common.tracelineType.short=Traceline type
|
| 375 | 375 | observe.Common.transmittingBuoyOperation=Transmitting buoy operation
|
| ... | ... | @@ -790,9 +790,11 @@ observe.data.ll.observation.Catch.depredatedTab=Depredation |
| 790 | 790 | observe.data.ll.observation.Catch.foodAndSexualTab=Food and sexual maturity
|
| 791 | 791 | observe.data.ll.observation.Catch.noBranchlineSelected=No branchline selected
|
| 792 | 792 | observe.data.ll.observation.Catch.number=Hauling number
|
| 793 | +observe.data.ll.observation.Catch.number.short=Hauling number
|
|
| 793 | 794 | observe.data.ll.observation.Catch.sizeMeasuresTab=Sizes
|
| 794 | 795 | observe.data.ll.observation.Catch.title=Catches
|
| 795 | 796 | observe.data.ll.observation.Catch.totalWeight=Total weight (kg)
|
| 797 | +observe.data.ll.observation.Catch.totalWeight.short=Total weight (kg)
|
|
| 796 | 798 | observe.data.ll.observation.Catch.type=Catch
|
| 797 | 799 | observe.data.ll.observation.Catch.weightMeasuresTab=Weights
|
| 798 | 800 | observe.data.ll.observation.Encounter.action.create=Create a new encounter
|
| ... | ... | @@ -52,8 +52,8 @@ observe.Common.batches.selected=Selected batches |
| 52 | 52 | observe.Common.beatDiameter=Diametro de la mordedura (cm)
|
| 53 | 53 | observe.Common.branchline=Branchline
|
| 54 | 54 | observe.Common.branchline.short=Arponcillo
|
| 55 | -observe.Common.branchlineLength=Longitud Arponcillo
|
|
| 56 | -observe.Common.branchlineLength.short=Longitud Arponcillo
|
|
| 55 | +observe.Common.branchlineLength=Longitud Arponcillo (m)
|
|
| 56 | +observe.Common.branchlineLength.short=Longitud Arponcillo (m)
|
|
| 57 | 57 | observe.Common.branchlinesComposition=Arponcillos
|
| 58 | 58 | 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.
|
| 59 | 59 | observe.Common.branchlinesCompositionProportionSum=Suma de los proporciónes de arponcillos (%)
|
| ... | ... | @@ -128,10 +128,10 @@ observe.Common.fishingEndDepth=Profundidad en fin de pesca (m) |
| 128 | 128 | observe.Common.fishingStart=Inicio de pesca
|
| 129 | 129 | observe.Common.fishingStartDepth=Profundidad en inicio de pesca (m)
|
| 130 | 130 | observe.Common.floatingObject.comment=Comentarios de objeto
|
| 131 | -observe.Common.floatline1Length=Longitud 1 del orinque
|
|
| 132 | -observe.Common.floatline1Length.short=Longitud 1 del orinque
|
|
| 133 | -observe.Common.floatline2Length=Longitud 2 del orinque
|
|
| 134 | -observe.Common.floatline2Length.short=Longitud 2 del orinque
|
|
| 131 | +observe.Common.floatline1Length=Longitud 1 del orinque (m)
|
|
| 132 | +observe.Common.floatline1Length.short=Longitud 1 del orinque (m)
|
|
| 133 | +observe.Common.floatline2Length=Longitud 2 del orinque (m)
|
|
| 134 | +observe.Common.floatline2Length.short=Longitud 2 del orinque (m)
|
|
| 135 | 135 | observe.Common.floatlinesComposition=Orinques
|
| 136 | 136 | observe.Common.floatlinesComposition.validation.uniqueKey=La tupla (tipo/longitud) debe ser única, la tupa ya está utilizada, value at index %s is duplicated.
|
| 137 | 137 | 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 |
| 368 | 368 | observe.Common.totalLineLength=Total line length\#TODO
|
| 369 | 369 | observe.Common.totalSectionsCount=totalSectionsCount \#TODO
|
| 370 | 370 | observe.Common.traceCutOff=Bajo de línea cortada
|
| 371 | -observe.Common.tracelineLength=Parte baja
|
|
| 372 | -observe.Common.tracelineLength.short=Parte baja
|
|
| 371 | +observe.Common.tracelineLength=Parte baja (m)
|
|
| 372 | +observe.Common.tracelineLength.short=Parte baja (m)
|
|
| 373 | 373 | observe.Common.tracelineType=Tipo bajo de línea
|
| 374 | 374 | observe.Common.tracelineType.short=Tipo bajo de línea
|
| 375 | 375 | observe.Common.transmittingBuoyOperation=Operación sobre baliza
|
| ... | ... | @@ -790,9 +790,11 @@ observe.data.ll.observation.Catch.depredatedTab=Depredación |
| 790 | 790 | observe.data.ll.observation.Catch.foodAndSexualTab=Alimentación y maturidad sexual
|
| 791 | 791 | observe.data.ll.observation.Catch.noBranchlineSelected=No branchline selected \#TODO
|
| 792 | 792 | observe.data.ll.observation.Catch.number=Número de virada
|
| 793 | +observe.data.ll.observation.Catch.number.short=Número de virada
|
|
| 793 | 794 | observe.data.ll.observation.Catch.sizeMeasuresTab=Tamaños (cm)
|
| 794 | 795 | observe.data.ll.observation.Catch.title=Capturas
|
| 795 | 796 | observe.data.ll.observation.Catch.totalWeight=Peso total (kg)
|
| 797 | +observe.data.ll.observation.Catch.totalWeight.short=Peso total (kg)
|
|
| 796 | 798 | observe.data.ll.observation.Catch.type=Captura
|
| 797 | 799 | observe.data.ll.observation.Catch.weightMeasuresTab=Pesos (kg)
|
| 798 | 800 | observe.data.ll.observation.Encounter.action.create=Crear una nueva encuentro
|
| ... | ... | @@ -52,8 +52,8 @@ observe.Common.batches.selected=Lots sélectionnés |
| 52 | 52 | observe.Common.beatDiameter=Diamètre de la morsure (cm)
|
| 53 | 53 | observe.Common.branchline=Avançon
|
| 54 | 54 | observe.Common.branchline.short=Avançon
|
| 55 | -observe.Common.branchlineLength=Longueur Avançon
|
|
| 56 | -observe.Common.branchlineLength.short=Longueur Avançon
|
|
| 55 | +observe.Common.branchlineLength=Longueur Avançon (m)
|
|
| 56 | +observe.Common.branchlineLength.short=Longueur Avançon (m)
|
|
| 57 | 57 | observe.Common.branchlinesComposition=Avançons
|
| 58 | 58 | observe.Common.branchlinesComposition.validation.uniqueKey=Le tuple (type haut/type bas/taille) doit être unique, la donnée de rang %s est invalide.
|
| 59 | 59 | observe.Common.branchlinesCompositionProportionSum=Somme des proportions d'avançons (%)
|
| ... | ... | @@ -128,10 +128,10 @@ observe.Common.fishingEndDepth=Profondeur en fin de pêche (m) |
| 128 | 128 | observe.Common.fishingStart=Début pêche
|
| 129 | 129 | observe.Common.fishingStartDepth=Profondeur en début de pêche (m)
|
| 130 | 130 | observe.Common.floatingObject.comment=Commentaire sur l'objet flottant
|
| 131 | -observe.Common.floatline1Length=Longueur 1 d'orin
|
|
| 132 | -observe.Common.floatline1Length.short=Longueur 1 d'orin
|
|
| 133 | -observe.Common.floatline2Length=Longueur 2 d'orin
|
|
| 134 | -observe.Common.floatline2Length.short=Longueur 2 d'orin
|
|
| 131 | +observe.Common.floatline1Length=Longueur 1 d'orin (m)
|
|
| 132 | +observe.Common.floatline1Length.short=Longueur 1 d'orin (m)
|
|
| 133 | +observe.Common.floatline2Length=Longueur 2 d'orin (m)
|
|
| 134 | +observe.Common.floatline2Length.short=Longueur 2 d'orin (m)
|
|
| 135 | 135 | observe.Common.floatlinesComposition=Orins
|
| 136 | 136 | observe.Common.floatlinesComposition.validation.uniqueKey=Le tuple (type/longueur) doit être unique, la donnée de rang %s est invalide.
|
| 137 | 137 | observe.Common.floatlinesCompositionProportionSum=Somme des proportions d'orins (%)
|
| ... | ... | @@ -368,8 +368,8 @@ observe.Common.totalLightsticksCount=Nombre total de cyalumes |
| 368 | 368 | observe.Common.totalLineLength=Longueur totale de la ligne
|
| 369 | 369 | observe.Common.totalSectionsCount=Nombre total de sections
|
| 370 | 370 | observe.Common.traceCutOff=Bas de ligne coupé
|
| 371 | -observe.Common.tracelineLength=Longueur bas de ligne
|
|
| 372 | -observe.Common.tracelineLength.short=Longueur bas de ligne
|
|
| 371 | +observe.Common.tracelineLength=Longueur bas de ligne (m)
|
|
| 372 | +observe.Common.tracelineLength.short=Longueur bas de ligne (m)
|
|
| 373 | 373 | observe.Common.tracelineType=Type bas de ligne
|
| 374 | 374 | observe.Common.tracelineType.short=Type bas de ligne
|
| 375 | 375 | observe.Common.transmittingBuoyOperation=Opération balise
|
| ... | ... | @@ -790,9 +790,11 @@ observe.data.ll.observation.Catch.depredatedTab=Déprédation |
| 790 | 790 | observe.data.ll.observation.Catch.foodAndSexualTab=Alimentation et maturité sexuelle
|
| 791 | 791 | observe.data.ll.observation.Catch.noBranchlineSelected=Aucun avançon sélectionné
|
| 792 | 792 | observe.data.ll.observation.Catch.number=Numéro au virage
|
| 793 | +observe.data.ll.observation.Catch.number.short=Numéro au virage
|
|
| 793 | 794 | observe.data.ll.observation.Catch.sizeMeasuresTab=Tailles (cm)
|
| 794 | 795 | observe.data.ll.observation.Catch.title=Captures
|
| 795 | 796 | observe.data.ll.observation.Catch.totalWeight=Poids total (kg)
|
| 797 | +observe.data.ll.observation.Catch.totalWeight.short=Poids total (kg)
|
|
| 796 | 798 | observe.data.ll.observation.Catch.type=Capture
|
| 797 | 799 | observe.data.ll.observation.Catch.weightMeasuresTab=Poids (kg)
|
| 798 | 800 | observe.data.ll.observation.Encounter.action.create=Nouvelle rencontre
|
| ... | ... | @@ -29,7 +29,7 @@ data.ll.logbook.HooksComposition=hookType,hookSize,hookOffset,proportion |
| 29 | 29 | data.ll.logbook.SamplePart=species,count,sizeMeasureType,length,weightMeasureType,weight,sex
|
| 30 | 30 | data.ll.observation.BaitsComposition=baitType,baitSettingStatus,individualSize,individualWeight,proportion
|
| 31 | 31 | data.ll.observation.BranchlinesComposition=topType,tracelineType,length,tracelineLength,proportion
|
| 32 | -data.ll.observation.Catch=section,basket,branchline,species,acquisitionMode,count,catchHealthStatus,catchFate,discardHealthStatus,depredated,comment
|
|
| 32 | +data.ll.observation.Catch=number,section,basket,branchline,species,acquisitionMode,count,catchHealthStatus,catchFate,discardHealthStatus,depredated,totalWeight,comment
|
|
| 33 | 33 | data.ll.observation.Encounter=encounterType,species,distance,count
|
| 34 | 34 | data.ll.observation.FloatlinesComposition=lineType,length,proportion
|
| 35 | 35 | data.ll.observation.HooksComposition=hookType,hookSize,hookOffset,proportion
|