version 1.34, 2004/03/31 05:23:59
|
version 1.41, 2004/10/19 19:14:51
|
Line 44 sub start_essayresponse {
|
Line 44 sub start_essayresponse {
|
$result=&Apache::response::meta_package_write('essayresponse'); |
$result=&Apache::response::meta_package_write('essayresponse'); |
} elsif ($target eq 'web') { |
} elsif ($target eq 'web') { |
my $part= $Apache::inputtags::part; |
my $part= $Apache::inputtags::part; |
|
|
my $ncol= &Apache::lonnet::EXT("resource.$part".'_'."$id.maxcollaborators"); |
my $ncol= &Apache::lonnet::EXT("resource.$part".'_'."$id.maxcollaborators"); |
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"); |
Line 52 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?mode=selectfile&fieldname=HWPORT'.$part.'_'.$id.'","cat","height=400,'. |
|
'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> '. |
'<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"> '. |
Line 73 sub start_essayresponse {
|
Line 76 sub start_essayresponse {
|
&mt('Allowed filetypes: <b>[_1]</b>',$uploadedfiletypes). |
&mt('Allowed filetypes: <b>[_1]</b>',$uploadedfiletypes). |
'<br />'; |
'<br />'; |
if ($uploadedfile) { |
if ($uploadedfile) { |
my $curfile='<a href="'.&Apache::lonnet::tokenwrapper($Apache::lonhomework::history{"resource.$part.$id.uploadedurl"}). |
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" /> '. |
'"><img src="/adm/lonIcons/unknown.gif" border=0" /> '. |
$uploadedfile.'</a>'; |
$uploadedfile.'</a>'; |
$result.=&mt('Currently submitted: <tt>[_1]</tt>',$curfile); |
$result.=&mt('Currently submitted: <tt>[_1]</tt>',$curfile); |
Line 106 sub end_essayresponse {
|
Line 112 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'}; |
if (( $response =~ /[^\s]/) || ($filename =~ /[^\s]/)) { |
my $portfiles = $ENV{'form.HWPORT'.$part.'_'.$id.'.filename'}; |
|
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 122 sub end_essayresponse {
|
Line 129 sub end_essayresponse {
|
if ($uploadedfiletypes=~/\,$extension\,/i) { |
if ($uploadedfiletypes=~/\,$extension\,/i) { |
$Apache::lonhomework::results{"resource.$part.$id.uploadedfile"}=$filename; |
$Apache::lonhomework::results{"resource.$part.$id.uploadedfile"}=$filename; |
$Apache::lonhomework::results{"resource.$part.$id.uploadedurl"}= |
$Apache::lonhomework::results{"resource.$part.$id.uploadedurl"}= |
&Apache::lonnet::userfileupload('HWFILE'.$part.'_'.$id); |
&Apache::lonnet::userfileupload('HWFILE'.$part.'_'.$id,undef,'essayresponse'); |
$uploadedflag=1; |
$uploadedflag=1; |
} else { |
} else { |
$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); } |
Line 158 sub end_essayresponse {
|
Line 169 sub end_essayresponse {
|
if ($Apache::lonhomework::type eq 'exam') { |
if ($Apache::lonhomework::type eq 'exam') { |
my $repetition=&Apache::response::repetition(); |
my $repetition=&Apache::response::repetition(); |
$result.='\begin{enumerate}'; |
$result.='\begin{enumerate}'; |
|
if ($ENV{'request.state'} eq "construct" ) {$result.='\item[\strut]';} |
for (my $i=0;$i<$repetition;$i++) { |
for (my $i=0;$i<$repetition;$i++) { |
$result.='\item[\textbf{'.($Apache::lonxml::counter+$i). |
$result.='\item[\textbf{'.($Apache::lonxml::counter+$i). |
'}.]\textit{'.&mt('Leave blank on scoring form'). |
'}.]\textit{'.&mt('Leave blank on scoring form'). |
'}\vskip 0 mm'; |
'}\vskip 0 mm'; |
} |
} |
$result.= '\end{enumerate}'; |
$result.= '\end{enumerate}'; |
|
$increment=$repetition; |
} |
} |
} |
} |
if ($target eq 'grade' || $target eq 'web' || $target eq 'answer' || |
if ($target eq 'grade' || $target eq 'web' || $target eq 'answer' || |