From ae083f4b52e3806ed583da50aa657aff4d23bbd5 Mon Sep 17 00:00:00 2001 From: Beverly Nguyen Date: Wed, 15 Jan 2025 17:08:21 -0800 Subject: [PATCH 1/6] update banner with different status states --- app/main/views/jobs.py | 1 + app/templates/partials/jobs/status.html | 43 +++++++++++++++++++------ 2 files changed, 34 insertions(+), 10 deletions(-) diff --git a/app/main/views/jobs.py b/app/main/views/jobs.py index dddf838a1..9de227bc3 100644 --- a/app/main/views/jobs.py +++ b/app/main/views/jobs.py @@ -407,6 +407,7 @@ def get_job_partials(job): session["arrived_from_preview_page"] = False arrived_from_preview_page_url = session.get("arrived_from_preview_page", False) + print('job', dir(job)) return { "counts": counts, diff --git a/app/templates/partials/jobs/status.html b/app/templates/partials/jobs/status.html index fb0a745f8..fc94d174a 100644 --- a/app/templates/partials/jobs/status.html +++ b/app/templates/partials/jobs/status.html @@ -21,7 +21,7 @@

- {% if job.still_processing or arrived_from_preview_page_url %} + {% if not job.finished_processing or arrived_from_preview_page_url %} {% if job.scheduled_for %}

@@ -33,16 +33,39 @@
{{display_message_status}} {% else %} -
-
-

Your text has been sent

-

- {{ job.template_name }} - {{ current_service.name }} was sent on {% if job.processing_started %} - {{ job.processing_started|format_datetime_table }} {% else %} - {{ job.created_at|format_datetime_table }} {% endif %} by {{ job.created_by.name }} -

+ {% if job.finished_processing or job.processing_started %} +
+
+

+ {% if job.finished_processing %} + Your text has been sent + {% else %} + Your text is sending + {% endif %} +

+

+ {{ job.template_name }} - {{ current_service.name }} + {% if job.finished_processing %} + was sent on {{job.processing_started|format_datetime_normal}} + {% else %} + has been sending since {{job.processing_started| format_datetime_normal}} + {% endif %} by {{ job.created_by.name }} +

+
-
+ {% else %} +
+
+

+ Your text is pending +

+

+ {{ job.template_name }} - {{ current_service.name }} + has been pending since {{job.created_at|format_datetime_normal}} by {{ job.created_by.name }} +

+
+
+ {% endif %} {{display_message_status}} {% endif %} {% endif %} From 7c5179994b8554cbeb974b01fa4a394db7560eb3 Mon Sep 17 00:00:00 2001 From: Beverly Nguyen Date: Thu, 16 Jan 2025 12:09:09 -0800 Subject: [PATCH 2/6] update verbage --- app/templates/partials/jobs/status.html | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/app/templates/partials/jobs/status.html b/app/templates/partials/jobs/status.html index fc94d174a..552d60334 100644 --- a/app/templates/partials/jobs/status.html +++ b/app/templates/partials/jobs/status.html @@ -1,3 +1,5 @@ +{% from "components/ajax-block.html" import ajax_block %} + {% set display_message_status %} {% if job.template.content %}

Message

@@ -18,14 +20,18 @@ {% endif %}

Delivery Status

{% endset %} - +{{ ajax_block( + partials, + url_for('.get_notifications_as_json', service_id=current_service.id, message_type=message_type, status=status), + 'job' +) }}

{% if not job.finished_processing or arrived_from_preview_page_url %} {% if job.scheduled_for %}

-

Your text has been scheduled

+

Your message has been scheduled

{{ job.template_name }} - {{ current_service.name }} was scheduled on {{ job.scheduled_for|format_datetime_normal }} by {{ job.created_by.name }}

@@ -38,9 +44,9 @@

{% if job.finished_processing %} - Your text has been sent + Your message has been sent {% else %} - Your text is sending + Your message is sending {% endif %}

@@ -57,7 +63,7 @@

- Your text is pending + Your message is pending

{{ job.template_name }} - {{ current_service.name }} From 9942ecf53e902a2f8f3ff109f3aad7d70e0d465f Mon Sep 17 00:00:00 2001 From: Beverly Nguyen Date: Fri, 17 Jan 2025 16:30:59 -0800 Subject: [PATCH 3/6] ajax applied to status --- app/main/views/jobs.py | 7 +++---- app/templates/partials/jobs/status.html | 9 +++------ app/templates/views/jobs/job.html | 14 +++++++++++++- 3 files changed, 19 insertions(+), 11 deletions(-) diff --git a/app/main/views/jobs.py b/app/main/views/jobs.py index 9de227bc3..a5798b56d 100644 --- a/app/main/views/jobs.py +++ b/app/main/views/jobs.py @@ -57,7 +57,7 @@ def view_job(service_id, job_id): filter_args = parse_filter_args(request.args) filter_args["status"] = set_status_filters(filter_args) - + # updates_url return render_template( "views/jobs/job.html", job=job, @@ -111,7 +111,7 @@ def cancel_job(service_id, job_id): @user_has_permissions() def view_job_updates(service_id, job_id): job = Job.from_id(job_id, service_id=service_id) - +# this could help return jsonify(**get_job_partials(job)) @@ -407,8 +407,7 @@ def get_job_partials(job): session["arrived_from_preview_page"] = False arrived_from_preview_page_url = session.get("arrived_from_preview_page", False) - print('job', dir(job)) - + # partials here return { "counts": counts, "notifications": render_template( diff --git a/app/templates/partials/jobs/status.html b/app/templates/partials/jobs/status.html index 552d60334..c39f64b37 100644 --- a/app/templates/partials/jobs/status.html +++ b/app/templates/partials/jobs/status.html @@ -10,7 +10,8 @@

  • - + +

    {{ job.original_file_name }}

    @@ -20,13 +21,9 @@ {% endif %}

    Delivery Status

    {% endset %} -{{ ajax_block( - partials, - url_for('.get_notifications_as_json', service_id=current_service.id, message_type=message_type, status=status), - 'job' -) }}

    + {% if not job.finished_processing or arrived_from_preview_page_url %} {% if job.scheduled_for %}

    diff --git a/app/templates/views/jobs/job.html b/app/templates/views/jobs/job.html index 7014e1987..7a6162110 100644 --- a/app/templates/views/jobs/job.html +++ b/app/templates/views/jobs/job.html @@ -11,7 +11,19 @@ {% block maincolumn_content %} {{ page_header("Message status") }} - {{ partials['status']|safe }} + + {% if not job.processing_finished %} +
    + {% endif %} + {{ partials['status']|safe }} + {% if not job.processing_finished %} +
    + {% endif %} {% if not finished %}
    Date: Mon, 20 Jan 2025 16:00:21 -0800 Subject: [PATCH 4/6] removed comments --- app/main/views/jobs.py | 5 ++--- app/templates/partials/jobs/status.html | 2 -- app/templates/views/jobs/job.html | 13 ------------- 3 files changed, 2 insertions(+), 18 deletions(-) diff --git a/app/main/views/jobs.py b/app/main/views/jobs.py index a5798b56d..d7a1d9bf4 100644 --- a/app/main/views/jobs.py +++ b/app/main/views/jobs.py @@ -57,7 +57,6 @@ def view_job(service_id, job_id): filter_args = parse_filter_args(request.args) filter_args["status"] = set_status_filters(filter_args) - # updates_url return render_template( "views/jobs/job.html", job=job, @@ -111,7 +110,7 @@ def cancel_job(service_id, job_id): @user_has_permissions() def view_job_updates(service_id, job_id): job = Job.from_id(job_id, service_id=service_id) -# this could help + return jsonify(**get_job_partials(job)) @@ -407,7 +406,7 @@ def get_job_partials(job): session["arrived_from_preview_page"] = False arrived_from_preview_page_url = session.get("arrived_from_preview_page", False) - # partials here + return { "counts": counts, "notifications": render_template( diff --git a/app/templates/partials/jobs/status.html b/app/templates/partials/jobs/status.html index c39f64b37..41beb1cde 100644 --- a/app/templates/partials/jobs/status.html +++ b/app/templates/partials/jobs/status.html @@ -11,7 +11,6 @@
    • -

      {{ job.original_file_name }}

      @@ -23,7 +22,6 @@ {% endset %}

      - {% if not job.finished_processing or arrived_from_preview_page_url %} {% if job.scheduled_for %}

      diff --git a/app/templates/views/jobs/job.html b/app/templates/views/jobs/job.html index 7a6162110..4c8a7d1fc 100644 --- a/app/templates/views/jobs/job.html +++ b/app/templates/views/jobs/job.html @@ -11,19 +11,6 @@ {% block maincolumn_content %} {{ page_header("Message status") }} - - {% if not job.processing_finished %} -
      - {% endif %} - {{ partials['status']|safe }} - {% if not job.processing_finished %} -
      - {% endif %} {% if not finished %}
      Date: Tue, 21 Jan 2025 10:46:30 -0800 Subject: [PATCH 5/6] fix test and arrival session --- app/main/views/jobs.py | 2 +- app/templates/partials/jobs/status.html | 34 ++++++++++++++----------- app/templates/views/jobs/job.html | 12 +++++++++ tests/app/main/views/test_jobs.py | 2 +- 4 files changed, 33 insertions(+), 17 deletions(-) diff --git a/app/main/views/jobs.py b/app/main/views/jobs.py index d7a1d9bf4..bb95f630e 100644 --- a/app/main/views/jobs.py +++ b/app/main/views/jobs.py @@ -401,7 +401,7 @@ def get_job_partials(job): ) if request.referrer is not None: - session["arrived_from_preview_page"] = "check" in request.referrer + session["arrived_from_preview_page"] = ("check" in request.referrer) or ("help=0" in request.referrer) else: session["arrived_from_preview_page"] = False diff --git a/app/templates/partials/jobs/status.html b/app/templates/partials/jobs/status.html index 41beb1cde..0f3288813 100644 --- a/app/templates/partials/jobs/status.html +++ b/app/templates/partials/jobs/status.html @@ -1,5 +1,3 @@ -{% from "components/ajax-block.html" import ajax_block %} - {% set display_message_status %} {% if job.template.content %}

      Message

      @@ -10,7 +8,7 @@
      • - +

        {{ job.original_file_name }}

        @@ -20,9 +18,10 @@ {% endif %}

        Delivery Status

        {% endset %} +

        - {% if not job.finished_processing or arrived_from_preview_page_url %} + {% if not job.finished_processing %} {% if job.scheduled_for %}

        @@ -34,23 +33,15 @@
        {{display_message_status}} {% else %} - {% if job.finished_processing or job.processing_started %} + {% if job.processing_started %}

        - {% if job.finished_processing %} - Your message has been sent - {% else %} - Your message is sending - {% endif %} + Your message is sending

        {{ job.template_name }} - {{ current_service.name }} - {% if job.finished_processing %} - was sent on {{job.processing_started|format_datetime_normal}} - {% else %} - has been sending since {{job.processing_started| format_datetime_normal}} - {% endif %} by {{ job.created_by.name }} + has been sending since {{job.processing_started| format_datetime_normal}} by {{ job.created_by.name }}

        @@ -69,6 +60,19 @@ {% endif %} {{display_message_status}} {% endif %} + {% elif arrived_from_preview_page_url %} +
        +
        +

        + Your message has been sent +

        +

        + {{ job.template_name }} - {{ current_service.name }} + was sent on {{job.processing_started|format_datetime_normal}} by {{ job.created_by.name }} +

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

        {% if job.status == 'sending limits exceeded'%} diff --git a/app/templates/views/jobs/job.html b/app/templates/views/jobs/job.html index 4c8a7d1fc..1643715f4 100644 --- a/app/templates/views/jobs/job.html +++ b/app/templates/views/jobs/job.html @@ -11,6 +11,18 @@ {% block maincolumn_content %} {{ page_header("Message status") }} + {% if not job.processing_finished %} +
        + {% endif %} + {{ partials['status']|safe }} + {% if not job.processing_finished %} +
        + {% endif %} {% if not finished %}
        Date: Tue, 21 Jan 2025 14:49:26 -0800 Subject: [PATCH 6/6] fix test --- tests/app/main/views/test_jobs.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/app/main/views/test_jobs.py b/tests/app/main/views/test_jobs.py index a32480983..ab09f7ecd 100644 --- a/tests/app/main/views/test_jobs.py +++ b/tests/app/main/views/test_jobs.py @@ -269,7 +269,7 @@ def test_should_show_job_with_sending_limit_exceeded_status( pytest.param( datetime(2020, 1, 1, 0, 0, 0), datetime(2020, 1, 9, 6, 0, 1), - ("These messages have been deleted because they were sent more than 7 days ago"), + ("No messages to show yet…"), ), # Created a while ago, started exactly 24h ago # ---