loncom/homework/essayresponse.pm - diff

Return to essayresponse.pm CVS log

Up to [LON-CAPA] / loncom / homework

Diff for /loncom/homework/essayresponse.pm between versions 1.97 and 1.100.4.1

version 1.97, 2009/01/01 16:45:32	version 1.100.4.1, 2009/09/11 16:34:09
Line 60 sub start_essayresponse {	Line 60 sub start_essayresponse {
}	}
$result.='<br /><table border="1">';	$result.='<br /><table border="1">';
if ( $Apache::lonhomework::type ne 'survey' ) {	if ( $Apache::lonhomework::type ne 'survey' ) {
$result.= '<tr><td>'.	if ($env{'request.uri'} eq '/res/gci/gci/internal/submission.problem') {
'<label>'.	$result .= '<input type="hidden" name="HWDRAFT'.$part.'_'.$id.'" value="yes" />';
'<input type="radio" name="HWDRAFT'.$part.'_'.$id.'" value="yes" checked="checked" /> '.	} else {
&mt('Submit entries below as answer to receive credit').	$result.= '<tr><td>'.
'</label> <br />'.	'<label>'.
'<label>'.	'<input type="radio" name="HWDRAFT'.$part.'_'.$id.'" value="yes" checked="checked" /> '.
'<input type="radio" name="HWDRAFT'.$part.'_'.$id.'" value="no" /> '.	&mt('Submit entries below as answer to receive credit').
&mt('Save entries below as a draft answer (not submitting them for credit yet)').	'</label> <br />'.
'</label>'.	'<label>'.
'</td></tr>';	'<input type="radio" name="HWDRAFT'.$part.'_'.$id.'" value="no" /> '.
}	&mt('Save entries below as a draft answer (not submitting them for credit yet)').
	'</label>'.
	'</td></tr>';
	}
	}

if ($ncol > 0) {	if ($ncol > 0) {
$result .='<tr><td>'.'<label>'.	$result .='<tr><td>'.'<label>'.
Line 267 sub file_submission {	Line 271 sub file_submission {
}	}
my $uploadedfiletypes=	my $uploadedfiletypes=
&Apache::lonnet::EXT("resource.$part".'_'."$id.uploadedfiletypes");	&Apache::lonnet::EXT("resource.$part".'_'."$id.uploadedfiletypes");
if ($uploadedfiletypes) {	if ($uploadedfiletypes ne '') {
$uploadedfiletypes=~s/[^\w\,]//g;	$uploadedfiletypes=~s/[^\w\,]//g;
$uploadedfiletypes=','.$uploadedfiletypes.',';	$uploadedfiletypes=','.$uploadedfiletypes.',';
foreach my $file (@submitted_files) {	foreach my $file (@submitted_files) {
Line 281 sub file_submission {	Line 285 sub file_submission {
}	}
}	}
}	}
	} else {
	@acceptable_files = @submitted_files;
}	}
my $maxfilesize=&Apache::lonnet::EXT("resource.$part".'_'."$id.maxfilesize");	my $maxfilesize=&Apache::lonnet::EXT("resource.$part".'_'."$id.maxfilesize");
if (!$maxfilesize) {	if (!$maxfilesize) {
Line 378 sub file_submission {	Line 384 sub file_submission {
$Apache::lonhomework::results{"resource.$part.$id.uploadedurl"}=	$Apache::lonhomework::results{"resource.$part.$id.uploadedurl"}=
&Apache::lonnet::userfileupload('HWFILE'.$jspart.'_'.$id,undef,	&Apache::lonnet::userfileupload('HWFILE'.$jspart.'_'.$id,undef,
$subdir);	$subdir);
&Apache::lonnet::delenv($env{'form.HWFILE'.$jspart.'_'.$id});	delete($env{'form.HWFILE'.$jspart.'_'.$id});
}	}
} elsif ($which eq 'portfiles' &&	} elsif ($which eq 'portfiles' &&
$Apache::lonhomework::history{"resource.$part.$id.$which"}) {	$Apache::lonhomework::history{"resource.$part.$id.$which"}) {
Line 390 sub file_submission {	Line 396 sub file_submission {

sub delete_form_items {	sub delete_form_items {
my ($jspart,$id) = @_;	my ($jspart,$id) = @_;
&Apache::lonnet::delenv($env{'form.HWFILE'.$jspart.'_'.$id.'.filename'});	delete($env{'form.HWFILE'.$jspart.'_'.$id.'.filename'});
&Apache::lonnet::delenv($env{'form.HWFILE'.$jspart.'_'.$id.'.mimetype'});	delete($env{'form.HWFILE'.$jspart.'_'.$id.'.mimetype'});
&Apache::lonnet::delenv($env{'form.HWFILE'.$jspart.'_'.$id});	delete($env{'form.HWFILE'.$jspart.'_'.$id});
}	}

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

Removed from v.1.97
changed lines
	Added in v.1.100.4.1