pk/atst
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add min and max range values to date selector so a more accurate error message can be displayed when a date is out of the range

Browse Source
This commit is contained in:
leigh-mil
2019-10-03 16:12:49 -04:00
parent da6916b1a1
commit 07b3c68422
9 changed files with 126 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
atst/forms/task_order.py
View File

@@ -91,6 +91,8 @@ class CLINForm(FlaskForm):
self.start_date.data
and self.end_date.data
and self.start_date.data > self.end_date.data
and self.start_date.data <= contract_end
and self.end_date.data >= contract_start
):
self.start_date.errors.append(
translate("forms.task_order.pop_errors.date_order")
@@ -100,7 +102,7 @@ class CLINForm(FlaskForm):
if self.start_date.data and self.start_date.data <= contract_start:
self.start_date.errors.append(
translate(
"forms.task_order.pop_errors.start",
"forms.task_order.pop_errors.start_pre_contract",
{"date": contract_start.strftime("%b %d, %Y")},
)
)
@@ -109,12 +111,30 @@ class CLINForm(FlaskForm):
if self.end_date.data and self.end_date.data >= contract_end:
self.end_date.errors.append(
translate(
"forms.task_order.pop_errors.end",
"forms.task_order.pop_errors.end_past_contract",
{"date": contract_end.strftime("%b %d, %Y")},
)
)
valid = False
if self.start_date.data and self.start_date.data > contract_end:
self.start_date.errors.append(
translate(
"forms.task_order.pop_errors.start_past_contract",
{"date": contract_end.strftime("%b %d, %Y")},
)
)
valid = False
if self.end_date.data and self.end_date.data < contract_start:
self.end_date.errors.append(
translate(
"forms.task_order.pop_errors.end_pre_contract",
{"date": contract_start.strftime("%b %d, %Y")},
)
)
valid = False
return valid