Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe
Commits:
-
7fe3cb84
by Tony Chemit at 2024-06-27T11:45:08+02:00
-
7c99e313
by Tony Chemit at 2024-06-27T11:45:08+02:00
-
b175fd69
by Tony Chemit at 2024-06-27T12:43:10+02:00
-
82769ba2
by Tony Chemit at 2024-06-27T12:56:09+02:00
5 changed files:
- 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
- src/site/markdown/avdth/logbook.md
Changes:
| ... | ... | @@ -98,7 +98,7 @@ public class FloatingObjectReader extends DataReader<FloatingObject> { |
| 98 | 98 | .put("31", "8")
|
| 99 | 99 | .put("32", "8")
|
| 100 | 100 | .put("33", "11")
|
| 101 | - .put("34", "4")
|
|
| 101 | + .put("34", "99")
|
|
| 102 | 102 | // See https://gitlab.com/ultreiaio/ird-observe/-/issues/2568
|
| 103 | 103 | .put("40", "11")
|
| 104 | 104 | .put("41", "11")
|
| ... | ... | @@ -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
|
| ... | ... | @@ -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
|
| ... | ... | @@ -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
|
| ... | ... | @@ -202,7 +202,7 @@ Cela est réalisé via la table de correspondace suivante : |
| 202 | 202 | | 31 | 8 |
|
| 203 | 203 | | 32 | 8 |
|
| 204 | 204 | | 33 | 11 |
|
| 205 | -| 34 | 4 |
|
|
| 205 | +| 34 | 99 |
|
|
| 206 | 206 | | 40 | 11 |
|
| 207 | 207 | | 41 | 11 |
|
| 208 | 208 | |
| ... | ... | @@ -278,6 +278,8 @@ Dans ce cas, on peut ajouter un éventuel matériel en utilisant la table de cor |
| 278 | 278 | |
| 279 | 279 | ##### Matériel Bouée émettrice seule
|
| 280 | 280 | |
| 281 | +Lorsque **ACTIVITE.C_OPERA** vaut **34**, on ajoute toujours un tel matériel.
|
|
| 282 | + |
|
| 281 | 283 | Dernier cas permettant d'ajouter un matériel de type **Bouée émettrice seule** au DCP :
|
| 282 | 284 | |
| 283 | 285 | 1. Le DCP n'est pas déclaré dans **AVDTH**
|
| ... | ... | @@ -374,6 +376,7 @@ Pour renseigner le propriétaire de la balise ```transmittingBuoyOwnerShip``` ( |
| 374 | 376 | |:---------------------------|:---------------------------------------------|
|
| 375 | 377 | | 1 | 0 |
|
| 376 | 378 | | 2 | 3 |
|
| 379 | +| 3 | null |
|
|
| 377 | 380 | |
| 378 | 381 | Pour renseigner le code de la balise, on recopie la valeur de la colonne ```ACTIVITE.V_ID_BALISE```.
|
| 379 | 382 |