version 1.81, 2007/01/08 11:12:44
|
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; |
use LONCAPA qw(:DEFAULT :match); |
|
|
|
|
BEGIN { |
BEGIN { |
Line 70 sub start_essayresponse {
|
Line 70 sub start_essayresponse {
|
|
|
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>'; |
} |
} |
Line 148 sub end_essayresponse {
|
Line 151 sub end_essayresponse {
|
my ($symb,$crsid,$domain,$name)= |
my ($symb,$crsid,$domain,$name)= |
&Apache::lonnet::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)= |
Line 175 sub end_essayresponse {
|
Line 179 sub end_essayresponse {
|
{'no_verbatim' => 1}); |
{'no_verbatim' => 1}); |
$result.=&Apache::response::answer_footer($$tagstack[-1]); |
$result.=&Apache::response::answer_footer($$tagstack[-1]); |
} |
} |
|
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 210 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 245 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; |
} |
} |