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

Use validator on the field for checking that the pop dates are within the contract date range

Browse Source
This commit is contained in:
leigh-mil 2019-10-08 10:30:04 -04:00
parent 07b3c68422
commit f4855c0ae3
3 changed files with 30 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

60
atst/forms/task_order.py
View File

@ -38,6 +38,22 @@ def validate_funding(form, field):
)
def validate_date_in_range(form, field):
contract_start = app.config.get("CONTRACT_START_DATE")
contract_end = app.config.get("CONTRACT_END_DATE")
if field.data and (field.data < contract_start or field.data > contract_end):
raise ValidationError(
translate(
"forms.task_order.pop_errors.range",
{
"start": contract_start.strftime("%b %d, %Y"),
"end": contract_end.strftime("%b %d, %Y"),
},
)
)
class CLINForm(FlaskForm):
jedi_clin_type = SelectField(
translate("task_orders.form.clin_type_label"),
@ -52,13 +68,13 @@ class CLINForm(FlaskForm):
translate("task_orders.form.pop_start"),
description=translate("task_orders.form.pop_example"),
format="%m/%d/%Y",
validators=[Optional()],
validators=[validate_date_in_range],
)
end_date = DateField(
translate("task_orders.form.pop_end"),
description=translate("task_orders.form.pop_example"),
format="%m/%d/%Y",
validators=[Optional()],
validators=[validate_date_in_range],
)
total_amount = DecimalField(
label=translate("task_orders.form.total_funds_label"),
@ -84,57 +100,17 @@ class CLINForm(FlaskForm):
def validate(self, *args, **kwargs):
valid = super().validate(*args, **kwargs)
contract_start = app.config.get("CONTRACT_START_DATE")
contract_end = app.config.get("CONTRACT_END_DATE")
if (
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")
)
valid = False
if self.start_date.data and self.start_date.data <= contract_start:
self.start_date.errors.append(
translate(
"forms.task_order.pop_errors.start_pre_contract",
{"date": contract_start.strftime("%b %d, %Y")},
)
)
valid = False
if self.end_date.data and self.end_date.data >= contract_end:
self.end_date.errors.append(
translate(
"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

15
tests/forms/test_task_order.py
View File

@ -47,17 +47,24 @@ def test_clin_form_pop_dates_within_contract_dates():
start_date=invalid_start, end_date=invalid_end
)
clin_form = CLINForm(obj=invalid_clin)
assert not clin_form.validate()
assert (
translate(
"forms.task_order.pop_errors.start_pre_contract",
{"date": CONTRACT_START_DATE.strftime("%b %d, %Y")},
"forms.task_order.pop_errors.range",
{
"start": CONTRACT_START_DATE.strftime("%b %d, %Y"),
"end": CONTRACT_END_DATE.strftime("%b %d, %Y"),
},
)
) in clin_form.start_date.errors
assert (
translate(
"forms.task_order.pop_errors.end_past_contract",
{"date": CONTRACT_END_DATE.strftime("%b %d, %Y")},
"forms.task_order.pop_errors.range",
{
"start": CONTRACT_START_DATE.strftime("%b %d, %Y"),
"end": CONTRACT_END_DATE.strftime("%b %d, %Y"),
},
)
) in clin_form.end_date.errors

1
translations.yaml
View File

@ -210,6 +210,7 @@ forms:
number_description: Task order number (13 digits)
pop_errors:
date_order: PoP start date must be before end date.
range: Date must be between {start} and {end}.
end_past_contract: PoP end date must be before or on {date}.
end_pre_contract: PoP end date must be after or on {date}.
start_past_contract: PoP start date must be before or on {date}.