diff options
Diffstat (limited to 'archaeological_operations/models.py')
| -rw-r--r-- | archaeological_operations/models.py | 79 |
1 files changed, 27 insertions, 52 deletions
diff --git a/archaeological_operations/models.py b/archaeological_operations/models.py index 9764b8dba..e58ddffce 100644 --- a/archaeological_operations/models.py +++ b/archaeological_operations/models.py @@ -342,6 +342,7 @@ class ArchaeologicalSite( PARENT_ONLY_SEARCH_VECTORS = ["operations"] DATED_FIELDS = BaseHistorizedItem.DATED_FIELDS + ["sinking_date"] + NUMBER_FIELDS = GeographicTownItem.NUMBER_FIELDS[:] EXTRA_REQUEST_KEYS = { "towns_label": "towns", @@ -1014,18 +1015,15 @@ class Operation( "documents__associated_url__isnull", ] DATED_FIELDS = BaseHistorizedItem.DATED_FIELDS + [ - "start_date__lte", - "start_date__gte", - "excavation_end_date__lte", - "excavation_end_date__gte", + "start_date", + "end", + "excavation_end_date", "documentation_deposit_date", - "documentation_deadline__lte", - "documentation_deadline__gte", - "finds_deadline__lte", - "finds_deadline__gte", + "documentation_deadline", + "finds_deadline", "finds_deposit_date", ] - NUMBER_FIELDS = ["year", "operation_code"] + NUMBER_FIELDS = ["year", "operation_code"] + GeographicTownItem.NUMBER_FIELDS EXTRA_REQUEST_KEYS = { "operation_type__label": "operation_type__label", "common_name": "common_name__icontains", @@ -1034,18 +1032,14 @@ class Operation( "scientific_documentation_comment": "scientific_documentation_comment__icontains", "abstract": "abstract__icontains", "end_date": "end_date__isnull", - "start_before": "start_date__lte", - "start_after": "start_date__gte", - "end_before": "excavation_end_date__lte", - "end_after": "excavation_end_date__gte", + "start": "start_date", + "end": "excavation_end_date", "towns__numero_insee__startswith": "towns__numero_insee__startswith", "parcel": "parcels__cached_label__iexact", "history_creator": "history_creator__ishtaruser__person__pk", "history_modifier": "history_modifier__ishtaruser__person__pk", - "documentation_deadline_before": "documentation_deadline__lte", - "documentation_deadline_after": "documentation_deadline__gte", - "finds_deadline_before": "finds_deadline__lte", - "finds_deadline_after": "finds_deadline__gte", + "documentation_deadline": "documentation_deadline", + "finds_deadline": "finds_deadline", "related_treatment": "context_record__base_finds__find__upstream_treatment__id", "towns_label": "towns", "scientist__pk": "scientist__pk", # dynamic_table_documents @@ -1189,19 +1183,12 @@ class Operation( "periods": SearchAltName( pgettext_lazy("key for text search", "period"), "periods__label__iexact" ), - "start_before": SearchAltName( - pgettext_lazy("key for text search", "start-before"), "start_date__lte" - ), - "start_after": SearchAltName( - pgettext_lazy("key for text search", "start-after"), "start_date__gte" - ), - "end_before": SearchAltName( - pgettext_lazy("key for text search", "end-before"), - "excavation_end_date__lte", + "start": SearchAltName( + pgettext_lazy("key for text search", "start"), "start_date" ), - "end_after": SearchAltName( - pgettext_lazy("key for text search", "end-after"), - "excavation_end_date__gte", + "end": SearchAltName( + pgettext_lazy("key for text search", "end"), + "excavation_end_date", ), "relation_types": SearchAltName( pgettext_lazy("key for text search", "relation-types"), "relation_types" @@ -1244,13 +1231,9 @@ class Operation( pgettext_lazy("key for text search", "documentation-provided"), "documentation_received", ), - "documentation_deadline_before": SearchAltName( - pgettext_lazy("key for text search", "documentation-deadline-before"), - "documentation_deadline__lte", - ), - "documentation_deadline_after": SearchAltName( - pgettext_lazy("key for text search", "documentation-deadline-after"), - "documentation_deadline__gte", + "documentation_deadline": SearchAltName( + pgettext_lazy("key for text search", "documentation-deadline"), + "documentation_deadline", ), "finds_deposit_date": SearchAltName( pgettext_lazy("key for text search", "finds-deposit-date"), @@ -1263,13 +1246,9 @@ class Operation( pgettext_lazy("key for text search", "has-finds"), "context_record__base_finds__isnull", ), - "finds_deadline_before": SearchAltName( - pgettext_lazy("key for text search", "finds-deadline-before"), - "finds_deadline__lte", - ), - "finds_deadline_after": SearchAltName( - pgettext_lazy("key for text search", "finds-deadline-after"), - "finds_deadline__gte", + "finds_deadline": SearchAltName( + pgettext_lazy("key for text search", "finds-deadline"), + "finds_deadline", ), "drassm_code": SearchAltName( pgettext_lazy("key for text search", "code-drassm"), @@ -2612,8 +2591,7 @@ class AdministrativeAct(DocumentItem, BaseHistorizedItem, OwnPerms, ValueGetter, TABLE_COLS_OPE.append("departments_label") # search parameters - DATED_FIELDS = BaseHistorizedItem.DATED_FIELDS + ["signature_date__lte", - "signature_date__gte"] + DATED_FIELDS = BaseHistorizedItem.DATED_FIELDS + ["signature_date"] ASSOCIATED_MODELS = [ ("File", "associated_file"), (Person, "associated_file__general_contractor"), @@ -2658,6 +2636,7 @@ class AdministrativeAct(DocumentItem, BaseHistorizedItem, OwnPerms, ValueGetter, "documents__associated_url__isnull", "documents__associated_file__isnull", ] + NUMBER_FIELDS = ["year", "index"] RELATIVE_SESSION_NAMES = [ ("operation", "operation__pk"), ("file", "associated_file__pk"), @@ -2732,13 +2711,9 @@ class AdministrativeAct(DocumentItem, BaseHistorizedItem, OwnPerms, ValueGetter, "act_object": SearchAltName( pgettext_lazy("key for text search", "object"), "act_object__icontains" ), - "signature_date_before": SearchAltName( - pgettext_lazy("key for text search", "signature-before"), - "signature_date__lte", - ), - "signature_date_after": SearchAltName( - pgettext_lazy("key for text search", "signature-after"), - "signature_date__gte", + "signature_date": SearchAltName( + pgettext_lazy("key for text search", "signature"), + "signature_date", ), "associated_file__name": SearchAltName( pgettext_lazy("key for text search", "file-name"), |