Merge pull request #266 from dod-ccpo/review-history-#159038479

Review history #159038479

atst/filters.py

@@ -65,9 +65,9 @@ def renderList(value):
     return app.jinja_env.filters["safe"]("<br>".join(value))
 
 
-def formattedDate(value):
+def formattedDate(value, formatter="%m/%d/%Y"):
     if value:
-        return value.strftime("%m/%d/%Y")
+        return value.strftime(formatter)
     else:
         return "-"
 

atst/models/request_review.py

@@ -20,3 +20,15 @@ class RequestReview(Base):
     phone_mao = Column(String)
     fname_ccpo = Column(String)
     lname_ccpo = Column(String)
+
+    @property
+    def full_name_reviewer(self):
+        return self.reviewer.full_name
+
+    @property
+    def full_name_mao(self):
+        return "{} {}".format(self.fname_mao, self.lname_mao)
+
+    @property
+    def full_name_ccpo(self):
+        return "{} {}".format(self.fname_ccpo, self.lname_ccpo)

atst/models/request_status_event.py

@@ -42,3 +42,12 @@ class RequestStatusEvent(Base):
     @property
     def displayname(self):
         return self.new_status.value
+
+    @property
+    def log_name(self):
+        if self.new_status == RequestStatus.CHANGES_REQUESTED:
+            return "Denied"
+        elif self.new_status == RequestStatus.PENDING_FINANCIAL_VERIFICATION:
+            return "Accepted"
+        else:
+            return self.displayname

atst/routes/requests/approval.py

@@ -35,8 +35,9 @@ def render_approval(request, form=None):
     return render_template(
         "requests/approval.html",
         data=data,
+        status_events=reversed(request.status_events),
         request_id=request.id,
-        status=request.status.value,
+        current_status=request.status.value,
         pending_review=pending_review,
         financial_review=pending_final_approval,
         pdf_available=request.task_order and request.task_order.pdf,