- Observe-commits - mailman.cloud.codelutin.com

[Git][ultreiaio/ird-observe] Pushed new branch master-9.3.x
by Tony CHEMIT (＠tchemit) 29 Jun '24

29 Jun '24

Tony CHEMIT pushed new branch master-9.3.x at ultreiaio / ird-observe -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/tree/master-9.3.x You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] Update changelog for v.9.3.6 [skip CI]
by Tony CHEMIT (＠tchemit) 27 Jun '24

27 Jun '24

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 5bb932e1 by Tony Chemit at 2024-06-27T13:25:05+02:00 Update changelog for v.9.3.6 [skip CI] - - - - - 2 changed files: - CHANGELOG.md - pom.xml Changes: ===================================== CHANGELOG.md ===================================== @@ -1,11 +1,11 @@ # ObServe changelog * Author [Tony Chemit](mailto:dev@tchemit.fr) - * Last generated at 2024-06-26 13:09. + * Last generated at 2024-06-27 13:24. ## Version [9.3.6](https://gitlab.com/ultreiaio/ird-observe/-/milestones/283) -**Closed at 2024-06-26.** +**Closed at 2024-06-27.** ### Download * [Client (observe-9.3.6-client.zip)](https://repo1.maven.org/maven2/fr/ird/observe/ob…) @@ -25,6 +25,9 @@ * [[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) * [[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) * [[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) + * [[Type::Evolution 2911]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2911) **Ultime peaufinage sur traitement d'une OPERA 34 (retrait de balise seule)** (Thanks to Tony CHEMIT) (Reported by Pascal Cauquil) + * [[Type::Documentation 2894]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2894) **Mini erreur dans la doc du migrateur AVDTH** (Thanks to Tony CHEMIT) (Reported by Pascal Cauquil) + * [[Type::Documentation 2897]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2897) **Précisions à ajouter dans la documentation de migration AVDTH** (Thanks to Pascal Cauquil) (Reported by Pascal Cauquil) ## Version [9.3.5](https://gitlab.com/ultreiaio/ird-observe/-/milestones/282) @@ -497,6 +500,7 @@ No issue. * [[Type::Evolution 2610]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2610) **Revue du remplissage de activity.setCount** (Thanks to Tony CHEMIT) (Reported by Pascal Cauquil) * [[Type::Tâche 2499]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2499) **Interrogations sur la localisation de certaines tables de ps_common** (Thanks to Tony CHEMIT) (Reported by Pascal Cauquil) * [[Type::Tâche 2596]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2596) **Réduire la taille du livrable server-zip** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Type::Documentation 2597]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2597) **Documentation de l'outil de reporting** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) ## Version [9.0.23](https://gitlab.com/ultreiaio/ird-observe/-/milestones/253) @@ -636,6 +640,7 @@ No issue. * [[Type::Evolution 2533]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2533) **Rapports Distributions de tailles** (Thanks to Tony CHEMIT) (Reported by Pascal Cauquil) * [[Type::Evolution 2535]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2535) **Ordonner les colonnes du tableau captures selon l'ordre des champs sur le formulaire** (Thanks to Tony CHEMIT) (Reported by Pascal Cauquil) * [[Type::Tâche 2480]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2480) **Les touches de recourcis F3, F4, F5... exigent que le focus soit déjà sur leur panel pour fonctionner** (Thanks to ) (Reported by Pascal Cauquil) + * [[Type::Documentation 2432]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2432) **Quel nom de rôle recherche l'assistant sécurité pour attribuer le nouveau rôle 'Opérateur de données' ?** (Thanks to Tony CHEMIT) (Reported by Pascal Cauquil) ## Version [9.0.16](https://gitlab.com/ultreiaio/ird-observe/-/milestones/242) @@ -1490,6 +1495,8 @@ No issue. * [[Type::Tâche 2280]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2280) **Eprouver le dump AZTI** (Thanks to Pascal Cauquil) (Reported by Pascal Cauquil) * [[Type::Tâche 2290]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2290) **Eprouver le dump IEO** (Thanks to Pascal Cauquil) (Reported by Tony CHEMIT) * [[Type::Tâche 2320]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2320) **Calée orpheline de la base IRD** (Thanks to Tony CHEMIT) (Reported by Pascal Cauquil) + * [[Type::Documentation 2158]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2158) **Amélioration de la documentation de l'API publique** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Type::Documentation 2233]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2233) **Documentation /data/ps/common/Trip/Create incomplète** (Thanks to Tony CHEMIT) (Reported by Pascal Cauquil) ## Version [8.0.10](https://gitlab.com/ultreiaio/ird-observe/-/milestones/187) ===================================== pom.xml ===================================== @@ -154,7 +154,7 @@ <jaxx.detectAction>true</jaxx.detectAction>  <gitlab.changesTitle>ObServe changelog</gitlab.changesTitle> - <gitlab.trackers>Type::Anomalie,Type::Evolution,Type::Tâche</gitlab.trackers> + <gitlab.trackers>Type::Anomalie,Type::Evolution,Type::Tâche,Type::Documentation</gitlab.trackers> <gitlab.fromMilestone>7.6.0</gitlab.fromMilestone> <gitlab.stagingUrl>https://ultreia.io/release/observe/${major}</gitlab.stagingUrl>  View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/5bb932e18514e1d8e9fd2a934… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/5bb932e18514e1d8e9fd2a934… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] 4 commits: Dans le cas d'une opération activité 34, toujours ajouter le matériaux balise...
by Tony CHEMIT (＠tchemit) 27 Jun '24

27 Jun '24

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 7fe3cb84 by Tony Chemit at 2024-06-27T11:45:08+02:00 Dans le cas d'une opération activité 34, toujours ajouter le matériaux balise seule sur le FOB - Closes #2910 - - - - - 7c99e313 by Tony Chemit at 2024-06-27T11:45:08+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 - - - - - b175fd69 by Tony Chemit at 2024-06-27T12:43:10+02:00 Ultime peaufinage sur traitement d'une OPERA 34 (retrait de balise seule) - Closes #2911 - - - - - 82769ba2 by Tony Chemit at 2024-06-27T12:56:09+02:00 Précisions à ajouter dans la documentation de migration AVDTH - Closes #2897 - - - - - 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: ===================================== core/persistence/avdth/src/main/java/fr/ird/observe/persistence/avdth/data/logbook/FloatingObjectReader.java ===================================== @@ -98,7 +98,7 @@ public class FloatingObjectReader extends DataReader<FloatingObject> { .put("31", "8") .put("32", "8") .put("33", "11") - .put("34", "4") + .put("34", "99") // See https://gitlab.com/ultreiaio/ird-observe/-/issues/2568 .put("40", "11") .put("41", "11") @@ -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 ===================================== 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 ===================================== 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 ===================================== src/site/markdown/avdth/logbook.md ===================================== @@ -202,7 +202,7 @@ Cela est réalisé via la table de correspondace suivante : | 31 | 8 | | 32 | 8 | | 33 | 11 | -| 34 | 4 | +| 34 | 99 | | 40 | 11 | | 41 | 11 | @@ -278,6 +278,8 @@ Dans ce cas, on peut ajouter un éventuel matériel en utilisant la table de cor ##### Matériel Bouée émettrice seule +Lorsque **ACTIVITE.C_OPERA** vaut **34**, on ajoute toujours un tel matériel. + Dernier cas permettant d'ajouter un matériel de type **Bouée émettrice seule** au DCP : 1. Le DCP n'est pas déclaré dans **AVDTH** @@ -374,6 +376,7 @@ Pour renseigner le propriétaire de la balise ```transmittingBuoyOwnerShip``` ( |:---------------------------|:---------------------------------------------| | 1 | 0 | | 2 | 3 | +| 3 | null | Pour renseigner le code de la balise, on recopie la valeur de la colonne ```ACTIVITE.V_ID_BALISE```. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/45e04e17f20c96eaabe16ae9… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/45e04e17f20c96eaabe16ae9… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] 4 commits: Update changelog for v.9.3.6 [skip CI]
by Tony CHEMIT (＠tchemit) 26 Jun '24

26 Jun '24

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 609a7959 by Tony Chemit at 2024-06-26T13:11:08+02:00 Update changelog for v.9.3.6 [skip CI] - - - - - 14d5e257 by Tony Chemit at 2024-06-26T13:11:08+02:00 LL observations/captures : ajout de champs dans le tableau récapitulatif - Closes #2908 - - - - - 13c7c369 by Tony Chemit at 2024-06-26T13:11:08+02:00 Dans le cas d'une opération activité 34, toujours ajouter le matériaux balise seule sur le FOB - Closes #2910 - - - - - 45e04e17 by Tony Chemit at 2024-06-26T13:11:08+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 - - - - - 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: ===================================== CHANGELOG.md ===================================== @@ -1,7 +1,30 @@ # ObServe changelog * Author [Tony Chemit](mailto:dev@tchemit.fr) - * Last generated at 2024-05-22 10:52. + * Last generated at 2024-06-26 13:09. + +## Version [9.3.6](https://gitlab.com/ultreiaio/ird-observe/-/milestones/283) + +**Closed at 2024-06-26.** + +### Download +* [Client (observe-9.3.6-client.zip)](https://repo1.maven.org/maven2/fr/ird/observe/ob…) +* [Serveur (observe-9.3.6.war)](https://repo1.maven.org/maven2/fr/ird/observe/observe/9…) +* [Serveur (observe-9.3.6-server.zip)](https://repo1.maven.org/maven2/fr/ird/observe/ob…) + + +### Issues + * [[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) + * [[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) + * [[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) + * [[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) + * [[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) + * [[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) + * [[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) + * [[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) + * [[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) + * [[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) + * [[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) ## Version [9.3.5](https://gitlab.com/ultreiaio/ird-observe/-/milestones/282) @@ -12,7 +35,6 @@ * [Serveur (observe-9.3.5.war)](https://repo1.maven.org/maven2/fr/ird/observe/observe/9…) * [Serveur (observe-9.3.5-server.zip)](https://repo1.maven.org/maven2/fr/ird/observe/ob…) - ### Issues * [[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) * [[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) ===================================== 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/ad2685762a1e1d2f99d1ce19… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/ad2685762a1e1d2f99d1ce19… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] Update changelog for v.9.3.6 [skip CI]
by Tony CHEMIT (＠tchemit) 26 Jun '24

26 Jun '24

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: ad268576 by Tony Chemit at 2024-06-26T13:09:09+02:00 Update changelog for v.9.3.6 [skip CI] - - - - - 1 changed file: - CHANGELOG.md Changes: ===================================== CHANGELOG.md ===================================== @@ -1,17 +1,12 @@ # ObServe changelog * Author [Tony Chemit](mailto:dev@tchemit.fr) - * Last generated at 2024-06-26 10:05. + * Last generated at 2024-06-26 13:09. ## Version [9.3.6](https://gitlab.com/ultreiaio/ird-observe/-/milestones/283) **Closed at 2024-06-26.** -### Download -* [Client (observe-9.3.6-client.zip)](https://repo1.maven.org/maven2/fr/ird/observe/ob…) -* [Serveur (observe-9.3.6.war)](https://repo1.maven.org/maven2/fr/ird/observe/observe/9…) -* [Serveur (observe-9.3.6-server.zip)](https://repo1.maven.org/maven2/fr/ird/observe/ob…) - ### Issues * [[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) @@ -22,6 +17,9 @@ * [[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) * [[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) * [[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) + * [[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) + * [[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) + * [[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) ## Version [9.3.5](https://gitlab.com/ultreiaio/ird-observe/-/milestones/282) View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/ad2685762a1e1d2f99d1ce196… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/ad2685762a1e1d2f99d1ce196… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] 3 commits: LL observations/captures : ajout de champs dans le tableau récapitulatif - Closes #2908
by Tony CHEMIT (＠tchemit) 26 Jun '24

26 Jun '24

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/072987cbd055819ab5389c81… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/072987cbd055819ab5389c81… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] Update changelog for v.9.3.6 [skip CI]
by Tony CHEMIT (＠tchemit) 26 Jun '24

26 Jun '24

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 072987cb by Tony Chemit at 2024-06-26T10:07:01+02:00 Update changelog for v.9.3.6 [skip CI] - - - - - 1 changed file: - CHANGELOG.md Changes: ===================================== CHANGELOG.md ===================================== @@ -1,7 +1,27 @@ # ObServe changelog * Author [Tony Chemit](mailto:dev@tchemit.fr) - * Last generated at 2024-05-22 10:52. + * Last generated at 2024-06-26 10:05. + +## Version [9.3.6](https://gitlab.com/ultreiaio/ird-observe/-/milestones/283) + +**Closed at 2024-06-26.** + +### Download +* [Client (observe-9.3.6-client.zip)](https://repo1.maven.org/maven2/fr/ird/observe/ob…) +* [Serveur (observe-9.3.6.war)](https://repo1.maven.org/maven2/fr/ird/observe/observe/9…) +* [Serveur (observe-9.3.6-server.zip)](https://repo1.maven.org/maven2/fr/ird/observe/ob…) + + +### Issues + * [[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) + * [[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) + * [[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) + * [[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) + * [[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) + * [[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) + * [[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) + * [[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) ## Version [9.3.5](https://gitlab.com/ultreiaio/ird-observe/-/milestones/282) @@ -12,7 +32,6 @@ * [Serveur (observe-9.3.5.war)](https://repo1.maven.org/maven2/fr/ird/observe/observe/9…) * [Serveur (observe-9.3.5-server.zip)](https://repo1.maven.org/maven2/fr/ird/observe/ob…) - ### Issues * [[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) * [[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) View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/072987cbd055819ab5389c819… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/072987cbd055819ab5389c819… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] Do not deploy to tomcat in build-for-release
by Tony CHEMIT (＠tchemit) 26 Jun '24

26 Jun '24

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 3ed656ed by Tony Chemit at 2024-06-26T09:09:44+02:00 Do not deploy to tomcat in build-for-release - - - - - 1 changed file: - .gitlab-ci.yml Changes: ===================================== .gitlab-ci.yml ===================================== @@ -47,7 +47,7 @@ cache: environment: name: test script: - - if [ -n "${BUILD_FOR_RELEASE}" ]; then ultreiaio-maven-execute 'clean install -U -e -DperformRelease -Pdeploy'; fi + - if [ -n "${BUILD_FOR_RELEASE}" ]; then ultreiaio-maven-execute 'clean install -U -e -DperformRelease -Pdeploy -Dmaven.tomcat.skip'; fi .publish-site: &publish-site environment: View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/3ed656ed2ea6cede959251e11… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/3ed656ed2ea6cede959251e11… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] 2 commits: Fix one validator which used system locale to translate a type (instead of...
by Tony CHEMIT (＠tchemit) 26 Jun '24

26 Jun '24

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 196e173a by Tony Chemit at 2024-06-26T08:31:50+02:00 Fix one validator which used system locale to translate a type (instead of using the decoratorService locale) - - - - - 2cb15c22 by Tony Chemit at 2024-06-26T08:32:13+02:00 Fix ValidateServiceFixtures (assert arguments are flipped) - - - - - 2 changed files: - core/services/test/src/main/java/fr/ird/observe/services/service/ValidateServiceFixtures.java - toolkit/api-validation/src/main/java/fr/ird/observe/validation/validators/referential/IdDtoReferentialDisabledFieldValidationSupport.java Changes: ===================================== core/services/test/src/main/java/fr/ird/observe/services/service/ValidateServiceFixtures.java ===================================== @@ -115,7 +115,7 @@ public class ValidateServiceFixtures extends GeneratedValidateServiceFixtures { } private void assertResult(ValidationResult actual, ValidationResult expected) { - Assert.assertEquals(actual.getNodes().size(), expected.getNodes().size()); + Assert.assertEquals(expected.getNodes().size(), actual.getNodes().size()); Iterator<ValidationResultDto> expectedIterator = expected.getNodes().iterator(); for (ValidationResultDto actualNode : actual.getNodes()) { @@ -125,9 +125,9 @@ public class ValidateServiceFixtures extends GeneratedValidateServiceFixtures { } private void assertResult(ValidationResultDto actual, ValidationResultDto expected) { - Assert.assertEquals(actual.getDatum().getId(), expected.getDatum().getId()); - Assert.assertEquals(actual.getMessages(), expected.getMessages()); - Assert.assertEquals(actual.getChildCount(), expected.getChildCount()); + Assert.assertEquals(expected.getDatum().getId(), actual.getDatum().getId()); + Assert.assertEquals(expected.getMessages(), actual.getMessages()); + Assert.assertEquals(expected.getChildCount(), actual.getChildCount()); if (actual.getChildren() != null) { Iterator<ValidationResultDto> actualChildren = actual.getChildren().iterator(); Iterator<ValidationResultDto> expectedChildren = expected.getChildren().iterator(); ===================================== toolkit/api-validation/src/main/java/fr/ird/observe/validation/validators/referential/IdDtoReferentialDisabledFieldValidationSupport.java ===================================== @@ -106,7 +106,8 @@ public abstract class IdDtoReferentialDisabledFieldValidationSupport extends Nui referenceValue = referentialDtoReference.toString(); } else { if (referenceType == null) { - referenceType = I18nDecoratorHelper.getType(referentialDtoReference.getReferenceType()); + DecoratorService decoratorService = (DecoratorService) stack.findValue("decoratorService"); + referenceType = I18nDecoratorHelper.getType(decoratorService.getReferentialLocale().getLocale(), referentialDtoReference.getReferenceType()); } } try { View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/aa8ce8cce35d5bf8b9614d9a… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/aa8ce8cce35d5bf8b9614d9a… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] Fix persistence tests (by skipping them), when some files are missing to execute them
by Tony CHEMIT (＠tchemit) 25 Jun '24

25 Jun '24

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: aa8ce8cc by Tony Chemit at 2024-06-25T17:40:30+02:00 Fix persistence tests (by skipping them), when some files are missing to execute them - - - - - 5 changed files: - core/persistence/test/src/test/java/fr/ird/observe/persistence/avdth/data/AvdthDataBuilderTestSupport.java - core/persistence/test/src/test/java/fr/ird/observe/persistence/avdth/referential/AvdthReferentialBuilderTest.java - core/persistence/test/src/test/java/fr/ird/observe/persistence/avdth/referential/AvdthWeightCategoryBuilderTest.java - core/persistence/test/src/test/java/org/nuiton/topia/persistence/jdbc/JdbcHelperPostgresTest.java - toolkit/test-api/src/main/java/fr/ird/observe/test/ObserveTestConfiguration.java Changes: ===================================== core/persistence/test/src/test/java/fr/ird/observe/persistence/avdth/data/AvdthDataBuilderTestSupport.java ===================================== @@ -98,6 +98,7 @@ public abstract class AvdthDataBuilderTestSupport extends PersistenceTestSupport } public static List<String> allDatabases(Path path) { + Assume.assumeTrue("Skip, avdth root path " + path + " not found", Files.exists(path)); try (Stream<Path> pathStream = Files.find(path, 1, (p, b) -> p.toFile().getName().endsWith(".mdb"))) { List<String> collect = pathStream.map(p -> p.toFile().getName()).sorted().collect(Collectors.toList()); Collections.reverse(collect); @@ -127,6 +128,7 @@ public abstract class AvdthDataBuilderTestSupport extends PersistenceTestSupport public void build() throws SQLException, IOException, MissingReferentialException { log.info(String.format("Start for database: %s", dbName)); Path avdthFile = getRootPath().resolve(dbName); + Assume.assumeTrue("Skip, avdth file " + avdthFile + " not found", Files.exists(avdthFile)); Path scriptPath = TOPIA_TEST_CLASS_RESOURCE.getTestDirectory().toPath().resolve("export-" + dbName.replace(".mdb", ".sql")); Path scriptTemporaryDirectory = scriptPath.getParent().resolve(scriptPath.toFile().getName().replace(".sql", "-tmp")); ===================================== core/persistence/test/src/test/java/fr/ird/observe/persistence/avdth/referential/AvdthReferentialBuilderTest.java ===================================== @@ -39,10 +39,12 @@ import fr.ird.observe.test.spi.DatabaseNameConfiguration; import fr.ird.observe.test.spi.DatabasePasswordConfiguration; import fr.ird.observe.test.spi.DatabaseVersionConfiguration; import org.junit.Assert; +import org.junit.Assume; import org.junit.ClassRule; import org.junit.Test; import java.io.IOException; +import java.nio.file.Files; import java.nio.file.Path; import java.sql.Connection; import java.sql.SQLException; @@ -74,6 +76,7 @@ public class AvdthReferentialBuilderTest extends TestSupportWithConfig { Path avdthFile = AvdthFixtures.getAvdthCachePath() .resolve("OA") .resolve("OA_2020_V35.mdb"); + Assume.assumeTrue("Skip, avdth file " + avdthFile + " not found", Files.exists(avdthFile)); Path scriptPath = localTestMethodResource.getTestDirectory().toPath().resolve("export-" + avdthFile.toFile().getName().replace(".mdb", ".sql")); Path scriptTemporaryDirectory = scriptPath.getParent().resolve(scriptPath.toFile().getName().replace(".sql", "-tmp")); ===================================== core/persistence/test/src/test/java/fr/ird/observe/persistence/avdth/referential/AvdthWeightCategoryBuilderTest.java ===================================== @@ -38,10 +38,12 @@ import fr.ird.observe.test.spi.DatabaseNameConfiguration; import fr.ird.observe.test.spi.DatabasePasswordConfiguration; import fr.ird.observe.test.spi.DatabaseVersionConfiguration; import org.junit.Assert; +import org.junit.Assume; import org.junit.ClassRule; import org.junit.Test; import java.io.IOException; +import java.nio.file.Files; import java.nio.file.Path; import java.sql.Connection; import java.sql.SQLException; @@ -70,6 +72,7 @@ public class AvdthWeightCategoryBuilderTest extends TestSupportWithConfig { public void build() throws SQLException, IOException { Path avdthFile = AvdthFixtures.getAvdthCachePath() .resolve("avdth-gen-35_74.mdb"); + Assume.assumeTrue("Skip, avdth file " + avdthFile + " not found", Files.exists(avdthFile)); Path scriptPath = localTestMethodResource.getTestDirectory().toPath().resolve("export-" + avdthFile.toFile().getName().replace(".mdb", ".sql")); Path scriptTemporaryDirectory = scriptPath.getParent().resolve(scriptPath.toFile().getName().replace(".sql", "-tmp")); ===================================== core/persistence/test/src/test/java/org/nuiton/topia/persistence/jdbc/JdbcHelperPostgresTest.java ===================================== @@ -61,10 +61,10 @@ public class JdbcHelperPostgresTest { @Test public void isTableExist() throws SQLException { - boolean actual = jdbcHelper.isTableExist("Public", "Tms_version"); + boolean actual = jdbcHelper.isTableExist("Common", "database_version"); Assert.assertTrue(actual); - actual = jdbcHelper.isTableExist("PUBLIC", "tms_version-fake"); + actual = jdbcHelper.isTableExist("PUBLIC", "database_version-fake"); Assert.assertFalse(actual); } @Test ===================================== toolkit/test-api/src/main/java/fr/ird/observe/test/ObserveTestConfiguration.java ===================================== @@ -33,10 +33,12 @@ import fr.ird.observe.test.spi.DatabaseVersionConfiguration; import io.ultreia.java4all.util.Version; import io.ultreia.java4all.util.sql.conf.JdbcConfiguration; import io.ultreia.java4all.util.sql.conf.JdbcConfigurationBuilder; +import org.junit.Assume; import java.lang.reflect.AnnotatedElement; import java.net.MalformedURLException; import java.net.URL; +import java.nio.file.Files; import java.nio.file.Path; /** @@ -145,9 +147,9 @@ public class ObserveTestConfiguration { } public static JdbcConfiguration pgConfiguration() { - return new JdbcConfigurationBuilder().forDatabase(ObserveTestConfiguration.getTestPropertyAsString(ObserveTestConfiguration.PG_URL),//"jdbc:postgresql://localhost:5432/observe_9", - ObserveTestConfiguration.getTestPropertyAsString(ObserveTestConfiguration.PG_LOGIN),//"obstuna-referentiel", - ObserveTestConfiguration.getTestPropertyAsString(ObserveTestConfiguration.PG_PASSWORD)//";;dm8-referentiel.." + return new JdbcConfigurationBuilder().forDatabase(ObserveTestConfiguration.getTestPropertyAsString(ObserveTestConfiguration.PG_URL), + ObserveTestConfiguration.getTestPropertyAsString(ObserveTestConfiguration.PG_LOGIN), + ObserveTestConfiguration.getTestPropertyAsString(ObserveTestConfiguration.PG_PASSWORD) ); } @@ -155,6 +157,7 @@ public class ObserveTestConfiguration { public static void injectCredentials() { Path credentialPath = Path.of(ObserveTestConfiguration.getTestPropertyAsString(ToolkitFixtures.TEST_CREDENTIALS_KEY)); + Assume.assumeTrue("Skip, no credential file found", Files.exists(credentialPath)); ToolkitFixtures.injectCredentials(credentialPath, ObserveTestConfiguration.PG_URL, ObserveTestConfiguration.PG_LOGIN, View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/aa8ce8cce35d5bf8b9614d9a3… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/aa8ce8cce35d5bf8b9614d9a3… You're receiving this email because of your account on gitlab.com.

1 0