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

branch develop updated (f103039 -> ae0e78d)
by codelutin.com scm July 6, 2016

July 6, 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 f103039 Merge branch 'feature/8180' into develop new ae0e78d Remove log 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 ae0e78d6c53ef4b7b88aa310b73989477fefb3cc Author: Julien Ruchaud <julien.ruchaud(a)debux.org> Date: Wed Jul 6 11:42:09 2016 +0200 Remove log Summary of changes: .../service/importdata/actions/ImportAcousticsActionSupport.java | 2 -- 1 file changed, 2 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 (acde695 -> f103039)
by codelutin.com scm July 6, 2016

July 6, 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 acde695 [jgitflow-maven-plugin]Updating develop poms back to pre merge state new 06a112d Add new import mode for mooring new fcb76c3 Change style new 2e685cb Plug action but they are not implemented new cf4e900 Plug action but they are not implemented new c45b350 Add form to import accoustics data for mooring new 99e85b4 Force input action for the validation new 05a6223 Implements accoustic data import for mooring new 7d474b1 Add translation new 05c4c41 Create mooring import service new 240051e Add remove strategies for mooring (not tested) new 26bbe2e Fix UI after modification on remove strategies for mooring new bfe6e95 Create IT for mooring importation new 1b4499d Finish mooring import forms new c47f954 Fix description in modification logs new e6c7d05 Begin create table in dashboard for mooring new 2071c67 Fix error on Elementary cell when position is set at end new 6f27c0e Fix tooltip, delete quote in string new 8a4f1cc Add support to display a mooring new 3f49ca8 Add support to display a mooring new d33669f Toggle visibility between voyages and morings new a7c6529 Toggle visibility between voyages and morings new 4c7ad65 Add translate new a1cb8d2 Add moring support in remove import new be9b0fc Add test on remove mooring import new ac4d5cc Add test on remove mooring acoustic import new d1c2fe1 Force migration new cad618b Force migration new b6c4248 Add test on remove mooring acoustic import new 0bc16f1 Add migration for database for the mooring new 5ae4575 Fix test due to mooring acoustic import test new 7f5fdb4 Fix test due to mooring acoustic import test new 2459a0e Improve the perfomance on search duplicate cell (ref #8165) new de9a623 Move migration to 3.907 version new 1ab5806 Move migration to 3.907 version new 54ce56d Update documentation for the mooring import new 60bca11 Refactoring avoid copy/paste on acoustic import for voyage and mooring new f255142 Fix delete import for mooring new 249211a Fix delete import for mooring new 6761c1d Refactoring on result import to make place for mooring new 27d7303 Refactoring on echotype import to make place for mooring new d25c1eb Add DataAcousticProvider in the model to avoid cast new d0a307c Create basic import AncillaryInstrumentation for Mooring new c5a4572 Add forgotten columns (refs #8370) new e8830cb Handle duplication on elementary cell (refs #2246) new b6ba2a9 Handle duplication on elementary cell (refs #2246) new 6ec47de Handle duplication on elementary cell (refs #2246) new 224bd1b Create ancillary intrumentation import for the voyage new 9c65eef Handle remove ancillary instrumentation import new a475079 Migrate database and add ancillary instrumentation new 2061223 Complete documentation on Ancillary instrumentation import new 871f148 Add echotype on mooring new 90397fc Add echotype on mooring new 251f4f7 Create service for echotype import for mooring new 791d802 Create service for esdu results import for mooring new 8d19a2d Create remove strategy for esdu results import for mooring new 9edc202 Migrate database to introduce echotype for the mooring new 38ee8f6 Complete documentation on mooring import new 3c8ff7a Clear hibernate trasaction to increase performance during flush (refs #8165) new 9425305 Add ancillary intrumentation in UI new 98ec303 Add results import for mooring in UI new 78ee58f Modify esdu cell name new a574030 Use too elementary cell new 00cbfce Add new import mode for mooring new 5d437a7 Change style new ff095a2 Plug action but they are not implemented new 6627c4c Plug action but they are not implemented new 173d055 Add form to import accoustics data for mooring new 8bf46a6 Force input action for the validation new 68d33c9 Implements accoustic data import for mooring new ce6f852 Add translation new 3a36842 Create mooring import service new 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 new b1e59f8 Create IT for mooring importation new c6e295c Finish mooring import forms new c81b19a Fix description in modification logs new a209554 Begin create table in dashboard for mooring new 4cc1ac4 Fix error on Elementary cell when position is set at end new e70d317 Fix tooltip, delete quote in string new aec1002 Add support to display a mooring new e18c828 Add support to display a mooring new 9df8d02 Toggle visibility between voyages and morings new 6c3b2f1 Toggle visibility between voyages and morings new 359a065 Add translate new 7912ed8 Add moring support in remove import new 172b9b8 Add test on remove mooring import new 386ecfb Add test on remove mooring acoustic import new e1a4cb3 Force migration new bacb8bb Force migration new d9e0c99 Add test on remove mooring acoustic import new 90f4702 Add migration for database for the mooring new 782f88d Fix test due to mooring acoustic import test new 1399fe4 Fix test due to mooring acoustic import test new c576083 Improve the perfomance on search duplicate cell (ref #8165) new 85d1ca3 Improve the perfomance on search duplicate cell (ref #8165) new 76dd036 Improve the perfomance on search duplicate cell (ref #8165) new 5056a51 Move migration to 3.907 version new 316dc33 Move migration to 3.907 version new c679de2 Update documentation for the mooring import new d9be6f1 Refactoring avoid copy/paste on acoustic import for voyage and mooring new 150c7e6 Fix delete import for mooring new d3f6fb9 Fix delete import for mooring new cd4c7ee Refactoring on result import to make place for mooring new 612b6a3 Refactoring on echotype import to make place for mooring new 33247f7 Add DataAcousticProvider in the model to avoid cast new 4b96b1f Create basic import AncillaryInstrumentation for Mooring new b47af30 Add forgotten columns (refs #8370) new f334d59 Handle duplication on elementary cell (refs #2246) new 99c6aaf Handle duplication on elementary cell (refs #2246) new 0b01f5f Handle duplication on elementary cell (refs #2246) new 9f0f94f Create ancillary intrumentation import for the voyage new 4dc5610 Handle remove ancillary instrumentation import new 499517a Migrate database and add ancillary instrumentation new edc70c3 Complete documentation on Ancillary instrumentation import new 0285289 Add echotype on mooring new b4c446f Add echotype on mooring new bcee297 Create service for echotype import for mooring new 2b736c0 Create service for esdu results import for mooring new e81e229 Create remove strategy for esdu results import for mooring new cd9fa27 Migrate database to introduce echotype for the mooring new ca641fb Complete documentation on mooring import new 15ec21f Clear hibernate trasaction to increase performance during flush (refs #8165) new efcdae6 Add ancillary intrumentation in UI new f472fe9 Add results import for mooring in UI new f641359 Modify esdu cell name new 943c4a4 Use too elementary cell new c88cba4 Merge branch 'feature/8180' of gitlab.nuiton.org:codelutin/echobase into feature/8180 new f103039 Merge branch 'feature/8180' into develop The 129 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 f1030396d6d60632efdf20089c5a59c93558c8f5 Merge: acde695 c88cba4 Author: Julien Ruchaud <julien.ruchaud(a)debux.org> Date: Wed Jul 6 10:52:24 2016 +0200 Merge branch 'feature/8180' into develop commit c88cba42bfd2bd1ed7f1182b0e94dae1276a1840 Merge: a574030 943c4a4 Author: Julien Ruchaud <julien.ruchaud(a)debux.org> Date: Wed Jul 6 10:47:44 2016 +0200 Merge branch 'feature/8180' of gitlab.nuiton.org:codelutin/echobase into feature/8180 commit a57403057f756127c4b306c2d3e5d5ad47872d4d Author: Julien Ruchaud <julien.ruchaud(a)debux.org> Date: Wed Jul 6 09:58:03 2016 +0200 Use too elementary cell commit 78ee58f2517e2875e9a9a1bf0190072b7992df48 Author: Julien Ruchaud <julien.ruchaud(a)debux.org> Date: Tue Jul 5 18:18:00 2016 +0200 Modify esdu cell name commit 98ec3032076abb7d50c9a17b1c44abfd81d54cc1 Author: Julien Ruchaud <julien.ruchaud(a)debux.org> Date: Tue Jul 5 18:06:49 2016 +0200 Add results import for mooring in UI commit 94253052abfb658a6e2e64e3d0d0e11846b2109e Author: Julien Ruchaud <julien.ruchaud(a)debux.org> Date: Tue Jul 5 16:03:40 2016 +0200 Add ancillary intrumentation in UI commit 3c8ff7a5035834d005df80f143357ba5459a836c Author: Julien Ruchaud <julien.ruchaud(a)debux.org> Date: Tue Jul 5 14:52:10 2016 +0200 Clear hibernate trasaction to increase performance during flush (refs #8165) commit 38ee8f61ddde174357637692d1ca47ebe11bef71 Author: Julien Ruchaud <julien.ruchaud(a)debux.org> Date: Mon Jul 4 17:33:23 2016 +0200 Complete documentation on mooring import commit 9edc2020e89f572ecf0bebd706bd198c0b1b4fac Author: Julien Ruchaud <julien.ruchaud(a)debux.org> Date: Mon Jul 4 17:14:17 2016 +0200 Migrate database to introduce echotype for the mooring commit 8d19a2d42e5954f01bd87e01e8f1a0ad3d2e63ac Author: Julien Ruchaud <julien.ruchaud(a)debux.org> Date: Mon Jul 4 17:11:36 2016 +0200 Create remove strategy for esdu results import for mooring commit 791d80244d3bfd977bb791c8e24908064a5a78a2 Author: Julien Ruchaud <julien.ruchaud(a)debux.org> Date: Mon Jul 4 16:55:07 2016 +0200 Create service for esdu results import for mooring commit 251f4f75b01218e6ef2bddf34ce06db6d3dee33c Author: Julien Ruchaud <julien.ruchaud(a)debux.org> Date: Mon Jul 4 15:19:17 2016 +0200 Create service for echotype import for mooring commit 90397fc792ad8442d33036f534f6675ba737bf07 Author: Julien Ruchaud <julien.ruchaud(a)debux.org> Date: Mon Jul 4 14:04:47 2016 +0200 Add echotype on mooring commit 871f1481bfd3119fd2a99ca79f6189bab4320c80 Author: Julien Ruchaud <julien.ruchaud(a)debux.org> Date: Mon Jul 4 14:03:59 2016 +0200 Add echotype on mooring commit 2061223c69b217d314121e880bcabcbece4268a2 Author: Julien Ruchaud <julien.ruchaud(a)debux.org> Date: Mon Jul 4 12:00:48 2016 +0200 Complete documentation on Ancillary instrumentation import commit a4750799ad06123cd4ce8e5de9b4a6fd3cdcf7af Author: Julien Ruchaud <julien.ruchaud(a)debux.org> Date: Mon Jul 4 11:47:06 2016 +0200 Migrate database and add ancillary instrumentation commit 9c65eefedcd87e49b586a860cad04617d424e55f Author: Julien Ruchaud <julien.ruchaud(a)debux.org> Date: Mon Jul 4 11:23:24 2016 +0200 Handle remove ancillary instrumentation import commit 224bd1bf2a0cbc25977e2212eac4ea7523353a37 Author: Julien Ruchaud <julien.ruchaud(a)debux.org> Date: Fri Jul 1 11:21:52 2016 +0200 Create ancillary intrumentation import for the voyage commit 6ec47debd752b4d10d82520fc64b5473346d5bd9 Author: Julien Ruchaud <julien.ruchaud(a)debux.org> Date: Thu Jun 30 17:52:05 2016 +0200 Handle duplication on elementary cell (refs #2246) commit b6ba2a92f48c91a37f47571914ec24fef20a6db2 Author: Julien Ruchaud <julien.ruchaud(a)debux.org> Date: Thu Jun 30 17:18:19 2016 +0200 Handle duplication on elementary cell (refs #2246) commit e8830cb1a132c5f8404ce8855cf318a252450d3c Author: Julien Ruchaud <julien.ruchaud(a)debux.org> Date: Thu Jun 30 17:16:40 2016 +0200 Handle duplication on elementary cell (refs #2246) commit c5a4572a2196e00ba6723db90b66015b282772b4 Author: Julien Ruchaud <julien.ruchaud(a)debux.org> Date: Wed Jun 29 19:00:08 2016 +0200 Add forgotten columns (refs #8370) commit d0a307cc5d176ab10698a6ca8c4009f35fe5648a Author: Julien Ruchaud <julien.ruchaud(a)debux.org> Date: Wed Jun 29 15:32:43 2016 +0200 Create basic import AncillaryInstrumentation for Mooring commit d25c1eb6de81b738a38da8a4d11bd933303f924d Author: Julien Ruchaud <julien.ruchaud(a)debux.org> Date: Wed Jun 29 11:38:41 2016 +0200 Add DataAcousticProvider in the model to avoid cast commit 27d730389ebabbc409c90bc7ca6550da896c4098 Author: Julien Ruchaud <julien.ruchaud(a)debux.org> Date: Wed Jun 29 10:35:11 2016 +0200 Refactoring on echotype import to make place for mooring commit 6761c1d0e8ad9633b0ae0f0d12d82f17d41526ac Author: Julien Ruchaud <julien.ruchaud(a)debux.org> Date: Wed Jun 29 09:17:44 2016 +0200 Refactoring on result import to make place for mooring commit 249211a45d75e26d893eba25d933ee301fc5bac3 Author: Julien Ruchaud <julien.ruchaud(a)debux.org> Date: Tue Jun 28 16:55:04 2016 +0200 Fix delete import for mooring commit f2551429fc42c45c89c63e07f0815361b35bfafb Author: Julien Ruchaud <julien.ruchaud(a)debux.org> Date: Tue Jun 28 16:48:31 2016 +0200 Fix delete import for mooring commit 60bca11cdb1b4f758ff7191b624b54ec3e9fd237 Author: Julien Ruchaud <julien.ruchaud(a)debux.org> Date: Tue Jun 28 16:26:03 2016 +0200 Refactoring avoid copy/paste on acoustic import for voyage and mooring commit 54ce56dc312ddf9ee58278a084c66f45b72c9712 Author: Julien Ruchaud <julien.ruchaud(a)debux.org> Date: Mon Jun 27 17:37:47 2016 +0200 Update documentation for the mooring import commit 1ab58067ab13badc352d33da005f8a249e6427ac Author: Julien Ruchaud <julien.ruchaud(a)debux.org> Date: Mon Jun 27 17:12:09 2016 +0200 Move migration to 3.907 version commit de9a623de252cf8a0fc1fd3fd4797510a59d482f Author: Julien Ruchaud <julien.ruchaud(a)debux.org> Date: Mon Jun 27 16:32:51 2016 +0200 Move migration to 3.907 version commit 2459a0e80bd0f5fbf3d9ee68db304ca800b2a8bf Author: Julien Ruchaud <julien.ruchaud(a)debux.org> Date: Mon Jun 27 16:22:50 2016 +0200 Improve the perfomance on search duplicate cell (ref #8165) commit 7f5fdb4ae28947464ae40ea6a837f53fee98aadf Author: Julien Ruchaud <julien.ruchaud(a)debux.org> Date: Mon Jun 27 16:19:29 2016 +0200 Fix test due to mooring acoustic import test commit 5ae4575713b7d9ca8a23d9de7eb4bf11e07c6628 Author: Julien Ruchaud <julien.ruchaud(a)debux.org> Date: Mon Jun 27 11:27:08 2016 +0200 Fix test due to mooring acoustic import test commit 0bc16f1a63df48eba17eaa5bcc5df1c5256f4724 Author: Julien Ruchaud <julien.ruchaud(a)debux.org> Date: Mon Jun 27 11:20:29 2016 +0200 Add migration for database for the mooring commit b6c42489f2dd77e09287a46a52e2c9cd0063e930 Author: Julien Ruchaud <julien.ruchaud(a)debux.org> Date: Mon Jun 27 10:46:21 2016 +0200 Add test on remove mooring acoustic import commit cad618b84113b58fc81df5d59e9b4808eb0d6be7 Author: Julien Ruchaud <julien.ruchaud(a)debux.org> Date: Mon Jun 27 10:31:30 2016 +0200 Force migration commit d1c2fe10b8e29199bc6fcabd58882bd518f1142b Author: Julien Ruchaud <julien.ruchaud(a)debux.org> Date: Mon Jun 27 10:29:57 2016 +0200 Force migration commit ac4d5cc98ff1429688ff380cb3354b649f56fe78 Author: Julien Ruchaud <julien.ruchaud(a)debux.org> Date: Mon Jun 27 10:27:58 2016 +0200 Add test on remove mooring acoustic import commit be9b0fc02d223cc7ac32f4e82951dade168f22bc Author: Julien Ruchaud <julien.ruchaud(a)debux.org> Date: Fri Jun 24 18:21:30 2016 +0200 Add test on remove mooring import commit a1cb8d26e38281645f701c8faf3587f0525fb710 Author: Julien Ruchaud <julien.ruchaud(a)debux.org> Date: Fri Jun 24 11:19:43 2016 +0200 Add moring support in remove import commit 4c7ad65a708aa504862cbcf4741dbc333da252e0 Author: Julien Ruchaud <julien.ruchaud(a)debux.org> Date: Thu Jun 23 17:23:01 2016 +0200 Add translate commit a7c65293d891c0053c42a023d65b5640a6f681cf Author: Julien Ruchaud <julien.ruchaud(a)debux.org> Date: Thu Jun 23 16:58:28 2016 +0200 Toggle visibility between voyages and morings commit d33669f3925f15e9cf0f68d3ba4bf8f933476d87 Author: Julien Ruchaud <julien.ruchaud(a)debux.org> Date: Thu Jun 23 16:31:15 2016 +0200 Toggle visibility between voyages and morings commit 3f49ca8f43a7f01576d953d855ef24e945567a42 Author: Julien Ruchaud <julien.ruchaud(a)debux.org> Date: Thu Jun 23 14:27:47 2016 +0200 Add support to display a mooring commit 8a4f1cca7c35f284b902a8c648005e1ab76af223 Author: Julien Ruchaud <julien.ruchaud(a)debux.org> Date: Thu Jun 23 12:08:32 2016 +0200 Add support to display a mooring commit 6f27c0e3eac2f1d7487bbf08bd6a2106efc6957c Author: Julien Ruchaud <julien.ruchaud(a)debux.org> Date: Thu Jun 23 10:53:02 2016 +0200 Fix tooltip, delete quote in string commit 2071c678fdd954fd52be0d71c72dda764a3fd36c Author: Julien Ruchaud <julien.ruchaud(a)debux.org> Date: Thu Jun 23 10:19:05 2016 +0200 Fix error on Elementary cell when position is set at end commit e6c7d05dabb42c95f620e7099f210b9cdadf46e1 Author: Julien Ruchaud <julien.ruchaud(a)debux.org> Date: Wed Jun 22 17:11:46 2016 +0200 Begin create table in dashboard for mooring commit c47f954b25d48a91f6df8c45dfdc9b91904366b0 Author: Julien Ruchaud <julien.ruchaud(a)debux.org> Date: Wed Jun 22 14:00:38 2016 +0200 Fix description in modification logs commit 1b4499df211e78d5c4f0f5b721233138bdcdf4c7 Author: Julien Ruchaud <julien.ruchaud(a)debux.org> Date: Wed Jun 22 11:12:19 2016 +0200 Finish mooring import forms commit bfe6e956569d5537c32ee3d61da37e6c7c5b99a4 Author: Julien Ruchaud <julien.ruchaud(a)debux.org> Date: Wed Jun 22 10:32:53 2016 +0200 Create IT for mooring importation commit 26bbe2e1c2d99993a008eb6714b58e42f559c93d 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 240051e1a14b032e911ff001a3827abc1ef53458 Author: Julien Ruchaud <julien.ruchaud(a)debux.org> Date: Tue Jun 21 17:19:40 2016 +0200 Add remove strategies for mooring (not tested) commit 05c4c41df776158addb3dd493529e00f0d37e26c Author: Julien Ruchaud <julien.ruchaud(a)debux.org> Date: Fri Jun 17 16:33:48 2016 +0200 Create mooring import service commit 7d474b13cde499f5fd52c0c7c6f07ac00918a842 Author: Julien Ruchaud <julien.ruchaud(a)debux.org> Date: Thu Jun 16 16:45:36 2016 +0200 Add translation commit 05a6223f113658a73a57e73636f934f96086ef8c Author: Julien Ruchaud <julien.ruchaud(a)debux.org> Date: Tue Jun 14 16:45:12 2016 +0200 Implements accoustic data import for mooring commit 99e85b4c5c0c3010c3955780ef0f9718cdd0dae1 Author: Julien Ruchaud <julien.ruchaud(a)debux.org> Date: Tue Jun 14 10:54:14 2016 +0200 Force input action for the validation commit c45b35009f82823808ca3a4a1bf4a8c73c5bec96 Author: Julien Ruchaud <julien.ruchaud(a)debux.org> Date: Mon Jun 13 17:32:45 2016 +0200 Add form to import accoustics data for mooring commit cf4e9005129b8f3de2f8c941737f683fb45e6f6c Author: Julien Ruchaud <julien.ruchaud(a)debux.org> Date: Mon Jun 13 16:02:44 2016 +0200 Plug action but they are not implemented commit 2e685cbf6014e18e8f5e3ab68f6169c104980afe Author: Julien Ruchaud <julien.ruchaud(a)debux.org> Date: Mon Jun 13 13:48:49 2016 +0200 Plug action but they are not implemented commit fcb76c3eff4cd93577534a75de4a301321fd20a0 Author: Julien Ruchaud <julien.ruchaud(a)debux.org> Date: Mon Jun 13 12:12:47 2016 +0200 Change style commit 06a112d3acc7085f8aca966067da42d4bc315b79 Author: Julien Ruchaud <julien.ruchaud(a)debux.org> Date: Mon Jun 13 12:00:56 2016 +0200 Add new import mode for mooring commit 943c4a4ec5c1f34addc3d88a7c9ad46f34d23eb9 Author: Julien Ruchaud <julien.ruchaud(a)debux.org> Date: Wed Jul 6 09:58:03 2016 +0200 Use too elementary cell commit f64135905e33833d20fbabdc66b4b69eab79908c Author: Julien Ruchaud <julien.ruchaud(a)debux.org> Date: Tue Jul 5 18:18:00 2016 +0200 Modify esdu cell name commit f472fe90cea025623dc36041886521682d289c41 Author: Julien Ruchaud <julien.ruchaud(a)debux.org> Date: Tue Jul 5 18:06:49 2016 +0200 Add results import for mooring in UI commit efcdae65afc4fa468243ef7aafa973d3666ad1a3 Author: Julien Ruchaud <julien.ruchaud(a)debux.org> Date: Tue Jul 5 16:03:40 2016 +0200 Add ancillary intrumentation in UI commit 15ec21f7424242f759dad01eaebf57cbf17cd8a6 Author: Julien Ruchaud <julien.ruchaud(a)debux.org> Date: Tue Jul 5 14:52:10 2016 +0200 Clear hibernate trasaction to increase performance during flush (refs #8165) commit ca641fb5b64360412d08abff449a9c44674f456b Author: Julien Ruchaud <julien.ruchaud(a)debux.org> Date: Mon Jul 4 17:33:23 2016 +0200 Complete documentation on mooring import commit cd9fa2708c04a16365c869f2c679e4a3068a70d8 Author: Julien Ruchaud <julien.ruchaud(a)debux.org> Date: Mon Jul 4 17:14:17 2016 +0200 Migrate database to introduce echotype for the mooring commit e81e229cc4769cdd4e3b812bad0dd72140a14b2f Author: Julien Ruchaud <julien.ruchaud(a)debux.org> Date: Mon Jul 4 17:11:36 2016 +0200 Create remove strategy for esdu results import for mooring commit 2b736c089116319e8f1345c25b9e99b75779c23e Author: Julien Ruchaud <julien.ruchaud(a)debux.org> Date: Mon Jul 4 16:55:07 2016 +0200 Create service for esdu results import for mooring commit bcee297b5fc53471266b1e913697baae16edaebb Author: Julien Ruchaud <julien.ruchaud(a)debux.org> Date: Mon Jul 4 15:19:17 2016 +0200 Create service for echotype import for mooring commit b4c446f940d74f791d79fcae8f4117d85b07873a Author: Julien Ruchaud <julien.ruchaud(a)debux.org> Date: Mon Jul 4 14:04:47 2016 +0200 Add echotype on mooring commit 0285289910217c42df27de383c34cd091f9058e0 Author: Julien Ruchaud <julien.ruchaud(a)debux.org> Date: Mon Jul 4 14:03:59 2016 +0200 Add echotype on mooring commit edc70c38e076ce437e327c22383bca9c0d8ba264 Author: Julien Ruchaud <julien.ruchaud(a)debux.org> Date: Mon Jul 4 12:00:48 2016 +0200 Complete documentation on Ancillary instrumentation import commit 499517a5cd0a296a49b3184ad347dbf1ff4e2e78 Author: Julien Ruchaud <julien.ruchaud(a)debux.org> Date: Mon Jul 4 11:47:06 2016 +0200 Migrate database and add ancillary instrumentation commit 4dc5610b9ddfd829a1f30ddf8e452ff83be2e71e Author: Julien Ruchaud <julien.ruchaud(a)debux.org> Date: Mon Jul 4 11:23:24 2016 +0200 Handle remove ancillary instrumentation import commit 9f0f94f7ac1397be5d716feb6f3fc25d5c519a16 Author: Julien Ruchaud <julien.ruchaud(a)debux.org> Date: Fri Jul 1 11:21:52 2016 +0200 Create ancillary intrumentation import for the voyage commit 0b01f5f0c7ffb436eb0f9a22d8b3a57e133f21ba Author: Julien Ruchaud <julien.ruchaud(a)debux.org> Date: Thu Jun 30 17:52:05 2016 +0200 Handle duplication on elementary cell (refs #2246) commit 99c6aaff73183c460643c05349d0c00800d8e63f Author: Julien Ruchaud <julien.ruchaud(a)debux.org> Date: Thu Jun 30 17:18:19 2016 +0200 Handle duplication on elementary cell (refs #2246) commit f334d59dabd9a8bb4610e25099d881242d21d7c4 Author: Julien Ruchaud <julien.ruchaud(a)debux.org> Date: Thu Jun 30 17:16:40 2016 +0200 Handle duplication on elementary cell (refs #2246) commit b47af301a055796ef3a6d9d3715a35508006a419 Author: Julien Ruchaud <julien.ruchaud(a)debux.org> Date: Wed Jun 29 19:00:08 2016 +0200 Add forgotten columns (refs #8370) commit 4b96b1f11ca71f2727bde6e93619542fc85d2f62 Author: Julien Ruchaud <julien.ruchaud(a)debux.org> Date: Wed Jun 29 15:32:43 2016 +0200 Create basic import AncillaryInstrumentation for Mooring commit 33247f7015982298a038eadbc5337d4fd40a1fa1 Author: Julien Ruchaud <julien.ruchaud(a)debux.org> Date: Wed Jun 29 11:38:41 2016 +0200 Add DataAcousticProvider in the model to avoid cast commit 612b6a3dcd3d18cf0a24af7bf4f2333d97dbad07 Author: Julien Ruchaud <julien.ruchaud(a)debux.org> Date: Wed Jun 29 10:35:11 2016 +0200 Refactoring on echotype import to make place for mooring commit cd4c7ee532575e11d9158e771847051cdb19dbc4 Author: Julien Ruchaud <julien.ruchaud(a)debux.org> Date: Wed Jun 29 09:17:44 2016 +0200 Refactoring on result import to make place for mooring commit d3f6fb97f0aa645f40ce219b15d332f272f000ab Author: Julien Ruchaud <julien.ruchaud(a)debux.org> Date: Tue Jun 28 16:55:04 2016 +0200 Fix delete import for mooring commit 150c7e63c7def9b070ac7344cbe07b38cae1049d Author: Julien Ruchaud <julien.ruchaud(a)debux.org> Date: Tue Jun 28 16:48:31 2016 +0200 Fix delete import for mooring commit d9be6f1937857d46ec774b0a1cba0f643adbc014 Author: Julien Ruchaud <julien.ruchaud(a)debux.org> Date: Tue Jun 28 16:26:03 2016 +0200 Refactoring avoid copy/paste on acoustic import for voyage and mooring commit c679de263e647978b2ad41a0cfbc423dc7c266d2 Author: Julien Ruchaud <julien.ruchaud(a)debux.org> Date: Mon Jun 27 17:37:47 2016 +0200 Update documentation for the mooring import commit 316dc330252c3eae2cbecfd2c659e986d7c4b931 Author: Julien Ruchaud <julien.ruchaud(a)debux.org> Date: Mon Jun 27 17:12:09 2016 +0200 Move migration to 3.907 version commit 5056a51e19a1e0b9cef44370233036a7653ff753 Author: Julien Ruchaud <julien.ruchaud(a)debux.org> Date: Mon Jun 27 16:32:51 2016 +0200 Move migration to 3.907 version commit 76dd036a80297dc9969d89836c29514f0cd13eee Author: Julien Ruchaud <julien.ruchaud(a)debux.org> Date: Mon Jun 27 16:31:28 2016 +0200 Improve the perfomance on search duplicate cell (ref #8165) commit 85d1ca3d589c525492455129fcb807afc4778b91 Author: Julien Ruchaud <julien.ruchaud(a)debux.org> Date: Mon Jun 27 16:23:19 2016 +0200 Improve the perfomance on search duplicate cell (ref #8165) commit c5760837eccac8476e8e4c96002b89f07934f6a7 Author: Julien Ruchaud <julien.ruchaud(a)debux.org> Date: Mon Jun 27 16:22:50 2016 +0200 Improve the perfomance on search duplicate cell (ref #8165) commit 1399fe470802aa908ffe35e018d5f2c9c8174e4e Author: Julien Ruchaud <julien.ruchaud(a)debux.org> Date: Mon Jun 27 16:19:29 2016 +0200 Fix test due to mooring acoustic import test commit 782f88d94552887fe3d4bbabaad40cfaf50e6e8a Author: Julien Ruchaud <julien.ruchaud(a)debux.org> Date: Mon Jun 27 11:27:08 2016 +0200 Fix test due to mooring acoustic import test commit 90f4702fd7e19ea66c721cf4863192cdcd6c22c1 Author: Julien Ruchaud <julien.ruchaud(a)debux.org> Date: Mon Jun 27 11:20:29 2016 +0200 Add migration for database for the mooring commit d9e0c9952c8996808cf56be760cc31dd5dc869cf Author: Julien Ruchaud <julien.ruchaud(a)debux.org> Date: Mon Jun 27 10:46:21 2016 +0200 Add test on remove mooring acoustic import commit bacb8bbae86205cd1eda6e65f83562f678baade3 Author: Julien Ruchaud <julien.ruchaud(a)debux.org> Date: Mon Jun 27 10:31:30 2016 +0200 Force migration commit e1a4cb3d22f307737f7628007547049c39e05bca Author: Julien Ruchaud <julien.ruchaud(a)debux.org> Date: Mon Jun 27 10:29:57 2016 +0200 Force migration commit 386ecfb4d883b1caa35cbd3b224d266f0e39f7a7 Author: Julien Ruchaud <julien.ruchaud(a)debux.org> Date: Mon Jun 27 10:27:58 2016 +0200 Add test on remove mooring acoustic import commit 172b9b8f61f3869564b69cf7b1aa3e5bbc687d2c Author: Julien Ruchaud <julien.ruchaud(a)debux.org> Date: Fri Jun 24 18:21:30 2016 +0200 Add test on remove mooring import commit 7912ed8a8928eca0cfbed5e5ff968ea2f933dbc3 Author: Julien Ruchaud <julien.ruchaud(a)debux.org> Date: Fri Jun 24 11:19:43 2016 +0200 Add moring support in remove import commit 359a065d7223cdc69e7263ef56f383d2a2e7b539 Author: Julien Ruchaud <julien.ruchaud(a)debux.org> Date: Thu Jun 23 17:23:01 2016 +0200 Add translate commit 6c3b2f16d32e1c9f5632a794d1a9d7a467977053 Author: Julien Ruchaud <julien.ruchaud(a)debux.org> Date: Thu Jun 23 16:58:28 2016 +0200 Toggle visibility between voyages and morings commit 9df8d02db4e86a7bd4f151331111e890e036c961 Author: Julien Ruchaud <julien.ruchaud(a)debux.org> Date: Thu Jun 23 16:31:15 2016 +0200 Toggle visibility between voyages and morings commit e18c8288b532eca8c39cc70b18531569221b2f72 Author: Julien Ruchaud <julien.ruchaud(a)debux.org> Date: Thu Jun 23 14:27:47 2016 +0200 Add support to display a mooring commit aec1002786b98ef516a906bb0c95d3fdf3ccb189 Author: Julien Ruchaud <julien.ruchaud(a)debux.org> Date: Thu Jun 23 12:08:32 2016 +0200 Add support to display a mooring commit e70d317c69f108fc5d37793f2b6ec5ac8a825295 Author: Julien Ruchaud <julien.ruchaud(a)debux.org> Date: Thu Jun 23 10:53:02 2016 +0200 Fix tooltip, delete quote in string commit 4cc1ac46a7d0b4478aa8014cf6347182f8898661 Author: Julien Ruchaud <julien.ruchaud(a)debux.org> Date: Thu Jun 23 10:19:05 2016 +0200 Fix error on Elementary cell when position is set at end 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 commit c81b19ad94ab59183b209a24f24694cd6cf35672 Author: Julien Ruchaud <julien.ruchaud(a)debux.org> Date: Wed Jun 22 14:00:38 2016 +0200 Fix description in modification logs commit c6e295cbbceb19987cf66b2a92ffa0e2bc448295 Author: Julien Ruchaud <julien.ruchaud(a)debux.org> Date: Wed Jun 22 11:12:19 2016 +0200 Finish mooring import forms commit b1e59f8958da03a348c4d04bc41279e95617c240 Author: Julien Ruchaud <julien.ruchaud(a)debux.org> Date: Wed Jun 22 10:32:53 2016 +0200 Create IT for mooring importation 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) 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 commit ce6f85260ccfe898d56967361049c83c6467b436 Author: Julien Ruchaud <julien.ruchaud(a)debux.org> Date: Thu Jun 16 16:45:36 2016 +0200 Add translation commit 68d33c99b80644e72e9e0bdb5d32a59e3a2b3b31 Author: Julien Ruchaud <julien.ruchaud(a)debux.org> Date: Tue Jun 14 16:45:12 2016 +0200 Implements accoustic data import for mooring commit 8bf46a622bf825e73b7b633d359b6ec5231e3e8d Author: Julien Ruchaud <julien.ruchaud(a)debux.org> Date: Tue Jun 14 10:54:14 2016 +0200 Force input action for the validation commit 173d055ffba26644a4c36d694e3a375f7f1b7ed4 Author: Julien Ruchaud <julien.ruchaud(a)debux.org> Date: Mon Jun 13 17:32:45 2016 +0200 Add form to import accoustics data for mooring commit 6627c4c23d0a791f91727fae8b861ff15a4e1634 Author: Julien Ruchaud <julien.ruchaud(a)debux.org> Date: Mon Jun 13 16:02:44 2016 +0200 Plug action but they are not implemented commit ff095a27d919d76abed2b4815d0001a201e0bfed Author: Julien Ruchaud <julien.ruchaud(a)debux.org> Date: Mon Jun 13 13:48:49 2016 +0200 Plug action but they are not implemented commit 5d437a733d0d7ea97d7910a3ce19c905ca97a42b Author: Julien Ruchaud <julien.ruchaud(a)debux.org> Date: Mon Jun 13 12:12:47 2016 +0200 Change style commit 00cbfce49df0c79a306e0587a50d9100ae414fcf Author: Julien Ruchaud <julien.ruchaud(a)debux.org> Date: Mon Jun 13 12:00:56 2016 +0200 Add new import mode for mooring Summary of changes: .../echobase/entities/ImportFileIdTopiaDao.java | 9 - .../fr/ifremer/echobase/entities/ImportLogs.java | 4 +- .../fr/ifremer/echobase/entities/ImportType.java | 164 +++- .../echobase/entities/data/CellTopiaDao.java | 61 +- .../entities/data/DataAcousticProvider.java | 58 ++ .../echobase/entities/data/MooringImpl.java | 30 + .../{references/Ports.java => data/Moorings.java} | 12 +- .../echobase/entities/data/TransectImpl.java | 40 + .../ifremer/echobase/entities/data/VoyageImpl.java | 31 + .../{Ports.java => AncillaryInstrumentations.java} | 12 +- .../WorkingDbMigrationCallBackForVersion3_906.java | 21 - .../WorkingDbMigrationCallBackForVersion3_907.java | 33 + ...WorkingDbMigrationCallBackForVersion3_908.java} | 6 +- .../WorkingDbMigrationCallBackForVersion3_909.java | 33 + .../i18n/echobase-domain_en_GB.properties | 10 + .../i18n/echobase-domain_fr_FR.properties | 10 + .../migration/workingDb/3.906-add-indexes.sql | 1 + ...-0-add-indexes.sql => 3.908-0-drop-indexes.sql} | 2 +- ...tLog-table.sql => 3.909-0-mooring-echotype.sql} | 4 +- .../workingDb/h2/3.905-0-update-model.sql | 4 + .../workingDb/h2/3.905-2-migrate-voyage-ports.sql | 4 + .../3.907-0-update-importLog-entityId.sql} | 2 +- .../workingDb/pg/3.905-0-update-model.sql | 4 + .../workingDb/pg/3.905-2-migrate-voyage-ports.sql | 4 + .../3.907-0-update-importLog-entityId.sql} | 3 +- echobase-domain/src/main/xmi/echobase.properties | 2 +- echobase-domain/src/main/xmi/echobase.zargo | Bin 98231 -> 99798 bytes .../fr/ifremer/echobase/services/csv/CellAble.java | 9 +- .../echobase/services/csv/CellValueParser.java | 49 +- .../echobase/services/csv/EchoBaseCsvUtil.java | 32 + .../csv/{CellAble.java => ProviderAble.java} | 18 +- .../services/service/UserDbPersistenceService.java | 161 +++- ...illaryInstrumentationAssociationException.java} | 10 +- .../DuplicatedElementaryCellException.java | 5 +- .../importdata/DuplicatedEsduCellException.java | 5 +- ...eption.java => DuplicatedMooringException.java} | 8 +- .../importdata/EsduCellNotFoundException.java | 7 +- .../service/importdata/ImportDataFileResult.java | 10 +- .../service/importdata/ImportDataService.java | 178 ++++- ...ception.java => MismatchProviderException.java} | 6 +- ....java => MooringCodeAlreadyExistException.java} | 8 +- .../{MissionService.java => MooringService.java} | 18 +- ...ava => ResultsImportAlreadyExistException.java} | 6 +- ...tion.java => ImportAcousticsActionSupport.java} | 173 ++--- ...mportAncillaryInstrumentationActionSupport.java | 129 ++++ .../actions/ImportDataActionSupport.java | 36 +- ...ava => ImportResultsCellDataActionSupport.java} | 43 +- ...rt.java => ImportResultsDataActionSupport.java} | 20 +- ...ava => ImportResultsEchotypeActionSupport.java} | 72 +- .../actions/MooringAcousticsImportAction.java | 61 ++ ...ommonsAncillaryInstrumentationImportAction.java | 77 ++ ... => MooringCommonsImportDataActionSupport.java} | 10 +- .../actions/MooringCommonsMooringImportAction.java | 106 +++ .../MooringResultsCellImportDataActionSupport.java | 51 ++ .../MooringResultsEchotypeImportAction.java | 67 ++ ...chotypeAndSpeciesCategoryCellImportAction.java} | 32 +- ...ringResultsEsduByEchotypeCellImportAction.java} | 32 +- .../actions/VoyageAcousticsImportAction.java | 857 +-------------------- ...ommonsAncillaryInstrumentationImportAction.java | 81 ++ .../actions/VoyageCommonsVoyageImportAction.java | 2 +- .../VoyageResultsCellImportDataActionSupport.java | 109 +-- ...ndSpeciesCategoryAndLengthCellImportAction.java | 3 +- ...EchotypeAndSpeciesCategoryCellImportAction.java | 3 +- ...oyageResultsEsduByEchotypeCellImportAction.java | 4 +- ...sEsduSpeciesAndAgeCategoryCellImportAction.java | 3 +- .../VoyageResultsImportDataActionSupport.java | 52 +- .../VoyageResultsMapFishCellImportAction.java | 4 +- .../VoyageResultsMapOtherCellImportAction.java | 4 +- ...VoyageResultsRegionAssociationImportAction.java | 4 - .../actions/VoyageResultsRegionImportAction.java | 4 +- .../VoyageResultsRegionResultsImportAction.java | 147 +--- .../VoyageResultsVoyageEchotypeImportAction.java | 121 +-- ...oyageResultsVoyageLengthAgeKeyImportAction.java | 4 +- ...geResultsVoyageLengthWeightKeyImportAction.java | 4 +- ...tion.java => ImportAcousticsConfiguration.java} | 21 +- ...java => ImportResultsConfigurationSupport.java} | 30 +- ...va => MooringAcousticsImportConfiguration.java} | 31 +- ...ncillaryInstrumentationImportConfiguration.java | 53 ++ ... MooringCommonsMooringImportConfiguration.java} | 31 +- ... => MooringImportDataConfigurationSupport.java} | 20 +- .../MooringResultsImportConfiguration.java | 91 +++ .../VoyageAcousticsImportConfiguration.java | 198 +---- ...ncillaryInstrumentationImportConfiguration.java | 53 ++ .../VoyageCommonsImportConfiguration.java | 9 +- .../VoyageResultsImportConfiguration.java | 32 +- .../contexts/ImportDataContextSupport.java | 34 +- ...aContext.java => ImportResultsDataContext.java} | 42 +- ...java => MooringAcousticsImportDataContext.java} | 26 +- ...sAncillaryInstrumentationImportDataContext.java | 69 ++ ...=> MooringCommonsMooringImportDataContext.java} | 16 +- .../contexts/MooringResultsImportDataContext.java | 81 ++ .../contexts/VoyageAcousticsImportDataContext.java | 52 +- ...sAncillaryInstrumentationImportDataContext.java | 71 ++ .../contexts/VoyageImportDataContextSupport.java | 29 +- .../contexts/VoyageResultsImportDataContext.java | 206 +---- ...rtModel.java => AcousticImportExportModel.java} | 138 ++-- ...ousticImportRow.java => AcousticImportRow.java} | 20 +- .../csv/AncillaryInstrumentationImportRow.java | 55 ++ ...sAncillaryInstrumentationImportExportModel.java | 60 ++ ...ngCommonsAncillaryInstrumentationImportRow.java | 59 ++ .../MooringCommonsMooringImportExportModel.java | 93 +++ ...> MooringResultsEchotypeImportExportModel.java} | 36 +- .../csv/MooringResultsEchotypeImportRow.java | 73 ++ ...chotypeAndSpeciesCategoryImportExportModel.java | 94 +++ ...EsduByEchotypeAndSpeciesCategoryImportRow.java} | 30 +- ...ringResultsEsduByEchotypeImportExportModel.java | 83 ++ ... => MooringResultsEsduByEchotypeImportRow.java} | 32 +- ...mportRow.java => ResultsEchotypeImportRow.java} | 38 +- ...sAncillaryInstrumentationImportExportModel.java | 63 ++ ...geCommonsAncillaryInstrumentationImportRow.java | 75 ++ ...hotypeAndSpeciesCategoryAndLengthImportRow.java | 19 +- ...sEsduByEchotypeAndSpeciesCategoryImportRow.java | 19 +- .../csv/VoyageResultsEsduByEchotypeImportRow.java | 21 +- ...esultsEsduBySpeciesAndAgeCategoryImportRow.java | 19 +- .../VoyageResultsRegionCellResultImportRow.java | 21 +- ...yageResultsVoyageEchotypeImportExportModel.java | 5 +- .../csv/VoyageResultsVoyageEchotypeImportRow.java | 59 +- .../strategy/AbstractImportDbStrategy.java | 38 +- .../importdb/strategy/FreeImportDbStrategy.java | 22 +- .../strategy/ReferentialImportDbStrategy.java | 4 +- .../service/removedata/RemoveDataService.java | 63 +- .../strategy/AbstractRemoveDataStrategy.java | 109 +-- .../strategy/AcousticRemoveDataStrategy.java | 16 +- .../strategy/CatchesRemoveDataStrategy.java | 8 +- .../strategy/CommonAllRemoveDataStrategy.java | 16 +- ...ncillaryInstrumentationRemoveDataStrategy.java} | 50 +- .../strategy/CommonTransectRemoveDataStrategy.java | 19 +- .../strategy/CommonTransitRemoveDataStrategy.java | 17 +- .../strategy/CommonVoyageRemoveDataStrategy.java | 16 +- .../strategy/DummyRemoveDataStrategy.java | 59 ++ .../strategy/LegacyVoyageRemoveDataStrategy.java | 13 +- ...java => MooringAcousticRemoveDataStrategy.java} | 52 +- ...ncillaryInstrumentationRemoveDataStrategy.java} | 48 +- ...trategy.java => MooringRemoveDataStrategy.java} | 62 +- ...va => MooringResultEsduRemoveDataStrategy.java} | 18 +- .../strategy/MooringResultsRemoveDataStrategy.java | 105 +++ .../strategy/OperationRemoveDataStrategy.java | 9 +- .../strategy/ResultEsduRemoveDataStrategy.java | 9 +- .../strategy/ResultMapFishRemoveDataStrategy.java | 9 +- .../strategy/ResultMapOtherRemoveDataStrategy.java | 9 +- .../strategy/ResultRegionRemoveDataStrategy.java | 9 +- .../strategy/ResultVoyageRemoveDataStrategy.java | 13 +- .../i18n/echobase-services_en_GB.properties | 11 +- .../i18n/echobase-services_fr_FR.properties | 11 +- .../echobase/services/EchoBaseServiceFixtures.java | 20 + .../services/EchoBaseTestServiceSupport.java | 7 + .../echobase/services/ImportDataFixtures.java | 29 + .../services/MigrateImportDataDatabasesIT.java | 10 + .../importdata/AbstractImportDataServiceIT.java | 33 +- ...IT.java => MooringAcousticImportServiceIT.java} | 25 +- ...onsAncillaryInstrumentationImportServiceIT.java | 72 ++ .../MooringCommonsMooringImportServiceIT.java | 71 ++ ...EchotypeAndSpeciesCategoryImportServiceIT.java} | 35 +- ...esultsEsduCellOnlyEchotypeImportServiceIT.java} | 33 +- ...eIT.java => MooringResultsImportServiceIT.java} | 28 +- ...onsAncillaryInstrumentationImportServiceIT.java | 72 ++ ...AndSpeciesCategoryAndLengthImportServiceIT.java | 2 +- ...ciesCategoryAndLength_SmallImportServiceIT.java | 2 +- ...yEchotypeAndSpeciesCategoryImportServiceIT.java | 2 +- ...ResultsEsduCellOnlyEchotypeImportServiceIT.java | 2 +- ...llOnlySpeciesAndAgeCategoryImportServiceIT.java | 2 +- .../VoyageResultsRegionCellImportServiceIT.java | 2 +- ...VoyageResultsRegionCell_AllImportServiceIT.java | 2 +- .../removedata/AbstractRemoveDataServiceTest.java | 208 ++++- ...llaryInstrumentationRemoveDataServiceTest.java} | 30 +- .../removedata/CommonAllRemoveDataServiceTest.java | 1 + .../CommonTransectRemoveDataServiceTest.java | 1 + .../CommonVoyageRemoveDataServiceTest.java | 1 + ...a => MooringAcousticRemoveDataServiceTest.java} | 23 +- ...Test.java => MooringRemoveDataServiceTest.java} | 33 +- ...=> MooringResultEsduRemoveDataServiceTest.java} | 20 +- ...va => MooringResultsRemoveDataServiceTest.java} | 20 +- .../resources/echobase-services-test.properties | 4 +- .../common/ancillaryInstrumentation.csv.gz | Bin 0 -> 131 bytes .../echobase-catches-and-voyage-result.h2.db.gz | Bin 1006673 -> 991130 bytes .../import-data/echobase-catches.h2.db.gz | Bin 936199 -> 924955 bytes .../import-data/echobase-commonData.h2.db.gz | Bin 369833 -> 370149 bytes .../import-data/echobase-mooring-results.h2.db.gz | Bin 0 -> 930474 bytes .../import-data/echobase-mooring.h2.db.gz | Bin 0 -> 925371 bytes .../resources/import-data/echobase-nodata.h2.db.gz | Bin 318432 -> 318631 bytes .../echobase-operation-total-samples.h2.db.gz | Bin 785038 -> 785190 bytes .../import-data/echobase-operation.h2.db.gz | Bin 507447 -> 508067 bytes .../mooring/ancillaryInstrumentation.csv.gz | Bin 0 -> 96 bytes .../resources/import-data/mooring/mooring.csv.gz | Bin 0 -> 323 bytes .../byEchotypeAndSpeciesCategory_small.csv.gz | Bin 0 -> 2038 bytes .../result/mooring-esdu/byEchotype_small.csv.gz | Bin 0 -> 2798 bytes .../import-data/result/mooring/echotype.csv.gz | Bin 0 -> 593 bytes .../echobase/ui/actions/dbeditor/GetEntities.java | 59 +- .../importData/AbstractConfigureImport.java | 4 +- .../actions/importData/AbstractLaunchImport.java | 4 +- .../importData/ConfigureAcousticImport.java | 1 - .../ConfigureAncillaryInstrumentationImport.java | 72 ++ ...rt.java => ConfigureMooringAcousticImport.java} | 33 +- ...igureMooringAncillaryInstrumentationImport.java | 72 ++ ...ort.java => ConfigureMooringCommonsImport.java} | 37 +- .../importData/ConfigureMooringResultsImport.java | 131 ++++ .../ui/actions/importData/CreateMooring.java | 119 +++ ...yage.java => GetDataProcessingsForMooring.java} | 33 +- .../importData/GetDataProcessingsForVoyage.java | 17 +- .../{ImportMode.java => ImportMooringMode.java} | 31 +- .../{ImportMode.java => ImportVoyageMode.java} | 9 +- ...a => LaunchAncillaryInstrumentationImport.java} | 18 +- ...mport.java => LaunchMooringAcousticImport.java} | 18 +- ...unchMooringAncillaryInstrumentationImport.java} | 18 +- ...Import.java => LaunchMooringCommonsImport.java} | 18 +- ...Import.java => LaunchMooringResultsImport.java} | 18 +- .../ui/actions/importData/SelectImportType.java | 40 +- .../ui/actions/removeData/ConfirmDelete.java | 18 +- .../echobase/ui/actions/removeData/ImportLogs.java | 21 +- .../echobase/ui/actions/workingDb/DashBoard.java | 25 +- .../ui/actions/workingDb/GetImportLogDetail.java | 13 +- .../workingDb/{GetVoyage.java => GetMooring.java} | 27 +- .../echobase/ui/actions/workingDb/GetVoyage.java | 15 +- .../main/resources/config/struts-importData.xml | 22 +- .../src/main/resources/config/struts-workingDb.xml | 17 +- echobase-ui/src/main/resources/echobase.properties | 2 + ... ConfigureMooringAcousticImport-validation.xml} | 10 +- ... => CreateMooring-createMooring-validation.xml} | 8 +- .../resources/i18n/echobase-ui_en_GB.properties | 59 +- .../resources/i18n/echobase-ui_fr_FR.properties | 47 +- ...=> configureAncillaryInstrumentationImport.jsp} | 14 +- ...port.jsp => configureMooringAcousticImport.jsp} | 19 +- ...igureMooringAncillaryInstrumentationImport.jsp} | 20 +- ...mport.jsp => configureMooringCommonsImport.jsp} | 32 +- .../importData/configureMooringResultsImport.jsp | 138 ++++ .../jsp/importData/configureResultsImport.jsp | 2 +- .../WEB-INF/jsp/importData/createMooring.jsp | 103 +++ ... => progressAncillaryInstrumentationImport.jsp} | 4 +- ...mport.jsp => progressMooringAcousticImport.jsp} | 2 +- ...gressMooringAncillaryInstrumentationImport.jsp} | 4 +- ...Import.jsp => progressMooringCommonsImport.jsp} | 4 +- ...Import.jsp => progressMooringResultsImport.jsp} | 2 +- ...sp => resultAncillaryInstrumentationImport.jsp} | 2 +- ...cImport.jsp => resultMooringAcousticImport.jsp} | 0 ...esultMooringAncillaryInstrumentationImport.jsp} | 2 +- ...onImport.jsp => resultMooringCommonsImport.jsp} | 2 +- ...tsImport.jsp => resultMooringResultsImport.jsp} | 0 .../WEB-INF/jsp/importData/selectImportType.jsp | 46 +- .../webapp/WEB-INF/jsp/removeData/importLogs.jsp | 21 +- .../webapp/WEB-INF/jsp/workingDb/dashboard.jsp | 310 +++++--- echobase-ui/src/main/webapp/css/screen.css | 12 +- echobase-ui/src/main/webapp/js/gridHelper.js | 19 +- src/site/en/resources/model/Transverse.png | Bin 7038 -> 9110 bytes src/site/en/resources/model/dataAcoustic.png | Bin 28647 -> 34954 bytes src/site/en/resources/model/dataCatches.png | Bin 22230 -> 22223 bytes src/site/en/resources/model/dataCategory.png | Bin 9109 -> 9122 bytes src/site/en/resources/model/dataCommon.png | Bin 29204 -> 35480 bytes src/site/en/resources/model/dataEchotype.png | Bin 6838 -> 6860 bytes src/site/en/resources/model/dataLengthAgeKey.png | Bin 6799 -> 6754 bytes .../en/resources/model/dataLengthWeightKey.png | Bin 6655 -> 5566 bytes src/site/en/resources/model/dataMooring.png | Bin 0 -> 11778 bytes .../model/referenceAcousticInstrument.png | Bin 8939 -> 11654 bytes src/site/en/resources/model/referenceAll.png | Bin 65060 -> 71173 bytes .../resources/model/referenceAreaOfOperation.png | Bin 2692 -> 2703 bytes src/site/en/resources/model/referenceCellType.png | Bin 3224 -> 3225 bytes .../en/resources/model/referenceDataMetadata.png | Bin 8701 -> 8723 bytes .../en/resources/model/referenceDataQuality.png | Bin 1808 -> 1817 bytes .../en/resources/model/referenceDepthStratum.png | Bin 1873 -> 1880 bytes src/site/en/resources/model/referenceGear.png | Bin 12643 -> 12676 bytes src/site/en/resources/model/referenceMission.png | Bin 7820 -> 7830 bytes src/site/en/resources/model/referenceOperation.png | Bin 5851 -> 5858 bytes .../{ => en}/resources/model/referencePort.png | Bin src/site/en/resources/model/referenceProtocole.png | Bin 6551 -> 6576 bytes .../en/resources/model/referenceReferenceDatum.png | Bin 3127 -> 3134 bytes src/site/en/resources/model/referenceSample.png | Bin 7617 -> 7631 bytes src/site/en/resources/model/referenceSpecies.png | Bin 14230 -> 14498 bytes src/site/en/resources/model/referenceStrata.png | Bin 7890 -> 7903 bytes .../en/resources/model/referenceTSParameter.png | Bin 9923 -> 9934 bytes src/site/en/resources/model/referenceVessel.png | Bin 6636 -> 7237 bytes src/site/en/rst/importData.rst | 254 +++++- src/site/rst/importData.rst | 256 +++++- 271 files changed, 6187 insertions(+), 3438 deletions(-) create mode 100644 echobase-domain/src/main/java/fr/ifremer/echobase/entities/data/DataAcousticProvider.java create mode 100644 echobase-domain/src/main/java/fr/ifremer/echobase/entities/data/MooringImpl.java copy echobase-domain/src/main/java/fr/ifremer/echobase/entities/{references/Ports.java => data/Moorings.java} (79%) create mode 100644 echobase-domain/src/main/java/fr/ifremer/echobase/entities/data/TransectImpl.java copy echobase-domain/src/main/java/fr/ifremer/echobase/entities/references/{Ports.java => AncillaryInstrumentations.java} (75%) create mode 100644 echobase-domain/src/main/java/fr/ifremer/echobase/persistence/migration/workingDb/WorkingDbMigrationCallBackForVersion3_907.java copy echobase-domain/src/main/java/fr/ifremer/echobase/persistence/migration/workingDb/{WorkingDbMigrationCallBackForVersion3_906.java => WorkingDbMigrationCallBackForVersion3_908.java} (90%) create mode 100644 echobase-domain/src/main/java/fr/ifremer/echobase/persistence/migration/workingDb/WorkingDbMigrationCallBackForVersion3_909.java create mode 100644 echobase-domain/src/main/resources/migration/workingDb/3.906-add-indexes.sql copy echobase-domain/src/main/resources/migration/workingDb/{3.906-0-add-indexes.sql => 3.908-0-drop-indexes.sql} (94%) copy echobase-domain/src/main/resources/migration/workingDb/{3.901-0-clean-importLog-table.sql => 3.909-0-mooring-echotype.sql} (84%) copy echobase-domain/src/main/resources/migration/workingDb/{3.906-0-add-indexes.sql => h2/3.907-0-update-importLog-entityId.sql} (92%) copy echobase-domain/src/main/resources/migration/workingDb/{3.906-0-add-indexes.sql => pg/3.907-0-update-importLog-entityId.sql} (92%) copy echobase-services/src/main/java/fr/ifremer/echobase/services/csv/{CellAble.java => ProviderAble.java} (72%) copy echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/{DuplicatedEchotypeAssociationException.java => DuplicatedAncillaryInstrumentationAssociationException.java} (71%) copy echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/{DuplicatedVoyageException.java => DuplicatedMooringException.java} (77%) rename echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/{MismatchVoyageException.java => MismatchProviderException.java} (80%) copy echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/{MissionNameAlreadyExistException.java => MooringCodeAlreadyExistException.java} (82%) copy echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/{MissionService.java => MooringService.java} (77%) rename echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/{ResultsVoyageImportAlreadyExistException.java => ResultsImportAlreadyExistException.java} (82%) copy echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/actions/{VoyageAcousticsImportAction.java => ImportAcousticsActionSupport.java} (89%) create mode 100644 echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/actions/ImportAncillaryInstrumentationActionSupport.java copy echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/actions/{VoyageResultsCellImportDataActionSupport.java => ImportResultsCellDataActionSupport.java} (72%) copy echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/actions/{VoyageResultsImportDataActionSupport.java => ImportResultsDataActionSupport.java} (82%) copy echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/actions/{VoyageResultsVoyageEchotypeImportAction.java => ImportResultsEchotypeActionSupport.java} (61%) create mode 100644 echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/actions/MooringAcousticsImportAction.java create mode 100644 echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/actions/MooringCommonsAncillaryInstrumentationImportAction.java copy echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/actions/{VoyageOperationsImportDataActionSupport.java => MooringCommonsImportDataActionSupport.java} (70%) create mode 100644 echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/actions/MooringCommonsMooringImportAction.java create mode 100644 echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/actions/MooringResultsCellImportDataActionSupport.java create mode 100644 echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/actions/MooringResultsEchotypeImportAction.java copy echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/actions/{VoyageResultsEsduByEchotypeAndSpeciesCategoryCellImportAction.java => MooringResultsEsduByEchotypeAndSpeciesCategoryCellImportAction.java} (51%) copy echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/actions/{VoyageResultsEsduByEchotypeCellImportAction.java => MooringResultsEsduByEchotypeCellImportAction.java} (50%) create mode 100644 echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/actions/VoyageCommonsAncillaryInstrumentationImportAction.java copy echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/configurations/{VoyageAcousticsImportConfiguration.java => ImportAcousticsConfiguration.java} (92%) copy echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/configurations/{VoyageImportDataConfigurationSupport.java => ImportResultsConfigurationSupport.java} (54%) copy echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/configurations/{VoyageImportDataConfigurationSupport.java => MooringAcousticsImportConfiguration.java} (56%) create mode 100644 echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/configurations/MooringCommonsAncillaryInstrumentationImportConfiguration.java copy echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/configurations/{VoyageImportDataConfigurationSupport.java => MooringCommonsMooringImportConfiguration.java} (54%) copy echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/configurations/{VoyageImportDataConfigurationSupport.java => MooringImportDataConfigurationSupport.java} (67%) create mode 100644 echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/configurations/MooringResultsImportConfiguration.java create mode 100644 echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/configurations/VoyageCommonsAncillaryInstrumentationImportConfiguration.java copy echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/contexts/{VoyageResultsImportDataContext.java => ImportResultsDataContext.java} (86%) copy echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/contexts/{VoyageOperationsImportDataContext.java => MooringAcousticsImportDataContext.java} (59%) create mode 100644 echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/contexts/MooringCommonsAncillaryInstrumentationImportDataContext.java copy echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/contexts/{VoyageOperationsImportDataContext.java => MooringCommonsMooringImportDataContext.java} (68%) create mode 100644 echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/contexts/MooringResultsImportDataContext.java create mode 100644 echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/contexts/VoyageCommonsAncillaryInstrumentationImportDataContext.java rename echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/{VoyageAcousticImportExportModel.java => AcousticImportExportModel.java} (62%) rename echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/{VoyageAcousticImportRow.java => AcousticImportRow.java} (95%) create mode 100644 echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/AncillaryInstrumentationImportRow.java create mode 100644 echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/MooringCommonsAncillaryInstrumentationImportExportModel.java create mode 100644 echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/MooringCommonsAncillaryInstrumentationImportRow.java create mode 100644 echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/MooringCommonsMooringImportExportModel.java copy echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/{VoyageResultsVoyageEchotypeImportExportModel.java => MooringResultsEchotypeImportExportModel.java} (55%) create mode 100644 echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/MooringResultsEchotypeImportRow.java create mode 100644 echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/MooringResultsEsduByEchotypeAndSpeciesCategoryImportExportModel.java copy echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/{VoyageResultsEsduByEchotypeAndSpeciesCategoryImportRow.java => MooringResultsEsduByEchotypeAndSpeciesCategoryImportRow.java} (77%) create mode 100644 echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/MooringResultsEsduByEchotypeImportExportModel.java copy echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/{VoyageResultsEsduByEchotypeImportRow.java => MooringResultsEsduByEchotypeImportRow.java} (71%) copy echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/{VoyageResultsVoyageEchotypeImportRow.java => ResultsEchotypeImportRow.java} (69%) create mode 100644 echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/VoyageCommonsAncillaryInstrumentationImportExportModel.java create mode 100644 echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/VoyageCommonsAncillaryInstrumentationImportRow.java copy echobase-services/src/main/java/fr/ifremer/echobase/services/service/removedata/strategy/{ResultMapOtherRemoveDataStrategy.java => CommonAncillaryInstrumentationRemoveDataStrategy.java} (55%) create mode 100644 echobase-services/src/main/java/fr/ifremer/echobase/services/service/removedata/strategy/DummyRemoveDataStrategy.java copy echobase-services/src/main/java/fr/ifremer/echobase/services/service/removedata/strategy/{AcousticRemoveDataStrategy.java => MooringAcousticRemoveDataStrategy.java} (66%) copy echobase-services/src/main/java/fr/ifremer/echobase/services/service/removedata/strategy/{ResultMapOtherRemoveDataStrategy.java => MooringAncillaryInstrumentationRemoveDataStrategy.java} (55%) copy echobase-services/src/main/java/fr/ifremer/echobase/services/service/removedata/strategy/{CommonAllRemoveDataStrategy.java => MooringRemoveDataStrategy.java} (51%) copy echobase-services/src/main/java/fr/ifremer/echobase/services/service/removedata/strategy/{ResultEsduRemoveDataStrategy.java => MooringResultEsduRemoveDataStrategy.java} (77%) create mode 100644 echobase-services/src/main/java/fr/ifremer/echobase/services/service/removedata/strategy/MooringResultsRemoveDataStrategy.java copy echobase-services/src/test/java/fr/ifremer/echobase/services/service/importdata/{VoyageAcousticImportServiceIT.java => MooringAcousticImportServiceIT.java} (81%) create mode 100644 echobase-services/src/test/java/fr/ifremer/echobase/services/service/importdata/MooringCommonsAncillaryInstrumentationImportServiceIT.java create mode 100644 echobase-services/src/test/java/fr/ifremer/echobase/services/service/importdata/MooringCommonsMooringImportServiceIT.java copy echobase-services/src/test/java/fr/ifremer/echobase/services/service/importdata/{VoyageResultsEsduCellOnlyEchotypeAndSpeciesCategoryImportServiceIT.java => MooringResultsEsduCellOnlyEchotypeAndSpeciesCategoryImportServiceIT.java} (65%) copy echobase-services/src/test/java/fr/ifremer/echobase/services/service/importdata/{VoyageResultsEsduCellOnlyEchotypeImportServiceIT.java => MooringResultsEsduCellOnlyEchotypeImportServiceIT.java} (63%) copy echobase-services/src/test/java/fr/ifremer/echobase/services/service/importdata/{VoyageResultsVoyageOnlyEchotypeImportServiceIT.java => MooringResultsImportServiceIT.java} (63%) create mode 100644 echobase-services/src/test/java/fr/ifremer/echobase/services/service/importdata/VoyageCommonsAncillaryInstrumentationImportServiceIT.java copy echobase-services/src/test/java/fr/ifremer/echobase/ui/actions/removedata/{CatchesRemoveDataServiceTest.java => AncillaryInstrumentationRemoveDataServiceTest.java} (56%) copy echobase-services/src/test/java/fr/ifremer/echobase/ui/actions/removedata/{ResultMapRemoveOtherDataServiceTest.java => MooringAcousticRemoveDataServiceTest.java} (67%) copy echobase-services/src/test/java/fr/ifremer/echobase/ui/actions/removedata/{CatchesRemoveDataServiceTest.java => MooringRemoveDataServiceTest.java} (62%) copy echobase-services/src/test/java/fr/ifremer/echobase/ui/actions/removedata/{CatchesRemoveDataServiceTest.java => MooringResultEsduRemoveDataServiceTest.java} (75%) copy echobase-services/src/test/java/fr/ifremer/echobase/ui/actions/removedata/{ResultMapRemoveOtherDataServiceTest.java => MooringResultsRemoveDataServiceTest.java} (70%) create mode 100644 echobase-services/src/test/resources/import-data/common/ancillaryInstrumentation.csv.gz create mode 100644 echobase-services/src/test/resources/import-data/echobase-mooring-results.h2.db.gz create mode 100644 echobase-services/src/test/resources/import-data/echobase-mooring.h2.db.gz create mode 100644 echobase-services/src/test/resources/import-data/mooring/ancillaryInstrumentation.csv.gz create mode 100644 echobase-services/src/test/resources/import-data/mooring/mooring.csv.gz create mode 100644 echobase-services/src/test/resources/import-data/result/mooring-esdu/byEchotypeAndSpeciesCategory_small.csv.gz create mode 100644 echobase-services/src/test/resources/import-data/result/mooring-esdu/byEchotype_small.csv.gz create mode 100644 echobase-services/src/test/resources/import-data/result/mooring/echotype.csv.gz create mode 100644 echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/ConfigureAncillaryInstrumentationImport.java copy echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/{ConfigureAcousticImport.java => ConfigureMooringAcousticImport.java} (68%) create mode 100644 echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/ConfigureMooringAncillaryInstrumentationImport.java copy echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/{LaunchCatchesImport.java => ConfigureMooringCommonsImport.java} (51%) create mode 100644 echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/ConfigureMooringResultsImport.java create mode 100644 echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/CreateMooring.java copy echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/{GetDataProcessingsForVoyage.java => GetDataProcessingsForMooring.java} (74%) copy echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/{ImportMode.java => ImportMooringMode.java} (65%) rename echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/{ImportMode.java => ImportVoyageMode.java} (84%) copy echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/{LaunchOperationImport.java => LaunchAncillaryInstrumentationImport.java} (60%) copy echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/{LaunchOperationImport.java => LaunchMooringAcousticImport.java} (69%) copy echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/{LaunchOperationImport.java => LaunchMooringAncillaryInstrumentationImport.java} (59%) copy echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/{LaunchAcousticImport.java => LaunchMooringCommonsImport.java} (64%) copy echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/{LaunchResultsImport.java => LaunchMooringResultsImport.java} (65%) copy echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/workingDb/{GetVoyage.java => GetMooring.java} (70%) copy echobase-ui/src/main/resources/fr/ifremer/echobase/ui/actions/importData/{ConfigureAcousticImport-validation.xml => ConfigureMooringAcousticImport-validation.xml} (93%) copy echobase-ui/src/main/resources/fr/ifremer/echobase/ui/actions/importData/{CreateMission-createMission-validation.xml => CreateMooring-createMooring-validation.xml} (86%) copy echobase-ui/src/main/webapp/WEB-INF/jsp/importData/{configureOperationImport.jsp => configureAncillaryInstrumentationImport.jsp} (78%) copy echobase-ui/src/main/webapp/WEB-INF/jsp/importData/{configureAcousticImport.jsp => configureMooringAcousticImport.jsp} (87%) copy echobase-ui/src/main/webapp/WEB-INF/jsp/importData/{configureOperationImport.jsp => configureMooringAncillaryInstrumentationImport.jsp} (70%) copy echobase-ui/src/main/webapp/WEB-INF/jsp/importData/{configureCatchesImport.jsp => configureMooringCommonsImport.jsp} (64%) create mode 100644 echobase-ui/src/main/webapp/WEB-INF/jsp/importData/configureMooringResultsImport.jsp create mode 100644 echobase-ui/src/main/webapp/WEB-INF/jsp/importData/createMooring.jsp copy echobase-ui/src/main/webapp/WEB-INF/jsp/importData/{progressCommonImport.jsp => progressAncillaryInstrumentationImport.jsp} (87%) copy echobase-ui/src/main/webapp/WEB-INF/jsp/importData/{progressAcousticImport.jsp => progressMooringAcousticImport.jsp} (93%) copy echobase-ui/src/main/webapp/WEB-INF/jsp/importData/{progressCommonImport.jsp => progressMooringAncillaryInstrumentationImport.jsp} (87%) 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/{progressResultsImport.jsp => progressMooringResultsImport.jsp} (93%) copy echobase-ui/src/main/webapp/WEB-INF/jsp/importData/{resultCommonImport.jsp => resultAncillaryInstrumentationImport.jsp} (92%) copy echobase-ui/src/main/webapp/WEB-INF/jsp/importData/{resultAcousticImport.jsp => resultMooringAcousticImport.jsp} (100%) copy echobase-ui/src/main/webapp/WEB-INF/jsp/importData/{resultCommonImport.jsp => resultMooringAncillaryInstrumentationImport.jsp} (92%) copy echobase-ui/src/main/webapp/WEB-INF/jsp/importData/{resultCommonImport.jsp => resultMooringCommonsImport.jsp} (93%) copy echobase-ui/src/main/webapp/WEB-INF/jsp/importData/{resultResultsImport.jsp => resultMooringResultsImport.jsp} (100%) create mode 100644 src/site/en/resources/model/dataMooring.png copy src/site/{ => en}/resources/model/referencePort.png (100%) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 6

branch feature/8180 deleted (was c88cba4)
by codelutin.com scm July 6, 2016

July 6, 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 was c88cba4 Merge branch 'feature/8180' of gitlab.nuiton.org:codelutin/echobase into feature/8180 This change permanently discards the following revisions: discards c88cba4 Merge branch 'feature/8180' of gitlab.nuiton.org:codelutin/echobase into feature/8180 discards a574030 Use too elementary cell discards 78ee58f Modify esdu cell name discards 98ec303 Add results import for mooring in UI discards 9425305 Add ancillary intrumentation in UI discards 3c8ff7a Clear hibernate trasaction to increase performance during flush (refs #8165) discards 38ee8f6 Complete documentation on mooring import discards 9edc202 Migrate database to introduce echotype for the mooring discards 8d19a2d Create remove strategy for esdu results import for mooring discards 791d802 Create service for esdu results import for mooring discards 251f4f7 Create service for echotype import for mooring discards 90397fc Add echotype on mooring discards 871f148 Add echotype on mooring discards 2061223 Complete documentation on Ancillary instrumentation import discards a475079 Migrate database and add ancillary instrumentation discards 9c65eef Handle remove ancillary instrumentation import discards 224bd1b Create ancillary intrumentation import for the voyage discards 6ec47de Handle duplication on elementary cell (refs #2246) discards b6ba2a9 Handle duplication on elementary cell (refs #2246) discards e8830cb Handle duplication on elementary cell (refs #2246) discards c5a4572 Add forgotten columns (refs #8370) discards d0a307c Create basic import AncillaryInstrumentation for Mooring discards d25c1eb Add DataAcousticProvider in the model to avoid cast discards 27d7303 Refactoring on echotype import to make place for mooring discards 6761c1d Refactoring on result import to make place for mooring discards 249211a Fix delete import for mooring discards f255142 Fix delete import for mooring discards 60bca11 Refactoring avoid copy/paste on acoustic import for voyage and mooring discards 54ce56d Update documentation for the mooring import discards 1ab5806 Move migration to 3.907 version discards de9a623 Move migration to 3.907 version discards 2459a0e Improve the perfomance on search duplicate cell (ref #8165) discards 7f5fdb4 Fix test due to mooring acoustic import test discards 5ae4575 Fix test due to mooring acoustic import test discards 0bc16f1 Add migration for database for the mooring discards b6c4248 Add test on remove mooring acoustic import discards cad618b Force migration discards d1c2fe1 Force migration discards ac4d5cc Add test on remove mooring acoustic import discards be9b0fc Add test on remove mooring import discards a1cb8d2 Add moring support in remove import discards 4c7ad65 Add translate discards a7c6529 Toggle visibility between voyages and morings discards d33669f Toggle visibility between voyages and morings discards 3f49ca8 Add support to display a mooring discards 8a4f1cc Add support to display a mooring discards 6f27c0e Fix tooltip, delete quote in string discards 2071c67 Fix error on Elementary cell when position is set at end discards e6c7d05 Begin create table in dashboard for mooring discards c47f954 Fix description in modification logs discards 1b4499d Finish mooring import forms discards bfe6e95 Create IT for mooring importation discards 26bbe2e Fix UI after modification on remove strategies for mooring discards 240051e Add remove strategies for mooring (not tested) discards 05c4c41 Create mooring import service discards 7d474b1 Add translation discards 05a6223 Implements accoustic data import for mooring discards 99e85b4 Force input action for the validation discards c45b350 Add form to import accoustics data for mooring discards cf4e900 Plug action but they are not implemented discards 2e685cb Plug action but they are not implemented discards fcb76c3 Change style discards 06a112d Add new import mode for mooring discards 943c4a4 Use too elementary cell discards f641359 Modify esdu cell name discards f472fe9 Add results import for mooring in UI discards efcdae6 Add ancillary intrumentation in UI discards 15ec21f Clear hibernate trasaction to increase performance during flush (refs #8165) discards ca641fb Complete documentation on mooring import discards cd9fa27 Migrate database to introduce echotype for the mooring discards e81e229 Create remove strategy for esdu results import for mooring discards 2b736c0 Create service for esdu results import for mooring discards bcee297 Create service for echotype import for mooring discards b4c446f Add echotype on mooring discards 0285289 Add echotype on mooring discards edc70c3 Complete documentation on Ancillary instrumentation import discards 499517a Migrate database and add ancillary instrumentation discards 4dc5610 Handle remove ancillary instrumentation import discards 9f0f94f Create ancillary intrumentation import for the voyage discards 0b01f5f Handle duplication on elementary cell (refs #2246) discards 99c6aaf Handle duplication on elementary cell (refs #2246) discards f334d59 Handle duplication on elementary cell (refs #2246) discards b47af30 Add forgotten columns (refs #8370) discards 4b96b1f Create basic import AncillaryInstrumentation for Mooring discards 33247f7 Add DataAcousticProvider in the model to avoid cast discards 612b6a3 Refactoring on echotype import to make place for mooring discards cd4c7ee Refactoring on result import to make place for mooring discards d3f6fb9 Fix delete import for mooring discards 150c7e6 Fix delete import for mooring discards d9be6f1 Refactoring avoid copy/paste on acoustic import for voyage and mooring discards c679de2 Update documentation for the mooring import discards 316dc33 Move migration to 3.907 version discards 5056a51 Move migration to 3.907 version discards 76dd036 Improve the perfomance on search duplicate cell (ref #8165) discards 85d1ca3 Improve the perfomance on search duplicate cell (ref #8165) discards c576083 Improve the perfomance on search duplicate cell (ref #8165) discards 1399fe4 Fix test due to mooring acoustic import test discards 782f88d Fix test due to mooring acoustic import test discards 90f4702 Add migration for database for the mooring discards d9e0c99 Add test on remove mooring acoustic import discards bacb8bb Force migration discards e1a4cb3 Force migration discards 386ecfb Add test on remove mooring acoustic import discards 172b9b8 Add test on remove mooring import discards 7912ed8 Add moring support in remove import discards 359a065 Add translate discards 6c3b2f1 Toggle visibility between voyages and morings discards 9df8d02 Toggle visibility between voyages and morings discards e18c828 Add support to display a mooring discards aec1002 Add support to display a mooring discards e70d317 Fix tooltip, delete quote in string discards 4cc1ac4 Fix error on Elementary cell when position is set at end discards a209554 Begin create table in dashboard for mooring discards c81b19a Fix description in modification logs discards c6e295c Finish mooring import forms discards b1e59f8 Create IT for mooring importation discards bb9d454 Fix UI after modification on remove strategies for mooring discards f754e8b Add remove strategies for mooring (not tested) discards 59af2e0 Introduce entityId in importLog (not working in UI) discards 3a36842 Create mooring import service discards ce6f852 Add translation discards 68d33c9 Implements accoustic data import for mooring discards 8bf46a6 Force input action for the validation discards 173d055 Add form to import accoustics data for mooring discards 6627c4c Plug action but they are not implemented discards ff095a2 Plug action but they are not implemented discards 5d437a7 Change style discards 00cbfce Add new import mode for mooring -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 0

branch feature/8180 updated (943c4a4 -> c88cba4)
by codelutin.com scm July 6, 2016

July 6, 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 943c4a4 Use too elementary cell adds 7cc43a1 Add cr réunion adds abb0eb3 Ajout d'un script pour faciliter les mises à jour (See #8175) adds fbd0194 Mise à jour de la documentation des mise à jour (See #8175) adds 3089b78 Mise à jour de la documentation d'installation (pré-requis tomcat 8) adds 6cb3384 Mise en place du script de mise à jour au démarrage de l'application (See #8175) adds 23c79a3 Merge branch 'feature/8175' into develop adds 98dfab4 Complete documentation for libreoffice (refs #8008) adds 07c92ed Fix copy update script adds 58fb101 Get the last model version from 8180 feature adds 831ccc5 Modify topia version adds de0e522 [jgitflow-maven-plugin]updating poms for 4.0-SNAPSHOT development adds b3a6311 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts adds 2979db7 [jgitflow-maven-plugin]updating poms for 4.0-alpha-2 branch with snapshot versions adds 320d3d0 Fix license headers adds 297e5af [jgitflow-maven-plugin]updating poms for branch'release/4.0-alpha-2' with non-snapshot versions adds 09f06f6 [jgitflow-maven-plugin]merging 'release/4.0-alpha-2' into 'master' adds 9534a3d [jgitflow-maven-plugin]merging 'master' into 'develop' adds aa9a6ec [jgitflow-maven-plugin]Updating develop poms back to pre merge state adds a46492a Fix type no usefull refs #8353 adds 00bc763 Fix column name refs #8353 adds 4de4f43 Add forget callback for migration refs #8353 adds fcc059d [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts adds 907cfc4 [jgitflow-maven-plugin]updating poms for 4.0-alpha-3 branch with snapshot versions adds 468e955 [jgitflow-maven-plugin]updating poms for branch'release/4.0-alpha-3' with non-snapshot versions adds 5ef97c9 [jgitflow-maven-plugin]merging 'release/4.0-alpha-3' into 'master' adds 53fec10 [jgitflow-maven-plugin]merging 'master' into 'develop' adds 4d494c8 [jgitflow-maven-plugin]Updating develop poms back to pre merge state adds 94a143d Update model image in site adds b9fb829 Rename legend in qgis adds 2ef6a93 Initalisation du referenciel adds 292e560 Test adds 46bfa10 Supression lock adds eabb0dd Fix error on Elementary cell when position is set at end adds ec1a8ab test2 adds 2a18b01 Merge branch 'develop' of https://gitlab.nuiton.org/codelutin/echobase into develop adds 569de80 From scmwebeditor -- e adds 01403aa From scmwebeditor -- dfg adds 38abb5d Improve the perfomance on search duplicate cell (ref #8165) adds c8c858c Improve the perfomance on search duplicate cell (ref #8165) adds efcf1a2 Improve the perfomance on search duplicate cell (ref #8165) adds 807db9a [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts adds 22fb71d [jgitflow-maven-plugin]updating poms for 4.0-alpha-4 branch with snapshot versions adds 2a08cea Fix license header adds 8ccd467 [jgitflow-maven-plugin]updating poms for branch'release/4.0-alpha-4' with non-snapshot versions adds b5e9529 [jgitflow-maven-plugin]merging 'release/4.0-alpha-4' into 'master' adds 9ae86d8 [jgitflow-maven-plugin]merging 'master' into 'develop' adds 38dcf19 [jgitflow-maven-plugin]Updating develop poms back to pre merge state adds 5d3377b Add forgotten columns (refs #8370) adds 260dd19 Add forgotten columns (refs #8370) adds 73d35e8 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts adds 3eb5830 [jgitflow-maven-plugin]updating poms for 4.0-alpha-5 branch with snapshot versions adds 1180b01 [jgitflow-maven-plugin]updating poms for branch'release/4.0-alpha-5' with non-snapshot versions adds d15d38e [jgitflow-maven-plugin]merging 'release/4.0-alpha-5' into 'master' adds 33941c3 [jgitflow-maven-plugin]merging 'master' into 'develop' adds 1c9d999 [jgitflow-maven-plugin]Updating develop poms back to pre merge state adds eb5d1aa Handle duplication on elementary cell (refs #2246) adds 4f6c5de [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts adds b7df710 [jgitflow-maven-plugin]updating poms for 4.0-alpha-6 branch with snapshot versions adds 50565e6 [jgitflow-maven-plugin]updating poms for branch'release/4.0-alpha-6' with non-snapshot versions adds 311cdf9 [jgitflow-maven-plugin]merging 'release/4.0-alpha-6' into 'master' adds db707d7 [jgitflow-maven-plugin]merging 'master' into 'develop' adds acde695 [jgitflow-maven-plugin]Updating develop poms back to pre merge state new 06a112d Add new import mode for mooring new fcb76c3 Change style new 2e685cb Plug action but they are not implemented new cf4e900 Plug action but they are not implemented new c45b350 Add form to import accoustics data for mooring new 99e85b4 Force input action for the validation new 05a6223 Implements accoustic data import for mooring new 7d474b1 Add translation new 05c4c41 Create mooring import service new 240051e Add remove strategies for mooring (not tested) new 26bbe2e Fix UI after modification on remove strategies for mooring new bfe6e95 Create IT for mooring importation new 1b4499d Finish mooring import forms new c47f954 Fix description in modification logs new e6c7d05 Begin create table in dashboard for mooring new 2071c67 Fix error on Elementary cell when position is set at end new 6f27c0e Fix tooltip, delete quote in string new 8a4f1cc Add support to display a mooring new 3f49ca8 Add support to display a mooring new d33669f Toggle visibility between voyages and morings new a7c6529 Toggle visibility between voyages and morings new 4c7ad65 Add translate new a1cb8d2 Add moring support in remove import new be9b0fc Add test on remove mooring import new ac4d5cc Add test on remove mooring acoustic import new d1c2fe1 Force migration new cad618b Force migration new b6c4248 Add test on remove mooring acoustic import new 0bc16f1 Add migration for database for the mooring new 5ae4575 Fix test due to mooring acoustic import test new 7f5fdb4 Fix test due to mooring acoustic import test new 2459a0e Improve the perfomance on search duplicate cell (ref #8165) new de9a623 Move migration to 3.907 version new 1ab5806 Move migration to 3.907 version new 54ce56d Update documentation for the mooring import new 60bca11 Refactoring avoid copy/paste on acoustic import for voyage and mooring new f255142 Fix delete import for mooring new 249211a Fix delete import for mooring new 6761c1d Refactoring on result import to make place for mooring new 27d7303 Refactoring on echotype import to make place for mooring new d25c1eb Add DataAcousticProvider in the model to avoid cast new d0a307c Create basic import AncillaryInstrumentation for Mooring new c5a4572 Add forgotten columns (refs #8370) new e8830cb Handle duplication on elementary cell (refs #2246) new b6ba2a9 Handle duplication on elementary cell (refs #2246) new 6ec47de Handle duplication on elementary cell (refs #2246) new 224bd1b Create ancillary intrumentation import for the voyage new 9c65eef Handle remove ancillary instrumentation import new a475079 Migrate database and add ancillary instrumentation new 2061223 Complete documentation on Ancillary instrumentation import new 871f148 Add echotype on mooring new 90397fc Add echotype on mooring new 251f4f7 Create service for echotype import for mooring new 791d802 Create service for esdu results import for mooring new 8d19a2d Create remove strategy for esdu results import for mooring new 9edc202 Migrate database to introduce echotype for the mooring new 38ee8f6 Complete documentation on mooring import new 3c8ff7a Clear hibernate trasaction to increase performance during flush (refs #8165) new 9425305 Add ancillary intrumentation in UI new 98ec303 Add results import for mooring in UI new 78ee58f Modify esdu cell name new a574030 Use too elementary cell new c88cba4 Merge branch 'feature/8180' of gitlab.nuiton.org:codelutin/echobase into feature/8180 The 63 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 c88cba42bfd2bd1ed7f1182b0e94dae1276a1840 Merge: a574030 943c4a4 Author: Julien Ruchaud <julien.ruchaud(a)debux.org> Date: Wed Jul 6 10:47:44 2016 +0200 Merge branch 'feature/8180' of gitlab.nuiton.org:codelutin/echobase into feature/8180 commit a57403057f756127c4b306c2d3e5d5ad47872d4d Author: Julien Ruchaud <julien.ruchaud(a)debux.org> Date: Wed Jul 6 09:58:03 2016 +0200 Use too elementary cell commit 78ee58f2517e2875e9a9a1bf0190072b7992df48 Author: Julien Ruchaud <julien.ruchaud(a)debux.org> Date: Tue Jul 5 18:18:00 2016 +0200 Modify esdu cell name commit 98ec3032076abb7d50c9a17b1c44abfd81d54cc1 Author: Julien Ruchaud <julien.ruchaud(a)debux.org> Date: Tue Jul 5 18:06:49 2016 +0200 Add results import for mooring in UI commit 94253052abfb658a6e2e64e3d0d0e11846b2109e Author: Julien Ruchaud <julien.ruchaud(a)debux.org> Date: Tue Jul 5 16:03:40 2016 +0200 Add ancillary intrumentation in UI commit 3c8ff7a5035834d005df80f143357ba5459a836c Author: Julien Ruchaud <julien.ruchaud(a)debux.org> Date: Tue Jul 5 14:52:10 2016 +0200 Clear hibernate trasaction to increase performance during flush (refs #8165) commit 38ee8f61ddde174357637692d1ca47ebe11bef71 Author: Julien Ruchaud <julien.ruchaud(a)debux.org> Date: Mon Jul 4 17:33:23 2016 +0200 Complete documentation on mooring import commit 9edc2020e89f572ecf0bebd706bd198c0b1b4fac Author: Julien Ruchaud <julien.ruchaud(a)debux.org> Date: Mon Jul 4 17:14:17 2016 +0200 Migrate database to introduce echotype for the mooring commit 8d19a2d42e5954f01bd87e01e8f1a0ad3d2e63ac Author: Julien Ruchaud <julien.ruchaud(a)debux.org> Date: Mon Jul 4 17:11:36 2016 +0200 Create remove strategy for esdu results import for mooring commit 791d80244d3bfd977bb791c8e24908064a5a78a2 Author: Julien Ruchaud <julien.ruchaud(a)debux.org> Date: Mon Jul 4 16:55:07 2016 +0200 Create service for esdu results import for mooring commit 251f4f75b01218e6ef2bddf34ce06db6d3dee33c Author: Julien Ruchaud <julien.ruchaud(a)debux.org> Date: Mon Jul 4 15:19:17 2016 +0200 Create service for echotype import for mooring commit 90397fc792ad8442d33036f534f6675ba737bf07 Author: Julien Ruchaud <julien.ruchaud(a)debux.org> Date: Mon Jul 4 14:04:47 2016 +0200 Add echotype on mooring commit 871f1481bfd3119fd2a99ca79f6189bab4320c80 Author: Julien Ruchaud <julien.ruchaud(a)debux.org> Date: Mon Jul 4 14:03:59 2016 +0200 Add echotype on mooring commit 2061223c69b217d314121e880bcabcbece4268a2 Author: Julien Ruchaud <julien.ruchaud(a)debux.org> Date: Mon Jul 4 12:00:48 2016 +0200 Complete documentation on Ancillary instrumentation import commit a4750799ad06123cd4ce8e5de9b4a6fd3cdcf7af Author: Julien Ruchaud <julien.ruchaud(a)debux.org> Date: Mon Jul 4 11:47:06 2016 +0200 Migrate database and add ancillary instrumentation commit 9c65eefedcd87e49b586a860cad04617d424e55f Author: Julien Ruchaud <julien.ruchaud(a)debux.org> Date: Mon Jul 4 11:23:24 2016 +0200 Handle remove ancillary instrumentation import commit 224bd1bf2a0cbc25977e2212eac4ea7523353a37 Author: Julien Ruchaud <julien.ruchaud(a)debux.org> Date: Fri Jul 1 11:21:52 2016 +0200 Create ancillary intrumentation import for the voyage commit 6ec47debd752b4d10d82520fc64b5473346d5bd9 Author: Julien Ruchaud <julien.ruchaud(a)debux.org> Date: Thu Jun 30 17:52:05 2016 +0200 Handle duplication on elementary cell (refs #2246) commit b6ba2a92f48c91a37f47571914ec24fef20a6db2 Author: Julien Ruchaud <julien.ruchaud(a)debux.org> Date: Thu Jun 30 17:18:19 2016 +0200 Handle duplication on elementary cell (refs #2246) commit e8830cb1a132c5f8404ce8855cf318a252450d3c Author: Julien Ruchaud <julien.ruchaud(a)debux.org> Date: Thu Jun 30 17:16:40 2016 +0200 Handle duplication on elementary cell (refs #2246) commit c5a4572a2196e00ba6723db90b66015b282772b4 Author: Julien Ruchaud <julien.ruchaud(a)debux.org> Date: Wed Jun 29 19:00:08 2016 +0200 Add forgotten columns (refs #8370) commit d0a307cc5d176ab10698a6ca8c4009f35fe5648a Author: Julien Ruchaud <julien.ruchaud(a)debux.org> Date: Wed Jun 29 15:32:43 2016 +0200 Create basic import AncillaryInstrumentation for Mooring commit d25c1eb6de81b738a38da8a4d11bd933303f924d Author: Julien Ruchaud <julien.ruchaud(a)debux.org> Date: Wed Jun 29 11:38:41 2016 +0200 Add DataAcousticProvider in the model to avoid cast commit 27d730389ebabbc409c90bc7ca6550da896c4098 Author: Julien Ruchaud <julien.ruchaud(a)debux.org> Date: Wed Jun 29 10:35:11 2016 +0200 Refactoring on echotype import to make place for mooring commit 6761c1d0e8ad9633b0ae0f0d12d82f17d41526ac Author: Julien Ruchaud <julien.ruchaud(a)debux.org> Date: Wed Jun 29 09:17:44 2016 +0200 Refactoring on result import to make place for mooring commit 249211a45d75e26d893eba25d933ee301fc5bac3 Author: Julien Ruchaud <julien.ruchaud(a)debux.org> Date: Tue Jun 28 16:55:04 2016 +0200 Fix delete import for mooring commit f2551429fc42c45c89c63e07f0815361b35bfafb Author: Julien Ruchaud <julien.ruchaud(a)debux.org> Date: Tue Jun 28 16:48:31 2016 +0200 Fix delete import for mooring commit 60bca11cdb1b4f758ff7191b624b54ec3e9fd237 Author: Julien Ruchaud <julien.ruchaud(a)debux.org> Date: Tue Jun 28 16:26:03 2016 +0200 Refactoring avoid copy/paste on acoustic import for voyage and mooring commit 54ce56dc312ddf9ee58278a084c66f45b72c9712 Author: Julien Ruchaud <julien.ruchaud(a)debux.org> Date: Mon Jun 27 17:37:47 2016 +0200 Update documentation for the mooring import commit 1ab58067ab13badc352d33da005f8a249e6427ac Author: Julien Ruchaud <julien.ruchaud(a)debux.org> Date: Mon Jun 27 17:12:09 2016 +0200 Move migration to 3.907 version commit de9a623de252cf8a0fc1fd3fd4797510a59d482f Author: Julien Ruchaud <julien.ruchaud(a)debux.org> Date: Mon Jun 27 16:32:51 2016 +0200 Move migration to 3.907 version commit 2459a0e80bd0f5fbf3d9ee68db304ca800b2a8bf Author: Julien Ruchaud <julien.ruchaud(a)debux.org> Date: Mon Jun 27 16:22:50 2016 +0200 Improve the perfomance on search duplicate cell (ref #8165) commit 7f5fdb4ae28947464ae40ea6a837f53fee98aadf Author: Julien Ruchaud <julien.ruchaud(a)debux.org> Date: Mon Jun 27 16:19:29 2016 +0200 Fix test due to mooring acoustic import test commit 5ae4575713b7d9ca8a23d9de7eb4bf11e07c6628 Author: Julien Ruchaud <julien.ruchaud(a)debux.org> Date: Mon Jun 27 11:27:08 2016 +0200 Fix test due to mooring acoustic import test commit 0bc16f1a63df48eba17eaa5bcc5df1c5256f4724 Author: Julien Ruchaud <julien.ruchaud(a)debux.org> Date: Mon Jun 27 11:20:29 2016 +0200 Add migration for database for the mooring commit b6c42489f2dd77e09287a46a52e2c9cd0063e930 Author: Julien Ruchaud <julien.ruchaud(a)debux.org> Date: Mon Jun 27 10:46:21 2016 +0200 Add test on remove mooring acoustic import commit cad618b84113b58fc81df5d59e9b4808eb0d6be7 Author: Julien Ruchaud <julien.ruchaud(a)debux.org> Date: Mon Jun 27 10:31:30 2016 +0200 Force migration commit d1c2fe10b8e29199bc6fcabd58882bd518f1142b Author: Julien Ruchaud <julien.ruchaud(a)debux.org> Date: Mon Jun 27 10:29:57 2016 +0200 Force migration commit ac4d5cc98ff1429688ff380cb3354b649f56fe78 Author: Julien Ruchaud <julien.ruchaud(a)debux.org> Date: Mon Jun 27 10:27:58 2016 +0200 Add test on remove mooring acoustic import commit be9b0fc02d223cc7ac32f4e82951dade168f22bc Author: Julien Ruchaud <julien.ruchaud(a)debux.org> Date: Fri Jun 24 18:21:30 2016 +0200 Add test on remove mooring import commit a1cb8d26e38281645f701c8faf3587f0525fb710 Author: Julien Ruchaud <julien.ruchaud(a)debux.org> Date: Fri Jun 24 11:19:43 2016 +0200 Add moring support in remove import commit 4c7ad65a708aa504862cbcf4741dbc333da252e0 Author: Julien Ruchaud <julien.ruchaud(a)debux.org> Date: Thu Jun 23 17:23:01 2016 +0200 Add translate commit a7c65293d891c0053c42a023d65b5640a6f681cf Author: Julien Ruchaud <julien.ruchaud(a)debux.org> Date: Thu Jun 23 16:58:28 2016 +0200 Toggle visibility between voyages and morings commit d33669f3925f15e9cf0f68d3ba4bf8f933476d87 Author: Julien Ruchaud <julien.ruchaud(a)debux.org> Date: Thu Jun 23 16:31:15 2016 +0200 Toggle visibility between voyages and morings commit 3f49ca8f43a7f01576d953d855ef24e945567a42 Author: Julien Ruchaud <julien.ruchaud(a)debux.org> Date: Thu Jun 23 14:27:47 2016 +0200 Add support to display a mooring commit 8a4f1cca7c35f284b902a8c648005e1ab76af223 Author: Julien Ruchaud <julien.ruchaud(a)debux.org> Date: Thu Jun 23 12:08:32 2016 +0200 Add support to display a mooring commit 6f27c0e3eac2f1d7487bbf08bd6a2106efc6957c Author: Julien Ruchaud <julien.ruchaud(a)debux.org> Date: Thu Jun 23 10:53:02 2016 +0200 Fix tooltip, delete quote in string commit 2071c678fdd954fd52be0d71c72dda764a3fd36c Author: Julien Ruchaud <julien.ruchaud(a)debux.org> Date: Thu Jun 23 10:19:05 2016 +0200 Fix error on Elementary cell when position is set at end commit e6c7d05dabb42c95f620e7099f210b9cdadf46e1 Author: Julien Ruchaud <julien.ruchaud(a)debux.org> Date: Wed Jun 22 17:11:46 2016 +0200 Begin create table in dashboard for mooring commit c47f954b25d48a91f6df8c45dfdc9b91904366b0 Author: Julien Ruchaud <julien.ruchaud(a)debux.org> Date: Wed Jun 22 14:00:38 2016 +0200 Fix description in modification logs commit 1b4499df211e78d5c4f0f5b721233138bdcdf4c7 Author: Julien Ruchaud <julien.ruchaud(a)debux.org> Date: Wed Jun 22 11:12:19 2016 +0200 Finish mooring import forms commit bfe6e956569d5537c32ee3d61da37e6c7c5b99a4 Author: Julien Ruchaud <julien.ruchaud(a)debux.org> Date: Wed Jun 22 10:32:53 2016 +0200 Create IT for mooring importation commit 26bbe2e1c2d99993a008eb6714b58e42f559c93d 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 240051e1a14b032e911ff001a3827abc1ef53458 Author: Julien Ruchaud <julien.ruchaud(a)debux.org> Date: Tue Jun 21 17:19:40 2016 +0200 Add remove strategies for mooring (not tested) commit 05c4c41df776158addb3dd493529e00f0d37e26c Author: Julien Ruchaud <julien.ruchaud(a)debux.org> Date: Fri Jun 17 16:33:48 2016 +0200 Create mooring import service commit 7d474b13cde499f5fd52c0c7c6f07ac00918a842 Author: Julien Ruchaud <julien.ruchaud(a)debux.org> Date: Thu Jun 16 16:45:36 2016 +0200 Add translation commit 05a6223f113658a73a57e73636f934f96086ef8c Author: Julien Ruchaud <julien.ruchaud(a)debux.org> Date: Tue Jun 14 16:45:12 2016 +0200 Implements accoustic data import for mooring commit 99e85b4c5c0c3010c3955780ef0f9718cdd0dae1 Author: Julien Ruchaud <julien.ruchaud(a)debux.org> Date: Tue Jun 14 10:54:14 2016 +0200 Force input action for the validation commit c45b35009f82823808ca3a4a1bf4a8c73c5bec96 Author: Julien Ruchaud <julien.ruchaud(a)debux.org> Date: Mon Jun 13 17:32:45 2016 +0200 Add form to import accoustics data for mooring commit cf4e9005129b8f3de2f8c941737f683fb45e6f6c Author: Julien Ruchaud <julien.ruchaud(a)debux.org> Date: Mon Jun 13 16:02:44 2016 +0200 Plug action but they are not implemented commit 2e685cbf6014e18e8f5e3ab68f6169c104980afe Author: Julien Ruchaud <julien.ruchaud(a)debux.org> Date: Mon Jun 13 13:48:49 2016 +0200 Plug action but they are not implemented commit fcb76c3eff4cd93577534a75de4a301321fd20a0 Author: Julien Ruchaud <julien.ruchaud(a)debux.org> Date: Mon Jun 13 12:12:47 2016 +0200 Change style commit 06a112d3acc7085f8aca966067da42d4bc315b79 Author: Julien Ruchaud <julien.ruchaud(a)debux.org> Date: Mon Jun 13 12:00:56 2016 +0200 Add new import mode for mooring 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 | 169 ++++++++++++++ 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 + .../echobase/config/EchoBaseConfiguration.java | 14 ++ .../config/EchoBaseConfigurationOption.java | 46 ++-- ...WorkingDbMigrationCallBackForVersion3_902.java} | 10 +- .../WorkingDbMigrationCallBackForVersion3_905.java | 21 ++ .../WorkingDbMigrationCallBackForVersion3_908.java | 21 ++ .../i18n/echobase-domain_en_GB.properties | 3 + .../i18n/echobase-domain_fr_FR.properties | 3 + .../migration/workingDb/3.906-add-indexes.sql | 1 + .../workingDb/h2/3.905-0-update-model.sql | 3 + .../workingDb/h2/3.905-2-migrate-voyage-ports.sql | 3 + .../migration/workingDb/pg/3.900-0-fix-types.sql | 4 +- .../pg/3.901-1-upgrade-importFile-table.sql | 2 +- .../workingDb/pg/3.905-0-update-model.sql | 3 + .../workingDb/pg/3.905-2-migrate-voyage-ports.sql | 3 + .../actions/MooringCommonsMooringImportAction.java | 1 + .../MooringAcousticsImportConfiguration.java | 1 - .../GearCharacteristicValuesImportModel.java | 21 ++ .../GearCharacteristicValuesImportRow.java | 21 ++ .../strategy/CatchesRemoveDataStrategy.java | 1 - .../strategy/OperationRemoveDataStrategy.java | 2 - .../strategy/ResultEsduRemoveDataStrategy.java | 2 - .../strategy/ResultMapFishRemoveDataStrategy.java | 1 - .../strategy/ResultMapOtherRemoveDataStrategy.java | 1 - .../strategy/ResultRegionRemoveDataStrategy.java | 1 - .../gis/templates/EchoBaseQGisTemplate.qgs | 2 +- echobase-ui/pom.xml | 1 + .../echobase/ui/EchoBaseApplicationContext.java | 22 ++ .../dbeditor/ImportGearCharacteristics.java | 21 ++ .../src/main/resources/embedded/update-echobase.sh | 54 +++++ pom.xml | 3 +- src/doc/reunions/reunion_2016-06-16.md | 97 ++++++++ src/site/en/rst/configure.rst.vm | 28 +-- src/site/en/rst/exportData.rst | 3 + src/site/en/rst/install.rst.vm | 5 + src/site/en/rst/update.rst.vm | 35 +-- src/site/resources/model/dataCommon.png | Bin 35480 -> 34469 bytes src/site/resources/model/dataMooring.png | Bin 11778 -> 14136 bytes src/site/rst/exportData.rst | 3 + src/site/rst/install.rst.vm | 20 +- src/site/rst/update.rst.vm | 29 ++- 56 files changed, 1415 insertions(+), 98 deletions(-) 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 copy echobase-domain/src/main/java/fr/ifremer/echobase/persistence/migration/workingDb/{WorkingDbMigrationCallBackForVersion3_903.java => WorkingDbMigrationCallBackForVersion3_902.java} (84%) create mode 100644 echobase-domain/src/main/resources/migration/workingDb/3.906-add-indexes.sql create mode 100755 echobase-ui/src/main/resources/embedded/update-echobase.sh create mode 100644 src/doc/reunions/reunion_2016-06-16.md -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 6

branch feature/8180 updated (f641359 -> 943c4a4)
by codelutin.com scm July 6, 2016

July 6, 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 f641359 Modify esdu cell name new 943c4a4 Use too elementary cell 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 943c4a4ec5c1f34addc3d88a7c9ad46f34d23eb9 Author: Julien Ruchaud <julien.ruchaud(a)debux.org> Date: Wed Jul 6 09:58:03 2016 +0200 Use too elementary cell Summary of changes: .../ifremer/echobase/services/csv/CellValueParser.java | 18 +++++++++--------- src/site/en/rst/importData.rst | 4 +++- src/site/rst/importData.rst | 4 +++- 3 files changed, 15 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 (efcdae6 -> f641359)
by codelutin.com scm July 5, 2016

July 5, 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 efcdae6 Add ancillary intrumentation in UI new f472fe9 Add results import for mooring in UI new f641359 Modify esdu cell name 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 f64135905e33833d20fbabdc66b4b69eab79908c Author: Julien Ruchaud <julien.ruchaud(a)debux.org> Date: Tue Jul 5 18:18:00 2016 +0200 Modify esdu cell name commit f472fe90cea025623dc36041886521682d289c41 Author: Julien Ruchaud <julien.ruchaud(a)debux.org> Date: Tue Jul 5 18:06:49 2016 +0200 Add results import for mooring in UI Summary of changes: .../fr/ifremer/echobase/entities/ImportType.java | 20 ++- echobase-domain/src/main/xmi/echobase.zargo | Bin 99818 -> 99798 bytes .../echobase/services/csv/CellValueParser.java | 33 +---- .../services/service/UserDbPersistenceService.java | 48 ++++--- .../importData/ConfigureMooringResultsImport.java | 131 +++++++++++++++++++ ...yage.java => GetDataProcessingsForMooring.java} | 33 +++-- .../importData/GetDataProcessingsForVoyage.java | 17 +-- ...Import.java => LaunchMooringResultsImport.java} | 15 +-- .../main/resources/config/struts-importData.xml | 8 +- .../importData/configureMooringResultsImport.jsp | 138 +++++++++++++++++++++ .../jsp/importData/configureResultsImport.jsp | 2 +- ...Import.jsp => progressMooringResultsImport.jsp} | 2 +- ...tsImport.jsp => resultMooringResultsImport.jsp} | 0 echobase-ui/src/main/webapp/js/gridHelper.js | 19 ++- src/site/en/rst/importData.rst | 4 +- src/site/rst/importData.rst | 4 +- 16 files changed, 366 insertions(+), 108 deletions(-) create mode 100644 echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/ConfigureMooringResultsImport.java copy echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/{GetDataProcessingsForVoyage.java => GetDataProcessingsForMooring.java} (74%) copy echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/{LaunchMooringAcousticImport.java => LaunchMooringResultsImport.java} (68%) create mode 100644 echobase-ui/src/main/webapp/WEB-INF/jsp/importData/configureMooringResultsImport.jsp copy echobase-ui/src/main/webapp/WEB-INF/jsp/importData/{progressResultsImport.jsp => progressMooringResultsImport.jsp} (93%) copy echobase-ui/src/main/webapp/WEB-INF/jsp/importData/{resultResultsImport.jsp => resultMooringResultsImport.jsp} (100%) -- 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 (15ec21f -> efcdae6)
by codelutin.com scm July 5, 2016

July 5, 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 15ec21f Clear hibernate trasaction to increase performance during flush (refs #8165) new efcdae6 Add ancillary intrumentation in UI 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 efcdae65afc4fa468243ef7aafa973d3666ad1a3 Author: Julien Ruchaud <julien.ruchaud(a)debux.org> Date: Tue Jul 5 16:03:40 2016 +0200 Add ancillary intrumentation in UI Summary of changes: .../fr/ifremer/echobase/entities/ImportType.java | 2 +- .../i18n/echobase-domain_en_GB.properties | 8 +-- .../i18n/echobase-domain_fr_FR.properties | 8 +-- ...mportAncillaryInstrumentationActionSupport.java | 5 +- .../ConfigureAncillaryInstrumentationImport.java | 72 ++++++++++++++++++++++ ...gureMooringAncillaryInstrumentationImport.java} | 41 +++++------- .../ui/actions/importData/ImportMooringMode.java | 5 +- .../ui/actions/importData/ImportVoyageMode.java | 3 + ...a => LaunchAncillaryInstrumentationImport.java} | 14 ++--- ...unchMooringAncillaryInstrumentationImport.java} | 14 ++--- .../resources/i18n/echobase-ui_en_GB.properties | 26 ++++---- .../resources/i18n/echobase-ui_fr_FR.properties | 8 ++- ...=> configureAncillaryInstrumentationImport.jsp} | 14 ++--- ...igureMooringAncillaryInstrumentationImport.jsp} | 20 +++--- ... => progressAncillaryInstrumentationImport.jsp} | 4 +- ...gressMooringAncillaryInstrumentationImport.jsp} | 4 +- ...sp => resultAncillaryInstrumentationImport.jsp} | 2 +- ...esultMooringAncillaryInstrumentationImport.jsp} | 2 +- 18 files changed, 156 insertions(+), 96 deletions(-) create mode 100644 echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/ConfigureAncillaryInstrumentationImport.java copy echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/{ConfigureMooringAcousticImport.java => ConfigureMooringAncillaryInstrumentationImport.java} (50%) copy echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/{LaunchMooringAcousticImport.java => LaunchAncillaryInstrumentationImport.java} (63%) copy echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/{LaunchMooringAcousticImport.java => LaunchMooringAncillaryInstrumentationImport.java} (62%) copy echobase-ui/src/main/webapp/WEB-INF/jsp/importData/{configureOperationImport.jsp => configureAncillaryInstrumentationImport.jsp} (78%) copy echobase-ui/src/main/webapp/WEB-INF/jsp/importData/{configureOperationImport.jsp => configureMooringAncillaryInstrumentationImport.jsp} (70%) copy echobase-ui/src/main/webapp/WEB-INF/jsp/importData/{progressAcousticImport.jsp => progressAncillaryInstrumentationImport.jsp} (87%) copy echobase-ui/src/main/webapp/WEB-INF/jsp/importData/{progressAcousticImport.jsp => progressMooringAncillaryInstrumentationImport.jsp} (87%) copy echobase-ui/src/main/webapp/WEB-INF/jsp/importData/{resultMooringCommonsImport.jsp => resultAncillaryInstrumentationImport.jsp} (92%) copy echobase-ui/src/main/webapp/WEB-INF/jsp/importData/{resultMooringCommonsImport.jsp => resultMooringAncillaryInstrumentationImport.jsp} (92%) -- 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 (ca641fb -> 15ec21f)
by codelutin.com scm July 5, 2016

July 5, 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 ca641fb Complete documentation on mooring import new 15ec21f Clear hibernate trasaction to increase performance during flush (refs #8165) 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 15ec21f7424242f759dad01eaebf57cbf17cd8a6 Author: Julien Ruchaud <julien.ruchaud(a)debux.org> Date: Tue Jul 5 14:52:10 2016 +0200 Clear hibernate trasaction to increase performance during flush (refs #8165) Summary of changes: .../services/service/UserDbPersistenceService.java | 8 + .../actions/ImportAcousticsActionSupport.java | 11 + .../actions/ImportDataActionSupport.java | 6 +- .../actions/VoyageAcousticsImportAction.java | 6 +- .../contexts/VoyageAcousticsImportDataContext.java | 22 + .../resources/echobase-services-test.properties | 4 +- .../test/resources/import-data/acoustic/movies.csv | 32986 ------------------- .../import-data/acoustic/movies_small.csv | 301 - 8 files changed, 51 insertions(+), 33293 deletions(-) delete mode 100644 echobase-services/src/test/resources/import-data/acoustic/movies.csv delete mode 100644 echobase-services/src/test/resources/import-data/acoustic/movies_small.csv -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 0

branch feature/8180 updated (cd9fa27 -> ca641fb)
by codelutin.com scm July 4, 2016

July 4, 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 cd9fa27 Migrate database to introduce echotype for the mooring new ca641fb Complete documentation on mooring import 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 ca641fb5b64360412d08abff449a9c44674f456b Author: Julien Ruchaud <julien.ruchaud(a)debux.org> Date: Mon Jul 4 17:33:23 2016 +0200 Complete documentation on mooring import Summary of changes: src/site/en/rst/importData.rst | 302 +++++++++++++++++++++++++++------------- src/site/rst/importData.rst | 303 ++++++++++++++++++++++++++++------------- 2 files changed, 417 insertions(+), 188 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 (bcee297 -> cd9fa27)
by codelutin.com scm July 4, 2016

July 4, 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 bcee297 Create service for echotype import for mooring new 2b736c0 Create service for esdu results import for mooring new e81e229 Create remove strategy for esdu results import for mooring new cd9fa27 Migrate database to introduce echotype for the mooring 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 cd9fa2708c04a16365c869f2c679e4a3068a70d8 Author: Julien Ruchaud <julien.ruchaud(a)debux.org> Date: Mon Jul 4 17:14:17 2016 +0200 Migrate database to introduce echotype for the mooring commit e81e229cc4769cdd4e3b812bad0dd72140a14b2f Author: Julien Ruchaud <julien.ruchaud(a)debux.org> Date: Mon Jul 4 17:11:36 2016 +0200 Create remove strategy for esdu results import for mooring commit 2b736c089116319e8f1345c25b9e99b75779c23e Author: Julien Ruchaud <julien.ruchaud(a)debux.org> Date: Mon Jul 4 16:55:07 2016 +0200 Create service for esdu results import for mooring Summary of changes: .../services/service/UserDbPersistenceService.java | 4 +- .../service/importdata/ImportDataService.java | 66 ++++++++++----- ...ava => ResultsImportAlreadyExistException.java} | 6 +- ...MooringResultsCellImportDataActionSupport.java} | 18 ++-- ...chotypeAndSpeciesCategoryCellImportAction.java} | 33 ++++---- ...ringResultsEsduByEchotypeCellImportAction.java} | 31 +++---- ...oyageResultsEsduByEchotypeCellImportAction.java | 1 - ...chotypeAndSpeciesCategoryImportExportModel.java | 94 +++++++++++++++++++++ ...EsduByEchotypeAndSpeciesCategoryImportRow.java} | 27 +++--- ...ringResultsEsduByEchotypeImportExportModel.java | 83 ++++++++++++++++++ ... => MooringResultsEsduByEchotypeImportRow.java} | 31 +++---- .../service/removedata/RemoveDataService.java | 4 +- ...va => MooringResultEsduRemoveDataStrategy.java} | 17 ++-- .../i18n/echobase-services_en_GB.properties | 1 + .../i18n/echobase-services_fr_FR.properties | 1 + .../echobase/services/ImportDataFixtures.java | 12 +++ .../services/MigrateImportDataDatabasesIT.java | 5 ++ .../importdata/AbstractImportDataServiceIT.java | 30 +++++-- ...EchotypeAndSpeciesCategoryImportServiceIT.java} | 35 ++++---- ...esultsEsduCellOnlyEchotypeImportServiceIT.java} | 33 +++++--- ...AndSpeciesCategoryAndLengthImportServiceIT.java | 2 +- ...ciesCategoryAndLength_SmallImportServiceIT.java | 2 +- ...yEchotypeAndSpeciesCategoryImportServiceIT.java | 2 +- ...ResultsEsduCellOnlyEchotypeImportServiceIT.java | 2 +- ...llOnlySpeciesAndAgeCategoryImportServiceIT.java | 2 +- .../VoyageResultsRegionCellImportServiceIT.java | 2 +- ...VoyageResultsRegionCell_AllImportServiceIT.java | 2 +- .../removedata/AbstractRemoveDataServiceTest.java | 33 +++++++- .../MooringAcousticRemoveDataServiceTest.java | 4 +- .../removedata/MooringRemoveDataServiceTest.java | 4 +- ...=> MooringResultEsduRemoveDataServiceTest.java} | 15 ++-- .../MooringResultsRemoveDataServiceTest.java | 4 +- .../echobase-catches-and-voyage-result.h2.db.gz | Bin 990799 -> 991130 bytes .../import-data/echobase-catches.h2.db.gz | Bin 924599 -> 924955 bytes .../import-data/echobase-commonData.h2.db.gz | Bin 369853 -> 370149 bytes .../import-data/echobase-mooring-results.h2.db.gz | Bin 0 -> 930474 bytes .../import-data/echobase-mooring.h2.db.gz | Bin 925009 -> 925371 bytes .../resources/import-data/echobase-nodata.h2.db.gz | Bin 318391 -> 318631 bytes .../echobase-operation-total-samples.h2.db.gz | Bin 784879 -> 785190 bytes .../import-data/echobase-operation.h2.db.gz | Bin 507688 -> 508067 bytes .../byEchotypeAndSpeciesCategory_small.csv.gz | Bin 0 -> 2038 bytes .../result/mooring-esdu/byEchotype_small.csv.gz | Bin 0 -> 2798 bytes 42 files changed, 439 insertions(+), 167 deletions(-) rename echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/{ResultsVoyageImportAlreadyExistException.java => ResultsImportAlreadyExistException.java} (82%) copy echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/actions/{VoyageResultsCellImportDataActionSupport.java => MooringResultsCellImportDataActionSupport.java} (64%) copy echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/actions/{VoyageResultsRegionResultsImportAction.java => MooringResultsEsduByEchotypeAndSpeciesCategoryCellImportAction.java} (53%) copy echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/actions/{VoyageResultsEsduByEchotypeCellImportAction.java => MooringResultsEsduByEchotypeCellImportAction.java} (51%) create mode 100644 echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/MooringResultsEsduByEchotypeAndSpeciesCategoryImportExportModel.java copy echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/{VoyageResultsEsduByEchotypeAndSpeciesCategoryImportRow.java => MooringResultsEsduByEchotypeAndSpeciesCategoryImportRow.java} (80%) create mode 100644 echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/MooringResultsEsduByEchotypeImportExportModel.java copy echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/{VoyageResultsEsduByEchotypeImportRow.java => MooringResultsEsduByEchotypeImportRow.java} (74%) copy echobase-services/src/main/java/fr/ifremer/echobase/services/service/removedata/strategy/{ResultEsduRemoveDataStrategy.java => MooringResultEsduRemoveDataStrategy.java} (79%) copy echobase-services/src/test/java/fr/ifremer/echobase/services/service/importdata/{VoyageResultsEsduCellOnlyEchotypeAndSpeciesCategoryImportServiceIT.java => MooringResultsEsduCellOnlyEchotypeAndSpeciesCategoryImportServiceIT.java} (65%) copy echobase-services/src/test/java/fr/ifremer/echobase/services/service/importdata/{VoyageResultsEsduCellOnlyEchotypeImportServiceIT.java => MooringResultsEsduCellOnlyEchotypeImportServiceIT.java} (63%) copy echobase-services/src/test/java/fr/ifremer/echobase/ui/actions/removedata/{MooringResultsRemoveDataServiceTest.java => MooringResultEsduRemoveDataServiceTest.java} (76%) create mode 100644 echobase-services/src/test/resources/import-data/echobase-mooring-results.h2.db.gz create mode 100644 echobase-services/src/test/resources/import-data/result/mooring-esdu/byEchotypeAndSpeciesCategory_small.csv.gz create mode 100644 echobase-services/src/test/resources/import-data/result/mooring-esdu/byEchotype_small.csv.gz -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 3