diff options
| -rw-r--r-- | archaeological_finds/forms.py | 11 | ||||
| -rw-r--r-- | archaeological_finds/templates/ishtar/sheet_find.html | 4 |
2 files changed, 14 insertions, 1 deletions
diff --git a/archaeological_finds/forms.py b/archaeological_finds/forms.py index 808003712..51ac1eed7 100644 --- a/archaeological_finds/forms.py +++ b/archaeological_finds/forms.py @@ -148,8 +148,11 @@ class FindSelect(TableSelect): # TODO search by warehouse material_types = forms.ChoiceField(label=_(u"Material type"), choices=[]) object_types = forms.ChoiceField(label=_(u"Object type"), choices=[]) + preservation_to_considers = forms.ChoiceField( + choices=[], label=_(u"Preservation type")) conservatory_state = forms.ChoiceField(label=_(u"Conservatory state"), choices=[]) + integrities = forms.ChoiceField(label=_(u"Integrity"), choices=[]) base_finds__find__description = forms.CharField(label=_(u"Description")) base_finds__batch = forms.ChoiceField(label=_(u"Batch/object"), choices=models.IS_ISOLATED_CHOICES) @@ -172,6 +175,14 @@ class FindSelect(TableSelect): models.ObjectType.get_types() self.fields['checked'].choices = \ [('', '--')] + list(models.CHECK_CHOICES) + self.fields['preservation_to_considers'].choices = \ + models.PreservationType.get_types() + self.fields['preservation_to_considers'].help_text = \ + models.PreservationType.get_help() + self.fields['integrities'].choices = \ + models.IntegrityType.get_types() + self.fields['integrities'].help_text = \ + models.IntegrityType.get_help() class FindFormSelection(forms.Form): diff --git a/archaeological_finds/templates/ishtar/sheet_find.html b/archaeological_finds/templates/ishtar/sheet_find.html index 96f190120..126cbefba 100644 --- a/archaeological_finds/templates/ishtar/sheet_find.html +++ b/archaeological_finds/templates/ishtar/sheet_find.html @@ -47,8 +47,9 @@ {% field "Find number" item.find_number %} {% field "Conservatory state" item.conservatory_state %} -{% field "Type of preservation to consider" item.preservation_to_consider %} +{% field_multiple "Type of preservation to consider" item.preservation_to_considers %} {% field_multiple "Object types" item.object_types %} +{% field_multiple "Integrity" item.integrities %} {% field "Checked" item.checked|from_dict:item.CHECK_DICT %} {% if item.upstream_treatment %}<p><label>{%trans "Upstream treatment"%}{% trans ":"%}</label> @@ -65,6 +66,7 @@ <span class='value'>{{base_find.complete_id}}</span></p> {% field "Short ID" base_find.short_id %} +{% field "Batch/object" base_find|from_dict:base_find.IS_ISOLATED_DICT %} {% if base_find.discovery_date %} <p><label>{%trans "Discovery date"%}{% trans ":"%}</label> |