From 4b0d8ec636bf087213409c750459a3e57416fde1 Mon Sep 17 00:00:00 2001 From: Chris Hill-Scott Date: Wed, 12 Oct 2016 09:20:32 +0100 Subject: [PATCH] Use days of week, not month for scheduled jobs MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Friday at 4pm is easier to understand than 14 October at 4pm, especially when the UI you’ve used to choose this time has talked about days of the week. --- app/__init__.py | 18 ++++++++++++++++++ app/templates/partials/jobs/notifications.html | 2 +- app/templates/views/dashboard/_upcoming.html | 2 +- tests/app/main/views/test_dashboard.py | 4 ++-- tests/app/main/views/test_jobs.py | 3 ++- tests/conftest.py | 2 +- 6 files changed, 25 insertions(+), 6 deletions(-) diff --git a/app/__init__.py b/app/__init__.py index 17b17c563..375bc677a 100644 --- a/app/__init__.py +++ b/app/__init__.py @@ -117,6 +117,7 @@ def create_app(): application.add_template_filter(format_date) application.add_template_filter(format_date_normal) application.add_template_filter(format_date_short) + application.add_template_filter(format_datetime_relative) application.add_template_filter(format_delta) application.add_template_filter(format_notification_status) application.add_template_filter(format_notification_status_as_time) @@ -232,6 +233,23 @@ def format_datetime_short(date): ) +def format_datetime_relative(date): + return '{} at {}'.format( + get_human_day(date), + format_time(date) + ) + + +def get_human_day(time): + # Add 1 hour to get ‘midnight today’ instead of ‘midnight tomorrow’ + time = (gmt_timezones(time) - timedelta(hours=1)).strftime('%A') + if time == datetime.utcnow().strftime('%A'): + return 'today' + if time == (datetime.utcnow() + timedelta(days=1)).strftime('%A'): + return 'tomorrow' + return time + + def format_time(date): return { '12:00AM': 'Midnight', diff --git a/app/templates/partials/jobs/notifications.html b/app/templates/partials/jobs/notifications.html index 408073a39..9ef4ef6ad 100644 --- a/app/templates/partials/jobs/notifications.html +++ b/app/templates/partials/jobs/notifications.html @@ -5,7 +5,7 @@ {% if job.job_status == 'scheduled' %}

- Sending will start at {{ job.scheduled_for|format_time }} + Sending will start {{ job.scheduled_for|format_datetime_relative }}

diff --git a/app/templates/views/dashboard/_upcoming.html b/app/templates/views/dashboard/_upcoming.html index 4589b20a3..1d7b897ed 100644 --- a/app/templates/views/dashboard/_upcoming.html +++ b/app/templates/views/dashboard/_upcoming.html @@ -23,7 +23,7 @@
{{ item.original_file_name }} - Sending at {{ item.scheduled_for|format_time }} + Sending {{ item.scheduled_for|format_datetime_relative }}
{% endcall %} diff --git a/tests/app/main/views/test_dashboard.py b/tests/app/main/views/test_dashboard.py index 09a243e8c..f0e1cacfc 100644 --- a/tests/app/main/views/test_dashboard.py +++ b/tests/app/main/views/test_dashboard.py @@ -194,10 +194,10 @@ def test_should_show_upcoming_jobs_on_dashboard( assert len(table_rows) == 2 assert 'send_me_later.csv' in table_rows[0].find_all('th')[0].text - assert 'Sending at 11:09am' in table_rows[0].find_all('th')[0].text + assert 'Sending today at 11:09am' in table_rows[0].find_all('th')[0].text assert table_rows[0].find_all('td')[0].text.strip() == '1' assert 'even_later.csv' in table_rows[1].find_all('th')[0].text - assert 'Sending at 11:09pm' in table_rows[1].find_all('th')[0].text + assert 'Sending today at 11:09pm' in table_rows[1].find_all('th')[0].text assert table_rows[1].find_all('td')[0].text.strip() == '1' diff --git a/tests/app/main/views/test_jobs.py b/tests/app/main/views/test_jobs.py index 96d40c7de..98184fa31 100644 --- a/tests/app/main/views/test_jobs.py +++ b/tests/app/main/views/test_jobs.py @@ -142,6 +142,7 @@ def test_should_show_job_in_progress( assert page.find('p', {'class': 'hint'}).text.strip() == 'Report is 50% complete…' +@freeze_time("2016-01-01T00:00:00.061258") def test_should_show_scheduled_job( app_, service_one, @@ -162,7 +163,7 @@ def test_should_show_scheduled_job( assert response.status_code == 200 page = BeautifulSoup(response.data.decode('utf-8'), 'html.parser') - assert page.find('main').find_all('p')[2].text.strip() == 'Sending will start at midnight' + assert page.find('main').find_all('p')[2].text.strip() == 'Sending will start today at midnight' assert page.find('input', {'type': 'submit', 'value': 'Cancel sending'}) diff --git a/tests/conftest.py b/tests/conftest.py index 5a110ff71..5f21ebacc 100644 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -903,7 +903,7 @@ def mock_get_scheduled_job(mocker, api_user_active): api_user_active, job_id=job_id, job_status='scheduled', - scheduled_for='2016-01-01T00:00:00.061258' + scheduled_for='2016-01-02T00:00:00.061258' )} return mocker.patch('app.job_api_client.get_job', side_effect=_get_job)