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

Merge pull request #849 from GSA/814-error-message-CSV

Browse Source 
814 error message csv
This commit is contained in:
Carlo Costino
2023-10-06 12:17:07 -04:00
committed by GitHub
parent 838f643b18 af2da54ffc
commit 3a4e3889c0
9 changed files with 238 additions and 211 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
app/assets/javascripts/errorBanner.js
View File

@@ -12,6 +12,5 @@
hideBanner: () => $('.banner-dangerous').addClass('display-none'), hideBanner: () => $('.banner-dangerous').addClass('display-none'),
showBanner: () => $('.banner-dangerous') showBanner: () => $('.banner-dangerous')
.removeClass('display-none') .removeClass('display-none')
.trigger('focus'),
}; };
})(window); })(window);

4
app/assets/javascripts/fileUpload.js
View File

@@ -15,9 +15,9 @@
// The label gets styled like a button and is used to hide the native file upload control. This is so that // The label gets styled like a button and is used to hide the native file upload control. This is so that
// users see a button that looks like the others on the site. // users see a button that looks like the others on the site.
//
this.$form.find('label.file-upload-button').addClass('usa-button margin-bottom-1');
this.$form.find('label.file-upload-button').addClass('usa-button margin-bottom-1').attr( {role: 'button', tabindex: '0'} );
// Clear the form if the user navigates back to the page // Clear the form if the user navigates back to the page
$(window).on("pageshow", () => this.$form[0].reset()); $(window).on("pageshow", () => this.$form[0].reset());

2
app/assets/javascripts/main.js
View File

@@ -16,8 +16,6 @@ $(() => GOVUK.modules.start());
$(() => $('.error-message, .usa-error-message').eq(0).parent('label').next('input').trigger('focus')); $(() => $('.error-message, .usa-error-message').eq(0).parent('label').next('input').trigger('focus'));
$(() => $('.banner-dangerous').eq(0).trigger('focus'));
$(() => $('.govuk-header__container').on('click', function() { $(() => $('.govuk-header__container').on('click', function() {
$(this).css('border-color', '#005ea5'); $(this).css('border-color', '#005ea5');
})); }));

2
app/templates/components/components/alert/template.njk
View File

@@ -11,7 +11,7 @@
<div class="usa-alert__body"> <div class="usa-alert__body">
<h{{params.header_level}} class="usa-alert__heading">{{params.heading}}</h{{params.header_level}}> <h{{params.header_level}} class="usa-alert__heading">{{params.heading}}</h{{params.header_level}}>
<p class="usa-alert__text"> <p class="usa-alert__text">
{{params.text}} {{params.text | safe }}
</p> </p>
</div> </div>
</div> </div>

16
app/templates/partials/check/message-too-long.html
View File

@@ -1,7 +1,9 @@
<h1 class='banner-title'> <div class="usa-alert usa-alert--error" role="alert">
Message too long <div class="usa-alert__body">
</h1> <h1 class="usa-alert__heading">Message too long</h1>
<p class="usa-body"> <p class="usa-alert__text">
Text messages cannot be longer than {{ SMS_CHAR_COUNT_LIMIT }} characters. Text messages cannot be longer than {{ SMS_CHAR_COUNT_LIMIT }} characters.
Your message is {{ template.content_count }} characters. Your message is {{ template.content_count }} characters.
</p> </p>
</div>
</div>

28
app/templates/partials/check/not-allowed-to-send-to.html
View File

@@ -1,12 +1,16 @@
<h1 class='banner-title' data-module="track-error" data-error-type="Trial mode: bad recipients" data-error-label="{{ upload_id }}"> <div class="usa-alert usa-alert--error" role="alert">
You cannot send to <div class="usa-alert__body">
{{ 'this' if count_of_recipients == 1 else 'these' }} <h1 class="usa-alert__heading">
{{ template_type_label }} You cannot send to
{%- if count_of_recipients != 1 -%} {{ 'this' if count_of_recipients == 1 else 'these' }}
{{ 'es' if 'email address' == template_type_label else 's' }} {{ template_type_label }}
{%- endif %} {%- if count_of_recipients != 1 -%}
</h1> {{ 'es' if 'email address' == template_type_label else 's' }}
<p class="usa-body"> {%- endif %}
In <a class="usa-link" href="{{ url_for('.trial_mode_new') }}">trial mode</a> you can only </h1>
send to yourself and members of your team <p class="usa-alert__text">
</p> In <a class="usa-link" href="{{ url_for('.trial_mode_new') }}">trial mode</a> you can only
send to yourself and members of your team
</p>
</div>
</div>

14
app/templates/partials/check/sent-previously.html
View File

@@ -1,6 +1,8 @@
<h1 class='banner-title' data-module="track-error" data-error-type="File previously sent" data-error-label="{{ upload_id }}"> <div class="usa-alert usa-alert--error" role="alert">
These messages have already been sent today <div class="usa-alert__body">
</h1> <h1 class="usa-alert__heading">These messages have already been sent today</h1>
<p class="usa-body"> <p class="usa-alert__text">
If you need to resend them, rename the file and upload it again. If you need to resend them, rename the file and upload it again.
</p> </p>
</div>
</div>

49
app/templates/partials/check/too-many-messages.html
View File

@@ -1,23 +1,30 @@
<h1 class='banner-title' data-module="track-error" data-error-type="Trial mode: too many recipients" data-error-label="{{ upload_id }}"> <div class="usa-alert usa-alert--error" role="alert">
{% if original_file_name %} <div class="usa-alert__body">
Too many recipients <h1 class="usa-alert__heading">
{% else %} {% if original_file_name %}
Daily limit reached Too many recipients
{% endif %} {% else %}
</h1> Daily limit reached
<p class="usa-body"> {% endif %}
You can only send {{ current_service.message_limit|format_thousands }} messages per day </h1>
{%- if current_service.trial_mode %} <p class="usa-alert__text">
in <a class="usa-link" href="{{ url_for('.trial_mode_new')}}">trial mode</a> You can only send {{ current_service.message_limit|format_thousands }} messages per day
{%- endif -%} {%- if current_service.trial_mode %}
. in <a class="usa-link" href="{{ url_for('.trial_mode_new')}}">trial mode</a>
</p> {%- endif -%}
{% if original_file_name %} .
<p class="usa-body"> </p>
{% if current_service.message_limit != remaining_messages %} {% if original_file_name %}
<p class="usa-alert__text">
{% if current_service.message_limit != remaining_messages %}
You can still send {{ remaining_messages|format_thousands }} messages today, but You can still send {{ remaining_messages|format_thousands }} messages today, but
{% endif %}
‘{{ original_file_name }}’ contains
{{ count_of_recipients|recipient_count(template.template_type) }}.
</p>
{% endif %} {% endif %}
‘{{ original_file_name }}’ contains </div>
{{ count_of_recipients|recipient_count(template.template_type) }}. </div>
</p>
{% endif %}

333
app/templates/views/check/column-errors.html
View File

@@ -6,193 +6,208 @@
{% from "components/components/back-link/macro.njk" import usaBackLink %} {% from "components/components/back-link/macro.njk" import usaBackLink %}
{% block service_page_title %} {% block service_page_title %}
Error Error
{% endblock %} {% endblock %}
{% block backLink %} {% block backLink %}
{{ usaBackLink({ "href": back_link }) }} {{ usaBackLink({ "href": back_link }) }}
{% endblock %} {% endblock %}
{% block maincolumn_content %} {% block maincolumn_content %}
<div class=""> <div class="">
{% call banner_wrapper(type='dangerous') %} {% call banner_wrapper(type='dangerous') %}
{% if recipients.too_many_rows %} {% if recipients.too_many_rows %}
<h1 class='banner-title' data-module="track-error" data-error-type="Too many rows" data-error-label="{{ upload_id }}"> <div class="usa-alert usa-alert--error" role="alert">
Your file has too many rows <div class="usa-alert__body">
</h1> <h1 class="usa-alert__heading banner-title" data-module="track-error" data-error-type="Too many rows" data-error-label="{{ upload_id }}">Your file has too many rows</h1>
<p> <p class="usa-alert__text">
Notify can process up to Notify can process up to
{{ "{:,}".format(recipients.max_rows) }} rows at once. Your {{ "{:,}".format(recipients.max_rows) }} rows at once. Your
file has {{ "{:,}".format(recipients|length) }} rows. file has {{ "{:,}".format(recipients|length) }} rows.
</p> </p>
</div>
{% elif not count_of_recipients %}
<h1 class='banner-title' data-module="track-error" data-error-type="No rows" data-error-label="{{ upload_id }}">
Your file is missing some rows
</h1>
{% if recipients.missing_column_headers %}
<p>
It needs at least one row of data, and {{ recipients.missing_column_headers | sort() | formatted_list(
prefix='a column called',
prefix_plural='columns called'
) }}.
</p>
{% else %}
<p>
It needs at least one row of data.
</p>
{% endif %}
{% elif not recipients.has_recipient_columns %}
<h1 class='banner-title' data-module="track-error" data-error-type="Missing recipient columns" data-error-label="{{ upload_id }}">
There’s a problem with your column names
</h1>
<p>
Your file needs a column called ‘{{ first_recipient_column }}’.
</p>
<p>
Right now it has {{ recipients.column_headers | formatted_list(
prefix='one column, called ',
prefix_plural='columns called '
) }}.
</p>
{% elif recipients.duplicate_recipient_column_headers %}
<h1 class='banner-title' data-module="track-error" data-error-type="Duplicate recipient columns" data-error-label="{{ upload_id }}">
There’s a problem with your column names
</h1>
<p>
We found more than one column called {{ (
recipients.duplicate_recipient_column_headers
) | formatted_list(
conjunction='or',
prefix='',
prefix_plural=''
) }}.
</p>
<p>
Delete or rename one of these columns and try again.
</p>
{% elif recipients.missing_column_headers %}
<h1 class='banner-title' data-module="track-error" data-error-type="Missing placeholder columns" data-error-label="{{ upload_id }}">
Your column names need to match the double brackets in your template
</h1>
<p>
Your file is missing {{ recipients.missing_column_headers | formatted_list(
conjunction='and',
prefix='a column called ',
prefix_plural='columns called '
) }}.
</p>
{% elif sent_previously %}
{% include "partials/check/sent-previously.html" %}
{% elif not recipients.allowed_to_send_to %}
{% with
count_of_recipients=count_of_recipients,
template_type_label=recipients.recipient_column_headers[0]
%}
{% include "partials/check/not-allowed-to-send-to.html" %}
{% endwith %}
{% elif recipients.more_rows_than_can_send %}
{% include "partials/check/too-many-messages.html" %}
{% endif %}
{% endcall %}
</div> </div>
{% elif not count_of_recipients %}
<div class="js-stick-at-top-when-scrolling"> <div class="usa-alert usa-alert--error" role="alert">
<div class="form-group"> <div class="usa-alert__body">
{% if not request.args.from_test %} <h1 class="usa-alert__heading banner-title" data-module="track-error" data-error-type="No rows"
{{ file_upload( data-error-label="{{ upload_id }}">Your file is missing some rows
form.file, </h1>
allowed_file_extensions=allowed_file_extensions, {% if recipients.missing_column_headers %}
action=url_for('.send_messages', service_id=current_service.id, template_id=template.id), <p class="usa-alert-text">
button_text='Upload your file again' It needs at least one row of data, and {{ recipients.missing_column_headers | sort() | formatted_list(
) }} prefix='a column called',
prefix_plural='columns called'
) }}.
</p>
{% else %}
<p class="usa-alert-text">
It needs at least one row of data.
</p>
{% endif %} {% endif %}
</div> </div>
<a href="#content" class="usa-link back-to-top-link">Back to top</a>
</div> </div>
{% if not request.args.from_test %} {% elif not recipients.has_recipient_columns %}
{% set column_headers = recipients._raw_column_headers if recipients.duplicate_recipient_column_headers else recipients.column_headers %} <div class="usa-alert usa-alert--error" role="alert">
<div class="usa-alert__body">
<h1 class="usa-alert__heading banner-title" data-module="track-error" data-error-type="Missing recipient columns"
data-error-label="{{ upload_id }}">There’s a problem with your column names</h1>
<p class="usa-alert-text">
Your file needs a column called ‘{{ first_recipient_column }}’.
</p>
<p class="usa-alert-text">
Right now it has {{ recipients.column_headers | formatted_list(
prefix='one column, called ',
prefix_plural='columns called '
) }}.
</p>
</div>
</div>
<h2 class="font-body-lg" id="file-preview">{{ original_file_name }}</h2> {% elif recipients.duplicate_recipient_column_headers %}
<div class="fullscreen-content" data-module="fullscreen-table"> <div class="usa-alert usa-alert--error" role="alert">
{% call(item, row_number) list_table( <div class="usa-alert__body">
recipients.displayed_rows, <h1 class="usa-alert__heading banner-title" data-module="track-error" data-error-type="Duplicate recipient columns"
caption=original_file_name, data-error-label="{{ upload_id }}">There’s a problem with your column names</h1>
caption_visible=False, <p class="usa-alert__text">
field_headings=[ We found more than one column called {{ (
'<span class="usa-sr-only">Row in file</span><span aria-hidden="true">1</span>'|safe recipients.duplicate_recipient_column_headers
] + column_headers ) | formatted_list(
) %} conjunction='or',
{% call index_field() %} prefix='',
<span> prefix_plural=''
{% set displayed_index = item.index + 2 %} ) }}.
{{ displayed_index }} </p>
</span> <p class="usa-alert__text">
{% endcall %} Delete or rename one of these columns and try again.
{% for column in column_headers %} </p>
{% if item[column].error and not recipients.missing_column_headers %} </div>
{% call field() %} </div>
<span>
<span class="table-field-error-label">{{ item[column].error }}</span> {% elif recipients.missing_column_headers %}
{{ item[column].data if item[column].data != None }}
</span> <div class="usa-alert usa-alert--error" role="alert">
{% endcall %} <div class="usa-alert__body">
{% elif item[column].ignore %} <h1 class="usa-alert__heading banner-title" data-module="track-error" data-error-type="Missing placeholder columns"
{{ text_field(item[column].data or '', status='default') }} data-error-label="{{ upload_id }}">Your column names need to match the double brackets in your template</h1>
{% else %} <p class="usa-alert__text">
{{ text_field(item[column].data or '') }} Your file is missing {{ recipients.missing_column_headers | formatted_list(
{% endif %} conjunction='and',
{% endfor %} prefix='a column called ',
{% if item[None].data %} prefix_plural='columns called '
{% for column in item[None].data %} ) }}.
{{ text_field(column, status='default') }} </p>
{% endfor %} </div>
{% endif %} </div>
{% endcall %}
{% elif sent_previously %}
{% include "partials/check/sent-previously.html" %}
{% elif not recipients.allowed_to_send_to %}
{% with
count_of_recipients=count_of_recipients,
template_type_label=recipients.recipient_column_headers[0]
%}
{% include "partials/check/not-allowed-to-send-to.html" %}
{% endwith %}
{% elif recipients.more_rows_than_can_send %}
{% include "partials/check/too-many-messages.html" %}
{% endif %}
{% endcall %}
</div>
<div class="js-stick-at-top-when-scrolling">
<div class="form-group">
{% if not request.args.from_test %}
{{ file_upload(
form.file,
allowed_file_extensions=allowed_file_extensions,
action=url_for('.send_messages', service_id=current_service.id, template_id=template.id),
button_text='Upload your file again'
) }}
{% endif %} {% endif %}
</div> </div>
<a href="#content" class="usa-link back-to-top-link">Back to top</a>
</div>
{% if recipients.too_many_rows %} {% if not request.args.from_test %}
<p class="table-show-more-link">
Only showing the first {{ count_of_displayed_recipients }} rows {% set column_headers = recipients._raw_column_headers if recipients.duplicate_recipient_column_headers else
</p> recipients.column_headers %}
{% elif count_of_displayed_recipients < count_of_recipients %}
<p class="table-show-more-link"> <h2 class="font-body-lg" id="file-preview">{{ original_file_name }}</h2>
{% if row_errors and not recipients.missing_column_headers %}
Only showing the first {{ count_of_displayed_recipients }} rows with errors <div class="fullscreen-content" data-module="fullscreen-table">
{% else %} {% call(item, row_number) list_table(
Only showing the first {{ count_of_displayed_recipients }} rows recipients.displayed_rows,
{% endif %} caption=original_file_name,
</p> caption_visible=False,
field_headings=[
'<span class="usa-sr-only">Row in file</span><span aria-hidden="true">1</span>'|safe
] + column_headers
) %}
{% call index_field() %}
<span>
{% set displayed_index = item.index + 2 %}
{{ displayed_index }}
</span>
{% endcall %}
{% for column in column_headers %}
{% if item[column].error and not recipients.missing_column_headers %}
{% call field() %}
<span>
<span class="table-field-error-label">{{ item[column].error }}</span>
{{ item[column].data if item[column].data != None }}
</span>
{% endcall %}
{% elif item[column].ignore %}
{{ text_field(item[column].data or '', status='default') }}
{% else %}
{{ text_field(item[column].data or '') }}
{% endif %}
{% endfor %}
{% if item[None].data %}
{% for column in item[None].data %}
{{ text_field(column, status='default') }}
{% endfor %}
{% endif %}
{% endcall %}
{% endif %}
</div>
{% if recipients.too_many_rows %}
<p class="table-show-more-link">
Only showing the first {{ count_of_displayed_recipients }} rows
</p>
{% elif count_of_displayed_recipients < count_of_recipients %} <p class="table-show-more-link">
{% if row_errors and not recipients.missing_column_headers %}
Only showing the first {{ count_of_displayed_recipients }} rows with errors
{% else %}
Only showing the first {{ count_of_displayed_recipients }} rows
{% endif %}
</p>
{% elif row_errors and not recipients.missing_column_headers %} {% elif row_errors and not recipients.missing_column_headers %}
<p class="table-show-more-link"> <p class="table-show-more-link">
Only showing rows with errors Only showing rows with errors
</p> </p>
{% endif %} {% endif %}
<h2 class="font-body-lg">Preview of {{ template.name }}</h2> <h2 class="font-body-lg">Preview of {{ template.name }}</h2>
{{ template|string }} {{ template|string }}
{% endblock %} {% endblock %}