--- loncom/interface/lonquickgrades.pm 2011/03/25 22:06:34 1.79
+++ 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.79 2011/03/25 22:06:34 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
@@ -543,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());
}
@@ -610,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(''.
+ ''.
+ ' | ');
+ } else {
+ $r->print(''.($categories{$id.'_totaltype'} eq 'default'?&mt('default'):$categories{$id.'_total'}).' | ');
+ }
+
+
# Calculation
$r->print('');
foreach my $calcrule (split(/\,/,$categories{$id.'_calculations'})) {
@@ -627,19 +646,6 @@ ENDMOVE
}
$r->print(' | ');
-
-# Total
- if ($cangrade) {
- $r->print(''.
- ''.
- ' | ');
- } else {
- $r->print(''.($categories{$id.'_totaltype'} eq 'default'?&mt('default'):$categories{$id.'_total'}).' | ');
- }
# Weight
if ($cangrade) {
$r->print(''.
@@ -648,6 +654,21 @@ ENDMOVE
} else {
$r->print(' | '.$categories{$id.'_weight'}.' | ');
}
+# Achieved
+ $r->print('');
+ if ($cangrade) {
+ $r->print('');
+ } else {
+ if ($categories{$id.'_displayachieved'} eq 'percent') {
+ $r->print(&mt('percent'));
+ } else {
+ $r->print(&mt('points'));
+ }
+ }
+ $r->print(' | ');
return ($value,$weight);
}
@@ -662,7 +683,7 @@ sub bottom_line_category {
if ($cangrade) {
$r->print(''.&mt('Create New Category').' | ');
}
- $r->print(''.&mt('Current:').$sum.' '.&mt('Total:').$total.'
| ');
+ $r->print(''.&mt('Current:').$sum.' '.&mt('Total:').$total.'
| ');
}
#
@@ -686,27 +707,32 @@ sub make_new_category {
}
$categories{$id.'_weight'}=0;
$categories{$id.'_totaltype'}='default';
+ $categories{$id.'_displayachieved'}='percent';
return %categories;
}
# === Calculation Rule Editing
-sub pretty_prt_rule {
- my ($cangrade,$id,$code,$value)=@_;
- my $cid=$id.'_'.$code;
- my %lt=&Apache::lonlocal::texthash(
+sub category_rule_codes {
+ return &Apache::lonlocal::texthash(
'droplow' => 'Drop N lowest grade assignments',
'drophigh' => 'Drop N highest grade assignments',
'capabove' => 'Cap percentage above N percent',
'capbelow' => 'Cap percentage below N percent');
+}
+
+sub pretty_prt_rule {
+ my ($cangrade,$id,$code,$value)=@_;
+ my $cid=$id.'_'.$code;
+ my %lt=&category_rule_codes();
my $ret='';
if ($cangrade) {
$ret.=' N=';
+ $ret.=' N=';
} else {
$ret.=$lt{$code}.'; N='.$value;
}
@@ -751,6 +777,21 @@ sub del_calculation_rule {
return %categories;
}
+sub set_category_rules {
+ my ($cangrade,$id,%categories)=@_;
+ unless ($cangrade) { return %categories; }
+ my %lt=&category_rule_codes();
+ my @newrules=();
+ foreach my $code ('',(keys(%lt))) {
+ if ($env{'form.sel_'.$id.'_'.$code}) {
+ push(@newrules,$env{'form.sel_'.$id.'_'.$code}.':'.$env{'form.val_'.$id.'_'.$code});
+ }
+ }
+ $categories{$id.'_calculations'}=join(',',sort(@newrules));
+ return %categories;
+}
+
+
# === Category Editing
#
@@ -912,6 +953,15 @@ sub set_category_weight {
return %categories;
}
+sub set_category_displayachieved {
+ my ($cangrade,$id,$value,%categories)=@_;
+ unless ($cangrade) { return %categories; }
+ unless (($value eq 'percent') || ($value eq 'points')) { $value='percent'; }
+ $categories{$id.'_displayachieved'}=$value;
+ return %categories;
+}
+
+
#
# === end category-related
#