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

branch develop updated (a22b26ef -> 9999f750)
by codelutin.com scm 08 Jan '20

08 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 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 new ce7349df fixes #9739 : Importe les données "ChannelID", "Bandwidth", "Frequency", "TransceiverPower" et "TransmitPulseLength" new 39cff176 fixes #9731 : Suppression des sampleDataType LTcm1 et LTcm0.5 new 9999f750 J'aime pas les gros commits comme ça, mais tout est imbriqué :( 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 9999f750ef347b88243db6f5012508ed5f380fb5 Author: jcouteau <couteau(a)codelutin.com> Date: Wed Jan 8 17:49:43 2020 +0100 J'aime pas les gros commits comme ça, mais tout est imbriqué :( fixes #9739 - Champs non valués dans la table "DataProcessing" d'EB (et donc dans le chapitre "DataProcessing" de l'export acoustic) fixes #9731 - Le "sampleDataType" des sampleData "numberSampled" devrait être "NumberAtLength" dans l'import des subsamples fixes #9742 - Ajouter un menu pour importer les calibrations Transformation de l'id d'échotype de int -> string commit 39cff1761a62cc902b95102c882bfb536e220294 Author: jcouteau <couteau(a)codelutin.com> Date: Thu Dec 5 11:16:53 2019 +0100 fixes #9731 : Suppression des sampleDataType LTcm1 et LTcm0.5 commit ce7349df6a8f0eeb06cc460d25b42ea1d8ce8299 Author: jcouteau <couteau(a)codelutin.com> Date: Thu Dec 5 11:00:25 2019 +0100 fixes #9739 : Importe les données "ChannelID", "Bandwidth", "Frequency", "TransceiverPower" et "TransmitPulseLength" Summary of changes: .../echobase/entities/data/EchotypeTopiaDao.java | 2 +- .../echobase/entities/data/TransitImpl.java | 15 +++ .../entities/references/SampleDataTypeImpl.java | 4 - ...WorkingDbMigrationCallBackForVersion3_914.java} | 6 +- ...WorkingDbMigrationCallBackForVersion3_915.java} | 7 +- .../workingDb/3.914-1-importlog-importtext.sql | 1 + .../workingDb/h2/3.914-1-importlog-importtext.sql | 1 + .../h2/3.915-0-dataAcquisition-dataProcessing.sql | 7 ++ .../migration/workingDb/h2/3.915-1-echotypeId.sql | 1 + .../workingDb/pg/3.914-1-importlog-importtext.sql | 1 + .../pg/3.915-0-dataAcquisition-dataProcessing.sql | 6 + .../migration/workingDb/pg/3.915-1-echotypeId.sql | 1 + echobase-domain/src/main/xmi/echobase.properties | 3 +- echobase-domain/src/main/xmi/echobase.zargo | Bin 100538 -> 100570 bytes .../echobase/services/csv/EchoBaseCsvUtil.java | 3 +- .../echobase/services/service/DbEditorService.java | 8 ++ .../services/service/UserDbPersistenceService.java | 40 ++++++- .../service/atlantos/xml/VocabularyExport.java | 71 ++++++++++-- .../service/atlantos/xml/XmlAccousticExport.java | 36 ++---- .../service/atlantos/xml/XmlBioticExport.java | 13 +-- .../service/importdata/ImportDataService.java | 39 ++----- .../actions/ImportAcousticsActionSupport.java | 39 ++++--- ...rt.java => ImportCalibrationActionSupport.java} | 30 ++--- .../ImportResultsEchotypeActionSupport.java | 3 + .../VoyageAcousticsCalibrationImportAction.java | 113 +++++++++++++++++++ .../actions/VoyageAcousticsImportAction.java | 2 + .../VoyageCatchesSubSampleImportAction.java | 27 +---- .../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 ++ .../i18n/echobase-services_en_GB.properties | 1 + .../i18n/echobase-services_fr_FR.properties | 1 + ... VoyageAcousticCalibrationImportServiceIT.java} | 24 ++-- .../import-data/acoustic/calibrations_small.csv.gz | Bin 0 -> 231 bytes .../import-data/acoustic/movies_small.csv.gz | Bin 7963 -> 7976 bytes .../echobase/ui/EchoBaseApplicationContext.java | 14 +-- .../importData/ConfigureAcousticImport.java | 12 ++ .../resources/i18n/echobase-ui_en_GB.properties | 2 + .../resources/i18n/echobase-ui_fr_FR.properties | 2 + .../src/main/webapp/WEB-INF/includes/footer.jsp | 6 + .../jsp/importData/configureAcousticImport.jsp | 3 + src/site/en/rst/importData.rst | 32 +++--- 53 files changed, 667 insertions(+), 216 deletions(-) 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%) create mode 100644 echobase-domain/src/main/resources/migration/workingDb/3.914-1-importlog-importtext.sql create mode 100644 echobase-domain/src/main/resources/migration/workingDb/h2/3.914-1-importlog-importtext.sql create mode 100644 echobase-domain/src/main/resources/migration/workingDb/h2/3.915-0-dataAcquisition-dataProcessing.sql create mode 100644 echobase-domain/src/main/resources/migration/workingDb/h2/3.915-1-echotypeId.sql create mode 100644 echobase-domain/src/main/resources/migration/workingDb/pg/3.914-1-importlog-importtext.sql create mode 100644 echobase-domain/src/main/resources/migration/workingDb/pg/3.915-0-dataAcquisition-dataProcessing.sql create mode 100644 echobase-domain/src/main/resources/migration/workingDb/pg/3.915-1-echotypeId.sql 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 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 -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 3

branch struts2.5 created (now 00ac42e3)
by codelutin.com scm 20 Nov '19

20 Nov '19

This is an automated email from the git hooks/post-receive script. New change to branch struts2.5 in repository echobase. See https://gitlab.nuiton.org/codelutin/echobase.git at 00ac42e3 Update struts from 2.3.x to 2.5.x This branch includes the following new commits: new 96ae9105 refs #10215 refs #10216 refs #10217 new b58e9683 fixes #10317 - La première espèce d'un echotype n'est pas liée new 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 new 29a35fb6 Update doc new 33601cb7 fixes #9738 - Ajouter un lien vers la doc en ligne dans le pied de page de la base new a8f74cc9 Remove deprecated code calls new 29e69af2 fixes #10230 : Les opérations ne sont pas associées au bon transect new a2104351 fixes #10146 : Les cellules de type "map" ne sont pas strictement reliées à un voyage dans la base new f087fe33 fixes #9699 : les boutons pour trier les colonnes ne fonctionnent pas new 00ac42e3 Update struts from 2.3.x to 2.5.x The 10 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 00ac42e32ec5d56cd1f2abd841e409c38529086e Author: jcouteau <couteau(a)codelutin.com> Date: Wed Nov 20 15:58:22 2019 +0100 Update struts from 2.3.x to 2.5.x commit f087fe33b2bc5c14ef28e1c468337113bd4b95d8 Author: jcouteau <couteau(a)codelutin.com> Date: Mon Nov 18 15:06:03 2019 +0100 fixes #9699 : les boutons pour trier les colonnes ne fonctionnent pas commit a21043517c7ec535fa263b8a9d16b048c350a847 Author: jcouteau <couteau(a)codelutin.com> Date: Fri Nov 15 09:27:38 2019 +0100 fixes #10146 : Les cellules de type "map" ne sont pas strictement reliées à un voyage dans la base commit 29e69af2c0176c5eca51d2945af6a0ce9b68b15c Author: jcouteau <couteau(a)codelutin.com> Date: Thu Nov 14 13:14:30 2019 +0100 fixes #10230 : Les opérations ne sont pas associées au bon transect commit a8f74cc93121ad52faf427dd75adb07bd7474000 Author: jcouteau <couteau(a)codelutin.com> Date: Thu Nov 14 13:03:26 2019 +0100 Remove deprecated code calls commit 33601cb786121f119929f944e8381fba37fe8da6 Author: jcouteau <couteau(a)codelutin.com> Date: Thu Nov 14 10:56:01 2019 +0100 fixes #9738 - Ajouter un lien vers la doc en ligne dans le pied de page de la base commit 29a35fb64c5341c6e01a3dfd00f36d5eb8b997b5 Author: jcouteau <couteau(a)codelutin.com> Date: Tue Apr 30 15:01:06 2019 +0200 Update doc commit ad6b043206c3ca865c021d7ebd99cd737dacad4f Author: jcouteau <couteau(a)codelutin.com> Date: Tue Apr 30 14:56:26 2019 +0200 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 commit b58e9683fbb4847258d95f848e56bc9dbd0bfa1d Author: jcouteau <couteau(a)codelutin.com> Date: Thu Apr 25 15:56:26 2019 +0200 fixes #10317 - La première espèce d'un echotype n'est pas liée commit 96ae910553a9a12727d50b0b2e8397c7319bdb75 Author: jcouteau <couteau(a)codelutin.com> Date: Fri Mar 1 11:45:37 2019 +0100 refs #10215 refs #10216 refs #10217 -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 9

02/10: fixes #10317 - La première espèce d'un echotype n'est pas liée
by codelutin.com scm 20 Nov '19

20 Nov '19

This is an automated email from the git hooks/post-receive script. New commit to branch struts2.5 in repository echobase. See https://gitlab.nuiton.org/codelutin/echobase.git commit b58e9683fbb4847258d95f848e56bc9dbd0bfa1d Author: jcouteau <couteau(a)codelutin.com> Date: Thu Apr 25 15:56:26 2019 +0200 fixes #10317 - La première espèce d'un echotype n'est pas liée --- .../service/importdata/actions/ImportResultsEchotypeActionSupport.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/actions/ImportResultsEchotypeActionSupport.java b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/actions/ImportResultsEchotypeActionSupport.java index db14842b..3f83523e 100644 --- a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/actions/ImportResultsEchotypeActionSupport.java +++ b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/actions/ImportResultsEchotypeActionSupport.java @@ -107,6 +107,9 @@ public abstract class ImportResultsEchotypeActionSupport<M extends ImportDataCon // creates it echotype = persistenceService.createEchotype(rowEchotype); + // add this species + echotype.addSpecies(species); + // attach it to voyage provider.addEchotype(echotype); -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 0

branch develop updated (c1197fb0 -> a22b26ef)
by codelutin.com scm 17 Jan '19

17 Jan '19

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 c1197fb0 Fix version updates new a22b26ef Fixes #10217 - Update Biotic export 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 a22b26efac39a57792acf0aaadc255c57acb53f7 Author: jcouteau <couteau(a)codelutin.com> Date: Thu Jan 17 17:43:22 2019 +0100 Fixes #10217 - Update Biotic export Summary of changes: .../service/atlantos/xml/VocabularyExport.java | 7 +++-- .../service/atlantos/xml/XmlBioticExport.java | 32 ++-------------------- 2 files changed, 7 insertions(+), 32 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 (bdde5e7f -> c1197fb0)
by codelutin.com scm 17 Jan '19

17 Jan '19

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 bdde5e7f Update dependencies versions new c1197fb0 Fix version updates 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 c1197fb04b283279f73dc76d4fa0affd9662506c Author: jcouteau <couteau(a)codelutin.com> Date: Thu Jan 17 17:18:23 2019 +0100 Fix version updates Summary of changes: .../main/java/fr/ifremer/echobase/ui/validators/LoginValidator.java | 4 ++++ pom.xml | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 1

branch develop updated (aeb8694f -> bdde5e7f)
by codelutin.com scm 17 Jan '19

17 Jan '19

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 aeb8694f Add CI new bdde5e7f Update dependencies versions 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 bdde5e7fe485e9a3b89f61ec2e45a152c367e040 Author: jcouteau <couteau(a)codelutin.com> Date: Thu Jan 17 16:32:44 2019 +0100 Update dependencies versions Summary of changes: .../echobase/config/EchoBaseConfiguration.java | 7 +----- pom.xml | 29 +++++++++++----------- 2 files changed, 16 insertions(+), 20 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 (2c9cfc90 -> aeb8694f)
by codelutin.com scm 17 Jan '19

17 Jan '19

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 2c9cfc90 From scmwebeditor -- fg new aeb8694f Add CI 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 aeb8694fd418ebf0e247e1238669fe6838650f80 Author: jcouteau <couteau(a)codelutin.com> Date: Thu Jan 17 12:13:43 2019 +0100 Add CI Summary of changes: .gitlab-ci.yml | 40 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 40 insertions(+) create mode 100644 .gitlab-ci.yml -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 1

branch develop updated (4df3ff7d -> 2c9cfc90)
by codelutin.com scm 19 Apr '18

19 Apr '18

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 4df3ff7d From scmwebeditor -- fg new 2c9cfc90 From scmwebeditor -- fg 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 2c9cfc90409245cb554784a07b2bace66e55dfaf Author: mathieu.doray(a)ifremer.fr <unknown> Date: Thu Apr 19 11:40:45 2018 +0200 From scmwebeditor -- fg Summary of changes: src/site/rst/exportData.rst | 7 +++++++ 1 file changed, 7 insertions(+) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 1

branch develop updated (df14239d -> 4df3ff7d)
by codelutin.com scm 19 Apr '18

19 Apr '18

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 df14239d From scmwebeditor -- fg new 4df3ff7d From scmwebeditor -- fg 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 4df3ff7d664747984f3183d540409c214b9715c3 Author: mathieu.doray(a)ifremer.fr <unknown> Date: Thu Apr 19 11:36:05 2018 +0200 From scmwebeditor -- fg Summary of changes: src/site/rst/exportData.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 1

branch develop updated (582db0fe -> df14239d)
by codelutin.com scm 19 Apr '18

19 Apr '18

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 582db0fe From scmwebeditor -- dfgf new df14239d From scmwebeditor -- fg 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 df14239db457bb9c542a8e2360aa5806432d03fb Author: mathieu.doray(a)ifremer.fr <unknown> Date: Thu Apr 19 11:32:57 2018 +0200 From scmwebeditor -- fg Summary of changes: src/site/rst/exportData.rst | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 1