version 1.318, 2010/03/10 21:25:36
|
version 1.322, 2010/11/01 16:19:49
|
Line 47 use Apache::externalresponse();
|
Line 47 use Apache::externalresponse();
|
use Apache::rankresponse(); |
use Apache::rankresponse(); |
use Apache::matchresponse(); |
use Apache::matchresponse(); |
use Apache::chemresponse(); |
use Apache::chemresponse(); |
|
use Apache::functionplotresponse(); |
use Apache::drawimage(); |
use Apache::drawimage(); |
use Apache::Constants qw(:common); |
use Apache::Constants qw(:common); |
use Apache::loncommon(); |
use Apache::loncommon(); |
Line 111 sub get_target {
|
Line 112 sub get_target {
|
} elsif ( $env{'form.grade_target'} eq 'webgrade' |
} elsif ( $env{'form.grade_target'} eq 'webgrade' |
&& ($Apache::lonhomework::queuegrade eq 'F' )) { |
&& ($Apache::lonhomework::queuegrade eq 'F' )) { |
return ($env{'form.grade_target'}); |
return ($env{'form.grade_target'}); |
} |
} elsif ($env{'form.grade_target'} eq 'answer') { |
|
if ($env{'form.answer_output_mode'} eq 'tex') { |
|
return ($env{'form.grade_target'}); |
|
} |
|
} |
if ($env{'form.webgrade'} && |
if ($env{'form.webgrade'} && |
($Apache::lonhomework::modifygrades eq 'F' |
($Apache::lonhomework::modifygrades eq 'F' |
|| $Apache::lonhomework::queuegrade eq 'F' )) { |
|| $Apache::lonhomework::queuegrade eq 'F' )) { |
Line 170 sub setup_vars {
|
Line 175 sub setup_vars {
|
# return ';$external::target='.$target.';'; |
# return ';$external::target='.$target.';'; |
} |
} |
|
|
sub createmenu { |
|
my ($which,$request)=@_; |
|
if ($which eq 'grade') { |
|
$request->print('<script type="text/javascript" language="JavaScript"> |
|
hwkmenu=window.open("/res/adm/pages/homeworkmenu.html","homeworkremote", |
|
"height=350,width=150,menubar=no"); |
|
</script>'); |
|
} |
|
} |
|
|
|
sub proctor_checked_in { |
sub proctor_checked_in { |
my ($slot_name,$slot,$type)=@_; |
my ($slot_name,$slot,$type)=@_; |
my @possible_proctors=split(",",$slot->{'proctor'}); |
my @possible_proctors=split(",",$slot->{'proctor'}); |
Line 265 sub check_slot_access {
|
Line 260 sub check_slot_access {
|
} |
} |
if ($slotstatus eq 'NEEDS_CHECKIN' && |
if ($slotstatus eq 'NEEDS_CHECKIN' && |
&proctor_checked_in($slot_name,$returned_slot,$type)) { |
&proctor_checked_in($slot_name,$returned_slot,$type)) { |
&Apache::lonxml::debug("protoctor checked in"); |
&Apache::lonxml::debug("proctor checked in"); |
$slotstatus='CAN_ANSWER'; |
$slotstatus=$status; |
} |
} |
|
|
my ($is_correct,$got_grade,$checkedin); |
my ($is_correct,$got_grade,$checkedin); |