From d62b178a78f0654cf041d35cc89d9d2fee7d24d5 Mon Sep 17 00:00:00 2001
From: Nico Vermaas <vermaas@astron.nl>
Date: Fri, 4 Feb 2022 16:38:59 +0100
Subject: [PATCH] refactor
---
atdb/taskdatabase/templates/taskdatabase/base.html | 2 +-
.../taskdatabase/{monitoring.html => monitoring_page.html} | 0
atdb/taskdatabase/urls.py | 2 +-
atdb/taskdatabase/views.py | 4 ++--
4 files changed, 4 insertions(+), 4 deletions(-)
rename atdb/taskdatabase/templates/taskdatabase/{monitoring.html => monitoring_page.html} (100%)
diff --git a/atdb/taskdatabase/templates/taskdatabase/base.html b/atdb/taskdatabase/templates/taskdatabase/base.html
index e4604399..1ca7e614 100644
--- a/atdb/taskdatabase/templates/taskdatabase/base.html
+++ b/atdb/taskdatabase/templates/taskdatabase/base.html
@@ -49,7 +49,7 @@
{% if user.is_authenticated %}
<li><a class="nav-link" href="{% url 'task-details'%}">Task Details</a></li>
- <li><a class="nav-link" href="{% url 'quality-tasks' %}">Quality</a></li>
+ <li><a class="nav-link" href="{% url 'quality' %}">Quality</a></li>
{% endif %}
<li><a class="nav-link" href="{% url 'dashboard' 'active_nores' %}">Dashboard</a></li>
diff --git a/atdb/taskdatabase/templates/taskdatabase/monitoring.html b/atdb/taskdatabase/templates/taskdatabase/monitoring_page.html
similarity index 100%
rename from atdb/taskdatabase/templates/taskdatabase/monitoring.html
rename to atdb/taskdatabase/templates/taskdatabase/monitoring_page.html
diff --git a/atdb/taskdatabase/urls.py b/atdb/taskdatabase/urls.py
index b3862f35..bddabc88 100644
--- a/atdb/taskdatabase/urls.py
+++ b/atdb/taskdatabase/urls.py
@@ -14,7 +14,7 @@ urlpatterns = [
# --- GUI ---
path('', views.IndexView.as_view(), name='index'),
path('postprocessing-tasks', views.PostProcessingTasksView.as_view(), name='postprocessing-tasks'),
- path('quality-tasks', views.QualityTasksView.as_view(), name='quality-tasks'),
+ path('quality', views.ShowQualityPage.as_view(), name='quality'),
path('task_details/<int:id>/<page>', views.TaskDetails, name='task-details'),
path('task_details/', views.TaskDetails, name='task-details'),
diff --git a/atdb/taskdatabase/views.py b/atdb/taskdatabase/views.py
index a50e8de5..191b504e 100644
--- a/atdb/taskdatabase/views.py
+++ b/atdb/taskdatabase/views.py
@@ -315,7 +315,7 @@ class PostProcessingTasksView(ListView):
return tasks
-class QualityTasksView(ListView):
+class ShowQualityPage(ListView):
"""
This is the main view of ATDB. It shows a pagination list of tasks, sorted by creationTime.
"""
@@ -497,7 +497,7 @@ def ShowMonitoring(request):
distinct_services_per_host = LatestMonitor.objects.all().order_by('name', 'hostname', '-timestamp').distinct('name', 'hostname')
monitor_results = algorithms.convert_monitor_to_html(request, distinct_services_per_host)
- return render(request, "taskdatabase/monitoring.html", {'monitor_results': monitor_results})
+ return render(request, "taskdatabase/monitoring_page.html", {'monitor_results': monitor_results})
class DiagramView(ListView):
--
GitLab