--- loncom/homework/inputtags.pm 2006/06/05 18:53:03 1.194 +++ loncom/homework/inputtags.pm 2006/06/30 00:32:25 1.198 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # input definitons # -# $Id: inputtags.pm,v 1.194 2006/06/05 18:53:03 banghart Exp $ +# $Id: inputtags.pm,v 1.198 2006/06/30 00:32:25 albertel Exp $ # # Copyright Michigan State University Board of Trustees # @@ -284,7 +284,8 @@ sub start_textline { my $partid=$Apache::inputtags::part; my $id=$Apache::inputtags::response[-1]; if ($Apache::inputtags::status[-1] eq 'CAN_ANSWER' - || $Apache::inputtags::status[-1] eq 'CANNOT_ANSWER') { + || ($Apache::inputtags::status[-1] eq 'CANNOT_ANSWER' && + $Apache::lonhomework::history{"resource.$partid.solved"} !~ /^correct/ )) { my $size = &Apache::lonxml::get_param('size',$parstack,$safeeval); my $maxlength; if ($size eq '') { $size=20; } else { @@ -454,7 +455,7 @@ sub file_selector { } $result.=&mt("Portfolio files previously selected: [_1]",join(', ',@filelist)); if (@bad_file_list) { - $result.='
'.&mt('These file(s) don\'t exist: [_1]',join(', ',@bad_file_list)); + $result.='
'.&mt('These file(s) don\'t exist: [_1]',join(', ',@bad_file_list)); } } } @@ -719,10 +720,16 @@ sub decideoutput { } my (undef,undef,$domain,$user)=&Apache::lonxml::whichuser(); foreach my $resid(@Apache::inputtags::response){ - &Apache::lonnet::logthis("handback is ".$Apache::lonhomework::history{"resource.$part.$resid.handback"}); if ($Apache::lonhomework::history{"resource.$part.$resid.handback"}) { - $message.= '
Returned File'; - } + $message.='
'; + my @files = split(/\s*,\s*/, + $Apache::lonhomework::history{"resource.$part.$resid.handback"}); + my $file_msg; + foreach my $file (@files) { + $file_msg.= '
'.$file.''; + } + $message .= &mt('Returned file(s): [_1]',$file_msg); + } } if (lc($Apache::lonhomework::problemstatus) eq 'no' &&