diff --git a/atdb/taskdatabase/templates/taskdatabase/index.html b/atdb/taskdatabase/templates/taskdatabase/index.html
index ce8f1ac7774a1faa98e52ad629c76995fe9af3ce..2f3100ec768b13928027e722a79b00a7a787a4bf 100644
--- a/atdb/taskdatabase/templates/taskdatabase/index.html
+++ b/atdb/taskdatabase/templates/taskdatabase/index.html
@@ -28,9 +28,8 @@
<th>Created</th>
<th>size-to-process</th>
- <th>Details</th>
- <th>Hold</th>
- <th>Set Status</th>
+ <th>Info</th>
+ <th>Actions</th>
</tr>
</thead>
<tbody>
@@ -46,7 +45,7 @@
{% include 'taskdatabase/pagination.html' %}
</div>
</div>
- <p class="footer"> Version 1.0.0 (5 mar 2021 - 15:00)
+ <p class="footer"> Version 1.0.0 (5 mar 2021 - 16:00)
</div>
diff --git a/atdb/taskdatabase/templates/taskdatabase/task/details_card.html b/atdb/taskdatabase/templates/taskdatabase/task/details_card.html
index bb9913901fa9f7f7f8d5741fb3748a69ba26aa9d..db46b1dd5bf171487d2174a154b038af593a9d63 100644
--- a/atdb/taskdatabase/templates/taskdatabase/task/details_card.html
+++ b/atdb/taskdatabase/templates/taskdatabase/task/details_card.html
@@ -5,7 +5,15 @@
<table class="table table-striped">
<tbody>
<tr><td><b>id</b></td><td><a href="{% url 'task-detail-view-api' task.pk %}" target="_blank">{{ task.id }} </a></td></tr>
- <tr><td><b>priority</b></td><td>{{ task.priority }}</td></tr>
+ <tr><td><b>priority</b></td><td>
+ {% if user.is_authenticated %}
+ <a href="{% url 'task-change-priority' task.pk '-10' %}" class="btn btn-warning btn-sm" role="button">-10</a>
+ {% endif %}
+ {{ task.priority }}
+ {% if user.is_authenticated %}
+ <a href="{% url 'task-change-priority' task.pk '10' %}" class="btn btn-warning btn-sm" role="button">+10</a>
+ {% endif %}
+ </td></tr>
<tr class="{{ task.status }}"><td><b>status</b></td><td>{{ task.status }}</td></tr>
<tr><td><b>workflow</b></td><td>
<a class="open-modal btn btn-primary btn-sm"
diff --git a/atdb/taskdatabase/templates/taskdatabase/task/task_details.html b/atdb/taskdatabase/templates/taskdatabase/task/task_details.html
index feb3d32ad6c88b275ac2227a7bd7cb6b1ae3ba5f..ecead11289d6e7ea7d46ed135e511b0e2c16086f 100644
--- a/atdb/taskdatabase/templates/taskdatabase/task/task_details.html
+++ b/atdb/taskdatabase/templates/taskdatabase/task/task_details.html
@@ -11,7 +11,7 @@
<div class="col-sm">
{% include "taskdatabase/task/details_card.html" %}
</div>
- <div class="col-sm">
+ <div class="col-md">
{% include "taskdatabase/task/logentries_card.html" %}
</div>
</div>
diff --git a/atdb/taskdatabase/templates/taskdatabase/tasks.html b/atdb/taskdatabase/templates/taskdatabase/tasks.html
index 81f9b18e9520c100476b88f00b901220b12d81d2..ef942821affc71e70310903c2193b8192bc4733f 100644
--- a/atdb/taskdatabase/templates/taskdatabase/tasks.html
+++ b/atdb/taskdatabase/templates/taskdatabase/tasks.html
@@ -34,14 +34,8 @@
<a class="btn btn-primary btn-sm"
href="{% url 'task-details' task.id my_tasks.number %}"
data-popup-url="{% url 'task-details' task.id my_tasks.number %}"
- > Details
- </a>
-
- <a class="open-modal btn btn-primary btn-sm"
- href="{% url 'workflow-details' task.workflow %}"
- data-popup-url="{% url 'workflow-details' task.workflow %}"
- target="_blank"> w({{ task.workflow }})
- </a>
+ ><i class="fas fa-list"></i> Details
+ </a>
<a class="open-modal btn btn-primary btn-sm"
href="{% url 'show-inputs' task.id %}"
@@ -61,37 +55,30 @@
target="_blank"><i class="fas fa-clock"></i>
</a>
</td>
-
+ <td>
{% if user.is_authenticated %}
{% if task.resume %}
- <td>
<a href="{% url 'task-hold-resume' task.pk 'hold' my_tasks.number %}" class="btn btn-warning btn-sm" role="button"><i class="fas fa-pause"></i> hold</a>
- </td>
{% endif %}
{% if not task.resume %}
- <td>
<a href="{% url 'task-hold-resume' task.pk 'resume' my_tasks.number %}" class="btn btn-success btn-sm" role="button"><i class="fas fa-play"></i> start</a>
- </td>
{% endif %}
- <td>
+
{% if user.is_staff %}
{% if task.status != "defining" %}
<a href="{% url 'task-setstatus-view' task.pk 'defining' my_tasks.number %}" class="btn btn-warning btn-sm" role="button"><i class="fas fa-undo"></i> Reset</a>
{% endif %}
- {% if task.status == "defining" %}
- <a href="{% url 'task-setstatus-view' task.pk 'defined' my_tasks.number %}" class="btn btn-success btn-sm" role="button">Stage</a>
- {% endif %}
{% 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"><i class="fas fa-check"></i> validate</a>
{% endif %}
- </td>
{% endif %}
+ </td>
</tr>
</div>
diff --git a/atdb/taskdatabase/urls.py b/atdb/taskdatabase/urls.py
index 1f7f431bbc8aa30c58a77e9a081985edd0491108..c094691421e399c47062c86089517943de05d351 100644
--- a/atdb/taskdatabase/urls.py
+++ b/atdb/taskdatabase/urls.py
@@ -47,6 +47,8 @@ urlpatterns = [
path('tasks/<int:pk>/setstatus/<new_status>', views.TaskSetStatus, name='task-details-setstatus'),
path('tasks/<int:pk>/change_priority/<priority_change>/<page>', views.TaskChangePriority, name='task-change-priority'),
+ path('tasks/<int:pk>/change_priority/<priority_change>', views.TaskChangePriority, name='task-change-priority'),
+
path('tasks/set_filter/<filter>', views.TaskSetFilter, name='task-set-filter'),
path('tasks/<int:pk>/set_status/<new_status>/<page>', views.TaskSetStatusTables2, name = 'task-setstatus'),
diff --git a/atdb/taskdatabase/views.py b/atdb/taskdatabase/views.py
index d654c50681024477d942dec52a0f488f985ee5b6..84e66584ceb5fda14093560c7cfa906089506b82 100644
--- a/atdb/taskdatabase/views.py
+++ b/atdb/taskdatabase/views.py
@@ -241,7 +241,7 @@ def TaskDetails(request, id=0, page=0):
# store the current page on the session
request.session['page'] = page
- log_entries = LogEntry.objects.filter(task=task)
+ log_entries = LogEntry.objects.filter(task=task).order_by('-timestamp')
logentries_html = convert_logentries_to_html(log_entries)
return render(request, "taskdatabase/task/task_details.html", {'task': task, 'logentries': logentries_html })
@@ -423,7 +423,7 @@ def TaskSetStatus(request,pk,new_status,page=0):
if page==0:
# redirect to details screen
- return redirect('/atdb/task_details/0/0')
+ return redirect('/atdb/task_details')
else:
# redirect to tasks list
return redirect('/atdb/?page='+page)
@@ -434,13 +434,23 @@ def TaskSetFilter(request,filter):
return redirect('/atdb/?page=1')
-def TaskChangePriority(request,pk,priority_change,page):
+def TaskChangePriority(request,pk,priority_change,page=0):
model = Task
task = Task.objects.get(pk=pk)
priority = task.priority + int(priority_change)
+
+ if priority<0:
+ priority=0
+
task.priority = priority
task.save()
- return redirect('/atdb/?page='+page)
+
+ if page==0:
+ # redirect to details screen
+ return redirect('/atdb/task_details')
+ else:
+ # redirect to tasks list
+ return redirect('/atdb/?page='+page)
def TaskSetStatusTables2(request,pk,new_status,page):