From eefab03a101ecb12da882e5b58494c298d1e6375 Mon Sep 17 00:00:00 2001
From: Julian Rother <julianr@fsmpi.rwth-aachen.de>
Date: Fri, 26 May 2017 12:11:10 +0200
Subject: [PATCH] Indicate currently live stream in upcomming panel, closes
#302
---
server.py | 3 ++-
templates/index.html | 2 +-
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/server.py b/server.py
index f14e2d9..e5f4441 100644
--- a/server.py
+++ b/server.py
@@ -337,9 +337,10 @@ def index():
start = date.today()
end = start + timedelta(days=7)
upcomming = query('''
- SELECT lectures.*, "course" AS sep, courses.*
+ SELECT lectures.*, streams.active AS nowlive, "course" AS sep, courses.*
FROM lectures
JOIN courses ON (lectures.course_id = courses.id)
+ LEFT JOIN streams ON lectures.id = streams.lecture_id
WHERE (time > ?) AND (time < ?) AND (? OR (lectures.visible AND courses.visible AND courses.listed)) AND NOT lectures.norecording
ORDER BY time ASC LIMIT 30''', start, end, ismod())
for i in upcomming:
diff --git a/templates/index.html b/templates/index.html
index 70b72bf..60e2826 100644
--- a/templates/index.html
+++ b/templates/index.html
@@ -111,7 +111,7 @@
<ul class="list-group" style="margin: 0px;">
{% for i in g.list %}
<li class="list-group-item list-group-item-condensed">
- {{i.time|time}} <a href="{{url_for('course', handle=i.course.handle)}}">{{i.course.title}}</a>: <a href="{{url_for('course', handle=i.course.handle)}}#lecture-{{i.id}}">{{i.title}}</a> {{livelabel(i.live, False)}}
+ {{i.time|time}} <a href="{{url_for('course', handle=i.course.handle)}}">{{i.course.title}}</a>: <a href="{{url_for('course', handle=i.course.handle)}}#lecture-{{i.id}}">{{i.title}}</a> {{livelabel(i.live, i.nowlive)}}
</li>
{% endfor %}
</ul>
--
GitLab