From e9d8be7cfd031c156da153d59355e49cb7d2071a Mon Sep 17 00:00:00 2001
From: adityacp
Date: Mon, 3 Apr 2017 11:41:13 +0530
Subject: Change courses.html to allow teachers to add/edit Questionpaper

---
 yaksh/templates/yaksh/courses.html | 18 +++++++++++++++---
 1 file changed, 15 insertions(+), 3 deletions(-)

diff --git a/yaksh/templates/yaksh/courses.html b/yaksh/templates/yaksh/courses.html
index 970d488..4d19fb9 100644
--- a/yaksh/templates/yaksh/courses.html
+++ b/yaksh/templates/yaksh/courses.html
@@ -130,19 +130,31 @@
                         </div>
                     </div>
                 </div>
-                <div class="col-md-4">
+                <div>
                     <p><b><a href="{{URL_ROOT}}/exam/manage/searchteacher/{{course.id}}/">Add Teacher</a></b></p>
                 </div>
-                <div class="col-md-4">
+                <div class="col-md-2">
                     <p><b><u>Quiz(zes)</u></b></p>
                     {% if course.get_quizzes %}
                         {% for quiz in course.get_quizzes %}
                             <a href="{{URL_ROOT}}/exam/manage/addquiz/{{course.id}}/{{quiz.id}}/">{{ quiz.description }}</a><br>
-                    {% endfor %}
+                        {% endfor %}
                     {% else %}
                         <p><b>No quiz </b></p>
                     {% endif %}
                 </div>
+                <div class="col-md-4">
+                    <p><b><u>Question Paper(s)</u></b></p>
+                    {% for quiz in course.get_quizzes %}
+                    {% if quiz.questionpaper_set.get %}
+                    <a href="{{URL_ROOT}}/exam/manage/designquestionpaper/{{ quiz.id }}/{{quiz.questionpaper_set.get.id}}/">Question Paper for {{ quiz.description }}</a><br>
+                    {% else %}
+                    <p>No Question Paper
+                    <a href="#" onClick='location.replace("{{URL_ROOT}}/exam/manage/quiz/designquestionpaper/{{ quiz.id }}/");'>Add</a>
+                    </p>
+                    {% endif %}
+                    {% endfor %}
+                </div>
             </div>
             <br/>
             <button class="btn btn-primary pull-right"type="button" onClick='location.replace("{{URL_ROOT}}/exam/manage/addquiz/{{course.id}}/");'>Add New Quiz</button>
-- 
cgit 


From c1bdc56f889e60a246e6fccb450f339b68897395 Mon Sep 17 00:00:00 2001
From: adityacp
Date: Tue, 4 Apr 2017 10:35:05 +0530
Subject: Check if user is teacher or moderator for creating QuestionPaper

---
 yaksh/views.py | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/yaksh/views.py b/yaksh/views.py
index 2adc2c3..247aca4 100644
--- a/yaksh/views.py
+++ b/yaksh/views.py
@@ -661,8 +661,7 @@ def course_detail(request, course_id):
         raise Http404('You are not allowed to view this page')
 
     course = get_object_or_404(Course, pk=course_id)
-    if not course.is_creator(user) and not course.is_teacher(user):
-        raise Http404('This course does not belong to you')
+
 
     return my_render_to_response('yaksh/course_detail.html', {'course': course},
                                 context_instance=ci)
@@ -859,7 +858,9 @@ def design_questionpaper(request, quiz_id, questionpaper_id=None):
 
     if not is_moderator(user):
         raise Http404('You are not allowed to view this page!')
-
+    quiz = Quiz.objects.get(id=quiz_id)
+    if not quiz.course.is_creator(user) and not quiz.course.is_teacher(user):
+        raise Http404('This course does not belong to you')
     filter_form = QuestionFilterForm(user=user)
     questions = None
     marks = None
-- 
cgit 


From 09756c7db9341aace9e9ac25c9078c8cd4bf8399 Mon Sep 17 00:00:00 2001
From: adityacp
Date: Tue, 4 Apr 2017 10:42:22 +0530
Subject: Fix failing test views test

---
 yaksh/views.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/yaksh/views.py b/yaksh/views.py
index 247aca4..661d472 100644
--- a/yaksh/views.py
+++ b/yaksh/views.py
@@ -661,7 +661,8 @@ def course_detail(request, course_id):
         raise Http404('You are not allowed to view this page')
 
     course = get_object_or_404(Course, pk=course_id)
-
+    if not course.is_creator(user) and not course.is_teacher(user):
+        raise Http404('This course does not belong to you')
 
     return my_render_to_response('yaksh/course_detail.html', {'course': course},
                                 context_instance=ci)
-- 
cgit