display reviewer name and basic review action
This commit is contained in:
@@ -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)
|
||||
|
@@ -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
|
||||
|
@@ -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,
|
||||
|
Reference in New Issue
Block a user