--- loncom/interface/lonparmset.pm	2005/06/02 16:35:32	1.200
+++ loncom/interface/lonparmset.pm	2005/06/04 17:35:19	1.208
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Handler to set parameters for assessments
 #
-# $Id: lonparmset.pm,v 1.200 2005/06/02 16:35:32 www Exp $
+# $Id: lonparmset.pm,v 1.208 2005/06/04 17:35:19 www Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -68,20 +68,11 @@ use Apache::lonnavmaps;
 
 my $parmhashid;
 my %parmhash;
+my $symbsid;
+my %symbs;
 
 # --- end local caches
 
-#
-# FIXME: get rid of items below
-#
-my @ids;
-my %symbp;
-my %mapp;
-my %typep;
-my %keyp;
-my %uris;
-my %maptitles;
-
 ##################################################
 ##################################################
 
@@ -112,9 +103,13 @@ Returns:  A list, the first item is the
 =cut
 
 ##################################################
-##################################################
 sub parmval {
     my ($what,$id,$def,$uname,$udom,$csec)=@_;
+    return &parmval_by_symb($what,&symbcache($id),$def,$uname,$udom,$csec);
+}
+
+sub parmval_by_symb {
+    my ($what,$symb,$def,$uname,$udom,$csec)=@_;
 # load caches
 
     &cacheparmhash();
@@ -128,9 +123,10 @@ sub parmval {
     my $result='';
     my @outpar=();
 # ----------------------------------------------------- Cascading lookup scheme
+    my $map=(&Apache::lonnet::decode_symb($symb))[0];    
 
-    my $symbparm=$symbp{$id}.'.'.$what;
-    my $mapparm=$mapp{$id}.'___(all).'.$what;
+    my $symbparm=$symb.'.'.$what;
+    my $mapparm=$map.'___(all).'.$what;
 
     my $seclevel=$env{'request.course.id'}.'.['.$csec.'].'.$what;
     my $seclevelr=$env{'request.course.id'}.'.['.$csec.'].'.$symbparm;
@@ -180,8 +176,7 @@ sub parmval {
 	}
 
         if (defined($$courseopt{$seclevelr})) {
-	    $outpar[4]=$$courseopt
-{$seclevelr};
+	    $outpar[4]=$$courseopt{$seclevelr};
 	    $result=4;
 	}
     }
@@ -222,6 +217,29 @@ sub cacheparmhash {
     }
 }
 
+sub resetsymbcache {
+    $symbsid='';
+}
+
+sub symbcache {
+    my $id=shift;
+    if ($symbsid ne $env{'request.course.id'}) {
+	%symbs=();
+    }
+    unless ($symbs{$id}) {
+	my $navmap = Apache::lonnavmaps::navmap->new();
+	if ($id=~/\./) {
+	    my $resource=$navmap->getById($id);
+	    $symbs{$id}=$resource->symb();
+	} else {
+	    my $resource=$navmap->getByMapPc($id);
+	    $symbs{$id}=&Apache::lonnet::declutter($resource->src());
+	}
+	$symbsid=$env{'request.course.id'};
+    }
+    return $symbs{$id};
+}
+
 ##################################################
 ##################################################
 #
@@ -238,14 +256,7 @@ sub cacheparmhash {
 
 sub storeparm {
     my ($sresid,$spnam,$snum,$nval,$ntype,$uname,$udom,$csec)=@_;
-    my $navmap = Apache::lonnavmaps::navmap->new();
-    if ($sresid=~/\./) {
-	my $resource=$navmap->getById($sresid);
-	&storeparm_by_symb($resource->symb(),$spnam,$snum,$nval,$ntype,$uname,$udom,$csec);
-    } else {
-        my $resource=$navmap->getByMapPc($sresid);
-	&storeparm_by_symb(&Apache::lonnet::declutter($resource->src()),$spnam,$snum,$nval,$ntype,$uname,$udom,$csec);
-    }
+    &storeparm_by_symb(&symbcache($sresid),$spnam,$snum,$nval,$ntype,$uname,$udom,$csec);
 }
 
 #
@@ -435,33 +446,23 @@ sub plink {
 		&valout($value,$type).'</a><a name="'.$marker.'"></a>';
 }
 
-
 sub startpage {
-    my ($r,$id,$udom,$csec,$uname,$have_assesments,$trimheader)=@_;
+    my ($r,$id,$udom,$csec,$uname,$have_assessments)=@_;
 
     my $bodytag=&Apache::loncommon::bodytag('Set/Modify Course Parameters','',
                                             'onUnload="pclose()"');
-    my $breadcrumbs = &Apache::lonhtmlcommon::breadcrumbs(undef,'Table');
+    my $breadcrumbs = &Apache::lonhtmlcommon::breadcrumbs(undef,'Table Mode Parameter Setting');
     my $chooseopt=&Apache::loncommon::select_dom_form($udom,'udom').' '.
         &Apache::loncommon::selectstudent_link('parmform','uname','udom');
     my $selscript=&Apache::loncommon::studentbrowser_javascript();
     my $pjump_def = &Apache::lonhtmlcommon::pjump_javascript_definition();
     my %lt=&Apache::lonlocal::texthash(
-		    'cep'   => "Course Environment Parameters",
-		    'scep'  => "Set Course Environment Parameters",
-		    'smcap' => "Set/Modify Course Assessment Parameter",
-		    'mcap'  => "Modify Course Assessment Parameters",
-		    'caphm' => "Course Assessment Parameter - Helper Mode",
-		    'capom' => "Course Assessment Parameters - Overview Mode",
                     'captm' => "Course Assessments Parameters - Table Mode",
 		    'sg'    => "Section/Group",
 		    'fu'    => "For User",
 		    'oi'    => "or ID",
 		    'ad'    => "at Domain"
 				       );
-    my $overallhelp=
-	&Apache::loncommon::help_open_menu('','Setting Parameters','Course_Setting_Parameters','',10,'Instructor Interface');
-    my $assessparmhelp=&Apache::loncommon::help_open_topic("Cascading_Parameters","Assessment Parameters");
     my $html=&Apache::lonxml::xmlbegin();
     $r->print(<<ENDHEAD);
 $html
@@ -512,28 +513,7 @@ $selscript
 </head>
 $bodytag
 $breadcrumbs
-$overallhelp
 ENDHEAD
-
-    unless ($trimheader) {$r->print(<<ENDHEAD2);
-<form method="post" action="/adm/parmset" name="envform">
-<h4>$lt{'cep'}</h4>
-<input type="submit" name="crsenv" value="$lt{'scep'}" />
-</form>
-<hr />
-$assessparmhelp
-<form method="post" action="/adm/helper/parameter.helper" name="helpform">
-<h4>$lt{'caphm'}</h4>
-<input type="submit" value="$lt{'smcap'}" />
-</form>
-<hr />
-<form method="post" action="/adm/parmset" name="overview">
-<h4>$lt{'capom'}</h4>
-<input type="submit" name="overview" value="$lt{'mcap'}" />
-</form>
-<hr />
-ENDHEAD2
-    }
     my %sectionhash=();
     my $sections='';
     if (&Apache::loncommon::get_sections(
@@ -552,8 +532,8 @@ ENDHEAD2
 <h4>$lt{'captm'}</h4>
 ENDHEAD3
 
-    if (!$have_assesments) {
-	$r->print('<font color="red">'.&mt('There are no assesment parameters in this course to set.').'</font><br />');	
+    if (!$have_assessments) {
+	$r->print('<font color="red">'.&mt('There are no assessment parameters in this course to set.').'</font><br />');	
     } else {
 	$r->print(<<ENDHEAD);
 <b>
@@ -574,7 +554,7 @@ ENDHEAD
 }
 
 sub print_row {
-    my ($r,$which,$part,$name,$rid,$default,$defaulttype,$display,$defbgone,
+    my ($r,$which,$part,$name,$symbp,$rid,$default,$defaulttype,$display,$defbgone,
 	$defbgtwo,$parmlev,$uname,$udom,$csec)=@_;
 # get the values for the parameter in cascading order
 # empty levels will remain empty
@@ -596,7 +576,7 @@ sub print_row {
     }
     my $parm=$$display{$which};
 
-    if ($parmlev eq 'full' || $parmlev eq 'brief') {
+    if ($parmlev eq 'full') {
         $r->print('<td bgcolor='.$defbgtwo.' align="center">'
                   .$$part{$which}.'</td>');
     } else {    
@@ -631,47 +611,30 @@ sub print_row {
 
         &print_td($r,11,$defbgone,$result,\@outpar,$mprefix,$_,\@typeoutpar,$display);
 
-        if ($parmlev eq 'brief') {
-
-           &print_td($r,7,$defbgone,$result,\@outpar,$mprefix,$_,\@typeoutpar,$display);
-
-           if ($csec) {
-               &print_td($r,4,$defbgtwo,$result,\@outpar,$mprefix,$_,\@typeoutpar,$display);
-           }
-           if ($uname) {
-               &print_td($r,1,$defbgone,$result,\@outpar,$mprefix,$_,\@typeoutpar,$display);
-           }
-        } else {
-
-           &print_td($r,10,$defbgone,$result,\@outpar,$mprefix,$_,\@typeoutpar,$display);
-           &print_td($r,9,'#FFDDDD',$result,\@outpar,$mprefix,$_,\@typeoutpar,$display);
-           &print_td($r,8,'#FFDDDD',$result,\@outpar,$mprefix,$_,\@typeoutpar,$display);
-           &print_td($r,7,$defbgone,$result,\@outpar,$mprefix,$_,\@typeoutpar,$display);
+	&print_td($r,10,$defbgone,$result,\@outpar,$mprefix,$_,\@typeoutpar,$display);
+	&print_td($r,9,'#FFDDDD',$result,\@outpar,$mprefix,$_,\@typeoutpar,$display);
+	&print_td($r,8,'#FFDDDD',$result,\@outpar,$mprefix,$_,\@typeoutpar,$display);
+	&print_td($r,7,$defbgone,$result,\@outpar,$mprefix,$_,\@typeoutpar,$display);
+	
+	if ($csec) {
+	    &print_td($r,6,$defbgtwo,$result,\@outpar,$mprefix,$_,\@typeoutpar,$display);
+	    &print_td($r,5,$defbgtwo,$result,\@outpar,$mprefix,$_,\@typeoutpar,$display);
+	    &print_td($r,4,$defbgtwo,$result,\@outpar,$mprefix,$_,\@typeoutpar,$display);
+	}
+	if ($uname) {
+	    &print_td($r,3,$defbgone,$result,\@outpar,$mprefix,$_,\@typeoutpar,$display);
+	    &print_td($r,2,$defbgone,$result,\@outpar,$mprefix,$_,\@typeoutpar,$display);
+	    &print_td($r,1,$defbgone,$result,\@outpar,$mprefix,$_,\@typeoutpar,$display);
+	}
 
-           if ($csec) {
-               &print_td($r,6,$defbgtwo,$result,\@outpar,$mprefix,$_,\@typeoutpar,$display);
-               &print_td($r,5,$defbgtwo,$result,\@outpar,$mprefix,$_,\@typeoutpar,$display);
-               &print_td($r,4,$defbgtwo,$result,\@outpar,$mprefix,$_,\@typeoutpar,$display);
-           }
-           if ($uname) {
-               &print_td($r,3,$defbgone,$result,\@outpar,$mprefix,$_,\@typeoutpar,$display);
-               &print_td($r,2,$defbgone,$result,\@outpar,$mprefix,$_,\@typeoutpar,$display);
-               &print_td($r,1,$defbgone,$result,\@outpar,$mprefix,$_,\@typeoutpar,$display);
-           }
-        } # end of $brief if/else
     } # end of $parmlev if/else
 
     $r->print('<td bgcolor=#CCCCFF align="center">'.
                   &valout($outpar[$result],$typeoutpar[$result]).'</td>');
 
-    if ($parmlev eq 'full' || $parmlev eq 'brief') {
+    if ($parmlev eq 'full') {
         my $sessionval=&Apache::lonnet::EXT('resource.'.$$part{$which}.
-                                        '.'.$$name{$which},$symbp{$rid});
-
-# this doesn't seem to work, and I don't think is correct
-#    my $sessionvaltype=&Apache::lonnet::EXT('resource.'.$$part{$which}.
-#                                      '.'.$$name{$which}.'.type',$symbp{$rid});
-# this seems to work
+                                        '.'.$$name{$which},$$symbp{$rid});
         my $sessionvaltype=$typeoutpar[$result];
         if (!defined($sessionvaltype)) { $sessionvaltype=$$defaulttype{$which}; }
         $r->print('<td bgcolor=#999999 align="center"><font color=#FFFFFF>'.
@@ -696,6 +659,7 @@ sub print_td {
     $r->print('</td>'."\n");
 }
 
+
 =pod
 
 =item B<extractResourceInformation>: Given the course data hash, extractResourceInformation extracts lots of information about the course's resources into a variety of hashes.
@@ -802,6 +766,87 @@ sub extractResourceInformation {
     }
 }
 
+
+##################################################
+##################################################
+
+sub parmmenu {
+    my ($r,$allparms,$pscat)=@_;
+    my $tempkey;
+    $r->print(<<ENDSCRIPT);
+<script type="text/javascript">
+    function checkall(value, checkName) {
+	for (i=0; i<document.forms.parmform.elements.length; i++) {
+            ele = document.forms.parmform.elements[i];
+            if (ele.name == checkName) {
+                document.forms.parmform.elements[i].checked=value;
+            }
+        }
+    }
+</script>
+ENDSCRIPT
+    $r->print(&mt('Select Parameters to View'));
+    $r->print("\n<table><tr>");
+    my $cnt=0;
+    foreach $tempkey (sort { $$allparms{$a} cmp $$allparms{$b} }
+                      keys %{$allparms} ) {
+	++$cnt;
+	$r->print("</tr>\n<tr>") if ($cnt%2);
+	$r->print("\n<td><input type='checkbox' name='pscat' ");
+	$r->print('value="'.$tempkey.'"');
+	if ($$pscat[0] eq "all" || grep $_ eq $tempkey, @{$pscat}) {
+	    $r->print(' checked');
+	}
+	$r->print('>'.$$allparms{$tempkey}.'</td>');
+    }
+    $r->print('
+</tr><tr><td>
+<input type="button" onclick="checkall(true, \'pscat\')" value="Select All" />
+</td><td>
+<input type="button" onclick="checkall(false, \'pscat\')" value="Unselect All" />
+</td>
+');
+    $r->print('</tr></table>');
+}
+
+sub menu {
+    my ($r,$allparms,$allparts,$allkeys,$pscat,$psprt,$fcat)=@_;
+    my $tempkey;
+    
+    &parmmenu($r,$allkeys,$pscat);
+
+    $r->print('<table><tr>');    
+    $r->print('<td><select multiple name="psprt" size="5">');
+    $r->print('<option value="all"');
+    $r->print(' selected') unless (@{$psprt});
+    $r->print('>'.&mt('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" ||  $temphash{$tempkey}) {
+		$r->print(' selected');
+	    }
+	    $r->print('>'.$$allparts{$tempkey}.'</option>');
+	}
+    }
+    $r->print('</select></td></tr><tr><td colspan="3"><hr /></td></tr>');
+    
+    $r->print('<tr><td>'.&mt('Sort list by').'</td><td>');
+    $r->print('<select name="fcat">');
+    $r->print('<option value="">'.&mt('Enclosing Map or Folder').'</option>');
+    foreach (sort keys %{$allkeys}) {
+	$r->print('<option value="'.$_.'"');
+	if ($fcat eq $_) { $r->print(' selected'); }
+	$r->print('>'.$$allkeys{$_}.'</option>');
+    }
+    $r->print('</select></td>');
+    
+    $r->print('</tr><tr><td colspan="3"><hr /></td></tr></table>');
+    
+}
+
 ##################################################
 ##################################################
 
@@ -835,6 +880,15 @@ Variables used (guessed by Jeremy):
 sub assessparms {
 
     my $r=shift;
+
+    my @ids=();
+    my %symbp=();
+    my %mapp=();
+    my %typep=();
+    my %keyp=();
+    my %uris=();
+    my %maptitles=();
+
 # -------------------------------------------------------- Variable declaration
     my %allkeys=();
     my %allmaps=();
@@ -875,11 +929,9 @@ sub assessparms {
     my $pschp=$env{'form.pschp'};
     my @psprt=&Apache::loncommon::get_env_multiple('form.psprt');
     if (!@psprt) { $psprt[0]='0'; }
-    my $showoptions=$env{'form.showoptions'};
 
     my $pssymb='';
     my $parmlev='';
-    my $trimheader='';
     my $prevvisit=$env{'form.prevvisit'};
  
     unless ($env{'form.parmlev'}) {
@@ -898,13 +950,11 @@ sub assessparms {
 	if (!@pscat) { @pscat=('all'); }
 	$pschp='';
         $parmlev = 'full';
-        $trimheader='yes';
     } elsif ($env{'form.symb'}) {
 	$pssymb=$env{'form.symb'};
 	if (!@pscat) { @pscat=('all'); }
 	$pschp='';
         $parmlev = 'full';
-        $trimheader='yes';
     } else {
 	$env{'form.url'}='';
     }
@@ -964,10 +1014,15 @@ sub assessparms {
 
 # ---------------------------------------------------------- Anything to store?
     if ($env{'form.pres_marker'}) {
-	$message.=&storeparm(split(/\&/,$env{'form.pres_marker'}),
-			     $env{'form.pres_value'},
-			     $env{'form.pres_type'},
-                             $uname,$udom,$csec);
+        my @markers=split(/\&\&\&/,$env{'form.pres_marker'});
+        my @values=split(/\&\&\&/,$env{'form.pres_value'});
+        my @types=split(/\&\&\&/,$env{'form.pres_type'});
+	for (my $i=0;$i<=$#markers;$i++) {
+	    $message.=&storeparm(split(/\&/,$markers[$i]),
+				 $values[$i],
+				 $types[$i],
+				 $uname,$udom,$csec);
+	}
 # ---------------------------------------------------------------- Done storing
 	$message.='<h3>'.&mt('Changes can take up to 10 minutes before being active for all students.').&Apache::loncommon::help_open_topic('Caching').'</h3>';
     }
@@ -989,16 +1044,8 @@ sub assessparms {
     if ($psprt[0] eq "all" || !@psprt) {@psprt = (keys %allparts);}
 # ------------------------------------------------------------------ Start page
 
-    my $have_assesments=1;
-    if (scalar(keys(%allkeys)) eq 0) { $have_assesments=0; }
+    &startpage($r,$id,$udom,$csec,$uname,scalar(keys(%allkeys)));
 
-    $trimheader = 'yes';
-    &startpage($r,$id,$udom,$csec,$uname,$have_assesments,$trimheader);
-
-#    if ($env{'form.url'}) {
-#	$r->print('<input type="hidden" value="'.$env{'form.url'}.
-#		  '" name="url"><input type="hidden" name="command" value="set">');
-#    }
     $r->print('<input type="hidden" value="true" name="prevvisit">');
 
     foreach ('tolerance','date_default','date_start','date_end',
@@ -1039,112 +1086,16 @@ sub assessparms {
     } else {
         my ($map,$id,$resource)=&Apache::lonnet::decode_symb($pssymb);
         $r->print("<tr><td>".&mt('Specific Resource')."</td><td>$resource</td>");
-        $r->print('<td><input type="submit" name="dis" value="'.$submitmessage.'"></td>');
+        $r->print('<td><input type="hidden" value="'.
+		  $pssymb.'" name="symb"><input type="submit" name="dis" value="'.
+		  $submitmessage.'"></td>');
         $r->print('</tr>');
-        $r->print('<input type="hidden" value="'.$pssymb.'" name="symb">');
     }
+    $r->print('</table><br />');
 
-    $r->print('<tr><td colspan="3"><hr /><label><input type="checkbox"');
-    if ($showoptions eq 'show') {$r->print(" checked ");}
-    $r->print(' name="showoptions" value="show" />'.&mt('Show More Options').'</label><hr /></td></tr>');
-#    $r->print("<tr><td>Show: $showoptions</td></tr>");
-#    $r->print("<tr><td>pscat: @pscat</td></tr>");
-#    $r->print("<tr><td>psprt: @psprt</td></tr>");
-#    $r->print("<tr><td>fcat:  $fcat</td></tr>");
-
-    if ($showoptions eq 'show') {
-        my $tempkey;
-
-        $r->print('<tr><td colspan="3" align="center">'.&mt('Select Parameters to View').'</td></tr>');
-
-        $r->print('<tr><td colspan="2"><table><tr>');
-        my $cnt=0;
-        foreach $tempkey (sort { $allparms{$a} cmp $allparms{$b} }
-                      keys %allparms ) {
-            ++$cnt;
-            $r->print('</tr><tr>') if ($cnt%2);
-            $r->print('<td><input type="checkbox" name="pscat" ');
-            $r->print('value="'.$tempkey.'"');
-            if ($pscat[0] eq "all" || grep $_ eq $tempkey, @pscat) {
-                $r->print(' checked');
-            }
-	    $r->print('>'.$allparms{$tempkey}.'</td>');
-	}
-	$r->print('
-</tr><tr><td>
-<script type="text/javascript">
-    function checkall(value, checkName) {
-	for (i=0; i<document.forms.parmform.elements.length; i++) {
-            ele = document.forms.parmform.elements[i];
-            if (ele.name == checkName) {
-                document.forms.parmform.elements[i].checked=value;
-            }
-        }
-    }
-</script>
-<input type="button" onclick="checkall(true, \'pscat\')" value="Select All" />
-</td><td>
-<input type="button" onclick="checkall(false, \'pscat\')" value="Unselect All" />
-</td>
-');
-        $r->print('</tr></table>');
-
-#        $r->print('<tr><td>Select Parts</td><td>');
-        $r->print('<td><select multiple name="psprt" size="5">');
-        $r->print('<option value="all"');
-        $r->print(' selected') unless (@psprt);
-        $r->print('>'.&mt('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" ||  $temphash{$tempkey}) {
-                    $r->print(' selected');
-                }
-                $r->print('>'.$allparts{$tempkey}.'</option>');
-            }
-        }
-        $r->print('</select></td></tr><tr><td colspan="3"><hr /></td></tr>');
-
-        $r->print('<tr><td>'.&mt('Sort list by').'</td><td>');
-        $r->print('<select name="fcat">');
-        $r->print('<option value="">'.&mt('Enclosing Map or Folder').'</option>');
-        foreach (sort keys %allkeys) {
-            $r->print('<option value="'.$_.'"');
-            if ($fcat eq $_) { $r->print(' selected'); }
-            $r->print('>'.$allkeys{$_}.'</option>');
-        }
-        $r->print('</select></td>');
-
-        $r->print('</tr><tr><td colspan="3"><hr /></td></tr>');
-
-    } else { # hide options - include any necessary extras here
 
-        $r->print('<input type="hidden" name="fcat" value="'.$fcat.'">'."\n");
+    &menu($r,\%allparms,\%allparts,\%allkeys,\@pscat,\@psprt,$fcat);
 
-        unless (@pscat) {
-          foreach (keys %allparms ) {
-            $r->print('<input type="hidden" name="pscat" value="'.$_.'">'."\n");
-          }
-        } else {
-          foreach (@pscat) {
-            $r->print('<input type="hidden" name="pscat" value="'.$_.'">'."\n");
-          }
-        }
-
-        unless (@psprt) {
-          foreach (keys %allparts ) {
-            $r->print('<input type="hidden" name="psprt" value="'.$_.'">'."\n");
-          }
-        } else {
-          foreach (@psprt) {
-            $r->print('<input type="hidden" name="psprt" value="'.$_.'">'."\n");
-          }
-        }
-
-    }
-    $r->print('</table><br />');
     if (($prevvisit) || ($pschp) || ($pssymb)) {
         $submitmessage = &mt("Update Course Assessment Parameter Display");
     } else {
@@ -1152,13 +1103,6 @@ sub assessparms {
     }
     $r->print('<input type="submit" name="dis" value="'.$submitmessage.'">');
 
-#    my @temp_psprt;
-#    foreach my $t (@psprt) {
-#	push(@temp_psprt, grep {eval (/^$t\./ || ($_ == $t))} (keys %allparts));
-#    }
-
-#    @psprt = @temp_psprt;
-
     my @temp_pscat;
     map {
         my $cat = $_;
@@ -1173,7 +1117,7 @@ sub assessparms {
         my $csuname=$env{'user.name'};
         my $csudom=$env{'user.domain'};
 
-        if ($parmlev eq 'full' || $parmlev eq 'brief') {
+        if ($parmlev eq 'full') {
            my $coursespan=$csec?8:5;
            $r->print('<p><table border=2>');
            $r->print('<tr><td colspan=5></td>');
@@ -1310,7 +1254,7 @@ ENDTABLEHEADFOUR
                                 undef $firstrow;
                             }
 
-                            &print_row($r,$_,\%part,\%name,$rid,\%default,
+                            &print_row($r,$_,\%part,\%name,\%symbp,$rid,\%default,
                                        \%type,\%display,$defbgone,$defbgtwo,
                                        $parmlev,$uname,$udom,$csec);
                         }
@@ -1319,7 +1263,7 @@ ENDTABLEHEADFOUR
             } # end foreach ids
 # -------------------------------------------------- End entry for one resource
             $r->print('</table>');
-        } # end of  brief/full
+        } # end of  full
 #--------------------------------------------------- Entry for parm level map
         if ($parmlev eq 'map') {
             my $defbgone = '"E0E099"';
@@ -1418,7 +1362,7 @@ ENDMAPONE
 
 	        foreach (sort keys %name) {
                     $r->print('<tr>');
-                    &print_row($r,$_,\%part,\%name,$mapid,\%default,
+                    &print_row($r,$_,\%part,\%name,\%symbp,$mapid,\%default,
                            \%type,\%display,$defbgone,$defbgtwo,
                            $parmlev,$uname,$udom,$csec);
 #                    $r->print("<tr><td>resource.$part{$_}.$name{$_},$symbp{$mapid}</td></tr>\n");
@@ -1496,7 +1440,7 @@ ENDMAPONE
 
 	    foreach (sort keys %name) {
                 $r->print('<tr>');
-                &print_row($r,$_,\%part,\%name,$mapid,\%default,
+                &print_row($r,$_,\%part,\%name,\%symbp,$mapid,\%default,
                        \%type,\%display,$defbgone,$defbgtwo,$parmlev,$uname,$udom,$csec);
 #                    $r->print("<tr><td>resource.$part{$_}.$name{$_},$symbp{$mapid}</td></tr>\n");
             }
@@ -1838,7 +1782,8 @@ $output
 ENDenv
 }
 ##################################################
-
+# Overview mode
+##################################################
 my $tableopen;
 
 sub tablestart {
@@ -1860,26 +1805,38 @@ sub tableend {
     }
 }
 
-sub overview {
-    my $r=shift;
-    my $bodytag=&Apache::loncommon::bodytag(
-                             'Set/Modify Course Assessment Parameters');
-    my $dom = $env{'course.'.$env{'request.course.id'}.'.domain'};
-    my $crs = $env{'course.'.$env{'request.course.id'}.'.num'};
-    my $breadcrumbs = &Apache::lonhtmlcommon::breadcrumbs(undef,'Overview');
-    my $html=&Apache::lonxml::xmlbegin();
-    $r->print(<<ENDOVER);
-$html
-<head>
-<title>LON-CAPA Course Environment</title>
-</head>
-$bodytag
-$breadcrumbs
-<form method="post" action="/adm/parmset?action=setoverview" name="overviewform">
-<input type="hidden" name="overview" value="1" />
-ENDOVER
+sub readdata {
+    my ($crs,$dom)=@_;
+# Read coursedata
+    my $resourcedata=&Apache::lonnet::get_courseresdata($crs,$dom);
+# Read userdata
+
+    my $classlist=&Apache::loncoursedata::get_classlist();
+    foreach (keys %$classlist) {
+        # the following undefs are for 'domain', and 'username' respectively.
+        if ($_=~/^(\w+)\:(\w+)$/) {
+	    my ($tuname,$tudom)=($1,$2);
+	    my $useropt=&Apache::lonnet::get_userresdata($tuname,$tudom);
+            foreach my $userkey (keys %{$useropt}) {
+		if ($userkey=~/^$env{'request.course.id'}/) {
+                    my $newkey=$userkey;
+		    $newkey=~s/^($env{'request.course.id'}\.)/$1\[useropt\:$tuname\:$tudom\]\./;
+		    $$resourcedata{$newkey}=$$useropt{$userkey};
+		}
+	    }
+	}
+    }
+    return $resourcedata;
+}
+
+
 # Setting
-    my %olddata=&Apache::lonnet::dump('resourcedata',$dom,$crs);
+
+sub storedata {
+    my ($r,$crs,$dom)=@_;
+# Set userlevel immediately
+# Do an intermediate store of course level
+    my $olddata=&readdata($crs,$dom);
     my %newdata=();
     undef %newdata;
     my @deldata=();
@@ -1888,18 +1845,58 @@ ENDOVER
 	if ($_=~/^form\.([a-z]+)\_(.+)$/) {
 	    my $cmd=$1;
 	    my $thiskey=$2;
+	    my ($tuname,$tudom)=&extractuser($thiskey);
+	    my $tkey=$thiskey;
+            if ($tuname) {
+		$tkey=~s/\.\[useropt\:$tuname\:$tudom\]\./\./;
+	    }
 	    if ($cmd eq 'set') {
 		my $data=$env{$_};
-		if ($olddata{$thiskey} ne $data) { $newdata{$thiskey}=$data; }
+		if ($$olddata{$thiskey} ne $data) { 
+		    if ($tuname) {
+			if (&Apache::lonnet::put('resourcedata',{$tkey=>$data},$tudom,$tuname) eq 'ok') {
+			    $r->print('<br />'.&mt('Stored modified parameter for').' '.
+				      &Apache::loncommon::plainname($tuname,$tudom));
+			} else {
+			    $r->print('<h2><font color="red">'.
+				      &mt('Error storing parameters').'</font></h2>');
+			}
+			&Apache::lonnet::devalidateuserresdata($tuname,$tudom);
+		    } else {
+			$newdata{$thiskey}=$data;
+                    } 
+		}
 	    } elsif ($cmd eq 'del') {
-		push (@deldata,$thiskey);
+		if ($tuname) {
+		    if (&Apache::lonnet::del('resourcedata',[$tkey],$tudom,$tuname) eq 'ok') {
+			$r->print('<br />'.&mt('Deleted parameter for').' '.&Apache::loncommon::plainname($tuname,$tudom));
+		    } else {
+			$r->print('<h2><font color="red">'.
+				  &mt('Error deleting parameters').'</font></h2>');
+		    }
+		    &Apache::lonnet::devalidateuserresdata($tuname,$tudom);
+		} else {
+		    push (@deldata,$thiskey);
+		}
 	    } elsif ($cmd eq 'datepointer') {
 		my $data=&Apache::lonhtmlcommon::get_date_from_form($env{$_});
-		if (defined($data) and $olddata{$thiskey} ne $data) { $newdata{$thiskey}=$data; }
+		if (defined($data) and $$olddata{$thiskey} ne $data) { 
+		    if ($tuname) {
+			if (&Apache::lonnet::put('resourcedata',{$tkey=>$data},$tudom,$tuname) eq 'ok') {
+			    $r->print('<br />'.&mt('Stored modified date for').' '.&Apache::loncommon::plainname($tuname,$tudom));
+			} else {
+			    $r->print('<h2><font color="red">'.
+				      &mt('Error storing parameters').'</font></h2>');
+			}
+			&Apache::lonnet::devalidateuserresdata($tuname,$tudom);
+		    } else {
+			$newdata{$thiskey}=$data; 
+		    }
+		}
 	    }
 	}
     }
-# Store
+# Store all course level
     my $delentries=$#deldata+1;
     my @newdatakeys=keys %newdata;
     my $putentries=$#newdatakeys+1;
@@ -1910,6 +1907,7 @@ ENDOVER
 	    $r->print('<h2><font color="red">'.
 		      &mt('Error deleting parameters').'</font></h2>');
 	}
+	&Apache::lonnet::devalidatecourseresdata($crs,$dom);
     }
     if ($putentries) {
 	if (&Apache::lonnet::put('resourcedata',\%newdata,$dom,$crs) eq 'ok') {
@@ -1918,25 +1916,41 @@ ENDOVER
 	    $r->print('<h2><font color="red">'.
 		      &mt('Error storing parameters').'</font></h2>');
 	}
+	&Apache::lonnet::devalidatecourseresdata($crs,$dom);
     }
-# Read and display
-    my %resourcedata=&Apache::lonnet::dump('resourcedata',$dom,$crs);
+}
+
+sub extractuser {
+    my $key=shift;
+    return ($key=~/^$env{'request.course.id'}.\[useropt\:(\w+)\:(\w+)\]\./);
+}
+
+sub listdata {
+    my ($r,$resourcedata,$listdata)=@_;
+# Start list output
+
     my $oldsection='';
     my $oldrealm='';
     my $oldpart='';
     my $pointer=0;
     $tableopen=0;
     my $foundkeys=0;
-    foreach my $thiskey (sort keys %resourcedata) {
-	if ($resourcedata{$thiskey.'.type'}) {
-	    my ($course,$middle,$part,$name)=
-		($thiskey=~/^(\w+)\.(?:(.+)\.)*([\w\s]+)\.(\w+)$/);
+    foreach my $thiskey (sort keys %{$listdata}) {
+	if ($$resourcedata{$thiskey.'.type'}) {
+	    my ($middle,$part,$name)=
+		($thiskey=~/^$env{'request.course.id'}\.(?:(.+)\.)*([\w\s]+)\.(\w+)$/);
 	    my $section=&mt('All Students');
-	    if ($middle=~/^\[(.*)\]\./) {
-		$section=&mt('Group/Section').': '.$1;
-		$middle=~s/^\[(.*)\]\.//;
+	    if ($middle=~/^\[(.*)\]/) {
+		my $issection=$1;
+		if ($issection=~/^useropt\:(\w+)\:(\w+)/) {
+		    $section=&mt('User').": ".&Apache::loncommon::plainname($1,$2);
+		} else {
+		    $section=&mt('Group/Section').': '.$issection;
+		}
+		$middle=~s/^\[(.*)\]//;
 	    }
-	    $middle=~s/\.$//;
+	    $middle=~s/\.+$//;
+	    $middle=~s/^\.+//;
 	    my $realm='<font color="red">'.&mt('All Resources').'</font>';
 	    if ($middle=~/^(.+)\_\_\_\(all\)$/) {
 		$realm='<font color="green">'.&mt('Folder/Map').': '.&Apache::lonnet::gettitle($1).' <br /><font color="#aaaaaa" size="-2">('.$1.')</font></font>';
@@ -1966,26 +1980,78 @@ ENDOVER
 		      ':</b></td><td><input type="checkbox" name="del_'.
 		      $thiskey.'" /></td><td>');
 	    $foundkeys++;
-	    if ($resourcedata{$thiskey.'.type'}=~/^date/) {
+	    if ($$resourcedata{$thiskey.'.type'}=~/^date/) {
 		my $jskey='key_'.$pointer;
 		$pointer++;
 		$r->print(
 			  &Apache::lonhtmlcommon::date_setter('overviewform',
 							      $jskey,
-						      $resourcedata{$thiskey}).
+						      $$resourcedata{$thiskey}).
 '<input type="hidden" name="datepointer_'.$thiskey.'" value="'.$jskey.'" />'
 			  );
 	    } else {
 		$r->print(
 			  '<input type="text" name="set_'.$thiskey.'" value="'.
-			  $resourcedata{$thiskey}.'">');
+			  $$resourcedata{$thiskey}.'">');
 	    }
 	    $r->print('</td></tr>');
 	}
     }
-    
+    return $foundkeys;
+}
+
+sub newoverview {
+    my $r=shift;
+    my $bodytag=&Apache::loncommon::bodytag(
+                             'Set Course Assessment Parameters');
+    my $dom = $env{'course.'.$env{'request.course.id'}.'.domain'};
+    my $crs = $env{'course.'.$env{'request.course.id'}.'.num'};
+    my $breadcrumbs = &Apache::lonhtmlcommon::breadcrumbs(undef,'Overview');
+    my $html=&Apache::lonxml::xmlbegin();
+    $r->print(<<ENDOVER);
+$html
+<head>
+<title>LON-CAPA Parameters</title>
+</head>
+$bodytag
+$breadcrumbs
+<form method="post" action="/adm/parmset?action=newoverview" name="overviewform">
+ENDOVER
+   $r->print(&tableend().
+	     '<p><input type="submit" value="'.&mt('Submit').'" /></p></form></body></html>');
+}
+
+sub overview {
+    my $r=shift;
+    my $bodytag=&Apache::loncommon::bodytag(
+                             'Modify Course Assessment Parameters');
+    my $dom = $env{'course.'.$env{'request.course.id'}.'.domain'};
+    my $crs = $env{'course.'.$env{'request.course.id'}.'.num'};
+    my $breadcrumbs = &Apache::lonhtmlcommon::breadcrumbs(undef,'Overview');
+    my $html=&Apache::lonxml::xmlbegin();
+    $r->print(<<ENDOVER);
+$html
+<head>
+<title>LON-CAPA Parameters</title>
+</head>
+$bodytag
+$breadcrumbs
+<form method="post" action="/adm/parmset?action=setoverview" name="overviewform">
+ENDOVER
+# Store modified
+
+    &storedata($r,$crs,$dom);
+
+# Read modified data
+
+    my $resourcedata=&readdata($crs,$dom);
+
+# List data
+
+    my $foundkeys=&listdata($r,$resourcedata,$resourcedata);
+
     $r->print(&tableend().'<p>'.
-	($foundkeys?'<input type="submit" value="'.&mt('Modify Parameters').'" />':&mt('There are no course or section parameters.')).'</p></form></body></html>');
+	($foundkeys?'<input type="submit" value="'.&mt('Modify Parameters').'" />':&mt('There are no parameters.')).'</p></form></body></html>');
 }
 
 ##################################################
@@ -2113,8 +2179,7 @@ ENDMAINFORMHEAD
     my @menu =
         (
           { text => 'Set Course Environment Parameters',
-            help => 'Course_Setting_Parameters',
-            action => 'crsenv',
+	    action => 'crsenv',
             permission => $parm_permission,
             },
           { text => 'Set/Modify Course Assessment Parameters - Helper Mode',
@@ -2124,10 +2189,15 @@ ENDMAINFORMHEAD
           { text => 'Modify Course Assessment Parameters - Overview Mode',
             action => 'setoverview',
             permission => $parm_permission,
+            },          
+	  { text => 'Set Course Assessment Parameters - Overview Mode',
+            action => 'newoverview',
+            permission => $parm_permission,
             },
           { text => 'Set/Modify Course Assessment Parameters - Table Mode',
             action => 'settable',
             permission => $parm_permission,
+            help => 'Cascading_Parameters',
             },
 #          { text => 'Set Parameter Default Preferences',
 #            help => 'Course_View_Class_List',
@@ -2182,24 +2252,19 @@ sub handler {
 	return OK;
     }
     &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},
-					    ['action','state']);
+					    ['action','state',
+                                             'pres_marker',
+                                             'pres_value',
+                                             'pres_type',
+                                             'udom','uname']);
 
-# ----------------------------------------------------------- Clear out garbage
-
-
-    @ids=();
-    %symbp=();
-    %mapp=();
-    %typep=();
-    %keyp=();
-
-    %maptitles=();
 
     &Apache::lonhtmlcommon::clear_breadcrumbs();
     &Apache::lonhtmlcommon::add_breadcrumb({href=>"/adm/parmset",
 					    text=>"Parameter Manager",
-					    faq=>9,
+					    faq=>10,
 					    bug=>'Instructor Interface'});
+
 # ----------------------------------------------------- Needs to be in a course
     my $parm_permission =
 	(&Apache::lonnet::allowed('opa',$env{'request.course.id'}) ||
@@ -2211,6 +2276,11 @@ sub handler {
         &Apache::loncommon::content_type($r,'text/html');
         $r->send_http_header;
 
+
+        # id numbers can change on re-ordering of folders
+
+        &resetsymbcache();
+
         #
         # Main switch on form.action and form.state, as appropriate
         #
@@ -2235,9 +2305,14 @@ sub handler {
             &Apache::lonhtmlcommon::add_breadcrumb({href=>'/adm/parmset?action=setoverview',
 						    text=>"Overview Mode"});
 	    &overview($r);
+        } elsif ($env{'form.action'} eq 'newoverview' && $parm_permission) {
+            &Apache::lonhtmlcommon::add_breadcrumb({href=>'/adm/parmset?action=setoverview',
+						    text=>"Overview Mode"});
+	    &newoverview($r);
         } elsif ($env{'form.action'} eq 'settable' && $parm_permission) {
             &Apache::lonhtmlcommon::add_breadcrumb({href=>'/adm/parmset?action=settable',
-						    text=>"Table Mode"});
+						    text=>"Table Mode",
+						    help => 'Course_Setting_Parameters'});
 	    &assessparms($r);
         }