--- loncom/interface/lonparmset.pm 2011/05/23 09:29:27 1.513 +++ loncom/interface/lonparmset.pm 2011/11/21 03:25:19 1.515 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # Handler to set parameters for assessments # -# $Id: lonparmset.pm,v 1.513 2011/05/23 09:29:27 foxr Exp $ +# $Id: lonparmset.pm,v 1.515 2011/11/21 03:25:19 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -900,11 +900,15 @@ ENDJS } sub startpage { - my ($r) = @_; + my ($r,$psymb) = @_; - my %loaditems = ('onunload' => "pclose()", - 'onload' => "showHide_courseContent(); group_or_section('cgroup')", - ); + my %loaditems = ( + 'onunload' => "pclose()", + 'onload' => "group_or_section('cgroup')", + ); + if (!$psymb) { + $loaditems{'onload'} = "showHide_courseContent(); group_or_section('cgroup')"; + } if ((($env{'form.command'} eq 'set') && ($env{'form.url'}) && (!$env{'form.dis'})) || ($env{'form.symb'})) { @@ -1395,6 +1399,7 @@ sub lookUpTableParameter { 'acc' => 'misc', 'maxcollaborators' => 'misc', 'scoreformat' => 'misc', + 'lenient' => 'grading', ); } @@ -2115,7 +2120,7 @@ sub assessparms { for (my $i=0;$i<=$#markers;$i++) { - my ($needsrelease,$needsnewer); + my ($needsrelease,$needsnewer,$name); if ($markers[$i] =~ /^[\d.]+\&0_availablestudent\&(1|2|3)$/) { my (@ok_slots,@fail_slots,@del_slots); my $courseopt=&Apache::lonnet::get_courseresdata($cnum,$cdom); @@ -2146,22 +2151,23 @@ sub assessparms { } } } - } elsif ($markers[$i] =~ /_type\&\d+$/) { + } elsif ($markers[$i] =~ /_(type|lenient)\&\d+$/) { + $name = $1; $needsrelease = - $Apache::lonnet::needsrelease{'parameter:type:'.$values[$i]}; + $Apache::lonnet::needsrelease{"parameter:$name:$values[$i]"}; if ($needsrelease) { unless ($got_chostname) { - ($chostname,$cmajor,$cminor) = &questiontype_release_vars(); + ($chostname,$cmajor,$cminor) = ¶meter_release_vars(); $got_chostname = 1; } - $needsnewer = &questiontype_releasecheck($values[$i], - $needsrelease, - $chostname, - $cmajor,$cminor); + $needsnewer = ¶meter_releasecheck($name,$values[$i], + $needsrelease, + $chostname, + $cmajor,$cminor); } } if ($needsnewer) { - $message .= &oldversion_warning($values[$i],$chostname,$cmajor, + $message .= &oldversion_warning($name,$values[$i],$chostname,$cmajor, $cminor,$needsrelease); } else { $message.=&storeparm(split(/\&/,$markers[$i]), @@ -2185,7 +2191,7 @@ sub assessparms { if ($psprt[0] eq "all" || !@psprt) {@psprt = (keys %allparts);} # ------------------------------------------------------------------ Start page - &startpage($r); + &startpage($r,$pssymb); foreach ('tolerance','date_default','date_start','date_end', 'date_interval','int','float','string') { @@ -2277,6 +2283,7 @@ COURSECONTENTSCRIPT .'' .'
'); } else { + $r->print(); # parameter screen for a single resource. my ($map,$iid,$resource)=&Apache::lonnet::decode_symb($pssymb); my $title = &Apache::lonnet::gettitle($pssymb); @@ -2803,25 +2810,32 @@ sub storedata { $tkey=~s/\.\[useropt\:$tuname\:$tudom\]\./\./; } if ($cmd eq 'set' || $cmd eq 'datepointer' || $cmd eq 'dateinterval') { - my ($data, $typeof, $text); + my ($data, $typeof, $text, $name); if ($cmd eq 'set') { $data=$env{$key}; $typeof=$env{'form.typeof_'.$thiskey}; $text = &mt('Saved modified parameter for'); if ($typeof eq 'string_questiontype') { + $name = 'type'; + } elsif ($typeof eq 'string_lenient') { + $name = 'lenient'; + } + if ($name ne '') { my ($needsrelease,$needsnewer); - $needsrelease = $Apache::lonnet::needsrelease{'parameter:type:'.$data}; + $needsrelease = $Apache::lonnet::needsrelease{"parameter:$name:$data"}; if ($needsrelease) { unless ($got_chostname) { - ($chostname,$cmajor,$cminor)=&questiontype_release_vars(); + ($chostname,$cmajor,$cminor)=¶meter_release_vars(); $got_chostname = 1; } - $needsnewer = &questiontype_releasecheck($data,$needsrelease, - $chostname,$cmajor, - $cminor); + $needsnewer = ¶meter_releasecheck($name,$data, + $needsrelease, + $chostname,$cmajor, + $cminor); } if ($needsnewer) { - $r->print(''.
- &mt('Question Type was [_1]not[_2] set to [_3].',
- '','','"'.$desc.'"').'
'.
+ &mt('[_1] was [_2]not[_3] set to [_4].',
+ $standard_name,'','','"'.$desc.'"').'
'.
&mt('LON-CAPA version ([_1]) installed on home server ([_2]) does not meet version requirements ([_3] or newer).',
$cmajor.'.'.$cminor,$chostname,
$needsrelease).