--- loncom/homework/bridgetask.pm 2005/03/17 21:56:04 1.3 +++ loncom/homework/bridgetask.pm 2005/03/28 19:26:10 1.4 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # definition of tags that give a structure to a document # -# $Id: bridgetask.pm,v 1.3 2005/03/17 21:56:04 albertel Exp $ +# $Id: bridgetask.pm,v 1.4 2005/03/28 19:26:10 albertel Exp $ # # Copyright Michigan State University Board of Trustees # @@ -41,21 +41,42 @@ BEGIN { &Apache::lonxml::register('Apache::bridgetask',('Task','IntroParagraph','Dimension','Instance','InstanceText','Criteria','ClosingParagraph')); } +sub proctor_check_auth { + my ($slot)=@_; + 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); + if ($authhost ne 'no_host') { + $Apache::lonhomework::results{'resource.checkedin'}= + $user.'@'.$domain; + return 1; + } + } + } + return 0; +} + sub start_Task { my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_; - #&initialize_storage(); - - my $status; - my $accessmsg; + &Apache::structuretags::initialize_storage(); + &Apache::lonhomework::showhash(%Apache::lonhomework::history); + my ($status,$accessmsg,$slot); + $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' || $target eq 'grade' || $target eq 'answer' || $target eq 'tex') { - ($status,$accessmsg) = &Apache::lonhomework::check_task_access('0'); + ($status,$accessmsg,$slot) = + &Apache::lonhomework::check_task_access('0'); push (@Apache::inputtags::status,$status); my $expression='$external::datestatus="'.$status.'";'; $expression.='$external::gradestatus="'.$Apache::lonhomework::history{"resource.0.solved"}.'";'; @@ -65,17 +86,19 @@ sub start_Task { ( $status eq 'BANNED') || ( $status eq 'UNAVAILABLE') || ( $status eq 'NOT_IN_A_SLOT') || + ( $status eq 'NEEDS_CHECKIN') || ( $status eq 'INVALID_ACCESS')) { my $bodytext=&Apache::lonxml::get_all_text("/task",$parser); if ( $target eq "web" ) { - $result.= $head_tag_start.''; - my $msg=$body_tag_start; + $result.= $head_tag_start.''.$body_tag_start; + my $msg; if ($status eq 'UNAVAILABLE') { $msg.='

'.&mt('Unable to determine if this resource is open due to network problems. Please try again later.').'

'; } elsif ($status eq 'NOT_IN_A_SLOT') { $msg.='

'.&mt('You are not currently signed up to work at this time and/or place.').'

'; - } elsif ($status eq 'IN_A_SLOT') { - $msg.='

'.&mt('You need the Proctor to validate you.').'

'; + } elsif ($status eq 'NEEDS_CHECKIN') { + $msg.='

'.&mt('You need the Proctor to validate you.'). + '

'.&proctor_validation_screen($slot); } elsif ($status ne 'NOT_YET_VIEWED') { $msg.='

'.&mt('Not open to be viewed').'

'; } @@ -90,6 +113,14 @@ sub start_Task { } else { $result.=&mt('Problem is not open to be viewed. It')." $accessmsg \\vskip 0 mm "; } + } elsif ($target eq 'grade') { + if ($status eq 'NEEDS_CHECKIN') { + if (&proctor_check_auth($slot)) { + #FIXME immeadiatly add this to the grading queue + # with slot->{'endtime'} for when grading can + # begin on this resource + } + } } } elsif ($target eq 'web') { my $name= &Apache::structuretags::get_resource_name($parstack,$safeeval); @@ -126,14 +157,15 @@ sub end_Task { } } if ($target eq 'grade') { - #&Apache::lonhomework::showhash(%Apache::lonhomework::results); - #&finalize_storage(); + &Apache::lonhomework::showhash(%Apache::lonhomework::results); + &Apache::structuretags::finalize_storage(); } } elsif ($target eq 'meta') { $result.=''."\n"; #$result.=&Apache::response::meta_part_order(); #$result.=&Apache::response::meta_response_order(); } + undef($Apache::lonhomework::parsing_a_task); return $result; } @@ -259,5 +291,39 @@ sub end_Criteria { return ''; } +sub proctor_validation_screen { + my ($slot) = @_; + my (undef,undef,$domain,$user) = &Apache::lonxml::whichuser(); + my $ret=&Apache::lonnet::reply("studentphoto:$domain:$user:gif",&Apache::lonnet::homeserver($user,$domain)); + my $url="/uploaded/$domain/$user/internal/studentphoto.gif"; + my $tokenurl=&Apache::lonnet::tokenwrapper($url); + my $dom=(&Apache::lonxml::whichuser())[2]; + my $user=$ENV{'form.proctorname'}; + if ($ENV{'form.proctordomain'}) { $dom=$ENV{'form.proctordomain'}; } + my $msg; + if ($ENV{'form.proctorpassword'}) { + $msg='

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

'; + } + my $result= (<Proctor Validation +

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

+ $msg +
+ + + + + + +
Proctor's Username:
Password:
Proctor's Domain:
+
+Student who should be logged in is:
+
+
+ENDCHECKOUT + return $result; +} + 1; __END__