--- loncom/homework/grades.pm	2003/05/30 20:57:40	1.90
+++ 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.90 2003/05/30 20:57:40 albertel Exp $
+# $Id: grades.pm,v 1.95 2003/06/12 20:11:07 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -2035,16 +2035,19 @@ sub editgrades {
     $result .= '</tr><tr bgcolor="#deffff">';
     $result .= $header;
     $result .= '</tr>'."\n";
-
+    my $noupdate;
     for ($i=0; $i<$ENV{'form.total'}; $i++) {
+	my $line;
 	my $user = $ENV{'form.ctr'.$i};
-	my ($uname,$udom)=split(/:/,$user);
+	my $usercolon = $user;
+	$usercolon =~s/_/:/;
+	my ($uname,$udom)=split(/_/,$user);
 	my %newrecord;
 	my $updateflag = 0;
 
-	$result .= '<tr bgcolor="#ffffde"><td>'.$uname.'&nbsp;</td><td>'.
+	$line .= '<tr bgcolor="#ffffde"><td>'.$uname.'&nbsp;</td><td>'.
 	    $udom.'&nbsp;</td><td>'.
-		$$fullname{$user}.'&nbsp;</td>';
+		$$fullname{$usercolon}.'&nbsp;</td>';
 	foreach (@partid) {
 	    my $old_aw    = $ENV{'form.GD_'.$user.'_'.$_.'_awarded_s'};
 	    my $old_part_pcr = $old_aw/($weight{$_} ne '0' ? $weight{$_}:1);
@@ -2064,7 +2067,7 @@ sub editgrades {
 	    }
 	    $score = 'excused' if (($ENV{'form.GD_'.$user.'_'.$_.'_solved'} eq 'excused') &&
 				   ($score ne 'excused'));
-	    $result .= '<td align="center">'.$old_aw.'&nbsp;</td>'.
+	    $line .= '<td align="center">'.$old_aw.'&nbsp;</td>'.
 		'<td align="center">'.$awarded.
 		($score eq 'excused' ? $score : '').'&nbsp;</td>';
 
@@ -2087,17 +2090,23 @@ sub editgrades {
 		    $newrecord{'resource.'.$part.'regrader'}="$ENV{'user.name'}:$ENV{'user.domain'}";
 		    $updateflag=1;
 		}
-		$result .= '<td align="center">'.$old_aw.'&nbsp;</td>'.
+		$line .= '<td align="center">'.$old_aw.'&nbsp;</td>'.
 		    '<td align="center">'.$awarded.'&nbsp;</td>';
 	    }
 	}
-	$result .= '</tr>'."\n";
+	$line.='</tr>'."\n";
 	if ($updateflag) {
 	    $count++;
 	    &Apache::lonnet::cstore(\%newrecord,$symb,$ENV{'request.course.id'},
 				    $udom,$uname);
+	    $result.=$line;
+	} else {
+	    $noupdate.=$line;
 	}
     }
+    if ($noupdate) {
+	$result .= '<tr bgcolor="#ffffff"><td align="center" colspan="7">No Changes Occured For the Students Below</td></tr>'.$noupdate;
+    }
     $result .= '</table></td></tr></table>'."\n".
 	&show_grading_menu_form ($symb,$url);
     my $msg = '<b>Number of records updated = '.$rec_update.
@@ -2581,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();
@@ -2659,8 +2668,7 @@ sub displayPage {
         if($curRes == $iterator->END_MAP) { $depth++; }
 
         if (ref($curRes) && $curRes->is_problem() && !$curRes->randomout) {
-	    my $parts = ['0',@{$curRes->parts()}];
-	    &APache::lonnet::logthis("parts ".join(':',@$parts));
+	    my $parts = $curRes->parts();
             my $title = $curRes->compTitle();
 	    my $symbx = $curRes->symb();
 	    $studentTable.='<tr bgcolor="#ffffe6"><td align="center" valign="top" >'.$question.
@@ -2792,8 +2800,7 @@ sub updateGradeByPage {
         if($curRes == $iterator->END_MAP) { $depth++; }
 
         if (ref($curRes) && $curRes->is_problem() && !$curRes->randomout) {
-	    my $parts = ['0',@{$curRes->parts()}];
-	    &APache::lonnet::logthis("parts ".join(':',@$parts));
+	    my $parts = $curRes->parts();
             my $title = $curRes->compTitle();
 	    my $symbx = $curRes->symb();
 	    $studentTable.='<tr bgcolor="#ffffe6"><td align="center" valign="top" >'.$question.