--- loncom/interface/lonparmset.pm	2000/11/25 19:57:17	1.12
+++ loncom/interface/lonparmset.pm	2001/01/16 15:52:09	1.21
@@ -9,7 +9,9 @@
 #
 # 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,11/28,
+# 12/08,12/12,
+# 16/01/01 Gerd Kortemeyer
 
 package Apache::lonparmset;
 
@@ -17,7 +19,6 @@ use strict;
 use Apache::lonnet;
 use Apache::Constants qw(:common :http REDIRECT);
 use GDBM_File;
-use Apache::lonmeta;
 
 
 my %courseopt;
@@ -31,6 +32,10 @@ my @ids;
 my %symbp;
 my %mapp;
 my %typep;
+my %keyp;
+my %defp;
+
+my %allkeys;
 
 my $uname;
 my $udom;
@@ -53,13 +58,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;
@@ -121,16 +126,6 @@ sub parmval {
     return $result;
 }
 
-# ---------------------------------------------------------------- Sort routine
-
-sub bycat {
-    if ($fcat eq '') {
-        $a<=>$b;
-    } else {
-        &parmval('0.'.$fcat,$a)<=>&parmval('0.'.$fcat,$b);
-    }
-}
-
 # ------------------------------------------------------------ Output for value
 
 sub valout {
@@ -177,6 +172,8 @@ sub handler {
 
       $csec=$ENV{'form.csec'};
       $udom=$ENV{'form.udom'};
+      unless ($udom) { $udom=$r->dir_config('lonDefDomain'); }
+
       my $id=$ENV{'form.id'};
       if (($id) && ($udom)) {
           $uname=(&Apache::lonnet::idget($udom,$id))[1];
@@ -184,7 +181,7 @@ sub handler {
 	      $id='';
           } else {
               $message=
-     "<h3><font color=red>Unknown ID '$id' at domain '$udom'</font></h3>";
+     "<font color=red>Unknown ID '$id' at domain '$udom'</font>";
           }
       } else {
           $uname=$ENV{'form.uname'};
@@ -196,14 +193,14 @@ sub handler {
       
         if ($uhome eq 'no_host') { 
           $message=
-     "<h3><font color=red>Unknown user '$uname' at domain '$udom'</font></h3>";
+     "<font color=red>Unknown user '$uname' at domain '$udom'</font>";
           $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>";
+             $message="<font color=red>".
+              "User '$uname' at domain '$udom' not in this course</font>";
               $uname='';
               $csec=$ENV{'form.csec'};
 	 } else {
@@ -228,6 +225,110 @@ sub handler {
           (tie(%parmhash,'GDBM_File',
            $ENV{'request.course.fn'}.'_parms.db',&GDBM_READER,0640))) {
 
+# --------------------------------------------------------- Get all assessments
+	%allkeys=();
+        %defp=();
+        map {
+	    if ($_=~/^src\_(\d+)\.(\d+)$/) {
+	       my $mapid=$1;
+               my $resid=$2;
+               my $id=$mapid.'.'.$resid;
+               my $srcf=$bighash{$_};
+               if ($srcf=~/\.(problem|exam|quiz|assess|survey|form)$/) {
+		   $ids[$#ids+1]=$id;
+                   $typep{$id}=$1;
+                   $keyp{$id}='';
+                   map {
+                       if ($_=~/^parameter\_(.*)/) {
+			  my $key=$_;
+                          my $allkey=$1;
+                          $allkey=~s/\_/\./;
+                          my $display=
+			      &Apache::lonnet::metadata($srcf,$key.'.display');
+                          unless ($display) {
+                              $display=
+			         &Apache::lonnet::metadata($srcf,$key.'.name');
+                          }
+                          $allkeys{$allkey}=$display;
+                          if ($allkey eq $fcat) {
+                             $defp{$id}=
+                              &Apache::lonnet::metadata($srcf,$key);
+			  }
+                          if ($keyp{$id}) {
+			      $keyp{$id}.=','.$key;
+                          } else {
+                              $keyp{$id}=$key;
+		          }
+		       }
+                   } split(/\,/,
+                      &Apache::lonnet::metadata($srcf,'keys'));
+                   $mapp{$id}=
+		       &Apache::lonnet::declutter($bighash{'map_id_'.$mapid});
+                   $symbp{$id}=$mapp{$id}.
+			'___'.$resid.'___'.
+			    &Apache::lonnet::declutter($srcf);
+	       }
+            }
+        } keys %bighash;
+# ---------------------------------------------------------- Anything to store?
+        if ($ENV{'form.pres_marker'}) {
+       my ($sresid,$spnam,$snum)=split(/\&/,$ENV{'form.pres_marker'});
+       $spnam=~s/\_/\./;
+# ---------------------------------------------------------- Construct prefixes
+
+       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; }
+       $storeunder=&Apache::lonnet::escape($storeunder);
+ 
+       my $storecontent=
+    $storeunder.'='.&Apache::lonnet::escape($ENV{'form.pres_value'}).'&'.
+    $storeunder.'.type='.&Apache::lonnet::escape($ENV{'form.pres_type'});
+
+       my $reply='';
+           if ($snum>3) {
+# ---------------------------------------------------------------- Store Course
+            $reply=&Apache::lonnet::critical('put:'.
+             $ENV{'course.'.$ENV{'request.course.id'}.'.domain'}.':'.
+             $ENV{'course.'.$ENV{'request.course.id'}.'.num'}.':resourcedata:'.
+             $storecontent,
+             $ENV{'course.'.$ENV{'request.course.id'}.'.home'});
+           } else {
+# ------------------------------------------------------------------ Store User
+            $reply=
+            &Apache::lonnet::critical('put:'.$udom.':'.$uname.':resourcedata:'.
+             $storecontent,$uhome);
+           }
+
+         if ($reply=~/^error\:(.*)/) {
+	     $message.="<font color=red>Write Error: $1</font>";
+	 }
+# ---------------------------------------------------------------- Done storing
+   }
 # -------------------------------------------------------------- Get coursedata
         my $reply=&Apache::lonnet::reply('dump:'.
               $ENV{'course.'.$ENV{'request.course.id'}.'.domain'}.':'.
@@ -236,7 +337,8 @@ sub handler {
         if ($reply!~/^error\:/) {
            map {
              my ($name,$value)=split(/\=/,$_);
-             $courseopt{unescape($name)}=unescape($value);  
+             $courseopt{&Apache::lonnet::unescape($name)}=
+                        &Apache::lonnet::unescape($value);  
            } split(/\&/,$reply);
         }
 # --------------------------------------------------- Get userdata (if present)
@@ -246,29 +348,22 @@ sub handler {
            if ($reply!~/^error\:/) {
               map {
                 my ($name,$value)=split(/\=/,$_);
-                $useropt{unescape($name)}=unescape($value);  
+                $useropt{&Apache::lonnet::unescape($name)}=
+                         &Apache::lonnet::unescape($value);
               } 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;
+
+        @ids=sort  {  
+           if ($fcat eq '') {
+              $a<=>$b;
+           } else {
+              $outpar[&parmval($fcat,$a,$defp{$a})]<=>
+              $outpar[&parmval($fcat,$b,$defp{$b})];
+           } 
+        } @ids;
 # ------------------------------------------------------------------ Start page
          $r->content_type('text/html');
          $r->send_http_header;
@@ -277,6 +372,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");
@@ -284,6 +380,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)
@@ -291,6 +388,17 @@ sub handler {
                  "height=350,width=350,scrollbars=no,menubar=no");
 
     }
+
+    function psub() {
+        pclose();
+        if (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()">
@@ -309,17 +417,19 @@ 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">
 ENDHEAD
-	
-        $r->print($message.'<p>Sort list by ');
+
+        $r->print('<h2>'.$message.'</h2><p>Sort list by ');
 	$r->print('<select name="fcat" onChange="this.form.submit();">');
-        my $k;
-        my @sopt=('map','Map','name','Problem Name','deadline','Deadline');
-        for ($k=0;$k<$#sopt;$k=$k+2) {
-	    $r->print('<option value="'.$sopt[$k].'"');
-            if ($fcat eq $sopt[$k]) { $r->print(' selected'); }
-            $r->print('>'.$sopt[$k+1].'</option>');
-        }
+        $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>');
 # ----------------------------------------------------------------- Start Table
         my $coursespan=$csec?8:5;
@@ -352,82 +462,126 @@ ENDTABLEHEADFOUR
   $r->print('<th>general</th><th>for Enclosing Map</th><th>for Resource</th>');
     }
 	$r->print('</tr><tr>');
+         my $defbgone='';
+         my $defbgtwo='';
  	 map {
 # ------------------------------------------------------ Entry for one resource
+	     if ($defbgone eq '"E0E099"') {
+		 $defbgone='"E0E0DD"';
+             } else {
+                 $defbgone='"E0E099"';
+	     }
+	     if ($defbgtwo eq '"FFFF99"') {
+		 $defbgtwo='"FFFFDD"';
+             } else {
+                 $defbgtwo='"FFFF99"';
+	     }
 	    @outpar=();
             my $rid=$_;
             my $thistitle='';
-            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);
+            my %name=   ();
+            my %part=   ();
+	    my %display=();
+	    my %type=   ();
+            my %default=();
+            my $uri=&Apache::lonnet::declutter($bighash{'src_'.$rid});
+
             map {
-                if ($_=~/^parameter\_(\d+)\_(\w+)$/) {
-                    my $hashid=$1.'_'.$2;
-		    $part{$hashid}=$1;
-                    $name{$hashid}=$2;
-                    my $tdef;
-                    ($tdef,$display{$hashid})=
-			split(/\_\_dis\_\_/,$metadata{$_});
-		    ($type{$hashid},$default{$hashid})=split(/\:/,$tdef);
-                    unless ($display{$hashid}) {
-                        $display{$hashid}=$name{$hashid};
-                    }
-                }
-                if ($_ eq 'title') {
-		    $thistitle=$metadata{$_};
-                }
-            } keys %metadata;
+		$part{$_}=&Apache::lonnet::metadata($uri,$_.'.part');
+                $name{$_}=&Apache::lonnet::metadata($uri,$_.'.name');
+                $display{$_}=&Apache::lonnet::metadata($uri,$_.'.display');
+                unless ($display{$_}) { $display{$_}=''; }
+                $display{$_}.=' ('.$name{$_}.')';
+                $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;
-            $r->print('<td rowspan='.$totalparms.'><tt><font size=-1>'.
-  join(' / ',split(/\//,&Apache::lonnet::declutter($bighash{'src_'.$rid}))).
-           '</font></tt><p><b>'.
+	    my $isdef=1;
+	    unless ($totalparms) { $totalparms=1; $isdef=0; }
+            $r->print('<td bgcolor='.$defbgone.
+                ' rowspan='.$totalparms.'><tt><font size=-1>'.
+                join(' / ',split(/\//,$uri)).
+                '</font></tt><p><b>'.
                       $bighash{'title_'.$rid});
             if ($thistitle) {
 		$r->print(' ('.$thistitle.')');
             }
             $r->print('</b></td>');
-            $r->print('<td rowspan='.$totalparms.'>'.$typep{$rid}.'</td>');
-            $r->print('<td rowspan='.$totalparms.'><tt><font size=-1>'.
+            $r->print('<td bgcolor='.$defbgtwo.
+                    ' rowspan='.$totalparms.'>'.$typep{$rid}.'</td>');
+            $r->print('<td bgcolor='.$defbgone.
+                    ' rowspan='.$totalparms.'><tt><font size=-1>'.
 		      join(' / ',split(/\//,$mapp{$rid})).'</font></tt></td>');
+	  if ($isdef) {
             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"':'').'>'.
+               $r->print("<td bgcolor=".$defbgtwo.
+                  ">$part{$_}</td><td bgcolor=".$defbgone.
+                  ">$display{$_}</td>");
+               my $thismarker=$_;
+               $thismarker=~s/^parameter\_//; 
+               my $mprefix=$rid.'&'.$thismarker.'&';
+
+               $r->print('<td bgcolor='.
+                (($result==11)?'"#AAFFAA"':'#FFDDDD').'>'.
              &valout($outpar[11],$type{$_}).'</td>');
-               $r->print('<td'.(($result==10)?' bgcolor="#AAFFAA"':'').'>'.
+               $r->print('<td bgcolor='.
+                (($result==10)?'"#AAFFAA"':'#FFDDDD').'>'.
              &valout($outpar[10],$type{$_}).'</td>');
-               $r->print('<td'.(($result==9)?' bgcolor="#AAFFAA"':'').'>'.
-             &plink($type{$_},$display{$_},$outpar[9],$mprefix.'9').'</td>');
-               $r->print('<td'.(($result==8)?' bgcolor="#AAFFAA"':'').'>'.
-             &plink($type{$_},$display{$_},$outpar[8],$mprefix.'8').'</td>');
-               $r->print('<td'.(($result==7)?' bgcolor="#AAFFAA"':'').'>'.
-             &plink($type{$_},$display{$_},$outpar[7],$mprefix.'7').'</td>');
+
+               $r->print('<td bgcolor='.
+                (($result==9)?'"#AAFFAA"':$defbgone).'>'.
+             &plink($type{$_},$display{$_},$outpar[9],$mprefix.'9',
+                    'parmform.pres','psub').'</td>');
+               $r->print('<td bgcolor='.
+                (($result==8)?'"#AAFFAA"':$defbgone).'>'.
+             &plink($type{$_},$display{$_},$outpar[8],$mprefix.'8',
+                    'parmform.pres','psub').'</td>');
+               $r->print('<td bgcolor='.
+                (($result==7)?'"#AAFFAA"':$defbgone).'>'.
+             &plink($type{$_},$display{$_},$outpar[7],$mprefix.'7',
+                    'parmform.pres','psub').'</td>');
+
                if ($csec) {
-                 $r->print('<td'.(($result==6)?' bgcolor="#AAFFAA"':'').'>'.
-             &plink($type{$_},$display{$_},$outpar[6],$mprefix.'6').'</td>');
-                 $r->print('<td'.(($result==5)?' bgcolor="#AAFFAA"':'').'>'.
-             &plink($type{$_},$display{$_},$outpar[5],$mprefix.'5').'</td>');
-                 $r->print('<td'.(($result==4)?' bgcolor="#AAFFAA"':'').'>'.
-             &plink($type{$_},$display{$_},$outpar[4],$mprefix.'4').'</td>');
+                 $r->print('<td bgcolor='.
+                   (($result==6)?'"#AAFFAA"':$defbgtwo).'>'.
+             &plink($type{$_},$display{$_},$outpar[6],$mprefix.'6',
+                    'parmform.pres','psub').'</td>');
+                 $r->print('<td bgcolor='.
+                   (($result==5)?'"#AAFFAA"':$defbgtwo).'>'.
+             &plink($type{$_},$display{$_},$outpar[5],$mprefix.'5',
+                    'parmform.pres','psub').'</td>');
+                 $r->print('<td bgcolor='.
+                    (($result==4)?'"#AAFFAA"':$defbgtwo).'>'.
+             &plink($type{$_},$display{$_},$outpar[4],$mprefix.'4',
+                    'parmform.pres','psub').'</td>');
                }
+
                if ($uname) {
-                 $r->print('<td'.(($result==3)?' bgcolor="#AAFFAA"':'').'>'.
-             &plink($type{$_},$display{$_},$outpar[3],$mprefix.'3').'</td>');
-                 $r->print('<td'.(($result==2)?' bgcolor="#AAFFAA"':'').'>'.
-             &plink($type{$_},$display{$_},$outpar[2],$mprefix.'2').'</td>');
-                 $r->print('<td'.(($result==1)?' bgcolor="#AAFFAA"':'').'>'.
-             &plink($type{$_},$display{$_},$outpar[1],$mprefix.'1').'</td>');
+                 $r->print('<td bgcolor='.
+                    (($result==3)?'"#AAFFAA"':$defbgone).'>'.
+             &plink($type{$_},$display{$_},$outpar[3],$mprefix.'3',
+                    'parmform.pres','psub').'</td>');
+                 $r->print('<td bgcolor='.
+                    (($result==2)?'"#AAFFAA"':$defbgone).'>'.
+             &plink($type{$_},$display{$_},$outpar[2],$mprefix.'2',
+                    'parmform.pres','psub').'</td>');
+                 $r->print('<td bgcolor='.
+                   (($result==1)?'"#AAFFAA"':$defbgone).'>'.
+             &plink($type{$_},$display{$_},$outpar[1],$mprefix.'1',
+                    'parmform.pres','psub').'</td>');
                }
-               $r->print('<td>'.&valout($outpar[$result],$type{$_}).'</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>");
+        }
 # -------------------------------------------------- End entry for one resource
 	 } @ids;
          $r->print('</table></form></body></html>');