[LON-CAPA-cvs] cvs: loncom /homework essayresponse.pm
ng
lon-capa-cvs@mail.lon-capa.org
Wed, 24 Jul 2002 16:58:08 -0000
ng Wed Jul 24 12:58:08 2002 EDT
Modified files:
/loncom/homework essayresponse.pm
Log:
Add collaborator field - thanks to Gerd
Check for valid collaborators and maximum number.
However, cannot force students to change the number unless we trancate the
number.
Index: loncom/homework/essayresponse.pm
diff -u loncom/homework/essayresponse.pm:1.9 loncom/homework/essayresponse.pm:1.10
--- loncom/homework/essayresponse.pm:1.9 Fri Jul 19 16:43:11 2002
+++ loncom/homework/essayresponse.pm Wed Jul 24 12:58:08 2002
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# essay (ungraded) style responses
#
-# $Id: essayresponse.pm,v 1.9 2002/07/19 20:43:11 ng Exp $
+# $Id: essayresponse.pm,v 1.10 2002/07/24 16:58:08 ng Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -26,54 +26,96 @@
# http://www.lon-capa.org/
#
# 4/3 Guy
+# July, 2002, H. K. Ng
+#
package Apache::essayresponse;
use strict;
BEGIN {
- &Apache::lonxml::register('Apache::essayresponse',('essayresponse'));
+ &Apache::lonxml::register('Apache::essayresponse',('essayresponse'));
}
sub start_essayresponse {
- my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
- my $result;
- my $id = &Apache::response::start_response($parstack,$safeeval);
- if ($target eq 'meta') {
- $result=&Apache::response::meta_package_write('essayresponse');
- }
- if ($target eq 'web') {
- my $id = $Apache::inputtags::response['-1'];
- my $part= $Apache::inputtags::part;
- my $symb= &Apache::lonnet::symbread($ENV{'form.url'});
-# my $ncol= &Apache::lonnet::EXT('parameter\_$part\_$id\_maxcollaborators',$symb);
- my $ncol= &Apache::lonnet::get($symb,['parameter\_$part\_$id\_maxcollaborators']);
- $result ='<br />Collaborators: <input type="text" size="40" max="70" name="HWCOL'.
- $Apache::inputtags::response['-1'].'" /><br />'.$ncol.':<br>'.
- '(Enter collaborators using username or username@domain, e.g. smithje or doej@msu or smithje@fsu.)';
- }
- return $result;
+ my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
+ my $result;
+
+ if ($target eq 'web') {
+ my $part= $Apache::inputtags::part;
+ my $id = &Apache::response::start_response($parstack,$safeeval);
+
+ my $ncol= &Apache::lonnet::EXT("resource.$part".'_'."$id.maxcollaborators");
+ my $coll= &HTML::Entities::encode($Apache::lonhomework::history{"resource.$part.$id.collaborators"});
+ if ($ncol > 0) {
+ $result .='<br />Collaborators: <input type="text" size="70" max="80" name="HWCOL'.
+ $id.'" value="'.$coll.'" /><br />'.
+ '(Enter maximum '.$ncol.' collaborators using username or username@domain, e.g. '.
+ 'smithje or smithje@'.$ENV{'user.domain'}.'.)<br />';
+ $result .= &check_collaborators($ncol,$coll) if ($coll =~ /\w+/);
+ }
+ }
+ return $result;
}
sub end_essayresponse {
- my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
- if ( $target eq 'grade' ) {
- if ( defined $ENV{'form.submitted'}) {
- my $id = $Apache::inputtags::response['-1'];
- my $response = $ENV{'form.HWVAL'.$id};
- my $collaborators = $ENV{'form.HWCOL'.$id};
-# my $response = $ENV{'form.HWVAL'.$Apache::inputtags::response['-1']};
-# my $collaborators = $ENV{'form.HWCOL'.$Apache::inputtags::response['-1']};
- if ( $response =~ /[^\s]/) {
- my $part=$Apache::inputtags::part;
- $Apache::lonhomework::results{"resource.$part.$id.submission"}=$response;
- $Apache::lonhomework::results{"resource.$part.$id.awarddetail"}="SUBMITTED";
+ my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
+ my $part=$Apache::inputtags::part;
+ my $id = &Apache::response::start_response($parstack,$safeeval);
+ if ( $target eq 'grade' ) {
+ if ( defined $ENV{'form.submitted'}) {
+ my $response = $ENV{'form.HWVAL'.$id};
+ if ( $response =~ /[^\s]/) {
+ $Apache::lonhomework::results{"resource.$part.$id.submission"}=$response;
+ $Apache::lonhomework::results{"resource.$part.$id.awarddetail"}="SUBMITTED";
+ my %previous=&Apache::response::check_for_previous($response,$part,$id);
+ &Apache::response::handle_previous(\%previous,'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;
- my %previous=&Apache::response::check_for_previous($response,$part,$id);
- &Apache::response::handle_previous(\%previous,'SUBMITTED');
- }
- }
- }
- &Apache::response::end_response;
- return '';
+ $Apache::lonhomework::results{"resource.$part.$id.badcollaborators"}=(join(', ',@$badlist))
+ if (scalar(@$badlist) > 0);
+ $Apache::lonhomework::results{"resource.$part.$id.toomanycollaborators"}=$$toomany
+ if ($toomany > 0);
+ }
+ &Apache::response::end_response;
+ 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;