branch feature/6150 updated (a543cdc -> f0fc16b)
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@codelutin.com> Date: Mon Nov 24 14:55:49 2014 +0100 refs #6150 add checkboxes and table highlighter commit 0ad0f0a271682cf3da52df5ea4329d675dbb8277 Author: Kevin Morin <morin@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@codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch feature/6150 in repository tutti. See http://git.codelutin.com/tutti.git commit 0ad0f0a271682cf3da52df5ea4329d675dbb8277 Author: Kevin Morin <morin@codelutin.com> Date: Mon Nov 24 14:17:23 2014 +0100 refs #6150 --- .../src/main/resources/i18n/tutti-service_en_GB.properties | 1 + .../src/main/resources/i18n/tutti-service_fr_FR.properties | 1 + .../tutti/service/pupitri/PupitriImportServiceEvo6149Test.java | 8 ++++++++ 3 files changed, 10 insertions(+) diff --git a/tutti-service/src/main/resources/i18n/tutti-service_en_GB.properties b/tutti-service/src/main/resources/i18n/tutti-service_en_GB.properties index 929293e..67c40d7 100644 --- a/tutti-service/src/main/resources/i18n/tutti-service_en_GB.properties +++ b/tutti-service/src/main/resources/i18n/tutti-service_en_GB.properties @@ -92,6 +92,7 @@ tutti.service.exportCruise.exportOperations= tutti.service.exportCruise.exportParameters= tutti.service.exportCruise.exportSpecies= tutti.service.exportCruise.exportSurvey= +tutti.service.exportPdf.error= tutti.service.exportSumatra.error.species.null= tutti.service.exportSumatra.error.station.null= tutti.service.exportSumatra.header.averageSize= diff --git a/tutti-service/src/main/resources/i18n/tutti-service_fr_FR.properties b/tutti-service/src/main/resources/i18n/tutti-service_fr_FR.properties index dd6d0ad..5bf4282 100644 --- a/tutti-service/src/main/resources/i18n/tutti-service_fr_FR.properties +++ b/tutti-service/src/main/resources/i18n/tutti-service_fr_FR.properties @@ -84,6 +84,7 @@ tutti.service.exportCruise.exportOperations=<html>Export du fichier <strong>oper tutti.service.exportCruise.exportParameters=<html>Export du fichier <strong>parameters.csv</strong> pour la campagne %s</html> tutti.service.exportCruise.exportSpecies=<html>Export du fichier <strong>species.csv</strong> pour la campagne %s</html> tutti.service.exportCruise.exportSurvey=<html>Export du fichier <strong>survey.csv</strong> pour la campagne %s</html> +tutti.service.exportPdf.error= tutti.service.exportSumatra.error.species.null=L'espèce est nulle tutti.service.exportSumatra.error.station.null=Le trait est nul tutti.service.exportSumatra.header.averageSize=longueurmoy diff --git a/tutti-service/src/test/java/fr/ifremer/tutti/service/pupitri/PupitriImportServiceEvo6149Test.java b/tutti-service/src/test/java/fr/ifremer/tutti/service/pupitri/PupitriImportServiceEvo6149Test.java index d4cba18..4ba8490 100644 --- a/tutti-service/src/test/java/fr/ifremer/tutti/service/pupitri/PupitriImportServiceEvo6149Test.java +++ b/tutti-service/src/test/java/fr/ifremer/tutti/service/pupitri/PupitriImportServiceEvo6149Test.java @@ -13,6 +13,7 @@ import fr.ifremer.tutti.persistence.entities.data.SpeciesAbleBatchs; import fr.ifremer.tutti.persistence.entities.data.SpeciesBatch; import fr.ifremer.tutti.persistence.entities.protocol.TuttiProtocol; import fr.ifremer.tutti.persistence.entities.referential.Species; +import org.apache.commons.io.FileUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.junit.Assert; @@ -59,6 +60,13 @@ public class PupitriImportServiceEvo6149Test extends PupitryImportServiceTestSup Assert.assertNotNull(notImportedSpeciesIds); Assert.assertTrue(notImportedSpeciesIds.isEmpty()); + // copy result file into temp directory to check it after the test ends + String reportAttachmentId = pupitriImportResult.getReportAttachmentId(); + File attachmentFile = persistenceService.getAttachmentFile(reportAttachmentId); + File destFile = new File(FileUtils.getTempDirectory(), pupitriImportResult.getReportAttachmentFilename()); + FileUtils.copyFile(attachmentFile, destFile); + log.info("Generated report copied to " + destFile.getPath()); + BatchContainer<SpeciesBatch> rootSpeciesBatchAfter = persistenceService.getRootSpeciesBatch(operation.getId(), false); Assert.assertEquals(2, rootSpeciesBatchAfter.sizeChildren()); -- 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 feature/6150 in repository tutti. See http://git.codelutin.com/tutti.git commit f0fc16bfeac03944c27f8ce5ff92fc5f51df4d5f Author: Kevin Morin <morin@codelutin.com> Date: Mon Nov 24 14:55:49 2014 +0100 refs #6150 add checkboxes and table highlighter --- .../java/fr/ifremer/tutti/service/PdfGeneratorService.java | 2 ++ tutti-service/src/main/resources/ftl/pupitriReport_fr.ftl | 13 ++++++++++++- 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/tutti-service/src/main/java/fr/ifremer/tutti/service/PdfGeneratorService.java b/tutti-service/src/main/java/fr/ifremer/tutti/service/PdfGeneratorService.java index ab1d6f1..c88c869 100644 --- a/tutti-service/src/main/java/fr/ifremer/tutti/service/PdfGeneratorService.java +++ b/tutti-service/src/main/java/fr/ifremer/tutti/service/PdfGeneratorService.java @@ -1,11 +1,13 @@ package fr.ifremer.tutti.service; +import com.itextpdf.text.PageSize; import freemarker.cache.ClassTemplateLoader; import freemarker.ext.beans.BeansWrapper; import freemarker.template.Configuration; import freemarker.template.Template; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import org.eclipse.birt.report.engine.emitter.excel.layout.Page; import org.nuiton.jaxx.application.ApplicationTechnicalException; import org.xhtmlrenderer.pdf.ITextRenderer; diff --git a/tutti-service/src/main/resources/ftl/pupitriReport_fr.ftl b/tutti-service/src/main/resources/ftl/pupitriReport_fr.ftl index 6524380..ef30049 100644 --- a/tutti-service/src/main/resources/ftl/pupitriReport_fr.ftl +++ b/tutti-service/src/main/resources/ftl/pupitriReport_fr.ftl @@ -23,6 +23,8 @@ <head> <style type="text/css"> + @page { size: A4 landscape;} + <#assign blueColor="#000080"> h1, h4 { @@ -38,6 +40,7 @@ td, th { padding-right: 10pt; + vertical-align: top; } td.number { @@ -48,6 +51,10 @@ text-align: center; } + tbody > tr:nth-child(odd) { + background-color: #ddd; + } + .operationInfo { font-weight: bold; } @@ -112,6 +119,7 @@ <h4>Liste du tri "Vrac à trier"</h4> <table> + <thead> <tr> <th></th> <th>Espèce</th> @@ -123,10 +131,12 @@ <th>Petite</th> <th>Grande</th> </tr> + </thead> + <tbody> <#list rows as row> <tr> - <td></td> + <td><input type="checkbox"/></td> <td>${row.speciesCode}</td> <td><em>${row.speciesName}</em></td> <td><#if row.speciesVernucalCode??>${row.speciesVernucalCode}</#if></td> @@ -137,6 +147,7 @@ <td class="number">${row.nbBigBox}</td> </tr> </#list> + </tbody> </table> <h4>Espèces non importées</h4> -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
participants (1)
-
codelutin.com scm