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

Diff for /loncom/homework/essayresponse.pm between versions 1.13 and 1.24

version 1.13, 2002/08/01 15:20:34 version 1.24, 2003/02/27 17:00:08
Line 30 Line 30
 #  #
 package Apache::essayresponse;  package Apache::essayresponse;
 use strict;  use strict;
   use Apache::lonxml;
   use Apache::lonnet;
   
 BEGIN {  BEGIN {
     &Apache::lonxml::register('Apache::essayresponse',('essayresponse'));      &Apache::lonxml::register('Apache::essayresponse',('essayresponse'));
Line 38  BEGIN { Line 40  BEGIN {
 sub start_essayresponse {  sub start_essayresponse {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;      my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
     my $result;      my $result;
       my $id = &Apache::response::start_response($parstack,$safeeval);
     if ($target eq 'web') {      if ($target eq 'meta') {
    $result=&Apache::response::meta_package_write('essayresponse');
       } elsif ($target eq 'web') {
  my $part= $Apache::inputtags::part;   my $part= $Apache::inputtags::part;
  my $id  = &Apache::response::start_response($parstack,$safeeval);  
   
  my $ncol= &Apache::lonnet::EXT("resource.$part".'_'."$id.maxcollaborators");   my $ncol= &Apache::lonnet::EXT("resource.$part".'_'."$id.maxcollaborators");
  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");
           $uploadedfiletypes=~s/[^\w\,]//g;
    my $uploadedfile= &HTML::Entities::encode($Apache::lonhomework::history{"resource.$part.$id.uploadedfile"});
  $result='<br /><table border="1">';   $result='<br /><table border="1">';
    $result.='<tr><td>'.
       '<input type="radio" name="HWDRAFT'.$part.'_'.$id.'" value="yes" checked>'.
       ' Submit entries below as answer to receive credit <br />'.
       '<input type="radio" name="HWDRAFT'.$part.'_'.$id.'" value="no">'.
       ' Save entries below as a draft answer (not submitting them for credit yet) '.
       '</td></tr>';
  if ($ncol > 0) {   if ($ncol > 0) {
     $result .='<tr><td>'.      $result .='<tr><td>'.
  'Collaborators: <input type="text" size="70" max="80" name="HWCOL'.   'Collaborators: <input type="text" size="70" max="80" name="HWCOL'.
Line 55  sub start_essayresponse { Line 67  sub start_essayresponse {
     $result .= &check_collaborators($ncol,$coll) if ($coll =~ /\w+/);      $result .= &check_collaborators($ncol,$coll) if ($coll =~ /\w+/);
     $result .='</td></tr>';      $result .='</td></tr>';
  }   }
  $result.='<tr><td>'.          if ($uploadedfiletypes) {
     '<input type="radio" name="HWDRAFT'.$part.'_'.$id.'" value="yes" checked>'.             $result.=
     ' Submit text below as answer to receive credit <br />'.  '<tr><td>Submit a file: <input type="file" size="50" name="HWFILE'.
     '<input type="radio" name="HWDRAFT'.$part.'_'.$id.'" value="no">'.   $part.'_'.$id.'" onFocus="this.form.enctype='.
     ' Save text below as a draft answer (not submitting it for credit yet) '.  "'multipart/form-data'".';" /><br />Allowed filetypes: <b>'.$uploadedfiletypes.'</b><br />';
     '</td></tr></table>';             if ($uploadedfile) {
          $result.='Currently submitted: <tt><a href="'.
                   &Apache::lonnet::tokenwrapper($Apache::lonhomework::history{"resource.$part.$id.uploadedurl"}).'"><img src="/adm/lonIcons/unknown.gif" border=0"> '.$uploadedfile.'</a></tt>';
              } else {
                 $result.='(Hand in a file you have prepared on your computer)';
              }
              $result.='</td></tr>'; 
           }
           $result.='</table>';
     }      }
     return $result;      return $result;
 }  }
Line 68  sub start_essayresponse { Line 88  sub start_essayresponse {
 sub end_essayresponse {  sub end_essayresponse {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;      my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
     my $part          = $Apache::inputtags::part;      my $part          = $Apache::inputtags::part;
     my $id            = &Apache::response::start_response($parstack,$safeeval);      my $id            = $Apache::inputtags::response[-1];
     my $collaborators = $ENV{'form.HWCOL'.$part.'_'.$id};      my $result;
     if ($collaborators =~ /[^\s]/) {  
  my $previous_list= &HTML::Entities::encode($Apache::lonhomework::history{"resource.$part.$id.collaborators"});  
   
  $Apache::lonhomework::results{"resource.$part.$id.collaborators"}=$collaborators  
     if ($collaborators ne $previous_list);  
     }  
     if ( $target eq 'grade' ) {      if ( $target eq 'grade' ) {
    my $collaborators = $ENV{'form.HWCOL'.$part.'_'.$id};
    if ($collaborators =~ /[^\s]/) {
       my $previous_list= &HTML::Entities::encode($Apache::lonhomework::history{"resource.$part.$id.collaborators"});
       $Apache::lonhomework::results{"resource.$part.$id.collaborators"}=$collaborators
    if ($collaborators ne $previous_list);
    }
  if ( defined $ENV{'form.submitted'}) {   if ( defined $ENV{'form.submitted'}) {
     my $response      = $ENV{'form.HWVAL'.$id};      my $response      = $ENV{'form.HWVAL'.$id};
     if ( $response =~ /[^\s]/) {              my $filename= $ENV{'form.HWFILE'.$part.'_'.$id.'.filename'};
       if (( $response =~ /[^\s]/) || ($filename =~ /[^\s]/)) {
     my $award;
    if ($ENV{'form.HWDRAFT'.$part.'_'.$id} eq 'yes') {
       $award='SUBMITTED';
    } else {
       $award='DRAFT';
    }
                   my $uploadedflag=0;
                   if ($filename =~ /[^\s]/) {
               my $uploadedfiletypes= &Apache::lonnet::EXT("resource.$part".'_'."$id.uploadedfiletypes");
                      $uploadedfiletypes=~s/[^\w\,]//g;
                      $uploadedfiletypes=','.$uploadedfiletypes.',';
                      my ($extension)=($filename=~/\.(\w+)$/);
              if ($uploadedfiletypes=~/\,$extension\,/i) {
                 $Apache::lonhomework::results{"resource.$part.$id.uploadedfile"}=$filename;
                         $Apache::lonhomework::results{"resource.$part.$id.uploadedurl"}=
                            &Apache::lonnet::userfileupload('HWFILE'.$part.'_'.$id);
                         $uploadedflag=1;
      } else {
         $award='INVALID_FILETYPE';
                      }
           }
  $Apache::lonhomework::results{"resource.$part.$id.submission"}=$response;   $Apache::lonhomework::results{"resource.$part.$id.submission"}=$response;
  $Apache::lonhomework::results{"resource.$part.$id.awarddetail"}=   $Apache::lonhomework::results{"resource.$part.$id.awarddetail"}=$award;
     $ENV{'form.HWDRAFT'.$part.'_'.$id} eq 'yes' ? 'SUBMITTED' : 'DRAFT';  
  my %previous=&Apache::response::check_for_previous($response,$part,$id);   my %previous=&Apache::response::check_for_previous($response,$part,$id);
  &Apache::response::handle_previous(\%previous,'SUBMITTED');   unless ($uploadedflag) { &Apache::response::handle_previous(\%previous,$award); }
     }      }
  }   }
       } elsif ($target eq 'edit') {
    $result.=&Apache::edit::end_table();
       } elsif ($target eq 'tex') {
    if ($Apache::lonhomework::type eq 'exam') {
       $result.='\begin{enumerate}\item[\textbf{'.$Apache::lonxml::counter.'}.]\textit{Leave blank on scoring form}\vskip 0 mm';
       &Apache::lonxml::increment_counter();
       $result.= '\item[\textbf{'.$Apache::lonxml::counter.'}.]\textit{Leave blank on scoring form}\vskip 0 mm \end{enumerate}';
       &Apache::lonxml::increment_counter();
    }
     }      }
   
     &Apache::response::end_response;      &Apache::response::end_response;
     return '';      return $result;
 }  }
   
 sub check_collaborators {  sub check_collaborators {
Removed from v.1.13  
changed lines
  Added in v.1.24

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