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

branch develop updated (d1c83819 -> 2cf18b68)
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 d1c83819 clean pom adds 209df41f [gitflow-maven-plugin]Update versions for release adds 8f07a2a4 Pre release 4.2-rc1 new b57d3561 Merge branch 'release/4.2-rc1' into develop new 2cf18b68 [gitflow-maven-plugin]Update for next development version 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 2cf18b68649b1a9c3d5e8ef82a0c5a03564addd8 Author: Jean Couteau <couteau(a)codelutin.com> Date: Thu Feb 27 11:11:22 2020 +0100 [gitflow-maven-plugin]Update for next development version commit b57d3561b2f3a1ab47702fbddce3209c71411a06 Merge: d1c83819 8f07a2a4 Author: Jean Couteau <couteau(a)codelutin.com> Date: Thu Feb 27 11:11:19 2020 +0100 Merge branch 'release/4.2-rc1' into develop Summary of changes: echobase-domain/pom.xml | 2 +- .../workingDb/3.914-1-importlog-importtext.sql | 22 +++++++++++++++++++++- .../workingDb/h2/3.914-1-importlog-importtext.sql | 22 +++++++++++++++++++++- .../h2/3.915-0-dataAcquisition-dataProcessing.sql | 22 +++++++++++++++++++++- .../migration/workingDb/h2/3.915-1-echotypeId.sql | 20 ++++++++++++++++++++ .../workingDb/h2/3.916-0-gear-icesExport.sql | 22 +++++++++++++++++++++- .../workingDb/pg/3.914-1-importlog-importtext.sql | 22 +++++++++++++++++++++- .../pg/3.915-0-dataAcquisition-dataProcessing.sql | 20 ++++++++++++++++++++ .../migration/workingDb/pg/3.915-1-echotypeId.sql | 20 ++++++++++++++++++++ echobase-services/pom.xml | 2 +- echobase-ui/pom.xml | 2 +- pom.xml | 2 +- 12 files changed, 169 insertions(+), 9 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 2

annotated tag echobase-4.2-rc1 created (now 2b633ef2)
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 annotated tag echobase-4.2-rc1 in repository echobase. See https://gitlab.nuiton.org/codelutin/echobase.git at 2b633ef2 (tag) tagging 4436d41e3a941178355955185f20e616f2727b80 (commit) replaces echobase-4.0.15 tagged by Jean Couteau on Thu Feb 27 11:09:39 2020 +0100 - Log ----------------------------------------------------------------- Tag release ----------------------------------------------------------------------- This annotated tag includes the following new commits: new 209df41f [gitflow-maven-plugin]Update versions for release new 8f07a2a4 Pre release 4.2-rc1 new 4436d41e Merge branch 'release/4.2-rc1' 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 4436d41e3a941178355955185f20e616f2727b80 Merge: 242f86d5 8f07a2a4 Author: Jean Couteau <couteau(a)codelutin.com> Date: Thu Feb 27 11:09:38 2020 +0100 Merge branch 'release/4.2-rc1' commit 8f07a2a48ca6bd91f6b34fae7ab456cff88cdfa9 Author: Jean Couteau <couteau(a)codelutin.com> Date: Thu Feb 27 11:06:23 2020 +0100 Pre release 4.2-rc1 commit 209df41fa56ea06d6bb3c2b05dd4e76e3731e39e Author: jcouteau <couteau(a)codelutin.com> Date: Thu Feb 27 10:40:32 2020 +0100 [gitflow-maven-plugin]Update versions for release -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 0

branch master updated (242f86d5 -> 4436d41e)
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 master in repository echobase. See https://gitlab.nuiton.org/codelutin/echobase.git from 242f86d5 [jgitflow-maven-plugin]merging 'release/4.0.15' into 'master' adds 20d36a60 [jgitflow-maven-plugin]updating poms for 4.0.16-SNAPSHOT development adds 5ea7a6b6 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts adds 5266e664 [jgitflow-maven-plugin]merging 'master' into 'develop' adds c022a770 [jgitflow-maven-plugin]Updating develop poms back to pre merge state adds 582db0fe From scmwebeditor -- dfgf adds df14239d From scmwebeditor -- fg adds 4df3ff7d From scmwebeditor -- fg adds 2c9cfc90 From scmwebeditor -- fg adds aeb8694f Add CI adds bdde5e7f Update dependencies versions adds c1197fb0 Fix version updates adds a22b26ef Fixes #10217 - Update Biotic export adds 96ae9105 refs #10215 refs #10216 refs #10217 adds b58e9683 fixes #10317 - La première espèce d'un echotype n'est pas liée adds ad6b0432 fixes #8748 - Erreur à l'import des données d'opération (bis) fixes #10287 - Pas de size category dans le fichier d'import des echotypes adds 29a35fb6 Update doc adds 33601cb7 fixes #9738 - Ajouter un lien vers la doc en ligne dans le pied de page de la base adds a8f74cc9 Remove deprecated code calls adds 29e69af2 fixes #10230 : Les opérations ne sont pas associées au bon transect adds a2104351 fixes #10146 : Les cellules de type "map" ne sont pas strictement reliées à un voyage dans la base adds f087fe33 fixes #9699 : les boutons pour trier les colonnes ne fonctionnent pas adds ce7349df fixes #9739 : Importe les données "ChannelID", "Bandwidth", "Frequency", "TransceiverPower" et "TransmitPulseLength" adds 39cff176 fixes #9731 : Suppression des sampleDataType LTcm1 et LTcm0.5 adds 9999f750 J'aime pas les gros commits comme ça, mais tout est imbriqué :( adds 5b96a582 #refs 10217 : fix numbersAtLength adds 391ecd01 refs #10217 : fix Stratum vocabulary adds 1fe4581f Update doc adds de09f794 Clean code adds 80f2e5eb Fix pg migrations adds 1cddf9e1 Fix dataAcquisition link during acoustic import adds 134e610a refs #10216 : Fix Atlantos acoustic export (still issue on echotype vocabulary) adds 66aa0107 refs #10217 : Transit got more than one transect adds a3b59041 Fix CI build adds ee1a39fd Put back integration tests adds c79fab3e [ISO] comment typo adds 4942e867 fixes #10217 : Mise à jour de l'export Biotic pour la base CIEM adds c4d81c82 fixes #10216 : Mise à jour de l’export Acoustic pour la base CIEM adds f5ae0c57 rename results echotype import column adds ac290063 fixes #10217 : Biotic Export adds 12f010d4 Trying to fix releasable status : using pom v11 as parent pom adds 6b367956 i18n update adds 288af566 update doc adds cf720907 Add icesExport column to gear and export only operations with icesExport = true adds f1268a1e update doc adds d1c83819 clean pom new 209df41f [gitflow-maven-plugin]Update versions for release new 8f07a2a4 Pre release 4.2-rc1 new 4436d41e Merge branch 'release/4.2-rc1' 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 4436d41e3a941178355955185f20e616f2727b80 Merge: 242f86d5 8f07a2a4 Author: Jean Couteau <couteau(a)codelutin.com> Date: Thu Feb 27 11:09:38 2020 +0100 Merge branch 'release/4.2-rc1' commit 8f07a2a48ca6bd91f6b34fae7ab456cff88cdfa9 Author: Jean Couteau <couteau(a)codelutin.com> Date: Thu Feb 27 11:06:23 2020 +0100 Pre release 4.2-rc1 commit 209df41fa56ea06d6bb3c2b05dd4e76e3731e39e Author: jcouteau <couteau(a)codelutin.com> Date: Thu Feb 27 10:40:32 2020 +0100 [gitflow-maven-plugin]Update versions for release Summary of changes: .gitlab-ci.yml | 39 +++ echobase-domain/pom.xml | 2 +- .../echobase/config/EchoBaseConfiguration.java | 7 +- .../echobase/entities/data/EchotypeTopiaDao.java | 2 +- .../echobase/entities/data/TransitImpl.java | 21 +- .../ifremer/echobase/entities/data/VoyageImpl.java | 11 +- .../entities/references/SampleDataTypeImpl.java | 4 - ...WorkingDbMigrationCallBackForVersion3_914.java} | 6 +- ...WorkingDbMigrationCallBackForVersion3_915.java} | 7 +- ...WorkingDbMigrationCallBackForVersion3_916.java} | 6 +- ...ndexes.sql => 3.914-1-importlog-importtext.sql} | 4 +- .../3.914-1-importlog-importtext.sql} | 4 +- .../3.915-0-dataAcquisition-dataProcessing.sql} | 9 +- .../3.915-1-echotypeId.sql} | 4 +- .../3.916-0-gear-icesExport.sql} | 5 +- .../3.914-1-importlog-importtext.sql} | 4 +- .../3.915-0-dataAcquisition-dataProcessing.sql} | 8 +- .../3.915-1-echotypeId.sql} | 4 +- echobase-domain/src/main/xmi/echobase.properties | 3 +- echobase-domain/src/main/xmi/echobase.zargo | Bin 100538 -> 100762 bytes echobase-services/pom.xml | 8 +- .../echobase/services/csv/CellValueParser.java | 5 +- .../echobase/services/csv/EchoBaseCsvUtil.java | 3 +- .../echobase/services/service/DbEditorService.java | 8 + .../services/service/UserDbPersistenceService.java | 52 +++- .../service/atlantos/ExportAtlantosService.java | 25 +- .../service/atlantos/xml/VocabularyExport.java | 128 ++++++-- .../service/atlantos/xml/XmlAccousticExport.java | 76 ++--- .../service/atlantos/xml/XmlBioticExport.java | 338 ++++++++++----------- .../service/importdata/ImportDataService.java | 39 +-- .../actions/ImportAcousticsActionSupport.java | 37 ++- ...rt.java => ImportCalibrationActionSupport.java} | 30 +- .../ImportResultsEchotypeActionSupport.java | 5 +- .../VoyageAcousticsCalibrationImportAction.java | 113 +++++++ .../actions/VoyageAcousticsImportAction.java | 2 + .../VoyageCatchesSubSampleImportAction.java | 34 +-- .../VoyageOperationsOperationImportAction.java | 2 +- .../VoyageResultsMapFishCellImportAction.java | 4 +- .../VoyageResultsMapOtherCellImportAction.java | 3 +- .../ImportAcousticsConfiguration.java | 9 +- .../contexts/VoyageCatchesImportDataContext.java | 16 - .../importdata/csv/AcousticImportExportModel.java | 8 +- .../service/importdata/csv/AcousticImportRow.java | 28 +- .../csv/CalibrationImportExportModel.java | 75 +++++ .../importdata/csv/CalibrationImportRow.java | 125 ++++++++ .../importdata/csv/ResultsEchotypeImportRow.java | 9 + .../VoyageCatchesSubSampleImportExportModel.java | 5 +- .../csv/VoyageCatchesSubSampleImportRow.java | 11 - ...yageResultsVoyageEchotypeImportExportModel.java | 2 + .../strategy/AcousticRemoveDataStrategy.java | 10 + .../services/service/spatial/LizmapRepository.java | 28 +- .../i18n/echobase-services_en_GB.properties | 1 + .../i18n/echobase-services_fr_FR.properties | 1 + .../echobase/services/EchoBaseServiceFixtures.java | 8 +- .../fr/ifremer/echobase/services/FixCellsIT.java | 283 ----------------- .../atlantos/ExportAtlantosServiceTest.java | 40 ++- ... VoyageAcousticCalibrationImportServiceIT.java} | 24 +- .../VoyageCatchesOnlySubSampleImportServiceIT.java | 6 +- .../importdata/VoyageOperationImportServiceIT.java | 6 +- .../VoyageResultsMapFishCellImportServiceIT.java | 11 +- .../service/importdb/ImportDbServiceTest.java | 3 +- .../resources/echobase-importDb-referentiel.zip | Bin 51131 -> 50749 bytes .../import-data/acoustic/calibrations_small.csv.gz | Bin 0 -> 231 bytes .../import-data/acoustic/movies_small.csv.gz | Bin 7963 -> 7976 bytes .../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 echobase-ui/pom.xml | 2 +- .../echobase/ui/EchoBaseApplicationContext.java | 14 +- .../echobase/ui/EchoBaseStaticContentLoader.java | 3 +- .../importData/ConfigureAcousticImport.java | 12 + .../echobase/ui/validators/LoginValidator.java | 4 + .../resources/i18n/echobase-ui_en_GB.properties | 30 +- .../resources/i18n/echobase-ui_fr_FR.properties | 46 +-- .../src/main/webapp/WEB-INF/includes/footer.jsp | 9 +- .../jsp/importData/configureAcousticImport.jsp | 3 + pom.xml | 93 +++--- src/site/en/rst/exportAtlantos.rst | 42 +++ src/site/en/rst/importData.rst | 42 +-- src/site/rst/exportAtlantos.rst | 42 +++ src/site/rst/exportData.rst | 17 ++ src/site/rst/importData.rst | 42 +-- 87 files changed, 1239 insertions(+), 933 deletions(-) create mode 100644 .gitlab-ci.yml copy echobase-domain/src/main/java/fr/ifremer/echobase/persistence/migration/workingDb/{WorkingDbMigrationCallBackForVersion3_913.java => WorkingDbMigrationCallBackForVersion3_914.java} (86%) copy echobase-domain/src/main/java/fr/ifremer/echobase/persistence/migration/workingDb/{WorkingDbMigrationCallBackForVersion3_913.java => WorkingDbMigrationCallBackForVersion3_915.java} (82%) copy echobase-domain/src/main/java/fr/ifremer/echobase/persistence/migration/workingDb/{WorkingDbMigrationCallBackForVersion3_913.java => WorkingDbMigrationCallBackForVersion3_916.java} (86%) copy echobase-domain/src/main/resources/migration/workingDb/{3.906-0-add-indexes.sql => 3.914-1-importlog-importtext.sql} (86%) copy echobase-domain/src/main/resources/migration/workingDb/{3.906-0-add-indexes.sql => h2/3.914-1-importlog-importtext.sql} (86%) copy echobase-domain/src/main/resources/migration/workingDb/{3.913-0-atlantos-species.sql => h2/3.915-0-dataAcquisition-dataProcessing.sql} (64%) copy echobase-domain/src/main/resources/migration/workingDb/{3.906-0-add-indexes.sql => h2/3.915-1-echotypeId.sql} (87%) copy echobase-domain/src/main/resources/migration/workingDb/{3.906-0-add-indexes.sql => h2/3.916-0-gear-icesExport.sql} (84%) copy echobase-domain/src/main/resources/migration/workingDb/{3.906-0-add-indexes.sql => pg/3.914-1-importlog-importtext.sql} (87%) copy echobase-domain/src/main/resources/migration/workingDb/{3.913-0-atlantos-species.sql => pg/3.915-0-dataAcquisition-dataProcessing.sql} (67%) copy echobase-domain/src/main/resources/migration/workingDb/{3.906-0-add-indexes.sql => pg/3.915-1-echotypeId.sql} (87%) copy echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/actions/{VoyageResultsImportDataActionSupport.java => ImportCalibrationActionSupport.java} (52%) create mode 100644 echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/actions/VoyageAcousticsCalibrationImportAction.java create mode 100644 echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/CalibrationImportExportModel.java create mode 100644 echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/CalibrationImportRow.java delete mode 100644 echobase-services/src/test/java/fr/ifremer/echobase/services/FixCellsIT.java copy echobase-services/src/test/java/fr/ifremer/echobase/services/service/importdata/{VoyageAcousticImportServiceIT.java => VoyageAcousticCalibrationImportServiceIT.java} (86%) create mode 100644 echobase-services/src/test/resources/import-data/acoustic/calibrations_small.csv.gz create mode 100644 src/site/en/rst/exportAtlantos.rst create mode 100644 src/site/rst/exportAtlantos.rst -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 0

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

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

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