--- loncom/homework/grades.pm 2003/05/30 21:33:15 1.92 +++ loncom/homework/grades.pm 2003/06/12 20:11:07 1.95 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # The LON-CAPA Grading handler # -# $Id: grades.pm,v 1.92 2003/05/30 21:33:15 albertel Exp $ +# $Id: grades.pm,v 1.95 2003/06/12 20:11:07 albertel Exp $ # # Copyright Michigan State University Board of Trustees # @@ -2035,8 +2035,9 @@ sub editgrades { $result .= ''; $result .= $header; $result .= ''."\n"; - + my $noupdate; for ($i=0; $i<$ENV{'form.total'}; $i++) { + my $line; my $user = $ENV{'form.ctr'.$i}; my $usercolon = $user; $usercolon =~s/_/:/; @@ -2044,7 +2045,7 @@ sub editgrades { my %newrecord; my $updateflag = 0; - $result .= ''.$uname.' '. + $line .= ''.$uname.' '. $udom.' '. $$fullname{$usercolon}.' '; foreach (@partid) { @@ -2066,7 +2067,7 @@ sub editgrades { } $score = 'excused' if (($ENV{'form.GD_'.$user.'_'.$_.'_solved'} eq 'excused') && ($score ne 'excused')); - $result .= ''.$old_aw.' '. + $line .= ''.$old_aw.' '. ''.$awarded. ($score eq 'excused' ? $score : '').' '; @@ -2089,16 +2090,22 @@ sub editgrades { $newrecord{'resource.'.$part.'regrader'}="$ENV{'user.name'}:$ENV{'user.domain'}"; $updateflag=1; } - $result .= ''.$old_aw.' '. + $line .= ''.$old_aw.' '. ''.$awarded.' '; } } + $line.=''."\n"; if ($updateflag) { $count++; &Apache::lonnet::cstore(\%newrecord,$symb,$ENV{'request.course.id'}, $udom,$uname); + $result.=$line; + } else { + $noupdate.=$line; } - $result .= ''."\n"; + } + if ($noupdate) { + $result .= 'No Changes Occured For the Students Below'.$noupdate; } $result .= ''."\n". &show_grading_menu_form ($symb,$url); @@ -2583,14 +2590,14 @@ sub getSymbMap { $mapiterator->next(); # skip the first BEGIN_MAP my $mapcurRes = $mapiterator->next(); # for "current resource" my $ctr=0; - while ($mapdepth > 0 && $ctr < 100) { + while ($mapdepth > 0) { if($mapcurRes == $mapiterator->BEGIN_MAP) { $mapdepth++; } if($mapcurRes == $mapiterator->END_MAP) { $mapdepth++; } if (ref($mapcurRes) && $mapcurRes->is_problem() && !$mapcurRes->randomout) { $countProblems++; } - $ctr++; + $mapcurRes = $mapiterator->next(); } if ($countProblems > 0) { my $title = $curRes->compTitle();