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

Diff for /loncom/homework/essayresponse.pm between versions 1.61 and 1.65

version 1.61, 2005/04/05 15:38:57 version 1.65, 2005/05/03 05:31:51
Line 29 Line 29
 package Apache::essayresponse;  package Apache::essayresponse;
 use strict;  use strict;
 use Apache::lonxml();  use Apache::lonxml();
 use Apache::lonnet();  use Apache::lonnet;
 use Apache::lonlocal;  use Apache::lonlocal;
   
 BEGIN {  BEGIN {
Line 50  sub start_essayresponse { Line 50  sub start_essayresponse {
         $uploadedfiletypes=~s/[^\w\,]//g;          $uploadedfiletypes=~s/[^\w\,]//g;
  $result='<br /><table border="1">';   $result='<br /><table border="1">';
  $result.='<tr><td>'.   $result.='<tr><td>'.
               '<label>'.
     '<input type="radio" name="HWDRAFT'.$part.'_'.$id.'" value="yes" checked="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').
     '<input type="radio" name="HWDRAFT'.$part.'_'.$id.'" value="no" /> '.              '</label> <br />'.
       '<label>'.
               '<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>';      '</label>'.
               ' </td></tr>';
  if ($ncol > 0) {   if ($ncol > 0) {
     $result .='<tr><td>'.      $result .='<tr><td>'.'<label>'.
  'Collaborators: <input type="text" size="70" max="80" name="HWCOL'.   'Collaborators: <input type="text" size="70" max="80" name="HWCOL'.
  $part.'_'.$id.'" value="'.$coll.'" /><br />'.   $part.'_'.$id.'" value="'.$coll.'" /><br />'.
  &mt('(Enter maximum [_1] collaborators using username or username@domain, e.g. smithje or smithje@[_2].)',$ncol,$ENV{'user.domain'}).'<br />';   &mt('(Enter maximum [_1] collaborators using username or username@domain, e.g. smithje or smithje@[_2].)',$ncol,$env{'user.domain'}).
                   '</label><br />';
     $result .= &check_collaborators($ncol,$coll) if ($coll =~ /\w+/);      $result .= &check_collaborators($ncol,$coll) if ($coll =~ /\w+/);
     $result .='</td></tr>';      $result .='</td></tr>';
  }   }
Line 77  sub end_essayresponse { Line 82  sub end_essayresponse {
     my $increment     = 1;      my $increment     = 1;
     my $result;      my $result;
     if ( $target eq 'grade' ) {      if ( $target eq 'grade' ) {
  my $collaborators = $ENV{'form.HWCOL'.$part.'_'.$id};   my $collaborators = $env{'form.HWCOL'.$part.'_'.$id};
  if ($collaborators =~ /[^\s]/) {   if ($collaborators =~ /[^\s]/) {
     my $previous_list= &HTML::Entities::encode($Apache::lonhomework::history{"resource.$part.$id.collaborators"},'<>&"');      my $previous_list= &HTML::Entities::encode($Apache::lonhomework::history{"resource.$part.$id.collaborators"},'<>&"');
     $Apache::lonhomework::results{"resource.$part.$id.collaborators"}=$collaborators      $Apache::lonhomework::results{"resource.$part.$id.collaborators"}=$collaborators
Line 86  sub end_essayresponse { Line 91  sub end_essayresponse {
  if (  &Apache::response::submitted('scantron') ) {   if (  &Apache::response::submitted('scantron') ) {
     $increment=&Apache::response::scored_response($part,$id);      $increment=&Apache::response::scored_response($part,$id);
  } elsif ( &Apache::response::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};
     if (( $response =~ /[^\s]/) || ($filename =~ /[^\s]/) || ($portfiles =~ /[^\s]/)) {      if (( $response =~ /[^\s]/) || ($filename =~ /[^\s]/) || ($portfiles =~ /[^\s]/)) {
   my $award='DRAFT';    my $award='DRAFT';
         if ($ENV{'form.HWDRAFT'.$part.'_'.$id} eq 'yes') {          if ($env{'form.HWDRAFT'.$part.'_'.$id} eq 'yes') {
     $award='SUBMITTED';      $award='SUBMITTED';
  }   }
                 my $uploadedflag=0;                  my $uploadedflag=0;
  &file_submission($part,$id,'filename',$award,\$uploadedflag);   &file_submission($part,$id,'filename',\$award,\$uploadedflag);
  &file_submission($part,$id,'portfiles',$award,\$uploadedflag);   &file_submission($part,$id,'portfiles',\$award,\$uploadedflag);
  $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;
  my %previous=&Apache::response::check_for_previous($response,$part,$id);   my %previous=&Apache::response::check_for_previous($response,$part,$id);
Line 127  sub end_essayresponse { Line 132  sub end_essayresponse {
  if ($Apache::lonhomework::type eq 'exam') {   if ($Apache::lonhomework::type eq 'exam') {
     my $repetition=&Apache::response::repetition();      my $repetition=&Apache::response::repetition();
     $result.='\begin{enumerate}';      $result.='\begin{enumerate}';
     if ($ENV{'request.state'} eq "construct" ) {$result.='\item[\strut]';}      if ($env{'request.state'} eq "construct" ) {$result.='\item[\strut]';}
     for (my $i=0;$i<$repetition;$i++) {      for (my $i=0;$i<$repetition;$i++) {
  $result.='\item[\textbf{'.($Apache::lonxml::counter+$i).   $result.='\item[\textbf{'.($Apache::lonxml::counter+$i).
     '}.]\textit{'.&mt('Leave blank on scoring form').      '}.]\textit{'.&mt('Leave blank on scoring form').
Line 149  sub end_essayresponse { Line 154  sub end_essayresponse {
 sub file_submission {  sub file_submission {
     my ($part,$id,$which,$award,$uploadedflag)=@_;      my ($part,$id,$which,$award,$uploadedflag)=@_;
     my $files;      my $files;
     if ($which eq 'portfiles') { $files= $ENV{'form.HWPORT'.$part.'_'.$id}; }      if ($which eq 'portfiles') { $files= $env{'form.HWPORT'.$part.'_'.$id}; }
     if ($which eq 'filename') {      if ($which eq 'filename') {
  $files = $ENV{'form.HWFILE'.$part.'_'.$id.'.filename'};   $files = $env{'form.HWFILE'.$part.'_'.$id.'.filename'};
     }      }
           
     if ($files =~ /[^\s]/) {      if ($files =~ /[^\s]/) {
Line 159  sub file_submission { Line 164  sub file_submission {
  $Apache::lonhomework::results{"resource.$part.$id.$which"}=$files;   $Apache::lonhomework::results{"resource.$part.$id.$which"}=$files;
  my @submitted_files = split(/,/,$files);   my @submitted_files = split(/,/,$files);
  my $uploadedfiletypes= &Apache::lonnet::EXT("resource.$part".'_'."$id.uploadedfiletypes");   my $uploadedfiletypes= &Apache::lonnet::EXT("resource.$part".'_'."$id.uploadedfiletypes");
  $uploadedfiletypes=~s/[^\w\,]//g;   if ($uploadedfiletypes) {
  $uploadedfiletypes=','.$uploadedfiletypes.',';      $uploadedfiletypes=~s/[^\w\,]//g;
  foreach my $file (@submitted_files) {      $uploadedfiletypes=','.$uploadedfiletypes.',';
     my ($extension)=($file=~/\.(\w+)$/);      foreach my $file (@submitted_files) {
     unless ($uploadedfiletypes=~/\,$extension\,/i) {   my ($extension)=($file=~/\.(\w+)$/);
  $award='INVALID_FILETYPE';   unless ($uploadedfiletypes=~/\,$extension\,/i) {
       $$award='INVALID_FILETYPE';
    }
     }      }
  }   }
  if ($award ne 'INVALID_FILETYPE' && ref($uploadedflag)) {   if ($$award ne 'INVALID_FILETYPE' && ref($uploadedflag)) {
     $$uploadedflag=1;      $$uploadedflag=1;
  }   }
  if ($award ne 'INVALID_FILETYPE' && $which eq 'portfiles') {   if ($$award ne 'INVALID_FILETYPE' && $which eq 'portfiles') {
     my ($symb,$crsid,$domain,$name)=&Apache::lonxml::whichuser();      my ($symb,$crsid,$domain,$name)=&Apache::lonxml::whichuser();
     &Apache::lonnet::unmark_as_readonly($domain,$name,$symb.$crsid);      &Apache::lonnet::unmark_as_readonly($domain,$name,$symb.$crsid);
     &Apache::lonnet::mark_as_readonly($domain,$name,\@submitted_files,$symb.$crsid);      &Apache::lonnet::mark_as_readonly($domain,$name,\@submitted_files,$symb.$crsid);
     &Apache::lonnet::clear_selected_files($name);      &Apache::lonnet::clear_selected_files($name);
  }   }
  if ($award ne 'INVALID_FILETYPE' && $which eq 'filename') {   if ($$award ne 'INVALID_FILETYPE' && $which eq 'filename') {
     $Apache::lonhomework::results{"resource.$part.$id.uploadedfile"}=      $Apache::lonhomework::results{"resource.$part.$id.uploadedfile"}=
  $files;   $files;
     $Apache::lonhomework::results{"resource.$part.$id.uploadedurl"}=      $Apache::lonhomework::results{"resource.$part.$id.uploadedurl"}=
Line 194  sub file_submission { Line 201  sub file_submission {
 sub check_collaborators {  sub check_collaborators {
     my ($ncol,$coll) = @_;      my ($ncol,$coll) = @_;
     my %classlist=&Apache::lonnet::dump('classlist',      my %classlist=&Apache::lonnet::dump('classlist',
  $ENV{'course.'.$ENV{'request.course.id'}.'.domain'},   $env{'course.'.$env{'request.course.id'}.'.domain'},
  $ENV{'course.'.$ENV{'request.course.id'}.'.num'});   $env{'course.'.$env{'request.course.id'}.'.num'});
     my (@badcollaborators,$result);      my (@badcollaborators,$result);
     my (@collaborators) = split(/\,?\s+/,$coll);      my (@collaborators) = split(/\,?\s+/,$coll);
     foreach (@collaborators) {      foreach (@collaborators) {
Line 203  sub check_collaborators { Line 210  sub check_collaborators {
  if (/@/) {   if (/@/) {
     $collaborator =~ s/@/:/;      $collaborator =~ s/@/:/;
  } else {   } else {
     $collaborator = $_.':'.$ENV{'user.domain'};      $collaborator = $_.':'.$env{'user.domain'};
  }   }
  push @badcollaborators, $_ if (!grep /^$collaborator/i,keys %classlist);   push @badcollaborators, $_ if (!grep /^$collaborator/i,keys %classlist);
     }      }
Removed from v.1.61  
changed lines
  Added in v.1.65

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