branch develop updated (288af566 -> f1268a1e)
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 288af566 update doc new cf720907 Add icesExport column to gear and export only operations with icesExport = true new f1268a1e 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 f1268a1e88f9bdd34f75296fa755a365051abe8f Author: jcouteau <couteau@codelutin.com> Date: Thu Feb 27 09:19:34 2020 +0100 update doc commit cf7209077ab1687baba03c423a67cac479d33084 Author: jcouteau <couteau@codelutin.com> Date: Thu Feb 27 09:17:31 2020 +0100 Add icesExport column to gear and export only operations with icesExport = true Summary of changes: ...WorkingDbMigrationCallBackForVersion3_916.java} | 6 +++--- .../workingDb/h2/3.916-0-gear-icesExport.sql | 2 ++ echobase-domain/src/main/xmi/echobase.properties | 2 +- echobase-domain/src/main/xmi/echobase.zargo | Bin 100667 -> 100762 bytes .../service/atlantos/xml/XmlBioticExport.java | 8 ++++++-- .../service/importdb/ImportDbServiceTest.java | 1 - .../resources/echobase-importDb-referentiel.zip | Bin 50973 -> 50749 bytes src/site/en/rst/exportAtlantos.rst | 3 ++- src/site/rst/exportAtlantos.rst | 3 ++- 9 files changed, 16 insertions(+), 9 deletions(-) copy echobase-domain/src/main/java/fr/ifremer/echobase/persistence/migration/workingDb/{WorkingDbMigrationCallBackForVersion3_914.java => WorkingDbMigrationCallBackForVersion3_916.java} (89%) create mode 100644 echobase-domain/src/main/resources/migration/workingDb/h2/3.916-0-gear-icesExport.sql -- 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 cf7209077ab1687baba03c423a67cac479d33084 Author: jcouteau <couteau@codelutin.com> Date: Thu Feb 27 09:17:31 2020 +0100 Add icesExport column to gear and export only operations with icesExport = true --- .../WorkingDbMigrationCallBackForVersion3_916.java | 47 +++++++++++++++++++++ .../workingDb/h2/3.916-0-gear-icesExport.sql | 2 + echobase-domain/src/main/xmi/echobase.properties | 2 +- echobase-domain/src/main/xmi/echobase.zargo | Bin 100667 -> 100762 bytes .../service/atlantos/xml/XmlBioticExport.java | 8 +++- .../service/importdb/ImportDbServiceTest.java | 1 - .../resources/echobase-importDb-referentiel.zip | Bin 50973 -> 50749 bytes 7 files changed, 56 insertions(+), 4 deletions(-) diff --git a/echobase-domain/src/main/java/fr/ifremer/echobase/persistence/migration/workingDb/WorkingDbMigrationCallBackForVersion3_916.java b/echobase-domain/src/main/java/fr/ifremer/echobase/persistence/migration/workingDb/WorkingDbMigrationCallBackForVersion3_916.java new file mode 100644 index 00000000..874b5bb5 --- /dev/null +++ b/echobase-domain/src/main/java/fr/ifremer/echobase/persistence/migration/workingDb/WorkingDbMigrationCallBackForVersion3_916.java @@ -0,0 +1,47 @@ +package fr.ifremer.echobase.persistence.migration.workingDb; + +/*- + * #%L + * EchoBase :: Domain + * %% + * Copyright (C) 2011 - 2018 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% + */ + +import org.nuiton.topia.persistence.TopiaException; +import org.nuiton.topia.persistence.support.TopiaSqlSupport; +import org.nuiton.version.Version; +import org.nuiton.version.Versions; + +import java.util.List; + +public class WorkingDbMigrationCallBackForVersion3_916 extends WorkingDbMigrationCallBackForVersionSupport { + + @Override + public Version getVersion() { + return Versions.valueOf("3.916"); + } + + @Override + protected void prepareMigrationScript(TopiaSqlSupport sqlSupport, + List<String> queries, + boolean showSql, + boolean showProgression) throws TopiaException { + + addSpecificScript("3.916-0-gear-icesExport.sql", queries); + } + +} diff --git a/echobase-domain/src/main/resources/migration/workingDb/h2/3.916-0-gear-icesExport.sql b/echobase-domain/src/main/resources/migration/workingDb/h2/3.916-0-gear-icesExport.sql new file mode 100644 index 00000000..5a864455 --- /dev/null +++ b/echobase-domain/src/main/resources/migration/workingDb/h2/3.916-0-gear-icesExport.sql @@ -0,0 +1,2 @@ +alter table gear add column icesExport boolean; +update gear set icesExport=true; \ No newline at end of file diff --git a/echobase-domain/src/main/xmi/echobase.properties b/echobase-domain/src/main/xmi/echobase.properties index 5217375b..58e9356a 100644 --- a/echobase-domain/src/main/xmi/echobase.properties +++ b/echobase-domain/src/main/xmi/echobase.properties @@ -23,7 +23,7 @@ model.tagValue.notGenerateToString=true model.tagValue.generateOperatorForDAOHelper=true -model.tagValue.version=3.915 +model.tagValue.version=3.916 model.tagValue.generatePropertyChangeSupport=false model.tagValue.generateBooleanGetMethods=false model.tagValue.indexForeignKeys=true diff --git a/echobase-domain/src/main/xmi/echobase.zargo b/echobase-domain/src/main/xmi/echobase.zargo index fdd00668..23183abb 100644 Binary files a/echobase-domain/src/main/xmi/echobase.zargo and b/echobase-domain/src/main/xmi/echobase.zargo differ 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 bc759b35..13f34e4d 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 @@ -70,11 +70,15 @@ public class XmlBioticExport implements EchoBaseService { boolean exportHaul=false; - //Export Haul only if it contains samples + //Export Haul only if it contains samples that should be exported and gear should be exported for (Sample sample : samples) { SpeciesCategory category = sample.getSpeciesCategory(); String name = sample.getSampleType().getName(); - if (!name.equals("Sorted") && category.getSpecies().getIcesExport() != null && category.getSpecies().getIcesExport()) { + if ( !name.equals("Sorted") + && category.getSpecies().getIcesExport() != null + && category.getSpecies().getIcesExport() + && operation.getGear().isIcesExport()) { + // EXPORT HAUL exportHaul = true; exportHaul(operation, index++, xmlCruise); diff --git a/echobase-services/src/test/java/fr/ifremer/echobase/services/service/importdb/ImportDbServiceTest.java b/echobase-services/src/test/java/fr/ifremer/echobase/services/service/importdb/ImportDbServiceTest.java index 58540145..b3c71caa 100644 --- a/echobase-services/src/test/java/fr/ifremer/echobase/services/service/importdb/ImportDbServiceTest.java +++ b/echobase-services/src/test/java/fr/ifremer/echobase/services/service/importdb/ImportDbServiceTest.java @@ -52,7 +52,6 @@ public class ImportDbServiceTest extends EchoBaseTestServiceSupport { } @Test -//Fix import data public void importDb() throws IOException, ImportException { ImportDbConfiguration conf = new ImportDbConfiguration(getLocale()); diff --git a/echobase-services/src/test/resources/echobase-importDb-referentiel.zip b/echobase-services/src/test/resources/echobase-importDb-referentiel.zip index 8f188b7e..10e01078 100644 Binary files a/echobase-services/src/test/resources/echobase-importDb-referentiel.zip and b/echobase-services/src/test/resources/echobase-importDb-referentiel.zip differ -- 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 f1268a1e88f9bdd34f75296fa755a365051abe8f Author: jcouteau <couteau@codelutin.com> Date: Thu Feb 27 09:19:34 2020 +0100 update doc --- src/site/en/rst/exportAtlantos.rst | 3 ++- src/site/rst/exportAtlantos.rst | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/site/en/rst/exportAtlantos.rst b/src/site/en/rst/exportAtlantos.rst index 6bf8c6cb..fe0d0433 100644 --- a/src/site/en/rst/exportAtlantos.rst +++ b/src/site/en/rst/exportAtlantos.rst @@ -38,4 +38,5 @@ 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 +Only the species that have the value icesExport to true will be exported during the process. +Only the operations that have a gear with 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 index f3611b19..5c9822ee 100644 --- a/src/site/rst/exportAtlantos.rst +++ b/src/site/rst/exportAtlantos.rst @@ -38,4 +38,5 @@ quelques temps. Vous pourrez alors importer ces fichiers dans la base Atlantos d Espèces exportées ----------------- -Seules les espèces qui ont le champ **icesExport** renseigné à **true** seront exportées. \ No newline at end of file +Seules les espèces qui ont le champ **icesExport** renseigné à **true** seront exportées. +Seules les opérations avec un métier qui a le champs **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