diff options
| author | Étienne Loks <etienne.loks@iggdrasil.net> | 2024-06-26 10:16:18 +0200 |
|---|---|---|
| committer | Étienne Loks <etienne.loks@iggdrasil.net> | 2024-06-26 10:16:18 +0200 |
| commit | 707e0f9edcde92c47cd543325187e9e13b9ef43f (patch) | |
| tree | a8c89da0bfa990cb6134a42d0f3ece60bae01b67 /archaeological_finds | |
| parent | f4eceb80557e2141e8535cc1b555c1a72e3e8ddd (diff) | |
| download | Ishtar-707e0f9edcde92c47cd543325187e9e13b9ef43f.tar.bz2 Ishtar-707e0f9edcde92c47cd543325187e9e13b9ef43f.zip | |
✨ criteria search: adapt searches for relative search (dates and numbers)
Diffstat (limited to 'archaeological_finds')
| -rw-r--r-- | archaeological_finds/forms.py | 27 | ||||
| -rw-r--r-- | archaeological_finds/forms_treatments.py | 6 | ||||
| -rw-r--r-- | archaeological_finds/models_finds.py | 12 |
3 files changed, 15 insertions, 30 deletions
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=[] ) diff --git a/archaeological_finds/forms_treatments.py b/archaeological_finds/forms_treatments.py index 011dc2d30..f7d260f42 100644 --- a/archaeological_finds/forms_treatments.py +++ b/archaeological_finds/forms_treatments.py @@ -567,8 +567,7 @@ class AdministrativeActTreatmentSelect(TableSelect): act_object = forms.CharField(label=_("Object"), max_length=300) - signature_date_after = DateField(label=_("Signature date after")) - signature_date_before = DateField(label=_("Signature date before")) + signature_date = DateField(label=_("Signature date")) treatment__name = forms.CharField( label=_("Treatment name"), max_length=200) treatment__year = forms.IntegerField(label=_("Treatment year")) @@ -826,8 +825,7 @@ class AdministrativeActTreatmentFileSelect(TableSelect): act_object = forms.CharField(label=_("Object"), max_length=300) - signature_date_after = DateField(label=_("Signature date after")) - signature_date_before = DateField(label=_("Signature date before")) + signature_date = DateField(label=_("Signature date")) treatment_file__name = forms.CharField( label=_("Treatment request name"), max_length=200) diff --git a/archaeological_finds/models_finds.py b/archaeological_finds/models_finds.py index 52ac8d581..7ce184fc0 100644 --- a/archaeological_finds/models_finds.py +++ b/archaeological_finds/models_finds.py @@ -1744,19 +1744,15 @@ class Find( pgettext_lazy("key for text search", "museum-collection"), "museum_collection__label__iexact", related_name="museum_collection" - ), + ), "museum_former_collections": SearchAltName( pgettext_lazy("key for text search", "museum-former-collection"), "museum_former_collections__denomination__iexact", related_name="museum_former_collections" - ), - "museum_inventory_entry_year_before": SearchAltName( - pgettext_lazy("key for text search", "museum-inventory-entry-year-before"), - "museum_inventory_entry_year__lte" ), - "museum_inventory_entry_year_after": SearchAltName( - pgettext_lazy("key for text search", "museum-inventory-entry-year-after"), - "museum_inventory_entry_year__gte" + "museum_inventory_entry_year": SearchAltName( + pgettext_lazy("key for text search", "museum-inventory-entry-year"), + "museum_inventory_entry_year" ), "museum_inventory_conformity": SearchAltName( pgettext_lazy("key for text search", "museum-inventory-conformity"), |