version 1.29, 2001/03/21 18:24:36
|
version 1.100, 2003/05/08 15:33:15
|
Line 1
|
Line 1
|
# The LearningOnline Network with CAPA |
# The LearningOnline Network with CAPA |
# input definitons |
# input definitons |
|
# |
|
# $Id$ |
|
# |
|
# 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 |
# 2/19 Guy |
|
|
package Apache::inputtags; |
package Apache::inputtags; |
|
use HTML::Entities(); |
use strict; |
use strict; |
|
use Apache::loncommon; |
|
|
sub BEGIN { |
BEGIN { |
&Apache::lonxml::register('Apache::inputtags',('textarea','textline','datasubmission')); |
&Apache::lonxml::register('Apache::inputtags',('hiddenline','textfield','textline')); |
} |
} |
|
|
|
|
sub initialize_inputtags { |
sub initialize_inputtags { |
|
# list of current input ids |
@Apache::inputtags::input=(); |
@Apache::inputtags::input=(); |
|
# list of all input ids seen in this problem |
@Apache::inputtags::inputlist=(); |
@Apache::inputtags::inputlist=(); |
|
# list of all current response ids |
@Apache::inputtags::response=(); |
@Apache::inputtags::response=(); |
|
# list of all response ids seen in this problem |
@Apache::inputtags::responselist=(); |
@Apache::inputtags::responselist=(); |
@Apache::inputtags::answergroup=(); |
# 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 <problem> only |
$Apache::inputtags::part=''; |
$Apache::inputtags::part=''; |
|
# list of problem date statuses, the first element is for <problem> |
|
# if there is a second element it is for the current <part> |
@Apache::inputtags::status=(); |
@Apache::inputtags::status=(); |
|
# hash of defined params for the current response |
%Apache::inputtags::params=(); |
%Apache::inputtags::params=(); |
|
# list of all ids, for <import>, these get join()ed and prepended |
|
@Apache::inputtags::import=(); |
} |
} |
|
|
sub start_input { |
sub start_input { |
my ($parstack,$safeeval)=@_; |
my ($parstack,$safeeval)=@_; |
my $args =''; |
my $id = &Apache::lonxml::get_param('id',$parstack,$safeeval); |
if ( $#$parstack > -1 ) { $args=$$parstack[$#$parstack]; } |
if ($id eq '') { $id = $Apache::lonxml::curdepth; } |
my $id = &Apache::run::run("{$args;".'return $id}',$safeeval); |
|
push (@Apache::inputtags::input,$id); |
push (@Apache::inputtags::input,$id); |
push (@Apache::inputtags::inputlist,$id); |
push (@Apache::inputtags::inputlist,$id); |
return $id; |
return $id; |
Line 36 sub end_input {
|
Line 75 sub end_input {
|
return ''; |
return ''; |
} |
} |
|
|
sub start_textarea { |
sub start_textfield { |
my ($target,$token,$parstack,$parser,$safeeval)=@_; |
my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_; |
my $result = ""; |
my $result = ""; |
my $id = &start_input($parstack,$safeeval); |
my $id = &start_input($parstack,$safeeval); |
|
my $resid=$Apache::inputtags::response[-1]; |
if ($target eq 'web') { |
if ($target eq 'web') { |
$result= '<textarea name="HWVAL'.$id.'" value="">'; |
$Apache::lonxml::evaluate--; |
|
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); |
|
if ( $rows eq '') { $rows = 10; } |
|
$result= '<textarea name="HWVAL_'.$resid.'" '. |
|
"rows=\"$rows\" cols=\"$cols\">".$oldresponse; |
|
if ($oldresponse ne '') { |
|
#get rid of any startup text if the user has already responded |
|
&Apache::lonxml::get_all_text("/textfield",$parser); |
|
} |
|
} else { |
|
#right or wrong don't show it |
|
#$result='<table border="1"><tr><td><i>'.$oldresponse.'</i></td></tr></table>'; |
|
$result=''; |
|
#get rid of any startup text |
|
&Apache::lonxml::get_all_text("/textfield",$parser); |
|
} |
|
} elsif ($target eq 'grade') { |
|
my $seedtext=&Apache::lonxml::get_all_text("/textfield",$parser); |
|
if ($seedtext eq $ENV{'form.HWVAL_'.$resid}) { |
|
# if the seed text is still there it wasn't a real submission |
|
$ENV{'form.HWVAL_'.$resid}=''; |
|
} |
|
} elsif ($target eq 'edit') { |
|
$result.=&Apache::edit::tag_start($target,$token); |
|
$result.=&Apache::edit::text_arg('Rows:','rows',$token,4); |
|
$result.=&Apache::edit::text_arg('Columns:','cols',$token,4); |
|
my $bodytext=&Apache::lonxml::get_all_text("/textfield",$parser); |
|
$result.=&Apache::edit::editfield($token->[1],$bodytext,'Text you want to appear by default:',80,2); |
|
} elsif ($target eq 'modified') { |
|
my $constructtag=&Apache::edit::get_new_args($token,$parstack, |
|
$safeeval,'rows','cols'); |
|
if ($constructtag) { |
|
$result = &Apache::edit::rebuild_tag($token); |
|
} else { |
|
$result=$token->[4]; |
|
} |
|
$result.=&Apache::edit::modifiedfield(); |
|
} elsif ($target eq 'tex') { |
|
my $number_of_lines = &Apache::lonxml::get_param('rows',$parstack,$safeeval); |
|
my $width_of_box = &Apache::lonxml::get_param('cols',$parstack,$safeeval); |
|
if ($$tagstack[-2] eq 'essayresponse' and $Apache::lonhomework::type eq 'exam') { |
|
$result = '\fbox{\fbox{\parbox{\textwidth-5mm}{'; |
|
for (my $i=0;$i<int $number_of_lines*2;$i++) {$result.='\strut \\\\ ';} |
|
$result.='\strut \\\\\strut \\\\\strut \\\\\strut \\\\}}}'; |
|
} else { |
|
my $TeXwidth=$width_of_box/80; |
|
$result = '\vskip 1 mm \fbox{\fbox{\parbox{'.$TeXwidth.'\textwidth-5mm}{'; |
|
for (my $i=0;$i<int $number_of_lines*2;$i++) {$result.='\strut \\\\ ';} |
|
$result.='}}}\vskip 2 mm '; |
|
} |
} |
} |
return $result; |
return $result; |
} |
} |
|
|
sub end_textarea { |
sub end_textfield { |
my ($target,$token,$parstack,$parser,$safeeval)=@_; |
my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_; |
|
my $result; |
if ($target eq 'web') { |
if ($target eq 'web') { |
return "</textarea>"; |
$Apache::lonxml::evaluate++; |
} |
if ($Apache::inputtags::status[-1] eq 'CAN_ANSWER') { |
|
return "</textarea>"; |
|
} |
|
} elsif ($target eq 'edit') { |
|
$result=&Apache::edit::end_table(); |
|
} |
&end_input; |
&end_input; |
return ''; |
return $result; |
} |
} |
|
|
sub start_textline { |
sub start_textline { |
my ($target,$token,$parstack,$parser,$safeeval)=@_; |
my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_; |
my $result = ""; |
my $result = ""; |
if ($target eq 'web') { |
if ($target eq 'web') { |
my $args =''; |
$Apache::lonxml::evaluate--; |
if ( $#$parstack > -1 ) { $args=$$parstack[$#$parstack]; } |
my $partid=$Apache::inputtags::part; |
my $size = &Apache::run::run("{$args;".'return $size}',$safeeval); |
my $id=$Apache::inputtags::response[-1]; |
if ($size eq '') { $size=20; } |
if ($Apache::inputtags::status[-1] eq 'CAN_ANSWER') { |
my $oldresponse = $Apache::lonhomework::history{"resource.$Apache::inputtags::part.$Apache::inputtags::response['-1'].submission"}; |
my $size = &Apache::lonxml::get_param('size',$parstack,$safeeval); |
$result= '<input type="text" name="HWVAL'.$Apache::inputtags::response['-1'].'" value="'.$oldresponse.'" size="'.$size.'" />'; |
my $maxlength; |
|
if ($size eq '') { $size=20; } else { |
|
if ($size < 20) { $maxlength=$size; } |
|
} |
|
my $oldresponse = &HTML::Entities::encode($Apache::lonhomework::history{"resource.$partid.$id.submission"}); |
|
if ($Apache::lonhomework::type ne 'exam') { |
|
$result= '<input type="text" name="HWVAL_'.$id.'" value="'. |
|
$oldresponse.'" size="'.$size.'" maxlength="'.$maxlength.'" />'; |
|
} |
|
} else { |
|
#right or wrong don't show what was last typed in. |
|
#$result='<i>'.$oldresponse.'</i>'; |
|
$result=''; |
|
} |
|
} elsif ($target eq 'edit') { |
|
$result=&Apache::edit::tag_start($target,$token); |
|
$result.=&Apache::edit::text_arg('Size:','size',$token,'5')."</td></tr>"; |
|
$result.=&Apache::edit::end_table; |
|
} 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; |
return $result; |
} |
} |
|
|
sub end_textline { |
sub end_textline { |
my ($target,$token,$parstack,$parser,$safeeval)=@_; |
my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_; |
|
if ($target eq 'web') { $Apache::lonxml::evaluate++; } |
|
elsif ($target eq 'edit') { return ('','no'); } |
return ""; |
return ""; |
} |
} |
|
|
#answergroup is deprecated |
sub start_hiddenline { |
#sub start_answergroup { |
my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_; |
# my ($target,$token,$parstack,$parser,$safeeval)=@_; |
my $result = ""; |
# my $args =''; |
if ($target eq 'web') { |
# if ( $#$parstack > -1 ) { $args=$$parstack[$#$parstack]; } |
$Apache::lonxml::evaluate--; |
# my $id = &Apache::run::run("{$args;".'return $id}',$safeeval); |
if ($Apache::inputtags::status[-1] eq 'CAN_ANSWER') { |
# push (@Apache::inputtags::answergroup,$id); |
my $partid=$Apache::inputtags::part; |
# if ($target == 'web') { |
my $id=$Apache::inputtags::response[-1]; |
# |
my $oldresponse = &HTML::Entities::encode($Apache::lonhomework::history{"resource.$partid.$id.submission"}); |
# } |
if ($Apache::lonhomework::type ne 'exam') { |
# return ''; |
$result= '<input type="hidden" name="HWVAL_'.$id.'" value="'. |
#} |
$oldresponse.'" />'; |
# |
} |
#sub end_answergroup { |
} |
# my ($target,$token,$parstack,$parser,$safeeval)=@_; |
} elsif ($target eq 'edit') { |
# return ''; # <answergroup> has ben deprecated |
$result=&Apache::edit::tag_start($target,$token); |
# my $args =''; |
$result.=&Apache::edit::end_table; |
# if ( $#$parstack > -1 ) { $args=$$parstack[$#$parstack]; } |
} |
# my $id = &Apache::run::run("{$args;".'return $id}',$safeeval); |
return $result; |
# push (@Apache::inputtags::answergroup,$id); |
} |
# my $result=''; |
|
# my $button='<input type="submit" name="submit" value="Submit All Answers" />'; |
sub end_hiddenline { |
# my $showbutton='1'; |
my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_; |
# my $usedtry='1'; |
if ($target eq 'web') { $Apache::lonxml::evaluate++; } |
# my $response=''; |
elsif ($target eq 'edit') { return ('','no'); } |
# if ( $target == 'web' ) { |
return ""; |
# if ( defined $ENV{'form.submitted'}) { |
|
# } |
|
# if ($showbutton > 0) { $result.=$button } |
|
# } |
|
# pop @Apache::inputtags::answergroup; |
|
# return $result; |
|
#} |
|
|
|
|
|
sub start_datasubmission { |
|
} |
|
|
|
sub end_datasubmission { |
|
my ($target,$token,$parstack,$parser,$safeeval)=@_; |
|
if ( $target == 'web' ) { |
|
return '<input type="submit" name="submit" value="Submit All Data" />'; |
|
} |
|
return ''; |
|
} |
} |
|
|
sub finalizeawards { |
sub finalizeawards { |
Line 125 sub finalizeawards {
|
Line 233 sub finalizeawards {
|
my $award; |
my $award; |
if ($#_ == '-1') { $result = "NO_RESPONSE"; } |
if ($#_ == '-1') { $result = "NO_RESPONSE"; } |
if ($result eq '' ) { |
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 '' ) { |
if ($result eq '' ) { |
foreach $award (@_) { if ($award eq 'ERROR') {$result='ERROR'; last;}} |
foreach $award (@_) { if ($award eq 'ERROR') {$result='ERROR'; last;}} |
Line 156 sub finalizeawards {
|
Line 274 sub finalizeawards {
|
foreach $award (@_) { if ($award eq 'INCORRECT') {$result=$award; last;} } |
foreach $award (@_) { if ($award eq 'INCORRECT') {$result=$award; last;} } |
} |
} |
if ($result eq '' ) { |
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;} } |
foreach $award (@_) { if ($award eq 'APPROX_ANS') {$result=$award; last;} } |
} |
} |
if ($result eq '' ) { $result='EXACT_ANS'; } |
if ($result eq '' ) { $result='EXACT_ANS'; } |
Line 163 sub finalizeawards {
|
Line 296 sub finalizeawards {
|
} |
} |
|
|
sub decideoutput { |
sub decideoutput { |
my ($award)=@_; |
my ($award,$solved,$previous,$target)=@_; |
my $message=''; |
my $message=''; |
my $button=0; |
my $button=0; |
if ($award eq 'EXACT_ANS' || $award eq 'APPROX_ANS' ) { |
my $previousmsg; |
$message = "<b>You are correct.</b> Your receipt is ".&Apache::lonnet::receipt; |
|
$button=0; |
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 = "<b>You are correct.</b>"; |
|
} |
|
$message=' Your receipt is '.&Apache::lonnet::receipt; |
|
} |
|
$button=0; |
|
$previousmsg=''; |
|
} elsif ($solved =~ /^excused/) { |
|
$message = "<b>You are excused from the problem.</b>"; |
|
$button=0; |
|
$previousmsg=''; |
|
} elsif ($award eq 'EXACT_ANS' || $award eq 'APPROX_ANS' ) { |
|
if ($solved =~ /^incorrect/ || $solved eq '') { |
|
$message = "Incorrect"; |
|
$button=1; |
|
} else { |
|
$message = "<b>You are correct.</b> Your receipt is ". |
|
&Apache::lonnet::receipt; |
|
$button=0; |
|
$previousmsg=''; |
|
} |
} elsif ($award eq 'NO_RESPONSE') { |
} elsif ($award eq 'NO_RESPONSE') { |
$message = ''; |
$message = ''; |
$button=1; |
$button=1; |
} elsif ($award eq 'MISSING_ANSWER') { |
} elsif ($award eq 'MISSING_ANSWER') { |
$message = 'Some parts were not submitted'; |
$message = 'Some parts were not submitted'; |
$button = 1; |
$button = 1; |
} elsif ($award eq 'WANTED_NUMERIC') { |
} elsif ($award eq 'WANTED_NUMERIC') { |
$message = "This question expects a numeric answer"; |
$message = "This question expects a numeric answer"; |
$button=1; |
$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') { |
} elsif ($award eq 'SIG_FAIL') { |
$message = "Please adjust significant figures.";# you provided %s significant figures"; |
$message = "Please adjust significant figures.";# you provided %s significant figures"; |
$button=1; |
$button=1; |
} elsif ($award eq 'UNIT_FAIL') { |
} elsif ($award eq 'UNIT_FAIL') { |
$message = "Units incorrect."; #Computer reads units as %s"; |
$message = "Units incorrect. ". |
$button=1; |
&Apache::loncommon::help_open_topic('Physical_Units'); #Computer reads units as %s"; |
|
$button=1; |
} elsif ($award eq 'UNIT_NOTNEEDED') { |
} elsif ($award eq 'UNIT_NOTNEEDED') { |
$message = "Only a number required.";# Computer reads units of %s"; |
$message = "Only a number required.";# Computer reads units of %s"; |
$button=1; |
$button=1; |
} elsif ($award eq 'NO_UNIT') { |
} elsif ($award eq 'NO_UNIT') { |
$message = "Units required"; |
$message = "Units required". |
$button=1; |
&Apache::loncommon::help_open_topic('Physical_Units'); |
|
$button=1; |
} elsif ($award eq 'BAD_FORMULA') { |
} elsif ($award eq 'BAD_FORMULA') { |
$message = "Unable to understand formula"; |
$message = "Unable to understand formula"; |
$button=1; |
$button=1; |
} elsif ($award eq 'INCORRECT') { |
} elsif ($award eq 'INCORRECT') { |
$message = "Incorrect"; |
$message = "Incorrect"; |
$button=1; |
$button=1; |
|
} elsif ($award eq 'SUBMITTED') { |
|
$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 { |
} else { |
$message = "Unknown message: $award"; |
$message = "Unknown message: $award"; |
$button=1; |
$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 { |
sub setgradedata { |
my ($award,$id) = @_; |
my ($award,$id,$previously_used) = @_; |
if ( $award eq 'APPROX_ANS' || $award eq 'EXACT_ANS' ) { |
# if the student already has it correct, don't modify the status |
$Apache::lonhomework::results{"resource.$id.tries"} = |
if ($Apache::inputtags::status['-1'] ne 'CAN_ANSWER' && |
$Apache::lonhomework::history{"resource.$id.tries"} + 1; |
$Apache::inputtags::status['-1'] ne 'CANNOT_ANSWER') { |
$Apache::lonhomework::results{"resource.$id.solved"} = |
$Apache::lonhomework::results{"resource.$id.afterduedate"}=$award; |
'correct_by_student'; |
return ''; |
$Apache::lonhomework::results{"resource.$id.awarded"} = '1'; |
} elsif ( $Apache::lonhomework::history{"resource.$id.solved"} !~ |
} elsif ( $award eq 'INCORRECT' ) { |
/^correct/ || $Apache::lonhomework::scantronmode) { |
$Apache::lonhomework::results{"resource.$id.tries"} = |
#handle assignment of tries and solved status |
$Apache::lonhomework::history{"resource.$id.tries"} + 1; |
my $solvemsg; |
$Apache::lonhomework::results{"resource.$id.solved"} = |
if ($Apache::lonhomework::scantronmode) { |
'incorrect_attempted'; |
$solvemsg='correct_by_scantron'; |
} else { |
} else { |
$Apache::lonhomework::results{"resource.$id.solved"} = |
$solvemsg='correct_by_student'; |
'incorrect_attempted'; |
} |
|
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; |
$Apache::lonhomework::results{"resource.$id.award"} = $award; |
} |
} |
Line 226 sub setgradedata {
|
Line 485 sub setgradedata {
|
sub grade { |
sub grade { |
my ($target) = @_; |
my ($target) = @_; |
my $id = $Apache::inputtags::part; |
my $id = $Apache::inputtags::part; |
# my $result=''; |
|
my $response=''; |
my $response=''; |
if ( $target == 'web' ) { |
if ( defined $ENV{'form.submitted'}) { |
if ( defined $ENV{'form.submitted'}) { |
my @awards = (); |
my @awards = (); |
foreach $response (@Apache::inputtags::responselist) { |
&Apache::lonxml::debug("$#Apache::inputtags::responselist"); |
&Apache::lonxml::debug("looking for response.$id.$response.awarddetail"); |
foreach $response (@Apache::inputtags::responselist) { |
my $value=$Apache::lonhomework::results{"resource.$id.$response.awarddetail"}; |
&Apache::lonxml::debug("looking for response.$id.$response.awarddetail"); |
&Apache::lonxml::debug("keeping $value from $response for $id"); |
my $value=$Apache::lonhomework::results{"resource.$id.$response.awarddetail"}; |
push (@awards,$value); |
if ( $value ne '' ) { |
} |
&Apache::lonxml::debug("keep ing $value from $response for $id"); |
my $finalaward = &finalizeawards(@awards); |
push (@awards,$value); |
my $previously_used; |
} else { |
if ( $#Apache::inputtags::previous eq $#awards ) { |
&Apache::lonxml::debug("skipping $value from $response for $id"); |
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 ''; |
return ''; |
} |
} |
|
|
sub gradestatus { |
sub gradestatus { |
my ($id) = @_; |
my ($id,$target) = @_; |
my $showbutton = 1; |
my $showbutton = 1; |
my $message = ''; |
my $message = ''; |
|
my $latemessage = ''; |
my $trystr=''; |
my $trystr=''; |
my $button=''; |
my $button=''; |
|
my $previousmsg=''; |
|
|
my $status = $Apache::inputtags::status['-1']; |
my $status = $Apache::inputtags::status['-1']; |
&Apache::lonxml::debug("gradestatus has :$status:"); |
&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 $award = $Apache::lonhomework::history{"resource.$id.award"}; |
&Apache::lonxml::debug("Found Award |$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 '' ) { |
if ( $award ne '' ) { |
&Apache::lonxml::debug('Getting message'); |
&Apache::lonxml::debug('Getting message'); |
($showbutton,$message) = &decideoutput($award); |
($showbutton,$message,$previousmsg) = |
$message="<br /><table bgcolor=\"#aaffaa\"><tr><td>$message</td></tr></table>"; |
&decideoutput($award,$solved,$previous,$target); |
|
if ($target eq 'tex') { |
|
$message=' '.$message.' '; |
|
} else { |
|
$message="<td bgcolor=\"#aaffaa\">$message</td>"; |
|
if ($previousmsg) { |
|
$previousmsg="<td bgcolor=\"#ffaaaa\">$previousmsg</td>"; |
|
} |
|
} |
} |
} |
my $tries = $Apache::lonhomework::history{"resource.$id.tries"}; |
my $tries = $Apache::lonhomework::history{"resource.$id.tries"}; |
my $maxtries = &Apache::lonnet::EXT("resource.$id.maxtries"); |
my $maxtries = &Apache::lonnet::EXT("resource.$id.maxtries"); |
Line 274 sub gradestatus {
|
Line 557 sub gradestatus {
|
if ( $maxtries eq '' ) { $maxtries = '2'; } |
if ( $maxtries eq '' ) { $maxtries = '2'; } |
if ( $maxtries eq 'con_lost' ) { $maxtries = '0'; } |
if ( $maxtries eq 'con_lost' ) { $maxtries = '0'; } |
if ( $showbutton ) { |
if ( $showbutton ) { |
$trystr = "<br />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 = "<td>Tries $tries/$maxtries</td>"; |
|
} |
} |
} |
if ( $status eq 'SHOW_ANSWER' || $status eq 'CANNOT_ANSWER') {$showbutton = 0;} |
if ( $status eq 'SHOW_ANSWER' || $status eq 'CANNOT_ANSWER') {$showbutton = 0;} |
if ( $showbutton ) { |
if ( $showbutton ) { |
$button = '<br /><input type="submit" name="submit" value="Submit All Answers" />'; |
if ($target ne 'tex') { |
|
$button = '<br /><input type="submit" name="submit" value="Submit Answer" />'; |
|
} |
|
} |
|
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="<td bgcolor=\"#ffaaaa\">The last submission was after the Due Date</td>"; |
|
} |
|
} |
|
} |
|
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.'<table><tr>'.$output.'</tr></table>'; |
} |
} |
} |
} |
return $button.$message.$trystr; |
|
} |
} |
1; |
1; |
__END__ |
__END__ |