From 014909dda63e2e4fd1e5b13caea282f00b03ba53 Mon Sep 17 00:00:00 2001
From: Andreas <andreasv@fsmpi.rwth-aachen.de>
Date: Thu, 25 Jan 2018 18:02:34 +0100
Subject: [PATCH] add support for not released videos to cut progress view
---
cutprogress.py | 2 +-
templates/cutprogress.html | 6 +++++-
2 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/cutprogress.py b/cutprogress.py
index a46b6c9..88a4caf 100644
--- a/cutprogress.py
+++ b/cutprogress.py
@@ -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'])
maxlecturecount = max(len(course['lectures']),maxlecturecount)
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.*
FROM responsible
JOIN users ON (responsible.user_id = users.id AND responsible.course_id = ?)
diff --git a/templates/cutprogress.html b/templates/cutprogress.html
index f04178f..7b40642 100644
--- a/templates/cutprogress.html
+++ b/templates/cutprogress.html
@@ -32,7 +32,11 @@
{% if l.videos|count == 0 %}
<span style="color: red" aria-hidden="true" class="fa fa-times"></span>
{% else %}
- <span style="color: green" aria-hidden="true" class="glyphicon glyphicon-ok"></span>
+ {% if l.videos|selectattr('visible')|list|count == 0 %}
+ <span style="color: orange" aria-hidden="true" class="glyphicon glyphicon-ok"></span>
+ {% else %}
+ <span style="color: green" aria-hidden="true" class="glyphicon glyphicon-ok"></span>
+ {% endif %}
{% endif %}
{% else %}
<span style="color: grey" aria-hidden="true" class="fa fa-times"></span>
--
GitLab