summaryrefslogtreecommitdiff
path: root/archaeological_operations/templates/ishtar/dashboards
diff options
context:
space:
mode:
authorÉtienne Loks <etienne.loks@peacefrogs.net>2013-09-12 18:54:28 +0200
committerÉtienne Loks <etienne.loks@peacefrogs.net>2013-09-12 18:54:28 +0200
commitb6da2dbc66b084cf04124878f9f3617be1cff5bf (patch)
treeded46e73d714edd9c7b1eafaead66344f6cb76d6 /archaeological_operations/templates/ishtar/dashboards
parent25a0f476ef2248cde4e70ed0c199174e1398e2ba (diff)
downloadIshtar-b6da2dbc66b084cf04124878f9f3617be1cff5bf.tar.bz2
Ishtar-b6da2dbc66b084cf04124878f9f3617be1cff5bf.zip
Change m2 to ha in dashboards (refs #559)
Diffstat (limited to 'archaeological_operations/templates/ishtar/dashboards')
-rw-r--r--archaeological_operations/templates/ishtar/dashboards/dashboard_operation.html17
1 files changed, 8 insertions, 9 deletions
diff --git a/archaeological_operations/templates/ishtar/dashboards/dashboard_operation.html b/archaeological_operations/templates/ishtar/dashboards/dashboard_operation.html
index 719ec2ac1..e67214fbf 100644
--- a/archaeological_operations/templates/ishtar/dashboards/dashboard_operation.html
+++ b/archaeological_operations/templates/ishtar/dashboards/dashboard_operation.html
@@ -1,6 +1,5 @@
{% extends "base.html" %}
-{% load i18n %}
-{% load range %}
+{% load i18n range units %}
{% block extra_head %}
{{form.media}}
{% endblock %}
@@ -28,11 +27,11 @@
<table>
<caption>{% trans "Area by type of operation" %}</caption>
<tr>
- <th>{% trans "Status" %}</th><th>{% trans "Area (m²)" %}</th>
+ <th>{% trans "Status" %}</th><th>{% trans "Area (ha)" %}</th>
</tr>
{% for surface in dashboard.surface_by_type %}
<tr>
- <th class='sub'>{{surface.operation_type__label}}</th><td>{{surface.number}}</td>
+ <th class='sub'>{{surface.operation_type__label}}</th><td>{{surface.number|m2_to_ha}}</td>
</tr>
{% endfor %}
</table></div>
@@ -228,15 +227,15 @@
<div class='table'>
<table>
- <caption>{% trans "Effective operations areas (m²)" %}</caption>
+ <caption>{% trans "Effective operations areas (ha)" %}</caption>
<tr>
<th>&nbsp;</th>{% for yr in dashboard.years%}<th>{{yr}}</th>{% endfor %}
</tr>
<tr>
- <th>{% trans "Sum" %}</th>{% for nb, mean in dashboard.survey.effective %}<td>{{nb}}</td>{% endfor %}
+ <th>{% trans "Sum" %}</th>{% for nb, mean in dashboard.survey.effective %}<td>{{nb|m2_to_ha}}</td>{% endfor %}
</tr>
<tr>
- <th>{% trans "Average" %}</th>{% for nb, avg in dashboard.survey.effective %}<td>{{avg}}</td>{% endfor %}
+ <th>{% trans "Average" %}</th>{% for nb, avg in dashboard.survey.effective %}<td>{{avg|m2_to_ha}}</td>{% endfor %}
</tr>
</table></div>
@@ -313,11 +312,11 @@
<table>
<caption>{% trans "Main towns by surface" %}</caption>
<tr>
- <th>{% trans "Town" %}</th><th>{% trans "Total surface (m²)" %}</th>
+ <th>{% trans "Town" %}</th><th>{% trans "Total surface (ha)" %}</th>
</tr>
{% for lbl, nb in dashboard.survey.towns_surface %}
<tr>
- <th class='sub'>{{lbl}}</th><td>{{nb}}</td>
+ <th class='sub'>{{lbl}}</th><td>{{nb|m2_to_ha}}</td>
</tr>
{% endfor %}
</table></div>