version 1.89, 2011/05/24 17:17:24
|
version 1.92, 2011/05/25 01:12:01
|
Line 646 ENDMOVE
|
Line 646 ENDMOVE
|
# Content display and summing up of points |
# Content display and summing up of points |
my $totalpossible=0; |
my $totalpossible=0; |
my $totalcorrect=0; |
my $totalcorrect=0; |
|
my @individual=(); |
if ($output) { $r->print('<td><ul>'); } |
if ($output) { $r->print('<td><ul>'); } |
foreach my $contentid (split(/\,/,$categories{$id.'_content'})) { |
foreach my $contentid (split(/\,/,$categories{$id.'_content'})) { |
my ($type,$possible,$attempted,$correct)=split(/\:/,$$performance{$contentid}); |
my ($type,$possible,$attempted,$correct)=split(/\:/,$$performance{$contentid}); |
$totalpossible+=$possible; |
$totalpossible+=$possible; |
$totalcorrect+=$correct; |
$totalcorrect+=$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).' ('.$correct.'/'.$possible.')'); |
Line 662 ENDMOVE
|
Line 664 ENDMOVE
|
} |
} |
if ($output) { |
if ($output) { |
$r->print('</ul>'); |
$r->print('</ul>'); |
$r->print('<p>'.&mt('Total raw points: [_1]/[_2]',$totalcorrect,$totalpossible).'</p>'); |
|
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('</td>'); |
$r->print('</td>'); |
} |
} |
# Total |
# Total |
|
if ($output) { $r->print('<td>'); } |
if ($cangrade) { |
if ($cangrade) { |
if ($output) { |
if ($output) { |
$r->print('<td>'. |
$r->print( |
'<select name="totaltype_'.$id.'">'. |
'<select name="totaltype_'.$id.'">'. |
'<option value="default"'.($categories{$id.'_totaltype'} eq 'default'?' selected="selected"':'').'>'.&mt('default').'</option>'. |
'<option value="default"'.($categories{$id.'_totaltype'} eq 'default'?' selected="selected"':'').'>'.&mt('default').'</option>'. |
'<option value="typein"'.($categories{$id.'_totaltype'} eq 'typein'?' selected="selected"':'').'>'.&mt('Type-in value').'</option>'. |
'<option value="typein"'.($categories{$id.'_totaltype'} eq 'typein'?' selected="selected"':'').'>'.&mt('Type-in value').'</option>'. |
'</select>'. |
'</select>'. |
'<input type="text" size="4" name="total_'.$id. |
'<input type="text" size="4" name="total_'.$id. |
'" value="'.&Apache::lonhtmlcommon::entity_encode($categories{$id.'_total'}).'" /></td>'); |
'" value="'.&Apache::lonhtmlcommon::entity_encode($categories{$id.'_total'}).'" />'); |
} |
} |
} else { |
} else { |
if ($output) { |
if ($output) { |
$r->print('<td>'.($categories{$id.'_totaltype'} eq 'default'?&mt('default'):$categories{$id.'_total'}).'</td>'); |
$r->print('<td>'.($categories{$id.'_totaltype'} eq 'default'?&mt('default'):$categories{$id.'_total'})); |
} |
} |
} |
} |
|
# Adjust total points |
|
if ($categories{$id.'_totaltype'} eq 'typein') { |
|
$totalpossible=1.*$categories{$id.'_total'}; |
|
} |
|
if ($output) { |
|
$r->print('<p>'.&mt('Adjusted raw points: [_1]/[_2]',$totalcorrect,$totalpossible).'</p>'); |
|
} |
|
|
|
|
# Calculation |
# Calculation |
Line 695 ENDMOVE
|
Line 705 ENDMOVE
|
if ($cangrade) { |
if ($cangrade) { |
if ($output) { $r->print(' <a href="javascript:storecmd(\'delrule_'.$id.'______'.$code.'\');">'.&mt('Delete').'</a>'); } |
if ($output) { $r->print(' <a href="javascript:storecmd(\'delrule_'.$id.'______'.$code.'\');">'.&mt('Delete').'</a>'); } |
} |
} |
|
if ($code eq 'capabove') { |
|
if ($totalpossible>0) { |
|
if ($totalcorrect/$totalpossible>$value/100.) { |
|
$totalcorrect=$totalpossible*$value/100.; |
|
} |
|
} |
|
} elsif ($code eq 'capbelow') { |
|
if ($totalpossible>0) { |
|
if ($totalcorrect/$totalpossible<$value/100.) { |
|
$totalcorrect=$totalpossible*$value/100.; |
|
} |
|
} |
|
} elsif ($code eq 'droplow') { |
|
($totalcorrect,@individual)=&drop(0,0,$value,@individual); |
|
} elsif ($code eq 'drophigh') { |
|
($totalcorrect,@individual)=&drop(1,0,$value,@individual); |
|
} elsif ($code eq 'droplowperc') { |
|
($totalcorrect,@individual)=&drop(0,1,$value,@individual); |
|
} elsif ($code eq 'drophighperc') { |
|
($totalcorrect,@individual)=&drop(1,1,$value,@individual); |
|
} |
if ($output) { $r->print('</li>'); } |
if ($output) { $r->print('</li>'); } |
} |
} |
if ($output) { $r->print('</ul>'); } |
if ($output) { |
if ($cangrade) { |
$r->print('</ul>'); |
if ($output) { $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('</td>'); |
} |
} |
if ($output) { $r->print('</td>'); } |
|
|
|
# Weight |
# Weight |
if ($cangrade) { |
if ($cangrade) { |
Line 739 ENDMOVE
|
Line 771 ENDMOVE
|
} |
} |
|
|
# |
# |
|
# Drop folders and problems |
|
# |
|
|
|
sub drop { |
|
my ($high,$percent,@individual)=@_; |
|
my @newindividual=sort { |
|
my ($pa,$ca)=split(/\:/,$a); |
|
my ($pb,$cb)=split(/\:/,$b); |
|
if ($percent) { |
|
my $perca=0; |
|
if ($pa>0) { $perca=$ca/$pa; } |
|
my $percb=0; |
|
if ($pb>0) { $percb=$cb/$pb; } |
|
$perca<=>$percb; |
|
} else { |
|
$ca<=>$cb; |
|
} |
|
} @individual; |
|
my $newcorrect=0; |
|
return ($newcorrect,@newindividual); |
|
} |
|
# |
# Bottom line with grades |
# Bottom line with grades |
# |
# |
|
|
Line 781 sub make_new_category {
|
Line 835 sub make_new_category {
|
|
|
sub category_rule_codes { |
sub category_rule_codes { |
return &Apache::lonlocal::texthash( |
return &Apache::lonlocal::texthash( |
'droplow' => 'Drop N lowest grade assignments', |
'droplowperc' => 'Drop N lowest grade percentage problems/folders', |
'drophigh' => 'Drop N highest grade assignments', |
'drophighperc' => 'Drop N highest grade percentage problems/folderss', |
|
'droplow' => 'Drop N lowest point problems/folders', |
|
'drophigh' => 'Drop N highest point problems/folders', |
'capabove' => 'Cap percentage above N percent', |
'capabove' => 'Cap percentage above N percent', |
'capbelow' => 'Cap percentage below N percent'); |
'capbelow' => 'Cap percentage below N percent'); |
} |
} |