Skip to content
Snippets Groups Projects
Commit c4572586 authored by Nico Vermaas's avatar Nico Vermaas
Browse files

move dashboard tree

parent 473535cc
No related branches found
No related tags found
2 merge requests!227working on annotation,!224Sdc 436 validation
Showing
with 26 additions and 27 deletions
...@@ -13,7 +13,7 @@ ...@@ -13,7 +13,7 @@
<h4>Dashboard</h4> <h4>Dashboard</h4>
</div> </div>
<div class="col-4"> <div class="col-4">
{% include "dashboard/toggles.html" %} {% include "taskdatabase/dashboard/toggles.html" %}
</div> </div>
</div> </div>
</div> </div>
...@@ -33,6 +33,6 @@ ...@@ -33,6 +33,6 @@
{% include "taskdatabase/modal/modal_script.html" %} {% include "taskdatabase/modal/modal_script.html" %}
{% include "taskdatabase/modal/modal.html" %} {% include "taskdatabase/modal/modal.html" %}
{% include 'taskdatabase/localstorage_scripts.html' %} {% include 'taskdatabase/refresh.html' %}
{% endblock %} {% endblock %}
\ No newline at end of file
...@@ -45,7 +45,7 @@ ...@@ -45,7 +45,7 @@
</div> </div>
</div> </div>
{% include 'taskdatabase/localstorage_scripts.html' %} {% include 'taskdatabase/no_refresh.html' %}
{% endblock %} {% endblock %}
......
...@@ -34,11 +34,11 @@ ...@@ -34,11 +34,11 @@
{% include 'taskdatabase/pagination.html' %} {% include 'taskdatabase/pagination.html' %}
</div> </div>
</div> </div>
<p class="footer"> Version 1.0.0 (2 apr 2021 - 6:00) <p class="footer"> Version 1.0.0 (4 apr 2021 - 13:00)
</div> </div>
{% include 'taskdatabase/localstorage_scripts.html' %} {% include 'taskdatabase/refresh.html' %}
{% endblock %} {% endblock %}
...@@ -37,6 +37,6 @@ ...@@ -37,6 +37,6 @@
</div> </div>
</div> </div>
{% include 'taskdatabase/localstorage_scripts.html' %} {% include 'taskdatabase/refresh.html' %}
{% endblock %} {% endblock %}
<script type="text/javascript">
function readFromLocalStorage(id) {
var s = localStorage.getItem(id);
if (s !== null) {
document.getElementById(id).value = s;
}
}
</script>
<script type="text/javascript">
function writeToLocalStorage(id) {
var s = document.getElementById(id).value
localStorage.setItem(id, s);
}
</script>
\ No newline at end of file
...@@ -84,7 +84,7 @@ ...@@ -84,7 +84,7 @@
</div> </div>
{% include 'taskdatabase/localstorage_scripts.html' %} {% include 'taskdatabase/refresh.html' %}
{% endblock %} {% endblock %}
......
...@@ -43,7 +43,7 @@ ...@@ -43,7 +43,7 @@
</div> </div>
</div> </div>
{% include 'taskdatabase/localstorage_scripts.html' %} {% include 'taskdatabase/no_refresh.html' %}
{% endblock %} {% endblock %}
......
...@@ -14,20 +14,3 @@ ...@@ -14,20 +14,3 @@
}(30)); }(30));
</script> </script>
<script type="text/javascript">
function readFromLocalStorage(id) {
var s = localStorage.getItem(id);
if (s !== null) {
document.getElementById(id).value = s;
}
}
</script>
<script type="text/javascript">
function writeToLocalStorage(id) {
var s = document.getElementById(id).value
localStorage.setItem(id, s);
}
</script>
\ No newline at end of file
...@@ -44,7 +44,7 @@ ...@@ -44,7 +44,7 @@
</div> </div>
</div> </div>
{% include 'taskdatabase/localstorage_scripts.html' %} {% include 'taskdatabase/no_refresh.html' %}
{% endblock %} {% endblock %}
......
...@@ -614,7 +614,7 @@ def ShowConfig(request): ...@@ -614,7 +614,7 @@ def ShowConfig(request):
def ShowDashboard(request, selection): def ShowDashboard(request, selection):
# gather the results # gather the results
results_tasks, results_logs = algorithms.construct_dashboard_html(request, selection) results_tasks, results_logs = algorithms.construct_dashboard_html(request, selection)
return render(request, "dashboard/dashboard.html", return render(request, "taskdatabase/dashboard/dashboard.html",
{'results_tasks': results_tasks, {'results_tasks': results_tasks,
'results_logs': results_logs, 'results_logs': results_logs,
'selection': selection}) 'selection': selection})
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment