move query tree

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
 

atdb/taskdatabase/templates/taskdatabase/filter/search.html

-<!-- 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">

atdb/taskdatabase/templates/query/index.html → 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' %}
 

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>

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

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):