Refactor fv form to separate TO from request
This commit is contained in:
richard-dds
@@ -1,7 +1,7 @@
|
||||
import re
|
||||
import pendulum
|
||||
from wtforms.fields.html5 import DateField, EmailField
|
||||
from wtforms.fields import StringField, FileField
|
||||
from wtforms.fields import StringField, FileField, FormField
|
||||
from wtforms.validators import InputRequired, Email, Regexp, Optional
|
||||
from flask_wtf.file import FileAllowed
|
||||
|
||||
@@ -21,17 +21,16 @@ def number_to_int(num):
|
||||
return int(num)
|
||||
|
||||
|
||||
class BaseFinancialForm(ValidatedForm):
|
||||
def reset(self):
|
||||
"""
|
||||
Reset UII info so that it can be de-parsed rendered properly.
|
||||
This is a stupid workaround, and there's probably a better way.
|
||||
"""
|
||||
self.uii_ids.process_data(self.uii_ids.data)
|
||||
def coerce_choice(val):
|
||||
if val is None:
|
||||
return None
|
||||
elif isinstance(val, str):
|
||||
return val
|
||||
else:
|
||||
return val.value
|
||||
|
||||
def validate(self, **kwargs):
|
||||
return super().validate()
|
||||
|
||||
class DraftValidateMixin(object):
|
||||
def validate_draft(self):
|
||||
"""
|
||||
Another stupid workaround. Maybe there isn't a better way.
|
||||
@@ -49,86 +48,19 @@ class BaseFinancialForm(ValidatedForm):
|
||||
|
||||
return valid
|
||||
|
||||
@property
|
||||
def is_missing_task_order_number(self):
|
||||
return False
|
||||
|
||||
task_order_number = StringField(
|
||||
class TaskOrderForm(ValidatedForm, DraftValidateMixin):
|
||||
number = StringField(
|
||||
"Task Order Number associated with this request",
|
||||
description="Include the original Task Order number (including the 000X at the end). Do not include any modification numbers. Note that there may be a lag between approving a task order and when it becomes available in our system.",
|
||||
validators=[InputRequired()],
|
||||
)
|
||||
|
||||
uii_ids = NewlineListField(
|
||||
"Unique Item Identifier (UII)s related to your application(s) if you already have them.",
|
||||
description="If you have more than one UII, place each one on a new line.",
|
||||
)
|
||||
|
||||
pe_id = StringField(
|
||||
"Program Element Number",
|
||||
description="PE numbers help the Department of Defense identify which offices' budgets are contributing towards this resource use. <br/><em>It should be 7 digits followed by 1-3 letters, and should have a zero as the first and third digits.</em>",
|
||||
validators=[InputRequired()],
|
||||
)
|
||||
|
||||
treasury_code = StringField(
|
||||
"Program Treasury Code",
|
||||
description="Program Treasury Code (or Appropriations Code) identifies resource types. <br/> <em>It should be a four digit or six digit number, optionally prefixed by one or more zeros.</em>",
|
||||
validators=[InputRequired(), Regexp(TREASURY_CODE_REGEX)],
|
||||
)
|
||||
|
||||
ba_code = StringField(
|
||||
"Program Budget Activity (BA) Code",
|
||||
description="BA Code is used to identify the purposes, projects, or types of activities financed by the appropriation fund. <br/><em>It should be two digits, followed by an optional letter.</em>",
|
||||
validators=[InputRequired(), Regexp(BA_CODE_REGEX)],
|
||||
)
|
||||
|
||||
fname_co = StringField("KO First Name", validators=[InputRequired()])
|
||||
lname_co = StringField("KO Last Name", validators=[InputRequired()])
|
||||
|
||||
email_co = EmailField("KO Email", validators=[InputRequired(), Email()])
|
||||
|
||||
office_co = StringField("KO Office", validators=[InputRequired()])
|
||||
|
||||
fname_cor = StringField("COR First Name", validators=[InputRequired()])
|
||||
|
||||
lname_cor = StringField("COR Last Name", validators=[InputRequired()])
|
||||
|
||||
email_cor = EmailField("COR Email", validators=[InputRequired(), Email()])
|
||||
|
||||
office_cor = StringField("COR Office", validators=[InputRequired()])
|
||||
|
||||
|
||||
class FinancialForm(BaseFinancialForm):
|
||||
@property
|
||||
def is_missing_task_order_number(self):
|
||||
return "task_order_number" in self.errors
|
||||
|
||||
@property
|
||||
def is_only_missing_task_order_number(self):
|
||||
return "task_order_number" in self.errors and len(self.errors) == 1
|
||||
|
||||
|
||||
class ExtendedFinancialForm(BaseFinancialForm):
|
||||
def validate(self, *args, **kwargs):
|
||||
if self.funding_type.data == "OTHER":
|
||||
self.funding_type_other.validators.append(InputRequired())
|
||||
|
||||
to_validator = None
|
||||
if kwargs.get("has_attachment"):
|
||||
to_validators = list(self.task_order.validators)
|
||||
self.task_order.validators = []
|
||||
|
||||
valid = super().validate(*args, **kwargs)
|
||||
|
||||
if to_validator:
|
||||
self.task_order.validators = to_validators
|
||||
|
||||
return valid
|
||||
|
||||
funding_type = SelectField(
|
||||
description="What is the source of funding?",
|
||||
choices=FUNDING_TYPES,
|
||||
validators=[InputRequired()],
|
||||
coerce=coerce_choice,
|
||||
render_kw={"required": False},
|
||||
)
|
||||
|
||||
@@ -190,7 +122,7 @@ class ExtendedFinancialForm(BaseFinancialForm):
|
||||
filters=[number_to_int],
|
||||
)
|
||||
|
||||
task_order = FileField(
|
||||
pdf = FileField(
|
||||
"Upload a copy of your Task Order",
|
||||
validators=[
|
||||
FileAllowed(["pdf"], "Only PDF documents can be uploaded."),
|
||||
@@ -198,3 +130,101 @@ class ExtendedFinancialForm(BaseFinancialForm):
|
||||
],
|
||||
render_kw={"required": False},
|
||||
)
|
||||
|
||||
|
||||
class RequestFinancialVerificationForm(ValidatedForm, DraftValidateMixin):
|
||||
uii_ids = NewlineListField(
|
||||
"Unique Item Identifier (UII)s related to your application(s) if you already have them.",
|
||||
description="If you have more than one UII, place each one on a new line.",
|
||||
)
|
||||
|
||||
pe_id = StringField(
|
||||
"Program Element Number",
|
||||
description="PE numbers help the Department of Defense identify which offices' budgets are contributing towards this resource use. <br/><em>It should be 7 digits followed by 1-3 letters, and should have a zero as the first and third digits.</em>",
|
||||
validators=[InputRequired()],
|
||||
)
|
||||
|
||||
treasury_code = StringField(
|
||||
"Program Treasury Code",
|
||||
description="Program Treasury Code (or Appropriations Code) identifies resource types. <br/> <em>It should be a four digit or six digit number, optionally prefixed by one or more zeros.</em>",
|
||||
validators=[InputRequired(), Regexp(TREASURY_CODE_REGEX)],
|
||||
)
|
||||
|
||||
ba_code = StringField(
|
||||
"Program Budget Activity (BA) Code",
|
||||
description="BA Code is used to identify the purposes, projects, or types of activities financed by the appropriation fund. <br/><em>It should be two digits, followed by an optional letter.</em>",
|
||||
validators=[InputRequired(), Regexp(BA_CODE_REGEX)],
|
||||
)
|
||||
|
||||
fname_co = StringField("KO First Name", validators=[InputRequired()])
|
||||
lname_co = StringField("KO Last Name", validators=[InputRequired()])
|
||||
|
||||
email_co = EmailField("KO Email", validators=[InputRequired(), Email()])
|
||||
|
||||
office_co = StringField("KO Office", validators=[InputRequired()])
|
||||
|
||||
fname_cor = StringField("COR First Name", validators=[InputRequired()])
|
||||
|
||||
lname_cor = StringField("COR Last Name", validators=[InputRequired()])
|
||||
|
||||
email_cor = EmailField("COR Email", validators=[InputRequired(), Email()])
|
||||
|
||||
office_cor = StringField("COR Office", validators=[InputRequired()])
|
||||
|
||||
def reset(self):
|
||||
"""
|
||||
Reset UII info so that it can be de-parsed rendered properly.
|
||||
This is a stupid workaround, and there's probably a better way.
|
||||
"""
|
||||
self.uii_ids.process_data(self.uii_ids.data)
|
||||
|
||||
|
||||
class FinancialVerificationForm(ValidatedForm):
|
||||
|
||||
task_order = FormField(TaskOrderForm)
|
||||
request = FormField(RequestFinancialVerificationForm)
|
||||
|
||||
def validate(self, *args, **kwargs):
|
||||
if self.task_order.funding_type.data == "OTHER":
|
||||
self.task_order.funding_type_other.validators.append(InputRequired())
|
||||
|
||||
to_number_validators = None
|
||||
if kwargs.get("has_attachment"):
|
||||
to_number_validators = list(self.task_order.number.validators)
|
||||
self.task_order.number.validators = []
|
||||
|
||||
valid = super().validate()
|
||||
|
||||
if to_number_validators:
|
||||
self.task_order.number.validators = to_number_validators
|
||||
|
||||
return valid
|
||||
|
||||
def do_validate_request(self):
|
||||
"""
|
||||
Called do_validate_request to avoid being considered an inline
|
||||
validator by wtforms.
|
||||
"""
|
||||
return self.request.validate(self)
|
||||
|
||||
def validate_draft(self):
|
||||
return self.task_order.validate_draft() and self.request.validate_draft()
|
||||
|
||||
def reset(self):
|
||||
self.request.reset()
|
||||
|
||||
@property
|
||||
def pe_id(self):
|
||||
return self.request.pe_id
|
||||
|
||||
@property
|
||||
def task_order_number(self):
|
||||
return self.task_order.number
|
||||
|
||||
@property
|
||||
def is_missing_task_order_number(self):
|
||||
return "number" in self.errors.get("task_order", {})
|
||||
|
||||
@property
|
||||
def is_only_missing_task_order_number(self):
|
||||
return "task_order_number" in self.errors and len(self.errors) == 1
|
||||
|
||||
Reference in New Issue
Block a user