--- loncom/interface/lonquickgrades.pm 2011/05/27 19:32:10 1.94 +++ loncom/interface/lonquickgrades.pm 2011/06/02 01:34:34 1.98 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # Quick Student Grades Display # -# $Id: lonquickgrades.pm,v 1.94 2011/05/27 19:32:10 www Exp $ +# $Id: lonquickgrades.pm,v 1.98 2011/06/02 01:34:34 www Exp $ # # Copyright Michigan State University Board of Trustees # @@ -35,6 +35,17 @@ use Apache::loncommon; use Apache::lonlocal; use Apache::lonnet; use Apache::grades; +use Time::HiRes; +my $time=0; + +sub tim { + my ($label)=@_; + my $tt=&Time::HiRes::time(); + my $dt=$tt-$time; + &Apache::lonnet::logthis("qg $label ".$dt); + $time=$tt; +} + sub handler { my $r = shift; @@ -242,39 +253,40 @@ sub getData { my $stack = $iterator->getStack(); for my $part (@{$parts}) { - my $completionStatus = $curRes->getCompletionStatus($part); my $dateStatus = $curRes->getDateStatus($part); - - if ($completionStatus == $curRes->EXCUSED()) { + my $weight = $curRes->weight($part); + my $problemstatus = $curRes->problemstatus($part); + + if ($curRes->solved($part) eq 'excused') { next; } if ($showPoints) { my $score = 0; # If we're not telling status and the answer date isn't passed yet, # it's an "attempted" point - if ((($curRes->problemstatus($part) eq 'no') || - ($curRes->problemstatus($part) eq 'no_feedback_ever')) && + if ((($problemstatus eq 'no') || + ($problemstatus eq 'no_feedback_ever')) && ($dateStatus != $curRes->ANSWER_OPEN)) { my $status = $curRes->simpleStatus($part); if ($status == $curRes->ATTEMPTED) { - $partsAttempted += $curRes->weight($part); + $partsAttempted += $weight; $totalAttempted += $partsAttempted; } } else { - $score = &Apache::grades::compute_points($curRes->weight($part), $curRes->awarded($part)); + $score = &Apache::grades::compute_points($weight, $curRes->awarded($part)); } $partsRight += $score; $totalRight += $score; - $partsCount += $curRes->weight($part); + $partsCount += $weight; $curRes->{DATA}->{PROB_SCORE} += $score; - $curRes->{DATA}->{PROB_WEIGHT} += $curRes->weight($part); + $curRes->{DATA}->{PROB_WEIGHT} += $weight; if ($curRes->opendate($part) < $now) { - $totalPossible += $curRes->weight($part); - $curRes->{DATA}->{PROB_POSSIBLE} += $curRes->weight($part); + $totalPossible += $weight; + $curRes->{DATA}->{PROB_POSSIBLE} += $weight; } - $totalParts += $curRes->weight($part); + $totalParts += $weight; } else { my $status = $curRes->simpleStatus($part); my $thisright = 0; @@ -291,7 +303,6 @@ sub getData { $totalAttempted++; } - my $dateStatus = $curRes->getDateStatus($part); $totalParts++; if ($curRes->opendate($part) < $now) { $totalPossible++; @@ -588,8 +599,10 @@ sub process_category_edits { sub output_category_table { my ($r,$cangrade,$navmaps,%categories)=@_; - my $sum=0; - my $total=0; + + my $totalweight=0; + my $totalpoints=0; + $r->print(&Apache::loncommon::start_data_table()); # &output_category_table_header($r,$cangrade); @@ -599,15 +612,19 @@ sub output_category_table { my %performance=&dumpdata($navmaps); my $maxpos=$#order; for (my $i=0;$i<=$maxpos;$i++) { - my ($value,$weight)=&output_and_calc_category($r,$cangrade,$navmaps,$order[$i],$i,$maxpos,\%performance,1,%categories); - $sum+=$value*$weight; - $total+=$weight; + my ($correct,$possible,$type,$weight)=&output_and_calc_category($r,$cangrade,$navmaps,$order[$i],$i,$maxpos,\%performance,1,%categories); + unless ($possible) { next; } + $totalpoints+=$weight*$correct/$possible; + $totalweight+=$weight; } # - &bottom_line_category($r,$cangrade,$sum,$total); + my $perc=0; + if ($totalweight) { $perc=100.*$totalpoints/$totalweight; } + + &bottom_line_category($r,$cangrade,$perc); # $r->print(&Apache::loncommon::end_data_table()); - return $sum; + return $perc; } sub output_category_table_header { @@ -632,8 +649,7 @@ sub output_category_table_header { sub output_and_calc_category { my ($r,$cangrade,$navmaps,$id,$currentpos,$maxpos,$performance,$output,%categories)=@_; - my $value=0; - my $weight=0; + my $iconpath = &Apache::loncommon::lonhttpdurl($r->dir_config('lonIconsURL') . "/"); my %lt=&Apache::lonlocal::texthash( 'up' => 'Move Up', @@ -682,7 +698,7 @@ ENDMOVE if ($possible>0) { push(@individual,"$possible:$correct"); } if ($output) { $r->print('
  • '); - $r->print(&Apache::lonnet::gettitle($contentid).' ('.$correct.'/'.$possible.')'); + $r->print(&Apache::lonnet::gettitle($contentid).' ('.&numberout($correct).'/'.&numberout($possible).')'); if ($cangrade) { $r->print(' '.&mt('Delete').''); } @@ -694,7 +710,7 @@ ENDMOVE if ($cangrade) { $r->print('
    '.&Apache::loncommon::selectresource_link('quickform','addcont_'.$id,&mt('Add Problem or Folder')).'
    '); } - $r->print('

    '.&mt('Total raw points: [_1]/[_2]',$totalcorrect,$totalpossible).'

    '); + $r->print('

    '.&mt('Total raw points: [_1]/[_2]',&numberout($totalcorrect),&numberout($totalpossible)).'

    '); $r->print(''); } # Total @@ -719,7 +735,7 @@ ENDMOVE $totalpossible=1.*$categories{$id.'_total'}; } if ($output) { - $r->print('

    '.&mt('Adjusted raw points: [_1]/[_2]',$totalcorrect,$totalpossible).'

    '); + $r->print('

    '.&mt('Adjusted raw points: [_1]/[_2]',&numberout($totalcorrect),&numberout($totalpossible)).'

    '); } @@ -763,43 +779,54 @@ ENDMOVE if ($output) { $r->print(''); if ($cangrade) { $r->print('
    '.&new_calc_rule_form($id)); } - $r->print('

    '.&mt('Calculated points: [_1]/[_2]',$totalcorrect,$totalpossible).'

    '); + $r->print('

    '.&mt('Calculated points: [_1]/[_2]',&numberout($totalcorrect),&numberout($totalpossible)).'

    '); $r->print(''); } - +# +# Prepare for export +# # Weight + my $weight=$categories{$id.'_weight'}; + unless (1.*$weight>0) { $weight=0; } if ($cangrade) { if ($output) { $r->print(''. ''); + '" value="'.&Apache::lonhtmlcommon::entity_encode($weight).'" />'); } } else { if ($output) { - $r->print(''.$categories{$id.'_weight'}.''); + $r->print(''.$weight.''); } } # Achieved + my $type=$categories{$id.'_displayachieved'}; + unless (($type eq 'percent') || ($type eq 'points')) { $type='points'; } if ($output) { $r->print(''); } if ($cangrade) { if ($output) { $r->print(''); } - } else { - if ($output) { - if ($categories{$id.'_displayachieved'} eq 'percent') { - $r->print(&mt('percent')); - } else { - $r->print(&mt('points')); + } + if ($output) { + $r->print('

    '); + if ($type eq 'percent') { + my $perc='---'; + if ($totalpossible) { + $perc=100.*$totalcorrect/$totalpossible; } + $r->print(&mt('[_1] percent',&numberout($perc))); + } else { + $r->print(&mt('[_1]/[_2] points',&numberout($totalcorrect),&numberout($totalpossible))); } + $r->print('

    '); } if ($output) { $r->print(''); } - return ($value,$weight); + return ($totalcorrect,$totalpossible,$type,$weight); } # @@ -847,14 +874,21 @@ sub drop { # sub bottom_line_category { - my ($r,$cangrade,$sum,$total)=@_; + my ($r,$cangrade,$perc)=@_; $r->print(&Apache::loncommon::start_data_table_row()); if ($cangrade) { $r->print(''.&mt('Create New Category').''); } - $r->print(''.&mt('Current:').$sum.'
    '.&mt('Total:').$total.'
    '); + $r->print(''.&mt('Total: [_1] percent',&numberout($perc)).''); } +sub numberout { + my ($number)=@_; + my $printout=sprintf("%.3f", $number); + $printout=~s/0+$//; + $printout=~s/\.$//; + return $printout; +} # # Make one new category #