--- loncom/interface/lonquickgrades.pm 2011/02/20 23:57:35 1.71 +++ loncom/interface/lonquickgrades.pm 2011/03/12 02:58:44 1.75 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # Quick Student Grades Display # -# $Id: lonquickgrades.pm,v 1.71 2011/02/20 23:57:35 www Exp $ +# $Id: lonquickgrades.pm,v 1.75 2011/03/12 02:58:44 www Exp $ # # Copyright Michigan State University Board of Trustees # @@ -80,13 +80,38 @@ 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]; + } + if (($stdid) && (!$uname)) { + $r->print('
'.&mt("Unknown Student/Employee ID: [_1]",$stdid).'
'); + $stdid=''; + } + $r->print('\n"); } &endGradeScreen($r); return OK; @@ -165,7 +191,7 @@ sub startGradeScreen { sub endGradeScreen { my ($r)=@_; - $r->print(''); + $r->print(''.&Apache::loncommon::end_page()); } @@ -398,9 +424,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 +449,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,20 +473,34 @@ 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); + } 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); - } 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_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 - } - } + } elsif ($cmd=~/^addcont\_(.+)$/) { + %categories=&add_category_content($1,$cangrade,$env{'form.addcont_'.$1.'_symb'},%categories); + } elsif ($cmd=~/^delcont\_(.+)\_\_\_\_\_\_(.+)$/) { + %categories=&del_category_content($1,$cangrade,$2,%categories); + } +# Move to a new position + my $moveid=$env{'form.storemove'}; + if ($moveid) { + %categories=&move_category($moveid,$cangrade,$env{'form.newpos_'.$moveid},%categories); + } return %categories; } @@ -530,12 +564,12 @@ sub output_and_calc_category { $r->print(<