--- loncom/interface/lonparmset.pm	2000/11/24 20:00:27	1.10
+++ loncom/interface/lonparmset.pm	2000/11/27 15:12:42	1.14
@@ -9,7 +9,7 @@
 #
 # 10/11,10/12,10/16 Gerd Kortemeyer)
 #
-# 11/20,11/21,11/22,11/23,11/24,11/25 Gerd Kortemeyer
+# 11/20,11/21,11/22,11/23,11/24,11/25,11/27 Gerd Kortemeyer
 
 package Apache::lonparmset;
 
@@ -43,8 +43,9 @@ my $fcat;
 # -------------------------------------------- Figure out a cascading parameter
 
 sub parmval {
-    my ($what,$id)=@_;
+    my ($what,$id,$def)=@_;
     my $result='';
+    @outpar=();
 # ----------------------------------------------------- Cascading lookup scheme
 
        my $symbparm=$symbp{$id}.'.'.$what;
@@ -52,13 +53,13 @@ sub parmval {
 
        my $seclevel=
             $ENV{'request.course.id'}.'.['.
-		$ENV{'request.course.sec'}.'].'.$what;
+		$csec.'].'.$what;
        my $seclevelr=
             $ENV{'request.course.id'}.'.['.
-		$ENV{'request.course.sec'}.'].'.$symbparm;
+		$csec.'].'.$symbparm;
        my $seclevelm=
             $ENV{'request.course.id'}.'.['.
-		$ENV{'request.course.sec'}.'].'.$mapparm;
+		$csec.'].'.$mapparm;
 
        my $courselevel=
             $ENV{'request.course.id'}.'.'.$what;
@@ -67,54 +68,56 @@ sub parmval {
        my $courselevelm=
             $ENV{'request.course.id'}.'.'.$mapparm;
 
-# ----------------------------------------------------------- first, check user
-      
-      if ($uname) { 
-       if ($useropt{$courselevelr}) { $outpar[1]=$useropt{$courselevelr}; 
-                                      $result=1; }
-       if ($useropt{$courselevelm}) { $outpar[2]=$useropt{$courselevelm}; 
-                                      $result=2; }
-       if ($useropt{$courselevel}) { $outpar[3]=$useropt{$courselevel};  
-                                     $result=3; }
-      }
+# -------------------------------------------------------- first, check default
 
-# -------------------------------------------------------- second, check course
+       if ($def) { $outpar[11]=$def;
+                   $result=11; }
 
-       if ($courseopt{$seclevelr}) { $outpar[4]=$courseopt{$seclevelr};  
-                                     $result=4; }  
-       if ($courseopt{$seclevelm}) { $outpar[5]=$courseopt{$seclevelm};  
-                                     $result=5; }  
-       if ($courseopt{$seclevel}) { $outpar[6]=$courseopt{$seclevel};  
-                                    $result=6; }  
+# ----------------------------------------------------- second, check map parms
+
+       my $thisparm=$parmhash{$symbparm};
+       if ($thisparm) { $outpar[10]=$thisparm;  
+                        $result=10; }
+
+# --------------------------------------------------------- third, check course
 
-       if ($courseopt{$courselevelr}) { $outpar[7]=$courseopt{$courselevelr}; 
-                                        $result=7; }
-       if ($courseopt{$courselevelm}) { $outpar[8]=$courseopt{$courselevelm}; 
-                                        $result=8; }
        if ($courseopt{$courselevel}) { $outpar[9]=$courseopt{$courselevel};  
                                        $result=9; }
 
-# ------------------------------------------------------ third, check map parms
+       if ($courseopt{$courselevelm}) { $outpar[8]=$courseopt{$courselevelm}; 
+                                        $result=8; }
 
-       my $thisparm=$parmhash{$symbparm};
-       if ($thisparm) { $outpar[10]=$thisparm;  
-                        $result=10; }
-     
-# --------------------------------------------- last, look in resource metadata
+       if ($courseopt{$courselevelr}) { $outpar[7]=$courseopt{$courselevelr}; 
+                                        $result=7; }
 
-        my $filename='/home/httpd/res/'.$bighash{'src_'.$id}.'.meta';
-        if (-e $filename) {
-            my @content;
-            {
-             my $fh=Apache::File->new($filename);
-             @content=<$fh>;
-            }
-            if (join('',@content)=~
-                 /\<$what[^\>]*\>([^\<]*)\<\/$what\>/) {
-	        $outpar[11]=$1; 
-                $result=11;
- 	    }
-        }
+       if ($csec) {
+
+        if ($courseopt{$seclevel}) { $outpar[6]=$courseopt{$seclevel};  
+                                    $result=6; }
+
+        if ($courseopt{$seclevelm}) { $outpar[5]=$courseopt{$seclevelm};  
+                                     $result=5; }  
+ 
+        if ($courseopt{$seclevelr}) { $outpar[4]=$courseopt{$seclevelr};  
+                                     $result=4; }
+  
+      }
+
+# ---------------------------------------------------------- fourth, check user
+      
+      if ($uname) { 
+
+       if ($useropt{$courselevel}) { $outpar[3]=$useropt{$courselevel};  
+                                     $result=3; }
+
+       if ($useropt{$courselevelm}) { $outpar[2]=$useropt{$courselevelm}; 
+                                      $result=2; }
+
+       if ($useropt{$courselevelr}) { $outpar[1]=$useropt{$courselevelr}; 
+                                      $result=1; }
+
+      }
+     
     return $result;
 }
 
@@ -170,22 +173,52 @@ sub handler {
       %symbp=();
       %typep=();
 
-      $uname=$ENV{'form.uname'};
+      my $message='';
+
+      $csec=$ENV{'form.csec'};
       $udom=$ENV{'form.udom'};
+      my $id=$ENV{'form.id'};
+      if (($id) && ($udom)) {
+          $uname=(&Apache::lonnet::idget($udom,$id))[1];
+          if ($uname) {
+	      $id='';
+          } else {
+              $message=
+     "<h3><font color=red>Unknown ID '$id' at domain '$udom'</font></h3>";
+          }
+      } else {
+          $uname=$ENV{'form.uname'};
+      }
       unless ($udom) { $uname=''; }
       $uhome='';
-      my $message='';
       if ($uname) {
 	  $uhome=&Apache::lonnet::homeserver($uname,$udom);
-      }
-      if ($uhome eq 'no_host') { 
+      
+        if ($uhome eq 'no_host') { 
           $message=
      "<h3><font color=red>Unknown user '$uname' at domain '$udom'</font></h3>";
           $uname=''; 
+        } else {
+          $csec=&Apache::lonnet::usection(
+				       $udom,$uname,$ENV{'request.course.id'});
+          if ($csec eq '-1') {
+             $message="<h3><font color=red>".
+              "User '$uname' at domain '$udom' not in this course</font></h3>";
+              $uname='';
+              $csec=$ENV{'form.csec'};
+	 } else {
+              my %name=&Apache::lonnet::userenvironment($udom,$uname,
+		('firstname','middlename','lastname','generation','id'));
+              $message="\n<p>\nFull Name: ".
+                          $name{'firstname'}.' '.$name{'middlename'}
+	                 .$name{'lastname'}.' '.$name{'generation'}.
+                       "<br>\nID: ".$name{'id'}.'<p>';
+         }
+        }
       }
 
-      $csec=$ENV{'form.csec'};
       unless ($csec) { $csec=''; }
+
       $fcat=$ENV{'form.fcat'};
       unless ($fcat) { $fcat=''; }
 
@@ -195,6 +228,67 @@ sub handler {
           (tie(%parmhash,'GDBM_File',
            $ENV{'request.course.fn'}.'_parms.db',&GDBM_READER,0640))) {
 
+# --------------------------------------------------------- Get all assessments
+        map {
+	    if ($_=~/^src\_(\d+)\.(\d+)$/) {
+	       my $mapid=$1;
+               my $resid=$2;
+               my $id=$mapid.'.'.$resid;
+               if ($bighash{$_}=~/\.(problem|exam|quiz|assess|survey|form)$/) {
+		   $ids[$#ids+1]=$id;
+                   $typep{$id}=$1;
+                   $mapp{$id}=
+		       &Apache::lonnet::declutter($bighash{'map_id_'.$mapid});
+                   $symbp{$id}=$mapp{$id}.
+			'___'.$resid.'___'.
+			    &Apache::lonnet::declutter($bighash{$_});
+	       }
+            }
+        } keys %bighash;
+# ---------------------------------------------------------- Anything to store?
+        if ($ENV{'form.pres_marker'}) {
+       my ($sresid,$spnam,$snum)=split(/\&/,$ENV{'form.pres_marker'});
+
+       my $symbparm=$symbp{$sresid}.'.'.$spnam;
+       my $mapparm=$mapp{$sresid}.'___(all).'.$spnam;
+
+       my $seclevel=
+            $ENV{'request.course.id'}.'.['.
+		$csec.'].'.$spnam;
+       my $seclevelr=
+            $ENV{'request.course.id'}.'.['.
+		$csec.'].'.$symbparm;
+       my $seclevelm=
+            $ENV{'request.course.id'}.'.['.
+		$csec.'].'.$mapparm;
+
+       my $courselevel=
+            $ENV{'request.course.id'}.'.'.$spnam;
+       my $courselevelr=
+            $ENV{'request.course.id'}.'.'.$symbparm;
+       my $courselevelm=
+            $ENV{'request.course.id'}.'.'.$mapparm;
+
+       my $storeunder='';
+       if (($snum==9) || ($snum==3)) { $storeunder=$courselevel; }
+       if (($snum==8) || ($snum==2)) { $storeunder=$courselevelm; }
+       if (($snum==7) || ($snum==1)) { $storeunder=$courselevelr; }
+       if ($snum==6) { $storeunder=$seclevel; }
+       if ($snum==5) { $storeunder=$seclevelm; }
+       if ($snum==4) { $storeunder=$seclevelr; }
+
+
+           $message.="<h1>Storing $ENV{'form.pres_value'} type $ENV{'form.pres_type'} under $ENV{'form.pres_marker'} in $storeunder</h1>";
+
+
+# ---------------------------------------------------------- Construct prefixes
+           if ($snum>3) {
+# ---------------------------------------------------------------- Store Course
+           } else {
+# ------------------------------------------------------------------ Store User
+           } 
+        }
+
 # -------------------------------------------------------------- Get coursedata
         my $reply=&Apache::lonnet::reply('dump:'.
               $ENV{'course.'.$ENV{'request.course.id'}.'.domain'}.':'.
@@ -217,23 +311,7 @@ sub handler {
               } split(/\&/,$reply);
            }
         }
-# --------------------------------------------------------- Get all assessments
-        map {
-	    if ($_=~/^src\_(\d+)\.(\d+)$/) {
-	       my $mapid=$1;
-               my $resid=$2;
-               my $id=$mapid.'.'.$resid;
-               if ($bighash{$_}=~/\.(problem|exam|quiz|assess|survey|form)$/) {
-		   $ids[$#ids+1]=$id;
-                   $typep{$id}=$1;
-                   $mapp{$id}=
-		       &Apache::lonnet::declutter($bighash{'map_id_'.$mapid});
-                   $symbp{$id}=$mapp{$id}.
-			'___'.$resid.'___'.
-			    &Apache::lonnet::declutter($bighash{$_});
-	       }
-            }
-        } keys %bighash;
+
 # ------------------------------------------------------------------- Sort this
          @ids=sort bycat @ids;
 # ------------------------------------------------------------------ Start page
@@ -244,6 +322,7 @@ sub handler {
 <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");
@@ -251,6 +330,7 @@ sub handler {
     }
 
     function pjump(type,dis,value,marker,ret,call) {
+        document.parmform.pres_marker.value='';
         parmwin=window.open("/adm/rat/parameter.html?type="+escape(type)
                  +"&value="+escape(value)+"&marker="+escape(marker)
                  +"&return="+escape(ret)
@@ -258,6 +338,18 @@ sub handler {
                  "height=350,width=350,scrollbars=no,menubar=no");
 
     }
+
+    function psub() {
+        pclose();
+        if ((document.parmform.pres_value.value!='') && 
+            (document.parmform.pres_marker.value!='')) {
+            document.parmform.submit();
+        } else {
+            document.parmform.pres_value.value='';
+            document.parmform.pres_marker.value='';
+        }
+    }
+
 </script>
 </head>
 <body bgcolor="#FFFFFF" onUnload="pclose()">
@@ -266,22 +358,22 @@ sub handler {
 <h2>Course: $ENV{'course.'.$ENV{'request.course.id'}.'.description'}</h2>
 <b>
 Section/Group: 
-<input type="text" value="$csec" size="6" name="csec" 
-onBlur="this.form.submit();">
+<input type="text" value="$csec" size="6" name="csec">
 <br>
 For User 
-<input type="text" value="$uname" size="12" name="uname" 
-onBlur="if (this.form.udom.value) { this.form.submit(); }"> 
+<input type="text" value="$uname" size="12" name="uname">
+or ID
+<input type="text" value="$id" size="12" name="id"> 
 at Domain 
-<input type="text" value="$udom" size="6" name="udom" 
-onBlur="if (this.form.uname.value) { this.form.submit(); }">
+<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">
 ENDHEAD
-	 
-	 if ($uhome eq 'no_host') {
-            $r->print($message);
-         }
-        $r->print('<p>Sort list by ');
+	
+        $r->print($message.'<p>Sort list by ');
 	$r->print('<select name="fcat" onChange="this.form.submit();">');
         my $k;
         my @sopt=('map','Map','name','Problem Name','deadline','Deadline');
@@ -295,25 +387,24 @@ ENDHEAD
         my $coursespan=$csec?8:5;
 	 $r->print(<<ENDTABLEHEAD);
 <p><table border=2>
-<tr><td colspan=4></td>
+<tr><td colspan=5></td>
 <th colspan=$coursespan>Any User</th>
 ENDTABLEHEAD
     if ($uname) {
 	$r->print("<th colspan=3 rowspan=2>User $uname at Domain $udom</th>");
     }
     $r->print(<<ENDTABLETWO);
-</tr><tr><td colspan=4></td>
+<th rowspan=3>Parameter in Effect</th></tr><tr><td colspan=5></td>
 <th colspan=2>Resource Level</th>
 <th colspan=3>in Course</th>
 ENDTABLETWO
     if ($csec) {
 	$r->print("<th colspan=3>in Section/Group $csec</th>");
     }
-    $r->print('</tr><tr>');
     $r->print(<<ENDTABLEHEADFOUR);
-<tr><th>Assessment URL and Title</th>
+</tr><tr><th>Assessment URL and Title</th><th>Type</th>
 <th>Enclosing Map</th><th>Part No.</th><th>Parameter Name</th>
-<th>from Metadata</th><th>from Enclosing Map</th>
+<th>default</th><th>from Enclosing Map</th>
 <th>general</th><th>for Enclosing Map</th><th>for Resource</th>
 ENDTABLEHEADFOUR
     if ($csec) {
@@ -328,27 +419,31 @@ ENDTABLEHEADFOUR
 	    @outpar=();
             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 %name=   ('0_deadline' => 'deadline');
+            my %part=   ('0_deadline' => '0');
+	    my %display=('0_deadline' => 'Deadline');
+	    my %type=   ('0_deadline' => 'date_end');
+            my %default=('0_deadline' => time);
             my %metadata=&Apache::lonmeta::unpackagemeta(
 &Apache::lonnet::getfile('/home/httpd/html/'.$bighash{'src_'.$rid}.'.meta'),1);
             map {
                 if ($_=~/^parameter\_(\d+)\_(\w+)$/) {
-		    $part[$#part+1]=$1;
-                    $name[$#name+1]=$2;
-                    ($type[$#type+1],$display[$#display+1])=
+                    my $hashid=$1.'_'.$2;
+		    $part{$hashid}=$1;
+                    $name{$hashid}=$2;
+                    my $tdef;
+                    ($tdef,$display{$hashid})=
 			split(/\_\_dis\_\_/,$metadata{$_});
-                    unless ($display[$#display]) {
-                        $display[$#display]=$name[$#name];
+		    ($type{$hashid},$default{$hashid})=split(/\:/,$tdef);
+                    unless ($display{$hashid}) {
+                        $display{$hashid}=$name{$hashid};
                     }
                 }
                 if ($_ eq 'title') {
 		    $thistitle=$metadata{$_};
                 }
             } keys %metadata;
-            my $totalparms=$#name+1;
+	    my $totalparms=scalar keys %name;
             $r->print('<td rowspan='.$totalparms.'><tt><font size=-1>'.
   join(' / ',split(/\//,&Apache::lonnet::declutter($bighash{'src_'.$rid}))).
            '</font></tt><p><b>'.
@@ -356,34 +451,59 @@ ENDTABLEHEADFOUR
             if ($thistitle) {
 		$r->print(' ('.$thistitle.')');
             }
-            $r->print('</b></td><td rowspan='.$totalparms.'>');
-            $r->print('<tt><font size=-1>'.
+            $r->print('</b></td>');
+            $r->print('<td rowspan='.$totalparms.'>'.$typep{$rid}.'</td>');
+            $r->print('<td rowspan='.$totalparms.'><tt><font size=-1>'.
 		      join(' / ',split(/\//,$mapp{$rid})).'</font></tt></td>');
-            my $i;
-            for ($i=0;$i<$totalparms;$i++) {
-               $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>');
+            map {
+
+	       my $result=&parmval($part{$_}.'.'.$name{$_},$rid,$default{$_});
+
+               $r->print("<td>$part{$_}</td><td>$display{$_}</td>"); 
+               my $mprefix=$rid.'&'.$_.'&';
+
+               $r->print('<td'.(($result==11)?' bgcolor="#AAFFAA"':'').'>'.
+             &valout($outpar[11],$type{$_}).'</td>');
+               $r->print('<td'.(($result==10)?' bgcolor="#AAFFAA"':'').'>'.
+             &valout($outpar[10],$type{$_}).'</td>');
+
+               $r->print('<td'.(($result==9)?' bgcolor="#AAFFAA"':'').'>'.
+             &plink($type{$_},$display{$_},$outpar[9],$mprefix.'9',
+                    'parmform.pres','psub').'</td>');
+               $r->print('<td'.(($result==8)?' bgcolor="#AAFFAA"':'').'>'.
+             &plink($type{$_},$display{$_},$outpar[8],$mprefix.'8',
+                    'parmform.pres','psub').'</td>');
+               $r->print('<td'.(($result==7)?' bgcolor="#AAFFAA"':'').'>'.
+             &plink($type{$_},$display{$_},$outpar[7],$mprefix.'7',
+                    'parmform.pres','psub').'</td>');
+
                if ($csec) {
-                  $r->print('<td>'.
-                  &plink($type[$i],$display[$i],$outpar[5]).'</td>');
+                 $r->print('<td'.(($result==6)?' bgcolor="#AAFFAA"':'').'>'.
+             &plink($type{$_},$display{$_},$outpar[6],$mprefix.'6',
+                    'parmform.pres','psub').'</td>');
+                 $r->print('<td'.(($result==5)?' bgcolor="#AAFFAA"':'').'>'.
+             &plink($type{$_},$display{$_},$outpar[5],$mprefix.'5',
+                    'parmform.pres','psub').'</td>');
+                 $r->print('<td'.(($result==4)?' bgcolor="#AAFFAA"':'').'>'.
+             &plink($type{$_},$display{$_},$outpar[4],$mprefix.'4',
+                    'parmform.pres','psub').'</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('<td'.(($result==3)?' bgcolor="#AAFFAA"':'').'>'.
+             &plink($type{$_},$display{$_},$outpar[3],$mprefix.'3',
+                    'parmform.pres','psub').'</td>');
+                 $r->print('<td'.(($result==2)?' bgcolor="#AAFFAA"':'').'>'.
+             &plink($type{$_},$display{$_},$outpar[2],$mprefix.'2',
+                    'parmform.pres','psub').'</td>');
+                 $r->print('<td'.(($result==1)?' bgcolor="#AAFFAA"':'').'>'.
+             &plink($type{$_},$display{$_},$outpar[1],$mprefix.'1',
+                    'parmform.pres','psub').'</td>');
                }
+
+               $r->print('<td>'.&valout($outpar[$result],$type{$_}).'</td>');
                $r->print("</tr>\n<tr>");
-	   }
+	   } sort keys %name;
 # -------------------------------------------------- End entry for one resource
 	 } @ids;
          $r->print('</table></form></body></html>');
@@ -404,7 +524,4 @@ __END__
 
 
 
-
-
-