--- loncom/interface/lonparmset.pm	2005/06/17 20:01:50	1.226
+++ loncom/interface/lonparmset.pm	2005/06/18 18:51:50	1.230
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Handler to set parameters for assessments
 #
-# $Id: lonparmset.pm,v 1.226 2005/06/17 20:01:50 www Exp $
+# $Id: lonparmset.pm,v 1.230 2005/06/18 18:51:50 www Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -260,6 +260,20 @@ sub rulescache {
     return $rules{$id};
 }
 
+sub preset_defaults {
+    my $type=shift;
+    if (&rulescache($type.'_action') eq 'default') {
+# yes, there is something
+	return (&rulescache($type.'_hours'),
+		&rulescache($type.'_min'),
+		&rulescache($type.'_sec'),
+		&rulescache($type.'_value'));
+    } else {
+# nothing there or something else
+	return ('','','','','');
+    }
+}
+
 ##################################################
 ##################################################
 #
@@ -313,8 +327,29 @@ sub storeparm_by_symb {
 	   my ($whichaction,$whichparm)=($action=~/^(.*\_)([^\_]+)$/);
 # set triggered parameter on same level
 	   my $newspnam=$prefix.$triggered;
-
-	   &Apache::lonnet::logthis('About to set '.$newspnam.' using action '.$whichaction.' with '.$parm.' ('.$whichparm.')');
+	   my $newvalue='';
+	   my $active=1;
+	   if ($action=~/^when\_setting/) {
+# are there restrictions?
+	       if (&rulescache($triggered.'_triggervalue')=~/\w/) {
+		   $active=0;
+		   foreach my $possiblevalue (split(/\s*\,\s*/,&rulescache($triggered.'_triggervalue'))) {
+		       if (lc($possiblevalue) eq lc($nval)) { $active=1; }
+		   }
+	       }
+	       $newvalue=&rulescache($triggered.'_value');
+	   } else {
+	       my $totalsecs=((&rulescache($triggered.'_days')*24+&rulescache($triggered.'_hours'))*60+&rulescache($triggered.'_min'))*60+&rulescache($triggered.'_sec');
+	       if ($action=~/^later\_than/) {
+		   $newvalue=$nval+$totalsecs;
+	       } else {
+		   $newvalue=$nval-$totalsecs;
+	       }
+	   }
+	   if ($active) {
+	       &storeparm_by_symb($symb,$newspnam,$snum,$newvalue,&rulescache($triggered.'_type'),
+				   $uname,$udom,$csec,$recflag);
+	   }
        }
     }
     return '';
@@ -489,11 +524,12 @@ sub plink {
             $winvalue=$env{'form.recent_'.(split(/\_/,$type))[0]};
         }
     }
-
-
+    my ($parmname)=((split(/\&/,$marker))[1]=~/\_([^\_]+)$/);
+    my ($hour,$min,$sec,$val)=&preset_defaults($parmname);
+    unless (defined($winvalue)) { $winvalue=$val; }
     return 
 	'<a href="javascript:pjump('."'".$type."','".$dis."','".$winvalue."','"
-	    .$marker."','".$return."','".$call."'".');">'.
+	    .$marker."','".$return."','".$call."','".$hour."','".$min."','".$sec."'".');">'.
 		&valout($value,$type).'</a><a name="'.$marker.'"></a>';
 }
 
@@ -2186,6 +2222,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.
@@ -2199,25 +2244,37 @@ sub listdata {
 			  &Apache::lonhtmlcommon::date_setter('overviewform',
 							      $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.'">');
@@ -2241,7 +2298,7 @@ $html
 </head>
 $bodytag
 $breadcrumbs
-<form method="post" action="/adm/parmset?action=newoverview" name="parmform">
+<form method="post" action="/adm/parmset?action=newoverview" name="overviewform">
 ENDOVER
     my @ids=();
     my %typep=();
@@ -2632,11 +2689,13 @@ ENDDEFHEAD
 		    }
 		    $newrules{$tempkey.'_type'}=$defkeytype{$tempkey};
 		    if (&isdateparm($defkeytype{$tempkey})) {
+			$newrules{$tempkey.'_days'}=$env{'form.'.$tempkey.'_days'};
 			$newrules{$tempkey.'_hours'}=$env{'form.'.$tempkey.'_hours'};
 			$newrules{$tempkey.'_min'}=$env{'form.'.$tempkey.'_min'};
 			$newrules{$tempkey.'_sec'}=$env{'form.'.$tempkey.'_sec'};
 		    } else {
 			$newrules{$tempkey.'_value'}=$env{'form.'.$tempkey.'_value'};
+			$newrules{$tempkey.'_triggervalue'}=$env{'form.'.$tempkey.'_triggervalue'};
 		    }
 		} else {
 		    push(@delrules,$tempkey.'_action');
@@ -2655,7 +2714,8 @@ ENDDEFHEAD
 	&Apache::lonnet::del('parmdefactions',\@delrules,$dom,$crs);
 	&resetrulescache();
     }
-    my %lt=&Apache::lonlocal::texthash('hours' => 'Hours',
+    my %lt=&Apache::lonlocal::texthash('days' => 'Days',
+				       'hours' => 'Hours',
 				       'min' => 'Minutes',
 				       'sec' => 'Seconds',
 				       'yes' => 'Yes',
@@ -2698,15 +2758,19 @@ ENDDEFHEAD
 	    }
 	}
 	$r->print('</select>');
-
-
+	unless (&isdateparm($defkeytype{$tempkey})) {
+	    $r->print("\n<br />".&mt('Triggering value(s) of other parameter (optional, comma-separated):').
+		      '<input type="text" size="20" name="'.$tempkey.'_triggervalue" value="'.&rulescache($tempkey.'_triggervalue').'" />');
+	}
 	$r->print("\n</td><td>\n");
 
         if (&isdateparm($defkeytype{$tempkey})) {
+	    my $days=&rulescache($tempkey.'_days');
 	    my $hours=&rulescache($tempkey.'_hours');
 	    my $min=&rulescache($tempkey.'_min');
 	    my $sec=&rulescache($tempkey.'_sec');
 	    $r->print(<<ENDINPUTDATE);
+<input name="$tempkey\_days" type="text" size="4" value="$days" />$lt{'days'}<br />
 <input name="$tempkey\_hours" type="text" size="4" value="$hours" />$lt{'hours'}<br />
 <input name="$tempkey\_min" type="text" size="4" value="$min" />$lt{'min'}<br />
 <input name="$tempkey\_sec" type="text" size="4" value="$sec" />$lt{'sec'}