version 1.40, 2004/10/18 22:14:15
|
version 1.52, 2004/12/06 18:09:54
|
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,'. |
'<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 70 sub start_essayresponse {
|
Line 66 sub start_essayresponse {
|
} |
} |
if ($uploadedfiletypes) { |
if ($uploadedfiletypes) { |
$result.='<tr><td>'.&mt('Submit a file:'). |
$result.='<tr><td>'.&mt('Submit a file:'). |
' <input type="file" size="50" name="HWFILE'. |
' <br /><input type="file" size="50" name="HWFILE'. |
$part.'_'.$id.'" onFocus="this.form.enctype='. |
$part.'_'.$id.'" onFocus="this.form.enctype='. |
"'multipart/form-data'".';" /><br />'. |
"'multipart/form-data'".';" /><br />'. |
&mt('Allowed filetypes: <b>[_1]</b>',$uploadedfiletypes). |
&mt('Allowed filetypes: <b>[_1]</b>',$uploadedfiletypes).'<br />'. |
|
'<strong>OR:</strong><br /><a href='."'".'javascript:void(window.open("/adm/portfolio?mode=selectfile&fieldname=HWPORT'.$part.'_'.$id.'","cat","height=600,'. |
|
'width=600,scrollbars=1,resizable=1,menubar=2,location=1"))'."'".'>Select Portfolio Files</a>'. |
|
'<br />'. |
|
'<input type="text" size="50" name="HWPORT'.$part.'_'.$id.'" value="" />'. |
'<br />'; |
'<br />'; |
if ($uploadedfile) { |
if ($Apache::lonhomework::history{"resource.$part.$id.portfiles"}=~/[^\s]/){ |
|
$result.="Portfolio files previously selected: <strong>".&Apache::lonnet::unescape($Apache::lonhomework::history{"resource.$part.$id.portfiles"})."</strong><br />"; |
|
} |
|
|
|
if ($uploadedfile) { |
my $url=$Apache::lonhomework::history{"resource.$part.$id.uploadedurl"}; |
my $url=$Apache::lonhomework::history{"resource.$part.$id.uploadedurl"}; |
push (@Apache::lonxml::extlinks,$url); |
push (@Apache::lonxml::extlinks,$url); |
&Apache::lonnet::allowuploaded('/adm/essayresponse',$url); |
&Apache::lonnet::allowuploaded('/adm/essayresponse',$url); |
Line 112 sub end_essayresponse {
|
Line 116 sub end_essayresponse {
|
} elsif ( defined($ENV{'form.submitted'}) ) { |
} elsif ( defined($ENV{'form.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; |
if ($ENV{'form.HWDRAFT'.$part.'_'.$id} eq 'yes') { |
if ($ENV{'form.HWDRAFT'.$part.'_'.$id} eq 'yes') { |
$award='SUBMITTED'; |
$award='SUBMITTED'; |
} else { |
} else { |
$award='DRAFT'; |
$award='DRAFT'; |
Line 135 sub end_essayresponse {
|
Line 139 sub end_essayresponse {
|
$award='INVALID_FILETYPE'; |
$award='INVALID_FILETYPE'; |
} |
} |
} |
} |
|
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; |
|
} |
$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 170 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 194 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; |
} |
} |
|
|