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

version 1.20, 2009/02/01 20:40:28 version 1.20.2.2, 2010/01/27 20:38:08
Line 95  sub hint { Line 95  sub hint {
 ENDHINT  ENDHINT
 }  }
   
   sub script {
       my $text=$qparms{$prefix.'numericalscript'};
       my $ht=&mt('Scripting (optional)');
       return (<<ENDSCRIPT);
   <table bgcolor="#ccccaa" cellspacing="4" cellpadding="2">
   <tr><td><b>$ht</b><br />
   <textarea style="width:100%" name="numericalscript" cols="80" rows="4">$text</textarea>
   </td></tr>
   </table>
   <br />
   ENDSCRIPT
   }
   
 sub foil {  sub foil {
     my $number=shift;      my $number=shift;
     my %values='';      my %values='';
Line 178  sub handler { Line 191  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
       my $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 203  sub handler { Line 218  sub handler {
  $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   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'});
 # ------------------------------------------------------------------- Read Data  # ------------------------------------------------------------------- Read Data
   
     %qparms=&Apache::lonnet::dump('resourcedata',      %qparms=&Apache::lonnet::dump('resourcedata',
Line 234  sub handler { Line 261  sub handler {
  $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 />');
         $r->print('<form name="simpleedit" method="POST">');          $r->print('<form name="simpleedit" method="post">');
 # Question Type          # Question Type        
  my %questiontypes=('radio'  =>    my %questiontypes=('radio'  => 
                                '1 out of N multiple choice (radio button)',                                 '1 out of N multiple choice (radio button)',
    'option' => 'Option response',     'option' => 'Option response',
                            'string' => 'Short string response',                             'string' => 'Short string response',
                            'essay'  => 'Essay, open end');                             'essay'  => 'Essay, open end',
                              '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 249  sub handler { Line 278  sub handler {
                                ($qtype,'questiontype',%questiontypes).                                 ($qtype,'questiontype',%questiontypes).
   '</b><br /><input type="submit" value="'.&mt('Save and Edit').    '</b><br /><input type="submit" value="'.&mt('Save and Edit').
   '" /><p>&nbsp;</p>');    '" /><p>&nbsp;</p>');
   # Script
           if ($qtype eq 'numerical') {
              $r->print(&script());
           }
 # Question Text  # Question Text
         $r->print(&questiontext());          $r->print(&questiontext());
 # Radio, Option ===  # Radio, Option ===
Line 310  sub handler { Line 343  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>'.&mt('Correct answer').': <input type="text" size="20" name="stringanswer" value="'.$stringanswer.'" />&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 />');
 # Hint  # Hint
     $r->print(&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(
                   '<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;'.
                     '<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('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>'.
                      '</td></tr></table><br />');
               $r->print(&hint());
           }
 # Store Button  # Store Button
  $r->print(   $r->print(
   '<input type="submit" value="'.&mt('Save and Edit').'" /></form>');    '<input type="submit" value="'.&mt('Save and Edit').'" /></form>');

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


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