version 1.40, 2004/10/18 22:14:15
|
version 1.61, 2005/04/05 15:38:57
|
Line 48 sub start_essayresponse {
|
Line 48 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; |
my $uploadedfile= &HTML::Entities::encode($Apache::lonhomework::history{"resource.$part.$id.uploadedfile"},'<>&"'); |
|
$result='<br /><table border="1">'; |
$result='<br /><table border="1">'; |
$result.='<tr><td>'. |
$result.='<tr><td>'. |
'<a href='."'".'javascript:void(window.open("/adm/portfolio?action=selectfile&fieldname=HWPORT'.$part.'_'.$id.'","cat","height=400,'. |
'<input type="radio" name="HWDRAFT'.$part.'_'.$id.'" value="yes" checked="checked" /> '. |
'width=500,scrollbars=1,resizable=1,menubar=0,location=1"))'."'".'>Select Portfolio Files</a>'. |
|
'<br />'. |
|
'<input type="text" name="HWPORT'.$part.'_'.$id.'" value="Selected files will appear here." /><br />'. |
|
'<input type="radio" name="HWDRAFT'.$part.'_'.$id.'" value="yes" checked> '. |
|
&mt('Submit entries below as answer to receive credit').' <br />'. |
&mt('Submit entries below as answer to receive credit').' <br />'. |
'<input type="radio" name="HWDRAFT'.$part.'_'.$id.'" value="no"> '. |
'<input type="radio" name="HWDRAFT'.$part.'_'.$id.'" value="no" /> '. |
&mt('Save entries below as a draft answer (not submitting them for credit yet)'). |
&mt('Save entries below as a draft answer (not submitting them for credit yet)'). |
' </td></tr>'; |
' </td></tr>'; |
if ($ncol > 0) { |
if ($ncol > 0) { |
Line 68 sub start_essayresponse {
|
Line 63 sub start_essayresponse {
|
$result .= &check_collaborators($ncol,$coll) if ($coll =~ /\w+/); |
$result .= &check_collaborators($ncol,$coll) if ($coll =~ /\w+/); |
$result .='</td></tr>'; |
$result .='</td></tr>'; |
} |
} |
if ($uploadedfiletypes) { |
$result.=&Apache::inputtags::file_selector($part,$id, |
$result.='<tr><td>'.&mt('Submit a file:'). |
$uploadedfiletypes,'both'); |
' <input type="file" size="50" name="HWFILE'. |
|
$part.'_'.$id.'" onFocus="this.form.enctype='. |
|
"'multipart/form-data'".';" /><br />'. |
|
&mt('Allowed filetypes: <b>[_1]</b>',$uploadedfiletypes). |
|
'<br />'; |
|
if ($uploadedfile) { |
|
my $url=$Apache::lonhomework::history{"resource.$part.$id.uploadedurl"}; |
|
push (@Apache::lonxml::extlinks,$url); |
|
&Apache::lonnet::allowuploaded('/adm/essayresponse',$url); |
|
my $curfile='<a href="'.$url. |
|
'"><img src="/adm/lonIcons/unknown.gif" border=0" /> '. |
|
$uploadedfile.'</a>'; |
|
$result.=&mt('Currently submitted: <tt>[_1]</tt>',$curfile); |
|
} else { |
|
$result.=&mt('(Hand in a file you have prepared on your computer)'); |
|
} |
|
$result.='</td></tr>'; |
|
} |
|
$result.='</table>'; |
$result.='</table>'; |
} |
} |
return $result; |
return $result; |
Line 106 sub end_essayresponse {
|
Line 83 sub end_essayresponse {
|
$Apache::lonhomework::results{"resource.$part.$id.collaborators"}=$collaborators |
$Apache::lonhomework::results{"resource.$part.$id.collaborators"}=$collaborators |
if ($collaborators ne $previous_list); |
if ($collaborators ne $previous_list); |
} |
} |
if ( defined($ENV{'form.submitted'}) && |
if ( &Apache::response::submitted('scantron') ) { |
$ENV{'form.submitted'} eq 'scantron' ) { |
|
$increment=&Apache::response::scored_response($part,$id); |
$increment=&Apache::response::scored_response($part,$id); |
} elsif ( defined($ENV{'form.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.'.filename'}; |
my $portfiles = $ENV{'form.HWPORT'.$part.'_'.$id}; |
if (( $response =~ /[^\s]/) || ($filename =~ /[^\s]/)) { |
if (( $response =~ /[^\s]/) || ($filename =~ /[^\s]/) || ($portfiles =~ /[^\s]/)) { |
my $award; |
my $award='DRAFT'; |
if ($ENV{'form.HWDRAFT'.$part.'_'.$id} eq 'yes') { |
if ($ENV{'form.HWDRAFT'.$part.'_'.$id} eq 'yes') { |
$award='SUBMITTED'; |
$award='SUBMITTED'; |
} else { |
|
$award='DRAFT'; |
|
} |
} |
my $uploadedflag=0; |
my $uploadedflag=0; |
if ($filename =~ /[^\s]/) { |
&file_submission($part,$id,'filename',$award,\$uploadedflag); |
my $uploadedfiletypes= &Apache::lonnet::EXT("resource.$part".'_'."$id.uploadedfiletypes"); |
&file_submission($part,$id,'portfiles',$award,\$uploadedflag); |
$uploadedfiletypes=~s/[^\w\,]//g; |
|
$uploadedfiletypes=','.$uploadedfiletypes.','; |
|
my ($extension)=($filename=~/\.(\w+)$/); |
|
if ($uploadedfiletypes=~/\,$extension\,/i) { |
|
$Apache::lonhomework::results{"resource.$part.$id.uploadedfile"}=$filename; |
|
$Apache::lonhomework::results{"resource.$part.$id.uploadedurl"}= |
|
&Apache::lonnet::userfileupload('HWFILE'.$part.'_'.$id,undef,'essayresponse'); |
|
$uploadedflag=1; |
|
} else { |
|
$award='INVALID_FILETYPE'; |
|
} |
|
} |
|
$Apache::lonhomework::results{"resource.$part.$id.submission"}=$response; |
$Apache::lonhomework::results{"resource.$part.$id.submission"}=$response; |
$Apache::lonhomework::results{"resource.$part.$id.awarddetail"}=$award; |
$Apache::lonhomework::results{"resource.$part.$id.awarddetail"}=$award; |
my %previous=&Apache::response::check_for_previous($response,$part,$id); |
my %previous=&Apache::response::check_for_previous($response,$part,$id); |
Line 156 sub end_essayresponse {
|
Line 118 sub end_essayresponse {
|
&Apache::lonnet::put('nohist_essay_'.$apath, |
&Apache::lonnet::put('nohist_essay_'.$apath, |
{ $akey => $response },$adom,$aname); |
{ $akey => $response },$adom,$aname); |
} |
} |
} |
} |
} |
} |
} |
} |
} elsif ($target eq 'edit') { |
} elsif ($target eq 'edit') { |
$result.=&Apache::edit::end_table(); |
$result.=&Apache::edit::end_table(); |
} elsif ($target eq 'tex') { |
} elsif ($target eq 'tex') { |
Line 180 sub end_essayresponse {
|
Line 142 sub end_essayresponse {
|
&Apache::lonxml::increment_counter($increment); |
&Apache::lonxml::increment_counter($increment); |
} |
} |
&Apache::response::end_response; |
&Apache::response::end_response; |
|
|
return $result; |
return $result; |
} |
} |
|
|
|
sub file_submission { |
|
my ($part,$id,$which,$award,$uploadedflag)=@_; |
|
my $files; |
|
if ($which eq 'portfiles') { $files= $ENV{'form.HWPORT'.$part.'_'.$id}; } |
|
if ($which eq 'filename') { |
|
$files = $ENV{'form.HWFILE'.$part.'_'.$id.'.filename'}; |
|
} |
|
|
|
if ($files =~ /[^\s]/) { |
|
$files =~s/,$//; |
|
$Apache::lonhomework::results{"resource.$part.$id.$which"}=$files; |
|
my @submitted_files = split(/,/,$files); |
|
my $uploadedfiletypes= &Apache::lonnet::EXT("resource.$part".'_'."$id.uploadedfiletypes"); |
|
$uploadedfiletypes=~s/[^\w\,]//g; |
|
$uploadedfiletypes=','.$uploadedfiletypes.','; |
|
foreach my $file (@submitted_files) { |
|
my ($extension)=($file=~/\.(\w+)$/); |
|
unless ($uploadedfiletypes=~/\,$extension\,/i) { |
|
$award='INVALID_FILETYPE'; |
|
} |
|
} |
|
if ($award ne 'INVALID_FILETYPE' && ref($uploadedflag)) { |
|
$$uploadedflag=1; |
|
} |
|
if ($award ne 'INVALID_FILETYPE' && $which eq 'portfiles') { |
|
my ($symb,$crsid,$domain,$name)=&Apache::lonxml::whichuser(); |
|
&Apache::lonnet::unmark_as_readonly($domain,$name,$symb.$crsid); |
|
&Apache::lonnet::mark_as_readonly($domain,$name,\@submitted_files,$symb.$crsid); |
|
&Apache::lonnet::clear_selected_files($name); |
|
} |
|
if ($award ne 'INVALID_FILETYPE' && $which eq 'filename') { |
|
$Apache::lonhomework::results{"resource.$part.$id.uploadedfile"}= |
|
$files; |
|
$Apache::lonhomework::results{"resource.$part.$id.uploadedurl"}= |
|
&Apache::lonnet::userfileupload('HWFILE'.$part.'_'.$id,undef, |
|
'essayresponse'); |
|
} |
|
} elsif ($which eq 'portfiles' && |
|
$Apache::lonhomework::history{"resource.$part.$id.$which"}) { |
|
my ($symb,$crsid,$domain,$name)=&Apache::lonxml::whichuser(); |
|
&Apache::lonnet::unmark_as_readonly($domain,$name,$symb.$crsid); |
|
$Apache::lonhomework::results{"resource.$part.$id.$which"}=""; |
|
} |
|
} |
|
|
sub check_collaborators { |
sub check_collaborators { |
my ($ncol,$coll) = @_; |
my ($ncol,$coll) = @_; |
my %classlist=&Apache::lonnet::dump('classlist', |
my %classlist=&Apache::lonnet::dump('classlist', |