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

Diff for /loncom/homework/essayresponse.pm between versions 1.57 and 1.60

version 1.57, 2004/12/21 22:46:27 version 1.60, 2005/03/31 21:24:29
Line 48  sub start_essayresponse { Line 48  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;
  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>'.   $result.='<tr><td>'.
     '<input type="radio" name="HWDRAFT'.$part.'_'.$id.'" value="yes" checked="checked" /> '.      '<input type="radio" name="HWDRAFT'.$part.'_'.$id.'" value="yes" checked="checked" /> '.
Line 64  sub start_essayresponse { Line 63  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>';
  }   }
         if ($uploadedfiletypes) {   $result.=&Apache::inputtags::file_selector($part,$id,
     $result.='<tr><td>'.&mt('Submit a file: (only one file can be uploaded)').     $uploadedfiletypes,'both');
  ' <br /><input type="file" size="50" name="HWFILE'.  
  $part.'_'.$id.'" /><br />'.  
  &mt('Allowed filetypes: <b>[_1]</b>',$uploadedfiletypes).'<br />'.  
                 '<strong>OR:</strong><br /><a href='."'".'javascript:void(window.open("/adm/portfolio?mode=selectfile&amp;fieldname=HWPORT'.$part.'_'.$id.'","cat","height=600,width=800,scrollbars=1,resizable=1,menubar=2,location=1"))'."'".'>Select Portfolio Files</a>'.  
                 '<br />'.  
                 '<input type="text" size="50" name="HWPORT'.$part.'_'.$id.'" value="" />'.  
  '<br />';  
     if ($Apache::lonhomework::history{"resource.$part.$id.portfiles"}=~/[^\s]/){  
         $result.="Portfolio files previously selected: <strong>".&Apache::lonnet::unescape($Apache::lonhomework::history{"resource.$part.$id.portfiles"})."</strong><br />";  
     }  
   
             if ($uploadedfile) {  
        my $url=$Apache::lonhomework::history{"resource.$part.$id.uploadedurl"};  
        push (@Apache::lonxml::extlinks,$url);  
        &Apache::lonnet::allowuploaded('/adm/essayresponse',$url);  
        my $curfile='<a href="'.$url.  
    '"><img src="/adm/lonIcons/unknown.gif" border=0" /> '.  
    $uploadedfile.'</a>';  
        $result.=&mt('Currently submitted: <tt>[_1]</tt>',$curfile);  
            } else {  
               $result.=&mt('(Hand in a file you have prepared on your computer)');  
            }  
            $result.='</td></tr>';   
         }  
         $result.='</table>';          $result.='</table>';
     }      }
     return $result;      return $result;
Line 108  sub end_essayresponse { Line 83  sub end_essayresponse {
     $Apache::lonhomework::results{"resource.$part.$id.collaborators"}=$collaborators      $Apache::lonhomework::results{"resource.$part.$id.collaborators"}=$collaborators
  if ($collaborators ne $previous_list);   if ($collaborators ne $previous_list);
  }   }
  if ( defined($ENV{'form.submitted'}) &&   if (  &Apache::response::submitted('scantron') ) {
      $ENV{'form.submitted'} eq 'scantron' ) {  
     $increment=&Apache::response::scored_response($part,$id);      $increment=&Apache::response::scored_response($part,$id);
  } elsif ( defined($ENV{'form.submitted'}) ) {   } elsif ( &Apache::response::submitted() ) {
     my $response      = $ENV{'form.HWVAL_'.$id};      my $response      = $ENV{'form.HWVAL_'.$id};
             my $filename= $ENV{'form.HWFILE'.$part.'_'.$id.'.filename'};              my $filename= $ENV{'form.HWFILE'.$part.'_'.$id.'.filename'};
             my $portfiles = $ENV{'form.HWPORT'.$part.'_'.$id};              my $portfiles = $ENV{'form.HWPORT'.$part.'_'.$id};
Line 144  sub end_essayresponse { Line 118  sub end_essayresponse {
                     $portfiles =~s/,$//;                      $portfiles =~s/,$//;
                     $Apache::lonhomework::results{"resource.$part.$id.portfiles"}=$portfiles;                      $Apache::lonhomework::results{"resource.$part.$id.portfiles"}=$portfiles;
                     my @submitted_files = split /,/,$portfiles;                      my @submitted_files = split /,/,$portfiles;
     my ($dsymb,$crsid,$domain,$name)=&Apache::lonxml::whichuser();               my $uploadedfiletypes= &Apache::lonnet::EXT("resource.$part".'_'."$id.uploadedfiletypes");
     &Apache::lonnet::unmark_as_readonly($domain,$name,$dsymb.$crsid);                      $uploadedfiletypes=~s/[^\w\,]//g;
                     &Apache::lonnet::mark_as_readonly($domain,$name,\@submitted_files,$dsymb.$crsid);                      $uploadedfiletypes=','.$uploadedfiletypes.',';
                     &Apache::lonnet::clear_selected_files($name);                      foreach (@submitted_files) {
                     $uploadedflag=1;                          my ($extension)=($_=~/\.(\w+)$/);
                   unless ($uploadedfiletypes=~/\,$extension\,/i) {
                       $award='INVALID_FILETYPE';
                           }
                       }
                       if ($award ne 'INVALID_FILETYPE'){
           my ($dsymb,$crsid,$domain,$name)=&Apache::lonxml::whichuser();
           &Apache::lonnet::unmark_as_readonly($domain,$name,$dsymb.$crsid);
                           &Apache::lonnet::mark_as_readonly($domain,$name,\@submitted_files,$dsymb.$crsid);
                           &Apache::lonnet::clear_selected_files($name);
                           $uploadedflag=1;
                       }
            } else {             } else {
     my ($dsymb,$crsid,$domain,$name)=&Apache::lonxml::whichuser();      my ($dsymb,$crsid,$domain,$name)=&Apache::lonxml::whichuser();
                &Apache::lonnet::unmark_as_readonly($domain,$name,$dsymb.$crsid);                 &Apache::lonnet::unmark_as_readonly($domain,$name,$dsymb.$crsid);
Removed from v.1.57  
changed lines
  Added in v.1.60

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