--- loncom/homework/lonsimpleproblemedit.pm 2010/01/29 15:44:41 1.20.2.4 +++ loncom/homework/lonsimpleproblemedit.pm 2009/04/06 12:59:07 1.21 @@ -1,7 +1,7 @@ # The LearningOnline Network # Simple Problem Parameter Setting "Editor" # -# $Id: lonsimpleproblemedit.pm,v 1.20.2.4 2010/01/29 15:44:41 raeburn Exp $ +# $Id: lonsimpleproblemedit.pm,v 1.21 2009/04/06 12:59:07 bisitz Exp $ # # Copyright Michigan State University Board of Trustees # @@ -95,34 +95,15 @@ sub hint { ENDHINT } -sub script { - my $text=$qparms{$prefix.'numericalscript'}; - my $ht=&mt('Scripting (optional)'); - return (< -$ht
- - - -
-ENDSCRIPT -} - sub foil { my $number=shift; - my (%values,%defaultvalues,%customvalues); - %defaultvalues = &Apache::lonlocal::texthash( - 'unused' => 'Not shown, not used' - ); + my %values=''; if ($qtype eq 'radio') { - %customvalues = &Apache::lonlocal::texthash( - 'true' => 'True', - 'false' => 'False' - ); + %values=('true' => 'True', 'false' => 'False'); } elsif ($qtype eq 'option') { - %customvalues=&evaloptionhash($qparms{$prefix.'options'}); + %values=&evaloptionhash($qparms{$prefix.'options'}); } - %values = (%defaultvalues,%customvalues); + $values{'unused'}='Not shown, not used'; my $value=$qparms{$prefix.'value'.$number}; unless (defined($value)) { $value='unused'; } unless ($values{$value}) { $value='unused'; } @@ -134,14 +115,10 @@ sub foil { unless ($positions{$position}) { $position='random'; } - my $selectvalue=&Apache::loncommon::select_form( - $value, - 'value'.$number, - &Apache::lonlocal::texthash(%values)); - my $selectposition=&Apache::loncommon::select_form( - $position, - 'position'.$number, - &Apache::lonlocal::texthash(%positions)); + my $selectvalue=&Apache::loncommon::select_form + ($value,'value'.$number,%values); + my $selectposition=&Apache::loncommon::select_form + ($position,'position'.$number,%positions); my $text=$qparms{$prefix.'text'.$number}; my %lt=&Apache::lonlocal::texthash('foil' => 'Foil', 'value' => 'Value', @@ -201,8 +178,6 @@ sub handler { # ------------------------------------------------ Prefix for everything stored $prefix=$env{'request.course.id'}.'.'.$symb.'.0.'; -#----------------------------------- Prefix for storing weight of Problem Parts - my $weightprefix=$env{'request.course.id'}.'.'.$symb.'.'; # ---------------------------------------------------------- Anything to store? if (($symb) && (defined($env{'form.questiontype'}))) { @@ -228,24 +203,12 @@ sub handler { $storecontent{$prefix.$parm}=~s/\s+$//s; } } -# ---------------------------------------------------- Set weights of hidden parts to zero -# ------------------------------------------------------ and used part to 1 - $storecontent{$weightprefix.'essay.weight'}=0; - $storecontent{$weightprefix.'numerical.weight'}=0; - $storecontent{$weightprefix.'option.weight'}=0; - $storecontent{$weightprefix.'radio.weight'}=0; - $storecontent{$weightprefix.'string.weight'}=0; - $storecontent{$weightprefix.$env{'form.questiontype'}.'.weight'}=1; - my $reply=&Apache::lonnet::cput ('resourcedata',\%storecontent, $env{'course.'.$env{'request.course.id'}.'.domain'}, $env{'course.'.$env{'request.course.id'}.'.num'}); + } - - &Apache::lonnet::devalidatecourseresdata( - $env{'course.'.$env{'request.course.id'}.'.num'}, - $env{'course.'.$env{'request.course.id'}.'.domain'}); # ------------------------------------------------------------------- Read Data %qparms=&Apache::lonnet::dump('resourcedata', @@ -259,40 +222,46 @@ sub handler { $spell_header)); if ($symb) { $r->print('

'.&Apache::lonnet::gettitle($symb).'

'); - $r->print('
'); + $r->print('

' + .&mt('Note: it can take up to 10 minutes for changes to take effect for all users.') + .&Apache::loncommon::help_open_topic('Caching') + .'

' + ); my $displaylink = &get_parent_uri($symb); - if ($displaylink ne '') { - $r->print(''.&mt('Student View').' - '); + if ($displaylink ne '') { + $r->print(&Apache::lontemplate::start_functionslist() + .&Apache::lontemplate::item_functionslist( + ''.&mt('Student View').'') + .&Apache::lontemplate::end_functionslist() + ); } else { - $r->print(''.&mt('An error occurred retrieving the link to this problem').'
'.&mt('You may need to [_1]re-select the course[_2] and then return to this resource to view it.','','').'
'); + $r->print('

' + .&mt('An error occurred retrieving the link to this problem.') + .'
' + .&mt('You may need to [_1]re-select the course[_2] and then return to this resource to view it.' + ,'','') + .'

' + ); } - $r->print(&mt('Note: it can take up to 10 minutes for changes to take effect for all users.'). - &Apache::loncommon::help_open_topic('Caching').'
'); + $r->print('
'. &rawrendering($symb). '

'); - $r->print('
'); -# Question Type - my %questiontypes=( - 'radio' => '1 out of N multiple choice (radio button)', - 'option' => 'Option Response', - 'string' => 'Short string response', - 'essay' => 'Essay, open end', - 'numerical' => 'Numerical Response'); + $r->print(''); +# Question Type + my %questiontypes=('radio' => + '1 out of N multiple choice (radio button)', + 'option' => 'Option response', + 'string' => 'Short string response', + 'essay' => 'Essay, open end'); $qtype=$qparms{$prefix.'questiontype'}; unless (defined($qtype)) { $qtype='radio'; } unless ($questiontypes{$qtype}) { $qtype='radio'; } - $r->print(''.&mt('Question Type').': ' - .&Apache::loncommon::select_form( - $qtype, - 'questiontype', - &Apache::lonlocal::texthash(%questiontypes)). + $r->print(''.&mt('Question Type'). + ': '.&Apache::loncommon::select_form + ($qtype,'questiontype',%questiontypes). '

 

'); -# Script - if ($qtype eq 'numerical') { - $r->print(&script()); - } # Question Text $r->print(&questiontext()); # Radio, Option === @@ -302,9 +271,8 @@ sub handler { unless (defined($maxfoils)) { $maxfoils=10; } unless ($maxfoils=~/^\d+$/) { $maxfoils=10; } if ($maxfoils<=0) { $maxfoils=10; } - my %randomizes=( - 'yes' => 'Display foils in random order', - 'no' => 'Display foils in order given'); + my %randomizes=('yes' => 'Display foils in random order', + 'no' => 'Display foils in order given'); my $randomize=$qparms{$prefix.'randomize'}; unless (defined($randomize)) { $randomize='yes'; } unless ($randomizes{$randomize}) { $randomize='yes'; } @@ -312,10 +280,8 @@ sub handler { ''. '
'.&mt('Max number of foils displayed'). ':   '. - &Apache::loncommon::select_form( - $randomize, - 'randomize', - &Apache::lonlocal::texthash(%randomizes)). + &Apache::loncommon::select_form + ($randomize,'randomize',%randomizes). '
'); # Option Response: Options if ($qtype eq 'option') { @@ -357,33 +323,13 @@ sub handler { unless ($stringtypes{$stringtype}) { $stringtype='cs'; } $r->print( ''. - '
  '. - &Apache::loncommon::select_form( - $stringtype, - 'stringtype', - &Apache::lonlocal::texthash(%stringtypes)). + '
'.&mt('Correct answer').':   '. + &Apache::loncommon::select_form + ($stringtype,'stringtype',%stringtypes). '

'); # Hint $r->print(&hint()); } - if ($qtype eq 'numerical') { - my $numericalanswer=$qparms{$prefix.'numericalanswer'}; - unless (defined($numericalanswer)) { $numericalanswer=''; } - my $numericaltolerance=$qparms{$prefix.'numericaltolerance'}; - unless (defined($numericaltolerance)) { $numericaltolerance='5%'; } - my $numericalsigfigs=$qparms{$prefix.'numericalsigfigs'}; - unless (defined($numericalsigfigs)) { $numericalsigfigs='1,15'; } - - $r->print( - ''. - '
  '. - '  '. - '  '. - '  '. - ''. - '

'); - $r->print(&hint()); - } # Store Button $r->print( '');