This is an automated email from the git hooks/post-receive script. New change to branch develop in repository tutti. See http://git.codelutin.com/tutti.git from c2d4a8a fixes #6822: [IMPORT GENERIQUE] Définir les différentes statégies d'import possible Merge branch 'feature/6822' into develop new afa33f9 mise à jour des données de test de l'import générique new cf014cd mise en place du rapport d'import + amélioration API d'import new 56faee6 amélioration des rapports d'import générique new 0ce79ed fix i18n new 7dedfd4 fixes #6698: [IMPORT GENERIQUE] Rapport d’import transmissible par mail Merge branch 'feature/6698' into develop 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 7dedfd49b7bf4ca0b38b46f06aab4b2ca6d1564c Merge: c2d4a8a 0ce79ed Author: Tony CHEMIT <chemit@codelutin.com> Date: Wed Apr 1 23:13:07 2015 +0200 fixes #6698: [IMPORT GENERIQUE] Rapport d’import transmissible par mail Merge branch 'feature/6698' into develop commit 0ce79eddbe68d62af25d9780f7cc74cb16232aa0 Author: Tony CHEMIT <chemit@codelutin.com> Date: Wed Apr 1 23:12:59 2015 +0200 fix i18n commit 56faee65c8e60b73ef283cc3f326d46c3d13a58e Author: Tony CHEMIT <chemit@codelutin.com> Date: Wed Apr 1 22:15:20 2015 +0200 amélioration des rapports d'import générique commit cf014cddd57f570b0c06badc27c2f42f57ac74fe Author: Tony CHEMIT <chemit@codelutin.com> Date: Wed Apr 1 19:49:22 2015 +0200 mise en place du rapport d'import + amélioration API d'import commit afa33f9d1f1898d94baf5c93bf0779abae238ab0 Author: Tony CHEMIT <chemit@codelutin.com> Date: Wed Apr 1 19:45:10 2015 +0200 mise à jour des données de test de l'import générique Summary of changes: .../entities/data/FishingOperations.java | 2 +- .../genericformat/GenericFormatContextSupport.java | 8 +- .../GenericFormatImportCruiseContext.java | 18 +- .../GenericFormatImportCruiseResult.java | 69 +- .../GenericFormatImportOperationResult.java | 78 +- .../genericformat/GenericFormatImportResult.java | 69 +- .../genericformat/GenericFormatResultSupport.java | 10 +- .../GenericFormatValidateFileContext.java | 2 +- .../GenericformatImportPersistenceHelper.java | 15 +- .../importactions/DoCheckWeightAction.java | 2 +- .../importactions/DoCleanWeightAction.java | 2 +- .../importactions/ImportAccidentalCatchAction.java | 2 +- .../importactions/ImportCatchAction.java | 4 +- .../ImportIndividualObservationAction.java | 2 +- .../importactions/ImportMarineLitterAction.java | 2 +- .../importactions/ImportOperationAction.java | 24 +- .../importactions/ImportParameterAction.java | 2 +- .../resources/ftl/genericFormatImportReport_fr.ftl | 281 ++++--- .../ftl/genericFormatValidateReport_fr.ftl | 19 +- .../resources/i18n/tutti-service_fr_FR.properties | 2 +- .../GenericFormatImportServiceTest.java | 16 +- .../genericFormat/default/attachments.csv | 1 + .../test/resources/genericFormat/default/catch.csv | 866 ++++++++++----------- .../genericFormat/default/marineLitter.csv | 8 +- .../resources/genericFormat/default/operation.csv | 6 +- .../resources/genericFormat/default/survey.csv | 4 +- .../resources/genericFormat/empty/attachments.csv | 1 + .../test/resources/genericFormat/empty/catch.csv | 2 +- .../resources/genericFormat/empty/marineLitter.csv | 2 +- .../resources/genericFormat/empty/operation.csv | 2 +- .../test/resources/genericFormat/empty/survey.csv | 2 +- 31 files changed, 836 insertions(+), 687 deletions(-) create mode 100644 tutti-service/src/test/resources/genericFormat/default/attachments.csv create mode 100644 tutti-service/src/test/resources/genericFormat/empty/attachments.csv -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.