version 1.92, 2011/05/25 01:12:01
|
version 1.95, 2011/05/28 16:55:49
|
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 572 sub output_category_table {
|
Line 599 sub output_category_table {
|
my %performance=&dumpdata($navmaps); |
my %performance=&dumpdata($navmaps); |
my $maxpos=$#order; |
my $maxpos=$#order; |
for (my $i=0;$i<=$maxpos;$i++) { |
for (my $i=0;$i<=$maxpos;$i++) { |
my ($value,$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+=$value*$weight; |
$sum+=$correct*$weight; |
$total+=$weight; |
$total+=$weight; |
} |
} |
# |
# |
Line 605 sub output_category_table_header {
|
Line 632 sub output_category_table_header {
|
|
|
sub output_and_calc_category { |
sub output_and_calc_category { |
my ($r,$cangrade,$navmaps,$id,$currentpos,$maxpos,$performance,$output,%categories)=@_; |
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 $iconpath = &Apache::loncommon::lonhttpdurl($r->dir_config('lonIconsURL') . "/"); |
my %lt=&Apache::lonlocal::texthash( |
my %lt=&Apache::lonlocal::texthash( |
'up' => 'Move Up', |
'up' => 'Move Up', |
Line 718 ENDMOVE
|
Line 744 ENDMOVE
|
} |
} |
} |
} |
} elsif ($code eq 'droplow') { |
} elsif ($code eq 'droplow') { |
($totalcorrect,@individual)=&drop(0,0,$value,@individual); |
($totalpossible,$totalcorrect,@individual)=&drop(0,0,$value,@individual); |
} elsif ($code eq 'drophigh') { |
} elsif ($code eq 'drophigh') { |
($totalcorrect,@individual)=&drop(1,0,$value,@individual); |
($totalpossible,$totalcorrect,@individual)=&drop(1,0,$value,@individual); |
} elsif ($code eq 'droplowperc') { |
} elsif ($code eq 'droplowperc') { |
($totalcorrect,@individual)=&drop(0,1,$value,@individual); |
($totalpossible,$totalcorrect,@individual)=&drop(0,1,$value,@individual); |
} elsif ($code eq 'drophighperc') { |
} elsif ($code eq 'drophighperc') { |
($totalcorrect,@individual)=&drop(1,1,$value,@individual); |
($totalpossible,$totalcorrect,@individual)=&drop(1,1,$value,@individual); |
} |
} |
if ($output) { $r->print('</li>'); } |
if ($output) { $r->print('</li>'); } |
} |
} |
|
# Re-adjust total points if force total |
|
if ($categories{$id.'_totaltype'} eq 'typein') { |
|
$totalpossible=1.*$categories{$id.'_total'}; |
|
} |
|
|
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>'.&mt('Calculated points: [_1]/[_2]',$totalcorrect,$totalpossible).'</p>'); |
$r->print('</td>'); |
$r->print('</td>'); |
} |
} |
|
# |
|
# Prepare for export |
|
# |
# Weight |
# Weight |
|
my $weight=$categories{$id.'_weight'}; |
|
unless (1.*$weight>0) { $weight=0; } |
if ($cangrade) { |
if ($cangrade) { |
if ($output) { |
if ($output) { |
$r->print('<td>'. |
$r->print('<td>'. |
'<input type="text" size="4" name="weight_'.$id. |
'<input type="text" size="4" name="weight_'.$id. |
'" value="'.&Apache::lonhtmlcommon::entity_encode($categories{$id.'_weight'}).'" /></td>'); |
'" value="'.&Apache::lonhtmlcommon::entity_encode($weight).'" /></td>'); |
} |
} |
} else { |
} else { |
if ($output) { |
if ($output) { |
$r->print('<td>'.$categories{$id.'_weight'}.'</td>'); |
$r->print('<td>'.$weight.'</td>'); |
} |
} |
} |
} |
# Achieved |
# Achieved |
|
my $type=$categories{$id.'_displayachieved'}; |
|
unless (($type eq 'percent') || ($type eq 'points')) { $type='points'; } |
if ($output) { $r->print('<td>'); } |
if ($output) { $r->print('<td>'); } |
if ($cangrade) { |
if ($cangrade) { |
if ($output) { |
if ($output) { |
$r->print('<select name="displayachieved_'.$id.'">'. |
$r->print('<select name="displayachieved_'.$id.'">'. |
'<option value="percent"'.($categories{$id.'_displayachieved'} eq 'percent'?' selected="selected"':'').'>'.&mt('percent').'</option>'. |
'<option value="percent"'.($type eq 'percent'?' selected="selected"':'').'>'.&mt('percent').'</option>'. |
'<option value="points"'.($categories{$id.'_displayachieved'} eq 'points'?' selected="selected"':'').'>'.&mt('points').'</option>'. |
'<option value="points"'.($type eq 'points'?' selected="selected"':'').'>'.&mt('points').'</option>'. |
'</select>'); |
'</select>'); |
} |
} |
} else { |
} |
if ($output) { |
if ($output) { |
if ($categories{$id.'_displayachieved'} eq 'percent') { |
$r->print('<p>'); |
$r->print(&mt('percent')); |
if ($type eq 'percent') { |
} else { |
my $perc='---'; |
$r->print(&mt('points')); |
if ($totalpossible) { |
|
$perc=100.*$totalcorrect/$totalpossible; |
} |
} |
|
$r->print(&mt('[_1] percent',$perc)); |
|
} else { |
|
$r->print(&mt('[_1]/[_2] points',$totalcorrect,$totalpossible)); |
} |
} |
|
$r->print('</p>'); |
} |
} |
if ($output) { $r->print('</td>'); } |
if ($output) { $r->print('</td>'); } |
|
|
return ($value,$weight); |
return ($totalcorrect,$totalpossible,$type,$weight); |
} |
} |
|
|
# |
# |
Line 775 ENDMOVE
|
Line 817 ENDMOVE
|
# |
# |
|
|
sub drop { |
sub drop { |
my ($high,$percent,@individual)=@_; |
my ($high,$percent,$n,@individual)=@_; |
|
# Sort assignments by points or percent |
my @newindividual=sort { |
my @newindividual=sort { |
my ($pa,$ca)=split(/\:/,$a); |
my ($pa,$ca)=split(/\:/,$a); |
my ($pb,$cb)=split(/\:/,$b); |
my ($pb,$cb)=split(/\:/,$b); |
Line 789 sub drop {
|
Line 832 sub drop {
|
$ca<=>$cb; |
$ca<=>$cb; |
} |
} |
} @individual; |
} @individual; |
|
# Drop the ones we don't want |
|
if ($#newindividual>=$n) { |
|
if ($high) { |
|
splice(@newindividual,$#newindividual+1-$n,$n); |
|
} else { |
|
splice(@newindividual,0,$n); |
|
} |
|
} else { |
|
@newindividual=(); |
|
} |
|
# Re-calculate how many points possible and achieved |
|
my $newpossible=0; |
my $newcorrect=0; |
my $newcorrect=0; |
return ($newcorrect,@newindividual); |
for my $score (@newindividual) { |
|
my ($thispossible,$thiscorrect)=(split(/\:/,$score)); |
|
$newpossible+=$thispossible; |
|
$newcorrect+=$thiscorrect; |
|
} |
|
return ($newpossible,$newcorrect,@newindividual); |
} |
} |
# |
# |
# Bottom line with grades |
# Bottom line with grades |