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

Merge pull request #434 from dod-ccpo/small-fix

Browse Source 
Update "auto approve" to "auto accept" in request domain object
This commit is contained in:
patricksmithdds 2018-11-07 09:38:25 -05:00 committed by GitHub
commit cb48fac0b7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
atst/domain/requests/requests.py
View File

@ -27,7 +27,7 @@ def create_revision_from_request_body(body):
class Requests(object): class Requests(object):
AUTO_APPROVE_THRESHOLD = 1_000_000 AUTO_ACCEPT_THRESHOLD = 1_000_000
ANNUAL_SPEND_THRESHOLD = 1_000_000 ANNUAL_SPEND_THRESHOLD = 1_000_000
@classmethod @classmethod
@ -63,7 +63,7 @@ class Requests(object):
def submit(cls, request): def submit(cls, request):
request = Requests.set_status(request, RequestStatus.SUBMITTED) request = Requests.set_status(request, RequestStatus.SUBMITTED)
if Requests.should_auto_approve(request): if Requests.should_auto_accept(request):
request = Requests.set_status( request = Requests.set_status(
request, RequestStatus.PENDING_FINANCIAL_VERIFICATION request, RequestStatus.PENDING_FINANCIAL_VERIFICATION
) )
@ -72,7 +72,7 @@ class Requests(object):
request=request, request=request,
review_data={ review_data={
"comment": "Auto-acceptance for dollar value below {}".format( "comment": "Auto-acceptance for dollar value below {}".format(
dollars(Requests.AUTO_APPROVE_THRESHOLD) dollars(Requests.AUTO_ACCEPT_THRESHOLD)
) )
}, },
) )
@ -134,13 +134,13 @@ class Requests(object):
return updated_request return updated_request
@classmethod @classmethod
def should_auto_approve(cls, request): def should_auto_accept(cls, request):
try: try:
dollar_value = request.body["details_of_use"]["dollar_value"] dollar_value = request.body["details_of_use"]["dollar_value"]
except KeyError: except KeyError:
return False return False
return dollar_value < cls.AUTO_APPROVE_THRESHOLD return dollar_value < cls.AUTO_ACCEPT_THRESHOLD
_VALID_SUBMISSION_STATUSES = [ _VALID_SUBMISSION_STATUSES = [
RequestStatus.STARTED, RequestStatus.STARTED,

2
atst/forms/new_request.py
View File

@ -35,7 +35,7 @@ class DetailsOfUseForm(ValidatedForm):
except ValueError: except ValueError:
annual_spend = 0 annual_spend = 0
if annual_spend > Requests.AUTO_APPROVE_THRESHOLD: if annual_spend > Requests.ANNUAL_SPEND_THRESHOLD:
self.number_user_sessions.validators.append(InputRequired()) self.number_user_sessions.validators.append(InputRequired())
self.average_daily_traffic.validators.append(InputRequired()) self.average_daily_traffic.validators.append(InputRequired())

3
templates/requests/approval.html
View File

@ -101,7 +101,6 @@
<li> <li>
<article class='approval-log__log-item'> <article class='approval-log__log-item'>
<div> <div>
{{ review.log_name }}
<h3 class='approval-log__log-item__header'>{{ review.status.log_name }} by {{ review.full_name_reviewer }}</h3> <h3 class='approval-log__log-item__header'>{{ review.status.log_name }} by {{ review.full_name_reviewer }}</h3>
{% if review.comment %} {% if review.comment %}
<p>{{ review.comment }}</p> <p>{{ review.comment }}</p>
@ -163,7 +162,7 @@
{{ TextInput( {{ TextInput(
review_form.comment, review_form.comment,
label='Approval comments or notes', label='Approval comments or notes',
description='Provide any comments or notes regarding the approval of this request. <strong>This message will be shared with the person making the JEDI request.</strong>.', description='Provide any comments or notes regarding the approval of this request. <strong>This message will be shared with the person making the JEDI request.</strong>',
paragraph=True, paragraph=True,
noMaxWidth=True noMaxWidth=True
) }} ) }}