From 46124a45cc3bded0002ed69ecc6624be024bc7b4 Mon Sep 17 00:00:00 2001 From: Beverly Nguyen Date: Wed, 14 Aug 2024 12:28:09 -0700 Subject: [PATCH 1/2] added 3 day download --- app/main/views/activity.py | 7 +++++++ app/templates/views/activity/all-activity.html | 4 ++++ 2 files changed, 11 insertions(+) diff --git a/app/main/views/activity.py b/app/main/views/activity.py index 38863eb59..b1cafdb6a 100644 --- a/app/main/views/activity.py +++ b/app/main/views/activity.py @@ -35,6 +35,13 @@ def all_jobs_activity(service_id): status=request.args.get("status"), number_of_days="one_day", ), + download_link_three_day=url_for( + ".download_notifications_csv", + service_id=current_service.id, + message_type=message_type, + status=request.args.get("status"), + number_of_days="three_day", + ), download_link_five_day=url_for( ".download_notifications_csv", service_id=current_service.id, diff --git a/app/templates/views/activity/all-activity.html b/app/templates/views/activity/all-activity.html index 9714dfc16..7875f295d 100644 --- a/app/templates/views/activity/all-activity.html +++ b/app/templates/views/activity/all-activity.html @@ -134,6 +134,10 @@

Download all data last 24 hours (CSV)

+

+ Download all data last 3 days (CSV) +   +

Download all data last 5 days (CSV)

From a31e1991477812bae841ed868ffe731c1c52be30 Mon Sep 17 00:00:00 2001 From: Jonathan Bobel Date: Wed, 14 Aug 2024 16:11:00 -0400 Subject: [PATCH 2/2] Updates from the QA review --- app/assets/images/gsa-logo.svg | 22 +++++++++++++++++++ app/assets/javascripts/activityChart.js | 6 ++--- app/assets/sass/uswds/_uswds-theme.scss | 3 ++- app/templates/views/dashboard/dashboard.html | 9 ++++---- .../views/dashboard/template-statistics.html | 2 +- tests/app/main/views/test_dashboard.py | 2 +- tests/javascripts/activityChart.test.js | 2 +- 7 files changed, 34 insertions(+), 12 deletions(-) create mode 100644 app/assets/images/gsa-logo.svg diff --git a/app/assets/images/gsa-logo.svg b/app/assets/images/gsa-logo.svg new file mode 100644 index 000000000..fc05aecd2 --- /dev/null +++ b/app/assets/images/gsa-logo.svg @@ -0,0 +1,22 @@ + + + + + + + + + + + diff --git a/app/assets/javascripts/activityChart.js b/app/assets/javascripts/activityChart.js index 5d2f89b39..08fee6cd4 100644 --- a/app/assets/javascripts/activityChart.js +++ b/app/assets/javascripts/activityChart.js @@ -229,16 +229,16 @@ const selectedText = selectElement.options[selectElement.selectedIndex].text; if (selectedValue === "individual") { - subTitle.textContent = selectedText + " - Last 7 Days"; + subTitle.textContent = selectedText + " - last 7 days"; fetchData('individual'); } else if (selectedValue === "service") { - subTitle.textContent = selectedText + " - Last 7 Days"; + subTitle.textContent = selectedText + " - last 7 days"; fetchData('service'); } // Update ARIA live region const liveRegion = document.getElementById('aria-live-account'); - liveRegion.textContent = `Data updated for ${selectedText} - Last 7 Days`; + liveRegion.textContent = `Data updated for ${selectedText} - last 7 days`; // Switch tables based on dropdown selection const selectedTable = selectedValue === "individual" ? "table1" : "table2"; diff --git a/app/assets/sass/uswds/_uswds-theme.scss b/app/assets/sass/uswds/_uswds-theme.scss index bc4b9b733..4aaa659a5 100644 --- a/app/assets/sass/uswds/_uswds-theme.scss +++ b/app/assets/sass/uswds/_uswds-theme.scss @@ -13,5 +13,6 @@ in the form $setting: value, $theme-banner-max-width: "desktop-lg", $theme-grid-container-max-width: "desktop-lg", $theme-footer-max-width: "desktop-lg", - $theme-header-max-width: "desktop-lg" + $theme-header-max-width: "desktop-lg", + $theme-identifier-max-width: "desktop-lg" ); diff --git a/app/templates/views/dashboard/dashboard.html b/app/templates/views/dashboard/dashboard.html index 94fd08faa..fd7f2fdc8 100644 --- a/app/templates/views/dashboard/dashboard.html +++ b/app/templates/views/dashboard/dashboard.html @@ -23,7 +23,7 @@ {{ ajax_block(partials, updates_url, 'inbox') }}
-

Total Messages

+

Total messages

@@ -43,7 +43,7 @@
-
{{ current_service.name }} - Last 7 Days
+
{{ current_service.name }} - last 7 days
@@ -56,7 +56,7 @@
{{ ajax_block(partials, updates_url, 'template-statistics') }} diff --git a/app/templates/views/dashboard/template-statistics.html b/app/templates/views/dashboard/template-statistics.html index 34e820d32..77efbea50 100644 --- a/app/templates/views/dashboard/template-statistics.html +++ b/app/templates/views/dashboard/template-statistics.html @@ -2,7 +2,7 @@
{% if template_statistics|length > 0 %} -

Recent Templates

+

Recent templates

{% call(item, row_number) list_table( template_statistics, diff --git a/tests/app/main/views/test_dashboard.py b/tests/app/main/views/test_dashboard.py index 37dbdf831..d5bab6323 100644 --- a/tests/app/main/views/test_dashboard.py +++ b/tests/app/main/views/test_dashboard.py @@ -635,7 +635,7 @@ def test_should_show_recent_templates_on_dashboard( headers = [ header.text.strip() for header in page.find_all("h2") + page.find_all("h1") ] - assert "Total Messages" in headers + assert "Total messages" in headers table_rows = page.find_all("tbody")[0].find_all("tr") diff --git a/tests/javascripts/activityChart.test.js b/tests/javascripts/activityChart.test.js index 31e74c016..94f3492a1 100644 --- a/tests/javascripts/activityChart.test.js +++ b/tests/javascripts/activityChart.test.js @@ -32,7 +32,7 @@ beforeAll(done => {
-
Service Name - Last 7 Days
+
Service Name - last 7 days