--- loncom/interface/lonquickgrades.pm 2011/05/24 18:06:10 1.90
+++ loncom/interface/lonquickgrades.pm 2011/05/28 16:55:49 1.95
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# Quick Student Grades Display
#
-# $Id: lonquickgrades.pm,v 1.90 2011/05/24 18:06:10 www Exp $
+# $Id: lonquickgrades.pm,v 1.95 2011/05/28 16:55:49 www Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -478,6 +478,33 @@ sub outputCategories {
# foreach (keys(%data)) {
# $r->print("\n ".$_.'='.$data{$_});
# }
+# my @debugarray=('5:1','4:3','1:1','5:5','6:7');
+# $r->print("Array: ".join(',',@debugarray).' ');
+# $r->print("0,0,0: ".join(',',&drop(0,0,0,@debugarray)).' ');
+# $r->print("1,0,0: ".join(',',&drop(1,0,0,@debugarray)).' ');
+# $r->print("0,1,0: ".join(',',&drop(0,1,0,@debugarray)).' ');
+# $r->print("1,1,0: ".join(',',&drop(1,1,0,@debugarray)).' ');
+#
+# $r->print("0,0,2: ".join(',',&drop(0,0,2,@debugarray)).' ');
+# $r->print("1,0,2: ".join(',',&drop(1,0,2,@debugarray)).' ');
+# $r->print("0,1,2: ".join(',',&drop(0,1,2,@debugarray)).' ');
+# $r->print("1,1,2: ".join(',',&drop(1,1,2,@debugarray)).' ');
+#
+# $r->print("0,0,4: ".join(',',&drop(0,0,4,@debugarray)).' ');
+# $r->print("1,0,4: ".join(',',&drop(1,0,4,@debugarray)).' ');
+# $r->print("0,1,4: ".join(',',&drop(0,1,4,@debugarray)).' ');
+# $r->print("1,1,4: ".join(',',&drop(1,1,4,@debugarray)).' ');
+#
+# $r->print("0,0,5: ".join(',',&drop(0,0,5,@debugarray)).' ');
+# $r->print("1,0,5: ".join(',',&drop(1,0,5,@debugarray)).' ');
+# $r->print("0,1,5: ".join(',',&drop(0,1,5,@debugarray)).' ');
+# $r->print("1,1,5: ".join(',',&drop(1,1,5,@debugarray)).' ');
+#
+# $r->print("0,0,7: ".join(',',&drop(0,0,7,@debugarray)).' ');
+# $r->print("1,0,7: ".join(',',&drop(1,0,7,@debugarray)).' ');
+# $r->print("0,1,7: ".join(',',&drop(0,1,7,@debugarray)).' ');
+# $r->print("1,1,7: ".join(',',&drop(1,1,7,@debugarray)).' ');
+
}
#
@@ -572,8 +599,8 @@ 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;
+ my ($correct,$possible,$type,$weight)=&output_and_calc_category($r,$cangrade,$navmaps,$order[$i],$i,$maxpos,\%performance,1,%categories);
+ $sum+=$correct*$weight;
$total+=$weight;
}
#
@@ -605,8 +632,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',
@@ -646,11 +672,13 @@ ENDMOVE
# Content display and summing up of points
my $totalpossible=0;
my $totalcorrect=0;
+ my @individual=();
if ($output) { $r->print('
'); }
foreach my $contentid (split(/\,/,$categories{$id.'_content'})) {
my ($type,$possible,$attempted,$correct)=split(/\:/,$$performance{$contentid});
$totalpossible+=$possible;
$totalcorrect+=$correct;
+ if ($possible>0) { push(@individual,"$possible:$correct"); }
if ($output) {
$r->print('');
$r->print(&Apache::lonnet::gettitle($contentid).' ('.$correct.'/'.$possible.')');
@@ -662,10 +690,10 @@ ENDMOVE
}
if ($output) {
$r->print(' ');
- $r->print(''.&mt('Total raw points: [_1]/[_2]',$totalcorrect,$totalpossible).'
');
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(' ');
}
# Total
@@ -703,50 +731,128 @@ ENDMOVE
if ($cangrade) {
if ($output) { $r->print(' '.&mt('Delete').' '); }
}
+ 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') {
+ ($totalpossible,$totalcorrect,@individual)=&drop(0,0,$value,@individual);
+ } elsif ($code eq 'drophigh') {
+ ($totalpossible,$totalcorrect,@individual)=&drop(1,0,$value,@individual);
+ } elsif ($code eq 'droplowperc') {
+ ($totalpossible,$totalcorrect,@individual)=&drop(0,1,$value,@individual);
+ } elsif ($code eq 'drophighperc') {
+ ($totalpossible,$totalcorrect,@individual)=&drop(1,1,$value,@individual);
+ }
if ($output) { $r->print(''); }
}
- if ($output) { $r->print(''); }
- if ($cangrade) {
- if ($output) { $r->print(' '.&new_calc_rule_form($id)); }
+# Re-adjust total points if force total
+ if ($categories{$id.'_totaltype'} eq 'typein') {
+ $totalpossible=1.*$categories{$id.'_total'};
}
- if ($output) { $r->print(''); }
+ if ($output) {
+ $r->print('');
+ if ($cangrade) { $r->print(' '.&new_calc_rule_form($id)); }
+ $r->print(''.&mt('Calculated points: [_1]/[_2]',$totalcorrect,$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(''.
- ''.&mt('percent').' '.
- ''.&mt('points').' '.
+ ''.&mt('percent').' '.
+ ''.&mt('points').' '.
' ');
}
- } 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',$perc));
+ } else {
+ $r->print(&mt('[_1]/[_2] points',$totalcorrect,$totalpossible));
}
+ $r->print('
');
}
if ($output) { $r->print(' '); }
- return ($value,$weight);
+ return ($totalcorrect,$totalpossible,$type,$weight);
}
#
+# Drop folders and problems
+#
+
+sub drop {
+ my ($high,$percent,$n,@individual)=@_;
+# Sort assignments by points or percent
+ 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;
+# 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;
+ for my $score (@newindividual) {
+ my ($thispossible,$thiscorrect)=(split(/\:/,$score));
+ $newpossible+=$thispossible;
+ $newcorrect+=$thiscorrect;
+ }
+ return ($newpossible,$newcorrect,@newindividual);
+}
+#
# Bottom line with grades
#
@@ -789,8 +895,10 @@ sub make_new_category {
sub category_rule_codes {
return &Apache::lonlocal::texthash(
- 'droplow' => 'Drop N lowest grade assignments',
- 'drophigh' => 'Drop N highest grade assignments',
+ 'droplowperc' => 'Drop N lowest grade percentage problems/folders',
+ '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',
'capbelow' => 'Cap percentage below N percent');
}