--- loncom/interface/lonparmset.pm	2002/10/01 07:09:05	1.71
+++ loncom/interface/lonparmset.pm	2003/03/14 21:15:39	1.80.2.1
@@ -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.80.2.1 2003/03/14 21:15:39 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -72,6 +72,8 @@ my %mapp;
 my %typep;
 my %keyp;
 
+my %maptitles;
+
 my $uname;
 my $udom;
 my $uhome;
@@ -96,13 +98,13 @@ Returns:  A list, the first item is the
 11- resource default
 10- map default
 9 - General Course
-8 - Map level in course
+8 - Map or Folder level in course
 7 - resource level in course
 6 - General for section
-5 - Map level for section
+5 - Map or Folder level for section
 4 - resource level in section
 3 - General for specific student
-2 - Map level for specific student
+2 - Map or Folder level for specific student
 1 - resource level for specific student
 
 =cut
@@ -467,6 +469,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>');
@@ -543,6 +546,7 @@ sub extractResourceInformation {
     my $defp = shift;
     my $mapp = shift;
     my $symbp = shift;
+    my $maptitles=shift;
 
     foreach (keys %$bighash) {
 	if ($_=~/^src\_(\d+)\.(\d+)$/) {
@@ -583,6 +587,9 @@ sub extractResourceInformation {
 		    &Apache::lonnet::declutter($$bighash{'map_id_'.$mapid});
                 $$mapp{$mapid}=$$mapp{$id};
 		$$allmaps{$mapid}=$$mapp{$id};
+		$$maptitles{$mapid}=
+ $$bighash{'title_'.$$bighash{'ids_'.&Apache::lonnet::clutter($$mapp{$id})}};
+		$$maptitles{$$mapp{$id}}=$$maptitles{$mapid};
 		$$symbp{$id}=$$mapp{$id}.
 			'___'.$resid.'___'.
 			    &Apache::lonnet::declutter($srcf);
@@ -656,6 +663,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='';
@@ -749,7 +757,7 @@ sub assessparms {
     }
 
 # --------------------------------------------------------- Get all assessments
-    extractResourceInformation(\%bighash, \@ids, \%typep,\%keyp, \%allparms, \%allparts, \%allkeys, \%allmaps, $fcat, \%defp, \%mapp, \%symbp);
+    extractResourceInformation(\%bighash, \@ids, \%typep,\%keyp, \%allparms, \%allparts, \%allkeys, \%allmaps, $fcat, \%defp, \%mapp, \%symbp,\%maptitles);
 
     $mapp{'0.0'} = '';
     $symbp{'0.0'} = '';
@@ -778,6 +786,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 +804,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,14 +830,20 @@ 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\:(.*)/) {
 	    $message.="<font color=red>Write Error: $1</font>";
 	}
 # ---------------------------------------------------------------- Done storing
+	$message.='<h3>Changes can take up to 10 minutes before being active for all students</h3>';
     }
 # --------------------------------------------- Devalidate cache for this child
         &Apache::lonnet::devalidatecourseresdata(
@@ -893,13 +916,13 @@ sub assessparms {
 
         $r->print('</tr><tr><td><hr /></td>');
 
-        $r->print('<tr><td>Select Enclosing Map</td>');
+        $r->print('<tr><td>Select Enclosing Map or Folder</td>');
         $r->print('<td colspan="2"><select name="pschp">');
-        $r->print('<option value="all">All Maps</option>');
+        $r->print('<option value="all">All Maps or Folders</option>');
         foreach (sort {$allmaps{$a} cmp $allmaps{$b}} keys %allmaps) {
             $r->print('<option value="'.$_.'"');
             if (($pschp eq $_)) { $r->print(' selected'); }
-            $r->print('>/res/'.$allmaps{$_}.'</option>');
+            $r->print('>'.$maptitles{$_}.($allmaps{$_}!~/^uploaded/?'  ['.$allmaps{$_}.']':'').'</option>');
         }
         $r->print("</select></td></tr>\n");
     } else {
@@ -929,7 +952,6 @@ sub assessparms {
         $r->print('>All Parameters</td>');
 
         my $cnt=0;
-
         foreach $tempkey (sort { $allparms{$a} cmp $allparms{$b} }
                       keys %allparms ) {
             ++$cnt;
@@ -948,10 +970,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>');
@@ -961,7 +985,7 @@ sub assessparms {
 
         $r->print('<tr><td>Sort list by</td><td>');
         $r->print('<select name="fcat">');
-        $r->print('<option value="">Enclosing Map</option>');
+        $r->print('<option value="">Enclosing Map or Folder</option>');
         foreach (sort keys %allkeys) {
             $r->print('<option value="'.$_.'"');
             if ($fcat eq $_) { $r->print(' selected'); }
@@ -998,12 +1022,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 {
@@ -1041,17 +1065,17 @@ ENDTABLETWO
            }
            $r->print(<<ENDTABLEHEADFOUR);
 </tr><tr><th>Assessment URL and Title</th><th>Type</th>
-<th>Enclosing Map</th><th>Part No.</th><th>Parameter Name</th>
-<th>default</th><th>from Enclosing Map</th>
-<th>general</th><th>for Enclosing Map</th><th>for Resource</th>
+<th>Enclosing Map or Folder</th><th>Part No.</th><th>Parameter Name</th>
+<th>default</th><th>from Enclosing Map or Folder</th>
+<th>general</th><th>for Enclosing Map or Folder</th><th>for Resource</th>
 ENDTABLEHEADFOUR
 
            if ($csec) {
-               $r->print('<th>general</th><th>for Enclosing Map</th><th>for Resource</th>');
+               $r->print('<th>general</th><th>for Enclosing Map or Folder</th><th>for Resource</th>');
            }
 
            if ($uname) {
-               $r->print('<th>general</th><th>for Enclosing Map</th><th>for Resource</th>');
+               $r->print('<th>general</th><th>for Enclosing Map or Folder</th><th>for Resource</th>');
            }
 
            $r->print('</tr>');
@@ -1195,7 +1219,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 +1227,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');
                       }
@@ -1212,10 +1236,12 @@ ENDTABLEHEADFOUR
                 } # end loop through ids
                                  
 #---------------------------------------------------- print header information
+                my $foldermap=($maptitle=~/^uploaded/?'Folder':'Map');
+                my $showtitle=$maptitles{$maptitle}.($maptitle!~/^uploaded/?' ['.$maptitle.']':'');
                 $r->print(<<ENDMAPONE);
 <center><h4>
-<font color="red">Set Defaults for All Resources in map
-<i>$maptitle</i><br />
+<font color="red">Set Defaults for All Resources in $foldermap<br />
+<i>$showtitle</i><br />
 Specifically for
 ENDMAPONE
                 if ($uname) {
@@ -1277,14 +1303,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 +1400,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 +1433,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{$_}) {