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 3318653 fixes #6146: [CAPTURE] Pouvoir effectuer du melag sur un lot catégorisé (centrage des fenetres) new 7de70d3 reecriture de l'import pupitri pour mieux le gerer new fd9f6d3 les tests d'import pupitri refonctionnent new f742ba8 - ajout du commentaire de melag - ajout règle metier lors de l'import du melag pour changer en poids petit si aussi un poid G trouve new 51e9b2f amelioration du code d'import pupitri + ajout d'un test pour la fonctionnalite #6149 new 51ecc0c fixes #6147 fixes #6149 Merge branch 'feature/6147' 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 51ecc0c7ff9735f6b198e7d269ec9474d4bb20a0 Merge: 3318653 51e9b2f Author: Tony CHEMIT <chemit@codelutin.com> Date: Fri Nov 21 18:37:31 2014 +0100 fixes #6147 fixes #6149 Merge branch 'feature/6147' into develop commit 51e9b2fa3a92c5be9d6afd0ec61dd0de3eb0413f Author: Tony CHEMIT <chemit@codelutin.com> Date: Fri Nov 21 18:36:50 2014 +0100 amelioration du code d'import pupitri + ajout d'un test pour la fonctionnalite #6149 commit f742ba87cbe7e01af617911670dbfcb49d2d30bb Author: Tony CHEMIT <chemit@codelutin.com> Date: Fri Nov 21 18:00:02 2014 +0100 - ajout du commentaire de melag - ajout règle metier lors de l'import du melag pour changer en poids petit si aussi un poid G trouve commit fd9f6d3f6b2f90b6c68c213d779c8f2b1d96689a Author: Tony CHEMIT <chemit@codelutin.com> Date: Fri Nov 21 16:19:30 2014 +0100 les tests d'import pupitri refonctionnent commit 7de70d388fa024f52b8cd269ef3a3928a21cbb0a Author: Tony CHEMIT <chemit@codelutin.com> Date: Fri Nov 21 16:19:00 2014 +0100 reecriture de l'import pupitri pour mieux le gerer Summary of changes: .../pupitri/CarrouselImportRequestResult.java | 83 ++++++ .../tutti/service/pupitri/PupitriCatch.java | 27 +- .../tutti/service/pupitri/PupitriImportResult.java | 194 ++++++++------ .../service/pupitri/PupitriImportService.java | 298 ++++++++++++++------- .../resources/i18n/tutti-service_en_GB.properties | 1 - .../resources/i18n/tutti-service_fr_FR.properties | 4 +- .../pupitri/PupitriImportServiceAno3898Test.java | 58 +--- .../pupitri/PupitriImportServiceAno5032Test.java | 60 +---- .../pupitri/PupitriImportServiceAno5079Test.java | 57 +--- .../pupitri/PupitriImportServiceEvo5060Test.java | 56 +--- .../pupitri/PupitriImportServiceEvo5062Test.java | 56 +--- .../pupitri/PupitriImportServiceEvo6149.java | 153 +++++++++++ .../service/pupitri/PupitriImportServiceTest.java | 68 ++--- .../pupitri/PupitryImportServiceTestSupport.java | 53 ++++ .../src/test/resources/pupitri/evo-6149.car | 6 + .../pupitri/{evo-5060.tnk => evo-6149.tnk} | 0 ...o-5062.tuttiProtocol => evo-6149.tuttiProtocol} | 0 17 files changed, 705 insertions(+), 469 deletions(-) create mode 100644 tutti-service/src/main/java/fr/ifremer/tutti/service/pupitri/CarrouselImportRequestResult.java create mode 100644 tutti-service/src/test/java/fr/ifremer/tutti/service/pupitri/PupitriImportServiceEvo6149.java create mode 100644 tutti-service/src/test/java/fr/ifremer/tutti/service/pupitri/PupitryImportServiceTestSupport.java create mode 100644 tutti-service/src/test/resources/pupitri/evo-6149.car copy tutti-service/src/test/resources/pupitri/{evo-5060.tnk => evo-6149.tnk} (100%) copy tutti-service/src/test/resources/pupitri/{evo-5062.tuttiProtocol => evo-6149.tuttiProtocol} (100%) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.