From 66e72f2f471ff5a629befc481550b8bf152f55dd Mon Sep 17 00:00:00 2001
From: Guillaume Pellerin <guillaume.pellerin@ircam.fr>
Date: Wed, 10 Feb 2021 15:09:19 +0100
Subject: [PATCH] simplify records filtering

---
 teleforma/templates/teleforma/inc/media_list.html         | 2 +-
 teleforma/views/core.py                                   | 3 +--
 teleforma/webclass/models.py                              | 8 ++------
 .../webclass/templates/webclass/inc/webclass_list.html    | 8 +++++---
 4 files changed, 9 insertions(+), 12 deletions(-)

diff --git a/teleforma/templates/teleforma/inc/media_list.html b/teleforma/templates/teleforma/inc/media_list.html
index 45fc008e..8b841c9d 100644
--- a/teleforma/templates/teleforma/inc/media_list.html
+++ b/teleforma/templates/teleforma/inc/media_list.html
@@ -66,7 +66,7 @@
           {% endif %}
          {% endif %}
         {% endfor %}
-        {% for record in other_records|from_course_type:type %}
+        {% for record in webclass_records|from_course_type:type %}
             {% include 'webclass/inc/webclass_card.html' %}
         {% endfor %}
     </tbody>
diff --git a/teleforma/views/core.py b/teleforma/views/core.py
index 8229b321..ce49dddd 100644
--- a/teleforma/views/core.py
+++ b/teleforma/views/core.py
@@ -481,8 +481,7 @@ class CourseView(CourseAccessMixin, DetailView):
         context['webclass_slot'] = webclass_slot
 
         try:
-            context['webclass_records'] = WebclassRecord.get_records(context['period'], course, course_type=None)
-            context['other_records'] = WebclassRecord.get_records(context['period'], course).exclude(course_type=None)
+            context['webclass_records'] = WebclassRecord.get_records(context['period'], course)
         except Exception, e:
             print(e)
             context['webclass_error'] = True
diff --git a/teleforma/webclass/models.py b/teleforma/webclass/models.py
index 8ba6006d..eb00d4f9 100644
--- a/teleforma/webclass/models.py
+++ b/teleforma/webclass/models.py
@@ -394,13 +394,9 @@ class WebclassRecord(models.Model):
         return "Enregistrement webclass %d" % self.id
 
     @staticmethod
-    def get_records(period, course, course_type=None):
+    def get_records(period, course):
         record_ids = set()
-        if not course_type:
-            records =  WebclassRecord.objects.filter(period=period, course=course, course_type=course_type)
-        else:
-            records =  WebclassRecord.objects.filter(period=period, course=course).exclude(course_type=None)
-        
+        records =  WebclassRecord.objects.filter(period=period, course=course)
         for record in records:
             record_ids.add(record.record_id)
         if not record_ids:
diff --git a/teleforma/webclass/templates/webclass/inc/webclass_list.html b/teleforma/webclass/templates/webclass/inc/webclass_list.html
index ff22bf3c..1bd2f111 100644
--- a/teleforma/webclass/templates/webclass/inc/webclass_list.html
+++ b/teleforma/webclass/templates/webclass/inc/webclass_list.html
@@ -43,9 +43,11 @@
                 </td>
             </tr>
             {% endif %}
-            {% for record in webclass_records %}
-                {% include 'webclass/inc/webclass_card.html' %}
-            {% endfor %}
+            {% with type == None %}
+                {% for record in webclass_records|from_course_type:type %}
+                    {% include 'webclass/inc/webclass_card.html' %}
+                {% endfor %}
+            {% endwith %}
         </tbody>
     </table>
 </div>
-- 
2.39.5