diff options
| author | Étienne Loks <etienne.loks@iggdrasil.net> | 2021-01-18 20:55:39 +0100 |
|---|---|---|
| committer | Étienne Loks <etienne.loks@iggdrasil.net> | 2021-02-28 12:15:23 +0100 |
| commit | 30fff1ce12c54ccbf99ab0d2afdb9d38b8367565 (patch) | |
| tree | ae99dbe5e40e842fa3cff360864a9b148367fccf | |
| parent | 8db3d86d332266d6cfae60cb92107fb8aa1645bb (diff) | |
| download | Ishtar-30fff1ce12c54ccbf99ab0d2afdb9d38b8367565.tar.bz2 Ishtar-30fff1ce12c54ccbf99ab0d2afdb9d38b8367565.zip | |
Find search: add treatment end date
| -rw-r--r-- | archaeological_finds/forms.py | 5 | ||||
| -rw-r--r-- | archaeological_finds/models_finds.py | 11 |
2 files changed, 13 insertions, 3 deletions
diff --git a/archaeological_finds/forms.py b/archaeological_finds/forms.py index 49fae40b4..014a094bc 100644 --- a/archaeological_finds/forms.py +++ b/archaeological_finds/forms.py @@ -1210,7 +1210,10 @@ class FindSelect(DocumentItemSelect, PeriodSelect): loan = forms.NullBooleanField(label=_(u"Loan?")) treatments_file_end_date = forms.DateField( - label=_(u"Treatment file end date before"), widget=DatePicker + label=_("Treatment file end date before"), widget=DatePicker + ) + treatments_end_date = forms.DateField( + label=_("Treatment end date before"), widget=DatePicker ) TYPES = PeriodSelect.TYPES + [ diff --git a/archaeological_finds/models_finds.py b/archaeological_finds/models_finds.py index 1e848a361..5c6f0f27f 100644 --- a/archaeological_finds/models_finds.py +++ b/archaeological_finds/models_finds.py @@ -926,7 +926,9 @@ class Find(BulkUpdatedItem, ValueGetter, DocumentItem, BaseHistorizedItem, } DATED_FIELDS = [ - 'last_modified__gte', 'treatments__file__end_date__lte', + 'last_modified__gte', + 'treatments__file__end_date__lte', + 'treatments__end_date__lte', 'base_finds__discovery_date__lte', 'base_finds__discovery_date__gte', 'base_finds__discovery_date_tpq__lte', @@ -1127,8 +1129,13 @@ class Find(BulkUpdatedItem, ValueGetter, DocumentItem, BaseHistorizedItem, 'treatments_file_end_date': SearchAltName( pgettext_lazy("key for text search", - "treatment-end-date-before"), + "treatment-file-end-date-before"), 'treatments__file__end_date__lte'), + 'treatments_end_date': + SearchAltName( + pgettext_lazy("key for text search", + "treatment-end-date-before"), + 'treatments__end_date__lte'), 'previous_id': SearchAltName( pgettext_lazy("key for text search", "previous-id"), |