--- loncom/interface/lonparmset.pm	2002/10/01 07:09:05	1.71
+++ 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.71 2002/10/01 07:09:05 albertel Exp $
+# $Id: lonparmset.pm,v 1.79 2002/11/21 22:32:53 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -467,6 +467,7 @@ sub print_row {
 #                                      '.'.$$name{$which}.'.type',$symbp{$rid});
 # this seems to work
     my $sessionvaltype=$typeoutpar[$result];
+    if (!defined($sessionvaltype)) { $sessionvaltype=$$defaulttype{$which}; }
     $r->print('<td bgcolor=#999999 align="center"><font color=#FFFFFF>'.
                   &valout($sessionval,$sessionvaltype).'&nbsp;'.
                   '</font></td>');
@@ -656,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='';
@@ -778,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='';
@@ -794,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
 #
@@ -813,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\:(.*)/) {
@@ -929,7 +945,6 @@ sub assessparms {
         $r->print('>All Parameters</td>');
 
         my $cnt=0;
-
         foreach $tempkey (sort { $allparms{$a} cmp $allparms{$b} }
                       keys %allparms ) {
             ++$cnt;
@@ -948,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>');
@@ -998,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 {
@@ -1195,7 +1212,7 @@ ENDTABLEHEADFOUR
                     foreach (split(/\,/,$keyp{$rid})) {
                       my $tempkeyp = $_;
                       my $fullkeyp = $tempkeyp;
-                      $tempkeyp =~ s/_[\d_]+_/_0_/;
+                      $tempkeyp =~ s/_\w+_/_0_/;
                       
                       if ((grep $_ eq $fullkeyp, @catmarker) &&(!$name{$tempkeyp})) {
                         $part{$tempkeyp}="0";
@@ -1203,7 +1220,7 @@ ENDTABLEHEADFOUR
                         $display{$tempkeyp}=&Apache::lonnet::metadata($uri,$fullkeyp.'.display');
                         unless ($display{$tempkeyp}) { $display{$tempkeyp}=''; }
                         $display{$tempkeyp}.=' ('.$name{$tempkeyp}.')';
-                        $display{$tempkeyp} =~ s/_[\d_]+_/_0_/;
+                        $display{$tempkeyp} =~ s/_\w+_/_0_/;
                         $default{$tempkeyp}=&Apache::lonnet::metadata($uri,$fullkeyp);
                         $type{$tempkeyp}=&Apache::lonnet::metadata($uri,$fullkeyp.'.type');
                       }
@@ -1277,14 +1294,14 @@ ENDMAPONE
                 foreach (split(/\,/,$keyp{$rid})) {
                   my $tempkeyp = $_;
                   my $fullkeyp = $tempkeyp;
-                  $tempkeyp =~ s/_[\d_]+_/_0_/;
+                  $tempkeyp =~ s/_\w+_/_0_/;
                   if ((grep $_ eq $fullkeyp, @catmarker) &&(!$name{$tempkeyp})) {
                     $part{$tempkeyp}="0";
                     $name{$tempkeyp}=&Apache::lonnet::metadata($uri,$fullkeyp.'.name');
                     $display{$tempkeyp}=&Apache::lonnet::metadata($uri,$fullkeyp.'.display');
                     unless ($display{$tempkeyp}) { $display{$tempkeyp}=''; }
                     $display{$tempkeyp}.=' ('.$name{$tempkeyp}.')';
-                    $display{$tempkeyp} =~ s/_[\d_]+_/_0_/;
+                    $display{$tempkeyp} =~ s/_\w+_/_0_/;
                     $default{$tempkeyp}=&Apache::lonnet::metadata($uri,$fullkeyp);
                     $type{$tempkeyp}=&Apache::lonnet::metadata($uri,$fullkeyp.'.type');
                   }
@@ -1374,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>: '.
@@ -1392,51 +1424,54 @@ sub crsenv {
 	    ('url'            => '<b>Top Level Map</b> '.
                                  '<a href="javascript:openbrowser'.
                                  "('envform','url','sequence')\">".
-                                 'Browse</a><br><font color=red> '.
+                                 'Browse</a><br /><font color=red> '.
                                  'Modification may make assessment data '.
                                  'inaccessible</font>',
              'description'    => '<b>Course Description</b>',
-             'courseid'       => '<b>Course ID or number</b><br>'.
+             'courseid'       => '<b>Course ID or number</b><br />'.
                                  '(internal, optional)',
              'default_xml_style' => '<b>Default XML Style File</b> '.
                     '<a href="javascript:openbrowser'.
                     "('envform','default_xml_style'".
                     ",'sty')\">Browse</a><br>",
-             'question.email' => '<b>Feedback Addresses for Content '.
-                                 'Questions</b><br>(<tt>user:domain,'.
-                                 'user:domain,...</tt>)',
-             'comment.email'  => '<b>Feedback Addresses for Comments</b><br>'.
-                                 '(<tt>user:domain,user:domain,...</tt>)',
+             'question.email' => '<b>Feedback Addresses for Resource Content '.
+                                 'Questions</b><br />(<tt>user:domain,'.
+                                 'user:domain(section;section;...;*;...),...</tt>)',
+             'comment.email'  => '<b>Feedback Addresses for Course Content Comments</b><br />'.
+                                 '(<tt>user:domain,user:domain(section;section;...;*;...),...</tt>)',
              'policy.email'   => '<b>Feedback Addresses for Course Policy</b>'.
-                                 '<br>(<tt>user:domain,user:domain,...</tt>)',
-             'hideemptyrows'  => '<b>Hide Empty Rows in Spreadsheets</b><br>'.
+                                 '<br />(<tt>user:domain,user:domain(section;section;...;*;...),...</tt>)',
+             'hideemptyrows'  => '<b>Hide Empty Rows in Spreadsheets</b><br />'.
                                  '("<tt>yes</tt>" for default hiding)',
-             'pageseparators'  => '<b>Visibly Separate Items on Pages</b><br>'.
+             'pageseparators'  => '<b>Visibly Separate Items on Pages</b><br />'.
                                  '("<tt>yes</tt>" for visible separation)',
              'pch.roles.denied'=> '<b>Disallow Resource Discussion for '.
-                                  'Roles</b><br>"<tt>st</tt>": '.
+                                  'Roles</b><br />"<tt>st</tt>": '.
                                   'student, "<tt>ta</tt>": '.
                                   'TA, "<tt>in</tt>": '.
-                                  'instructor;<br><tt>role,role,...</tt>) '.
+                                  'instructor;<br /><tt>role,role,...</tt>) '.
 	       Apache::loncommon::help_open_topic("Course_Disable_Discussion"),
              'pch.users.denied' => 
-                          '<b>Disallow Resource Discussion for Users</b><br>'.
+                          '<b>Disallow Resource Discussion for Users</b><br />'.
                                  '(<tt>user:domain,user:domain,...</tt>)',
              'spreadsheet_default_classcalc' 
                  => '<b>Default Course Spreadsheet</b> '.
                     '<a href="javascript:openbrowser'.
                     "('envform','spreadsheet_default_classcalc'".
-                    ",'spreadsheet')\">Browse</a><br>",
+                    ",'spreadsheet')\">Browse</a><br />",
              'spreadsheet_default_studentcalc' 
                  => '<b>Default Student Spreadsheet</b> '.
                     '<a href="javascript:openbrowser'.
                     "('envform','spreadsheet_default_calc'".
-                    ",'spreadsheet')\">Browse</a><br>",
+                    ",'spreadsheet')\">Browse</a><br />",
              'spreadsheet_default_assesscalc' 
                  => '<b>Default Assessment Spreadsheet</b> '.
                     '<a href="javascript:openbrowser'.
                     "('envform','spreadsheet_default_assesscalc'".
-                    ",'spreadsheet')\">Browse</a><br>",
+                    ",'spreadsheet')\">Browse</a><br />",
+	     'allow_limited_html_in_feedback'
+	         => '<b>Allow limited HTML in discussion posts</b><br />'.
+	            '(Set value to yes to allow)'
              );
 	foreach (keys(%values)) {
 	    unless ($descriptions{$_}) {