--- loncom/interface/lonquickgrades.pm 2011/02/20 23:57:35 1.71 +++ loncom/interface/lonquickgrades.pm 2011/05/24 23:44:33 1.91 @@ -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.91 2011/05/24 23:44:33 www Exp $ # # Copyright Michigan State University Board of Trustees # @@ -62,7 +62,8 @@ sub real_handler { $r->send_http_header; my $showPoints = - $env{'course.'.$env{'request.course.id'}.'.grading'} eq 'standard'; + (($env{'course.'.$env{'request.course.id'}.'.grading'} eq 'standard') + || ($env{'course.'.$env{'request.course.id'}.'.grading'} eq 'categories')); my $notshowSPRSlink = (($env{'course.'.$env{'request.course.id'}.'.grading'} eq 'external') || ($env{'course.'.$env{'request.course.id'}.'.grading'} eq 'externalnototals')); @@ -80,13 +81,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 +192,7 @@ sub startGradeScreen { sub endGradeScreen { my ($r)=@_; - $r->print(''); + $r->print(''.&Apache::loncommon::end_page()); } @@ -240,8 +267,12 @@ sub getData { $totalRight += $score; $partsCount += $curRes->weight($part); + $curRes->{DATA}->{PROB_SCORE} += $score; + $curRes->{DATA}->{PROB_WEIGHT} += $curRes->weight($part); + if ($curRes->opendate($part) < $now) { $totalPossible += $curRes->weight($part); + $curRes->{DATA}->{PROB_POSSIBLE} += $curRes->weight($part); } $totalParts += $curRes->weight($part); } else { @@ -398,9 +429,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,25 +454,60 @@ 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 + &output_category_table($r,$cangrade,$navmap,%categories); +# if ($cangrade) { - $r->print(''); +# Get data for all symbs +# + +sub dumpdata { + my ($navmap)=@_; + my %returndata=(); + +# Run through the map and get all data + + my $iterator = $navmap->getIterator(undef, undef, undef, 1); + my $depth = 1; + $iterator->next(); # ignore first BEGIN_MAP + my $curRes = $iterator->next(); + + while ($depth > 0) { + if ($curRes == $iterator->BEGIN_MAP()) {$depth++;} + if ($curRes == $iterator->END_MAP()) { $depth--; } + if (ref($curRes)) { + if ($curRes->is_map()) { + $returndata{$curRes->symb()}='folder:'.$curRes->{DATA}->{CHILD_PARTS}.':'.$curRes->{DATA}->{CHILD_ATTEMPTED}.':'.$curRes->{DATA}->{CHILD_CORRECT}; + } else { + $returndata{$curRes->symb()}='res:'.$curRes->{DATA}->{PROB_WEIGHT}.':'.$curRes->{DATA}->{PROB_POSSIBLE}.':'.$curRes->{DATA}->{PROB_SCORE}; + } + } + $curRes = $iterator->next(); } + return %returndata; } # @@ -453,20 +517,41 @@ sub outputCategories { sub process_category_edits { my ($r,$cangrade,%categories)=@_; 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); + %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 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.resourcesymb'},%categories); + } elsif ($cmd=~/^delcont\_(.+)\_\_\_\_\_\_(.+)$/) { + %categories=&del_category_content($1,$cangrade,$2,%categories); + } elsif ($cmd=~/^newrule\_(.+)$/) { + %categories=&add_calculation_rule($1,$cangrade,':',%categories); + } elsif ($cmd=~/^delrule\_(.+)\_\_\_\_\_\_(.*)$/) { + %categories=&del_calculation_rule($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; } @@ -484,9 +569,10 @@ sub output_category_table { # my @order=split(/\,/,$categories{'order'}); # + my %performance=&dumpdata($navmaps); my $maxpos=$#order; for (my $i=0;$i<=$maxpos;$i++) { - my ($value,$weight)=&output_and_calc_category($r,$cangrade,$navmaps,$order[$i],$i,$maxpos,%categories); + my ($value,$weight)=&output_and_calc_category($r,$cangrade,$navmaps,$order[$i],$i,$maxpos,\%performance,1,%categories); $sum+=$value*$weight; $total+=$weight; } @@ -505,9 +591,10 @@ sub output_category_table_header { } $r->print(''.&mt('Total raw points: [_1]/[_2]',$totalcorrect,$totalpossible).'
'); + if ($cangrade) { + $r->print(''.&mt('Adjusted raw points: [_1]/[_2]',$totalcorrect,$totalpossible).'
'); } + + +# Calculation + my $actualtotal=$totalcorrect; + if ($output) { $r->print(''.&mt('Calculated points: [_1]/[_2]',$actualtotal,$totalpossible).'
'); + } + + if ($cangrade) { + if ($output) { $r->print('