From 0808861705c08aede6c0dc9e07ac891911a7bbfb Mon Sep 17 00:00:00 2001
From: prathamesh
Date: Tue, 23 Sep 2014 14:44:47 +0530
Subject: Models and views modified.

Added number of attempts option for quiz.
Also days lag between two attempts.
added test status and attempt number for the test.
Removed profile foreign key from answer paper models
since user foreign key is present in the answer paper model.
Urls slightly modified to include attemt number for a given quiz.
---
 testapp/exam/templates/exam/intro.html    | 2 +-
 testapp/exam/templates/exam/question.html | 9 ++-------
 testapp/exam/templates/exam/quit.html     | 4 ++--
 3 files changed, 5 insertions(+), 10 deletions(-)

(limited to 'testapp/exam/templates')

diff --git a/testapp/exam/templates/exam/intro.html b/testapp/exam/templates/exam/intro.html
index ec1888a..58068ed 100644
--- a/testapp/exam/templates/exam/intro.html
+++ b/testapp/exam/templates/exam/intro.html
@@ -27,7 +27,7 @@
          </ul>
           <p> We hope you enjoy taking this exam !!!</p>
 
-          <form action="{{URL_ROOT}}/exam/start/{{ paper_id }}/" method="post" align="center">
+          <form action="{{URL_ROOT}}/exam/start/{{ attempt_no }}/{{ paper_id }}/" method="post" align="center">
            {% csrf_token %}
            <center><button class="btn" type="submit" name="start">Start Exam!</button></center>
           </form>
diff --git a/testapp/exam/templates/exam/question.html b/testapp/exam/templates/exam/question.html
index a3e8629..855a29e 100644
--- a/testapp/exam/templates/exam/question.html
+++ b/testapp/exam/templates/exam/question.html
@@ -74,7 +74,7 @@ function setSnippetHeight()
         <ul>
         <li> <h5><a> Hi {{user.first_name.title}} {{user.last_name.title}}  </a></h5>
         </ul>
-        <form id="logout" action="{{URL_ROOT}}/exam/quit/{{ paper.question_paper.id }}/" method="post" class="pull-right">
+        <form id="logout" action="{{URL_ROOT}}/exam/quit/{{ paper.attempt_number }}/{{ paper.question_paper.id }}/" method="post" class="pull-right">
         {% csrf_token %}
          <button class="btn" type="submit" name="quit">Quit Exam</button> </li>
 
@@ -94,13 +94,8 @@ function setSnippetHeight()
 	 {% endfor%}
 	 </div>{% endif %}
 
-         {% if success_msg %}
-         <script type="text/javascript">
-            alert("Congratulations, that's correct. Let's go to next question");
-         </script>
-         {% endif %}
          <p id="status"></p>
-         <form id="code" action="{{URL_ROOT}}/exam/{{ question.id }}/check/{{ paper.question_paper.id }}/" method="post">
+         <form id="code" action="{{URL_ROOT}}/exam/{{ question.id }}/check/{{ paper.attempt_number }}/{{ paper.question_paper.id }}/" method="post">
          {% csrf_token %}
          {% if question.type == "mcq" %}
          {% for option in question.options.strip.splitlines %}
diff --git a/testapp/exam/templates/exam/quit.html b/testapp/exam/templates/exam/quit.html
index fee11ed..2c347cb 100644
--- a/testapp/exam/templates/exam/quit.html
+++ b/testapp/exam/templates/exam/quit.html
@@ -7,8 +7,8 @@
         <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/{{ id }}/" method="post">
+    <form action="{{URL_ROOT}}/exam/complete/{{ attempt_no }}/{{ 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/{{ 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_no }}/{{ id }}/'">No!</button></center>
 	</form>
 {% endblock content %}
-- 
cgit 


From cbdeb90a756832c71c80bac4dbe9ba1a3aceacb2 Mon Sep 17 00:00:00 2001
From: hardythe1
Date: Fri, 16 Jan 2015 16:47:43 +0530
Subject: added view, urls for assignment upload & changed the model

---
 testapp/exam/templates/exam/question.html | 11 +++++++++++
 1 file changed, 11 insertions(+)

(limited to 'testapp/exam/templates')

diff --git a/testapp/exam/templates/exam/question.html b/testapp/exam/templates/exam/question.html
index 855a29e..f8888b1 100644
--- a/testapp/exam/templates/exam/question.html
+++ b/testapp/exam/templates/exam/question.html
@@ -95,6 +95,17 @@ function setSnippetHeight()
 	 </div>{% endif %}
 
          <p id="status"></p>
+         
+         {% if question.type == "bash assignment" %}
+         <form action="{{URL_ROOT}}/exam/submit-assignment/{{ question.id }}/check/{{ paper.attempt_number }}/{{ paper.question_paper.id }}/" method="post">
+         <p>Upload assignment file for the said question<p>
+         <input type=file id=assignment name=assignment>
+         <hr>
+         <br><button class="btn" type="submit" name="submitassign" id="submitassign">Upload</button>&nbsp;&nbsp;
+         <button class="btn" type="submit" name="skip" id="skip">Skip</button>
+         </form>         
+         {% endif %}
+         
          <form id="code" action="{{URL_ROOT}}/exam/{{ question.id }}/check/{{ paper.attempt_number }}/{{ paper.question_paper.id }}/" method="post">
          {% csrf_token %}
          {% if question.type == "mcq" %}
-- 
cgit 


From f2e09edeb2e5b884f0e75ad3747b51e7603d70e1 Mon Sep 17 00:00:00 2001
From: prathamesh
Date: Tue, 20 Jan 2015 17:05:41 +0530
Subject: Assignment upload interface implementation

---
 testapp/exam/templates/exam/question.html | 19 ++++++++-----------
 1 file changed, 8 insertions(+), 11 deletions(-)

(limited to 'testapp/exam/templates')

diff --git a/testapp/exam/templates/exam/question.html b/testapp/exam/templates/exam/question.html
index f8888b1..03284ce 100644
--- a/testapp/exam/templates/exam/question.html
+++ b/testapp/exam/templates/exam/question.html
@@ -96,23 +96,18 @@ function setSnippetHeight()
 
          <p id="status"></p>
          
-         {% if question.type == "bash assignment" %}
-         <form action="{{URL_ROOT}}/exam/submit-assignment/{{ question.id }}/check/{{ paper.attempt_number }}/{{ paper.question_paper.id }}/" method="post">
-         <p>Upload assignment file for the said question<p>
-         <input type=file id=assignment name=assignment>
-         <hr>
-         <br><button class="btn" type="submit" name="submitassign" id="submitassign">Upload</button>&nbsp;&nbsp;
-         <button class="btn" type="submit" name="skip" id="skip">Skip</button>
-         </form>         
-         {% endif %}
-         
-         <form id="code" action="{{URL_ROOT}}/exam/{{ question.id }}/check/{{ paper.attempt_number }}/{{ paper.question_paper.id }}/" method="post">
+         <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 %}
          {% if question.type == "mcq" %}
          {% for option in question.options.strip.splitlines %}
          <input name="answer" type="radio" value="{{option}}" />{{option}} <br/>
          {% endfor %}
          {% endif %}
+         {% if question.type == "basgn" %}
+         <p>Upload assignment file for the said question<p>
+         <input type=file id="assignment" name="assignment">
+         <hr>
+         {% endif %}
          {% if question.type == "mcc" %}
          {% for option in question.options.strip.splitlines %}
          <input name="answer" type="checkbox" value="{{ option }}"> {{ option }}
@@ -134,6 +129,8 @@ function setSnippetHeight()
 
          {% if question.type == "mcq" or question.type == "mcc "%}
          <br><button class="btn" type="submit" name="check" id="check">Submit Answer</button>&nbsp;&nbsp;
+         {% elif question.type == "basgn" %}
+         <br><button class="btn" type="submit" name="check" id="check">Submit Answer</button>&nbsp;&nbsp;
          {% else %}
          <button class="btn" type="submit" name="check" id="check" onClick="submitCode();">Check Answer</button>&nbsp;&nbsp;
          {% endif %}
-- 
cgit 


From caf153bcaa8b9a0096a4653b562198f2ba2cef9a Mon Sep 17 00:00:00 2001
From: prathamesh
Date: Tue, 24 Feb 2015 09:29:35 +0530
Subject: Question navigator implemented

Students can now move from one question to another through
the navigator window.
Also, the questions attempted will have different color then
the ones which are not attempted.
---
 testapp/exam/templates/exam/question.html | 24 ++++++++++++++++++++++--
 1 file changed, 22 insertions(+), 2 deletions(-)

(limited to 'testapp/exam/templates')

diff --git a/testapp/exam/templates/exam/question.html b/testapp/exam/templates/exam/question.html
index 03284ce..96e7bd6 100644
--- a/testapp/exam/templates/exam/question.html
+++ b/testapp/exam/templates/exam/question.html
@@ -81,10 +81,30 @@ function setSnippetHeight()
         </form>
      </div>
    </div>
+</div>
+<div class = container>
+<div class="sidebar">
+    <p>Question Navigator </p>
+    <div class="pagination">
+        <ul>
+            {% for qid, num in questions.items %}
+                {% if qid in to_attempt %}
+                    {% if qid == question.id|slugify %}
+                        <li class="active"><a href="{{ URL_ROOT }}/exam/{{ qid }}/{{ paper.attempt_number }}/{{ paper.question_paper.id }}/">{{ num }}</a></li>
+                    {% else %}
+                        <li><a href="{{ URL_ROOT }}/exam/{{ qid }}/{{ paper.attempt_number }}/{{ paper.question_paper.id }}/">{{ num }}</a></li>
+                    {% endif %}
+                {% endif %}
+                {% if qid in submitted %}
+                    <li class="done"><a href="#">{{ num }}</a></li>
+                {% endif %}
+            {% endfor %}
+        </ul>
+    </div>
+</div>
 </div>
 
-         
-     	 <h4><u> {{ question.summary }} </u><font class=pull-right>(Marks : {{ question.points }}) </font></h4><br> 
+     <h4><u> {{ question.summary }} </u><font class=pull-right>(Marks : {{ question.points }}) </font></h4><br>
 	 <font size=3 face=arial>	{{ question.description|safe }} </font>
          {% if error_message %}
 	 <div class="alert alert-error">
-- 
cgit