]> git.parisson.com Git - teleforma.git/commitdiff
Webclass records can now be added manually (without metadata)
authorYoan Le Clanche <yoanl@pilotsystems.net>
Mon, 6 Jul 2020 11:34:53 +0000 (13:34 +0200)
committerYoan Le Clanche <yoanl@pilotsystems.net>
Mon, 6 Jul 2020 11:34:53 +0000 (13:34 +0200)
teleforma/webclass/models.py
teleforma/webclass/templates/webclass/inc/webclass_list.html

index c3f059562121038baabc05869c7260f7273bbe24..97f4d79e27b16740f4a9aeeffc23024198f8a203 100644 (file)
@@ -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
index 3c600e3cdce8077046d48b3103766dc1ac6bba22..744dbfd56c5bf4fd19bf5c94f3d19882c6e336b9 100644 (file)
                 <td {% if forloop.first %}class="border-top" {% endif %} style="padding-left: 1em;">
                     <div>
                         <dl class="listing" style="font-size: 1.2em;">
-                            <dt>{% trans "Professor" %}</dt>
-                            <dd><a href="{% url telemeta-profile-detail record.slot.professor.user.username %}"
-                                    target="_blank">{{ record.slot.professor }}</a></dd>
+                            {% if record.slot %}
+                                <dt>{% trans "Professor" %}</dt>
+                                <dd><a href="{% url telemeta-profile-detail record.slot.professor.user.username %}"
+                                        target="_blank">{{ record.slot.professor }}</a></dd>
+                            {% endif %}
                             <dt>{% trans "Begin" %}</dt>
                             <dd>{{ record.start_date }}</dd>
                         </dl>