Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixed js to remove buttons when needed

Browse Source
This commit is contained in:
Vik Paruchuri
2012-11-01 12:27:42 -04:00
parent 5b6045b5fc
commit 9238653f7a
2 changed files with 32 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
common/lib/xmodule/xmodule/js/src/selfassessment/display.coffee
View File

@@ -2,21 +2,22 @@ $(document).on('click', 'section.sa-wrapper input#show', ( ->
root = location.protocol + "//" + location.host
post_url=$('section.sa-wrapper input#show').attr('url')
final_url="/courses/MITx/6.002x/2012_Fall/modx/#{post_url}/sa_show"
answer=$('section.sa-wrapper input#answer').val()
answer=$('section.sa-wrapper textarea#answer').val()
$.post final_url, answer, (response) ->
if response.success
$('section.sa-wrapper input#show').remove()
$('section.sa-wrapper textarea#answer').remove()
$('section.sa-wrapper p#rubric').append(answer)
$('section.sa-wrapper p#rubric').append(response.rubric)
));
$(document).on('click', 'section.sa-wrapper input#save', ( ->
assessment_correct=$('section.sa-wrapper #assessment').find(':selected').text()
root = location.protocol + "//" + location.host
post_url=$('section.sa-wrapper input#show').attr('url')
post_url=$('section.sa-wrapper input#save').attr('url')
final_url="/courses/MITx/6.002x/2012_Fall/modx/#{post_url}/sa_save"
$.post final_url, assessment_correct, (response) ->
if response.success
$('section.sa_wrapper p#save_message').replace(response.message)
alert("save")
if response.success
$('section.sa-wrapper p#save_message').append(response.message)
$('section.sa-wrapper input#save').remove()
));

35
common/lib/xmodule/xmodule/self_assessment_module.py
View File

@@ -21,10 +21,6 @@ from xmodule.contentstore.content import XASSET_SRCREF_PREFIX, StaticContent
log = logging.getLogger("mitx.courseware")
rubric_form=('<br/><br/>Please assess your performance given the above rubric: <br/><br/><section class="sa-wrapper"><select name="assessment" id="assessment">'
'<option value="incorrect">Incorrect</option><option value="correct">Correct</option></select><br/>'
'<input type="button" value="Save" id="save" name="save"/><p id="save_message"></p></section><br/><br/>')
def only_one(lst, default="", process=lambda x: x):
"""
If lst is empty, returns default
@@ -63,18 +59,31 @@ class SelfAssessmentModule(XModule):
instance_state, shared_state, **kwargs)
dom2=etree.fromstring("<selfassessment>" + self.definition['data'] + "</selfassessment>")
self.rubric=''.join([etree.tostring(child) for child in only_one(dom2.xpath('rubric'))])
self.rubric="<br/><br/>" + ''.join([etree.tostring(child) for child in only_one(dom2.xpath('rubric'))])
self.problem=''.join([etree.tostring(child) for child in only_one(dom2.xpath('problem'))])
problem_form=('<section class="sa-wrapper"><input type="text" name="answer" '
'id="answer"/><br/>'
problem_form=('<section class="sa-wrapper"><textarea name="answer" '
'id="answer" cols="50" rows="5"/><br/>'
'<input type="button" value="Check" id ="show" name="show" url="{0}"/>'
'<p id="rubric"></p></section><br/><br/>').format(self.location)
rubric_form=('<br/><br/>Please assess your performance given the above rubric: <br/>'
'<br/><section class="sa-wrapper"><select name="assessment" id="assessment">'
'<option value="incorrect">Incorrect</option><option value="correct">'
'Correct</option></select><br/>'
'<input type="button" value="Save" id="save" name="save" url="{0}"/>'
'<p id="save_message"></p></section><br/><br/>').format(self.location)
self.problem=''.join([self.problem,problem_form])
self.rubric=''.join([self.rubric,rubric_form])
self.html = self.problem
self.answer=""
self.score=0
self.top_score=1
self.submit_message=etree.tostring(dom2.xpath('submitmessage')[0])
log.debug(self.submit_message)
def get_score(self):
return self.score
@@ -126,6 +135,7 @@ class SelfAssessmentModule(XModule):
def show_rubric(self,get):
self.answer=get.keys()[0]
log.debug(self.answer)
return {'success': True, 'rubric' : self.rubric}
def save_problem(self, get):
@@ -135,13 +145,16 @@ class SelfAssessmentModule(XModule):
with the error key only present if success is False.
'''
correctness=get.keys()[0]
correctness=get.keys()[0].lower()
log.debug(correctness)
points=0
if correctness=="correct" :
points=1
event_info = dict()
event_info['state'] = {'seed': 1,
'student_answers': self.answers,
'student_answers': self.answer,
'correct_map': {'self_assess' : {'correctness': correctness,
'npoints': 0,
'npoints': points,
'msg': "",
'hint': "",
'hintmode': "",
@@ -155,7 +168,7 @@ class SelfAssessmentModule(XModule):
self.system.track_function('save_problem_succeed', event_info)
return {'success': True, 'message' : "Save Succcesful. Thanks for participating!"}
return {'success': True, 'message' : self.submit_message}
class SelfAssessmentDescriptor(XmlDescriptor, EditingDescriptor):
"""