diff --git a/atdb/taskdatabase/templates/dashboard/dashboard.html b/atdb/taskdatabase/templates/taskdatabase/dashboard/dashboard.html similarity index 87% rename from atdb/taskdatabase/templates/dashboard/dashboard.html rename to atdb/taskdatabase/templates/taskdatabase/dashboard/dashboard.html index db35bb3c566dc7d111bb7b88eca4a7fee7205ddf..e6f1394b7516cc213c3f95d097312a9a97bd1c6b 100644 --- a/atdb/taskdatabase/templates/dashboard/dashboard.html +++ b/atdb/taskdatabase/templates/taskdatabase/dashboard/dashboard.html @@ -13,7 +13,7 @@ <h4>Dashboard</h4> </div> <div class="col-4"> - {% include "dashboard/toggles.html" %} + {% include "taskdatabase/dashboard/toggles.html" %} </div> </div> </div> @@ -33,6 +33,6 @@ {% include "taskdatabase/modal/modal_script.html" %} {% include "taskdatabase/modal/modal.html" %} -{% include 'taskdatabase/localstorage_scripts.html' %} +{% include 'taskdatabase/refresh.html' %} {% endblock %} \ No newline at end of file diff --git a/atdb/taskdatabase/templates/dashboard/toggles.html b/atdb/taskdatabase/templates/taskdatabase/dashboard/toggles.html similarity index 100% rename from atdb/taskdatabase/templates/dashboard/toggles.html rename to atdb/taskdatabase/templates/taskdatabase/dashboard/toggles.html diff --git a/atdb/taskdatabase/templates/taskdatabase/failures/failures_page.html b/atdb/taskdatabase/templates/taskdatabase/failures/failures_page.html index fa53f4e8248850abeba9a28b0a2ae0f1c5e0ce49..15d5493c8beb43cd12c41dc111fbe39298682160 100644 --- a/atdb/taskdatabase/templates/taskdatabase/failures/failures_page.html +++ b/atdb/taskdatabase/templates/taskdatabase/failures/failures_page.html @@ -45,7 +45,7 @@ </div> </div> -{% include 'taskdatabase/localstorage_scripts.html' %} +{% include 'taskdatabase/no_refresh.html' %} {% endblock %} diff --git a/atdb/taskdatabase/templates/taskdatabase/index.html b/atdb/taskdatabase/templates/taskdatabase/index.html index fdbdeee83358306f4093137a8a09e74e7305d096..7a8652a35b72291fb0561ef6e9b05e1c049ce61a 100644 --- a/atdb/taskdatabase/templates/taskdatabase/index.html +++ b/atdb/taskdatabase/templates/taskdatabase/index.html @@ -34,11 +34,11 @@ {% include 'taskdatabase/pagination.html' %} </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> -{% include 'taskdatabase/localstorage_scripts.html' %} +{% include 'taskdatabase/refresh.html' %} {% endblock %} diff --git a/atdb/taskdatabase/templates/taskdatabase/monitoring_page.html b/atdb/taskdatabase/templates/taskdatabase/monitoring_page.html index 6da4454a4bd42cee537b8fad34682ccca7f68961..98a438e6b996fd37c8e0544531cdf8bc961399fd 100644 --- a/atdb/taskdatabase/templates/taskdatabase/monitoring_page.html +++ b/atdb/taskdatabase/templates/taskdatabase/monitoring_page.html @@ -37,6 +37,6 @@ </div> </div> -{% include 'taskdatabase/localstorage_scripts.html' %} +{% include 'taskdatabase/refresh.html' %} {% endblock %} diff --git a/atdb/taskdatabase/templates/taskdatabase/no_refresh.html b/atdb/taskdatabase/templates/taskdatabase/no_refresh.html new file mode 100644 index 0000000000000000000000000000000000000000..3d99cd33d73204f3c7cdb0acff96aa49d084d58d --- /dev/null +++ b/atdb/taskdatabase/templates/taskdatabase/no_refresh.html @@ -0,0 +1,16 @@ + +<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 diff --git a/atdb/taskdatabase/templates/taskdatabase/postprocessing.html b/atdb/taskdatabase/templates/taskdatabase/postprocessing.html index 276050d311900953d1aa60ba736094572b4ce31a..7d22fe92b13763e5f83e9a74be53adffad701bf0 100644 --- a/atdb/taskdatabase/templates/taskdatabase/postprocessing.html +++ b/atdb/taskdatabase/templates/taskdatabase/postprocessing.html @@ -84,7 +84,7 @@ </div> -{% include 'taskdatabase/localstorage_scripts.html' %} +{% include 'taskdatabase/refresh.html' %} {% endblock %} diff --git a/atdb/taskdatabase/templates/taskdatabase/quality/quality_page.html b/atdb/taskdatabase/templates/taskdatabase/quality/quality_page.html index 6d3b8881cef4dc1a1a301f1dd9ad9e1609b3543c..00d5fdf24898b89d265787aca78440198695cd61 100644 --- a/atdb/taskdatabase/templates/taskdatabase/quality/quality_page.html +++ b/atdb/taskdatabase/templates/taskdatabase/quality/quality_page.html @@ -43,7 +43,7 @@ </div> </div> -{% include 'taskdatabase/localstorage_scripts.html' %} +{% include 'taskdatabase/no_refresh.html' %} {% endblock %} diff --git a/atdb/taskdatabase/templates/taskdatabase/localstorage_scripts.html b/atdb/taskdatabase/templates/taskdatabase/refresh.html similarity index 55% rename from atdb/taskdatabase/templates/taskdatabase/localstorage_scripts.html rename to atdb/taskdatabase/templates/taskdatabase/refresh.html index a95e03d8cb656fc18a3b66803b65e798aedf3e57..f0a067e624f92f706c27cf62fdfb0dbea47972d6 100644 --- a/atdb/taskdatabase/templates/taskdatabase/localstorage_scripts.html +++ b/atdb/taskdatabase/templates/taskdatabase/refresh.html @@ -14,20 +14,3 @@ }(30)); </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 diff --git a/atdb/taskdatabase/templates/taskdatabase/validation/validation_page.html b/atdb/taskdatabase/templates/taskdatabase/validation/validation_page.html index 88a9b12ab2b51ec097c0bbecc311f33e1c9dda52..7663748135154eba4b1f06048e1a2669a0f333cf 100644 --- a/atdb/taskdatabase/templates/taskdatabase/validation/validation_page.html +++ b/atdb/taskdatabase/templates/taskdatabase/validation/validation_page.html @@ -44,7 +44,7 @@ </div> </div> -{% include 'taskdatabase/localstorage_scripts.html' %} +{% include 'taskdatabase/no_refresh.html' %} {% endblock %} diff --git a/atdb/taskdatabase/views.py b/atdb/taskdatabase/views.py index 30cd37630cc91c5b53b826e9f3dab116ec14cd42..7f39852562a48b3bf38032ca097ff684ae85f851 100644 --- a/atdb/taskdatabase/views.py +++ b/atdb/taskdatabase/views.py @@ -614,7 +614,7 @@ def ShowConfig(request): def ShowDashboard(request, selection): # gather the results 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_logs': results_logs, 'selection': selection})