--- loncom/homework/lonsimpleproblemedit.pm 2009/05/11 16:51:22 1.22 +++ loncom/homework/lonsimpleproblemedit.pm 2009/12/02 18:33:20 1.30 @@ -1,7 +1,7 @@ # The LearningOnline Network # Simple Problem Parameter Setting "Editor" # -# $Id: lonsimpleproblemedit.pm,v 1.22 2009/05/11 16:51:22 bisitz Exp $ +# $Id: lonsimpleproblemedit.pm,v 1.30 2009/12/02 18:33:20 bisitz Exp $ # # Copyright Michigan State University Board of Trustees # @@ -71,7 +71,7 @@ sub questiontext { return (< $qt
- +
$spell_link @@ -85,9 +85,9 @@ sub hint { my $spell_link= &Apache::lonhtmlcommon::spelllink('simpleedit','hinttext'); return (< +
$ht
- +
$spell_link
@@ -95,6 +95,19 @@ 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=''; @@ -115,10 +128,14 @@ sub foil { unless ($positions{$position}) { $position='random'; } - my $selectvalue=&Apache::loncommon::select_form - ($value,'value'.$number,%values); - my $selectposition=&Apache::loncommon::select_form - ($position,'position'.$number,%positions); + 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 $text=$qparms{$prefix.'text'.$number}; my %lt=&Apache::lonlocal::texthash('foil' => 'Foil', 'value' => 'Value', @@ -128,11 +145,11 @@ sub foil { my $spell_link= &Apache::lonhtmlcommon::spelllink('simpleedit',"text$number"); return (< +
$lt{'foil'}
$lt{'value'}: $selectvalue$lt{'pos'}: $selectposition
$lt{'text'}:
- +
$spell_link
@@ -178,6 +195,9 @@ 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'}))) { @@ -203,11 +223,25 @@ 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 @@ -221,21 +255,19 @@ sub handler { $r->print(&Apache::loncommon::start_page('Simple Problem Editor', $spell_header)); if ($symb) { - $r->print('

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

'); - $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 $title='

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

'; my $displaylink = &get_parent_uri($symb); if ($displaylink ne '') { - $r->print(&Apache::lontemplate::start_functionslist() - .&Apache::lontemplate::item_functionslist( - ''.&mt('Student View').'') - .&Apache::lontemplate::end_functionslist() - ); + my $functions=&Apache::lonhtmlcommon::start_funclist() + .&Apache::lonhtmlcommon::add_item_funclist( + '' + .&mt('Student View').'') + .&Apache::lonhtmlcommon::end_funclist(); + $r->print(&Apache::loncommon::head_subbox($functions) + .$title); } else { - $r->print('

' + $r->print($title + .'

' .&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.' @@ -243,25 +275,46 @@ sub handler { .'

' ); } + $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( + '
' + .&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'); + 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'); $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',%questiontypes). - '

 

'); + $r->print( + '
' + .''.&mt('Question Type').'' + .&Apache::loncommon::select_form( + $qtype, + 'questiontype', + &Apache::lonlocal::texthash(%questiontypes)) + .'
' + ); + $r->print( + '

' + .'' + .'

' + ); +# Script + if ($qtype eq 'numerical') { + $r->print(&script()); + } # Question Text $r->print(&questiontext()); # Radio, Option === @@ -271,25 +324,28 @@ 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'; } $r->print( - ''. + '
'. '
'.&mt('Max number of foils displayed'). ':   '. - &Apache::loncommon::select_form - ($randomize,'randomize',%randomizes). - '
'); + &Apache::loncommon::select_form( + $randomize, + 'randomize', + &Apache::lonlocal::texthash(%randomizes)). + '
'); # Option Response: Options if ($qtype eq 'option') { my $options=$qparms{$prefix.'options'}; unless (defined($options)) { $options="('true','false')"; } my %optionshash=&evaloptionhash($options); $r->print( - ''. + '
'. '
'.&mt('Add new option').': '. ''. @@ -322,14 +378,34 @@ sub handler { unless (defined($stringtype)) { $stringtype='cs'; } unless ($stringtypes{$stringtype}) { $stringtype='cs'; } $r->print( - ''. - '
'.&mt('Correct answer').':   '. - &Apache::loncommon::select_form - ($stringtype,'stringtype',%stringtypes). + ''. + '
  '. + &Apache::loncommon::select_form( + $stringtype, + 'stringtype', + &Apache::lonlocal::texthash(%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( '');