--- loncom/interface/lonparmset.pm 2004/11/27 17:23:09 1.179 +++ loncom/interface/lonparmset.pm 2005/03/17 20:01:11 1.185 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # Handler to set parameters for assessments # -# $Id: lonparmset.pm,v 1.179 2004/11/27 17:23:09 raeburn Exp $ +# $Id: lonparmset.pm,v 1.185 2005/03/17 20:01:11 albertel Exp $ # # Copyright Michigan State University Board of Trustees # @@ -96,10 +96,10 @@ Inputs: $what - a parameter spec (inclu Returns: A list, the first item is the index into the remaining list of items of parm valuse that is the active one, the list consists of parm values at the 11 possible levels -11- resource default -10- map default -9 - General Course -8 - Map or Folder level in course +11 - General Course +10 - Map or Folder level in course +9- resource default +8- map default 7 - resource level in course 6 - General for section 5 - Map or Folder level for section @@ -129,32 +129,35 @@ sub parmval { my $courselevelr=$ENV{'request.course.id'}.'.'.$symbparm; my $courselevelm=$ENV{'request.course.id'}.'.'.$mapparm; -# -------------------------------------------------------- first, check default - if (defined($def)) { $outpar[11]=$def; $result=11; } -# ----------------------------------------------------- second, check map parms - - my $thisparm=$parmhash{$symbparm}; - if (defined($thisparm)) { $outpar[10]=$thisparm; $result=10; } - -# --------------------------------------------------------- third, check course +# --------------------------------------------------------- first, check course if (defined($courseopt{$courselevel})) { - $outpar[9]=$courseopt{$courselevel}; - $result=9; + $outpar[11]=$courseopt{$courselevel}; + $result=11; } if (defined($courseopt{$courselevelm})) { - $outpar[8]=$courseopt{$courselevelm}; - $result=8; + $outpar[10]=$courseopt{$courselevelm}; + $result=10; } +# ------------------------------------------------------- second, check default + + if (defined($def)) { $outpar[9]=$def; $result=9; } + +# ------------------------------------------------------ third, check map parms + + my $thisparm=$parmhash{$symbparm}; + if (defined($thisparm)) { $outpar[8]=$thisparm; $result=8; } + if (defined($courseopt{$courselevelr})) { $outpar[7]=$courseopt{$courselevelr}; $result=7; } +# ------------------------------------------------------ fourth, back to course if (defined($csec)) { if (defined($courseopt{$seclevel})) { $outpar[6]=$courseopt{$seclevel}; @@ -171,7 +174,7 @@ sub parmval { } } -# ---------------------------------------------------------- fourth, check user +# ---------------------------------------------------------- fifth, check user if (defined($uname)) { if (defined($useropt{$courselevel})) { @@ -309,8 +312,9 @@ sub startpage { my $overallhelp= &Apache::loncommon::help_open_menu('','Setting Parameters','Course_Setting_Parameters','',10,'Instructor Interface'); my $assessparmhelp=&Apache::loncommon::help_open_topic("Cascading_Parameters","Assessment Parameters"); + my $html=&Apache::lonxml::xmlbegin(); $r->print(< +$html LON-CAPA Course Parameters - LON-CAPA Course Environment $bodytag @@ -1809,8 +1810,9 @@ sub overview { 'Set/Modify Course Assessment Parameters'); my $dom = $ENV{'course.'.$ENV{'request.course.id'}.'.domain'}; my $crs = $ENV{'course.'.$ENV{'request.course.id'}.'.num'}; + my $html=&Apache::lonxml::xmlbegin(); $r->print(< +$html LON-CAPA Course Environment