Merge pull request #297 from dod-ccpo/expiration-date-#160326598

add expiration_date to manual task order form

atst/models/request_revision.py

@@ -35,7 +35,7 @@ class RequestRevision(Base, TimestampsMixin):
 
     # details_of_use
     jedi_usage = Column(String)
-    start_date = Column(Date())
+    start_date = Column(Date)
     cloud_native = Column(String)
     dollar_value = Column(Integer)
     dod_component = Column(String)
@@ -60,7 +60,7 @@ class RequestRevision(Base, TimestampsMixin):
     fname_request = Column(String)
     lname_request = Column(String)
     service_branch = Column(String)
-    date_latest_training = Column(Date())
+    date_latest_training = Column(Date)
 
     # financial_verification
     pe_id = Column(String)

atst/models/task_order.py

@@ -1,6 +1,6 @@
 from enum import Enum
 
-from sqlalchemy import Column, Integer, String, ForeignKey, Enum as SQLAEnum
+from sqlalchemy import Column, Integer, String, ForeignKey, Enum as SQLAEnum, Date
 from sqlalchemy.orm import relationship
 
 from atst.models import Base
@@ -32,6 +32,7 @@ class TaskOrder(Base):
     clin_1003 = Column(Integer)
     clin_2001 = Column(Integer)
     clin_2003 = Column(Integer)
+    expiration_date = Column(Date)
 
     attachment_id = Column(ForeignKey("attachments.id"))
     pdf = relationship("Attachment")