--- loncom/interface/lonquickgrades.pm 2011/05/24 23:44:33 1.91
+++ loncom/interface/lonquickgrades.pm 2011/05/27 19:32:10 1.94
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# Quick Student Grades Display
#
-# $Id: lonquickgrades.pm,v 1.91 2011/05/24 23:44:33 www Exp $
+# $Id: lonquickgrades.pm,v 1.94 2011/05/27 19:32:10 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)).'
');
+
}
#
@@ -664,10 +691,10 @@ ENDMOVE
}
if ($output) {
$r->print('');
- $r->print('
'.&mt('Total raw points: [_1]/[_2]',$totalcorrect,$totalpossible).'
'); if ($cangrade) { $r->print(''.&mt('Total raw points: [_1]/[_2]',$totalcorrect,$totalpossible).'
'); $r->print(''); } # Total @@ -697,7 +724,6 @@ ENDMOVE # Calculation - my $actualtotal=$totalcorrect; if ($output) { $r->print(''.&mt('Calculated points: [_1]/[_2]',$actualtotal,$totalpossible).'
'); +# Re-adjust total points if force total + if ($categories{$id.'_totaltype'} eq 'typein') { + $totalpossible=1.*$categories{$id.'_total'}; } - if ($cangrade) { - if ($output) { $r->print(''.&mt('Calculated points: [_1]/[_2]',$totalcorrect,$totalpossible).'
'); + $r->print('