Skip to content
Snippets Groups Projects
Commit 4e01eb38 authored by Nico Vermaas's avatar Nico Vermaas
Browse files

online show status 'archived' in archived page

parent 75b72678
No related branches found
No related tags found
No related merge requests found
Pipeline #42675 passed
......@@ -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>
......
......@@ -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>
......
......@@ -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>
......
......@@ -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
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment