--- loncom/homework/lonsimpleproblemedit.pm 2010/01/29 15:44:41 1.20.2.4 +++ loncom/homework/lonsimpleproblemedit.pm 2014/12/15 00:50:20 1.37 @@ -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.37 2014/12/15 00:50:20 raeburn 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
@@ -99,9 +99,9 @@ sub script { my $text=$qparms{$prefix.'numericalscript'}; my $ht=&mt('Scripting (optional)'); return (< +
$ht
- +

@@ -137,11 +137,11 @@ sub foil { my $selectvalue=&Apache::loncommon::select_form( $value, 'value'.$number, - &Apache::lonlocal::texthash(%values)); + \%values); my $selectposition=&Apache::loncommon::select_form( $position, 'position'.$number, - &Apache::lonlocal::texthash(%positions)); + {&Apache::lonlocal::texthash(%positions)}); my $text=$qparms{$prefix.'text'.$number}; my %lt=&Apache::lonlocal::texthash('foil' => 'Foil', 'value' => 'Value', @@ -151,11 +151,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
@@ -201,10 +201,11 @@ sub handler { # ------------------------------------------------ Prefix for everything stored $prefix=$env{'request.course.id'}.'.'.$symb.'.0.'; -#----------------------------------- Prefix for storing weight of Problem Parts +#------------------------------------------------- Prefix for storing weight of Problem Parts my $weightprefix=$env{'request.course.id'}.'.'.$symb.'.'; + # ---------------------------------------------------------- Anything to store? - + my $storeresult; if (($symb) && (defined($env{'form.questiontype'}))) { my %storecontent=(); undef %storecontent; @@ -217,11 +218,11 @@ sub handler { $env{'form.newopt'}=~s/\'/\\\'/g; $curoptions{$env{'form.newopt'}}=$env{'form.newopt'}; } - $env{'form.options'}="('".join("','",keys %curoptions)."')"; + $env{'form.options'}="('".join("','",keys(%curoptions))."')"; } $env{'form.hiddenparts'}='!'.$env{'form.questiontype'}; - foreach (keys %env) { - if ($_=~/^form\.(\w+)$/) { + foreach my $envkey (keys(%env)) { + if ($envkey=~/^form\.(\w+)$/) { my $parm=$1; $storecontent{$prefix.$parm}=$env{'form.'.$parm}; $storecontent{$prefix.$parm}=~s/^\s+//s; @@ -230,22 +231,34 @@ sub handler { } # ---------------------------------------------------- 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; + $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'}); + if ($reply eq 'ok') { + if ($env{'form.forceview'}) { + my $dest = &get_parent_uri($symb); + if ($dest) { + $r->internal_redirect($dest); + return OK; + } + } + } else { + $storeresult = $reply; + } } - - &Apache::lonnet::devalidatecourseresdata( - $env{'course.'.$env{'request.course.id'}.'.num'}, - $env{'course.'.$env{'request.course.id'}.'.domain'}); # ------------------------------------------------------------------- Read Data %qparms=&Apache::lonnet::dump('resourcedata', @@ -253,26 +266,57 @@ sub handler { $env{'course.'.$env{'request.course.id'}.'.num'}, $env{'request.course.id'}.'.'.$symb); + my $js = <<"ENDJS"; + + + +ENDJS + # ------------------------------------------------------------ Print the screen my $spell_header=&Apache::lonhtmlcommon::spellheader(); $r->print(&Apache::loncommon::start_page('Simple Problem Editor', - $spell_header)); + $spell_header.$js)); if ($symb) { - $r->print('

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

'); - $r->print('
'); - my $displaylink = &get_parent_uri($symb); - if ($displaylink ne '') { - $r->print(''.&mt('Student View').' - '); + my $title='

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

'; + if (&get_parent_uri($symb)) { + $r->print($title); + if ($storeresult) { + $r->print('

'.&mt('An error: [_1] occurred saving your changes',$storeresult).'

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

' + ); } - $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 + $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', @@ -282,13 +326,23 @@ sub handler { $qtype=$qparms{$prefix.'questiontype'}; unless (defined($qtype)) { $qtype='radio'; } unless ($questiontypes{$qtype}) { $qtype='radio'; } - $r->print(''.&mt('Question Type').': ' + $r->print( + '
' + .''.&mt('Question Type').'' .&Apache::loncommon::select_form( $qtype, 'questiontype', - &Apache::lonlocal::texthash(%questiontypes)). - '

 

'); + {&Apache::lonlocal::texthash(%questiontypes)}) + .'
' + ); + $r->print( + '

' + .'' + .'' + .(' ' x3) + .'' + .'

' + ); # Script if ($qtype eq 'numerical') { $r->print(&script()); @@ -309,26 +363,26 @@ sub handler { unless (defined($randomize)) { $randomize='yes'; } unless ($randomizes{$randomize}) { $randomize='yes'; } $r->print( - ''. + '
'. '
'.&mt('Max number of foils displayed'). ':   '. &Apache::loncommon::select_form( $randomize, 'randomize', - &Apache::lonlocal::texthash(%randomizes)). - '
'); + {&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').': '. ''. &mt('Delete an option').': '. - &Apache::loncommon::select_form('','delopt',('' => '',%optionshash)). + &Apache::loncommon::select_form('','delopt',{'' => '',%optionshash}). '
'); } # Foils @@ -356,43 +410,46 @@ sub handler { unless (defined($stringtype)) { $stringtype='cs'; } unless ($stringtypes{$stringtype}) { $stringtype='cs'; } $r->print( - ''. - '
  '. + ''. + '
  '. &Apache::loncommon::select_form( $stringtype, 'stringtype', - &Apache::lonlocal::texthash(%stringtypes)). + {&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'; } + 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( + '
'. '
  '. '  '. '  '. '  '. ''. - '

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

'); + $r->print(&hint()); } # Store Button $r->print( - ''); + ''. + (' ' x3). + ''. + ''); } else { $r->print(&mt('Could not identify problem.')); } $r->print(&Apache::loncommon::end_page()); return OK; -} +} 1; __END__