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

Merge branch 'dev-nico' into 'master'

Dev nico

See merge request !140
parents bd3037ed 8541ac2f
Branches
No related tags found
4 merge requests!158SDC-470: Create api-function to retrieve the minimum start time and maximum...,!143Query Page:,!141Master,!140Dev nico
Pipeline #20020 passed
<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; <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 %} {% if record.resume %}
<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> <a href="{% url 'query-hold-resume' record.pk 'hold' request.GET %}" class="btn btn-warning btn-sm" role="button"><i class="fas fa-pause"></i> hold</a>
{% endif %} {% endif %}
{% if not record.resume %} {% if not record.resume %}
<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> <a href="{% url 'query-hold-resume' record.pk 'resume' request.GET %}" class="btn btn-success btn-sm" role="button"><i class="fas fa-play"></i> start</a>
{% endif %} {% endif %}
\ No newline at end of file
...@@ -8,8 +8,8 @@ ...@@ -8,8 +8,8 @@
<p>Click to 'multi change' Status for all these tasks</p> <p>Click to 'multi change' Status for all these tasks</p>
<table> <table>
<tr> <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' 'hold' request.GET %}" 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-hold' 'resume' request.GET %}" class="btn btn-danger btn-sm" role="button"><i class="fas fa-play"></i> start</a>&nbsp;
<a href="{% url 'task-multi-setstatus' 'defined' request.GET %}" class="btn btn-danger btn-sm" role="button"><i class="fas fa-sync-alt"></i> defined</a>&nbsp; <a href="{% url 'task-multi-setstatus' 'defined' request.GET %}" 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' request.GET %}" class="btn btn-danger btn-sm" role="button"><i class="fas fa-sync-alt"></i> staged</a>&nbsp; <a href="{% url 'task-multi-setstatus' 'staged' request.GET %}" class="btn btn-danger btn-sm" role="button"><i class="fas fa-sync-alt"></i> staged</a>&nbsp;
......
...@@ -80,7 +80,7 @@ ...@@ -80,7 +80,7 @@
{% include 'taskdatabase/pagination.html' %} {% include 'taskdatabase/pagination.html' %}
</div> </div>
</div> </div>
<p class="footer"> Version 1.0.0 (29 oct 2021 - 13:00) <p class="footer"> Version 1.0.0 (29 oct 2021 - 14:00)
</div> </div>
......
...@@ -64,8 +64,9 @@ urlpatterns = [ ...@@ -64,8 +64,9 @@ urlpatterns = [
path('tasks/task-set-onhold-filter/<onhold>', views.TaskSetOnHoldFilter, name='task-set-onhold-filter'), path('tasks/task-set-onhold-filter/<onhold>', views.TaskSetOnHoldFilter, name='task-set-onhold-filter'),
path('tasks/<int:pk>/set_status/<new_status>/<query_params>', views.TaskSetStatusTables2, name = 'task-setstatus'), path('tasks/<int:pk>/set_status/<new_status>/<query_params>', views.TaskSetStatusTables2, name = 'task-setstatus'),
path('tasks/set_status_multi/<new_status>/<query_params>', views.TaskMultiStatus, name='task-multi-setstatus'), path('tasks/set_status_multi/<new_status>/<query_params>', views.TaskMultiStatus, name='task-multi-setstatus'),
path('tasks/set_multi_hold/<onhold>', views.TaskMultiHold, name='task-multi-hold'), path('tasks/set_multi_hold/<onhold>/<query_params>', 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>/<page>', views.Hold, name='task-hold-resume'),
path('tasks/<int:pk>/hold/<hold_it>', views.Hold, name='task-hold-resume'), path('tasks/<int:pk>/hold/<hold_it>', views.Hold, name='task-hold-resume'),
path('tasks/<int:pk>/query-hold/<hold_it>/<query_params>', views.HoldQuery, name='query-hold-resume'),
] ]
\ No newline at end of file
...@@ -476,6 +476,17 @@ def Hold(request,pk,hold_it,page=0): ...@@ -476,6 +476,17 @@ def Hold(request,pk,hold_it,page=0):
# redirect to tasks list # redirect to tasks list
return redirect('/atdb/?page='+page) return redirect('/atdb/?page='+page)
def HoldQuery(request,pk,hold_it,query_params):
model = Task
task = Task.objects.get(pk=pk)
task.resume = (hold_it == 'resume')
task.save()
current_query_params = convert_query_params_to_url(query_params)
return redirect('/atdb/query/?' + current_query_params)
@login_required @login_required
def TaskSetStatus(request,pk,new_status,page=0): def TaskSetStatus(request,pk,new_status,page=0):
model = Task model = Task
...@@ -599,7 +610,7 @@ def TaskMultiStatus(request, new_status, query_params): ...@@ -599,7 +610,7 @@ def TaskMultiStatus(request, new_status, query_params):
@login_required @login_required
def TaskMultiHold(request, onhold): def TaskMultiHold(request, onhold, query_params):
# get the list of id's from the session # get the list of id's from the session
query_list_of_ids = request.session['query_list_of_ids'] query_list_of_ids = request.session['query_list_of_ids']
count = len(query_list_of_ids) count = len(query_list_of_ids)
...@@ -611,7 +622,13 @@ def TaskMultiHold(request, onhold): ...@@ -611,7 +622,13 @@ def TaskMultiHold(request, onhold):
task.resume = (onhold == 'resume') task.resume = (onhold == 'resume')
task.save() task.save()
return redirect('/atdb/query') current_query_params = request.session['current_query_params']
return redirect('/atdb/query?'+current_query_params)
# add the current query parameters to the session so that they survive
# the request/response to the confirmation page (which has other query parameters)
current_query_params = convert_query_params_to_url(query_params)
request.session['current_query_params'] = current_query_params
return render(request, "query/confirm_multi_change.html",{'new_value': onhold, 'count' : count}) return render(request, "query/confirm_multi_change.html",{'new_value': onhold, 'count' : count})
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment