--- loncom/interface/lonparmset.pm	2000/11/24 15:27:27	1.8
+++ loncom/interface/lonparmset.pm	2000/11/24 17:22:13	1.9
@@ -9,7 +9,7 @@
 #
 # 10/11,10/12,10/16 Gerd Kortemeyer)
 #
-# 11/20,11/21,11/22,11/23,11/24 Gerd Kortemeyer
+# 11/20,11/21,11/22,11/23,11/24,11/25 Gerd Kortemeyer
 
 package Apache::lonparmset;
 
@@ -107,13 +107,21 @@ sub bycat {
     }
 }
 
+# ------------------------------------------------------------ Output for value
+
+sub valout {
+    my ($value,$type)=@_;
+    return
+	($value?(($type=~/^date/)?localtime($value):$value):'  ');
+}
+
 # -------------------------------------------------------- Produces link anchor
 
 sub plink {
     my ($type,$dis,$value,$marker,$return,$call)=@_;
     return '<a href="javascript:pjump('."'".$type."','".$dis."','".$value."','"
       .$marker."','".$return."','".$call."'".');">'.
-    ($value?(($type=~/^date/)?localtime($value):$value):'&nbsp;&nbsp;').'</a>';
+      &valout($value,$type).'</a>';
 }
 
 # ================================================================ Main Handler
@@ -261,7 +269,24 @@ ENDHEAD
             $r->print('>'.$sopt[$k+1].'</option>');
         }
         $r->print('</select>');
-	 $r->print("\n<p><table border=2>\n<tr>");
+	 $r->print(<<ENDTABLEHEAD);
+<p><table border=2>
+<tr><th>Assessment URL and Title</th><th>Part No.</th><th>Parameter Name</th>
+<th>Resource Metadata</th><th>Enclosing Map Parameter</th>
+<th>Course</th>
+ENDTABLEHEAD
+    if ($csec) {
+	$r->print('<th>Section/Group: '.$csec.'</th>');
+    }
+	$r->print('<th>Resource in Course</th>');
+	if ($uname) {
+	    $r->print('<th>User in Course</th>');
+            if ($csec) {
+		$r->print('<th>User in Section/Group: '.$csec.'</th>');
+            }
+            $r->print('<th>User for Resource in Course</th>');
+	}
+	$r->print('<tr>');
  	 map {
 # ------------------------------------------------------ Entry for one resource
 	    @outpar=();
@@ -297,10 +322,27 @@ ENDHEAD
             $r->print('</b></td>');
             my $i;
             for ($i=0;$i<$totalparms;$i++) {
-               $r->print("<td>$part[$i]</td><td>$display[$i]</td>");
-               my $j;
-               for ($j=1;$j<=7;$j++) {
-		   $r->print('<td>'.&plink($type[$i],$display[$i],$outpar[$j]).'</td>');}
+               $r->print("<td>$part[$i]</td><td>$display[$i]</td>"); 
+               $r->print('<td>'.&valout($outpar[8],$type[$i]).'</td>');
+               $r->print('<td>'.&valout($outpar[7],$type[$i]).'</td>');
+               $r->print('<td>'.
+                  &plink($type[$i],$display[$i],$outpar[6]).'</td>');
+               if ($csec) {
+                  $r->print('<td>'.
+                  &plink($type[$i],$display[$i],$outpar[5]).'</td>');
+               }
+               $r->print('<td>'.
+                  &plink($type[$i],$display[$i],$outpar[4]).'</td>');
+               if ($uname) {
+                $r->print('<td>'.
+                  &plink($type[$i],$display[$i],$outpar[3]).'</td>');
+                if ($csec) {
+                  $r->print('<td>'.
+                  &plink($type[$i],$display[$i],$outpar[2]).'</td>');
+                }
+                $r->print('<td>'.
+                  &plink($type[$i],$display[$i],$outpar[1]).'</td>');
+               }
                $r->print("</tr>\n<tr>");
 	   }
 # -------------------------------------------------- End entry for one resource