--- loncom/interface/lonparmset.pm	2007/10/17 00:27:44	1.383
+++ loncom/interface/lonparmset.pm	2007/11/17 02:50:49	1.387
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Handler to set parameters for assessments
 #
-# $Id: lonparmset.pm,v 1.383 2007/10/17 00:27:44 albertel Exp $
+# $Id: lonparmset.pm,v 1.387 2007/11/17 02:50:49 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -2503,16 +2503,28 @@ sub storedata {
             if ($tuname) {
 		$tkey=~s/\.\[useropt\:$tuname\:$tudom\]\./\./;
 	    }
-	    if ($cmd eq 'set') {
-		my $data=$env{$_};
-                my $typeof=$env{'form.typeof_'.$thiskey};
- 		if ($$olddata{$thiskey} ne $data) { 
+	    if ($cmd eq 'set' || $cmd eq 'datepointer' || $cmd eq 'dateinterval') {
+		my ($data, $typeof, $text);
+		if ($cmd eq 'set') {
+		    $data=$env{$_};
+		    $typeof=$env{'form.typeof_'.$thiskey};
+		    $text = &mt('Saved modified parameter for');
+		} elsif ($cmd eq 'datepointer') {
+		    $data=&Apache::lonhtmlcommon::get_date_from_form($env{$_});
+		    $typeof=$env{'form.typeof_'.$thiskey};
+		    $text = &mt('Saved modified date for');
+		} elsif ($cmd eq 'dateinterval') {
+		    $data=&get_date_interval_from_form($thiskey);
+		    $typeof=$env{'form.typeof_'.$thiskey};
+		    $text = &mt('Saved modified date for');
+		}
+		if (defined($data) and $$olddata{$thiskey} ne $data) { 
 		    if ($tuname) {
 			if (&Apache::lonnet::put('resourcedata',{$tkey=>$data,
 								 $tkey.'.type' => $typeof},
 						 $tudom,$tuname) eq 'ok') {
 			    &log_parmset({$tkey=>$data,$tkey.'.type' => $typeof},0,$tuname,$tudom);
-			    $r->print('<br />'.&mt('Saved modified parameter for').' '.
+			    $r->print('<br />'.$text.' '.
 				      &Apache::loncommon::plainname($tuname,$tudom));
 			} else {
 			    $r->print('<div class="LC_error">'.
@@ -2537,26 +2549,6 @@ sub storedata {
 		} else {
 		    push (@deldata,$thiskey,$thiskey.'.type');
 		}
-	    } elsif ($cmd eq 'datepointer') {
-		my $data=&Apache::lonhtmlcommon::get_date_from_form($env{$_});
-                my $typeof=$env{'form.typeof_'.$thiskey};
-		if (defined($data) and $$olddata{$thiskey} ne $data) { 
-		    if ($tuname) {
-			if (&Apache::lonnet::put('resourcedata',{$tkey=>$data,
-								 $tkey.'.type' => $typeof},
-						 $tudom,$tuname) eq 'ok') {
-			    &log_parmset({$tkey=>$data,$tkey.'.type' => $typeof},0,$tuname,$tudom);
-			    $r->print('<br />'.&mt('Saved modified date for').' '.&Apache::loncommon::plainname($tuname,$tudom));
-			} else {
-			    $r->print('<div class="LC_error">'.
-				      &mt('Error saving parameters').'</div>');
-			}
-			&Apache::lonnet::devalidateuserresdata($tuname,$tudom);
-		    } else {
-			$newdata{$thiskey}=$data;
-			$newdata{$thiskey.'.type'}=$typeof; 
-		    }
-		}
 	    }
 	}
     }
@@ -2739,6 +2731,9 @@ sub listdata {
 '<input type="hidden" name="datepointer_'.$thiskey.'" value="'.$jskey.'" />'.
 &date_sanity_info($$resourcedata{$thiskey})
 			  );
+	    } elsif ($thistype eq 'date_interval') {
+		$r->print(&date_interval_selector($thiskey,
+						  $$resourcedata{$thiskey}));
 	    } elsif ($thistype =~ m/^string/) {
 		$r->print(&string_selector($thistype,$thiskey,
 					   $$resourcedata{$thiskey}));
@@ -2753,9 +2748,47 @@ sub listdata {
     return $foundkeys;
 }
 
+
+sub date_interval_selector {
+    my ($thiskey, $showval) = @_;
+    my $result;
+    foreach my $which (['days', 86400, 31],
+		       ['hours', 3600, 23],
+		       ['minutes', 60, 59],
+		       ['seconds',  1, 59]) {
+	my ($name, $factor, $max) = @{ $which };
+	my $amount = int($showval/$factor);
+	$showval  %= $factor;
+	my %select = ((map {$_ => $_} (0..$max)),
+		      'select_form_order' => [0..$max]);
+	$result .= &Apache::loncommon::select_form($amount,$name.'_'.$thiskey,
+						   %select);
+	$result .= ' '.&mt($name);
+    }
+    $result .= '<input type="hidden" name="dateinterval_'.$thiskey.'" />';
+    return $result;
+
+}
+
+sub get_date_interval_from_form {
+    my ($key) = @_;
+    my $seconds = 0;
+    foreach my $which (['days', 86400],
+		       ['hours', 3600],
+		       ['minutes', 60],
+		       ['seconds',  1]) {
+	my ($name, $factor) = @{ $which };
+	if (defined($env{'form.'.$name.'_'.$key})) {
+	    $seconds += $env{'form.'.$name.'_'.$key} * $factor;
+	}
+    }
+    return $seconds;
+}
+
+
 sub default_selector {
     my ($thiskey, $showval) = @_;
-    return '<input type="text" name="set_'.$thiskey.'" value="'.$showval.'">' ;
+    return '<input type="text" name="set_'.$thiskey.'" value="'.$showval.'" />';
 }
 
 my %strings = 
@@ -2765,6 +2798,7 @@ my %strings =
 		 [ 'no', 'No' ]],
      'string_problemstatus'
              => [[ 'yes', 'Yes' ],
+		 [ 'answer', 'Yes, and show correct answer if they exceed the maxium number of tries.' ],
 		 [ 'no', 'No, don\'t show correct/incorrect feedback.' ],
 		 [ 'no_feedback_ever', 'No, show no feedback at all.' ]],
      );