From e1718e606dbbaf575871b3e545bf27f6dc8ad5de Mon Sep 17 00:00:00 2001 From: Yoan Le Clanche Date: Mon, 6 Jul 2020 13:34:53 +0200 Subject: [PATCH] Webclass records can now be added manually (without metadata) --- teleforma/webclass/models.py | 13 ++++++++----- .../templates/webclass/inc/webclass_list.html | 8 +++++--- 2 files changed, 13 insertions(+), 8 deletions(-) diff --git a/teleforma/webclass/models.py b/teleforma/webclass/models.py index c3f05956..97f4d79e 100644 --- a/teleforma/webclass/models.py +++ b/teleforma/webclass/models.py @@ -51,8 +51,7 @@ def get_records_from_bbb(**kwargs): url = url.decode() else: continue - if not recording['metadata'].get('periodid'): - continue + start = int(recording['startTime'].decode()[:-3]) end = int(recording['endTime'].decode()[:-3]) data = { @@ -65,10 +64,14 @@ def get_records_from_bbb(**kwargs): 'url': url, 'preview': recording.get('playback', {}).get('format', {}).get('preview', {}).get('images', {}).get('image', [])[0].decode(), 'state': recording['state'].decode(), - 'period_id': int(recording['metadata'].get('periodid').decode()), - 'course_id': int(recording['metadata'].get('courseid').decode()), - 'slot': WebclassSlot.objects.get(pk=int(recording['metadata'].get('slotid').decode())) } + if recording['metadata'].get('periodid'): + data.update({ + 'period_id': int(recording['metadata'].get('periodid').decode()), + 'course_id': int(recording['metadata'].get('courseid').decode()), + 'slot': WebclassSlot.objects.get(pk=int(recording['metadata'].get('slotid').decode())) + }) + data['duration'] = data['end'] - data['start'] records.append(data) return records diff --git a/teleforma/webclass/templates/webclass/inc/webclass_list.html b/teleforma/webclass/templates/webclass/inc/webclass_list.html index 3c600e3c..744dbfd5 100644 --- a/teleforma/webclass/templates/webclass/inc/webclass_list.html +++ b/teleforma/webclass/templates/webclass/inc/webclass_list.html @@ -54,9 +54,11 @@
-
{% trans "Professor" %}
-
{{ record.slot.professor }}
+ {% if record.slot %} +
{% trans "Professor" %}
+
{{ record.slot.professor }}
+ {% endif %}
{% trans "Begin" %}
{{ record.start_date }}
-- 2.39.5