--- loncom/homework/bridgetask.pm 2005/03/17 21:21:11 1.2 +++ loncom/homework/bridgetask.pm 2005/03/31 21:24:29 1.8 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # definition of tags that give a structure to a document # -# $Id: bridgetask.pm,v 1.2 2005/03/17 21:21:11 albertel Exp $ +# $Id: bridgetask.pm,v 1.8 2005/03/31 21:24:29 albertel Exp $ # # Copyright Michigan State University Board of Trustees # @@ -41,21 +41,53 @@ 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 add_previous_version_button { + my $result; + $result.=' Show a previously done version: '; + return $result; +} + 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') { + $body_tag_start.=&add_previous_version_button(); + } 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"}.'";'; @@ -64,13 +96,20 @@ sub start_Task { if (( $status eq 'CLOSED' ) || ( $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.='