version 1.90, 2011/05/24 18:06:10
|
version 1.93, 2011/05/26 18:02:22
|
Line 478 sub outputCategories {
|
Line 478 sub outputCategories {
|
# foreach (keys(%data)) { |
# foreach (keys(%data)) { |
# $r->print("\n<br />".$_.'='.$data{$_}); |
# $r->print("\n<br />".$_.'='.$data{$_}); |
# } |
# } |
|
# my @debugarray=('5:1','4:3','1:1','5:5','6:7'); |
|
# $r->print("Array: ".join(',',@debugarray).'<br />'); |
|
# $r->print("0,0,0: ".join(',',&drop(0,0,0,@debugarray)).'<br />'); |
|
# $r->print("1,0,0: ".join(',',&drop(1,0,0,@debugarray)).'<br />'); |
|
# $r->print("0,1,0: ".join(',',&drop(0,1,0,@debugarray)).'<br />'); |
|
# $r->print("1,1,0: ".join(',',&drop(1,1,0,@debugarray)).'<br />'); |
|
# |
|
# $r->print("0,0,2: ".join(',',&drop(0,0,2,@debugarray)).'<br />'); |
|
# $r->print("1,0,2: ".join(',',&drop(1,0,2,@debugarray)).'<br />'); |
|
# $r->print("0,1,2: ".join(',',&drop(0,1,2,@debugarray)).'<br />'); |
|
# $r->print("1,1,2: ".join(',',&drop(1,1,2,@debugarray)).'<br />'); |
|
# |
|
# $r->print("0,0,4: ".join(',',&drop(0,0,4,@debugarray)).'<br />'); |
|
# $r->print("1,0,4: ".join(',',&drop(1,0,4,@debugarray)).'<br />'); |
|
# $r->print("0,1,4: ".join(',',&drop(0,1,4,@debugarray)).'<br />'); |
|
# $r->print("1,1,4: ".join(',',&drop(1,1,4,@debugarray)).'<br />'); |
|
# |
|
# $r->print("0,0,5: ".join(',',&drop(0,0,5,@debugarray)).'<br />'); |
|
# $r->print("1,0,5: ".join(',',&drop(1,0,5,@debugarray)).'<br />'); |
|
# $r->print("0,1,5: ".join(',',&drop(0,1,5,@debugarray)).'<br />'); |
|
# $r->print("1,1,5: ".join(',',&drop(1,1,5,@debugarray)).'<br />'); |
|
# |
|
# $r->print("0,0,7: ".join(',',&drop(0,0,7,@debugarray)).'<br />'); |
|
# $r->print("1,0,7: ".join(',',&drop(1,0,7,@debugarray)).'<br />'); |
|
# $r->print("0,1,7: ".join(',',&drop(0,1,7,@debugarray)).'<br />'); |
|
# $r->print("1,1,7: ".join(',',&drop(1,1,7,@debugarray)).'<br />'); |
|
|
} |
} |
|
|
# |
# |
Line 646 ENDMOVE
|
Line 673 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 691 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 |
Line 703 ENDMOVE
|
Line 732 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 747 ENDMOVE
|
Line 798 ENDMOVE
|
} |
} |
|
|
# |
# |
|
# Drop folders and problems |
|
# |
|
|
|
sub drop { |
|
my ($high,$percent,$n,@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; |
|
if ($#newindividual>=$n) { |
|
if ($high) { |
|
splice(@newindividual,$#newindividual+1-$n,$n); |
|
} else { |
|
splice(@newindividual,0,$n); |
|
} |
|
} else { |
|
@newindividual=(); |
|
} |
|
my $newcorrect=0; |
|
for my $score (@newindividual) { |
|
$newcorrect+=(split(/\:/,$score))[1]; |
|
} |
|
return ($newcorrect,@newindividual); |
|
} |
|
# |
# Bottom line with grades |
# Bottom line with grades |
# |
# |
|
|
Line 789 sub make_new_category {
|
Line 874 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'); |
} |
} |