Merge pull request #184 from dod-ccpo/financial-page-bug-159795524

review and submit page bugs (159795524 and 159889979)

atst/domain/requests.py

@@ -137,6 +137,11 @@ class Requests(object):
 
         return dollar_value < cls.AUTO_APPROVE_THRESHOLD
 
+    _VALID_SUBMISSION_STATUSES = [
+        RequestStatus.STARTED,
+        RequestStatus.CHANGES_REQUESTED,
+    ]
+
     @classmethod
     def should_allow_submission(cls, request):
         all_request_sections = [
@@ -145,7 +150,7 @@ class Requests(object):
             "primary_poc",
         ]
         existing_request_sections = request.body.keys()
-        return request.status == RequestStatus.STARTED and all(
+        return request.status in Requests._VALID_SUBMISSION_STATUSES and all(
             section in existing_request_sections for section in all_request_sections
         )
 

atst/models/request.py

@@ -27,3 +27,8 @@ class Request(Base):
     @property
     def status_displayname(self):
         return self.status_events[-1].displayname
+
+    @property
+    def annual_spend(self):
+        monthly = self.body.get("details_of_use", {}).get("estimated_monthly_spend", 0)
+        return monthly * 12

atst/routes/requests/index.py

@@ -10,7 +10,7 @@ def map_request(request):
     time_created = pendulum.instance(request.time_created)
     is_new = time_created.add(days=1) > pendulum.now()
     app_count = request.body.get("details_of_use", {}).get("num_software_systems", 0)
-    annual_usage = request.body.get("details_of_use", {}).get("dollar_value", 0)
+    annual_usage = request.annual_spend
     update_url = url_for(
         "requests.requests_form_update", screen=1, request_id=request.id
     )