made jobs filterable and pageed

jobs.py

@@ -7,9 +7,31 @@ import random
 @register_navbar('Jobs', iconlib='fa',  icon='suitcase')
 @mod_required
 def jobs_overview():
+	if 'page' in request.args:
+		page = max(0, int(request.args['page']))
+	else:
+		page = 0
+	if 'pagesize' in request.args:
+		pagesize = min(500, int(request.args['pagesize']))
+	else:
+		pagesize = 50
+
 	worker = query('SELECT * FROM worker ORDER BY last_ping DESC')
-	jobs = query('SELECT * FROM jobs WHERE state != "finished"')
-	return render_template('jobs_overview.html',worker=worker,jobs=jobs)
+
+	# get filter options
+	filter_values = {
+			'type': query('SELECT distinct type FROM jobs'),
+			'state': query('SELECT distinct state FROM jobs'),
+			'worker': query('SELECT distinct worker FROM jobs')}
+	
+	# parse filter
+	filter = {
+			'type': request.args.get('type','%'),
+			'state': request.args.get('state','failed'),
+			'worker': request.args.get('worker','%') }
+
+	jobs = query('SELECT * FROM jobs WHERE (state != "finished") AND (type like ?) AND (worker like ? OR (worker IS NULL AND ? = "%")) AND (state like ?) ORDER BY `time_created` DESC LIMIT ? OFFSET ?', filter['type'], filter['worker'], filter['worker'], filter['state'], pagesize, page*pagesize)
+	return render_template('jobs_overview.html',worker=worker,jobs=jobs, filter_values=filter_values, filter=filter, page=page, pagesize=pagesize)
 
 def jobs_api_token_required(func):
 	@wraps(func)

server.py

@@ -244,6 +244,14 @@ def dump_error_page():
 def equalto(a,b):
 	return a == b
 
+@app.template_filter(name='filterdict')
+def jinja2_filterdict(value, attrdel):
+	v = dict(value)
+	for a in attrdel:
+		if a in v:
+			del v[a]
+	return dict(v)
+
 @app.template_filter(name='semester')
 def human_semester(s, long=False):
 	if not s or s == 'zeitlos' or len(s) != 6:

templates/jobs_overview.html

@@ -40,6 +40,40 @@
 		</div>
 		<div class="panel-collapse collapse in">
 			<div class="panel-body">
+				<div class="row">
+					<form>
+						<a href="{{url_for('jobs_overview', page=page-1, **(request.args|filterdict(['page','pagesize'])) ) }}" class="pull-left btn btn-default col-xs-1">{{ "<<" }}</a>
+						<div class="form-group col-xs-3">
+							<label for="type">Type</label>
+							<input list="job_type" name="type" value="{{ filter.type }}">
+							<datalist id="job_type">
+								{% for o in filter_values.type %}
+								<option value="{{ o.type }}">
+								{% endfor %}
+							</datalist>
+						</div>
+						<div class="form-group col-xs-3">
+							<label for="worker">Worker</label>
+							<input list="job_worker" name="worker" value="{{ filter.worker }}">
+							<datalist id="job_worker">
+								{% for o in filter_values.worker %}
+								<option value="{{ o.worker }}">
+								{% endfor %}
+							</datalist>
+						</div>
+						<div class="form-group col-xs-3">
+							<label for="state">State</label>
+							<input list="job_state" name="state" value="{{ filter.state }}">
+							<datalist id="job_state">
+								{% for o in filter_values.state %}
+								<option value="{{ o.state }}">
+								{% endfor %}
+							</datalist>
+						</div>
+						<button type="submit" class="btn btn-primary col-xs-1">Filter</button>
+						<a href="{{url_for('jobs_overview', page=page+1, **(request.args|filterdict(['page','pagesize'])) ) }}" class="pull-right btn btn-default col-xs-1">{{ ">>" }}</a>
+					</form>
+				</div>
 				<table class="table">
 				<tr>
 					<th>ID</th>