--- loncom/interface/lonparmset.pm	2005/06/18 17:23:25	1.229
+++ loncom/interface/lonparmset.pm	2005/06/28 15:12:54	1.232
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Handler to set parameters for assessments
 #
-# $Id: lonparmset.pm,v 1.229 2005/06/18 17:23:25 www Exp $
+# $Id: lonparmset.pm,v 1.232 2005/06/28 15:12:54 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -525,7 +525,6 @@ sub plink {
         }
     }
     my ($parmname)=((split(/\&/,$marker))[1]=~/\_([^\_]+)$/);
-    &Apache::lonnet::logthis($marker.'-'.$parmname);
     my ($hour,$min,$sec,$val)=&preset_defaults($parmname);
     unless (defined($winvalue)) { $winvalue=$val; }
     return 
@@ -630,7 +629,10 @@ sub print_row {
     } else {    
         $parm=~s|\[.*\]\s||g;
     }
-
+    my $automatic=&rulescache(($which=~/\_([^\_]+)$/)[0].'_triggers');
+    if ($automatic) {
+	$parm.='<font color="red"><br />'.&mt('Automatically sets').' '.join(', ',split(/\:/,$automatic)).'</font>';
+    }
     $r->print('<td bgcolor='.$defbgone.'>'.$parm.'</td>');
    
     my $thismarker=$which;
@@ -1001,7 +1003,7 @@ sub displaymenu {
 
 sub mapmenu {
     my ($r,$allmaps,$pschp,$maptitles)=@_;
-    $r->print(&mt('Select Enclosing Map or Folder').' ');
+    $r->print('<b>'.&mt('Select Enclosing Map or Folder').'</b> ');
     $r->print('<select name="pschp">');
     $r->print('<option value="all">'.&mt('All Maps or Folders').'</option>');
     foreach (sort {$$allmaps{$a} cmp $$allmaps{$b}} keys %{$allmaps}) {
@@ -1014,8 +1016,8 @@ sub mapmenu {
 
 sub levelmenu {
     my ($r,$alllevs,$parmlev)=@_;
-    $r->print(&mt('Select Parameter Level').
-	      &Apache::loncommon::help_open_topic('Course_Parameter_Levels').' ');
+    $r->print('<b>'.&mt('Select Parameter Level').
+	      &Apache::loncommon::help_open_topic('Course_Parameter_Levels').'</b> ');
     $r->print('<select name="parmlev">');
     foreach (reverse sort keys %{$alllevs}) {
 	$r->print('<option value="'.$$alllevs{$_}.'"');
@@ -2223,6 +2225,15 @@ sub listdata {
 		$oldpart=$part;
 	    }
 #
+# Preset defaults?
+#
+            my ($hour,$min,$sec,$val)=('','','','');
+	    unless ($$resourcedata{$thiskey}) {
+		my ($parmname)=($thiskey=~/\.(\w+)$/);
+		($hour,$min,$sec,$val)=&preset_defaults($parmname);
+	    }
+
+#
 # Ready to print
 #
 	    $r->print(&tablestart().'<tr><td><b>'.$name.
@@ -2233,28 +2244,40 @@ sub listdata {
 		my $jskey='key_'.$pointer;
 		$pointer++;
 		$r->print(
-			  &Apache::lonhtmlcommon::date_setter('overviewform',
+			  &Apache::lonhtmlcommon::date_setter('parmform',
 							      $jskey,
 						      $$resourcedata{$thiskey},
-							      '',1).
+							      '',1,'','',$hour,$min,$sec).
 '<input type="hidden" name="datepointer_'.$thiskey.'" value="'.$jskey.'" />'
 			  );
 	    } elsif ($thistype eq 'string_yesno') {
+		my $showval;
+		if (defined($$resourcedata{$thiskey})) {
+		    $showval=$$resourcedata{$thiskey};
+		} else {
+		    $showval=$val;
+		}
 		$r->print('<label><input type="radio" name="set_'.$thiskey.
 			  '" value="yes"');
-		if ($$resourcedata{$thiskey} eq 'yes') {
+		if ($showval eq 'yes') {
 		    $r->print(' checked="checked"');
 		}
                 $r->print(' />'.&mt('Yes').'</label> ');
 		$r->print('<label><input type="radio" name="set_'.$thiskey.
 			  '" value="no"');
-		if ($$resourcedata{$thiskey} eq 'no') {
+		if ($showval eq 'no') {
 		    $r->print(' checked="checked"');
 		}
                 $r->print(' />'.&mt('No').'</label>');
 	    } else {
+		my $showval;
+		if (defined($$resourcedata{$thiskey})) {
+		    $showval=$$resourcedata{$thiskey};
+		} else {
+		    $showval=$val;
+		}
 		$r->print('<input type="text" name="set_'.$thiskey.'" value="'.
-			  $$resourcedata{$thiskey}.'">');
+			  $showval.'">');
 	    }
 	    $r->print('<input type="hidden" name="typeof_'.$thiskey.'" value="'.
 		      $thistype.'">');
@@ -2423,7 +2446,7 @@ $html
 </head>
 $bodytag
 $breadcrumbs
-<form method="post" action="/adm/parmset?action=setoverview" name="overviewform">
+<form method="post" action="/adm/parmset?action=setoverview" name="parmform">
 ENDOVER
 # Store modified
 
@@ -2715,6 +2738,8 @@ ENDDEFHEAD
 	    push @datedisplay,&mt('Automatically set earlier than ').$tempkey;
 	} 
     }
+$r->print(&mt('Manual setting rules apply to all interfaces.').'<br />'.
+	  &mt('Automatic setting rules apply to table mode interfaces only.'));
     $r->print("\n<table border='1'><tr><th>".&mt('Rule for parameter').'</th><th>'.
 	      &mt('Action').'</th><th>'.&mt('Value').'</th></tr>');
     foreach my $tempkey (&keysindisplayorder(\%allparms,\%keyorder)) {