--- loncom/homework/inputtags.pm 2006/06/05 18:53:03 1.194
+++ loncom/homework/inputtags.pm 2006/07/19 20:54:19 1.203
@@ -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.203 2006/07/19 20:54:19 www Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -284,7 +284,9 @@ 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') {
+ || lc($Apache::lonhomework::problemstatus) eq 'no'
+ || ($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 {
@@ -439,12 +441,12 @@ sub file_selector {
''.
'
';
if ($Apache::lonhomework::history{"resource.$part.$id.portfiles"}=~/[^\s]/){
- my (@filelist,@bad_file_list);
- foreach my $file (split(',',&unescape($Apache::lonhomework::history{"resource.$part.$id.portfiles"}))) {
+ my (@file_list,@bad_file_list);
+ foreach my $file (split(/\s*,\s*/,&unescape($Apache::lonhomework::history{"resource.$part.$id.portfiles"}))) {
my (undef,undef,$domain,$user)=&Apache::lonxml::whichuser();
my $url="/uploaded/$domain/$user/portfolio$file";
my $icon=&Apache::loncommon::icon($url);
- push(@filelist,''.$file.'');
if (! &Apache::lonnet::stat_file($url)) {
&Apache::lonnet::logthis("bad file is $url");
@@ -452,9 +454,15 @@ sub file_selector {
'" border="0" />'.$file.'');
}
}
- $result.=&mt("Portfolio files previously selected: [_1]",join(', ',@filelist));
+ my $files = ''.
+ join(', ',@file_list).
+ '';
+ $result.=&mt("Portfolio files previously selected: [_1]",$files);
if (@bad_file_list) {
- $result.='
'.&mt('These file(s) don\'t exist: [_1]',join(', ',@bad_file_list));
+ my $bad_files = ''.
+ join(', ',@bad_file_list).
+ '';
+ $result.='
'.&mt('These file(s) don\'t exist: [_1]',$bad_files);
}
}
}
@@ -533,10 +541,11 @@ sub decideoutput {
my $bgcolor='orange';
my $added_computer_text=0;
my %possiblecolors =
- ( 'correct' => '#aaffaa',
- 'charged_try' => '#ffaaaa',
+ ( 'correct' => '#aaffaa',
+ 'charged_try' => '#ffaaaa',
'not_charged_try' => '#ffffaa',
- 'no_message' => '#fffff',
+ 'no_grade' => '#ffffaa',
+ 'no_message' => '#ffffff',
);
my $part = $Apache::inputtags::part;
@@ -695,7 +704,7 @@ sub decideoutput {
$button=1;
} elsif ($award eq 'SUBMITTED') {
$message = &mt("Your submission has been recorded.");
- $bgcolor=$possiblecolors{'correct'};
+ $bgcolor=$possiblecolors{'no_grade'};
$button=1;
} elsif ($award eq 'DRAFT') {
$message = &mt("A draft copy has been saved.");
@@ -719,16 +728,22 @@ 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' &&
$Apache::inputtags::status[-1] ne 'SHOW_ANSWER') {
$message = &mt("Answer Submitted: Your final submission will be graded after the due date.");
- $bgcolor=$possiblecolors{'correct'};
+ $bgcolor=$possiblecolors{'no_grade'};
$button=1;
}
if ($Apache::inputtags::status[-1] eq 'SHOW_ANSWER' &&