--- loncom/homework/inputtags.pm 2001/06/27 18:51:37 1.36 +++ loncom/homework/inputtags.pm 2003/05/06 15:31:45 1.98 @@ -1,12 +1,39 @@ # The LearningOnline Network with CAPA # input definitons +# +# $Id: inputtags.pm,v 1.98 2003/05/06 15:31:45 albertel Exp $ +# +# Copyright Michigan State University Board of Trustees +# +# This file is part of the LearningOnline Network with CAPA (LON-CAPA). +# +# LON-CAPA is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# +# LON-CAPA is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with LON-CAPA; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +# +# /home/httpd/html/adm/gpl.txt +# +# http://www.lon-capa.org/ +# # 2/19 Guy package Apache::inputtags; +use HTML::Entities(); use strict; +use Apache::loncommon; -sub BEGIN { - &Apache::lonxml::register('Apache::inputtags',('textarea','textline','datasubmission')); +BEGIN { + &Apache::lonxml::register('Apache::inputtags',('hiddenline','textfield','textline')); } @@ -17,20 +44,27 @@ sub initialize_inputtags { @Apache::inputtags::inputlist=(); # list of all current response ids @Apache::inputtags::response=(); - #list of all response ids seen in this problem + # 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::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 problem date statuses, the first element is for - #if there is a second element it is for the current + # 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 + # 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=(); } sub start_input { my ($parstack,$safeeval)=@_; my $id = &Apache::lonxml::get_param('id',$parstack,$safeeval); + if ($id eq '') { $id = $Apache::lonxml::curdepth; } push (@Apache::inputtags::input,$id); push (@Apache::inputtags::inputlist,$id); return $id; @@ -41,72 +75,157 @@ sub end_input { return ''; } -sub start_textarea { +sub start_textfield { my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_; my $result = ""; my $id = &start_input($parstack,$safeeval); + my $resid=$Apache::inputtags::response[-1]; if ($target eq 'web') { - my $oldresponse = $Apache::lonhomework::history{"resource.$Apache::inputtags::part.$Apache::inputtags::response['-1'].submission"}; - my $cols = &Apache::lonxml::get_param('cols',$parstack,$safeeval); - if ( $cols eq '') { $cols = 80; } - my $rows = &Apache::lonxml::get_param('rows',$parstack,$safeeval); - if ( $rows eq '') { $rows = 10; } - $result= '"; - } + $Apache::lonxml::evaluate++; + if ($Apache::inputtags::status[-1] eq 'CAN_ANSWER') { + return ""; + } + } elsif ($target eq 'edit') { + $result=&Apache::edit::end_table(); + } &end_input; - return ''; + return $result; } sub start_textline { my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_; my $result = ""; if ($target eq 'web') { - my $size = &Apache::lonxml::get_param('size',$parstack,$safeeval); - if ($size eq '') { $size=20; } - my $oldresponse = $Apache::lonhomework::history{"resource.$Apache::inputtags::part.$Apache::inputtags::response['-1'].submission"}; - $result= ''; - } - if ($target eq 'edit') { - $result.=&Apache::edit::tag_start($target,$token,&Apache::lonxml::description($token)); + $Apache::lonxml::evaluate--; + if ($Apache::inputtags::status[-1] eq 'CAN_ANSWER') { + my $size = &Apache::lonxml::get_param('size',$parstack,$safeeval); + my $maxlength; + if ($size eq '') { $size=20; } else { + if ($size < 20) { $maxlength=$size; } + } + my $partid=$Apache::inputtags::part; + my $id=$Apache::inputtags::response[-1]; + my $oldresponse = &HTML::Entities::encode($Apache::lonhomework::history{"resource.$partid.$id.submission"}); + if ($Apache::lonhomework::type ne 'exam') { + $result= ''; + } + } else { + #right or wrong don't show what was last typed in. + #$result=''.$oldresponse.''; + $result=''; + } + } elsif ($target eq 'edit') { + $result=&Apache::edit::tag_start($target,$token); $result.=&Apache::edit::text_arg('Size:','size',$token,'5').""; $result.=&Apache::edit::end_table; - } - if ($target eq 'modified') { + } elsif ($target eq 'modified') { my $constructtag=&Apache::edit::get_new_args($token,$parstack,$safeeval,'size'); 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); + if ($size != 0) {$size=$size*2; $size.=' mm';} else {$size='40 mm';} + $result='\framebox['.$size.'][s]{\tiny\strut}'; } return $result; } sub end_textline { my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_; - if ($target eq 'edit') { return ('','no'); } + if ($target eq 'web') { $Apache::lonxml::evaluate++; } + elsif ($target eq 'edit') { return ('','no'); } return ""; } -sub start_datasubmission { - return ''; +sub start_hiddenline { + my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_; + my $result = ""; + if ($target eq 'web') { + $Apache::lonxml::evaluate--; + if ($Apache::inputtags::status[-1] eq 'CAN_ANSWER') { + my $partid=$Apache::inputtags::part; + my $id=$Apache::inputtags::response[-1]; + my $oldresponse = &HTML::Entities::encode($Apache::lonhomework::history{"resource.$partid.$id.submission"}); + if ($Apache::lonhomework::type ne 'exam') { + $result= ''; + } + } + } elsif ($target eq 'edit') { + $result=&Apache::edit::tag_start($target,$token); + $result.=&Apache::edit::end_table; + } + return $result; } -sub end_datasubmission { +sub end_hiddenline { my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_; - if ( $target == 'web' ) { - return ''; - } - return ''; + if ($target eq 'web') { $Apache::lonxml::evaluate++; } + elsif ($target eq 'edit') { return ('','no'); } + return ""; } sub finalizeawards { @@ -114,7 +233,17 @@ sub finalizeawards { my $award; if ($#_ == '-1') { $result = "NO_RESPONSE"; } if ($result eq '' ) { - foreach $award (@_) { if ($award eq '') {$result='MISSING_ANSWER'; last;}} + my $blankcount; + foreach $award (@_) { + if ($award eq '') { + $result='MISSING_ANSWER'; + $blankcount++; + } + } + if ($blankcount == ($#_ + 1)) { $result = 'NO_RESPONSE'; } + } + if ($result eq '' ) { + foreach $award (@_) { if ($award eq 'MISSING_ANSWER') {$result='MISSING_ANSWER'; last;}} } if ($result eq '' ) { foreach $award (@_) { if ($award eq 'ERROR') {$result='ERROR'; last;}} @@ -145,9 +274,21 @@ sub finalizeawards { foreach $award (@_) { if ($award eq 'INCORRECT') {$result=$award; last;} } } if ($result eq '' ) { + foreach $award (@_) { if ($award eq 'MISORDERED_RANK') {$result=$award; last;} } + } + if ($result eq '' ) { + foreach $award (@_) { if ($award eq 'INVALID_FILETYPE') {$result=$award; last;} } + } + if ($result eq '' ) { + foreach $award (@_) { if ($award eq 'DRAFT') {$result=$award; last;} } + } + if ($result eq '' ) { foreach $award (@_) { if ($award eq 'SUBMITTED') {$result=$award; last;} } } if ($result eq '' ) { + foreach $award (@_) { if ($award eq 'ASSIGNED_SCORE') {$result=$award; last;} } + } + if ($result eq '' ) { foreach $award (@_) { if ($award eq 'APPROX_ANS') {$result=$award; last;} } } if ($result eq '' ) { $result='EXACT_ANS'; } @@ -155,70 +296,188 @@ sub finalizeawards { } sub decideoutput { - my ($award,$solved)=@_; + my ($award,$solved,$previous,$target)=@_; my $message=''; my $button=0; - if ($solved =~ /^correct/ || $award eq 'EXACT_ANS' || $award eq 'APPROX_ANS' ) { - $message = "You are correct. Your receipt is ".&Apache::lonnet::receipt; - $button=0; + my $previousmsg; + + if ($previous) { $previousmsg='You have entered that answer before'; } + + if ($solved =~ /^correct/) { + if ($award eq 'ASSIGNED_SCORE') { + $message = "A score has been assigned."; + } else { + if ($target eq 'tex') { + $message = '\textbf{You are correct}.'; + } else { + $message = "You are correct."; + } + $message=' Your receipt is '.&Apache::lonnet::receipt; + } + $button=0; + $previousmsg=''; + } elsif ($solved =~ /^excused/) { + $message = "You are excused from the problem."; + $button=0; + $previousmsg=''; + } elsif ($award eq 'EXACT_ANS' || $award eq 'APPROX_ANS' ) { + if ($solved =~ /^incorrect/ || $solved eq '') { + $message = "Incorrect"; + $button=1; + } else { + $message = "You are correct. Your receipt is ". + &Apache::lonnet::receipt; + $button=0; + $previousmsg=''; + } } elsif ($award eq 'NO_RESPONSE') { - $message = ''; - $button=1; + $message = ''; + $button=1; } elsif ($award eq 'MISSING_ANSWER') { - $message = 'Some parts were not submitted'; - $button = 1; + $message = 'Some parts were not submitted'; + $button = 1; } elsif ($award eq 'WANTED_NUMERIC') { - $message = "This question expects a numeric answer"; - $button=1; + $message = "This question expects a numeric answer"; + $button=1; + } elsif ($award eq 'MISORDERED_RANK') { + $message = 'You have provided an invalid ranking, please refer to '. + &Apache::loncommon::help_open_topic('Ranking_Problems','help on ranking problems').'.'; + $button=1; + } elsif ($award eq 'INVALID_FILETYPE') { + $message = 'The filetype extension of the file you uploaded is not allowed.'; + $button=1; } elsif ($award eq 'SIG_FAIL') { - $message = "Please adjust significant figures.";# you provided %s significant figures"; - $button=1; + $message = "Please adjust significant figures.";# you provided %s significant figures"; + $button=1; } elsif ($award eq 'UNIT_FAIL') { - $message = "Units incorrect."; #Computer reads units as %s"; - $button=1; + $message = "Units incorrect. ". + &Apache::loncommon::help_open_topic('Physical_Units'); #Computer reads units as %s"; + $button=1; } elsif ($award eq 'UNIT_NOTNEEDED') { - $message = "Only a number required.";# Computer reads units of %s"; - $button=1; + $message = "Only a number required.";# Computer reads units of %s"; + $button=1; } elsif ($award eq 'NO_UNIT') { - $message = "Units required"; - $button=1; + $message = "Units required". + &Apache::loncommon::help_open_topic('Physical_Units'); + $button=1; } elsif ($award eq 'BAD_FORMULA') { - $message = "Unable to understand formula"; - $button=1; + $message = "Unable to understand formula"; + $button=1; } elsif ($award eq 'INCORRECT') { - $message = "Incorrect"; - $button=1; + $message = "Incorrect"; + $button=1; } elsif ($award eq 'SUBMITTED') { - $message = "Your submission has been recorded."; - $button=1; + $message = "Your submission has been recorded."; + $button=1; + } elsif ($award eq 'DRAFT') { + $message = "A draft copy has been saved."; + $button=1; + } elsif ($award eq 'ASSIGNED_SCORE') { + $message = "A score has been assigned."; + $button=0; } else { - $message = "Unknown message: $award"; - $button=1; + $message = "Unknown message: $award"; + $button=1; } - return ($button,$message); + if (lc($Apache::lonhomework::problemstatus) eq 'no') { + $message = "Answer Submitted"; + $button=1; + } + return ($button,$message,$previousmsg); +} + +sub removealldata { + my ($id)=@_; + foreach my $key (keys(%Apache::lonhomework::results)) { + if (($key =~ /^resource\.\Q$id\E\./) && ($key !~ /\.collaborators$/)) { + &Apache::lonxml::debug("Removing $key"); + delete($Apache::lonhomework::results{$key}); + } + } } sub setgradedata { - my ($award,$id) = @_; - if ( $award eq 'APPROX_ANS' || $award eq 'EXACT_ANS' ) { - $Apache::lonhomework::results{"resource.$id.tries"} = - $Apache::lonhomework::history{"resource.$id.tries"} + 1; - $Apache::lonhomework::results{"resource.$id.solved"} = - 'correct_by_student'; - $Apache::lonhomework::results{"resource.$id.awarded"} = '1'; - } elsif ( $award eq 'INCORRECT' ) { - $Apache::lonhomework::results{"resource.$id.tries"} = - $Apache::lonhomework::history{"resource.$id.tries"} + 1; - $Apache::lonhomework::results{"resource.$id.solved"} = - 'incorrect_attempted'; - } elsif ( $award eq 'SUBMITTED' ) { - $Apache::lonhomework::results{"resource.$id.tries"} = - $Apache::lonhomework::history{"resource.$id.tries"} + 1; - $Apache::lonhomework::results{"resource.$id.solved"} = - 'ungraded_attempted'; - } else { - $Apache::lonhomework::results{"resource.$id.solved"} = - 'incorrect_attempted'; + my ($award,$id,$previously_used) = @_; + # if the student already has it correct, don't modify the status + if ($Apache::inputtags::status['-1'] ne 'CAN_ANSWER' && + $Apache::inputtags::status['-1'] ne 'CANNOT_ANSWER') { + $Apache::lonhomework::results{"resource.$id.afterduedate"}=$award; + return ''; + } elsif ( $Apache::lonhomework::history{"resource.$id.solved"} !~ + /^correct/ || $Apache::lonhomework::scantronmode) { + #handle assignment of tries and solved status + my $solvemsg; + if ($Apache::lonhomework::scantronmode) { + $solvemsg='correct_by_scantron'; + } else { + $solvemsg='correct_by_student'; + } + if ($Apache::lonhomework::history{"resource.$id.afterduedate"}) { + $Apache::lonhomework::results{"resource.$id.afterduedate"}=''; + } + if ( $award eq 'ASSIGNED_SCORE') { + $Apache::lonhomework::results{"resource.$id.tries"} = + $Apache::lonhomework::history{"resource.$id.tries"} + 1; + $Apache::lonhomework::results{"resource.$id.solved"} = + $solvemsg; + my $numawards=scalar(@Apache::inputtags::responselist); + &Apache::lonxml::debug("Whaaa!"); + $Apache::lonhomework::results{"resource.$id.awarded"} = 0; + foreach my $res (@Apache::inputtags::responselist) { + $Apache::lonhomework::results{"resource.$id.awarded"}+= + $Apache::lonhomework::results{"resource.$id.$res.awarded"}; + } + if ($numawards > 0) { + $Apache::lonhomework::results{"resource.$id.awarded"}/= + $numawards; + } + } elsif ( $award eq 'APPROX_ANS' || $award eq 'EXACT_ANS' ) { + $Apache::lonhomework::results{"resource.$id.tries"} = + $Apache::lonhomework::history{"resource.$id.tries"} + 1; + $Apache::lonhomework::results{"resource.$id.solved"} = + $solvemsg; + $Apache::lonhomework::results{"resource.$id.awarded"} = '1'; + } elsif ( $award eq 'INCORRECT' ) { + $Apache::lonhomework::results{"resource.$id.tries"} = + $Apache::lonhomework::history{"resource.$id.tries"} + 1; + $Apache::lonhomework::results{"resource.$id.solved"} = + 'incorrect_attempted' + } elsif ( $award eq 'SUBMITTED' ) { + $Apache::lonhomework::results{"resource.$id.tries"} = + $Apache::lonhomework::history{"resource.$id.tries"} + 1; + $Apache::lonhomework::results{"resource.$id.solved"} = + 'ungraded_attempted'; + } elsif ( $award eq 'DRAFT' ) { + $Apache::lonhomework::results{"resource.$id.solved"} = ''; + } elsif ( $award eq 'NO_RESPONSE' ) { + #no real response so delete any data that got stored + &removealldata($id); + return ''; + } else { + $Apache::lonhomework::results{"resource.$id.solved"} = + 'incorrect_attempted'; + } + + # check if this was a previous submission if it was delete the + # unneeded data and update the previously_used attribute + if ( $previously_used eq 'PREVIOUSLY_USED') { + delete($Apache::lonhomework::results{"resource.$id.tries"}); + $Apache::lonhomework::results{"resource.$id.previous"} = '1'; + } elsif ( $previously_used eq 'PREVIOUSLY_LAST') { + #delete all data as they student didn't do anything, but save + #the list of collaborators. + &removealldata($id); + #and since they didn't do anything we were never here + return ''; + } else { + $Apache::lonhomework::results{"resource.$id.previous"} = '0'; + } + } elsif ( $Apache::lonhomework::history{"resource.$id.solved"} =~ + /^correct/ ) { + #delete all data as they student already has it correct + &removealldata($id); + #and since they didn't do anything we were never here + return ''; } $Apache::lonhomework::results{"resource.$id.award"} = $award; } @@ -226,47 +485,70 @@ sub setgradedata { sub grade { my ($target) = @_; my $id = $Apache::inputtags::part; -# my $result=''; my $response=''; - if ( $target == 'web' ) { - if ( defined $ENV{'form.submitted'}) { - my @awards = (); - &Apache::lonxml::debug("$#Apache::inputtags::responselist"); - foreach $response (@Apache::inputtags::responselist) { - &Apache::lonxml::debug("looking for response.$id.$response.awarddetail"); - my $value=$Apache::lonhomework::results{"resource.$id.$response.awarddetail"}; - if ( $value ne '' ) { - &Apache::lonxml::debug("keeping $value from $response for $id"); - push (@awards,$value); - } else { - &Apache::lonxml::debug("skipping $value from $response for $id"); + if ( defined $ENV{'form.submitted'}) { + my @awards = (); + foreach $response (@Apache::inputtags::responselist) { + &Apache::lonxml::debug("looking for response.$id.$response.awarddetail"); + my $value=$Apache::lonhomework::results{"resource.$id.$response.awarddetail"}; + &Apache::lonxml::debug("keeping $value from $response for $id"); + push (@awards,$value); + } + my $finalaward = &finalizeawards(@awards); + my $previously_used; + if ( $#Apache::inputtags::previous eq $#awards ) { + my $match=0; + my @matches; + foreach my $versionar (@Apache::inputtags::previous_version) { + foreach my $version (@$versionar) { + $matches[$version]++; + } + } + foreach my $elem (@matches) {if ($elem eq ($#awards+1)) {$match=1;}} + if ($match) { + $previously_used = 'PREVIOUSLY_LAST'; + foreach my $value (@Apache::inputtags::previous) { + if ($value eq 'PREVIOUSLY_USED' ) { + $previously_used = $value; + last; + } + } } - } - my $finalaward = &finalizeawards(@awards); - &Apache::lonxml::debug("final award $finalaward"); - &setgradedata($finalaward,$id); } + &Apache::lonxml::debug("final award $finalaward, $previously_used"); + &setgradedata($finalaward,$id,$previously_used); } return ''; } sub gradestatus { - my ($id) = @_; + my ($id,$target) = @_; my $showbutton = 1; my $message = ''; + my $latemessage = ''; my $trystr=''; my $button=''; - + my $previousmsg=''; + my $status = $Apache::inputtags::status['-1']; &Apache::lonxml::debug("gradestatus has :$status:"); - if ( $status ne 'CLOSED' ) { + if ( $status ne 'CLOSED' && $status ne 'UNAVAILABLE') { my $award = $Apache::lonhomework::history{"resource.$id.award"}; my $solved = $Apache::lonhomework::history{"resource.$id.solved"}; + my $previous = $Apache::lonhomework::history{"resource.$id.previous"}; &Apache::lonxml::debug("Found Award |$award|$solved|"); if ( $award ne '' ) { &Apache::lonxml::debug('Getting message'); - ($showbutton,$message) = &decideoutput($award,$solved); - $message="
$message
"; + ($showbutton,$message,$previousmsg) = + &decideoutput($award,$solved,$previous,$target); + if ($target eq 'tex') { + $message=' '.$message.' '; + } else { + $message="$message"; + if ($previousmsg) { + $previousmsg="$previousmsg"; + } + } } my $tries = $Apache::lonhomework::history{"resource.$id.tries"}; my $maxtries = &Apache::lonnet::EXT("resource.$id.maxtries"); @@ -275,14 +557,41 @@ sub gradestatus { if ( $maxtries eq '' ) { $maxtries = '2'; } if ( $maxtries eq 'con_lost' ) { $maxtries = '0'; } if ( $showbutton ) { - $trystr = "
Tries $tries/$maxtries"; + if ($target eq 'tex') { + if ($ENV{'request.state'} ne "construct" && $Apache::lonhomework::type ne 'exam') { + $trystr = ' {\vskip 1 mm \small \textit{Tries} '.$tries.'/'.$maxtries.'} \vskip 2 mm '; + } else { + $trystr = '\vskip 0 mm '; + } + } else { + $trystr = "Tries $tries/$maxtries"; + } } if ( $status eq 'SHOW_ANSWER' || $status eq 'CANNOT_ANSWER') {$showbutton = 0;} if ( $showbutton ) { - $button = '
'; + if ($target ne 'tex') { + $button = '
'; + } + } + 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"; + } + } + } + my $output= $previousmsg.$latemessage.$message.$trystr; + if ($output =~ /^\s*$/) { + return $button; + } else { + if ($target eq 'tex') { + return $button.' \vskip 0 mm '.$output.' '; + } else { + return $button.''.$output.'
'; } } - return $button.$message.$trystr; } 1; __END__