darkhelm/notifications-admin
1
0
Fork 0
mirror of https://github.com/GSA/notifications-admin.git synced 2026-06-26 02:11:49 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3353 from alphagov/reverse-sort-scheduled-jobs

Browse Source 
Reverse sort scheduled jobs
This commit is contained in:
Chris Hill-Scott
2020-03-06 16:40:16 +00:00
committed by GitHub
parent 6b17fb1dce 3ad00adfb3
commit 4a154fddcf
4 changed files with 18 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
app/notify_client/job_api_client.py
View File

@@ -14,8 +14,9 @@ class JobApiClient(NotifyAdminAPIClient):
'ready to send',
'sent to dvla'
}
NON_SCHEDULED_JOB_STATUSES = JOB_STATUSES - {'scheduled', 'cancelled'}
SCHEDULED_JOB_STATUS = 'scheduled'
CANCELLED_JOB_STATUS = 'cancelled'
NON_SCHEDULED_JOB_STATUSES = JOB_STATUSES - {SCHEDULED_JOB_STATUS, CANCELLED_JOB_STATUS}
def get_job(self, service_id, job_id):
params = {}
@@ -65,8 +66,12 @@ class JobApiClient(NotifyAdminAPIClient):
def get_scheduled_jobs(self, service_id):
return sorted(
self.get_jobs(service_id, statuses=['scheduled'])['data'],
key=lambda job: job['scheduled_for']
self.get_jobs(
service_id,
statuses=[self.SCHEDULED_JOB_STATUS]
)['data'],
key=lambda job: job['scheduled_for'],
reverse=True,
)
@cache.set('has_jobs-{service_id}')

2
app/templates/views/dashboard/_upcoming.html
View File

@@ -20,7 +20,7 @@
</span>
<span class="banner-dashboard-meta">
sending starts
{{ current_service.scheduled_jobs[0].scheduled_for|format_datetime_relative }}
{{ current_service.scheduled_jobs[-1].scheduled_for|format_datetime_relative }}
</span>
</a>
{% endif %}

8
tests/app/main/views/test_jobs.py
View File

@@ -44,14 +44,14 @@ from tests.conftest import (
(
'File Messages to be sent'
),
(
'send_me_later.csv '
'Sending 1 January 2016 at 11:09am 1'
),
(
'even_later.csv '
'Sending 1 January 2016 at 11:09pm 1'
),
(
'send_me_later.csv '
'Sending 1 January 2016 at 11:09am 1'
),
(
'File Status'
),

8
tests/app/main/views/test_uploads.py
View File

@@ -668,13 +668,13 @@ def test_uploads_page_shows_scheduled_jobs(
'File Status'
),
(
'send_me_later.csv '
'Sending 1 January 2016 at 11:09am '
'even_later.csv '
'Sending 1 January 2016 at 11:09pm '
'1 text message waiting to send'
),
(
'even_later.csv '
'Sending 1 January 2016 at 11:09pm '
'send_me_later.csv '
'Sending 1 January 2016 at 11:09am '
'1 text message waiting to send'
),
]