--- loncom/homework/bridgetask.pm 2005/09/20 07:10:21 1.50 +++ 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.50 2005/09/20 07:10:21 albertel Exp $ +# $Id: bridgetask.pm,v 1.55 2005/09/29 19:18:37 albertel Exp $ # # Copyright Michigan State University Board of Trustees # @@ -204,6 +204,87 @@ sub preserve_grade_info { return $result; } +sub style { + return (< +.fail, .pass, .neutral { + position: relative; + margin : 5px; + margin-bottom :10px; + padding : 4px; + padding-left : 75px; + border : thin solid; + font-weight : bolder; + font-size: smaller; + font-family: Arial; + background-color : rgb(255,240,225); +} + +.fail h4, .pass h4 { + position:absolute; + left: -4px; + top: -8px; + padding:2px; + margin:0; + background-color : rgb(255,240,225); + border : thin solid; +} + +.fail { + color: red; +} + +.pass { + color : green; +} + +.neutral { + color : blue; +} + +.question { + border : thin solid black; + padding : 4px; + margin-bottom : 1em; +} + +.grade { + font-size: x-large; + font-family: Arial; + position:absolute; + left: 5px; + top: -5px; + width: 70px; +} + +div#feedback h1 { + color : inherit; +} + +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)=@_; @@ -247,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; @@ -291,22 +365,13 @@ sub start_Task { } elsif ($target eq 'web') { my $name= &Apache::structuretags::get_resource_name($parstack,$safeeval); $result.="$head_tag_start$name - $body_tag_start \n"; + $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') { @@ -323,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); @@ -370,6 +434,10 @@ sub start_Task { $webgrade.'" />'; $result.=''; + if ($env{'form.regrade'}) { + $result.=''; + } } } else { # page_start returned a starting result, delete it if we don't need it @@ -383,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'); } @@ -482,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", @@ -493,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().''; @@ -511,6 +625,8 @@ sub end_Task { $Apache::lonhomework::results{"resource.0.award"}= $Apache::lonhomework::results{"resource.$version.0.award"}= $award; + $Apache::lonhomework::results{"resource.0.submission"}= + $Apache::lonhomework::results{"resource.$version.0.submission"}=''; } &Apache::lonhomework::showhash(%Apache::lonhomework::results); &Apache::structuretags::finalize_storage(); @@ -575,13 +691,16 @@ sub end_Task { &remove_from_queue($env{'form.queue'}); my ($symb,$courseid,$udom,$uname)=&Apache::lonxml::whichuser(); - $Apache::lonhomework::results{"resource.$version.0.bridgetask.portfiles"}= - $Apache::lonhomework::history{"resource.$version.0.bridgetask.portfiles"}; - &Apache::grades::version_portfiles( - \%Apache::lonhomework::results, - ["$version.0.bridgetask"],$courseid, - $symb,$udom,$uname, - ["$version.0.bridgetask"]); + + if ($env{'form.regrade'} ne 'yes') { + $Apache::lonhomework::results{"resource.$version.0.bridgetask.portfiles"}= + $Apache::lonhomework::history{"resource.$version.0.bridgetask.portfiles"}; + &Apache::grades::version_portfiles( + \%Apache::lonhomework::results, + ["$version.0.bridgetask"],$courseid, + $symb,$udom,$uname, + ["$version.0.bridgetask"]); + } } else { $Apache::lonhomework::results{"resource.$version.status"}='pass'; $Apache::lonhomework::results{"resource.$version.0.solved"}='correct_by_override'; @@ -590,13 +709,15 @@ sub end_Task { &remove_from_queue($env{'form.queue'}); my ($symb,$courseid,$udom,$uname)=&Apache::lonxml::whichuser(); - $Apache::lonhomework::results{"resource.$version.0.bridgetask.portfiles"}= - $Apache::lonhomework::history{"resource.$version.0.bridgetask.portfiles"}; - &Apache::grades::version_portfiles( - \%Apache::lonhomework::results, - ["$version.0.bridgetask"],$courseid, - $symb,$udom,$uname, - ["$version.0.bridgetask"]); + if ($env{'form.regrade'} ne 'yes') { + $Apache::lonhomework::results{"resource.$version.0.bridgetask.portfiles"}= + $Apache::lonhomework::history{"resource.$version.0.bridgetask.portfiles"}; + &Apache::grades::version_portfiles( + \%Apache::lonhomework::results, + ["$version.0.bridgetask"],$courseid, + $symb,$udom,$uname, + ["$version.0.bridgetask"]); + } } $Apache::lonhomework::results{"resource.status"}= $Apache::lonhomework::results{"resource.$version.status"}; @@ -1011,6 +1132,7 @@ sub select_user { + $fullname->{$student} @@ -1103,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 { @@ -1119,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(); @@ -1130,23 +1253,67 @@ 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"}; - $result.='
'; + my $mandatory=($dimension{$instance.'.criteria.'.$id.'.mandatory'} ne 'N'); + if ($mandatory) { + $mandatory='Mandatory'; + } else { + $mandatory='Optional'; + } if ($status eq 'fail') { - $result.=''.&mt('Did not pass').''; } elsif ($status eq 'pass') { - $result.=''.&mt('Passed').''; } else { &Apache::lonxml::error("Student viewing a graded bridgetask was shown a status of $status"); } - $result.='
'; + my $status_display=$status; + $status_display=~s/^([a-z])/uc($1)/e; + @Apache::scripttag::parser_env = @_; + $result.='

'.$mandatory. + ' 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.=&mt('Comment from grader: ').$Apache::lonhomework::history{"resource.$version.$dim.$instance.$id.comment"}.'
'; + $result.='

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

'; } - $result.=$dimension{$instance.'.criteria.'.$id}. - '
'; + $result.=''; } } } elsif ($target eq 'webgrade') { @@ -1186,9 +1353,10 @@ sub get_instance { ''; $result.=''; my (undef,undef,$udom,$uname) = &Apache::lonxml::whichuser(); - my $file_url = '/uploaded/'.$udom.'/'.$uname.'/portfolio'; + my $file_url = '/uploaded/'.$udom.'/'.$uname.'/portfolio/'; foreach my $partial_file (split(',',$Apache::lonhomework::history{"resource.$version.0.bridgetask.portfiles"})) { my $file=$file_url.$partial_file; + $file=~s|/+|/|g; &Apache::lonnet::allowuploaded('/adm/bridgetask',$file); $result.=' '.$file.