From 763f96559bd1827ce87a72708d72efc9361ef588 Mon Sep 17 00:00:00 2001
From: prathamesh
Date: Mon, 16 Jun 2014 17:04:40 +0530
Subject: Models modified.

QuestionPaper model modified for generating random questions.
Added language field to Question model.
Removed tags from Quiz model.
Template and javascript for Add and Edit questions modified.
Added test cases for models.
---
 testapp/templates/exam/add_question.html  |  6 ++++--
 testapp/templates/exam/add_quiz.html      |  3 ---
 testapp/templates/exam/edit_question.html | 12 ++++++------
 testapp/templates/exam/edit_quiz.html     |  4 ----
 4 files changed, 10 insertions(+), 15 deletions(-)

(limited to 'testapp/templates/exam')

diff --git a/testapp/templates/exam/add_question.html b/testapp/templates/exam/add_question.html
index b49d7de..b0b22b1 100644
--- a/testapp/templates/exam/add_question.html
+++ b/testapp/templates/exam/add_question.html
@@ -22,8 +22,10 @@
   {% csrf_token %}
   <center><table class=span1>
   <tr><td>Summary: <td>{{ form.summary }}{{ form.summary.errors }}
-  <tr><td>Points:<td><button class="btn-mini" type="button" onClick="increase(frm);">+</button>{{ form.points }}<button class="btn-mini" type="button" onClick="decrease(frm);">-</button>{{ form.points.errors }} &nbsp; Active: &nbsp; {{ form.active }}{{form.active.errors}} &nbsp; Type: &nbsp;{{ form.type }}{{form.type.errors}}
-  <tr><td><strong>Rendered: </strong><td><p id='my'></p>
+  <tr><td> Language: <td> {{form.language}}{{form.language.errors}}
+  <tr><td> Active: <td> {{ form.active }}{{form.active.errors}} &nbsp; Type: &nbsp;{{ form.type }}{{form.type.errors}}
+  <tr><td>Points:<td><button class="btn-mini" type="button" onClick="increase(frm);">+</button>{{ form.points }}<button class="btn-mini" type="button" onClick="decrease(frm);">-</button>{{ form.points.errors }} 
+    <tr><td><strong>Rendered: </strong><td><p id='my'></p>
   <tr><td>Description: <td>{{ form.description}}  {{form.description.errors}}
   <tr><td>Test: <td>{{ form.test }}{{form.test.errors}}
   <tr><td>Snippet: <td>{{ form.snippet }}{{ form.snippet.errors }}</td></tD></td></tr>
diff --git a/testapp/templates/exam/add_quiz.html b/testapp/templates/exam/add_quiz.html
index 9851584..c2533de 100644
--- a/testapp/templates/exam/add_quiz.html
+++ b/testapp/templates/exam/add_quiz.html
@@ -5,11 +5,8 @@
 
 {% block css %}
 <link rel="stylesheet" href="{{ URL_ROOT }}/static/exam/css/question_quiz.css" type="text/css" /> 
-<link rel="stylesheet" media="all" type="text/css" href="{{ URL_ROOT }}/static/exam/css/autotaggit.css" />
 {% endblock %}
 {% block script %}
-<script src="/static/taggit_autocomplete_modified/jquery.min.js" type="text/javascript"></script>
-<script src="/static/taggit_autocomplete_modified/jquery.autocomplete.js" type="text/javascript"></script>
 <script src="{{ URL_ROOT }}/static/exam/js/add_quiz.js"></script>
 {% endblock %}
 {% block onload %} onload="javascript:test();"  {% endblock %}
diff --git a/testapp/templates/exam/edit_question.html b/testapp/templates/exam/edit_question.html
index 73e61d7..b28cc3e 100644
--- a/testapp/templates/exam/edit_question.html
+++ b/testapp/templates/exam/edit_question.html
@@ -30,15 +30,15 @@
 	      
 	      <center><table class=span1>
                  <tr><td><b>Summary:</b> <td>{{ form.summary }}{{ form.summary.errors }}
- 
-                 <tr><td><b>Points:<td><button class="btn-mini" name={{forloop.counter}} type="button" onClick="increase(frm,{{forloop.counter}});">+</button>{{ form.points }}<button class="btn-mini" type="button" onClick="decrease(frm,{{forloop.counter}});">-</button>{{ form.points.errors }} &nbsp; Active: &nbsp; {{ form.active }}{{form.active.errors}} &nbsp; Type: &nbsp;{{ form.type }}{{form.type.errors}}
-
+		 <tr><td><b> Language: </b><td> {{form.language}}{{form.language.errors}} 
+ 		 <tr><td><b> Active: </b><td>&nbsp; {{ form.active }}{{form.active.errors}} &nbsp; Type: &nbsp;{{ form.type }}{{form.type.errors}}
+		 <tr><td><b>Points:<td><button class="btn-mini" name={{forloop.counter}} type="button" onClick="increase(frm,{{forloop.counter}});">+</button>{{ form.points }}<button class="btn-mini" type="button" onClick="decrease(frm,{{forloop.counter}});">-</button>{{ form.points.errors }}
                  <tr><td><strong>Rendered: </strong><td><p id='my{{forloop.counter}}'></p>
                  <tr><td><b>Description: <td>{{ form.description }}  {{form.description.errors}}
-                 <tr><td><b>Test: <td>{{ form.test }}{{form.test.errors}}
+		 <tr><td><b>Test: <td>{{ form.test }}{{form.test.errors}}
                  <tr><td><b>Snippet: <td>{{ form.snippet }}{{ form.snippet.errors }}</td></b></td></tr>
-                 <tr><td>Tags: <td>{{ form.tags }}
-                 <tr><td id='label_option{{forloop.counter}}'><b>Options: <td>{{ form.options }}  {{form.options.errors}} {{form.options.helptext}}
+		 <tr><td><b>Tags: </b><td>{{ form.tags }}
+		 <tr><td id='label_option{{forloop.counter}}'><b>Options:<td>{{ form.options }}  {{form.options.errors}} {{form.options.helptext}}
               </table></center>
            </div>
         </div>
diff --git a/testapp/templates/exam/edit_quiz.html b/testapp/templates/exam/edit_quiz.html
index 0ea4aae..cf80df1 100644
--- a/testapp/templates/exam/edit_quiz.html
+++ b/testapp/templates/exam/edit_quiz.html
@@ -5,13 +5,10 @@
 
 {% block css %}
 <link rel="stylesheet" href="{{ URL_ROOT }}/static/exam/css/question_quiz.css" type="text/css" /> 
-<link rel="stylesheet" media="all" type="text/css" href="{{ URL_ROOT }}/static/exam/css/autotaggit.css" />
 {% endblock %}
 
 {% block script %}
 <script src="{{ URL_ROOT }}/static/exam/js/edit_quiz.js"></script>
-<script src="/static/taggit_autocomplete_modified/jquery.min.js" type="text/javascript"></script>
-<script src="/static/taggit_autocomplete_modified/jquery.autocomplete.js" type="text/javascript"></script>
 {% endblock %}
 
 {% block onload %} onload = 'javascript:form_load();' {% endblock %}
@@ -25,7 +22,6 @@
  	<tr><td><b>Start Date: <td>{{ form.start_date}} 
 	<tr><td><b>Duration: <td> {{ form.duration }} 
 	<tr><td><b>Active: <td> {{ form.active }} 
-    <tr><td><b>Tags: <td> {{ form.tags }}
 	<tr><td><b>Description: <td> {{ form.description }}
 	<hr>
   {% endfor %}
-- 
cgit