From 11af9c35c1b4a7ffe5abb46d324120769a0b5e1d Mon Sep 17 00:00:00 2001
From: Andreas Valder <andreasv@fsmpi.rwth-aachen.de>
Date: Wed, 31 Aug 2016 09:10:31 +0200
Subject: [PATCH] renmed video endpoint to course endpoint, courseid can now be
an int
---
server.py | 12 +++++++++---
templates/schedule.html | 2 +-
2 files changed, 10 insertions(+), 4 deletions(-)
diff --git a/server.py b/server.py
index 4b67b77..6dbfcd9 100755
--- a/server.py
+++ b/server.py
@@ -64,7 +64,7 @@ def index():
LIMIT 6
''', ismod()))
-@app.route('/videos')
+@app.route('/course')
@register_navbar('Videos', icon='film')
def videos():
courses = query('SELECT * FROM courses WHERE (? OR (visible AND listed))', ismod())
@@ -111,7 +111,7 @@ def search():
@app.route('/course/<id>')
def course(id):
- courses = query('SELECT * FROM courses WHERE handle = ? AND (? OR visible)', id, ismod())
+ courses = query('SELECT * FROM courses WHERE ((handle = ?) or id = ?) AND (? OR visible)', id, id, ismod())
if not courses:
flash('Diese Veranstaltung existiert nicht!')
return app.view_functions['videos'](), 404
@@ -205,7 +205,13 @@ def schedule():
# date and times are burning in sqlite
s = datetime.combine(i['date'],time())
e = datetime.combine(i['date'],time(23,59))
- i['lectures'] = query ('SELECT lectures.*,courses.* FROM lectures JOIN courses ON (lectures.course_id = courses.id) WHERE (time < ?) AND (time > ?) ORDER BY time ASC',e,s);
+ i['lectures'] = query ('''
+ SELECT lectures.*,courses.short
+ FROM lectures
+ JOIN courses ON (lectures.course_id = courses.id)
+ WHERE (time < ?) AND (time > ?)
+ ORDER BY time ASC'''
+ ,e,s);
# sweepline to find out how many lectures overlap
maxcol=0;
curcol=0;
diff --git a/templates/schedule.html b/templates/schedule.html
index 21c7b55..f4f64d2 100644
--- a/templates/schedule.html
+++ b/templates/schedule.html
@@ -17,7 +17,7 @@
{% for l in d.lectures|selectattr('schedule_col','equalto',i) if (((l.time_asdate.time() > t) and (l.time_asdate.time() < times[time_loop.index+1])) != (l.time_asdate.time() == t ) ) %}
<td rowspan="{{l.duration / 15}}" style="background: lightgrey;">
<p class="small">
- <strong><a href="{{url_for('course', id=l['handle'])}}#{{l.id}}">{{l.short}}</a></strong><br>
+ <strong><a href="{{url_for('course', id=l['course_id'])}}#{{l.id}}">{{l.short}}</a></strong><br>
{{l.time_asdate.strftime("%H:%M")}} - {{l.end_asdate.strftime("%H:%M")}}<br>
{{l.place}}</p>
</td>
--
GitLab