--- loncom/homework/grades.pm	2003/05/30 21:42:36	1.93
+++ loncom/homework/grades.pm	2003/06/13 15:43:28	1.96
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # The LON-CAPA Grading handler
 #
-# $Id: grades.pm,v 1.93 2003/05/30 21:42:36 albertel Exp $
+# $Id: grades.pm,v 1.96 2003/06/13 15:43:28 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -466,8 +466,13 @@ LISTJAVASCRIPT
 	'onClick="javascript:checkSelect(this.form.stuinfo);" '.
 	'value="'.$viewgrade.'" /></form>'."\n";
     if ($ctr == 0) {
-	$gradeTable='<br />&nbsp;<font color="red">'.
-	    'No submission found for this resource.</font><br />';
+	my $num_students=(scalar(keys(%$fullname)));
+	if ($num_students eq 0) {
+	    $gradeTable='<br />&nbsp;<font color="red">There are no students currently enrolled.</font>';
+	} else {
+	    $gradeTable='<br />&nbsp;<font color="red">'.
+		'No submissions found for this resource for any students. ('.$num_students.' checked for submissions</font><br />';
+	}
     } elsif ($ctr == 1) {
 	$gradeTable =~ s/type=checkbox/type=checkbox checked/;
     }
@@ -1924,6 +1929,10 @@ sub viewgrades {
     $result.='<input type="hidden" name="total" value="'.$ctr.'" />'."\n";
     $result.='<input type="button" value="Submit Changes" '.
 	'onClick="javascript:submit();" TARGET=_self /></form>'."\n";
+    if (scalar(%$fullname) eq 0) {
+	my $colspan=3+scalar(@parts);
+	$result='<font color="red">There are no students in section "'.$ENV{'form.section'}.'" with enrollment status "'.$ENV{'form.status'}.'" to modify or grade.</font>';
+    }
     $result.=&show_grading_menu_form($symb,$url);
     return $result;
 }
@@ -2590,14 +2599,14 @@ sub getSymbMap {
 	    $mapiterator->next(); # skip the first BEGIN_MAP
 	    my $mapcurRes = $mapiterator->next(); # for "current resource"
 	    my $ctr=0;
-	    while ($mapdepth > 0 && $ctr < 100) {
+	    while ($mapdepth > 0) {
 		if($mapcurRes == $mapiterator->BEGIN_MAP) { $mapdepth++; }
 		if($mapcurRes == $mapiterator->END_MAP) { $mapdepth++; }
 
 		if (ref($mapcurRes) && $mapcurRes->is_problem() && !$mapcurRes->randomout) {
 		    $countProblems++;
 		}
-		$ctr++;
+		$mapcurRes = $mapiterator->next();
 	    }
 	    if ($countProblems > 0) {
 		my $title = $curRes->compTitle();