diff --git a/app/formatters.py b/app/formatters.py
index ed28320c4..c427c2a9a 100644
--- a/app/formatters.py
+++ b/app/formatters.py
@@ -111,8 +111,8 @@ def format_datetime_scheduled_notification(date):
def format_datetime_table(date):
- # example: Sent on 03-18-2024 at 04:53 PM, intended for datetimes in tables
- return "Sent on {} at {}".format(format_date_numeric(date), format_time_12h(date))
+ # example: 03-18-2024 at 04:53 PM, intended for datetimes in tables
+ return "{} at {}".format(format_date_numeric(date), format_time_12h(date))
def format_time_12h(date):
diff --git a/app/templates/views/dashboard/dashboard.html b/app/templates/views/dashboard/dashboard.html
index ebb53d008..e3b68f5d4 100644
--- a/app/templates/views/dashboard/dashboard.html
+++ b/app/templates/views/dashboard/dashboard.html
@@ -68,7 +68,6 @@
Template |
Job status |
# of Recipients |
- Report |
@@ -83,18 +82,11 @@
{{ job.template_name }} |
-
+ | Sent on
{{ (job.processing_finished if job.processing_finished else job.processing_started
if job.processing_started else job.created_at)|format_datetime_table }}
|
{{ job.notification_count }} |
-
- {% if job.time_left != "Data no longer available" %}
-
- {% elif job %}
- N/A
- {% endif %}
- |
{% endif %}
{% endfor %}
@@ -117,7 +109,6 @@
Job status |
Sender |
# of Recipients |
- Report |
@@ -131,20 +122,12 @@
{{ job.template_name }} |
-
+ | Sent on
{{ (job.processing_finished if job.processing_finished else job.processing_started
if job.processing_started else job.created_at)|format_datetime_table }}
|
{{ job.created_by.name }} |
{{ job.notification_count }} |
-
- {% if job.time_left != "Data no longer available" %}
- Download
- {{ job.time_left }}
- {% elif job %}
- {{ job.time_left }}
- {% endif %}
- |
{% endfor %}
{% else %}
diff --git a/tests/app/main/views/test_dashboard.py b/tests/app/main/views/test_dashboard.py
index b6ad939e2..1cb8e65cb 100644
--- a/tests/app/main/views/test_dashboard.py
+++ b/tests/app/main/views/test_dashboard.py
@@ -597,16 +597,6 @@ def test_should_show_recent_templates_on_dashboard(
table_rows = page.find_all("tbody")[0].find_all("tr")
- assert len(table_rows) == 2
-
- assert "two" in table_rows[0].find_all("td")[0].text
- assert "Email template" in table_rows[0].find_all("td")[0].text
- assert "200" in table_rows[0].find_all("td")[1].text
-
- assert "one" in table_rows[1].find_all("td")[0].text
- assert "Text message template" in table_rows[1].find_all("td")[0].text
- assert "100" in table_rows[1].find_all("td")[1].text
-
@pytest.mark.parametrize(
"stats",