--- loncom/homework/lonsimpleproblemedit.pm 2010/01/27 20:38:08 1.20.2.2 +++ loncom/homework/lonsimpleproblemedit.pm 2009/08/17 18:18:35 1.24 @@ -1,7 +1,7 @@ # The LearningOnline Network # Simple Problem Parameter Setting "Editor" # -# $Id: lonsimpleproblemedit.pm,v 1.20.2.2 2010/01/27 20:38:08 raeburn Exp $ +# $Id: lonsimpleproblemedit.pm,v 1.24 2009/08/17 18:18:35 www Exp $ # # Copyright Michigan State University Board of Trustees # @@ -191,8 +191,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'}))) { @@ -218,24 +216,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', @@ -249,15 +235,29 @@ sub handler { $spell_header)); if ($symb) { $r->print('<h1>'.&Apache::lonnet::gettitle($symb).'</h1>'); - $r->print('<table width="100%" bgcolor="#FFFFAA" border="2"><tr><td>'); my $displaylink = &get_parent_uri($symb); - if ($displaylink ne '') { - $r->print('<a href="'.$displaylink.'">'.&mt('Student View').'</a> - '); + if ($displaylink ne '') { + my $functions=&Apache::lonhtmlcommon::start_funclist() + .&Apache::lonhtmlcommon::add_item_funclist( + '<a href="'.$displaylink.'">' + .&mt('Student View').'</a>') + .&Apache::lonhtmlcommon::end_funclist(); + $r->print(&Apache::loncommon::head_subbox($functions)); } else { - $r->print('<span class="LC_error">'.&mt('An error occurred retrieving the link to this problem').'<br />'.&mt('You may need to [_1]re-select the course[_2] and then return to this resource to view it.','<a href="/adm/roles">','</a>').'</span><br />'); + $r->print('<p class="LC_error">' + .&mt('An error occurred retrieving the link to this problem.') + .'<br />' + .&mt('You may need to [_1]re-select the course[_2] and then return to this resource to view it.' + ,'<a href="/adm/roles">','</a>') + .'</p>' + ); } - $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').'</td></tr></table>'); + $r->print('<p class="LC_warning">' + .&mt('Note: it can take up to 10 minutes for changes to take effect for all users.') + .&Apache::loncommon::help_open_topic('Caching') + .'</p>' + ); + $r->print('<table border="2" bgcolor="#FFFFFF" width="100%"><tr><td>'. &rawrendering($symb). '</td></tr></table><br />'); @@ -269,7 +269,6 @@ sub handler { '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'; } @@ -343,7 +342,7 @@ sub handler { unless ($stringtypes{$stringtype}) { $stringtype='cs'; } $r->print( '<table bgcolor="#00ee44" cellspacing="4" cellpadding="2">'. - '<tr><td><label>'.&mt('Correct answer').': <input type="text" size="20" name="stringanswer" value="'.$stringanswer.'" /></label> '. + '<tr><td>'.&mt('Correct answer').': <input type="text" size="20" name="stringanswer" value="'.$stringanswer.'" /> '. &Apache::loncommon::select_form ($stringtype,'stringtype',%stringtypes). '</td></tr></table><br />'); @@ -351,22 +350,14 @@ sub handler { $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( - '<table bgcolor="#00ee44" cellspacing="4" cellpadding="2">'. - '<tr><td><label>'.&mt('Correct answer').': <input type="text" size="20" name="numericalanswer" value="'.$numericalanswer.'" /></label> '. - '<label>'.&mt('Unit').': <input type="text" size="5" name="numericalunit" value="'.$qparms{$prefix.'numericalunit'}.'" /></label> '. - '<label>'.&mt('Format').': <input type="text" size="5" name="numericalformat" value="'.$qparms{$prefix.'numericalformat'}.'" /></label> '. - '<label>'.&mt('Tolerance').': <input type="text" size="5" name="numericaltolerance" value="'.$numericaltolerance.'" /></label> '. - '<label>'.&mt('Significant digits').': <input type="text" size="5" name="numericalsigfigs" value="'.$numericalsigfigs.'" /></label>'. - '</td></tr></table><br />'); - $r->print(&hint()); + my $numericalanswer=$qparms{$prefix.'numericalanswer'}; + unless (defined($numericalanswer)) { $numericalanswer=''; } + + $r->print( + '<table bgcolor="#00ee44" cellspacing="4" cellpadding="2">'. + '<tr><td>'.&mt('Correct answer').': <input type="text" size="20" name="numericalanswer" value="'.$numericalanswer.'" />'. + '</td></tr></table><br />'); + $r->print(&hint()); } # Store Button $r->print(