diff --git a/atdb/taskdatabase/templates/taskdatabase/ingest/headers.html b/atdb/taskdatabase/templates/taskdatabase/ingest/headers.html index 4c22cc0b2de4a2f986576ba8562bdce3beca1db6..a36591940f65a28de895445bf6232941cb864bda 100644 --- a/atdb/taskdatabase/templates/taskdatabase/ingest/headers.html +++ b/atdb/taskdatabase/templates/taskdatabase/ingest/headers.html @@ -1,31 +1,31 @@ <tr> - <th> - <a href="{% url 'sort-tasks' '-workflow' 'ingest' %}" class="btn btn-light btn-sm" role="button"><i class="fas fa-sort-up"></i></a> - Workflow - <a href="{% url 'sort-tasks' 'workflow' 'ingest' %}" class="btn btn-light btn-sm" role="button"><i class="fas fa-sort-down"></i></a> - </th> - <th> - <a href="{% url 'sort-tasks' '-priority' 'ingest' %}" class="btn btn-light btn-sm" role="button"><i class="fas fa-sort-up"></i></a> - Priority - <a href="{% url 'sort-tasks' 'priority' 'ingest' %}" class="btn btn-light btn-sm" role="button"><i class="fas fa-sort-down"></i></a> + <a href="{% url 'sort-tasks' '-sas_id' 'ingest' %}" class="btn btn-light btn-sm" role="button"><i class="fas fa-sort-up"></i></a> + SAS_ID (input) + <a href="{% url 'sort-tasks' 'sas_id' 'ingest' %}" class="btn btn-light btn-sm" role="button"><i class="fas fa-sort-down"></i></a> </th> - <th>Status</th> <th> <a href="{% url 'sort-tasks' '-project' 'ingest' %}" class="btn btn-light btn-sm" role="button"><i class="fas fa-sort-up"></i></a> Project <a href="{% url 'sort-tasks' 'project' 'ingest' %}" class="btn btn-light btn-sm" role="button"><i class="fas fa-sort-down"></i></a> </th> + <th> + <a href="{% url 'sort-tasks' '-workflow' 'ingest' %}" class="btn btn-light btn-sm" role="button"><i class="fas fa-sort-up"></i></a> + Workflow + <a href="{% url 'sort-tasks' 'workflow' 'ingest' %}" class="btn btn-light btn-sm" role="button"><i class="fas fa-sort-down"></i></a> + </th> <th> <a href="{% url 'sort-tasks' '-filter' 'ingest' %}" class="btn btn-light btn-sm" role="button"><i class="fas fa-sort-up"></i></a> Filter <a href="{% url 'sort-tasks' 'filter' 'ingest' %}" 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' 'ingest' %}" class="btn btn-light btn-sm" role="button"><i class="fas fa-sort-up"></i></a> - SAS_ID (input) - <a href="{% url 'sort-tasks' 'sas_id' 'ingest' %}" class="btn btn-light btn-sm" role="button"><i class="fas fa-sort-down"></i></a> + <a href="{% url 'sort-tasks' '-priority' 'ingest' %}" class="btn btn-light btn-sm" role="button"><i class="fas fa-sort-up"></i></a> + Priority + <a href="{% url 'sort-tasks' 'priority' 'ingest' %}" class="btn btn-light btn-sm" role="button"><i class="fas fa-sort-down"></i></a> </th> + <th>Status</th> + <th>Completion</th> <th> SAS_ID (output) at LTA diff --git a/atdb/taskdatabase/templates/taskdatabase/ingest/tasks.html b/atdb/taskdatabase/templates/taskdatabase/ingest/tasks.html index 9c073cb569bd4d8b784b7afd5a6ed13e8c720e6f..1a61c352add2df52faf58fa3b64a6a529f9cd86a 100644 --- a/atdb/taskdatabase/templates/taskdatabase/ingest/tasks.html +++ b/atdb/taskdatabase/templates/taskdatabase/ingest/tasks.html @@ -4,7 +4,8 @@ {% if task.status != "removed_invisible" %} <div class="row"> <tr> - + <td>{{ task.sas_id }}</td> + <td>{{ task.project }}</td> <td> <a class="open-modal btn btn-primary btn-sm" href="{% url 'workflow-details' task.workflow.id %}" @@ -12,6 +13,7 @@ target="_blank"><i class="fas fa-project-diagram"></i> {{ task.workflow.id }} </a></td> </td> + <td>{{ task.filter }} </td> <td> {% if user.is_authenticated %} <a href="{% url 'task-change-priority-sasid' task.pk '-10' my_tasks.number %}" class="btn btn-warning btn-sm" role="button">-10</a> @@ -22,10 +24,7 @@ {% endif %} </td> <td>{{ task.sasid_ingested_fraction.status }}</td> - <td>{{ task.project }}</td> - <td>{{ task.filter }} </td> - <td>{{ task.sas_id }}</td> <td>{{ task.sasid_ingested_fraction.completion }}%</td> <td> {% if task.sas_id_archived != None %}