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 1e1f975 fixes #6096 (amélioration du message lors que les références sont utilisées) adds b9613b5 refs #6149 rename test adds 9fcf63e - ajout d'un service de generation de pdf (utilisation pour le raport des captures) - debut de generation du rapport pupitri adds 1f0b7a1 Propose a l'utilisateur de consulter le rapport pupitri genere adds 3e89c69 refs #6096 renommage variable + methodes adds 7fdd8e7 - reorganisation du paquetage pupitri - prise en compte du nombre de caisse (pour le rapport pupitri) adds 99295a2 use short date format adds a543cdc - ajout des espèces non importées dans le rapport - generer le rapport pdf avant le traitement du melag adds 0ad0f0a refs #6150 adds f0fc16b refs #6150 add checkboxes and table highlighter adds 5636692 sort rows (on sorted + species code), add sorted column, clean report adds 2c5021a refs #6150 adds f91164c refs #6150 adds 2c19b7c refs #6150 adds 2fa05b1 fixes #6096 (ajout de trois lignes blanches en bas du tableau) adds b460b2d refs #6150 adds 5e88001 refs #6150 new ca954ab fixes #6150 Merge branch 'feature/6150' into develop 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 ca954ab82973660aea4e3cd78865dfd82bf38641 Merge: 1e1f975 5e88001 Author: Tony CHEMIT <chemit@codelutin.com> Date: Tue Nov 25 08:27:27 2014 +0100 fixes #6150 Merge branch 'feature/6150' into develop Summary of changes: .../java/fr/ifremer/tutti/TuttiConfiguration.java | 6 +- .../ifremer/tutti/service/PdfGeneratorService.java | 84 +++++ .../export/pdf/CatchesPdfExportService.java | 90 +++--- .../fr/ifremer/tutti/service/pupitri/BoxType.java | 33 ++ .../pupitri/CarrouselImportRequestResult.java | 64 +++- .../tutti/service/pupitri/PupitriCatch.java | 168 ---------- .../service/pupitri/PupitriExportService.java | 2 + .../tutti/service/pupitri/PupitriImportResult.java | 124 +++++--- .../service/pupitri/PupitriImportService.java | 354 +++++++++------------ .../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 +- .../pupitri/report/PupitriImportReportModel.java | 126 ++++++++ .../pupitri/report/PupitriImportReportRow.java | 84 +++++ .../service/referential/ImportRequestResult.java | 14 +- .../ReferentialTemporaryGearService.java | 6 +- .../ReferentialTemporaryPersonService.java | 6 +- .../ReferentialTemporarySpeciesService.java | 6 +- .../ReferentialTemporaryVesselService.java | 6 +- .../src/main/resources/ftl/pupitriReport_fr.ftl | 234 ++++++++++++++ .../resources/i18n/tutti-service_en_GB.properties | 4 + .../resources/i18n/tutti-service_fr_FR.properties | 7 +- ...9.java => PupitriImportServiceEvo6149Test.java} | 36 ++- .../src/test/resources/pupitri/evo-6149.car | 4 +- .../tutti/ui/swing/action/ImportPupitriAction.java | 37 +++ .../ifremer/tutti/ui/swing/util/TuttiUIUtil.java | 14 + .../util/attachment/AttachmentEditorUIHandler.java | 10 +- .../resources/i18n/tutti-ui-swing_en_GB.properties | 4 + .../resources/i18n/tutti-ui-swing_fr_FR.properties | 4 + 34 files changed, 1395 insertions(+), 529 deletions(-) create mode 100644 tutti-service/src/main/java/fr/ifremer/tutti/service/PdfGeneratorService.java 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%) create mode 100644 tutti-service/src/main/java/fr/ifremer/tutti/service/pupitri/report/PupitriImportReportModel.java create mode 100644 tutti-service/src/main/java/fr/ifremer/tutti/service/pupitri/report/PupitriImportReportRow.java create mode 100644 tutti-service/src/main/resources/ftl/pupitriReport_fr.ftl rename tutti-service/src/test/java/fr/ifremer/tutti/service/pupitri/{PupitriImportServiceEvo6149.java => PupitriImportServiceEvo6149Test.java} (80%) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.