branch develop updated (c1f5ca1 -> e62a6b5)
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 c1f5ca1 refs #6538 ajout des couleurs + mise en page adds 3cf2fbc start of #6575 adds 249cea2 Merge branches 'develop' and 'feature/6575' of https://git.codelutin.com/tutti into feature/6575 adds 47f83be add species code, name and vernacular name + catch comment adds e039703 Merge branch 'develop' of https://git.codelutin.com/tutti into feature/6575 adds fe84276 ajout des catégories adds 0a01441 mise en page du pdf new e62a6b5 fixes #6575 [ERGO] créer un rapport "espèces à confirmer" 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 e62a6b514f6b3ae8acaaa8745ae5e8a1098b42b1 Merge: c1f5ca1 0a01441 Author: Kevin Morin <morin@codelutin.com> Date: Fri Feb 6 17:51:00 2015 +0100 fixes #6575 [ERGO] créer un rapport "espèces à confirmer" Summary of changes: .../tutti/persistence/TuttiPersistenceImpl.java | 10 + .../persistence/TuttiPersistenceNoDbImpl.java | 10 + .../service/BenthosBatchPersistenceService.java | 10 + .../BenthosBatchPersistenceServiceImpl.java | 24 +++ .../service/SpeciesBatchPersistenceService.java | 10 + .../SpeciesBatchPersistenceServiceImpl.java | 24 +++ .../ifremer/tutti/service/PdfGeneratorService.java | 1 + .../ifremer/tutti/service/PersistenceService.java | 10 + .../tutti/service/export/ExportCatchContext.java | 40 ++-- .../ToConfirmReportBatchEntry.java} | 53 +++-- .../toconfirmreport/ToConfirmReportContext.java | 114 ++++++++++ .../toconfirmreport/ToConfirmReportOperation.java | 50 +++++ .../toconfirmreport/ToConfirmReportService.java | 231 +++++++++++++++++++++ .../resources/ftl/toConfirmSpeciesReport_fr.ftl | 191 +++++++++++++++++ .../src/main/filtered-resources/log4j.properties | 5 +- .../filtered-resources/tutti-help-fr.properties | 26 +-- .../fr/ifremer/tutti/ui/swing/TuttiUIContext.java | 5 + ... => SpeciesToConfirmReportForCruiseAction.java} | 42 ++-- .../tutti/ui/swing/content/home/SelectCruiseUI.css | 10 +- .../ui/swing/content/home/SelectCruiseUI.jaxx | 1 + .../resources/i18n/tutti-ui-swing_en_GB.properties | 5 + .../resources/i18n/tutti-ui-swing_fr_FR.properties | 5 + 22 files changed, 786 insertions(+), 91 deletions(-) copy tutti-service/src/main/java/fr/ifremer/tutti/service/export/{pdf/PdfExportBatchEntry.java => toconfirmreport/ToConfirmReportBatchEntry.java} (56%) create mode 100644 tutti-service/src/main/java/fr/ifremer/tutti/service/export/toconfirmreport/ToConfirmReportContext.java create mode 100644 tutti-service/src/main/java/fr/ifremer/tutti/service/export/toconfirmreport/ToConfirmReportOperation.java create mode 100644 tutti-service/src/main/java/fr/ifremer/tutti/service/export/toconfirmreport/ToConfirmReportService.java create mode 100644 tutti-service/src/main/resources/ftl/toConfirmSpeciesReport_fr.ftl copy tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/{SendCruiseReportAction.java => SpeciesToConfirmReportForCruiseAction.java} (63%) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
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 e62a6b514f6b3ae8acaaa8745ae5e8a1098b42b1 Merge: c1f5ca1 0a01441 Author: Kevin Morin <morin@codelutin.com> Date: Fri Feb 6 17:51:00 2015 +0100 fixes #6575 [ERGO] créer un rapport "espèces à confirmer" .../tutti/persistence/TuttiPersistenceImpl.java | 10 + .../persistence/TuttiPersistenceNoDbImpl.java | 10 + .../service/BenthosBatchPersistenceService.java | 10 + .../BenthosBatchPersistenceServiceImpl.java | 24 +++ .../service/SpeciesBatchPersistenceService.java | 10 + .../SpeciesBatchPersistenceServiceImpl.java | 24 +++ .../ifremer/tutti/service/PdfGeneratorService.java | 1 + .../ifremer/tutti/service/PersistenceService.java | 10 + .../tutti/service/export/ExportCatchContext.java | 40 ++-- .../toconfirmreport/ToConfirmReportBatchEntry.java | 92 ++++++++ .../toconfirmreport/ToConfirmReportContext.java | 114 ++++++++++ .../toconfirmreport/ToConfirmReportOperation.java | 50 +++++ .../toconfirmreport/ToConfirmReportService.java | 231 +++++++++++++++++++++ .../resources/ftl/toConfirmSpeciesReport_fr.ftl | 191 +++++++++++++++++ .../src/main/filtered-resources/log4j.properties | 5 +- .../filtered-resources/tutti-help-fr.properties | 26 +-- .../fr/ifremer/tutti/ui/swing/TuttiUIContext.java | 5 + .../SpeciesToConfirmReportForCruiseAction.java | 109 ++++++++++ .../tutti/ui/swing/content/home/SelectCruiseUI.css | 10 +- .../ui/swing/content/home/SelectCruiseUI.jaxx | 1 + .../resources/i18n/tutti-ui-swing_en_GB.properties | 5 + .../resources/i18n/tutti-ui-swing_fr_FR.properties | 5 + 22 files changed, 936 insertions(+), 47 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
participants (1)
-
codelutin.com scm