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

Diff for /loncom/homework/essayresponse.pm between versions 1.69 and 1.88

version 1.69, 2005/11/15 22:19:57 version 1.88, 2008/08/28 00:14:42
Line 31  use strict; Line 31  use strict;
 use Apache::lonxml();  use Apache::lonxml();
 use Apache::lonnet;  use Apache::lonnet;
 use Apache::lonlocal;  use Apache::lonlocal;
   use LONCAPA qw(:DEFAULT :match);
    
   
 BEGIN {  BEGIN {
     &Apache::lonxml::register('Apache::essayresponse',('essayresponse'));      &Apache::lonxml::register('Apache::essayresponse',('essayresponse'));
Line 49  sub start_essayresponse { Line 51  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'.        &mt('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'}).        &mt('(Enter a maximum of [quant,_1,collaborator] using username or username:domain, e.g. smithje or smithje:[_2].)',$ncol,$env{'user.domain'});
                 '</label><br />';              if ($ncol > 1) {
                   $result .= '<br />'.&mt('If entering more than one, use spaces to separate the collaborators.');
               }
               $result .= '</label><br />';
     $result .= &check_collaborators($ncol,$coll) if ($coll =~ /\w+/);      $result .= &check_collaborators($ncol,$coll) if ($coll =~ /\w+/);
     $result .='</td></tr>';      $result .='</td></tr>';
  }   }
  $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 80  sub end_essayresponse { Line 117  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::inputtags::response[-1];      my $id            = $Apache::inputtags::response[-1];
     my $increment     = 1;      my $increment     = &Apache::response::repetition();
     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};
Line 112  sub end_essayresponse { Line 149  sub end_essayresponse {
 #  #
                 if ($award eq 'SUBMITTED') {                  if ($award eq 'SUBMITTED') {
     my ($symb,$crsid,$domain,$name)=      my ($symb,$crsid,$domain,$name)=
  &Apache::lonxml::whichuser();   &Apache::lonnet::whichuser();
     if ($crsid) {      if ($crsid) {
  my $akey=$name.'.'.$domain.'.'.$crsid;   my $akey=join('.',&escape($name),&escape($domain),
         &escape($crsid));
  my $essayurl=   my $essayurl=
     &Apache::lonnet::declutter($ENV{'REQUEST_URI'});      &Apache::lonnet::declutter($ENV{'REQUEST_URI'});
  my ($adom,$aname,$apath)=   my ($adom,$aname,$apath)=
     ($essayurl=~/^(\w+)\/(\w+)\/(.*)$/);      ($essayurl=~/^($LONCAPA::domain_re)\/($LONCAPA::username_re)\/(.*)$/);
                         $apath=&Apache::lonnet::escape($apath);                          $apath=&escape($apath);
  $apath=~s/\W/\_/gs;   $apath=~s/\W/\_/gs;
  &Apache::lonnet::put('nohist_essay_'.$apath,   &Apache::lonnet::put('nohist_essay_'.$apath,
  { $akey => $response },$adom,$aname);   { $akey => $response },$adom,$aname);
Line 129  sub end_essayresponse { Line 167  sub end_essayresponse {
  }    } 
     } elsif ($target eq 'edit') {      } elsif ($target eq 'edit') {
  $result.=&Apache::edit::end_table();   $result.=&Apache::edit::end_table();
     } elsif ($target eq 'tex') {  
  if ($Apache::lonhomework::type eq 'exam') {      } elsif ($target eq 'tex'
     my $repetition=&Apache::response::repetition();       && $Apache::lonhomework::type eq 'exam') {
     $result.='\begin{enumerate}';   $result .= &Apache::inputtags::exam_score_line($target);
     if ($env{'request.state'} eq "construct" ) {$result.='\item[\strut]';}  
     for (my $i=0;$i<$repetition;$i++) {      } elsif ($target eq 'answer') {
  $result.='\item[\textbf{'.($Apache::lonxml::counter+$i).   $result.=&Apache::response::answer_header($$tagstack[-1]);
     '}.]\textit{'.&mt('Leave blank on scoring form').   my $answer = &mt('Essay will be hand graded.');
     '}\vskip 0 mm';   $result.=&Apache::response::answer_part($$tagstack[-1],$answer,
     }   {'no_verbatim' => 1});
     $result.= '\end{enumerate}';   $result.=&Apache::response::answer_footer($$tagstack[-1]);
     $increment=$repetition;      }
  }      if ($target eq 'web') {
    &Apache::response::setup_prior_tries_hash(\&format_prior_response,
     ['portfiles',
      'uploadedurl']);
     }      }
   
     if ($target eq 'grade' || $target eq 'web' || $target eq 'answer' ||      if ($target eq 'grade' || $target eq 'web' || $target eq 'answer' ||
  $target eq 'tex' || $target eq 'analyze') {   $target eq 'tex' || $target eq 'analyze') {
  &Apache::lonxml::increment_counter($increment);   &Apache::lonxml::increment_counter($increment, "$part.$id");
   
    if ($target eq 'analyze') {
               $Apache::lonhomework::analyze{"$part.$id.type"} = 'essayresponse';
       &Apache::lonhomework::set_bubble_lines();
    }
     }      }
     &Apache::response::end_response;      &Apache::response::end_response;
   
     return $result;      return $result;
 }  }
   
   sub format_prior_response {
       my ($mode,$answer,$other_data) = @_;
       my $output;
   
       my (undef,undef,$udom,$uname) = &Apache::lonnet::whichuser();
       my $port_url = '/uploaded/'.$udom.'/'.$uname.'/portfolio/';
   
       my $file_list;
   
       foreach my $file (split(/\s*,\s*/,
       $other_data->[0].','.$other_data->[1])) {
    next if ($file!~/\S/);
    if ($file !~ m{^/uploaded/}) { $file=$port_url.$file; }
    $file=~s|/+|/|g;
    &Apache::lonnet::allowuploaded('/adm/essayresponse',$file);
    $file_list.='<li><span class="LC_nobreak"><a href="'.$file.'?rawmode=1" target="lonGRDs"><img src="'.
       &Apache::loncommon::icon($file).'" alt="file icon" border="0" /> '.$file.
       '</a></span></li>'."\n";
       }
       if ($file_list) {
    $output.= &mt('Submitted Files').'<ul>'.$file_list.'</ul>';
       }
       if ($answer =~ /\S/) {
    $output.='<p>'.&mt('Submitted text').
       '<blockquote>'.$answer.'</blockquote></p>';
       }
   
       return '<div class="LC_prior_essay">'.$output.'</div>';
   }
   
 sub file_submission {  sub file_submission {
     my ($part,$id,$which,$award,$uploadedflag)=@_;      my ($part,$id,$which,$award,$uploadedflag)=@_;
     my $files;      my $files;
Line 168  sub file_submission { Line 245  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");
Line 177  sub file_submission { Line 254  sub file_submission {
     $uploadedfiletypes=','.$uploadedfiletypes.',';      $uploadedfiletypes=','.$uploadedfiletypes.',';
     foreach my $file (@submitted_files) {      foreach my $file (@submitted_files) {
  my ($extension)=($file=~/\.(\w+)$/);   my ($extension)=($file=~/\.(\w+)$/);
  unless ($uploadedfiletypes=~/\,$extension\,/i) {   unless ($uploadedfiletypes=~/\,\s*\Q$extension\E\s*\,/i) {
     $$award='INVALID_FILETYPE';      $$award='INVALID_FILETYPE';
  }   }
     }      }
Line 186  sub file_submission { Line 263  sub file_submission {
     $$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::lonnet::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);
Line 200  sub file_submission { Line 277  sub file_submission {
  }   }
     } elsif ($which eq 'portfiles' &&      } elsif ($which eq 'portfiles' &&
      $Apache::lonhomework::history{"resource.$part.$id.$which"}) {       $Apache::lonhomework::history{"resource.$part.$id.$which"}) {
  my ($symb,$crsid,$domain,$name)=&Apache::lonxml::whichuser();   my ($symb,$crsid,$domain,$name)=&Apache::lonnet::whichuser();
  &Apache::lonnet::unmark_as_readonly($domain,$name,[$symb,$crsid]);   &Apache::lonnet::unmark_as_readonly($domain,$name,[$symb,$crsid]);
  $Apache::lonhomework::results{"resource.$part.$id.$which"}="";   $Apache::lonhomework::results{"resource.$part.$id.$which"}="";
     }      }
Line 212  sub check_collaborators { Line 289  sub check_collaborators {
  $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);    
     foreach (@collaborators) {      my (@collaborators) = split(/,?\s+/,$coll);
  my $collaborator = $_;      foreach my $entry (@collaborators) {
  if (/@/) {          my $collaborator;
     $collaborator =~ s/@/:/;   if ($entry =~ /:/) {
       $collaborator = $entry;
  } else {   } else {
     $collaborator = $_.':'.$env{'user.domain'};      $collaborator = $entry.':'.$env{'user.domain'};
  }   }
  push @badcollaborators, $_ if (!grep /^$collaborator/i,keys %classlist);          if ($collaborator !~ /^$match_username:$match_domain$/) {
               if (!grep(/^\Q$entry\E$/,@badcollaborators)) {
           push(@badcollaborators,$entry);
               }
           } elsif (!grep(/^\Q$collaborator\E$/i,keys(%classlist))) {
               if (!grep(/^\Q$entry\E$/,@badcollaborators)) {
                   push(@badcollaborators,$entry);
               }
           }
     }      }
           
     if (scalar(@badcollaborators)) {      my $numbad = scalar(@badcollaborators);
  $result = '<table border="0"><tr bgcolor="#ffbbbb"><td> The following user'.      if ($numbad) {
     (scalar(@badcollaborators) > 1 ? 's are' : ' is').' invalid: '.   $result = '<table border="0"><tr bgcolor="#ffbbbb"><td>';
     join(', ',@badcollaborators).'. Please correct.</td></tr></table>';          if ($numbad == 1) {
               $result .= &mt('The following user is invalid:');
           } else {
               $result .= &mt('The following [_1] users are invalid:',$numbad);
           }
    $result .= ' '.join(', ',@badcollaborators).'. '.&mt('Please correct.').
                      '</td></tr></table>';
     }      }
     my $toomany = scalar(@collaborators) - $ncol;      my $toomany = scalar(@collaborators) - $ncol;
     if ($toomany > 0) {      if ($toomany > 0) {
  $result .= '<table border="0"><tr bgcolor="#ffbbbb"><td>'.   $result .= '<table border="0"><tr bgcolor="#ffbbbb"><td>'.
     'You have too many collaborators. Please remove '.$toomany.' collaborator'.             &mt('You have too many collaborators.').' '.
     ($toomany > 1 ? 's' :'').'.</td></tr></table>';                     &mt('Please remove [quant,_1,collaborator].',$toomany).
              '</td></tr></table>';
     }      }
     return $result;      return $result;
 }  }
Removed from v.1.69  
changed lines
  Added in v.1.88

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