version 1.61, 2002/09/23 07:08:40
|
version 1.64, 2002/10/02 18:13:47
|
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 382 sub setgradedata {
|
Line 382 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 424 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 443 sub gradestatus {
|
Line 443 sub gradestatus {
|
&Apache::lonxml::debug('Getting message'); |
&Apache::lonxml::debug('Getting message'); |
($showbutton,$message,$previousmsg) = |
($showbutton,$message,$previousmsg) = |
&decideoutput($award,$solved,$previous); |
&decideoutput($award,$solved,$previous); |
$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 459 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') { |
|
$trystr = ' Tries '.$tries.'/'.$maxtries.' '; |
|
} 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; |