From fd774739b529640a9a704bafb6b8612a5c681855 Mon Sep 17 00:00:00 2001
From: vermaas <vermaas@astron.nl>
Date: Thu, 19 Jan 2023 11:09:26 +0100
Subject: [PATCH] archived page
---
.../templates/taskdatabase/archived/headers.html | 15 +++++----------
.../templates/taskdatabase/archived/page.html | 2 +-
.../templates/taskdatabase/archived/tasks.html | 10 ++--------
3 files changed, 8 insertions(+), 19 deletions(-)
diff --git a/atdb/taskdatabase/templates/taskdatabase/archived/headers.html b/atdb/taskdatabase/templates/taskdatabase/archived/headers.html
index 9cdb6d05..5d3f4226 100644
--- a/atdb/taskdatabase/templates/taskdatabase/archived/headers.html
+++ b/atdb/taskdatabase/templates/taskdatabase/archived/headers.html
@@ -9,22 +9,17 @@
<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>
+ <a href="{% url 'sort-tasks' '-project' 'archived' %}" 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>
</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>
Filter
<a href="{% url 'sort-tasks' 'filter' 'archived' %}" 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>
- Project
- <a href="{% url 'sort-tasks' 'project' 'archived' %}" 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>
SAS_ID (input)
diff --git a/atdb/taskdatabase/templates/taskdatabase/archived/page.html b/atdb/taskdatabase/templates/taskdatabase/archived/page.html
index c3584435..893208d7 100644
--- a/atdb/taskdatabase/templates/taskdatabase/archived/page.html
+++ b/atdb/taskdatabase/templates/taskdatabase/archived/page.html
@@ -9,7 +9,7 @@
<div class="row">
<div class="col-12">
<h3>Archived</h3>
- This overview shows the tasks that are archived in the LTA.
+ This overview shows the tasks that are <b>archived</b> in the LTA.
<hr>
</div>
</div>
diff --git a/atdb/taskdatabase/templates/taskdatabase/archived/tasks.html b/atdb/taskdatabase/templates/taskdatabase/archived/tasks.html
index b3b083e4..97c03bbe 100644
--- a/atdb/taskdatabase/templates/taskdatabase/archived/tasks.html
+++ b/atdb/taskdatabase/templates/taskdatabase/archived/tasks.html
@@ -31,15 +31,9 @@
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>
+ <td>{{ task.project }}</td>
+ <td>{{ task.filter }} </td>
<td>
{{ task.sas_id }}
</td>
--
GitLab