--- loncom/homework/lonsimpleproblemedit.pm 2009/09/24 00:50:03 1.26 +++ loncom/homework/lonsimpleproblemedit.pm 2012/11/09 03:28:01 1.34 @@ -1,7 +1,7 @@ # The LearningOnline Network # Simple Problem Parameter Setting "Editor" # -# $Id: lonsimpleproblemedit.pm,v 1.26 2009/09/24 00:50:03 truskell Exp $ +# $Id: lonsimpleproblemedit.pm,v 1.34 2012/11/09 03:28:01 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -40,7 +40,6 @@ use LONCAPA; my %qparms; my $prefix; -my $weightprefix; my $qtype; sub evaloptionhash { @@ -72,7 +71,7 @@ sub questiontext { return (< $qt
- +
$spell_link @@ -86,9 +85,9 @@ sub hint { my $spell_link= &Apache::lonhtmlcommon::spelllink('simpleedit','hinttext'); return (< +
$ht
- +
$spell_link
@@ -100,9 +99,9 @@ sub script { my $text=$qparms{$prefix.'numericalscript'}; my $ht=&mt('Scripting (optional)'); return (< +
$ht
- +

@@ -111,13 +110,19 @@ 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'; } @@ -129,10 +134,14 @@ 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, + \%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', @@ -142,11 +151,11 @@ sub foil { my $spell_link= &Apache::lonhtmlcommon::spelllink('simpleedit',"text$number"); return (< +
$lt{'foil'}
$lt{'value'}: $selectvalue$lt{'pos'}: $selectposition
$lt{'text'}:
- +
$spell_link
@@ -193,10 +202,10 @@ sub handler { # ------------------------------------------------ Prefix for everything stored $prefix=$env{'request.course.id'}.'.'.$symb.'.0.'; #------------------------------------------------- Prefix for storing weight of Problem Parts - $weightprefix=$env{'request.course.id'}.'.'.$symb.'.'; + my $weightprefix=$env{'request.course.id'}.'.'.$symb.'.'; # ---------------------------------------------------------- Anything to store? - + my $storeresult; if (($symb) && (defined($env{'form.questiontype'}))) { my %storecontent=(); undef %storecontent; @@ -238,7 +247,16 @@ sub handler { &Apache::lonnet::devalidatecourseresdata( $env{'course.'.$env{'request.course.id'}.'.num'}, $env{'course.'.$env{'request.course.id'}.'.domain'}); - + if ($reply eq 'ok') { + if ($env{'form.forceview'}) { + my $dest = &get_parent_uri($symb); + if ($dest) { + $r->internal_redirect($dest); + } + } + } else { + $storeresult = $reply; + } } # ------------------------------------------------------------------- Read Data @@ -247,22 +265,37 @@ sub handler { $env{'course.'.$env{'request.course.id'}.'.num'}, $env{'request.course.id'}.'.'.$symb); + my $js = <<"ENDJS"; + + + +ENDJS + # ------------------------------------------------------------ Print the screen my $spell_header=&Apache::lonhtmlcommon::spellheader(); $r->print(&Apache::loncommon::start_page('Simple Problem Editor', - $spell_header)); + $spell_header.$js)); 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)); + my $title='

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

'; + if (&get_parent_uri($symb)) { + $r->print($title); + if ($storeresult) { + $r->print('

'.&mt('An error: [_1] occurred saving your changes',$storeresult).'

'); + } } else { - $r->print('

' + $r->print($title + .'

' .&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.' @@ -276,25 +309,39 @@ sub handler { .'

' ); - $r->print('
'. - &rawrendering($symb). - '

'); + $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', - 'numerical' => 'Numerical response'); + 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)}) + .'
' + ); + $r->print( + '

' + .'' + .'' + .(' ' x3) + .'' + .'

' + ); # Script if ($qtype eq 'numerical') { $r->print(&script()); @@ -308,30 +355,33 @@ sub handler { 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'; } $r->print( - ''. + '
'. '
'.&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') { my $options=$qparms{$prefix.'options'}; unless (defined($options)) { $options="('true','false')"; } my %optionshash=&evaloptionhash($options); $r->print( - ''. + '
'. '
'.&mt('Add new option').': '. ''. &mt('Delete an option').': '. - &Apache::loncommon::select_form('','delopt',('' => '',%optionshash)). + &Apache::loncommon::select_form('','delopt',{'' => '',%optionshash}). '
'); } # Foils @@ -359,10 +409,12 @@ sub handler { unless (defined($stringtype)) { $stringtype='cs'; } unless ($stringtypes{$stringtype}) { $stringtype='cs'; } $r->print( - ''. + '
'. '
  '. - &Apache::loncommon::select_form - ($stringtype,'stringtype',%stringtypes). + &Apache::loncommon::select_form( + $stringtype, + 'stringtype', + {&Apache::lonlocal::texthash(%stringtypes)}). '

'); # Hint $r->print(&hint()); @@ -376,7 +428,7 @@ sub handler { unless (defined($numericalsigfigs)) { $numericalsigfigs='1,15'; } $r->print( - ''. + '
'. '
  '. '  '. '  '. @@ -387,13 +439,16 @@ sub handler { } # Store Button $r->print( - ''); + ''. + (' ' x3). + ''. + ''); } else { $r->print(&mt('Could not identify problem.')); } $r->print(&Apache::loncommon::end_page()); return OK; -} +} 1; __END__