From e6cce5b0ca4d616b7ff55c66f5d94376974fcc4c Mon Sep 17 00:00:00 2001
From: adityacp
Date: Tue, 31 Mar 2020 15:51:15 +0530
Subject: Change course_modules.html and views.py

- Get distinct courses in student dashboard
- Add condition to check if question paper exists for a quiz in course modules
---
 yaksh/templates/yaksh/course_modules.html |  8 +++++---
 yaksh/views.py                            | 15 +++++++--------
 2 files changed, 12 insertions(+), 11 deletions(-)

(limited to 'yaksh')

diff --git a/yaksh/templates/yaksh/course_modules.html b/yaksh/templates/yaksh/course_modules.html
index 214f8c7..dd7b68d 100644
--- a/yaksh/templates/yaksh/course_modules.html
+++ b/yaksh/templates/yaksh/course_modules.html
@@ -128,9 +128,11 @@
                                                 View
                                             </a>
                                         {% else %}
-                                            <a href="{% url 'yaksh:start_quiz' unit.quiz.questionpaper_set.get.id module.id course.id %}" class="btn btn-outline-info">
-                                                View
-                                            </a>
+                                            {% if unit.quiz.questionpaper_set.get %}
+                                                <a href="{% url 'yaksh:start_quiz' unit.quiz.questionpaper_set.get.id module.id course.id %}" class="btn btn-outline-info">
+                                                    View
+                                                </a>
+                                            {% endif %}
                                         {% endif %}
                                     </td>
                                     <td>
diff --git a/yaksh/views.py b/yaksh/views.py
index 2cd09ac..c72c4ff 100644
--- a/yaksh/views.py
+++ b/yaksh/views.py
@@ -176,15 +176,14 @@ def quizlist_user(request, enrolled=None, msg=None):
         courses = hidden_courses
         title = 'Search Results'
     else:
-        courses = list(Course.objects.filter(
-            active=True, is_trial=False,
+        enrolled_courses = user.students.filter(is_trial=False).order_by('-id')
+        remaining_courses = list(Course.objects.filter(
+            active=True, is_trial=False, hidden=False
         ).exclude(
-           ~Q(requests=user), ~Q(rejected=user), hidden=True
-        ).order_by('-id'))
-        enrolled_course = list(
-            user.students.filter(is_trial=False).order_by('-id')
-        )
-        courses.extend(enrolled_course)
+            id__in=enrolled_courses.values_list("id", flat=True)
+            ).order_by('-id'))
+        courses = list(enrolled_courses)
+        courses.extend(remaining_courses)
         title = 'All Courses'
 
     for course in courses:
-- 
cgit