Merge pull request #411 from dod-ccpo/phone-extensions

Add phone ext

atst/domain/users.py

@@ -69,6 +69,7 @@ class Users(object):
         "last_name",
         "email",
         "phone_number",
+        "phone_ext",
         "service_branch",
         "citizenship",
         "designation",

atst/forms/ccpo_review.py

@@ -19,5 +19,6 @@ class CCPOReviewForm(ValidatedForm):
     phone_mao = TelField(
         "Mission Owner phone number (optional)", validators=[Optional(), PhoneNumber()]
     )
+    phone_ext_mao = StringField("Extension (optional)")
     fname_ccpo = StringField("First Name (optional)", validators=[Optional(), Name()])
     lname_ccpo = StringField("Last Name (optional)", validators=[Optional(), Name()])

atst/forms/edit_user.py

@@ -20,11 +20,8 @@ USER_FIELDS = {
         description="Enter your preferred contact e-mail address",
         validators=[Email()],
     ),
-    "phone_number": TelField(
-        "Phone Number",
-        description="Enter your 10-digit U.S. phone number",
-        validators=[PhoneNumber()],
-    ),
+    "phone_number": TelField("Phone Number", validators=[PhoneNumber()]),
+    "phone_ext": StringField("Extension"),
     "service_branch": SelectField(
         "Service Branch or Agency",
         description="Which service or organization do you belong to within the DoD?",
@@ -86,6 +83,7 @@ class EditUserForm(ValidatedForm):
     last_name = inherit_user_field("last_name")
     email = inherit_user_field("email")
     phone_number = inherit_user_field("phone_number")
+    phone_ext = inherit_user_field("phone_ext")
     service_branch = inherit_user_field("service_branch")
     citizenship = inherit_user_field("citizenship")
     designation = inherit_user_field("designation")

atst/forms/new_request.py

@@ -167,6 +167,7 @@ class InformationAboutYouForm(ValidatedForm):
     lname_request = inherit_field(USER_FIELDS["last_name"])
     email_request = inherit_field(USER_FIELDS["email"])
     phone_number = inherit_field(USER_FIELDS["phone_number"])
+    phone_ext = inherit_field(USER_FIELDS["phone_ext"], required=False)
     service_branch = inherit_field(USER_FIELDS["service_branch"])
     citizenship = inherit_field(USER_FIELDS["citizenship"])
     designation = inherit_field(USER_FIELDS["designation"])

atst/models/request.py

@@ -81,6 +81,7 @@ class Request(Base, mixins.TimestampsMixin, mixins.AuditableMixin):
         "citizenship",
         "designation",
         "phone_number",
+        "phone_ext",
         "email_request",
         "fname_request",
         "lname_request",

atst/models/request_review.py

@@ -18,6 +18,7 @@ class RequestReview(Base, mixins.TimestampsMixin, mixins.AuditableMixin):
     lname_mao = Column(String)
     email_mao = Column(String)
     phone_mao = Column(String)
+    phone_ext_mao = Column(String)
     fname_ccpo = Column(String)
     lname_ccpo = Column(String)
 

atst/models/request_revision.py

@@ -57,6 +57,7 @@ class RequestRevision(Base, mixins.TimestampsMixin, mixins.AuditableMixin):
     citizenship = Column(String)
     designation = Column(String)
     phone_number = Column(String)
+    phone_ext = Column(String)
     email_request = Column(String)
     fname_request = Column(String)
     lname_request = Column(String)

atst/models/user.py

@@ -21,6 +21,7 @@ class User(Base, mixins.TimestampsMixin, mixins.AuditableMixin):
     first_name = Column(String)
     last_name = Column(String)
     phone_number = Column(String)
+    phone_ext = Column(String)
     service_branch = Column(String)
     citizenship = Column(String)
     designation = Column(String)

atst/routes/requests/jedi_request_flow.py

@@ -64,6 +64,7 @@ class JEDIRequestFlow(object):
             "lname_request": user.last_name,
             "email_request": user.email,
             "phone_number": user.phone_number,
+            "phone_ext": user.phone_ext,
             "service_branch": user.service_branch,
             "designation": user.designation,
             "citizenship": user.citizenship,