validation per sas_id instead of per task

atdb/taskdatabase/urls.py

@@ -95,7 +95,6 @@ urlpatterns = [
     path('tasks/<int:pk>/change_priority/<priority_change>/<page>', views.ChangePriority, name='task-change-priority'),
     path('tasks/<int:pk>/change_priority/<priority_change>', views.ChangePriority, name='task-change-priority'),
     path('tasks/sort-tasks/<sort>/<redirect_to_page>', views.SortTasks, name='sort-tasks'),
-
     path('tasks/set_filter/<filter>/<redirect_to_page>', views.TaskSetFilter, name='task-set-filter'),
     path('tasks/set_active_filter/<redirect_to_page>', views.TaskSetActiveFilter, name='task-set-active-filter'),
     path('tasks/task-set-onhold-filter/<onhold>/<redirect_to_page>', views.TaskSetOnHoldFilter, name='task-set-onhold-filter'),

atdb/taskdatabase/views.py

@@ -337,9 +337,8 @@ class ShowValidationPage(ListView):
 
     def get_queryset(self):
 
-        stored_tasks = Task.objects.filter(status__icontains='stored').order_by("sas_id")
-        tasks = stored_tasks.distinct("sas_id")
-        #tasks = get_filtered_tasks(self.request, stored_tasks)
+        stored_tasks = Task.objects.filter(status__icontains='stored')
+        tasks = get_filtered_tasks(self.request, stored_tasks, "sas_id")
 
         # exclude the failed tasks
         tasks = tasks.exclude(status__icontains="failed")
@@ -407,8 +406,8 @@ class ShowFailuresPage(ListView):
 
 
 # this provides a broad range of filters for the search_box in the GUI
-def get_filtered_tasks(request, pre_filtered_tasks=None):
-    filtered_tasks = []
+def get_filtered_tasks(request, pre_filtered_tasks=None, distinct=None):
+
     filtered_tasks_as_list = None
 
     try:
@@ -468,15 +467,15 @@ def get_filtered_tasks(request, pre_filtered_tasks=None):
     else:
         request.session['filtered'] = True
 
+    if distinct:
+        # this does not seem to work, the distinct tasks are not sorted.
+        my_sorted_tasks = filtered_tasks.order_by(distinct,my_sort)
+        my_sorted_tasks = my_sorted_tasks.distinct(distinct)
+        return my_sorted_tasks
+    else:
         return filtered_tasks.order_by(my_sort)
 
 
-# class TaskTables2View(SingleTableView):
-#     model = Task
-#     table_class = TaskTable
-#     template_name = 'taskdatabase/query/query.html'
-
-
 def TaskDetails(request, id=0, page=0):
     try:
         task = Task.objects.get(id=id)
@@ -1064,6 +1063,7 @@ def ChangePriority(request, pk, priority_change, page=0):
 
 def SortTasks(request, sort, redirect_to_page):
     # store the sort field on the session
+
     request.session['sort'] = sort
     if redirect_to_page == 'atdb':
         return redirect('index')