--- loncom/homework/inputtags.pm 2005/03/31 21:24:29 1.160 +++ loncom/homework/inputtags.pm 2005/08/02 18:05:25 1.173 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # input definitons # -# $Id: inputtags.pm,v 1.160 2005/03/31 21:24:29 albertel Exp $ +# $Id: inputtags.pm,v 1.173 2005/08/02 18:05:25 albertel Exp $ # # Copyright Michigan State University Board of Trustees # @@ -30,6 +30,7 @@ use HTML::Entities(); use strict; use Apache::loncommon; use Apache::lonlocal; +use Apache::lonnet; BEGIN { &Apache::lonxml::register('Apache::inputtags',('hiddenline','textfield','textline')); @@ -42,9 +43,13 @@ sub initialize_inputtags { # list of all input ids seen in this problem @Apache::inputtags::inputlist=(); # list of all current response ids - @Apache::inputtags::response=(); + @Apache::inputtags::hint=(); # list of all response ids seen in this problem @Apache::inputtags::responselist=(); + # list of all current hint ids + @Apache::inputtags::response=(); + # list of all hint ids seen in this problem + @Apache::inputtags::hintlist=(); # list of whether or not a specific response was previously used @Apache::inputtags::previous=(); # submission it was used in @@ -74,6 +79,7 @@ sub check_for_duplicate_ids { my %check; foreach my $id (@Apache::inputtags::partlist, @Apache::inputtags::responselist, + @Apache::inputtags::hintlist, @Apache::inputtags::importlist) { $check{$id}++; } @@ -148,9 +154,9 @@ sub start_textfield { } } elsif ($target eq 'grade') { my $seedtext=&Apache::lonxml::get_all_text("/textfield",$parser); - if ($seedtext eq $ENV{'form.HWVAL_'.$resid}) { + if ($seedtext eq $env{'form.HWVAL_'.$resid}) { # if the seed text is still there it wasn't a real submission - $ENV{'form.HWVAL_'.$resid}=''; + $env{'form.HWVAL_'.$resid}=''; } } elsif ($target eq 'edit') { $result.=&Apache::edit::tag_start($target,$token); @@ -234,7 +240,7 @@ sub start_textline { } } else { #right or wrong don't show what was last typed in. - $result=''.$Apache::inputtags::answertxt{$id}.''; + $result=''.$Apache::inputtags::answertxt{$id}.''; #$result=''; } } elsif ($target eq 'edit') { @@ -304,14 +310,21 @@ sub end_hiddenline { sub file_selector { my ($part,$id,$uploadedfiletypes,$which)=@_; if (!$uploadedfiletypes) { return ''; } + + my $jspart=$part; + $jspart=~s/\./_/g; + my $result; - $result.=''. - &mt('Allowed filetypes: [_1]',$uploadedfiletypes).'
'; + $result.=''; + if ($uploadedfiletypes ne '*') { + $result.= + &mt('Allowed filetypes: [_1]',$uploadedfiletypes).'
'; + } if ($which eq 'uploadonly' || $which eq 'both') { $result.=&mt('Submit a file: (only one file can be uploaded)'). '

'; + $jspart.'_'.$id.'" />
'; my $uploadedfile= &HTML::Entities::encode($Apache::lonhomework::history{"resource.$part.$id.uploadedfile"},'<>&"'); if ($uploadedfile) { @@ -330,20 +343,20 @@ sub file_selector { $result.='
'.''.&mt('OR:').'
'; } if ($which eq 'portfolioonly' || $which eq 'both') { - $result.=''. + $result.=''. &mt('Select Portfolio Files').'
'. - ''. + ''. '
'; if ($Apache::lonhomework::history{"resource.$part.$id.portfiles"}=~/[^\s]/){ - my $filelist; + my @filelist; foreach my $file (split(',',&Apache::lonnet::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); - $filelist.=''.$file.''; + push(@filelist,''.$file.''); } - $result.=&mt("Portfolio files previously selected: [_1]",$filelist); + $result.=&mt("Portfolio files previously selected: [_1]",join(', ',@filelist)); } } $result.=''; @@ -393,7 +406,7 @@ sub finalizeawards { } sub decideoutput { - my ($award,$awardmsg,$solved,$previous,$target)=@_; + my ($award,$awarded,$awardmsg,$solved,$previous,$target)=@_; my $message=''; my $button=0; my $previousmsg; @@ -405,28 +418,39 @@ sub decideoutput { 'not_charged_try' => '#ffffaa', 'no_message' => '#fffff', ); + if ($previous) { $previousmsg=&mt('You have entered that answer before'); } if ($solved =~ /^correct/) { - if ($award eq 'ASSIGNED_SCORE') { + $bgcolor=$possiblecolors{'correct'}; + $message=&mt('You are correct.'); + if ($awarded < 1 && $awarded > 0) { + $message=&mt('You are partially correct.'); + $bgcolor=$possiblecolors{'not_charged_try'}; + } elsif ($awarded < 1) { + $message=&mt('Incorrect.'); + $bgcolor=$possiblecolors{'charged_try'}; + } + if ($env{'request.filename'} =~ + m|/res/lib/templates/examupload.problem$|) { $message = &mt("A score has been assigned."); + $added_computer_text=1; } else { if ($target eq 'tex') { - $message = '\textbf{'.&mt('You are correct.').'}'; + $message = '\textbf{'.$message.'}'; } else { - $message = "".&mt('You are correct.').""; + $message = "".$message.""; $message.=" ".&mt("Computer's answer now shown above."); } $added_computer_text=1; - unless ($ENV{'course.'. - $ENV{'request.course.id'}. + unless ($env{'course.'. + $env{'request.course.id'}. '.disable_receipt_display'} eq 'yes') { $message.=(($target eq 'web')?'
':' '). &mt('Your receipt is').' '.&Apache::lonnet::receipt($Apache::inputtags::part). (($target eq 'web')?&Apache::loncommon::help_open_topic('Receipt'):''); } } - $bgcolor=$possiblecolors{'correct'}; $button=0; $previousmsg=''; } elsif ($solved =~ /^excused/) { @@ -451,8 +475,8 @@ sub decideoutput { $message.=" ".&mt("Computer's answer now shown above."); } $added_computer_text=1; - unless ($ENV{'course.'. - $ENV{'request.course.id'}. + unless ($env{'course.'. + $env{'request.course.id'}. '.disable_receipt_display'} eq 'yes') { $message.=(($target eq 'web')?'
':' '). 'Your receipt is '.&Apache::lonnet::receipt($Apache::inputtags::part). @@ -490,7 +514,7 @@ sub decideoutput { $bgcolor=$possiblecolors{'not_charged_try'}; $button=1; } elsif ($award eq 'INVALID_FILETYPE') { - $message = &mt('The filetype extension of the file you uploaded is not allowed.'); + $message = &mt('Submission won\'t be graded. The type of file submitted is not allowed.'); $bgcolor=$possiblecolors{'not_charged_try'}; $button=1; } elsif ($award eq 'SIG_FAIL') { @@ -606,10 +630,10 @@ sub hidealldata { sub setgradedata { my ($award,$msg,$id,$previously_used) = @_; if ($Apache::lonhomework::scantronmode && - &Apache::lonnet::validCODE($ENV{'form.CODE'})) { - $Apache::lonhomework::results{"resource.CODE"}=$ENV{'form.CODE'}; + &Apache::lonnet::validCODE($env{'form.CODE'})) { + $Apache::lonhomework::results{"resource.CODE"}=$env{'form.CODE'}; } elsif ($Apache::lonhomework::scantronmode && - $ENV{'form.CODE'} eq '' && + $env{'form.CODE'} eq '' && $Apache::lonhomework::history{"resource.CODE"} ne '') { $Apache::lonhomework::results{"resource.CODE"}=''; } @@ -726,7 +750,7 @@ sub grade { my ($target) = @_; my $id = $Apache::inputtags::part; my $response=''; - if ( defined $ENV{'form.submitted'}) { + if ( defined $env{'form.submitted'}) { my (@awards,@msgs); foreach $response (@Apache::inputtags::response) { &Apache::lonxml::debug("looking for response.$id.$response.awarddetail"); @@ -779,6 +803,7 @@ sub gradestatus { if ( $status ne 'CLOSED' && $status ne 'UNAVAILABLE' && $status ne 'INVALID_ACCESS') { my $award = $Apache::lonhomework::history{"resource.$id.award"}; + my $awarded = $Apache::lonhomework::history{"resource.$id.awarded"}; my $solved = $Apache::lonhomework::history{"resource.$id.solved"}; my $previous = $Apache::lonhomework::history{"resource.$id.previous"}; my $awardmsg = $Apache::lonhomework::history{"resource.$id.awardmsg"}; @@ -786,7 +811,8 @@ sub gradestatus { if ( $award ne '' || $solved ne '' || $status eq 'SHOW_ANSWER') { &Apache::lonxml::debug('Getting message'); ($showbutton,$bgcolor,$message,$previousmsg) = - &decideoutput($award,$awardmsg,$solved,$previous,$target); + &decideoutput($award,$awarded,$awardmsg,$solved,$previous, + $target); if ($target eq 'tex') { $message='\vskip 2 mm '.$message.' '; } else { @@ -805,17 +831,21 @@ sub gradestatus { if ( $maxtries eq '' ) { $maxtries = '2'; } if ( $maxtries eq 'con_lost' ) { $maxtries = '0'; } my $tries_text=&mt('Tries'); - if ( $Apache::lonhomework::type eq 'survey') { $tries_text=&mt('Submissions'); } + if ( $Apache::lonhomework::type eq 'survey' || + $Apache::lonhomework::parsing_a_task) { + $tries_text=&mt('Submissions'); + } if ( $showbutton ) { if ($target eq 'tex') { - if ($ENV{'request.state'} ne "construct" && $Apache::lonhomework::type ne 'exam' && $ENV{'form.suppress_tries'} ne 'yes') { + if ($env{'request.state'} ne "construct" && $Apache::lonhomework::type ne 'exam' && $env{'form.suppress_tries'} ne 'yes') { $trystr = ' {\vskip 1 mm \small \textit{'.$tries_text.'} '.$tries.'/'.$maxtries.'} \vskip 2 mm '; } else { $trystr = '\vskip 0 mm '; } } else { $trystr = "".$tries_text." $tries"; - if($ENV{'request.state'} ne 'construct') { + if ($Apache::lonhomework::parsing_a_task) { + } elsif($env{'request.state'} ne 'construct') { $trystr.="/$maxtries"; } else { if (defined($Apache::inputtags::params{'maxtries'})) { @@ -833,10 +863,9 @@ sub gradestatus { } if ($Apache::lonhomework::history{"resource.$id.afterduedate"}) { #last submissions was after due date - if ($target eq 'tex') { - $latemessage=' The last submission was after the Due Date '; - } else { - $latemessage="The last submission was after the Due Date"; + $latemessage=&mt(' The last submission was after the Due Date ');; + if ($target eq 'web') { + $latemessage=''.$latemessage.''; } } }