diff options
| author | Étienne Loks <etienne.loks@iggdrasil.net> | 2024-06-24 16:18:46 +0200 |
|---|---|---|
| committer | Étienne Loks <etienne.loks@iggdrasil.net> | 2024-06-24 16:22:52 +0200 |
| commit | 0663c1251d225a4c40ed93645f3bd8f16ae2acb3 (patch) | |
| tree | 07615b01bde96b937b7e99a4faa713fe666563ee /archaeological_context_records | |
| parent | 8ca8b9b52fd84384c1dd53041710c3721681c346 (diff) | |
| download | Ishtar-0663c1251d225a4c40ed93645f3bd8f16ae2acb3.tar.bz2 Ishtar-0663c1251d225a4c40ed93645f3bd8f16ae2acb3.zip | |
✨ criteria search: adapt searches for relative search (dates and numbers)
Diffstat (limited to 'archaeological_context_records')
| -rw-r--r-- | archaeological_context_records/forms.py | 16 | ||||
| -rw-r--r-- | archaeological_context_records/models.py | 24 |
2 files changed, 13 insertions, 27 deletions
diff --git a/archaeological_context_records/forms.py b/archaeological_context_records/forms.py index 698484f50..eabd47e49 100644 --- a/archaeological_context_records/forms.py +++ b/archaeological_context_records/forms.py @@ -93,14 +93,8 @@ class OperationFormSelection(CustomForm, forms.Form): class PeriodSelect(forms.Form): datings__period = forms.ChoiceField(label=_("Dating - period"), choices=[]) datings__precise_dating = forms.CharField(label=_("Dating - precise")) - datings__start_date__before = forms.IntegerField( - label=_("Dating - start date before") - ) - datings__start_date__after = forms.IntegerField( - label=_("Dating - start date after") - ) - datings__end_date__before = forms.IntegerField(label=_("Dating - end date before")) - datings__end_date__after = forms.IntegerField(label=_("Dating - end date after")) + datings__start_date = forms.IntegerField(label=_("Dating - start date")) + datings__end_date = forms.IntegerField(label=_("Dating - end date")) datings__dating_type = forms.ChoiceField( label=_("Dating - dating type"), choices=[] ) @@ -113,10 +107,8 @@ class PeriodSelect(forms.Form): PERIOD_FIELDS = [ "datings__period", "datings__precise_dating", - "datings__start_date__before", - "datings__start_date__after", - "datings__end_date__before", - "datings__end_date__after", + "datings__start_date", + "datings__end_date", "datings__dating_type", "datings__quality", ] diff --git a/archaeological_context_records/models.py b/archaeological_context_records/models.py index 1e5d108bc..9533f357a 100644 --- a/archaeological_context_records/models.py +++ b/archaeological_context_records/models.py @@ -135,21 +135,13 @@ class Dating(models.Model, SerializeItem): pgettext_lazy("key for text search", "datings-precise"), "datings__precise_dating__iexact", ), - "datings__start_date__before": SearchAltName( - pgettext_lazy("key for text search", "datings-start-before"), - "datings__start_date__lte", + "datings__start_date": SearchAltName( + pgettext_lazy("key for text search", "datings-start"), + "datings__start_date", ), - "datings__start_date__after": SearchAltName( - pgettext_lazy("key for text search", "datings-start-after"), - "datings__start_date__gte", - ), - "datings__end_date__before": SearchAltName( - pgettext_lazy("key for text search", "datings-end-before"), - "datings__end_date__lte", - ), - "datings__end_date__after": SearchAltName( - pgettext_lazy("key for text search", "datings-end-after"), - "datings__end_date__gte", + "datings__end_date": SearchAltName( + pgettext_lazy("key for text search", "datings-end"), + "datings__end_date", ), "datings__dating_type": SearchAltName( pgettext_lazy("key for text search", "datings-type"), @@ -564,7 +556,9 @@ class ContextRecord( "documents__associated_file__isnull", "documents__associated_url__isnull", ] - NUMBER_FIELDS = ["operation__year"] + NUMBER_FIELDS = ["operation__year", "operation__operation_code", "datings__start_date", + "datings__end_date"] + GeographicSubTownItem.NUMBER_FIELDS + RELATION_TYPES_PREFIX = { "ope_relation_types": "operation__", "cr_relation_types": "", |