From 19acd7e9c2a32991cabb848f1a80451ffd202c05 Mon Sep 17 00:00:00 2001
From: Nico Vermaas <vermaas@astron.nl>
Date: Mon, 4 Apr 2022 14:25:57 +0200
Subject: [PATCH] move query tree
---
atdb/taskdatabase/tables.py | 4 ++--
atdb/taskdatabase/templates/taskdatabase/filter/search.html | 1 -
.../{ => taskdatabase}/query/action_buttons_per_row.html | 0
.../{ => taskdatabase}/query/confirm_multi_change.html | 0
.../templates/{ => taskdatabase}/query/index.html | 2 +-
.../templates/{ => taskdatabase}/query/query.html | 0
.../{ => taskdatabase}/query/set_multi_status_panel.html | 0
.../{ => taskdatabase}/query/status_buttons_per_row.html | 0
atdb/taskdatabase/templates/taskdatabase/tasks.html | 1 +
atdb/taskdatabase/templates/taskdatabase/tasks_headers.html | 5 +++++
atdb/taskdatabase/views.py | 4 ++--
11 files changed, 11 insertions(+), 6 deletions(-)
rename atdb/taskdatabase/templates/{ => taskdatabase}/query/action_buttons_per_row.html (100%)
rename atdb/taskdatabase/templates/{ => taskdatabase}/query/confirm_multi_change.html (100%)
rename atdb/taskdatabase/templates/{ => taskdatabase}/query/index.html (91%)
rename atdb/taskdatabase/templates/{ => taskdatabase}/query/query.html (100%)
rename atdb/taskdatabase/templates/{ => taskdatabase}/query/set_multi_status_panel.html (100%)
rename atdb/taskdatabase/templates/{ => taskdatabase}/query/status_buttons_per_row.html (100%)
diff --git a/atdb/taskdatabase/tables.py b/atdb/taskdatabase/tables.py
index a3fed15a..94769e0a 100644
--- a/atdb/taskdatabase/tables.py
+++ b/atdb/taskdatabase/tables.py
@@ -32,10 +32,10 @@ class TaskTable(tables.Table):
#resume = ResumeColumn()
actions = tables.TemplateColumn(verbose_name='Details',
- template_name='query/action_buttons_per_row.html',
+ template_name='taskdatabase/query/action_buttons_per_row.html',
orderable=False) # orderable not sortable
buttons = tables.TemplateColumn(verbose_name='Set Status',
- template_name='query/status_buttons_per_row.html',
+ template_name='taskdatabase/query/status_buttons_per_row.html',
orderable=False) # orderable not sortable
diff --git a/atdb/taskdatabase/templates/taskdatabase/filter/search.html b/atdb/taskdatabase/templates/taskdatabase/filter/search.html
index 5ad2d5a5..86f8a87d 100644
--- a/atdb/taskdatabase/templates/taskdatabase/filter/search.html
+++ b/atdb/taskdatabase/templates/taskdatabase/filter/search.html
@@ -1,4 +1,3 @@
-<!-- note the rerouting to '/query', which is captured by urls.py -->
<form class="navbar-form navbar-left" role="Search" onsubmit="writeToLocalStorage('search_box')" method="get" action="">
<div class="form-group">
diff --git a/atdb/taskdatabase/templates/query/action_buttons_per_row.html b/atdb/taskdatabase/templates/taskdatabase/query/action_buttons_per_row.html
similarity index 100%
rename from atdb/taskdatabase/templates/query/action_buttons_per_row.html
rename to atdb/taskdatabase/templates/taskdatabase/query/action_buttons_per_row.html
diff --git a/atdb/taskdatabase/templates/query/confirm_multi_change.html b/atdb/taskdatabase/templates/taskdatabase/query/confirm_multi_change.html
similarity index 100%
rename from atdb/taskdatabase/templates/query/confirm_multi_change.html
rename to atdb/taskdatabase/templates/taskdatabase/query/confirm_multi_change.html
diff --git a/atdb/taskdatabase/templates/query/index.html b/atdb/taskdatabase/templates/taskdatabase/query/index.html
similarity index 91%
rename from atdb/taskdatabase/templates/query/index.html
rename to atdb/taskdatabase/templates/taskdatabase/query/index.html
index a37ce609..b44c1011 100644
--- a/atdb/taskdatabase/templates/query/index.html
+++ b/atdb/taskdatabase/templates/taskdatabase/query/index.html
@@ -20,7 +20,7 @@
</div>
{% endif %}
- {% include "query/set_multi_status_panel.html" %}
+ {% include "taskdatabase/query/set_multi_status_panel.html" %}
{% render_table table 'django_tables2/bootstrap4.html' %}
diff --git a/atdb/taskdatabase/templates/query/query.html b/atdb/taskdatabase/templates/taskdatabase/query/query.html
similarity index 100%
rename from atdb/taskdatabase/templates/query/query.html
rename to atdb/taskdatabase/templates/taskdatabase/query/query.html
diff --git a/atdb/taskdatabase/templates/query/set_multi_status_panel.html b/atdb/taskdatabase/templates/taskdatabase/query/set_multi_status_panel.html
similarity index 100%
rename from atdb/taskdatabase/templates/query/set_multi_status_panel.html
rename to atdb/taskdatabase/templates/taskdatabase/query/set_multi_status_panel.html
diff --git a/atdb/taskdatabase/templates/query/status_buttons_per_row.html b/atdb/taskdatabase/templates/taskdatabase/query/status_buttons_per_row.html
similarity index 100%
rename from atdb/taskdatabase/templates/query/status_buttons_per_row.html
rename to atdb/taskdatabase/templates/taskdatabase/query/status_buttons_per_row.html
diff --git a/atdb/taskdatabase/templates/taskdatabase/tasks.html b/atdb/taskdatabase/templates/taskdatabase/tasks.html
index a9486cfd..2ecdfa5d 100644
--- a/atdb/taskdatabase/templates/taskdatabase/tasks.html
+++ b/atdb/taskdatabase/templates/taskdatabase/tasks.html
@@ -50,6 +50,7 @@
<td>{{ task.project }}</td>
<td>{{ task.sas_id }}</td>
+ <td>{{ task.filter }} </td>
<td>{{ task.creationTime|date:"Y-m-d H:i:s" }} </td>
<td>{{ task.size_to_process|filesizeformat }} </td>
diff --git a/atdb/taskdatabase/templates/taskdatabase/tasks_headers.html b/atdb/taskdatabase/templates/taskdatabase/tasks_headers.html
index d2250230..638e9c8f 100644
--- a/atdb/taskdatabase/templates/taskdatabase/tasks_headers.html
+++ b/atdb/taskdatabase/templates/taskdatabase/tasks_headers.html
@@ -31,6 +31,11 @@
SAS_ID
<a href="{% url 'sort-tasks' 'sas_id' 'atdb' %}" class="btn btn-light btn-sm" role="button"><i class="fas fa-sort-down"></i></a>
</th>
+ <th>
+ <a href="{% url 'sort-tasks' '-filter' 'atdb' %}" class="btn btn-light btn-sm" role="button"><i class="fas fa-sort-up"></i></a>
+ Filter
+ <a href="{% url 'sort-tasks' 'filter' 'atdb' %}" class="btn btn-light btn-sm" role="button"><i class="fas fa-sort-down"></i></a>
+ </th>
<th>
<a href="{% url 'sort-tasks' '-creationTime' 'atdb' %}" class="btn btn-light btn-sm" role="button"><i class="fas fa-sort-up"></i></a>
CreationTime
diff --git a/atdb/taskdatabase/views.py b/atdb/taskdatabase/views.py
index 7f398525..8e5a2024 100644
--- a/atdb/taskdatabase/views.py
+++ b/atdb/taskdatabase/views.py
@@ -161,7 +161,7 @@ class QueryView(SingleTableMixin, FilterView):
model = Task
# queryset = Task.objects.filter(task_type='regular')
queryset = Task.objects.all()
- template_name = "query/index.html"
+ template_name = "taskdatabase/query/index.html"
filterset_class = TaskFilterQueryPage
def get_table_data(self):
@@ -525,7 +525,7 @@ def get_filtered_tasks(search, sort, tasks=None):
class TaskTables2View(SingleTableView):
model = Task
table_class = TaskTable
- template_name = 'query/query.html'
+ template_name = 'taskdatabase/query/query.html'
def TaskDetails(request, id=0, page=0):
--
GitLab