From 6bd189271f9d01c168c4ab0346c617bc29b4d590 Mon Sep 17 00:00:00 2001 From: Matthieu Lamalle Date: Thu, 4 Mar 2021 09:18:17 +0100 Subject: [PATCH] correction fermeture div dans rapport ref #57 --- .../templates/Report/report.html.twig | 45 ++++++++++--------- 1 file changed, 23 insertions(+), 22 deletions(-) diff --git a/src/schedule-2.0/templates/Report/report.html.twig b/src/schedule-2.0/templates/Report/report.html.twig index d3ef41d..0a9b53d 100644 --- a/src/schedule-2.0/templates/Report/report.html.twig +++ b/src/schedule-2.0/templates/Report/report.html.twig @@ -59,7 +59,7 @@ } .astreinte { height: 12px; - font-size: 10px; + font-size: 10px; } {% if fgprint is defined and fgprint %} @@ -68,7 +68,7 @@ float:none !important; margin:0px; } - + table { width:100%; font-size:10px;} .card-header .synthese { @@ -83,10 +83,10 @@ .small { font-size:10px;} h4 { - padding-top: 20px; + padding-top: 20px; } - {% endif %} + {% endif %} {% endblock %} @@ -104,7 +104,7 @@ {% for i in 1..48 %} {% set selected="" %} {%if i==app.session.get('nbmonth') %} - {% set selected="selected" %} + {% set selected="selected" %} {% endif %} {% endfor %} @@ -126,7 +126,7 @@

RAPPORT

- +
 
{% for month in project.months %} @@ -185,14 +185,14 @@ TOTAL {{ (month.total + month.totala)|number_format(2, '.', ' ') }} - + {% endif %} - + {% endfor %} - - + +

CUMUL HEBDOMADAIRE

@@ -204,17 +204,17 @@ {% for week in weeks %} + {% endfor %} {% for week in weeks %} + {% endfor %} {% endfor %} @@ -236,15 +236,15 @@ {% set tot=0 %} {% for offer in project.offers %} - {% if loop.index - + - + - + - {% endif %} + {% endif %} {% endif %} {% endfor %} @@ -358,7 +358,7 @@ {% endfor %}
S{{ week.weeknumber}} -
- + {{ week.cumul}} -
Précédente {{ totbefore10|number_format(2, '.', ' ') }} - {% if decovalidate >= totbefore10 %} + {% if decovalidate >= totbefore10 %} {{ totbefore10|number_format(2, '.', ' ') }} {% set todel=totbefore10 %} {% else %} @@ -272,9 +272,9 @@ {{ offer.name }} {{ offer.ref }} {{ offer.quantity|number_format(2, '.', ' ') }} - {% if decovalidate >= offer.quantity %} + {% if decovalidate >= offer.quantity %} {{ offer.quantity|number_format(2, '.', ' ') }} {% set todel=offer.quantity %} {% else %} @@ -299,9 +299,9 @@ {{ offer.name }} {{ offer.ref }} {{ offer.quantity|number_format(2, '.', ' ') }} - {% if decovalidate >= 0 %} + {% if decovalidate >= 0 %} {{ decovalidate|number_format(2, '.', ' ') }} {% set todel=decovalidate %} {% else %} @@ -316,7 +316,7 @@ {% set decoproposed=decoproposed-totbefore10 %}
- + {% if not project.beforeastreinte is empty %}

ASTREINTES PASSEES

@@ -389,6 +389,7 @@ {% endif %}
+ {% endif %} {% endfor %}