branch develop updated (1a3f794 -> 735993d)
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 1a3f794 Concat files new f25dc92 Translate new dcb135a Modify redirection after create mission new 735993d Put the length to mm The 3 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 735993d3839438117561e3e2de652328b3e456ed Author: Julien Ruchaud <julien.ruchaud@debux.org> Date: Tue Oct 25 17:40:46 2016 +0200 Put the length to mm commit dcb135a9c8b3ee077236030b61f7635fa7183b0f Author: Julien Ruchaud <julien.ruchaud@debux.org> Date: Tue Oct 25 17:27:06 2016 +0200 Modify redirection after create mission commit f25dc92a019bfdbae39c61a7c969d73b99ab776c Author: Julien Ruchaud <julien.ruchaud@debux.org> Date: Tue Oct 25 17:17:45 2016 +0200 Translate Summary of changes: .../services/service/atlantos/xml/XmlBioticExport.java | 10 ++++++++-- echobase-ui/src/main/resources/config/struts-importData.xml | 2 +- .../src/main/resources/i18n/echobase-ui_fr_FR.properties | 6 +++--- 3 files changed, 12 insertions(+), 6 deletions(-) -- 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 f25dc92a019bfdbae39c61a7c969d73b99ab776c Author: Julien Ruchaud <julien.ruchaud@debux.org> Date: Tue Oct 25 17:17:45 2016 +0200 Translate --- echobase-ui/src/main/resources/i18n/echobase-ui_fr_FR.properties | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) 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 b490554..a175cd7 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 @@ -59,7 +59,7 @@ echobase.common.acquisitionSoftwareVersionME70=Version du logiciel d'acquisition echobase.common.actionError=Une erreur est survenue pendant l'opération \: echobase.common.addDataAcquisition=Toujours créer de nouvelles entrées DataAcqusitions echobase.common.admin=Administrateur -echobase.common.ancillaryInstrumentationFile=Fichier des données d'ancillary InstrumentationFile +echobase.common.ancillaryInstrumentationFile=Fichier des données des autres capteurs echobase.common.areaOfOperation=Zone d'activités echobase.common.author=Auteur echobase.common.authorEmail=Courriel de l'auteur @@ -116,7 +116,7 @@ echobase.common.importResult=Résultat de l'import echobase.common.importText=Description echobase.common.importType=Type d'import echobase.common.importType.acoustic=Import des données accoustiques -echobase.common.importType.ancillaryInstrumentation=Import des ancillary instrumentations +echobase.common.importType.ancillaryInstrumentation=Import des autres capteurs echobase.common.importType.catches=Import des captures echobase.common.importType.common=Import des données de Voyage / Transit / Transect echobase.common.importType.mooring=Import des bouées @@ -151,7 +151,7 @@ echobase.common.northLimit=Limite Nord echobase.common.operationFile= echobase.common.operationMetadataFile= echobase.common.operator=Opérateur -echobase.common.organisationLevelAcknowledgements=organisationLevelAcknowledgements +echobase.common.organisationLevelAcknowledgements= echobase.common.organisationReferences=Références de l'organisation echobase.common.password=Mot de passe echobase.common.pilotVersion=Version du pilote jdbc -- 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 dcb135a9c8b3ee077236030b61f7635fa7183b0f Author: Julien Ruchaud <julien.ruchaud@debux.org> Date: Tue Oct 25 17:27:06 2016 +0200 Modify redirection after create mission --- echobase-ui/src/main/resources/config/struts-importData.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/echobase-ui/src/main/resources/config/struts-importData.xml b/echobase-ui/src/main/resources/config/struts-importData.xml index 923dbe0..92ced7c 100644 --- a/echobase-ui/src/main/resources/config/struts-importData.xml +++ b/echobase-ui/src/main/resources/config/struts-importData.xml @@ -104,7 +104,7 @@ <result name="input">/WEB-INF/jsp/importData/createMission.jsp</result> <result type="redirectAction"> <param name="namespace">/importData</param> - <param name="actionName">configureCommon</param> + <param name="actionName">selectImportType</param> <param name="method">input</param> </result> </action> -- 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 735993d3839438117561e3e2de652328b3e456ed Author: Julien Ruchaud <julien.ruchaud@debux.org> Date: Tue Oct 25 17:40:46 2016 +0200 Put the length to mm --- .../services/service/atlantos/xml/XmlBioticExport.java | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/atlantos/xml/XmlBioticExport.java b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/atlantos/xml/XmlBioticExport.java index 3660b7a..606e225 100644 --- a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/atlantos/xml/XmlBioticExport.java +++ b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/atlantos/xml/XmlBioticExport.java @@ -302,6 +302,12 @@ public class XmlBioticExport implements EchoBaseService { SpeciesCategory category = sample.getSpeciesCategory(); + String lengthClass = sampleDataValues.get("LengthClass"); + Float lengthClassValue = 0f; + if (lengthClass != null) { + lengthClassValue = Float.parseFloat(lengthClass) * 10; + } + xml.create("DataType", "IDREF", vocabulary.getVocabularyCode("AC_CatchDataType_R")); xml.create("SpeciesCode", @@ -327,9 +333,9 @@ public class XmlBioticExport implements EchoBaseService { sample.getSampleWeight()); xml.create("LengthCode", - "IDREF", vocabulary.getVocabularyCode(sampleDataValues.containsKey(SampleDataTypeImpl.LTCM0_5) ? "AC_LengthCode_halfcm" : "AC_LengthCode_cm")); + "IDREF", vocabulary.getVocabularyCode("AC_LengthCode_mm")); xml.create("LengthClass", - sampleDataValues.get("LengthClass")); + lengthClassValue); xml.create("LengthType", "IDREF", vocabulary.getVocabularyCode("AC_LengthMeasurementType_1")); xml.create("NumberAtLength", -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
participants (1)
-
codelutin.com scm