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

branch feature/8180 updated (c81b19a -> a209554)
by codelutin.com scm June 22, 2016

June 22, 2016

This is an automated email from the git hooks/post-receive script. New change to branch feature/8180 in repository echobase. See https://gitlab.nuiton.org/codelutin/echobase.git from c81b19a Fix description in modification logs new a209554 Begin create table in dashboard for mooring 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 a20955403871109879bfdfa6d209707ffdbcb4a5 Author: Julien Ruchaud <julien.ruchaud(a)debux.org> Date: Wed Jun 22 17:11:46 2016 +0200 Begin create table in dashboard for mooring Summary of changes: .../fr/ifremer/echobase/entities/ImportType.java | 130 +++++++++++++++------ .../services/service/UserDbPersistenceService.java | 27 +++++ .../service/importdata/ImportDataService.java | 1 + .../MooringCommonsImportConfiguration.java | 2 +- .../importdb/strategy/FreeImportDbStrategy.java | 2 +- .../service/removedata/RemoveDataService.java | 2 +- .../strategy/MooringRemoveDataStrategy.java | 2 +- .../echobase/ui/actions/dbeditor/GetEntities.java | 24 ++-- .../echobase/ui/actions/workingDb/DashBoard.java | 23 +++- .../ui/actions/workingDb/GetImportLogDetail.java | 7 +- .../src/main/resources/config/struts-workingDb.xml | 8 +- .../webapp/WEB-INF/jsp/workingDb/dashboard.jsp | 27 ++++- 12 files changed, 193 insertions(+), 62 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 1

branch feature/8180 updated (c6e295c -> c81b19a)
by codelutin.com scm June 22, 2016

June 22, 2016

This is an automated email from the git hooks/post-receive script. New change to branch feature/8180 in repository echobase. See https://gitlab.nuiton.org/codelutin/echobase.git from c6e295c Finish mooring import forms new c81b19a Fix description in modification logs 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 c81b19ad94ab59183b209a24f24694cd6cf35672 Author: Julien Ruchaud <julien.ruchaud(a)debux.org> Date: Wed Jun 22 14:00:38 2016 +0200 Fix description in modification logs Summary of changes: .../services/service/importdata/ImportDataService.java | 7 ++++--- .../service/importdata/actions/ImportDataActionSupport.java | 13 +++++-------- 2 files changed, 9 insertions(+), 11 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 1

branch feature/8180 updated (b1e59f8 -> c6e295c)
by codelutin.com scm June 22, 2016

June 22, 2016

This is an automated email from the git hooks/post-receive script. New change to branch feature/8180 in repository echobase. See https://gitlab.nuiton.org/codelutin/echobase.git from b1e59f8 Create IT for mooring importation new c6e295c Finish mooring import forms 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 c6e295cbbceb19987cf66b2a92ffa0e2bc448295 Author: Julien Ruchaud <julien.ruchaud(a)debux.org> Date: Wed Jun 22 11:12:19 2016 +0200 Finish mooring import forms Summary of changes: ...ingImport.java => ConfigureMooringCommonsImport.java} | 8 ++------ .../ui/actions/importData/ImportMooringMode.java | 2 +- .../actions/importData/LaunchMooringAcousticImport.java | 2 +- ...ousticImport.java => LaunchMooringCommonsImport.java} | 16 ++++++++-------- .../echobase/ui/actions/importData/SelectImportType.java | 2 +- .../src/main/resources/i18n/echobase-ui_en_GB.properties | 1 + .../src/main/resources/i18n/echobase-ui_fr_FR.properties | 1 + ...oringImport.jsp => configureMooringCommonsImport.jsp} | 4 ++-- ...CommonImport.jsp => progressMooringCommonsImport.jsp} | 4 ++-- ...ltCommonImport.jsp => resultMooringCommonsImport.jsp} | 2 +- 10 files changed, 20 insertions(+), 22 deletions(-) rename echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/{ConfigureMooringImport.java => ConfigureMooringCommonsImport.java} (87%) copy echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/{LaunchMooringAcousticImport.java => LaunchMooringCommonsImport.java} (67%) rename echobase-ui/src/main/webapp/WEB-INF/jsp/importData/{configureMooringImport.jsp => configureMooringCommonsImport.jsp} (92%) copy echobase-ui/src/main/webapp/WEB-INF/jsp/importData/{progressCommonImport.jsp => progressMooringCommonsImport.jsp} (88%) copy echobase-ui/src/main/webapp/WEB-INF/jsp/importData/{resultCommonImport.jsp => resultMooringCommonsImport.jsp} (93%) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 1

branch develop updated (46bfa10 -> ec1a8ab)
by codelutin.com scm June 22, 2016

June 22, 2016

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 46bfa10 Supression lock new ec1a8ab test2 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 ec1a8ab050b69598d6bbff2e429707352801bd5a Author: mathieu doray <mathieu@mathinux> Date: Wed Jun 22 11:01:49 2016 +0200 test2 Summary of changes: echobase-domain/src/main/data/export-DataMetadata.csv | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 1

branch feature/8180 updated (bb9d454 -> b1e59f8)
by codelutin.com scm June 22, 2016

June 22, 2016

This is an automated email from the git hooks/post-receive script. New change to branch feature/8180 in repository echobase. See https://gitlab.nuiton.org/codelutin/echobase.git from bb9d454 Fix UI after modification on remove strategies for mooring new b1e59f8 Create IT for mooring importation 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 b1e59f8958da03a348c4d04bc41279e95617c240 Author: Julien Ruchaud <julien.ruchaud(a)debux.org> Date: Wed Jun 22 10:32:53 2016 +0200 Create IT for mooring importation Summary of changes: .../service/importdata/ImportDataService.java | 23 ++++++++---- .../actions/MooringCommonsMooringImportAction.java | 12 +++--- ...l.java => MooringCommonsImportExportModel.java} | 14 +++---- .../echobase/services/EchoBaseServiceFixtures.java | 4 ++ .../echobase/services/ImportDataFixtures.java | 4 +- .../importdata/MooringAcousticImportServiceIT.java | 2 +- ...eIT.java => MooringCommonsImportServiceIT.java} | 41 +++++++++++---------- .../resources/import-data/mooring/mooring.csv.gz | Bin 0 -> 323 bytes 8 files changed, 56 insertions(+), 44 deletions(-) rename echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/{MooringCommonsMooringImportExportModel.java => MooringCommonsImportExportModel.java} (85%) copy echobase-services/src/test/java/fr/ifremer/echobase/services/service/importdata/{VoyageResultsVoyageOnlyEchotypeImportServiceIT.java => MooringCommonsImportServiceIT.java} (51%) create mode 100644 echobase-services/src/test/resources/import-data/mooring/mooring.csv.gz -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 1

branch feature/8180 updated (59af2e0 -> bb9d454)
by codelutin.com scm June 21, 2016

June 21, 2016

This is an automated email from the git hooks/post-receive script. New change to branch feature/8180 in repository echobase. See https://gitlab.nuiton.org/codelutin/echobase.git from 59af2e0 Introduce entityId in importLog (not working in UI) new f754e8b Add remove strategies for mooring (not tested) new bb9d454 Fix UI after modification on remove strategies for mooring 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 bb9d4544190854a78502bdeb89e263181c5b567a Author: Julien Ruchaud <julien.ruchaud(a)debux.org> Date: Tue Jun 21 17:51:58 2016 +0200 Fix UI after modification on remove strategies for mooring commit f754e8b3503e988bfa2ac9e6ea26ff142361ffc5 Author: Julien Ruchaud <julien.ruchaud(a)debux.org> Date: Tue Jun 21 17:19:40 2016 +0200 Add remove strategies for mooring (not tested) Summary of changes: .../echobase/entities/data/CellTopiaDao.java | 89 +++++++++++++++++++++- .../i18n/echobase-domain_en_GB.properties | 4 + .../i18n/echobase-domain_fr_FR.properties | 4 + .../services/service/UserDbPersistenceService.java | 20 ++++- .../service/removedata/RemoveDataService.java | 9 ++- .../strategy/AbstractRemoveDataStrategy.java | 80 ++++--------------- .../strategy/AcousticRemoveDataStrategy.java | 1 - .../strategy/CommonAllRemoveDataStrategy.java | 1 - .../strategy/CommonTransectRemoveDataStrategy.java | 1 - .../strategy/CommonTransitRemoveDataStrategy.java | 1 - .../strategy/DummyMooringRemoveDataStrategy.java | 60 +++++++++++++++ .../strategy/LegacyVoyageRemoveDataStrategy.java | 1 - ...java => MooringAcousticRemoveDataStrategy.java} | 50 +++++------- ...trategy.java => MooringRemoveDataStrategy.java} | 50 ++++++------ .../echobase/ui/actions/dbeditor/GetEntities.java | 30 ++++---- .../ui/actions/removeData/ConfirmDelete.java | 5 +- .../echobase/ui/actions/workingDb/DashBoard.java | 2 - .../ui/actions/workingDb/GetImportLogDetail.java | 6 +- echobase-ui/src/main/resources/echobase.properties | 2 + 19 files changed, 257 insertions(+), 159 deletions(-) create mode 100644 echobase-services/src/main/java/fr/ifremer/echobase/services/service/removedata/strategy/DummyMooringRemoveDataStrategy.java copy echobase-services/src/main/java/fr/ifremer/echobase/services/service/removedata/strategy/{AcousticRemoveDataStrategy.java => MooringAcousticRemoveDataStrategy.java} (67%) copy echobase-services/src/main/java/fr/ifremer/echobase/services/service/removedata/strategy/{ResultEsduRemoveDataStrategy.java => MooringRemoveDataStrategy.java} (53%) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 2

branch feature/8180 updated (ce6f852 -> 59af2e0)
by codelutin.com scm June 21, 2016

June 21, 2016

This is an automated email from the git hooks/post-receive script. New change to branch feature/8180 in repository echobase. See https://gitlab.nuiton.org/codelutin/echobase.git from ce6f852 Add translation new 3a36842 Create mooring import service new 59af2e0 Introduce entityId in importLog (not working in UI) 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 59af2e00db8da4026e70caee758118dac54e39cd Author: Julien Ruchaud <julien.ruchaud(a)debux.org> Date: Tue Jun 21 16:23:06 2016 +0200 Introduce entityId in importLog (not working in UI) commit 3a36842921147bdd918f043fbf4a6fa8e1308310 Author: Julien Ruchaud <julien.ruchaud(a)debux.org> Date: Fri Jun 17 16:33:48 2016 +0200 Create mooring import service Summary of changes: .../Ports.java => DataAccousticProvider.java} | 28 +++--- .../fr/ifremer/echobase/entities/ImportLogs.java | 4 +- .../fr/ifremer/echobase/entities/ImportType.java | 20 +++- ...WorkingDbMigrationCallBackForVersion3_906.java} | 16 +-- .../i18n/echobase-domain_en_GB.properties | 2 + .../i18n/echobase-domain_fr_FR.properties | 2 + .../h2/3.906-0-update-importLog-entityId.sql | 1 + .../pg/3.906-0-update-importLog-entityId.sql | 1 + echobase-domain/src/main/xmi/echobase.properties | 2 +- echobase-domain/src/main/xmi/echobase.zargo | Bin 98231 -> 98213 bytes .../echobase/services/csv/EchoBaseCsvUtil.java | 10 ++ .../services/service/UserDbPersistenceService.java | 14 ++- ...eption.java => DuplicatedMooringException.java} | 8 +- .../service/importdata/ImportDataService.java | 15 ++- .../actions/ImportDataActionSupport.java | 3 + ... => MooringCommonsImportDataActionSupport.java} | 11 ++- .../actions/MooringCommonsMooringImportAction.java | 109 +++++++++++++++++++++ .../actions/VoyageCommonsVoyageImportAction.java | 2 +- .../MooringAcousticsImportConfiguration.java | 14 +-- ...java => MooringCommonsImportConfiguration.java} | 31 +++--- ... => MooringImportDataConfigurationSupport.java} | 20 ++-- .../contexts/ImportDataContextSupport.java | 10 ++ .../MooringAcousticsImportDataContext.java | 2 +- ...t.java => MooringCommonsImportDataContext.java} | 13 ++- ...t.java => MooringImportDataContextSupport.java} | 24 +++-- .../contexts/VoyageImportDataContextSupport.java | 2 +- .../MooringCommonsMooringImportExportModel.java | 93 ++++++++++++++++++ .../strategy/AbstractImportDbStrategy.java | 37 +++---- .../importdb/strategy/FreeImportDbStrategy.java | 22 ++++- .../strategy/ReferentialImportDbStrategy.java | 3 +- .../service/removedata/RemoveDataService.java | 42 ++++---- .../strategy/AbstractRemoveDataStrategy.java | 20 ++-- .../strategy/AcousticRemoveDataStrategy.java | 13 ++- .../strategy/CatchesRemoveDataStrategy.java | 7 +- .../strategy/CommonAllRemoveDataStrategy.java | 10 +- .../strategy/CommonTransectRemoveDataStrategy.java | 13 ++- .../strategy/CommonTransitRemoveDataStrategy.java | 14 ++- .../strategy/CommonVoyageRemoveDataStrategy.java | 11 ++- .../strategy/LegacyVoyageRemoveDataStrategy.java | 10 +- .../strategy/OperationRemoveDataStrategy.java | 7 +- .../strategy/ResultEsduRemoveDataStrategy.java | 7 +- .../strategy/ResultMapFishRemoveDataStrategy.java | 8 +- .../strategy/ResultMapOtherRemoveDataStrategy.java | 8 +- .../strategy/ResultRegionRemoveDataStrategy.java | 8 +- .../strategy/ResultVoyageRemoveDataStrategy.java | 13 ++- .../i18n/echobase-services_en_GB.properties | 2 + .../i18n/echobase-services_fr_FR.properties | 2 + .../removedata/AbstractRemoveDataServiceTest.java | 2 +- ...sticImport.java => ConfigureMooringImport.java} | 39 +++++--- .../ui/actions/importData/ImportMooringMode.java | 5 +- .../ui/actions/importData/SelectImportType.java | 2 +- .../resources/i18n/echobase-ui_en_GB.properties | 1 + .../resources/i18n/echobase-ui_fr_FR.properties | 1 + ...atchesImport.jsp => configureMooringImport.jsp} | 32 ++---- 54 files changed, 558 insertions(+), 238 deletions(-) copy echobase-domain/src/main/java/fr/ifremer/echobase/entities/{references/Ports.java => DataAccousticProvider.java} (70%) copy echobase-domain/src/main/java/fr/ifremer/echobase/persistence/migration/workingDb/{WorkingDbMigrationCallBackForVersion3_905.java => WorkingDbMigrationCallBackForVersion3_906.java} (62%) create mode 100644 echobase-domain/src/main/resources/migration/workingDb/h2/3.906-0-update-importLog-entityId.sql create mode 100644 echobase-domain/src/main/resources/migration/workingDb/pg/3.906-0-update-importLog-entityId.sql copy echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/{DuplicatedVoyageException.java => DuplicatedMooringException.java} (77%) copy echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/actions/{MooringAcousticsImportDataActionSupport.java => MooringCommonsImportDataActionSupport.java} (73%) create mode 100644 echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/actions/MooringCommonsMooringImportAction.java copy echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/configurations/{VoyageImportDataConfigurationSupport.java => MooringCommonsImportConfiguration.java} (55%) copy echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/configurations/{VoyageImportDataConfigurationSupport.java => MooringImportDataConfigurationSupport.java} (67%) copy echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/contexts/{VoyageCommonsImportDataContext.java => MooringCommonsImportDataContext.java} (72%) copy echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/contexts/{MooringAcousticsImportDataContext.java => MooringImportDataContextSupport.java} (64%) create mode 100644 echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/MooringCommonsMooringImportExportModel.java copy echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/{LaunchMooringAcousticImport.java => ConfigureMooringImport.java} (52%) copy echobase-ui/src/main/webapp/WEB-INF/jsp/importData/{configureCatchesImport.jsp => configureMooringImport.jsp} (65%) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 2

branch develop updated (292e560 -> 46bfa10)
by codelutin.com scm June 20, 2016

June 20, 2016

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 292e560 Test new 46bfa10 Supression lock 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 46bfa10fca619e5f6a889395fa0d22b32f6641b8 Author: mathieu doray <mathieu@mathinux> Date: Mon Jun 20 17:59:55 2016 +0200 Supression lock Summary of changes: echobase-domain/src/main/data/.~lock.export-DataMetadata.csv# | 1 - 1 file changed, 1 deletion(-) delete mode 100644 echobase-domain/src/main/data/.~lock.export-DataMetadata.csv# -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 1

branch develop updated (2ef6a93 -> 292e560)
by codelutin.com scm June 20, 2016

June 20, 2016

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 2ef6a93 Initalisation du referenciel new 292e560 Test 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 292e560f81441e8032071cd4c24bd0f5f8685a3a Author: mathieu doray <mathieu@mathinux> Date: Mon Jun 20 17:57:19 2016 +0200 Test Summary of changes: echobase-domain/src/main/data/.~lock.export-DataMetadata.csv# | 1 + echobase-domain/src/main/data/export-DataMetadata.csv | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) create mode 100644 echobase-domain/src/main/data/.~lock.export-DataMetadata.csv# -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 1

branch develop updated (b9fb829 -> 2ef6a93)
by codelutin.com scm June 20, 2016

June 20, 2016

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 b9fb829 Rename legend in qgis new 2ef6a93 Initalisation du referenciel 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 2ef6a9373e14454af065f5dab7f84b25f24c1595 Author: mathieu doray <mathieu@mathinux> Date: Mon Jun 20 17:51:00 2016 +0200 Initalisation du referenciel Summary of changes: .../src/main/data/export-AgeCategory.csv | 5 + echobase-domain/src/main/data/export-Category.csv | 8 + echobase-domain/src/main/data/export-CellType.csv | 8 + .../src/main/data/export-DataMetadata.csv | 168 ++++++++++++++ echobase-domain/src/main/data/export-DataType.csv | 29 +++ .../src/main/data/export-DepthStratum.csv | 21 ++ echobase-domain/src/main/data/export-Gear.csv | 188 +++++++++++++++ .../src/main/data/export-GearMetadata.csv | 8 + .../src/main/data/export-SampleDataType.csv | 137 +++++++++++ .../src/main/data/export-SampleType.csv | 6 + .../src/main/data/export-SizeCategory.csv | 8 + echobase-domain/src/main/data/export-Species.csv | 256 +++++++++++++++++++++ echobase-domain/src/main/data/export-Strata.csv | 2 + .../src/main/data/export-TSParameters.csv | 134 +++++++++++ echobase-domain/src/main/data/export-Vessel.csv | 14 ++ .../src/main/data/export-VesselType.csv | 8 + 16 files changed, 1000 insertions(+) create mode 100644 echobase-domain/src/main/data/export-AgeCategory.csv create mode 100644 echobase-domain/src/main/data/export-Category.csv create mode 100644 echobase-domain/src/main/data/export-CellType.csv create mode 100644 echobase-domain/src/main/data/export-DataMetadata.csv create mode 100644 echobase-domain/src/main/data/export-DataType.csv create mode 100644 echobase-domain/src/main/data/export-DepthStratum.csv create mode 100644 echobase-domain/src/main/data/export-Gear.csv create mode 100644 echobase-domain/src/main/data/export-GearMetadata.csv create mode 100644 echobase-domain/src/main/data/export-SampleDataType.csv create mode 100644 echobase-domain/src/main/data/export-SampleType.csv create mode 100644 echobase-domain/src/main/data/export-SizeCategory.csv create mode 100644 echobase-domain/src/main/data/export-Species.csv create mode 100644 echobase-domain/src/main/data/export-Strata.csv create mode 100644 echobase-domain/src/main/data/export-TSParameters.csv create mode 100644 echobase-domain/src/main/data/export-Vessel.csv create mode 100644 echobase-domain/src/main/data/export-VesselType.csv -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 1