';
$result.=''.
+ '
'.
+ ' |
';
+ ''.
+ ' ';
if ($ncol > 0) {
- $result .='| '.
+ $result .=' |
'.'
';
$result .= &check_collaborators($ncol,$coll) if ($coll =~ /\w+/);
$result .=' |
';
}
- if ($uploadedfiletypes) {
- $result.=''.&mt('Submit a file: (only one file can be uploaded)').
- '
'.
- &mt('Allowed filetypes: [_1]',$uploadedfiletypes).'
'.
- 'OR:
Select Portfolio Files'.
- '
'.
- ''.
- '
';
- if ($Apache::lonhomework::history{"resource.$part.$id.portfiles"}=~/[^\s]/){
- $result.="Portfolio files previously selected: ".&Apache::lonnet::unescape($Apache::lonhomework::history{"resource.$part.$id.portfiles"})."
";
- }
-
- if ($uploadedfile) {
- my $url=$Apache::lonhomework::history{"resource.$part.$id.uploadedurl"};
- push (@Apache::lonxml::extlinks,$url);
- &Apache::lonnet::allowuploaded('/adm/essayresponse',$url);
- my $curfile=' '.
- $uploadedfile.'';
- $result.=&mt('Currently submitted: [_1]',$curfile);
- } else {
- $result.=&mt('(Hand in a file you have prepared on your computer)');
- }
- $result.=' |
';
- }
+ $result.=&Apache::inputtags::file_selector($part,$id,
+ $uploadedfiletypes,'both');
$result.='
';
}
return $result;
@@ -99,61 +83,29 @@ sub end_essayresponse {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
my $part = $Apache::inputtags::part;
my $id = $Apache::inputtags::response[-1];
- my $increment = 1;
+ my $increment = &Apache::response::repetition();
my $result;
if ( $target eq 'grade' ) {
- my $collaborators = $ENV{'form.HWCOL'.$part.'_'.$id};
+ my $collaborators = $env{'form.HWCOL'.$part.'_'.$id};
if ($collaborators =~ /[^\s]/) {
my $previous_list= &HTML::Entities::encode($Apache::lonhomework::history{"resource.$part.$id.collaborators"},'<>&"');
$Apache::lonhomework::results{"resource.$part.$id.collaborators"}=$collaborators
if ($collaborators ne $previous_list);
}
- if ( defined($ENV{'form.submitted'}) &&
- $ENV{'form.submitted'} eq 'scantron' ) {
+ if ( &Apache::response::submitted('scantron') ) {
$increment=&Apache::response::scored_response($part,$id);
- } elsif ( defined($ENV{'form.submitted'}) ) {
- my $response = $ENV{'form.HWVAL_'.$id};
- my $filename= $ENV{'form.HWFILE'.$part.'_'.$id.'.filename'};
- my $portfiles = $ENV{'form.HWPORT'.$part.'_'.$id};
+ } elsif ( &Apache::response::submitted() ) {
+ my $response = $env{'form.HWVAL_'.$id};
+ my $filename= $env{'form.HWFILE'.$part.'_'.$id.'.filename'};
+ my $portfiles = $env{'form.HWPORT'.$part.'_'.$id};
if (( $response =~ /[^\s]/) || ($filename =~ /[^\s]/) || ($portfiles =~ /[^\s]/)) {
- my $award;
- if ($ENV{'form.HWDRAFT'.$part.'_'.$id} eq 'yes') {
+ my $award='DRAFT';
+ if ($env{'form.HWDRAFT'.$part.'_'.$id} eq 'yes') {
$award='SUBMITTED';
- } else {
- $award='DRAFT';
}
my $uploadedflag=0;
- if ($filename =~ /[^\s]/) {
- my $uploadedfiletypes= &Apache::lonnet::EXT("resource.$part".'_'."$id.uploadedfiletypes");
- $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';
- }
- } else {
- $Apache::lonhomework::results{"resource.$part.$id.uploadedfile"}="";
- $Apache::lonhomework::results{"resource.$part.$id.uploadedurl"}="";
- }
- if ($portfiles =~ /[^\s]/) {
- $portfiles =~s/,$//;
- $Apache::lonhomework::results{"resource.$part.$id.portfiles"}=$portfiles;
- my @submitted_files = split /,/,$portfiles;
- my ($dsymb,$crsid,$domain,$name)=&Apache::lonxml::whichuser();
- &Apache::lonnet::unmark_as_readonly($domain,$name,$dsymb.$crsid);
- &Apache::lonnet::mark_as_readonly($domain,$name,\@submitted_files,$dsymb.$crsid);
- &Apache::lonnet::clear_selected_files($name);
- $uploadedflag=1;
- } else {
- my ($dsymb,$crsid,$domain,$name)=&Apache::lonxml::whichuser();
- &Apache::lonnet::unmark_as_readonly($domain,$name,$dsymb.$crsid);
- $Apache::lonhomework::results{"resource.$part.$id.portfiles"}="";
- }
+ &file_submission($part,$id,'filename',\$award,\$uploadedflag);
+ &file_submission($part,$id,'portfiles',\$award,\$uploadedflag);
$Apache::lonhomework::results{"resource.$part.$id.submission"}=$response;
$Apache::lonhomework::results{"resource.$part.$id.awarddetail"}=$award;
my %previous=&Apache::response::check_for_previous($response,$part,$id);
@@ -170,7 +122,7 @@ sub end_essayresponse {
&Apache::lonnet::declutter($ENV{'REQUEST_URI'});
my ($adom,$aname,$apath)=
($essayurl=~/^(\w+)\/(\w+)\/(.*)$/);
- $apath=&Apache::lonnet::escape($apath);
+ $apath=&escape($apath);
$apath=~s/\W/\_/gs;
&Apache::lonnet::put('nohist_essay_'.$apath,
{ $akey => $response },$adom,$aname);
@@ -180,20 +132,17 @@ sub end_essayresponse {
}
} elsif ($target eq 'edit') {
$result.=&Apache::edit::end_table();
- } elsif ($target eq 'tex') {
- if ($Apache::lonhomework::type eq 'exam') {
- my $repetition=&Apache::response::repetition();
- $result.='\begin{enumerate}';
- if ($ENV{'request.state'} eq "construct" ) {$result.='\item[\strut]';}
- for (my $i=0;$i<$repetition;$i++) {
- $result.='\item[\textbf{'.($Apache::lonxml::counter+$i).
- '}.]\textit{'.&mt('Leave blank on scoring form').
- '}\vskip 0 mm';
- }
- $result.= '\end{enumerate}';
- $increment=$repetition;
- }
+
+ } elsif ($target eq 'tex'
+ && $Apache::lonhomework::type eq 'exam') {
+ $result .= &Apache::inputtags::exam_score_line($target);
+
+ } elsif ($target eq 'answer') {
+ $result.=&Apache::response::answer_header($$tagstack[-1]);
+ $result.=&Apache::response::answer_part($$tagstack[-1],'');
+ $result.=&Apache::response::answer_footer($$tagstack[-1]);
}
+
if ($target eq 'grade' || $target eq 'web' || $target eq 'answer' ||
$target eq 'tex' || $target eq 'analyze') {
&Apache::lonxml::increment_counter($increment);
@@ -203,11 +152,65 @@ sub end_essayresponse {
return $result;
}
+sub file_submission {
+ my ($part,$id,$which,$award,$uploadedflag)=@_;
+ my $files;
+ my $jspart=$part;
+ $jspart=~s/\./_/g;
+ if ($which eq 'portfiles') { $files= $env{'form.HWPORT'.$jspart.'_'.$id}; }
+ if ($which eq 'filename') {
+ $files = $env{'form.HWFILE'.$jspart.'_'.$id.'.filename'};
+ }
+
+ if ($files =~ /[^\s]/) {
+ $files =~s/,$//;
+ $Apache::lonhomework::results{"resource.$part.$id.$which"}=$files;
+
+ my @submitted_files = ($files);
+ if ( $which eq 'portfiles' ) {
+ @submitted_files = split(/,/,$files);
+ }
+
+ my $uploadedfiletypes= &Apache::lonnet::EXT("resource.$part".'_'."$id.uploadedfiletypes");
+ if ($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'.$jspart.'_'.$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 {
my ($ncol,$coll) = @_;
my %classlist=&Apache::lonnet::dump('classlist',
- $ENV{'course.'.$ENV{'request.course.id'}.'.domain'},
- $ENV{'course.'.$ENV{'request.course.id'}.'.num'});
+ $env{'course.'.$env{'request.course.id'}.'.domain'},
+ $env{'course.'.$env{'request.course.id'}.'.num'});
my (@badcollaborators,$result);
my (@collaborators) = split(/\,?\s+/,$coll);
foreach (@collaborators) {
@@ -215,7 +218,7 @@ sub check_collaborators {
if (/@/) {
$collaborator =~ s/@/:/;
} else {
- $collaborator = $_.':'.$ENV{'user.domain'};
+ $collaborator = $_.':'.$env{'user.domain'};
}
push @badcollaborators, $_ if (!grep /^$collaborator/i,keys %classlist);
}