diff --git a/atdb/taskdatabase/templates/taskdatabase/archived/headers.html b/atdb/taskdatabase/templates/taskdatabase/archived/headers.html index 9cdb6d053fa07d1c2e6ab66280b5832adbf6dc6d..5d3f42268a045138f8cb3b904187daf29423c8b3 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 c35844359a0823b66ade7f04fdb46e6e14402408..893208d74df86b9cc516ce7317631397a7a35c5f 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 b3b083e4c2457acce9c39ce464e23ee78911c83d..97c03bbebe92ed53fed5b4146fa4672b3c4772cb 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>