[BACK]Return to optionresponse.pm CVS log [TXT] [DIR] Up to [LON-CAPA] / loncom / homework

Diff for /loncom/homework/optionresponse.pm between versions 1.195.2.1 and 1.197

version 1.195.2.1, 2015/04/21 23:36:43 version 1.197, 2015/04/09 09:48:02
Line 51  sub start_optionresponse { Line 51  sub start_optionresponse {
   undef(%Apache::response::foilnames);    undef(%Apache::response::foilnames);
   if ($target eq 'edit') {    if ($target eq 'edit') {
     $result.=&Apache::edit::start_table($token)      $result.=&Apache::edit::start_table($token)
        .'<tr><td><span class="LC_nobreak">'.&mt('Multiple Option Response Question').'</span> '         .'<tr><td><span class="LC_nobreak">'.&Apache::loncommon::insert_folding_button().' '
          .&mt('Multiple Option Response Question').'</span> '
        .&Apache::loncommon::help_open_topic('Option_Response_Problems')."</td>"         .&Apache::loncommon::help_open_topic('Option_Response_Problems')."</td>"
        .'<td><span class="LC_nobreak">'.&mt('Delete?').' '         .'<td><span class="LC_nobreak">'.&mt('Delete?').' '
        .&Apache::edit::deletelist($target,$token)         .&Apache::edit::deletelist($target,$token)
Line 127  sub start_foilgroup { Line 128  sub start_foilgroup {
         maxcheck => 'Enter maximum number students may check (e.g., 3)',          maxcheck => 'Enter maximum number students may check (e.g., 3)',
         mincheck => 'Enter minimum number students need to check (e.g., 1)',          mincheck => 'Enter minimum number students need to check (e.g., 1)',
     );      );
     $result.= (<<ENDTABLE);      $result.= sprintf(<<ENDTABLE, &Apache::loncommon::insert_folding_button());
       <tr><td>$lt{'sel'}</td>        <tr><td>%s $lt{'sel'}</td>
         <td>          <td>
   $lt{'add'} <input type="text" name="$Apache::lonxml::curdepth.options" />    $lt{'add'} <input type="text" name="$Apache::lonxml::curdepth.options" />
         </td>          </td>
Line 375  sub end_foilgroup { Line 376  sub end_foilgroup {
   }    }
  }   }
  my $part=$Apache::inputtags::part;   my $part=$Apache::inputtags::part;
         my $id = $Apache::inputtags::response['-1'];          my $nonlenient=&grading_is_nonlenient($part);
         my $nonlenient=&grading_is_nonlenient($part,$id);   my $id = $Apache::inputtags::response['-1'];
  my $responsestr=&Apache::lonnet::hash2str(%responsehash);   my $responsestr=&Apache::lonnet::hash2str(%responsehash);
  my $gradestr   =&Apache::lonnet::hash2str(%grade);   my $gradestr   =&Apache::lonnet::hash2str(%grade);
  my %previous=&Apache::response::check_for_previous($responsestr,   my %previous=&Apache::response::check_for_previous($responsestr,
Line 491  sub end_foilgroup { Line 492  sub end_foilgroup {
 }  }
   
 sub grading_is_nonlenient {  sub grading_is_nonlenient {
     my ($part,$id) = @_;      my ($part) = @_;
 # Web mode: we are non-lenient unless told otherwise  # Web mode: we are non-lenient unless told otherwise
     my $defaultparm = 'off';      my $defaultparm = 'off';
     my $nonlenient = 1;      my $nonlenient = 0;
 # Grading a bubblesheet exam: we are grading lenient unless told otherwise  # Grading a bubblesheet exam: we are grading lenient unless told otherwise
     if ($Apache::lonhomework::scantronmode) {      if ($Apache::lonhomework::scantronmode) {
         $defaultparm = 'on';          $defaultparm = 'on';
         $nonlenient = 0;          $nonlenient = 1;
     }      }
     my $lenientparm =      my $lenientparm =
         &Apache::response::get_response_param($part,'lenient',$defaultparm);          &Apache::response::get_response_param($part,'lenient',$defaultparm);
     if ($lenientparm eq 'default') {  
         $lenientparm = $defaultparm;  
     }  
     $lenientparm =  
         &Apache::response::get_response_param($part.'_'.$id,'lenient',$lenientparm);  
     if ($lenientparm eq 'default') {  
         $lenientparm = $defaultparm;  
     }  
     if ($lenientparm=~/^0|off|no$/i) {      if ($lenientparm=~/^0|off|no$/i) {
         $nonlenient = 1;          $nonlenient = 1;
     } elsif ($lenientparm=~/^1|on|yes$/i) {      } elsif ($lenientparm=~/^1|on|yes$/i) {
         $nonlenient = 0;          $nonlenient = 0;
     }      }
     if (!$nonlenient) {  
         $Apache::inputtags::leniency=1;  
     }  
     return $nonlenient;      return $nonlenient;
 }  }
   
Removed from v.1.195.2.1  
changed lines
  Added in v.1.197

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