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 %}
-
-
- Date
- |
- {% for month in year %}
-
- {{ month.monthlabel }}
- |
- {% endfor %}
-
-
-
- Consommé
- |
- {% for month in year %}
-
- {{ month.duration }}
- |
- {% endfor %}
-
- {% endfor %}
-
-
- {% if not project.beforeastreinte is empty %}
-
ASTREINTES
-
- {% for year in project.before %}
-
-
- Date
- |
- {% for month in year %}
-
- {{ month.monthlabel }}
- |
- {% endfor %}
-
-
-
- Consommé
- |
- {% for month in year %}
-
- {{ month.duration }}
- |
- {% endfor %}
-
- {% endfor %}
-
- {% endif %}
{% for month in project.months %}
@@ -247,10 +190,37 @@
{% endif %}
-
+
{% endfor %}
+
+
CUMUL HEBDOMADAIRE
+
+ {% for year, weeks in project.weeks %}
+
+
+ {{ year}}
+ |
+ {% for week in weeks %}
+
+ S{{ week.weeknumber}}
+ |
+ {% endfor %}
+
+
+
+
+ |
+ {% for week in weeks %}
+
+ {{ week.cumul}}
+ |
+ {% endfor %}
+
+ {% endfor %}
+
+
{% 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 %}
+
+
+ Date
+ |
+ {% for month in year %}
+
+ {{ month.monthlabel }}
+ |
+ {% endfor %}
+
+
+
+ Consommé
+ |
+ {% for month in year %}
+
+ {{ month.duration }}
+ |
+ {% endfor %}
+
+ {% endfor %}
+
+
+ {% if not project.beforeastreinte is empty %}
+
ASTREINTES PASSEES
+
+ {% for year in project.beforeastreinte %}
+
+
+ Date
+ |
+ {% for month in year %}
+
+ {{ month.monthlabel }}
+ |
+ {% endfor %}
+
+
+
+ Consommé
+ |
+ {% for month in year %}
+
+ {{ month.duration }}
+ |
+ {% endfor %}
+
+ {% endfor %}
+
+ {% endif %}
{% endif %}