This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository echobase. See https://gitlab.nuiton.org/codelutin/echobase.git commit 1fe4581f7b306d9af96e6fa2e51ea63e0a95c449 Author: jcouteau <couteau@codelutin.com> Date: Thu Jan 30 15:53:49 2020 +0100 Update doc --- pom.xml | 24 ++++++++++++++++++++++++ src/site/en/rst/importData.rst | 10 ++++++---- src/site/rst/importData.rst | 42 +++++++++++++++++++++++------------------- 3 files changed, 53 insertions(+), 23 deletions(-) diff --git a/pom.xml b/pom.xml index b545b51c..8d18b826 100644 --- a/pom.xml +++ b/pom.xml @@ -539,6 +539,30 @@ </plugins> </pluginManagement> + <plugins> + <!--For sonar code coverage--> + <plugin> + <groupId>org.jacoco</groupId> + <artifactId>jacoco-maven-plugin</artifactId> + <version>0.8.5</version> + <executions> + <execution> + <id>default-prepare-agent</id> + <goals> + <goal>prepare-agent</goal> + </goals> + </execution> + <execution> + <id>default-report</id> + <phase>test</phase> + <goals> + <goal>report</goal> + </goals> + </execution> + </executions> + </plugin> + </plugins> + </build> <reporting> diff --git a/src/site/en/rst/importData.rst b/src/site/en/rst/importData.rst index f7ce6e9b..944b3899 100644 --- a/src/site/en/rst/importData.rst +++ b/src/site/en/rst/importData.rst @@ -491,7 +491,7 @@ Required columns :: - operationId;baracoudaCode;numFish;dataLabel;dataValue;name + operationId;baracoudaCode;numFish;dataLabel;dataValue;name;sizeCategory Columns formats --------------- @@ -511,14 +511,16 @@ Columns formats +----------------+--------------------------+ | dataValue |(Float-NA) | +----------------+--------------------------+ +| sizeCategory |FK(SizeCategory#name) | ++----------------+--------------------------+ Example ------- :: - operationId;baracoudaCode;numFish;dataLabel;dataValue;name - P5002;ENGR-ENC;9394;NA;-1;Age + operationId;baracoudaCode;numFish;dataLabel;dataValue;name;sizeCategory + P5002;ENGR-ENC;9394;NA;-1;Age;0 Acoustic (voyage or mooring) ============================ @@ -716,7 +718,7 @@ Required columns :: - voyage;echotypeName;depthStratumId;meaning;baracoudaCode + voyage;echotypeName;depthStratumId;meaning;baracoudaCode;id Columns formats --------------- diff --git a/src/site/rst/importData.rst b/src/site/rst/importData.rst index 1335aa92..b26b03e3 100644 --- a/src/site/rst/importData.rst +++ b/src/site/rst/importData.rst @@ -497,7 +497,7 @@ Colonnes requises :: - operationId;baracoudaCode;numFish;dataLabel;dataValue;name + operationId;baracoudaCode;numFish;dataLabel;dataValue;name;sizeCategory Format des colonnes ------------------- @@ -517,14 +517,16 @@ Format des colonnes +----------------+--------------------------+ | dataValue |(Float-NA) | +----------------+--------------------------+ +| sizeCategory |FK(SizeCategory#name) | ++----------------+--------------------------+ Exemple ------- :: - operationId;baracoudaCode;numFish;dataLabel;dataValue;name - P5002;ENGR-ENC;9394;NA;-1;Age + operationId;baracoudaCode;numFish;dataLabel;dataValue;name;sizeCategory + P5002;ENGR-ENC;9394;NA;-1;Age;1 Acoustic (voyage ou bouée) ========================== @@ -722,32 +724,34 @@ Colonnes requises :: - voyage;echotypeName;depthStratumId;meaning;baracoudaCode + voyage;echotypeName;depthStratumId;meaning;baracoudaCode;id Format des colonnes ------------------- -+-----------------+--------------------------+ -| Colonne | Type | -+=================+==========================+ -| echotypeName |text | -+-----------------+--------------------------+ -| meaning |text | -+-----------------+--------------------------+ -| voyage |FK(Voyage#name) | -+-----------------+--------------------------+ -| depthStratumId |FK(DepthStratum#id) | -+-----------------+--------------------------+ -| baracoudaCode |FK(Species#baracoudaCode) | -+-----------------+--------------------------+ ++-----------------+-------------------------------+ +| Colonne | Type | ++=================+===============================+ +| echotypeName |text | ++-----------------+-------------------------------+ +| meaning |text | ++-----------------+-------------------------------+ +| voyage |FK(Voyage#name) | ++-----------------+-------------------------------+ +| depthStratumId |FK(DepthStratum#id) | ++-----------------+-------------------------------+ +| baracoudaCode |FK(Species#baracoudaCode) | ++-----------------+-------------------------------+ +| id |integer (species category code | ++-----------------+-------------------------------+ Exemple ------- :: - voyage;echotypeName;depthStratumId;meaning;baracoudaCode - PELGAS2011;D1;CLAS;Maquereaux, Chinchards et gadidés présents dans les couches à proximité du fond;COMP-LEM + voyage;echotypeName;depthStratumId;meaning;baracoudaCode;id + PELGAS2011;D1;CLAS;Maquereaux, Chinchards et gadidés présents dans les couches à proximité du fond;COMP-LEM;& LengthWeightKey ~~~~~~~~~~~~~~~ -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.