--- loncom/homework/grades.pm	2003/04/30 20:16:02	1.88
+++ 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.88 2003/04/30 20:16:02 www Exp $
+# $Id: grades.pm,v 1.92 2003/05/30 21:33:15 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -1302,7 +1302,7 @@ KEYWORDS
 	my $lastone = pop @col_fullnames;
 	$msgfor .= ', '.(join ', ',@col_fullnames).' and '.$lastone.'.';
     }
-    $msgfor =~ s/\'/\\'/g; #\'
+    $msgfor =~ s/\'/\\'/g; #' stupid emacs
     $result.='<tr><td bgcolor="#ffffff">'."\n".
 	'&nbsp;<a href="javascript:msgCenter(document.SCORE,'.$counter.
 	',\''.$msgfor.'\')"; TARGET=_self>'.
@@ -1913,7 +1913,8 @@ 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(/:/);
+	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);
@@ -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.
@@ -1942,19 +1944,19 @@ sub viewstudentgrade {
 	if ($type eq 'awarded') {
 	    my $pts = $score eq '' ? '' : $score*$$weight{$part};
 	    $result.='<input type="hidden" name="'.
-		'GD_'.$uname.'_'.$part.'_awarded_s" value="'.$pts.'" />'."\n";
+		'GD_'.$student.'_'.$part.'_awarded_s" value="'.$pts.'" />'."\n";
 	    $result.='<td align="middle"><input type="text" name="'.
-		'GD_'.$uname.'_'.$part.'_awarded" '.
-		'onChange="javascript:changeSelect(\''.$part.'\',\''.$uname.
+		'GD_'.$student.'_'.$part.'_awarded" '.
+		'onChange="javascript:changeSelect(\''.$part.'\',\''.$student.
 		'\')" value="'.$pts.'" size="4" /></td>'."\n";
 	} elsif ($type eq 'solved') {
 	    my ($status,$foo)=split(/_/,$score,2);
 	    $status = 'nothing' if ($status eq '');
-	    $result.='<input type="hidden" name="'.'GD_'.$uname.'_'.
+	    $result.='<input type="hidden" name="'.'GD_'.$student.'_'.
 		$part.'_solved_s" value="'.$status.'" />'."\n";
 	    $result.='<td align="middle"><select name="'.
-		'GD_'.$uname.'_'.$part.'_solved" '.
-		'onChange="javascript:changeOneScore(\''.$part.'\',\''.$uname.'\')" >'."\n";
+		'GD_'.$student.'_'.$part.'_solved" '.
+		'onChange="javascript:changeOneScore(\''.$part.'\',\''.$student.'\')" >'."\n";
 	    my $optsel = '<option selected="on"> </option><option>excused</option>'."\n";
 	    $optsel = '<option> </option><option selected="on">excused</option>'."\n"
 		if ($status eq 'excused');
@@ -1962,10 +1964,10 @@ sub viewstudentgrade {
 	    $result.="</select></td>\n";
 	} else {
 	    $result.='<input type="hidden" name="'.
-		'GD_'.$uname.'_'.$part.'_'.$type.'_s" value="'.$score.'" />'.
+		'GD_'.$student.'_'.$part.'_'.$type.'_s" value="'.$score.'" />'.
 		    "\n";
 	    $result.='<td align="middle"><input type="text" name="'.
-		'GD_'.$uname.'_'.$part.'_'.$type.'" '.
+		'GD_'.$student.'_'.$part.'_'.$type.'" '.
 		'value="'.$score.'" size="4" /></td>'."\n";
 	}
     }
@@ -1985,7 +1987,7 @@ sub editgrades {
     $title.='<font size=+1><b>Section: </b>'.$ENV{'form.section'}.'</font>'."\n";
     my $result= '<table border="0"><tr><td bgcolor="#777777">'."\n";
     $result.= '<table border="0"><tr bgcolor="#deffff">'.
-	'<td rowspan=2><b>Username</b></td><td rowspan=2><b>Fullname</b></td>'."\n";
+	'<td rowspan=2><b>Username</b></td><td rowspan=2><b>Domain</b></td><td rowspan=2><b>Fullname</b></td>'."\n";
 
     my %scoreptr = (
 		    'correct'  =>'correct_by_override',
@@ -2036,13 +2038,15 @@ sub editgrades {
 
     for ($i=0; $i<$ENV{'form.total'}; $i++) {
 	my $user = $ENV{'form.ctr'.$i};
+	my $usercolon = $user;
+	$usercolon =~s/_/:/;
+	my ($uname,$udom)=split(/_/,$user);
 	my %newrecord;
 	my $updateflag = 0;
-	my @userdom = grep /^$user:/,keys %$classlist;
-	my (undef,$udom) = split(/:/,$userdom[0]);
 
-	$result .= '<tr bgcolor="#ffffde"><td>'.$user.'&nbsp;</td><td>'.
-	    $$fullname{$userdom[0]}.'&nbsp;</td>';
+	$result .= '<tr bgcolor="#ffffde"><td>'.$uname.'&nbsp;</td><td>'.
+	    $udom.'&nbsp;</td><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,$user);
+				    $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.