--- loncom/homework/grades.pm	2007/10/09 23:42:49	1.451
+++ loncom/homework/grades.pm	2007/10/11 20:25:34	1.452
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # The LON-CAPA Grading handler
 #
-# $Id: grades.pm,v 1.451 2007/10/09 23:42:49 albertel Exp $
+# $Id: grades.pm,v 1.452 2007/10/11 20:25:34 banghart Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -531,6 +531,8 @@ sub getclasslist {
 	    foreach my $grp(@getgroup) {
 	        if ($group eq $grp) {
 	            $exclude = 0;
+	        } elsif (($grp eq 'none') && !$group) {
+	            $exclude = 0;
 	        }
 	    }
 	    if ($exclude) {
@@ -970,7 +972,7 @@ LISTJAVASCRIPT
 
 	$ctr++;
 	my $section = $classlist->{$student}->[&Apache::loncoursedata::CL_SECTION()];
-
+        my $group = $classlist->{$student}->[&Apache::loncoursedata::CL_GROUP()];
 	if ( $perm{'vgr'} eq 'F' ) {
 	    $gradeTable.='<tr bgcolor="#ffffe6">' if ($ctr%2 ==1);
 	    $gradeTable.='<td align="right">'.$ctr.'&nbsp;</td>'.
@@ -978,7 +980,7 @@ LISTJAVASCRIPT
                $student.':'.$$fullname{$student}.':::SECTION'.$section.
 	       ')&nbsp;" />&nbsp;&nbsp;</label></td>'."\n".'<td>'.
 	       &nameUserString(undef,$$fullname{$student},$uname,$udom).
-	       '&nbsp;'.$section.'</td>'."\n";
+	       '&nbsp;'.$section.'/'.$group.'</td>'."\n";
 
 	    if ($env{'form.showgrading'} eq 'yes' && $submitonly ne 'all') {
 		foreach (sort keys(%status)) {