branch feature/6150 updated (5636692 -> f91164c)
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@codelutin.com> Date: Mon Nov 24 17:44:17 2014 +0100 refs #6150 commit 2c5021a49aa3ce9c90dda24f33ef2fe138b4ab4f Author: Kevin Morin <morin@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@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 2c5021a49aa3ce9c90dda24f33ef2fe138b4ab4f Author: Kevin Morin <morin@codelutin.com> Date: Mon Nov 24 17:30:25 2014 +0100 refs #6150 --- .../src/main/resources/ftl/pupitriReport_fr.ftl | 68 +++++++++++++--------- 1 file changed, 41 insertions(+), 27 deletions(-) diff --git a/tutti-service/src/main/resources/ftl/pupitriReport_fr.ftl b/tutti-service/src/main/resources/ftl/pupitriReport_fr.ftl index a45d7ca..06554da 100644 --- a/tutti-service/src/main/resources/ftl/pupitriReport_fr.ftl +++ b/tutti-service/src/main/resources/ftl/pupitriReport_fr.ftl @@ -26,6 +26,7 @@ @page { size: A4 landscape;} <#assign blueColor="#000080"> + <#assign lightGrayColor="#ddd"> h1, h4 { color: ${blueColor}; @@ -51,8 +52,8 @@ text-align: center; } - tbody > tr:nth-child(odd) { - background-color: #ddd; + .alternateRows > tr:nth-child(odd) { + background-color: ${lightGrayColor}; } .operationInfo { @@ -67,6 +68,19 @@ margin-right: 50pt; } + .center { + margin: auto; + } + + .bordered { + border: 1px solid black; + border-collapse: collapse; + } + + .bordered tr :nth-child(3) { + border-right: 1px solid black; + } + </style> </head> <body> @@ -84,34 +98,34 @@ </p> <hr/> -<table> +<table class="center bordered"> <thead> - <tr> - <th colspan="3" class="text">Balance Trémie</th> - <th colspan="3" class="text">Balance Carrousel</th> - </tr> - <tr> - <th class="text">Trié</th> - <th class="text">Non trié</th> - <th class="text">Total</th> - <th class="text">Vrac</th> - <th class="text">Hors vrac</th> - <th class="text">Total</th> - </tr> + <tr> + <th colspan="3" class="text">Balance Trémie</th> + <th colspan="3" class="text">Balance Carrousel</th> + </tr> + <tr> + <th class="text">Trié</th> + <th class="text">Non trié</th> + <th class="text">Total</th> + <th class="text">Vrac</th> + <th class="text">Hors vrac</th> + <th class="text">Total</th> + </tr> </thead> - <tr> - <td class="number"><#if trunkSortedWeight??>${trunkSortedWeight?string("0.00")}</#if></td> - <td class="number"><#if trunkRejectedWeight??>${trunkRejectedWeight?string("")}</#if></td> - <td class="number"><#if trunkTotalWeight??>${trunkTotalWeight?string("0.00")}</#if></td> - <td class="number"><#if carrouselSortedWeight??>${carrouselSortedWeight?string("0.00")}</#if></td> - <td class="number"><#if carrouselUnsortedWeight??>${carrouselUnsortedWeight?string("")}</#if></td> - <td class="number"><#if carrouselTotalWeight??>${carrouselTotalWeight?string("0.00")}</#if></td> - </tr> + <tbody> + <tr> + <td class="number"><#if trunkSortedWeight??>${trunkSortedWeight?string("0.00")}</#if></td> + <td class="number"><#if trunkRejectedWeight??>${trunkRejectedWeight?string("")}</#if></td> + <td class="number"><#if trunkTotalWeight??>${trunkTotalWeight?string("0.00")}</#if></td> + <td class="number"><#if carrouselSortedWeight??>${carrouselSortedWeight?string("0.00")}</#if></td> + <td class="number"><#if carrouselUnsortedWeight??>${carrouselUnsortedWeight?string("")}</#if></td> + <td class="number"><#if carrouselTotalWeight??>${carrouselTotalWeight?string("0.00")}</#if></td> + </tr> + </tbody> </table> -<br/> - -<p> +<p class="centered">> NOTE: Les poids affichés sont en kg. </p> @@ -131,7 +145,7 @@ </tr> </thead> - <tbody> + <tbody class="alternateRows"> <#list rows as row> <tr> <td><input type="checkbox"/></td> -- 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 f91164cc1920f5091fbe74d7acf156e9ceadc28b Author: Kevin Morin <morin@codelutin.com> Date: Mon Nov 24 17:44:17 2014 +0100 refs #6150 --- tutti-service/src/main/resources/ftl/pupitriReport_fr.ftl | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tutti-service/src/main/resources/ftl/pupitriReport_fr.ftl b/tutti-service/src/main/resources/ftl/pupitriReport_fr.ftl index 06554da..102cb68 100644 --- a/tutti-service/src/main/resources/ftl/pupitriReport_fr.ftl +++ b/tutti-service/src/main/resources/ftl/pupitriReport_fr.ftl @@ -99,7 +99,7 @@ <hr/> <table class="center bordered"> - <thead> + <thead class="bordered"> <tr> <th colspan="3" class="text">Balance Trémie</th> <th colspan="3" class="text">Balance Carrousel</th> @@ -125,7 +125,7 @@ </tbody> </table> -<p class="centered">> +<p> NOTE: Les poids affichés sont en kg. </p> @@ -150,7 +150,7 @@ <tr> <td><input type="checkbox"/></td> <td>${row.speciesCode}</td> - <td><#if row.sorted??>V<#else>HV</#if></td> + <td><#if row.sorted>V<#else>HV</#if></td> <td><em>${row.speciesName}</em></td> <td><#if row.speciesVernucalCode??>${row.speciesVernucalCode}</#if></td> <td class="number">${row.sortedWeight}</td> -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
participants (1)
-
codelutin.com scm