--- loncom/interface/lonquickgrades.pm 2011/03/25 01:34:49 1.78
+++ loncom/interface/lonquickgrades.pm 2011/03/26 20:04:15 1.81
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# Quick Student Grades Display
#
-# $Id: lonquickgrades.pm,v 1.78 2011/03/25 01:34:49 www Exp $
+# $Id: lonquickgrades.pm,v 1.81 2011/03/26 20:04:15 www Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -475,10 +475,13 @@ sub process_category_edits {
unless ($cangrade) { return %categories; }
# First store everything
foreach my $id (split(/\,/,$categories{'order'})) {
+# Set names, types, and weight (there is only one of each per category)
%categories=&set_category_name($cangrade,$id,$env{'form.name_'.$id},%categories);
%categories=&set_category_total($cangrade,$id,$env{'form.totaltype_'.$id},$env{'form.total_'.$id},%categories);
%categories=&set_category_weight($cangrade,$id,$env{'form.weight_'.$id},%categories);
-# More changes here
+ %categories=&set_category_displayachieved($cangrade,$id,$env{'form.displayachieved_'.$id},%categories);
+# Set values for category rules (before names may change)
+ %categories=&set_category_rules($cangrade,$id,%categories);
}
# Now deal with commands
@@ -497,6 +500,8 @@ sub process_category_edits {
%categories=&del_category_content($1,$cangrade,$2,%categories);
} elsif ($cmd=~/^newrule\_(.+)$/) {
%categories=&add_calculation_rule($1,$cangrade,':',%categories);
+ } elsif ($cmd=~/^delrule\_(.+)\_\_\_\_\_\_(.*)$/) {
+ %categories=&del_calculation_rule($1,$cangrade,$2,%categories);
}
# Move to a new position
my $moveid=$env{'form.storemove'};
@@ -541,9 +546,10 @@ sub output_category_table_header {
}
$r->print('
'.&mt('Category').'
'.
'
'.&mt('Contents').'
'.
- '
'.&mt('Calculation').'
'.
'
'.&mt('Total Points').'
'.
- '
'.&mt('Relative Weight').'
');
+ '
'.&mt('Calculation').'
'.
+ '
'.&mt('Relative Weight').'
'.
+ '
'.&mt('Achieved').'
');
$r->print(&Apache::loncommon::end_data_table_header_row());
}
@@ -608,6 +614,21 @@ ENDMOVE
&Apache::lonstathelpers::problem_selector('.',undef,1,1,'addcont_'.$id.'_',1,'this.form.cmd.value="addcont_'.$id.'";this.form.submit();'));
}
$r->print('');
+
+# Total
+ if ($cangrade) {
+ $r->print('