Commit 9b6e053f by Justin Riley

report success/failure in proctor admin reset form

parent 3c07eed7
...@@ -235,9 +235,12 @@ class ProctorModule(ProctorFields, XModule): ...@@ -235,9 +235,12 @@ class ProctorModule(ProctorFields, XModule):
return self.child.get_icon_class() if self.child else 'other' return self.child.get_icon_class() if self.child else 'other'
def reset(self, username): def reset(self, username):
try:
pminfo = module_tree_reset.ProctorModuleInfo(self.runtime.course_id) pminfo = module_tree_reset.ProctorModuleInfo(self.runtime.course_id)
pminfo.get_assignments_attempted_and_failed(username, do_reset=True) pminfo.get_assignments_attempted_and_failed(username, do_reset=True)
return self.status(username) return self.status(username)
except Exception as exc:
return json.dumps({"error": str(exc)})
def status(self, username): def status(self, username):
try: try:
......
...@@ -36,16 +36,37 @@ proctor_override = function(){ ...@@ -36,16 +36,37 @@ proctor_override = function(){
} }
$('#proctor_override').click(proctor_override); $('#proctor_override').click(proctor_override);
$('#proctor_${element_id}_submit').click( function() { $('#proctor_${element_id}_reset_form').submit(function(e) {
e.preventDefault();
$('#proctor_${element_id}_submit').attr("disabled", true);
$('#proctor_${element_id}_submit').html('${_("Processing, please wait...")}');
$.ajax({ $.ajax({
url: '${ajax_url}/reset', url: '${ajax_url}/reset',
type: 'POST', type: 'POST',
dataType: 'json', dataType: 'json',
data: $('#proctor_${element_id}_reset_form').serialize(), data: $('#proctor_${element_id}_reset_form').serialize(),
success: function(data) { success: function(data) {
$('#proctor_${element_id}_text').append(JSON.stringify(data)); var msg = '';
if ('error' in data) {
msg = "ERROR: " + data['error'];
} else {
var uname = $('#proctor_${element_id}_student_username').val();
msg = "Successfully reset attempts for user: " + uname;
} }
$('#proctor_${element_id}_text').html(msg);
},
error: function(xhr, stat, error){
console.debug(xhr);
console.debug(stat);
console.debug(error);
$('#proctor_${element_id}_text').html('FATAL: ' + error);
},
complete: function(){
$('#proctor_${element_id}_submit').removeAttr("disabled");
$('#proctor_${element_id}_submit').html('${_("Reset Attempts")}');
},
}); });
return false;
}); });
</script> </script>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment