--- loncom/homework/bridgetask.pm 2006/03/29 13:24:43 1.128 +++ loncom/homework/bridgetask.pm 2006/04/10 07:30:54 1.137 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # definition of tags that give a structure to a document # -# $Id: bridgetask.pm,v 1.128 2006/03/29 13:24:43 albertel Exp $ +# $Id: bridgetask.pm,v 1.137 2006/04/10 07:30:54 albertel Exp $ # # Copyright Michigan State University Board of Trustees # @@ -974,7 +974,7 @@ DONEBUTTON &Apache::structuretags::finalize_storage(); } } elsif ($target eq 'webgrade') { - $result.="</div>\n<hr />"; + $result.="</div>"; #$result.='<input type="submit" name="next" value="'. # &mt('Save & Next').'" /> '; #$result.='<input type="submit" name="end" value="'. @@ -1319,8 +1319,13 @@ sub pick_from_queue_data { if (@possible) { # sort entries in order by slot end time @possible = sort { $a->[1] <=> $b->[1] } @possible; - # pick one of the first ten entries - my $max=($#possible < 10) ? $#possible : 10; + # pick one of the entries in the top 10% in small queues and one + # of the first ten entries in large queues + my $ten_percent = int($#possible * 0.1); + if ($ten_percent < 1 ) { $ten_percent = 1; } + if ($ten_percent > 10) { $ten_percent = 10; } + my $max=($#possible < $ten_percent) ? $#possible : $ten_percent; + return $possible[int(rand($max))][0]; } return undef; @@ -1764,9 +1769,7 @@ sub get_instance { my $link=&link($instance,$id); my $status=$Apache::lonhomework::history{"resource.$version.0.$dim.$instance.$id.status"}; $result.='<div class="LC_GRADING_criteria" id="'.$link.'">'."\n". - '<a name="'.$link.'" />'."\n". - '<a name="next_'.$last_link.'" />'."\n". - '<div class="LC_GRADING_criteriatext">'."\n"; + '<div class="LC_GRADING_criteriatext" id="next_'.$last_link.'">'."\n"; @Apache::scripttag::parser_env = @_; $result.=&Apache::scripttag::xmlparse($dimension{$instance.'.criteria.'.$id}); $result.='</div>'."\n". @@ -1876,9 +1879,6 @@ sub start_IntroParagraph { } elsif ($tagstack->[-2] eq 'Task' && $target eq 'webgrade') { &Apache::lonxml::startredirection(); - } else { - &Apache:;lonxml::error("Invalid use of <IntroParagraph> inside of <".$tagstack->[-2].">"); - &Apache::lonxml::get_all_text('/introparagraph',$parser,$style); } }