diff options
Diffstat (limited to 'archaeological_operations')
5 files changed, 548 insertions, 335 deletions
diff --git a/archaeological_operations/locale/django.pot b/archaeological_operations/locale/django.pot index 86e6febcb..7c2ea0d62 100644 --- a/archaeological_operations/locale/django.pot +++ b/archaeological_operations/locale/django.pot @@ -9,27 +9,27 @@ msgid "" msgstr "" #: forms.py:66 forms.py:368 forms.py:952 forms.py:974 forms.py:978 -#: models.py:815 templates/ishtar/blocks/window_tables/parcels.html:8 +#: models.py:815 templates/ishtar/blocks/window_tables/parcels.html:10 msgid "Parcels" msgstr "" #: forms.py:69 forms.py:202 forms.py:928 models.py:801 -#: templates/ishtar/blocks/window_tables/parcels.html:5 -#: templates/ishtar/dashboards/dashboard_operation.html:302 -#: templates/ishtar/dashboards/dashboard_operation.html:315 -#: templates/ishtar/dashboards/dashboard_operation.html:482 -#: templates/ishtar/dashboards/dashboard_operation.html:495 +#: templates/ishtar/blocks/window_tables/parcels.html:7 +#: templates/ishtar/dashboards/dashboard_operation.html:432 +#: templates/ishtar/dashboards/dashboard_operation.html:446 +#: templates/ishtar/dashboards/dashboard_operation.html:685 +#: templates/ishtar/dashboards/dashboard_operation.html:699 msgid "Town" msgstr "" #: forms.py:71 forms.py:457 forms.py:731 forms.py:1192 models.py:194 #: models.py:618 models.py:799 -#: templates/ishtar/blocks/window_tables/parcels.html:6 +#: templates/ishtar/blocks/window_tables/parcels.html:8 msgid "Year" msgstr "" #: forms.py:74 models.py:802 -#: templates/ishtar/blocks/window_tables/parcels.html:7 +#: templates/ishtar/blocks/window_tables/parcels.html:9 msgid "Section" msgstr "" @@ -108,15 +108,15 @@ msgid "Parcel (section/number/public domain)" msgstr "" #: forms.py:467 forms.py:1206 models.py:519 -#: templates/ishtar/dashboards/dashboard_operation.html:273 -#: templates/ishtar/dashboards/dashboard_operation.html:286 -#: templates/ishtar/dashboards/dashboard_operation.html:453 -#: templates/ishtar/dashboards/dashboard_operation.html:466 +#: templates/ishtar/dashboards/dashboard_operation.html:390 +#: templates/ishtar/dashboards/dashboard_operation.html:411 +#: templates/ishtar/dashboards/dashboard_operation.html:643 +#: templates/ishtar/dashboards/dashboard_operation.html:664 msgid "Department" msgstr "" #: forms.py:468 forms.py:1038 models.py:78 -#: templates/ishtar/blocks/window_tables/archaeologicalsites.html:6 +#: templates/ishtar/blocks/window_tables/archaeologicalsites.html:8 msgid "Name" msgstr "" @@ -141,12 +141,12 @@ msgid "Operator" msgstr "" #: forms.py:497 forms.py:1043 models.py:82 models.py:204 -#: templates/ishtar/blocks/window_tables/archaeologicalsites.html:8 +#: templates/ishtar/blocks/window_tables/archaeologicalsites.html:10 msgid "Remains" msgstr "" #: forms.py:498 forms.py:1022 forms.py:1040 models.py:80 models.py:209 -#: templates/ishtar/blocks/window_tables/archaeologicalsites.html:7 +#: templates/ishtar/blocks/window_tables/archaeologicalsites.html:9 msgid "Periods" msgstr "" @@ -344,7 +344,7 @@ msgid "Preventive informations - excavation" msgstr "" #: forms.py:899 models.py:207 -#: templates/ishtar/dashboards/dashboard_operation.html:495 +#: templates/ishtar/dashboards/dashboard_operation.html:699 msgid "Cost (euros)" msgstr "" @@ -465,7 +465,7 @@ msgid "Indexed?" msgstr "" #: forms.py:1207 forms.py:1272 models.py:619 -#: templates/ishtar/blocks/window_tables/administrativacts.html:8 +#: templates/ishtar/blocks/window_tables/administrativacts.html:10 msgid "Object" msgstr "" @@ -821,8 +821,8 @@ msgid "Can delete own Administrative act" msgstr "" #: models.py:656 -#: templates/ishtar/blocks/window_tables/administrativacts.html:5 -#: templates/ishtar/blocks/window_tables/archaeologicalsites.html:5 +#: templates/ishtar/blocks/window_tables/administrativacts.html:7 +#: templates/ishtar/blocks/window_tables/archaeologicalsites.html:7 msgid "Ref." msgstr "" @@ -1151,24 +1151,23 @@ msgstr "" msgid "Operation source" msgstr "" -#: templates/ishtar/blocks/window_tables/administrativacts.html:6 -#: templates/ishtar/dashboards/dashboard_operation.html:82 +#: templates/ishtar/blocks/window_tables/administrativacts.html:8 msgid "Type" msgstr "" -#: templates/ishtar/blocks/window_tables/administrativacts.html:7 +#: templates/ishtar/blocks/window_tables/administrativacts.html:9 msgid "Date" msgstr "" -#: templates/ishtar/blocks/window_tables/administrativacts.html:18 +#: templates/ishtar/blocks/window_tables/administrativacts.html:20 msgid "No administrative act associated" msgstr "" -#: templates/ishtar/blocks/window_tables/archaeologicalsites.html:18 +#: templates/ishtar/blocks/window_tables/archaeologicalsites.html:20 msgid "No archaeological site associated" msgstr "" -#: templates/ishtar/blocks/window_tables/parcels.html:20 +#: templates/ishtar/blocks/window_tables/parcels.html:22 msgid "No parcel" msgstr "" @@ -1176,229 +1175,228 @@ msgstr "" msgid "Global informations" msgstr "" -#: templates/ishtar/dashboards/dashboard_operation.html:15 -#: templates/ishtar/dashboards/dashboard_operation.html:111 -#: templates/ishtar/dashboards/dashboard_operation.html:329 -msgid "Total" +#: templates/ishtar/dashboards/dashboard_operation.html:14 +#: templates/ishtar/dashboards/dashboard_operation.html:160 +#: templates/ishtar/dashboards/dashboard_operation.html:459 +msgid "total" msgstr "" -#: templates/ishtar/dashboards/dashboard_operation.html:17 -#: templates/ishtar/dashboards/dashboard_operation.html:30 -#: templates/ishtar/dashboards/dashboard_operation.html:113 -#: templates/ishtar/dashboards/dashboard_operation.html:152 -#: templates/ishtar/dashboards/dashboard_operation.html:184 -#: templates/ishtar/dashboards/dashboard_operation.html:331 -#: templates/ishtar/dashboards/dashboard_operation.html:370 +#: templates/ishtar/dashboards/dashboard_operation.html:18 +#: templates/ishtar/dashboards/dashboard_operation.html:32 +#: templates/ishtar/dashboards/dashboard_operation.html:164 +#: templates/ishtar/dashboards/dashboard_operation.html:254 +#: templates/ishtar/dashboards/dashboard_operation.html:463 +#: templates/ishtar/dashboards/dashboard_operation.html:517 msgid "Status" msgstr "" -#: templates/ishtar/dashboards/dashboard_operation.html:17 -#: templates/ishtar/dashboards/dashboard_operation.html:113 -#: templates/ishtar/dashboards/dashboard_operation.html:302 -#: templates/ishtar/dashboards/dashboard_operation.html:331 -#: templates/ishtar/dashboards/dashboard_operation.html:482 +#: templates/ishtar/dashboards/dashboard_operation.html:18 +#: templates/ishtar/dashboards/dashboard_operation.html:164 +#: templates/ishtar/dashboards/dashboard_operation.html:432 +#: templates/ishtar/dashboards/dashboard_operation.html:463 +#: templates/ishtar/dashboards/dashboard_operation.html:685 msgid "Number" msgstr "" #: templates/ishtar/dashboards/dashboard_operation.html:28 -msgid "Area by type of operation" +msgid "area by type of operation" msgstr "" -#: templates/ishtar/dashboards/dashboard_operation.html:30 +#: templates/ishtar/dashboards/dashboard_operation.html:32 msgid "Area (ha)" msgstr "" -#: templates/ishtar/dashboards/dashboard_operation.html:41 -msgid "By types" +#: templates/ishtar/dashboards/dashboard_operation.html:42 +msgid "by types" msgstr "" -#: templates/ishtar/dashboards/dashboard_operation.html:43 -#: templates/ishtar/dashboards/dashboard_operation.html:56 -#: templates/ishtar/dashboards/dashboard_operation.html:69 -#: templates/ishtar/dashboards/dashboard_operation.html:95 -#: templates/ishtar/dashboards/dashboard_operation.html:126 +#: templates/ishtar/dashboards/dashboard_operation.html:48 +#: templates/ishtar/dashboards/dashboard_operation.html:70 +#: templates/ishtar/dashboards/dashboard_operation.html:92 #: templates/ishtar/dashboards/dashboard_operation.html:139 -#: templates/ishtar/dashboards/dashboard_operation.html:260 -#: templates/ishtar/dashboards/dashboard_operation.html:344 -#: templates/ishtar/dashboards/dashboard_operation.html:357 -#: templates/ishtar/dashboards/dashboard_operation.html:440 +#: templates/ishtar/dashboards/dashboard_operation.html:180 +#: templates/ishtar/dashboards/dashboard_operation.html:202 +#: templates/ishtar/dashboards/dashboard_operation.html:369 +#: templates/ishtar/dashboards/dashboard_operation.html:479 +#: templates/ishtar/dashboards/dashboard_operation.html:499 +#: templates/ishtar/dashboards/dashboard_operation.html:623 msgid "State" msgstr "" -#: templates/ishtar/dashboards/dashboard_operation.html:54 -#: templates/ishtar/dashboards/dashboard_operation.html:124 -#: templates/ishtar/dashboards/dashboard_operation.html:342 -msgid "By year" +#: templates/ishtar/dashboards/dashboard_operation.html:64 +#: templates/ishtar/dashboards/dashboard_operation.html:174 +#: templates/ishtar/dashboards/dashboard_operation.html:473 +msgid "by year" msgstr "" -#: templates/ishtar/dashboards/dashboard_operation.html:67 -#: templates/ishtar/dashboards/dashboard_operation.html:137 -#: templates/ishtar/dashboards/dashboard_operation.html:355 -msgid "By realisation year" +#: templates/ishtar/dashboards/dashboard_operation.html:86 +#: templates/ishtar/dashboards/dashboard_operation.html:196 +#: templates/ishtar/dashboards/dashboard_operation.html:493 +msgid "by realisation year" msgstr "" -#: templates/ishtar/dashboards/dashboard_operation.html:80 -msgid "Effective operation by type and year" +#: templates/ishtar/dashboards/dashboard_operation.html:108 +msgid "effective operation by type and year" msgstr "" -#: templates/ishtar/dashboards/dashboard_operation.html:93 -msgid "By realisation month" +#: templates/ishtar/dashboards/dashboard_operation.html:133 +msgid "by realisation month" msgstr "" -#: templates/ishtar/dashboards/dashboard_operation.html:106 +#: templates/ishtar/dashboards/dashboard_operation.html:156 msgid "Survey informations" msgstr "" -#: templates/ishtar/dashboards/dashboard_operation.html:150 -msgid "Current year" +#: templates/ishtar/dashboards/dashboard_operation.html:218 +msgid "current year" msgstr "" -#: templates/ishtar/dashboards/dashboard_operation.html:155 -#: templates/ishtar/dashboards/dashboard_operation.html:171 -#: templates/ishtar/dashboards/dashboard_operation.html:187 -#: templates/ishtar/dashboards/dashboard_operation.html:203 -#: templates/ishtar/dashboards/dashboard_operation.html:289 -#: templates/ishtar/dashboards/dashboard_operation.html:373 -#: templates/ishtar/dashboards/dashboard_operation.html:389 +#: templates/ishtar/dashboards/dashboard_operation.html:225 +#: templates/ishtar/dashboards/dashboard_operation.html:240 +#: templates/ishtar/dashboards/dashboard_operation.html:257 +#: templates/ishtar/dashboards/dashboard_operation.html:274 +#: templates/ishtar/dashboards/dashboard_operation.html:415 +#: templates/ishtar/dashboards/dashboard_operation.html:520 +#: templates/ishtar/dashboards/dashboard_operation.html:537 msgid "Area" msgstr "" -#: templates/ishtar/dashboards/dashboard_operation.html:158 -#: templates/ishtar/dashboards/dashboard_operation.html:171 -#: templates/ishtar/dashboards/dashboard_operation.html:190 -#: templates/ishtar/dashboards/dashboard_operation.html:203 -#: templates/ishtar/dashboards/dashboard_operation.html:376 -#: templates/ishtar/dashboards/dashboard_operation.html:389 +#: templates/ishtar/dashboards/dashboard_operation.html:228 +#: templates/ishtar/dashboards/dashboard_operation.html:240 +#: templates/ishtar/dashboards/dashboard_operation.html:260 +#: templates/ishtar/dashboards/dashboard_operation.html:274 +#: templates/ishtar/dashboards/dashboard_operation.html:523 +#: templates/ishtar/dashboards/dashboard_operation.html:537 msgid "Man-day" msgstr "" -#: templates/ishtar/dashboards/dashboard_operation.html:161 -#: templates/ishtar/dashboards/dashboard_operation.html:171 -#: templates/ishtar/dashboards/dashboard_operation.html:193 -#: templates/ishtar/dashboards/dashboard_operation.html:203 -#: templates/ishtar/dashboards/dashboard_operation.html:379 -#: templates/ishtar/dashboards/dashboard_operation.html:389 +#: templates/ishtar/dashboards/dashboard_operation.html:231 +#: templates/ishtar/dashboards/dashboard_operation.html:240 +#: templates/ishtar/dashboards/dashboard_operation.html:263 +#: templates/ishtar/dashboards/dashboard_operation.html:274 +#: templates/ishtar/dashboards/dashboard_operation.html:526 +#: templates/ishtar/dashboards/dashboard_operation.html:537 msgid "Man-day/hectare" msgstr "" -#: templates/ishtar/dashboards/dashboard_operation.html:165 +#: templates/ishtar/dashboards/dashboard_operation.html:234 msgid "Man-day/hectare for effective operations (current year):" msgstr "" -#: templates/ishtar/dashboards/dashboard_operation.html:169 -msgid "Organizations (current year)" +#: templates/ishtar/dashboards/dashboard_operation.html:236 +msgid "organizations (current year)" msgstr "" -#: templates/ishtar/dashboards/dashboard_operation.html:182 -#: templates/ishtar/dashboards/dashboard_operation.html:368 -msgid "Current realisation year" +#: templates/ishtar/dashboards/dashboard_operation.html:250 +#: templates/ishtar/dashboards/dashboard_operation.html:513 +msgid "current realisation year" msgstr "" -#: templates/ishtar/dashboards/dashboard_operation.html:197 -#: templates/ishtar/dashboards/dashboard_operation.html:383 +#: templates/ishtar/dashboards/dashboard_operation.html:267 +#: templates/ishtar/dashboards/dashboard_operation.html:530 msgid "Man-day/hectare for effective operations (current realisation year):" msgstr "" -#: templates/ishtar/dashboards/dashboard_operation.html:201 -#: templates/ishtar/dashboards/dashboard_operation.html:387 -msgid "Organizations (current realisation year)" +#: templates/ishtar/dashboards/dashboard_operation.html:270 +#: templates/ishtar/dashboards/dashboard_operation.html:533 +msgid "organizations (current realisation year)" msgstr "" -#: templates/ishtar/dashboards/dashboard_operation.html:214 -#: templates/ishtar/dashboards/dashboard_operation.html:400 -msgid "Area by organization by year" +#: templates/ishtar/dashboards/dashboard_operation.html:283 +#: templates/ishtar/dashboards/dashboard_operation.html:547 +msgid "area by organization by year" msgstr "" -#: templates/ishtar/dashboards/dashboard_operation.html:216 -#: templates/ishtar/dashboards/dashboard_operation.html:402 -#: templates/ishtar/dashboards/dashboard_operation.html:421 +#: templates/ishtar/dashboards/dashboard_operation.html:292 +#: templates/ishtar/dashboards/dashboard_operation.html:555 +#: templates/ishtar/dashboards/dashboard_operation.html:590 msgid "Organization" msgstr "" -#: templates/ishtar/dashboards/dashboard_operation.html:224 -#: templates/ishtar/dashboards/dashboard_operation.html:413 -#: templates/ishtar/dashboards/dashboard_operation.html:432 +#: templates/ishtar/dashboards/dashboard_operation.html:309 +#: templates/ishtar/dashboards/dashboard_operation.html:575 +#: templates/ishtar/dashboards/dashboard_operation.html:611 msgid "Mean" msgstr "" -#: templates/ishtar/dashboards/dashboard_operation.html:230 -msgid "Effective operations areas (ha)" +#: templates/ishtar/dashboards/dashboard_operation.html:315 +msgid "effective operations areas (ha)" msgstr "" -#: templates/ishtar/dashboards/dashboard_operation.html:235 -#: templates/ishtar/dashboards/dashboard_operation.html:273 -#: templates/ishtar/dashboards/dashboard_operation.html:286 -#: templates/ishtar/dashboards/dashboard_operation.html:410 -#: templates/ishtar/dashboards/dashboard_operation.html:429 -#: templates/ishtar/dashboards/dashboard_operation.html:453 -#: templates/ishtar/dashboards/dashboard_operation.html:466 +#: templates/ishtar/dashboards/dashboard_operation.html:327 +#: templates/ishtar/dashboards/dashboard_operation.html:392 +#: templates/ishtar/dashboards/dashboard_operation.html:412 +#: templates/ishtar/dashboards/dashboard_operation.html:569 +#: templates/ishtar/dashboards/dashboard_operation.html:605 +#: templates/ishtar/dashboards/dashboard_operation.html:645 +#: templates/ishtar/dashboards/dashboard_operation.html:665 msgid "Sum" msgstr "" -#: templates/ishtar/dashboards/dashboard_operation.html:238 -#: templates/ishtar/dashboards/dashboard_operation.html:252 +#: templates/ishtar/dashboards/dashboard_operation.html:332 +#: templates/ishtar/dashboards/dashboard_operation.html:356 msgid "Average" msgstr "" -#: templates/ishtar/dashboards/dashboard_operation.html:244 -msgid "Man-Days/hectare by Year" +#: templates/ishtar/dashboards/dashboard_operation.html:338 +msgid "man-days/hectare by year" msgstr "" -#: templates/ishtar/dashboards/dashboard_operation.html:249 +#: templates/ishtar/dashboards/dashboard_operation.html:350 msgid "Man-Days/hectare" msgstr "" -#: templates/ishtar/dashboards/dashboard_operation.html:258 -#: templates/ishtar/dashboards/dashboard_operation.html:438 -msgid "By month" +#: templates/ishtar/dashboards/dashboard_operation.html:363 +#: templates/ishtar/dashboards/dashboard_operation.html:617 +msgid "by month" msgstr "" -#: templates/ishtar/dashboards/dashboard_operation.html:271 -#: templates/ishtar/dashboards/dashboard_operation.html:451 -msgid "By department" +#: templates/ishtar/dashboards/dashboard_operation.html:384 +#: templates/ishtar/dashboards/dashboard_operation.html:637 +msgid "by department" msgstr "" -#: templates/ishtar/dashboards/dashboard_operation.html:284 -#: templates/ishtar/dashboards/dashboard_operation.html:464 -msgid "Effective operation by department" +#: templates/ishtar/dashboards/dashboard_operation.html:405 +#: templates/ishtar/dashboards/dashboard_operation.html:658 +msgid "effective operation by department" msgstr "" -#: templates/ishtar/dashboards/dashboard_operation.html:289 -#: templates/ishtar/dashboards/dashboard_operation.html:469 +#: templates/ishtar/dashboards/dashboard_operation.html:415 +#: templates/ishtar/dashboards/dashboard_operation.html:668 msgid "Nb." msgstr "" -#: templates/ishtar/dashboards/dashboard_operation.html:300 -#: templates/ishtar/dashboards/dashboard_operation.html:480 -msgid "Main towns by number" +#: templates/ishtar/dashboards/dashboard_operation.html:428 +#: templates/ishtar/dashboards/dashboard_operation.html:681 +msgid "main towns by number" msgstr "" -#: templates/ishtar/dashboards/dashboard_operation.html:313 -msgid "Main towns by surface" +#: templates/ishtar/dashboards/dashboard_operation.html:442 +msgid "main towns by surface" msgstr "" -#: templates/ishtar/dashboards/dashboard_operation.html:315 +#: templates/ishtar/dashboards/dashboard_operation.html:446 msgid "Total surface (ha)" msgstr "" -#: templates/ishtar/dashboards/dashboard_operation.html:325 +#: templates/ishtar/dashboards/dashboard_operation.html:456 msgid "Excavation informations" msgstr "" -#: templates/ishtar/dashboards/dashboard_operation.html:419 -msgid "Area by organization by realisation year" +#: templates/ishtar/dashboards/dashboard_operation.html:581 +msgid "area by organization by realisation year" msgstr "" -#: templates/ishtar/dashboards/dashboard_operation.html:469 +#: templates/ishtar/dashboards/dashboard_operation.html:668 msgid "Cost" msgstr "" -#: templates/ishtar/dashboards/dashboard_operation.html:469 +#: templates/ishtar/dashboards/dashboard_operation.html:668 msgid "FNAP cost" msgstr "" -#: templates/ishtar/dashboards/dashboard_operation.html:493 -msgid "Main towns by cost" +#: templates/ishtar/dashboards/dashboard_operation.html:695 +msgid "main towns by cost" msgstr "" #: templates/ishtar/wizard/wizard_adminact_deletion.html:6 diff --git a/archaeological_operations/templates/ishtar/blocks/window_tables/administrativacts.html b/archaeological_operations/templates/ishtar/blocks/window_tables/administrativacts.html index 426669cca..4c41ed89e 100644 --- a/archaeological_operations/templates/ishtar/blocks/window_tables/administrativacts.html +++ b/archaeological_operations/templates/ishtar/blocks/window_tables/administrativacts.html @@ -1,6 +1,8 @@ {% load i18n %} -<table class='simple'> - <caption>{{caption}}</caption> +<h4>{{caption}}</h4> +<div class='clean-table'> +<div class='clean-table-wrap'> +<table> <tr> <th>{% trans "Ref." %}</th> <th>{% trans "Type" %}</th> @@ -18,3 +20,5 @@ <tr><td colspan="4" class='no_items'>{% trans "No administrative act associated" %}</td></tr> {% endfor %} </table> +</div> +</div> diff --git a/archaeological_operations/templates/ishtar/blocks/window_tables/archaeologicalsites.html b/archaeological_operations/templates/ishtar/blocks/window_tables/archaeologicalsites.html index d72291c5b..d570b9db2 100644 --- a/archaeological_operations/templates/ishtar/blocks/window_tables/archaeologicalsites.html +++ b/archaeological_operations/templates/ishtar/blocks/window_tables/archaeologicalsites.html @@ -1,6 +1,8 @@ {% load i18n %} -<table class='simple'> - <caption>{{caption}}</caption> +<h4>{{caption}}</h4> +<div class='clean-table'> +<div class='clean-table-wrap'> +<table> <tr> <th>{% trans "Ref." %}</th> <th>{% trans "Name" %}</th> @@ -18,3 +20,5 @@ <tr><td colspan="4" class='no_items'>{% trans "No archaeological site associated" %}</td></tr> {% endfor %} </table> +</div> +</div> diff --git a/archaeological_operations/templates/ishtar/blocks/window_tables/parcels.html b/archaeological_operations/templates/ishtar/blocks/window_tables/parcels.html index 9885680d7..37be138b1 100644 --- a/archaeological_operations/templates/ishtar/blocks/window_tables/parcels.html +++ b/archaeological_operations/templates/ishtar/blocks/window_tables/parcels.html @@ -1,6 +1,8 @@ {% load i18n %} -<table class='simple'> - <caption>{{ parcels_label }}</caption> +<h4>{{ parcels_label }}</h4> +<div class='clean-table'> +<div class='clean-table-wrap'> +<table> <tr> <th>{% trans "Town" %}</th> <th>{% trans "Year" %}</th> @@ -20,3 +22,4 @@ <tr><td colspan="4" class='no_items'>{% trans "No parcel" %}</td></tr> {% endfor %} </table> +</div></div> diff --git a/archaeological_operations/templates/ishtar/dashboards/dashboard_operation.html b/archaeological_operations/templates/ishtar/dashboards/dashboard_operation.html index b3b75c4ae..a661d304d 100644 --- a/archaeological_operations/templates/ishtar/dashboards/dashboard_operation.html +++ b/archaeological_operations/templates/ishtar/dashboards/dashboard_operation.html @@ -1,5 +1,5 @@ {% extends "base.html" %} -{% load i18n range units %} +{% load i18n range units humanize %} {% block extra_head %} {{form.media}} {% endblock %} @@ -10,496 +10,700 @@ <h3>{% trans "Global informations" %}</h3> <div> - <div class='table'> + <div class='clean-table'> + <h4>{% trans "total" %}</h4> + <div class='clean-table-wrap'> <table> - <caption>{% trans "Total" %}</caption> <tr> <th>{% trans "Status" %}</th><th>{% trans "Number" %}</th> </tr> {% for lbl, nb in dashboard.total %} <tr> - <th class='sub'>{{lbl}}</th><td>{{nb}}</td> + <th class='sub'>{{lbl}}</th><td>{{nb|intcomma}}</td> </tr> {% endfor %} - </table></div> + </table></div></div> - <div class='table'> + <div class='clean-table'> + <h4>{% trans "area by type of operation" %}</h4> + <div class='clean-table-wrap'> <table> - <caption>{% trans "Area by type of operation" %}</caption> <tr> <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|m2_to_ha}}</td> + <th class='sub'>{{surface.operation_type__label}}</th><td>{{surface.number|m2_to_ha|intcomma}}</td> </tr> {% endfor %} - </table></div> + </table></div></div> - <div class='table'> + <div class='clean-table'> + <h4>{% trans "by types" %}</h4> + <div class='clean-table-wrap'> <table> - <caption>{% trans "By types" %}</caption> <tr> - <th>{% trans "State" %}</th>{%for typ in dashboard.types %}<th>{{typ.label}}</th>{% endfor %} + {% for typ in dashboard.types %} + {% if forloop.counter0|divisibleby:5 %} + <th class='sub'>{% trans "State" %}</th> + {% endif %} + <th>{{typ.label}}</th> + {% endfor %} </tr> {% for lbl, types in dashboard.by_type %} <tr> - <th class='sub'>{{lbl}}</th>{%for nb in types %}<td>{{nb}}</td>{% endfor %} + {%for nb in types %} + {% if forloop.counter0|divisibleby:5 %} + <th class='sub'>{{lbl}}</th>{% endif %} + <td>{{nb|intcomma}}</td>{% endfor %} </tr> {% endfor %} - </table></div> + </table></div></div> - <div class='table'> + <div class='clean-table'> + <h4>{% trans "by year" %}</h4> + <div class='clean-table-wrap'> <table> - <caption>{% trans "By year" %}</caption> <tr> - <th>{% trans "State" %}</th>{%for yr in dashboard.years %}<th>{{yr}}</th>{% endfor %} + {% for yr in dashboard.years %} + {% if forloop.counter0|divisibleby:5 %} + <th class='sub'>{% trans "State" %}</th> + {% endif %} + <th>{{yr|default_if_none:''}}</th>{% endfor %} </tr> {% for lbl, years in dashboard.by_year %} <tr> - <th class='sub'>{{lbl}}</th>{%for nb in years %}<td>{{nb}}</td>{% endfor %} + {% for nb in years %} + {% if forloop.counter0|divisibleby:5 %} + <th class='sub'>{{lbl}}</th>{% endif %} + <td>{{nb|intcomma}}</td> + {% endfor %} </tr> {% endfor %} - </table></div> + </table></div></div> - <div class='table'> + <div class='clean-table'> + <h4>{% trans "by realisation year" %}</h4> + <div class='clean-table-wrap'> <table> - <caption>{% trans "By realisation year" %}</caption> <tr> - <th>{% trans "State" %}</th>{%for yr in dashboard.realisation_years %}<th>{{yr.year}}</th>{% endfor %} + {%for yr in dashboard.realisation_years %} + {% if forloop.counter0|divisibleby:5 %} + <th class='sub'>{% trans "State" %}</th> + {% endif %} + <th>{{yr.year|default_if_none:''}}</th>{% endfor %} </tr> {% for lbl, years in dashboard.by_realisation_year %} <tr> - <th class='sub'>{{lbl}}</th>{%for nb in years %}<td>{{nb}}</td>{% endfor %} + {% for nb in years %} + {% if forloop.counter0|divisibleby:5 %} + <th class='sub'>{{lbl}}</th>{% endif %} + <td>{{nb|intcomma}}</td> + {% endfor %} </tr> {% endfor %} - </table></div> + </table></div></div> - <div class='table'> - <table> - <caption>{% trans "Effective operation by type and year" %}</caption> + <div class='clean-table'> + <h4>{% trans "effective operation by type and year" %}</h4> + <div class='clean-table-wrap'> + <table class='mini-table'> + {% for lbl, years in dashboard.effective %} + + {% if forloop.counter0|divisibleby:6 %} <tr> - <th>{% trans "Type" %}</th>{%for yr in dashboard.years %}<th>{{yr}}</th>{% endfor %} + {%for yr in dashboard.years %} + {% if forloop.counter0|divisibleby:5 %} + <th></th> + {% endif %} + <th>{{yr|default_if_none:''}}</th>{% endfor %} </tr> - {% for lbl, years in dashboard.effective %} + {% endif %} <tr> - <th class='sub'>{{lbl}}</th>{%for nb in years %}<td>{{nb}}</td>{% endfor %} + {% for nb in years %} + {% if forloop.counter0|divisibleby:5 %} + <th class='sub'>{{lbl}}</th>{% endif %} + <td>{{nb|intcomma}}</td> + {% endfor %} </tr> {% endfor %} - </table></div> + </table></div></div> - <div class='table'> + <div class='clean-table'> + <h4>{% trans "by realisation month" %}</h4> + <div class='clean-table-wrap'> <table> - <caption>{% trans "By realisation month" %}</caption> <tr> - <th>{% trans "State" %}</th>{%for mt in dashboard.last_months %}<th>{{mt.date|date:"F Y"|capfirst}}</th>{% endfor %} + {%for mt in dashboard.last_months %} + {% if forloop.counter0|divisibleby:5 %} + <th class='sub'>{% trans "State" %}</th> + {% endif %} + <th>{{mt.date|date:"N Y"|capfirst}}</th>{% endfor %} </tr> {% for lbl, months in dashboard.by_realisation_month %} <tr> - <th class='sub'>{{lbl}}</th>{%for nb in months %}<td>{{nb}}</td>{% endfor %} + {%for nb in months %} + {% if forloop.counter0|divisibleby:5 %} + <th class='sub'>{{lbl}}</th>{% endif %} + <td>{{nb|intcomma}}</td> + {% endfor %} </tr> {% endfor %} - </table></div> + </table></div></div> </div> <h3>{% trans "Survey informations" %}</h3> <div> - <div class='table'> + <div class='clean-table'> + <h4>{% trans "total" %}</h4> + <div class='clean-table-wrap'> <table> - <caption>{% trans "Total" %}</caption> <tr> <th>{% trans "Status" %}</th><th>{% trans "Number" %}</th> </tr> {% for lbl, nb in dashboard.survey.total %} <tr> - <th class='sub'>{{lbl}}</th><td>{{nb}}</td> + <th class='sub'>{{lbl}}</th><td>{{nb|intcomma}}</td> </tr> {% endfor %} - </table></div> + </table></div></div> - <div class='table'> + <div class='clean-table'> + <h4>{% trans "by year" %}</h4> + <div class='clean-table-wrap'> <table> - <caption>{% trans "By year" %}</caption> <tr> - <th>{% trans "State" %}</th>{%for yr in dashboard.years %}<th>{{yr}}</th>{% endfor %} + {%for yr in dashboard.years %} + {% if forloop.counter0|divisibleby:5 %} + <th class='sub'>{% trans "State" %}</th> + {% endif %} + <th>{{yr|default_if_none:''}}</th>{% endfor %} </tr> {% for lbl, years in dashboard.survey.by_year %} <tr> - <th class='sub'>{{lbl}}</th>{%for nb in years %}<td>{{nb}}</td>{% endfor %} + {% for nb in years %} + {% if forloop.counter0|divisibleby:5 %} + <th class='sub'>{{lbl}}</th>{% endif %} + <td>{{nb|intcomma}}</td> + {% endfor %} </tr> {% endfor %} - </table></div> + </table></div></div> - <div class='table'> + <div class='clean-table'> + <h4>{% trans "by realisation year" %}</h4> + <div class='clean-table-wrap'> <table> - <caption>{% trans "By realisation year" %}</caption> <tr> - <th>{% trans "State" %}</th>{%for yr in dashboard.realisation_years %}<th>{{yr.year}}</th>{% endfor %} + {%for yr in dashboard.realisation_years %} + {% if forloop.counter0|divisibleby:5 %} + <th class='sub'>{% trans "State" %}</th> + {% endif %} + <th>{{yr.year|default_if_none:''}}</th>{% endfor %} </tr> {% for lbl, years in dashboard.survey.by_realisation_year %} <tr> - <th class='sub'>{{lbl}}</th>{%for nb in years %}<td>{{nb}}</td>{% endfor %} + {% for nb in years %} + {% if forloop.counter0|divisibleby:5 %} + <th class='sub'>{{lbl}}</th>{% endif %} + <td>{{nb|intcomma}}</td> + {% endfor %} </tr> {% endfor %} - </table></div> + </table></div></div> - <div class='table'> + <div class='clean-table'> + <h4>{% trans "current year" %}</h4> + <div class='clean-table-wrap'> <table> - <caption>{% trans "Current year" %}</caption> <tr> - <th>{% trans "Status" %}</th>{% for lbl in dashboard.filters_label %}<th>{{lbl}}</th>{%endfor%} + <th></th>{% for lbl in dashboard.filters_label %}<th>{{lbl}}</th>{%endfor%} </tr> <tr> - <th class='sub'>{% trans "Area"%}</th>{% for nb in dashboard.survey.area %}<td>{{nb}}</td>{%endfor%} + <th class='sub'>{% trans "Area"%}</th>{% for nb in dashboard.survey.area %}<td>{{nb|intcomma}}</td>{%endfor%} </tr> <tr> - <th class='sub'>{% trans "Man-day"%}</th>{% for nb in dashboard.survey.manday %}<td>{{nb}}</td>{%endfor%} + <th class='sub'>{% trans "Man-day"%}</th>{% for nb in dashboard.survey.manday %}<td>{{nb|intcomma}}</td>{%endfor%} </tr> <tr> - <th class='sub'>{% trans "Man-day/hectare"%}</th>{% for nb in dashboard.survey.mandayhect %}<td>{{nb}}</td>{%endfor%} + <th class='sub'>{% trans "Man-day/hectare"%}</th>{% for nb in dashboard.survey.mandayhect %}<td>{{nb|intcomma}}</td>{%endfor%} </tr> - </table></div> - + </table></div></div> <p><strong>{% trans "Man-day/hectare for effective operations (current year):" %}</strong> {{dashboard.survey.mandayhect_effective}}</p> - - <div class='table'> + <div class='clean-table'> + <h4>{% trans "organizations (current year)" %}</h4> + <div class='clean-table-wrap'> <table> - <caption>{% trans "Organizations (current year)" %}</caption> <tr> <th> </th><th>{% trans "Area" %}</th><th>{% trans "Man-day" %}</th><th>{% trans "Man-day/hectare" %}</th> </tr> {% for org in dashboard.survey.org %} <tr> - <th class='sub'>{{org.scientist__attached_to__name}}</th><td>{{org.area}}</td><td>{{org.manday}}</td><td>{{org.mandayhect}}</td> + <th class='sub'>{{org.scientist__attached_to__name}}</th><td>{{org.area|intcomma}}</td><td>{{org.manday|intcomma}}</td><td>{{org.mandayhect|intcomma}}</td> </tr> {% endfor %} - </table></div> + </table></div></div> - <div class='table'> + <div class='clean-table'> + <h4>{% trans "current realisation year" %}</h4> + <div class='clean-table-wrap'> <table> - <caption>{% trans "Current realisation year" %}</caption> <tr> <th>{% trans "Status" %}</th>{% for lbl in dashboard.filters_label %}<th>{{lbl}}</th>{%endfor%} </tr> <tr> - <th class='sub'>{% trans "Area"%}</th>{% for nb in dashboard.survey.area_realised %}<td>{{nb}}</td>{%endfor%} + <th class='sub'>{% trans "Area"%}</th>{% for nb in dashboard.survey.area_realised %}<td>{{nb|intcomma}}</td>{%endfor%} </tr> <tr> - <th class='sub'>{% trans "Man-day"%}</th>{% for nb in dashboard.survey.manday_realised %}<td>{{nb}}</td>{%endfor%} + <th class='sub'>{% trans "Man-day"%}</th>{% for nb in dashboard.survey.manday_realised %}<td>{{nb|intcomma}}</td>{%endfor%} </tr> <tr> - <th class='sub'>{% trans "Man-day/hectare"%}</th>{% for nb in dashboard.survey.mandayhect_realised %}<td>{{nb}}</td>{%endfor%} + <th class='sub'>{% trans "Man-day/hectare"%}</th>{% for nb in dashboard.survey.mandayhect_realised %}<td>{{nb|intcomma}}</td>{%endfor%} </tr> - </table></div> + </table></div></div> <p><strong>{% trans "Man-day/hectare for effective operations (current realisation year):" %}</strong> {{dashboard.survey.mandayhect_real_effective}}</p> - <div class='table'> + <div class='clean-table'> + <h4>{% trans "organizations (current realisation year)" %}</h4> + <div class='clean-table-wrap'> <table> - <caption>{% trans "Organizations (current realisation year)" %}</caption> <tr> <th> </th><th>{% trans "Area" %}</th><th>{% trans "Man-day" %}</th><th>{% trans "Man-day/hectare" %}</th> </tr> {% for org in dashboard.survey.org_realised %} <tr> - <th class='sub'>{{org.in_charge__attached_to__name}}</th><td>{{org.area}}</td><td>{{org.manday}}</td><td>{{org.mandayhect}}</td> + <th class='sub'>{{org.scientist__attached_to__name}}</th><td>{{org.area|intcomma}}</td><td>{{org.manday|intcomma}}</td><td>{{org.mandayhect|intcomma}}</td> </tr> {% endfor %} - </table></div> - - <div class='table'> - <table> - <caption>{% trans "Area by organization by year" %}</caption> + </table></div></div> + <div class='clean-table'> + <h4>{% trans "area by organization by year" %}</h4> + <div class='clean-table-wrap'> + <table class='mini-table'> <tr> - <th>{% trans "Organization" %}</th>{% for yr in dashboard.years%}<th>{{yr}}</th>{% endfor %} </tr> {% for org, vals in dashboard.survey.org_by_year %} - <tr> - <th class='sub'>{{org}}</th>{% for area, cost in vals %}<td>{{area}}</td>{% endfor %} + {% if forloop.counter0|divisibleby:4 %} + {% for yr in dashboard.years %} + {% if forloop.counter0|divisibleby:5 %} + <th class='sub'>{% trans "Organization" %}</th> + {% endif %} + <th>{{yr|default_if_none:''}}</th> + {% endfor %} + {% endif %} + + <tr> + {% for area, cost in vals %} + {% if forloop.counter0|divisibleby:5 %} + <th class='sub'>{{org}}</th> + {% endif %} + <td>{{area|intcomma}}</td>{% endfor %} </tr> {% endfor %} <tr> - <th>{% trans "Mean" %}</th>{% for area in dashboard.survey.org_by_year_area_mean %}<td>{{area}}</td>{% endfor %} + {% for area in dashboard.survey.org_by_year_area_mean %} + {% if forloop.counter0|divisibleby:5 %} + <th>{% trans "Mean" %}</th>{% endif%} + <td>{{area|intcomma}}</td>{% endfor %} </tr> - </table></div> + </table></div></div> - <div class='table'> + <div class='clean-table'> + <h4>{% trans "effective operations areas (ha)" %}</h4> + <div class='clean-table-wrap'> <table> - <caption>{% trans "Effective operations areas (ha)" %}</caption> <tr> - <th> </th>{% for yr in dashboard.years%}<th>{{yr}}</th>{% endfor %} + {%for yr in dashboard.years %} + {% if forloop.counter0|divisibleby:5 %} + <th></th> + {% endif %} + <th>{{yr|default_if_none:''}}</th>{% endfor %} </tr> <tr> - <th>{% trans "Sum" %}</th>{% for nb, mean in dashboard.survey.effective %}<td>{{nb|m2_to_ha}}</td>{% endfor %} + {% for nb, mean in dashboard.survey.effective %} + {% if forloop.counter0|divisibleby:5 %}<th>{% trans "Sum" %}</th>{%endif%} + <td>{{nb|m2_to_ha|intcomma}}</td>{% endfor %} </tr> <tr> - <th>{% trans "Average" %}</th>{% for nb, avg in dashboard.survey.effective %}<td>{{avg|m2_to_ha}}</td>{% endfor %} + {% for nb, avg in dashboard.survey.effective %} + {% if forloop.counter0|divisibleby:5 %}<th>{% trans "Average" %}</th>{%endif%} + <td>{{avg|m2_to_ha|intcomma}}</td>{% endfor %} </tr> - </table></div> + </table></div></div> - <div class='table'> + <div class='clean-table'> + <h4>{% trans "man-days/hectare by year" %}</h4> + <div class='clean-table-wrap'> <table> - <caption>{% trans "Man-Days/hectare by Year" %}</caption> <tr> - <th> </th>{% for yr in dashboard.years%}<th>{{yr}}</th>{% endfor %} + {%for yr in dashboard.years %} + {% if forloop.counter0|divisibleby:5 %} + <th></th> + {% endif %} + <th>{{yr|default_if_none:''}}</th>{% endfor %} </tr> <tr> - <th>{% trans "Man-Days/hectare" %}</th>{% for nb, mean in dashboard.survey.mandayshect %}<td>{{nb}}</td>{% endfor %} + {% for nb, mean in dashboard.survey.mandayshect %} + {% if forloop.counter0|divisibleby:5 %}<th>{% trans "Man-Days/hectare" %}</th>{%endif%} + <td>{{nb|intcomma}}</td>{% endfor %} </tr> <tr> - <th>{% trans "Average" %}</th>{% for nb, avg in dashboard.survey.mandayshect %}<td>{{avg}}</td>{% endfor %} + {% for nb, avg in dashboard.survey.mandayshect %} + {% if forloop.counter0|divisibleby:5 %} + <th>{% trans "Average" %}</th> + {%endif%} + <td>{{avg|intcomma}}</td>{% endfor %} </tr> - </table></div> + </table></div></div> - <div class='table'> + <div class='clean-table'> + <h4>{% trans "by month" %}</h4> + <div class='clean-table-wrap'> <table> - <caption>{% trans "By month" %}</caption> <tr> - <th>{% trans "State" %}</th>{%for mt in dashboard.last_months %}<th>{{mt.date|date:"F Y"|capfirst}}</th>{% endfor %} + {% for mt in dashboard.last_months %} + {% if forloop.counter0|divisibleby:5 %} + <th class='sub'>{% trans "State" %}</th>{% endif %} + <th>{{mt.date|date:"N Y"|capfirst}}</th>{% endfor %} </tr> {% for lbl, months in dashboard.survey.by_month %} <tr> - <th class='sub'>{{lbl}}</th>{%for nb in months %}<td>{{nb}}</td>{% endfor %} + {%for nb in months %} + {% if forloop.counter0|divisibleby:5 %} + <th class='sub'>{{lbl}}</th>{% endif %} + <td>{{nb|intcomma}}</td> + {% endfor %} </tr> {% endfor %} - </table></div> + </table></div></div> - <div class='table'> + <div class='clean-table'> + <h4>{% trans "by department" %}</h4> + <div class='clean-table-wrap'> <table> - <caption>{% trans "By department" %}</caption> <tr> - <th>{% trans "Department" %}</th>{%for yr in dashboard.years %}<th>{{yr}}</th>{% endfor %}<th>{% trans "Sum" %}</th> + {% for yr in dashboard.years %} + {% if forloop.counter0|divisibleby:5 %} + <th class='sub'>{% trans "Department" %}</th> + {% endif %} + <th>{{yr|default_if_none:''}}</th>{% endfor %}<th>{% trans "Sum" %}</th> </tr> {% for lbl, years in dashboard.survey.by_dpt %} <tr> - <th class='sub'>{{lbl}}</th>{%for nb in years %}<td{%if forloop.last%} class='sub'{%endif%}>{{nb}}</td>{% endfor %} + {% for nb in years %} + {% if forloop.counter0|divisibleby:5 %} + <th class='sub'>{{lbl}}</th>{% endif %} + <td{%if forloop.last%} class='sub'{%endif%}>{{nb|intcomma}}</td>{% endfor %} </tr> {% endfor %} - </table></div> + </table></div></div> - <div class='table'> + <div class='clean-table'> + <h4>{% trans "effective operation by department" %}</h4> + <div class='clean-table-wrap'> <table> - <caption>{% trans "Effective operation by department" %}</caption> <tr> - <th rowspan='2'>{% trans "Department" %}</th>{%for yr in dashboard.years %}<th colspan='2'>{{yr}}</th>{% endfor %}<th colspan='2'>{% trans "Sum" %}</th> + {% for yr in dashboard.years %} + {% if forloop.counter0|divisibleby:4 %} + <th rowspan='2'>{% trans "Department" %}</th>{% endif %} + <th class='sub' colspan='2'>{{yr|default_if_none:''}}</th>{% endfor %}<th colspan='2'>{% trans "Sum" %}</th> </tr> <tr> {%for yr in dashboard.years %}<th>{%trans "Nb."%}</th><th>{%trans "Area"%}</th>{% endfor %}<th>{%trans "Nb."%}</th><th>{%trans "Area"%}</th> </tr> {% for lbl, years in dashboard.survey.effective_by_dpt %} <tr> - <th class='sub'>{{lbl}}</th>{%for nb, area, cost, fnap in years %}<td{%if forloop.last%} class='sub'{%endif%}>{{nb}}</td><td{%if forloop.last%} class='sub'{%endif%}>{{area}}</td>{% endfor %} + {%for nb, area, cost, fnap in years %} + {% if forloop.counter0|divisibleby:4 %} + <th class='sub'>{{lbl}}</th>{% endif %} + <td{%if forloop.last%} class='sub'{%endif%}>{{nb|intcomma}}</td><td{%if forloop.last%} class='sub'{%endif%}>{{area|intcomma}}</td>{% endfor %} </tr> {% endfor %} - </table></div> + </table></div></div> - <div class='table'> + <div class='clean-table'> + <h4>{% trans "main towns by number" %}</h4> + <div class='clean-table-wrap'> <table> - <caption>{% trans "Main towns by number" %}</caption> <tr> <th>{% trans "Town" %}</th><th>{% trans "Number" %}</th> </tr> {% for lbl, nb in dashboard.survey.towns %} <tr> - <th class='sub'>{{lbl}}</th><td>{{nb}}</td> + <th class='sub'>{{lbl}}</th><td>{{nb|intcomma}}</td> </tr> {% endfor %} - </table></div> + </table></div></div> - <div class='table'> + <div class='clean-table'> + <h4>{% trans "main towns by surface" %}</h4> + <div class='clean-table-wrap'> <table> - <caption>{% trans "Main towns by surface" %}</caption> <tr> <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|m2_to_ha}}</td> + <th class='sub'>{{lbl}}</th><td>{{nb|m2_to_ha|intcomma}}</td> </tr> {% endfor %} - </table></div> + </table></div></div> </div> <h3>{% trans "Excavation informations" %}</h3> <div> - <div class='table'> + <div class='clean-table'> + <h4>{% trans "total" %}</h4> + <div class='clean-table-wrap'> <table> - <caption>{% trans "Total" %}</caption> <tr> <th>{% trans "Status" %}</th><th>{% trans "Number" %}</th> </tr> {% for lbl, nb in dashboard.excavation.total %} <tr> - <th class='sub'>{{lbl}}</th><td>{{nb}}</td> + <th class='sub'>{{lbl}}</th><td>{{nb|intcomma}}</td> </tr> {% endfor %} - </table></div> + </table></div></div> - <div class='table'> + <div class='clean-table'> + <h4>{% trans "by year" %}</h4> + <div class='clean-table-wrap'> <table> - <caption>{% trans "By year" %}</caption> <tr> - <th>{% trans "State" %}</th>{%for yr in dashboard.years %}<th>{{yr}}</th>{% endfor %} + {%for yr in dashboard.years %} + {% if forloop.counter0|divisibleby:5 %} + <th>{% trans "State" %}</th>{% endif %} + <th>{{yr|default_if_none:''}}</th>{% endfor %} </tr> {% for lbl, years in dashboard.excavation.by_year %} <tr> - <th class='sub'>{{lbl}}</th>{%for nb in years %}<td>{{nb}}</td>{% endfor %} + {% for nb in years %} + {% if forloop.counter0|divisibleby:5 %} + <th class='sub'>{{lbl}}</th>{% endif %} + <td>{{nb|intcomma}}</td>{% endfor %} </tr> {% endfor %} - </table></div> + </table></div></div> - <div class='table'> + <div class='clean-table'> + <h4>{% trans "by realisation year" %}</h4> + <div class='clean-table-wrap'> <table> - <caption>{% trans "By realisation year" %}</caption> <tr> - <th>{% trans "State" %}</th>{%for yr in dashboard.realisation_years %}<th>{{yr.year}}</th>{% endfor %} + {% for yr in dashboard.realisation_years %} + {% if forloop.counter0|divisibleby:5 %} + <th>{% trans "State" %}</th>{% endif %} + <th>{{yr.year}}</th>{% endfor %} </tr> {% for lbl, years in dashboard.excavation.by_realisation_year %} <tr> - <th class='sub'>{{lbl}}</th>{%for nb in years %}<td>{{nb}}</td>{% endfor %} + {% for nb in years %} + {% if forloop.counter0|divisibleby:5 %} + <th class='sub'>{{lbl}}</th>{% endif %} + <td>{{nb}}</td>{% endfor %} </tr> {% endfor %} - </table></div> + </table></div></div> - <div class='table'> + <div class='clean-table'> + <h4>{% trans "current realisation year" %}</h4> + <div class='clean-table-wrap'> <table> - <caption>{% trans "Current realisation year" %}</caption> <tr> <th>{% trans "Status" %}</th>{% for lbl in dashboard.filters_label %}<th>{{lbl}}</th>{%endfor%} </tr> <tr> - <th class='sub'>{% trans "Area"%}</th>{% for nb in dashboard.excavation.area_realised %}<td>{{nb}}</td>{%endfor%} + <th class='sub'>{% trans "Area"%}</th>{% for nb in dashboard.excavation.area_realised %}<td>{{nb|default_if_none:'-'|intcomma}}</td>{%endfor%} </tr> <tr> - <th class='sub'>{% trans "Man-day"%}</th>{% for nb in dashboard.excavation.manday_realised %}<td>{{nb}}</td>{%endfor%} + <th class='sub'>{% trans "Man-day"%}</th>{% for nb in dashboard.excavation.manday_realised %}<td>{{nb|default_if_none:'-'|intcomma}}</td>{%endfor%} </tr> <tr> - <th class='sub'>{% trans "Man-day/hectare"%}</th>{% for nb in dashboard.excavation.mandayhect_realised %}<td>{{nb}}</td>{%endfor%} + <th class='sub'>{% trans "Man-day/hectare"%}</th>{% for nb in dashboard.excavation.mandayhect_realised %}<td>{{nb|default_if_none:'-'|intcomma}}</td>{%endfor%} </tr> - </table></div> + </table></div></div> <p><strong>{% trans "Man-day/hectare for effective operations (current realisation year):" %}</strong> {{dashboard.excavation.mandayhect_real_effective}}</p> - <div class='table'> + <div class='clean-table'> + <h4>{% trans "organizations (current realisation year)" %}</h4> + <div class='clean-table-wrap'> <table> - <caption>{% trans "Organizations (current realisation year)" %}</caption> <tr> <th> </th><th>{% trans "Area" %}</th><th>{% trans "Man-day" %}</th><th>{% trans "Man-day/hectare" %}</th> </tr> {% for org in dashboard.excavation.org_realised %} <tr> - <th class='sub'>{{org.in_charge__attached_to__name}}</th><td>{{org.area}}</td><td>{{org.manday}}</td><td>{{org.mandayhect}}</td> + <th class='sub'>{{org.scientist__attached_to__name}}</th><td>{{org.area|default_if_none:'-'|intcomma}}</td><td>{{org.manday|default_if_none:'-'|intcomma}}</td><td>{{org.mandayhect|default_if_none:'-'|intcomma}}</td> </tr> {% endfor %} - </table></div> + </table></div></div> - <div class='table'> - <table> - <caption>{% trans "Area by organization by year" %}</caption> + <div class='clean-table'> + <h4>{% trans "area by organization by year" %}</h4> + <div class='clean-table-wrap'> + <table class='mini-table'> + {% for org, vals in dashboard.excavation.org_by_year %} + {% if forloop.counter0|divisibleby:5 %} <tr> - <th>{% trans "Organization" %}</th>{% for yr in dashboard.years%}<th>{{yr}}</th>{% endfor %} + {% for yr in dashboard.years%} + {% if forloop.counter0|divisibleby:5 %} + <th>{% trans "Organization" %}</th>{% endif %} + <th>{{yr|default_if_none:'-'}}</th>{% endfor %} </tr> - {% for org, vals in dashboard.excavation.org_by_year %} + {% endif %} <tr> - <th class='sub'>{{org}}</th>{% for area, cost in vals %}<td>{{area}}</td>{% endfor %} + {% for area, cost in vals %} + {% if forloop.counter0|divisibleby:5 %} + <th class='sub'>{{org}}</th>{% endif %} + <td>{{area|default_if_none:'-'|intcomma}}</td>{% endfor %} </tr> {% endfor %} <tr> - <th>{% trans "Sum" %}</th>{% for area in dashboard.excavation.org_by_year_area_sum %}<td>{{area}}</td>{% endfor %} + {% for area in dashboard.excavation.org_by_year_area_sum %} + {% if forloop.counter0|divisibleby:5 %} + <th>{% trans "Sum" %}</th>{% endif %} + <td>{{area|intcomma}}</td>{% endfor %} </tr> <tr> - <th>{% trans "Mean" %}</th>{% for area in dashboard.excavation.org_by_year_area_mean %}<td>{{area}}</td>{% endfor %} + {% for area in dashboard.excavation.org_by_year_area_mean %} + {% if forloop.counter0|divisibleby:5 %} + <th>{% trans "Mean" %}</th>{% endif %} + <td>{{area|intcomma}}</td>{% endfor %} </tr> - </table></div> + </table></div></div> - <div class='table'> - <table> - <caption>{% trans "Area by organization by realisation year" %}</caption> + <div class='clean-table'> + <h4>{% trans "area by organization by realisation year" %}</h4> + <div class='clean-table-wrap'> + <table class='mini-table'> + {% for org, vals in dashboard.excavation.org_by_year %} + + {% if forloop.counter0|divisibleby:5 %} <tr> - <th>{% trans "Organization" %}</th>{% for yr in dashboard.years%}<th>{{yr}}</th>{% endfor %} + {% for yr in dashboard.years%} + {% if forloop.counter0|divisibleby:5 %} + <th>{% trans "Organization" %}</th>{% endif %} + <th>{{yr|default_if_none:'-'}}</th>{% endfor %} </tr> - {% for org, vals in dashboard.excavation.org_by_year %} + {% endif %} + <tr> - <th class='sub'>{{org}}</th>{% for area, cost in vals %}<td>{{area}}</td>{% endfor %} + {% for area, cost in vals %} + {% if forloop.counter0|divisibleby:5 %} + <th class='sub'>{{org}}</th>{% endif %} + <td>{{area|default_if_none:'-'|intcomma}}</td>{% endfor %} </tr> {% endfor %} <tr> - <th>{% trans "Sum" %}</th>{% for area in dashboard.excavation.org_by_year_area_sum %}<td>{{area}}</td>{% endfor %} + {% for area in dashboard.excavation.org_by_year_area_sum %} + {% if forloop.counter0|divisibleby:5 %} + <th>{% trans "Sum" %}</th>{% endif %} + <td>{{area|default_if_none:'-'|intcomma}}</td>{% endfor %} </tr> <tr> - <th>{% trans "Mean" %}</th>{% for area in dashboard.excavation.org_by_year_area_mean %}<td>{{area}}</td>{% endfor %} + {% for area in dashboard.excavation.org_by_year_area_mean %} + {% if forloop.counter0|divisibleby:5 %} + <th>{% trans "Mean" %}</th>{% endif %} + <td>{{area|default_if_none:'-'|intcomma}}</td>{% endfor %} </tr> - </table></div> + </table></div></div> - <div class='table'> + <div class='clean-table'> + <h4>{% trans "by month" %}</h4> + <div class='clean-table-wrap'> <table> - <caption>{% trans "By month" %}</caption> <tr> - <th>{% trans "State" %}</th>{%for mt in dashboard.last_months %}<th>{{mt.date|date:"F Y"|capfirst}}</th>{% endfor %} + {% for mt in dashboard.last_months %} + {% if forloop.counter0|divisibleby:5 %} + <th class='sub'>{% trans "State" %}</th>{% endif %} + <th>{{mt.date|date:"N Y"|capfirst}}</th>{% endfor %} </tr> {% for lbl, months in dashboard.excavation.by_month %} <tr> - <th class='sub'>{{lbl}}</th>{%for nb in months %}<td>{{nb}}</td>{% endfor %} + {% for nb in months %} + {% if forloop.counter0|divisibleby:5 %} + <th class='sub'>{{lbl}}</th>{% endif %} + <td>{{nb|default_if_none:'-'|intcomma}}</td>{% endfor %} </tr> {% endfor %} - </table></div> + </table></div></div> - <div class='table'> + <div class='clean-table'> + <h4>{% trans "by department" %}</h4> + <div class='clean-table-wrap'> <table> - <caption>{% trans "By department" %}</caption> <tr> - <th>{% trans "Department" %}</th>{%for yr in dashboard.years %}<th>{{yr}}</th>{% endfor %}<th>{% trans "Sum" %}</th> + {% for yr in dashboard.years %} + {% if forloop.counter0|divisibleby:5 %} + <th class='sub'>{% trans "Department" %}</th>{% endif %} + <th>{{yr|default_if_none:'-'}}</th>{% endfor %} + <th>{% trans "Sum" %}</th> </tr> {% for lbl, years in dashboard.excavation.by_dpt %} <tr> - <th class='sub'>{{lbl}}</th>{%for nb in years %}<td{%if forloop.last%} class='sub'{%endif%}>{{nb}}</td>{% endfor %} + {% for nb in years %} + {% if forloop.counter0|divisibleby:5 %} + <th class='sub'>{{lbl}}</th>{% endif %} + <td{%if forloop.last%} class='sub'{%endif%}>{{nb|default_if_none:'-'|intcomma}}</td>{% endfor %} </tr> {% endfor %} - </table></div> + </table></div></div> - <div class='table'> + <div class='clean-table'> + <h4>{% trans "effective operation by department" %}</h4> + <div class='clean-table-wrap'> <table> - <caption>{% trans "Effective operation by department" %}</caption> <tr> - <th rowspan='2'>{% trans "Department" %}</th>{%for yr in dashboard.years %}<th colspan='3'>{{yr}}</th>{% endfor %}<th colspan='3'>{% trans "Sum" %}</th> + {% for yr in dashboard.years %} + {% if forloop.counter0|divisibleby:3 %} + <th rowspan='2' class="sub">{% trans "Department" %}</th>{% endif %} + <th colspan='3'>{{yr|default_if_none:'-'}}</th>{% endfor %}<th colspan='3'>{% trans "Sum" %}</th> </tr> <tr> - {%for yr in dashboard.years %}<th>{%trans "Nb."%}</th><th>{%trans "Cost"%}</th><th>{%trans "FNAP cost"%}</th>{% endfor %}<th>{%trans "Nb."%}</th><th>{%trans "Cost"%}</th><th>{%trans "FNAP cost"%}</th> + {% for yr in dashboard.years %}<th>{%trans "Nb."%}</th><th>{%trans "Cost"%}</th><th>{%trans "FNAP cost"%}</th>{% endfor %}<th>{%trans "Nb."%}</th><th>{%trans "Cost"%}</th><th>{%trans "FNAP cost"%}</th> </tr> {% for lbl, years in dashboard.excavation.effective_by_dpt %} <tr> - <th class='sub'>{{lbl}}</th>{%for nb, area, cost, fnap in years %}<td{%if forloop.last%} class='sub'{%endif%}>{{nb}}</td><td{%if forloop.last%} class='sub'{%endif%}>{{cost}}</td><td{%if forloop.last%} class='sub'{%endif%}>{{fnap}}</td>{% endfor %} + {% for nb, area, cost, fnap in years %} + {% if forloop.counter0|divisibleby:3 %} + <th class='sub'>{{lbl}}</th>{% endif %} + <td{%if forloop.last%} class='sub'{%endif%}>{{nb|intcomma}}</td><td{%if forloop.last%} class='sub'{%endif%}>{{cost|intcomma}}</td><td{%if forloop.last%} class='sub'{%endif%}>{{fnap|intcomma}}</td>{% endfor %} </tr> {% endfor %} - </table></div> + </table></div></div> - <div class='table'> + <div class='clean-table'> + <h4>{% trans "main towns by number" %}</h4> + <div class='clean-table-wrap'> <table> - <caption>{% trans "Main towns by number" %}</caption> <tr> <th>{% trans "Town" %}</th><th>{% trans "Number" %}</th> </tr> {% for lbl, nb in dashboard.excavation.towns %} <tr> - <th class='sub'>{{lbl}}</th><td>{{nb}}</td> + <th class='sub'>{{lbl}}</th><td>{{nb|intcomma}}</td> </tr> {% endfor %} - </table></div> + </table></div></div> - <div class='table'> + <div class='clean-table'> + <h4>{% trans "main towns by cost" %}</h4> + <div class='clean-table-wrap'> <table> - <caption>{% trans "Main towns by cost" %}</caption> <tr> <th>{% trans "Town" %}</th><th>{% trans "Cost (euros)" %}</th> </tr> {% for lbl, nb in dashboard.excavation.towns_cost %} <tr> - <th class='sub'>{{lbl}}</th><td>{{nb}}</td> + <th class='sub'>{{lbl}}</th><td>{{nb|intcomma}}</td> </tr> {% endfor %} - </table></div> + </table></div></div> </div> |