diff options
Diffstat (limited to 'ishtar/templates/dashboard_operation.html')
| -rw-r--r-- | ishtar/templates/dashboard_operation.html | 211 |
1 files changed, 60 insertions, 151 deletions
diff --git a/ishtar/templates/dashboard_operation.html b/ishtar/templates/dashboard_operation.html index b1fb0e8d5..71d9563d2 100644 --- a/ishtar/templates/dashboard_operation.html +++ b/ishtar/templates/dashboard_operation.html @@ -279,6 +279,47 @@ {% endfor %} </table></div> + <div class='table'> + <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> + </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 %} + </tr> + {% endfor %} + </table></div> + + <div class='table'> + <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> + </tr> + {% endfor %} + </table></div> + + <div class='table'> + <table> + <caption>{% trans "Main towns by surface" %}</caption> + <tr> + <th>{% trans "Town" %}</th><th>{% trans "Total surface (m²)" %}</th> + </tr> + {% for lbl, nb in dashboard.survey.towns_surface %} + <tr> + <th class='sub'>{{lbl}}</th><td>{{nb}}</td> + </tr> + {% endfor %} + </table></div> </div> @@ -421,181 +462,49 @@ {% endfor %} </table></div> - </div> -<!-- - <div> - - <h3>{% trans "Research archaeology" %}</h3> - - <p><strong>{% trans "Total:" %}</strong> {{dashboard.research.total_number}}</p> - <div class='table'> - <table> - <caption>{% trans "By year"%}</caption> - <tr> - {% for year in dashboard.research.by_year %}<th>{{year.date.year}}</th>{% endfor %} - </tr> - <tr> - {% for year in dashboard.research.by_year %}<td>{{year.number}}</td>{% endfor%} - </tr> - </table> - </div> - - <div class='table'> - <table> - <caption>{% trans "By month"%}</caption> - <tr> - {% for month in dashboard.research.by_month %}<th>{{month.date|date:"F Y"|capfirst}}</th>{% endfor %} - </tr> - <tr> - {% for month in dashboard.research.by_month %}<td>{{month.number}}</td>{% endfor%} - </tr> - </table> - </div> - - <div class='table'> - <table> - <caption>{% trans "By department"%}</caption> - <tr> - {% for dpt in dashboard.research.by_dpt %}<th>{{dpt.department__label}}</th>{% endfor %} - </tr> - <tr> - {% for dpt in dashboard.research.by_dpt %}<td>{{dpt.number}}</td>{% endfor%} - </tr> - </table> - </div> - - <div class='table'> - <table> - <caption>{% trans "Main towns"%}</caption> - <tr> - {% for town in dashboard.research.towns %}<th>{{town.town__name}}</th>{% endfor %} - </tr> - <tr> - {% for town in dashboard.research.towns %}<td>{{town.number}}</td>{% endfor%} - </tr> - </table> - </div> - - </div> - <div> - - <h3>{% trans "Rescue archaeology" %}</h3> - - <p><strong>{% trans "Total:" %}</strong> {{dashboard.rescue.total_number}}</p> - - <div class='table'> - <table> - <caption>{% trans "By saisine type"%}</caption> - <tr> - {% for saisine in dashboard.rescue.saisine %}<th>{{saisine.saisine_type__label}}</th>{% endfor %} - </tr> - <tr> - {% for saisine in dashboard.rescue.saisine %}<td>{{saisine.number}}</td>{% endfor%} - </tr> - </table> - </div> - - <div class='table'> - <table> - <caption>{% trans "By administrative act"%}</caption> - <tr> - {% for act in dashboard.rescue.administrative_act %}<th>{{act.act_type__label}}</th>{% endfor %} - </tr> - <tr> - {% for act in dashboard.rescue.administrative_act %}<td>{{act.number}}</td>{% endfor%} - </tr> - </table> - </div> - - <div class='table'> - <table> - <caption>{% trans "By year"%}</caption> - <tr> - {% for year in dashboard.rescue.by_year %}<th>{{year.date.year}}</th>{% endfor %} - </tr> - <tr> - {% for year in dashboard.rescue.by_year %}<td>{{year.number}}</td>{% endfor%} - </tr> - </table> - </div> - <div class='table'> <table> - <caption>{% trans "By month"%}</caption> - <tr> - {% for month in dashboard.rescue.by_month %}<th>{{month.date|date:"F Y"|capfirst}}</th>{% endfor %} - </tr> + <caption>{% trans "Effective operation by department" %}</caption> <tr> - {% for month in dashboard.rescue.by_month %}<td>{{month.number}}</td>{% endfor%} + <th rowspan='2'>{% trans "Department" %}</th>{%for yr in dashboard.years %}<th colspan='3'>{{yr}}</th>{% endfor %}<th colspan='3'>{% trans "Sum" %}</th> </tr> - </table> - </div> - - <p><strong>{% trans "Archaeological files linked to at least one operation:" %}</strong> {{dashboard.rescue.with_associated_operation}}</p> - <p><strong>{% trans "Archaeological files linked to at least one operation (%):" %}</strong> {{dashboard.rescue.with_associated_operation_percent}}</p> - - <div class='table'> - <table> - <caption>{% trans "Archaeological files linked to at least one operation (%)"%}</caption> <tr> - {% for year in dashboard.rescue.operational_by_year %}<th>{{year.date.year}}</th>{% endfor %} + {%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.survey.effective_by_dpt %} <tr> - {% for year in dashboard.rescue.operational_by_year %}<td>{{year.number}}</td>{% endfor%} + <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 %} </tr> - </table> - </div> - - <div class='table'> - <table> - <caption>{% trans "By department"%}</caption> - <tr> - {% for dpt in dashboard.rescue.by_dpt %}<th>{{dpt.department__label}}</th>{% endfor %} - </tr> - <tr> - {% for dpt in dashboard.rescue.by_dpt %}<td>{{dpt.number}}</td>{% endfor%} - </tr> - </table> - </div> + {% endfor %} + </table></div> <div class='table'> <table> - <caption>{% trans "Surface by department (m²)"%}</caption> + <caption>{% trans "Main towns by number" %}</caption> <tr> - {% for dpt in dashboard.rescue.surface_by_dpt %}<th>{{dpt.department__label}}</th>{% endfor %} + <th>{% trans "Town" %}</th><th>{% trans "Number" %}</th> </tr> + {% for lbl, nb in dashboard.excavation.towns %} <tr> - {% for dpt in dashboard.rescue.surface_by_dpt %}<td>{{dpt.number}}</td>{% endfor%} + <th class='sub'>{{lbl}}</th><td>{{nb}}</td> </tr> - </table> - </div> + {% endfor %} + </table></div> <div class='table'> <table> - <caption>{% trans "Main towns by number"%}</caption> + <caption>{% trans "Main towns by cost" %}</caption> <tr> - {% for town in dashboard.rescue.towns %}<th>{{town.town__name}}</th>{% endfor %} + <th>{% trans "Town" %}</th><th>{% trans "Cost (€)" %}</th> </tr> + {% for lbl, nb in dashboard.excavation.towns_cost %} <tr> - {% for town in dashboard.rescue.towns %}<td>{{town.number}}</td>{% endfor%} + <th class='sub'>{{lbl}}</th><td>{{nb}}</td> </tr> - </table> - </div> + {% endfor %} + </table></div> - <div class='table'> - <table> - <caption>{% trans "Main towns by surface (m²)"%}</caption> - <tr> - {% for town in dashboard.rescue.surface_by_town %}<th>{{town.town__name}}</th>{% endfor %} - </tr> - <tr> - {% for town in dashboard.rescue.surface_by_town %}<td>{{town.number}}</td>{% endfor%} - </tr> - </table> - </div> </div> - -/--> </div> {% endblock %} |