version 1.29, 2002/03/15 21:40:27
|
version 1.30, 2002/03/15 21:56:11
|
Line 239 sub astatus {
|
Line 239 sub astatus {
|
my $status=$returnhash{'resource.'.$_.'.solved'}; |
my $status=$returnhash{'resource.'.$_.'.solved'}; |
|
|
if ($status eq 'correct_by_student') { |
if ($status eq 'correct_by_student') { |
if ($code==0) { $code=3; } else { $code=4; } |
if ($code==0||$code==3) { $code=3; } else { $code=4; } |
$ctext.=' solved'; |
$ctext.=' solved'; |
} elsif ($status eq 'correct_by_override') { |
} elsif ($status eq 'correct_by_override') { |
if ($code==0) { $code=3; } else { $code=4; } |
if ($code==0||$code==3) { $code=3; } else { $code=4; } |
$ctext.=' override'; |
$ctext.=' override'; |
} elsif ($status eq 'incorrect_attempted') { |
} elsif ($status eq 'incorrect_attempted') { |
if ($code!=4 && $code!=3) { $code=2; } |
if ($code!=4 && $code!=3) { $code=2; } |
Line 258 sub astatus {
|
Line 258 sub astatus {
|
if ($code==3) { $code=4; } |
if ($code==3) { $code=4; } |
$ctext.=' override'; |
$ctext.=' override'; |
} elsif ($status eq 'excused') { |
} elsif ($status eq 'excused') { |
if ($code==0) { $code=3; } else { $code=4; } |
if ($code==0||$code==3) { $code=3; } else { $code=4; } |
$ctext.=' excused'; |
$ctext.=' excused'; |
} else { |
} else { |
if ($code==0) { $code=1; } |
if ($code==0) { $code=1; } |
Line 283 sub tracetable {
|
Line 283 sub tracetable {
|
eq 'sequence') { |
eq 'sequence') { |
$tprefix='h'; |
$tprefix='h'; |
} else { |
} else { |
# it's a page we need to grab out the problems only |
#if it's a page we need to still pull out the problems |
} |
} |
if (defined($rows[$sofar])) { |
if (defined($rows[$sofar])) { |
$rows[$sofar].='&'.$tprefix.$rid; |
$rows[$sofar].='&'.$tprefix.$rid; |
Line 603 sub handler {
|
Line 603 sub handler {
|
} |
} |
if ($code eq '3') { |
if ($code eq '3') { |
$add='<td bgcolor="#AAFFAA">'; |
$add='<td bgcolor="#AAFFAA">'; |
|
} elsif ($code eq '4') { |
|
$add='<td bgcolor="#E0FFAA">'; |
} else { |
} else { |
$add='<td bgcolor="#FFAAAA">'; |
$add='<td bgcolor="#FFAAAA">'; |
if ($tcode eq '2') { |
if ($tcode eq '2') { |
Line 618 sub handler {
|
Line 620 sub handler {
|
if ($code eq '1') { |
if ($code eq '1') { |
$hwke='</b> ('.$ctext.')</font>'; |
$hwke='</b> ('.$ctext.')</font>'; |
} |
} |
if ($code eq '2') { |
if ($code eq '2' || $code eq '4') { |
$hwk='<font color="#992222"><b>'; |
$hwk='<font color="#992222"><b>'; |
$hwke='</b> ('.$ctext.')</font>'; |
$hwke='</b> ('.$ctext.')</font>'; |
} |
} |
Line 626 sub handler {
|
Line 628 sub handler {
|
$hwk='<font color="#229922"><b>'; |
$hwk='<font color="#229922"><b>'; |
$hwke='</b> ('.$ctext.')</font>'; |
$hwke='</b> ('.$ctext.')</font>'; |
} |
} |
if ($code eq '4') { |
|
$hwk='<font color="#229922"><b>'; |
|
$hwke='</b> ('.$ctext.')</font>'; |
|
} |
|
} |
} |
if ($hash{'src_'.$rid} eq $currenturl) { |
if ($hash{'src_'.$rid} eq $currenturl) { |
$add=$add.'<a name="curloc"></a>'. |
$add=$add.'<a name="curloc"></a>'. |