version 1.95, 2011/05/28 16:55:49
|
version 1.98, 2011/06/02 01:34:34
|
Line 35 use Apache::loncommon;
|
Line 35 use Apache::loncommon;
|
use Apache::lonlocal; |
use Apache::lonlocal; |
use Apache::lonnet; |
use Apache::lonnet; |
use Apache::grades; |
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 { |
sub handler { |
my $r = shift; |
my $r = shift; |
Line 242 sub getData {
|
Line 253 sub getData {
|
my $stack = $iterator->getStack(); |
my $stack = $iterator->getStack(); |
|
|
for my $part (@{$parts}) { |
for my $part (@{$parts}) { |
my $completionStatus = $curRes->getCompletionStatus($part); |
|
my $dateStatus = $curRes->getDateStatus($part); |
my $dateStatus = $curRes->getDateStatus($part); |
|
my $weight = $curRes->weight($part); |
if ($completionStatus == $curRes->EXCUSED()) { |
my $problemstatus = $curRes->problemstatus($part); |
|
|
|
if ($curRes->solved($part) eq 'excused') { |
next; |
next; |
} |
} |
if ($showPoints) { |
if ($showPoints) { |
my $score = 0; |
my $score = 0; |
# If we're not telling status and the answer date isn't passed yet, |
# If we're not telling status and the answer date isn't passed yet, |
# it's an "attempted" point |
# it's an "attempted" point |
if ((($curRes->problemstatus($part) eq 'no') || |
if ((($problemstatus eq 'no') || |
($curRes->problemstatus($part) eq 'no_feedback_ever')) && |
($problemstatus eq 'no_feedback_ever')) && |
($dateStatus != $curRes->ANSWER_OPEN)) { |
($dateStatus != $curRes->ANSWER_OPEN)) { |
my $status = $curRes->simpleStatus($part); |
my $status = $curRes->simpleStatus($part); |
if ($status == $curRes->ATTEMPTED) { |
if ($status == $curRes->ATTEMPTED) { |
$partsAttempted += $curRes->weight($part); |
$partsAttempted += $weight; |
$totalAttempted += $partsAttempted; |
$totalAttempted += $partsAttempted; |
} |
} |
} else { |
} else { |
$score = &Apache::grades::compute_points($curRes->weight($part), $curRes->awarded($part)); |
$score = &Apache::grades::compute_points($weight, $curRes->awarded($part)); |
} |
} |
$partsRight += $score; |
$partsRight += $score; |
$totalRight += $score; |
$totalRight += $score; |
$partsCount += $curRes->weight($part); |
$partsCount += $weight; |
|
|
$curRes->{DATA}->{PROB_SCORE} += $score; |
$curRes->{DATA}->{PROB_SCORE} += $score; |
$curRes->{DATA}->{PROB_WEIGHT} += $curRes->weight($part); |
$curRes->{DATA}->{PROB_WEIGHT} += $weight; |
|
|
if ($curRes->opendate($part) < $now) { |
if ($curRes->opendate($part) < $now) { |
$totalPossible += $curRes->weight($part); |
$totalPossible += $weight; |
$curRes->{DATA}->{PROB_POSSIBLE} += $curRes->weight($part); |
$curRes->{DATA}->{PROB_POSSIBLE} += $weight; |
} |
} |
$totalParts += $curRes->weight($part); |
$totalParts += $weight; |
} else { |
} else { |
my $status = $curRes->simpleStatus($part); |
my $status = $curRes->simpleStatus($part); |
my $thisright = 0; |
my $thisright = 0; |
Line 291 sub getData {
|
Line 303 sub getData {
|
$totalAttempted++; |
$totalAttempted++; |
} |
} |
|
|
my $dateStatus = $curRes->getDateStatus($part); |
|
$totalParts++; |
$totalParts++; |
if ($curRes->opendate($part) < $now) { |
if ($curRes->opendate($part) < $now) { |
$totalPossible++; |
$totalPossible++; |
Line 588 sub process_category_edits {
|
Line 599 sub process_category_edits {
|
|
|
sub output_category_table { |
sub output_category_table { |
my ($r,$cangrade,$navmaps,%categories)=@_; |
my ($r,$cangrade,$navmaps,%categories)=@_; |
my $sum=0; |
|
my $total=0; |
my $totalweight=0; |
|
my $totalpoints=0; |
|
|
$r->print(&Apache::loncommon::start_data_table()); |
$r->print(&Apache::loncommon::start_data_table()); |
# |
# |
&output_category_table_header($r,$cangrade); |
&output_category_table_header($r,$cangrade); |
Line 600 sub output_category_table {
|
Line 613 sub output_category_table {
|
my $maxpos=$#order; |
my $maxpos=$#order; |
for (my $i=0;$i<=$maxpos;$i++) { |
for (my $i=0;$i<=$maxpos;$i++) { |
my ($correct,$possible,$type,$weight)=&output_and_calc_category($r,$cangrade,$navmaps,$order[$i],$i,$maxpos,\%performance,1,%categories); |
my ($correct,$possible,$type,$weight)=&output_and_calc_category($r,$cangrade,$navmaps,$order[$i],$i,$maxpos,\%performance,1,%categories); |
$sum+=$correct*$weight; |
unless ($possible) { next; } |
$total+=$weight; |
$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()); |
$r->print(&Apache::loncommon::end_data_table()); |
return $sum; |
return $perc; |
} |
} |
|
|
sub output_category_table_header { |
sub output_category_table_header { |
Line 681 ENDMOVE
|
Line 698 ENDMOVE
|
if ($possible>0) { push(@individual,"$possible:$correct"); } |
if ($possible>0) { push(@individual,"$possible:$correct"); } |
if ($output) { |
if ($output) { |
$r->print('<li>'); |
$r->print('<li>'); |
$r->print(&Apache::lonnet::gettitle($contentid).' ('.$correct.'/'.$possible.')'); |
$r->print(&Apache::lonnet::gettitle($contentid).' ('.&numberout($correct).'/'.&numberout($possible).')'); |
if ($cangrade) { |
if ($cangrade) { |
$r->print(' <a href="javascript:storecmd(\'delcont_'.$id.'______'.$contentid.'\');">'.&mt('Delete').'</a>'); |
$r->print(' <a href="javascript:storecmd(\'delcont_'.$id.'______'.$contentid.'\');">'.&mt('Delete').'</a>'); |
} |
} |
Line 693 ENDMOVE
|
Line 710 ENDMOVE
|
if ($cangrade) { |
if ($cangrade) { |
$r->print('<br />'.&Apache::loncommon::selectresource_link('quickform','addcont_'.$id,&mt('Add Problem or Folder')).'<br />'); |
$r->print('<br />'.&Apache::loncommon::selectresource_link('quickform','addcont_'.$id,&mt('Add Problem or Folder')).'<br />'); |
} |
} |
$r->print('<p>'.&mt('Total raw points: [_1]/[_2]',$totalcorrect,$totalpossible).'</p>'); |
$r->print('<p><b>'.&mt('Total raw points: [_1]/[_2]',&numberout($totalcorrect),&numberout($totalpossible)).'</b></p>'); |
$r->print('</td>'); |
$r->print('</td>'); |
} |
} |
# Total |
# Total |
Line 718 ENDMOVE
|
Line 735 ENDMOVE
|
$totalpossible=1.*$categories{$id.'_total'}; |
$totalpossible=1.*$categories{$id.'_total'}; |
} |
} |
if ($output) { |
if ($output) { |
$r->print('<p>'.&mt('Adjusted raw points: [_1]/[_2]',$totalcorrect,$totalpossible).'</p>'); |
$r->print('<p><b>'.&mt('Adjusted raw points: [_1]/[_2]',&numberout($totalcorrect),&numberout($totalpossible)).'</b></p>'); |
} |
} |
|
|
|
|
Line 762 ENDMOVE
|
Line 779 ENDMOVE
|
if ($output) { |
if ($output) { |
$r->print('</ul>'); |
$r->print('</ul>'); |
if ($cangrade) { $r->print('<br />'.&new_calc_rule_form($id)); } |
if ($cangrade) { $r->print('<br />'.&new_calc_rule_form($id)); } |
$r->print('<p>'.&mt('Calculated points: [_1]/[_2]',$totalcorrect,$totalpossible).'</p>'); |
$r->print('<p><b>'.&mt('Calculated points: [_1]/[_2]',&numberout($totalcorrect),&numberout($totalpossible)).'</b></p>'); |
$r->print('</td>'); |
$r->print('</td>'); |
} |
} |
# |
# |
Line 795 ENDMOVE
|
Line 812 ENDMOVE
|
} |
} |
} |
} |
if ($output) { |
if ($output) { |
$r->print('<p>'); |
$r->print('<p><b>'); |
if ($type eq 'percent') { |
if ($type eq 'percent') { |
my $perc='---'; |
my $perc='---'; |
if ($totalpossible) { |
if ($totalpossible) { |
$perc=100.*$totalcorrect/$totalpossible; |
$perc=100.*$totalcorrect/$totalpossible; |
} |
} |
$r->print(&mt('[_1] percent',$perc)); |
$r->print(&mt('[_1] percent',&numberout($perc))); |
} else { |
} else { |
$r->print(&mt('[_1]/[_2] points',$totalcorrect,$totalpossible)); |
$r->print(&mt('[_1]/[_2] points',&numberout($totalcorrect),&numberout($totalpossible))); |
} |
} |
$r->print('</p>'); |
$r->print('</b></p>'); |
} |
} |
if ($output) { $r->print('</td>'); } |
if ($output) { $r->print('</td>'); } |
|
|
Line 857 sub drop {
|
Line 874 sub drop {
|
# |
# |
|
|
sub bottom_line_category { |
sub bottom_line_category { |
my ($r,$cangrade,$sum,$total)=@_; |
my ($r,$cangrade,$perc)=@_; |
$r->print(&Apache::loncommon::start_data_table_row()); |
$r->print(&Apache::loncommon::start_data_table_row()); |
if ($cangrade) { |
if ($cangrade) { |
$r->print('<td colspan="3"><a href="javascript:storecmd(\'createnewcat\');">'.&mt('Create New Category').'</a></td>'); |
$r->print('<td colspan="3"><a href="javascript:storecmd(\'createnewcat\');">'.&mt('Create New Category').'</a></td>'); |
} |
} |
$r->print('<td colspan="6">'.&mt('Current:').$sum.'<br />'.&mt('Total:').$total.'<br /></td>'); |
$r->print('<td colspan="6"><b>'.&mt('Total: [_1] percent',&numberout($perc)).'</b></td>'); |
} |
} |
|
|
|
sub numberout { |
|
my ($number)=@_; |
|
my $printout=sprintf("%.3f", $number); |
|
$printout=~s/0+$//; |
|
$printout=~s/\.$//; |
|
return $printout; |
|
} |
# |
# |
# Make one new category |
# Make one new category |
# |
# |