diff options
author | Hardik Ghaghada | 2013-07-01 12:48:12 +0530 |
---|---|---|
committer | Hardik Ghaghada | 2013-07-01 12:48:12 +0530 |
commit | 77321c3590301a8550b8b351b6e8bbb382dc8947 (patch) | |
tree | dc47ea1a0315467ff8ac4559ae9877f6e25f0c69 | |
parent | 5ce91d1f2b2f2434bc51ddeeaf4f9f27305d1145 (diff) | |
download | online_test-77321c3590301a8550b8b351b6e8bbb382dc8947.tar.gz online_test-77321c3590301a8550b8b351b6e8bbb382dc8947.tar.bz2 online_test-77321c3590301a8550b8b351b6e8bbb382dc8947.zip |
made changes as per the comments on pull request
-rw-r--r-- | testapp/exam/views.py | 11 | ||||
-rw-r--r-- | testapp/static/exam/js/add_question.js | 65 |
2 files changed, 38 insertions, 38 deletions
diff --git a/testapp/exam/views.py b/testapp/exam/views.py index 6c977ee..4956f84 100644 --- a/testapp/exam/views.py +++ b/testapp/exam/views.py @@ -695,16 +695,15 @@ def check(request, q_id, questionpaper_id=None): # Add the answer submitted, regardless of it being correct or not. new_answer = Answer(question=question, answer=user_answer, correct=False) - new_answer.save() - paper.answers.add(new_answer) + else: - """Add the answer submitted with the Snippet code, - regardless of it being correct or not.""" + # Add the answer submitted with the Snippet code (correct or incorrect) answer_check = snippet_code + "\n" + user_answer new_answer = Answer(question=question, answer=answer_check, correct=False) - new_answer.save() - paper.answers.add(new_answer) + + new_answer.save() + paper.answers.add(new_answer) # If we were not skipped, we were asked to check. For any non-mcq # questions, we obtain the results via XML-RPC with the code executed diff --git a/testapp/static/exam/js/add_question.js b/testapp/static/exam/js/add_question.js index ab27dc0..d990291 100644 --- a/testapp/static/exam/js/add_question.js +++ b/testapp/static/exam/js/add_question.js @@ -26,16 +26,16 @@ function setSelectionRange(input, selectionStart, selectionEnd) { if (input.setSelectionRange) { - input.focus(); - input.setSelectionRange(selectionStart, selectionEnd); + input.focus(); + input.setSelectionRange(selectionStart, selectionEnd); } else if (input.createTextRange) { - var range = input.createTextRange(); - range.collapse(true); - range.moveEnd('character', selectionEnd); - range.moveStart('character', selectionStart); - range.select(); + var range = input.createTextRange(); + range.collapse(true); + range.moveEnd('character', selectionEnd); + range.moveStart('character', selectionStart); + range.select(); } } @@ -43,31 +43,31 @@ function replaceSelection (input, replaceString) { if (input.setSelectionRange) { - var selectionStart = input.selectionStart; - var selectionEnd = input.selectionEnd; - input.value = input.value.substring(0, selectionStart)+ replaceString + input.value.substring(selectionEnd); - if (selectionStart != selectionEnd) - { - setSelectionRange(input, selectionStart, selectionStart + replaceString.length); - } - else - { - setSelectionRange(input, selectionStart + replaceString.length, selectionStart + replaceString.length); - } + var selectionStart = input.selectionStart; + var selectionEnd = input.selectionEnd; + input.value = input.value.substring(0, selectionStart)+ replaceString + input.value.substring(selectionEnd); + if (selectionStart != selectionEnd) + { + setSelectionRange(input, selectionStart, selectionStart + replaceString.length); + } + else + { + setSelectionRange(input, selectionStart + replaceString.length, selectionStart + replaceString.length); + } } else if (document.selection) { - var range = document.selection.createRange(); - if (range.parentElement() == input) - { - var isCollapsed = range.text == ''; - range.text = replaceString; - if (!isCollapsed) - { - range.moveStart('character', -replaceString.length); - range.select(); - } - } + var range = document.selection.createRange(); + if (range.parentElement() == input) + { + var isCollapsed = range.text == ''; + range.text = replaceString; + if (!isCollapsed) + { + range.moveStart('character', -replaceString.length); + range.select(); + } + } } } @@ -97,7 +97,8 @@ function textareaformat() setTimeout(document.getElementById('id_snippet'),0); return false; } - }); + }); + $('#id_description').bind('focus', function( event ){ document.getElementById("id_description").rows=5; document.getElementById("id_description").cols=40; @@ -121,21 +122,21 @@ function textareaformat() document.getElementById("id_test").rows=1; document.getElementById("id_test").cols=40; }); + $('#id_options').bind('focus', function( event ){ document.getElementById("id_options").rows=5; document.getElementById("id_options").cols=40; }); - $('#id_options').bind('blur', function( event ){ document.getElementById("id_options").rows=1; document.getElementById("id_options").cols=40; }); + $('#id_snippet').bind('focus', function( event ){ document.getElementById("id_snippet").rows=5; document.getElementById("id_snippet").cols=40; $('#id_snippet').val(""); }); - $('#id_snippet').bind('blur', function( event ){ document.getElementById("id_snippet").rows=1; document.getElementById("id_snippet").cols=40; |