--- loncom/interface/lonquickgrades.pm 2011/02/20 20:57:46 1.67
+++ loncom/interface/lonquickgrades.pm 2011/03/11 02:39:53 1.74
@@ -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.74 2011/03/11 02:39:53 www Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -80,13 +80,31 @@ sub real_handler {
&startGradeScreen($r,'quick');
- $r->rflush();
-
-# my $uname='korte';
-# my $udom='gerd';
-
+ my $cangrade=&Apache::lonnet::allowed('mgr');
+#
+# Pick student
+#
my $uname;
my $udom;
+ my $stdid;
+ if ($cangrade) {
+ if ($env{'form.uname'}) { $uname=$env{'form.uname'}; }
+ if ($env{'form.udom'}) { $udom=$env{'form.udom'}; }
+ if ($env{'form.id'}) { $stdid=$env{'form.id'}; }
+ if (($stdid) && ($udom)) {
+ $uname=(&Apache::lonnet::idget($udom,$stdid))[1];
+ }
+ $r->print('
\n"); }
&endGradeScreen($r);
return OK;
@@ -165,7 +184,7 @@ sub startGradeScreen {
sub endGradeScreen {
my ($r)=@_;
- $r->print('');
+ $r->print(''.&Apache::loncommon::end_page());
}
@@ -374,7 +393,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 +405,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");
@@ -398,9 +417,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 +442,20 @@ 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,13 +466,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);
+ %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;
}
@@ -499,8 +529,8 @@ sub output_category_table_header {
$r->print('