[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.62

version 1.61, 2005/04/05 15:38:57 version 1.62, 2005/04/07 06:56:21
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 59  sub start_essayresponse { Line 59  sub start_essayresponse {
     $result .='<tr><td>'.      $result .='<tr><td>'.
  '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'}).'<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 77  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 86  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;
Line 127  sub end_essayresponse { Line 127  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 149  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 194  sub file_submission { Line 194  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 203  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.62

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