diff options
Diffstat (limited to 'archaeological_finds/templates/ishtar/sheet_find.html')
-rw-r--r-- | archaeological_finds/templates/ishtar/sheet_find.html | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/archaeological_finds/templates/ishtar/sheet_find.html b/archaeological_finds/templates/ishtar/sheet_find.html index 27d106fbd..465e2e1d5 100644 --- a/archaeological_finds/templates/ishtar/sheet_find.html +++ b/archaeological_finds/templates/ishtar/sheet_find.html @@ -382,12 +382,11 @@ <tr> <th> </th> <th>{% trans "Year - index" %}</th> - <th>{% trans "Label" %}</th> - <th>{% trans "Type" %}</th> + <th>{% trans "Label/type" %}</th> <th>{% trans "State" %}</th> <th>{% trans "Related finds (max. 15 displayed)" %}</th> <th>{% trans "Doer" %}</th> - <th>{% trans "Container" %}</th> + {% if can_view_container %}<th>{% trans "Container" %}</th>{% endif %} <th>{% trans "Start date" %}</th> <th>{% trans "End date" %}</th> </tr> @@ -400,13 +399,12 @@ <i class="fa fa-info-circle" aria-hidden="true"></i> </a> </td> - <td class='string'>{{ treatment.year }} - {{treatment.index}}</td> - <td class='string'>{{ treatment.label|default_if_none:"-" }}</td> - <td class='string'>{{ treatment.treatment_types_lbl }}</td> + <td class='string'>{{ treatment.year|unlocalize }}-{{treatment.index|unlocalize}}</td> + <td class='string'>{% if treatment.label %}{{ treatment.label}} ({{treatment.treatment_types_lbl}}){% else %}{{treatment.treatment_types_lbl}}{% endif %}</td> <td class='string'>{{ treatment.treatment_state|default_if_none:"-" }}</td> <td class='item-list'>{% for it in items %}<span>{{it}} {{it|link_to_window:request}}</span>{% endfor %}</td> <td class='string'>{{ treatment.person|default_if_none:"-" }}</td> - <td class='string'>{{ treatment.container|default_if_none:"-" }}</td> + {% if can_view_container %}<td class='string'>{% for find_treatment in treatment.get_find_treatment_list %}{% if find_treatment.find.pk == item.pk %}{{ find_treatment.full_location|default_if_none:"-" }}{% endif %}{% endfor %}</td>{% endif %} <td class='string'>{{ treatment.start_date|default_if_none:"-" }}</td> <td class='string'>{{ treatment.end_date|default_if_none:"-" }}</td> </tr> |