# Extended OEK report
* adds available rest surface of eco account to public report * adds amount of deducted surface per each deduction to public report
This commit is contained in:
@@ -30,17 +30,44 @@
|
||||
{% endif %}
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<th scope="row">{% trans 'Available' %}</th>
|
||||
<td>
|
||||
{{available_total|floatformat:2}} / {{obj.deductable_surface|default_if_none:0.00|floatformat:2}} m²
|
||||
{% with available as value %}
|
||||
{% include 'konova/widgets/progressbar.html' %}
|
||||
{% endwith %}
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<th scope="row">{% trans 'Deductions for' %}</th>
|
||||
<td class="align-middle">
|
||||
{% for deduction in deductions %}
|
||||
<a href="{% url 'intervention:report' deduction.intervention__id %}">
|
||||
{{deduction.intervention__identifier}} - {{deduction.intervention__title}}
|
||||
</a>
|
||||
<br>
|
||||
{% empty %}
|
||||
{% trans 'None' %}
|
||||
{% endfor %}
|
||||
<table class="table table-hover">
|
||||
<th scope="col">
|
||||
{% translate 'Intervention' %}
|
||||
</th>
|
||||
<th scope="col">
|
||||
{% translate 'Amount' %}
|
||||
</th>
|
||||
{% for deduction in deductions %}
|
||||
<tr>
|
||||
<td>
|
||||
<a href="{% url 'intervention:report' deduction.intervention__id %}">
|
||||
{{deduction.intervention__identifier}} - {{deduction.intervention__title}}
|
||||
</a>
|
||||
</td>
|
||||
<td>{{ deduction.surface|floatformat:2 }} m²</td>
|
||||
{% empty %}
|
||||
<td>
|
||||
{% translate 'None' %}
|
||||
</td>
|
||||
<td>
|
||||
/
|
||||
</td>
|
||||
</tr>
|
||||
{% endfor %}
|
||||
|
||||
</table>
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
|
||||
Reference in New Issue
Block a user