version 1.146, 2006/08/01 14:41:46
|
version 1.149, 2006/10/17 19:35:37
|
Line 306 sub handle_previous {
|
Line 306 sub handle_previous {
|
} |
} |
|
|
sub view_or_modify { |
sub view_or_modify { |
my ($symb,$courseid,$domain,$name) = &Apache::lonxml::whichuser(); |
my ($symb,$courseid,$domain,$name) = &Apache::lonnet::whichuser(); |
my $myself=0; |
my $myself=0; |
if ( ($name eq $env{'user.name'}) && ($domain eq $env{'user.domain'}) ) { |
if ( ($name eq $env{'user.name'}) && ($domain eq $env{'user.domain'}) ) { |
$myself=1; |
$myself=1; |
Line 340 sub end_dataresponse {
|
Line 340 sub end_dataresponse {
|
if ( $target eq 'web' ) { |
if ( $target eq 'web' ) { |
} elsif ($target eq 'grade' ) { |
} elsif ($target eq 'grade' ) { |
if ( defined $env{'form.submitted'}) { |
if ( defined $env{'form.submitted'}) { |
my ($symb,$courseid,$domain,$name)=&Apache::lonxml::whichuser(); |
my ($symb,$courseid,$domain,$name)=&Apache::lonnet::whichuser(); |
my $allowed=&Apache::lonnet::allowed('mgr',$courseid); |
my $allowed=&Apache::lonnet::allowed('mgr',$courseid); |
if ($allowed) { |
if ($allowed) { |
&Apache::response::setup_params('dataresponse',$safeeval); |
&Apache::response::setup_params('dataresponse',$safeeval); |
Line 686 sub setup_params {
|
Line 686 sub setup_params {
|
|
|
{ |
{ |
my @answer_bits; |
my @answer_bits; |
|
my $need_row_start; |
|
|
sub answer_header { |
sub answer_header { |
my ($type,$increment) = @_; |
my ($type,$increment,$rows) = @_; |
my $result; |
my $result; |
if ($env{'form.answer_output_mode'} eq 'tex') { |
if ($env{'form.answer_output_mode'} eq 'tex') { |
undef(@answer_bits); |
undef(@answer_bits); |
Line 701 sub answer_header {
|
Line 702 sub answer_header {
|
} |
} |
push(@answer_bits,$bit); |
push(@answer_bits,$bit); |
} else { |
} else { |
|
my $td = '<td '.(defined($rows)?'rowspan="'.$rows.'"':'').'>'; |
$result = '<table border="1"><tr>'; |
$result = '<table border="1"><tr>'; |
if ($Apache::lonhomework::type eq 'exam') { |
if ($Apache::lonhomework::type eq 'exam') { |
$result .= '<td>'.($Apache::lonxml::counter+$increment). ')</td>'; |
$result .= $td.($Apache::lonxml::counter+$increment). ')</td>'; |
} else { |
} else { |
$result .= '<td>Answer for Part:'.$Apache::inputtags::part.'</td>'; |
$result .= $td.&mt('Answer for Part: [_1]', |
|
$Apache::inputtags::part).'</td>'; |
} |
} |
$result .= "\n"; |
$result .= "\n"; |
|
$need_row_start = 0; |
|
} |
|
return $result; |
|
} |
|
|
|
sub next_answer { |
|
my ($type) = @_; |
|
my $result; |
|
if ($env{'form.answer_output_mode'} eq 'tex') { |
|
# FIXME ... need to do something with tex mode |
|
} else { |
|
$result .= "</tr>"; |
|
$need_row_start = 1; |
} |
} |
return $result; |
return $result; |
} |
} |
|
|
sub answer_part { |
sub answer_part { |
my ($type,$answer) = @_; |
my ($type,$answer,$args) = @_; |
my $result; |
my $result; |
if ($env{'form.answer_output_mode'} eq 'tex') { |
if ($env{'form.answer_output_mode'} eq 'tex') { |
my $to_use='|'; |
if (!$args->{'no_verbatim'}) { |
foreach my $value (32..126) { |
my $to_use='|'; |
my $char=pack('c',$value); |
foreach my $value (32..126) { |
if ($answer !~ /\Q$char\E/) { |
my $char=pack('c',$value); |
$to_use=$char; |
if ($answer !~ /\Q$char\E/) { |
last; |
$to_use=$char; |
|
last; |
|
} |
|
} |
|
if ($answer ne '') { |
|
$answer = '\verb'.$to_use.$answer.$to_use; |
} |
} |
} |
} |
if ($answer ne '') { |
if ($answer ne '') { |
push(@answer_bits,'\verb'.$to_use.$answer.$to_use); |
push(@answer_bits,$answer); |
} |
} |
} else { |
} else { |
$result = '<td>'.$answer.'</td>'; |
if ($need_row_start) { |
|
$result .= '<tr>'; |
|
$need_row_start = 0; |
|
} |
|
$result .= '<td>'.$answer.'</td>'; |
} |
} |
return $result; |
return $result; |
} |
} |
Line 751 sub answer_footer {
|
Line 776 sub answer_footer {
|
|
|
sub showallfoils { |
sub showallfoils { |
if (defined($env{'form.showallfoils'})) { |
if (defined($env{'form.showallfoils'})) { |
my ($symb)=&Apache::lonxml::whichuser(); |
my ($symb)=&Apache::lonnet::whichuser(); |
if (($env{'request.state'} eq 'construct') || |
if (($env{'request.state'} eq 'construct') || |
($env{'user.adv'} && $symb eq '') || |
($env{'user.adv'} && $symb eq '') || |
($Apache::lonhomework::viewgrades) ) { |
($Apache::lonhomework::viewgrades) ) { |
Line 973 sub submitted {
|
Line 998 sub submitted {
|
} |
} |
|
|
sub add_to_gradingqueue { |
sub add_to_gradingqueue { |
my ($symb,$courseid,$domain,$name) = &Apache::lonxml::whichuser(); |
my ($symb,$courseid,$domain,$name) = &Apache::lonnet::whichuser(); |
if ( $courseid eq '' |
if ( $courseid eq '' |
|| $symb eq '' |
|| $symb eq '' |
|| $env{'request.state'} eq 'construct' |
|| $env{'request.state'} eq 'construct' |