darkhelm/notifications-admin
1
0
Fork 0
mirror of https://github.com/GSA/notifications-admin.git synced 2026-09-05 16:18:26 -04:00
Code Issues Packages Projects Releases Wiki Activity
Files
d6ffcd3abed32462ffd55cbe0df0e466bb29de35
notifications-admin/app/templates/views/dashboard/_jobs.html

122 lines
4.7 KiB
HTML
Raw Normal View History

Give each row in a table a heading The first columns of our tables are always headings for the subsequent columns, even though they go horizontally. HTML has the `<th>` tag, which doesn’t just have to be used for headings along the top of a table. So this commit changes the first column to be a `<th>`. This then allows us to style these elements differently, specifically making them 50% wide. This makes pages like the dashboard align more nicely.
2016-06-08 13:41:02 +01:00
{% from "components/table.html" import list_table, field, right_aligned_field_heading, row_heading %}
Split the JSON responses into one key per section Previously, the AJAX update for the dashboard was returning a big blob of JSON with one key. This commit splits it up to return: - one key for each section of the page - each containing a smaller chunk of HTML rendered from a partial The jobs page was already working this way (pretty much) but just needed a little tweaking to get it the same.
2016-06-28 09:07:04 +01:00
{% from "components/big-number.html" import big_number -%}
Show usage count on uploads page Because we’re be grouping jobs under their parent contact lists it’s good to have some information ‘scent’ to help people find their jobs, ie by clicking into a contact list. It also lets you see which list have been used more than others, maybe because the update hasn’t been sent to that group of people yet. The hint text under uploads always says when they were used. For contact lists this is a bit more complicated, since they can: - never have been used - been used multiple times This commit makes use of the new fields being returned by the API to say determine when these messages are relevant. They also let us differentiate between a contact list that’s never been used, and one that has been used, but not recently enough to show any jobs against it.
2020-05-12 17:52:13 +01:00
{% from "components/message-count-label.html" import message_count_label, recipient_count_label, iteration_count -%}
Put uploaded files on the dashboard This commit depends on and uses the data returned by: - [x] https://github.com/alphagov/notifications-api/pull/345 - [x] https://github.com/alphagov/notifications-api/pull/347 - [x] https://github.com/alphagov/notifications-admin/pull/612 It puts the last 5 jobs on the dashboard. This should be changed to all the jobs from the last 7 days when that parameter is available. It also: - links to the jobs page - makes the numbers on the jobs page consistent with the dashboard - makes the numbers on an individual job consistent with the appearance of the dashboard
2016-05-25 13:36:35 +01:00
Make sure partials always have a wrapping `<div>` The diffDOM Javascript sometimes throws an error if it can’t calculate a diff between the original content of the page and the updated HTML delivered via AJAX. The problem seems to be when there’s not one, consistent top-level element for it to base its calculations on. This commit: - makes sure that all AJAX-delivered partials have a wrapping `<div>` - that this `<div>` has a consistent class name to make it clear why it’s there
2016-09-01 11:06:52 +01:00
<div class='dashboard-table ajax-block-container'>
Fix display of spreadsheet tables a9f79bcf078fae57c52b496762ca2e78f285a725 made all tables have a `fixed` layout. This causes issues with the spreadsheet-looking tables. This commit treats tables with half-width first columns as the exception, not the rule, and makes other tables display as before.
2016-06-09 15:52:10 +01:00
{% call(item, row_number) list_table(
jobs,
Split the JSON responses into one key per section Previously, the AJAX update for the dashboard was returning a big blob of JSON with one key. This commit splits it up to return: - one key for each section of the page - each containing a smaller chunk of HTML rendered from a partial The jobs page was already working this way (pretty much) but just needed a little tweaking to get it the same.
2016-06-28 09:07:04 +01:00
caption="Recent files uploaded",
Fix display of spreadsheet tables a9f79bcf078fae57c52b496762ca2e78f285a725 made all tables have a `fixed` layout. This causes issues with the spreadsheet-looking tables. This commit treats tables with half-width first columns as the exception, not the rule, and makes other tables display as before.
2016-06-09 15:52:10 +01:00
caption_visible=False,
Put upload letters button on jobs page This is going to become the one true ‘Uploads’ page, so it need the sticky footer that takes users into the new upload letters journey.
2019-10-09 10:52:11 +01:00
empty_message=(
Don’t talk about letters if the user can’t send them
2020-10-23 10:57:19 +01:00
'Upload a letter and Notify will print, pack and post it for you.' if current_service.has_permission('letter') else 'You have not uploaded any files yet.'
Put upload letters button on jobs page This is going to become the one true ‘Uploads’ page, so it need the sticky footer that takes users into the new upload letters journey.
2019-10-09 10:52:11 +01:00
),
Fix display of spreadsheet tables a9f79bcf078fae57c52b496762ca2e78f285a725 made all tables have a `fixed` layout. This causes issues with the spreadsheet-looking tables. This commit treats tables with half-width first columns as the exception, not the rule, and makes other tables display as before.
2016-06-09 15:52:10 +01:00
field_headings=[
'File',
Differentiate between different kinds of uploads Knowing what kind of upload a thing is is useful. And the information that is useful to show about each upload depends on what kind of upload it is.
2020-02-27 14:03:03 +00:00
'Status'
Fix display of spreadsheet tables a9f79bcf078fae57c52b496762ca2e78f285a725 made all tables have a `fixed` layout. This causes issues with the spreadsheet-looking tables. This commit treats tables with half-width first columns as the exception, not the rule, and makes other tables display as before.
2016-06-09 15:52:10 +01:00
],
Differentiate between different kinds of uploads Knowing what kind of upload a thing is is useful. And the information that is useful to show about each upload depends on what kind of upload it is.
2020-02-27 14:03:03 +00:00
field_headings_visible=False
Fix display of spreadsheet tables a9f79bcf078fae57c52b496762ca2e78f285a725 made all tables have a `fixed` layout. This causes issues with the spreadsheet-looking tables. This commit treats tables with half-width first columns as the exception, not the rule, and makes other tables display as before.
2016-06-09 15:52:10 +01:00
) %}
{% call row_heading() %}
<div class="file-list">
Group uploaded letters by day of printing Some teams have started uploading quite a lot of letters (in the hundreds per week). They’re also uploading CSVs of emails. This means the uploads page ends up quite jumbled. This is because: - there’s just a lot of items to scan through - conceptually it’s a bit odd to have batches of things displayed alongside individual things on the same page So instead we’re going to start grouping together uploaded letters. This will be by the date on which we ‘start’ printing them, or in other words the time at which they can no longer be cancelled. This feels like a natural grouping, and it matches what we know about people’s mental models of ‘batches’ and ‘runs’ when talking about printing. This grouping will be done in the API, so all this commit need to do is: - be ready to display this new type of pseudo-job - link to the page that displays all the uploaded letters for a given print day
2020-05-11 10:52:30 +01:00
{% if item.upload_type == 'letter_day' %}
<a class="file-list-filename-large govuk-link govuk-link--no-visited-state" href="{{ url_for('.uploaded_letters', service_id=current_service.id, letter_print_day=item.created_at|format_date_numeric) }}">{{ item.original_file_name }}</a>
{% elif item.upload_type == 'letter' %}
Differentiate between different kinds of uploads Knowing what kind of upload a thing is is useful. And the information that is useful to show about each upload depends on what kind of upload it is.
2020-02-27 14:03:03 +00:00
<a class="file-list-filename-large govuk-link govuk-link--no-visited-state" href="{{ url_for('.view_notification', service_id=current_service.id, notification_id=item.id) }}">{{ item.original_file_name }}</a>
Show contact lists on the uploads page Uploads page is where all the stuff you’ve uploaded lives. Now you can upload contact lists they should live here too. They always come first because they’re the most-removed from stuff you’ve sent.
2020-03-16 10:55:58 +00:00
{% elif item.upload_type == 'contact_list' %}
<a class="file-list-filename-large govuk-link govuk-link--no-visited-state" href="{{ url_for('.contact_list', service_id=current_service.id, contact_list_id=item.id) }}">{{ item.original_file_name }}</a>
Updated the uploads page to include letters. Now the page shows uploaded letters plus jobs. New units tests have not been written for this page because it is very like this will be refactor and probably a new template created for the page. Some design needs to go into this page. But we needed something ready for user research.
2019-12-05 16:14:30 +00:00
{% else %}
Differentiate between different kinds of uploads Knowing what kind of upload a thing is is useful. And the information that is useful to show about each upload depends on what kind of upload it is.
2020-02-27 14:03:03 +00:00
<a class="file-list-filename-large govuk-link govuk-link--no-visited-state" href="{{ url_for('.view_job', service_id=current_service.id, job_id=item.id) }}">{{ item.original_file_name }}</a>
Updated the uploads page to include letters. Now the page shows uploaded letters plus jobs. New units tests have not been written for this page because it is very like this will be refactor and probably a new template created for the page. Some design needs to go into this page. But we needed something ready for user research.
2019-12-05 16:14:30 +00:00
{% endif %}
Differentiate between different kinds of uploads Knowing what kind of upload a thing is is useful. And the information that is useful to show about each upload depends on what kind of upload it is.
2020-02-27 14:03:03 +00:00
{% if item.scheduled %}
Harmonise the typography when listing uploads 24px with 19px is what we use on the uploads page. On notifications page we use 19px with 16px. There’s some loose idea that the bigger size is for items that contain other items. This also increases the line height for recipients of PDF letters to make things line up.
2020-03-16 14:14:29 +00:00
<span class="file-list-hint-large">
Differentiate between different kinds of uploads Knowing what kind of upload a thing is is useful. And the information that is useful to show about each upload depends on what kind of upload it is.
2020-02-27 14:03:03 +00:00
Sending {{
item.scheduled_for|format_datetime_relative
}}
</span>
Show contact lists on the uploads page Uploads page is where all the stuff you’ve uploaded lives. Now you can upload contact lists they should live here too. They always come first because they’re the most-removed from stuff you’ve sent.
2020-03-16 10:55:58 +00:00
{% elif item.upload_type == 'contact_list' %}
Harmonise the typography when listing uploads 24px with 19px is what we use on the uploads page. On notifications page we use 19px with 16px. There’s some loose idea that the bigger size is for items that contain other items. This also increases the line height for recipients of PDF letters to make things line up.
2020-03-16 14:14:29 +00:00
<span class="file-list-hint-large">
Show usage count on uploads page Because we’re be grouping jobs under their parent contact lists it’s good to have some information ‘scent’ to help people find their jobs, ie by clicking into a contact list. It also lets you see which list have been used more than others, maybe because the update hasn’t been sent to that group of people yet. The hint text under uploads always says when they were used. For contact lists this is a bit more complicated, since they can: - never have been used - been used multiple times This commit makes use of the new fields being returned by the API to say determine when these messages are relevant. They also let us differentiate between a contact list that’s never been used, and one that has been used, but not recently enough to show any jobs against it.
2020-05-12 17:52:13 +01:00
{% if item.recent_job_count %}
Used {{ iteration_count(item.recent_job_count) }}
in the last
{{ current_service.get_days_of_retention(item.template_type) }}
days
{% elif item.has_jobs %}
Not used in the last
{{ current_service.get_days_of_retention(item.template_type) }}
days
{% else %}
Not used yet
{% endif %}
Group uploaded letters by day of printing Some teams have started uploading quite a lot of letters (in the hundreds per week). They’re also uploading CSVs of emails. This means the uploads page ends up quite jumbled. This is because: - there’s just a lot of items to scan through - conceptually it’s a bit odd to have batches of things displayed alongside individual things on the same page So instead we’re going to start grouping together uploaded letters. This will be by the date on which we ‘start’ printing them, or in other words the time at which they can no longer be cancelled. This feels like a natural grouping, and it matches what we know about people’s mental models of ‘batches’ and ‘runs’ when talking about printing. This grouping will be done in the API, so all this commit need to do is: - be ready to display this new type of pseudo-job - link to the page that displays all the uploaded letters for a given print day
2020-05-11 10:52:30 +01:00
{% elif item.upload_type == 'letter_day' %}
<span class="file-list-hint-large">
{{ item.letter_printing_statement }}
</span>
Differentiate between different kinds of uploads Knowing what kind of upload a thing is is useful. And the information that is useful to show about each upload depends on what kind of upload it is.
2020-02-27 14:03:03 +00:00
{% else %}
Harmonise the typography when listing uploads 24px with 19px is what we use on the uploads page. On notifications page we use 19px with 16px. There’s some loose idea that the bigger size is for items that contain other items. This also increases the line height for recipients of PDF letters to make things line up.
2020-03-16 14:14:29 +00:00
<span class="file-list-hint-large">
Differentiate between different kinds of uploads Knowing what kind of upload a thing is is useful. And the information that is useful to show about each upload depends on what kind of upload it is.
2020-02-27 14:03:03 +00:00
Sent {{
(item.scheduled_for or item.created_at)|format_datetime_relative
}}
</span>
{% endif %}
Highlight failing jobs on the dashboard > When we have jobs that have over 3% failure rates we should highlight > those so that peoples attention is drawn to deal with the failure. > > They would then go to the job view to see what the details are where > they could filter by failure, but that's a different story... > > This is just about calculating and highlighting those that need their > attention. — https://www.pivotaltracker.com/story/show/121206123 This commit: - calculates the failure rate for each job - makes jobs with a failure rate of > 3% go red on the dashboard
2016-06-14 16:47:22 +01:00
</div>
Fix display of spreadsheet tables a9f79bcf078fae57c52b496762ca2e78f285a725 made all tables have a `fixed` layout. This causes issues with the spreadsheet-looking tables. This commit treats tables with half-width first columns as the exception, not the rule, and makes other tables display as before.
2016-06-09 15:52:10 +01:00
{% endcall %}
{% call field() %}
Differentiate between different kinds of uploads Knowing what kind of upload a thing is is useful. And the information that is useful to show about each upload depends on what kind of upload it is.
2020-02-27 14:03:03 +00:00
{% if item.scheduled %}
{{ big_number(
item.notification_count,
smallest=True,
label=message_count_label(
item.notification_count,
item.template_type,
suffix='waiting to send'
)
) }}
{% elif item.template_type == 'letter' %}
{{ big_number(
item.notification_count,
smallest=True,
label=message_count_label(
item.notification_count,
item.template_type,
suffix=''
)
) }}
Show contact lists on the uploads page Uploads page is where all the stuff you’ve uploaded lives. Now you can upload contact lists they should live here too. They always come first because they’re the most-removed from stuff you’ve sent.
2020-03-16 10:55:58 +00:00
{% elif item.upload_type == 'contact_list' %}
{{ big_number(
item.row_count,
smallest=True,
label="saved {}".format(recipient_count_label(
item.row_count,
item.template_type
))
) }}
Differentiate between different kinds of uploads Knowing what kind of upload a thing is is useful. And the information that is useful to show about each upload depends on what kind of upload it is.
2020-02-27 14:03:03 +00:00
{% elif item.pdf_letter %}
Harmonise the typography when listing uploads 24px with 19px is what we use on the uploads page. On notifications page we use 19px with 16px. There’s some loose idea that the bigger size is for items that contain other items. This also increases the line height for recipients of PDF letters to make things line up.
2020-03-16 14:14:29 +00:00
<p class="govuk-body letter-recipient-summary">
Test that addresses display on uploads page We didn’t have a test that checked for the first two lines of the address being displayed when rendering one-off letters on the uploads page. I double checked in the database and we store addresses in the `to` field with newlines, not commas.
2020-03-03 10:50:07 +00:00
{% for line in item.recipient.splitlines() %}
Differentiate between different kinds of uploads Knowing what kind of upload a thing is is useful. And the information that is useful to show about each upload depends on what kind of upload it is.
2020-02-27 14:03:03 +00:00
{% if loop.index < 3 %}
{{ line }}<br>
{% endif %}
{% endfor %}
</p>
{% else %}
Update a couple more old grid styles
2020-03-03 16:58:06 +00:00
<div class="govuk-grid-row">
<div class="govuk-grid-column-one-third">
Differentiate between different kinds of uploads Knowing what kind of upload a thing is is useful. And the information that is useful to show about each upload depends on what kind of upload it is.
2020-02-27 14:03:03 +00:00
{{ big_number(
item.notifications_sending,
smallest=True,
label='sending',
) }}
</div>
Update a couple more old grid styles
2020-03-03 16:58:06 +00:00
<div class="govuk-grid-column-one-third">
Differentiate between different kinds of uploads Knowing what kind of upload a thing is is useful. And the information that is useful to show about each upload depends on what kind of upload it is.
2020-02-27 14:03:03 +00:00
{{ big_number(item.notifications_delivered, smallest=True, label='delivered') }}
</div>
Update a couple more old grid styles
2020-03-03 16:58:06 +00:00
<div class="govuk-grid-column-one-third">
Differentiate between different kinds of uploads Knowing what kind of upload a thing is is useful. And the information that is useful to show about each upload depends on what kind of upload it is.
2020-02-27 14:03:03 +00:00
{{ big_number(item.notifications_failed, smallest=True, label='failed') }}
</div></div>
{% endif %}
Fix display of spreadsheet tables a9f79bcf078fae57c52b496762ca2e78f285a725 made all tables have a `fixed` layout. This causes issues with the spreadsheet-looking tables. This commit treats tables with half-width first columns as the exception, not the rule, and makes other tables display as before.
2016-06-09 15:52:10 +01:00
{% endcall %}
Put uploaded files on the dashboard This commit depends on and uses the data returned by: - [x] https://github.com/alphagov/notifications-api/pull/345 - [x] https://github.com/alphagov/notifications-api/pull/347 - [x] https://github.com/alphagov/notifications-admin/pull/612 It puts the last 5 jobs on the dashboard. This should be changed to all the jobs from the last 7 days when that parameter is available. It also: - links to the jobs page - makes the numbers on the jobs page consistent with the dashboard - makes the numbers on an individual job consistent with the appearance of the dashboard
2016-05-25 13:36:35 +01:00
{% endcall %}
Fix display of spreadsheet tables a9f79bcf078fae57c52b496762ca2e78f285a725 made all tables have a `fixed` layout. This causes issues with the spreadsheet-looking tables. This commit treats tables with half-width first columns as the exception, not the rule, and makes other tables display as before.
2016-06-09 15:52:10 +01:00
</div>
Reference in New Issue Copy Permalink