--- loncom/homework/bridgetask.pm 2005/04/04 18:14:58 1.9 +++ loncom/homework/bridgetask.pm 2005/05/10 16:44:35 1.21 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # definition of tags that give a structure to a document # -# $Id: bridgetask.pm,v 1.9 2005/04/04 18:14:58 albertel Exp $ +# $Id: bridgetask.pm,v 1.21 2005/05/10 16:44:35 albertel Exp $ # # Copyright Michigan State University Board of Trustees # @@ -48,22 +48,26 @@ sub initialize_bridgetask { $Apache::bridgetask::dimension=''; # list of all Dimension ids seen @Apache::bridgetask::dimensionlist=(); + # mandatory attribute of all Dimensions seen + %Apache::bridgetask::dimensionmandatory=(); # 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 { my ($slot)=@_; - my $user=$ENV{'form.proctorname'}; - my $domain=$ENV{'form.proctordomain'}; + my $user=$env{'form.proctorname'}; + my $domain=$env{'form.proctordomain'}; my @allowed=split(",",$slot->{'proctor'}); foreach my $possible (@allowed) { my ($puser,$pdom)=(split('@',$possible)); 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') { $Apache::lonhomework::results{'resource.checkedin'}= $user.'@'.$domain; @@ -82,26 +86,43 @@ sub add_previous_version_button { return $result; } +sub add_grading_button { + my $result; + $result.=' '; + $result.=''; + return $result; +} + sub start_Task { my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_; - &Apache::structuretags::initialize_storage(); - &Apache::lonhomework::showhash(%Apache::lonhomework::history); - my ($status,$accessmsg,$slot); + if ($target ne 'webgrade') { + &Apache::structuretags::initialize_storage(); + &Apache::lonhomework::showhash(%Apache::lonhomework::history); + } + $Apache::lonhomework::parsing_a_task=1; #should get back a or the neccesary stuff to start XML/MathML my ($result,$head_tag_start,$body_tag_start,$form_tag_start)= &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.='
'.&add_grading_button()."
"; + } } - if ($target eq 'web' || $target eq 'grade' || $target eq 'answer' || + if ($target eq 'web' || ($target eq 'grade' && !$env{'form.webgrade'}) || $target eq 'answer' || $target eq 'tex') { - ($status,$accessmsg,$slot) = + ($status,$accessmsg,my $slot_name,$slot) = &Apache::lonhomework::check_task_access('0'); push(@Apache::inputtags::status,$status); + $Apache::inputtags::slot_name=$slot_name; my $expression='$external::datestatus="'.$status.'";'; $expression.='$external::gradestatus="'.$Apache::lonhomework::history{"resource.0.solved"}.'";'; &Apache::run::run($expression,$safeeval); @@ -152,13 +173,39 @@ sub start_Task { $body_tag_start \n $form_tag_start". ''; # 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') { $result .= ''."\n"; + '" value="'.$env{"form.grade_$field"}.'" />'."\n"; } } } + } elsif ( ($target eq 'grade' && $env{'form.webgrade'}) || + $target eq 'webgrade') { + if ($target eq 'webgrade') { + $result.=$head_tag_start.$body_tag_start.$form_tag_start; + $result.=''; + $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".'
Found '. + &Apache::lonnet::gettitle($symb).' for '.$uname.' at '.$udom.'
'; + $result.=''; + $Apache::bridgetask::queue_key=$todo; + &Apache::structuretags::initialize_storage(); + &Apache::lonhomework::showhash(%Apache::lonhomework::history); + $result.="\n".''; + } else { + if ($target eq 'webgrade') { + $result.="\n". + '
No user to be graded.
'; + } + my $bodytext=&Apache::lonxml::get_all_text("/task",$parser); + } } else { # page_start returned a starting result, delete it if we don't need it $result = ''; @@ -173,24 +220,96 @@ sub end_Task { if ($target eq 'grade' || $target eq 'web' || $target eq 'answer' || $target eq 'tex') { if ( - (($target eq 'web') && ($ENV{'request.state'} ne 'construct')) || + (($target eq 'web') && ($env{'request.state'} ne 'construct')) || ($target eq 'answer') || ($target eq 'tex') ) { if ($target eq 'web') { if ($status eq 'CAN_ANSWER') { - $result.=''. + $result.="\n".'
'. &Apache::inputtags::file_selector('0',"bridgetask","*", 'portfolioonly'). "
"; $result.=&Apache::inputtags::gradestatus('0'); } + } + if ($target eq 'web' || $target eq 'webgrade') { $result.=&Apache::lonxml::xmlend().''; } } - if ($target eq 'grade') { + if ($target eq 'grade' && !$env{'form.webgrade'}) { + 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::structuretags::finalize_storage(); + if ($award eq 'SUBMITTED') { + &add_to_queue(); + } + } + if ($target eq 'grade' && $env{'form.webgrade'}) { + my $optional_required= + &Apache::lonxml::get_param('OptionalRequired',$parstack, + $safeeval); + my $optional_passed=0; + my $mandatory_failed=0; + my $ungraded=0; + my $review=0; + &Apache::lonhomework::showhash(%Apache::lonhomework::results); + foreach my $dim_id (@Apache::bridgetask::dimensionlist) { + my $status= + $Apache::lonhomework::results{"resource.$dim_id.status"}; + my $mandatory= + ($Apache::bridgetask::dimensionmandatory{$dim_id} ne 'N'); + if ($status eq 'pass') { + if (!$mandatory) { $optional_passed++; } + } elsif ($status eq 'fail') { + if ($mandatory) { $mandatory_failed++; } + } elsif ($status eq 'ungraded') { + $ungraded++; + } elsif ($status eq 'review') { + $review++; + } + } + if ($optional_passed < $optional_required) { + $mandatory_failed++; + } + &Apache::lonxml::debug("all dim ".join(':',@Apache::bridgetask::dimensionlist)."results -> m_f $mandatory_failed o_p $optional_passed u $ungraded r $review"); + $Apache::lonhomework::results{'resource.grader'}= + $env{'user.name'}.'@'.$env{'user.domain'}; + if ($review) { + $Apache::lonhomework::results{'resource.status'}='review'; + &move_to_review_queue(); + } elsif ($ungraded) { + $Apache::lonhomework::results{'resource.status'}='ungraded'; + &check_queue_unlock(); + } elsif ($mandatory_failed) { + $Apache::lonhomework::results{'resource.status'}='fail'; + $Apache::lonhomework::results{"resource.0.award"}='EXACT_ANS'; + &remove_from_queue(); + } else { + $Apache::lonhomework::results{'resource.status'}='pass'; + $Apache::lonhomework::results{"resource.0.award"}='INCORRECT'; + &remove_from_queue(); + } + &Apache::structuretags::finalize_storage(); } + } elsif ($target eq 'webgrade') { + $result.="\n
"; + #$result.=' '; + #$result.=' '; + #$result.=' '; + #$result.=' '; + $result.=''.&Apache::loncommon::endbodytag().''; } elsif ($target eq 'meta') { $result.=''."\n"; #$result.=&Apache::response::meta_part_order(); @@ -200,10 +319,212 @@ sub end_Task { return $result; } +sub move_to_review_queue { + &Apache::lonxml::debug("Want to move"); +} + +sub check_queue_unlock { + &Apache::lonxml::debug("Want to unlock?"); +} + +sub remove_from_queue { + &Apache::lonxml::debug("Want to remove. Done?"); +} + +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

Current Queue

". + ""; + foreach my $key (sort(keys(%queue))) { + if ($key=~/locked$/) { + my ($symb,$uname,$udom) = &decode_queue_key($key); + my $title=&Apache::lonnet::gettitle($symb); + $result.="'; + } elsif ($key=~/timestamp$/) { + my ($symb,undef) = split("\0",$key); + my $title=&Apache::lonnet::gettitle($symb); + $result.=""; + } else { + my ($symb,$uname,$udom) = &decode_queue_key($key); + my $title=&Apache::lonnet::gettitle($symb); + $result.=""; + } + } + $result.="
resourceusertypedata
$title$uname"; + $result.='lock'.$queue{$key}.'
$title"; + $result.='last queue modification time'. + &Apache::lonlocal::locallocaltime($queue{$key})."
$title$uname"; + my $slot=$queue{$key}->[0]; + my %slot_data=&Apache::lonnet::get_slot($slot); + $result.='queue entryEnd time: '. + &Apache::lonlocal::locallocaltime($slot_data{'endtime'}). + "
\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 eq $check_section) { + &Apache::lonnet::logthis("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 { my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_; my $result; if ($target eq 'web') { + } elsif ($target eq 'webgrade') { + &Apache::lonxml::startredirection(); } return $result; } @@ -212,46 +533,121 @@ sub end_ClosingParagraph { my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_; my $result; if ($target eq 'web') { + } elsif ($target eq 'webgrade') { + &Apache::lonxml::endredirection(); } return $result; } +sub get_id { + my ($parstack,$safeeval)=@_; + my $id=&Apache::lonxml::get_param('id',$parstack,$safeeval); + if (!$id) { $id=$Apache::lonxml::curdepth; } + return $id; +} + my %dimension; sub start_Dimension { my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_; undef(%dimension); - my $dim_id=$Apache::lonxml::curdepth; + my $dim_id=&get_id($parstack,$safeeval); $Apache::bridgetask::dimension=$dim_id; push(@Apache::bridgetask::dimensionlist,$dim_id); undef(@Apache::bridgetask::instance); + $Apache::bridgetask::dimensionmandatory{$dim_id}= + &Apache::lonxml::get_param('Mandatory',$parstack,$safeeval); return ''; } -sub end_Dimension { - my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_; - my $result; - if ($target eq 'web') { - #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 $num_instances=scalar(@{$dimension{'instances'}}); - my $which=&Math::Random::random_uniform_integer(1,0,$num_instances-1); - my $instance=$dimension{'instances'}->[$which]; - $result=$dimension{'intro'}.$dimension{$instance.'.text'}; - #FIXME: don't show the criteria yet - #foreach my $id (@{$dimension{$instance.'.criterias'}}) { - # $result.=$dimension{$instance.'.criteria.'.$id}; - #} +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]; +} + +{ + my $last_link; + sub end_Dimension { + my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_; + my $result; + my $dim_id=&get_id($parstack,$safeeval); + my $instance=&get_instance(); + if ($target eq 'web') { + $result=$dimension{'intro'}.$dimension{$instance.'.text'}; + } elsif ($target eq 'webgrade') { + foreach my $id (@{$dimension{$instance.'.criterias'}}) { + my $link='criteria_'.$instance.'_'.$id; + my $status=$Apache::lonhomework::history{'resource.'.$instance.'.'.$id.'.status'}; + $result.=''. + ''. + ''. + '
'. + #$dimension{$instance.'.criteria.'.$id}. + ''. + 'Additional Comment for Student
'. + ''. + ''. + ''. + '
'. + '
'. + '
'. + '
'. + ''. + ''. + 'Prev
'. + 'Next


'. + ' '. + ''; + $last_link=$link; + } + } elsif ($target eq 'grade') { + my $optional_passed=0; + my $mandatory_failed=0; + my $ungraded=0; + my $review=0; + foreach my $id (@{$dimension{$instance.'.criterias'}}) { + my $status=$Apache::lonhomework::results{'resource.'.$instance.'.'.$id.'.status'}=$env{'form.HWVAL_criteria_'.$instance.'_'.$id}; + $Apache::lonhomework::results{'resource.'.$instance.'.'.$id.'.comment'}=$env{'form.HWVAL_comment_criteria_'.$instance.'_'.$id}; + my $mandatory=($dimension{$instance.'.criteria.'.$id.'.mandatory'} ne 'N'); + if ($status eq 'pass') { + if (!$mandatory) { $optional_passed++; } + } elsif ($status eq 'fail') { + if ($mandatory) { $mandatory_failed++; } + } elsif ($status eq 'review') { + $review++; + } elsif ($status eq 'ungraded') { + $ungraded++; + } else { + &Apache::lonxml::error("got wierd status --$status--"); + } + } + if ($optional_passed < $dimension{$instance.'.optionalrequired'}) { + $mandatory_failed++; + } + &Apache::lonxml::debug("all instance ".join(':',@{$dimension{$instance.'.criterias'}})." results -> m_f $mandatory_failed o_p $optional_passed u $ungraded r $review"); + if ($review) { + $Apache::lonhomework::results{'resource.'.$dim_id.'.status'}='review'; + } elsif ($ungraded) { + $Apache::lonhomework::results{'resource.'.$dim_id.'.status'}='ungraded'; + } elsif ($mandatory_failed) { + $Apache::lonhomework::results{'resource.'.$dim_id.'.status'}='fail'; + } else { + $Apache::lonhomework::results{'resource.'.$dim_id.'.status'}='pass'; + } + } + return $result; } - return $result; } sub start_IntroParagraph { my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_; my $result; - if ($target eq 'web') { - if ($tagstack->[-2] eq 'Dimension') { + if ($target eq 'web' || $target eq 'webgrade') { + if ($tagstack->[-2] eq 'Dimension' || $target eq 'webgrade') { &Apache::lonxml::startredirection(); } } @@ -261,8 +657,8 @@ sub start_IntroParagraph { sub end_IntroParagraph { my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_; my $result; - if ($target eq 'web') { - if ($tagstack->[-2] eq 'Dimension') { + if ($target eq 'web' || $target eq 'webgrade') { + if ($tagstack->[-2] eq 'Dimension' || $target eq 'webgrade') { $dimension{'intro'}=&Apache::lonxml::endredirection(); } } @@ -271,9 +667,12 @@ sub end_IntroParagraph { sub start_Instance { my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_; - push(@{$dimension{'instances'}},$Apache::lonxml::curdepth); - push(@Apache::bridgetask::instance,$Apache::lonxml::curdepth); - push(@Apache::bridgetask::instancelist,$Apache::lonxml::curdepth); + my $id=&get_id($parstack,$safeeval); + push(@{$dimension{'instances'}},$id); + push(@Apache::bridgetask::instance,$id); + push(@Apache::bridgetask::instancelist,$id); + $dimension{$id.'.optionalrequired'}= + &Apache::lonxml::get_param('OptionalRequired',$parstack,$safeeval); return ''; } @@ -284,7 +683,7 @@ sub end_Instance { sub start_InstanceText { my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_; - if ($target eq 'web') { + if ($target eq 'web' || $target eq 'webgrade') { &Apache::lonxml::startredirection(); } return ''; @@ -293,7 +692,7 @@ sub start_InstanceText { sub end_InstanceText { my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_; my $instance_id=$Apache::bridgetask::instance[-1]; - if ($target eq 'web') { + if ($target eq 'web' || $target eq 'webgrade') { $dimension{$instance_id.'.text'}=&Apache::lonxml::endredirection(); } return ''; @@ -301,7 +700,7 @@ sub end_InstanceText { sub start_Criteria { my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_; - if ($target eq 'web') { + if ($target eq 'web' || $target eq 'webgrade' || $target eq 'grade') { &Apache::lonxml::startredirection(); } return ''; @@ -310,10 +709,12 @@ sub start_Criteria { sub end_Criteria { my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_; my $instance_id=$Apache::bridgetask::instance[-1]; - if ($target eq 'web') { + if ($target eq 'web' || $target eq 'webgrade' || $target eq 'grade') { my $criteria=&Apache::lonxml::endredirection(); - my $id=$Apache::lonxml::curdepth; + my $id=&get_id($parstack,$safeeval); $dimension{$instance_id.'.criteria.'.$id}=$criteria; + $dimension{$instance_id.'.criteria.'.$id.'.mandatory'}= + &Apache::lonxml::get_param('Mandatory',$parstack,$safeeval); push(@{$dimension{$instance_id.'.criterias'}},$id); } return ''; @@ -323,10 +724,10 @@ sub proctor_validation_screen { my ($slot) = @_; my (undef,undef,$domain,$user) = &Apache::lonxml::whichuser(); my $url=&Apache::lonnet::studentphoto($domain,$user,'jpg'); - $user=$ENV{'form.proctorname'}; - if ($ENV{'form.proctordomain'}) { $domain=$ENV{'form.proctordomain'}; } + $user=$env{'form.proctorname'}; + if ($env{'form.proctordomain'}) { $domain=$env{'form.proctordomain'}; } my $msg; - if ($ENV{'form.proctorpassword'}) { + if ($env{'form.proctorpassword'}) { $msg='

'.&mt("Failed to authenticate the proctor.") .'

'; } @@ -334,7 +735,7 @@ sub proctor_validation_screen {

Proctor Validation

Your room's proctor needs to validate your access to this resource.

$msg -
+