bugfix sort in finished page

atdb/taskdatabase/templates/taskdatabase/archived/headers.html

 <tr>
     <th>
-        <a href="{% url 'sort-tasks' '-pk' 'archived' %}" class="btn btn-light btn-sm" role="button"><i class="fas fa-sort-up"></i></a>
+        <a href="{% url 'sort-tasks' '-pk' 'finished' %}" class="btn btn-light btn-sm" role="button"><i class="fas fa-sort-up"></i></a>
         ID
-        <a href="{% url 'sort-tasks' 'id' 'archived' %}" class="btn btn-light btn-sm" role="button"><i class="fas fa-sort-down"></i></a>
+        <a href="{% url 'sort-tasks' 'id' 'finished' %}" class="btn btn-light btn-sm" role="button"><i class="fas fa-sort-down"></i></a>
     </th>
     <th>Details</th>
     <th>
-        <a href="{% url 'sort-tasks' '-workflow' 'archived' %}" class="btn btn-light btn-sm" role="button"><i class="fas fa-sort-up"></i></a>
+        <a href="{% url 'sort-tasks' '-workflow' 'finished' %}" class="btn btn-light btn-sm" role="button"><i class="fas fa-sort-up"></i></a>
         Workflow
-        <a href="{% url 'sort-tasks' 'workflow' 'archived' %}" class="btn btn-light btn-sm" role="button"><i class="fas fa-sort-down"></i></a>
+        <a href="{% url 'sort-tasks' 'workflow' 'finished' %}" class="btn btn-light btn-sm" role="button"><i class="fas fa-sort-down"></i></a>
     <th>
-        <a href="{% url 'sort-tasks' '-status' 'archived' %}" class="btn btn-light btn-sm" role="button"><i class="fas fa-sort-up"></i></a>
+        <a href="{% url 'sort-tasks' '-status' 'finished' %}" class="btn btn-light btn-sm" role="button"><i class="fas fa-sort-up"></i></a>
         Status
-        <a href="{% url 'sort-tasks' 'status' 'archived' %}" class="btn btn-light btn-sm" role="button"><i class="fas fa-sort-down"></i></a>
+        <a href="{% url 'sort-tasks' 'status' 'finished' %}" class="btn btn-light btn-sm" role="button"><i class="fas fa-sort-down"></i></a>
     </th>
     <th>
-        <a href="{% url 'sort-tasks' '-project' 'archived' %}" class="btn btn-light btn-sm" role="button"><i class="fas fa-sort-up"></i></a>
+        <a href="{% url 'sort-tasks' '-project' 'finished' %}" class="btn btn-light btn-sm" role="button"><i class="fas fa-sort-up"></i></a>
         Project
-        <a href="{% url 'sort-tasks' 'project' 'archived' %}" class="btn btn-light btn-sm" role="button"><i class="fas fa-sort-down"></i></a>
+        <a href="{% url 'sort-tasks' 'project' 'finished' %}" class="btn btn-light btn-sm" role="button"><i class="fas fa-sort-down"></i></a>
     </th>
     <th>
-        <a href="{% url 'sort-tasks' '-filter' 'archived' %}" class="btn btn-light btn-sm" role="button"><i class="fas fa-sort-up"></i></a>
+        <a href="{% url 'sort-tasks' '-filter' 'finished' %}" class="btn btn-light btn-sm" role="button"><i class="fas fa-sort-up"></i></a>
         Filter
-        <a href="{% url 'sort-tasks' 'filter' 'archived' %}" class="btn btn-light btn-sm" role="button"><i class="fas fa-sort-down"></i></a>
+        <a href="{% url 'sort-tasks' 'filter' 'finished' %}" class="btn btn-light btn-sm" role="button"><i class="fas fa-sort-down"></i></a>
     </th>
 
     <th>
-        <a href="{% url 'sort-tasks' '-sas_id' 'archived' %}" class="btn btn-light btn-sm" role="button"><i class="fas fa-sort-up"></i></a>
+        <a href="{% url 'sort-tasks' '-sas_id' 'finished' %}" class="btn btn-light btn-sm" role="button"><i class="fas fa-sort-up"></i></a>
         SAS_ID (input)
-        <a href="{% url 'sort-tasks' 'sas_id' 'archived' %}" class="btn btn-light btn-sm" role="button"><i class="fas fa-sort-down"></i></a>
+        <a href="{% url 'sort-tasks' 'sas_id' 'finished' %}" class="btn btn-light btn-sm" role="button"><i class="fas fa-sort-down"></i></a>
     </th>
         <th>
         SAS_ID (output) at LTA

atdb/taskdatabase/templates/taskdatabase/index.html

@@ -31,7 +31,7 @@
             {% include 'taskdatabase/pagination.html' %}
         </div>
     </div>
-    <p class="footer"> Version 7 Aug 2023
+    <p class="footer"> Version 18 Aug 2023
 </div>
 
 {% include 'taskdatabase/refresh.html' %}

atdb/taskdatabase/views.py

@@ -335,8 +335,9 @@ class ShowValidationPage(ListView):
     @silk_profile(name='ShowValidationPage')
     def get_queryset(self):
         
-        stored_tasks = Task.objects.filter(status__icontains=State.STORED.value)
-        tasks = get_filtered_tasks(self.request, stored_tasks, "sas_id")
+        #stored_tasks = Task.objects.filter(status__icontains=State.STORED.value)
+        #tasks = get_filtered_tasks(self.request, stored_tasks, "sas_id")
+        tasks = get_filtered_tasks(self.request, None, "sas_id").filter(status__icontains=State.STORED.value)
 
         # exclude the failed tasks
         tasks = tasks.exclude(status__icontains=State.FAILED.value)
@@ -378,8 +379,9 @@ class ShowFailuresPage(ListView):
     @silk_profile(name='ShowFailuresPage')
     def get_queryset(self):
 
-        failed_tasks = Task.objects.filter(status__icontains=State.FAILED.value)
-        tasks = get_filtered_tasks(self.request, failed_tasks)
+        #failed_tasks = Task.objects.filter(status__icontains=State.FAILED.value)
+        #tasks = get_filtered_tasks(self.request, failed_tasks)
+        tasks = get_filtered_tasks(self.request).filter(status__icontains=State.FAILED.value)
 
         paginator = Paginator(tasks, config.TASKS_PER_PAGE)  # Show 50 tasks per page
         page = self.request.GET.get('page')
@@ -458,9 +460,11 @@ class ShowFinishedPage(ListView):
     def get_queryset(self):
 
         ##archived_tasks = Task.objects.filter(status=State.FINISHED.value)
-        tasks = get_filtered_tasks(self.request, None, "sas_id").filter(status=State.FINISHED.value)
         ##tasks = get_filtered_tasks(self.request, archived_tasks, "sas_id")
 
+        tasks = get_filtered_tasks(self.request, None, "sas_id").filter(status=State.FINISHED.value)
+
+
         paginator = Paginator(tasks, config.TASKS_PER_PAGE)  # Show 50 tasks per page
         page = self.request.GET.get('page')