diff options
| -rw-r--r-- | archaeological_finds/forms.py | 11 | ||||
| -rw-r--r-- | archaeological_finds/models_finds.py | 8 | ||||
| -rw-r--r-- | archaeological_finds/templates/ishtar/sheet_basefind.html | 2 | ||||
| -rw-r--r-- | archaeological_finds/templates/ishtar/sheet_find.html | 2 | ||||
| -rw-r--r-- | archaeological_finds/templates/ishtar/sheet_museum_find.html | 2 |
5 files changed, 17 insertions, 8 deletions
diff --git a/archaeological_finds/forms.py b/archaeological_finds/forms.py index 2dd222927..160863256 100644 --- a/archaeological_finds/forms.py +++ b/archaeological_finds/forms.py @@ -490,7 +490,7 @@ class BasicFindForm(CustomForm, ManageOldType): communicabilitie = widgets.Select2MultipleField( label=_("Communicability"), required=False ) - comment = forms.CharField(label=_("Comment"), required=False, widget=forms.Textarea) + comment = forms.CharField(label=_("General comment"), required=False, widget=forms.Textarea) cultural_attribution = widgets.Select2MultipleField( label=_("Cultural attribution"), required=False, @@ -657,6 +657,7 @@ class FindForm(BasicFindForm): "museum_inventory_transcript", "description", "public_description", + "get_first_base_find__comment", "get_first_base_find__discovery_date", "get_first_base_find__discovery_date_taq", "get_first_base_find__batch", @@ -698,6 +699,8 @@ class FindForm(BasicFindForm): ] HEADERS = BasicFindForm.HEADERS.copy() + get_first_base_find__comment = forms.CharField(label=_("Comment on the circumstances of discovery"), + widget=forms.Textarea, required=False) get_first_base_find__excavation_id = forms.CharField( label=_("Excavation ID"), required=False ) @@ -1606,8 +1609,9 @@ class FindSelect(GeoItemSelect, PeriodSelect): ], ), ( - _("Discovery date"), + _("Discovery"), [ + "base_finds__comment", "base_finds__discovery_date__before", "base_finds__discovery_date__after", "base_finds__discovery_date_taq__before", @@ -1826,6 +1830,7 @@ class FindSelect(GeoItemSelect, PeriodSelect): ) description = forms.CharField(label=_("Description")) + base_finds__comment = forms.CharField(label=_("Base find - Comment on the circumstances of discovery")) base_finds__discovery_date__after = forms.DateField( label=_("Discovery date (exact or beginning) after"), widget=DatePicker ) @@ -1891,7 +1896,7 @@ class FindSelect(GeoItemSelect, PeriodSelect): inscription = forms.CharField(label=_("Inscription")) communicabilities = forms.ChoiceField(label=_("Communicability")) - comment = forms.CharField(label=_("Comment")) + comment = forms.CharField(label=_("General comment")) cultural_attributions = forms.ChoiceField( label=_("Cultural attribution"), choices=[], required=False diff --git a/archaeological_finds/models_finds.py b/archaeological_finds/models_finds.py index 4eabda174..977a3ff3b 100644 --- a/archaeological_finds/models_finds.py +++ b/archaeological_finds/models_finds.py @@ -554,7 +554,7 @@ class BaseFind( ) excavation_id = models.TextField(_("Excavation ID"), blank=True, default="") description = models.TextField(_("Description"), blank=True, default="") - comment = models.TextField(_("Comment"), blank=True, default="") + comment = models.TextField(_("Comment on the circumstances of discovery"), blank=True, default="") special_interest = models.CharField( _("Special interest"), blank=True, default="", max_length=120 ) @@ -1319,6 +1319,10 @@ class Find( pgettext_lazy("key for text search", "context-record"), "base_finds__context_record__cached_label__icontains", ), + "base_finds__comment": SearchAltName( + pgettext_lazy("key for text search", "discovery-comment"), + "base_finds__comment__iexact", + ), "ope_relation_types": SearchAltName( pgettext_lazy("key for text search", "operation-relation-type"), "ope_relation_types", @@ -2125,7 +2129,7 @@ class Find( _("Dimensions comment"), blank=True, default="" ) mark = models.TextField(_("Marking details"), blank=True, default="") - comment = models.TextField(_("Comment"), blank=True, default="") + comment = models.TextField(_("General comment"), blank=True, default="") dating_comment = models.TextField(_("Comment on dating"), blank=True, default="") previous_id = models.TextField(_("Previous ID"), blank=True, default="") index = models.IntegerField("Index", default=0) diff --git a/archaeological_finds/templates/ishtar/sheet_basefind.html b/archaeological_finds/templates/ishtar/sheet_basefind.html index 1923bf662..82c2cbd53 100644 --- a/archaeological_finds/templates/ishtar/sheet_basefind.html +++ b/archaeological_finds/templates/ishtar/sheet_basefind.html @@ -47,7 +47,7 @@ {% field_flex "Special interest" base_find.special_interest '' '' first %} {% field_flex_full "Description" base_find.description "<pre>" "</pre>" first %} - {% field_flex_full "Comment" base_find.comment "<pre>" "</pre>" first %} + {% field_flex_full _("Comment on the circumstances of discovery") base_find.comment "<pre>" "</pre>" first %} </div> {% with item=base_find %} {% include "ishtar/blocks/sheet_json.html" %} diff --git a/archaeological_finds/templates/ishtar/sheet_find.html b/archaeological_finds/templates/ishtar/sheet_find.html index 6e0013dcf..530a1664f 100644 --- a/archaeological_finds/templates/ishtar/sheet_find.html +++ b/archaeological_finds/templates/ishtar/sheet_find.html @@ -191,7 +191,7 @@ {% field_flex_full "Inscription" item.inscription "<pre>" "</pre>" %} {% field_flex "Manufacturing place" item.manufacturing_place %} {% field_flex_multiple_obj "Communicability" item 'communicabilities' %} - {% field_flex_full "Comment" item.comment "<pre>" "</pre>" %} + {% field_flex_full _("General comment") item.comment "<pre>" "</pre>" %} </div> {% if item.length or item.width or item.height or item.diameter or item.thickness or item.volume or item.weight_string or item.dimensions_comment or item.clutter_long_side or item.clutter_short_side or item.clutter_height %} diff --git a/archaeological_finds/templates/ishtar/sheet_museum_find.html b/archaeological_finds/templates/ishtar/sheet_museum_find.html index d0a259353..6e6080b92 100644 --- a/archaeological_finds/templates/ishtar/sheet_museum_find.html +++ b/archaeological_finds/templates/ishtar/sheet_museum_find.html @@ -140,7 +140,7 @@ {% field_flex_full "Inscription" item.inscription "<pre>" "</pre>" %} {% field_flex "Manufacturing place" item.manufacturing_place %} {% field_flex_multiple_obj "Communicability" item 'communicabilities' %} - {% field_flex_full "Comment" item.comment "<pre>" "</pre>" %} + {% field_flex_full _("General comment") item.comment "<pre>" "</pre>" %} </div> {% if item.has_museum_section %} |