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@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@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@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@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@codelutin.com> Date: Wed May 4 11:31:27 2016 +0200 Utilisation ToPIA 3.1 commit bc5e510b7dac443a765e966334eca1feb8d4aac4 Author: Tony CHEMIT <chemit@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@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@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@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@codelutin.com>.