version 1.89, 2003/04/08 02:37:58
|
version 1.96, 2003/04/24 12:44:54
|
Line 124 sub start_textfield {
|
Line 124 sub start_textfield {
|
} |
} |
$result.=&Apache::edit::modifiedfield(); |
$result.=&Apache::edit::modifiedfield(); |
} elsif ($target eq 'tex') { |
} 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') { |
if ($$tagstack[-2] eq 'essayresponse' and $Apache::lonhomework::type eq 'exam') { |
my $number_of_lines= &Apache::lonxml::get_param('rows',$parstack,$safeeval); |
|
$result = '\fbox{\fbox{\parbox{\textwidth-5mm}{'; |
$result = '\fbox{\fbox{\parbox{\textwidth-5mm}{'; |
for (my $i=0;$i<int $number_of_lines*2;$i++) {$result.='\strut \\\\ ';} |
for (my $i=0;$i<int $number_of_lines*2;$i++) {$result.='\strut \\\\ ';} |
$result.='\strut \\\\\strut \\\\\strut \\\\\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; |
Line 252 sub finalizeawards {
|
Line 258 sub finalizeawards {
|
foreach $award (@_) { if ($award eq 'SUBMITTED') {$result=$award; last;} } |
foreach $award (@_) { if ($award eq 'SUBMITTED') {$result=$award; last;} } |
} |
} |
if ($result eq '' ) { |
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 267 sub decideoutput {
|
Line 276 sub decideoutput {
|
if ($previous) { $previousmsg='You have entered that answer before'; } |
if ($previous) { $previousmsg='You have entered that answer before'; } |
|
|
if ($solved =~ /^correct/) { |
if ($solved =~ /^correct/) { |
if ($target eq 'tex') { |
if ($award eq 'ASSIGNED_SCORE') { |
$message = '\textbf{You are correct}. Your receipt is '. |
$message = "A score has been assigned."; |
&Apache::lonnet::receipt; |
} else { |
} else { |
if ($target eq 'tex') { |
$message = "<b>You are correct.</b> Your receipt is ". |
$message = '\textbf{You are correct}.'; |
&Apache::lonnet::receipt; |
} else { |
} |
$message = "<b>You are correct.</b>"; |
$button=0; |
} |
$previousmsg=''; |
$message=' Your receipt is '.&Apache::lonnet::receipt; |
|
} |
|
$button=0; |
|
$previousmsg=''; |
} elsif ($solved =~ /^excused/) { |
} elsif ($solved =~ /^excused/) { |
$message = "<b>You are excused from the problem.</b>"; |
$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; |
$button=0; |
$previousmsg=''; |
$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') { |
} elsif ($award eq 'MISORDERED_RANK') { |
$message = 'You have provided an invalid ranking, please refer to '. |
$message = 'You have provided an invalid ranking, please refer to '. |
&Apache::loncommon::help_open_topic('Ranking_Problems','help on ranking problems').'.'; |
&Apache::loncommon::help_open_topic('Ranking_Problems','help on ranking problems').'.'; |
$button=1; |
$button=1; |
} elsif ($award eq 'INVALID_FILETYPE') { |
} elsif ($award eq 'INVALID_FILETYPE') { |
$message = 'The filetype extension of the file you uploaded is not allowed.'; |
$message = 'The filetype extension of the file you uploaded is not allowed.'; |
$button=1; |
$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. ". |
$message = "Units incorrect. ". |
&Apache::loncommon::help_open_topic('Physical_Units'); #Computer reads units as %s"; |
&Apache::loncommon::help_open_topic('Physical_Units'); #Computer reads units as %s"; |
$button=1; |
$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". |
&Apache::loncommon::help_open_topic('Physical_Units'); |
&Apache::loncommon::help_open_topic('Physical_Units'); |
$button=1; |
$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') { |
} elsif ($award eq 'SUBMITTED') { |
$message = "Your submission has been recorded."; |
$message = "Your submission has been recorded."; |
$button=1; |
$button=1; |
} elsif ($award eq 'DRAFT') { |
} elsif ($award eq 'DRAFT') { |
$message = "A draft copy has been saved."; |
$message = "A draft copy has been saved."; |
$button=1; |
$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; |
|
} |
|
if (lc($Apache::lonhomework::problemstatus) ne 'yes') { |
|
$message = "Answer Submitted"; |
|
$button=1; |
} |
} |
if ($Apache::lonhomework::type eq 'exam') {$message='';$previousmsg='';} |
|
return ($button,$message,$previousmsg); |
return ($button,$message,$previousmsg); |
} |
} |
|
|
Line 358 sub setgradedata {
|
Line 376 sub setgradedata {
|
$Apache::lonhomework::results{"resource.$id.afterduedate"}=$award; |
$Apache::lonhomework::results{"resource.$id.afterduedate"}=$award; |
return ''; |
return ''; |
} elsif ( $Apache::lonhomework::history{"resource.$id.solved"} !~ |
} elsif ( $Apache::lonhomework::history{"resource.$id.solved"} !~ |
/^correct/ ) { |
/^correct/ || $Apache::lonhomework::scantronmode) { |
#handle assignment of tries and solved status |
#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"}) { |
if ($Apache::lonhomework::history{"resource.$id.afterduedate"}) { |
$Apache::lonhomework::results{"resource.$id.afterduedate"}=''; |
$Apache::lonhomework::results{"resource.$id.afterduedate"}=''; |
} |
} |
if ( $award eq 'APPROX_ANS' || $award eq 'EXACT_ANS' ) { |
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::results{"resource.$id.tries"} = |
$Apache::lonhomework::history{"resource.$id.tries"} + 1; |
$Apache::lonhomework::history{"resource.$id.tries"} + 1; |
$Apache::lonhomework::results{"resource.$id.solved"} = |
$Apache::lonhomework::results{"resource.$id.solved"} = |
'correct_by_student'; |
$solvemsg; |
$Apache::lonhomework::results{"resource.$id.awarded"} = '1'; |
$Apache::lonhomework::results{"resource.$id.awarded"} = '1'; |
} elsif ( $award eq 'INCORRECT' ) { |
} elsif ( $award eq 'INCORRECT' ) { |
$Apache::lonhomework::results{"resource.$id.tries"} = |
$Apache::lonhomework::results{"resource.$id.tries"} = |
Line 491 sub gradestatus {
|
Line 531 sub gradestatus {
|
if ( $showbutton ) { |
if ( $showbutton ) { |
if ($target eq 'tex') { |
if ($target eq 'tex') { |
if ($ENV{'request.state'} ne "construct") { |
if ($ENV{'request.state'} ne "construct") { |
$trystr = ' {\small \textit{Tries} '.$tries.'/'.$maxtries.'} \vskip 0 mm '; |
$trystr = ' {\vskip -1 mm \small \textit{Tries} '.$tries.'/'.$maxtries.'} \vskip 2 mm '; |
} else { |
} else { |
$trystr = '\vskip 0 mm '; |
$trystr = '\vskip 0 mm '; |
} |
} |