diff --git a/atdb/taskdatabase/templates/taskdatabase/index.html b/atdb/taskdatabase/templates/taskdatabase/index.html index 6720e219c97566e34337f2f6ad97db86d225900f..227ca316b7928c30726628d722c30e19fdbee66b 100644 --- a/atdb/taskdatabase/templates/taskdatabase/index.html +++ b/atdb/taskdatabase/templates/taskdatabase/index.html @@ -18,9 +18,10 @@ <thead> <tr> <th width="5%">ID</th> - + <th>Priority</th> <th>Status</th> <th>Project</th> + <th>SAS_ID</th> <th width="15%">Workflow</th> <th>Created</th> @@ -44,7 +45,7 @@ </div> {% include 'taskdatabase/pagination.html' %} </div> - <p class="footer"> Version 1.0.0 (12 feb 2021 - 15:00) + <p class="footer"> Version 1.0.0 (19 feb 2021 - 15:00) <script type="text/javascript"> (function(seconds) { var refresh, diff --git a/atdb/taskdatabase/templates/taskdatabase/tasks.html b/atdb/taskdatabase/templates/taskdatabase/tasks.html index 13651e25a533a3ba1b696f73c22ef947f4c04383..fe7eb6288994ae49d83701370a329edbbf68ddba 100644 --- a/atdb/taskdatabase/templates/taskdatabase/tasks.html +++ b/atdb/taskdatabase/templates/taskdatabase/tasks.html @@ -8,9 +8,17 @@ <td> <a href="{{ task.get_absolute_url }}" target="_blank">{{ task.id }} </a> </td> - <td>{{ task.status }}</td> + <td> + <a href="{% url 'task-setstatus-view' task.pk 'lower' my_tasks.number %}" class="btn btn-primary btn-sm" role="button">-</a> + {{ task.priority }} + <a href="{% url 'task-setstatus-view' task.pk 'higher' my_tasks.number %}" class="btn btn-primary btn-sm" role="button">+</a> + + </td> + <td>{{ task.status }}</td> <td>{{ task.project }}</td> + <td>{{ task.sas_id }}</td> + <td>{{ task.workflow }} <td>{{ task.creationTime|date:"Y-m-d H:i:s" }} </td> @@ -34,10 +42,6 @@ <a href="{% url 'task-setstatus-view' task.pk 'archived' my_tasks.number %}" class="btn btn-primary btn-sm" role="button">archived</a> <a href="{% url 'task-setstatus-view' task.pk 'finished' my_tasks.number %}" class="btn btn-primary btn-sm" role="button">finished</a> - {% if task.status == "processed" %} - <a href="{% url 'task-setstatus-view' task.pk 'accepted' my_tasks.number %}" class="btn btn-success btn-sm" role="button">Accept</a> - {% endif %} - {% if task.status == "processed" %} <a href="{% url 'task-setstatus-view' task.pk 'validated' my_tasks.number %}" class="btn btn-success btn-sm" role="button">Validate</a> {% endif %}