--- loncom/homework/bridgetask.pm 2005/03/16 19:09:44 1.1 +++ loncom/homework/bridgetask.pm 2005/04/07 06:56:21 1.11 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # definition of tags that give a structure to a document # -# $Id: bridgetask.pm,v 1.1 2005/03/16 19:09:44 albertel Exp $ +# $Id: bridgetask.pm,v 1.11 2005/04/07 06:56:21 albertel Exp $ # # Copyright Michigan State University Board of Trustees # @@ -37,26 +37,71 @@ use Apache::lonmenu; use Apache::lonlocal; use Apache::lonxml; use Time::HiRes qw( gettimeofday tv_interval ); + BEGIN { &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 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=(); +} + +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.=&mt(' Show a previously done version: [_1]',''); + 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'); - push (@Apache::inputtags::status,$status); + ($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"}.'";'; &Apache::run::run($expression,$safeeval); @@ -64,13 +109,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.='

'.&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 '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').'

'; } @@ -85,6 +137,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); @@ -92,10 +152,10 @@ 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"; } } } @@ -113,22 +173,35 @@ 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.=''. + &Apache::inputtags::file_selector('0',"bridgetask","*", + 'portfolioonly'). + "
"; + $result.=&Apache::inputtags::gradestatus('0'); + } $result.=&Apache::lonxml::xmlend().''; } } if ($target eq 'grade') { - #&Apache::lonhomework::showhash(%Apache::lonhomework::results); - #&finalize_storage(); + &Apache::essayresponse::file_submission('0','bridgetask','portfiles','SUBMITTED'); + if ($Apache::lonhomework::results{"resource.0.bridgetask.portfiles"}) { + $Apache::lonhomework::results{"resource.0.tries"}= + 1+$Apache::lonhomework::history{"resource.0.tries"}; + } + &Apache::lonhomework::showhash(%Apache::lonhomework::results); + &Apache::structuretags::finalize_storage(); } } elsif ($target eq 'meta') { - #$result=&Apache::response::mandatory_part_meta; + $result.=''."\n"; #$result.=&Apache::response::meta_part_order(); #$result.=&Apache::response::meta_response_order(); } + undef($Apache::lonhomework::parsing_a_task); return $result; } @@ -136,7 +209,6 @@ sub start_ClosingParagraph { my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_; my $result; if ($target eq 'web') { - $result='
Closing
'; } return $result; } @@ -145,17 +217,18 @@ sub end_ClosingParagraph { my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_; my $result; if ($target eq 'web') { - $result='
'; } return $result; } my %dimension; -my $dim_id; sub start_Dimension { my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_; 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 ''; } @@ -166,16 +239,14 @@ sub end_Dimension { #FIXME just grabbing the first one for now, need #to randomly pick one until all have been seen #then start repicking - my $instance=$dimension{'instances'}->[0]; - my $result=$dimension{'intro'}. - $dimension{$instance.'.text'}. - '
Criteria
'; - foreach my $id (@{$dimension{$instance.'.criterias'}}) { - $result.=$dimension{$instance.'.criteria.'.$id}. - '
'; - } - $result=~s/
$//; - $result.='
'; + &Apache::response::pushrandomnumber(); + my @order=&Math::Random::random_permutation(@{$dimension{'instances'}}); + my $instance=$order[0]; + $result=$dimension{'intro'}.$dimension{$instance.'.text'}; + #FIXME: don't show the criteria yet + #foreach my $id (@{$dimension{$instance.'.criterias'}}) { + # $result.=$dimension{$instance.'.criteria.'.$id}; + #} } return $result; } @@ -186,8 +257,6 @@ sub start_IntroParagraph { if ($target eq 'web') { if ($tagstack->[-2] eq 'Dimension') { &Apache::lonxml::startredirection(); - } else { - $result='
Intro
'; } } return $result; @@ -199,18 +268,16 @@ sub end_IntroParagraph { if ($target eq 'web') { if ($tagstack->[-2] eq 'Dimension') { $dimension{'intro'}=&Apache::lonxml::endredirection(); - } else { - $result='
'; } } return $result; } -my $instance_id; sub start_Instance { my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_; 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 ''; } @@ -229,6 +296,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') { $dimension{$instance_id.'.text'}=&Apache::lonxml::endredirection(); } @@ -245,6 +313,7 @@ sub start_Criteria { sub end_Criteria { my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_; + my $instance_id=$Apache::bridgetask::instance[-1]; if ($target eq 'web') { my $criteria=&Apache::lonxml::endredirection(); my $id=$Apache::lonxml::curdepth; @@ -254,5 +323,36 @@ sub end_Criteria { return ''; } +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'}; } + 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__