Commit ba9ba6c6 by Justin Riley

remove 'Request Access' button

Access is now automatically requested on each page load if necessary so
this button is no longer necessary. Updated the template to explain that
access has been requested but not yet granted and to contact the
instructor/TA if they're not given access soon. The page now
automatically checks status every few seconds and will automatically
reload when access has been granted.
parent b8918cae
...@@ -231,8 +231,6 @@ class ProctorModule(ProctorFields, XModule): ...@@ -231,8 +231,6 @@ class ProctorModule(ProctorFields, XModule):
# return self.grades() # return self.grades()
# Proctor Panel requests (ALL USERS) # Proctor Panel requests (ALL USERS)
if dispatch == 'request':
return self.pp.request(json=False)
if dispatch == 'status': if dispatch == 'status':
return self.pp.status(json=False) return self.pp.status(json=False)
......
...@@ -134,27 +134,25 @@ setup_form('${ajax_url}/submission_history', ...@@ -134,27 +134,25 @@ setup_form('${ajax_url}/submission_history',
<div> <div>
<h2>Welcome: <b>${pp.user.profile.name or pp.user}</b></h2> <h2>Welcome: <b>${pp.user.profile.name or pp.user}</b></h2>
<p>${name} has not been released</p> <p>
Access has been requested for <b>${name}</b> but it hasn't been released
<div id="proctor_stat_${element_id}"></div> yet.
</p>
<p><input id="proctor_${element_id}" type="button" value="Request Access"></p> <p>
This page will automatically reload once access has been granted.
</p>
<p>
Please see your instructor or TA if access is not granted soon.
</p>
</div> </div>
<script type="text/javascript"> <script type="text/javascript">
procrel = (function(){ procrel = (function(){
var el = $('#proctor_${element_id}'); var el = $('#proctor_${element_id}');
var skiperr = false; var skiperr = false;
var set_skiperr = function(){ skiperr = true; } var set_skiperr = function(){ skiperr = true; }
var check_count = 0;
var statel = $('#proctor_stat_${element_id}'); var interval = null;
var setstat = function(status){
statel.html('<p><font color="green">' + status + '</font></p>');
}
var _do_pp = function(cmd, type, gfun){ var _do_pp = function(cmd, type, gfun){
$.ajax({ url: "${ajax_url}/" + cmd, $.ajax({ url: "${ajax_url}/" + cmd,
...@@ -173,10 +171,6 @@ procrel = (function(){ ...@@ -173,10 +171,6 @@ procrel = (function(){
return _do_pp(cmd, 'GET', gfun); return _do_pp(cmd, 'GET', gfun);
} }
var do_pp_post = function(cmd, gfun){
return _do_pp(cmd, 'POST', gfun);
}
var check_access = function(){ var check_access = function(){
do_pp_get('status', function(data){ do_pp_get('status', function(data){
console.log(data); console.log(data);
...@@ -191,10 +185,6 @@ procrel = (function(){ ...@@ -191,10 +185,6 @@ procrel = (function(){
}); });
} }
var check_count = 0;
var interval = null;
var periodic_check = function() { var periodic_check = function() {
if (interval == null) { if (interval == null) {
console.log("setting interval for check_access"); console.log("setting interval for check_access");
...@@ -204,24 +194,7 @@ procrel = (function(){ ...@@ -204,24 +194,7 @@ procrel = (function(){
} }
} }
var make_request = function(){ periodic_check();
check_count = 0;
do_pp_post('request', function(result, status, xhr){
setstat(result.status);
periodic_check();
});
}
el.click(make_request);
return {
"check": check_access,
"make": make_request,
"do_pp_get": do_pp_get,
"do_pp_post": do_pp_post,
"set_skiperr": set_skiperr
};
}()); }());
</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