--- loncom/homework/grades.pm	2003/05/16 19:00:23	1.89
+++ loncom/homework/grades.pm	2003/05/30 21:33:15	1.92
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # The LON-CAPA Grading handler
 #
-# $Id: grades.pm,v 1.89 2003/05/16 19:00:23 albertel Exp $
+# $Id: grades.pm,v 1.92 2003/05/30 21:33:15 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -1913,8 +1913,9 @@ sub viewgrades {
     my (undef,undef,$fullname) = &getclasslist($ENV{'form.section'},'1');
     my $ctr = 0;
     foreach (sort {lc($$fullname{$a}) cmp lc($$fullname{$b}) } keys %$fullname) {
-	my ($uname,$udom) = split(/:/);
-	$result.='<input type="hidden" name="ctr'.$ctr.'" value="'.$_.'" />'."\n";
+	my $uname = $_;
+	$uname=~s/:/_/;
+	$result.='<input type="hidden" name="ctr'.$ctr.'" value="'.$uname.'" />'."\n";
 	$result.=&viewstudentgrade($url,$symb,$ENV{'request.course.id'},
 				   $_,$$fullname{$_},\@parts,\%weight);
 	$ctr++;
@@ -1931,6 +1932,7 @@ sub viewgrades {
 sub viewstudentgrade {
     my ($url,$symb,$courseid,$student,$fullname,$parts,$weight) = @_;
     my ($uname,$udom) = split(/:/,$student);
+    $student=~s/:/_/;
     my %record=&Apache::lonnet::restore($symb,$courseid,$udom,$uname);
     my $result='<tr bgcolor="#ffffdd"><td>'.
 	'<a href="javascript:viewOneStudent(\''.$uname.'\',\''.$udom.
@@ -2036,13 +2038,15 @@ sub editgrades {
 
     for ($i=0; $i<$ENV{'form.total'}; $i++) {
 	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>'.
 	    $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);
@@ -2089,12 +2093,12 @@ sub editgrades {
 		    '<td align="center">'.$awarded.'&nbsp;</td>';
 	    }
 	}
-	$result .= '</tr>'."\n";
 	if ($updateflag) {
 	    $count++;
 	    &Apache::lonnet::cstore(\%newrecord,$symb,$ENV{'request.course.id'},
 				    $udom,$uname);
 	}
+	$result .= '</tr>'."\n";
     }
     $result .= '</table></td></tr></table>'."\n".
 	&show_grading_menu_form ($symb,$url);
@@ -2658,7 +2662,6 @@ sub displayPage {
 
         if (ref($curRes) && $curRes->is_problem() && !$curRes->randomout) {
 	    my $parts = $curRes->parts();
-	    $parts = &temp_parts_fix($parts); # remove line when lonnavmap is fixed
             my $title = $curRes->compTitle();
 	    my $symbx = $curRes->symb();
 	    $studentTable.='<tr bgcolor="#ffffe6"><td align="center" valign="top" >'.$question.
@@ -2751,18 +2754,6 @@ sub displayPage {
     return '';
 }
 
-sub temp_parts_fix { #remove sub once lonnavmap is fixed
-    my $parts = shift;
-    my %seen = ();
-    my @correctParts = ();
-    foreach (@{$parts}) {
-	next if ($seen{$_} > 0);
-	$seen{$_}++;
-	push @correctParts,$_;
-    }
-    return \@correctParts;
-}
-
 sub updateGradeByPage {
     my ($request) = shift;
 
@@ -2803,7 +2794,6 @@ sub updateGradeByPage {
 
         if (ref($curRes) && $curRes->is_problem() && !$curRes->randomout) {
 	    my $parts = $curRes->parts();
-	    $parts = &temp_parts_fix($parts); # remove line when lonnavmap is fixed
             my $title = $curRes->compTitle();
 	    my $symbx = $curRes->symb();
 	    $studentTable.='<tr bgcolor="#ffffe6"><td align="center" valign="top" >'.$question.