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

Use translations for WTForms validation

Browse Source
This commit is contained in:
graham-dds 2019-09-11 14:49:02 -04:00
parent 42693ec506
commit ab17b5cf84
1 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
atst/forms/task_order.py
View File

@ -10,6 +10,7 @@ from wtforms.fields.html5 import DateField
from wtforms.validators import Required, Optional, Length, NumberRange from wtforms.validators import Required, Optional, Length, NumberRange
from flask_wtf import FlaskForm from flask_wtf import FlaskForm
from datetime import datetime from datetime import datetime
from numbers import Number
from .data import JEDI_CLIN_TYPES from .data import JEDI_CLIN_TYPES
from .fields import SelectField from .fields import SelectField
@ -50,19 +51,21 @@ class CLINForm(FlaskForm):
total_amount = DecimalField( total_amount = DecimalField(
label=translate("task_orders.form.total_funds_label"), label=translate("task_orders.form.total_funds_label"),
validators=[ validators=[
Optional(),
NumberRange( NumberRange(
0, 1000000000, "dollar amount must be from $0.00 to $1,000,000,000.00" 0,
), 1000000000,
translate("forms.task_order.clin_funding_errors.funding_range_error"),
)
], ],
) )
obligated_amount = DecimalField( obligated_amount = DecimalField(
label=translate("task_orders.form.obligated_funds_label"), label=translate("task_orders.form.obligated_funds_label"),
validators=[ validators=[
Optional(),
NumberRange( NumberRange(
0, 1000000000, "dollar amount must be from $0.00 to $1,000,000,000.00" 0,
), 1000000000,
translate("forms.task_order.clin_funding_errors.funding_range_error"),
)
], ],
) )
@ -104,12 +107,12 @@ class CLINForm(FlaskForm):
valid = False valid = False
if ( if (
self.total_amount.data isinstance(self.total_amount.data, Number)
and self.obligated_amount.data and isinstance(self.obligated_amount.data, Number)
and self.total_amount.data < self.obligated_amount.data and self.total_amount.data < self.obligated_amount.data
): ):
self.obligated_amount.errors.append( self.obligated_amount.errors.append(
translate("forms.task_order.obligated_amount_error") translate("forms.task_order.clin_funding_errors.obligated_amount_error")
) )
valid = False valid = False