From 707e0f9edcde92c47cd543325187e9e13b9ef43f Mon Sep 17 00:00:00 2001 From: Étienne Loks Date: Wed, 26 Jun 2024 10:16:18 +0200 Subject: ✨ criteria search: adapt searches for relative search (dates and numbers) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- archaeological_finds/forms.py | 27 +++++++++------------------ 1 file changed, 9 insertions(+), 18 deletions(-) (limited to 'archaeological_finds/forms.py') diff --git a/archaeological_finds/forms.py b/archaeological_finds/forms.py index 60a3337d5..30dacf8f2 100644 --- a/archaeological_finds/forms.py +++ b/archaeological_finds/forms.py @@ -1639,24 +1639,20 @@ class FindSelect(GeoItemSelect, PeriodSelect): "museum_depositor_inventory_number", "museum_collection_entry_mode", "museum_entry_mode_comment", - "museum_entry_date_before", - "museum_entry_date_after", - "museum_entry_date_end_before", - "museum_entry_date_end_after", + "museum_entry_date", + "museum_entry_date_end", "museum_entry_date_comment", "museum_donor", "museum_inventory_marking_presence", "museum_marking_type", "museum_collection", "museum_former_collections", - "museum_inventory_entry_year_before", - "museum_inventory_entry_year_after", + "museum_inventory_entry_year", "museum_inventory_conformity", "museum_conformity_comment", "museum_inventory_transcript", "museum_original_repro", - "museum_allocation_date_before", - "museum_allocation_date_after", + "museum_allocation_date", "museum_purchase_price", ), ), @@ -1672,24 +1668,20 @@ class FindSelect(GeoItemSelect, PeriodSelect): "museum_depositor_inventory_number", "museum_collection_entry_mode", "museum_entry_mode_comment", - "museum_entry_date_before", - "museum_entry_date_after", - "museum_entry_date_end_before", - "museum_entry_date_end_after", + "museum_entry_date", + "museum_entry_date_end", "museum_entry_date_comment", "museum_donor", "museum_inventory_marking_presence", "museum_marking_type", "museum_collection", "museum_former_collections", - "museum_inventory_entry_year_before", - "museum_inventory_entry_year_after", + "museum_inventory_entry_year", "museum_inventory_conformity", "museum_conformity_comment", "museum_inventory_transcript", "museum_original_repro", - "museum_allocation_date_before", - "museum_allocation_date_after", + "museum_allocation_date", "museum_purchase_price", "museum_inventory_quantity", "museum_observed_quantity", @@ -1956,8 +1948,7 @@ class FindSelect(GeoItemSelect, PeriodSelect): reverse_lazy('autocomplete-biographicalnote'), associated_model=BiographicalNote), validators=[valid_id(BiographicalNote)]) - museum_inventory_entry_year_before = forms.IntegerField(label=_("Museum - Inventory entry year - before")) - museum_inventory_entry_year_after = forms.IntegerField(label=_("Museum - Inventory entry year - after")) + museum_inventory_entry_year= forms.IntegerField(label=_("Museum - Inventory entry year")) museum_inventory_conformity = forms.ChoiceField( label=_("Museum - Conformity with inventory"), choices=[] ) -- cgit v1.2.3