--- loncom/interface/lonnavmaps.pm	2005/12/29 18:50:35	1.349.2.5
+++ loncom/interface/lonnavmaps.pm	2005/12/29 18:09:32	1.356
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Navigate Maps Handler
 #
-# $Id: lonnavmaps.pm,v 1.349.2.5 2005/12/29 18:50:35 albertel Exp $
+# $Id: lonnavmaps.pm,v 1.356 2005/12/29 18:09:32 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -530,8 +530,9 @@ sub getDescription {
     if ($status == $res->PAST_DUE_NO_ANSWER) {
         return &mt("Was due")." " . timeToHumanString($res->duedate($part),'end');
     }
-    if (($status == $res->ANSWER_OPEN || $status == $res->PARTIALLY_CORRECT)
-	&& $res->handgrade($part) ne 'yes') {
+    if ($status == $res->ANSWER_OPEN 
+	|| ($status == $res->PARTIALLY_CORRECT
+	    && $res->handgrade($part) ne 'yes')) {
         return &mt("Answer available");
     }
     if ($status == $res->EXCUSED) {
@@ -2495,6 +2496,12 @@ sub parmval_real {
 
     my $cid=$env{'request.course.id'};
     my $csec=$env{'request.course.sec'};
+    my $cgroup='';
+    my @cgrps=split(/:/,$env{'request.course.groups'});
+    if (@cgrps > 0) {
+        @cgrps = sort(@cgrps);
+        $cgroup = $cgrps[0];
+    } 
     my $uname=$env{'user.name'};
     my $udom=$env{'user.domain'};
 
@@ -2512,6 +2519,10 @@ sub parmval_real {
     my $mapparm=$mapname.'___(all).'.$what;
     my $usercourseprefix=$cid;
 
+    my $grplevel=$usercourseprefix.'.['.$cgroup.'].'.$what;
+    my $grplevelr=$usercourseprefix.'.['.$cgroup.'].'.$symbparm;
+    my $grplevelm=$usercourseprefix.'.['.$cgroup.'].'.$mapparm;
+
     my $seclevel= $usercourseprefix.'.['.$csec.'].'.$what;
     my $seclevelr=$usercourseprefix.'.['.$csec.'].'.$symbparm;
     my $seclevelm=$usercourseprefix.'.['.$csec.'].'.$mapparm;
@@ -2532,6 +2543,12 @@ sub parmval_real {
     }
 
 # ------------------------------------------------------- second, check course
+    if ($cgroup ne '' and defined($courseopt)) {
+        if (defined($$courseopt{$grplevelr})) { return $$courseopt{$grplevelr}; }
+        if (defined($$courseopt{$grplevelm})) { return $$courseopt{$grplevelm}; }
+        if (defined($$courseopt{$grplevel})) { return $$courseopt{$grplevel}; }
+    }
+
     if ($csec and defined($courseopt)) {
         if (defined($$courseopt{$seclevelr})) { return $$courseopt{$seclevelr}; }
         if (defined($$courseopt{$seclevelm})) { return $$courseopt{$seclevelm}; }