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 8370139 fixes #6891: [TECH] erreur à la réouverture de l'écran d'import Merge branch 'feature/6891' into develop new 68186cd suppression des référentiels temporaires importés pendant la validation de l'import new f707a8c fixes #6894: [IMPORT GENERIQUE] Laisser la base propre après validation des données Merge branch 'feature/6894' into develop new 0b53b62 tri des campagnes et traits new a6faeb2 suppression des methodes de creations de configuration d'export new 3f5d777 fixes #6897: [IMPORT EXPORT GENERIQUE] Utiliser un ordre sur les traits Merge branch 'feature/6897' into develop new 0d540e1 amélioration du rapport de validation new 4170313 fixes #6893: [IMPORT GENERIQUE] Revoir le rapport de validation Merge branch 'feature/6893' into develop new 2952a24 amélioration du rapport d'import new 0aa0a5b fixes #6896: [IMPORT GENERIQUE] Revoir le rapport d'import Merge branch 'feature/6896' 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 0aa0a5b4d645e06f8415319711d9365fef35446d Merge: 4170313 2952a24 Author: Tony CHEMIT <chemit@codelutin.com> Date: Fri Apr 3 21:02:21 2015 +0200 fixes #6896: [IMPORT GENERIQUE] Revoir le rapport d'import Merge branch 'feature/6896' into develop commit 2952a24b4029287aaa9f62336b7194668043d91a Author: Tony CHEMIT <chemit@codelutin.com> Date: Fri Apr 3 21:02:15 2015 +0200 amélioration du rapport d'import commit 4170313370f429561261758e41c83cbe4f0b4b4d Merge: 3f5d777 0d540e1 Author: Tony CHEMIT <chemit@codelutin.com> Date: Fri Apr 3 21:01:36 2015 +0200 fixes #6893: [IMPORT GENERIQUE] Revoir le rapport de validation Merge branch 'feature/6893' into develop commit 0d540e1f97004a7a22c74b4233a7bfb3c5c638f3 Author: Tony CHEMIT <chemit@codelutin.com> Date: Fri Apr 3 21:00:56 2015 +0200 amélioration du rapport de validation commit 3f5d7775087f4bc749dde96d9dd10452c046b199 Merge: f707a8c a6faeb2 Author: Tony CHEMIT <chemit@codelutin.com> Date: Fri Apr 3 18:31:06 2015 +0200 fixes #6897: [IMPORT EXPORT GENERIQUE] Utiliser un ordre sur les traits Merge branch 'feature/6897' into develop commit a6faeb2cc1bfef659b5618b7009c82db6593b9e4 Author: Tony CHEMIT <chemit@codelutin.com> Date: Fri Apr 3 18:30:25 2015 +0200 suppression des methodes de creations de configuration d'export commit 0b53b62d7310d307f22021613cf020765ee27845 Author: Tony CHEMIT <chemit@codelutin.com> Date: Fri Apr 3 18:30:01 2015 +0200 tri des campagnes et traits commit f707a8c14695b7621e9cc6adb1e7b0db737ed489 Merge: 8370139 68186cd Author: Tony CHEMIT <chemit@codelutin.com> Date: Fri Apr 3 16:34:54 2015 +0200 fixes #6894: [IMPORT GENERIQUE] Laisser la base propre après validation des données Merge branch 'feature/6894' into develop commit 68186cdae134cf92827fce376fab2d14040c1d5f Author: Tony CHEMIT <chemit@codelutin.com> Date: Fri Apr 3 16:34:38 2015 +0200 suppression des référentiels temporaires importés pendant la validation de l'import Summary of changes: .../tutti/persistence/TuttiPersistenceImpl.java | 9 +- .../tutti/persistence/entities/data/Cruises.java | 15 ++ .../entities/data/FishingOperations.java | 38 +++++ .../entities/data/SpeciesAbleBatchs.java | 11 ++ .../persistence/entities/referential/Speciess.java | 7 + .../tutti/persistence/model/ProgramDataModel.java | 12 +- .../genericformat/GenericFormatContextSupport.java | 26 ++++ .../genericformat/GenericFormatExportService.java | 62 -------- .../GenericFormatImportCruiseContext.java | 16 ++ .../GenericFormatImportCruiseResult.java | 10 +- .../GenericFormatImportOperationContext.java | 19 +++ .../GenericFormatImportOperationResult.java | 42 +----- .../genericformat/GenericFormatImportResult.java | 2 +- .../GenericFormatReferentialImportResult.java | 5 + .../genericformat/GenericFormatResultSupport.java | 5 + .../GenericFormatValidateFileContext.java | 4 +- .../GenericFormatValidateFileResult.java | 7 + .../importactions/RestoreAfterValidateAction.java | 132 ++++++++++++++-- .../service/report/ReportGenerationService.java | 29 +++- .../resources/ftl/genericFormatImportReport_fr.ftl | 167 +++++++++++++-------- .../ftl/genericFormatValidateReport_fr.ftl | 86 ++++++++--- .../GenericFormatExportServiceAno5804Test.java | 14 +- .../GenericFormatExportServiceTest.java | 27 +++- .../GenericFormatImportServiceTest.java | 14 +- .../GenericFormatImportServiceValidTest.java | 13 ++ 25 files changed, 560 insertions(+), 212 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.