From 31b732cc2969f6ec8dc06ab7619849f7522a75fc Mon Sep 17 00:00:00 2001 From: Joana Maia Date: Mon, 28 Aug 2023 16:44:33 +0100 Subject: [PATCH 1/5] Add disclaimer to dashboard and reports --- .../components/dashboard-filters.vue | 122 +++++++++-------- .../templates/report-template-filters.vue | 125 +++++++++--------- 2 files changed, 130 insertions(+), 117 deletions(-) diff --git a/frontend/src/modules/dashboard/components/dashboard-filters.vue b/frontend/src/modules/dashboard/components/dashboard-filters.vue index 7dbb047c28..2e3899e5f8 100644 --- a/frontend/src/modules/dashboard/components/dashboard-filters.vue +++ b/frontend/src/modules/dashboard/components/dashboard-filters.vue @@ -1,67 +1,73 @@ diff --git a/frontend/src/modules/report/components/templates/report-template-filters.vue b/frontend/src/modules/report/components/templates/report-template-filters.vue index 6df1ac2e3c..abeb8fbb1b 100644 --- a/frontend/src/modules/report/components/templates/report-template-filters.vue +++ b/frontend/src/modules/report/components/templates/report-template-filters.vue @@ -1,71 +1,78 @@ diff --git a/frontend/src/modules/dashboard/pages/dashboard-page.vue b/frontend/src/modules/dashboard/pages/dashboard-page.vue index 70ab5ba508..08cafa2427 100644 --- a/frontend/src/modules/dashboard/pages/dashboard-page.vue +++ b/frontend/src/modules/dashboard/pages/dashboard-page.vue @@ -12,7 +12,7 @@

{{ currentTenant?.name }} team overview

+
+ + Data on this dashboard is not real-time +
-
- - - + + -
- -
+
+
-
- - Data on this report is not real-time +
+
diff --git a/frontend/src/modules/report/pages/report-view-page-public.vue b/frontend/src/modules/report/pages/report-view-page-public.vue index 989309ccae..7182cd2c8d 100644 --- a/frontend/src/modules/report/pages/report-view-page-public.vue +++ b/frontend/src/modules/report/pages/report-view-page-public.vue @@ -17,20 +17,26 @@
-
+
{{ currentTenant.name }}
-

- {{ - report.isTemplate - ? currentTemplate.name - : report.name - }} -

+
+

+ {{ + report.isTemplate + ? currentTemplate.name + : report.name + }} +

+
+ + Data on this report is not real-time +
+
+
+ + Data on this report is not real-time +
Date: Tue, 29 Aug 2023 11:04:51 +0100 Subject: [PATCH 3/5] Update disclaimer copy --- frontend/src/modules/dashboard/pages/dashboard-page.vue | 2 +- frontend/src/modules/report/pages/report-view-page-public.vue | 2 +- .../src/modules/report/pages/templates/report-template-page.vue | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/frontend/src/modules/dashboard/pages/dashboard-page.vue b/frontend/src/modules/dashboard/pages/dashboard-page.vue index 08cafa2427..36176169c4 100644 --- a/frontend/src/modules/dashboard/pages/dashboard-page.vue +++ b/frontend/src/modules/dashboard/pages/dashboard-page.vue @@ -22,7 +22,7 @@
- Data on this dashboard is not real-time + Data on this page refreshed every hour
diff --git a/frontend/src/modules/report/pages/report-view-page-public.vue b/frontend/src/modules/report/pages/report-view-page-public.vue index 7182cd2c8d..9569aa1bdb 100644 --- a/frontend/src/modules/report/pages/report-view-page-public.vue +++ b/frontend/src/modules/report/pages/report-view-page-public.vue @@ -34,7 +34,7 @@
- Data on this report is not real-time + Data on this page refreshed every hour
diff --git a/frontend/src/modules/report/pages/templates/report-template-page.vue b/frontend/src/modules/report/pages/templates/report-template-page.vue index b83374ec2a..2745409000 100644 --- a/frontend/src/modules/report/pages/templates/report-template-page.vue +++ b/frontend/src/modules/report/pages/templates/report-template-page.vue @@ -31,7 +31,7 @@
- Data on this report is not real-time + Data on this page refreshed every hour
Date: Tue, 29 Aug 2023 11:05:49 +0100 Subject: [PATCH 4/5] Fix color --- frontend/src/modules/dashboard/pages/dashboard-page.vue | 4 ++-- frontend/src/modules/report/pages/report-view-page-public.vue | 4 ++-- .../modules/report/pages/templates/report-template-page.vue | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/frontend/src/modules/dashboard/pages/dashboard-page.vue b/frontend/src/modules/dashboard/pages/dashboard-page.vue index 36176169c4..084903b6b5 100644 --- a/frontend/src/modules/dashboard/pages/dashboard-page.vue +++ b/frontend/src/modules/dashboard/pages/dashboard-page.vue @@ -21,8 +21,8 @@ {{ currentTenant?.name }} team overview
- - Data on this page refreshed every hour + + Data on this page refreshed every hour
diff --git a/frontend/src/modules/report/pages/report-view-page-public.vue b/frontend/src/modules/report/pages/report-view-page-public.vue index 9569aa1bdb..5fea2d3645 100644 --- a/frontend/src/modules/report/pages/report-view-page-public.vue +++ b/frontend/src/modules/report/pages/report-view-page-public.vue @@ -33,8 +33,8 @@ }}
- - Data on this page refreshed every hour + + Data on this page refreshed every hour
diff --git a/frontend/src/modules/report/pages/templates/report-template-page.vue b/frontend/src/modules/report/pages/templates/report-template-page.vue index 2745409000..06723ca72d 100644 --- a/frontend/src/modules/report/pages/templates/report-template-page.vue +++ b/frontend/src/modules/report/pages/templates/report-template-page.vue @@ -30,8 +30,8 @@
- - Data on this page refreshed every hour + + Data on this page refreshed every hour
Date: Tue, 29 Aug 2023 15:09:50 +0100 Subject: [PATCH 5/5] Refactor message --- frontend/src/modules/dashboard/pages/dashboard-page.vue | 2 +- frontend/src/modules/report/pages/report-view-page-public.vue | 2 +- .../src/modules/report/pages/templates/report-template-page.vue | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/frontend/src/modules/dashboard/pages/dashboard-page.vue b/frontend/src/modules/dashboard/pages/dashboard-page.vue index 084903b6b5..dcd71eac1e 100644 --- a/frontend/src/modules/dashboard/pages/dashboard-page.vue +++ b/frontend/src/modules/dashboard/pages/dashboard-page.vue @@ -22,7 +22,7 @@
- Data on this page refreshed every hour + Data on this page is refreshed every 15 min.
diff --git a/frontend/src/modules/report/pages/report-view-page-public.vue b/frontend/src/modules/report/pages/report-view-page-public.vue index 5fea2d3645..e752378b5b 100644 --- a/frontend/src/modules/report/pages/report-view-page-public.vue +++ b/frontend/src/modules/report/pages/report-view-page-public.vue @@ -34,7 +34,7 @@
- Data on this page refreshed every hour + Data on this page is refreshed every 15 min.
diff --git a/frontend/src/modules/report/pages/templates/report-template-page.vue b/frontend/src/modules/report/pages/templates/report-template-page.vue index 06723ca72d..c4a778f295 100644 --- a/frontend/src/modules/report/pages/templates/report-template-page.vue +++ b/frontend/src/modules/report/pages/templates/report-template-page.vue @@ -31,7 +31,7 @@
- Data on this page refreshed every hour + Data on this page is refreshed every 15 min.