- Tutti-commits - mailman.cloud.codelutin.com

branch develop updated (1e1f975 -> ca954ab)
by codelutin.com scm 25 Nov '14

25 Nov '14

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(a)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(a)codelutin.com>.

1 1

branch feature/6150 updated (2fa05b1 -> 5e88001)
by codelutin.com scm 24 Nov '14

24 Nov '14

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 2fa05b1 fixes #6096 (ajout de trois lignes blanches en bas du tableau) new b460b2d refs #6150 new 5e88001 refs #6150 The 2 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 5e88001fbe30f808b8a5287a5a9d38e86b2a936e Author: Kevin Morin <morin(a)codelutin.com> Date: Mon Nov 24 19:11:08 2014 +0100 refs #6150 commit b460b2dc92debdf991ab9d410d06eb46f1abb10d Author: Kevin Morin <morin(a)codelutin.com> Date: Mon Nov 24 18:49:22 2014 +0100 refs #6150 Summary of changes: .../src/main/resources/ftl/pupitriReport_fr.ftl | 107 ++++++++++++--------- 1 file changed, 63 insertions(+), 44 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 2

branch feature/6150 updated (2c19b7c -> 2fa05b1)
by codelutin.com scm 24 Nov '14

24 Nov '14

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 2c19b7c refs #6150 new 2fa05b1 fixes #6096 (ajout de trois lignes blanches en bas du tableau) 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 2fa05b14e539d5f28e6655d8befa3d6a11e09cdd Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Mon Nov 24 18:01:42 2014 +0100 fixes #6096 (ajout de trois lignes blanches en bas du tableau) Summary of changes: .../src/main/resources/ftl/pupitriReport_fr.ftl | 36 ++++++++++++++++++++++ 1 file changed, 36 insertions(+) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 1

branch feature/6150 updated (f91164c -> 2c19b7c)
by codelutin.com scm 24 Nov '14

24 Nov '14

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 f91164c refs #6150 new 2c19b7c refs #6150 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 2c19b7c9df9a76c3ae080572721db263e71aeb00 Author: Kevin Morin <morin(a)codelutin.com> Date: Mon Nov 24 17:52:55 2014 +0100 refs #6150 Summary of changes: tutti-service/src/main/resources/ftl/pupitriReport_fr.ftl | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 1

branch develop updated (cb7b706 -> 1e1f975)
by codelutin.com scm 24 Nov '14

24 Nov '14

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 cb7b706 fixes #6152: [CAPTURE] le nom du fichier resume .csv n'est pas explicite new 1e1f975 fixes #6096 (amélioration du message lors que les références sont utilisées) 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 1e1f975122b46f4d2ca656f6daf5adb8e15e3e08 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Mon Nov 24 17:51:07 2014 +0100 fixes #6096 (amélioration du message lors que les références sont utilisées) Summary of changes: .../service/referential/ReferentialTemporaryGearService.java | 8 +++++++- .../service/referential/ReferentialTemporaryPersonService.java | 8 +++++++- .../service/referential/ReferentialTemporarySpeciesService.java | 8 +++++++- .../service/referential/ReferentialTemporaryVesselService.java | 9 ++++++++- .../src/main/resources/i18n/tutti-service_fr_FR.properties | 8 ++++---- 5 files changed, 33 insertions(+), 8 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 1

branch feature/6150 updated (5636692 -> f91164c)
by codelutin.com scm 24 Nov '14

24 Nov '14

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 5636692 sort rows (on sorted + species code), add sorted column, clean report new 2c5021a refs #6150 new f91164c refs #6150 The 2 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 f91164cc1920f5091fbe74d7acf156e9ceadc28b Author: Kevin Morin <morin(a)codelutin.com> Date: Mon Nov 24 17:44:17 2014 +0100 refs #6150 commit 2c5021a49aa3ce9c90dda24f33ef2fe138b4ab4f Author: Kevin Morin <morin(a)codelutin.com> Date: Mon Nov 24 17:30:25 2014 +0100 refs #6150 Summary of changes: .../src/main/resources/ftl/pupitriReport_fr.ftl | 70 +++++++++++++--------- 1 file changed, 42 insertions(+), 28 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 2

branch feature/6150 updated (f0fc16b -> 5636692)
by codelutin.com scm 24 Nov '14

24 Nov '14

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 f0fc16b refs #6150 add checkboxes and table highlighter new 5636692 sort rows (on sorted + species code), add sorted column, clean report 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 56366922e8342c7ee7b57db3304a2d00ec26e8bc Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Mon Nov 24 17:27:09 2014 +0100 sort rows (on sorted + species code), add sorted column, clean report Summary of changes: .../service/pupitri/PupitriImportService.java | 10 +++------ .../pupitri/report/PupitriImportReportModel.java | 24 ++++++++++++++++++++ .../pupitri/report/PupitriImportReportRow.java | 8 +++++++ .../src/main/resources/ftl/pupitriReport_fr.ftl | 19 ++++++++-------- .../pupitri/PupitriImportServiceEvo6149Test.java | 26 ++++++++++++++++++---- .../src/test/resources/pupitri/evo-6149.car | 4 +++- 6 files changed, 69 insertions(+), 22 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 1

branch feature/6150 updated (a543cdc -> f0fc16b)
by codelutin.com scm 24 Nov '14

24 Nov '14

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 a543cdc - ajout des espèces non importées dans le rapport - generer le rapport pdf avant le traitement du melag new 0ad0f0a refs #6150 new f0fc16b refs #6150 add checkboxes and table highlighter The 2 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 f0fc16bfeac03944c27f8ce5ff92fc5f51df4d5f Author: Kevin Morin <morin(a)codelutin.com> Date: Mon Nov 24 14:55:49 2014 +0100 refs #6150 add checkboxes and table highlighter commit 0ad0f0a271682cf3da52df5ea4329d675dbb8277 Author: Kevin Morin <morin(a)codelutin.com> Date: Mon Nov 24 14:17:23 2014 +0100 refs #6150 Summary of changes: .../java/fr/ifremer/tutti/service/PdfGeneratorService.java | 2 ++ tutti-service/src/main/resources/ftl/pupitriReport_fr.ftl | 13 ++++++++++++- .../src/main/resources/i18n/tutti-service_en_GB.properties | 1 + .../src/main/resources/i18n/tutti-service_fr_FR.properties | 1 + .../service/pupitri/PupitriImportServiceEvo6149Test.java | 8 ++++++++ 5 files changed, 24 insertions(+), 1 deletion(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 2

branch develop updated (51ecc0c -> cb7b706)
by codelutin.com scm 24 Nov '14

24 Nov '14

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 51ecc0c fixes #6147 fixes #6149 Merge branch 'feature/6147' into develop new cb7b706 fixes #6152: [CAPTURE] le nom du fichier resume .csv n'est pas explicite 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 cb7b706139a1450fd6e74d26f7d6eeb1cf8f1b4e Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Mon Nov 24 11:24:26 2014 +0100 fixes #6152: [CAPTURE] le nom du fichier resume .csv n'est pas explicite Summary of changes: .../tutti/ui/swing/action/ExportCruiseForSumatraAction.java | 6 +++++- .../swing/action/ExportFishingOperationForSumatraAction.java | 12 ++++++++++-- 2 files changed, 15 insertions(+), 3 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 0

branch feature/6150 updated (99295a2 -> a543cdc)
by codelutin.com scm 24 Nov '14

24 Nov '14

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 99295a2 use short date format new a543cdc - ajout des espèces non importées dans le rapport - generer le rapport pdf avant le traitement du melag 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 a543cdcc0e1157e753d6bb582d2d88cc25e0333a Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Mon Nov 24 09:50:53 2014 +0100 - ajout des espèces non importées dans le rapport - generer le rapport pdf avant le traitement du melag Summary of changes: .../fr/ifremer/tutti/service/pupitri/PupitriImportService.java | 6 +++--- .../tutti/service/pupitri/report/PupitriImportReportModel.java | 5 +++++ tutti-service/src/main/resources/ftl/pupitriReport_fr.ftl | 7 +++++++ 3 files changed, 15 insertions(+), 3 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 1