Denied by Darth Vader
+{{ status.log_name }} by {{ status.review.full_name_reviewer }}
{% if status.review.comment %}{{ status.review.comment }}
{% endif %} @@ -171,13 +171,13 @@ {% endif %}diff --git a/atst/models/request_review.py b/atst/models/request_review.py index 9c1361d2..c46f1d11 100644 --- a/atst/models/request_review.py +++ b/atst/models/request_review.py @@ -21,6 +21,10 @@ class RequestReview(Base): 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) diff --git a/atst/models/request_status_event.py b/atst/models/request_status_event.py index a5373bdd..15e8a3d1 100644 --- a/atst/models/request_status_event.py +++ b/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 diff --git a/atst/routes/requests/approval.py b/atst/routes/requests/approval.py index 321f6869..1f1659cf 100644 --- a/atst/routes/requests/approval.py +++ b/atst/routes/requests/approval.py @@ -35,7 +35,7 @@ def render_approval(request, form=None): return render_template( "requests/approval.html", data=data, - statuses=request.status_events, + statuses=reversed(request.status_events), request_id=request.id, status=request.status.value, pending_review=pending_review, diff --git a/templates/requests/approval.html b/templates/requests/approval.html index 2011d482..fbef27e8 100644 --- a/templates/requests/approval.html +++ b/templates/requests/approval.html @@ -148,7 +148,7 @@
{{ status.review.comment }}
{% endif %} @@ -171,13 +171,13 @@ {% endif %}