--- loncom/homework/inputtags.pm 2005/01/31 22:00:40 1.156 +++ loncom/homework/inputtags.pm 2005/11/16 22:52:22 1.181 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # input definitons # -# $Id: inputtags.pm,v 1.156 2005/01/31 22:00:40 albertel Exp $ +# $Id: inputtags.pm,v 1.181 2005/11/16 22:52:22 albertel Exp $ # # Copyright Michigan State University Board of Trustees # @@ -30,43 +30,60 @@ use HTML::Entities(); use strict; use Apache::loncommon; use Apache::lonlocal; +use Apache::lonnet; BEGIN { &Apache::lonxml::register('Apache::inputtags',('hiddenline','textfield','textline')); } +# Initializes a set of global variables used during the parse of the problem. +# +# @Apache::inputtags::input - List of current input ids. +# @Apache::inputtags::inputlist - List of all input ids seen this problem. +# @Apache::inputtags::response - List of all current resopnse ids. +# @Apache::inputtags::responselist - List of all response ids seen this +# problem. +# @Apache::inputtags::hint - List of all hint ids. +# @Apache::inputtags::hintlist - List of all hint ids seen this problem. +# @Apache::inputtags::previous - List describing if specific responseds +# have been used +# @Apache::inputtags::previous_version - Submission responses were used in. +# $Apache::inputtags::part - Current part id (valid only in +# ) +# 0 if not in a part. +# @Apache::inputtags::partlist - List of part ids seen in the current +# +# @Apache::inputtags::status - List of problem statuses. First +# element is the status of the +# the remainder are for individual s. +# %Apache::inputtags::params - Hash of defined parameters for the +# current response. +# @Apache::inputtags::import - List of all ids for thes get +# join()ed and prepended. +# @Apache::inputtags::importlist - List of all import ids seen. +# $Apache::inputtags::response_with_no_part +# - Flag set true if we have seen a response +# that is not inside a +# %Apache::inputtags::answertxt - <*response> tags store correct +# answer strings for display by +# in this hash. sub initialize_inputtags { - # list of current input ids @Apache::inputtags::input=(); - # list of all input ids seen in this problem @Apache::inputtags::inputlist=(); - # list of all current response ids @Apache::inputtags::response=(); - # list of all response ids seen in this problem @Apache::inputtags::responselist=(); - # list of whether or not a specific response was previously used + @Apache::inputtags::hint=(); + @Apache::inputtags::hintlist=(); @Apache::inputtags::previous=(); - # submission it was used in @Apache::inputtags::previous_version=(); - # id of current part, 0 means that no part is current - # (inside only $Apache::inputtags::part=''; - # list of all part ids seen @Apache::inputtags::partlist=(); - # list of problem date statuses, the first element is for - # if there is a second element it is for the current @Apache::inputtags::status=(); - # hash of defined params for the current response %Apache::inputtags::params=(); - # list of all ids, for , these get join()ed and prepended @Apache::inputtags::import=(); - # list of all import ids seen @Apache::inputtags::importlist=(); - # just used to note whether we have seen a response that isn't in a part $Apache::inputtags::response_with_no_part=0; - # storage location so the begin <*response> tag can generate the correct - # answer string for display by the %Apache::inputtags::answertxt=(); } @@ -74,6 +91,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 +166,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); @@ -222,22 +240,34 @@ sub start_textline { if ($addchars) { $result.=&addchars('HWVAL_'.$id,$addchars); } - $result.= ''; } } 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') { $result=&Apache::edit::tag_start($target,$token); $result.=&Apache::edit::text_arg('Size:','size',$token,'5'). - &Apache::edit::text_arg - ('Click-On Texts (comma sep):','addchars',$token,10).""; - $result.=&Apache::edit::end_table; + &Apache::edit::text_arg('Click-On Texts (comma sep):', + 'addchars',$token,10); + $result.=&Apache::edit::select_arg('Readonly:','readonly', + ['no','yes'],$token); + $result.=&Apache::edit::end_row(); + $result.=&Apache::edit::end_table(); } elsif ($target eq 'modified') { - my $constructtag=&Apache::edit::get_new_args($token,$parstack,$safeeval,'size','addchars'); + my $constructtag=&Apache::edit::get_new_args($token,$parstack, + $safeeval,'size', + 'addchars','readonly'); if ($constructtag) { $result = &Apache::edit::rebuild_tag($token); } } elsif ($target eq 'tex' and $Apache::lonhomework::type ne 'exam') { my $size = &Apache::lonxml::get_param('size',$parstack,$safeeval); @@ -282,6 +312,70 @@ sub end_hiddenline { return ""; } +# $part -> partid +# $id -> responseid +# $uploadefiletypes -> comma seperated list of extensions allowed or * for any +# $which -> 'uploadedonly' -> only newly uploaded files +# 'portfolioonly' -> only allow files from portfolio +# 'both' -> allow files from either location +# $extratext -> additional text to go between the link and the input box +# returns a table row +sub file_selector { + my ($part,$id,$uploadedfiletypes,$which,$extratext)=@_; + if (!$uploadedfiletypes) { return ''; } + + my $jspart=$part; + $jspart=~s/\./_/g; + + my $result; + + $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)'). + '

'; + 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)'); + } + } + if ( $which eq 'both') { + $result.='
'.''.&mt('OR:').'
'; + } + if ($which eq 'portfolioonly' || $which eq 'both') { + $result.=$extratext.''. + &mt('Select Portfolio Files').'
'. + ''. + '
'; + if ($Apache::lonhomework::history{"resource.$part.$id.portfiles"}=~/[^\s]/){ + 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); + push(@filelist,''.$file.''); + } + $result.=&mt("Portfolio files previously selected: [_1]",join(', ',@filelist)); + } + } + $result.=''; + return $result; +} + sub checkstatus { my ($value,$awardref,$msgref)=@_; for (my $i=0;$i<=$#$awardref;$i++) { @@ -292,8 +386,24 @@ sub checkstatus { return(undef,undef); } +sub valid_award { + my ($award) =@_; + foreach my $possibleaward ('MISSING_ANSWER', 'ERROR', 'NO_RESPONSE', + 'TOO_LONG', 'UNIT_INVALID_INSTRUCTOR', + 'UNIT_INVALID_STUDENT', 'UNIT_IRRECONCIBLE', + 'UNIT_FAIL', 'NO_UNIT', + 'UNIT_NOTNEEDED', 'WANTED_NUMERIC', + 'BAD_FORMULA', 'SIG_FAIL', 'INCORRECT', + 'MISORDERED_RANK', 'INVALID_FILETYPE', + 'DRAFT', 'SUBMITTED', 'ASSIGNED_SCORE', + 'APPROX_ANS', 'EXACT_ANS','COMMA_FAIL') { + if ($award eq $possibleaward) { return 1; } + } + return 0; +} + sub finalizeawards { - my ($awardref,$msgref)=@_; + my ($awardref,$msgref,$nameref,$reverse)=@_; my $result=undef; my $award; my $msg; @@ -309,15 +419,18 @@ sub finalizeawards { if ($blankcount == ($#$awardref + 1)) { $result = 'NO_RESPONSE'; } } if (defined($result)) { return ($result,$msg); } - foreach my $possibleaward ('MISSING_ANSWER', 'ERROR', 'NO_RESPONSE', - 'TOO_LONG', 'UNIT_INVALID_INSTRUCTOR', - 'UNIT_INVALID_STUDENT', 'UNIT_IRRECONCIBLE', - 'UNIT_FAIL', 'NO_UNIT', - 'UNIT_NOTNEEDED', 'WANTED_NUMERIC', - 'BAD_FORMULA', 'SIG_FAIL', 'INCORRECT', - 'MISORDERED_RANK', 'INVALID_FILETYPE', - 'DRAFT', 'SUBMITTED', 'ASSIGNED_SCORE', - 'APPROX_ANS', 'EXACT_ANS','COMMA_FAIL') { + + # these awards are ordered from most important error through best correct + + my @awards = ('MISSING_ANSWER', 'ERROR', 'NO_RESPONSE', 'TOO_LONG', + 'UNIT_INVALID_INSTRUCTOR', 'UNIT_INVALID_STUDENT', + 'UNIT_IRRECONCIBLE', 'UNIT_FAIL', 'NO_UNIT', + 'UNIT_NOTNEEDED', 'WANTED_NUMERIC', 'BAD_FORMULA', + 'COMMA_FAIL', 'SIG_FAIL', 'INCORRECT', 'MISORDERED_RANK', + 'INVALID_FILETYPE', 'DRAFT', 'SUBMITTED', 'ASSIGNED_SCORE', + '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); } } @@ -325,7 +438,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; @@ -337,28 +450,47 @@ sub decideoutput { 'not_charged_try' => '#ffffaa', 'no_message' => '#fffff', ); + + my $part = $Apache::inputtags::part; + my $handgrade = + ('yes' eq lc(&Apache::lonnet::EXT("resource.$part.handgrade"))); + + my $computer = ($handgrade)? '' + : " ".&mt("Computer's answer now shown above."); + &Apache::lonxml::debug("handgrade has :$handgrade:"); + 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.=" ".&mt("Computer's answer now shown above."); + $message = "".$message.""; + $message.= $computer; } $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/) { @@ -380,11 +512,11 @@ sub decideoutput { $message = '\textbf{'.&mt('You are correct.').'}'; } else { $message = "".&mt('You are correct.').""; - $message.=" ".&mt("Computer's answer now shown above."); + $message.= $computer; } $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). @@ -417,12 +549,12 @@ sub decideoutput { } elsif ($award eq 'MISORDERED_RANK') { $message = &mt('You have provided an invalid ranking'); if ($target ne 'tex') { - $message.=', '.&mt('please refer to').' '.&Apache::loncommon::help_open_topic('Ranking_Problems','help on ranking problems').'.'; + $message.=', '.&mt('please refer to').' '.&Apache::loncommon::help_open_topic('Ranking_Problems','help on ranking problems'); } $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') { @@ -496,7 +628,7 @@ sub decideoutput { } if ($Apache::inputtags::status[-1] eq 'SHOW_ANSWER' && !$added_computer_text && $target ne 'tex') { - $message.=" ".&mt("Computer's answer now shown above."); + $message.= $computer; $added_computer_text=1; } return ($button,$bgcolor,$message,$previousmsg); @@ -538,10 +670,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"}=''; } @@ -658,7 +790,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"); @@ -711,6 +843,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"}; @@ -718,7 +851,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 { @@ -737,17 +871,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'})) { @@ -765,10 +903,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.''; } } }