Diff for /loncom/homework/lonsimpleproblemedit.pm between versions 1.20.2.2 and 1.26

version 1.20.2.2, 2010/01/27 20:38:08 version 1.26, 2009/09/24 00:50:03
Line 40  use LONCAPA; Line 40  use LONCAPA;
   
 my %qparms;  my %qparms;
 my $prefix;  my $prefix;
   my $weightprefix;
 my $qtype;  my $qtype;
   
 sub evaloptionhash {  sub evaloptionhash {
Line 191  sub handler { Line 192  sub handler {
   
 # ------------------------------------------------ Prefix for everything stored  # ------------------------------------------------ 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  #------------------------------------------------- Prefix for storing weight of Problem Parts
     my $weightprefix=$env{'request.course.id'}.'.'.$symb.'.';      $weightprefix=$env{'request.course.id'}.'.'.$symb.'.';
       
 # ---------------------------------------------------------- Anything to store?  # ---------------------------------------------------------- Anything to store?
   
     if (($symb) && (defined($env{'form.questiontype'}))) {      if (($symb) && (defined($env{'form.questiontype'}))) {
Line 220  sub handler { Line 222  sub handler {
  }   }
 # ---------------------------------------------------- Set weights of hidden parts to zero  # ---------------------------------------------------- Set weights of hidden parts to zero
 # ------------------------------------------------------ and used part to 1  # ------------------------------------------------------ and used part to 1
         $storecontent{$weightprefix.'essay.weight'}=0;   $storecontent{$weightprefix.'essay.weight'}=0;
         $storecontent{$weightprefix.'numerical.weight'}=0;   $storecontent{$weightprefix.'numerical.weight'}=0;
         $storecontent{$weightprefix.'option.weight'}=0;   $storecontent{$weightprefix.'option.weight'}=0;
         $storecontent{$weightprefix.'radio.weight'}=0;   $storecontent{$weightprefix.'radio.weight'}=0;
         $storecontent{$weightprefix.'string.weight'}=0;   $storecontent{$weightprefix.'string.weight'}=0;
         $storecontent{$weightprefix.$env{'form.questiontype'}.'.weight'}=1;   $storecontent{$weightprefix.$env{'form.questiontype'}.'.weight'}=1;
   
   
  my $reply=&Apache::lonnet::cput   my $reply=&Apache::lonnet::cput
     ('resourcedata',\%storecontent,      ('resourcedata',\%storecontent,
      $env{'course.'.$env{'request.course.id'}.'.domain'},       $env{'course.'.$env{'request.course.id'}.'.domain'},
      $env{'course.'.$env{'request.course.id'}.'.num'});       $env{'course.'.$env{'request.course.id'}.'.num'});
   
           &Apache::lonnet::devalidatecourseresdata(
                               $env{'course.'.$env{'request.course.id'}.'.num'},
                               $env{'course.'.$env{'request.course.id'}.'.domain'});
   
     }      }
           
     &Apache::lonnet::devalidatecourseresdata(  
                         $env{'course.'.$env{'request.course.id'}.'.num'},  
                         $env{'course.'.$env{'request.course.id'}.'.domain'});  
 # ------------------------------------------------------------------- Read Data  # ------------------------------------------------------------------- Read Data
   
     %qparms=&Apache::lonnet::dump('resourcedata',      %qparms=&Apache::lonnet::dump('resourcedata',
Line 249  sub handler { Line 253  sub handler {
      $spell_header));       $spell_header));
     if ($symb) {      if ($symb) {
  $r->print('<h1>'.&Apache::lonnet::gettitle($symb).'</h1>');   $r->print('<h1>'.&Apache::lonnet::gettitle($symb).'</h1>');
  $r->print('<table width="100%" bgcolor="#FFFFAA" border="2"><tr><td>');  
         my $displaylink = &get_parent_uri($symb);          my $displaylink = &get_parent_uri($symb);
         if ($displaylink ne '') {                if ($displaylink ne '') {
             $r->print('<a href="'.$displaylink.'">'.&mt('Student View').'</a> - ');              my $functions=&Apache::lonhtmlcommon::start_funclist()
                            .&Apache::lonhtmlcommon::add_item_funclist(
                                 '<a href="'.$displaylink.'">'
                                .&mt('Student View').'</a>')
                                .&Apache::lonhtmlcommon::end_funclist();
               $r->print(&Apache::loncommon::head_subbox($functions));
         } else {          } else {
             $r->print('<span class="LC_error">'.&mt('An error occurred retrieving the link to this problem').'<br />'.&mt('You may need to [_1]re-select the course[_2] and then return to this resource to view it.','<a href="/adm/roles">','</a>').'</span><br />');               $r->print('<p class="LC_error">'
                        .&mt('An error occurred retrieving the link to this problem.')
                        .'<br />'
                        .&mt('You may need to [_1]re-select the course[_2] and then return to this resource to view it.'
                            ,'<a href="/adm/roles">','</a>')
                        .'</p>'
               );
         }          }
         $r->print(&mt('Note: it can take up to 10 minutes for changes to take effect for all users.').          $r->print('<p class="LC_warning">'
   &Apache::loncommon::help_open_topic('Caching').'</td></tr></table>');                   .&mt('Note: it can take up to 10 minutes for changes to take effect for all users.')
                    .&Apache::loncommon::help_open_topic('Caching')
                    .'</p>'
           );
   
  $r->print('<table border="2" bgcolor="#FFFFFF" width="100%"><tr><td>'.   $r->print('<table border="2" bgcolor="#FFFFFF" width="100%"><tr><td>'.
                   &rawrendering($symb).                    &rawrendering($symb).
                   '</td></tr></table><br />');                    '</td></tr></table><br />');
Line 269  sub handler { Line 287  sub handler {
                            'string' => 'Short string response',                             'string' => 'Short string response',
                            'essay'  => 'Essay, open end',                             'essay'  => 'Essay, open end',
                            'numerical' => 'Numerical response');                             'numerical' => 'Numerical response');
   
         $qtype=$qparms{$prefix.'questiontype'};          $qtype=$qparms{$prefix.'questiontype'};
         unless (defined($qtype)) { $qtype='radio'; }          unless (defined($qtype)) { $qtype='radio'; }
         unless ($questiontypes{$qtype}) { $qtype='radio'; }          unless ($questiontypes{$qtype}) { $qtype='radio'; }
Line 343  sub handler { Line 360  sub handler {
             unless ($stringtypes{$stringtype}) { $stringtype='cs'; }              unless ($stringtypes{$stringtype}) { $stringtype='cs'; }
     $r->print(      $r->print(
   '<table bgcolor="#00ee44" cellspacing="4" cellpadding="2">'.    '<table bgcolor="#00ee44" cellspacing="4" cellpadding="2">'.
                   '<tr><td><label>'.&mt('Correct answer').': <input type="text" size="20" name="stringanswer" value="'.$stringanswer.'" /></label>&nbsp;&nbsp;'.            '<tr><td><label>'.&mt('Correct answer').': <input type="text" size="20" name="stringanswer" value="'.$stringanswer.'" /></label>&nbsp;&nbsp;'.
       &Apache::loncommon::select_form        &Apache::loncommon::select_form
       ($stringtype,'stringtype',%stringtypes).        ($stringtype,'stringtype',%stringtypes).
   '</td></tr></table><br />');    '</td></tr></table><br />');
Line 351  sub handler { Line 368  sub handler {
     $r->print(&hint());      $r->print(&hint());
  }   }
         if ($qtype eq 'numerical') {          if ($qtype eq 'numerical') {
             my $numericalanswer=$qparms{$prefix.'numericalanswer'};             my $numericalanswer=$qparms{$prefix.'numericalanswer'};
             unless (defined($numericalanswer)) { $numericalanswer=''; }             unless (defined($numericalanswer)) { $numericalanswer=''; }
             my $numericaltolerance=$qparms{$prefix.'numericaltolerance'};             my $numericaltolerance=$qparms{$prefix.'numericaltolerance'};
             unless (defined($numericaltolerance)) { $numericaltolerance='5%'; }             unless (defined($numericaltolerance)) { $numericaltolerance='5%'; }
             my $numericalsigfigs=$qparms{$prefix.'numericalsigfigs'};             my $numericalsigfigs=$qparms{$prefix.'numericalsigfigs'};
             unless (defined($numericalsigfigs)) { $numericalsigfigs='1,15'; }             unless (defined($numericalsigfigs)) { $numericalsigfigs='1,15'; }
   
             $r->print(             $r->print(
                 '<table bgcolor="#00ee44" cellspacing="4" cellpadding="2">'.                    '<table bgcolor="#00ee44" cellspacing="4" cellpadding="2">'.
                   '<tr><td><label>'.&mt('Correct answer').': <input type="text" size="20" name="numericalanswer" value="'.$numericalanswer.'" /></label>&nbsp;&nbsp;'.                    '<tr><td><label>'.&mt('Correct answer').': <input type="text" size="20" name="numericalanswer" value="'.$numericalanswer.'" /></label>&nbsp;&nbsp;'.
                   '<label>'.&mt('Unit').':  <input type="text" size="5" name="numericalunit" value="'.$qparms{$prefix.'numericalunit'}.'" /></label>&nbsp;&nbsp;'.                    '<label>'.&mt('Unit').':  <input type="text" size="5" name="numericalunit" value="'.$qparms{$prefix.'numericalunit'}.'" /></label>&nbsp;&nbsp;'.
                   '<label>'.&mt('Format').':  <input type="text" size="5" name="numericalformat" value="'.$qparms{$prefix.'numericalformat'}.'" /></label>&nbsp;&nbsp;'.                    '<label>'.&mt('Format').':  <input type="text" size="5" name="numericalformat" value="'.$qparms{$prefix.'numericalformat'}.'" /></label>&nbsp;&nbsp;'.
                   '<label>'.&mt('Tolerance').':  <input type="text" size="5" name="numericaltolerance" value="'.$numericaltolerance.'" /></label>&nbsp;&nbsp;'.                    '<label>'.&mt('Tolerance').':  <input type="text" size="5" name="numericaltolerance" value="'.$numericaltolerance.'" /></label>&nbsp;&nbsp;'.
                   '<label>'.&mt('Significant digits').':  <input type="text" size="5" name="numericalsigfigs" value="'.$numericalsigfigs.'" /></label>'.                    '<label>'.&mt('Significant digits').':  <input type="text" size="5" name="numericalsigfigs" value="'.$numericalsigfigs.'" /></label>'.
                    '</td></tr></table><br />');                    '</td></tr></table><br />');
             $r->print(&hint());             $r->print(&hint());
         }          }
 # Store Button  # Store Button
  $r->print(   $r->print(

Removed from v.1.20.2.2  
changed lines
  Added in v.1.26


FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>