--- loncom/interface/lonquickgrades.pm 2011/02/20 21:56:25 1.68
+++ loncom/interface/lonquickgrades.pm 2011/03/09 01:46:08 1.73
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# Quick Student Grades Display
#
-# $Id: lonquickgrades.pm,v 1.68 2011/02/20 21:56:25 www Exp $
+# $Id: lonquickgrades.pm,v 1.73 2011/03/09 01:46:08 www Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -165,7 +165,7 @@ sub startGradeScreen {
sub endGradeScreen {
my ($r)=@_;
- $r->print('');
+ $r->print(''.&Apache::loncommon::end_page());
}
@@ -398,9 +398,7 @@ sub outputTable {
.&Apache::loncommon::end_data_table_row());
}
- $r->print(&Apache::loncommon::end_data_table()
- .&Apache::loncommon::end_page());
-
+ $r->print(&Apache::loncommon::end_data_table());
}
#
@@ -425,24 +423,26 @@ sub outputCategories {
# Loading old categories
%categories=&Apache::lonnet::dump('grading_categories',$cdom,$cnum);
# Storing
- if (($cangrade) && (($env{'form.storechanges'}) || ($env{'form.storemove'} ne ''))) {
+ if (($cangrade) && (($env{'form.storechanges'}) || ($env{'form.storemove'} ne '') || ($env{'form.cmd'} ne ''))) {
# Process the changes
%categories=&process_category_edits($r,$cangrade,%categories);
# Actually store
- &Apache::lonnet::logthis("Storing ".$categories{'order'});
&Apache::lonnet::put('grading_categories',\%categories,$cdom,$cnum);
}
# new categories loaded now
# Form only generated if user can change the grading categories
if ($cangrade) {
- $r->print('
');
+ ''.
+ ''.
+ ''.
+ '');
}
}
@@ -453,17 +453,30 @@ sub outputCategories {
sub process_category_edits {
my ($r,$cangrade,%categories)=@_;
unless ($cangrade) { return %categories; }
+# First store everything
+ foreach my $id (split(/\,/,$categories{'order'})) {
+ %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
+ }
+
+# Now deal with commands
my $cmd=$env{'form.cmd'};
if ($cmd eq 'createnewcat') {
- %categories=&make_new_category($r,$cangrade,undef,%categories);
- }
- if ($cmd=~/^delcat\_(.+)$/) {
- my $id=$1;
- %categories=&del_category($id,$cangrade,%categories);
+ %categories=&make_new_category($r,$cangrade,undef,%categories);
+ } elsif ($cmd=~/^up\_(.+)$/) {
+ %categories=&move_up_category($1,$cangrade,%categories);
+ } elsif ($cmd=~/^down\_(.+)$/) {
+ %categories=&move_down_category($1,$cangrade,%categories);
+ } elsif ($cmd=~/^delcat\_(.+)$/) {
+ %categories=&del_category($1,$cangrade,%categories);
+ }
+# Move to a new position
+ my $moveid=$env{'form.storemove'};
+ if ($moveid) {
+ %categories=&move_category($moveid,$cangrade,$env{'form.newpos_'.$moveid},%categories);
}
-#
-# Business logic here
-#
return %categories;
}
@@ -503,8 +516,8 @@ sub output_category_table_header {
$r->print(''.&mt('Category').' | '.
''.&mt('Contents').' | '.
''.&mt('Calculation').' | '.
- ''.&mt('Weight').' | '.
- ''.&mt('Percent Overall').' | ');
+ ''.&mt('Total Points').' | '.
+ ''.&mt('Relative Weight').' | ');
$r->print(&Apache::loncommon::end_data_table_header_row());
}
@@ -527,12 +540,12 @@ sub output_and_calc_category {
$r->print(<
-
+
-
+
@@ -547,10 +560,47 @@ ENDMOVE
}
}
$r->print("\n\n\n");
- $r->print(''.&mt('Delete').' | ');
-
+ $r->print(''.&mt('Delete').' | ');
+ $r->print(' | ');
+ } else {
+ $r->print(''.$categories{$id.'_name'}.' | ');
+ }
+# Content
+# FIXME: just placeholders
+ if ($cangrade) {
+ $r->print("Content Edit | ");
+ } else {
+ $r->print("Content | ");
}
- $r->print(&Apache::loncommon::end_data_table_row()."\n");
+# Calculation
+# FIXME: just placeholders
+ if ($cangrade) {
+ $r->print("Calculation Edit | ");
+ } else {
+ $r->print("Calculation | ");
+ }
+# Total
+ if ($cangrade) {
+ $r->print(''.
+ ''.
+ ' | ');
+ } else {
+ $r->print(''.($categories{$id.'_totaltype'} eq 'default'?&mt('default'):$categories{$id.'_total'}).' | ');
+ }
+# Weight
+ if ($cangrade) {
+ $r->print(''.
+ ' | ');
+ } else {
+ $r->print(''.$categories{$id.'_weight'}.' | ');
+ }
+
return ($value,$weight);
}
@@ -562,7 +612,7 @@ sub bottom_line_category {
my ($r,$cangrade,$sum,$total)=@_;
$r->print(&Apache::loncommon::start_data_table_row());
if ($cangrade) {
- $r->print(''.&mt('Create New Category').' | ');
+ $r->print(''.&mt('Create New Category').' | ');
}
$r->print(''.&mt('Current:').$sum.' '.&mt('Total:').$total.'
| ');
}
@@ -586,6 +636,8 @@ sub make_new_category {
if (defined($ordernum)) {
%categories=&move_category($id,$cangrade,$ordernum,%categories);
}
+ $categories{$id.'_weight'}=0;
+ $categories{$id.'_totaltype'}='default';
return %categories;
}
@@ -606,6 +658,29 @@ sub del_category {
}
#
+# Move category up
+#
+
+sub move_up_category {
+ my ($id,$cangrade,%categories)=@_;
+ my $currentpos=¤t_pos_category($id,%categories);
+ if ($currentpos<1) { return %categories; }
+ return &move_category($id,$cangrade,$currentpos-1,%categories);
+}
+
+#
+# Move category down
+#
+
+sub move_down_category {
+ my ($id,$cangrade,%categories)=@_;
+ my $currentpos=¤t_pos_category($id,%categories);
+ my @order=split(/\,/,$categories{'order'});
+ if ($currentpos>=$#order) { return %categories; }
+ return &move_category($id,$cangrade,$currentpos+1,%categories);
+}
+
+#
# Move a category to a desired position n the display order
#
@@ -657,12 +732,41 @@ sub current_pos_category {
# Set name of a category
#
sub set_category_name {
- my ($canedit,$id,$name,%categories)=@_;
- unless ($canedit) { return %categories; }
+ my ($cangrade,$id,$name,%categories)=@_;
+ unless ($cangrade) { return %categories; }
$categories{$id.'_name'}=$name;
return %categories;
}
+#
+# Set total of a category
+#
+sub set_category_total {
+ my ($cangrade,$id,$totaltype,$total,%categories)=@_;
+ unless ($cangrade) { return %categories; }
+ if (($categories{$id.'_total'} eq '') && ($total=~/\d/)) {
+ $totaltype='typein';
+ }
+ $categories{$id.'_totaltype'}=$totaltype;
+ if ($totaltype eq 'default') {
+ $categories{$id.'_total'}='';
+ } else {
+ $total=~s/\D//gs;
+ unless ($total) { $total=0; }
+ $categories{$id.'_total'}=$total;
+ }
+ return %categories;
+}
+
+sub set_category_weight {
+ my ($cangrade,$id,$weight,%categories)=@_;
+ unless ($cangrade) { return %categories; }
+ $weight=~s/\D//gs;
+ unless ($weight) { $weight=0; }
+ $categories{$id.'_weight'}=$weight;
+ return %categories;
+}
+
#
# === end category-related
#