diff options
| -rw-r--r-- | testapp/exam/views.py | 22 | ||||
| -rw-r--r-- | testapp/static/exam/js/add_question.js | 89 | ||||
| -rw-r--r-- | testapp/static/exam/js/edit_question.js | 106 | ||||
| -rw-r--r-- | testapp/static/exam/js/question.js | 99 | ||||
| -rw-r--r-- | testapp/static/exam/js/show_quiz.js | 2 | ||||
| -rw-r--r-- | testapp/templates/exam/add_question.html | 2 | ||||
| -rw-r--r-- | testapp/templates/exam/edit_question.html | 2 | ||||
| -rw-r--r-- | testapp/templates/exam/question.html | 7 |
8 files changed, 249 insertions, 80 deletions
diff --git a/testapp/exam/views.py b/testapp/exam/views.py index 1d5d6f6..4c47004 100644 --- a/testapp/exam/views.py +++ b/testapp/exam/views.py @@ -684,14 +684,24 @@ def check(request, q_id, questionpaper_id=None): question = get_object_or_404(Question, pk=q_id) q_paper = QuestionPaper.objects.get(id=questionpaper_id) paper = AnswerPaper.objects.get(user=request.user, question_paper=q_paper) - answer = request.POST.get('answer') + snippet_code = request.POST.get('snippet') + user_answer = request.POST.get('answer') skip = request.POST.get('skip', None) if skip is not None: next_q = paper.skip() return show_question(request, next_q, questionpaper_id) + + if question.type == 'mcq': + # Add the answer submitted, regardless of it being correct or not. + new_answer = Answer(question=question, answer=user_answer, + correct=False) + + else: + # 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) - # Add the answer submitted, regardless of it being correct or not. - new_answer = Answer(question=question, answer=answer, correct=False) new_answer.save() paper.answers.add(new_answer) @@ -700,7 +710,7 @@ def check(request, q_id, questionpaper_id=None): # safely in a separate process (the code_server.py) running as nobody. if question.type == 'mcq': success = True # Only one attempt allowed for MCQ's. - if answer.strip() == question.test.strip(): + if user_answer.strip() == question.test.strip(): new_answer.correct = True new_answer.marks = question.points new_answer.error = 'Correct answer' @@ -708,7 +718,7 @@ def check(request, q_id, questionpaper_id=None): new_answer.error = 'Incorrect answer' else: user_dir = get_user_dir(user) - success, err_msg = code_server.run_code(answer, question.test, + success, err_msg = code_server.run_code(answer_check, question.test, user_dir, question.type) new_answer.error = err_msg if success: @@ -725,7 +735,7 @@ def check(request, q_id, questionpaper_id=None): if not paper.question_paper.quiz.active: return complete(request, reason='The quiz has been deactivated!') context = {'question': question, 'error_message': err_msg, - 'paper': paper, 'last_attempt': answer, + 'paper': paper, 'last_attempt': user_answer, 'quiz_name': paper.question_paper.quiz.description, 'time_left': time_left} ci = RequestContext(request) diff --git a/testapp/static/exam/js/add_question.js b/testapp/static/exam/js/add_question.js index 24af127..d990291 100644 --- a/testapp/static/exam/js/add_question.js +++ b/testapp/static/exam/js/add_question.js @@ -22,14 +22,83 @@ function decrease(frm) } -function textareaformat() +function setSelectionRange(input, selectionStart, selectionEnd) { + if (input.setSelectionRange) + { + 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(); + } +} +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); + } + } + 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(); + } + } + } +} + +function textareaformat() +{ document.getElementById('id_type').setAttribute('class','select-type'); - document.getElementById('id_points').setAttribute('class','mini-text'); document.getElementById('id_tags').setAttribute('class','tag-text'); - + + jQuery().ready(function() + { + $("#id_snippet").val("#To avoid indentation errors use tabs for indentation for Python questions"); + }); + + $('#id_snippet').bind('keydown', function( event ){ + if(navigator.userAgent.match("Gecko")) + { + c=event.which; + } + else + { + c=event.keyCode; + } + if(c==9) + { + replaceSelection(document.getElementById('id_snippet'),String.fromCharCode(9)); + 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; @@ -53,15 +122,26 @@ 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; + $('#id_snippet').val("#To avoid indentation errors use tabs for indentation for Python questions"); + }); $('#id_type').bind('change',function(event){ var value = document.getElementById('id_type').value; @@ -77,7 +157,6 @@ function textareaformat() document.getElementById('label_option').innerHTML = ""; } }); - document.getElementById('my').innerHTML = document.getElementById('id_description').value ; var value = document.getElementById('id_type').value; if(value == 'mcq') diff --git a/testapp/static/exam/js/edit_question.js b/testapp/static/exam/js/edit_question.js index acba384..8866b9a 100644 --- a/testapp/static/exam/js/edit_question.js +++ b/testapp/static/exam/js/edit_question.js @@ -46,6 +46,54 @@ function grade_data(showHideDiv) } } +function setSelectionRange(input, selectionStart, selectionEnd) +{ + if (input.setSelectionRange) + { + 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(); + } +} + +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); + } + } + 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(); + } + } + } +} function data(showContent,showHideDiv,a,summary) { @@ -56,7 +104,7 @@ function data(showContent,showHideDiv,a,summary) { con.style.display = "none" ele.style.display = "none"; - atag.text = summary; + atag.text = summary; } else { @@ -71,61 +119,84 @@ function textareaformat() var test = document.getElementsByName('test'); var option = document.getElementsByName('options'); var descriptions = document.getElementsByName('description'); + var snippets = document.getElementsByName('snippet'); var type = document.getElementsByName('type'); var tags = document.getElementsByName('tags'); - for (var i=0;i<point.length;i++) { point[i].id = point[i].id + i; descriptions[i+1].id=descriptions[i+1].id + i; test[i].id=test[i].id + i; + snippets[i].id=snippets[i].id + i; option[i].id=option[i].id + i; type[i].id = type[i].id + i; tags[i].id = tags[i].id + i; } - for(var i=0;i<point.length;i++) { var point_id = document.getElementById('id_points'+i); point_id.setAttribute('class','mini-text'); - var tags_id = document.getElementById('id_tags'+i); tags_id.setAttribute('class','ac_input'); tags_id.setAttribute('autocomplete','off'); - - jQuery().ready(function() - { - jQuery("#id_tags" + i).autocomplete("/taggit_autocomplete_modified/json", { multiple: true }); - }); - var type_id = document.getElementById('id_type'+i); type_id.setAttribute('class','select-type'); type_id.onchange = showOptions; var value = type_id.value; - var desc_id = document.getElementById('id_description'+i); desc_id.onfocus = gainfocus; desc_id.onblur = lostfocus; - var test_id = document.getElementById('id_test' + i); test_id.onfocus = gainfocus; test_id.onblur = lostfocus; - + var snippet_id = document.getElementById('id_snippet'+i); + $(snippet_id).bind('focus',function(event){ + this.rows = 5; + $(snippet_id).val(""); + }); + $(snippet_id).bind('blur',function(event){ + this.rows = 1; + $(snippet_id).val("#To avoid indentation errors use tab for indentation for Python questions"); + }); + $(snippet_id).bind('keydown', function (event){ + catchTab(snippet_id,event); + }); var option_id = document.getElementById('id_options' + i); option_id.onfocus = gainfocus; - option_id.onblur = lostfocus; - + option_id.onblur = lostfocus; if(value != 'mcq') { document.getElementById('id_options'+i).style.visibility='hidden'; document.getElementById('label_option'+(i+1)).innerHTML = ""; } - document.getElementById('my'+ (i+1)).innerHTML = desc_id.value; + jQuery().ready(function() + { + jQuery("#id_tags" + i).autocomplete("/taggit_autocomplete_modified/json", { multiple: true }); + $(snippet_id).val("#To avoid indentation errors use tab for indentation for Python questions"); + }); } } +function catchTab(item,e) +{ + if(navigator.userAgent.match("Gecko")) + { + c=e.which; + } + else + { + c=e.keyCode; + } + if(c==9) + { + replaceSelection(item,String.fromCharCode(9)); + setTimeout("document.getElementById('"+item.id+"').focus();",0); + return false; + } +} + function showOptions(e) { var value = this.value; @@ -141,9 +212,6 @@ function showOptions(e) document.getElementById('id_options'+no).style.visibility = 'hidden'; document.getElementById('label_option'+ (no+1)).innerHTML = ""; } - - - } function gainfocus(e) diff --git a/testapp/static/exam/js/question.js b/testapp/static/exam/js/question.js index ba3f6d2..cb6807e 100644 --- a/testapp/static/exam/js/question.js +++ b/testapp/static/exam/js/question.js @@ -13,16 +13,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(); } } @@ -30,59 +30,59 @@ 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(); + } + } } } -// We are going to catch the TAB key so that we can use it, Hooray! function catchTab(item,e) { if(navigator.userAgent.match("Gecko")) { - c=e.which; + c=e.which; } else { - c=e.keyCode; + c=e.keyCode; } if(c==9) { - replaceSelection(item,String.fromCharCode(9)); - setTimeout("document.getElementById('"+item.id+"').focus();",0); - return false; + replaceSelection(item,String.fromCharCode(9)); + setTimeout("document.getElementById('"+item.id+"').focus();",0); + return false; } } var lineObjOffsetTop = 2; - -function createTextAreaWithLines(id) + +function addLineNumbers(id) { var el = document.createElement('DIV'); var ta = document.getElementById(id); + var content = document.getElementById('snippet').value; ta.parentNode.insertBefore(el,ta); el.appendChild(ta); el.className='textAreaWithLines'; @@ -102,18 +102,29 @@ function createTextAreaWithLines(id) lineObj.style.textAlign = 'right'; lineObj.className='lineObj'; var string = ''; - for(var no=1;no<200;no++) + split_content = content.split('\n'); + if(id == "answer") { - if(string.length>0)string = string + '<br>'; - string = string + no; - } - //ta.onkeydown = function() { positionLineObj(lineObj,ta); }; - ta.onmousedown = function() { positionLineObj(lineObj,ta); }; + for(var no=split_content.length+1;no<1000;no++) + { + if(string.length>0)string = string + '<br>'; + string = string + no; + } + } + else + { + for(var no=1;no<=split_content.length;no++) + { + if(string.length>0)string = string + '<br>'; + string = string + no; + } + } + ta.onmousedown = function() { positionLineObj(lineObj,ta); }; ta.onscroll = function() { positionLineObj(lineObj,ta); }; ta.onblur = function() { positionLineObj(lineObj,ta); }; ta.onfocus = function() { positionLineObj(lineObj,ta); }; ta.onmouseover = function() { positionLineObj(lineObj,ta); }; - lineObj.innerHTML = string; + lineObj.innerHTML = string; } function positionLineObj(obj,ta) diff --git a/testapp/static/exam/js/show_quiz.js b/testapp/static/exam/js/show_quiz.js index 2e6e2de..c58feaa 100644 --- a/testapp/static/exam/js/show_quiz.js +++ b/testapp/static/exam/js/show_quiz.js @@ -38,6 +38,4 @@ function confirm_edit(frm) } else return true; - - } diff --git a/testapp/templates/exam/add_question.html b/testapp/templates/exam/add_question.html index e3ba17a..b49d7de 100644 --- a/testapp/templates/exam/add_question.html +++ b/testapp/templates/exam/add_question.html @@ -22,7 +22,7 @@ {% 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 }} Active: {{ form.active }}{{form.active.errors}} Type: {{ 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 }} Active: {{ form.active }}{{form.active.errors}} Type: {{ form.type }}{{form.type.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}} diff --git a/testapp/templates/exam/edit_question.html b/testapp/templates/exam/edit_question.html index 96502f1..73e61d7 100644 --- a/testapp/templates/exam/edit_question.html +++ b/testapp/templates/exam/edit_question.html @@ -31,7 +31,7 @@ <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 }} Active: {{ form.active }}{{form.active.errors}} Type: {{ 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 }} Active: {{ form.active }}{{form.active.errors}} Type: {{ form.type }}{{form.type.errors}} <tr><td><strong>Rendered: </strong><td><p id='my{{forloop.counter}}'></p> <tr><td><b>Description: <td>{{ form.description }} {{form.description.errors}} diff --git a/testapp/templates/exam/question.html b/testapp/templates/exam/question.html index 4f65b64..1d801b0 100644 --- a/testapp/templates/exam/question.html +++ b/testapp/templates/exam/question.html @@ -87,12 +87,15 @@ function update_time() {% endfor %} {% else %} - <textarea tabindex=1 rows="15" style="width:750px;margin-bottom:10px;" name="answer" id="answer" wrap="off" onkeydown="return catchTab(this,event)">{% if last_attempt %}{{last_attempt.strip}}{% else %}{% if question.type == "bash" %} #!/bin/bash{% else %}{{ question.snippet }}{% endif %}{% endif %}</textarea> + <textarea tabindex=1 rows="3" style="width:750px;margin-bottom:15px;height:auto;" readonly=yes name="snippet" id="snippet" wrap="off">{% if last_attempt %}{% else %}{% if question.type == "bash" %} #!/bin/bash{% else %} #To avoid errors use tabs for indentation for Python questions {{ question.snippet }}{% endif %}{% endif %}</textarea> + + <textarea tabindex=1 rows="10" style="width:750px;margin-bottom:10px;" name="answer" id="answer" wrap="off" onkeydown="return catchTab(this,event)">{% if last_attempt %}{{last_attempt.strip}}{% else %}{% if question.type == "bash" %}{% else %}{% endif %}{% endif %}</textarea> <br> <script type="text/javascript"> - createTextAreaWithLines('answer'); + addLineNumbers('answer'); </script> + <script>addLineNumbers('snippet');</Script> {% endif %} {% if question.type == "mcq" %} |