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

branch feature/2246 updated (883d892 -> a23905d)
by codelutin.com scm May 12, 2016

May 12, 2016

This is an automated email from the git hooks/post-receive script. New change to branch feature/2246 in repository echobase. See https://gitlab.nuiton.org/codelutin/echobase.git from 883d892 Ne pas pouvoir effectuer plusieurs imports du même type new ea54a1e Début de check pour les Sub-Sample mais il me manque des confirmations, à revoir avec Mathieu new 0896dd7 Catch more exception while importing + ajout meilleur TODO new 6bcfd28 i18n new a23905d Ne pas autoriser de réimporter les données acoustiques déjà existantes (See #2246) The 4 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 a23905dde41b2fbd383cb388072f791e13eedc01 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Thu May 12 15:39:59 2016 +0200 Ne pas autoriser de réimporter les données acoustiques déjà existantes (See #2246) commit 6bcfd28ac5a7a8547b4881f45a94f8015143e0d3 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Thu May 12 09:10:22 2016 +0200 i18n commit 0896dd7e73ceaab18a32924bbe995f719a7d4956 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Thu May 12 09:09:06 2016 +0200 Catch more exception while importing + ajout meilleur TODO commit ea54a1e9f532ce63c96c8b723871a609649c4e9a Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Tue May 10 10:50:51 2016 +0200 Début de check pour les Sub-Sample mais il me manque des confirmations, à revoir avec Mathieu Summary of changes: .../services/service/UserDbPersistenceService.java | 13 +++++++++++++ ...ion.java => DuplicatedElementaryCellException.java} | 8 ++++---- ...Exception.java => DuplicatedEsduCellException.java} | 8 ++++---- ...xception.java => DuplicatedSubSampleException.java} | 10 +++++++--- .../importdata/actions/ImportDataActionSupport.java | 8 ++++---- .../actions/VoyageAcousticsImportAction.java | 18 +++++++++++++++++- .../actions/VoyageCatchesSubSampleImportAction.java | 11 +++++++++++ .../resources/i18n/echobase-services_en_GB.properties | 3 +++ .../resources/i18n/echobase-services_fr_FR.properties | 3 +++ 9 files changed, 66 insertions(+), 16 deletions(-) copy echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/{MoreThanOnceVoyageToImportException.java => DuplicatedElementaryCellException.java} (78%) copy echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/{DuplicatedTransectException.java => DuplicatedEsduCellException.java} (80%) copy echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/{DuplicatedOperationException.java => DuplicatedSubSampleException.java} (73%) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 4

branch feature/#8171 updated (e73b8f4 -> 3df68fd)
by codelutin.com scm May 11, 2016

May 11, 2016

This is an automated email from the git hooks/post-receive script. New change to branch feature/#8171 in repository echobase. See https://gitlab.nuiton.org/codelutin/echobase.git from e73b8f4 Fix voyage creation with ports new 8aec49a Fix mandatory field during import new 3df68fd Fix import for the voyage entity 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 3df68fd7ce7f7834b5f2a51dadee236646892ede Author: Julien Ruchaud <julien.ruchaud(a)debux.org> Date: Wed May 11 17:22:14 2016 +0200 Fix import for the voyage entity commit 8aec49a3f2183d0fd669d99220437102e164bc90 Author: Julien Ruchaud <julien.ruchaud(a)debux.org> Date: Wed May 11 14:37:06 2016 +0200 Fix mandatory field during import Summary of changes: .../references/{Vessels.java => Ports.java} | 10 +++++----- .../migration/workingDb/3.905-1-insert-ports.sql | 4 ++-- .../echobase/services/csv/EchoBaseCsvUtil.java | 12 ++++++++++++ .../services/service/UserDbPersistenceService.java | 4 ++-- .../contexts/ImportDataContextSupport.java | 10 ++++++++++ .../csv/VoyageCommonsVoyageImportExportModel.java | 9 +++++---- .../resources/echobase-importDb-referentiel.zip | Bin 50556 -> 50514 bytes .../test/resources/import-data/common/voyage.csv.gz | Bin 126 -> 117 bytes 8 files changed, 36 insertions(+), 13 deletions(-) copy echobase-domain/src/main/java/fr/ifremer/echobase/entities/references/{Vessels.java => Ports.java} (79%) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 2

branch feature/2246 updated (9f72d77 -> 883d892)
by codelutin.com scm May 10, 2016

May 10, 2016

This is an automated email from the git hooks/post-receive script. New change to branch feature/2246 in repository echobase. See https://gitlab.nuiton.org/codelutin/echobase.git from 9f72d77 Ne pas autoriser de réimporter des meta sur les opérations et engins déjà existantes (See #2246) new 883d892 Ne pas pouvoir effectuer plusieurs imports du même type 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 883d89247f05706f7705b3d865dea461a9780ca1 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Tue May 10 10:03:34 2016 +0200 Ne pas pouvoir effectuer plusieurs imports du même type Summary of changes: .../echobase/services/service/removedata/RemoveDataService.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 1

branch feature/2246 updated (42d9dbb -> 9f72d77)
by codelutin.com scm May 10, 2016

May 10, 2016

This is an automated email from the git hooks/post-receive script. New change to branch feature/2246 in repository echobase. See https://gitlab.nuiton.org/codelutin/echobase.git from 42d9dbb Tester avant de supprimer lors de la suppression d'un import new 9f72d77 Ne pas autoriser de réimporter des meta sur les opérations et engins déjà existantes (See #2246) 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 9f72d77b3ef53ef5a390f1f9c790b541c3ae5e4b Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Tue May 10 09:46:46 2016 +0200 Ne pas autoriser de réimporter des meta sur les opérations et engins déjà existantes (See #2246) Summary of changes: .../services/service/UserDbPersistenceService.java | 24 ++++++++++++++++++++-- ...a => DuplicatedGearMetadataValueException.java} | 13 +++++++++--- ...DuplicatedOperationMetadataValueException.java} | 7 ++++--- .../VoyageOperationsGearMetadataImportAction.java | 23 +++++++++++++++++++++ ...ageOperationsOperationMetadataImportAction.java | 13 +++++++++++- .../i18n/echobase-services_en_GB.properties | 2 ++ .../i18n/echobase-services_fr_FR.properties | 2 ++ 7 files changed, 75 insertions(+), 9 deletions(-) copy echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/{DuplicatedOperationException.java => DuplicatedGearMetadataValueException.java} (60%) copy echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/{DuplicatedOperationException.java => DuplicatedOperationMetadataValueException.java} (75%) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 1

branch feature/2246 updated (8690ac9 -> 42d9dbb)
by codelutin.com scm May 10, 2016

May 10, 2016

This is an automated email from the git hooks/post-receive script. New change to branch feature/2246 in repository echobase. See https://gitlab.nuiton.org/codelutin/echobase.git from 8690ac9 Meilleure gestion de la suppression d'un ImportLog new 91a2107 Ajout toString new 7a78dc1 Nom de Zeus... ne jamais utiliser id comme nom de colonne car en hql ici c'est égale au TopiaId... new 42d9dbb Tester avant de supprimer lors de la suppression d'un import 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 42d9dbba9a49a41ab7d08a151dfbecf0b1053ca6 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Tue May 10 08:56:15 2016 +0200 Tester avant de supprimer lors de la suppression d'un import commit 7a78dc116fad15df2eb723e922cfb9cec2b216e2 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Tue May 10 08:55:34 2016 +0200 Nom de Zeus... ne jamais utiliser id comme nom de colonne car en hql ici c'est égale au TopiaId... commit 91a2107e04ad9955ce6cde17e8efa332d36fa8c9 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Tue May 10 08:54:44 2016 +0200 Ajout toString Summary of changes: .../echobase/entities/ImportFileIdTopiaDao.java | 2 +- .../main/java/fr/ifremer/echobase/io/InputFile.java | 20 ++++++++++++++++++++ .../strategy/AbstractRemoveDataStrategy.java | 15 +++++++++------ 3 files changed, 30 insertions(+), 7 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 3

branch feature/2246 updated (31e9b45 -> 8690ac9)
by codelutin.com scm May 9, 2016

May 9, 2016

This is an automated email from the git hooks/post-receive script. New change to branch feature/2246 in repository echobase. See https://gitlab.nuiton.org/codelutin/echobase.git from 31e9b45 Ne pas autoriser de réimporter des transects déjà existants (See #2246) new b3b3fac Ne pas pouvoir éditer les entitées transverses new 3209872 Ne pas autoriser de réimporter des opérations déjà existantes (See #2246) new dec2182 Renommage i18n new e847db7 Ajout toString new fa0d99e Bine utiliser la bonne page de résultat new 045c9fc Gérer la nullité d'erreur sur un import new 8690ac9 Meilleure gestion de la suppression d'un ImportLog The 7 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit 8690ac9d3c8e864dbb6e13d085f1dcd9f246612f Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Mon May 9 19:20:48 2016 +0200 Meilleure gestion de la suppression d'un ImportLog commit 045c9fc487758a476e73a9a9a4fae09f070d1640 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Mon May 9 19:20:14 2016 +0200 Gérer la nullité d'erreur sur un import commit fa0d99e448c1bd5ecfb5b26b105f755c90db949c Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Mon May 9 19:19:51 2016 +0200 Bine utiliser la bonne page de résultat commit e847db717f176fcec2da21cf4c64be64cf77c712 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Mon May 9 18:38:36 2016 +0200 Ajout toString commit dec218226fafb44f80dcc85e11ba2324f4c79119 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Mon May 9 18:37:56 2016 +0200 Renommage i18n commit 32098723e5d9346217d1be59713a9630832fe5c3 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Mon May 9 18:37:39 2016 +0200 Ne pas autoriser de réimporter des opérations déjà existantes (See #2246) commit b3b3fac2a9ecde1f843db04c7e9a2ecca76c7d0f Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Mon May 9 18:36:32 2016 +0200 Ne pas pouvoir éditer les entitées transverses Summary of changes: .../echobase/entities/ImportFileTopiaDao.java | 15 ++++++++++--- .../echobase/entities/ImportLogTopiaDao.java | 6 ++++-- .../{DataImpl.java => GearMetadataValueImpl.java} | 8 +++---- ...taImpl.java => OperationMetadataValueImpl.java} | 9 ++++---- .../echobase/persistence/EchoBaseDbMeta.java | 5 +++++ .../services/service/UserDbPersistenceService.java | 22 +++++++++++++++++++ ...tion.java => DuplicatedOperationException.java} | 7 +++--- .../importdata/DuplicatedTransectException.java | 2 +- .../importdata/DuplicatedTransitException.java | 2 +- .../VoyageOperationsOperationImportAction.java | 6 ++++++ .../strategy/OperationRemoveDataStrategy.java | 25 ++++++++++++++++++++-- .../i18n/echobase-services_en_GB.properties | 7 +++--- .../i18n/echobase-services_fr_FR.properties | 5 +++-- .../jsp/importData/importDataActionResult.jsp | 2 +- .../jsp/importData/resultAcousticImport.jsp | 2 +- .../WEB-INF/jsp/importData/resultCatchesImport.jsp | 2 +- .../jsp/importData/resultOperationImport.jsp | 2 +- .../WEB-INF/jsp/importData/resultResultsImport.jsp | 2 +- 18 files changed, 98 insertions(+), 31 deletions(-) copy echobase-domain/src/main/java/fr/ifremer/echobase/entities/data/{DataImpl.java => GearMetadataValueImpl.java} (61%) copy echobase-domain/src/main/java/fr/ifremer/echobase/entities/data/{DataImpl.java => OperationMetadataValueImpl.java} (60%) copy echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/{DuplicatedTransitException.java => DuplicatedOperationException.java} (76%) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 7

branch feature/2246 updated (1541342 -> 31e9b45)
by codelutin.com scm May 9, 2016

May 9, 2016

This is an automated email from the git hooks/post-receive script. New change to branch feature/2246 in repository echobase. See https://gitlab.nuiton.org/codelutin/echobase.git from 1541342 Ne pas autorisé un import d'un voyage déjà existant (clef unique name) (See #2246) new 2d6139e Ajout bidirection sur le modèle (A reverter quand import branche Atlantos) new 262c51e Début ajout migration pour les clef naturelles + traitement pour import transit (See #2246) new cda7281 Typo sur le nom d'une méthode new 73ff899 Ne pas autoriser de réimporter des transits déjà existants (See #2246) new 31e9b45 Ne pas autoriser de réimporter des transects déjà existants (See #2246) The 5 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 31e9b4548532e513bc3563f6f9e283f526d5e091 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Mon May 9 15:08:46 2016 +0200 Ne pas autoriser de réimporter des transects déjà existants (See #2246) commit 73ff8998bbea1e78b5e9f802361b1289bb973868 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Mon May 9 14:49:36 2016 +0200 Ne pas autoriser de réimporter des transits déjà existants (See #2246) commit cda728120f5ebdb2c5e0cacecd3aa7a1077966e3 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Mon May 9 14:49:09 2016 +0200 Typo sur le nom d'une méthode commit 262c51e3583f2b496b87c78615a1f8cd4ba0c252 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Mon May 9 14:14:33 2016 +0200 Début ajout migration pour les clef naturelles + traitement pour import transit (See #2246) commit 2d6139eea45b74df2404f6f025c1b334cf57066c Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Mon May 9 14:12:27 2016 +0200 Ajout bidirection sur le modèle (A reverter quand import branche Atlantos) Summary of changes: ... WorkingDbMigrationCallBackForVersion3_903.java} | 10 +++++----- .../workingDb/h2/3.903-0-add-naturalIds.sql | 2 ++ .../workingDb/pg/3.903-0-add-naturalIds.sql | 2 ++ echobase-domain/src/main/xmi/echobase.properties | 10 +++++++++- echobase-domain/src/main/xmi/echobase.zargo | Bin 90458 -> 90445 bytes .../services/service/UserDbPersistenceService.java | 17 +++++++++++++++++ ...eption.java => DuplicatedTransectException.java} | 10 +++++----- ...ception.java => DuplicatedTransitException.java} | 11 ++++++----- .../importdata/DuplicatedVoyageException.java | 4 ++-- .../actions/VoyageCommonsTransectImportAction.java | 6 ++++++ .../actions/VoyageCommonsTransitImportAction.java | 8 +++++++- .../i18n/echobase-services_en_GB.properties | 2 ++ .../i18n/echobase-services_fr_FR.properties | 2 ++ .../removedata/AbstractRemoveDataServiceTest.java | 6 ++++++ .../actions/importData/ConfigureCommonImport.java | 2 +- 15 files changed, 72 insertions(+), 20 deletions(-) copy echobase-domain/src/main/java/fr/ifremer/echobase/persistence/migration/workingDb/{WorkingDbMigrationCallBackForVersion3_902.java => WorkingDbMigrationCallBackForVersion3_903.java} (73%) create mode 100644 echobase-domain/src/main/resources/migration/workingDb/h2/3.903-0-add-naturalIds.sql create mode 100644 echobase-domain/src/main/resources/migration/workingDb/pg/3.903-0-add-naturalIds.sql copy echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/{NoVoyageToImportException.java => DuplicatedTransectException.java} (78%) copy echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/{NoVoyageToImportException.java => DuplicatedTransitException.java} (75%) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 5

branch feature/2246 created (now 1541342)
by codelutin.com scm May 9, 2016

May 9, 2016

This is an automated email from the git hooks/post-receive script. New change to branch feature/2246 in repository echobase. See https://gitlab.nuiton.org/codelutin/echobase.git at 1541342 Ne pas autorisé un import d'un voyage déjà existant (clef unique name) (See #2246) This branch includes the following new commits: new 1541342 Ne pas autorisé un import d'un voyage déjà existant (clef unique name) (See #2246) 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 1541342e799e303c66794950deca07c828e724f0 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Mon May 9 13:01:12 2016 +0200 Ne pas autorisé un import d'un voyage déjà existant (clef unique name) (See #2246) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 1

branch develop updated (4c7c2a1 -> e9095b6)
by codelutin.com scm May 9, 2016

May 9, 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 4c7c2a1 Fixes #8168 (Mise à jour des librairies) new eeef6aa Ajout bidirection sur le modèle (A reverter quand import branche Atlantos) new 42961ba Début d'optimisation des check d'import new 952bddb Ajout bidirection sur le modèle (A reverter quand import branche Atlantos) new bc5e510 Fin de l'optimisation des export (See #8170) new 4500852 Utilisation ToPIA 3.1 new 3d92141 On doit rajouter un order by à la main + correction de la fenetre à calculer new 5fc7551 Afficher les fichiers résultats d'import dans le tableau de bord new 3495e8a Bien vérifier que les fichiers importés sont correctes (See #8170) new e9095b6 Livrable #8170 Merge branch 'feature/8170' into develop The 9 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 e9095b622ed3bad89d9b5dc5a9854d242b237f4c Merge: 4c7c2a1 3495e8a Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Mon May 9 12:30:16 2016 +0200 Livrable #8170 Merge branch 'feature/8170' into develop commit 3495e8a1d06126c5c68c3966252a35cd97d96e50 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Mon May 9 12:27:59 2016 +0200 Bien vérifier que les fichiers importés sont correctes (See #8170) commit 5fc7551f8266a512b1b823e99adc98a5d4e7cd1e Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Wed May 4 12:26:41 2016 +0200 Afficher les fichiers résultats d'import dans le tableau de bord commit 3d921412e28327e8c60d497b939c8c1fff2b4723 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Wed May 4 11:34:02 2016 +0200 On doit rajouter un order by à la main + correction de la fenetre à calculer commit 4500852eae783c33d02c3a18472d7ab3455bcacc Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Wed May 4 11:31:27 2016 +0200 Utilisation ToPIA 3.1 commit bc5e510b7dac443a765e966334eca1feb8d4aac4 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Tue May 3 10:16:20 2016 +0200 Fin de l'optimisation des export (See #8170) commit 952bddb60fbf609052fea6bca7ba244923c3d5d2 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Tue May 3 10:09:14 2016 +0200 Ajout bidirection sur le modèle (A reverter quand import branche Atlantos) commit 42961ba52814b9ab11781ba84c88e9231bff3df1 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Mon May 2 11:26:34 2016 +0200 Début d'optimisation des check d'import commit eeef6aaec5fc57a5de6efd6f96c7bdf5214a2e47 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Mon May 2 11:19:42 2016 +0200 Ajout bidirection sur le modèle (A reverter quand import branche Atlantos) Summary of changes: .../echobase/entities/ImportFileIdTopiaDao.java | 46 +++++++++ .../fr/ifremer/echobase/entities/ImportedCell.java | 41 ++++++++ .../echobase/entities/ImportedCellResult.java | 41 ++++++++ .../entities/ImportedSampleDataResult.java | 48 +++++++++ .../fr/ifremer/echobase/io/EchoBaseIOUtil.java | 82 ++++++++++++++++ echobase-domain/src/main/xmi/echobase.zargo | Bin 90472 -> 90458 bytes .../echobase/services/service/DbEditorService.java | 17 ++-- .../services/service/UserDbPersistenceService.java | 30 +++++- .../service/importdata/CheckFileException.java | 32 ++++++ .../service/importdata/ImportException.java | 26 +++++ .../actions/ImportDataActionSupport.java | 46 +++++++-- .../actions/VoyageAcousticsImportAction.java | 83 ++++------------ .../VoyageCatchesBiometrySampleImportAction.java | 34 ++----- .../VoyageCatchesSubSampleImportAction.java | 107 ++++++--------------- .../VoyageCatchesTotalSampleImportAction.java | 92 +++++++----------- .../actions/VoyageCommonsTransectImportAction.java | 15 +-- .../actions/VoyageCommonsTransitImportAction.java | 17 +--- .../actions/VoyageCommonsVoyageImportAction.java | 8 +- .../VoyageOperationsGearMetadataImportAction.java | 36 +------ .../VoyageOperationsOperationImportAction.java | 25 +---- ...ageOperationsOperationMetadataImportAction.java | 37 +------ .../VoyageResultsCellImportDataActionSupport.java | 75 ++++++--------- ...VoyageResultsRegionAssociationImportAction.java | 31 +++--- .../actions/VoyageResultsRegionImportAction.java | 41 +++----- ...oyageResultsVoyageLengthAgeKeyImportAction.java | 8 +- ...geResultsVoyageLengthWeightKeyImportAction.java | 8 +- .../csv/VoyageCatchesBiometrySampleImportRow.java | 5 +- .../csv/VoyageCatchesTotalSampleImportRow.java | 9 +- ...VoyageOperationsGearMetadataValueImportRow.java | 5 +- .../csv/VoyageOperationsOperationImportRow.java | 3 +- ...eOperationsOperationMetadataValueImportRow.java | 5 +- .../csv/VoyageResultsRegionCellImportRow.java | 3 +- .../echobase/services/EchoBaseServiceFixtures.java | 8 ++ .../VoyageCatchesAllImportServiceIT.java | 16 +-- .../VoyageResultsRegionCellImportServiceIT.java | 7 +- ...oyageResultsRegionCell_AllImportServiceIT.java} | 15 ++- .../ui/actions/importData/DownloadInputFile.java | 73 ++++++++++++++ .../ui/actions/workingDb/DownloadExportFile.java | 30 +++--- ...oadImportFile.java => DownloadFileSupport.java} | 24 ++--- .../ui/actions/workingDb/DownloadImportFile.java | 80 ++------------- .../main/resources/config/struts-importData.xml | 11 +++ .../src/main/resources/config/struts-workingDb.xml | 11 +++ .../resources/i18n/echobase-ui_en_GB.properties | 5 + .../resources/i18n/echobase-ui_fr_FR.properties | 5 + .../jsp/importData/importDataActionResult.jsp | 62 ++++++++++++ .../WEB-INF/jsp/importData/resultCommonImport.jsp | 2 +- .../webapp/WEB-INF/jsp/workingDb/dashboard.jsp | 70 ++++++++++---- pom.xml | 2 +- 48 files changed, 859 insertions(+), 618 deletions(-) create mode 100644 echobase-domain/src/main/java/fr/ifremer/echobase/entities/ImportedCell.java create mode 100644 echobase-domain/src/main/java/fr/ifremer/echobase/entities/ImportedCellResult.java create mode 100644 echobase-domain/src/main/java/fr/ifremer/echobase/entities/ImportedSampleDataResult.java create mode 100644 echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/CheckFileException.java copy echobase-services/src/test/java/fr/ifremer/echobase/services/service/importdata/{VoyageResultsRegionCellImportServiceIT.java => VoyageResultsRegionCell_AllImportServiceIT.java} (87%) create mode 100644 echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/DownloadInputFile.java copy echobase-services/src/main/java/fr/ifremer/echobase/services/service/exportCoser/GenerateCoserMapException.java => echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/workingDb/DownloadExportFile.java (65%) copy echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/workingDb/{DownloadImportFile.java => DownloadFileSupport.java} (83%) create mode 100644 echobase-ui/src/main/webapp/WEB-INF/jsp/importData/importDataActionResult.jsp -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 9

branch feature/#8171 updated (2f07e9e -> e73b8f4)
by codelutin.com scm May 2, 2016

May 2, 2016

This is an automated email from the git hooks/post-receive script. New change to branch feature/#8171 in repository echobase. See https://gitlab.nuiton.org/codelutin/echobase.git from 2f07e9e correction de l'échappement des simples quotes adds e73b8f4 Fix voyage creation with ports No new revisions were added by this update. Summary of changes: .../ui/actions/removedata/AbstractRemoveDataServiceTest.java | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 0