--- loncom/homework/bridgetask.pm 2006/10/17 15:11:11 1.185 +++ loncom/homework/bridgetask.pm 2006/11/07 21:31:22 1.196 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # definition of tags that give a structure to a document # -# $Id: bridgetask.pm,v 1.185 2006/10/17 15:11:11 albertel Exp $ +# $Id: bridgetask.pm,v 1.196 2006/11/07 21:31:22 albertel Exp $ # # Copyright Michigan State University Board of Trustees # @@ -43,16 +43,16 @@ use LONCAPA; BEGIN { - &Apache::lonxml::register('Apache::bridgetask',('Task','IntroParagraph','Dimension','Question','QuestionText','Setup','Instance','InstanceText','Criteria','ClosingParagraph')); + &Apache::lonxml::register('Apache::bridgetask',('Task','IntroParagraph','Dimension','Question','QuestionText','Setup','Instance','InstanceText','Criteria','GraderNote','ClosingParagraph')); } my %dimension; +my $top = 'top'; + 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::top_dimensionlist=(); # list of all current Instance ids %Apache::bridgetask::instance=(); # list of all Instance ids seen in this problem @@ -326,9 +326,22 @@ sub style { my ($target) = @_; if ($target eq 'web' || $target eq 'webgrade') { - return (< STYLE + if ($env{'browser.type'} eq 'explorer' + && $env{'browser.os'} eq 'win' ) { + if ($env{'browser.version'} < 7) { + $style .= (< +STYLE + } else { + $style .= (< +STYLE + } + } + return $style; } return; } @@ -669,7 +682,7 @@ sub start_Task { } elsif ($target eq 'web') { $result.=&preserve_grade_info(); - $result.=&internal_location(); + $result.=&internal_location(); $result.=$form_tag_start. ''; &Apache::lonxml::startredirection(); @@ -684,11 +697,7 @@ sub start_Task { #$result.='
Review'.&show_queue('reviewqueue'); #$result.='
Grade'.&show_queue('gradingqueue'); } - # FIXME Blast! still need to reorg this, need to reshow the - # queue being reviewed once done with the grade pass... - # Hrrm, vaildation pass should perhaps say 'not_locked' - # perhaps do a search if there is a key that is mine and if - # there isn't reshow the queue.... + my ($todo,$status_code,$msg)=&get_key_todo($target); if ($todo) { @@ -773,6 +782,7 @@ sub start_Task { } if ($target eq 'webgrade') { $result.="\n".'
'; + &Apache::lonxml::startredirection(); } } elsif ($target eq 'edit') { $result.=$form_tag_start. @@ -1040,25 +1050,45 @@ DONEBUTTON $status.=&add_request_another_attempt_button(); } } + $status.='
'; my $man_count=0; + my $man_passed=0; my $opt_count=0; my $opt_passed=0; - foreach my $dim (keys(%Apache::bridgetask::top_dimensionlist)) { - if ($Apache::bridgetask::top_dimensionlist{$dim}{'manadatory'} + my $dim = $top; + foreach my $id (@{$dimension{$dim}{'criterias'}}) { + my $status = &get_criteria('status',$version,$dim,$id); + if ($dimension{$dim}{'criteria.'.$id.'.mandatory'} eq 'N') { $opt_count++; - if ($Apache::lonhomework::history{"resource.$version.0.$dim.status"} eq 'pass') { + if ($status eq 'pass') { $opt_passed++; } } else { $man_count++; + if ($status eq 'pass') { $man_passed++; } } } - + if ($man_passed eq $man_count) { $man_passed='all'; } + my $opt_req=&Apache::lonxml::get_param('OptionalRequired', - $parstack,$safeeval); + $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, of which you passed [_4].',$man_count,$opt_req,$opt_count,$opt_passed)."

\n"; + + $status.="\n
".&mt('You needed to pass all of the [_1] mandatory components and [_2] of the [_3] optional components, of which you passed [_4].',$man_count,$opt_req,$opt_count,$opt_passed)."

\n"; + + + foreach my $id (@{$dimension{$dim}{'criterias'}}) { + my $type = $dimension{$dim}{'criteria.'.$id.'.type'}; + if ($type eq 'dimension') { + $result.=$dimension{$id}{'result'}; + next; + } + my $criteria = + &nested_parse(\$dimension{$dim}{'criteria.'.$id}, + [@_]); + $status .= &layout_web_Criteria($dim,$id,$criteria); + } my $internal_location=&internal_location(); $result=~s/\Q$internal_location\E/$status/; @@ -1117,19 +1147,29 @@ DONEBUTTON my $ungraded=0; my $review=0; &Apache::lonhomework::showhash(%Apache::lonhomework::results); - foreach my $dim (keys(%Apache::bridgetask::top_dimensionlist)) { + my $dim = $top; + foreach my $id (@{$dimension{$dim}{'criterias'}}) { + my $link=&link($id); + + my $type = $dimension{$dim}{'criteria.'.$id.'.type'}; + + if ($type eq 'criteria') { + # dimensional 'criteria' don't get assigned grades + $Apache::lonhomework::results{"resource.$version.0.$id.status"}=$env{'form.HWVAL_'.$link}; + $Apache::lonhomework::results{"resource.$version.0.$id.comment"}=$env{'form.HWVAL_comment_'.$link}; + } my $status= - $Apache::lonhomework::results{"resource.$version.0.$dim.status"}; - my $mandatory= - ($Apache::bridgetask::top_dimensionlist{$dim}{'manadatory'} ne 'N'); + $Apache::lonhomework::results{"resource.$version.0.$id.status"}; + my $mandatory=($dimension{$dim}{'criteria.'.$id.'.mandatory'} ne 'N'); + if ($status eq 'pass') { if (!$mandatory) { $optional_passed++; } } elsif ($status eq 'fail') { if ($mandatory) { $mandatory_failed++; } - } elsif ($status eq 'ungraded') { - $ungraded++; } elsif ($status eq 'review') { $review++; + } elsif ($status eq 'ungraded') { + $ungraded++; } else { $ungraded++; } @@ -1137,39 +1177,18 @@ DONEBUTTON if ($optional_passed < $optional_required) { $mandatory_failed++; } - &Apache::lonxml::debug("all dim ".join(':',keys(%Apache::bridgetask::top_dimensionlist))."results -> m_f $mandatory_failed o_p $optional_passed u $ungraded r $review"); + &Apache::lonxml::debug(" task results -> m_f $mandatory_failed o_p $optional_passed u $ungraded r $review"); $Apache::lonhomework::results{'resource.0.regrader'}= $env{'user.name'}.':'.$env{'user.domain'}; if ($review) { $Apache::lonhomework::results{"resource.$version.0.status"}='review'; - if ($env{'form.queue'} eq 'reviewqueue') { - &check_queue_unlock($env{'form.queue'}); - &Apache::lonxml::debug(" still needs review not changing status."); - } else { - if ($env{'form.queue'} ne 'none') { - &move_between_queues($env{'form.queue'},'reviewqueue'); - } else { - &add_to_queue('reviewqueue',\%queue_data); - } - } } elsif ($ungraded) { $Apache::lonhomework::results{"resource.$version.0.status"}='ungraded'; - if ($env{'form.queue'} eq 'reviewqueue') { - &Apache::lonxml::debug("moving back."); - &move_between_queues($env{'form.queue'}, - 'gradingqueue'); - } elsif ($env{'form.queue'} eq 'none' ) { - &add_to_queue('gradingqueue',\%queue_data); - } else { - &check_queue_unlock($env{'form.queue'}); - } } elsif ($mandatory_failed) { $Apache::lonhomework::results{"resource.$version.0.status"}='fail'; $Apache::lonhomework::results{"resource.$version.0.solved"}='incorrect_by_override'; $Apache::lonhomework::results{"resource.$version.0.award"}='INCORRECT'; $Apache::lonhomework::results{"resource.$version.0.awarded"}='0'; - &remove_from_queue($env{'form.queue'}); - my ($symb,$courseid,$udom,$uname)=&Apache::lonnet::whichuser(); if ($env{'form.regrade'} ne 'yes') { @@ -1186,8 +1205,6 @@ DONEBUTTON $Apache::lonhomework::results{"resource.$version.0.solved"}='correct_by_override'; $Apache::lonhomework::results{"resource.$version.0.award"}='EXACT_ANS'; $Apache::lonhomework::results{"resource.$version.0.awarded"}='1'; - &remove_from_queue($env{'form.queue'}); - my ($symb,$courseid,$udom,$uname)=&Apache::lonnet::whichuser(); if ($env{'form.regrade'} ne 'yes') { $Apache::lonhomework::results{"resource.$version.0.bridgetask.portfiles"}= @@ -1211,13 +1228,56 @@ DONEBUTTON } &minimize_storage(); &Apache::structuretags::finalize_storage(); + + # data stored, now handle queue + if ($review) { + if ($env{'form.queue'} eq 'reviewqueue') { + &check_queue_unlock($env{'form.queue'}); + &Apache::lonxml::debug(" still needs review not changing status."); + } else { + if ($env{'form.queue'} ne 'none') { + &move_between_queues($env{'form.queue'},'reviewqueue'); + } else { + &add_to_queue('reviewqueue',\%queue_data); + } + } + } elsif ($ungraded) { + if ($env{'form.queue'} eq 'reviewqueue') { + &Apache::lonxml::debug("moving back."); + &move_between_queues($env{'form.queue'}, + 'gradingqueue'); + } elsif ($env{'form.queue'} eq 'none' ) { + &add_to_queue('gradingqueue',\%queue_data); + } else { + &check_queue_unlock($env{'form.queue'}); + } + } elsif ($mandatory_failed) { + &remove_from_queue($env{'form.queue'}); + } else { + &remove_from_queue($env{'form.queue'}); + } } if (exists($Apache::lonhomework::results{'INTERNAL_store'})) { # instance generation occured and hasn't yet been stored &Apache::structuretags::finalize_storage(); } } elsif ($target eq 'webgrade') { - $result.=""; + $result.=&Apache::lonxml::endredirection(); + my $dim = $top; + foreach my $id (@{$dimension{$dim}{'criterias'}} ) { + my $type = $dimension{$dim}{'criteria.'.$id.'.type'}; + if ($type eq 'dimension') { + # dimensional 'criteria' don't get assigned grades + next; + } else { + my $criteria =&nested_parse(\$dimension{$dim}{'criteria.'.$id}, + [@_]); + $criteria = &layout_webgrade_Criteria($dim,$id,$criteria); + my $internal_location=&internal_location($id); + $result=~s/\Q$internal_location\E/$criteria/; + } + } + $result.=""; #$result.=' '; #$result.=' undef}); - my $task_status = - $Apache::lonhomework::history{"resource.$version.0.status"}; - if ($task_status ne 'pass' && $task_status ne 'fail') { - - foreach my $id (@{$dimension{$dim}{$instance.'.criterias'}}, - @{$dimension{$dim}{'criterias'}}) { - my $type = $dimension{$dim}{'criteria.'.$id.'.type'}; - &Apache::lonxml::debug("$id is $type"); - if ($type eq 'dimension') { - $result.= - &nested_parse(\$dimension{$dim}{'criteria.'.$id}, - [@_],{'set_dim_id' => $id}); - } - } - } else { - my $dim_status=$Apache::lonhomework::history{"resource.$version.0.$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 $man_passed=0; - my $opt_count=0; - my $opt_passed=0; - foreach my $id ( @{$dimension{$dim}{$instance.'.criterias'}}, - @{$dimension{$dim}{'criterias'}} ) { - my $status = &get_criteria('status',$version,$dim,$id); - if ($dimension{$dim}{'criteria.'.$id.'.mandatory'} - eq 'N') { - $opt_count++; - if ($status eq 'pass') { $opt_passed++; } - } else { - $man_count++; - if ($status eq 'pass') { $man_passed++; } - } - } - if ($man_passed eq $man_count) { $man_passed='all'; } - - my $opt_req=$dimension{$dim}{$instance.'.optionalrequired'}; - if ($opt_req !~ /\S/) { - $opt_req= - &Apache::lonxml::get_param('OptionalRequired', - $parstack,$safeeval); - if ($opt_req !~ /\S/) { $opt_req = 0; } - } - $dim_info.="\n

".&mt('You passed [_1] of the [_2] mandatory components and [_3] of the [_4] optional components, of which you were required to pass [_5].',$man_passed,$man_count,$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{$dim}{$instance.'.criterias'}}, - @{$dimension{$dim}{'criterias'}}) { - my $type = $dimension{$dim}{'criteria.'.$id.'.type'}; - if ($type eq 'dimension') { - $result.=$dimension{$id}{'result'}; - next; - } - my $status= &get_criteria('status', $version,$dim,$id); - my $comment=&get_criteria('comment',$version,$dim,$id); - my $mandatory=($dimension{$dim}{'criteria.'.$id.'.mandatory'} ne 'N'); - if ($mandatory) { - $mandatory='Mandatory'; - } else { - $mandatory='Optional'; - } - if ($status eq 'fail') { - } elsif ($status eq 'pass') { - } else { - &Apache::lonxml::error("Student viewing a graded bridgetask was shown a status of $status"); - } - my $status_display=$status; - $status_display=~s/^([a-z])/uc($1)/e; - $result.= - '

' - .$mandatory.' Criteria

'; + my $shown_question_text; + foreach my $instance (@instances) { + $result .= &nested_parse(\$dimension{$dim}{$instance.'.text'}, + [@_]); + $result .= &nested_parse(\$dimension{$dim}{'questiontext'}, + [@_],{'set_dim_id' => undef}); + my $task_status = + $Apache::lonhomework::history{"resource.$version.0.status"}; + if ($task_status ne 'pass' && $task_status ne 'fail') { + + foreach my $id (@{$dimension{$dim}{$instance.'.criterias'}}, + @{$dimension{$dim}{'criterias'}}) { + my $type = $dimension{$dim}{'criteria.'.$id.'.type'}; + &Apache::lonxml::debug("$id is $type"); + if ($type eq 'dimension') { $result.= &nested_parse(\$dimension{$dim}{'criteria.'.$id}, [@_],{'set_dim_id' => $id}); - $result.='

'.$status_display.'

'; - if ($comment) { - $result.='

'. - &mt('Comment: [_1]',$comment).'

'; - } - $result.='
'; } } - } - } elsif ($target eq 'webgrade') { - # in case of any side effects that we need - &nested_parse(\$dimension{$dim}{'intro'},[@_]); - &nested_parse(\$dimension{$dim}{$instance.'.text'},[@_]); - $result.= - &nested_parse(\$dimension{$dim}{'questiontext'},[@_], - {'set_dim_id' => undef, - 'delayed_dim_results' => 1}); - foreach my $id (@{$dimension{$dim}{$instance.'.criterias'}}, - @{$dimension{$dim}{'criterias'}} ) { - my $type = $dimension{$dim}{'criteria.'.$id.'.type'}; - if ($type eq 'dimension') { - # dimensional 'criteria' don't get assigned grades - $result.= - &nested_parse(\$dimension{$dim}{'criteria.'.$id}, - [@_],{'set_dim_id' => $id}); - next; + } else { + my $dim_status=$Apache::lonhomework::history{"resource.$version.0.$dim.status"}; + my $mandatory='Mandatory'; + if (&Apache::lonxml::get_param('Mandatory',$parstack,$safeeval) eq 'N') { + $mandatory='Optional'; + } + my $dim_info="
\n"; + my $question = ('sub' x $dimension{$dim}{'depth'}).'question'; + my $ucquestion = $question; + $ucquestion =~ s/^(.)/uc($1)/e; + if ($dim_status eq 'pass') { + $dim_info.='

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

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

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

'; + } + my $man_count=0; + my $man_passed=0; + my $opt_count=0; + my $opt_passed=0; + foreach my $id ( @{$dimension{$dim}{$instance.'.criterias'}}, + @{$dimension{$dim}{'criterias'}} ) { + my $status = &get_criteria('status',$version,$dim,$id); + if ($dimension{$dim}{'criteria.'.$id.'.mandatory'} + eq 'N') { + $opt_count++; + if ($status eq 'pass') { $opt_passed++; } + } else { + $man_count++; + if ($status eq 'pass') { $man_passed++; } + } } - - my $link=&link($id); - my $status= &get_criteria('status',$version,$dim,$id); - $result.='
'."\n". - '
'."\n"; - $result.= - &nested_parse(\$dimension{$dim}{'criteria.'.$id},[@_]); - - $result.='
'."\n". - '
'."\n". - ''."\n". - ''."\n". - ''."\n". - ''."\n". - '
'."\n". - ''."\n". - '
    '."\n". - '
  • Prev
  • '."\n". - '
  • Next
  • '."\n". - '
'."\n". - '
'."\n"; - $result.=&grading_history($version,$dim,$id); - $last_link=$link; - } - if (&nest()) { - &Apache::lonxml::debug(" for $dim stashing results into ".$dimension{$dim}{'nested'}); - $dimension{$dimension{$dim}{'nested'}}{'result'}.=$result; - undef($result); - } - } elsif ($target eq 'grade' && $env{'form.webgrade'}) { - my $optional_passed=0; - my $mandatory_failed=0; - my $ungraded=0; - my $review=0; - - $result .= &nested_parse(\$dimension{$dim}{'intro'},[@_]); - $result .= &nested_parse(\$dimension{$dim}{$instance.'.text'}, - [@_]); - $result .= &nested_parse(\$dimension{$dim}{'questiontext'}, - [@_],{'set_dim_id' => undef}); - - foreach my $id (@{$dimension{$dim}{$instance.'.criterias'}}, - @{$dimension{$dim}{'criterias'}}) { - my $link=&link($id); - - my $type = $dimension{$dim}{'criteria.'.$id.'.type'}; - if ($type eq 'criteria') { - # dimensional 'criteria' don't get assigned grades - $Apache::lonhomework::results{"resource.$version.0.$dim.$id.status"}=$env{'form.HWVAL_'.$link}; - $Apache::lonhomework::results{"resource.$version.0.$dim.$id.comment"}=$env{'form.HWVAL_comment_'.$link}; - } else { - $result .= + if ($man_passed eq $man_count) { $man_passed='all'; } + + my $opt_req=$dimension{$dim}{$instance.'.optionalrequired'}; + if ($opt_req !~ /\S/) { + $opt_req= + &Apache::lonxml::get_param('OptionalRequired', + $parstack,$safeeval); + if ($opt_req !~ /\S/) { $opt_req = 0; } + } + $dim_info.="\n

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

\n
"; + + foreach my $id (@{$dimension{$dim}{$instance.'.criterias'}}, + @{$dimension{$dim}{'criterias'}}) { + my $type = $dimension{$dim}{'criteria.'.$id.'.type'}; + if ($type eq 'dimension') { + $result.=$dimension{$id}{'result'}; + next; + } + my $criteria = &nested_parse(\$dimension{$dim}{'criteria.'.$id}, - [@_],{'set_dim_id' => $id}); + [@_]); + $dim_info .= &layout_web_Criteria($dim,$id,$criteria); } - my $status= &get_criteria('status',$version,$dim,$id); - my $mandatory=($dimension{$dim}{'criteria.'.$id.'.mandatory'} ne 'N'); - if ($status eq 'pass') { - if (!$mandatory) { $optional_passed++; } - } elsif ($status eq 'fail') { - if ($mandatory) { $mandatory_failed++; } - } elsif ($status eq 'review') { - $review++; - } elsif ($status eq 'ungraded') { - $ungraded++; - } else { - $ungraded++; - } - } - # FIXME optional required can apply to only right now... - my $opt_req=$dimension{$dim}{$instance.'.optionalrequired'}; - if ($opt_req !~ /\S/) { - $opt_req= - &Apache::lonxml::get_param('OptionalRequired', - $parstack,$safeeval); - if ($opt_req !~ /\S/) { $opt_req = 0; } + my $internal_location=&internal_location($dim); + $result=~s/\Q$internal_location\E/$dim_info/; } - if ($optional_passed < $opt_req) { - $mandatory_failed++; + } + } elsif ($target eq 'webgrade') { + # in case of any side effects that we need + &nested_parse(\$dimension{$dim}{'intro'},[@_]); + &nested_parse(\$dimension{$dim}{$instance.'.text'},[@_]); + $result.= + &nested_parse(\$dimension{$dim}{'questiontext'},[@_], + {'set_dim_id' => undef, + 'delayed_dim_results' => 1}); + foreach my $id (@{$dimension{$dim}{$instance.'.criterias'}}, + @{$dimension{$dim}{'criterias'}} ) { + my $type = $dimension{$dim}{'criteria.'.$id.'.type'}; + if ($type eq 'dimension') { + # dimensional 'criteria' don't get assigned grades + $result.= + &nested_parse(\$dimension{$dim}{'criteria.'.$id}, + [@_],{'set_dim_id' => $id}); + next; + } else { + my $criteria =&nested_parse(\$dimension{$dim}{'criteria.'.$id}, + [@_]); + $criteria = &layout_webgrade_Criteria($dim,$id,$criteria); + my $internal_location=&internal_location($id); + $result=~s/\Q$internal_location\E/$criteria/; } - &Apache::lonxml::debug("all instance ".join(':',@{$dimension{$dim}{$instance.'.criterias'}})." results -> m_f $mandatory_failed o_p $optional_passed u $ungraded r $review"); - if ($review) { - $Apache::lonhomework::results{"resource.$version.0.$dim.status"}= - 'review'; - } elsif ($ungraded) { - $Apache::lonhomework::results{"resource.$version.0.$dim.status"}= - 'ungraded'; - } elsif ($mandatory_failed) { - $Apache::lonhomework::results{"resource.$version.0.$dim.status"}= - 'fail'; + } + if (&nest()) { + &Apache::lonxml::debug(" for $dim stashing results into ".$dimension{$dim}{'nested'}); + $dimension{$dimension{$dim}{'nested'}}{'result'}.=$result; + undef($result); + } + } elsif ($target eq 'grade' && $env{'form.webgrade'}) { + my $optional_passed=0; + my $mandatory_failed=0; + my $ungraded=0; + my $review=0; + + $result .= &nested_parse(\$dimension{$dim}{'intro'},[@_]); + $result .= &nested_parse(\$dimension{$dim}{$instance.'.text'}, + [@_]); + $result .= &nested_parse(\$dimension{$dim}{'questiontext'}, + [@_],{'set_dim_id' => undef}); + + foreach my $id (@{$dimension{$dim}{$instance.'.criterias'}}, + @{$dimension{$dim}{'criterias'}}) { + my $link=&link($id); + + my $type = $dimension{$dim}{'criteria.'.$id.'.type'}; + if ($type eq 'criteria') { + # dimensional 'criteria' don't get assigned grades + $Apache::lonhomework::results{"resource.$version.0.$dim.$id.status"}=$env{'form.HWVAL_'.$link}; + $Apache::lonhomework::results{"resource.$version.0.$dim.$id.comment"}=$env{'form.HWVAL_comment_'.$link}; } else { - $Apache::lonhomework::results{"resource.$version.0.$dim.status"}= - 'pass'; + $result .= + &nested_parse(\$dimension{$dim}{'criteria.'.$id}, + [@_],{'set_dim_id' => $id}); + } + my $status= &get_criteria('status',$version,$dim,$id); + + my $mandatory=($dimension{$dim}{'criteria.'.$id.'.mandatory'} ne 'N'); + if ($status eq 'pass') { + if (!$mandatory) { $optional_passed++; } + } elsif ($status eq 'fail') { + if ($mandatory) { $mandatory_failed++; } + } elsif ($status eq 'review') { + $review++; + } elsif ($status eq 'ungraded') { + $ungraded++; + } else { + $ungraded++; } + } + + my $opt_req=$dimension{$dim}{$instance.'.optionalrequired'}; + if ($opt_req !~ /\S/) { + $opt_req= + &Apache::lonxml::get_param('OptionalRequired', + $parstack,$safeeval); + if ($opt_req !~ /\S/) { $opt_req = 0; } + } + if ($optional_passed < $opt_req) { + $mandatory_failed++; + } + &Apache::lonxml::debug("all instance ".join(':',@{$dimension{$dim}{$instance.'.criterias'}})." results -> m_f $mandatory_failed o_p $optional_passed u $ungraded r $review"); + if ($review) { + $Apache::lonhomework::results{"resource.$version.0.$dim.status"}= + 'review'; + } elsif ($ungraded) { + $Apache::lonhomework::results{"resource.$version.0.$dim.status"}= + 'ungraded'; + } elsif ($mandatory_failed) { + $Apache::lonhomework::results{"resource.$version.0.$dim.status"}= + 'fail'; } else { - # any other targets no output - undef($result); + $Apache::lonhomework::results{"resource.$version.0.$dim.status"}= + 'pass'; } - &disable_dimension_parsing(); - pop(@Apache::bridgetask::dimension); - return $result; + } else { + # any other targets no output + undef($result); } + &disable_dimension_parsing(); + pop(@Apache::bridgetask::dimension); + return $result; +} - sub end_Setup { - my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_; - my $result=&Apache::lonxml::endredirection(); - my $dim=&get_id($parstack,$safeeval); - my $instance=&get_instance($dim); - my $version=&get_version(); - if ($target eq 'web') { - @Apache::scripttag::parser_env = @_; - $result.=&Apache::scripttag::xmlparse($dimension{$dim}{'intro'}); - my @instances = $instance; - if (&Apache::response::showallfoils()) { - @instances = @{$dimension{$dim}{'instances'}}; - } - foreach my $instance (@instances) { - @Apache::scripttag::parser_env = @_; - $result.=&Apache::scripttag::xmlparse($dimension{$dim}{$instance.'.text'}); - @Apache::scripttag::parser_env = @_; - $result.=&Apache::scripttag::xmlparse($dimension{$dim}{'questiontext'}); - } - } elsif ($target eq 'webgrade' - || $target eq 'grade' && $env{'form.webgrade'}) { - # in case of any side effects that we need - @Apache::scripttag::parser_env = @_; - &Apache::scripttag::xmlparse($dimension{$dim}{'intro'}); +sub end_Setup { + my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_; + my $result=&Apache::lonxml::endredirection(); + my $dim=&get_id($parstack,$safeeval); + my $instance=&get_instance($dim); + my $version=&get_version(); + if ($target eq 'web') { + @Apache::scripttag::parser_env = @_; + $result.=&Apache::scripttag::xmlparse($dimension{$dim}{'intro'}); + my @instances = $instance; + if (&Apache::response::showallfoils()) { + @instances = @{$dimension{$dim}{'instances'}}; + } + foreach my $instance (@instances) { @Apache::scripttag::parser_env = @_; - &Apache::scripttag::xmlparse($dimension{$dim}{$instance.'.text'}); + $result.=&Apache::scripttag::xmlparse($dimension{$dim}{$instance.'.text'}); @Apache::scripttag::parser_env = @_; - &Apache::scripttag::xmlparse($dimension{$dim}{'questiontext'}); - } else { - # any other targets no output - undef($result); + $result.=&Apache::scripttag::xmlparse($dimension{$dim}{'questiontext'}); } - pop(@Apache::bridgetask::dimension); - return $result; + } elsif ($target eq 'webgrade' + || $target eq 'grade' && $env{'form.webgrade'}) { + # in case of any side effects that we need + @Apache::scripttag::parser_env = @_; + &Apache::scripttag::xmlparse($dimension{$dim}{'intro'}); + @Apache::scripttag::parser_env = @_; + &Apache::scripttag::xmlparse($dimension{$dim}{$instance.'.text'}); + @Apache::scripttag::parser_env = @_; + &Apache::scripttag::xmlparse($dimension{$dim}{'questiontext'}); + } else { + # any other targets no output + undef($result); } + pop(@Apache::bridgetask::dimension); + return $result; } sub grading_history { @@ -2404,7 +2429,9 @@ sub grading_history { return ''; } my ($result,$grader); - my $scope="resource.$version.0.$dim.$id"; + my $scope="resource.$version.0."; + $scope .= ($dim ne $top) ? "$dim.$id" + : "$id"; foreach my $t (1..$Apache::lonhomework::history{'version'}) { if (exists($Apache::lonhomework::history{$t.':resource.0.regrader'})) { my ($gname,$gdom) = @@ -2491,9 +2518,19 @@ sub end_InstanceText { sub start_Criteria { my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; my $criteria=&Apache::lonxml::get_all_text('/criteria',$parser,$style); + my $result = ''; if ($target eq 'web' || $target eq 'webgrade' || $target eq 'grade') { my $dim = &get_dim_id(); my $id=&get_id($parstack,$safeeval); + if ($target eq 'web' || $target eq 'webgrade') { + if ($target eq 'webgrade' && $dim ne 'top') { + &Apache::lonxml::debug(" for $dim $id stashing results into $dim "); + $dimension{$dim}{'result'} .= &internal_location($id); + } else { + &Apache::lonxml::debug(" not stashing $dim $id"); + $result .= &internal_location($id); + } + } &Apache::lonxml::debug("Criteria $id with $dim"); if (&Apache::londefdef::is_inside_of($tagstack,'Instance')) { my $instance_id=$Apache::bridgetask::instance{$dim}[-1]; @@ -2510,12 +2547,97 @@ sub start_Criteria { push(@{$dimension{$dim}{'criterias'}},$id); } } - return ''; + return $result; +} + +sub layout_web_Criteria { + my ($dim,$id,$criteria) = @_; + + my $version = &get_version(); + my $status= &get_criteria('status', $version,$dim,$id); + my $comment=&get_criteria('comment',$version,$dim,$id); + my $mandatory=($dimension{$dim}{'criteria.'.$id.'.mandatory'} ne 'N'); + if ($mandatory) { + $mandatory='Mandatory'; + } else { + $mandatory='Optional'; + } + my $status_display=$status; + $status_display=~s/^([a-z])/uc($1)/e; + my $criteria_info.= + '

' + .$mandatory.' Criteria

'; + $criteria_info.= $criteria; + $criteria_info.='

'.$status_display.'

'; + if ($comment =~ /\w/) { + $criteria_info.='

'. + &mt('Comment: [_1]',$comment).'

'; + } + $criteria_info.='
'; + return $criteria_info; +} + +sub layout_webgrade_Criteria { + my ($dim,$id,$criteria) = @_; + my $link=&link($id); + my $version = &get_version(); + my $status = &get_criteria('status',$version,$dim,$id); + my $result = + '
'."\n". + '
'."\n". + $criteria. + '
'."\n". + '
'."\n". + ''."\n". + ''."\n". + ''."\n". + ''."\n". + '
'."\n". + ''."\n". + '
'."\n". + &grading_history($version,$dim,$id); + return $result; } sub end_Criteria { } +sub start_GraderNote { + my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; + + if ($target eq 'webgrade') { + return '
'. + &mt('Note to graders:').''; + } + my $note=&Apache::lonxml::get_all_text('/gradernote',$parser,$style); + return; +} + +sub end_GraderNote { + my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; + + if ($target eq 'webgrade') { + return '
'; + } + return; +} + + + sub proctor_validation_screen { my ($slot) = @_; my (undef,undef,$domain,$user) = &Apache::lonnet::whichuser();