--- loncom/homework/inputtags.pm 2006/05/30 12:45:37 1.192 +++ loncom/homework/inputtags.pm 2006/09/29 20:55:33 1.206 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # input definitons # -# $Id: inputtags.pm,v 1.192 2006/05/30 12:45:37 www Exp $ +# $Id: inputtags.pm,v 1.206 2006/09/29 20:55:33 albertel Exp $ # # Copyright Michigan State University Board of Trustees # @@ -140,9 +140,9 @@ sub start_textfield { my $resid=$Apache::inputtags::response[-1]; if ($target eq 'web') { $Apache::lonxml::evaluate--; + my $partid=$Apache::inputtags::part; + my $oldresponse = &HTML::Entities::encode($Apache::lonhomework::history{"resource.$partid.$resid.submission"},'<>&"'); if ($Apache::inputtags::status[-1] eq 'CAN_ANSWER') { - my $partid=$Apache::inputtags::part; - my $oldresponse = &HTML::Entities::encode($Apache::lonhomework::history{"resource.$partid.$resid.submission"},'<>&"'); my $cols = &Apache::lonxml::get_param('cols',$parstack,$safeeval); if ( $cols eq '') { $cols = 80; } my $rows = &Apache::lonxml::get_param('rows',$parstack,$safeeval); @@ -161,9 +161,13 @@ sub start_textfield { &Apache::lonxml::get_all_text("/textfield",$parser,$style); } } else { - #right or wrong don't show it - #$result='
'.$oldresponse.'
'; - $result=''; + #show past answer in the essayresponse case + if ($oldresponse =~ /\S/ + && &Apache::londefdef::is_inside_of($tagstack, + 'essayresponse') ) { + $result='
'. + $oldresponse.'
'; + } #get rid of any startup text &Apache::lonxml::get_all_text("/textfield",$parser,$style); } @@ -283,7 +287,7 @@ sub start_textline { $Apache::lonxml::evaluate--; my $partid=$Apache::inputtags::part; my $id=$Apache::inputtags::response[-1]; - if ($Apache::inputtags::status[-1] eq 'CAN_ANSWER') { + if (!&Apache::response::show_answer()) { my $size = &Apache::lonxml::get_param('size',$parstack,$safeeval); my $maxlength; if ($size eq '') { $size=20; } else { @@ -298,12 +302,17 @@ sub start_textline { } my $readonly=&Apache::lonxml::get_param('readonly',$parstack, $safeeval); - if (lc($readonly) eq 'yes') { + if (lc($readonly) eq 'yes' + || $Apache::inputtags::status[-1] eq 'CANNOT_ANSWER') { $readonly=' readonly="readonly" '; } else { $readonly=''; } - $result.= ''; } if ($Apache::lonhomework::type eq 'exam' @@ -410,19 +419,7 @@ sub file_selector { $result.=&mt('Submit a file: (only one file can be uploaded)'). '

'; - my $uploadedfile= &HTML::Entities::encode($Apache::lonhomework::history{"resource.$part.$id.uploadedfile"},'<>&"'); - - if ($uploadedfile) { - my $url=$Apache::lonhomework::history{"resource.$part.$id.uploadedurl"}; - &Apache::lonxml::extlink($url); - &Apache::lonnet::allowuploaded('/adm/essayresponse',$url); - my $icon=&Apache::loncommon::icon($url); - my $curfile=''.$uploadedfile.''; - $result.=&mt('Currently submitted: [_1]',$curfile); - } else { - #$result.=&mt('(Hand in a file you have prepared on your computer)'); - } + $result .= &show_past_file_submission($part,$id); } if ( $which eq 'both') { $result.='
'.''.&mt('OR:').'
'; @@ -432,34 +429,70 @@ sub file_selector { &mt('Select Portfolio Files').'
'. ''. '
'; - 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 (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)) { - push(@bad_file_list,''.$file.''); - } - } - $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 .= &show_past_portfile_submission($part,$id); + } $result.=''; return $result; } +sub show_past_file_submission { + my ($part,$id) = @_; + my $uploadedfile= &HTML::Entities::encode($Apache::lonhomework::history{"resource.$part.$id.uploadedfile"},'<>&"'); + + return if (!$uploadedfile); + + my $url=$Apache::lonhomework::history{"resource.$part.$id.uploadedurl"}; + &Apache::lonxml::extlink($url); + &Apache::lonnet::allowuploaded('/adm/essayresponse',$url); + my $icon=&Apache::loncommon::icon($url); + my $curfile=''.$uploadedfile.''; + return &mt('Currently submitted: [_1]',$curfile); + +} + +sub show_past_portfile_submission { + my ($part,$id) = @_; + if ($Apache::lonhomework::history{"resource.$part.$id.portfiles"}!~/[^\s]/){ + return; + } + 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(@file_list,''.$file.''); + if (! &Apache::lonnet::stat_file($url)) { + &Apache::lonnet::logthis("bad file is $url"); + push(@bad_file_list,''.$file.''); + } + } + my $files = ''. + join(', ',@file_list). + ''; + my $result = &mt("Portfolio files previously selected: [_1]",$files); + if (@bad_file_list) { + my $bad_files = ''. + join(', ',@bad_file_list). + ''; + $result.='
'.&mt('These file(s) don\'t exist: [_1]',$bad_files); + } + return $result; + +} + sub checkstatus { - my ($value,$awardref,$msgref)=@_; + my ($value,$awardref,$msgref,$nameref)=@_; for (my $i=0;$i<=$#$awardref;$i++) { if ($$awardref[$i] eq $value) { - return ($$awardref[$i],$$msgref[$i]); + if (ref($nameref)) { + return ($$awardref[$i],$$msgref[$i],$$nameref[$i]); + } else { + return ($$awardref[$i],$$msgref[$i]); + } } } return(undef,undef); @@ -484,9 +517,7 @@ sub valid_award { sub finalizeawards { my ($awardref,$msgref,$nameref,$reverse)=@_; - my $result=undef; - my $award; - my $msg; + my ($result,$award,$msg,$name); if ($#$awardref == -1) { $result = "NO_RESPONSE"; } if ($result eq '' ) { my $blankcount; @@ -512,8 +543,9 @@ sub finalizeawards { 'APPROX_ANS', 'EXACT_ANS'); if ($reverse) { @awards=reverse(@awards); } foreach my $possibleaward (@awards) { - ($result,$msg)=&checkstatus($possibleaward,$awardref,$msgref); - if (defined($result)) { return ($result,$msg); } + ($result,$msg,$name)=&checkstatus($possibleaward,$awardref,$msgref, + $nameref); + if (defined($result)) { return ($result,$msg,$name); } } return ('ERROR',undef); } @@ -526,10 +558,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; @@ -542,8 +575,8 @@ sub decideoutput { if ($previous) { $previousmsg=&mt('You have entered that answer before'); } - if ($solved =~ /^correct/) { - $bgcolor=$possiblecolors{'correct'}; + if ($solved =~ /^correct/) { + $bgcolor=$possiblecolors{'correct'}; $message=&mt('You are correct.'); if ($awarded < 1 && $awarded > 0) { $message=&mt('You are partially correct.'); @@ -688,7 +721,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."); @@ -710,10 +743,24 @@ sub decideoutput { $message = &mt("Unknown message").": $award"; $button=1; } + my (undef,undef,$domain,$user)=&Apache::lonxml::whichuser(); + foreach my $resid(@Apache::inputtags::response){ + if ($Apache::lonhomework::history{"resource.$part.$resid.handback"}) { + $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' &&