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>.