simplify records filtering

diff --git a/teleforma/templates/teleforma/inc/media_list.html b/teleforma/templates/teleforma/inc/media_list.html
index 45fc008ee7ccc9e79c1f79de2be66fa2db416e88..8b841c9dcaed987ad17cf25ed70c165fdf97dd44 100644 (file)
--- 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 8229b321b2f1cbe71e7024cb85012e89310aa431..ce49dddd3b11499198477a6834964b2daa24f86b 100644 (file)
--- 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 8ba6006d05cf551277a8ec7574e161f904b9b827..eb00d4f92b06584229eca50391c83edf1ce54a2c 100644 (file)
--- 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 ff22bf3c714c720f8abdcdf9fd3761ab15f48c55..1bd2f111835e9f69121515f11d8855198c3b653d 100644 (file)
--- 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>