This is an automated email from the git hooks/post-receive script. New change to branch feature/6150 in repository tutti. See http://git.codelutin.com/tutti.git from 3e89c69 refs #6096 renommage variable + methodes new 7fdd8e7 - reorganisation du paquetage pupitri - prise en compte du nombre de caisse (pour le rapport pupitri) The 1 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 7fdd8e731c5991b7f5b3e7385b0a71f226dd3274 Author: Tony CHEMIT <chemit@codelutin.com> Date: Sat Nov 22 17:58:42 2014 +0100 - reorganisation du paquetage pupitri - prise en compte du nombre de caisse (pour le rapport pupitri) Summary of changes: .../java/fr/ifremer/tutti/TuttiConfiguration.java | 6 +- .../fr/ifremer/tutti/service/pupitri/BoxType.java | 33 +++ .../pupitri/CarrouselImportRequestResult.java | 16 +- .../tutti/service/pupitri/PupitriCatch.java | 168 ------------ .../service/pupitri/PupitriExportService.java | 2 + .../tutti/service/pupitri/PupitriImportResult.java | 22 +- .../service/pupitri/PupitriImportService.java | 244 ++++-------------- .../tutti/service/pupitri/PupitriSignContext.java | 65 +++++ .../service/pupitri/PupitriSpeciesContext.java | 285 +++++++++++++++++++++ .../service/pupitri/{ => csv}/CarrouselRow.java | 14 +- .../pupitri/{ => csv}/CarrouselRowModel.java | 23 +- .../service/pupitri/{ => csv}/SpeciesRow.java | 2 +- .../service/pupitri/{ => csv}/SpeciesRowModel.java | 2 +- .../tutti/service/pupitri/{ => csv}/TrunkRow.java | 3 +- .../service/pupitri/{ => csv}/TrunkRowModel.java | 3 +- .../{ => report}/PupitriImportReportModel.java | 77 +----- .../pupitri/report/PupitriImportReportRow.java | 76 ++++++ .../src/main/resources/ftl/pupitriReport_fr.ftl | 77 ++++-- 18 files changed, 625 insertions(+), 493 deletions(-) create mode 100644 tutti-service/src/main/java/fr/ifremer/tutti/service/pupitri/BoxType.java delete mode 100644 tutti-service/src/main/java/fr/ifremer/tutti/service/pupitri/PupitriCatch.java create mode 100644 tutti-service/src/main/java/fr/ifremer/tutti/service/pupitri/PupitriSignContext.java create mode 100644 tutti-service/src/main/java/fr/ifremer/tutti/service/pupitri/PupitriSpeciesContext.java rename tutti-service/src/main/java/fr/ifremer/tutti/service/pupitri/{ => csv}/CarrouselRow.java (90%) rename tutti-service/src/main/java/fr/ifremer/tutti/service/pupitri/{ => csv}/CarrouselRowModel.java (74%) rename tutti-service/src/main/java/fr/ifremer/tutti/service/pupitri/{ => csv}/SpeciesRow.java (98%) rename tutti-service/src/main/java/fr/ifremer/tutti/service/pupitri/{ => csv}/SpeciesRowModel.java (96%) rename tutti-service/src/main/java/fr/ifremer/tutti/service/pupitri/{ => csv}/TrunkRow.java (96%) rename tutti-service/src/main/java/fr/ifremer/tutti/service/pupitri/{ => csv}/TrunkRowModel.java (95%) rename tutti-service/src/main/java/fr/ifremer/tutti/service/pupitri/{ => report}/PupitriImportReportModel.java (61%) create mode 100644 tutti-service/src/main/java/fr/ifremer/tutti/service/pupitri/report/PupitriImportReportRow.java -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.