From 61f53799ba3e5531aa4c04e3da77aa46e83d5115 Mon Sep 17 00:00:00 2001
From: Bjarke Madsen <bjarke@nordu.net>
Date: Wed, 14 Jun 2023 12:59:06 +0200
Subject: [PATCH] POL1-706 add warning banner about average values
---
brian_dashboard_manager/templating/helpers.py | 2 +-
.../nren_access/nren-dashboard.json.j2 | 17 +++++++++++++++++
.../templates/shared/dashboard.json.j2 | 17 +++++++++++++++++
test/test_aggregrate.py | 4 ++--
4 files changed, 37 insertions(+), 3 deletions(-)
diff --git a/brian_dashboard_manager/templating/helpers.py b/brian_dashboard_manager/templating/helpers.py
index 51878cc..2e0089a 100644
--- a/brian_dashboard_manager/templating/helpers.py
+++ b/brian_dashboard_manager/templating/helpers.py
@@ -20,7 +20,7 @@ PANEL_WIDTH = 24
logger = logging.getLogger(__file__)
-def num_generator(start=1):
+def num_generator(start=30):
"""
Generator for numbers starting from the value of `start`
diff --git a/brian_dashboard_manager/templating/templates/nren_access/nren-dashboard.json.j2 b/brian_dashboard_manager/templating/templates/nren_access/nren-dashboard.json.j2
index 130ddfa..eeb9dbb 100644
--- a/brian_dashboard_manager/templating/templates/nren_access/nren-dashboard.json.j2
+++ b/brian_dashboard_manager/templating/templates/nren_access/nren-dashboard.json.j2
@@ -39,6 +39,23 @@
"version": 1,
"links": [],
"panels": [
+ {
+ "datasource": null,
+ "gridPos": {
+ "h": 1,
+ "w": 24,
+ "x": 0,
+ "y": 0
+ },
+ "id": 1,
+ "options": {
+ "content": "",
+ "mode": "html"
+ },
+ "pluginVersion": "8.2.5",
+ "title": "INFO: The average values displayed are only mean values for timescales of 2 days or less",
+ "type": "text"
+ },
{% for panel in aggregate_panels %}
{{ panel }},
{% endfor %}
diff --git a/brian_dashboard_manager/templating/templates/shared/dashboard.json.j2 b/brian_dashboard_manager/templating/templates/shared/dashboard.json.j2
index 1c6564d..7132cf0 100644
--- a/brian_dashboard_manager/templating/templates/shared/dashboard.json.j2
+++ b/brian_dashboard_manager/templating/templates/shared/dashboard.json.j2
@@ -39,6 +39,23 @@
"version": 1,
"links": [],
"panels": [
+ {
+ "datasource": null,
+ "gridPos": {
+ "h": 1,
+ "w": 24,
+ "x": 0,
+ "y": 0
+ },
+ "id": 1,
+ "options": {
+ "content": "",
+ "mode": "html"
+ },
+ "pluginVersion": "8.2.5",
+ "title": "INFO: The average values displayed are only mean values for timescales of 2 days or less",
+ "type": "text"
+ }{{ "," if panels }}
{% for panel in panels %}
{{ panel }}{{ "," if not loop.last }}
{% endfor %}
diff --git a/test/test_aggregrate.py b/test/test_aggregrate.py
index 7c494ba..b70cd58 100644
--- a/test/test_aggregrate.py
+++ b/test/test_aggregrate.py
@@ -337,5 +337,5 @@ def test_provision_aggregate(data_config, mocker, client):
panels = result['panels']
expected_title = f'Aggregate - {TEST_DASHBOARD["dashboard_name"]}'
assert result['title'] == expected_title
- assert len(panels) == 14
- assert len(panels[0]['targets']) == len(TEST_DASHBOARD['interfaces'])
+ assert len(panels) == 15
+ assert len(panels[1]['targets']) == len(TEST_DASHBOARD['interfaces'])
--
GitLab