- Echobase-commits - mailman.cloud.codelutin.com

branch develop updated (f1268a1e -> d1c83819)
by codelutin.com scm 27 Feb '20

27 Feb '20

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 f1268a1e update doc new d1c83819 clean pom The 1 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 d1c838199454a3d6a1dd0beea54b128842015338 Author: jcouteau <couteau(a)codelutin.com> Date: Thu Feb 27 10:37:20 2020 +0100 clean pom Summary of changes: pom.xml | 33 +++------------------------------ 1 file changed, 3 insertions(+), 30 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 1

branch develop updated (288af566 -> f1268a1e)
by codelutin.com scm 27 Feb '20

27 Feb '20

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(a)codelutin.com> Date: Thu Feb 27 09:19:34 2020 +0100 update doc commit cf7209077ab1687baba03c423a67cac479d33084 Author: jcouteau <couteau(a)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(a)codelutin.com>.

1 2

branch develop updated (12f010d4 -> 288af566)
by codelutin.com scm 21 Feb '20

21 Feb '20

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(a)codelutin.com> Date: Fri Feb 21 16:41:14 2020 +0100 update doc commit 6b367956c1072b97e95560e5ad4d69a4334927ba Author: jcouteau <couteau(a)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(a)codelutin.com>.

1 2

branch develop updated (ac290063 -> 12f010d4)
by codelutin.com scm 21 Feb '20

21 Feb '20

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 ac290063 fixes #10217 : Biotic Export new 12f010d4 Trying to fix releasable status : using pom v11 as parent pom The 1 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 12f010d4d5651452891035963c5813dfd61e2450 Author: jcouteau <couteau(a)codelutin.com> Date: Fri Feb 21 15:46:51 2020 +0100 Trying to fix releasable status : using pom v11 as parent pom Summary of changes: pom.xml | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 1

branch develop updated (a3b59041 -> ac290063)
by codelutin.com scm 21 Feb '20

21 Feb '20

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 a3b59041 Fix CI build new ee1a39fd Put back integration tests new c79fab3e [ISO] comment typo new 4942e867 fixes #10217 : Mise à jour de l'export Biotic pour la base CIEM new c4d81c82 fixes #10216 : Mise à jour de l’export Acoustic pour la base CIEM new f5ae0c57 rename results echotype import column new ac290063 fixes #10217 : Biotic Export The 6 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 ac29006324f969004418b45bb80849c2bf2dba7d Author: jcouteau <couteau(a)codelutin.com> Date: Fri Feb 21 08:32:01 2020 +0100 fixes #10217 : Biotic Export commit f5ae0c5741db633a31d022cfe1e46674eda3d861 Author: jcouteau <couteau(a)codelutin.com> Date: Thu Feb 13 17:49:02 2020 +0100 rename results echotype import column commit c4d81c82c34b751348956735c88837cb967073ea Author: jcouteau <couteau(a)codelutin.com> Date: Thu Feb 13 17:44:19 2020 +0100 fixes #10216 : Mise à jour de l’export Acoustic pour la base CIEM commit 4942e8678b0076aab5e2e1f044587296d136384b Author: jcouteau <couteau(a)codelutin.com> Date: Thu Feb 13 17:43:32 2020 +0100 fixes #10217 : Mise à jour de l'export Biotic pour la base CIEM commit c79fab3e47ceaac7a21a5e9f157f867ad3a2ddfe Author: jcouteau <couteau(a)codelutin.com> Date: Thu Feb 13 17:37:27 2020 +0100 [ISO] comment typo commit ee1a39fded2e21a201cd75dbd317a4c48daf4da4 Author: jcouteau <couteau(a)codelutin.com> Date: Mon Feb 3 17:09:04 2020 +0100 Put back integration tests Summary of changes: echobase-services/pom.xml | 6 +- .../services/service/UserDbPersistenceService.java | 12 ++- .../service/atlantos/xml/VocabularyExport.java | 54 ++++++++----- .../service/atlantos/xml/XmlAccousticExport.java | 16 ++-- .../service/atlantos/xml/XmlBioticExport.java | 90 ++++++++++----------- .../ImportResultsEchotypeActionSupport.java | 2 +- .../VoyageCatchesSubSampleImportAction.java | 7 +- .../importdata/csv/ResultsEchotypeImportRow.java | 2 +- .../echobase/services/EchoBaseServiceFixtures.java | 8 +- .../VoyageCatchesOnlySubSampleImportServiceIT.java | 6 +- .../importdata/VoyageOperationImportServiceIT.java | 6 +- .../VoyageResultsMapFishCellImportServiceIT.java | 11 ++- .../import-data/catches/biometrysample.csv.gz | Bin 321 -> 314 bytes .../resources/import-data/catches/subsample.csv.gz | Bin 920 -> 864 bytes .../import-data/catches/subsample_all.csv.gz | Bin 22400 -> 21528 bytes .../import-data/echobase-commonData.h2.db.gz | Bin 373494 -> 388742 bytes .../import-data/operation/gearmetadatavalue.csv.gz | Bin 4964 -> 3302 bytes .../import-data/operation/operation.csv.gz | Bin 6056 -> 3508 bytes .../operation/operationmetadatavalue.csv.gz | Bin 2529 -> 1519 bytes .../import-data/result/voyage/echotype.csv.gz | Bin 617 -> 616 bytes 20 files changed, 117 insertions(+), 103 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 6

01/01: Fix CI build
by codelutin.com scm 03 Feb '20

03 Feb '20

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 a3b59041c7bb1fd157e5aa66c8263b0083008bcb Author: jcouteau <couteau(a)codelutin.com> Date: Mon Feb 3 09:39:52 2020 +0100 Fix CI build --- .gitlab-ci.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 42887bce..3e9e038b 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -15,7 +15,6 @@ build:with-tests: stage: build script: - mvn clean package - - rm * .git* -rf except: - /^master.*$/ - /^release\/.*$/ -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 0

branch develop updated (66aa0107 -> a3b59041)
by codelutin.com scm 03 Feb '20

03 Feb '20

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 66aa0107 refs #10217 : Transit got more than one transect new a3b59041 Fix CI build The 1 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 a3b59041c7bb1fd157e5aa66c8263b0083008bcb Author: jcouteau <couteau(a)codelutin.com> Date: Mon Feb 3 09:39:52 2020 +0100 Fix CI build Summary of changes: .gitlab-ci.yml | 1 - 1 file changed, 1 deletion(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 0

01/01: refs #10217 : Transit got more than one transect
by codelutin.com scm 03 Feb '20

03 Feb '20

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 66aa010721547583e89a9e0499c8d177fb7b7166 Author: jcouteau <couteau(a)codelutin.com> Date: Mon Feb 3 09:23:00 2020 +0100 refs #10217 : Transit got more than one transect --- echobase-domain/src/main/xmi/echobase.zargo | Bin 100570 -> 100667 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/echobase-domain/src/main/xmi/echobase.zargo b/echobase-domain/src/main/xmi/echobase.zargo index 679a9603..fdd00668 100644 Binary files a/echobase-domain/src/main/xmi/echobase.zargo and b/echobase-domain/src/main/xmi/echobase.zargo differ -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 0

branch develop updated (134e610a -> 66aa0107)
by codelutin.com scm 03 Feb '20

03 Feb '20

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 134e610a refs #10216 : Fix Atlantos acoustic export (still issue on echotype vocabulary) new 66aa0107 refs #10217 : Transit got more than one transect The 1 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 66aa010721547583e89a9e0499c8d177fb7b7166 Author: jcouteau <couteau(a)codelutin.com> Date: Mon Feb 3 09:23:00 2020 +0100 refs #10217 : Transit got more than one transect Summary of changes: echobase-domain/src/main/xmi/echobase.zargo | Bin 100570 -> 100667 bytes 1 file changed, 0 insertions(+), 0 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 0

branch develop updated (9999f750 -> 134e610a)
by codelutin.com scm 30 Jan '20

30 Jan '20

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 9999f750 J'aime pas les gros commits comme ça, mais tout est imbriqué :( new 5b96a582 #refs 10217 : fix numbersAtLength new 391ecd01 refs #10217 : fix Stratum vocabulary new 1fe4581f Update doc new de09f794 Clean code new 80f2e5eb Fix pg migrations new 1cddf9e1 Fix dataAcquisition link during acoustic import new 134e610a refs #10216 : Fix Atlantos acoustic export (still issue on echotype vocabulary) The 7 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 134e610ab7f9fc7be1922cb1bab9250eded1a97b Author: jcouteau <couteau(a)codelutin.com> Date: Thu Jan 30 16:01:36 2020 +0100 refs #10216 : Fix Atlantos acoustic export (still issue on echotype vocabulary) commit 1cddf9e1bcf1bce60cd09a879038e1cbaf5fefb8 Author: jcouteau <couteau(a)codelutin.com> Date: Thu Jan 30 15:59:46 2020 +0100 Fix dataAcquisition link during acoustic import commit 80f2e5eb629d4bce6bd6dbda34d50a19520a6851 Author: jcouteau <couteau(a)codelutin.com> Date: Thu Jan 30 15:59:07 2020 +0100 Fix pg migrations commit de09f794d3dbbd7a283573a5e81dc42fcc4158fc Author: jcouteau <couteau(a)codelutin.com> Date: Thu Jan 30 15:58:37 2020 +0100 Clean code commit 1fe4581f7b306d9af96e6fa2e51ea63e0a95c449 Author: jcouteau <couteau(a)codelutin.com> Date: Thu Jan 30 15:53:49 2020 +0100 Update doc commit 391ecd01c6cd64b086bbc2af30de42d61ba92058 Author: jcouteau <couteau(a)codelutin.com> Date: Thu Jan 30 13:58:33 2020 +0100 refs #10217 : fix Stratum vocabulary commit 5b96a582c38d4be65d7b3cbbd2dac297ab5d7a65 Author: jcouteau <couteau(a)codelutin.com> Date: Thu Jan 30 13:56:46 2020 +0100 #refs 10217 : fix numbersAtLength Summary of changes: .../echobase/entities/data/TransitImpl.java | 10 +- .../ifremer/echobase/entities/data/VoyageImpl.java | 11 +- .../workingDb/pg/3.914-1-importlog-importtext.sql | 2 +- .../migration/workingDb/pg/3.915-1-echotypeId.sql | 2 +- .../echobase/services/csv/CellValueParser.java | 5 +- .../service/atlantos/ExportAtlantosService.java | 25 +- .../service/atlantos/xml/VocabularyExport.java | 16 +- .../service/atlantos/xml/XmlAccousticExport.java | 32 +-- .../service/atlantos/xml/XmlBioticExport.java | 201 ++++++++------- .../actions/ImportAcousticsActionSupport.java | 2 +- .../services/service/spatial/LizmapRepository.java | 28 +- .../fr/ifremer/echobase/services/FixCellsIT.java | 283 --------------------- .../atlantos/ExportAtlantosServiceTest.java | 40 ++- .../service/importdb/ImportDbServiceTest.java | 2 +- .../resources/echobase-importDb-referentiel.zip | Bin 51131 -> 50973 bytes .../echobase/ui/EchoBaseStaticContentLoader.java | 3 +- .../src/main/webapp/WEB-INF/includes/footer.jsp | 3 +- pom.xml | 24 ++ src/site/en/rst/importData.rst | 10 +- src/site/rst/importData.rst | 42 +-- 20 files changed, 248 insertions(+), 493 deletions(-) delete mode 100644 echobase-services/src/test/java/fr/ifremer/echobase/services/FixCellsIT.java -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 7