--- loncom/homework/lonsimpleproblemedit.pm 2003/07/07 07:32:16 1.1 +++ loncom/homework/lonsimpleproblemedit.pm 2003/07/09 06:23:20 1.2 @@ -1,7 +1,7 @@ # The LearningOnline Network # Simple Problem Parameter Setting "Editor" # -# $Id: lonsimpleproblemedit.pm,v 1.1 2003/07/07 07:32:16 www Exp $ +# $Id: lonsimpleproblemedit.pm,v 1.2 2003/07/09 06:23:20 www Exp $ # # Copyright Michigan State University Board of Trustees # @@ -33,8 +33,42 @@ use Apache::Constants qw(:common :http); use Apache::loncommon; use Apache::lonnet; +my %qparms; +my $prefix; +my $qtype; + +sub evaloptionhash { + my $options=shift; + $options=~s/^\(\'//; + $options=~s/\'\)$//; + my %returnhash=(); + foreach (split(/\'\,\'/,$options)) { + $returnhash{$_}=$_; + } + return %returnhash; +} + +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; +} + sub questiontext { - my $text=shift; + my $text=$qparms{$prefix.'questiontext'}; return (< Question Text
@@ -46,7 +80,7 @@ ENDQUESTION } sub hint { - my $text=shift; + my $text=$qparms{$prefix.'hinttext'}; return (< Hint Text
@@ -58,10 +92,18 @@ ENDHINT } sub foil { - my ($number,$value,$position,$text,%values)=@_; + my $number=shift; + my %values=''; + if ($qtype eq 'radio') { + %values=('true' => 'True', 'false' => 'False'); + } elsif ($qtype eq 'option') { + %values=&evaloptionhash($qparms{$prefix.'options'}); + } $values{'unused'}='Not shown, not used'; + my $value=$qparms{$prefix.'value'.$number}; unless (defined($value)) { $value='unused'; } unless ($values{$value}) { $value='unused'; } + my $position=$qparms{$prefix.'position'.$number}; my %positions=('random' => 'Random position', 'top' => 'Show always at top position', 'bottom' => 'Show always at bottom position'); @@ -73,6 +115,7 @@ sub foil { ($value,'value'.$number,%values); my $selectposition=&Apache::loncommon::select_form ($position,'position'.$number,%positions); + my $text=$qparms{$prefix.'text'.$number}; return (< Foil @@ -106,19 +149,30 @@ sub handler { $uri=~s/\/smpedit$//; my $symb=&Apache::lonnet::symbread($uri); +# ------------------------------------------------ Prefix for everything stored + $prefix=$ENV{'request.course.id'}.'.'.$symb.'.0.'; # ---------------------------------------------------------- Anything to store? - if (($symb) && ($ENV{'form.storeproblem'})) { + 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.newopt'}) { + $ENV{'form.newopt'}=~s/\'/\\\'/g; + $curoptions{$ENV{'form.newopt'}}=$ENV{'form.newopt'}; + } + $ENV{'form.options'}="('".join("','",keys %curoptions)."')"; + } foreach (keys %ENV) { if ($_=~/^form\.(\w+)$/) { - my $spnam=$1; - my $symbparm=$symb.'.'.$spnam; - - my $courselevelr=$ENV{'request.course.id'}.'.'.$symbparm; - - $storecontent{$courselevelr}=$ENV{'form.'.$spnam};; + my $parm=$1; + $storecontent{$prefix.$parm}=$ENV{'form.'.$parm}; + $storecontent{$prefix.$parm}=~s/^\s+//s; + $storecontent{$prefix.$parm}=~s/\s+$//s; } } my $reply=&Apache::lonnet::cput @@ -127,6 +181,13 @@ sub handler { $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); + # ------------------------------------------------------------ Print the screen $r->print(< @@ -136,15 +197,70 @@ ENDDOCUMENT $r->print(&Apache::loncommon::bodytag('Simple Problem Editor')); if ($symb) { $r->print('

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

'); -# -# - $r->print(&questiontext('What color?'). - &foil(3,'green','bottom','Tomato', - ('green'=>'green','red'=>'red')). - &hint('This is the hint.')); -# -# + $r->print('
'. + &rawrendering($r,$uri). + '

'); + $r->print('
'); +# Question Type + my %questiontypes=('radio' => + '1 out of N multiple choice (radio button)', + 'option' => 'Option Response'); + $qtype=$qparms{$prefix.'questiontype'}; + unless (defined($qtype)) { $qtype='radio'; } + unless ($questiontypes{$qtype}) { $qtype='radio'; } + $r->print('Question Type: '.&Apache::loncommon::select_form + ($qtype,'questiontype',%questiontypes). + '

 

'); +# Question Text + $r->print(&questiontext()); +# Radio, Option === + if (($qtype eq 'radio') || ($qtype eq 'option')) { +# Response + my $maxfoils=$qparms{$prefix.'maxfoils'}; + 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 $randomize=$qparms{$prefix.'randomize'}; + unless (defined($randomize)) { $randomize='yes'; } + unless ($randomizes{$randomize}) { $randomize='yes'; } + $r->print( + ''. + '
Max number of foils displayed:   '. + &Apache::loncommon::select_form + ($randomize,'randomize',%randomizes). + '
'); +# Option Response: Options + if ($qtype eq 'option') { + my $options=$qparms{$prefix.'options'}; + unless (defined($options)) { $options="('true','false')"; } + my %optionshash=&evaloptionhash($options); + $r->print( + ''. + '
Add new option: '. + 'Delete an option: '. + &Apache::loncommon::select_form('','delopt',('' => '',%optionshash)). + '
'); + } +# Foils + for (my $i=1;$i<=10;$i++) { + $r->print(&foil($i)); + } +# End Options + if ($qtype eq 'option') { + $r->print('
'); + } +# End Response + $r->print('

'); + } +# Hint + $r->print(&hint()); +# Store Button + $r->print( + '
'); } else { $r->print('Could not identify problem.'); }