diff --git a/app/assets/sass/uswds/_legacy-styles.scss b/app/assets/sass/uswds/_legacy-styles.scss index 3b09e2218..b62c15c36 100644 --- a/app/assets/sass/uswds/_legacy-styles.scss +++ b/app/assets/sass/uswds/_legacy-styles.scss @@ -62,6 +62,10 @@ margin: -20px units(1) 20px units(1); } +h2.sms-message-header { + margin-bottom: 0.5rem; +} + .sms-message-status-outbound { text-align: right; } @@ -131,7 +135,7 @@ &-label, &-button-label { font-weight: bold; - font-size: 19px; + font-size: 19px; display: block; margin: 0 0 10px 0; } diff --git a/app/formatters.py b/app/formatters.py index 6638160d0..db9f8dc04 100644 --- a/app/formatters.py +++ b/app/formatters.py @@ -99,8 +99,9 @@ def format_datetime_short(date): def format_datetime_short_12h(date): + # example: February 20, 2024 at 07:00 PM US/Eastern return "{} at {} {}".format( - format_date_short(date), format_time_12h(date), get_user_preferred_timezone() + format_date_normal(date), format_time_12h(date), get_user_preferred_timezone() ) @@ -192,7 +193,7 @@ def format_date(date): def format_date_normal(date): date = parse_naive_dt(date) - return date.strftime("%d %B %Y").lstrip("0") + return date.strftime("%B %d, %Y").lstrip("0") def format_date_short(date): diff --git a/app/main/views/jobs.py b/app/main/views/jobs.py index ed8f051a3..8f856f867 100644 --- a/app/main/views/jobs.py +++ b/app/main/views/jobs.py @@ -10,6 +10,7 @@ from flask import ( redirect, render_template, request, + session, stream_with_context, url_for, ) @@ -369,6 +370,9 @@ def get_job_partials(job): job.template_type ) + session['came_from_preview_page'] = 'check' in request.referrer + came_from_preview_page_url = session.get('came_from_preview_page', False) + return { "counts": counts, "notifications": render_template( @@ -392,6 +396,7 @@ def get_job_partials(job): "status": render_template( "partials/jobs/status.html", job=job, + came_from_preview_page_url=came_from_preview_page_url ), } diff --git a/app/templates/partials/jobs/status.html b/app/templates/partials/jobs/status.html index fb72c8382..15703b01c 100644 --- a/app/templates/partials/jobs/status.html +++ b/app/templates/partials/jobs/status.html @@ -1,34 +1,49 @@

- {% if job.scheduled_for %} - {% if job.processing_started %} -

-
-

{{ job.template_name }} - {{ current_service.name }}

-

- Was sent on {{ job.created_at|format_datetime_short_12h }} by {{ job.created_by.name }} -

+ {% set display_message_status %} + {% if job.template.content %} +

Message

+
{{ current_service.name }}: {{job.template.content}}
+ {% endif %} + {% if job.original_file_name %} +

Recipients list

+
+
    +
  • + Description Icon +
    +

    {{ job.original_file_name }}

    +
    +
  • +
-
- {% else %} + {% endif %} +

SMS Status

+ {% endset %} + {% if job.scheduled_for %} + {% if came_from_preview_page_url %}
-

{{ job.template_name }} - {{ current_service.name }}

+

Your text has been scheduled

- Was scheduled on {{ job.scheduled_for|format_datetime_short_12h }} by {{ job.created_by.name }} + {{ job.template_name }} - {{ current_service.name }} was scheduled on {{ job.scheduled_for|format_datetime_short_12h }} by {{ job.created_by.name }}

+ {{display_message_status}} {% endif %} - {% else %} -
-
-

{{ job.template_name }} - {{ current_service.name }}

-

- Was sent on {{ job.created_at|format_datetime_short_12h }} by {{ job.created_by.name }} -

+ {% else %} + {% if came_from_preview_page_url %} +
+
+

Your text has been sent

+

+ {{ job.template_name }} - {{ current_service.name }} was sent on {{ job.created_at|format_datetime_short_12h }} by {{ job.created_by.name }} +

+
-
+ {{display_message_status}} + {% endif %} {% endif %}

{% if job.status == 'sending limits exceeded'%} diff --git a/app/templates/views/jobs/job.html b/app/templates/views/jobs/job.html index 0c334a634..ce4e94b3d 100644 --- a/app/templates/views/jobs/job.html +++ b/app/templates/views/jobs/job.html @@ -5,26 +5,13 @@ {% from "components/components/back-link/macro.njk" import usaBackLink %} {% block service_page_title %} - {{ job.original_file_name }} + {{ "Message status" }} {% endblock %} {% block maincolumn_content %} - {{ page_header(job.original_file_name) }} - - {% if not job.processing_finished %} -
- {% endif %} - {{ partials['status']|safe }} - {% if not job.processing_finished %} -
- {% endif %} - + {{ page_header("Message status") }} + {{ partials['status']|safe }} {% if not finished %}