From 8d7d38e321e075b1927d6f60866f021151574e2c Mon Sep 17 00:00:00 2001 From: Beverly Nguyen Date: Fri, 5 Jul 2024 16:30:41 -0700 Subject: [PATCH 1/5] update timestamp to display notification time created_at --- app/main/views/jobs.py | 1 + app/templates/views/dashboard/dashboard.html | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/app/main/views/jobs.py b/app/main/views/jobs.py index 42a4de090..fcdd91122 100644 --- a/app/main/views/jobs.py +++ b/app/main/views/jobs.py @@ -432,6 +432,7 @@ def get_job_partials(job): "partials/jobs/status.html", job=job, arrived_from_preview_page_url=arrived_from_preview_page_url, + notifications=notifications["notifications"] ), } diff --git a/app/templates/views/dashboard/dashboard.html b/app/templates/views/dashboard/dashboard.html index dd0279629..a886f43a0 100644 --- a/app/templates/views/dashboard/dashboard.html +++ b/app/templates/views/dashboard/dashboard.html @@ -69,7 +69,7 @@ {{ notification.template.name }} - {{ job.created_at | format_datetime_table }} + {{ notification.created_at|format_datetime_table }} {{ notification.created_by.name }} From 5042ba8d507eb4e6a0d3f4ed22ce15e8fc07d0bc Mon Sep 17 00:00:00 2001 From: Beverly Nguyen Date: Wed, 10 Jul 2024 14:47:29 -0700 Subject: [PATCH 2/5] update time from created_at to processing_fisnnished --- app/main/views/dashboard.py | 1 + app/main/views/jobs.py | 1 - app/templates/views/dashboard/dashboard.html | 4 ++-- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/app/main/views/dashboard.py b/app/main/views/dashboard.py index ae58ff226..557ac9955 100644 --- a/app/main/views/dashboard.py +++ b/app/main/views/dashboard.py @@ -105,6 +105,7 @@ def service_dashboard(service_id): ".view_job", service_id=current_service.id, job_id=job["id"] ), "created_at": job["created_at"], + "processing_finished": job["processing_finished"], "notification_count": job["notification_count"], "created_by": job["created_by"], "notifications": aggregate_notifications_by_job.get(job["id"], []), diff --git a/app/main/views/jobs.py b/app/main/views/jobs.py index fcdd91122..42a4de090 100644 --- a/app/main/views/jobs.py +++ b/app/main/views/jobs.py @@ -432,7 +432,6 @@ def get_job_partials(job): "partials/jobs/status.html", job=job, arrived_from_preview_page_url=arrived_from_preview_page_url, - notifications=notifications["notifications"] ), } diff --git a/app/templates/views/dashboard/dashboard.html b/app/templates/views/dashboard/dashboard.html index a886f43a0..19297863c 100644 --- a/app/templates/views/dashboard/dashboard.html +++ b/app/templates/views/dashboard/dashboard.html @@ -41,7 +41,7 @@ Template - Time sent + Job status Sender @@ -69,7 +69,7 @@ {{ notification.template.name }} - {{ notification.created_at|format_datetime_table }} + {{ job.processing_finished|format_datetime_table }} {{ notification.created_by.name }} From 96e94fd7d3ce80be3f1e544d012a4914e40f599c Mon Sep 17 00:00:00 2001 From: Beverly Nguyen Date: Thu, 11 Jul 2024 10:42:28 -0700 Subject: [PATCH 3/5] added conditional to datetime in table --- app/main/views/dashboard.py | 2 ++ app/templates/views/dashboard/dashboard.html | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/app/main/views/dashboard.py b/app/main/views/dashboard.py index 557ac9955..04b166fdc 100644 --- a/app/main/views/dashboard.py +++ b/app/main/views/dashboard.py @@ -106,6 +106,7 @@ def service_dashboard(service_id): ), "created_at": job["created_at"], "processing_finished": job["processing_finished"], + "processing_started": job["processing_started"], "notification_count": job["notification_count"], "created_by": job["created_by"], "notifications": aggregate_notifications_by_job.get(job["id"], []), @@ -119,6 +120,7 @@ def service_dashboard(service_id): partials=get_dashboard_partials(service_id), job_and_notifications=job_and_notifications, service_data_retention_days=service_data_retention_days, + job_response=job_response ) diff --git a/app/templates/views/dashboard/dashboard.html b/app/templates/views/dashboard/dashboard.html index 19297863c..6ad364b22 100644 --- a/app/templates/views/dashboard/dashboard.html +++ b/app/templates/views/dashboard/dashboard.html @@ -69,7 +69,7 @@ {{ notification.template.name }} - {{ job.processing_finished|format_datetime_table }} + {{ (job.processing_finished or job.processing_started)|format_datetime_table }} {{ notification.created_by.name }} From 380ed4417aae0c977a375c36c436bb26b3bf8580 Mon Sep 17 00:00:00 2001 From: Beverly Nguyen Date: Thu, 11 Jul 2024 10:43:28 -0700 Subject: [PATCH 4/5] removed job_response --- app/main/views/dashboard.py | 1 - 1 file changed, 1 deletion(-) diff --git a/app/main/views/dashboard.py b/app/main/views/dashboard.py index 04b166fdc..d725dde3b 100644 --- a/app/main/views/dashboard.py +++ b/app/main/views/dashboard.py @@ -120,7 +120,6 @@ def service_dashboard(service_id): partials=get_dashboard_partials(service_id), job_and_notifications=job_and_notifications, service_data_retention_days=service_data_retention_days, - job_response=job_response ) From 883df1bdcdbb86053ed4b3e0efbad92d899779c5 Mon Sep 17 00:00:00 2001 From: Beverly Nguyen Date: Thu, 11 Jul 2024 12:55:35 -0700 Subject: [PATCH 5/5] added conditionals to datetime in status banner --- app/templates/views/dashboard/dashboard.html | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/app/templates/views/dashboard/dashboard.html b/app/templates/views/dashboard/dashboard.html index 6ad364b22..aba7d2ac6 100644 --- a/app/templates/views/dashboard/dashboard.html +++ b/app/templates/views/dashboard/dashboard.html @@ -69,7 +69,8 @@ {{ notification.template.name }} - {{ (job.processing_finished or job.processing_started)|format_datetime_table }} + {{ (job.processing_finished if job.processing_finished else job.processing_started + if job.processing_started else job.created_at)|format_datetime_table }} {{ notification.created_by.name }}