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

[Git][ultreiaio/ird-observe][develop] Externaliser les bases avdth utilisées dans les tests - Closes #2912
by Tony CHEMIT (＠tchemit) 29 Jun '24

29 Jun '24

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 8c311f15 by Tony Chemit at 2024-06-29T12:01:03+02:00 Externaliser les bases avdth utilisées dans les tests - Closes #2912 - - - - - 9 changed files: - + core/persistence/test/.mvn/need-avdth - core/persistence/test/src/test/java/fr/ird/observe/persistence/avdth/referential/AvdthWeightCategoryBuilderTest.java - model/src/main/filtered-resources/observetest.properties - pom.xml - toolkit/plugin/src/main/java/fr/ird/observe/toolkit/maven/plugin/PersistenceRunner.java - + toolkit/plugin/src/main/java/fr/ird/observe/toolkit/maven/plugin/avdth/AvdthCreateDatabasesMojo.java - + toolkit/plugin/src/main/java/fr/ird/observe/toolkit/maven/plugin/avdth/AvdthDeleteCacheMojo.java - + toolkit/plugin/src/main/java/fr/ird/observe/toolkit/maven/plugin/avdth/CreateAvdthDatabases.java - + toolkit/plugin/src/main/java/fr/ird/observe/toolkit/maven/plugin/avdth/DeleteAvdthCache.java Changes: ===================================== core/persistence/test/.mvn/need-avdth ===================================== ===================================== core/persistence/test/src/test/java/fr/ird/observe/persistence/avdth/referential/AvdthWeightCategoryBuilderTest.java ===================================== @@ -71,7 +71,7 @@ public class AvdthWeightCategoryBuilderTest extends TestSupportWithConfig { @Test public void build() throws SQLException, IOException { Path avdthFile = AvdthFixtures.getAvdthCachePath() - .resolve("avdth-gen-35_74.mdb"); + .resolve("OA/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")); ===================================== model/src/main/filtered-resources/observetest.properties ===================================== @@ -25,7 +25,7 @@ observetest.model.version=${persistence.model.version} observetest.previous.model.version=${persistence.previous.model.version} observetest.tck.cache.path=${tck.cache.path} observetest.tck.credentials.path=${tck.credentials.store.path} -observetest.avdth.cache.path=${avdth.cache.path} +observetest.avdth.cache.path=${avdth.cache.path}/data observetest.first.model.version=7.0 observetest.h2.login=sa observetest.h2.password=sa ===================================== pom.xml ===================================== @@ -98,13 +98,11 @@ <persistence.previous.model.version>9.2</persistence.previous.model.version> <tck.filename>tck-v${persistence.model.version}.zip</tck.filename> <tck.updated.filename>updated-${tck.filename}</tck.updated.filename> - <tck.remote.path>/var/www/html/private/ird-observe/tck</tck.remote.path> + <tck.remote.path>/var/www/html/private/ird-observe/tck/tck</tck.remote.path> <tck.cache.path>${user.home}/.mvn/tck-cache/${model.name}/tck</tck.cache.path> <tck.credentials.store.path>${user.home}/.mvn/tck-cache/${model.name}/credentials.properties</tck.credentials.store.path> -  - <avdth.filename>avdth-v${persistence.model.version}.zip</avdth.filename> -  - <avdth.remote.path>/var/www/html/private/ird-observe/avdth</avdth.remote.path> + <avdth.filename>avdth-v9.3.6.zip</avdth.filename> + <avdth.remote.path>/var/www/html/private/ird-observe/tck/avdth</avdth.remote.path> <avdth.cache.path>${user.home}/.mvn/tck-cache/${model.name}/avdth</avdth.cache.path>  <test.skipAsserts>false</test.skipAsserts> @@ -1589,6 +1587,66 @@ </plugins> </build> </profile> + <profile> + <id>get-avdth</id> + <activation> + <file> + <exists>.mvn/need-avdth</exists> + </file> + </activation> + <build> + <plugins> + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>wagon-maven-plugin</artifactId> + <executions> + <execution> + <id>download-avdth</id> + <goals> + <goal>download-single</goal> + </goals> + <phase>initialize</phase> + <configuration> + <skipIfExists>true</skipIfExists> + <url>scpexe://ultreia.io</url> + <serverId>doc.ultreia.io</serverId> + <fromFile>${avdth.remote.path}/${avdth.filename}</fromFile> + <toDir>${avdth.cache.path}</toDir> + </configuration> + </execution> + </executions> + </plugin> + <plugin> + <groupId>${project.groupId}</groupId> + <artifactId>toolkit-maven-plugin</artifactId> + <version>${project.version}</version> + <dependencies> + <dependency> + <groupId>com.h2database</groupId> + <artifactId>h2</artifactId> + <version>${lib.version.h2}</version> + </dependency> + <dependency> + <groupId>org.postgresql</groupId> + <artifactId>postgresql</artifactId> + <version>${lib.version.postgresql}</version> + </dependency> + </dependencies> + <executions> + <execution> + <id>default-avdth-create-databases</id> + <goals> + <goal>avdth-create-databases</goal> + </goals> + <configuration> + <skipIfExists>true</skipIfExists> + </configuration> + </execution> + </executions> + </plugin> + </plugins> + </build> + </profile> <profile> <id>delete-tck</id> <activation> @@ -1616,6 +1674,33 @@ </plugins> </build> </profile> + <profile> + <id>delete-avdth</id> + <activation> + <property> + <name>delete-avdth</name> + <value>true</value> + </property> + </activation> + <build> + <defaultGoal>initialize</defaultGoal> + <plugins> + <plugin> + <groupId>${project.groupId}</groupId> + <artifactId>toolkit-maven-plugin</artifactId> + <version>${project.version}</version> + <executions> + <execution> + <id>default-avdth-delete-cache</id> + <goals> + <goal>avdth-delete-cache</goal> + </goals> + </execution> + </executions> + </plugin> + </plugins> + </build> + </profile> <profile> <id>documentation-generate-html</id> <activation> ===================================== toolkit/plugin/src/main/java/fr/ird/observe/toolkit/maven/plugin/PersistenceRunner.java ===================================== @@ -115,7 +115,21 @@ public abstract class PersistenceRunner extends MojoRunnable { throw new IllegalStateException(e); } } - return exploded; + return explodeArchive(archiveFile,exploded); + } + + protected Path explodeArchive(Path archiveFile, Path target) { + if (Files.notExists(target)) { + try { + Files.createDirectories(target); + try (InputStream inputStream = Files.newInputStream(archiveFile)) { + Zips.uncompress(inputStream, target.toFile()); + } + } catch (IOException e) { + throw new IllegalStateException(e); + } + } + return target; } protected void createForVersion(Version version, Path exploded, Path targetPath, DatabaseName... databaseNames) { ===================================== toolkit/plugin/src/main/java/fr/ird/observe/toolkit/maven/plugin/avdth/AvdthCreateDatabasesMojo.java ===================================== @@ -0,0 +1,78 @@ +package fr.ird.observe.toolkit.maven.plugin.avdth; + +/*- + * #%L + * ObServe Toolkit :: Maven plugin + * %% + * Copyright (C) 2008 - 2023 IRD, Ultreia.io + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ + +import fr.ird.observe.toolkit.maven.plugin.PersistenceMojoSupport; +import fr.ird.observe.toolkit.maven.plugin.PersistenceRunner; +import io.ultreia.java4all.i18n.spi.builder.I18nKeySet; +import org.apache.maven.plugins.annotations.LifecyclePhase; +import org.apache.maven.plugins.annotations.Mojo; +import org.apache.maven.plugins.annotations.Parameter; + +import java.io.File; +import java.io.IOException; +import java.nio.file.Files; +import java.nio.file.Path; + +/** + * Created on 29/06/2024. + * + * @author Tony Chemit - dev(a)tchemit.fr + * @since 9.4.0 + */ +@Mojo(name = "avdth-create-databases", threadSafe = true, defaultPhase = LifecyclePhase.INITIALIZE) +public class AvdthCreateDatabasesMojo extends PersistenceMojoSupport { + + @Parameter(property = "runner.archiveFile", defaultValue = "${avdth.cache.path}/${avdth.filename}", required = true) + private File archiveFile; + + @Parameter(property = "runner.avdthRootPath", defaultValue = "${avdth.cache.path}/data", required = true) + private File avdthRootPath; + + @Parameter(property = "runner.skipIfExists", defaultValue = "false") + private boolean skipIfExists; + + @Override + protected void doAction(I18nKeySet getterFile, ClassLoader classLoader) throws IOException { + Path resolve = avdthRootPath.toPath().resolve(getModelVersion().getVersion()); + if (skipIfExists && Files.exists(resolve)) { + getLog().info(String.format("Skip - files already at: %s", resolve)); + return; + } + super.doAction(getterFile, classLoader); + } + + @Override + protected CreateAvdthDatabases createRunner() { + CreateAvdthDatabases runner = new CreateAvdthDatabases(); + runner.setArchiveFile(archiveFile.toPath()); + return runner; + } + + @Override + protected void prepare(PersistenceRunner runner) { + super.prepare(runner); + runner.setSourceDirectory(avdthRootPath.toPath()); + } +} + ===================================== toolkit/plugin/src/main/java/fr/ird/observe/toolkit/maven/plugin/avdth/AvdthDeleteCacheMojo.java ===================================== @@ -0,0 +1,50 @@ +package fr.ird.observe.toolkit.maven.plugin.avdth; + +/*- + * #%L + * ObServe Toolkit :: Maven plugin + * %% + * Copyright (C) 2008 - 2023 IRD, Ultreia.io + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ + +import fr.ird.observe.toolkit.maven.plugin.PersistenceMojoSupport; +import org.apache.maven.plugins.annotations.LifecyclePhase; +import org.apache.maven.plugins.annotations.Mojo; +import org.apache.maven.plugins.annotations.Parameter; + +import java.io.File; + +/** + * Created on 29/06/2024. + * + * @author Tony Chemit - dev(a)tchemit.fr + * @since 9.4.0 + */ +@Mojo(name = "avdth-delete-cache", threadSafe = true, defaultPhase = LifecyclePhase.INITIALIZE) +public class AvdthDeleteCacheMojo extends PersistenceMojoSupport { + + @Parameter(property = "runner.avdthRootPath", defaultValue = "${avdth.cache.path}", required = true) + private File avdthRootPath; + + @Override + protected DeleteAvdthCache createRunner() { + DeleteAvdthCache runner = new DeleteAvdthCache(); + runner.setAvdthRootPath(avdthRootPath.toPath()); + return runner; + } +} ===================================== toolkit/plugin/src/main/java/fr/ird/observe/toolkit/maven/plugin/avdth/CreateAvdthDatabases.java ===================================== @@ -0,0 +1,56 @@ +package fr.ird.observe.toolkit.maven.plugin.avdth; + +/*- + * #%L + * ObServe Toolkit :: Maven plugin + * %% + * Copyright (C) 2008 - 2023 IRD, Ultreia.io + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ + +import fr.ird.observe.toolkit.maven.plugin.PersistenceRunner; + +import java.nio.file.Path; +import java.util.Objects; + +/** + * To create avdth databases from the avdth archive. + * <p> + * Created on 29/06/2024. + * + * @author Tony Chemit - dev(a)tchemit.fr + * @since 9.4.0 + */ +public class CreateAvdthDatabases extends PersistenceRunner { + protected Path archiveFile; + + public void setArchiveFile(Path archiveFile) { + this.archiveFile = archiveFile; + } + + @Override + public void init() { + super.init(); + Objects.requireNonNull(archiveFile); + } + + @Override + public void run() { + Path exploded = explodeArchive(archiveFile, sourceDirectory); + log.info(String.format("Load avdth databases for version %s to %s", modelVersion, exploded)); + } +} ===================================== toolkit/plugin/src/main/java/fr/ird/observe/toolkit/maven/plugin/avdth/DeleteAvdthCache.java ===================================== @@ -0,0 +1,61 @@ +package fr.ird.observe.toolkit.maven.plugin.avdth; + +/*- + * #%L + * ObServe Toolkit :: Maven plugin + * %% + * Copyright (C) 2008 - 2023 IRD, Ultreia.io + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ + +import fr.ird.observe.test.DataSourcesForTestManager; +import fr.ird.observe.toolkit.maven.plugin.PersistenceRunner; + +import java.io.IOException; +import java.nio.file.Path; +import java.util.Objects; + +/** + * Created on 29/06/2024. + * + * @author Tony Chemit - dev(a)tchemit.fr + * @since 9.4.0 + */ +public class DeleteAvdthCache extends PersistenceRunner { + + private Path avdthRootPath; + + public void setAvdthRootPath(Path avdthRootPath) { + this.avdthRootPath = avdthRootPath; + } + + @Override + public void init() { + super.init(); + Objects.requireNonNull(avdthRootPath); + } + + @Override + public void run() { + try { + DataSourcesForTestManager.clearCache(avdthRootPath); + } catch (IOException e) { + throw new IllegalStateException(String.format("Can't delete avdth cache at: %s", avdthRootPath), e); + } + } +} + View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/8c311f15d3bbb8458227a7bd1… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/8c311f15d3bbb8458227a7bd1… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe] Deleted branch feature/issue_avdth_cache
by Tony CHEMIT (＠tchemit) 29 Jun '24

29 Jun '24

Tony CHEMIT deleted branch feature/issue_avdth_cache at ultreiaio / ird-observe -- You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe] Pushed new branch feature/issue_avdth_cache
by Tony CHEMIT (＠tchemit) 29 Jun '24

29 Jun '24

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

1 0

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

29 Jun '24

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

1 0

[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