--- loncom/interface/lonparmset.pm	2011/10/07 15:25:40	1.505.2.1
+++ loncom/interface/lonparmset.pm	2011/01/13 17:44:30	1.506
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Handler to set parameters for assessments
 #
-# $Id: lonparmset.pm,v 1.505.2.1 2011/10/07 15:25:40 raeburn Exp $
+# $Id: lonparmset.pm,v 1.506 2011/01/13 17:44:30 www Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -302,6 +302,7 @@ use Apache::lonlocal;
 use Apache::lonnavmaps;
 use Apache::longroup;
 use Apache::lonrss;
+use HTML::Entities;
 use LONCAPA qw(:DEFAULT :match);
 
 
@@ -890,6 +891,8 @@ sub startpage {
                        {'add_entries' => \%loaditems,});
     my $breadcrumbs =
     &Apache::lonhtmlcommon::breadcrumbs('Table Mode Parameter Setting','Table_Mode');
+    my $escfilter=&Apache::lonhtmlcommon::entity_encode($env{'form.filter'});
+    my $escpart=&Apache::lonhtmlcommon::entity_encode($env{'form.part'});
     $r->print(<<ENDHEAD);
 $start_page
 $breadcrumbs
@@ -898,6 +901,8 @@ $breadcrumbs
 <input type="hidden" value="" name="pres_type" />
 <input type="hidden" value="" name="pres_marker" />
 <input type="hidden" value="1" name="prevvisit" />
+<input type="hidden" value="$escfilter" name="filter" />
+<input type="hidden" value="$escpart" name="part" />
 ENDHEAD
 }
 
@@ -930,7 +935,7 @@ sub print_row {
 
     if ($parmlev eq 'full') {
         $r->print('<td style="background-color:'.$defbgtwo.';" align="center">'
-                  .$$part{$which}.'</td>');
+                  .($$part{$which} eq '0'?'0 ('.&mt('default').')':$$part{$which}).'</td>');
     } else {
         $parm=~s|\[.*\]\s||g;
     }
@@ -1748,11 +1753,12 @@ sub mapmenu {
         # Info about selectable folders/maps
         $r->print(
             '<div class="LC_info">'
-           .&mt('You can only select maps and folders which have modifiable settings.')
-           .' '.&Apache::loncommon::help_open_topic('Parameter_Set_Folder')
+           .&mt('You can only select those maps and folders which can be currently parameterized.')
+         # .' '.&Apache::loncommon::help_open_topic('...') # Later: Add further help
            .'</div>'
         );
 
+
         $r->print(&Apache::loncommon::start_data_table());
 
         # Display row: "All Maps or Folders"
@@ -2019,8 +2025,11 @@ sub assessparms {
 
     my @pscat=&Apache::loncommon::get_env_multiple('form.pscat');
     my $pschp=$env{'form.pschp'};
+
+
     my @psprt=&Apache::loncommon::get_env_multiple('form.psprt');
     if (!@psprt) { $psprt[0]='0'; }
+    if (($env{'form.part'}) && ($psprt[0] ne 'all')) { $psprt[0]=$env{'form.part'}; }
 
     my $pssymb='';
     my $parmlev='';
@@ -2330,6 +2339,9 @@ COURSECONTENTSCRIPT
         my $csudom=$env{'user.domain'};
 
         if ($parmlev eq 'full') {
+#
+# This produces the cascading table output of parameters
+#
                my $coursespan=$csec?8:5;
                my $userspan=3;
                if ($cgroup ne '') {
@@ -2337,6 +2349,9 @@ COURSECONTENTSCRIPT
                }
 
                $r->print('<p><table border="2">');
+#
+# This produces the headers
+#
                $r->print('<tr><td colspan="5"></td>');
                $r->print('<th colspan="'.($coursespan).'">'.&mt('Any User').'</th>');
                if ($uname) {
@@ -2400,7 +2415,9 @@ ENDTABLEHEADFOUR
                }
 
                $r->print('</tr>');
-
+#
+# Done with the headers
+# 
                my $defbgone='';
                my $defbgtwo='';
                my $defbgthree = '';
@@ -2440,11 +2457,19 @@ ENDTABLEHEADFOUR
                     my %default=();
                     my $uri=&Apache::lonnet::declutter($uris{$rid});
 
+                    my $filter=$env{'form.filter'};
+
                     foreach (&keysplit($keyp{$rid})) {
                         my $tempkeyp = $_;
                         if (grep $_ eq $tempkeyp, @catmarker) {
+                          my $parmname=&Apache::lonnet::metadata($uri,$_.'.name');
+# We may only want certain parameters listed
+                          if ($filter) {
+                             unless ($filter=~/\Q$parmname\E/) { next; }
+                          }
+                          $name{$_}=$parmname;
                           $part{$_}=&Apache::lonnet::metadata($uri,$_.'.part');
-                          $name{$_}=&Apache::lonnet::metadata($uri,$_.'.name');
+
                           my $parmdis=&Apache::lonnet::metadata($uri,$_.'.display');
                           if ($allparms{$name{$_}} ne '') {
                               my $identifier;
@@ -3280,6 +3305,7 @@ ENDOVER
 
     my @pscat=&Apache::loncommon::get_env_multiple('form.pscat');
     my $pschp=$env{'form.pschp'};
+
     my @psprt=&Apache::loncommon::get_env_multiple('form.psprt');
     if (!@psprt) { $psprt[0]='0'; }
 
@@ -4613,6 +4639,7 @@ sub handler {
                                              'pres_marker',
                                              'pres_value',
                                              'pres_type',
+                                             'filter','part',
                                              'udom','uname','symb','serial','timebase']);