--- loncom/interface/lonparmset.pm 2005/06/18 17:23:25 1.229 +++ 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.229 2005/06/18 17:23:25 www Exp $ +# $Id: lonparmset.pm,v 1.230 2005/06/18 18:51:50 www 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 @@ -2223,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().''.$name. @@ -2236,25 +2244,37 @@ sub listdata { &Apache::lonhtmlcommon::date_setter('overviewform', $jskey, $$resourcedata{$thiskey}, - '',1). + '',1,'','',$hour,$min,$sec). '' ); } elsif ($thistype eq 'string_yesno') { + my $showval; + if (defined($$resourcedata{$thiskey})) { + $showval=$$resourcedata{$thiskey}; + } else { + $showval=$val; + } $r->print(' '); $r->print(''); } else { + my $showval; + if (defined($$resourcedata{$thiskey})) { + $showval=$$resourcedata{$thiskey}; + } else { + $showval=$val; + } $r->print(''); + $showval.'">'); } $r->print(''); @@ -2278,7 +2298,7 @@ $html $bodytag $breadcrumbs -
+ ENDOVER my @ids=(); my %typep=();