refine required fields for request review

This commit is contained in:
dandds
2018-09-10 10:42:04 -04:00
parent c4e9971206
commit bad78b7c64
4 changed files with 63 additions and 13 deletions

View File

@@ -8,15 +8,14 @@ from .validators import Alphabet, PhoneNumber
class CCPOReviewForm(ValidatedForm):
comments = TextAreaField(
"Comments",
description="Add notes or comments explaining what changes are being requested or why further discussion is needed about this request.",
"Comments (optional)",
)
fname_mao = StringField("First Name", validators=[Required(), Alphabet()])
lname_mao = StringField("Last Name", validators=[Required(), Alphabet()])
email_mao = EmailField("Mission Owner e-mail (optional)", validators=[Email()])
phone_mao = TelField(
"Mission Owner phone number (optional)",
validators=[Required(), PhoneNumber()],
validators=[PhoneNumber()],
)
fname_ccpo = StringField("First Name", validators=[Required(), Alphabet()])
lname_ccpo = StringField("Last Name", validators=[Required(), Alphabet()])

View File

@@ -11,9 +11,9 @@ class RequestReview(Base):
status = relationship("RequestStatusEvent", back_populates="review")
comments = Column(String)
fname_mao = Column(String)
lname_mao = Column(String)
fname_mao = Column(String, nullable=False)
lname_mao = Column(String, nullable=False)
email_mao = Column(String)
phone_mao = Column(String)
fname_ccpo = Column(String)
lname_ccpo = Column(String)
fname_ccpo = Column(String, nullable=False)
lname_ccpo = Column(String, nullable=False)