--- loncom/interface/lonhtmlcommon.pm 2005/04/07 06:56:23 1.104 +++ loncom/interface/lonhtmlcommon.pm 2005/10/13 22:37:40 1.114 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # a pile of common html routines # -# $Id: lonhtmlcommon.pm,v 1.104 2005/04/07 06:56:23 albertel Exp $ +# $Id: lonhtmlcommon.pm,v 1.114 2005/10/13 22:37:40 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -100,7 +100,7 @@ sub store_recent { my ($area,$name,$value)=@_; my $file=&recent_filename($area); my %recent=&Apache::lonnet::dump($file); - if (scalar(keys(%recent))>10) { + if (scalar(keys(%recent))>20) { # remove oldest value my $oldest=time; my $delkey=''; @@ -258,18 +258,23 @@ The method used to restrict user input w ############################################## sub date_setter { my ($formname,$dname,$currentvalue,$special,$includeempty,$state, - $no_hh_mm_ss) = @_; + $no_hh_mm_ss,$defhour,$defmin,$defsec) = @_; + my $wasdefined=1; if (! defined($state) || $state ne 'disabled') { $state = ''; } if (! defined($no_hh_mm_ss)) { $no_hh_mm_ss = 0; } - if (! defined($currentvalue) || $currentvalue eq 'now') { - unless ($includeempty) { - $currentvalue = time; - } else { + if ($currentvalue eq 'now') { + $currentvalue=time; + } + if ((!defined($currentvalue)) || ($currentvalue eq '')) { + $wasdefined=0; + if ($includeempty) { $currentvalue = 0; + } else { + $currentvalue = time; } } # other potentially useful values: wkday,yrday,is_daylight_savings @@ -279,6 +284,20 @@ sub date_setter { localtime($currentvalue); $year += 1900; } + unless ($wasdefined) { + if (($defhour) || ($defmin) || ($defsec)) { + ($sec,$min,$hour,$mday,$month,$year,undef,undef,undef) = + localtime(time); + $year += 1900; + $sec=($defsec?$defsec:0); + $min=($defmin?$defmin:0); + $hour=($defhour?$defhour:0); + } elsif (!$includeempty) { + $sec=0; + $min=0; + $hour=0; + } + } my $result = "\n\n"; $result .= < @@ -506,11 +525,13 @@ parameter setting wizard. ############################################## sub pjump_javascript_definition { my $Str = < //