--- loncom/homework/lonsimpleproblemedit.pm 2005/04/07 06:56:22 1.15 +++ loncom/homework/lonsimpleproblemedit.pm 2009/10/16 17:23:51 1.28 @@ -1,7 +1,7 @@ # The LearningOnline Network # Simple Problem Parameter Setting "Editor" # -# $Id: lonsimpleproblemedit.pm,v 1.15 2005/04/07 06:56:22 albertel Exp $ +# $Id: lonsimpleproblemedit.pm,v 1.28 2009/10/16 17:23:51 bisitz Exp $ # # Copyright Michigan State University Board of Trustees # @@ -34,6 +34,9 @@ use Apache::loncommon; use Apache::lonnet; use Apache::lonlocal; use Apache::lonnavmaps; +use lib '/home/httpd/lib/perl/'; +use LONCAPA; + my %qparms; my $prefix; @@ -63,10 +66,13 @@ sub rawrendering { sub questiontext { my $text=$qparms{$prefix.'questiontext'}; my $qt=&mt('Question Text'); + my $spell_link= + &Apache::lonhtmlcommon::spelllink('simpleedit','questiontext'); return (< +
$qt
+
$spell_link

@@ -76,16 +82,32 @@ ENDQUESTION sub hint { my $text=$qparms{$prefix.'hinttext'}; my $ht=&mt('Hint Text'); + my $spell_link= + &Apache::lonhtmlcommon::spelllink('simpleedit','hinttext'); return (< $ht
+
$spell_link
ENDHINT } +sub script { + my $text=$qparms{$prefix.'numericalscript'}; + my $ht=&mt('Scripting (optional)'); + return (< +$ht
+ + + +
+ENDSCRIPT +} + sub foil { my $number=shift; my %values=''; @@ -116,12 +138,15 @@ sub foil { 'pos' => 'Position', 'text' => 'Text'); + my $spell_link= + &Apache::lonhtmlcommon::spelllink('simpleedit',"text$number"); return (< +
$lt{'foil'}
$lt{'value'}: $selectvalue$lt{'pos'}: $selectposition
$lt{'text'}:
- + +
$spell_link

@@ -131,13 +156,16 @@ ENDFOIL sub get_parent_uri { my ($cur_symb)=@_; my $navmap = Apache::lonnavmaps::navmap->new(); - my $it = $navmap->getIterator(undef, undef, undef, 1); - while ( my $res=$it->next()) { - if (ref($res) && $res->symb() eq $cur_symb) { last; } + if (defined($navmap)) { + my $it = $navmap->getIterator(undef, undef, undef, 1); + while ( my $res=$it->next()) { + if (ref($res) && $res->symb() eq $cur_symb) { last; } + } + my ($src,$symb,$anchor)=&Apache::lonnavmaps::getLinkForResource($it->getStack()); + if (defined($anchor)) { $anchor='#'.$anchor; } + return $src.'?symb='.&escape($symb).$anchor; } - my ($src,$symb,$anchor)=&Apache::lonnavmaps::getLinkForResource($it->getStack()); - if (defined($anchor)) { $anchor='#'.$anchor; } - return $src.'?symb='.&Apache::lonnet::escape($symb).$anchor; + return; } sub handler { @@ -163,6 +191,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'}))) { @@ -188,11 +219,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 @@ -202,27 +247,45 @@ sub handler { $env{'request.course.id'}.'.'.$symb); # ------------------------------------------------------------ Print the screen - $r->print(< - -The LearningOnline Network with CAPA -ENDDOCUMENT - $r->print(&Apache::loncommon::bodytag('Simple Problem Editor')); + my $spell_header=&Apache::lonhtmlcommon::spellheader(); + $r->print(&Apache::loncommon::start_page('Simple Problem Editor', + $spell_header)); if ($symb) { $r->print('

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

'); - $r->print('
'. - ''.&mt('Student View').' - '.&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 '') { + 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)); + } 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('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('
'); + $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'); + 'essay' => 'Essay, open end', + 'numerical' => 'Numerical response'); $qtype=$qparms{$prefix.'questiontype'}; unless (defined($qtype)) { $qtype='radio'; } unless ($questiontypes{$qtype}) { $qtype='radio'; } @@ -231,6 +294,10 @@ ENDDOCUMENT ($qtype,'questiontype',%questiontypes). '

 

'); +# Script + if ($qtype eq 'numerical') { + $r->print(&script()); + } # Question Text $r->print(&questiontext()); # Radio, Option === @@ -251,7 +318,7 @@ ENDDOCUMENT ':   '. &Apache::loncommon::select_form ($randomize,'randomize',%randomizes). - ''); + ''); # Option Response: Options if ($qtype eq 'option') { my $options=$qparms{$prefix.'options'}; @@ -292,20 +359,38 @@ ENDDOCUMENT unless ($stringtypes{$stringtype}) { $stringtype='cs'; } $r->print( ''. - '
'.&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( '
'); } else { $r->print(&mt('Could not identify problem.')); } - $r->print(''); + $r->print(&Apache::loncommon::end_page()); return OK; }