--- loncom/homework/lonsimpleproblemedit.pm 2003/07/16 15:19:56 1.4 +++ loncom/homework/lonsimpleproblemedit.pm 2005/04/07 06:56:22 1.15 @@ -1,7 +1,7 @@ # The LearningOnline Network # Simple Problem Parameter Setting "Editor" # -# $Id: lonsimpleproblemedit.pm,v 1.4 2003/07/16 15:19:56 www Exp $ +# $Id: lonsimpleproblemedit.pm,v 1.15 2005/04/07 06:56:22 albertel Exp $ # # Copyright Michigan State University Board of Trustees # @@ -32,6 +32,8 @@ use strict; use Apache::Constants qw(:common :http); use Apache::loncommon; use Apache::lonnet; +use Apache::lonlocal; +use Apache::lonnavmaps; my %qparms; my $prefix; @@ -49,30 +51,22 @@ sub evaloptionhash { } sub rawrendering { - my ($request,$uri)=@_; - my $problem=&Apache::lonnet::getfile - (&Apache::lonnet::filelocation('',$uri)); - &Apache::lonnet::devalidatecourseresdata( - $ENV{'course.'.$ENV{'request.course.id'}.'.num'}, - $ENV{'course.'.$ENV{'request.course.id'}.'.domain'}); - my $uname=$ENV{'user.name'}; - my $udom=$ENV{'user.domain'}; - $ENV{'user.name'}=time; - $ENV{'user.domain'}=time; - my $result = &Apache::lonxml::xmlparse($request,'web', $problem); - $ENV{'user.name'}=$uname; - $ENV{'user.domain'}=$udom; - $result=~s/^.*\]*\>//si; - $result=~s/\<\/body[^\>]*\>.*$//si; - return $result; + 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'}, + 'web',\%data); } sub questiontext { my $text=$qparms{$prefix.'questiontext'}; + my $qt=&mt('Question Text'); return (< -Question Text
- +$qt
+
@@ -81,10 +75,11 @@ ENDQUESTION sub hint { my $text=$qparms{$prefix.'hinttext'}; + my $ht=&mt('Hint Text'); return (< -Hint Text
- +$ht
+
@@ -116,77 +111,95 @@ sub foil { my $selectposition=&Apache::loncommon::select_form ($position,'position'.$number,%positions); my $text=$qparms{$prefix.'text'.$number}; + my %lt=&Apache::lonlocal::texthash('foil' => 'Foil', + 'value' => 'Value', + 'pos' => 'Position', + 'text' => 'Text'); + return (< -Foil -Value: $selectvaluePosition: $selectposition -Text:
- +$lt{'foil'} +$lt{'value'}: $selectvalue$lt{'pos'}: $selectposition +$lt{'text'}:
+
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; } + } + my ($src,$symb,$anchor)=&Apache::lonnavmaps::getLinkForResource($it->getStack()); + if (defined($anchor)) { $anchor='#'.$anchor; } + return $src.'?symb='.&Apache::lonnet::escape($symb).$anchor; +} + sub handler { my $r = shift; if ($r->header_only) { - $r->content_type('text/html'); + &Apache::loncommon::content_type($r,'text/html'); $r->send_http_header; return OK; } # -------------------------------------------------------------------- Allowed? - unless (&Apache::lonnet::allowed('srm',$ENV{'request.course.id'})) { + unless (&Apache::lonnet::allowed('mdc',$env{'request.course.id'})) { return HTTP_NOT_ACCEPTABLE; } # ----------------------------------------------------------------- Send header - $r->content_type('text/html'); + &Apache::loncommon::content_type($r,'text/html'); $r->send_http_header; # ----------------------------------------------------- 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.'; # ---------------------------------------------------------- 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)."')"; } - 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; } } 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'}); } # ------------------------------------------------------------------- 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(<print(&Apache::loncommon::bodytag('Simple Problem Editor')); 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').'
'); $r->print('
'. - &rawrendering($r,$uri). + &rawrendering($symb). '

'); $r->print('
'); # Question Type @@ -210,9 +226,11 @@ ENDDOCUMENT $qtype=$qparms{$prefix.'questiontype'}; unless (defined($qtype)) { $qtype='radio'; } unless ($questiontypes{$qtype}) { $qtype='radio'; } - $r->print('Question Type: '.&Apache::loncommon::select_form + $r->print(''.&mt('Question Type'). + ': '.&Apache::loncommon::select_form ($qtype,'questiontype',%questiontypes). -'

 

'); + '

 

'); # Question Text $r->print(&questiontext()); # Radio, Option === @@ -229,7 +247,8 @@ ENDDOCUMENT unless ($randomizes{$randomize}) { $randomize='yes'; } $r->print( ''. - '
Max number of foils displayed:   '. + '
'.&mt('Max number of foils displayed'). +':   '. &Apache::loncommon::select_form ($randomize,'randomize',%randomizes). '
'); @@ -241,8 +260,9 @@ ENDDOCUMENT $r->print( ''. '
Add new option: '. - 'Delete an option: '. + $options.'" />'.&mt('Add new option').': '. + ''. + &mt('Delete an option').': '. &Apache::loncommon::select_form('','delopt',('' => '',%optionshash)). '
'); } @@ -272,7 +292,7 @@ ENDDOCUMENT unless ($stringtypes{$stringtype}) { $stringtype='cs'; } $r->print( ''. - '
Correct answer:   '. + '
'.&mt('Correct answer').':   '. &Apache::loncommon::select_form ($stringtype,'stringtype',%stringtypes). '

'); @@ -281,9 +301,9 @@ ENDDOCUMENT } # Store Button $r->print( - ''); + ''); } else { - $r->print('Could not identify problem.'); + $r->print(&mt('Could not identify problem.')); } $r->print(''); return OK;