summaryrefslogtreecommitdiff
path: root/testapp
diff options
context:
space:
mode:
authorankitjavalkar2015-09-07 18:03:49 +0530
committerankitjavalkar2015-09-09 17:45:20 +0530
commitae10d36297797ffc53275eabe3acfa0cb4bf3b11 (patch)
tree4c474e8148fb983e30601a606572d0f9c188e3fa /testapp
parente7e4a526e555e5a5dbe27fdc2ecfb85b537387ba (diff)
downloadonline_test-ae10d36297797ffc53275eabe3acfa0cb4bf3b11.tar.gz
online_test-ae10d36297797ffc53275eabe3acfa0cb4bf3b11.tar.bz2
online_test-ae10d36297797ffc53275eabe3acfa0cb4bf3b11.zip
Change app name, related paths in views and readme
Diffstat (limited to 'testapp')
-rw-r--r--testapp/templates/demo_urls.py2
-rw-r--r--testapp/yaksh_app/static/yaksh_app/js/question_filter.js47
-rw-r--r--testapp/yaksh_app/templates/yaksh_app/ajax_question_filter.html15
-rw-r--r--testapp/yaksh_app/templates/yaksh_app/design_questionpaper.html2
-rw-r--r--testapp/yaksh_app/templates/yaksh_app/manual_questionpaper.html3
-rw-r--r--testapp/yaksh_app/templates/yaksh_app/question.html2
-rw-r--r--testapp/yaksh_app/views.py14
7 files changed, 73 insertions, 12 deletions
diff --git a/testapp/templates/demo_urls.py b/testapp/templates/demo_urls.py
index 275b281..4308eba 100644
--- a/testapp/templates/demo_urls.py
+++ b/testapp/templates/demo_urls.py
@@ -9,5 +9,5 @@ urlpatterns = patterns('',
# url(r'^blog/', include('blog.urls')),
url(r'^admin/', include(admin.site.urls)),
- url(r'^exam/', include('testapp.exam.urls')),
+ url(r'^exam/', include('testapp.yaksh_app.urls')),
)
diff --git a/testapp/yaksh_app/static/yaksh_app/js/question_filter.js b/testapp/yaksh_app/static/yaksh_app/js/question_filter.js
new file mode 100644
index 0000000..065b06b
--- /dev/null
+++ b/testapp/yaksh_app/static/yaksh_app/js/question_filter.js
@@ -0,0 +1,47 @@
+$(document).ready(function(){
+ $question_type = $("#id_question_type");
+ $marks = $("#id_marks");
+ $language = $("#id_language");
+
+ function question_filter() {
+ $.ajax({
+ url: "/exam/ajax/questions/filter/",
+ type: "POST",
+ data: {
+ question_type: $question_type.val(),
+ marks: $marks.val(),
+ language: $language.val()
+ },
+ dataType: "html",
+ success: function(output) {
+ var questions = $(output).filter("#questions").html();
+ $("#filtered-questions").html(questions);
+ }
+ });
+ }
+
+ $question_type.change(function() {
+ question_filter()
+ });
+
+ $language.change(function() {
+ question_filter()
+ });
+
+ $marks.change(function() {
+ question_filter()
+ });
+
+ $("#checkall").live("click", function(){
+ if($(this).attr("checked")) {
+ $("#filtered-questions input:checkbox").each(function(index, element) {
+ $(this).attr('checked', true);
+ });
+ }
+ else {
+ $("#filtered-questions input:checkbox").each(function(index, element) {
+ $(this).attr('checked', false);
+ });
+ }
+ });
+}); \ No newline at end of file
diff --git a/testapp/yaksh_app/templates/yaksh_app/ajax_question_filter.html b/testapp/yaksh_app/templates/yaksh_app/ajax_question_filter.html
new file mode 100644
index 0000000..11bf660
--- /dev/null
+++ b/testapp/yaksh_app/templates/yaksh_app/ajax_question_filter.html
@@ -0,0 +1,15 @@
+<div id="questions">
+ {% if questions %}
+ <h5 class="highlight"><input type="checkbox" id="checkall" class="ignore"> Select All </h5>
+ {% endif %}
+ <ul class="inputs-list">
+
+ {% for question in questions %}
+ <li>
+ <label>
+ <input type="checkbox" name="question" data-qid="{{question.id}}">&nbsp;&nbsp;<a href="{{URL_ROOT}}/exam/manage/addquestion/{{ question.id }}">{{ question }}</a><br>
+ </label>
+ </li>
+ {% endfor %}
+ </ul>
+</div>
diff --git a/testapp/yaksh_app/templates/yaksh_app/design_questionpaper.html b/testapp/yaksh_app/templates/yaksh_app/design_questionpaper.html
index 4e24e09..f999cb1 100644
--- a/testapp/yaksh_app/templates/yaksh_app/design_questionpaper.html
+++ b/testapp/yaksh_app/templates/yaksh_app/design_questionpaper.html
@@ -15,7 +15,7 @@ select
</style>
{% endblock %}
{% block script %}
-<script src="/static/exam/js/jquery-1.4.2.min.js" type="text/javascript"></script>
+<script src="{{ URL_ROOT }}/static/yaksh_app/js/jquery-1.4.2.min.js" type="text/javascript"></script>
<script src="{{ URL_ROOT }}/static/yaksh_app/js/bootstrap-tabs.js"></script>
<script src="{{ URL_ROOT }}/static/yaksh_app/js/add_questionpaper.js"></script>
diff --git a/testapp/yaksh_app/templates/yaksh_app/manual_questionpaper.html b/testapp/yaksh_app/templates/yaksh_app/manual_questionpaper.html
index 66c83ed..9e2a082 100644
--- a/testapp/yaksh_app/templates/yaksh_app/manual_questionpaper.html
+++ b/testapp/yaksh_app/templates/yaksh_app/manual_questionpaper.html
@@ -14,8 +14,7 @@ select
</style>
{% endblock %}
{% block script %}
-<script src="/static/exam/js/jquery-1.4.2.min.js" type="text/javascript"></script>
-
+<script src="{{ URL_ROOT }}/static/yaksh_app/js/jquery-1.4.2.min.js" type="text/javascript"></script>
<script src="{{ URL_ROOT }}/static/yaksh_app/js/add_questionpaper.js"></script>
{% endblock %}
diff --git a/testapp/yaksh_app/templates/yaksh_app/question.html b/testapp/yaksh_app/templates/yaksh_app/question.html
index 8b43fff..594693c 100644
--- a/testapp/yaksh_app/templates/yaksh_app/question.html
+++ b/testapp/yaksh_app/templates/yaksh_app/question.html
@@ -10,7 +10,7 @@
{% endblock %}
{% block script %}
-<script src="/static/yaksh_app/js/jquery-1.4.2.min.js" type="text/javascript"></script>
+<script src="{{ URL_ROOT }}/static/yaksh_app/js/jquery-1.4.2.min.js" type="text/javascript"></script>
<script src="{{ URL_ROOT }}/static/yaksh_app/js/question.js"></script>
<script src="{{ URL_ROOT }}/static/yaksh_app/js/bootstrap-modal.js"></script>
diff --git a/testapp/yaksh_app/views.py b/testapp/yaksh_app/views.py
index c7b97d1..e6aabc4 100644
--- a/testapp/yaksh_app/views.py
+++ b/testapp/yaksh_app/views.py
@@ -162,7 +162,7 @@ def quizlist_user(request):
'unexpired_quizzes': unexpired_quizzes
}
- return my_render_to_response("exam/quizzes_user.html", context)
+ return my_render_to_response("yaksh_app/quizzes_user.html", context)
def intro(request, questionpaper_id):
@@ -218,7 +218,7 @@ def intro(request, questionpaper_id):
'disable_quiz_time': quiz_disable_time,
'quiz_expired': quiz_expired
}
- return my_render_to_response('exam/intro.html', context,
+ return my_render_to_response('yaksh_app/intro.html', context,
context_instance=ci)
else:
return my_redirect("/exam/quizzes/")
@@ -231,7 +231,7 @@ def intro(request, questionpaper_id):
'disable_quiz_time': quiz_disable_time,
'quiz_expired': quiz_expired
}
- return my_render_to_response('exam/intro.html', context,
+ return my_render_to_response('yaksh_app/intro.html', context,
context_instance=ci)
@@ -1302,7 +1302,7 @@ def ajax_questions_filter(request):
questions = list(Question.objects.filter(**filter_dict))
- return my_render_to_response('exam/ajax_question_filter.html',
+ return my_render_to_response('yaksh_app/ajax_question_filter.html',
{'questions': questions})
@@ -1324,7 +1324,7 @@ def show_all_questions(request):
'questions': questions,
'form': form
}
- return my_render_to_response('exam/showquestions.html', context,
+ return my_render_to_response('yaksh_app/showquestions.html', context,
context_instance=ci)
else:
for i in data:
@@ -1336,7 +1336,7 @@ def show_all_questions(request):
'questions': questions,
'form': form
}
- return my_render_to_response('exam/showquestions.html', context,
+ return my_render_to_response('yaksh_app/showquestions.html', context,
context_instance=ci)
elif request.method == 'POST' and request.POST.get('edit') == 'edit':
data = request.POST.getlist('question')
@@ -1381,7 +1381,7 @@ def show_all_questions(request):
'questions': questions,
'form': form
}
- return my_render_to_response('exam/showquestions.html', context,
+ return my_render_to_response('yaksh_app/showquestions.html', context,
context_instance=ci)