version 1.61, 2002/09/23 07:08:40
|
version 1.71, 2002/10/29 06:12:32
|
Line 32 use HTML::Entities();
|
Line 32 use HTML::Entities();
|
use strict; |
use strict; |
|
|
BEGIN { |
BEGIN { |
&Apache::lonxml::register('Apache::inputtags',('textfield','textline','datasubmission')); |
&Apache::lonxml::register('Apache::inputtags',('textfield','textline')); |
} |
} |
|
|
|
|
Line 110 sub start_textfield {
|
Line 110 sub start_textfield {
|
$result.=&Apache::edit::text_arg('Rows:','rows',$token,4); |
$result.=&Apache::edit::text_arg('Rows:','rows',$token,4); |
$result.=&Apache::edit::text_arg('Columns:','cols',$token,4); |
$result.=&Apache::edit::text_arg('Columns:','cols',$token,4); |
my $bodytext=&Apache::lonxml::get_all_text("/textfield",$$parser[-1]); |
my $bodytext=&Apache::lonxml::get_all_text("/textfield",$$parser[-1]); |
$result.=&Apache::edit::editfield($token->[1],$bodytext,'Text you want to appear by default:',50,2); |
$result.=&Apache::edit::editfield($token->[1],$bodytext,'Text you want to appear by default:',80,2); |
} elsif ($target eq 'modified') { |
} elsif ($target eq 'modified') { |
my $constructtag=&Apache::edit::get_new_args($token,$parstack, |
my $constructtag=&Apache::edit::get_new_args($token,$parstack, |
$safeeval,'rows','cols'); |
$safeeval,'rows','cols'); |
Line 175 sub end_textline {
|
Line 175 sub end_textline {
|
return ""; |
return ""; |
} |
} |
|
|
sub start_datasubmission { |
|
my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_; |
|
my $id = &Apache::response::start_response($parstack,$safeeval); |
|
my $result; |
|
if ($target eq 'meta') { |
|
$result = &Apache::response::meta_stores_write($token->[2]->{'name'}, |
|
$token->[2]->{'type'}, |
|
$token->[2]->{'display'}); |
|
$result .= &Apache::response::meta_package_write('datasubmission'); |
|
} |
|
return $result; |
|
} |
|
|
|
sub end_datasubmission { |
|
my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_; |
|
my $result; |
|
if ( $target eq 'web' ) { |
|
} elsif ($target eq 'grade' ) { |
|
if ( defined $ENV{'form.submitted'}) { |
|
&Apache::response::setup_params('datasubmission'); |
|
my $partid = $Apache::inputtags::part; |
|
my $id = $Apache::inputtags::response['-1']; |
|
my $response = $ENV{'form.HWVAL'.$id}; |
|
my $name = &Apache::lonxml::get_param('name',$parstack,$safeeval); |
|
if ( $response =~ /[^\s]/) { |
|
$Apache::lonhomework::results{"resource.$partid.$id.$name"}= |
|
$response; |
|
} |
|
} |
|
} |
|
&Apache::response::end_response; |
|
return $result; |
|
} |
|
|
|
sub finalizeawards { |
sub finalizeawards { |
my $result=''; |
my $result=''; |
my $award; |
my $award; |
Line 268 sub finalizeawards {
|
Line 234 sub finalizeawards {
|
} |
} |
|
|
sub decideoutput { |
sub decideoutput { |
my ($award,$solved,$previous)=@_; |
my ($award,$solved,$previous,$target)=@_; |
my $message=''; |
my $message=''; |
my $button=0; |
my $button=0; |
my $previousmsg; |
my $previousmsg; |
Line 276 sub decideoutput {
|
Line 242 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/) { |
$message = "<b>You are correct.</b> Your receipt is ". |
if ($target eq 'tex') { |
|
$message = '\textbf{You are correct}. Your receipt is '. |
|
&Apache::lonnet::receipt; |
|
} else { |
|
$message = "<b>You are correct.</b> Your receipt is ". |
&Apache::lonnet::receipt; |
&Apache::lonnet::receipt; |
|
} |
$button=0; |
$button=0; |
$previousmsg=''; |
$previousmsg=''; |
} elsif ($solved =~ /^excused/) { |
} elsif ($solved =~ /^excused/) { |
Line 337 sub decideoutput {
|
Line 308 sub decideoutput {
|
sub setgradedata { |
sub setgradedata { |
my ($award,$id,$previously_used) = @_; |
my ($award,$id,$previously_used) = @_; |
# if the student already has it correct, don't modify the status |
# if the student already has it correct, don't modify the status |
if ($Apache::inputtags::status['-1'] ne 'CAN_ANSWER') { |
if ($Apache::inputtags::status['-1'] ne 'CAN_ANSWER' && |
|
$Apache::inputtags::status['-1'] ne 'CANNOT_ANSWER') { |
$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"} !~ |
Line 382 sub setgradedata {
|
Line 354 sub setgradedata {
|
foreach my $key (keys(%Apache::lonhomework::results)) { |
foreach my $key (keys(%Apache::lonhomework::results)) { |
if (($key =~ /^resource\.$id\./) && ($key !~ /\.collaborators$/)) { |
if (($key =~ /^resource\.$id\./) && ($key !~ /\.collaborators$/)) { |
&Apache::lonxml::debug("Removing $key"); |
&Apache::lonxml::debug("Removing $key"); |
delete($Apache::lonhomework::results{$key}); |
delete($Apache::lonhomework::results{$key}); |
} |
} |
} |
} |
#and since they didn't do anything we were never here |
#and since they didn't do anything we were never here |
Line 424 sub grade {
|
Line 396 sub grade {
|
} |
} |
|
|
sub gradestatus { |
sub gradestatus { |
my ($id) = @_; |
my ($id,$target) = @_; |
my $showbutton = 1; |
my $showbutton = 1; |
my $message = ''; |
my $message = ''; |
my $latemessage = ''; |
my $latemessage = ''; |
Line 442 sub gradestatus {
|
Line 414 sub gradestatus {
|
if ( $award ne '' ) { |
if ( $award ne '' ) { |
&Apache::lonxml::debug('Getting message'); |
&Apache::lonxml::debug('Getting message'); |
($showbutton,$message,$previousmsg) = |
($showbutton,$message,$previousmsg) = |
&decideoutput($award,$solved,$previous); |
&decideoutput($award,$solved,$previous,$target); |
$message="<td bgcolor=\"#aaffaa\">$message</td>"; |
if ($target eq 'tex') { |
if ($previousmsg) { |
$message=' '.$message.' '; |
$previousmsg="<td bgcolor=\"#ffaaaa\">$previousmsg</td>"; |
} 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"}; |
Line 455 sub gradestatus {
|
Line 431 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 = "<td>Tries $tries/$maxtries</td>"; |
if ($target eq 'tex') { |
|
if ($ENV{'request.state'} ne "construct") { |
|
$trystr = ' {\small \textit{Tries} '.$tries.'/'.$maxtries.'} \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 Answer" />'; |
if ($target ne 'tex') { |
|
$button = '<br /><input type="submit" name="submit" value="Submit Answer" />'; |
|
} |
} |
} |
if ($Apache::lonhomework::history{"resource.$id.afterduedate"}) { |
if ($Apache::lonhomework::history{"resource.$id.afterduedate"}) { |
#last submissions was after due date |
#last submissions was after due date |
$latemessage="<td bgcolor=\"#ffaaaa\">The last submission was after the Due Date</td>"; |
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; |
my $output= $previousmsg.$latemessage.$message.$trystr; |
if ($output =~ /^\s*$/) { |
if ($output =~ /^\s*$/) { |
return $button; |
return $button; |
} else { |
} else { |
return $button.'<table><tr>'.$output.'</tr></table>'; |
if ($target eq 'tex') { |
|
return $button.' \vskip 0 mm '.$output.' '; |
|
} else { |
|
return $button.'<table><tr>'.$output.'</tr></table>'; |
|
} |
} |
} |
} |
} |
1; |
1; |