--- loncom/interface/lonparmset.pm	2002/10/01 06:21:23	1.70
+++ loncom/interface/lonparmset.pm	2002/11/19 19:26:35	1.78
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Handler to set parameters for assessments
 #
-# $Id: lonparmset.pm,v 1.70 2002/10/01 06:21:23 albertel Exp $
+# $Id: lonparmset.pm,v 1.78 2002/11/19 19:26:35 matthew Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -87,9 +87,23 @@ my $coursename;
 
 Figure out a cascading parameter.
 
-Inputs:  $what $id $def
-
-Returns: I am not entirely sure.
+Inputs:  $what - a parameter spec (incluse part info and name I.E. 0.weight)
+         $id   - a bighash Id number
+         $def  - the resource's default value   'stupid emacs
+
+Returns:  A list, the first item is the index into the remaining list of items of parm valuse that is the active one, the list consists of parm values at the 11 possible levels
+
+11- resource default
+10- map default
+9 - General Course
+8 - Map level in course
+7 - resource level in course
+6 - General for section
+5 - Map level for section
+4 - resource level in section
+3 - General for specific student
+2 - Map level for specific student
+1 - resource level for specific student
 
 =cut
 
@@ -123,32 +137,32 @@ sub parmval {
 
 # --------------------------------------------------------- third, check course
 
-    if ($courseopt{$courselevel}) {
+    if (defined($courseopt{$courselevel})) {
 	$outpar[9]=$courseopt{$courselevel};
 	$result=9;
     }
 
-    if ($courseopt{$courselevelm}) {
+    if (defined($courseopt{$courselevelm})) {
 	$outpar[8]=$courseopt{$courselevelm};
 	$result=8;
     }
 
-    if ($courseopt{$courselevelr}) {
+    if (defined($courseopt{$courselevelr})) {
 	$outpar[7]=$courseopt{$courselevelr};
 	$result=7;
     }
 
-    if ($csec) {
-        if ($courseopt{$seclevel}) {
+    if (defined($csec)) {
+        if (defined($courseopt{$seclevel})) {
 	    $outpar[6]=$courseopt{$seclevel};
 	    $result=6;
 	}
-        if ($courseopt{$seclevelm}) {
+        if (defined($courseopt{$seclevelm})) {
 	    $outpar[5]=$courseopt{$seclevelm};
 	    $result=5;
 	}
 
-        if ($courseopt{$seclevelr}) {
+        if (defined($courseopt{$seclevelr})) {
 	    $outpar[4]=$courseopt{$seclevelr};
 	    $result=4;
 	}
@@ -156,23 +170,22 @@ sub parmval {
 
 # ---------------------------------------------------------- fourth, check user
 
-    if ($uname) {
-	if ($useropt{$courselevel}) {
+    if (defined($uname)) {
+	if (defined($useropt{$courselevel})) {
 	    $outpar[3]=$useropt{$courselevel};
 	    $result=3;
 	}
 
-	if ($useropt{$courselevelm}) {
+	if (defined($useropt{$courselevelm})) {
 	    $outpar[2]=$useropt{$courselevelm};
 	    $result=2;
 	}
 
-	if ($useropt{$courselevelr}) {
+	if (defined($useropt{$courselevelr})) {
 	    $outpar[1]=$useropt{$courselevelr};
 	    $result=1;
 	}
     }
-
     return ($result,@outpar);
 }
 
@@ -199,7 +212,7 @@ sub valout {
     my $result = '';
     # Values of zero are valid.
     if (! $value && $value ne '0') {
-        $result = '  ';
+	$result = '  ';
     } else {
         if ($type eq 'date_interval') {
             my ($sec,$min,$hour,$mday,$mon,$year)=gmtime($value);
@@ -454,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>');
@@ -643,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='';
@@ -916,7 +931,6 @@ sub assessparms {
         $r->print('>All Parameters</td>');
 
         my $cnt=0;
-
         foreach $tempkey (sort { $allparms{$a} cmp $allparms{$b} }
                       keys %allparms ) {
             ++$cnt;
@@ -935,10 +949,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>');
@@ -985,12 +1001,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 {
@@ -1182,7 +1198,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";
@@ -1190,7 +1206,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');
                       }
@@ -1264,14 +1280,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');
                   }
@@ -1361,6 +1377,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>: '.
@@ -1379,51 +1410,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{$_}) {