--- loncom/homework/grades.pm	2003/10/28 23:20:03	1.145
+++ loncom/homework/grades.pm	2003/11/07 19:25:26	1.152
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # The LON-CAPA Grading handler
 #
-# $Id: grades.pm,v 1.145 2003/10/28 23:20:03 albertel Exp $
+# $Id: grades.pm,v 1.152 2003/11/07 19:25:26 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -55,17 +55,35 @@ my %perm=();
 
 # ----- These first few routines are general use routines.----
 #
-# --- Retrieve the parts that matches stores_\d+ from the metadata file.---
+# --- Retrieve the parts from the metadata file.---
 sub getpartlist {
-    my ($url) = @_;
-    my @parts =();
-    my (@metakeys) = split(/,/,&Apache::lonnet::metadata($url,'keys'));
-    foreach my $key (@metakeys) {
-	if ( $key =~ m/stores_(\w+)_.*/) {
-	    push(@parts,$key);
+    my ($url,$symb) = @_;
+    my $partorder = &Apache::lonnet::metadata($url, 'partorder');
+    my @parts;
+    if ($partorder) {
+	for my $part (split (/,/,$partorder)) {
+	    if (!&Apache::loncommon::check_if_partid_hidden($part,$symb)) {
+		push(@parts, $part);
+	    }
+	}	    
+    } else {
+	my $metadata = &Apache::lonnet::metadata($url, 'packages');
+	foreach (split(/\,/,$metadata)) {
+	    if ($_ =~ /^part_(.*)$/) {
+		if (!&Apache::loncommon::check_if_partid_hidden($1,$symb)) {
+		    push(@parts, $1);
+		}
+	    }
+	}
+    }
+    my @stores;
+    foreach my $part (@parts) {
+	my (@metakeys) = split(/,/,&Apache::lonnet::metadata($url,'keys'));
+	foreach my $key (@metakeys) {
+	    if ($key =~ m/^stores_\Q$part\E_/) { push(@stores,$key); }
 	}
     }
-    return @parts;
+    return @stores;
 }
 
 # --- Get the symbolic name of a problem and the url
@@ -115,20 +133,25 @@ sub response_type {
     $symb=($ENV{'form.symb'} ne '' ? $ENV{'form.symb'} : (&Apache::lonnet::symbread($url))) if ($symb eq '');
     my $allkeys = &Apache::lonnet::metadata($url,'keys');
     my %seen = ();
-    my (@partlist,%handgrade);
+    my (@partlist,%handgrade,%responseType);
     foreach (split(/,/,&Apache::lonnet::metadata($url,'packages'))) {
-	if (/^\w+response_\w+.*/) {
+	if (/^\w+response_.*/) {
 	    my ($responsetype,$part) = split(/_/,$_,2);
 	    my ($partid,$respid) = split(/_/,$part);
+	    if (&Apache::loncommon::check_if_partid_hidden($partid,$symb)) {
+		next;
+	    }
 	    $responsetype =~ s/response$//; # make it compatible w/ navmaps - should move to that!!
 	    my ($value) = &Apache::lonnet::EXT('resource.'.$part.'.handgrade',$symb);
-	    $handgrade{$part} = $responsetype.':'.($value eq 'yes' ? 'yes' : 'no'); 
+	    $handgrade{$part} = ($value eq 'yes' ? 'yes' : 'no'); 
+	    if (!exists($responseType{$partid})) { $responseType{$partid}={}; }
+	    $responseType{$partid}->{$respid}=$responsetype;
 	    next if ($seen{$partid} > 0);
 	    $seen{$partid}++;
 	    push @partlist,$partid;
 	}
     }
-    return \@partlist,\%handgrade;
+    return \@partlist,\%handgrade,\%responseType;
 }
 
 #--- Show resource title
@@ -137,42 +160,104 @@ sub showResourceInfo {
     my ($url,$probTitle) = @_;
     my $result ='<table border="0">'.
 	'<tr><td colspan=3><font size=+1><b>Current Resource: </b>'.$probTitle.'</font></td></tr>'."\n";
-    my ($partlist,$handgrade) = &response_type($url);
+    my ($partlist,$handgrade,$responseType) = &response_type($url);
     my %resptype = ();
     my $hdgrade='no';
-    for (sort keys(%$handgrade)) {
-	my ($responsetype,$handgrade)=split(/:/,$$handgrade{$_});
-	my $partID = (split(/_/))[0];
-	$resptype{$partID} = $responsetype;
+    for my $part_resID (sort keys(%$handgrade)) {
+	my $handgrade=$$handgrade{$part_resID};
+	my ($partID,$resID) = split(/_/,$part_resID);
+	my $responsetype = $responseType->{$partID}->{$resID};
 	$hdgrade = $handgrade if ($handgrade eq 'yes');
-	$result.='<tr><td><b>Part </b>'.$partID.'</td>'.
+	$result.='<tr><td><b>Part </b>'.$partID.' <font color="#999999">'.
+	    $resID.'</font></td>'.
 	    '<td><b>Type: </b>'.$responsetype.'</td></tr>';
 #	    '<td><b>Handgrade: </b>'.$handgrade.'</td></tr>';
     }
     $result.='</table>'."\n";
-    return $result,\%resptype,$hdgrade,$partlist,$handgrade;
+    return $result,$responseType,$hdgrade,$partlist,$handgrade;
 }
 
+
+sub get_order {
+    my ($partid,$respid,$symb,$uname,$udom)=@_;
+    my (undef,undef,$url)=&Apache::lonnet::decode_symb($symb);
+    $url=&Apache::lonnet::clutter($url);
+    my $subresult=&Apache::lonnet::ssi($url,
+				       ('grade_target' => 'analyze'),
+				       ('grade_domain' => $udom),
+				       ('grade_symb' => $symb),
+				       ('grade_courseid' => 
+					        $ENV{'request.course.id'}),
+				       ('grade_username' => $uname));
+    (undef,$subresult)=split(/_HASH_REF__/,$subresult,2);
+    my %analyze=&Apache::lonnet::str2hash($subresult);
+    return ($analyze{"$partid.$respid.shown"});
+}
 #--- Clean response type for display
-#--- Currently filters option response type only.
+#--- Currently filters option/rank/radiobutton/match/essay response types only.
 sub cleanRecord {
-    my ($answer,$response,$symb) = @_;
-    if ($response eq 'option') {
-	my (@IDs,@ans);
-	foreach (split(/\&/,&Apache::lonnet::unescape($answer))) {
-	    my ($optionID,$ans) = split(/=/);
-	    push @IDs,$optionID.'</font>';
-	    push @ans,$ans;
+    my ($answer,$response,$symb,$partid,$respid,$record,$order,$version) = @_;
+    my $grayFont = '<font color="#999999">';
+    if ($response =~ /^(option|rank)$/) {
+	my %answer=&Apache::lonnet::str2hash($answer);
+	my %grading=&Apache::lonnet::str2hash($record->{$version."resource.$partid.$respid.submissiongrading"});
+	my ($toprow,$bottomrow);
+	foreach my $foil (@$order) {
+	    if ($grading{$foil} == 1) {
+		$toprow.='<td><b>'.$answer{$foil}.'&nbsp;</b></td>';
+	    } else {
+		$toprow.='<td><i>'.$answer{$foil}.'&nbsp;</i></td>';
+	    }
+	    $bottomrow.='<td>'.$grayFont.$foil.'</font>&nbsp;</td>';
 	}
-	my $grayFont = '<font color="#999999">';
 	return '<blockquote><table border="1">'.
-	    '<tr valign="top"><td>Answer</td><td>'.
-	    (join '</td><td>',@ans).'</td></tr>'.
-	    '<tr valign="top"><td>'.$grayFont.'Option ID</font></td><td>'.$grayFont.
-	    (join '</td><td>'.$grayFont,@IDs).'</font></td></tr>'.
-	    '</table></blockquote>';
-    }
-    if ($response eq 'essay') {
+	    '<tr valign="top"><td>Answer</td>'.$toprow.'</tr>'.
+	    '<tr valign="top"><td>'.$grayFont.'Option ID</font></td>'.
+	    $grayFont.$bottomrow.'</tr>'.'</table></blockquote>';
+    } elsif ($response eq 'match') {
+	my %answer=&Apache::lonnet::str2hash($answer);
+	my %grading=&Apache::lonnet::str2hash($record->{$version."resource.$partid.$respid.submissiongrading"});
+	my @items=&Apache::lonnet::str2array($record->{$version."resource.$partid.$respid.submissionitems"});
+	my ($toprow,$middlerow,$bottomrow);
+	foreach my $foil (@$order) {
+	    my $item=shift(@items);
+	    if ($grading{$foil} == 1) {
+		$toprow.='<td><b>'.$item.'&nbsp;</b></td>';
+		$middlerow.='<td><b>'.$grayFont.$answer{$foil}.'&nbsp;</font></b></td>';
+	    } else {
+		$toprow.='<td><i>'.$item.'&nbsp;</i></td>';
+		$middlerow.='<td><i>'.$grayFont.$answer{$foil}.'&nbsp;</font></i></td>';
+	    }
+	    $bottomrow.='<td>'.$grayFont.$foil.'</font>&nbsp;</td>';
+	}
+	return '<blockquote><table border="1">'.
+	    '<tr valign="top"><td>Answer</td>'.$toprow.'</tr>'.
+	    '<tr valign="top"><td>'.$grayFont.'Item ID</font></td>'.
+	    $middlerow.'</tr>'.
+	    '<tr valign="top"><td>'.$grayFont.'Option ID</font></td>'.
+	    $bottomrow.'</tr>'.'</table></blockquote>';
+    } elsif ($response eq 'radiobutton') {
+	my %answer=&Apache::lonnet::str2hash($answer);
+	my ($toprow,$bottomrow);
+	my $correct=($order->[0])+1;
+	for (my $i=1;$i<=$#$order;$i++) {
+	    my $foil=$order->[$i];
+	    if (exists($answer{$foil})) {
+		if ($i == $correct) {
+		    $toprow.='<td><b>true</b></td>';
+		} else {
+		    $toprow.='<td><i>true</i></td>';
+		}
+	    } else {
+		$toprow.='<td>false</td>';
+	    }
+	    $bottomrow.='<td>'.$grayFont.$foil.'</font>&nbsp;</td>';
+	}
+	return '<blockquote><table border="1">'.
+	    '<tr valign="top"><td>Answer</td>'.$toprow.'</tr>'.
+	    '<tr valign="top"><td>'.$grayFont.'Option ID</font></td>'.
+	    $grayFont.$bottomrow.'</tr>'.'</table></blockquote>';
+    } elsif ($response eq 'essay') {
 	if (! exists ($ENV{'form.'.$symb})) {
 	    my (%keyhash) = &Apache::lonnet::dump('nohist_handgrade',
 						  $ENV{'course.'.$ENV{'request.course.id'}.'.domain'},
@@ -580,8 +665,9 @@ LISTJAVASCRIPT
 		my ($foo,$partid,$foo1) = split(/\./,$_);
 		if ($status{'resource.'.$partid.'.submitted_by'} ne '') {
 		    $submitted = 0;
+		    my ($part)=split(/\./,$partid);
 		    $gradeTable.='<input type="hidden" name="'.
-			$student.':submitted_by" value="'.
+			$student.':'.$part.':submitted_by" value="'.
 			$status{'resource.'.$partid.'.submitted_by'}.'" />';
 		}
 	    }
@@ -1400,7 +1486,7 @@ KEYWORDS
 
     my %record = &Apache::lonnet::restore($symb,$ENV{'request.course.id'},$udom,$uname);
 
-    my ($partlist,$handgrade) = &response_type($url,$symb);
+    my ($partlist,$handgrade,$responseType) = &response_type($url,$symb);
 
     # Display student info
     $request->print(($counter == 0 ? '' : '<br />'));
@@ -1447,8 +1533,10 @@ KEYWORDS
 		    $result.=$$fullname{$_}.'&nbsp; &nbsp; &nbsp;';
 		}
                 $result.='<br />'."\n";
+		my ($part)=split(/\./,$_);
 		$result.='<input type="hidden" name="collaborator'.$counter.
-		    '" value="'.(join ':',@goodcollaborators).'" />'."\n";
+		    '" value="'.$part.':'.(join ':',@goodcollaborators).'" />'.
+		    "\n";
 	    }
 	    if (scalar(@badcollaborators) > 0) {
 		$result.='<table border="0"><tr bgcolor="#ffbbbb"><td>';
@@ -1474,78 +1562,78 @@ KEYWORDS
     #             (3) Last submission plus the parts info
     #             (4) The whole record for this student
     if ($ENV{'form.lastSub'} =~ /^(lastonly|hdgrade)$/) {
-	if ($ENV{'form.'.$uname.':'.$udom.':submitted_by'}) {
-	    my $submitby=''.
-		'<b>Collaborative submission by: </b>'.
-		'<a href="javascript:viewSubmitter(\''.
-		$ENV{'form.'.$uname.':'.$udom.':submitted_by'}.
-		'\')"; TARGET=_self>'.
-		$$fullname{$ENV{'form.'.$uname.':'.$udom.':submitted_by'}}.'</a>';
-	    $request->print($submitby);
+	my ($string,$timestamp)= &get_last_submission(\%record);
+	my $lastsubonly=''.
+	    ($$timestamp eq '' ? '' : '<b>Date Submitted:</b> '.
+	     $$timestamp)."</td></tr>\n";
+	if ($$timestamp eq '') {
+	    $lastsubonly.='<tr><td bgcolor="#ffffe6">'.$$string[0]; 
 	} else {
-	    my ($string,$timestamp)= &get_last_submission (\%record);
-	    my $lastsubonly=''.
-		($$timestamp eq '' ? '' : '<b>Date Submitted:</b> '.
-		 $$timestamp)."</td></tr>\n";
-	    if ($$timestamp eq '') {
-		$lastsubonly.='<tr><td bgcolor="#ffffe6">'.$$string[0]; 
-	    } else {
-		for my $part (sort keys(%$handgrade)) {
-		    my ($responsetype,$foo) = split(/:/,$$handgrade{$part});
-		    my ($partid,$respid) = split(/_/,$part);
-		    if (!exists($record{'resource.'.$partid.'.'.$respid.'.submission'})) {
+	    my %seenparts;
+	    for my $part (sort keys(%$handgrade)) {
+		my ($partid,$respid) = split(/_/,$part);
+		if ($ENV{"form.$uname:$udom:$partid:submitted_by"}) {
+		    if (exists($seenparts{$partid})) { next; }
+		    $seenparts{$partid}=1;
+		    my $submitby='<b>Part '.$partid.
+			' Collaborative submission by: </b>'.
+			'<a href="javascript:viewSubmitter(\''.
+			$ENV{"form.$uname:$udom:$partid:submitted_by"}.
+			'\')"; TARGET=_self>'.
+			$$fullname{$ENV{"form.$uname:$udom:$partid:submitted_by"}}.'</a><br />';
+		    $request->print($submitby);
+		    next;
+		}
+		my $responsetype = $responseType->{$partid}->{$respid};
+		if (!exists($record{"resource.$partid.$respid.submission"})) {
+		    $lastsubonly.='<tr><td bgcolor="#ffffe6"><b>Part '.
+			$partid.'</b> <font color="#999999">( ID '.$respid.
+			' )</font>&nbsp; &nbsp;'.
+			'<font color="red">Nothing submitted - no attempts</font><br /><br />';
+		    next;
+		}
+		foreach (@$string) {
+		    my ($partid,$respid) = /^resource\.([^\.]*)\.([^\.]*)\.submission/;
+		    if ($part ne ($partid.'_'.$respid)) { next; }
+		    my ($ressub,$subval) = split(/:/,$_,2);
+		    # Similarity check
+		    my $similar='';
+		    if($ENV{'form.checkPlag'}){
+			my ($oname,$odom,$ocrsid,$oessay,$osim)=
+			    &most_similar($uname,$udom,$subval);
+			if ($osim) {
+			    $osim=int($osim*100.0);
+			    $similar="<hr /><h3><font color=\"#FF0000\">Essay".
+				" is $osim% similar to an essay by ".
+				&Apache::loncommon::plainname($oname,$odom).
+				'</font></h3><blockquote><i>'.
+				&keywords_highlight($oessay).
+				'</i></blockquote><hr />';
+			}
+		    }
+		    my $order=&get_order($partid,$respid,$symb,$uname,$udom);
+		    if ($ENV{'form.lastSub'} eq 'lastonly' || 
+			($ENV{'form.lastSub'} eq 'hdgrade' && 
+			 $$handgrade{$part} eq 'yes')) {
 			$lastsubonly.='<tr><td bgcolor="#ffffe6"><b>Part '.
 			    $partid.'</b> <font color="#999999">( ID '.$respid.
-			    ' )</font>&nbsp; &nbsp;'.
-			    '<font color="red">Nothing submitted - no attempts</font><br /><br />';
- 		    } else {
-			foreach (@$string) {
-			    my ($partid,$respid) = /^resource\.(\w+)\.(\w+)\.submission/;
-			    if ($part eq ($partid.'_'.$respid)) {
-				my ($ressub,$subval) = split(/:/,$_,2);
-                            # Similarity check
-				my $similar='';
-				my $oname;
-				my $odom;
-				my $ocrsid;
-				my $oessay;
-				my $osim;
-				if($ENV{'form.checkPlag'}){
-				    ($oname,$odom,$ocrsid,$oessay,$osim)=&most_similar($uname,$udom,$subval);
-				    if ($osim) {
-					$osim=int($osim*100.0);
-					$similar='<hr /><h3><font color="#FF0000">Essay is '.$osim.
-					    '% similar to an essay by '.&Apache::loncommon::plainname($oname,$odom).
-					    '</font></h3><blockquote><i>'.
-					    &keywords_highlight($oessay).'</i></blockquote><hr />';
-				    }
-				}
-				$lastsubonly.='<tr><td bgcolor="#ffffe6"><b>Part '.
-				    $partid.'</b> <font color="#999999">( ID '.$respid.
-				    ' )</font>&nbsp; &nbsp;'.
-				    ($record{"resource.$partid.$respid.uploadedurl"}?
-				     '<a href="'.
-				     &Apache::lonnet::tokenwrapper($record{"resource.$partid.$respid.uploadedurl"}).
-				     '"><img src="/adm/lonIcons/unknown.gif" border=0"> File uploaded by student</a> '.
-				     '<font color="red" size="1">Like all files provided by users, '.
-				     'this file may contain virusses</font><br />':'').
-				     '<b>Submitted Answer: </b>'.
-				     &cleanRecord($subval,$responsetype,$symb).
-				     '<br /><br />'.$similar."\n"
-				     if ($ENV{'form.lastSub'} eq 'lastonly' || 
-					 ($ENV{'form.lastSub'} eq 'hdgrade' && 
-					  $$handgrade{$part} =~ /:yes$/));
-			    }
+			    ' )</font>&nbsp; &nbsp;';
+			if ($record{"resource.$partid.$respid.uploadedurl"}) {
+			    $lastsubonly.='<a href="'.&Apache::lonnet::tokenwrapper($record{"resource.$partid.$respid.uploadedurl"}).'"><img src="/adm/lonIcons/unknown.gif" border=0"> File uploaded by student</a> <font color="red" size="1">Like all files provided by users, this file may contain virusses</font><br />';
 			}
+			$lastsubonly.='<b>Submitted Answer: </b>'.
+			    &cleanRecord($subval,$responsetype,$symb,$partid,
+					 $respid,\%record,$order);
+			if ($similar) {$lastsubonly.="<br /><br />$similar\n";}
 		    }
 		}
 	    }
-	    $lastsubonly.='</td></tr><tr bgcolor="#ffffff"><td>'."\n";
-	    $request->print($lastsubonly);
 	}
+	$lastsubonly.='</td></tr><tr bgcolor="#ffffff"><td>'."\n";
+	$request->print($lastsubonly);
     } elsif ($ENV{'form.lastSub'} eq 'datesub') {
 	my (undef,$responseType,undef,$parts) = &showResourceInfo($url);
-	$request->print(&displaySubByDates(\$symb,\%record,$parts,$responseType,$checkIcon));
+	$request->print(&displaySubByDates($symb,\%record,$parts,$responseType,$checkIcon,$uname,$udom));
     } elsif ($ENV{'form.lastSub'} =~ /^(last|all)$/) {
 	$request->print(&Apache::loncommon::get_previous_attempt($symb,$uname,$udom,
 								 $ENV{'request.course.id'},
@@ -1718,18 +1806,26 @@ sub processHandGrade {
 							       $ENV{'form.msgsub'},$message);
 	    }
 	    if ($ENV{'form.collaborator'.$ctr}) {
-		my (@collaborators) = split(/:/,$ENV{'form.collaborator'.$ctr});
-		foreach (@collaborators) {
-		    my ($errorflag,$pts,$wgt) = 
-			&saveHandGrade($request,$url,$symb,$_,$udom,$ctr,$ENV{'form.unamedom'.$ctr});
-		    if ($errorflag eq 'not_allowed') {
-			$request->print("<font color=\"red\">Not allowed to modify grades for $_:$udom</font>");
-			next;
-		    } else {
-			if ($message ne '') {
-			    $msgstatus = &Apache::lonmsg::user_normal_msg ($_,$udom,
-									   $ENV{'form.msgsub'},
-									   $message);
+		my @collabstrs;
+		if (ref($ENV{'form.collaborator'.$ctr}) eq 'ARRAY') {
+		    @collabstrs=@{$ENV{'form.collaborator'.$ctr}};
+		} else {
+		    @collabstrs=$ENV{'form.collaborator'.$ctr};
+		}
+		foreach my $collabstr (@collabstrs) {
+		    my ($part,@collaborators) = split(/:/,$collabstr);
+		    foreach (@collaborators) {
+			my ($errorflag,$pts,$wgt) = 
+			    &saveHandGrade($request,$url,$symb,$_,$udom,$ctr,
+					   $ENV{'form.unamedom'.$ctr},$part);
+			if ($errorflag eq 'not_allowed') {
+			    $request->print("<font color=\"red\">Not allowed to modify grades for $_:$udom</font>");
+			    next;
+			} else {
+			    if ($message ne '') {
+				$msgstatus = &Apache::lonmsg::user_normal_msg($_,$udom,$ENV{'form.msgsub'},$message);
+			    }
+			    
 			}
 		    }
 		}
@@ -1881,7 +1977,7 @@ sub processHandGrade {
 
 #---- Save the score and award for each student, if changed
 sub saveHandGrade {
-    my ($request,$url,$symb,$stuname,$domain,$newflg,$submitter) = @_;
+    my ($request,$url,$symb,$stuname,$domain,$newflg,$submitter,$part) = @_;
     my $usec = &Apache::lonnet::getsection($domain,$stuname,
 					   $ENV{'request.course.id'});
     if (!&canmodify($usec)) { return('not_allowed'); }
@@ -1889,6 +1985,8 @@ sub saveHandGrade {
     my %newrecord  = ();
     my ($pts,$wgt) = ('','');
     foreach (split(/:/,$ENV{'form.partlist'.$newflg})) {
+	#collaborator may vary for different parts
+	if ($submitter && $_ ne $part) { next; }
 	my $dropMenu = $ENV{'form.GD_SEL'.$newflg.'_'.$_};
 	if ($dropMenu eq 'excused') {
 	    if ($record{'resource.'.$_.'.solved'} ne 'excused') {
@@ -1924,6 +2022,7 @@ sub saveHandGrade {
 		$newrecord{$reckey} = 'correct_by_override' 
 		    if ($record{$reckey} ne 'correct_by_override');
 	    }
+	    
 	    $newrecord{'resource.'.$_.'.submitted_by'} = $submitter 
 		if ($submitter && ($record{'resource.'.$_.'.submitted_by'} ne $submitter));
 	    $newrecord{'resource.'.$_.'.regrader'}="$ENV{'user.name'}:$ENV{'user.domain'}";
@@ -2151,7 +2250,7 @@ sub viewgrades {
 	my ($partid,$respid) = split (/_/,$_,2);
 	next if $seen{$partid};
 	$seen{$partid}++;
-	my ($responsetype,$handgrade)=split(/:/,$$handgrade{$_});
+	my $handgrade=$$handgrade{$_};
 	my $wgt = &Apache::lonnet::EXT('resource.'.$partid.'.weight',$symb);
 	$weight{$partid} = $wgt eq '' ? '1' : $wgt;
 
@@ -2193,7 +2292,7 @@ sub viewgrades {
     $result.= '<table border=0><tr><td bgcolor="#777777">'."\n".
 	'<table border=0><tr bgcolor="#deffff"><td>&nbsp;<b>No.</b>&nbsp;</td>'.
 	'<td>'.&nameUserString('header')."</td>\n";
-    my (@parts) = sort(&getpartlist($url));
+    my (@parts) = sort(&getpartlist($url,$symb));
     foreach my $part (@parts) {
 	my $display=&Apache::lonnet::metadata($url,$part.'.display');
 	$display =~ s|^Number of Attempts|Tries<br />|; # makes the column narrower
@@ -2310,7 +2409,7 @@ sub editgrades {
     my %columns = ();
     my ($i,$ctr,$count,$rec_update) = (0,0,0,0);
 
-    my (@parts) = sort(&getpartlist($url));
+    my (@parts) = sort(&getpartlist($url,$symb));
     my $header;
     while ($ctr < $ENV{'form.totalparts'}) {
 	my $partid = $ENV{'form.partid_'.$ctr};
@@ -2575,8 +2674,8 @@ ENDPICK
 }
 
 sub csvupload_fields {
-    my ($url) = @_;
-    my (@parts) = &getpartlist($url);
+    my ($url,$symb) = @_;
+    my (@parts) = &getpartlist($url,$symb);
     my @fields=(['username','Student Username'],['domain','Student Domain']);
     foreach my $part (sort(@parts)) {
 	my @datum;
@@ -2659,7 +2758,7 @@ sub csvuploadmap {
     &csvuploadmap_header($request,$symb,$url,$datatoken,$#records+1);
     my ($i,$keyfields);
     if (@records) {
-	my @fields=&csvupload_fields($url);
+	my @fields=&csvupload_fields($url,$symb);
 
 	if ($ENV{'form.upfile_associate'} eq 'reverse') {	
 	    &Apache::loncommon::csv_print_samples($request,\@records);
@@ -2970,9 +3069,16 @@ sub displayPage {
 		} else {
 		    my %responseType = ();
 		    foreach my $partid (@{$parts}) {
-			$responseType{$partid} = $curRes->responseType($partid);
+			my @responseIds =$curRes->responseIds($partid);
+			my @responseType =$curRes->responseType($partid);
+			my %responseIds;
+			for (my $i=0;$i<=$#responseIds;$i++) {
+			    $responseIds{$responseIds[$i]}=$responseType[$i];
+			}
+			$responseType{$partid} = \%responseIds;
 		    }
-		    $studentTable.= &displaySubByDates(\$symbx,\%record,$parts,\%responseType,$checkIcon);
+		    $studentTable.= &displaySubByDates($symbx,\%record,$parts,\%responseType,$checkIcon,$uname,$udom);
+
 		}
 	    } elsif ($ENV{'form.lastSub'} eq 'all') {
 		my $last = ($ENV{'form.lastSub'} eq 'last' ? 'last' : '');
@@ -3007,7 +3113,7 @@ sub displayPage {
 }
 
 sub displaySubByDates {
-    my ($symbx,$record,$parts,$responseType,$checkIcon) = @_;
+    my ($symb,$record,$parts,$responseType,$checkIcon,$uname,$udom) = @_;
     my $studentTable='<table border="0" width="100%"><tr><td bgcolor="#777777">'.
 	'<table border="0" width="100%"><tr bgcolor="#e6ffff">'.
 	'<td><b>Date/Time</b></td>'.
@@ -3015,33 +3121,62 @@ sub displaySubByDates {
 	'<td><b>Status&nbsp;</b></td></tr>';
     my ($version);
     my %mark;
+    my %orders;
     $mark{'correct_by_student'} = $checkIcon;
-    return '<br />&nbsp;<font color="red">Nothing submitted - no attempts</font><br />' 
-	if (!exists($$record{'1:timestamp'}));
+    if (!exists($$record{'1:timestamp'})) {
+	return '<br />&nbsp;<font color="red">Nothing submitted - no attempts</font><br />';
+    }
     for ($version=1;$version<=$$record{'version'};$version++) {
 	my $timestamp = scalar(localtime($$record{$version.':timestamp'}));
 	$studentTable.='<tr bgcolor="#ffffff" valign="top"><td>'.$timestamp.'</td>';
 	my @versionKeys = split(/\:/,$$record{$version.':keys'});
 	my @displaySub = ();
 	foreach my $partid (@{$parts}) {
-	    my @matchKey = grep /^resource\.$partid\..*?\.submission$/,@versionKeys;
+	    my @matchKey = sort(grep /^resource\.\Q$partid\E\..*?\.submission$/,@versionKeys);
 #	    next if ($$record{"$version:resource.$partid.solved"} eq '');
-	    $displaySub[0].=(exists $$record{$version.':'.$matchKey[0]}) ? 
-		'<b>Part&nbsp;'.$partid.'&nbsp;'.
-		($$record{"$version:resource.$partid.tries"} eq '' ? 'Trial&nbsp;not&nbsp;counted' :
-		 'Trial&nbsp;'.$$record{"$version:resource.$partid.tries"}).'</b>&nbsp; '.
-		 &cleanRecord($$record{$version.':'.$matchKey[0]},$$responseType{$partid},$$symbx).'<br />' : '';
-	    $displaySub[1].=(exists $$record{"$version:resource.$partid.award"}) ?
-		'<b>Part&nbsp;'.$partid.'</b> &nbsp;'.
-		lc($$record{"$version:resource.$partid.award"}).' '.
-		$mark{$$record{"$version:resource.$partid.solved"}}.'<br />' : '';
-	    $displaySub[2].=(exists $$record{"$version:resource.$partid.regrader"}) ?
-		$$record{"$version:resource.$partid.regrader"}.' (<b>Part:</b> '.$partid.')' : '';
-	}
-	$displaySub[2].=(exists $$record{"$version:resource.regrader"}) ?
-	    $$record{"$version:resource.regrader"} : ''; # needed because old essay regrader has not parts info
-	$studentTable.='<td>'.$displaySub[0].'&nbsp;</td><td>'.$displaySub[1].
-	    ($displaySub[2] eq '' ? '' : 'Manually graded by '.$displaySub[2]).'&nbsp;</td></tr>';
+	    foreach my $matchKey (@matchKey) {
+		if (exists $$record{$version.':'.$matchKey}) {
+		    my ($responseId)=($matchKey=~ /^resource\.\Q$partid\E\.(.*?)\.submission$/);
+		    $displaySub[0].='<b>Part&nbsp;'.$partid.'&nbsp;';
+		    $displaySub[0].='<font color="#999999">(ID&nbsp;'.
+			$responseId.')</font>&nbsp;';
+		    if ($$record{"$version:resource.$partid.tries"} eq '') {
+			$displaySub[0].='Trial&nbsp;not&nbsp;counted';
+		    } else {
+			$displaySub[0].='Trial&nbsp;'.
+			    $$record{"$version:resource.$partid.tries"};
+		    }
+		    my $responseType=$responseType->{$partid}->{$responseId};
+		    if (!exists($orders{$partid})) { $orders{$partid}={}; }
+		    if (!exists($orders{$partid}->{$responseId})) {
+			$orders{$partid}->{$responseId}=
+			    &get_order($partid,$responseId,$symb,$uname,$udom);
+		    }
+		    $displaySub[0].='</b>&nbsp; '.
+			&cleanRecord($$record{$version.':'.$matchKey},$responseType,$symb,$partid,$responseId,$record,$orders{$partid}->{$responseId},"$version:").'<br />';
+		}
+	    }
+	    if (exists $$record{"$version:resource.$partid.award"}) {
+		$displaySub[1].='<b>Part&nbsp;'.$partid.'</b> &nbsp;'.
+		    lc($$record{"$version:resource.$partid.award"}).' '.
+		    $mark{$$record{"$version:resource.$partid.solved"}}.
+		    '<br />';
+	    }
+	    if (exists $$record{"$version:resource.$partid.regrader"}) {
+		$displaySub[2].=$$record{"$version:resource.$partid.regrader"}.
+		    ' (<b>Part:</b> '.$partid.')';
+	    }
+	}
+	# needed because old essay regrader has not parts info
+	if (exists $$record{"$version:resource.regrader"}) {
+	    $displaySub[2].=$$record{"$version:resource.regrader"};
+	}
+	$studentTable.='<td>'.$displaySub[0].'&nbsp;</td><td>'.$displaySub[1];
+	if ($displaySub[2]) {
+	    $studentTable.='Manually graded by '.$displaySub[2];
+	}
+	$studentTable.='&nbsp;</td></tr>';
+    
     }
     $studentTable.='</table></td></tr></table>';
     return $studentTable;
@@ -3803,6 +3938,11 @@ sub send_header {
 #remotewindow.close();
 #</script>"); 
     $request->print(&Apache::loncommon::bodytag('Grading'));
+    foreach my $key (sort(keys(%ENV))) {
+	if ($key =~ /^form\./) {
+	    Apache->request->print("$key => $ENV{$key} <br />");
+	}
+    }
 }
 
 sub send_footer {