Merge branch 'model_changes' of ...

https://github.com/hardythe1/online_test into master.

Conflicts:
	production.cfg
	testapp/production.py

1 files changed, 81 insertions, 0 deletions

diff --git a/testapp/templates/exam/manual_questionpaper.html b/testapp/templates/exam/manual_questionpaper.html
new file mode 100644
index 0000000..1a1f95c
--- /dev/null
+++ b/testapp/templates/exam/manual_questionpaper.html
@@ -0,0 +1,81 @@
+{% extends "manage.html" %}
+
+
+{% block subtitle %}Design Question Paper{% endblock %}
+
+{% 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" />
+<style>
+select
+{
+    width:auto;
+}
+</style>
+{% 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_questionpaper.js"></script>
+{% endblock %}
+
+{% block manage %}
+<input type=hidden id="url_root" value={{ URL_ROOT }}>
+<center><b>Manual mode to design the Question Paper</center><br>
+
+<form action="" method="post" name=frm>
+    {% csrf_token %}
+    <center>
+    Tag Conditions:
+    <select name='first_tag'>
+    <option value="">Select Tag </option>
+    {% for tag in data.tags %}
+       <option value={{tag}}>{{tag}}</option>
+    {% endfor %}
+    </select>
+    <select name='first_condition'>
+    <option value="or">OR</option>
+    <option value="and">AND</option>
+    </select>
+    <select name='second_tag'>
+    <option value="">Select Tag </option>
+    {% for tag in data.tags %}
+       <option value={{tag}}>{{tag}}</option>
+    {% endfor %}
+    </select>
+    <select name='second_condition'>
+    <option value="or">OR</option>
+    <option value="and">AND</option>
+    </select>
+    <select name='third_tag'>
+    <option value="null">Select Tag </option>
+    {% for tag in data.tags %}
+       <option value={{tag}}>{{tag}}</option>
+    {% endfor %}
+    </select>
+    </center>
+    <br>
+    <center><button class=btn type=submit  name='fetch' value='fetch'>Fetch Questions</button>
+    <br><br><b>Below is the list of Questions fetched according to the given tag conditions</b></center>
+    <hr>
+    <center><table class=span10>
+    <th> &nbsp; 
+    <th>Summary
+    <th>Type
+    <th>Points
+    <th>Tags
+    {% for question in data.questions %}
+    <tr><td><input type=checkbox name=questions value={{question.id}}> <td> {{ question.summary }} <td>{{ question.type }} <td>{{ question.points }} <td>
+        {% for tag in question.tags.all %}
+         {{ tag }}
+        {% endfor %}
+    </tr>
+    <br>
+    {% endfor %}
+    </table>
+    {% if data.msg %}<div class="alert alert-error">{{ data.msg }}</div>{% endif %}
+    <center><button class=btn type=submit name='save' value='save'>Save Question Paper</button></center>
+</form>
+
+{% endblock %}