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.40 and 1.41

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

version 1.40, 2004/10/18 22:14:15	version 1.41, 2004/10/19 19:14:51
Line 51 sub start_essayresponse {	Line 51 sub start_essayresponse {
my $uploadedfile= &HTML::Entities::encode($Apache::lonhomework::history{"resource.$part.$id.uploadedfile"},'<>&"');	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,'.	'<a href='."'".'javascript:void(window.open("/adm/portfolio?mode=selectfile&fieldname=HWPORT'.$part.'_'.$id.'","cat","height=400,'.
'width=500,scrollbars=1,resizable=1,menubar=0,location=1"))'."'".'>Select Portfolio Files</a>'.	'width=500,scrollbars=1,resizable=1,menubar=0,location=1"))'."'".'>Select Portfolio Files</a>'.
'<br />'.	'<br />'.
'<input type="text" name="HWPORT'.$part.'_'.$id.'" value="Selected files will appear here." /><br />'.	'<input type="text" name="HWPORT'.$part.'_'.$id.'" value="Selected files will appear here." /><br />'.
Line 113 sub end_essayresponse {	Line 113 sub end_essayresponse {
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.'.filename'};
if (( $response =~ /[^\s]/) \|\| ($filename =~ /[^\s]/)) {	if (( $response =~ /[^\s]/) \|\| ($filename =~ /[^\s]/) \|\| ($portfiles != "Selected files will appear here.")) {
my $award;	my $award;
if ($ENV{'form.HWDRAFT'.$part.'_'.$id} eq 'yes') {	if ($ENV{'form.HWDRAFT'.$part.'_'.$id} eq 'yes') {
$award='SUBMITTED';	$award='SUBMITTED';
Line 135 sub end_essayresponse {	Line 135 sub end_essayresponse {
$award='INVALID_FILETYPE';	$award='INVALID_FILETYPE';
}	}
}	}
	if ($portfiles != "Selected files will appear here.") {
	$Apache::lonhomework::results{"resource.$part.$id.portfiles"}=$portfiles;
	}
$Apache::lonhomework::results{"resource.$part.$id.submission"}=$response;	$Apache::lonhomework::results{"resource.$part.$id.submission"}=$response;
	$Apache::lonhomework::results{"resource.$part.$id.submission"}=$portfiles;
$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);
unless ($uploadedflag) { &Apache::response::handle_previous(\%previous,$award); }	unless ($uploadedflag) { &Apache::response::handle_previous(\%previous,$award); }

Removed from v.1.40
changed lines
	Added in v.1.41