--- loncom/interface/lonparmset.pm	2000/11/22 12:16:03	1.4
+++ loncom/interface/lonparmset.pm	2000/11/23 20:20:39	1.5
@@ -9,7 +9,7 @@
 #
 # 10/11,10/12,10/16 Gerd Kortemeyer)
 #
-# 11/20,11/21,11/22 Gerd Kortemeyer
+# 11/20,11/21,11/22,11/23 Gerd Kortemeyer
 
 package Apache::lonparmset;
 
@@ -97,6 +97,15 @@ sub bycat {
     }
 }
 
+# -------------------------------------------------------- Produces link anchor
+
+sub plink {
+    my ($type,$dis,$value,$marker,$return,$call)=@_;
+    return '<a href="javascript:pjump('."'".$type."','".$dis."','".$value."','"
+           .$marker."','".$return."','".$call."'".');">'.
+           (($type=~/^date/)?localtime($value):$value).'</a>';
+}
+
 # ================================================================ Main Handler
 
 sub handler {
@@ -190,8 +199,29 @@ sub handler {
 # ------------------------------------------------------------------ Start page
          $r->content_type('text/html');
          $r->send_http_header;
-	 $r->print(
-  '<html><body bgcolor="#FFFFFF"><h1>Set Assessment Parameters</h1>');
+	$r->print(<<ENDHEAD);
+<html>
+<head>
+<title>LON-CAPA Assessment Parameters</title>
+<script>
+    function pclose() {
+        parmwin=window.open("/adm/rat/empty.html","LONCAPAparms",
+                 "height=350,width=350,scrollbars=no,menubar=no");
+        parmwin.close();
+    }
+
+    function pjump(type,dis,value,marker,ret,call) {
+        parmwin=window.open("/adm/rat/parameter.html?type="+type
+                 +"&value="+value+"&marker="+marker+"&return="+ret
+                 +"&call="+call+"&name="+dis,"LONCAPAparms",
+                 "height=350,width=350,scrollbars=no,menubar=no");
+
+    }
+</script>
+</head>
+<body bgcolor="#FFFFFF" onUnload="pclose()">
+<h1>Set Assessment Parameters</h1>
+ENDHEAD
 	$r->print("<h2>Course: $ENV{'course.'.
                    $ENV{'request.course.id'}.'.description'}</h2>");
 	 if ($csec) {
@@ -203,22 +233,46 @@ sub handler {
 	 if ($uhome eq 'no_host') {
             $r->print($message);
          }
-	 $r->print('<table border=2>');
+	 $r->print("\n<table border=2>\n<tr>");
  	 map {
-	    $r->print('<tr>');
 # ------------------------------------------------------ Entry for one resource
+            my $rid=$_;
+            my $thistitle='';
+            my @part=(0,1,1);
+            my @name=('deadline','sig','tol');
+	    my @display=('Deadline','Significant Figures','Tolerance');
+	    my @type=('date','int','tolerance');
             my %metadata=&Apache::lonmeta::unpackagemeta(
-  &Apache::lonnet::getfile('/home/httpd/html/'.$bighash{'src_'.$_}.'.meta'),1);
+&Apache::lonnet::getfile('/home/httpd/html/'.$bighash{'src_'.$rid}.'.meta'),1);
             map {
-                if ($_=~/^parameter\_(\d+)\_(\w+)\_\_dis\_\_(.+)$/) {
-		    my $part=$1;
-                    my $name=$2;
-                    my $display=$3;
-                    my $type=$metadata{$_};
+                if ($_=~/^parameter\_(\d+)\_(\w+)$/) {
+		    $part[$#part+1]=$1;
+                    $name[$#name+1]=$2;
+                    ($type[$#type+1],$display[$#display+1])=
+			split(/\_\_dis\_\_/,$metadata{$_});
+                    unless ($display[$#display]) {
+                        $display[$#display]=$name[$#name];
+                    }
+                }
+                if ($_ eq 'title') {
+		    $thistitle=$metadata{$_};
                 }
             } keys %metadata;
+            my $totalparms=$#name+1;
+            $r->print('<td rowspan='.$totalparms.'><tt><font size=-1>'.
+                $bighash{'src_'.$rid}.'</font></tt><p><b>'.
+                      $bighash{'title_'.$rid});
+            if ($thistitle) {
+		$r->print(' ('.$thistitle.')');
+            }
+            $r->print('</b></td>');
+            my $i;
+            for ($i=0;$i<$totalparms;$i++) {
+               $r->print("<td>$part[$i]</td><td>$display[$i]</td>");
+               $r->print('<td>'.&plink($type[$i],$display[$i],'987684455').'</td>');
+               $r->print("</tr>\n<tr>");
+	   }
 # -------------------------------------------------- End entry for one resource
-            $r->print('</tr>');
 	 } @ids;
          $r->print('</table></body></html>');
          untie(%bighash);
