diff --git a/atdb/taskdatabase/templates/taskdatabase/archived/headers.html b/atdb/taskdatabase/templates/taskdatabase/archived/headers.html index eac27b83e0408e84cac5218642078e43fb559aee..9cdb6d053fa07d1c2e6ab66280b5832adbf6dc6d 100644 --- a/atdb/taskdatabase/templates/taskdatabase/archived/headers.html +++ b/atdb/taskdatabase/templates/taskdatabase/archived/headers.html @@ -9,6 +9,11 @@ <a href="{% url 'sort-tasks' '-workflow' 'archived' %}" 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> + </th> + <th> + <a href="{% url 'sort-tasks' '-status' 'archived' %}" 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> </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> diff --git a/atdb/taskdatabase/templates/taskdatabase/archived/tasks.html b/atdb/taskdatabase/templates/taskdatabase/archived/tasks.html index 77ac321fe4d5a4d37e2e00eb7cf62aea5847ba47..b3b083e4c2457acce9c39ce464e23ee78911c83d 100644 --- a/atdb/taskdatabase/templates/taskdatabase/archived/tasks.html +++ b/atdb/taskdatabase/templates/taskdatabase/archived/tasks.html @@ -31,6 +31,12 @@ target="_blank"><i class="fas fa-project-diagram"></i> {{ task.workflow }} </a></td> </td> + {% if task.resume %} + <td class="bigger">{{ task.status }}</td> + {% endif %} + {% if not task.resume %} + <td class="bigger">{{ task.status }} (holding)</td> + {% endif %} <td>{{ task.filter }} </td> <td>{{ task.project }}</td> diff --git a/atdb/taskdatabase/templates/taskdatabase/index.html b/atdb/taskdatabase/templates/taskdatabase/index.html index 96f13e14affe55eb52e921b042cbe3a385647d68..e3718140a0ea9770a011b502b9513d13bcd48c4a 100644 --- a/atdb/taskdatabase/templates/taskdatabase/index.html +++ b/atdb/taskdatabase/templates/taskdatabase/index.html @@ -34,7 +34,7 @@ {% include 'taskdatabase/pagination.html' %} </div> </div> - <p class="footer"> Version 19 Januari 2022 - 10:00 + <p class="footer"> Version 19 Januari 2022 - 11:00 </div> diff --git a/atdb/taskdatabase/views.py b/atdb/taskdatabase/views.py index 499db094c9cbf2d5c5f27c5d9683b52503ea198e..d414df3d21149de1a5b9dda3067f1ccfb238c459 100644 --- a/atdb/taskdatabase/views.py +++ b/atdb/taskdatabase/views.py @@ -416,7 +416,7 @@ class ShowArchivedPage(ListView): def get_queryset(self): - archived_tasks = Task.objects.filter(status__icontains='archived') + archived_tasks = Task.objects.filter(status='archived') tasks = get_filtered_tasks(self.request, archived_tasks) paginator = Paginator(tasks, config.TASKS_PER_PAGE) # Show 50 tasks per page