--- loncom/homework/bridgetask.pm 2006/03/28 19:55:43 1.122 +++ loncom/homework/bridgetask.pm 2006/06/05 17:15:37 1.128.2.10 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # definition of tags that give a structure to a document # -# $Id: bridgetask.pm,v 1.122 2006/03/28 19:55:43 albertel Exp $ +# $Id: bridgetask.pm,v 1.128.2.10 2006/06/05 17:15:37 albertel Exp $ # # Copyright Michigan State University Board of Trustees # @@ -213,6 +213,7 @@ sub add_grading_button { 'gradinguser', 'gradingdomain'); $result.=&Apache::loncommon::studentbrowser_javascript(); + $result.= '

'; } return $result; } @@ -258,64 +259,14 @@ sub preserve_grade_info { } sub style { - return (< -.LC_fail, .LC_pass, .LC_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); -} - -.LC_fail h4, .LC_pass h4 { - position:absolute; - left: -4px; - top: -8px; - padding:2px; - margin:0; - background-color : rgb(255,240,225); - border : thin solid; -} - -.LC_fail { - color: red; -} - -.LC_pass { - color : green; -} - -.LC_neutral { - color : blue; -} - -.LC_question { - border : thin solid black; - padding : 4px; - margin-bottom : 1em; -} - -.LC_grade { - font-size: x-large; - font-family: Arial; - position:absolute; - left: 5px; - top: -5px; - width: 70px; -} - -div#feedback h1 { - color : inherit; -} - + my ($target) = @_; + if ($target eq 'web' + || $target eq 'webgrade') { + return (< STYLE - + } + return; } sub show_task { @@ -398,12 +349,15 @@ sub webgrade_standard_info { my %lt=&Apache::lonlocal::texthash('done' => 'Next Item', 'stop' => 'Quit Grading', + 'fail' => 'Fail Rest', ); my $result=< + $file_list INFO @@ -428,7 +382,15 @@ sub start_Task { my ($result,$head_tag_start,$body_tag_start,$form_tag_start)= &Apache::structuretags::page_start($target,$token,$tagstack,$parstack,$parser,$safeeval); + $head_tag_start .= &style($target); $body_tag_start .= '
'."\n"; + + if ($target eq 'web' || $target eq 'webgrade') { + $head_tag_start.=''. + &Apache::structuretags::get_resource_name($parstack,$safeeval). + ''; + } + if ($target eq 'web' && $env{'request.state'} ne 'construct') { if ($Apache::lonhomework::modifygrades) { $body_tag_start.='
Nonexistant file: [_1]',$file); - } else { - $file = ''.$file.''; - } + $file = ''.$file.''; $files .= '
  • '.$file.'
    • '; } $files.=''; @@ -538,9 +496,8 @@ DONESCREEN } } } elsif ($target eq 'web') { - my $name= &Apache::structuretags::get_resource_name($parstack,$safeeval); - $result.="$head_tag_start$name - $body_tag_start \n".&style(); + $result.="$head_tag_start + $body_tag_start \n"; $result.=&preserve_grade_info(); $result.=&internal_location(); @@ -552,7 +509,11 @@ DONESCREEN $target eq 'webgrade') { my $webgrade='yes'; if ($target eq 'webgrade') { - $result.=$head_tag_start.''.$body_tag_start; + $result.=$head_tag_start. + ''.$body_tag_start. + "\n".'
    '."\n". + ''; #$result.='
    Review'.&show_queue('reviewqueue'); #$result.='
    Grade'.&show_queue('gradingqueue'); } @@ -1012,7 +973,7 @@ DONEBUTTON &Apache::structuretags::finalize_storage(); } } elsif ($target eq 'webgrade') { - $result.="
    \n
    "; + $result.="
    "; #$result.=' '; #$result.=' '; #$result.=' '; - $result.=''."\n\n". + $result.=''."\n\n\n". &Apache::loncommon::endbodytag().''; } elsif ($target eq 'meta') { $result.=&Apache::response::meta_package_write('Task'); @@ -1357,9 +1318,15 @@ 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; - return $possible[int(rand($max))][0]; + # 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 $possible[0][0]; } return undef; } @@ -1802,9 +1769,7 @@ sub get_instance { my $link=&link($instance,$id); my $status=$Apache::lonhomework::history{"resource.$version.0.$dim.$instance.$id.status"}; $result.='
    '."\n". - ''."\n". - ''."\n". - '
    '."\n"; + '
    '."\n"; @Apache::scripttag::parser_env = @_; $result.=&Apache::scripttag::xmlparse($dimension{$instance.'.criteria.'.$id}); $result.='
    '."\n". @@ -1831,7 +1796,13 @@ sub get_instance { my $mandatory_failed=0; my $ungraded=0; my $review=0; + + @Apache::scripttag::parser_env = @_; + $result.=&Apache::scripttag::xmlparse($dimension{'intro'}); foreach my $id (@{$dimension{$instance.'.criterias'}}) { + @Apache::scripttag::parser_env = @_; + $result.=&Apache::scripttag::xmlparse($dimension{$instance.'.tex +t'}); my $link=&link($instance,$id); my $status=$Apache::lonhomework::results{"resource.$version.0.$dim.$instance.$id.status"}=$env{'form.HWVAL_'.$link}; $Apache::lonhomework::results{"resource.$version.0.$dim.$instance.$id.comment"}=$env{'form.HWVAL_comment_'.$link}; @@ -1908,12 +1879,12 @@ sub grading_history { sub start_IntroParagraph { my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; my $result; - if ($target eq 'web' || $target eq 'webgrade') { + if ($target eq 'web' || $target eq 'web' || $target eq 'webgrade') { if ($tagstack->[-2] eq 'Dimension') { $dimension{'intro'}=&Apache::lonxml::get_all_text('/introparagraph',$parser,$style); - } elsif ($target eq 'webgrade') { - &Apache::lonxml::get_all_text('/introparagraph',$parser,$style); + } elsif ($tagstack->[-2] eq 'Task' && $target eq 'webgrade') { + &Apache::lonxml::startredirection(); } } @@ -1921,6 +1892,10 @@ sub start_IntroParagraph { } sub end_IntroParagraph { + my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; + if ($tagstack->[-2] eq 'Task' && $target eq 'webgrade') { + my $result = &Apache::lonxml::endredirection(); + } } sub start_Instance { @@ -1945,7 +1920,7 @@ sub start_InstanceText { my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; my $instance_id=$Apache::bridgetask::instance[-1]; my $text=&Apache::lonxml::get_all_text('/instancetext',$parser,$style); - if ($target eq 'web' || $target eq 'webgrade') { + if ($target eq 'grade' || $target eq 'web' || $target eq 'webgrade') { $dimension{$instance_id.'.text'}=$text; } return '';