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

Diff for /loncom/homework/essayresponse.pm between versions 1.71 and 1.79

version 1.71, 2006/03/09 01:11:12 version 1.79, 2006/10/23 10:00:29
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 lib '/home/httpd/lib/perl/';
   use LONCAPA;
    
   
 BEGIN {  BEGIN {
     &Apache::lonxml::register('Apache::essayresponse',('essayresponse'));      &Apache::lonxml::register('Apache::essayresponse',('essayresponse'));
Line 49  sub start_essayresponse { Line 52  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'.   'Collaborators: <input type="text" size="70" max="80" name="HWCOL'.
Line 72  sub start_essayresponse { Line 81  sub start_essayresponse {
  $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 112  sub end_essayresponse { Line 147  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=$name.'.'.$domain.'.'.$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=~/^(\w+)\/(\w+)\/(.*)$/);
                         $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 136  sub end_essayresponse { Line 171  sub end_essayresponse {
   
     } elsif ($target eq 'answer') {      } elsif ($target eq 'answer') {
  $result.=&Apache::response::answer_header($$tagstack[-1]);   $result.=&Apache::response::answer_header($$tagstack[-1]);
  $result.=&Apache::response::answer_part($$tagstack[-1],'');   my $answer = &mt('Hand Graded.');
    $result.=&Apache::response::answer_part($$tagstack[-1],$answer,
    {'no_verbatim' => 1});
  $result.=&Apache::response::answer_footer($$tagstack[-1]);   $result.=&Apache::response::answer_footer($$tagstack[-1]);
     }      }
   
Line 165  sub file_submission { Line 202  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 183  sub file_submission { Line 220  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 197  sub file_submission { Line 234  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"}="";
     }      }
Removed from v.1.71  
changed lines
  Added in v.1.79

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