Merge pull request #556 from dod-ccpo/navigate-to-form-review-page

Navigate to Task Order Form review page
This commit is contained in:
leigh-mil
2019-01-22 14:11:00 -05:00
committed by GitHub
4 changed files with 99 additions and 113 deletions

View File

@@ -19,6 +19,14 @@ def dollars(value):
return "${:,.0f}".format(numberValue)
def dollarsWithCents(value):
try:
numberValue = float(value)
except ValueError:
numberValue = 0
return "${:,.2f}".format(numberValue)
def usPhone(number):
phone = re.sub(r"\D", "", number)
return "+1 ({}) {} - {}".format(phone[0:3], phone[3:6], phone[6:])
@@ -113,6 +121,7 @@ def normalizeOrder(title):
def register_filters(app):
app.jinja_env.filters["iconSvg"] = iconSvg
app.jinja_env.filters["dollars"] = dollars
app.jinja_env.filters["dollarsWithCents"] = dollarsWithCents
app.jinja_env.filters["usPhone"] = usPhone
app.jinja_env.filters["readableInteger"] = readableInteger
app.jinja_env.filters["getOptionLabel"] = getOptionLabel

View File

@@ -45,8 +45,8 @@ class AppInfoForm(CacheableForm):
default="",
)
native_apps = RadioField(
translate("forms.task_order.native_apps_label"),
description=translate("forms.task_order.native_apps_description"),
translate("forms.task_order.native_apps.label"),
description=translate("forms.task_order.native_apps.description"),
choices=[("yes", "Yes"), ("no", "No"), ("not_sure", "Not Sure")],
)
complexity = SelectMultipleField(