From d06c8ccae125a81eba25f52f30d7da3c1a2bd907 Mon Sep 17 00:00:00 2001
From: Gertjan van den Burg <gertjanvandenburg@gmail.com>
Date: Tue, 19 Mar 2019 15:55:35 +0000
Subject: Allow task deletion from management panel

---
 app/templates/admin/assign.html | 36 ------------------------------------
 app/templates/admin/index.html  |  2 +-
 app/templates/admin/manage.html | 36 ++++++++++++++++++++++++++++++++++++
 3 files changed, 37 insertions(+), 37 deletions(-)
 delete mode 100644 app/templates/admin/assign.html
 create mode 100644 app/templates/admin/manage.html

(limited to 'app/templates')

diff --git a/app/templates/admin/assign.html b/app/templates/admin/assign.html
deleted file mode 100644
index a2658e6..0000000
--- a/app/templates/admin/assign.html
+++ /dev/null
@@ -1,36 +0,0 @@
-{% extends "base.html" %}
-{% import 'bootstrap/wtf.html' as wtf %}
-
-{% block app_content %}
-<h1>Assign Task</h1>
-<div class="row">
-	<div class="col-md-4">
-		{{ wtf.quick_form(form) }}
-	</div>
-</div>
-<article class="overview">
-	<table class="table table-striped">
-		<thead class="thead-dark">
-			<th scope="col">Task ID</th>
-			<th scope="col">User ID</th>
-			<th scope="col">Username</th>
-			<th scope="col">Dataset ID</th>
-			<th scope="col">Dataset Name</th>
-			<th scope="col">Status</th>
-			<th scope="col">Completed On</th>
-		</thead>
-		{% for task in tasks %}
-		<tr>
-			<th scope="row">{{ task.id }}</th>
-			<td>{{ task.user.id }}</td>
-			<td>{{ task.user.username }}</td>
-			<td>{{ task.dataset.id }}</td>
-			<td>{{ task.dataset.name }}</td>
-			<td>{% if task.done %}Completed{% else %}Pending{% endif %}</td>
-			<td>{{ task.completed_on }}</td>
-		</tr>
-		{% endfor %}
-		</tr>
-	</table>
-</article>
-{% endblock %}
diff --git a/app/templates/admin/index.html b/app/templates/admin/index.html
index 0a1bd5e..212ead0 100644
--- a/app/templates/admin/index.html
+++ b/app/templates/admin/index.html
@@ -7,7 +7,7 @@
 		<a href="/admin/add">Add dataset</a>
 	</li>
 	<li>
-		<a href="/admin/assign">View and assign tasks</a>
+		<a href="/admin/manage">View and manage tasks</a>
 	</li>
 </ul>
 {% endblock %}
diff --git a/app/templates/admin/manage.html b/app/templates/admin/manage.html
new file mode 100644
index 0000000..aaff8ff
--- /dev/null
+++ b/app/templates/admin/manage.html
@@ -0,0 +1,36 @@
+{% extends "base.html" %}
+{% import 'bootstrap/wtf.html' as wtf %}
+
+{% block app_content %}
+<h1>Assign Task</h1>
+<div class="row">
+	<div class="col-md-4">
+		{{ wtf.quick_form(form, button_map={'assign': 'primary', 'delete': 'danger'}) }}
+	</div>
+</div>
+<article class="overview">
+	<table class="table table-striped">
+		<thead class="thead-dark">
+			<th scope="col">Task ID</th>
+			<th scope="col">User ID</th>
+			<th scope="col">Username</th>
+			<th scope="col">Dataset ID</th>
+			<th scope="col">Dataset Name</th>
+			<th scope="col">Status</th>
+			<th scope="col">Completed On</th>
+		</thead>
+		{% for task in tasks %}
+		<tr>
+			<th scope="row">{{ task.id }}</th>
+			<td>{{ task.user.id }}</td>
+			<td>{{ task.user.username }}</td>
+			<td>{{ task.dataset.id }}</td>
+			<td>{{ task.dataset.name }}</td>
+			<td>{% if task.done %}Completed{% else %}Pending{% endif %}</td>
+			<td>{{ task.completed_on }}</td>
+		</tr>
+		{% endfor %}
+		</tr>
+	</table>
+</article>
+{% endblock %}
-- 
cgit v1.2.3