diff --git a/alembic/versions/bc6edccded26_request_reviews_non_nullable_fields.py b/alembic/versions/bc6edccded26_request_reviews_non_nullable_fields.py new file mode 100644 index 00000000..e143275a --- /dev/null +++ b/alembic/versions/bc6edccded26_request_reviews_non_nullable_fields.py @@ -0,0 +1,50 @@ +"""request_reviews non-nullable fields + +Revision ID: bc6edccded26 +Revises: 7bdb2055d7c7 +Create Date: 2018-09-10 10:38:00.107297 + +""" +from alembic import op +import sqlalchemy as sa + + +# revision identifiers, used by Alembic. +revision = 'bc6edccded26' +down_revision = '7bdb2055d7c7' +branch_labels = None +depends_on = None + + +def upgrade(): + # ### commands auto generated by Alembic - please adjust! ### + op.alter_column('request_reviews', 'fname_ccpo', + existing_type=sa.VARCHAR(), + nullable=False) + op.alter_column('request_reviews', 'fname_mao', + existing_type=sa.VARCHAR(), + nullable=False) + op.alter_column('request_reviews', 'lname_ccpo', + existing_type=sa.VARCHAR(), + nullable=False) + op.alter_column('request_reviews', 'lname_mao', + existing_type=sa.VARCHAR(), + nullable=False) + # ### end Alembic commands ### + + +def downgrade(): + # ### commands auto generated by Alembic - please adjust! ### + op.alter_column('request_reviews', 'lname_mao', + existing_type=sa.VARCHAR(), + nullable=True) + op.alter_column('request_reviews', 'lname_ccpo', + existing_type=sa.VARCHAR(), + nullable=True) + op.alter_column('request_reviews', 'fname_mao', + existing_type=sa.VARCHAR(), + nullable=True) + op.alter_column('request_reviews', 'fname_ccpo', + existing_type=sa.VARCHAR(), + nullable=True) + # ### end Alembic commands ### diff --git a/atst/forms/ccpo_review.py b/atst/forms/ccpo_review.py index 6db8c9a5..89b5ed03 100644 --- a/atst/forms/ccpo_review.py +++ b/atst/forms/ccpo_review.py @@ -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()]) diff --git a/atst/models/request_review.py b/atst/models/request_review.py index 3b4df410..a17367ff 100644 --- a/atst/models/request_review.py +++ b/atst/models/request_review.py @@ -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) diff --git a/templates/requests/approval.html b/templates/requests/approval.html index d9952981..49a526d8 100644 --- a/templates/requests/approval.html +++ b/templates/requests/approval.html @@ -39,11 +39,7 @@ Provide instructions or notes for additional information that is necessary to approve the request here. The requestor may then re-submit the updated request or initiate contact outside of AT-AT if further discussion is required. These notes will be visible to the person making the JEDI request. -