From 4e01eb385150d75ce68abe11572f0e66be91a614 Mon Sep 17 00:00:00 2001
From: vermaas <vermaas@astron.nl>
Date: Thu, 19 Jan 2023 11:04:40 +0100
Subject: [PATCH] online show status 'archived' in archived page
---
.../templates/taskdatabase/archived/headers.html | 5 +++++
.../taskdatabase/templates/taskdatabase/archived/tasks.html | 6 ++++++
atdb/taskdatabase/templates/taskdatabase/index.html | 2 +-
atdb/taskdatabase/views.py | 2 +-
4 files changed, 13 insertions(+), 2 deletions(-)
diff --git a/atdb/taskdatabase/templates/taskdatabase/archived/headers.html b/atdb/taskdatabase/templates/taskdatabase/archived/headers.html
index eac27b83..9cdb6d05 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 77ac321f..b3b083e4 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 96f13e14..e3718140 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 499db094..d414df3d 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
--
GitLab