From 22eeed2b59775f1f616cf84c70dcaf5593bf98b3 Mon Sep 17 00:00:00 2001
From: Nico Vermaas <vermaas@astron.nl>
Date: Fri, 19 Mar 2021 09:24:57 +0100
Subject: [PATCH] adding failed and processing time columns to dashboard.
Layout change.
---
atdb/taskdatabase/services/algorithms.py | 10 +++++++++-
atdb/taskdatabase/templates/dashboard/dashboard.html | 4 ++--
atdb/taskdatabase/templates/dashboard/toggles.html | 4 ++++
atdb/taskdatabase/templates/taskdatabase/base.html | 2 ++
atdb/taskdatabase/templates/taskdatabase/index.html | 2 +-
5 files changed, 18 insertions(+), 4 deletions(-)
create mode 100644 atdb/taskdatabase/templates/dashboard/toggles.html
diff --git a/atdb/taskdatabase/services/algorithms.py b/atdb/taskdatabase/services/algorithms.py
index c408d6a0..3c826d1b 100644
--- a/atdb/taskdatabase/services/algorithms.py
+++ b/atdb/taskdatabase/services/algorithms.py
@@ -67,8 +67,16 @@ def convert_logentries_to_html(log_entries):
return results
-def convert_list_of_dicts_to_html(my_list):
+def convert_list_of_dicts_to_html(my_blob):
results = ""
+ my_list = []
+
+ # if the parameter is not a list, then make it a list first
+ if not isinstance(my_blob, list):
+ my_list.append(my_blob)
+ else:
+ my_list = my_blob
+
try:
for my_dict in my_list:
# iterate through the dict of key/values
diff --git a/atdb/taskdatabase/templates/dashboard/dashboard.html b/atdb/taskdatabase/templates/dashboard/dashboard.html
index ea2d4ff2..2a4878be 100644
--- a/atdb/taskdatabase/templates/dashboard/dashboard.html
+++ b/atdb/taskdatabase/templates/dashboard/dashboard.html
@@ -8,12 +8,12 @@
<div class="card">
<div class="card-body">
<h4>Dashboard</h4>
+
<table class="table table-striped">
{{ results_tasks | safe }}
</table>
-
-
+
<table class="table table-striped">
{{ results_logs | safe }}
</table>
diff --git a/atdb/taskdatabase/templates/dashboard/toggles.html b/atdb/taskdatabase/templates/dashboard/toggles.html
new file mode 100644
index 00000000..47e0cbbc
--- /dev/null
+++ b/atdb/taskdatabase/templates/dashboard/toggles.html
@@ -0,0 +1,4 @@
+<table>
+ <input type="checkbox" data-on="Active Workflows" data-off="All Workflows" checked data-toggle="toggle" data-onstyle="warning" data-offstyle="primary" data-style="slow">
+ <input type="checkbox" data-on="Resources Visible" data-off="Resources Invisible" checked data-toggle="toggle" data-onstyle="primary" data-style="slow">
+</table>
\ No newline at end of file
diff --git a/atdb/taskdatabase/templates/taskdatabase/base.html b/atdb/taskdatabase/templates/taskdatabase/base.html
index beab93fe..1c2726a8 100644
--- a/atdb/taskdatabase/templates/taskdatabase/base.html
+++ b/atdb/taskdatabase/templates/taskdatabase/base.html
@@ -25,6 +25,8 @@
<link rel="stylesheet" type="text/css" href="{% static 'taskdatabase/style.css' %}"/>
<link rel="icon" href="{% static 'favicon.ico' %}">
+ <link href="https://cdn.jsdelivr.net/gh/gitbrent/bootstrap4-toggle@3.6.1/css/bootstrap4-toggle.min.css" rel="stylesheet">
+ <script src="https://cdn.jsdelivr.net/gh/gitbrent/bootstrap4-toggle@3.6.1/js/bootstrap4-toggle.min.js"></script>
{% block extra_js %}{% endblock %}
</head>
diff --git a/atdb/taskdatabase/templates/taskdatabase/index.html b/atdb/taskdatabase/templates/taskdatabase/index.html
index 7305c651..6a6b520e 100644
--- a/atdb/taskdatabase/templates/taskdatabase/index.html
+++ b/atdb/taskdatabase/templates/taskdatabase/index.html
@@ -80,7 +80,7 @@
{% include 'taskdatabase/pagination.html' %}
</div>
</div>
- <p class="footer"> Version 1.0.0 (19 mar 2021 - 08:00)
+ <p class="footer"> Version 1.0.0 (19 mar 2021 - 09:00)
</div>
--
GitLab