Merge pull request #49 from ankitjavalkar/feedback-changes

Feedback changes

3 files changed, 52 insertions, 9 deletions

diff --git a/testapp/exam/templates/exam/complete.html b/testapp/exam/templates/exam/complete.html
index 1d5df3c..08abe76 100644
--- a/testapp/exam/templates/exam/complete.html
+++ b/testapp/exam/templates/exam/complete.html
@@ -5,8 +5,29 @@
 {% block pagetitle %}Online Test{% endblock %}
 {% block content %}
 {% csrf_token %}
-        <center><h2> Good bye! </h2></center>
-        <center><h4> {{message}} </h4></center>
-        <center><h4>You may now close the browser.</h4></center><br>
+		{% if submitted or unattempted %}
+			<br><center><table class="bordered-table zebra-striped span8"
+			 style="text-align:left;">
+				<tr><td><b>Submitted Questions</b></td>
+				<td>
+				{% if submitted %}
+					{{ submitted|join:", " }}
+				{% else %}
+					<p><b>No Questions have been Submitted</b></p>
+				{% endif %}
+				</td></tr>
+				<tr><td><b>Unattempted Questions</b></td>
+				<td>
+				{% if unattempted %}
+					{{ unattempted|join:", " }}
+				{% else %}
+					<p><b>All Questions have been Submitted</b></p>
+				{% endif %}
+				</td></tr>
+			</table></center>
+		{% endif %}
+		<center><h2> Good bye! </h2></center>
+		<center><h4> {{message}} </h4></center>
+		<br><center><h4>You may now close the browser.</h4></center><br>
 	<center><a href="{{URL_ROOT}}/exam/"> Login Again </a></center>
 {% endblock content %}
diff --git a/testapp/exam/templates/exam/question.html b/testapp/exam/templates/exam/question.html
index eac6792..b7a7053 100644
--- a/testapp/exam/templates/exam/question.html
+++ b/testapp/exam/templates/exam/question.html
@@ -104,7 +104,6 @@ function call_skip(url)
      </div>
    </div>
 </div>
-
 <div class = container>
   <div class="sidebar">
     <p>Question Navigator </p>
@@ -179,7 +178,9 @@ function call_skip(url)
          {% else %}
          <button class="btn" type="submit" name="check" id="check" onClick="submitCode();">Check Answer</button>&nbsp;&nbsp;
          {% endif %}
-         <button class="btn" type="submit" name="skip" id="skip">Skip Question</button>
+         {% if to_attempt|length != 1 %}
+             <button class="btn" type="submit" name="skip" id="skip">Attempt Later</button>
+         {% endif %}
          </form>
          
       
diff --git a/testapp/exam/templates/exam/quit.html b/testapp/exam/templates/exam/quit.html
index f49b62f..91bce64 100644
--- a/testapp/exam/templates/exam/quit.html
+++ b/testapp/exam/templates/exam/quit.html
@@ -3,12 +3,33 @@
 {% block title %}Quit exam {% endblock %}
 {% block pagetitle %}Online Test {% endblock %}
 {% block content %}
+	{% if submitted or unattempted %}
+		<br><center><table class="bordered-table zebra-striped span8"
+		 style="text-align:left;">
+			<tr><td><b>Submitted Questions</b></td>
+			<td>
+			{% if submitted %}
+				{{ submitted|join:", " }}
+			{% else %}
+				<p><b>No Questions have been Submitted</b></p>
+			{% endif %}
+			</td></tr>
+			<tr><td><b>Unattempted Questions</b></td>
+			<td>
+			{% if unattempted %}
+				{{ unattempted|join:", " }}
+			{% else %}
+				<p><b>All Questions have been Submitted</b></p>
+			{% endif %}
+			</td></tr>
+		</table></center>
+	{% endif %}
 
-        <center><h4>Your current answers are saved.</h4></center>
+	<center><h4>Your current answers are saved.</h4></center>
 	<center><h4> Are you sure you wish to quit the exam?</h4></center>
-   	<center><h4> Be sure, as you won't be able to restart this exam.</h4></center>
-    <form action="{{URL_ROOT}}/exam/complete/{{ attempt_num }}/{{ id }}/" method="post">
+	<center><h4> Be sure, as you won't be able to restart this exam.</h4></center>
+	<form action="{{URL_ROOT}}/exam/complete/{{ attempt_num }}/{{ id }}/" method="post">
 	{% csrf_token %}
-    <center><button class="btn" type="submit" name="yes">Yes!</button>&nbsp;<button class="btn" type="button" name="no" onClick="window.location='{{ URL_ROOT }}/exam/start/{{ attempt_num }}/{{ id }}/'">No!</button></center>
+	<center><button class="btn" type="submit" name="yes">Yes!</button>&nbsp;<button class="btn" type="button" name="no" onClick="window.location='{{ URL_ROOT }}/exam/start/{{ attempt_num }}/{{ id }}/'">No!</button></center>
 	</form>
 {% endblock content %}