Skip to content
Snippets Groups Projects
Commit 014909dd authored by Andreas Valder's avatar Andreas Valder
Browse files

add support for not released videos to cut progress view

parent 525eb2ac
Branches
No related tags found
No related merge requests found
...@@ -20,7 +20,7 @@ def cutprogress(user=None): ...@@ -20,7 +20,7 @@ def cutprogress(user=None):
course['lectures'] = query('SELECT lectures.title, lectures.time, lectures.id FROM lectures WHERE lectures.course_id= ? AND NOT lectures.deleted AND NOT lectures.norecording ORDER BY lectures.time', course['id']) course['lectures'] = query('SELECT lectures.title, lectures.time, lectures.id FROM lectures WHERE lectures.course_id= ? AND NOT lectures.deleted AND NOT lectures.norecording ORDER BY lectures.time', course['id'])
maxlecturecount = max(len(course['lectures']),maxlecturecount) maxlecturecount = max(len(course['lectures']),maxlecturecount)
for lecture in course['lectures']: for lecture in course['lectures']:
lecture['videos'] = query('SELECT videos.path, formats.description as formatdesc FROM videos JOIN formats ON (videos.video_format = formats.id) WHERE videos.lecture_id = ? AND NOT videos.deleted', lecture['id']) lecture['videos'] = query('SELECT videos.path, formats.description as formatdesc, videos.visible FROM videos JOIN formats ON (videos.video_format = formats.id) WHERE videos.lecture_id = ? AND NOT videos.deleted', lecture['id'])
course['responsible'] = query('''SELECT users.* course['responsible'] = query('''SELECT users.*
FROM responsible FROM responsible
JOIN users ON (responsible.user_id = users.id AND responsible.course_id = ?) JOIN users ON (responsible.user_id = users.id AND responsible.course_id = ?)
......
...@@ -31,9 +31,13 @@ ...@@ -31,9 +31,13 @@
{% if l.time < datetime.now() %} {% if l.time < datetime.now() %}
{% if l.videos|count == 0 %} {% if l.videos|count == 0 %}
<span style="color: red" aria-hidden="true" class="fa fa-times"></span> <span style="color: red" aria-hidden="true" class="fa fa-times"></span>
{% else %}
{% if l.videos|selectattr('visible')|list|count == 0 %}
<span style="color: orange" aria-hidden="true" class="glyphicon glyphicon-ok"></span>
{% else %} {% else %}
<span style="color: green" aria-hidden="true" class="glyphicon glyphicon-ok"></span> <span style="color: green" aria-hidden="true" class="glyphicon glyphicon-ok"></span>
{% endif %} {% endif %}
{% endif %}
{% else %} {% else %}
<span style="color: grey" aria-hidden="true" class="fa fa-times"></span> <span style="color: grey" aria-hidden="true" class="fa fa-times"></span>
{% endif %} {% endif %}
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment