diff options
| author | Étienne Loks <etienne.loks@iggdrasil.net> | 2016-12-04 23:11:59 +0100 |
|---|---|---|
| committer | Étienne Loks <etienne.loks@iggdrasil.net> | 2016-12-04 23:11:59 +0100 |
| commit | 75990cbba38b0149bad31ed3f1d999dd9de29cff (patch) | |
| tree | 323f5c52f0b1a869b170d38d10174db061ba5776 | |
| parent | cf38d1b8d0328b28b7dc48f7981907e66b9fdc8e (diff) | |
| download | Ishtar-75990cbba38b0149bad31ed3f1d999dd9de29cff.tar.bz2 Ishtar-75990cbba38b0149bad31ed3f1d999dd9de29cff.zip | |
Adapt treatment cols
| -rw-r--r-- | archaeological_finds/models.py | 5 | ||||
| -rw-r--r-- | archaeological_finds/templates/ishtar/sheet_find.html | 8 |
2 files changed, 11 insertions, 2 deletions
diff --git a/archaeological_finds/models.py b/archaeological_finds/models.py index d142a22b3..aaa145c65 100644 --- a/archaeological_finds/models.py +++ b/archaeological_finds/models.py @@ -798,8 +798,9 @@ post_delete.connect(post_save_cache, sender=TreatmentType) class Treatment(BaseHistorizedItem, ImageModel, OwnPerms): SHOW_URL = 'show-treatment' - TABLE_COLS = ('treatment_types_lbl', 'person', 'start_date', - 'downstream_cached_label', 'upstream_cached_label') + TABLE_COLS = ('year', 'index', 'treatment_types_lbl', 'label', 'person', + 'start_date', 'downstream_cached_label', + 'upstream_cached_label') REVERSED_BOOL_FIELDS = ['image__isnull'] EXTRA_REQUEST_KEYS = { "label": 'label__icontains', diff --git a/archaeological_finds/templates/ishtar/sheet_find.html b/archaeological_finds/templates/ishtar/sheet_find.html index 2efb9a69c..c5cfc39b5 100644 --- a/archaeological_finds/templates/ishtar/sheet_find.html +++ b/archaeological_finds/templates/ishtar/sheet_find.html @@ -86,6 +86,8 @@ <table id='{{window_id}}-upstream'> <tr> <th> </th> + <th>{% trans "Year - index" %}</th> + <th>{% trans "Label" %}</th> <th>{% trans "Type" %}</th> <th>{% trans "Related finds" %}</th> <th>{% trans "Doer" %}</th> @@ -101,6 +103,8 @@ <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 }}</td> <td class='string'>{{ treatment.treatment_types_lbl }}</td> <td class='item-list'>{% for item in items %}<span>{{item}} {{ item|link_to_window}}</span>{% endfor %}</td> <td class='string'>{{ treatment.person|default_if_none:"-" }}</td> @@ -122,6 +126,8 @@ <table id='{{window_id}}-downstream'> <tr> <th> </th> + <th>{% trans "Year - index" %}</th> + <th>{% trans "Label" %}</th> <th>{% trans "Type" %}</th> <th>{% trans "Related finds" %}</th> <th>{% trans "Doer" %}</th> @@ -137,6 +143,8 @@ <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 }}</td> <td class='string'>{{ treatment.treatment_types_lbl }}</td> <td class='item-list'>{% for item in items %}<span>{{item}} {{ item|link_to_window}}</span>{% endfor %}</td> <td class='string'>{{ treatment.person|default_if_none:"" }}</td> |