--- loncom/interface/lonparmset.pm	2001/07/06 12:11:22	1.30
+++ loncom/interface/lonparmset.pm	2001/09/01 14:13:47	1.34
@@ -12,7 +12,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,03/23,03/24,03/26,05/09,
-# 07/05,07/06 Gerd Kortemeyer
+# 07/05,07/06,08/08,08/09,09/01 Gerd Kortemeyer
 
 package Apache::lonparmset;
 
@@ -291,7 +291,7 @@ sub assessparms {
 # ---------------------------------------------------------- Anything to store?
         if ($ENV{'form.pres_marker'}) {
        my ($sresid,$spnam,$snum)=split(/\&/,$ENV{'form.pres_marker'});
-       $spnam=~s/\_/\./;
+       $spnam=~s/\_([^\_]+)$/\.$1/;
 # ---------------------------------------------------------- Construct prefixes
 
        my $symbparm=$symbp{$sresid}.'.'.$spnam;
@@ -500,7 +500,7 @@ ENDHEAD
 	    $r->print('<option value="'.$_.'"');
             if ($fcat eq $_) { $r->print(' selected'); }
             $r->print('>'.$allkeys{$_}.'</option>');
-        } keys %allkeys;
+        } reverse sort keys %allkeys;
        $r->print(
     '</select></tr><tr><td>Select Enclosing Map</td><td><select name=pschp>');
         $r->print('<option value=all>All Maps</option>');
@@ -517,7 +517,7 @@ ENDHEAD
 	    $r->print('<option value="'.$_.'"');
             if ($pscat eq $_) { $r->print(' selected'); }
             $r->print('>'.$allkeys{$_}.'</option>');
-        } keys %allkeys;
+        } reverse sort keys %allkeys;
         $r->print(
 '</select></td></tr></table><br><input name=dis type="submit" value="Display">'
                  );
@@ -526,6 +526,8 @@ ENDHEAD
 	my $catmarker='parameter_'.$pscat;
         $catmarker=~s/\./\_/g;
         my $coursespan=$csec?8:5;
+        my $csuname=$ENV{'user.name'};
+        my $csudom=$ENV{'user.domain'};
 	 $r->print(<<ENDTABLEHEAD);
 <p><table border=2>
 <tr><td colspan=5></td>
@@ -535,7 +537,9 @@ ENDTABLEHEAD
 	$r->print("<th colspan=3 rowspan=2>User $uname at Domain $udom</th>");
     }
     $r->print(<<ENDTABLETWO);
-<th rowspan=3>Parameter in Effect</th></tr><tr><td colspan=5></td>
+<th rowspan=3>Parameter in Effect</th>
+<th rowspan=3>Current Session Value<br>($csuname at $csudom)</th>
+</tr><tr><td colspan=5></td>
 <th colspan=2>Resource Level</th>
 <th colspan=3>in Course</th>
 ENDTABLETWO
@@ -554,7 +558,7 @@ ENDTABLEHEADFOUR
     if ($uname) {
   $r->print('<th>general</th><th>for Enclosing Map</th><th>for Resource</th>');
     }
-	$r->print('</tr><tr>');
+	$r->print('</tr>');
          my $defbgone='';
          my $defbgtwo='';
  	 map {
@@ -577,6 +581,7 @@ ENDTABLEHEADFOUR
 	    @outpar=();
             my $thistitle='';
             my %name=   ();
+	     undef %name;
             my %part=   ();
 	    my %display=();
 	    my %type=   ();
@@ -584,6 +589,7 @@ ENDTABLEHEADFOUR
             my $uri=&Apache::lonnet::declutter($bighash{'src_'.$rid});
 
             map {
+	     if (($_ eq $catmarker) || ($pscat eq 'all')) {
 		$part{$_}=&Apache::lonnet::metadata($uri,$_.'.part');
                 $name{$_}=&Apache::lonnet::metadata($uri,$_.'.name');
                 $display{$_}=&Apache::lonnet::metadata($uri,$_.'.display');
@@ -592,13 +598,13 @@ ENDTABLEHEADFOUR
                 $default{$_}=&Apache::lonnet::metadata($uri,$_);
                 $type{$_}=&Apache::lonnet::metadata($uri,$_.'.type');
                 $thistitle=&Apache::lonnet::metadata($uri,$_.'.title');
+	     }
             } split(/\,/,$keyp{$rid});
 
 	    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.
+	  if ($totalparms>0) {
+            my $firstrow=1;
+            $r->print('<tr><td bgcolor='.$defbgone.
                 ' rowspan='.$totalparms.'><tt><font size=-1>'.
                 join(' / ',split(/\//,$uri)).
                 '</font></tt><p><b>'.
@@ -612,11 +618,13 @@ ENDTABLEHEADFOUR
             $r->print('<td bgcolor='.$defbgone.
                     ' rowspan='.$totalparms.'><tt><font size=-1>'.
 		      join(' / ',split(/\//,$mapp{$rid})).'</font></tt></td>');
-	  if ($isdef) {
             map {
-	     if (($_ eq $catmarker) || ($pscat eq 'all')) {
 	       my $result=&parmval($part{$_}.'.'.$name{$_},$rid,$default{$_});
-
+               unless ($firstrow) { 
+                  $r->print('<tr>'); 
+               } else {
+		   $firstrow=0;
+               }
                $r->print("<td bgcolor=".$defbgtwo.
                   ">$part{$_}</td><td bgcolor=".$defbgone.
                   ">$display{$_}</td>");
@@ -674,13 +682,17 @@ ENDTABLEHEADFOUR
                     'parmform.pres','psub').'</td>');
                }
                $r->print(
-        '<td bgcolor=#CCCCFF>'.&valout($outpar[$result],$type{$_}).'</td>');
-               $r->print("</tr>\n<tr>");
-	   }
+	'<td bgcolor=#CCCCFF>'.&valout($outpar[$result],$type{$_}).'</td>');
+               my $sessionval=&Apache::lonnet::EXT('resource.'.$part{$_}.
+		      '.'.$name{$_},$mapp{$rid}.'___'.$inmapid.'___'.$uri);
+               if (($type{$_}=~/^date/) && ($sessionval))
+                    { $sessionval=localtime($sessionval); }
+               $r->print(
+	'<td bgcolor=#999999><font color=#FFFFFF>'.$sessionval.'&nbsp;'.
+        '</font></td>');
+               $r->print("</tr>");
 	   } sort keys %name;
-	} else {
- 	    $r->print("</tr>\n<tr>");
-        }
+	}
 # -------------------------------------------------- End entry for one resource
 	 }
 	 } @ids;
@@ -813,10 +825,10 @@ sub handler {
 
 # ----------------------------------------------------- Needs to be in a course
 
-   if (($ENV{'request.course.fn'}) && 
+   if (($ENV{'request.course.id'}) && 
        (&Apache::lonnet::allowed('opa',$ENV{'request.course.id'}))) {
 
-       unless ($ENV{'form.crsenv'}) {
+       unless (($ENV{'form.crsenv'}) || (!$ENV{'request.course.fn'})) {
 # --------------------------------------------------------- Bring up assessment
 	  &assessparms($r);
 # ---------------------------------------------- This is for course environment