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

Diff for /loncom/homework/inputtags.pm between versions 1.221 and 1.225

version 1.221, 2007/04/16 22:50:41 version 1.225, 2007/05/21 23:09:57
Line 629  sub decideoutput { Line 629  sub decideoutput {
     }      }
     $added_computer_text=1;      $added_computer_text=1;
     my ($symb) = &Apache::lonnet::whichuser();      my ($symb) = &Apache::lonnet::whichuser();
     if ((!$env{'course.'.      if (($symb ne '') 
      $env{'request.course.id'}.   &&
      '.disable_receipt_display'} eq 'yes')&&   ($env{'course.'.$env{'request.course.id'}.
     $symb) {       '.disable_receipt_display'} ne 'yes')) { 
  $message.=(($target eq 'web')?'<br />':' ').   $message.=(($target eq 'web')?'<br />':' ').
     &mt('Your receipt is').' '.&Apache::lonnet::receipt($Apache::inputtags::part).      &mt('Your receipt is').' '.&Apache::lonnet::receipt($Apache::inputtags::part).
     (($target eq 'web')?&Apache::loncommon::help_open_topic('Receipt'):'');      (($target eq 'web')?&Apache::loncommon::help_open_topic('Receipt'):'');
Line 1106  sub get_grade_messages { Line 1106  sub get_grade_messages {
 }  }
   
 sub gradestatus {  sub gradestatus {
     my ($id,$target) = @_;      my ($id,$target,$no_previous) = @_;
     my $showbutton = 1;      my $showbutton = 1;
     my $message = '';      my $message = '';
     my $latemessage = '';      my $latemessage = '';
Line 1145  sub gradestatus { Line 1145  sub gradestatus {
  if ($target eq 'tex') {   if ($target eq 'tex') {
     return $button.' \vskip 0 mm '.$output.' ';      return $button.' \vskip 0 mm '.$output.' ';
  } else {   } else {
     return '<table><tr><td>'.$button.'</td>'.$output.'<td>'.&previous_tries($id,$target).'</td></tr></table>';      $output =
    '<table><tr><td>'.$button.'</td>'.$output;
       if (!$no_previous) {
    $output.='<td>'.&previous_tries($id,$target).'</td>';
       }
       $output.= '</tr></table>';
       return $output;
  }   }
     }      }
 }  }
Line 1176  sub previous_tries { Line 1182  sub previous_tries {
     my $previous = $count_lookup{$which};      my $previous = $count_lookup{$which};
     $message =~ s{(</td>)}{ as submission # $previous $1};      $message =~ s{(</td>)}{ as submission # $previous $1};
  } elsif ($Apache::lonhomework::history{"$prefix.tries"}) {   } elsif ($Apache::lonhomework::history{"$prefix.tries"}) {
     if ( $Apache::lonhomework::history{"$prefix.solved"} =~       if (!(lc($Apache::lonhomework::problemstatus) eq 'no'
  /^correct/) {    && $Apache::inputtags::status[-1] ne 'SHOW_ANSWER')
    && $Apache::lonhomework::history{"$prefix.solved"} =~/^correct/
    ) {
   
  $message =~ s{(<td.*?>)(.*?)(</td>)}   $message =~ s{(<td.*?>)(.*?)(</td>)}
              {$1 <strong>Correct</strong>. $3};               {$1 <strong>Correct</strong>. $3}s;
     }      }
     my $trystr = "(Try ".      my $trystr = "(Try ".
  $Apache::lonhomework::history{"$prefix.tries"}.')';   $Apache::lonhomework::history{"$prefix.tries"}.')';
Line 1190  sub previous_tries { Line 1199  sub previous_tries {
   
   
  $output.='<tr class="'.$class.'">';   $output.='<tr class="'.$class.'">';
  $output.='<td align ="center">'.$count.'</td>';   $output.='<td align="center">'.$count.'</td>';
  $output.=$message;   $output.=$message;
   
  foreach my $resid (@Apache::inputtags::response) {   foreach my $resid (@Apache::inputtags::response) {
Line 1211  sub previous_tries { Line 1220  sub previous_tries {
     }      }
     return if ($output eq '');      return if ($output eq '');
     my $headers =       my $headers = 
  '<tr>'.'<th>'.&mt('Submission #').'</th><th>'.&mt(' ').   '<tr>'.'<th>'.&mt('Submission #').'</th><th>'.&mt('Try').
  '</th><th colspan="'.scalar(@Apache::inputtags::response).'">'.   '</th><th colspan="'.scalar(@Apache::inputtags::response).'">'.
  &mt('Submitted Answer').'</th>';   &mt('Submitted Answer').'</th>';
     $output ='<table class="LC_prior_tries">'.$headers.$output.'</table>';      $output ='<table class="LC_prior_tries">'.$headers.$output.'</table>';
Removed from v.1.221  
changed lines
  Added in v.1.225

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