--- loncom/homework/lonsimpleproblemedit.pm 2004/12/14 18:24:17 1.13 +++ loncom/homework/lonsimpleproblemedit.pm 2010/01/29 15:44:41 1.20.2.4 @@ -1,7 +1,7 @@ # The LearningOnline Network # Simple Problem Parameter Setting "Editor" # -# $Id: lonsimpleproblemedit.pm,v 1.13 2004/12/14 18:24:17 albertel Exp $ +# $Id: lonsimpleproblemedit.pm,v 1.20.2.4 2010/01/29 15:44:41 raeburn 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; @@ -56,17 +59,20 @@ sub rawrendering { 'simple_edit_button' => 'off', 'devalidatecourseresdata'=>'on'); return &Apache::loncommon::get_student_view($symb,time,time, - $ENV{'request.course.id'}, + $env{'request.course.id'}, 'web',\%data); } 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,25 +82,47 @@ 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=''; + my (%values,%defaultvalues,%customvalues); + %defaultvalues = &Apache::lonlocal::texthash( + 'unused' => 'Not shown, not used' + ); if ($qtype eq 'radio') { - %values=('true' => 'True', 'false' => 'False'); + %customvalues = &Apache::lonlocal::texthash( + 'true' => 'True', + 'false' => 'False' + ); } elsif ($qtype eq 'option') { - %values=&evaloptionhash($qparms{$prefix.'options'}); + %customvalues=&evaloptionhash($qparms{$prefix.'options'}); } - $values{'unused'}='Not shown, not used'; + %values = (%defaultvalues,%customvalues); my $value=$qparms{$prefix.'value'.$number}; unless (defined($value)) { $value='unused'; } unless ($values{$value}) { $value='unused'; } @@ -106,22 +134,29 @@ 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', '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 +166,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 { @@ -150,7 +188,7 @@ sub handler { } # -------------------------------------------------------------------- Allowed? - unless (&Apache::lonnet::allowed('mdc',$ENV{'request.course.id'})) { + unless (&Apache::lonnet::allowed('mdc',$env{'request.course.id'})) { return HTTP_NOT_ACCEPTABLE; } # ----------------------------------------------------------------- Send header @@ -162,75 +200,99 @@ sub handler { my $symb=&Apache::lonnet::symbread(); # ------------------------------------------------ Prefix for everything stored - $prefix=$ENV{'request.course.id'}.'.'.$symb.'.0.'; + $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'}))) { + if (($symb) && (defined($env{'form.questiontype'}))) { my %storecontent=(); undef %storecontent; - if ($ENV{'form.questiontype'} eq 'option') { - my %curoptions=&evaloptionhash($ENV{'form.options'}); - if ($ENV{'form.delopt'}) { - delete $curoptions{$ENV{'form.delopt'}}; + if ($env{'form.questiontype'} eq 'option') { + my %curoptions=&evaloptionhash($env{'form.options'}); + if ($env{'form.delopt'}) { + delete $curoptions{$env{'form.delopt'}}; } - if ($ENV{'form.newopt'}) { - $ENV{'form.newopt'}=~s/\'/\\\'/g; - $curoptions{$ENV{'form.newopt'}}=$ENV{'form.newopt'}; + if ($env{'form.newopt'}) { + $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) { + $env{'form.hiddenparts'}='!'.$env{'form.questiontype'}; + foreach (keys %env) { if ($_=~/^form\.(\w+)$/) { my $parm=$1; - $storecontent{$prefix.$parm}=$ENV{'form.'.$parm}; + $storecontent{$prefix.$parm}=$env{'form.'.$parm}; $storecontent{$prefix.$parm}=~s/^\s+//s; $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'}); - + $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', - $ENV{'course.'.$ENV{'request.course.id'}.'.domain'}, - $ENV{'course.'.$ENV{'request.course.id'}.'.num'}, - $ENV{'request.course.id'}.'.'.$symb); + $env{'course.'.$env{'request.course.id'}.'.domain'}, + $env{'course.'.$env{'request.course.id'}.'.num'}, + $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.'). + $r->print('
'); + my $displaylink = &get_parent_uri($symb); + if ($displaylink ne '') { + $r->print(''.&mt('Student View').' - '); + } 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('
'); -# Question Type - my %questiontypes=('radio' => - '1 out of N multiple choice (radio button)', - 'option' => 'Option response', - 'string' => 'Short string response', - 'essay' => 'Essay, open end'); + $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'); $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)). '

 

'); +# Script + if ($qtype eq 'numerical') { + $r->print(&script()); + } # Question Text $r->print(&questiontext()); # Radio, Option === @@ -240,8 +302,9 @@ ENDDOCUMENT 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'; } @@ -249,8 +312,10 @@ ENDDOCUMENT ''. '
'.&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') { @@ -292,20 +357,40 @@ ENDDOCUMENT 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( ''); } else { $r->print(&mt('Could not identify problem.')); } - $r->print(''); + $r->print(&Apache::loncommon::end_page()); return OK; }