From 216031440bfe304ad51013950f49e88258ed9fde Mon Sep 17 00:00:00 2001 From: Hardik Ghaghada Date: Mon, 29 Apr 2013 11:05:39 +0530 Subject: Added a separate textarea for non-editable code for snippet feature --- testapp/exam/views.py | 4 +-- testapp/static/exam/js/question.js | 54 ++++++++++++++++++++++++++++++++++-- testapp/templates/exam/question.html | 7 +++-- 3 files changed, 59 insertions(+), 6 deletions(-) (limited to 'testapp') diff --git a/testapp/exam/views.py b/testapp/exam/views.py index 5a5f5fe..0767d67 100644 --- a/testapp/exam/views.py +++ b/testapp/exam/views.py @@ -476,8 +476,8 @@ def automatic_questionpaper(request, questionpaper_id=None): context = {'data': {'questions': fetched_questions, 'tags': tags, 'msg': msg}} - return my_render_to_response\( - 'exam/automatic_questionpaper.html', context, + return my_render_to_response\ + ('exam/automatic_questionpaper.html', context, context_instance=RequestContext(request)) else: tags = Tag.objects.all() diff --git a/testapp/static/exam/js/question.js b/testapp/static/exam/js/question.js index ba3f6d2..72b92e1 100644 --- a/testapp/static/exam/js/question.js +++ b/testapp/static/exam/js/question.js @@ -78,11 +78,51 @@ function catchTab(item,e) } var lineObjOffsetTop = 2; + +function createTextAreaWithLines2(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'; + el.style.width = (ta.offsetWidth + 30) + 'px'; + ta.style.position = 'absolute'; + ta.style.left = '30px'; + el.style.height = (ta.offsetHeight + 2) + 'px'; + el.style.overflow='hidden'; + el.style.position = 'relative'; + el.style.width = (ta.offsetWidth + 30) + 'px'; + var lineObj = document.createElement('DIV'); + lineObj.style.position = 'absolute'; + lineObj.style.top = lineObjOffsetTop + 'px'; + lineObj.style.left = '0px'; + lineObj.style.width = '27px'; + el.insertBefore(lineObj,ta); + lineObj.style.textAlign = 'right'; + lineObj.className='lineObj'; + var string = ''; + split_content = content.split('\n'); + for(var no=split_content.length+1;no<1000;no++) + { + if(string.length>0)string = string + '
'; + string = string + no; + } + //ta.onkeydown = function() { positionLineObj(lineObj,ta); }; + 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; +} function createTextAreaWithLines(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 +142,28 @@ function createTextAreaWithLines(id) lineObj.style.textAlign = 'right'; lineObj.className='lineObj'; var string = ''; - for(var no=1;no<200;no++) + split_content = content.split('\n'); + for(var no=1;no<=split_content.length;no++) { if(string.length>0)string = string + '
'; string = string + no; } + /*for(var no=1;no<200;no++) + { + if(string.length>0)string = string + '
'; + string = string + no; + if (content.trim.length == 0) + { + alert(string); + } + }*/ //ta.onkeydown = function() { positionLineObj(lineObj,ta); }; 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/templates/exam/question.html b/testapp/templates/exam/question.html index 4f65b64..3506c93 100644 --- a/testapp/templates/exam/question.html +++ b/testapp/templates/exam/question.html @@ -87,12 +87,15 @@ function update_time() {% endfor %} {% else %} - + + +
+ {% endif %} {% if question.type == "mcq" %} -- cgit From 71c2ad9ff8adc43f6d576571eceda07758e19ca9 Mon Sep 17 00:00:00 2001 From: Hardik Ghaghada Date: Tue, 30 Apr 2013 12:23:37 +0530 Subject: Snippet feature implemented --- testapp/exam/views.py | 29 ++++++++++++++++++++--------- testapp/templates/exam/question.html | 4 ++-- 2 files changed, 22 insertions(+), 11 deletions(-) (limited to 'testapp') diff --git a/testapp/exam/views.py b/testapp/exam/views.py index 0767d67..6c977ee 100644 --- a/testapp/exam/views.py +++ b/testapp/exam/views.py @@ -684,23 +684,34 @@ 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) - - # 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) + + 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) + new_answer.save() + paper.answers.add(new_answer) + else: + """Add the answer submitted with the Snippet code, + regardless of it being correct or not.""" + 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) # 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 # 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 +719,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 +736,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/templates/exam/question.html b/testapp/templates/exam/question.html index 3506c93..0fe7345 100644 --- a/testapp/templates/exam/question.html +++ b/testapp/templates/exam/question.html @@ -87,9 +87,9 @@ function update_time() {% endfor %} {% else %} - + - +
- + {% endif %} {% if question.type == "mcq" %} -- cgit From 6ab170ff9a530c2d59d4ce4a826c0fcaf9ec246f Mon Sep 17 00:00:00 2001 From: Hardik Ghaghada Date: Tue, 11 Jun 2013 17:40:29 +0530 Subject: Implemented tabs for indentation for snippets --- testapp/static/exam/js/add_question.js | 86 ++++++++++++++++++++++-- testapp/static/exam/js/edit_question.js | 104 ++++++++++++++++++++++++------ testapp/static/exam/js/question.js | 33 ---------- testapp/templates/exam/add_question.html | 2 +- testapp/templates/exam/edit_question.html | 2 +- 5 files changed, 170 insertions(+), 57 deletions(-) (limited to 'testapp') diff --git a/testapp/static/exam/js/add_question.js b/testapp/static/exam/js/add_question.js index 24af127..ab27dc0 100644 --- a/testapp/static/exam/js/add_question.js +++ b/testapp/static/exam/js/add_question.js @@ -22,14 +22,82 @@ 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; @@ -62,6 +130,17 @@ function textareaformat() 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 +156,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..023b654 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) { @@ -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;i0)string = string + '
'; - string = string + no; - } - lineObj.innerHTML = string; -}*/ - function positionLineObj(obj,ta) { obj.style.top = (ta.scrollTop * -1 + lineObjOffsetTop) + 'px'; 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 %}
Summary: {{ form.summary }}{{ form.summary.errors }} -
Points:{{ form.points }}{{ form.points.errors }}   Active:   {{ form.active }}{{form.active.errors}}   Type:  {{ form.type }}{{form.type.errors}} +
Points:{{ form.points }}{{ form.points.errors }}   Active:   {{ form.active }}{{form.active.errors}}   Type:  {{ form.type }}{{form.type.errors}}
Rendered:

Description: {{ form.description}} {{form.description.errors}}
Test: {{ 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 @@
Summary: {{ form.summary }}{{ form.summary.errors }} -
Points:{{ form.points }}{{ form.points.errors }}   Active:   {{ form.active }}{{form.active.errors}}   Type:  {{ form.type }}{{form.type.errors}} +
Points:{{ form.points }}{{ form.points.errors }}   Active:   {{ form.active }}{{form.active.errors}}   Type:  {{ form.type }}{{form.type.errors}}
Rendered:

Description: {{ form.description }} {{form.description.errors}} -- cgit From 5ce91d1f2b2f2434bc51ddeeaf4f9f27305d1145 Mon Sep 17 00:00:00 2001 From: Hardik Ghaghada Date: Tue, 11 Jun 2013 22:38:53 +0530 Subject: Modified textarea in student interface to notify about using tabs for indentation --- testapp/templates/exam/question.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'testapp') diff --git a/testapp/templates/exam/question.html b/testapp/templates/exam/question.html index 435f67f..1d801b0 100644 --- a/testapp/templates/exam/question.html +++ b/testapp/templates/exam/question.html @@ -87,7 +87,7 @@ function update_time() {% endfor %} {% else %} - +
-- cgit From 77321c3590301a8550b8b351b6e8bbb382dc8947 Mon Sep 17 00:00:00 2001 From: Hardik Ghaghada Date: Mon, 1 Jul 2013 12:48:12 +0530 Subject: made changes as per the comments on pull request --- testapp/exam/views.py | 11 +++--- testapp/static/exam/js/add_question.js | 65 +++++++++++++++++----------------- 2 files changed, 38 insertions(+), 38 deletions(-) (limited to 'testapp') 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; -- cgit