This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository echobase. See https://gitlab.nuiton.org/codelutin/echobase.git 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 .../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 | 34 +++---- ...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(+), 622 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.