--- loncom/interface/lonquickgrades.pm 2011/02/20 20:57:46 1.67
+++ loncom/interface/lonquickgrades.pm 2011/02/20 23:38:00 1.70
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# Quick Student Grades Display
#
-# $Id: lonquickgrades.pm,v 1.67 2011/02/20 20:57:46 www Exp $
+# $Id: lonquickgrades.pm,v 1.70 2011/02/20 23:38:00 www Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -374,7 +374,7 @@ sub outputTable {
# If there were any problems at the top level, print an extra "catchall"
if ($topLevelParts > 0) {
my $ratio = $topLevelRight / $topLevelParts;
- my $color = mixColors(\@start, \@end, $ratio);
+ my $color = &mixColors(\@start, \@end, $ratio);
$r->print(&Apache::loncommon::start_data_table_row()
.'
');
$r->print(&mt("Problems Not Contained In A Folder")." | ");
@@ -386,7 +386,7 @@ sub outputTable {
# show totals (if applicable), close table
#
if ($showPoints) {
- my $maxHelpLink = Apache::loncommon::help_open_topic("Quick_Grades_Possibly_Correct");
+ my $maxHelpLink = &Apache::loncommon::help_open_topic("Quick_Grades_Possibly_Correct");
$title = $showPoints ? "Points" : "Parts Done";
my $totaltitle = $showPoints ? &mt("Awarded Total Points") : &mt("Total Parts Done");
@@ -429,7 +429,7 @@ sub outputCategories {
# Process the changes
%categories=&process_category_edits($r,$cangrade,%categories);
# Actually store
-# &Apache::lonnet::logthis("Storing ".$categories{'order'});
+ &Apache::lonnet::logthis("Storing ".$categories{'order'});
&Apache::lonnet::put('grading_categories',\%categories,$cdom,$cnum);
}
# new categories loaded now
@@ -455,11 +455,17 @@ sub process_category_edits {
unless ($cangrade) { return %categories; }
my $cmd=$env{'form.cmd'};
if ($cmd eq 'createnewcat') {
- %categories=&make_new_category($r,$cangrade,undef,%categories);
- }
-#
-# Business logic here
-#
+ %categories=&make_new_category($r,$cangrade,undef,%categories);
+ } elsif ($cmd=~/^delcat\_(.+)$/) {
+ %categories=&del_category($1,$cangrade,%categories);
+ } else {
+# Simply store the rest of the stuff
+ foreach my $id (split(/\,/,$categories{'order'})) {
+ %categories=&set_category_name($cangrade,$id,$env{'form.name_'.$id},%categories);
+ %categories=&set_category_weight($cangrade,$id,$env{'form.weighttype_'.$id},$env{'form.weight_'.$id},%categories);
+# More changes here
+ }
+ }
return %categories;
}
@@ -543,9 +549,39 @@ ENDMOVE
}
}
$r->print("\n\n | \n");
-
+ $r->print(''.&mt('Delete').' | ');
+ $r->print(' | ');
+ } else {
+ $r->print(''.$categories{$id.'_name'}.' | ');
}
- $r->print(&Apache::loncommon::end_data_table_row()."\n");
+# Content
+# FIXME: just placeholders
+ if ($cangrade) {
+ $r->print("Content Edit | ");
+ } else {
+ $r->print("Content | ");
+ }
+# Calculation
+# FIXME: just placeholders
+ if ($cangrade) {
+ $r->print("Calculation Edit | ");
+ } else {
+ $r->print("Calculation | ");
+ }
+# Weight
+ if ($cangrade) {
+ $r->print(''.
+ ''.
+ ' | ');
+ } else {
+ $r->print(''.($categories{$id.'_weighttype'} eq 'default'?&mt('default'):$categories{$id.'_weight'}).' | ');
+ }
+
return ($value,$weight);
}
@@ -581,10 +617,27 @@ sub make_new_category {
if (defined($ordernum)) {
%categories=&move_category($id,$cangrade,$ordernum,%categories);
}
+ $categories{$id.'_weighttype'}='default';
return %categories;
}
#
+# Delete category
+#
+
+sub del_category {
+ my ($id,$cangrade,%categories)=@_;
+ my @neworder=();
+ foreach my $currentid (split(/\,/,$categories{'order'})) {
+ unless ($currentid eq $id) {
+ push(@neworder,$currentid);
+ }
+ }
+ $categories{'order'}=join(',',@neworder);
+ return %categories;
+}
+
+#
# Move a category to a desired position n the display order
#
@@ -636,13 +689,34 @@ 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 weight of a category
+#
+sub set_category_weight {
+ my ($cangrade,$id,$weighttype,$weight,%categories)=@_;
+ unless ($cangrade) { return %categories; }
+ if (($categories{$id.'_weight'} eq '') && ($weight=~/\d/)) {
+ $weighttype='typein';
+ }
+ $categories{$id.'_weighttype'}=$weighttype;
+ if ($weighttype eq 'default') {
+ $categories{$id.'_weight'}='';
+ } else {
+ $weight=~s/\D//gs;
+ unless ($weight) { $weight=0; }
+ $categories{$id.'_weight'}=$weight;
+ }
+ return %categories;
+}
+
+
+#
# === end category-related
#
#