diff --git a/atdb/taskdatabase/services/algorithms.py b/atdb/taskdatabase/services/algorithms.py index c408d6a024c7e315de1322eeaebfb27e25422734..3c826d1b1679fa10a15c571e12b7591103e75aa2 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 ea2d4ff2246a3dff5022a3be6cc305f15f4b443e..2a4878be714a664cae8a35f64c13214cc4403ac2 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 0000000000000000000000000000000000000000..47e0cbbc0cbf1acc8b9ec844b35e810d1c9c678d --- /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 beab93fece61ef8ecc63ee9e4ab51b5e58587646..1c2726a8fdbbf41343b3f8ca8941f54fd53736d6 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 7305c6513d7dbd1e329736ff983b8ffbcc9a03e3..6a6b520ea2e1dce4194dfd5b835e1716bb8e3f35 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>