pk/atst
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix "pending CCPO approval" alert display logic

Browse Source
This commit is contained in:
dandds 2018-08-13 11:03:23 -04:00
parent 37bb0c5d30
commit 1387423a1c
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
atst/domain/requests.py
View File

@ -150,3 +150,7 @@ class Requests(object):
@classmethod @classmethod
def is_pending_financial_verification(cls, request): def is_pending_financial_verification(cls, request):
return request.status == RequestStatus.PENDING_FINANCIAL_VERIFICATION return request.status == RequestStatus.PENDING_FINANCIAL_VERIFICATION
@classmethod
def is_pending_ccpo_approval(cls, request):
return request.status == RequestStatus.PENDING_CCPO_APPROVAL

7
atst/routes/requests/index.py
View File

@ -37,11 +37,8 @@ def requests_index():
mapped_requests = [map_request(r) for r in requests] mapped_requests = [map_request(r) for r in requests]
pending_fv_count = [ pending_fv = any(Requests.is_pending_financial_verification(r) for r in requests)
True for r in requests if Requests.is_pending_financial_verification(r) pending_ccpo = any(Requests.is_pending_ccpo_approval(r) for r in requests)
]
pending_fv = len(pending_fv_count) > 1
pending_ccpo = len(pending_fv_count) != len(mapped_requests)
return render_template( return render_template(
"requests.html", "requests.html",