From de4c4369cf5f0d31372d0f798c7042ddcdffbe08 Mon Sep 17 00:00:00 2001 From: Étienne Loks Date: Mon, 29 Jan 2018 15:32:36 +0100 Subject: Dashboard: fix display for operation and files --- .../ishtar/dashboards/dashboard_operation.html | 68 +++++++++++----------- 1 file changed, 34 insertions(+), 34 deletions(-) (limited to 'archaeological_operations') diff --git a/archaeological_operations/templates/ishtar/dashboards/dashboard_operation.html b/archaeological_operations/templates/ishtar/dashboards/dashboard_operation.html index 5b435032e..19302cd05 100644 --- a/archaeological_operations/templates/ishtar/dashboards/dashboard_operation.html +++ b/archaeological_operations/templates/ishtar/dashboards/dashboard_operation.html @@ -13,7 +13,7 @@

{% trans "total" %}

- +
@@ -27,7 +27,7 @@

{% trans "area by type of operation" %}

-
{% trans "Status" %}{% trans "Number" %}
+
@@ -41,7 +41,7 @@

{% trans "by types" %}

-
{% trans "Status" %}{% trans "Area (ha)" %}
+
{% for typ in dashboard.types %} {% if forloop.counter0|divisibleby:5 %} @@ -63,7 +63,7 @@

{% trans "by year" %}

-
+
{% for yr in dashboard.years %} {% if forloop.counter0|divisibleby:5 %} @@ -85,7 +85,7 @@

{% trans "by realisation year" %}

-
+
{%for yr in dashboard.realisation_years %} {% if forloop.counter0|divisibleby:5 %} @@ -107,7 +107,7 @@

{% trans "effective operation by type and year" %}

-
+
{% for lbl, years in dashboard.effective %} {% if forloop.counter0|divisibleby:6 %} @@ -132,7 +132,7 @@

{% trans "by realisation month" %}

-
+
{%for mt in dashboard.last_months %} {% if forloop.counter0|divisibleby:5 %} @@ -159,7 +159,7 @@

{% trans "total" %}

-
+
@@ -173,7 +173,7 @@

{% trans "by year" %}

-
{% trans "Status" %}{% trans "Number" %}
+
{%for yr in dashboard.years %} {% if forloop.counter0|divisibleby:5 %} @@ -195,7 +195,7 @@

{% trans "by realisation year" %}

-
+
{%for yr in dashboard.realisation_years %} {% if forloop.counter0|divisibleby:5 %} @@ -217,7 +217,7 @@

{% trans "current year" %}

-
+
{% for lbl in dashboard.filters_label %}{%endfor%} @@ -235,7 +235,7 @@

{% trans "organizations (current year)" %}

-
{{lbl}}
+
@@ -249,7 +249,7 @@

{% trans "current realisation year" %}

-
 {% trans "Area" %}{% trans "Man-day" %}{% trans "Man-day/hectare" %}
+
{% for lbl in dashboard.filters_label %}{%endfor%} @@ -269,7 +269,7 @@

{% trans "organizations (current realisation year)" %}

-
{% trans "Status" %}{{lbl}}
+
@@ -282,7 +282,7 @@

{% trans "area by organization by year" %}

-
 {% trans "Area" %}{% trans "Man-day" %}{% trans "Man-day/hectare" %}
+
{% for org, vals in dashboard.survey.org_by_year %} @@ -314,7 +314,7 @@

{% trans "effective operations areas (ha)" %}

-
+
{%for yr in dashboard.years %} {% if forloop.counter0|divisibleby:5 %} @@ -337,7 +337,7 @@

{% trans "man-days/hectare by year" %}

-
+
{%for yr in dashboard.years %} {% if forloop.counter0|divisibleby:5 %} @@ -362,7 +362,7 @@

{% trans "by month" %}

-
+
{% for mt in dashboard.last_months %} {% if forloop.counter0|divisibleby:5 %} @@ -383,7 +383,7 @@

{% trans "by department" %}

-
+
{% for yr in dashboard.years %} {% if forloop.counter0|divisibleby:5 %} @@ -404,7 +404,7 @@

{% trans "effective operation by department" %}

-
+
{% for yr in dashboard.years %} {% if forloop.counter0|divisibleby:4 %} @@ -427,7 +427,7 @@

{% trans "main towns by number" %}

-
+
@@ -441,7 +441,7 @@

{% trans "main towns by surface" %}

-
{% trans "Town" %}{% trans "Number" %}
+
@@ -458,7 +458,7 @@

{% trans "total" %}

-
{% trans "Town" %}{% trans "Total surface (ha)" %}
+
@@ -472,7 +472,7 @@

{% trans "by year" %}

-
{% trans "Status" %}{% trans "Number" %}
+
{%for yr in dashboard.years %} {% if forloop.counter0|divisibleby:5 %} @@ -492,7 +492,7 @@

{% trans "by realisation year" %}

-
+
{% for yr in dashboard.realisation_years %} {% if forloop.counter0|divisibleby:5 %} @@ -512,7 +512,7 @@

{% trans "current realisation year" %}

-
+
{% for lbl in dashboard.filters_label %}{%endfor%} @@ -532,7 +532,7 @@

{% trans "organizations (current realisation year)" %}

-
{% trans "Status" %}{{lbl}}
+
@@ -546,7 +546,7 @@

{% trans "area by organization by year" %}

-
 {% trans "Area" %}{% trans "Man-day" %}{% trans "Man-day/hectare" %}
+
{% for org, vals in dashboard.excavation.org_by_year %} {% if forloop.counter0|divisibleby:5 %} @@ -580,7 +580,7 @@

{% trans "area by organization by realisation year" %}

-
+
{% for org, vals in dashboard.excavation.org_by_year %} {% if forloop.counter0|divisibleby:5 %} @@ -616,7 +616,7 @@

{% trans "by month" %}

-
+
{% for mt in dashboard.last_months %} {% if forloop.counter0|divisibleby:5 %} @@ -636,7 +636,7 @@

{% trans "by department" %}

-
+
{% for yr in dashboard.years %} {% if forloop.counter0|divisibleby:5 %} @@ -657,7 +657,7 @@

{% trans "effective operation by department" %}

-
+
{% for yr in dashboard.years %} {% if forloop.counter0|divisibleby:3 %} @@ -682,7 +682,7 @@

{% trans "main towns by number" %}

-
+
@@ -696,7 +696,7 @@

{% trans "main towns by cost" %}

-
{% trans "Town" %}{% trans "Number" %}
+
-- cgit v1.2.3
{% trans "Town" %}{% trans "Cost (euros)" %}