From 96851b3d2bfb238c8450b34642a8e43f1fc55fbe Mon Sep 17 00:00:00 2001 From: Étienne Loks Date: Wed, 20 Mar 2024 11:06:13 +0100 Subject: ✨ Find/Base find comment fields: rename, add to form, search (refs #5604) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- archaeological_finds/forms.py | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) (limited to 'archaeological_finds/forms.py') 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 -- cgit v1.2.3