darkhelm/notifications-admin
1
0
Fork 0
mirror of https://github.com/GSA/notifications-admin.git synced 2026-05-07 01:19:22 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3134 from alphagov/relative-dates-jobs

Browse Source 
Use relative dates for jobs on dashboard
This commit is contained in:
Chris Hill-Scott
2019-10-02 16:19:44 +01:00
committed by GitHub
parent 124801836b 79369c38c7
commit 8b9cc5f4dc
3 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -20,7 +20,7 @@
<a class="file-list-filename" href="{{ url_for('.view_job', service_id=current_service.id, job_id=item.id) }}">{{ item.original_file_name }}</a>
<span class="file-list-hint">
Sent {{
item.scheduled_for|format_datetime_short if item.scheduled_for else item.created_at|format_datetime_short
(item.scheduled_for if item.scheduled_for else item.created_at)|format_datetime_relative
}}
</span>
</div>

2
tests/app/main/views/test_dashboard.py
View File

@@ -774,7 +774,7 @@ def test_should_show_recent_jobs_on_dashboard(
"thisisatest.csv",
)):
assert filename in table_rows[index].find_all('th')[0].text
assert 'Sent 1 January at 11:09' in table_rows[index].find_all('th')[0].text
assert 'Sent today at 11:09' in table_rows[index].find_all('th')[0].text
for column_index, count in enumerate((1, 0, 0)):
assert table_rows[index].find_all('td')[column_index].text.strip() == str(count)

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

@@ -24,19 +24,19 @@ from tests.conftest import (
),
(
'export 1/1/2016.xls '
'Sent 12 December at 12:12pm 1 0 0'
'Sent today at 12:12pm 1 0 0'
),
(
'all email addresses.xlsx '
'Sent 12 December at 12:12pm 1 0 0'
'Sent today at 12:12pm 1 0 0'
),
(
'applicants.ods '
'Sent 12 December at 12:12pm 1 0 0'
'Sent today at 12:12pm 1 0 0'
),
(
'thisisatest.csv '
'Sent 12 December at 12:12pm 1 0 0'
'Sent today at 12:12pm 1 0 0'
),
)),
(active_caseworking_user, (
@@ -56,19 +56,19 @@ from tests.conftest import (
),
(
'export 1/1/2016.xls '
'Sent 12 December at 12:12pm 1 0 0'
'Sent today at 12:12pm 1 0 0'
),
(
'all email addresses.xlsx '
'Sent 12 December at 12:12pm 1 0 0'
'Sent today at 12:12pm 1 0 0'
),
(
'applicants.ods '
'Sent 12 December at 12:12pm 1 0 0'
'Sent today at 12:12pm 1 0 0'
),
(
'thisisatest.csv '
'Sent 12 December at 12:12pm 1 0 0'
'Sent today at 12:12pm 1 0 0'
),
)),
])
@@ -129,19 +129,19 @@ def test_jobs_page_doesnt_show_scheduled_on_page_2(
),
(
'export 1/1/2016.xls '
'Sent 12 December at 12:12pm 1 0 0'
'Sent today at 12:12pm 1 0 0'
),
(
'all email addresses.xlsx '
'Sent 12 December at 12:12pm 1 0 0'
'Sent today at 12:12pm 1 0 0'
),
(
'applicants.ods '
'Sent 12 December at 12:12pm 1 0 0'
'Sent today at 12:12pm 1 0 0'
),
(
'thisisatest.csv '
'Sent 12 December at 12:12pm 1 0 0'
'Sent today at 12:12pm 1 0 0'
),
)):
assert normalize_spaces(page.select('tr')[index].text) == row