--- loncom/homework/lonsimpleproblemedit.pm 2004/11/30 22:57:16 1.11 +++ loncom/homework/lonsimpleproblemedit.pm 2009/09/24 00:50:03 1.26 @@ -1,7 +1,7 @@ # The LearningOnline Network # Simple Problem Parameter Setting "Editor" # -# $Id: lonsimpleproblemedit.pm,v 1.11 2004/11/30 22:57:16 albertel Exp $ +# $Id: lonsimpleproblemedit.pm,v 1.26 2009/09/24 00:50:03 truskell Exp $ # # Copyright Michigan State University Board of Trustees # @@ -33,9 +33,14 @@ use Apache::Constants qw(:common :http); use Apache::loncommon; use Apache::lonnet; use Apache::lonlocal; +use Apache::lonnavmaps; +use lib '/home/httpd/lib/perl/'; +use LONCAPA; + my %qparms; my $prefix; +my $weightprefix; my $qtype; sub evaloptionhash { @@ -52,19 +57,23 @@ sub evaloptionhash { sub rawrendering { my ($symb)=@_; my %data=('show_errors'=>'on', + '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

@@ -74,16 +83,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=''; @@ -114,18 +139,36 @@ 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
ENDFOIL } +sub get_parent_uri { + my ($cur_symb)=@_; + my $navmap = Apache::lonnavmaps::navmap->new(); + 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; + } + return; +} + sub handler { my $r = shift; @@ -136,7 +179,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 @@ -145,75 +188,117 @@ sub handler { # ----------------------------------------------------- Figure out where we are my $uri=$r->uri; $uri=~s/\/smpedit$//; - my $symb=&Apache::lonnet::symbread($uri); + 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 + $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).'

'); + 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'; } $r->print(''.&mt('Question Type'). ': '.&Apache::loncommon::select_form ($qtype,'questiontype',%questiontypes). - '

 

'); +# Script + if ($qtype eq 'numerical') { + $r->print(&script()); + } # Question Text $r->print(&questiontext()); # Radio, Option === @@ -275,20 +360,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; }