version 1.7, 2005/03/31 16:05:13
|
version 1.16, 2005/05/03 06:44:56
|
Line 37 use Apache::lonmenu;
|
Line 37 use Apache::lonmenu;
|
use Apache::lonlocal; |
use Apache::lonlocal; |
use Apache::lonxml; |
use Apache::lonxml; |
use Time::HiRes qw( gettimeofday tv_interval ); |
use Time::HiRes qw( gettimeofday tv_interval ); |
|
|
BEGIN { |
BEGIN { |
&Apache::lonxml::register('Apache::bridgetask',('Task','IntroParagraph','Dimension','Instance','InstanceText','Criteria','ClosingParagraph')); |
&Apache::lonxml::register('Apache::bridgetask',('Task','IntroParagraph','Dimension','Instance','InstanceText','Criteria','ClosingParagraph')); |
} |
} |
|
|
|
sub initialize_bridgetask { |
|
# id of current Dimension, 0 means that no dimension is current |
|
# (inside <Task> only) |
|
$Apache::bridgetask::dimension=''; |
|
# list of all Dimension ids seen |
|
@Apache::bridgetask::dimensionlist=(); |
|
# list of all current Instance ids |
|
@Apache::bridgetask::instance=(); |
|
# list of all Instance ids seen in this problem |
|
@Apache::bridgetask::instancelist=(); |
|
# key of queud user data that we are currently grading |
|
$Apache::bridgetask::queue_key=''; |
|
} |
|
|
sub proctor_check_auth { |
sub proctor_check_auth { |
my ($slot)=@_; |
my ($slot)=@_; |
my $user=$ENV{'form.proctorname'}; |
my $user=$env{'form.proctorname'}; |
my $domain=$ENV{'form.proctordomain'}; |
my $domain=$env{'form.proctordomain'}; |
|
|
my @allowed=split(",",$slot->{'proctor'}); |
my @allowed=split(",",$slot->{'proctor'}); |
foreach my $possible (@allowed) { |
foreach my $possible (@allowed) { |
my ($puser,$pdom)=(split('@',$possible)); |
my ($puser,$pdom)=(split('@',$possible)); |
if ($puser eq $user && $pdom eq $domain) { |
if ($puser eq $user && $pdom eq $domain) { |
my $authhost=&Apache::lonnet::authenticate($puser,$ENV{'form.proctorpassword'},$pdom); |
my $authhost=&Apache::lonnet::authenticate($puser,$env{'form.proctorpassword'},$pdom); |
if ($authhost ne 'no_host') { |
if ($authhost ne 'no_host') { |
$Apache::lonhomework::results{'resource.checkedin'}= |
$Apache::lonhomework::results{'resource.checkedin'}= |
$user.'@'.$domain; |
$user.'@'.$domain; |
Line 61 sub proctor_check_auth {
|
Line 76 sub proctor_check_auth {
|
return 0; |
return 0; |
} |
} |
|
|
|
sub add_previous_version_button { |
|
my $result; |
|
$result.=&mt(' Show a previously done version: [_1]','<select name="previousversion"> |
|
<option>Pick one</option> |
|
</select>'); |
|
return $result; |
|
} |
|
|
|
sub add_grading_button { |
|
my $result; |
|
$result.=' <input type="submit" name="gradeasubmission" value="'. |
|
&mt("Get a submission to grade").'" />'; |
|
$result.='<input type="hidden" name="grade_target" value="webgrade" />'; |
|
return $result; |
|
} |
|
|
sub start_Task { |
sub start_Task { |
my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_; |
my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_; |
|
|
&Apache::structuretags::initialize_storage(); |
|
&Apache::lonhomework::showhash(%Apache::lonhomework::history); |
|
|
|
my ($status,$accessmsg,$slot); |
my ($status,$accessmsg,$slot); |
|
if ($target ne 'webgrade') { |
|
&Apache::structuretags::initialize_storage(); |
|
&Apache::lonhomework::showhash(%Apache::lonhomework::history); |
|
} |
|
|
$Apache::lonhomework::parsing_a_task=1; |
$Apache::lonhomework::parsing_a_task=1; |
#should get back a <html> or the neccesary stuff to start XML/MathML |
#should get back a <html> or the neccesary stuff to start XML/MathML |
my ($result,$head_tag_start,$body_tag_start,$form_tag_start)= |
my ($result,$head_tag_start,$body_tag_start,$form_tag_start)= |
&Apache::structuretags::page_start($target,$token,$tagstack,$parstack,$parser,$safeeval); |
&Apache::structuretags::page_start($target,$token,$tagstack,$parstack,$parser,$safeeval); |
|
|
|
if ($target eq 'web') { |
|
$body_tag_start.=&add_previous_version_button(); |
|
if ($Apache::lonhomework::modifygrades) { |
|
$body_tag_start.='<form name="gradesubmission" method="POST" action="'; |
|
my $uri=$env{'request.uri'}; |
|
if ($env{'request.enc'}) { $uri=&Apache::lonenc::encrypted($uri); } |
|
$body_tag_start.=$uri.'">'.&add_grading_button()."</form>"; |
|
} |
|
} |
if ($target eq 'web' || $target eq 'grade' || $target eq 'answer' || |
if ($target eq 'web' || $target eq 'grade' || $target eq 'answer' || |
$target eq 'tex') { |
$target eq 'tex') { |
($status,$accessmsg,$slot) = |
($status,$accessmsg,my $slot_name,$slot) = |
&Apache::lonhomework::check_task_access('0'); |
&Apache::lonhomework::check_task_access('0'); |
push (@Apache::inputtags::status,$status); |
push(@Apache::inputtags::status,$status); |
|
$Apache::inputtags::slot_name=$slot_name; |
my $expression='$external::datestatus="'.$status.'";'; |
my $expression='$external::datestatus="'.$status.'";'; |
$expression.='$external::gradestatus="'.$Apache::lonhomework::history{"resource.0.solved"}.'";'; |
$expression.='$external::gradestatus="'.$Apache::lonhomework::history{"resource.0.solved"}.'";'; |
&Apache::run::run($expression,$safeeval); |
&Apache::run::run($expression,$safeeval); |
Line 128 sub start_Task {
|
Line 171 sub start_Task {
|
$body_tag_start \n $form_tag_start". |
$body_tag_start \n $form_tag_start". |
'<input type="hidden" name="submitted" value="yes" />'; |
'<input type="hidden" name="submitted" value="yes" />'; |
# if we are viewing someone else preserve that info |
# if we are viewing someone else preserve that info |
if (defined $ENV{'form.grade_symb'}) { |
if (defined $env{'form.grade_symb'}) { |
foreach my $field ('symb','courseid','domain','username') { |
foreach my $field ('symb','courseid','domain','username') { |
$result .= '<input type="hidden" name="grade_'.$field. |
$result .= '<input type="hidden" name="grade_'.$field. |
'" value="'.$ENV{"form.grade_$field"}.'" />'."\n"; |
'" value="'.$env{"form.grade_$field"}.'" />'."\n"; |
} |
} |
} |
} |
} |
} |
|
} elsif ($target eq 'webgrade') { |
|
$result.=$head_tag_start.$body_tag_start.$form_tag_start; |
|
$result.= |
|
'<input type="hidden" name="grade_target" value="webgrade" />'; |
|
$result.=&show_queue(); |
|
my $todo=&get_from_queue(); |
|
if ($todo) { |
|
&setup_env_for_other_user($todo,$safeeval); |
|
my ($symb,$uname,$udom)=&decode_queue_key($todo); |
|
$result.="\n".'<table><tr><td>Found '. |
|
&Apache::lonnet::gettitle($symb).' for '.$uname.' at '.$udom.'</td></tr></table>'; |
|
$result.='<input type="hidden" name="gradingkey" value="'. |
|
&Apache::lonnet::escape($todo).'" />'; |
|
$Apache::bridgetask::queue_key=$todo; |
|
&Apache::structuretags::initialize_storage(); |
|
&Apache::lonhomework::showhash(%Apache::lonhomework::history); |
|
} else { |
|
$result.="\n". |
|
'<table><tr><td>No user to be graded.</td></tr></table>'; |
|
my $bodytext=&Apache::lonxml::get_all_text("/task",$parser); |
|
} |
|
|
} else { |
} else { |
# page_start returned a starting result, delete it if we don't need it |
# page_start returned a starting result, delete it if we don't need it |
$result = ''; |
$result = ''; |
Line 149 sub end_Task {
|
Line 214 sub end_Task {
|
if ($target eq 'grade' || $target eq 'web' || $target eq 'answer' || |
if ($target eq 'grade' || $target eq 'web' || $target eq 'answer' || |
$target eq 'tex') { |
$target eq 'tex') { |
if ( |
if ( |
(($target eq 'web') && ($ENV{'request.state'} ne 'construct')) || |
(($target eq 'web') && ($env{'request.state'} ne 'construct')) || |
($target eq 'answer') || ($target eq 'tex') |
($target eq 'answer') || ($target eq 'tex') |
) { |
) { |
if ($target eq 'web') { |
if ($target eq 'web') { |
|
if ($status eq 'CAN_ANSWER') { |
|
$result.="\n".'<table border="1">'. |
|
&Apache::inputtags::file_selector('0',"bridgetask","*", |
|
'portfolioonly'). |
|
"</table>"; |
|
$result.=&Apache::inputtags::gradestatus('0'); |
|
} |
|
} |
|
if ($target eq 'web' || $target eq 'webgrade') { |
$result.=&Apache::lonxml::xmlend().'</html>'; |
$result.=&Apache::lonxml::xmlend().'</html>'; |
} |
} |
} |
} |
if ($target eq 'grade') { |
if ($target eq 'grade') { |
|
my $award='SUBMITTED'; |
|
&Apache::essayresponse::file_submission('0','bridgetask','portfiles',\$award); |
|
if ($award eq 'SUBMITTED' && |
|
$Apache::lonhomework::results{"resource.0.bridgetask.portfiles"}) { |
|
$Apache::lonhomework::results{"resource.0.tries"}= |
|
1+$Apache::lonhomework::history{"resource.0.tries"}; |
|
} |
|
$Apache::lonhomework::results{"resource.0.award"}=$award; |
&Apache::lonhomework::showhash(%Apache::lonhomework::results); |
&Apache::lonhomework::showhash(%Apache::lonhomework::results); |
&Apache::structuretags::finalize_storage(); |
&Apache::structuretags::finalize_storage(); |
|
if ($award eq 'SUBMITTED') { |
|
&add_to_queue(); |
|
} |
} |
} |
|
} elsif ($target eq 'webgrade') { |
|
$result.="\n<hr />"; |
|
$result.='<input type="submit" name="next" value="'. |
|
&mt('Save & Next').'" /> '; |
|
$result.='<input type="submit" name="end" value="'. |
|
&mt('Save & Stop Grading').'" /> '; |
|
$result.='<input type="submit" name="end" value="'. |
|
&mt('Throw Away & Stop Grading').'" /> '; |
|
$result.='</form>'.&Apache::loncommon::endbodytag().'</html>'; |
} elsif ($target eq 'meta') { |
} elsif ($target eq 'meta') { |
$result.='<parameter part="0" package="Task"></parameter>'."\n"; |
$result.='<parameter part="0" package="Task"></parameter>'."\n"; |
#$result.=&Apache::response::meta_part_order(); |
#$result.=&Apache::response::meta_part_order(); |
Line 169 sub end_Task {
|
Line 263 sub end_Task {
|
return $result; |
return $result; |
} |
} |
|
|
|
sub setup_env_for_other_user { |
|
my ($queue_key,$safeeval)=@_; |
|
my ($symb,$uname,$udom)=&decode_queue_key($queue_key); |
|
$env{'form.grade_symb'}=$symb; |
|
$env{'form.grade_domain'}=$udom; |
|
$env{'form.grade_username'}=$uname; |
|
$env{'form.grade_courseid'}=$env{'request.course.id'}; |
|
&Apache::lonxml::initialize_rndseed($safeeval); |
|
} |
|
|
|
sub add_to_queue { |
|
my ($symb,$cid,$udom,$uname)=&Apache::lonxml::whichuser(); |
|
my $cnum=$env{'course.'.$cid.'.num'}; |
|
my $cdom=$env{'course.'.$cid.'.domain'}; |
|
my %data; |
|
$data{"$symb\0queue\0$uname\@$udom"}=[$Apache::inputtags::slot_name]; |
|
&Apache::lonnet::put('gradingqueue',\%data,$cdom,$cnum); |
|
} |
|
|
|
sub show_queue { |
|
my $result; |
|
my ($symb,$cid,$udom,$uname)=&Apache::lonxml::whichuser(); |
|
my $cnum=$env{'course.'.$cid.'.num'}; |
|
my $cdom=$env{'course.'.$cid.'.domain'}; |
|
my $regexp="^$symb\0"; |
|
my %queue=&Apache::lonnet::dump('gradingqueue',$cdom,$cnum,$regexp); |
|
$result.="\n<h3>Current Queue</h3><table><tr><th>resource</th><th>user</th><th>type</th><th>data</th></tr>"; |
|
foreach my $key (sort(keys(%queue))) { |
|
if ($key=~/locked$/) { |
|
my ($symb,$uname,$udom) = &decode_queue_key($key); |
|
my $title=&Apache::lonnet::gettitle($symb); |
|
$result.="<tr><td>$title</td><td>$uname</td><td>"; |
|
$result.='<td>lock</td><td>'.$queue{$key}.'</td></tr>'; |
|
} elsif ($key=~/timestamp$/) { |
|
my ($symb,undef) = split("\0",$key); |
|
my $title=&Apache::lonnet::gettitle($symb); |
|
$result.="<tr><td>$title</td><td></td><td>"; |
|
$result.='<td>last queue modification time</td><td>'. |
|
&Apache::lonlocal::locallocaltime($queue{$key})."</td></tr>"; |
|
} else { |
|
my ($symb,$uname,$udom) = &decode_queue_key($key); |
|
my $title=&Apache::lonnet::gettitle($symb); |
|
$result.="<tr><td>$title</td><td>$uname</td><td>"; |
|
my $slot=$queue{$key}->[0]; |
|
my %slot_data=&Apache::lonnet::get_slot($slot); |
|
$result.='<td>queue entry</td><td>End time: '.&Apache::lonlocal::locallocaltime($slot_data{'endtime'})."</td></tr>"; |
|
} |
|
} |
|
$result.="</table><hr />\n"; |
|
return $result; |
|
} |
|
|
|
sub decode_queue_key { |
|
my ($key)=@_; |
|
my ($symb,undef,$user) = split("\0",$key); |
|
my ($uname,$udom) = split('@',$user); |
|
return ($symb,$uname,$udom); |
|
} |
|
|
|
sub queue_key_locked { |
|
my ($key,$cdom,$cnum)=@_; |
|
my ($key_locked,$value)= |
|
&Apache::lonnet::get('gradingqueue',["$key\0locked"],$cdom,$cnum); |
|
if ($key_locked eq "$key\0locked") { |
|
return $value; |
|
} |
|
return undef; |
|
} |
|
|
|
sub pick_from_queue_data { |
|
my ($check_section,$queue,$cdom,$cnum)=@_; |
|
foreach my $key (keys(%$queue)) { |
|
my ($symb,$uname,$udom)=&decode_queue_key($key); |
|
if ($check_section) { |
|
my $section=&Apache::lonnet::getsection($uname,$udom); |
|
if ($section ne $check_section) { |
|
&Apache::lonnet::logthis("not my sec"); |
|
next; |
|
} |
|
} |
|
my $slot=$queue->{$key}[0]; |
|
my %slot_data=&Apache::lonnet::get_slot($slot); |
|
if ($slot_data{'endtime'} > time) { |
|
&Apache::lonnet::logthis("not time"); |
|
next; |
|
} |
|
if (&queue_key_locked($key,$cdom,$cnum)) { |
|
&Apache::lonnet::logthis("someone already has um."); |
|
next; |
|
} |
|
return $key; |
|
} |
|
return undef; |
|
} |
|
|
|
sub find_mid_grade { |
|
my ($symb,$cdom,$cnum)=@_; |
|
my $todo=&Apache::lonnet::unescape($env{'form.gradingkey'}); |
|
my $me=$env{'user.name'}.'@'.$env{'user.domain'}; |
|
if ($todo) { |
|
my $who=&queue_key_locked($todo,$cdom,$cnum); |
|
if ($who eq $me) { return $todo; } |
|
} |
|
my $regexp="^$symb\0.*\0locked\$"; |
|
my %locks=&Apache::lonnet::dump('gradingqueue',$cdom,$cnum,$regexp); |
|
foreach my $key (keys(%locks)) { |
|
my $who=$locks{$key}; |
|
if ($who eq $me) { |
|
$todo=$key; |
|
$todo=~s/\0locked$//; |
|
return $todo; |
|
} |
|
} |
|
return undef; |
|
} |
|
|
|
sub get_from_queue { |
|
my $result; |
|
my ($symb,$cid,$udom,$uname)=&Apache::lonxml::whichuser(); |
|
my $cnum=$env{'course.'.$cid.'.num'}; |
|
my $cdom=$env{'course.'.$cid.'.domain'}; |
|
my $todo; |
|
# FIXME need to find if I am 'mid grading' |
|
$todo=&find_mid_grade($symb,$cdom,$cnum); |
|
&Apache::lonnet::logthis("found ".join(':',&decode_queue_key($todo))); |
|
if ($todo) { return $todo; } |
|
while (1) { |
|
my $starttime=time; |
|
&Apache::lonnet::put('gradingqueue',{"$symb\0timestamp"=>$starttime}, |
|
$cdom,$cnum); |
|
&Apache::lonnet::logthis("$starttime"); |
|
my $regexp="^$symb\0queue\0"; |
|
my %queue=&Apache::lonnet::dump('gradingqueue',$cdom,$cnum,$regexp); |
|
#make a pass looking for a user in my section |
|
if ($env{'request.course.sec'}) { |
|
&Apache::lonnet::logthis("sce"); |
|
$todo=&pick_from_queue_data($env{'request.course.sec'},\%queue, |
|
$cdom,$cnum); |
|
&Apache::lonnet::logthis("sce $todo"); |
|
} |
|
# no one in our section so look for any user that is ready for grading |
|
if (!$todo) { |
|
&Apache::lonnet::logthis("no sce"); |
|
$todo=&pick_from_queue_data($env{'request.course.sec'},\%queue, |
|
$cdom,$cnum); |
|
&Apache::lonnet::logthis("no sce $todo"); |
|
} |
|
# no user to grade |
|
if (!$todo) { last; } |
|
&Apache::lonnet::logthis("got $todo"); |
|
# otherwise found someone so lets try to lock them |
|
my $success=&Apache::lonnet::newput('gradingqueue', |
|
{"$todo\0locked"=> |
|
$env{'user.name'}.'@'.$env{'user.domain'}}, |
|
$cdom,$cnum); |
|
# someone else already picked them |
|
&Apache::lonnet::logthis("success $todo"); |
|
if ($success ne 'ok') { next; } |
|
my (undef,$endtime)= |
|
&Apache::lonnet::get('gradingqueue',["$symb\0timestamp"], |
|
$cdom,$cnum); |
|
&Apache::lonnet::logthis("emd $endtime"); |
|
# someone else already modified the queue, |
|
# perhaps our picked user wass already fully graded between |
|
# when we picked him and when we locked his record? so lets |
|
# double check. |
|
if ($endtime != $starttime) { |
|
my ($key,$value)= |
|
&Apache::lonnet::get('gradingqueue',["$todo"], |
|
$cdom,$cnum); |
|
&Apache::lonnet::logthis("check $key .. $value"); |
|
if ($key eq $todo && ref($value)) { |
|
} else { |
|
&Apache::lonnet::del('gradingqueue',["$todo\0locked"], |
|
$cdom,$cnum); |
|
&Apache::lonnet::logthis("del"); |
|
next; |
|
} |
|
} |
|
&Apache::lonnet::logthis("last $todo"); |
|
last; |
|
} |
|
return $todo; |
|
} |
|
|
sub start_ClosingParagraph { |
sub start_ClosingParagraph { |
my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_; |
my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_; |
my $result; |
my $result; |
if ($target eq 'web') { |
if ($target eq 'web') { |
|
} elsif ($target eq 'webgrade') { |
|
&Apache::lonxml::startredirection(); |
} |
} |
return $result; |
return $result; |
} |
} |
Line 181 sub end_ClosingParagraph {
|
Line 462 sub end_ClosingParagraph {
|
my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_; |
my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_; |
my $result; |
my $result; |
if ($target eq 'web') { |
if ($target eq 'web') { |
|
} elsif ($target eq 'webgrade') { |
|
&Apache::lonxml::endredirection(); |
} |
} |
return $result; |
return $result; |
} |
} |
|
|
my %dimension; |
my %dimension; |
my $dim_id; |
|
sub start_Dimension { |
sub start_Dimension { |
my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_; |
my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_; |
undef(%dimension); |
undef(%dimension); |
$dim_id=$Apache::lonxml::curdepth; |
my $dim_id=$Apache::lonxml::curdepth; |
|
$Apache::bridgetask::dimension=$dim_id; |
|
push(@Apache::bridgetask::dimensionlist,$dim_id); |
|
undef(@Apache::bridgetask::instance); |
return ''; |
return ''; |
} |
} |
|
|
|
sub get_instance { |
|
#FIXME just grabbing the first one for now, need |
|
#to randomly pick one until all have been seen |
|
#then start repicking |
|
&Apache::response::pushrandomnumber(); |
|
my @order=&Math::Random::random_permutation(@{$dimension{'instances'}}); |
|
return $order[0]; |
|
} |
|
|
sub end_Dimension { |
sub end_Dimension { |
my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_; |
my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_; |
my $result; |
my $result; |
if ($target eq 'web') { |
if ($target eq 'web') { |
#FIXME just grabbing the first one for now, need |
my $instance=&get_instance(); |
#to randomly pick one until all have been seen |
$result=$dimension{'intro'}.$dimension{$instance.'.text'}; |
#then start repicking |
} elsif ($target eq 'webgrade') { |
my $instance=$dimension{'instances'}->[0]; |
my $instance=&get_instance(); |
$result=$dimension{'intro'}. |
$result.="\n".'<table>'; |
$dimension{$instance.'.text'}; |
foreach my $id (@{$dimension{$instance.'.criterias'}}) { |
#FIXME: don't show the criteria yet |
$result.='<tr><td>'. |
#foreach my $id (@{$dimension{$instance.'.criterias'}}) { |
$dimension{$instance.'.criteria.'.$id}.'</td></tr>'; |
# $result.=$dimension{$instance.'.criteria.'.$id}; |
} |
#} |
$result.='</table>'; |
} |
} |
return $result; |
return $result; |
} |
} |
Line 215 sub end_Dimension {
|
Line 509 sub end_Dimension {
|
sub start_IntroParagraph { |
sub start_IntroParagraph { |
my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_; |
my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_; |
my $result; |
my $result; |
if ($target eq 'web') { |
if ($target eq 'web' || $target eq 'webgrade') { |
if ($tagstack->[-2] eq 'Dimension') { |
if ($tagstack->[-2] eq 'Dimension' || $target eq 'webgrade') { |
&Apache::lonxml::startredirection(); |
&Apache::lonxml::startredirection(); |
} |
} |
} |
} |
Line 226 sub start_IntroParagraph {
|
Line 520 sub start_IntroParagraph {
|
sub end_IntroParagraph { |
sub end_IntroParagraph { |
my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_; |
my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_; |
my $result; |
my $result; |
if ($target eq 'web') { |
if ($target eq 'web' || $target eq 'webgrade') { |
if ($tagstack->[-2] eq 'Dimension') { |
if ($tagstack->[-2] eq 'Dimension' || $target eq 'webgrade') { |
$dimension{'intro'}=&Apache::lonxml::endredirection(); |
$dimension{'intro'}=&Apache::lonxml::endredirection(); |
} |
} |
} |
} |
return $result; |
return $result; |
} |
} |
|
|
my $instance_id; |
|
sub start_Instance { |
sub start_Instance { |
my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_; |
my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_; |
push(@{$dimension{'instances'}},$Apache::lonxml::curdepth); |
push(@{$dimension{'instances'}},$Apache::lonxml::curdepth); |
$instance_id=$Apache::lonxml::curdepth; |
push(@Apache::bridgetask::instance,$Apache::lonxml::curdepth); |
|
push(@Apache::bridgetask::instancelist,$Apache::lonxml::curdepth); |
return ''; |
return ''; |
} |
} |
|
|
Line 249 sub end_Instance {
|
Line 543 sub end_Instance {
|
|
|
sub start_InstanceText { |
sub start_InstanceText { |
my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_; |
my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_; |
if ($target eq 'web') { |
if ($target eq 'web' || $target eq 'webgrade') { |
&Apache::lonxml::startredirection(); |
&Apache::lonxml::startredirection(); |
} |
} |
return ''; |
return ''; |
Line 257 sub start_InstanceText {
|
Line 551 sub start_InstanceText {
|
|
|
sub end_InstanceText { |
sub end_InstanceText { |
my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_; |
my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_; |
if ($target eq 'web') { |
my $instance_id=$Apache::bridgetask::instance[-1]; |
|
if ($target eq 'web' || $target eq 'webgrade') { |
$dimension{$instance_id.'.text'}=&Apache::lonxml::endredirection(); |
$dimension{$instance_id.'.text'}=&Apache::lonxml::endredirection(); |
} |
} |
return ''; |
return ''; |
Line 265 sub end_InstanceText {
|
Line 560 sub end_InstanceText {
|
|
|
sub start_Criteria { |
sub start_Criteria { |
my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_; |
my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_; |
if ($target eq 'web') { |
if ($target eq 'web' || $target eq 'webgrade') { |
&Apache::lonxml::startredirection(); |
&Apache::lonxml::startredirection(); |
} |
} |
return ''; |
return ''; |
Line 273 sub start_Criteria {
|
Line 568 sub start_Criteria {
|
|
|
sub end_Criteria { |
sub end_Criteria { |
my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_; |
my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_; |
if ($target eq 'web') { |
my $instance_id=$Apache::bridgetask::instance[-1]; |
|
if ($target eq 'web' || $target eq 'webgrade') { |
my $criteria=&Apache::lonxml::endredirection(); |
my $criteria=&Apache::lonxml::endredirection(); |
my $id=$Apache::lonxml::curdepth; |
my $id=$Apache::lonxml::curdepth; |
$dimension{$instance_id.'.criteria.'.$id}=$criteria; |
$dimension{$instance_id.'.criteria.'.$id}=$criteria; |
Line 286 sub proctor_validation_screen {
|
Line 582 sub proctor_validation_screen {
|
my ($slot) = @_; |
my ($slot) = @_; |
my (undef,undef,$domain,$user) = &Apache::lonxml::whichuser(); |
my (undef,undef,$domain,$user) = &Apache::lonxml::whichuser(); |
my $url=&Apache::lonnet::studentphoto($domain,$user,'jpg'); |
my $url=&Apache::lonnet::studentphoto($domain,$user,'jpg'); |
$user=$ENV{'form.proctorname'}; |
$user=$env{'form.proctorname'}; |
if ($ENV{'form.proctordomain'}) { $domain=$ENV{'form.proctordomain'}; } |
if ($env{'form.proctordomain'}) { $domain=$env{'form.proctordomain'}; } |
my $msg; |
my $msg; |
if ($ENV{'form.proctorpassword'}) { |
if ($env{'form.proctorpassword'}) { |
$msg='<p><font color="red">'.&mt("Failed to authenticate the proctor.") |
$msg='<p><font color="red">'.&mt("Failed to authenticate the proctor.") |
.'</font></p>'; |
.'</font></p>'; |
} |
} |
Line 297 sub proctor_validation_screen {
|
Line 593 sub proctor_validation_screen {
|
<h2>Proctor Validation</h2> |
<h2>Proctor Validation</h2> |
<p>Your room's proctor needs to validate your access to this resource.</p> |
<p>Your room's proctor needs to validate your access to this resource.</p> |
$msg |
$msg |
<form name="checkout" method="POST" action="$ENV{'request.uri'}"> |
<form name="checkout" method="POST" action="$env{'request.uri'}"> |
<input type="hidden" name="validate" value="yes" /> |
<input type="hidden" name="validate" value="yes" /> |
<input type="hidden" name="submitted" value="yes" /> |
<input type="hidden" name="submitted" value="yes" /> |
<table> |
<table> |