Resolve conflicts and update to latest changes

10 files changed, 183 insertions, 106 deletions

diff --git a/yaksh/templates/yaksh/complete.html b/yaksh/templates/yaksh/complete.html
index 3d6cadc..0881bfe 100644
--- a/yaksh/templates/yaksh/complete.html
+++ b/yaksh/templates/yaksh/complete.html
@@ -33,9 +33,6 @@ width="80" alt="YAKSH"></img>{% endblock %}
 	<center><h3>{{message}}</h3></center>
     <center>
     <br>
-    {% if not module_id %}
-        <br><center><h4>You may now close the browser.</h4></center><br>
-    {% endif %}
     {% if module_id and not user == "moderator" %}
         {% if first_unit %}
             <a href="{{URL_ROOT}}/exam/next_unit/{{course_id}}/{{module_id}}/{{learning_unit.id}}/1" class="btn btn-info" id="Next"> Next
diff --git a/yaksh/templates/yaksh/course_modules.html b/yaksh/templates/yaksh/course_modules.html
index eba7409..6c93e97 100644
--- a/yaksh/templates/yaksh/course_modules.html
+++ b/yaksh/templates/yaksh/course_modules.html
@@ -19,102 +19,100 @@
 {% endif %}
 <b>Grade: {% if grade %} {{ grade }} {% else %} Will be available once the course is complete {% endif %}</b>
 {% if learning_modules %}
-    {% for module in learning_modules %}
-        <div class="row well">
-            <table class="table">
-                <tr>
-                <td>
-                <a href="{{URL_ROOT}}/exam/quizzes/view_module/{{module.id}}/{{course.id}}">
-                {{module.name|title}}</a>
-                </td>
-                <td>
-                <span class="glyphicon glyphicon-chevron-down" id="learning_units{{module.id}}{{course.id}}_down">
-                </span>
-                <span class="glyphicon glyphicon-chevron-up" id="learning_units{{module.id}}{{course.id}}_up" style="display: none;"></span>
-                <a data-toggle="collapse" data-target="#learning_units{{module.id}}{{course.id}}" onclick="view_unit('learning_units{{module.id}}{{course.id}}');">
-                View Lessons/Quizzes/Exercises</a>
-                </td>
-                <td>
-                {% get_module_status user module course as module_status %}
-                Status:
-                {% if module_status == "completed" %}
-                <span class="label label-success">
-                    {{module_status|title}}
-                </span>
-                {% elif module_status == "inprogress" %}
-                <span class="label label-info">
-                    {{module_status|title}}
-                </span>
-                {% else %}
-                <span class="label label-warning">
-                    {{module_status|title}}
-                </span>
-                {% endif %}
-                </td>
-                </tr>
-            </table>
-        </div>
-        <div id="learning_units{{module.id}}{{course.id}}" class="collapse">
-        <table class="table">
-            <tr>
-            <th>Lesson/Quiz/Exercise</th>
-            <th>Status</th>
-            <th>Type</th>
-            <th>View AnswerPaper</th>
-            </tr>
-            {% for unit in module.get_learning_units %}
+    <table class="table">
+        {% for module in learning_modules %}
             <tr>
-            <ul class="inputs-list">
                 <td>
-                {% if unit.type == "quiz" %}
-                    {{unit.quiz.description}}
-                {% else %}
-                    {{unit.lesson.name}}
-                {% endif %}
+                    <a href="{{URL_ROOT}}/exam/quizzes/view_module/{{module.id}}/{{course.id}}">
+                    {{module.name|title}}</a>
                 </td>
                 <td>
-                {% get_unit_status course module unit user as status %}
-                {% if status == "completed" %}
-                    <span class="label label-success">{{status|title}}
+                    <span class="glyphicon glyphicon-chevron-down" id="learning_units{{module.id}}{{course.id}}_down">
                     </span>
-                {% elif status == "inprogress" %}
-                    <span class="label label-info">{{status|title}}
+                    <span class="glyphicon glyphicon-chevron-up" id="learning_units{{module.id}}{{course.id}}_up" style="display: none;">
                     </span>
-                {% else %}
-                    <span class="label label-warning">{{status|title}}
-                    </span>
-                {% endif %}
-                </td>
-                <td>
-                {% if unit.type == "quiz" %}
-                    {% if unit.quiz.is_exercise %}
-                        Exercise
-                    {% else %}
-                        Quiz
-                    {% endif %}
-                {% else %}
-                    Lesson
-                {% endif %}
+                    <a data-toggle="collapse" data-target="#learning_units{{module.id}}{{course.id}}" onclick="view_unit('learning_units{{module.id}}{{course.id}}');">
+                    View Lessons/Quizzes/Exercises</a>
+                    <div id="learning_units{{module.id}}{{course.id}}" class="collapse">
+                        <table class="table">
+                        <tr>
+                            <th>Lesson/Quiz/Exercise</th>
+                            <th>Status</th>
+                            <th>Type</th>
+                            <th>View AnswerPaper</th>
+                        </tr>
+                        {% for unit in module.get_learning_units %}
+                        <tr>
+                            <td>
+                            {% if unit.type == "quiz" %}
+                                {{unit.quiz.description}}
+                            {% else %}
+                                {{unit.lesson.name}}
+                            {% endif %}
+                            </td>
+                            <td>
+                            {% get_unit_status course module unit user as status %}
+                            {% if status == "completed" %}
+                                <span class="label label-success">{{status|title}}
+                                </span>
+                            {% elif status == "inprogress" %}
+                                <span class="label label-info">{{status|title}}
+                                </span>
+                            {% else %}
+                                <span class="label label-warning">{{status|title}}
+                                </span>
+                            {% endif %}
+                            </td>
+                            <td>
+                            {% if unit.type == "quiz" %}
+                                {% if unit.quiz.is_exercise %}
+                                    Exercise
+                                {% else %}
+                                    Quiz
+                                {% endif %}
+                            {% else %}
+                                Lesson
+                            {% endif %}
+                            </td>
+                            <td>
+                            {% if unit.type == "quiz" %}
+                                {% if unit.quiz.view_answerpaper %}
+                                    <a href="{{ URL_ROOT }}/exam/view_answerpaper/{{ unit.quiz.questionpaper_set.get.id }}/{{course.id}}">
+                                    <i class="fa fa-eye" aria-hidden="true"></i> Can View </a>
+                                {% else %}
+                                    <a>
+                                    <i class="fa fa-eye-slash" aria-hidden="true">
+                                    </i> Cannot view now </a>
+                                {% endif %}
+                            {% else %}
+                                ------
+                            {% endif %}
+                            </td>
+                        </tr>
+                        {% endfor %}
+                        </table>
+                    </div>
                 </td>
                 <td>
-                {% if unit.type == "quiz" %}
-                    {% if unit.quiz.view_answerpaper %}
-                        <a href="{{ URL_ROOT }}/exam/view_answerpaper/{{ unit.quiz.questionpaper_set.get.id }}/{{course.id}}"><i class="fa fa-eye" aria-hidden="true"></i> Can View </a>
+                    {% get_module_status user module course as module_status %}
+                    Status:
+                    {% if module_status == "completed" %}
+                    <span class="label label-success">
+                        {{module_status|title}}
+                    </span>
+                    {% elif module_status == "inprogress" %}
+                    <span class="label label-info">
+                        {{module_status|title}}
+                    </span>
                     {% else %}
-                        <a>
-                        <i class="fa fa-eye-slash" aria-hidden="true">
-                        </i> Cannot view now </a>
+                    <span class="label label-warning">
+                        {{module_status|title}}
+                    </span>
                     {% endif %}
-                {% else %}
-                    ------
-                {% endif %}
                 </td>
-            </ul>
             </tr>
-            {% endfor %}
-        </table>
-        </div>
-    {% endfor %}
+        {% endfor %}
+    </table>
 {% else %}
     <h3> No lectures found </h3>
 {% endif %}
diff --git a/yaksh/templates/yaksh/courses.html b/yaksh/templates/yaksh/courses.html
index 811aa0f..ba09c6d 100644
--- a/yaksh/templates/yaksh/courses.html
+++ b/yaksh/templates/yaksh/courses.html
@@ -4,6 +4,7 @@
 {% block script %}
 <script>
     $(document).ready(function(){
+        $('[data-toggle="tooltip"]').tooltip();
         $("#created_courses").toggle();
         $("#link_created_courses").click(function() {
             if ($("#allotted_courses").is(":visible")){
@@ -24,6 +25,14 @@
     });
 </script>
 {% endblock %}
+{% block css %}
+<style>
+    .test + .tooltip.top > .tooltip-inner {
+      padding: 15px;
+      font-size: 12px;
+    }
+</style>
+{% endblock %}
 {% block content %}
 <div class="row">
     <div class="col-sm-3 col-md-2 sidebar">
@@ -103,7 +112,8 @@
         <br><br>
         <ul>
             <li>
-                <a href="{{URL_ROOT}}/exam/manage/courses/designcourse/{{course.id}}/">Design Course
+                <a href="{{URL_ROOT}}/exam/manage/courses/designcourse/{{course.id}}/" data-toggle="tooltip" title="Add/Remove/Change course modules" data-placement="top">
+                    Design Course
                 </a>
             </li>
             <br>
@@ -127,7 +137,7 @@
             </li>
             <br>
             <li>
-                <a href="{{URL_ROOT}}/exam/manage/duplicate_course/{{ course.id }}/">
+                <a class="test" href="{{URL_ROOT}}/exam/manage/duplicate_course/{{ course.id }}/" data-toggle="tooltip" title="Creates Copy of selected Course as well as its Modules, Lessons/Quizzes" data-placement="top">
                 Clone Course</a>
             </li>
         </ul>
@@ -263,7 +273,7 @@
             </li>
             <br>
             <li>
-                <a href="{{URL_ROOT}}/exam/manage/duplicate_course/{{ course.id }}/">
+                <a class="test" href="{{URL_ROOT}}/exam/manage/duplicate_course/{{ course.id }}/" data-toggle="tooltip" title="Creates Copy of selected Course as well as its Modules, Lessons/Quizzes" data-placement="top">
                 Clone Course</a>
             </li>
         </ul>
@@ -362,6 +372,9 @@
             {% 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>
+                <a href="{{URL_ROOT}}/exam/manage/preview_questionpaper/{{quiz.questionpaper_set.get.id}}" class="btn btn-primary active btn-xs" target="_blank">
+                        View
+                </a>
                 <br>
             {% else %}
                 <p>No Question Paper 
diff --git a/yaksh/templates/yaksh/design_course_session.html b/yaksh/templates/yaksh/design_course_session.html
index ee530e0..6542e3c 100644
--- a/yaksh/templates/yaksh/design_course_session.html
+++ b/yaksh/templates/yaksh/design_course_session.html
@@ -23,7 +23,7 @@
         <div class="row">
             <div class="col-md-8 col-md-offset-2 available-list">
                 <div id="fixed-available-wrapper">
-                    <p><u><b>Available Lessons and quizzes: (Add Lessons and Quizzes)</b></u></p>
+                    <p><u><b>Available Modules:</b></u></p>
                     <div id="fixed-available">
                         <table id="course-details" class="table table-bordered">
                         <tr>
@@ -64,7 +64,7 @@
             </div>
             <div class="col-md-8 col-md-offset-2">
                 <div id="fixed-added-wrapper">
-                    <p><u><b>Choosen Lessons and quizzes:</b></u></p>
+                    <p><u><b>Choosen Modules:</b></u></p>
                     <div id="fixed-added">
                         <table id="course-details" class="table table-bordered">
                         <tr>
diff --git a/yaksh/templates/yaksh/design_questionpaper.html b/yaksh/templates/yaksh/design_questionpaper.html
index 1656e2b..d982d27 100644
--- a/yaksh/templates/yaksh/design_questionpaper.html
+++ b/yaksh/templates/yaksh/design_questionpaper.html
@@ -192,10 +192,14 @@ select
 
     <div class="tab-pane" id="finish">
         <center>
-            <h5>Almost finished creating your question paper</h5>
+            <h5><u>Almost finished creating your question paper</u></h5>
             <label style="float: none;">
                 {{ qpaper_form.shuffle_questions }}
-                <span>Auto shuffle.</span>
+                <span>Shuffle questions' order for each student</span>
+            </label> <br><br>
+            <label style="float: none;">
+                {{ qpaper_form.shuffle_testcases }}
+                <span>Shuffle MCQ/MCC options for each student</span>
             </label> <br><br>
             <input class ="btn primary large" type="submit" name="save" id="save" value="Save question paper">
             <br>
diff --git a/yaksh/templates/yaksh/preview_questionpaper.html b/yaksh/templates/yaksh/preview_questionpaper.html
new file mode 100644
index 0000000..123218f
--- /dev/null
+++ b/yaksh/templates/yaksh/preview_questionpaper.html
@@ -0,0 +1,42 @@
+{% extends "base.html" %}
+
+{% block pagetitle %} Quiz: {{ paper.quiz.description }} {% endblock pagetitle %}
+
+{% block content %}
+<div class="well">
+	<div class="col-md-12">
+		<div class="col-md-6">Maximum Mark(s): {{ paper.total_marks }}</div>
+		<div class="col-md-6"><span class="pull-right">Total Time: {{ paper.quiz.duration }} minutes</span></div>
+	</div>
+</div>
+<div class="panel panel-default">
+	<div class="panel-heading">Instructions</div>
+	<div class="panel-body" id="instructions">
+		{{ paper.quiz.instructions|safe }}
+	</div>
+</div>
+{% for question in questions %}
+    <div class="panel panel-info">
+        <div class="panel-heading">
+            <strong> {{forloop.counter}}. {{ question.summary }} 
+            <span class="marks pull-right"> Mark(s): {{ question.points }} </span>
+            </strong>
+        </div>
+        <div class="panel-body">
+            <h5><u>Question:</u></h5> <strong>{{ question.description|safe }}</strong>
+            <br/><b>Answer:</b><br/>
+            {% if question.type == "code" %}
+                <div class="well">{{ question.snippet }}<br/></div>
+            {% endif %}
+            {% if question.type == "mcq" or question.type == "mcc" %}
+                <h5> <u>Choices:</u></h5>
+                {% for testcase in question.get_test_cases %}
+                <br/><strong>
+                {{ forloop.counter }}. {{ testcase.options|safe }}</strong>
+                {% endfor %}
+            {% endif %}
+            
+        </div>
+    </div>
+{% endfor %}
+{% endblock %}
diff --git a/yaksh/templates/yaksh/quizzes_user.html b/yaksh/templates/yaksh/quizzes_user.html
index cf08752..49f8d2d 100644
--- a/yaksh/templates/yaksh/quizzes_user.html
+++ b/yaksh/templates/yaksh/quizzes_user.html
@@ -39,25 +39,44 @@ No Courses to display
                 </b></h4>
             </div>
             <div class="col-md-4">
-                {% if not course.active %}
-                    <span class="label label-danger">Closed</span>
-                {% endif %}
                 {% if user in course.requests.all %} <span class="label label-warning">Request Pending </span>
                 {% elif user in course.rejected.all %}<span class="label label-danger">Request Rejected</span>
                 {% elif user in course.students.all %}<span class="label label-info">Enrolled</span>
                 {% else %}
-                    {% if course.is_active_enrollment %}
-                        {% if course.is_self_enroll %}
-                            <a class="btn btn-success" href="{{ URL_ROOT }}/exam/self_enroll/{{ course.id }}">Enroll</a>
+                    {% if course.active %}
+                        {% if course.is_active_enrollment %}
+                            {% if course.is_self_enroll %}
+                                <a class="btn btn-success" href="{{ URL_ROOT }}/exam/self_enroll/{{ course.id }}">Enroll</a>
+                            {% else %}
+                                <a class="btn btn-success" href="{{ URL_ROOT }}/exam/enroll_request/{{ course.id }}">Enroll</a>
+                            {% endif %}
                         {% else %}
-                            <a class="btn btn-success" href="{{ URL_ROOT }}/exam/enroll_request/{{ course.id }}">Enroll</a>
+                            <span class="label label-danger" style="font-size: 15px">
+                                Enrollment Closed
+                            </span>
                         {% endif %}
                     {% else %}
-                        <span class="label label-danger">Enrollment Closed</span>
+                        <span class="label label-danger" style="font-size: 15px">
+                            Course is not activated
+                        </span>
                     {% endif %}
                 {% endif %}
             </div>
+            <div class="col-md-4">
+                {% if course.days_before_start != 0 %}
+                <span class="label label-info" style="font-size: 15px">
+                    {{course.days_before_start}} day(s) to start
+                </span>
+                {% endif %}
+            </div>
         </div>
+        {% if course.is_active_enrollment %}
+            <div class="alert alert-info">
+                Start Date&nbsp;: {{course.start_enroll_time}}
+                <br>
+                End Date&nbsp;&nbsp;: {{course.end_enroll_time}}
+            </div>
+        {% endif %}
 
         {% if course.instructions %}
         <div class="row">
diff --git a/yaksh/templates/yaksh/user_data.html b/yaksh/templates/yaksh/user_data.html
index 45867d2..ce2533e 100644
--- a/yaksh/templates/yaksh/user_data.html
+++ b/yaksh/templates/yaksh/user_data.html
@@ -74,8 +74,7 @@ User IP address: {{ paper.user_ip }}
                         {% endif %}
                     {% endfor %}
 
-            {% elif question.type == "integer" or question.type == "string"
-               or question.type == "float" %}
+            {% elif question.type == "integer" or question.type == "string" or question.type == "float" %}
                 <h5> <u>Correct Answer:</u></h5>
                     {% for testcase in question.get_test_cases %}
                     <strong>{{ testcase.correct|safe }}</strong>
diff --git a/yaksh/templates/yaksh/view_answerpaper.html b/yaksh/templates/yaksh/view_answerpaper.html
index 410b578..971ef77 100644
--- a/yaksh/templates/yaksh/view_answerpaper.html
+++ b/yaksh/templates/yaksh/view_answerpaper.html
@@ -34,7 +34,7 @@
     Start time: {{ paper.start_time }} <br/>
     End time : {{ paper.end_time }} <br/>
     Percentage obtained: {{ paper.percent }}% <br/>
-    {% if paper.passed == 0 %}
+    {% if paper.passed %}
     Status : <b style="color: red;"> Failed </b><br/>
     {% else %}
     Status : <b style="color: green;"> Passed </b><br/>
@@ -55,7 +55,8 @@
             <h5><u>Question:</u></h5> <strong>{{ question.description|safe }}</strong>
             {% if question.type == "mcq" or question.type == "mcc" %}
                 <h5> <u>Choices:</u></h5>
-                {% for testcase in question.get_test_cases %}
+                {% get_ordered_testcases question paper as testcases %}
+                {% for testcase in testcases %}
                 {% if testcase.correct %}
                    <br/>
                    <strong>{{ forloop.counter }}. {{ testcase.options|safe }}</strong>
diff --git a/yaksh/templates/yaksh/view_profile.html b/yaksh/templates/yaksh/view_profile.html
index 5f06135..ce95226 100644
--- a/yaksh/templates/yaksh/view_profile.html
+++ b/yaksh/templates/yaksh/view_profile.html
@@ -31,6 +31,10 @@
     <th><label for="id_position"><h5>Position:</h5></label></th>
     <th><label for="id_position"><h5>{{ user.profile.position }}</h5></label></th>
   </tr>
+  <tr>
+    <th><label for="id_position"><h5>Timezone:</h5></label></th>
+    <th><label for="id_position"><h5>{{ user.profile.timezone }}</h5></label></th>
+  </tr>
   </table>
   <a class="btn btn-primary pull-right" href="{{ URL_ROOT }}/exam/editprofile/">Edit Profile</a>
 {% endblock %}