Skip to content
Snippets Groups Projects
Commit b087a4d1 authored by Nico Vermaas's avatar Nico Vermaas
Browse files

adding multi hold/resume functionality in query

parent 9809c5dd
Branches
No related tags found
3 merge requests!98Acceptance,!95Dev nico,!94adding multi hold/resume functionality in query
<a href="{% url 'task-details' record.pk 0 %}" class="btn btn-primary btn-sm" role="button"><i class="fas fa-list"></i> Details</a>&nbsp;
{% if record.resume %}
<a href="{% url 'task-hold-resume' record.pk 'hold' 0 %}" class="btn btn-warning btn-sm" role="button"><i class="fas fa-pause"></i> hold</a>
<a href="{% url 'task-hold-resume' record.pk 'hold' %}" class="btn btn-warning btn-sm" role="button"><i class="fas fa-pause"></i> hold</a>
{% endif %}
{% if not record.resume %}
<a href="{% url 'task-hold-resume' record.pk 'resume' 0 %}" class="btn btn-success btn-sm" role="button"><i class="fas fa-play"></i> start</a>
<a href="{% url 'task-hold-resume' record.pk 'resume' %}" class="btn btn-success btn-sm" role="button"><i class="fas fa-play"></i> start</a>
{% endif %}
\ No newline at end of file
......@@ -8,6 +8,9 @@
<p>Click to change Status for all these tasks</p>
<table>
<tr>
<a href="{% url 'task-multi-hold' 'hold' %}" class="btn btn-danger btn-sm" role="button"><i class="fas fa-pause"></i> hold</a>&nbsp;
<a href="{% url 'task-multi-hold' 'resume' %}" class="btn btn-danger btn-sm" role="button"><i class="fas fa-play"></i> start</a>&nbsp;
<a href="{% url 'task-multi-setstatus' 'defining' %}" class="btn btn-danger btn-sm" role="button"><i class="fas fa-sync-alt"></i> defining</a>&nbsp;
<a href="{% url 'task-multi-setstatus' 'defined' %}" class="btn btn-danger btn-sm" role="button"><i class="fas fa-sync-alt"></i> defined</a>&nbsp;
<a href="{% url 'task-multi-setstatus' 'staged' %}" class="btn btn-danger btn-sm" role="button"><i class="fas fa-sync-alt"></i> staged</a>&nbsp;
......
......@@ -80,7 +80,7 @@
{% include 'taskdatabase/pagination.html' %}
</div>
</div>
<p class="footer"> Version 1.0.0 (1 apr 2021 - 12:00)
<p class="footer"> Version 1.0.0 (1 apr 2021 - 14:00)
</div>
......
......@@ -64,7 +64,8 @@ urlpatterns = [
path('tasks/task-set-onhold-filter/<onhold>', views.TaskSetOnHoldFilter, name='task-set-onhold-filter'),
path('tasks/<int:pk>/set_status/<new_status>/<page>', views.TaskSetStatusTables2, name = 'task-setstatus'),
path('tasks/set_status_multi/<new_status>', views.TaskSetStatusMulti, name='task-multi-setstatus'),
path('tasks/set_multi_hold/<onhold>', views.TaskMultiHold, name='task-multi-hold'),
path('tasks/<int:pk>/hold/<hold_it>/<page>', views.Hold, name='task-hold-resume'),
path('tasks/<int:pk>/hold/<hold_it>', views.Hold, name='task-hold-resume'),
]
\ No newline at end of file
......@@ -8,7 +8,6 @@ from django.contrib.auth.decorators import login_required
from django.views.generic import ListView
from django.contrib import messages
from django.core.cache import cache
from rest_framework import generics, pagination
from rest_framework.response import Response
......@@ -453,7 +452,7 @@ class JobDetailsViewAPI(generics.RetrieveUpdateDestroyAPIView):
# set task status to 'new_status' - called from the GUI
@login_required
def Hold(request,pk,hold_it,page):
def Hold(request,pk,hold_it,page=0):
model = Task
task = Task.objects.get(pk=pk)
task.resume = (hold_it == 'resume')
......@@ -537,10 +536,6 @@ def TaskSetStatusTables2(request,pk,new_status,page):
def TaskSetStatusMulti(request, new_status):
# read the current querylist from the session
# yikes, this doesn't work if 2 users are simultaneously logged in
# query_list = cache.get('query_list')
# cache.delete('query_list')
# get the list of id's from the session
query_list_of_ids = request.session['query_list_of_ids']
......@@ -550,6 +545,22 @@ def TaskSetStatusMulti(request, new_status):
task.save()
return redirect('/atdb/query')
@login_required
def TaskMultiHold(request, onhold):
# read the current querylist from the session
# get the list of id's from the session
query_list_of_ids = request.session['query_list_of_ids']
for id in query_list_of_ids:
task = Task.objects.get(id=id[0])
task.resume = (onhold == 'resume')
task.save()
return redirect('/atdb/query')
# /atdb/get_size?status__in=defined,staged
class GetSizeView(generics.ListAPIView):
queryset = Task.objects.all()
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment