--- loncom/interface/lonparmset.pm 2005/06/17 20:56:06 1.227 +++ loncom/interface/lonparmset.pm 2005/11/22 19:02:40 1.268.2.1 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # Handler to set parameters for assessments # -# $Id: lonparmset.pm,v 1.227 2005/06/17 20:56:06 www Exp $ +# $Id: lonparmset.pm,v 1.268.2.1 2005/11/22 19:02:40 albertel 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 ('','','','',''); + } +} + ################################################## ################################################## # @@ -302,6 +316,8 @@ sub storeparm_by_symb { # store parameter &storeparm_by_symb_inner ($symb,$spnam,$snum,$nval,$ntype,$uname,$udom,$csec); +# don't do anything if parameter was reset + unless ($nval) { return; } my ($prefix,$parm)=($spnam=~/^(.*[\_\.])([^\_\.]+)$/); # remember that this was set $recstack{$parm}=1; @@ -314,11 +330,28 @@ sub storeparm_by_symb { # set triggered parameter on same level my $newspnam=$prefix.$triggered; my $newvalue=''; - if ($action eq 'when_setting_') { + 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); } - &Apache::lonnet::logthis('About to set '.$newspnam.' using action '.$whichaction.' with '.$parm.' ('.$whichparm.')'); } } return ''; @@ -493,12 +526,13 @@ sub plink { $winvalue=$env{'form.recent_'.(split(/\_/,$type))[0]}; } } - - - return + my ($parmname)=((split(/\&/,$marker))[1]=~/\_([^\_]+)$/); + my ($hour,$min,$sec,$val)=&preset_defaults($parmname); + unless (defined($winvalue)) { $winvalue=$val; } + return '
'. ''. - &valout($value,$type).''; + .$marker."','".$return."','".$call."','".$hour."','".$min."','".$sec."'".');">'. + &valout($value,$type).' |
print("\n | '); + $r->print('>'.$$allparms{$tempkey}.''); $cnt++; if ($cnt==3) { $r->print(" | |
-Select All -Select Common Only +Select All +Select Common Only |
-Add Problem Dates
-Add Content Dates -Add Discussion Settings -Add Visibilities -Add Part Parameters +Add Problem Dates +Add Content Dates +Add Discussion Settings +Add Visibilities +Add Part Parameters | -Unselect All +Unselect All | '); $r->print('