--- loncom/interface/spreadsheet/assesscalc.pm	2006/04/06 20:24:13	1.52
+++ loncom/interface/spreadsheet/assesscalc.pm	2006/05/01 06:17:16	1.53
@@ -1,5 +1,5 @@
 #
-# $Id: assesscalc.pm,v 1.52 2006/04/06 20:24:13 raeburn Exp $
+# $Id: assesscalc.pm,v 1.53 2006/05/01 06:17:16 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -302,12 +302,12 @@ this user and course.
 ##################################################
 sub parmval {
     my $self = shift;
-    my ($what,$symb,$uname,$udom,$csec,$recurse,$mapname,$id,$fn,$cgroup)=@_;
-    $uname  = $self->{'name'}    if (! defined($uname));
-    $udom   = $self->{'domain'}  if (! defined($udom));
-    $csec   = $self->{'section'} if (! defined($csec));
-    $cgroup = $self->{'group'}   if (! defined($cgroup)); 
-    $symb   = $self->{'symb'}    if (! defined($symb));
+    my ($what,$symb,$uname,$udom,$csec,$recurse,$mapname,$id,$fn,$groups)=@_;
+    $uname  = $self->{'name'}     if (! defined($uname));
+    $udom   = $self->{'domain'}   if (! defined($udom));
+    $csec   = $self->{'section'}  if (! defined($csec));
+    $groups = $self->{'groups'}   if (! defined($groups)); 
+    $symb   = $self->{'symb'}     if (! defined($symb));
     #
     my $result='';
     #
@@ -325,10 +325,6 @@ sub parmval {
     my $courseprefix = $self->{'cid'};
     my $usercourseprefix = $uname.'_'.$udom.'_'.$self->{'cid'};
     #
-    my $grplevel=$courseprefix.'.['.$cgroup.'].'.$what;
-    my $grplevelr=$courseprefix.'.['.$cgroup.'].'.$symbparm;
-    my $grplevelm=$courseprefix.'.['.$cgroup.'].'.$mapparm;
-    #
     my $seclevel  = $courseprefix.'.['.$csec.'].'.$what;
     my $seclevelr = $courseprefix.'.['.$csec.'].'.$symbparm;
     my $seclevelm = $courseprefix.'.['.$csec.'].'.$mapparm;
@@ -346,11 +342,16 @@ sub parmval {
         return $useropt{$ucourselevelm} if (defined($useropt{$ucourselevelm}));
         return $useropt{$ucourselevel}  if (defined($useropt{$ucourselevel}));
     }
-    # check group
-    if (defined($cgroup)) {
-        return $courseopt{$grplevelr} if (defined($courseopt{$grplevelr}));
-        return $courseopt{$grplevelm} if (defined($courseopt{$grplevelm}));
-        return $courseopt{$grplevel}  if (defined($courseopt{$grplevel}));
+    # check groups
+    if (defined($groups) && ref($groups eq 'ARRAY')) {
+        foreach my $group (@{$groups}) {
+            foreach my $level ($symbparm,$mapparm,$what) {
+                my $item = $courseprefix.'.['.$group.'].'.$level;
+                if (defined($courseopt{$item})) {
+                    return $courseopt{$item};
+                }
+            }
+        }
     }
     # check section
     if (defined($csec)) {
@@ -382,7 +383,7 @@ sub parmval {
 	my $newwhat=$rwhat;
 	$newwhat=~s/\Q$space\E/$part/;
 	my $partgeneral=$self->parmval($newwhat,$symb,$uname,$udom,$csec,1,
-				       $mapname,$id,$fn);
+				       $mapname,$id,$fn,$groups);
 	if (defined($partgeneral)) { return $partgeneral; }
     }
     if ($recurse) { return undef; }
@@ -647,7 +648,7 @@ sub get_parameter_values {
             my $value = $self->parmval($parmname,$self->{'symb'},
 				       $self->{'name'},$self->{'domain'},
 				       $self->{'section'},undef,
-				       $mapname,$id,$fn);
+				       $mapname,$id,$fn,$self->{'groups'});
             $parameters{$parmname} =$value;
         }
         untie(%parmhash);