diff options
Diffstat (limited to 'archaeological_operations/templates')
| -rw-r--r-- | archaeological_operations/templates/ishtar/sheet_operation.html | 39 |
1 files changed, 20 insertions, 19 deletions
diff --git a/archaeological_operations/templates/ishtar/sheet_operation.html b/archaeological_operations/templates/ishtar/sheet_operation.html index ef9c9632a..e290ce319 100644 --- a/archaeological_operations/templates/ishtar/sheet_operation.html +++ b/archaeological_operations/templates/ishtar/sheet_operation.html @@ -1,5 +1,5 @@ {% extends "ishtar/sheet.html" %} -{% load i18n l10n ishtar_helpers window_tables window_header window_ope_tables window_field from_dict %} +{% load i18n l10n ishtar_helpers humanize window_tables window_header window_ope_tables window_field from_dict %} {% block head_title %}<strong>{% trans "Operation" %}</strong> - {{item.short_label}}{% if item.common_name %} - {{item.common_name}}{% endif %}{% endblock %} @@ -535,12 +535,12 @@ <h4>{% trans "Parcels" %}</h4> <div class='row'> - {% field_flex_2 "Number of parcels" item.nb_parcels %} + {% field_flex_2 "Number of parcels" item.nb_parcels|intcomma %} </div> <h4>{% trans "Context records" %}</h4> <div class='row'> - {% field_flex_2 "Number of context records" item.nb_context_records %} + {% field_flex_2 "Number of context records" item.nb_context_records|intcomma %} </div> <div class='row'> {% if item.nb_context_records_by_type %} @@ -548,7 +548,7 @@ <table class="table table-striped"> <tr><th>{% trans "Type" %}</th><th>{% trans "Number" %}</th></tr> {% for label, nb in item.nb_context_records_by_type %} - <tr><td>{{label|default:"-"}}</td><td>{{nb}}</td></tr> + <tr><td>{{label|default:"-"}}</td><td class="text-right">{{nb}}</td></tr> {% endfor %} </table> </div> @@ -558,7 +558,7 @@ <table class="table table-striped"> <tr><th>{% trans "Chronological period" %}</th><th>{% trans "Number" %}</th></tr> {% for label, nb in item.nb_context_records_by_periods %} - <tr><td>{{label|default:"-"}}</td><td>{{nb}}</td></tr> + <tr><td>{{label|default:"-"}}</td><td class="text-right">{{nb}}</td></tr> {% endfor %} </table> </div> @@ -567,35 +567,36 @@ <h4>{% trans "Finds" %}</h4> <div class='row'> - {% field_flex_2 "Number of finds" item.nb_finds %} + {% field_flex "Number of finds" item.nb_finds|intcomma %} + {% field_flex _("Number of remains") item.nb_remains|intcomma %} </div> <div class='row'> - {% if item.nb_finds_by_material_type %} + {% if item.nb_finds_by_material_type_full %} <div class="col-12 col-md-6 col-lg-4"> <table class="table table-striped"> - <tr><th>{% trans "Material type" %}</th><th>{% trans "Number" %}</th></tr> - {% for label, nb in item.nb_finds_by_material_type %} - <tr><td>{{label|default:"-"}}</td><td>{{nb}}</td></tr> + <tr><th>{% trans "Material type" %}</th><th>{% trans "Number" %}</th><th>{% trans "Number of remains" %}</th></tr> + {% for label, nb, remains in item.nb_finds_by_material_type_full %} + <tr><td>{{label|default:"-"}}</td><td class="text-right">{{nb}}</td><td class="text-right">{{remains|default:"-"}}</td></tr> {% endfor %} </table> </div> {% endif %} - {% if item.nb_finds_by_types %} + {% if item.nb_finds_by_types_full %} <div class="col-12 col-md-6 col-lg-4"> <table class="table table-striped"> - <tr><th>{% trans "Object type" %}</th><th>{% trans "Number" %}</th></tr> - {% for label, nb in item.nb_finds_by_types %} - <tr><td>{{label}}</td><td>{{nb}}</td></tr> + <tr><th>{% trans "Object type" %}</th><th>{% trans "Number" %}</th><th>{% trans "Number of remains" %}</th></tr> + {% for label, nb, remains in item.nb_finds_by_types_full %} + <tr><td>{{label}}</td><td class="text-right">{{nb}}</td><td class="text-right">{{remains|default:"-"}}</td></tr> {% endfor %} </table> </div> {% endif %} - {% if item.nb_finds_by_periods %} + {% if item.nb_finds_by_periods_full %} <div class="col-12 col-md-6 col-lg-4"> <table class="table table-striped"> - <tr><th>{% trans "Chronological period" %}</th><th>{% trans "Number" %}</th></tr> - {% for label, nb in item.nb_finds_by_periods %} - <tr><td>{{label|default:"-"}}</td><td>{{nb}}</td></tr> + <tr><th>{% trans "Chronological period" %}</th><th>{% trans "Number" %}</th><th>{% trans "Number of remains" %}</th></tr> + {% for label, nb, remains in item.nb_finds_by_periods_full %} + <tr><td>{{label|default:"-"}}</td><td>{{nb}}</td><td>{{remains|default:"-"}}</td></tr> {% endfor %} </table> </div> @@ -612,7 +613,7 @@ <table class="table table-striped"> <tr><th>{% trans "Type" %}</th><th>{% trans "Number" %}</th></tr> {% for label, nb in item.nb_documents_by_types %} - <tr><td>{{label}}</td><td>{{nb}}</td></tr> + <tr><td>{{label}}</td><td class="text-right">{{nb}}</td></tr> {% endfor %} </table> </div> |