branch develop updated (12f010d4 -> 288af566)
This is an automated email from the git hooks/post-receive script. New change to branch develop in repository echobase. See https://gitlab.nuiton.org/codelutin/echobase.git from 12f010d4 Trying to fix releasable status : using pom v11 as parent pom new 6b367956 i18n update new 288af566 update doc The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit 288af566830a0b85c9231884a93cf0f47024da0e Author: jcouteau <couteau@codelutin.com> Date: Fri Feb 21 16:41:14 2020 +0100 update doc commit 6b367956c1072b97e95560e5ad4d69a4334927ba Author: jcouteau <couteau@codelutin.com> Date: Fri Feb 21 16:40:59 2020 +0100 i18n update Summary of changes: .../resources/i18n/echobase-ui_en_GB.properties | 28 +++++++------- .../resources/i18n/echobase-ui_fr_FR.properties | 44 +++++++++++----------- .../en/rst/{update.rst.vm => exportAtlantos.rst} | 25 +++++++----- .../rst/importDb.rst => rst/exportAtlantos.rst} | 43 ++++++++------------- 4 files changed, 67 insertions(+), 73 deletions(-) copy src/site/en/rst/{update.rst.vm => exportAtlantos.rst} (53%) copy src/site/{en/rst/importDb.rst => rst/exportAtlantos.rst} (51%) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
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 6b367956c1072b97e95560e5ad4d69a4334927ba Author: jcouteau <couteau@codelutin.com> Date: Fri Feb 21 16:40:59 2020 +0100 i18n update --- .../resources/i18n/echobase-ui_en_GB.properties | 28 +++++++------- .../resources/i18n/echobase-ui_fr_FR.properties | 44 +++++++++++----------- 2 files changed, 36 insertions(+), 36 deletions(-) diff --git a/echobase-ui/src/main/resources/i18n/echobase-ui_en_GB.properties b/echobase-ui/src/main/resources/i18n/echobase-ui_en_GB.properties index 26aff15b..839b13f0 100644 --- a/echobase-ui/src/main/resources/i18n/echobase-ui_en_GB.properties +++ b/echobase-ui/src/main/resources/i18n/echobase-ui_en_GB.properties @@ -90,25 +90,25 @@ echobase.common.digitThreshold=Digitization threshold echobase.common.distributionStatement=Distribution statement echobase.common.downLimit=Down limit echobase.common.eastLimit=East limit -echobase.common.echotypeFile= +echobase.common.echotypeFile=Echotype file echobase.common.email=E-mail echobase.common.entityId=ID echobase.common.entityType=Entity type -echobase.common.esduByEchotypeAndSpeciesCategoryAndLengthFile= -echobase.common.esduByEchotypeAndSpeciesCategoryFile= -echobase.common.esduByEchotypeFile= -echobase.common.esduBySpeciesAndAgeCategoryFile= +echobase.common.esduByEchotypeAndSpeciesCategoryAndLengthFile=Results by echotype and speciesCategory and length file +echobase.common.esduByEchotypeAndSpeciesCategoryFile=Results by echotype and speciesCategory file +echobase.common.esduByEchotypeFile=Results by echotype file +echobase.common.esduBySpeciesAndAgeCategoryFile=Results by speciesCategory and ageCategory file echobase.common.exportDbMode=Mode echobase.common.extractCommunityIndicator=Extract community indicators echobase.common.extractMaps=Extract maps echobase.common.extractPopulationIndicator=Extract population indicators echobase.common.extractRawData=Extract raw data echobase.common.facade=Facade (Coser) -echobase.common.gearMetadataFile= +echobase.common.gearMetadataFile=Gear metadata file echobase.common.id=ID echobase.common.importDataMode=Import type echobase.common.importDate=Import date -echobase.common.importDbFile= +echobase.common.importDbFile=import file echobase.common.importDbMode=Import db mode echobase.common.importEntity=For echobase.common.importError=Error\: @@ -135,8 +135,8 @@ echobase.common.jdbcUrl=Connection URL echobase.common.keywords=Keywords echobase.common.lastModifiedDate=Last modified date echobase.common.lastModifiedUser=Last modified user -echobase.common.lengthAgeKeyFile= -echobase.common.lengthWeightKeyFile= +echobase.common.lengthAgeKeyFile=Length-age key file +echobase.common.lengthWeightKeyFile=Length-weight key file echobase.common.litteratureReferences=References echobase.common.loggedDataDatatype=loggedDataDatatype echobase.common.loggedDataFormat=loggedDataFormat @@ -183,14 +183,14 @@ echobase.common.spatialAware=Is database spatial aware ? echobase.common.spatialStructureFound=Is database spatialized ? echobase.common.startEndDate=Start - End date echobase.common.startEndPort=Start - End port -echobase.common.subSampleFile= -echobase.common.totalSampleFile= +echobase.common.subSampleFile=Subsamples file +echobase.common.totalSampleFile=Totals file echobase.common.transceiverAcquisitionAbsorptionDescription=Transceiver absorption coefficient computation method (data acquisition) echobase.common.transectBinUnitsPingAxis=Bin units along the ping axis (transect) -echobase.common.transectFile= +echobase.common.transectFile=Transect file echobase.common.transectGeospatialVerticalPositive=GeospatialVerticalPositive (transect) echobase.common.transectLicence=Data license (transect) -echobase.common.transitFile= +echobase.common.transitFile=Transit file echobase.common.transitRelatedActivity=Transit related activities echobase.common.units=Units echobase.common.upLimit=Up limit @@ -199,7 +199,7 @@ echobase.common.userName=User name echobase.common.vessel=Vessel echobase.common.voyage=Cruise echobase.common.voyageDescription=Description -echobase.common.voyageFile= +echobase.common.voyageFile=Voyage file echobase.common.westLimit=West limit echobase.common.zone=Zone (Coser) echobase.common.zunits=Units up/down limit diff --git a/echobase-ui/src/main/resources/i18n/echobase-ui_fr_FR.properties b/echobase-ui/src/main/resources/i18n/echobase-ui_fr_FR.properties index 6cd42d94..f6a6d355 100644 --- a/echobase-ui/src/main/resources/i18n/echobase-ui_fr_FR.properties +++ b/echobase-ui/src/main/resources/i18n/echobase-ui_fr_FR.properties @@ -64,14 +64,14 @@ echobase.common.ancillaryInstrumentationFile=Fichier des données des autres cap echobase.common.areaOfOperation=Zone d'activités echobase.common.author=Auteur echobase.common.authorEmail=Courriel de l'auteur -echobase.common.biometrySampleFile= +echobase.common.biometrySampleFile=Fichier des biométries echobase.common.calibrationsFile=Fichier des calibrations echobase.common.cellMapsFishFile=Fichier des cellules Cartes (Poisson) echobase.common.cellMapsOtherFile=Fichier des cellules Cartes (Autre) echobase.common.cellPositionReference=Référentiel géographique des cellules d'écho-intégration -echobase.common.cellRegionAssociationFile= -echobase.common.cellRegionResultFile= -echobase.common.cellRegionsFile= +echobase.common.cellRegionAssociationFile=Fichier des associations de région +echobase.common.cellRegionResultFile=Fichiers des résultats par région +echobase.common.cellRegionsFile=Fichier des régions echobase.common.code=Code echobase.common.comment=Commentaire echobase.common.comments=Commentaires @@ -90,25 +90,25 @@ echobase.common.digitThreshold=Seuil de numérisation echobase.common.distributionStatement=Conditions de diffusion des données echobase.common.downLimit=Limite basse echobase.common.eastLimit=Limite Est -echobase.common.echotypeFile= +echobase.common.echotypeFile=Fichier des echotypes echobase.common.email=Courriel echobase.common.entityId=Identifiant de l'entité echobase.common.entityType=Type d'entité -echobase.common.esduByEchotypeAndSpeciesCategoryAndLengthFile= -echobase.common.esduByEchotypeAndSpeciesCategoryFile= -echobase.common.esduByEchotypeFile= -echobase.common.esduBySpeciesAndAgeCategoryFile= +echobase.common.esduByEchotypeAndSpeciesCategoryAndLengthFile=Fichier des résultats par échotype, speciesCategory et longueur +echobase.common.esduByEchotypeAndSpeciesCategoryFile=Fichier des résultats par échotype et speciesCategory +echobase.common.esduByEchotypeFile=Fichier des résultats par échotype +echobase.common.esduBySpeciesAndAgeCategoryFile=Fichier des résultats par species et ageCategory echobase.common.exportDbMode=Mode echobase.common.extractCommunityIndicator=Extraire les indicateurs de communauté echobase.common.extractMaps=Extraire les cartes echobase.common.extractPopulationIndicator=Extraire les indicateurs de population echobase.common.extractRawData=Extraire les sources echobase.common.facade=Facade (Coser) -echobase.common.gearMetadataFile= +echobase.common.gearMetadataFile=Fichier des métadonnées d'engin echobase.common.id=Identifiant echobase.common.importDataMode=Type d'import echobase.common.importDate=Date de l'import -echobase.common.importDbFile= +echobase.common.importDbFile=Fichier d'import echobase.common.importDbMode=Mode d'import echobase.common.importEntity=Lié à echobase.common.importError=Une erreur est survenue pendant l'import \: @@ -135,8 +135,8 @@ echobase.common.jdbcUrl=URL de connexion echobase.common.keywords=Mots clefs echobase.common.lastModifiedDate=Date de dernière modification echobase.common.lastModifiedUser=Utilisateur de dernière modification -echobase.common.lengthAgeKeyFile= -echobase.common.lengthWeightKeyFile= +echobase.common.lengthAgeKeyFile=Fichier des relations age-longueur +echobase.common.lengthWeightKeyFile=Fichier des relations taille-poids echobase.common.litteratureReferences=Références echobase.common.loggedDataDatatype=loggedDataDatatype echobase.common.loggedDataFormat=loggedDataFormat @@ -146,12 +146,12 @@ echobase.common.modificationDate=Date de modification echobase.common.modificationText=Modification echobase.common.modificationUser=Utilisateur echobase.common.mooring=Bouée -echobase.common.mooringFile= -echobase.common.moviesFile= +echobase.common.mooringFile=Fichier des bouées +echobase.common.moviesFile=Fichier acoustique echobase.common.name=Nom echobase.common.northLimit=Limite Nord -echobase.common.operationFile= -echobase.common.operationMetadataFile= +echobase.common.operationFile=Fichier des opérations +echobase.common.operationMetadataFile=Fichier des métadonnées d'opération echobase.common.operator=Opérateur echobase.common.organisationLevelAcknowledgements=DOI de la campagne echobase.common.organisationReferences=Références de l'organisation @@ -183,14 +183,14 @@ echobase.common.spatialAware=Base spatialisée ? echobase.common.spatialStructureFound=Base spatialisée ? echobase.common.startEndDate=Date de début - fin echobase.common.startEndPort=Port de départ - arrivé -echobase.common.subSampleFile= -echobase.common.totalSampleFile= +echobase.common.subSampleFile=Fichier des échantillons +echobase.common.totalSampleFile=Fichier des captures totales echobase.common.transceiverAcquisitionAbsorptionDescription=Méthode de calcul du coefficient d'absorption pour l'acquisition des données echobase.common.transectBinUnitsPingAxis=Unité de la dimension horizontale des ESDU -echobase.common.transectFile= +echobase.common.transectFile=Fichier des transects echobase.common.transectGeospatialVerticalPositive=Direction de l'axe vertical des profondeurs (transect) echobase.common.transectLicence=Licence pour la diffusion des données (transect) -echobase.common.transitFile= +echobase.common.transitFile=Fichier des transits echobase.common.transitRelatedActivity=Travaux réalisés pendant le transit echobase.common.units=Unité echobase.common.upLimit=Limite haute @@ -199,7 +199,7 @@ echobase.common.userName=Nom de l'utilisateur echobase.common.vessel=Navire echobase.common.voyage=Campagne echobase.common.voyageDescription=Description -echobase.common.voyageFile= +echobase.common.voyageFile=Fichier des voyages echobase.common.westLimit=Limite Ouest echobase.common.zone=Zone (Coser) echobase.common.zunits=Unité limite haute/basse -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
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 288af566830a0b85c9231884a93cf0f47024da0e Author: jcouteau <couteau@codelutin.com> Date: Fri Feb 21 16:41:14 2020 +0100 update doc --- src/site/en/rst/exportAtlantos.rst | 41 ++++++++++++++++++++++++++++++++++++++ src/site/rst/exportAtlantos.rst | 41 ++++++++++++++++++++++++++++++++++++++ 2 files changed, 82 insertions(+) diff --git a/src/site/en/rst/exportAtlantos.rst b/src/site/en/rst/exportAtlantos.rst new file mode 100644 index 00000000..6bf8c6cb --- /dev/null +++ b/src/site/en/rst/exportAtlantos.rst @@ -0,0 +1,41 @@ +.. - +.. * #%L +.. * EchoBase +.. * %% +.. * Copyright (C) 2020 Ifremer, Codelutin +.. * %% +.. * This program is free software: you can redistribute it and/or modify +.. * it under the terms of the GNU Affero 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 Affero General Public License +.. * along with this program. If not, see <http://www.gnu.org/licenses/>. +.. * #L% +.. - + +==================== +Atlantos/CIEM export +==================== + +Abstract +======== + +This document describes how to export Echobase data to Atlantos/CIEM format. + +Creating queries +---------------- + +Data can be exported to Atlantos/CIEM export by clicking on the appropriate menu entry (**ICES export**). You will be +asked the cruise and vessel to export. You will then get the exported files in a .zip after a short period of time. You +then can import the files it contains into Atlantos/CIEM database. + +Exported species +---------------- + +Only the species that have the value icesExport to true will be exported during the process \ No newline at end of file diff --git a/src/site/rst/exportAtlantos.rst b/src/site/rst/exportAtlantos.rst new file mode 100644 index 00000000..f3611b19 --- /dev/null +++ b/src/site/rst/exportAtlantos.rst @@ -0,0 +1,41 @@ +.. - +.. * #%L +.. * EchoBase +.. * %% +.. * Copyright (C) 2020 Ifremer, Codelutin +.. * %% +.. * This program is free software: you can redistribute it and/or modify +.. * it under the terms of the GNU Affero 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 Affero General Public License +.. * along with this program. If not, see <http://www.gnu.org/licenses/>. +.. * #L% +.. - + +==================== +Export Atlantos/CIEM +==================== + +Abstract +======== + +Ce document explique comment exporter les données pour les importer dans la base Atlantos du CIEM. + +Exporter +-------- + +Les données peuvent être exportées au format Atlantos/CIEM en cliquant sur l'entrée de menu dédiée (**Exporter vers ICES**). +Vous devrez entrer la campagne et le navire pour exporter. Vous obtiendrez alors les fichiers d'export dans un zip après +quelques temps. Vous pourrez alors importer ces fichiers dans la base Atlantos du CIEM. + +Espèces exportées +----------------- + +Seules les espèces qui ont le champ **icesExport** renseigné à **true** seront exportées. \ No newline at end of file -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
participants (1)
-
codelutin.com scm