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

Diff for /loncom/homework/essayresponse.pm between versions 1.72 and 1.76

version 1.72, 2006/05/30 12:45:36 version 1.76, 2006/10/16 09:27:54
Line 52  sub start_essayresponse { Line 52  sub start_essayresponse {
  my $coll= &HTML::Entities::encode($Apache::lonhomework::history{"resource.$part.$id.collaborators"},'<>&"');   my $coll= &HTML::Entities::encode($Apache::lonhomework::history{"resource.$part.$id.collaborators"},'<>&"');
  my $uploadedfiletypes= &Apache::lonnet::EXT("resource.$part".'_'."$id.uploadedfiletypes");   my $uploadedfiletypes= &Apache::lonnet::EXT("resource.$part".'_'."$id.uploadedfiletypes");
         $uploadedfiletypes=~s/[^\w\,]//g;          $uploadedfiletypes=~s/[^\w\,]//g;
  $result='<br /><table border="1">';   if ( $Apache::lonhomework::type eq 'survey' ) {
  $result.='<tr><td>'.      $result.= '<input type="hidden" name="HWDRAFT'.$part.'_'.$id.'" value="yes" /> ';
             '<label>'.   }
     '<input type="radio" name="HWDRAFT'.$part.'_'.$id.'" value="yes" checked="checked" /> '.   $result.='<br /><table border="1">';
     &mt('Submit entries below as answer to receive credit').   if ( $Apache::lonhomework::type ne 'survey' ) {
             '</label> <br />'.      $result.= '<tr><td>'.
     '<label>'.   '<label>'.
             '<input type="radio" name="HWDRAFT'.$part.'_'.$id.'" value="no" /> '.   '<input type="radio" name="HWDRAFT'.$part.'_'.$id.'" value="yes" checked="checked" /> '.
     &mt('Save entries below as a draft answer (not submitting them for credit yet)').   &mt('Submit entries below as answer to receive credit').
     '</label>'.   '</label> <br />'.
             ' </td></tr>';   '<label>'.
    '<input type="radio" name="HWDRAFT'.$part.'_'.$id.'" value="no" /> '.
    &mt('Save entries below as a draft answer (not submitting them for credit yet)').
    '</label>'.
    '</td></tr>';
    }
   
  if ($ncol > 0) {   if ($ncol > 0) {
     $result .='<tr><td>'.'<label>'.      $result .='<tr><td>'.'<label>'.
  'Collaborators: <input type="text" size="70" max="80" name="HWCOL'.   'Collaborators: <input type="text" size="70" max="80" name="HWCOL'.
Line 75  sub start_essayresponse { Line 81  sub start_essayresponse {
  $result.=&Apache::inputtags::file_selector($part,$id,   $result.=&Apache::inputtags::file_selector($part,$id,
    $uploadedfiletypes,'both');     $uploadedfiletypes,'both');
         $result.='</table>';          $result.='</table>';
       } elsif ($target eq 'web' &&
        $Apache::inputtags::status[-1] ne 'CAN_ANSWER') {
    my $part= $Apache::inputtags::part;
    my @msgs;
    if ($Apache::lonhomework::history{"resource.$part.$id.collaborators"} =~ /\S/) {
       my $coll= &HTML::Entities::encode($Apache::lonhomework::history{"resource.$part.$id.collaborators"},'<>&"');
       $result .= '<td>'.&mt('Collaborated with [_1]',$coll).'</td>';
    }
   
    my $file_submission = 
       &Apache::inputtags::show_past_file_submission($part,$id);
    if ($file_submission) {
       $result .= '<td>'.$file_submission.'</td>';
    }
   
    my $port_submission = 
       &Apache::inputtags::show_past_portfile_submission($part,$id);
    if ($port_submission) {
       $result .= '<td>'.$port_submission.'</td>';
    }
   
    if ($result ne '') {
       $result = 
    '<table class="LC_pastsubmission"><tr>'.$result.
    '</tr></table>';
    }
     }      }
     return $result;      return $result;
 }  }
Line 138  sub end_essayresponse { Line 170  sub end_essayresponse {
  $result .= &Apache::inputtags::exam_score_line($target);   $result .= &Apache::inputtags::exam_score_line($target);
   
     } elsif ($target eq 'answer') {      } elsif ($target eq 'answer') {
  $result.=&Apache::response::answer_header($$tagstack[-1]);   if ($env{'form.answer_output_mode'} eq 'tex') {
  $result.=&Apache::response::answer_part($$tagstack[-1],'');      $result .= '\begin{tabular}{|l|}';
  $result.=&Apache::response::answer_footer($$tagstack[-1]);      $result .= '\hline';
       $result .= ' Answer for essay will be hand graded \\\\  ';
       $result .= '\\hline';
       $result .= '\end{tabular}';
       $result .= '\vskip 3mm';
    } else {
       $result.=&Apache::response::answer_header($$tagstack[-1]);
       $result.=&Apache::response::answer_part($$tagstack[-1],'');
       $result.=&Apache::response::answer_footer($$tagstack[-1]);
    }
     }      }
   
     if ($target eq 'grade' || $target eq 'web' || $target eq 'answer' ||      if ($target eq 'grade' || $target eq 'web' || $target eq 'answer' ||
Line 168  sub file_submission { Line 209  sub file_submission {
   
  my @submitted_files = ($files);   my @submitted_files = ($files);
  if ( $which eq 'portfiles' ) {   if ( $which eq 'portfiles' ) {
     @submitted_files = split(/,/,$files);      @submitted_files = split(/\s*,\s*/,$files);
  }   }
   
  my $uploadedfiletypes= &Apache::lonnet::EXT("resource.$part".'_'."$id.uploadedfiletypes");   my $uploadedfiletypes= &Apache::lonnet::EXT("resource.$part".'_'."$id.uploadedfiletypes");
Removed from v.1.72  
changed lines
  Added in v.1.76

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