--- loncom/interface/lonparmset.pm	2000/11/28 15:39:52	1.18
+++ loncom/interface/lonparmset.pm	2001/03/23 23:04:32	1.26
@@ -9,7 +9,9 @@
 #
 # 10/11,10/12,10/16 Gerd Kortemeyer)
 #
-# 11/20,11/21,11/22,11/23,11/24,11/25,11/27,11/28 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,02/08,03/20,03/23 Gerd Kortemeyer
 
 package Apache::lonparmset;
 
@@ -34,6 +36,7 @@ my %keyp;
 my %defp;
 
 my %allkeys;
+my %allmaps;
 
 my $uname;
 my $udom;
@@ -136,9 +139,18 @@ sub valout {
 
 sub plink {
     my ($type,$dis,$value,$marker,$return,$call)=@_;
-    return '<a href="javascript:pjump('."'".$type."','".$dis."','".$value."','"
+    my $winvalue=$value;
+    unless ($winvalue) {
+	if ($type=~/^date/) {
+            $winvalue=$ENV{'form.recent_'.$type};
+        } else {
+            $winvalue=$ENV{'form.recent_'.(split(/\_/,$type))[0]};
+        }
+    }
+    return 
+      '<a href="javascript:pjump('."'".$type."','".$dis."','".$winvalue."','"
       .$marker."','".$return."','".$call."'".');">'.
-      &valout($value,$type).'</a>';
+      &valout($value,$type).'</a><a name="'.$marker.'"></a>';
 }
 
 # ================================================================ Main Handler
@@ -172,6 +184,9 @@ sub handler {
       $udom=$ENV{'form.udom'};
       unless ($udom) { $udom=$r->dir_config('lonDefDomain'); }
 
+      my $pscat=$ENV{'form.pscat'};
+      my $pschp=$ENV{'form.pschp'};
+
       my $id=$ENV{'form.id'};
       if (($id) && ($udom)) {
           $uname=(&Apache::lonnet::idget($udom,$id))[1];
@@ -224,8 +239,9 @@ sub handler {
            $ENV{'request.course.fn'}.'_parms.db',&GDBM_READER,0640))) {
 
 # --------------------------------------------------------- Get all assessments
-	%allkeys=();
-        %defp=();
+	undef %allkeys;
+        undef %allmaps;
+        undef %defp;
         map {
 	    if ($_=~/^src\_(\d+)\.(\d+)$/) {
 	       my $mapid=$1;
@@ -250,7 +266,7 @@ sub handler {
                           $allkeys{$allkey}=$display;
                           if ($allkey eq $fcat) {
                              $defp{$id}=
-                              &Apache::lonnet::metadata($srcf,$key.'.default');
+                              &Apache::lonnet::metadata($srcf,$key);
 			  }
                           if ($keyp{$id}) {
 			      $keyp{$id}.=','.$key;
@@ -262,6 +278,7 @@ sub handler {
                       &Apache::lonnet::metadata($srcf,'keys'));
                    $mapp{$id}=
 		       &Apache::lonnet::declutter($bighash{'map_id_'.$mapid});
+                   $allmaps{$mapid}=$mapp{$id};
                    $symbp{$id}=$mapp{$id}.
 			'___'.$resid.'___'.
 			    &Apache::lonnet::declutter($srcf);
@@ -310,6 +327,18 @@ sub handler {
        my $reply='';
            if ($snum>3) {
 # ---------------------------------------------------------------- Store Course
+#
+# Expire sheets
+	    &Apache::lonnet::expirespread('','','studentcalc');
+            if (($snum==7) || ($snum==4)) {
+	     &Apache::lonnet::expirespread('','','assesscalc',$symbp{$sresid});
+            } elsif (($snum==8) || ($snum==5)) {
+	     &Apache::lonnet::expirespread('','','assesscalc',$mapp{$sresid});
+            } else {
+	     &Apache::lonnet::expirespread('','','assesscalc');
+            }
+
+# Store parameter
             $reply=&Apache::lonnet::critical('put:'.
              $ENV{'course.'.$ENV{'request.course.id'}.'.domain'}.':'.
              $ENV{'course.'.$ENV{'request.course.id'}.'.num'}.':resourcedata:'.
@@ -317,6 +346,20 @@ sub handler {
              $ENV{'course.'.$ENV{'request.course.id'}.'.home'});
            } else {
 # ------------------------------------------------------------------ Store User
+#
+# Expire sheets
+	    &Apache::lonnet::expirespread($uname,$udom,'studentcalc');
+            if ($snum==1) {
+		&Apache::lonnet::expirespread
+                    ($uname,$udom,'assesscalc',$symbp{$sresid});
+            } elsif ($snum==2) {
+		&Apache::lonnet::expirespread
+                    ($uname,$udom,'assesscalc',$mapp{$sresid});
+            } else {
+		&Apache::lonnet::expirespread($uname,$udom,'assesscalc');
+            }
+                
+# Store parameter
             $reply=
             &Apache::lonnet::critical('put:'.$udom.':'.$uname.':resourcedata:'.
              $storecontent,$uhome);
@@ -390,6 +433,17 @@ sub handler {
     function psub() {
         pclose();
         if (document.parmform.pres_marker.value!='') {
+            document.parmform.action+='#'+document.parmform.pres_marker.value;
+            var typedef=new Array();
+            typedef=document.parmform.pres_type.value.split('_');
+            if (typedef[0]=='date') {
+                eval('document.parmform.recent_'+
+                     document.parmform.pres_type.value+
+		     '.value=document.parmform.pres_value.value;');
+            } else {
+                eval('document.parmform.recent_'+typedef[0]+
+		     '.value=document.parmform.pres_value.value;');
+            }
             document.parmform.submit();
         } else {
             document.parmform.pres_value.value='';
@@ -414,22 +468,46 @@ or ID
 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
+    map {
+      $r->print('<input type="hidden" value="'.
+          $ENV{'form.recent_'.$_}.'" name="recent_'.$_.'">');
+    } ('tolerance','date_default','date_start','date_end','date_interval',
+       'int','float','string');
 
-        $r->print('<h2>'.$message.'</h2><p>Sort list by ');
-	$r->print('<select name="fcat" onChange="this.form.submit();">');
+        $r->print('<h2>'.$message.'</h2><table><tr><td>Sort list by</td><td>');
+	$r->print('<select name="fcat">');
         $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>');
+       $r->print(
+    '</select></tr><tr><td>Select Enclosing Map</td><td><select name=pschp>');
+        $r->print('<option value=all>All Maps</option>');
+        map {
+	    $r->print('<option value="'.$_.'"');
+            if ($pschp eq $_) { $r->print(' selected'); }
+            $r->print('>'.$allmaps{$_}.'</option>');
+        } keys %allmaps;
+        $r->print(
+ '</select></td></tr><tr><td>Select Parameter</td><td><select name=pscat>');
+        $r->print('<option value=all>All Parameters</option>');
+        map {
+	    $r->print('<option value="'.$_.'"');
+            if ($pscat eq $_) { $r->print(' selected'); }
+            $r->print('>'.$allkeys{$_}.'</option>');
+        } keys %allkeys;
+        $r->print(
+      '</select></td></tr></table><br><input type="submit" value="Display">');
+      if (($pscat) || ($pschp)) {
 # ----------------------------------------------------------------- Start Table
+	my $catmarker='parameter_'.$pscat;
+        $catmarker=~s/\./\_/g;
         my $coursespan=$csec?8:5;
 	 $r->print(<<ENDTABLEHEAD);
 <p><table border=2>
@@ -460,10 +538,23 @@ ENDTABLEHEADFOUR
   $r->print('<th>general</th><th>for Enclosing Map</th><th>for Resource</th>');
     }
 	$r->print('</tr><tr>');
+         my $defbgone='';
+         my $defbgtwo='';
  	 map {
+           my $rid=$_;
+           if (($pschp eq 'all') || ($allmaps{$pschp} eq $mapp{$rid})) {
 # ------------------------------------------------------ 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=   ();
             my %part=   ();
@@ -478,13 +569,17 @@ ENDTABLEHEADFOUR
                 $display{$_}=&Apache::lonnet::metadata($uri,$_.'.display');
                 unless ($display{$_}) { $display{$_}=''; }
                 $display{$_}.=' ('.$name{$_}.')';
-                $default{$_}=&Apache::lonnet::metadata($uri,$_.'.default');
+                $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>'.
+	    my $isdef=1;
+	    unless ($totalparms) { $totalparms=1; $isdef=0; }
+	    if ($pscat ne 'all') { $totalparms=1; }
+            $r->print('<td bgcolor='.$defbgone.
+                ' rowspan='.$totalparms.'><tt><font size=-1>'.
                 join(' / ',split(/\//,$uri)).
                 '</font></tt><p><b>'.
                       $bighash{'title_'.$rid});
@@ -492,63 +587,86 @@ ENDTABLEHEADFOUR
 		$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 {
-
+	     if (($_ eq $catmarker) || ($pscat eq 'all')) {
 	       my $result=&parmval($part{$_}.'.'.$name{$_},$rid,$default{$_});
 
-               $r->print("<td>$part{$_}</td><td>$display{$_}</td>");
+               $r->print("<td bgcolor=".$defbgtwo.
+                  ">$part{$_}</td><td bgcolor=".$defbgone.
+                  ">$display{$_}</td>");
                my $thismarker=$_;
                $thismarker=~s/^parameter\_//; 
                my $mprefix=$rid.'&'.$thismarker.'&';
 
-               $r->print('<td'.(($result==11)?' bgcolor="#AAFFAA"':'').'>'.
+               $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"':'').'>'.
+               $r->print('<td bgcolor='.
+                (($result==9)?'"#AAFFAA"':$defbgone).'>'.
              &plink($type{$_},$display{$_},$outpar[9],$mprefix.'9',
                     'parmform.pres','psub').'</td>');
-               $r->print('<td'.(($result==8)?' bgcolor="#AAFFAA"':'').'>'.
+               $r->print('<td bgcolor='.
+                (($result==8)?'"#AAFFAA"':$defbgone).'>'.
              &plink($type{$_},$display{$_},$outpar[8],$mprefix.'8',
                     'parmform.pres','psub').'</td>');
-               $r->print('<td'.(($result==7)?' bgcolor="#AAFFAA"':'').'>'.
+               $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"':'').'>'.
+                 $r->print('<td bgcolor='.
+                   (($result==6)?'"#AAFFAA"':$defbgtwo).'>'.
              &plink($type{$_},$display{$_},$outpar[6],$mprefix.'6',
                     'parmform.pres','psub').'</td>');
-                 $r->print('<td'.(($result==5)?' bgcolor="#AAFFAA"':'').'>'.
+                 $r->print('<td bgcolor='.
+                   (($result==5)?'"#AAFFAA"':$defbgtwo).'>'.
              &plink($type{$_},$display{$_},$outpar[5],$mprefix.'5',
                     'parmform.pres','psub').'</td>');
-                 $r->print('<td'.(($result==4)?' bgcolor="#AAFFAA"':'').'>'.
+                 $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"':'').'>'.
+                 $r->print('<td bgcolor='.
+                    (($result==3)?'"#AAFFAA"':$defbgone).'>'.
              &plink($type{$_},$display{$_},$outpar[3],$mprefix.'3',
                     'parmform.pres','psub').'</td>');
-                 $r->print('<td'.(($result==2)?' bgcolor="#AAFFAA"':'').'>'.
+                 $r->print('<td bgcolor='.
+                    (($result==2)?'"#AAFFAA"':$defbgone).'>'.
              &plink($type{$_},$display{$_},$outpar[2],$mprefix.'2',
                     'parmform.pres','psub').'</td>');
-                 $r->print('<td'.(($result==1)?' bgcolor="#AAFFAA"':'').'>'.
+                 $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>');
+         $r->print('</table>');
+      }
+	$r->print('</form></body></html>');
          untie(%bighash);
 	 untie(%parmhash);
       }