--- loncom/homework/grades.pm	2003/10/28 23:20:03	1.145
+++ loncom/homework/grades.pm	2003/11/06 15:22:33	1.147
@@ -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.147 2003/11/06 15:22:33 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,20 +160,21 @@ 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;
 }
 
 #--- Clean response type for display
@@ -1400,7 +1424,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 />'));
@@ -1483,7 +1507,7 @@ KEYWORDS
 		$$fullname{$ENV{'form.'.$uname.':'.$udom.':submitted_by'}}.'</a>';
 	    $request->print($submitby);
 	} else {
-	    my ($string,$timestamp)= &get_last_submission (\%record);
+	    my ($string,$timestamp)= &get_last_submission(\%record);
 	    my $lastsubonly=''.
 		($$timestamp eq '' ? '' : '<b>Date Submitted:</b> '.
 		 $$timestamp)."</td></tr>\n";
@@ -1491,8 +1515,8 @@ KEYWORDS
 		$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);
+		    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.
@@ -2151,7 +2175,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 +2217,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 +2334,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 +2599,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 +2683,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 +2994,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);
+
 		}
 	    } elsif ($ENV{'form.lastSub'} eq 'all') {
 		my $last = ($ENV{'form.lastSub'} eq 'last' ? 'last' : '');
@@ -3016,32 +3047,56 @@ sub displaySubByDates {
     my ($version);
     my %mark;
     $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"};
+		    }
+		    &Apache::lonnet::logthis("Part is $partid responseType is ".join(':',%$responseType));
+		    my $responseType=$responseType->{$partid}->{$responseId};
+		    $displaySub[0].='</b>&nbsp; '.
+			&cleanRecord($$record{$version.':'.$matchKey},$responseType,$$symbx).'<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;