Echobase-commits

Download

echobase-commits@list.forge.codelutin.com

January 2020

1 participants
2 discussions

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

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