diff options
author | Étienne Loks <etienne.loks@iggdrasil.net> | 2024-04-30 13:00:10 +0200 |
---|---|---|
committer | Étienne Loks <etienne.loks@iggdrasil.net> | 2024-04-30 13:07:24 +0200 |
commit | f4dd4e34b09c84b8f5e87829896f33916fe859fc (patch) | |
tree | 2c742560dfa56f8bd0a522e4ba1fd9d6571570cd /archaeological_operations/forms.py | |
parent | 7e9369ced291d94830b58dc5f7edcc5b608939ff (diff) | |
download | Ishtar-f4dd4e34b09c84b8f5e87829896f33916fe859fc.tar.bz2 Ishtar-f4dd4e34b09c84b8f5e87829896f33916fe859fc.zip |
✨ operation: finds and documentation deposit dates - edit forms, bulk update, criteria search and sheet
Diffstat (limited to 'archaeological_operations/forms.py')
-rw-r--r-- | archaeological_operations/forms.py | 22 |
1 files changed, 22 insertions, 0 deletions
diff --git a/archaeological_operations/forms.py b/archaeological_operations/forms.py index 488f7d74e..b37bed988 100644 --- a/archaeological_operations/forms.py +++ b/archaeological_operations/forms.py @@ -570,6 +570,8 @@ class OperationSelect(GeoItemSelect): validators=[valid_id(Person)]) documentation_received = forms.NullBooleanField( label=_("Documentation provided")) + documentation_deposit_date = DateField( + label=_("Documentation deposit date")) documentation_deadline_before = DateField( label=_("Documentation deadline before")) documentation_deadline_after = DateField( @@ -577,6 +579,8 @@ class OperationSelect(GeoItemSelect): has_finds = forms.NullBooleanField(label=_("Has finds")) finds_received = forms.NullBooleanField( label=_("Finds provided")) + finds_deposit_date = DateField( + label=_("Finds deposit date")) finds_deadline_before = DateField( label=_("Finds deadline before")) finds_deadline_after = DateField( @@ -601,9 +605,11 @@ class OperationSelect(GeoItemSelect): 'documentation_deadline_before', 'documentation_deadline_after', 'documentation_received', + 'documentation_deposit_date', 'finds_deadline_before', 'finds_deadline_after', 'finds_received', + 'finds_deposit_date', )) if not profile.underwater: self._remove_fields(("drassm_code",)) @@ -810,11 +816,17 @@ class OperationFormGeneral(CustomForm, ManageOldType): required=False) documentation_received = forms.NullBooleanField( required=False, label=_("Documentation provided")) + documentation_deposit_date = DateField( + label=_("Documentation deposit date"), + required=False) finds_deadline = DateField( label=_("Deadline for submission of the finds"), required=False, ) finds_received = forms.NullBooleanField( required=False, label=_("Finds provided")) + finds_deposit_date = DateField( + label=_("Finds deposit date"), + required=False) HEADERS['scientific_documentation_comment'] = FormHeader(_("Scientific")) scientific_documentation_comment = forms.CharField( @@ -842,8 +854,10 @@ class OperationFormGeneral(CustomForm, ManageOldType): WAREHOUSE_FIELDS = [ 'documentation_deadline', 'documentation_received', + 'documentation_deposit_date', 'finds_deadline', 'finds_received', + 'finds_deposit_date', ] TYPES = [ FieldType('operation_type', models.OperationType), @@ -1680,6 +1694,8 @@ class QAOperationFormMulti(QAForm): 'qa_operator', 'qa_documentation_received', 'qa_finds_received', + "qa_finds_deposit_date", + "qa_documentation_deposit_date", ] qa_operation_type = forms.ChoiceField( label=_("Operation type"), required=False @@ -1697,10 +1713,16 @@ class QAOperationFormMulti(QAForm): label=_("Documentation provided"), required=False, choices=QAForm.NULL_BOOL_CHOICES ) + qa_documentation_deposit_date = DateField( + label=_("Documentation deposit date"), required=False, + ) qa_finds_received = forms.ChoiceField( label=_("Finds provided"), required=False, choices=QAForm.NULL_BOOL_CHOICES ) + qa_finds_deposit_date = DateField( + label=_("Finds deposit date"), + required=False) qa_collaborators = forms.IntegerField( label=_("Collaborators"), required=False, widget=widgets.JQueryAutoComplete( |