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

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

01/01: fixes #6152: [CAPTURE] le nom du fichier resume .csv n'est pas explicite
by codelutin.com scm 24 Nov '14

24 Nov '14

This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository tutti. See http://git.codelutin.com/tutti.git 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 --- .../tutti/ui/swing/action/ExportCruiseForSumatraAction.java | 6 +++++- .../swing/action/ExportFishingOperationForSumatraAction.java | 12 ++++++++++-- 2 files changed, 15 insertions(+), 3 deletions(-) diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ExportCruiseForSumatraAction.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ExportCruiseForSumatraAction.java index 8c2ac16..2b2d7d0 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ExportCruiseForSumatraAction.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ExportCruiseForSumatraAction.java @@ -49,6 +49,8 @@ public class ExportCruiseForSumatraAction extends AbstractMainUITuttiAction { private static final Log log = LogFactory.getLog(ExportCruiseForSumatraAction.class); + private static final String EXPORT_FILE_NAME = "sumatra_%s_%s"; // sumatra_nom campagne - date du jour + protected File file; protected SumatraExportResult sumatraExportResult; @@ -75,9 +77,11 @@ public class ExportCruiseForSumatraAction extends AbstractMainUITuttiAction { if (doAction) { String date = DateUtil.formatDate(new Date(), "dd-MM-yyyy"); + String exportFilename = String.format(EXPORT_FILE_NAME, getDataContext().getCruise().getName(), date); + // choose file to export file = saveFile( - String.format("sumatra_%s_%s", getDataContext().getCruise().getName(), date), + exportFilename, "csv", t("tutti.exportCruiseCsv.title.choose.exportFile"), t("tutti.exportCruiseCsv.action.chooseFile"), diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ExportFishingOperationForSumatraAction.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ExportFishingOperationForSumatraAction.java index 3ae4c1d..db426a1 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ExportFishingOperationForSumatraAction.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ExportFishingOperationForSumatraAction.java @@ -52,6 +52,8 @@ public class ExportFishingOperationForSumatraAction extends AbstractTuttiAction< private static final Log log = LogFactory.getLog(ExportFishingOperationForSumatraAction.class); + private static final String EXPORT_FILE_NAME = "sumatra_%s_%s_%s_%s"; // sumatra_nom campagne_n° station_n° trait_date début trait.csv + protected File file; protected SumatraExportResult sumatraExportResult; @@ -88,10 +90,16 @@ public class ExportFishingOperationForSumatraAction extends AbstractTuttiAction< FishingOperation fishingOperation = getModel().getFishingOperation(); - String date = DateUtil.formatDate(new Date(), "dd-MM-yyyy"); + String date = DateUtil.formatDate(fishingOperation.getGearShootingStartDate(), "dd-MM-yyyy"); + String exportFilename = String.format(EXPORT_FILE_NAME, + getDataContext().getCruise().getName(), + fishingOperation.getStationNumber(), + fishingOperation.getFishingOperationNumber(), + date); + // choose file to export file = saveFile( - String.format("sumatra_%s_%s_%s", getDataContext().getCruise().getName(), fishingOperation.getId(), date), + exportFilename, "csv", t("tutti.exportFishingOperationCsv.title.choose.exportFile"), t("tutti.exportFishingOperationCsv.action.chooseFile"), -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 0

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

branch feature/6150 updated (7fdd8e7 -> 99295a2)
by codelutin.com scm 22 Nov '14

22 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 7fdd8e7 - reorganisation du paquetage pupitri - prise en compte du nombre de caisse (pour le rapport pupitri) new 99295a2 use short date format 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 99295a229c30bfa2a64847af52f660b00e2bf6b4 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Sat Nov 22 18:09:44 2014 +0100 use short date format Summary of changes: tutti-service/src/main/resources/ftl/pupitriReport_fr.ftl | 4 ++-- 1 file changed, 2 insertions(+), 2 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 (3e89c69 -> 7fdd8e7)
by codelutin.com scm 22 Nov '14

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

1 1

branch feature/6150 updated (1f0b7a1 -> 3e89c69)
by codelutin.com scm 22 Nov '14

22 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 1f0b7a1 Propose a l'utilisateur de consulter le rapport pupitri genere new 3e89c69 refs #6096 renommage variable + methodes 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 3e89c693696b9f3d0da740f46ffc6a6b04099e8e Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Sat Nov 22 15:55:23 2014 +0100 refs #6096 renommage variable + methodes Summary of changes: .../tutti/service/referential/ImportRequestResult.java | 14 +++----------- .../referential/ReferentialTemporaryGearService.java | 6 +++--- .../referential/ReferentialTemporaryPersonService.java | 6 +++--- .../referential/ReferentialTemporarySpeciesService.java | 6 +++--- .../referential/ReferentialTemporaryVesselService.java | 6 +++--- 5 files changed, 15 insertions(+), 23 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 1