--- loncom/interface/lonparmset.pm	2001/03/21 01:45:01	1.25
+++ loncom/interface/lonparmset.pm	2001/03/23 23:04:32	1.26
@@ -11,7 +11,7 @@
 #
 # 11/20,11/21,11/22,11/23,11/24,11/25,11/27,11/28,
 # 12/08,12/12,
-# 16/01/01,02/08,03/20 Gerd Kortemeyer
+# 16/01/01,02/08,03/20,03/23 Gerd Kortemeyer
 
 package Apache::lonparmset;
 
@@ -36,6 +36,7 @@ my %keyp;
 my %defp;
 
 my %allkeys;
+my %allmaps;
 
 my $uname;
 my $udom;
@@ -183,6 +184,9 @@ sub handler {
       $udom=$ENV{'form.udom'};
       unless ($udom) { $udom=$r->dir_config('lonDefDomain'); }
 
+      my $pscat=$ENV{'form.pscat'};
+      my $pschp=$ENV{'form.pschp'};
+
       my $id=$ENV{'form.id'};
       if (($id) && ($udom)) {
           $uname=(&Apache::lonnet::idget($udom,$id))[1];
@@ -235,8 +239,9 @@ sub handler {
            $ENV{'request.course.fn'}.'_parms.db',&GDBM_READER,0640))) {
 
 # --------------------------------------------------------- Get all assessments
-	%allkeys=();
-        %defp=();
+	undef %allkeys;
+        undef %allmaps;
+        undef %defp;
         map {
 	    if ($_=~/^src\_(\d+)\.(\d+)$/) {
 	       my $mapid=$1;
@@ -273,6 +278,7 @@ sub handler {
                       &Apache::lonnet::metadata($srcf,'keys'));
                    $mapp{$id}=
 		       &Apache::lonnet::declutter($bighash{'map_id_'.$mapid});
+                   $allmaps{$mapid}=$mapp{$id};
                    $symbp{$id}=$mapp{$id}.
 			'___'.$resid.'___'.
 			    &Apache::lonnet::declutter($srcf);
@@ -462,7 +468,6 @@ or ID
 at Domain 
 <input type="text" value="$udom" size="6" name="udom">
 </b>
-<input type="submit" value="Display">
 <input type="hidden" value='' name="pres_value">
 <input type="hidden" value='' name="pres_type">
 <input type="hidden" value='' name="pres_marker">
@@ -473,16 +478,36 @@ ENDHEAD
     } ('tolerance','date_default','date_start','date_end','date_interval',
        'int','float','string');
 
-        $r->print('<h2>'.$message.'</h2><p>Sort list by ');
-	$r->print('<select name="fcat" onChange="this.form.submit();">');
+        $r->print('<h2>'.$message.'</h2><table><tr><td>Sort list by</td><td>');
+	$r->print('<select name="fcat">');
         $r->print('<option value="">Enclosing Map</option>');
         map {
 	    $r->print('<option value="'.$_.'"');
             if ($fcat eq $_) { $r->print(' selected'); }
             $r->print('>'.$allkeys{$_}.'</option>');
         } keys %allkeys;
-        $r->print('</select>');
+       $r->print(
+    '</select></tr><tr><td>Select Enclosing Map</td><td><select name=pschp>');
+        $r->print('<option value=all>All Maps</option>');
+        map {
+	    $r->print('<option value="'.$_.'"');
+            if ($pschp eq $_) { $r->print(' selected'); }
+            $r->print('>'.$allmaps{$_}.'</option>');
+        } keys %allmaps;
+        $r->print(
+ '</select></td></tr><tr><td>Select Parameter</td><td><select name=pscat>');
+        $r->print('<option value=all>All Parameters</option>');
+        map {
+	    $r->print('<option value="'.$_.'"');
+            if ($pscat eq $_) { $r->print(' selected'); }
+            $r->print('>'.$allkeys{$_}.'</option>');
+        } keys %allkeys;
+        $r->print(
+      '</select></td></tr></table><br><input type="submit" value="Display">');
+      if (($pscat) || ($pschp)) {
 # ----------------------------------------------------------------- Start Table
+	my $catmarker='parameter_'.$pscat;
+        $catmarker=~s/\./\_/g;
         my $coursespan=$csec?8:5;
 	 $r->print(<<ENDTABLEHEAD);
 <p><table border=2>
@@ -516,6 +541,8 @@ ENDTABLEHEADFOUR
          my $defbgone='';
          my $defbgtwo='';
  	 map {
+           my $rid=$_;
+           if (($pschp eq 'all') || ($allmaps{$pschp} eq $mapp{$rid})) {
 # ------------------------------------------------------ Entry for one resource
 	     if ($defbgone eq '"E0E099"') {
 		 $defbgone='"E0E0DD"';
@@ -528,7 +555,6 @@ ENDTABLEHEADFOUR
                  $defbgtwo='"FFFF99"';
 	     }
 	    @outpar=();
-            my $rid=$_;
             my $thistitle='';
             my %name=   ();
             my %part=   ();
@@ -551,6 +577,7 @@ ENDTABLEHEADFOUR
 	    my $totalparms=scalar keys %name;
 	    my $isdef=1;
 	    unless ($totalparms) { $totalparms=1; $isdef=0; }
+	    if ($pscat ne 'all') { $totalparms=1; }
             $r->print('<td bgcolor='.$defbgone.
                 ' rowspan='.$totalparms.'><tt><font size=-1>'.
                 join(' / ',split(/\//,$uri)).
@@ -567,6 +594,7 @@ ENDTABLEHEADFOUR
 		      join(' / ',split(/\//,$mapp{$rid})).'</font></tt></td>');
 	  if ($isdef) {
             map {
+	     if (($_ eq $catmarker) || ($pscat eq 'all')) {
 	       my $result=&parmval($part{$_}.'.'.$name{$_},$rid,$default{$_});
 
                $r->print("<td bgcolor=".$defbgtwo.
@@ -625,17 +653,20 @@ ENDTABLEHEADFOUR
              &plink($type{$_},$display{$_},$outpar[1],$mprefix.'1',
                     'parmform.pres','psub').'</td>');
                }
-
                $r->print(
         '<td bgcolor=#CCCCFF>'.&valout($outpar[$result],$type{$_}).'</td>');
                $r->print("</tr>\n<tr>");
+	   }
 	   } sort keys %name;
 	} else {
-	    $r->print("</tr>\n<tr>");
+ 	    $r->print("</tr>\n<tr>");
         }
 # -------------------------------------------------- End entry for one resource
+	 }
 	 } @ids;
-         $r->print('</table></form></body></html>');
+         $r->print('</table>');
+      }
+	$r->print('</form></body></html>');
          untie(%bighash);
 	 untie(%parmhash);
       }