modification mise en page du rapport
This commit is contained in:
@@ -127,64 +127,7 @@
|
||||
<div class="card-body">
|
||||
<h3>RAPPORT</h3>
|
||||
<div class="small">
|
||||
<h4>CONSOMMATION PASSEE</h4>
|
||||
{% if project.hors!=0 %}
|
||||
Consommation précédente totale = {{ project.hors }}<br>
|
||||
{% endif %}
|
||||
|
||||
<table>
|
||||
{% for year in project.before %}
|
||||
<tr class="text-center">
|
||||
<td class="text-center">
|
||||
Date
|
||||
</td>
|
||||
{% for month in year %}
|
||||
<td class="text-center">
|
||||
{{ month.monthlabel }}
|
||||
</td>
|
||||
{% endfor %}
|
||||
</tr>
|
||||
<tr class=" text-center">
|
||||
<td class="text-center">
|
||||
Consommé
|
||||
</td>
|
||||
{% for month in year %}
|
||||
<td class="text-center">
|
||||
{{ month.duration }}
|
||||
</td>
|
||||
{% endfor %}
|
||||
</tr>
|
||||
{% endfor %}
|
||||
</table>
|
||||
|
||||
|
||||
{% if not project.beforeastreinte is empty %}
|
||||
<h4>ASTREINTES</h4>
|
||||
<table>
|
||||
{% for year in project.before %}
|
||||
<tr class="text-center">
|
||||
<td class="text-center">
|
||||
Date
|
||||
</td>
|
||||
{% for month in year %}
|
||||
<td class="text-center">
|
||||
{{ month.monthlabel }}
|
||||
</td>
|
||||
{% endfor %}
|
||||
</tr>
|
||||
<tr class=" text-center">
|
||||
<td class="text-center">
|
||||
Consommé
|
||||
</td>
|
||||
{% for month in year %}
|
||||
<td class="text-center">
|
||||
{{ month.duration }}
|
||||
</td>
|
||||
{% endfor %}
|
||||
</tr>
|
||||
{% endfor %}
|
||||
</table>
|
||||
{% endif %}
|
||||
<div class="new-page"> </div>
|
||||
|
||||
{% for month in project.months %}
|
||||
@@ -247,10 +190,37 @@
|
||||
</table>
|
||||
{% endif %}
|
||||
|
||||
<div class="new-page"> </div>
|
||||
|
||||
{% endfor %}
|
||||
|
||||
|
||||
|
||||
<h4>CUMUL HEBDOMADAIRE</h4>
|
||||
<table>
|
||||
{% for year, weeks in project.weeks %}
|
||||
<thead>
|
||||
<th class="text-center day">
|
||||
{{ year}}
|
||||
</th>
|
||||
{% for week in weeks %}
|
||||
<th class="text-center">
|
||||
S{{ week.weeknumber}}
|
||||
</th>
|
||||
{% endfor %}
|
||||
</thead>
|
||||
<tr class="text-center">
|
||||
<td class="text-center">
|
||||
|
||||
</td>
|
||||
{% for week in weeks %}
|
||||
<td class="text-center">
|
||||
{{ week.cumul}}
|
||||
</td>
|
||||
{% endfor %}
|
||||
</tr>
|
||||
{% endfor %}
|
||||
</table>
|
||||
<div class="new-page"> </div>
|
||||
{% if not project.offers is empty %}
|
||||
<h4>COMMANDES</h4>
|
||||
{% set count=(project.offers|length)-8 %}
|
||||
@@ -360,7 +330,64 @@
|
||||
|
||||
<div class="new-page"> </div>
|
||||
{% endif %}
|
||||
<h4>CONSOMMATION PASSEE</h4>
|
||||
{% if project.hors!=0 %}
|
||||
Consommation précédente totale = {{ project.hors }}<br>
|
||||
{% endif %}
|
||||
|
||||
<table>
|
||||
{% for year in project.before %}
|
||||
<thead>
|
||||
<th class="text-center day">
|
||||
Date
|
||||
</th>
|
||||
{% for month in year %}
|
||||
<th class="text-center">
|
||||
{{ month.monthlabel }}
|
||||
</th>
|
||||
{% endfor %}
|
||||
</thead>
|
||||
<tr class="text-center">
|
||||
<td class="text-center">
|
||||
Consommé
|
||||
</td>
|
||||
{% for month in year %}
|
||||
<td class="text-center">
|
||||
{{ month.duration }}
|
||||
</td>
|
||||
{% endfor %}
|
||||
</tr>
|
||||
{% endfor %}
|
||||
</table>
|
||||
|
||||
|
||||
{% if not project.beforeastreinte is empty %}
|
||||
<h4>ASTREINTES PASSEES</h4>
|
||||
<table>
|
||||
{% for year in project.beforeastreinte %}
|
||||
<thead>
|
||||
<th class="text-center day">
|
||||
Date
|
||||
</th>
|
||||
{% for month in year %}
|
||||
<th class="text-center">
|
||||
{{ month.monthlabel }}
|
||||
</th>
|
||||
{% endfor %}
|
||||
</thead>
|
||||
<tr class=" text-center">
|
||||
<td class="text-center">
|
||||
Consommé
|
||||
</td>
|
||||
{% for month in year %}
|
||||
<td class="text-center">
|
||||
{{ month.duration }}
|
||||
</td>
|
||||
{% endfor %}
|
||||
</tr>
|
||||
{% endfor %}
|
||||
</table>
|
||||
{% endif %}
|
||||
</div>
|
||||
</div>
|
||||
{% endif %}
|
||||
|
Reference in New Issue
Block a user