Diff for /loncom/homework/essayresponse.pm between versions 1.9 and 1.10

version 1.9, 2002/07/19 20:43:11 version 1.10, 2002/07/24 16:58:08
Line 26 Line 26
 # http://www.lon-capa.org/  # http://www.lon-capa.org/
 #  #
 # 4/3 Guy  # 4/3 Guy
   # July, 2002, H. K. Ng
   #
 package Apache::essayresponse;  package Apache::essayresponse;
 use strict;  use strict;
   
 BEGIN {  BEGIN {
   &Apache::lonxml::register('Apache::essayresponse',('essayresponse'));      &Apache::lonxml::register('Apache::essayresponse',('essayresponse'));
 }  }
   
 sub start_essayresponse {  sub start_essayresponse {
   my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;      my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
   my $result;      my $result;
   my $id = &Apache::response::start_response($parstack,$safeeval);  
   if ($target eq 'meta') {      if ($target eq 'web') {
     $result=&Apache::response::meta_package_write('essayresponse');   my $part= $Apache::inputtags::part;
   }   my $id  = &Apache::response::start_response($parstack,$safeeval);
   if ($target eq 'web') {  
       my $id  = $Apache::inputtags::response['-1'];   my $ncol= &Apache::lonnet::EXT("resource.$part".'_'."$id.maxcollaborators");
       my $part= $Apache::inputtags::part;   my $coll= &HTML::Entities::encode($Apache::lonhomework::history{"resource.$part.$id.collaborators"});
       my $symb= &Apache::lonnet::symbread($ENV{'form.url'});   if ($ncol > 0) {
 #      my $ncol= &Apache::lonnet::EXT('parameter\_$part\_$id\_maxcollaborators',$symb);      $result .='<br />Collaborators: <input type="text" size="70" max="80" name="HWCOL'.
       my $ncol= &Apache::lonnet::get($symb,['parameter\_$part\_$id\_maxcollaborators']);   $id.'" value="'.$coll.'" /><br />'.
       $result ='<br />Collaborators: <input type="text" size="40" max="70" name="HWCOL'.   '(Enter maximum '.$ncol.' collaborators using username or username@domain, e.g. '.
               $Apache::inputtags::response['-1'].'" /><br />'.$ncol.':<br>'.   'smithje or smithje@'.$ENV{'user.domain'}.'.)<br />';
       '(Enter collaborators using username or username@domain, e.g. smithje or doej@msu or smithje@fsu.)';      $result .= &check_collaborators($ncol,$coll) if ($coll =~ /\w+/);
   }   }
   return $result;      }
       return $result;
 }  }
   
 sub end_essayresponse {  sub end_essayresponse {
   my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;      my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
   if ( $target eq 'grade' ) {      my $part=$Apache::inputtags::part;
     if ( defined $ENV{'form.submitted'}) {      my $id  = &Apache::response::start_response($parstack,$safeeval);
       my $id            = $Apache::inputtags::response['-1'];      if ( $target eq 'grade' ) {
       my $response      = $ENV{'form.HWVAL'.$id};   if ( defined $ENV{'form.submitted'}) {
       my $collaborators = $ENV{'form.HWCOL'.$id};      my $response      = $ENV{'form.HWVAL'.$id};
 #      my $response = $ENV{'form.HWVAL'.$Apache::inputtags::response['-1']};      if ( $response =~ /[^\s]/) {
 #      my $collaborators = $ENV{'form.HWCOL'.$Apache::inputtags::response['-1']};   $Apache::lonhomework::results{"resource.$part.$id.submission"}=$response;
       if ( $response =~ /[^\s]/) {   $Apache::lonhomework::results{"resource.$part.$id.awarddetail"}="SUBMITTED";
  my $part=$Apache::inputtags::part;   my %previous=&Apache::response::check_for_previous($response,$part,$id);
  $Apache::lonhomework::results{"resource.$part.$id.submission"}=$response;   &Apache::response::handle_previous(\%previous,'SUBMITTED');
  $Apache::lonhomework::results{"resource.$part.$id.awarddetail"}="SUBMITTED";      }
    }
       }
       my $collaborators = $ENV{'form.HWCOL'.$id};
       if ($collaborators =~ /[^\s]/) {
    my $ncol= &Apache::lonnet::EXT("resource.$part".'_'."$id.maxcollaborators");
    my ($badlist,$toomany) = &check_collaborators($ncol,$collaborators,'yes');
  $Apache::lonhomework::results{"resource.$part.$id.collaborators"}=$collaborators;   $Apache::lonhomework::results{"resource.$part.$id.collaborators"}=$collaborators;
  my %previous=&Apache::response::check_for_previous($response,$part,$id);   $Apache::lonhomework::results{"resource.$part.$id.badcollaborators"}=(join(', ',@$badlist)) 
  &Apache::response::handle_previous(\%previous,'SUBMITTED');      if (scalar(@$badlist) > 0);
       }   $Apache::lonhomework::results{"resource.$part.$id.toomanycollaborators"}=$$toomany 
     }      if ($toomany > 0);
   }      }
   &Apache::response::end_response;      &Apache::response::end_response;
   return '';      return '';
   }
   
   sub check_collaborators {
       my ($ncol,$coll,$retbad) = @_;
       my %classlist=&Apache::lonnet::dump('classlist',
    $ENV{'course.'.$ENV{'request.course.id'}.'.domain'},
    $ENV{'course.'.$ENV{'request.course.id'}.'.num'});
       my (@badcollaborators,$result);
       my (@collaborators) = split(/\,?\s+/,$coll);
       foreach (@collaborators) {
    my $collaborator = $_;
    if (/@/) {
       $collaborator =~ s/@/:/;
    } else {
       $collaborator = $_.':'.$ENV{'user.domain'};
    }
    push @badcollaborators, $_ if (!grep /^$collaborator/i,keys %classlist);
       }
       
       if (scalar(@badcollaborators)) {
    my $badlist = sprintf ("The following user%s invalid: ",
          (scalar(@badcollaborators) > 1 ? 's are' : ' is'));
    $result .= '<table border="0"><tr bgcolor="#ffbbbb"><td>'.
       $badlist.join(', ',@badcollaborators).'. Please correct.</td></tr></table>';
       }
       my $toomany = scalar(@collaborators) - $ncol;
       if ($toomany > 0) {
    $result .= '<table border="0"><tr bgcolor="#ffbbbb"><td>'.
       'You have too many collaborators. Please remove '.$toomany.' collaborator'.
       ($toomany > 1 ? 's' :'').'.</td></tr></table>';
       }
       return (\@badcollaborators,\$toomany) if ($retbad eq 'yes');
       return $result;
 }  }
   
 1;  1;

Removed from v.1.9  
changed lines
  Added in v.1.10


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