summaryrefslogtreecommitdiff
path: root/archaeological_operations/views.py
diff options
context:
space:
mode:
authorÉtienne Loks <etienne.loks@iggdrasil.net>2016-09-08 12:10:26 +0200
committerÉtienne Loks <etienne.loks@iggdrasil.net>2016-09-08 12:10:26 +0200
commitb15ca19df32888c2ab22489e4d6965537dc0d389 (patch)
treed32e6c17c078a0f3f13ff33d6daff24d92bd2cdb /archaeological_operations/views.py
parent13a0eed56e71fccb91b72b9005a7ffd27ca39c1b (diff)
downloadIshtar-b15ca19df32888c2ab22489e4d6965537dc0d389.tar.bz2
Ishtar-b15ca19df32888c2ab22489e4d6965537dc0d389.zip
Operation: manage deadline for finds and documentation receipt (refs #3191)
Diffstat (limited to 'archaeological_operations/views.py')
-rw-r--r--archaeological_operations/views.py12
1 files changed, 10 insertions, 2 deletions
diff --git a/archaeological_operations/views.py b/archaeological_operations/views.py
index 013e329a1..b47623fc2 100644
--- a/archaeological_operations/views.py
+++ b/archaeological_operations/views.py
@@ -138,9 +138,13 @@ def get_available_operation_code(request, year=None):
get_operation = get_item(
models.Operation, 'get_operation', 'operation',
- bool_fields=['end_date__isnull', 'virtual_operation'],
+ bool_fields=['end_date__isnull', 'virtual_operation',
+ 'documentation_received', 'finds_received'],
dated_fields=['start_date__lte', 'start_date__gte',
- 'excavation_end_date__lte', 'excavation_end_date__gte'],
+ 'excavation_end_date__lte', 'excavation_end_date__gte',
+ 'documentation_deadline__lte', 'documentation_deadline__gte',
+ 'finds_deadline__lte', 'finds_deadline__gte',
+ ],
extra_request_keys={
'common_name': 'common_name__icontains',
'comment': 'comment__icontains',
@@ -167,6 +171,10 @@ get_operation = get_item(
'history_modifier__ishtaruser__person__pk',
'archaeological_sites':
'archaeological_sites__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',
},
)
show_operation = show_item(models.Operation, 'operation')