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

test time fixes and bonus letter removal

Browse Source
This commit is contained in:
stvnrlly
2022-11-22 17:03:42 -05:00
parent 86b28e5e44
commit ca1897973a
20 changed files with 6 additions and 618 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -17,9 +17,7 @@
) %}
{% call row_heading() %}
<div class="file-list">
{% 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' %}
{% if item.upload_type == 'letter' %}
<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>
{% 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>
@@ -46,10 +44,6 @@
{% else %}
Not used yet
{% endif %}
{% elif item.upload_type == 'letter_day' %}
<span class="file-list-hint-large">
{{ item.letter_printing_statement }}
</span>
{% else %}
<span class="file-list-hint-large">
Sent {{

20
app/templates/views/jobs/job.html
View File

@@ -10,31 +10,17 @@
{% endblock %}
{% block backLink %}
{% if not just_sent %}
{{ govukBackLink({ "href": url_for('main.uploads', service_id=current_service.id) }) }}
{% endif %}
{{ govukBackLink({ "href": url_for('main.uploads', service_id=current_service.id) }) }}
{% endblock %}
{% block maincolumn_content %}
{{ page_header(job.original_file_name) }}
{% if just_sent and job.template_type == 'letter' %}
{{ banner(just_sent_message, type='default', with_tick=True) }}
{% else %}
{{ ajax_block(partials, updates_url, 'status', finished=job.processing_finished) }}
{% endif %}
{{ ajax_block(partials, updates_url, 'status', finished=job.processing_finished) }}
{{ ajax_block(partials, updates_url, 'counts', finished=job.processing_finished) }}
{{ ajax_block(partials, updates_url, 'notifications', finished=job.processing_finished) }}
{% if job.letter_job_can_be_cancelled %}
<div class="js-stick-at-bottom-when-scrolling">
<div class="page-footer">
<span class="page-footer-link page-footer-delete-link-without-button">
<a class="govuk-link govuk-link--destructive" href="{{ url_for('main.cancel_letter_job', service_id=current_service.id, job_id=job.id) }}">Cancel sending these letters</a>
</span>
{% else %}
<div>&nbsp;</div>
{% endif %}
<div>&nbsp;</div>
{% endblock %}

40
app/templates/views/notifications/notification.html
View File

@@ -46,46 +46,6 @@
{{ created_at|format_datetime_human }}
</p>
{% if template.template_type == 'letter' %}
{% if notification_status == 'cancelled' %}
<p class="notification-status-cancelled">
Cancelled {{ updated_at|format_datetime_short }}
</p>
{% elif notification_status == 'validation-failed' %}
<p class="notification-status-cancelled">
{{ message.summary | safe }}
</p>
{% elif notification_status == 'permanent-failure' %}
<p class="notification-status-cancelled">
Permanent failure – The provider cannot print the letter. Your letter will not be dispatched.
</p>
{% elif notification_status == 'technical-failure' %}
<p class="notification-status-cancelled">
Technical failure – Notify will resend once the team have
fixed the problem
</p>
{% else %}
{% if sent_with_test_key %}
{% if is_precompiled_letter %}
<p class="govuk-body">
This letter passed our checks, but we will not print it because you used a test key.
</p>
{% else %}
<p class="govuk-body">
We will not print this letter because you used a test key.
</p>
{% endif %}
{% else %}
<p class="govuk-body">
{{ letter_print_day }}
</p>
<p class="govuk-body">
Estimated delivery date: {{ estimated_letter_delivery_date|format_day_of_week }} {{ estimated_letter_delivery_date|format_date_short }}
</p>
{% endif %}
{% endif %}
{% endif %}
<div class="{{ 'letter-sent' if template.template_type == 'letter' else '' }}">
{{ template|string }}
</div>

37
app/templates/views/uploads/uploaded-letters.html
View File

@@ -1,37 +0,0 @@
{% extends "withnav_template.html" %}
{% from "components/page-header.html" import page_header %}
{% from "components/back-link/macro.njk" import govukBackLink %}
{% block service_page_title %}
Uploaded letters
{% endblock %}
{% block backLink %}
{{ govukBackLink({ "href": url_for('main.uploads', service_id=current_service.id) }) }}
{% endblock %}
{% block maincolumn_content %}
{{ page_header('Uploaded letters') }}
{% if notifications %}
<p class='govuk-body'>
{{ total|message_count('letter') }}
</p>
<p class='govuk-body'>
{{ letter_printing_statement }}
</p>
{% else %}
<p class='table-empty-message'>
No letters printing {{ letter_print_day }}
</p>
{% endif %}
{% include 'views/activity/notifications.html' %}
{% endblock %}