--- loncom/interface/lonparmset.pm	2002/10/28 23:28:52	1.75
+++ loncom/interface/lonparmset.pm	2002/11/21 22:32:53	1.79
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Handler to set parameters for assessments
 #
-# $Id: lonparmset.pm,v 1.75 2002/10/28 23:28:52 albertel Exp $
+# $Id: lonparmset.pm,v 1.79 2002/11/21 22:32:53 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -657,6 +657,7 @@ sub assessparms {
     my @pscat=&get_env_multiple('form.pscat');
     my $pschp=$ENV{'form.pschp'};
     my @psprt=&get_env_multiple('form.psprt');
+    if (!@psprt) { $psprt[0]='0'; }
     my $showoptions=$ENV{'form.showoptions'};
 
     my $pssymb='';
@@ -779,6 +780,8 @@ sub assessparms {
 	if ($snum==5) { $storeunder=$seclevelm; }
 	if ($snum==4) { $storeunder=$seclevelr; }
 	
+	my $delete;
+	if ($ENV{'form.pres_value'} eq '') { $delete=1;}
         my %storecontent = ($storeunder         => $ENV{'form.pres_value'},
                             $storeunder.'.type' => $ENV{'form.pres_type'});
 	my $reply='';
@@ -795,10 +798,17 @@ sub assessparms {
 		&Apache::lonnet::expirespread('','','assesscalc');
 	    }
 # Store parameter
-            $reply=&Apache::lonnet::cput
-                ('resourcedata',\%storecontent,
-                 $ENV{'course.'.$ENV{'request.course.id'}.'.domain'},
-                 $ENV{'course.'.$ENV{'request.course.id'}.'.num'});
+	    if ($delete) {
+		$reply=&Apache::lonnet::del
+		    ('resourcedata',[keys(%storecontent)],
+		     $ENV{'course.'.$ENV{'request.course.id'}.'.domain'},
+		     $ENV{'course.'.$ENV{'request.course.id'}.'.num'});
+	    } else {
+		$reply=&Apache::lonnet::cput
+		    ('resourcedata',\%storecontent,
+		     $ENV{'course.'.$ENV{'request.course.id'}.'.domain'},
+		     $ENV{'course.'.$ENV{'request.course.id'}.'.num'});
+	    }
 	} else {
 # ------------------------------------------------------------------ Store User
 #
@@ -814,8 +824,13 @@ sub assessparms {
 		&Apache::lonnet::expirespread($uname,$udom,'assesscalc');
 	    }
 # Store parameter
-	    $reply=&Apache::lonnet::cput
-                ('resourcedata',\%storecontent,$udom,$uname);
+	    if ($delete) {
+		$reply=&Apache::lonnet::del
+		    ('resourcedata',[keys(%storecontent)],$udom,$uname);
+	    } else {
+		$reply=&Apache::lonnet::cput
+		    ('resourcedata',\%storecontent,$udom,$uname);
+	    }
 	}
 
 	if ($reply=~/^error\:(.*)/) {
@@ -930,7 +945,6 @@ sub assessparms {
         $r->print('>All Parameters</td>');
 
         my $cnt=0;
-
         foreach $tempkey (sort { $allparms{$a} cmp $allparms{$b} }
                       keys %allparms ) {
             ++$cnt;
@@ -949,10 +963,12 @@ sub assessparms {
         $r->print('<option value="all"');
         $r->print(' selected') unless (@psprt);
         $r->print('>All Parts</option>');
+        my %temphash=();
+        foreach (@psprt) { $temphash{$_}=1; }
         foreach $tempkey (sort keys %allparts) {
             unless ($tempkey =~ /\./) {
                 $r->print('<option value="'.$tempkey.'"');
-                if ($psprt[0] eq "all" ||  grep $_ == $tempkey, @psprt) {
+                if ($psprt[0] eq "all" ||  $temphash{$tempkey}) {
                     $r->print(' selected');
                 }
                 $r->print('>'.$allparts{$tempkey}.'</option>');
@@ -999,12 +1015,12 @@ sub assessparms {
     }
     $r->print('</table>');
 
-    my @temp_psprt;
-    foreach my $t (@psprt) {
-	push(@temp_psprt, grep {eval (/^$t\./ || ($_ == $t))} (keys %allparts));
-    }
+#    my @temp_psprt;
+#    foreach my $t (@psprt) {
+#	push(@temp_psprt, grep {eval (/^$t\./ || ($_ == $t))} (keys %allparts));
+#    }
 
-    @psprt = @temp_psprt;
+#    @psprt = @temp_psprt;
 
     my @temp_pscat;
     map {
@@ -1375,6 +1391,21 @@ sub crsenv {
                          $dom,$crs).
                     '<br>';
             }
+            if ($name =~ /^spreadsheet_default_(classcalc|
+                                                studentcalc|
+                                                assesscalc)$/x) {
+                my $sheettype = $1; 
+                if ($sheettype eq 'classcalc') {
+                    # no need to do anything since viewing the sheet will
+                    # cause it to be updated. 
+                } elsif ($sheettype eq 'studentcalc') {
+                    # expire all the student spreadsheets
+                    &Apache::lonnet::expirespread('','','studentcalc');
+                } else {
+                    # expire all the default assessment spreadsheets
+                }
+            }
+
             if ($name) {
                 $setoutput.='Setting <tt>'.$name.'</tt> to <tt>'.
                     $value.'</tt>: '.