--- loncom/homework/grades.pm	2003/07/14 14:29:07	1.113
+++ loncom/homework/grades.pm	2003/07/14 16:11:19	1.115
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # The LON-CAPA Grading handler
 #
-# $Id: grades.pm,v 1.113 2003/07/14 14:29:07 ng Exp $
+# $Id: grades.pm,v 1.115 2003/07/14 16:11:19 ng Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -2662,13 +2662,11 @@ sub getSymbMap {
     my ($request) = @_;
     my $navmap = Apache::lonnavmaps::navmap-> new($ENV{'request.course.fn'}.'.db',
 						  $ENV{'request.course.fn'}.'_parms.db',1, 1);
-
-    #my $res = $navmap->firstResource(); # temp resource to access constants
     $navmap->init();
 
     # End navmap using boilerplate
 
-    my $iterator = Apache::lonnavmaps::iterator->new($navmap, undef, undef, undef, 1, undef, 1);
+    my $iterator = Apache::lonnavmaps::iterator->new($navmap, undef, undef, undef, undef, 1, undef, 1);
     my $depth = 1;
     my $curRes = $iterator->next();
 
@@ -2676,7 +2674,7 @@ sub getSymbMap {
     my @titles = ();
     my $minder=0;
     my $seenBeginMap = 0;
-    while ($depth > 0 && !$seenBeginMap) {
+    while ($depth > 0 || !$seenBeginMap) {
         if ($curRes == $iterator->BEGIN_MAP()) {$depth++; $seenBeginMap = 1; }
         if ($curRes == $iterator->END_MAP()) { $depth--; }
 
@@ -2814,12 +2812,13 @@ sub displayPage {
 			my @versionKeys = split(/\:/,$record{$version.':keys'});
 			my @displaySub = ();
 			foreach my $partid (@{$parts}) {
+			    my $responseType = $curRes->responseType($partid);
 			    my @matchKey = grep /^resource\.$partid\..*?\.submission$/,@versionKeys;
 			    next if ($record{"$version:resource.$partid.solved"} eq '');
 #			    next if ($record{"$version:resource.$partid.award"} eq 'APPROX_ANS' && 
 #				     $record{"$version:resource.$partid.solved"} eq '');
 			    $displaySub[0].=(exists $record{$version.':'.$matchKey[0]}) ? 
-				'<b>Part&nbsp;'.$partid.'&nbsp;'.
+				'<b>Part&nbsp;'.$partid.'&nbsp;Type:'.$responseType.':endtype'.
 				($record{"$version:resource.$partid.tries"} eq '' ? 'Trial&nbsp;not&nbsp;counted' :
 				'Trial&nbsp;'.$record{"$version:resource.$partid.tries"}).'</b>&nbsp; '.
 				$record{$version.':'.$matchKey[0]}.'<br />' : '';