[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.230

version 1.221, 2007/04/16 22:50:41 version 1.230, 2007/09/18 22:18:41
Line 31  use strict; Line 31  use strict;
 use Apache::loncommon;  use Apache::loncommon;
 use Apache::lonlocal;  use Apache::lonlocal;
 use Apache::lonnet;  use Apache::lonnet;
 use lib '/home/httpd/lib/perl/';  
 use LONCAPA;  use LONCAPA;
     
   
Line 116  sub check_for_duplicate_ids { Line 115  sub check_for_duplicate_ids {
   
 sub start_input {  sub start_input {
     my ($parstack,$safeeval)=@_;      my ($parstack,$safeeval)=@_;
     my $id = &Apache::lonxml::get_param('id',$parstack,$safeeval);      my $id = &Apache::lonxml::get_id($parstack,$safeeval);
     if ($id eq '') { $id = $Apache::lonxml::curdepth; }  
     push (@Apache::inputtags::input,$id);      push (@Apache::inputtags::input,$id);
     push (@Apache::inputtags::inputlist,$id);      push (@Apache::inputtags::inputlist,$id);
     return $id;      return $id;
Line 449  sub file_selector { Line 447  sub file_selector {
  $result.='<br />'.'<strong>'.&mt('OR:').'</strong><br />';   $result.='<br />'.'<strong>'.&mt('OR:').'</strong><br />';
     }      }
     if ($which eq 'portfolioonly' || $which eq 'both') {       if ($which eq 'portfolioonly' || $which eq 'both') { 
  $result.=$extratext.'<a href='."'".'javascript:void(window.open("/adm/portfolio?mode=selectfile&amp;fieldname=HWPORT'.$jspart.'_'.$id.'","cat","height=600,width=800,scrollbars=1,resizable=1,menubar=2,location=1"))'."'".'>'.   $result.=$extratext.'<a href='."'".'javascript:void(window.open("/adm/portfolio?mode=selectfile&amp;fieldname='.$env{'form.request.prefix'}.'HWPORT'.$jspart.'_'.$id.'","cat","height=600,width=800,scrollbars=1,resizable=1,menubar=2,location=1"))'."'".'>'.
     &mt('Select Portfolio Files').'</a><br />'.      &mt('Select Portfolio Files').'</a><br />'.
     '<input type="text" size="50" name="HWPORT'.$jspart.'_'.$id.'" value="" />'.      '<input type="text" size="50" name="HWPORT'.$jspart.'_'.$id.'" value="" />'.
     '<br />';      '<br />';
Line 629  sub decideoutput { Line 627  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 1104  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 1133  sub gradestatus { Line 1131  sub gradestatus {
  }   }
  if ( $showbutton ) {    if ( $showbutton ) { 
     if ($target ne 'tex') {      if ($target ne 'tex') {
  $button = '<input onsubmit="javascript:setSubmittedPart(\''.$id.'\')" type="submit" name="submit_'.$id.'" value="'.&mt('Submit Answer').'" />';   $button = 
       '<input 
                             onmouseup="javascript:setSubmittedPart(\''.$id.'\')"
                              onsubmit="javascript:setSubmittedPart(\''.$id.'\')"
                           type="submit" name="submit_'.$id.'"
                            value="'.&mt('Submit Answer').'" />';
     }      }
  }   }
   
Line 1145  sub gradestatus { Line 1148  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 1174  sub previous_tries { Line 1183  sub previous_tries {
     my ($match,$which) = &find_which_previous($i);      my ($match,$which) = &find_which_previous($i);
     $message=$previousmsg;      $message=$previousmsg;
     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 1202  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 1223  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>';
     #return $output;      #return $output;
     $output=~s/\\/\\\\/g;      $output = &Apache::loncommon::js_ready($output); 
     $output=~s/\'/\\\'/g;      $output.='<br /><form action=""><center><input type="button" name="close" value="'.&mt('Close Window').'" onClick="window.close()" /></center></form>';
     $output=~s/\s+/ /g;  
     my $windowopen=&Apache::lonhtmlcommon::javascript_docopen();      my $windowopen=&Apache::lonhtmlcommon::javascript_docopen();
     my $start_page =      my $start_page =
  &Apache::loncommon::start_page('Previous Tries', undef,   &Apache::loncommon::start_page('Previous Tries', undef,
        {'only_body' => 1,         {'only_body'      => 1,
  'bgcolor'   => '#FFFFFF',   'bgcolor'        => '#FFFFFF',
  'js_ready'  => 1,});   'js_ready'       => 1,
           'inherit_jsmath' => 1, });
     my $end_page =      my $end_page =
  &Apache::loncommon::end_page({'js_ready' => 1,});   &Apache::loncommon::end_page({'js_ready' => 1,});
           
Removed from v.1.221  
changed lines
  Added in v.1.230

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