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

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

version 1.46, 2004/11/01 22:51:48 version 1.57, 2004/12/21 22:46:27
Line 51  sub start_essayresponse { Line 51  sub start_essayresponse {
  my $uploadedfile= &HTML::Entities::encode($Apache::lonhomework::history{"resource.$part.$id.uploadedfile"},'<>&"');   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> '.      '<input type="radio" name="HWDRAFT'.$part.'_'.$id.'" value="yes" checked="checked" /> '.
     &mt('Submit entries below as answer to receive credit').' <br />'.      &mt('Submit entries below as answer to receive credit').' <br />'.
     '<input type="radio" name="HWDRAFT'.$part.'_'.$id.'" value="no"> '.      '<input type="radio" name="HWDRAFT'.$part.'_'.$id.'" value="no" /> '.
     &mt('Save entries below as a draft answer (not submitting them for credit yet)').      &mt('Save entries below as a draft answer (not submitting them for credit yet)').
     ' </td></tr>';      ' </td></tr>';
  if ($ncol > 0) {   if ($ncol > 0) {
Line 65  sub start_essayresponse { Line 65  sub start_essayresponse {
     $result .='</td></tr>';      $result .='</td></tr>';
  }   }
         if ($uploadedfiletypes) {          if ($uploadedfiletypes) {
     $result.='<tr><td>'.&mt('Submit a file:').      $result.='<tr><td>'.&mt('Submit a file: (only one file can be uploaded)').
  ' <br /><input type="file" size="50" name="HWFILE'.   ' <br /><input type="file" size="50" name="HWFILE'.
  $part.'_'.$id.'" onFocus="this.form.enctype='.   $part.'_'.$id.'" /><br />'.
  "'multipart/form-data'".';" /><br />'.  
  &mt('Allowed filetypes: <b>[_1]</b>',$uploadedfiletypes).'<br />'.   &mt('Allowed filetypes: <b>[_1]</b>',$uploadedfiletypes).'<br />'.
                 '<strong>OR:</strong><br /><a href='."'".'javascript:void(window.open("/adm/portfolio?mode=selectfile&fieldname=HWPORT'.$part.'_'.$id.'","cat","height=400,'.                  '<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>'.
                 'width=500,scrollbars=1,resizable=1,menubar=0,location=1"))'."'".'>Select Portfolio Files</a>'.  
                 '<br />'.                  '<br />'.
                 '<input type="text" size="50" name="HWPORT'.$part.'_'.$id.'" value="" />'.                  '<input type="text" size="50" name="HWPORT'.$part.'_'.$id.'" value="" />'.
  '<br />';   '<br />';
     if ($Apache::lonhomework::history{"resource.$part.$id.portfiles"}=~/[^\s]/){      if ($Apache::lonhomework::history{"resource.$part.$id.portfiles"}=~/[^\s]/){
         $result.="Portfolio files previously selected: <strong>".$Apache::lonhomework::history{"resource.$part.$id.portfiles"}."</strong><br />";          $result.="Portfolio files previously selected: <strong>".&Apache::lonnet::unescape($Apache::lonhomework::history{"resource.$part.$id.portfiles"})."</strong><br />";
     }      }
   
             if ($uploadedfile) {              if ($uploadedfile) {
Line 126  sub end_essayresponse { Line 124  sub end_essayresponse {
  }   }
                 my $uploadedflag=0;                  my $uploadedflag=0;
                 if ($filename =~ /[^\s]/) {                  if ($filename =~ /[^\s]/) {
             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;
                    $uploadedfiletypes=','.$uploadedfiletypes.',';                      $uploadedfiletypes=','.$uploadedfiletypes.',';
                    my ($extension)=($filename=~/\.(\w+)$/);                      my ($extension)=($filename=~/\.(\w+)$/);
            if ($uploadedfiletypes=~/\,$extension\,/i) {              if ($uploadedfiletypes=~/\,$extension\,/i) {
               $Apache::lonhomework::results{"resource.$part.$id.uploadedfile"}=$filename;                  $Apache::lonhomework::results{"resource.$part.$id.uploadedfile"}=$filename;
                       $Apache::lonhomework::results{"resource.$part.$id.uploadedurl"}=                          $Apache::lonhomework::results{"resource.$part.$id.uploadedurl"}=
                          &Apache::lonnet::userfileupload('HWFILE'.$part.'_'.$id,undef,'essayresponse');                          &Apache::lonnet::userfileupload('HWFILE'.$part.'_'.$id,undef,'essayresponse');
                       $uploadedflag=1;                          $uploadedflag=1;
    } else {      } else {
       $award='INVALID_FILETYPE';          $award='INVALID_FILETYPE';
                    }                      }
           } else {
              $Apache::lonhomework::results{"resource.$part.$id.uploadedfile"}="";
                      $Apache::lonhomework::results{"resource.$part.$id.uploadedurl"}="";
         }          }
                 if ($portfiles =~ /[^\s]/) {                  if ($portfiles =~ /[^\s]/) {
                       $portfiles =~s/,$//;
                     $Apache::lonhomework::results{"resource.$part.$id.portfiles"}=$portfiles;                      $Apache::lonhomework::results{"resource.$part.$id.portfiles"}=$portfiles;
                     $Apache::lonhomework::results{"resource.$part.$id.uploadedurl"}=$portfiles;  
                     my @submitted_files = split /,/,$portfiles;                      my @submitted_files = split /,/,$portfiles;
     my ($dsymb,$crsid,$domain,$name)=      my ($dsymb,$crsid,$domain,$name)=&Apache::lonxml::whichuser();
  &Apache::lonxml::whichuser();      &Apache::lonnet::unmark_as_readonly($domain,$name,$dsymb.$crsid);
                     foreach (@submitted_files) {                      &Apache::lonnet::mark_as_readonly($domain,$name,\@submitted_files,$dsymb.$crsid);
                         my $file = $_;                      &Apache::lonnet::clear_selected_files($name);
  &Apache::lonnet::put('file_permissions',  
  { $dsymb.$crsid => $file },$domain,$name);  
                     }  
                     $uploadedflag=1;                      $uploadedflag=1;
              } else {
       my ($dsymb,$crsid,$domain,$name)=&Apache::lonxml::whichuser();
                  &Apache::lonnet::unmark_as_readonly($domain,$name,$dsymb.$crsid);
                  $Apache::lonhomework::results{"resource.$part.$id.portfiles"}="";
            }             }
  $Apache::lonhomework::results{"resource.$part.$id.submission"}=$response;   $Apache::lonhomework::results{"resource.$part.$id.submission"}=$response;
  $Apache::lonhomework::results{"resource.$part.$id.awarddetail"}=$award;   $Apache::lonhomework::results{"resource.$part.$id.awarddetail"}=$award;
Removed from v.1.46  
changed lines
  Added in v.1.57

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