From 87beec6a0389e35c94fe674627d47e1f3ea1c22e Mon Sep 17 00:00:00 2001
From: ankitjavalkar
Date: Mon, 6 Mar 2017 13:07:46 +0530
Subject: Display full name of course creator & redirect logout correctly

---
 yaksh/templates/user.html               | 2 +-
 yaksh/templates/yaksh/quizzes_user.html | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'yaksh/templates')

diff --git a/yaksh/templates/user.html b/yaksh/templates/user.html
index 0d1f980..b068fae 100644
--- a/yaksh/templates/user.html
+++ b/yaksh/templates/user.html
@@ -16,7 +16,7 @@
         <div class= "collapse navbar-collapse" id="navbar">
           <ul class="nav navbar-nav navbar-right">
               <li><a href="{{ URL_ROOT }}/exam/viewprofile"> {{ user.get_full_name.title }} </a></li>
-              <li><a style='cursor:pointer' id='logout' onClick='location.replace("{{URL_ROOT}}/exam/complete/");'> <span class="glyphicon glyphicon-log-out">Logout </span></a></li>
+              <li><a style='cursor:pointer' id='logout' onClick='location.replace("{{URL_ROOT}}/exam/logout/");'> <span class="glyphicon glyphicon-log-out">Logout </span></a></li>
           </ul>
         </div><!-- /.navbar -->
       </div><!-- /.container -->
diff --git a/yaksh/templates/yaksh/quizzes_user.html b/yaksh/templates/yaksh/quizzes_user.html
index 63f22a1..72fce30 100644
--- a/yaksh/templates/yaksh/quizzes_user.html
+++ b/yaksh/templates/yaksh/quizzes_user.html
@@ -6,7 +6,7 @@
     <div class="col-md-12">
         <div class="row">
             <div class="col-md-4">
-                <h4><b><u> {{ course.name }} by {{ course.creator }}</u></b></h4>
+                <h4><b><u> {{ course.name }} by {{ course.creator.get_full_name }}</u></b></h4>
             </div>
              <div class="col-md-4">
                 {% if user in course.requests.all %} <span class="label label-warning">Request Pending </span>
-- 
cgit 


From 9484e8bebcd4363fa3aa1c2fc842de1bdcc25a10 Mon Sep 17 00:00:00 2001
From: ankitjavalkar
Date: Thu, 23 Feb 2017 17:33:07 +0530
Subject: Allow revisiting all types of question to resubmit answer

---
 yaksh/templates/exam.html            | 4 +++-
 yaksh/templates/yaksh/user_data.html | 4 ++--
 2 files changed, 5 insertions(+), 3 deletions(-)

(limited to 'yaksh/templates')

diff --git a/yaksh/templates/exam.html b/yaksh/templates/exam.html
index b497cc0..02ff70a 100644
--- a/yaksh/templates/exam.html
+++ b/yaksh/templates/exam.html
@@ -52,7 +52,9 @@
                 {% endif %}
                 {% endif %}
                 {% if qid in paper.get_questions_answered %}
-                <li class="disabled"><a style="background-color:#B4B8BA; width:25%" href="#" data-toggle="tooltip" title="{{ qid.description }}" >{{ forloop.counter }}</a></li>
+                <li><a style="background-color:#B4B8BA; width:25%" href="#" data-toggle="tooltip"
+                onclick="call_skip('{{ URL_ROOT }}/exam/{{ question.id }}/skip/{{ qid.id }}/{{ paper.attempt_number }}/{{ paper.question_paper.id }}/')"
+                title="{{ qid.description }}">{{ forloop.counter }}</a></li>
                 {% endif %}
                 {% else %}
                 {% if qid.id == question.id %}
diff --git a/yaksh/templates/yaksh/user_data.html b/yaksh/templates/yaksh/user_data.html
index 9be28fb..16707b2 100644
--- a/yaksh/templates/yaksh/user_data.html
+++ b/yaksh/templates/yaksh/user_data.html
@@ -100,7 +100,7 @@ User IP address: {{ paper.user_ip }}
     {% else %}
     <h5>Student answer: </h5>
     {% for answer in answers %}
-    {% if not answer.skipped %}
+ 
     {% if answer.answer.correct %}
             <div class="panel panel-success">
             <div class="panel-heading">Correct answer
@@ -116,7 +116,7 @@ User IP address: {{ paper.user_ip }}
     </div>
     <div class="panel-body"><pre><code>{{ answer.answer.answer.strip }}</code></pre></div>
     </div>
-    {% endif %}
+
     {% endfor %}
     {% endif %}
     <hr>
-- 
cgit 


From d0d4c9ab3a409c68766bc044825bf22b0519f6a3 Mon Sep 17 00:00:00 2001
From: ankitjavalkar
Date: Fri, 3 Mar 2017 16:35:18 +0530
Subject: Multiple changes:     - Fix movement from one question to another in
 next_question     - Fix random display of errors from MCQs     - Add
 Notification display if question has been attempted     - Fix test cases for
 changes made

---
 yaksh/templates/yaksh/question.html | 24 +++++++++++++++---------
 1 file changed, 15 insertions(+), 9 deletions(-)

(limited to 'yaksh/templates')

diff --git a/yaksh/templates/yaksh/question.html b/yaksh/templates/yaksh/question.html
index 1f6e67d..f94298e 100644
--- a/yaksh/templates/yaksh/question.html
+++ b/yaksh/templates/yaksh/question.html
@@ -135,13 +135,19 @@ function call_skip(url)
 {% block onload %} onload="updateTime();" {% endblock %}
 
 {% block main %}
-         <p id="status"></p>
-         <form id="code" action="{{URL_ROOT}}/exam/{{ question.id }}/check/{{ paper.attempt_number }}/{{ paper.question_paper.id }}/" method="post" enctype="multipart/form-data">
-         {% csrf_token %}
-         <input type=hidden name="question_id" id="question_id" value={{ question.id }}></input>
-             <div class="panel panel-default">
-                 <div class="panel-heading">
-                     <h4><u> {{ question.summary }}
+        <p id="status"></p>
+        {% if notification %}
+        <div class="alert alert-warning" role="alert">
+          <strong>Note:</strong> {{ notification }}
+        </div>
+        {% endif %}
+        <form id="code" action="{{URL_ROOT}}/exam/{{ question.id }}/check/{{ paper.attempt_number }}/{{ paper.question_paper.id }}/" method="post" enctype="multipart/form-data">
+        {% csrf_token %}
+        <input type=hidden name="question_id" id="question_id" value={{ question.id }}></input>
+            <div class="panel panel-default">
+                  <div class="panel-heading">
+                      <h4>
+                        <u> {{ question.summary }}
                              {% if question.type == "mcq" %}
                              (Single Correct Choice Questions)
                              {% elif question.type == "mcc" %}
@@ -151,8 +157,8 @@ function call_skip(url)
                              {% elif question.type == "upload" %}
                              (ASSIGNMENT UPLOAD)
                              {% endif %}
-                         </u>
-                         <font class=pull-right>(Marks : {{ question.points }}) </font>
+                        </u>
+                        <font class=pull-right>(Marks : {{ question.points }}) </font>
                       </h4>
                       <font size=3 face=arial> {{ question.description|safe }} </font>
                       {% if files %}
-- 
cgit 


From c118c7eff7abaeba18f7c375828d2e022d21cb9f Mon Sep 17 00:00:00 2001
From: ankitjavalkar
Date: Fri, 3 Mar 2017 19:16:46 +0530
Subject: Modify UI for notifications in submitted code questions

---
 yaksh/templates/yaksh/question.html | 19 +++++++++++++++----
 1 file changed, 15 insertions(+), 4 deletions(-)

(limited to 'yaksh/templates')

diff --git a/yaksh/templates/yaksh/question.html b/yaksh/templates/yaksh/question.html
index f94298e..5b5326d 100644
--- a/yaksh/templates/yaksh/question.html
+++ b/yaksh/templates/yaksh/question.html
@@ -137,9 +137,15 @@ function call_skip(url)
 {% block main %}
         <p id="status"></p>
         {% if notification %}
-        <div class="alert alert-warning" role="alert">
-          <strong>Note:</strong> {{ notification }}
-        </div>
+          {% if question.type == "code" %}
+          <div class="alert alert-success" role="alert">
+            <strong>Note:</strong> {{ notification }}
+          </div>
+          {% else %}
+          <div class="alert alert-warning" role="alert">
+            <strong>Note:</strong> {{ notification }}
+          </div>
+          {% endif %}
         {% endif %}
         <form id="code" action="{{URL_ROOT}}/exam/{{ question.id }}/check/{{ paper.attempt_number }}/{{ paper.question_paper.id }}/" method="post" enctype="multipart/form-data">
         {% csrf_token %}
@@ -204,10 +210,15 @@ function call_skip(url)
          {% elif question.type == "upload" %}
          <br><button class="btn btn-primary" type="submit" name="check" id="check" onClick="return validate();">Upload</button>&nbsp;&nbsp;
          {% else %}
-         <button class="btn btn-primary" type="submit" name="check" id="check" onClick="submitCode();">Check Answer <span class="glyphicon glyphicon-cog"></span></button>&nbsp;&nbsp;
+           {% if notification == None %}
+           <button class="btn btn-primary" type="submit" name="check" id="check" onClick="submitCode();">Check Answer <span class="glyphicon glyphicon-cog"></span></button>&nbsp;&nbsp;
+           {% endif %}
          {% endif %}
+
          {% if paper.question_paper.quiz.allow_skip and not paper.get_questions_unanswered|length_is:"1" %}
+         {% if notification == None %}
          <button class="btn btn-primary"  onclick="call_skip('{{ URL_ROOT }}/exam/{{ question.id }}/skip/{{ paper.attempt_number }}/{{ paper.question_paper.id }}/')" name="skip" id="skip">Attempt Later <span class="glyphicon glyphicon-arrow-right"></span></button>
+         {% endif %}
          </div>
                  </div>
              </div>
-- 
cgit 


From e231c13eade3afaa8f03a56fb69923b78c7a02d8 Mon Sep 17 00:00:00 2001
From: ankitjavalkar
Date: Tue, 7 Mar 2017 11:43:14 +0530
Subject: Add numbering enrolled/requested/rejected students in course details
 display

---
 yaksh/templates/yaksh/course_detail.html | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'yaksh/templates')

diff --git a/yaksh/templates/yaksh/course_detail.html b/yaksh/templates/yaksh/course_detail.html
index dc85080..4b7efaf 100644
--- a/yaksh/templates/yaksh/course_detail.html
+++ b/yaksh/templates/yaksh/course_detail.html
@@ -31,6 +31,7 @@
             <input type="checkbox" class="checkall"/>&nbsp;<font size="2">Select all</font>
             <div id="enroll-all">
                 <table class="table table-striped">
+                    <th></th>
                     <th></th>
                     <th>Full Name</th>
                     <th>Email</th>
@@ -43,6 +44,7 @@
                 {% for request in course.get_requests %}
                     <tr>
                         <td><input type="checkbox" name="check" value="{{ request.id }}"></td>
+                        <td>{{ forloop.counter }}.</td>
                         <td>{{request.get_full_name}}</td>
                         <td> {{request.email}}</td>
                         <td> {{request.profile.roll_number}}</td>
@@ -71,6 +73,7 @@
             <input type="checkbox" class="reject"/>&nbsp;<font size="2">Select all</font>
             <div id="reject">
                 <table class="table table-striped">
+                    <th></th>
                     <th></th>
                     <th>Full Name</th>
                     <th>Email</th>
@@ -83,6 +86,7 @@
                     {% csrf_token %}
                     <tr>
                         <td><input type="checkbox" name="check" value="{{ enrolled.id }}"></td>
+                        <td>{{ forloop.counter }}.</td>
                         <td> {{ enrolled.get_full_name|title }} </td>
                         <td> {{enrolled.email}}</td>
                         <td> {{enrolled.profile.roll_number}}</td>
@@ -107,6 +111,7 @@
             <input type="checkbox" class="enroll"/>&nbsp;<font size="2">Select all</font>
             <div id="enroll">
                 <table class="table table-striped">
+                    <th></th>
                     <th></th>
                     <th>Full Name</th>
                     <th>Email</th>
@@ -119,6 +124,7 @@
                 {% csrf_token %}
                         <tr>
                             <td><input type="checkbox" name="check" value="{{ rejected.id }}"></td>
+                            <td>{{ forloop.counter }}.</td>
                             <td>{{rejected.get_full_name|title}}</td>
                             <td> {{rejected.email}}</td>
                             <td> {{rejected.profile.roll_number}}</td>
-- 
cgit 


From f57cfacf41f8a1d72a56ea8c875f906e7db2a15e Mon Sep 17 00:00:00 2001
From: ankitjavalkar
Date: Wed, 8 Mar 2017 10:34:12 +0530
Subject: Hide/Disable submit in correct code questions

---
 yaksh/templates/yaksh/question.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'yaksh/templates')

diff --git a/yaksh/templates/yaksh/question.html b/yaksh/templates/yaksh/question.html
index 5b5326d..9dd0de5 100644
--- a/yaksh/templates/yaksh/question.html
+++ b/yaksh/templates/yaksh/question.html
@@ -210,13 +210,13 @@ function call_skip(url)
          {% elif question.type == "upload" %}
          <br><button class="btn btn-primary" type="submit" name="check" id="check" onClick="return validate();">Upload</button>&nbsp;&nbsp;
          {% else %}
-           {% if notification == None %}
+           {% if question in paper.get_questions_unanswered %}
            <button class="btn btn-primary" type="submit" name="check" id="check" onClick="submitCode();">Check Answer <span class="glyphicon glyphicon-cog"></span></button>&nbsp;&nbsp;
            {% endif %}
          {% endif %}
 
          {% if paper.question_paper.quiz.allow_skip and not paper.get_questions_unanswered|length_is:"1" %}
-         {% if notification == None %}
+         {% if question in paper.get_questions_unanswered %}
          <button class="btn btn-primary"  onclick="call_skip('{{ URL_ROOT }}/exam/{{ question.id }}/skip/{{ paper.attempt_number }}/{{ paper.question_paper.id }}/')" name="skip" id="skip">Attempt Later <span class="glyphicon glyphicon-arrow-right"></span></button>
          {% endif %}
          </div>
-- 
cgit