--- loncom/homework/bridgetask.pm 2005/09/22 22:25:35 1.53 +++ loncom/homework/bridgetask.pm 2005/09/29 19:18:37 1.55 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # definition of tags that give a structure to a document # -# $Id: bridgetask.pm,v 1.53 2005/09/22 22:25:35 albertel Exp $ +# $Id: bridgetask.pm,v 1.55 2005/09/29 19:18:37 albertel Exp $ # # Copyright Michigan State University Board of Trustees # @@ -265,6 +265,26 @@ STYLE } +sub show_task { + my ($status,$previous)=@_; + if (!$previous && ( + ( $status eq 'CLOSED' ) || + ( $status eq 'BANNED') || + ( $status eq 'UNAVAILABLE') || + ( $status eq 'NOT_IN_A_SLOT') || + ( $status eq 'NEEDS_CHECKIN') || + ( $status eq 'WAITING_FOR_GRADE') || + ( $status eq 'INVALID_ACCESS') )) { + return 0; + } + return 1; +} + +sub internal_location { + my ($id)=@_; + return ''; +} + sub start_Task { my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_; @@ -308,14 +328,7 @@ sub start_Task { &Apache::run::run($expression,$safeeval); &Apache::lonxml::debug("Got $status"); $body_tag_start.=&add_previous_version_button($status); - if (!$previous && ( - ( $status eq 'CLOSED' ) || - ( $status eq 'BANNED') || - ( $status eq 'UNAVAILABLE') || - ( $status eq 'NOT_IN_A_SLOT') || - ( $status eq 'NEEDS_CHECKIN') || - ( $status eq 'WAITING_FOR_GRADE') || - ( $status eq 'INVALID_ACCESS') )) { + if (!&show_task($status,$previous)) { my $bodytext=&Apache::lonxml::get_all_text("/task",$parser); if ( $target eq "web" ) { $result.= $head_tag_start.''.$body_tag_start; @@ -354,20 +367,11 @@ sub start_Task { $result.="$head_tag_start$name $body_tag_start \n".&style(); - my ($version,$previous)=&get_version(); - if ($Apache::lonhomework::history{"resource.$version.status"} eq 'fail') { - $result.='

'.&mt('Did not pass').'

'; - if (!$previous) { - $result.=&add_request_another_attempt_button(); - } - } - if ($Apache::lonhomework::history{"resource.$version.status"} eq 'pass') { - $result.='

'.&mt('Passed').'

'; - } $result.=$form_tag_start. ''; $result.=&preserve_grade_info(); - + $result.=&internal_location(); + &Apache::lonxml::startredirection(); } } elsif ( ($target eq 'grade' && $env{'form.webgrade'}) || $target eq 'webgrade') { @@ -384,7 +388,6 @@ sub start_Task { # there isn't reshow the queue.... my ($todo,$status_code)=&get_key_todo($target); - &Apache::lonnet::logthis("got todo -$todo- stat -$status_code-"); if ($todo) { &setup_env_for_other_user($todo,$safeeval); my ($symb,$uname,$udom)=&decode_queue_key($todo); @@ -448,7 +451,7 @@ sub get_key_todo { my $todo; if (defined($env{'form.reviewasubmission'})) { - &Apache::lonnet::logthis("review a submission...."); + &Apache::lonxml::debug("review a submission...."); $env{'form.queue'}='reviewqueue'; return (undef,'show_list'); } @@ -547,6 +550,9 @@ sub end_Task { ($target eq 'answer') || ($target eq 'tex') ) { if ($target eq 'web') { + if (&show_task($status,$previous)) { + $result.=&Apache::lonxml::endredirection(); + } if ($status eq 'CAN_ANSWER' && !$previous) { $result.="\n".''. &Apache::inputtags::file_selector("$version.0", @@ -558,6 +564,49 @@ sub end_Task { "
"; $result.=&Apache::inputtags::gradestatus('0'); } + if (&show_task($status,$previous)) { + my $bt_status=$Apache::lonhomework::history{"resource.$version.status"}; + my $title=&Apache::lonnet::gettitle(); + my %slot=&Apache::lonnet::get_slot($Apache::inputtags::slot_name); + my $start_time= + &Apache::lonlocal::locallocaltime($slot{'starttime'}); + + my $status; + $status.="\n
\n"; + + if ($bt_status eq 'pass') { + $status.='

You passed the '.$title.' given on '. + $start_time.'.

'; + } + if ($bt_status eq 'fail') { + $status.='

You did not pass the '.$title.' given on '. + $start_time.'.

'; + if (!$previous) { + $status.=&add_request_another_attempt_button(); + } + } + my $man_count=0; + my $opt_count=0; + my $opt_passed=0; + foreach my $dim_id (@Apache::bridgetask::dimensionlist) { + if ($Apache::bridgetask::dimensionmandatory{$dim_id} + eq 'N') { + $opt_count++; + if ($Apache::lonhomework::history{"resource.$version.$dim_id.status"} eq 'pass') { + $opt_passed++; + } + } else { + $man_count++; + } + } + my $opt_req=&Apache::lonxml::get_param('OptionalRequired', + $parstack,$safeeval); + if ($opt_req !~ /\S/) { $opt_req='0'; } + $status.="\n

".&mt('You needed to pass all of the [_1] mandatory components and [_2] of the [_3] optional components on the bridge task.',$man_count,$opt_req,$opt_count)."

\n"; + + my $internal_location=&internal_location(); + $result=~s/\Q$internal_location\E/$status/; + } } if ($target eq 'web' || $target eq 'webgrade') { $result.=&Apache::lonxml::xmlend().''; @@ -1176,7 +1225,8 @@ sub start_Dimension { undef(@Apache::bridgetask::instance); $Apache::bridgetask::dimensionmandatory{$dim_id}= &Apache::lonxml::get_param('Mandatory',$parstack,$safeeval); - return ''; + &Apache::lonxml::startredirection(); + return &internal_location($dim_id); } sub get_instance { @@ -1192,7 +1242,7 @@ sub get_instance { my $last_link; sub end_Dimension { my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_; - my $result; + my $result=&Apache::lonxml::endredirection(); my $dim=&get_id($parstack,$safeeval); my $instance=&get_instance(); my $version=&get_version(); @@ -1203,6 +1253,41 @@ sub get_instance { $result.=&Apache::scripttag::xmlparse($dimension{$instance.'.text'}); if ($Apache::lonhomework::history{"resource.$version.status"} eq 'pass' || $Apache::lonhomework::history{"resource.$version.status"} eq 'fail') { + + my $dim_status=$Apache::lonhomework::history{"resource.$version.$dim.status"}; + my $mandatory='Mandatory'; + if ($Apache::bridgetask::dimensionmandatory{$dim} eq 'N') { + $mandatory='Optional'; + } + my $dim_info="
\n"; + if ($dim_status eq 'pass') { + $dim_info.='

Question : you passed this '.$mandatory.' question

'; + } + if ($dim_status eq 'fail') { + $dim_info.='

Question : you did not pass this '.$mandatory.' question

'; + } + my $man_count=0; + my $opt_count=0; + my $opt_passed=0; + foreach my $id (@{$dimension{$instance.'.criterias'}}) { + if ($dimension{$instance.'.criteria.'.$id.'.mandatory'} + eq 'N') { + $opt_count++; + if ($Apache::lonhomework::history{"resource.$version.$dim.$instance.$id.status"} eq 'pass') { + $opt_passed++; + } + } else { + $man_count++; + } + } + my $opt_req=&Apache::lonxml::get_param('OptionalRequired', + $parstack,$safeeval); + if ($opt_req !~ /\S/) { $opt_req='0'; } + $dim_info.="\n

".&mt('You passed all of the mandatory components and [_1] of the [_2] optional components, of which you were required to pass [_3].',$opt_passed,$opt_count,$opt_req)."

\n
"; + + my $internal_location=&internal_location($dim); + $result=~s/\Q$internal_location\E/$dim_info/; + foreach my $id (@{$dimension{$instance.'.criterias'}}) { my $status=$Apache::lonhomework::history{"resource.$version.$dim.$instance.$id.status"}; my $comment=$Apache::lonhomework::history{"resource.$version.$dim.$instance.$id.comment"}; @@ -1219,10 +1304,12 @@ sub get_instance { } my $status_display=$status; $status_display=~s/^([a-z])/uc($1)/e; + @Apache::scripttag::parser_env = @_; $result.='

'.$mandatory. - ' Criteria

'. - $dimension{$instance.'.criteria.'.$id}. - '

'.$status_display.'

'; + ' Criteria

'; + @Apache::scripttag::parser_env = @_; + $result.=&Apache::scripttag::xmlparse($dimension{$instance.'.criteria.'.$id}); + $result.='

'.$status_display.'

'; if ($Apache::lonhomework::history{"resource.$version.$dim.$instance.$id.comment"}) { $result.='

'.$Apache::lonhomework::history{"resource.$version.$dim.$instance.$id.comment"}.'

'; }