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

adding confirm button for multi set buttons

parent fdf44ce1
No related branches found
No related tags found
3 merge requests!108Master,!102Master,!101adding confirm button for multi set buttons
...@@ -17,7 +17,7 @@ TD { ...@@ -17,7 +17,7 @@ TD {
background-color: lemonchiffon; background-color: lemonchiffon;
} }
.error,.failed,.staging_failed,.processed_failed { .error,.failed,.staging_failed,.processed_failed,.scrubbed_failed {
color: red; color: red;
font-weight: bold; font-weight: bold;
} }
......
atdb/docs/ATDB-LDV GUI.png

147 KiB

...@@ -17,7 +17,7 @@ TD { ...@@ -17,7 +17,7 @@ TD {
background-color: lemonchiffon; background-color: lemonchiffon;
} }
.error,.failed,.staging_failed,.processed_failed { .error,.failed,.staging_failed,.processed_failed,.scrubbed_failed {
color: red; color: red;
font-weight: bold; font-weight: bold;
} }
......
{% extends 'taskdatabase/base.html' %}
{% block myBlock %}
<div class="container-fluid details-container">
<div class="card">
<div class="card-body">
<form action="./{{ new_value }}" method="POST">{% csrf_token %}
<div class="text-center">
<h4>Are you sure you want to set {{ count }} tasks to {{ new_value }}?</h4>
<p>
<button class="btn btn-success btn-sm" type="submit"><i class="fas fa-check"></i> OK</button>
<a href="{% url 'query' %}" class="btn btn-warning btn-sm" role="button"><i class="fas fa-times-circle"></i> Cancel</a>&nbsp
</p>
</div>
</form>
</div>
</div>
</div>
{% endblock %}
\ No newline at end of file
...@@ -4,8 +4,7 @@ ...@@ -4,8 +4,7 @@
<div class="modal-content"> <div class="modal-content">
<div class="modal-body"></div> <div class="modal-body"></div>
<div class="modal-footer"> <div class="modal-footer">
<button type="button" class="btn btn-info" data-dismiss="modal">Close <button type="button" class="btn btn-info" data-dismiss="modal">Close</button>
</button>
</div> </div>
</div> </div>
</div> </div>
......
...@@ -63,7 +63,7 @@ urlpatterns = [ ...@@ -63,7 +63,7 @@ urlpatterns = [
path('tasks/set_active_filter', views.TaskSetActiveFilter, name='task-set-active-filter'), path('tasks/set_active_filter', views.TaskSetActiveFilter, name='task-set-active-filter'),
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>/<page>', views.TaskSetStatusTables2, name = 'task-setstatus'), 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_status_multi/<new_status>', views.TaskMultiStatus, name='task-multi-setstatus'),
path('tasks/set_multi_hold/<onhold>', views.TaskMultiHold, name='task-multi-hold'), 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>/<page>', views.Hold, name='task-hold-resume'),
......
...@@ -61,9 +61,9 @@ class TaskFilterQueryPage(filters.FilterSet): ...@@ -61,9 +61,9 @@ class TaskFilterQueryPage(filters.FilterSet):
model = Task model = Task
fields = { fields = {
'id': ['exact', 'lte', 'gte'], 'id': ['exact', 'gte', 'lte'],
'workflow__id': ['exact'], 'workflow__id': ['exact'],
'priority': ['exact', 'lte', 'gte'], 'priority': ['exact', 'gte', 'lte'],
'status': ['icontains', 'in'], 'status': ['icontains', 'in'],
'project': ['exact', 'icontains'], 'project': ['exact', 'icontains'],
'sas_id': ['exact', 'icontains'], 'sas_id': ['exact', 'icontains'],
...@@ -489,6 +489,7 @@ def TaskSetFilter(request,filter): ...@@ -489,6 +489,7 @@ def TaskSetFilter(request,filter):
# set the defined list of ACTIVE_STATUSSES on the session, used later by the 'get_searched_tasks' mechanism # set the defined list of ACTIVE_STATUSSES on the session, used later by the 'get_searched_tasks' mechanism
def TaskSetActiveFilter(request): def TaskSetActiveFilter(request):
request.session['task_filter'] = settings.ACTIVE_STATUSSES request.session['task_filter'] = settings.ACTIVE_STATUSSES
request.session['task_onhold_filter'] = None
return redirect('/atdb/?page=1') return redirect('/atdb/?page=1')
def TaskSetOnHoldFilter(request, onhold): def TaskSetOnHoldFilter(request, onhold):
...@@ -531,11 +532,12 @@ def TaskSetStatusTables2(request,pk,new_status,page): ...@@ -531,11 +532,12 @@ def TaskSetStatusTables2(request,pk,new_status,page):
return redirect('/atdb/query/?page='+page) return redirect('/atdb/query/?page='+page)
@login_required @login_required
def TaskSetStatusMulti(request, new_status): def TaskMultiStatus(request, new_status):
# read the current querylist from the session
# 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)
if request.method == "POST":
for id in query_list_of_ids: for id in query_list_of_ids:
task = Task.objects.get(id=id[0]) task = Task.objects.get(id=id[0])
...@@ -543,13 +545,16 @@ def TaskSetStatusMulti(request, new_status): ...@@ -543,13 +545,16 @@ def TaskSetStatusMulti(request, new_status):
task.save() task.save()
return redirect('/atdb/query') return redirect('/atdb/query')
return render(request, "query/confirm_multi_change.html",{'new_value': new_status, 'count' : count})
@login_required @login_required
def TaskMultiHold(request, onhold): def TaskMultiHold(request, onhold):
# read the current querylist from the session
# 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)
if request.method == "POST":
for id in query_list_of_ids: for id in query_list_of_ids:
task = Task.objects.get(id=id[0]) task = Task.objects.get(id=id[0])
...@@ -558,6 +563,8 @@ def TaskMultiHold(request, onhold): ...@@ -558,6 +563,8 @@ def TaskMultiHold(request, onhold):
return redirect('/atdb/query') return redirect('/atdb/query')
return render(request, "query/confirm_multi_change.html",{'new_value': onhold, 'count' : count})
# /atdb/get_size?status__in=defined,staged # /atdb/get_size?status__in=defined,staged
class GetSizeView(generics.ListAPIView): class GetSizeView(generics.ListAPIView):
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment