--- loncom/interface/spreadsheet/assesscalc.pm	2006/05/15 23:44:46	1.51.2.1
+++ loncom/interface/spreadsheet/assesscalc.pm	2006/09/03 00:39:57	1.56
@@ -1,5 +1,5 @@
 #
-# $Id: assesscalc.pm,v 1.51.2.1 2006/05/15 23:44:46 albertel Exp $
+# $Id: assesscalc.pm,v 1.56 2006/09/03 00:39:57 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -290,7 +290,8 @@ Returns: The value of a parameter, or ''
 
 This function cascades through the possible levels searching for a value for
 a parameter.  The levels are checked in the following order:
-user, course (at section level and course level), map, and lonnet::metadata.
+user, course (at group, section level and course level), map, and 
+lonnet::metadata.
 This function uses %parmhash, which must be tied prior to calling it.
 This function also requires %courseopt and %useropt to be initialized for
 this user and course.
@@ -301,11 +302,12 @@ this user and course.
 ##################################################
 sub parmval {
     my $self = shift;
-    my ($what,$symb,$uname,$udom,$csec,$recurse,$mapname,$id,$fn)=@_;
-    $uname = $self->{'name'}    if (! defined($uname));
-    $udom  = $self->{'domain'}  if (! defined($udom));
-    $csec  = $self->{'section'} if (! defined($csec));
-    $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='';
     #
@@ -335,12 +337,23 @@ sub parmval {
     my $ucourselevel  = $usercourseprefix.'.'.$what;
     my $ucourselevelr = $usercourseprefix.'.'.$symbparm;
     my $ucourselevelm = $usercourseprefix.'.'.$mapparm;
-   # check user
+    # check user
     if (defined($uname)) {
         return $useropt{$ucourselevelr} if (defined($useropt{$ucourselevelr}));
         return $useropt{$ucourselevelm} if (defined($useropt{$ucourselevelm}));
         return $useropt{$ucourselevel}  if (defined($useropt{$ucourselevel}));
     }
+    # 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)) {
         return $courseopt{$seclevelr} if (defined($courseopt{$seclevelr}));
@@ -371,7 +384,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; }
@@ -529,7 +542,7 @@ sub assess_html_row {
             $row_html .= &Apache::Spreadsheet::html_uneditable_cell($cell,
                                                                     '#FFDDDD');
         } else {
-            $row_html .= '<td bgcolor="#EOFFDD">';
+            $row_html .= '<td bgcolor="#E0FFDD">';
             $row_html .= &Apache::Spreadsheet::html_editable_cell($cell,
                                                                   '#E0FFDD',1);
         }
@@ -637,7 +650,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);