--- loncom/homework/bridgetask.pm 2005/03/28 19:26:10 1.4 +++ loncom/homework/bridgetask.pm 2005/04/04 18:14:58 1.9 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # definition of tags that give a structure to a document # -# $Id: bridgetask.pm,v 1.4 2005/03/28 19:26:10 albertel Exp $ +# $Id: bridgetask.pm,v 1.9 2005/04/04 18:14:58 albertel Exp $ # # Copyright Michigan State University Board of Trustees # @@ -37,10 +37,23 @@ 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'}; @@ -61,6 +74,14 @@ sub proctor_check_auth { 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)=@_; @@ -73,11 +94,14 @@ sub start_Task { 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,$slot) = &Apache::lonhomework::check_task_access('0'); - push (@Apache::inputtags::status,$status); + push(@Apache::inputtags::status,$status); my $expression='$external::datestatus="'.$status.'";'; $expression.='$external::gradestatus="'.$Apache::lonhomework::history{"resource.0.solved"}.'";'; &Apache::run::run($expression,$safeeval); @@ -153,6 +177,13 @@ sub end_Task { ($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().''; } } @@ -173,7 +204,6 @@ sub start_ClosingParagraph { my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_; my $result; if ($target eq 'web') { - $result='
Closing
'; } return $result; } @@ -182,17 +212,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 ''; } @@ -203,16 +234,15 @@ 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]; - $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 $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}; + #} } return $result; } @@ -223,8 +253,6 @@ sub start_IntroParagraph { if ($target eq 'web') { if ($tagstack->[-2] eq 'Dimension') { &Apache::lonxml::startredirection(); - } else { - $result='
Intro
'; } } return $result; @@ -236,18 +264,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 ''; } @@ -266,6 +292,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(); } @@ -282,6 +309,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; @@ -294,12 +322,9 @@ sub end_Criteria { 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 $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.") @@ -315,11 +340,11 @@ sub proctor_validation_screen { - +
Proctor's Username:
Password:
Proctor's Domain:
Proctor's Domain:

Student who should be logged in is:
-
+
ENDCHECKOUT return $result;