1 files changed, 33 insertions, 17 deletions
diff --git a/yaksh/views.py b/yaksh/views.py
index 526c774..d634e0c 100644
--- a/yaksh/views.py
+++ b/yaksh/views.py
@@ -156,6 +156,7 @@ def user_logout(request):
 def quizlist_user(request, enrolled=None, msg=None):
     """Show All Quizzes that is available to logged-in user."""
     user = request.user
+    courses_data = []
 
     if request.method == "POST":
         course_code = request.POST.get('course_code')
@@ -164,18 +165,30 @@ def quizlist_user(request, enrolled=None, msg=None):
         title = 'Search'
 
     elif enrolled is not None:
-        courses = user.students.all()
+        courses = user.students.all().order_by('-id')
         title = 'Enrolled Courses'
     else:
         courses = Course.objects.filter(
             active=True, is_trial=False
         ).exclude(
            ~Q(requests=user), ~Q(rejected=user), hidden=True
-        )
+        ).order_by('-id')
         title = 'All Courses'
 
+    for course in courses:
+        if user in course.students.all():
+            _percent = course.get_completion_percent(user)
+        else:
+            _percent = None
+        courses_data.append(
+            {
+                'data': course,
+                'completion_percentage': _percent,
+            }
+        )
+
     context = {
-        'user': user, 'courses': courses,
+        'user': user, 'courses': courses_data,
         'title': title, 'msg': msg
     }
 
@@ -523,23 +536,28 @@ def start(request, questionpaper_id=None, attempt_num=None, course_id=None,
     # if any previous attempt
     last_attempt = AnswerPaper.objects.get_user_last_attempt(
         quest_paper, user, course_id)
-    if last_attempt and last_attempt.is_attempt_inprogress():
-        return show_question(
-            request, last_attempt.current_question(), last_attempt,
-            course_id=course_id, module_id=module_id,
-            previous_question=last_attempt.current_question()
-        )
+
+    if last_attempt:
+        if last_attempt.is_attempt_inprogress():
+            return show_question(
+                request, last_attempt.current_question(), last_attempt,
+                course_id=course_id, module_id=module_id,
+                previous_question=last_attempt.current_question()
+            )
+        attempt_number = last_attempt.attempt_number + 1
+    else:
+        attempt_number = 1
+
     # allowed to start
     if not quest_paper.can_attempt_now(user, course_id)[0]:
         msg = quest_paper.can_attempt_now(user, course_id)[1]
         if is_moderator(user):
             return prof_manage(request, msg=msg)
-        return view_module(request, module_id=module_id, course_id=course_id,
-                           msg=msg)
-    if not last_attempt:
-        attempt_number = 1
-    else:
-        attempt_number = last_attempt.attempt_number + 1
+        return complete(
+            request, msg, last_attempt.attempt_number, quest_paper.id,
+            course_id=course_id, module_id=module_id
+        )
+
     if attempt_num is None and not quest_paper.quiz.is_exercise:
         context = {
             'user': user,
@@ -2855,8 +2873,6 @@ def preview_questionpaper(request, questionpaper_id):
     if not is_moderator(user):
         raise Http404('You are not allowed to view this page!')
     paper = QuestionPaper.objects.get(id=questionpaper_id)
-    if not paper.quiz.creator == user:
-        raise Http404('This questionpaper does not belong to you')
     context = {
         'questions': paper._get_questions_for_answerpaper(),
         'paper': paper,