From 5643360f9d3302f251d12fdc9739c461d2db5765 Mon Sep 17 00:00:00 2001 From: Matthieu Lamalle Date: Wed, 17 Jun 2020 17:32:32 +0200 Subject: [PATCH] modification mise en page du rapport --- .../templates/Report/report.html.twig | 143 +++++++++++------- 1 file changed, 85 insertions(+), 58 deletions(-) diff --git a/src/schedule-2.0/templates/Report/report.html.twig b/src/schedule-2.0/templates/Report/report.html.twig index 55f5879..45c5229 100644 --- a/src/schedule-2.0/templates/Report/report.html.twig +++ b/src/schedule-2.0/templates/Report/report.html.twig @@ -127,64 +127,7 @@

RAPPORT

-

CONSOMMATION PASSEE

- {% if project.hors!=0 %} - Consommation précédente totale = {{ project.hors }}
- {% endif %} - - - {% for year in project.before %} - - - {% for month in year %} - - {% endfor %} - - - - {% for month in year %} - - {% endfor %} - - {% endfor %} -
- Date - - {{ month.monthlabel }} -
- Consommé - - {{ month.duration }} -
- - {% if not project.beforeastreinte is empty %} -

ASTREINTES

- - {% for year in project.before %} - - - {% for month in year %} - - {% endfor %} - - - - {% for month in year %} - - {% endfor %} - - {% endfor %} -
- Date - - {{ month.monthlabel }} -
- Consommé - - {{ month.duration }} -
- {% endif %}
 
{% for month in project.months %} @@ -247,10 +190,37 @@ {% endif %} -
 
+ {% endfor %} + +

CUMUL HEBDOMADAIRE

+ + {% for year, weeks in project.weeks %} + + + {% for week in weeks %} + + {% endfor %} + + + + {% for week in weeks %} + + {% endfor %} + + {% endfor %} +
+ {{ year}} + + S{{ week.weeknumber}} +
+ + + {{ week.cumul}} +
+
 
{% if not project.offers is empty %}

COMMANDES

{% set count=(project.offers|length)-8 %} @@ -360,7 +330,64 @@
 
{% endif %} +

CONSOMMATION PASSEE

+ {% if project.hors!=0 %} + Consommation précédente totale = {{ project.hors }}
+ {% endif %} + + + {% for year in project.before %} + + + {% for month in year %} + + {% endfor %} + + + + {% for month in year %} + + {% endfor %} + + {% endfor %} +
+ Date + + {{ month.monthlabel }} +
+ Consommé + + {{ month.duration }} +
+ + {% if not project.beforeastreinte is empty %} +

ASTREINTES PASSEES

+ + {% for year in project.beforeastreinte %} + + + {% for month in year %} + + {% endfor %} + + + + {% for month in year %} + + {% endfor %} + + {% endfor %} +
+ Date + + {{ month.monthlabel }} +
+ Consommé + + {{ month.duration }} +
+ {% endif %}
{% endif %}