version 1.59, 2005/04/07 06:56:21
|
version 1.62, 2006/03/07 22:42:47
|
Line 57 sub start_hintgroup {
|
Line 57 sub start_hintgroup {
|
if ( ($showoncorrect ne 'yes' && &Apache::response::show_answer()) || |
if ( ($showoncorrect ne 'yes' && &Apache::response::show_answer()) || |
( $numtries < $hinttries) ) { |
( $numtries < $hinttries) ) { |
&Apache::lonxml::debug("Grabbin all"); |
&Apache::lonxml::debug("Grabbin all"); |
&Apache::lonxml::get_all_text("/hintgroup",$parser); |
&Apache::lonxml::get_all_text("/hintgroup",$parser,$style); |
} |
} |
&Apache::lonxml::startredirection; |
&Apache::lonxml::startredirection; |
} elsif ($target eq 'tex') { |
} elsif ($target eq 'tex') { |
Line 94 sub end_hintgroup {
|
Line 94 sub end_hintgroup {
|
$hinttext.'</td></tr></table>'; |
$hinttext.'</td></tr></table>'; |
} |
} |
} elsif ($target eq 'edit') { |
} elsif ($target eq 'edit') { |
$result.=&Apache::edit::end_table(); |
$result.=&Apache::edit::end_row().&Apache::edit::end_table(); |
} elsif ($target eq 'tex') { |
} elsif ($target eq 'tex') { |
$result .= '}'; |
$result .= '}'; |
} |
} |
Line 161 sub end_numericalhint {
|
Line 161 sub end_numericalhint {
|
my $name= &Apache::lonxml::get_param('name',$parstack,$safeeval); |
my $name= &Apache::lonxml::get_param('name',$parstack,$safeeval); |
&Apache::response::setup_params('numericalhint',$safeeval); |
&Apache::response::setup_params('numericalhint',$safeeval); |
my $partid=$Apache::inputtags::part; |
my $partid=$Apache::inputtags::part; |
my $id=$Apache::inputtags::response['-1']; |
my $id=$Apache::inputtags::hint[-1]; |
#id submissions occured under |
#id submissions occured under |
my $submitid=$Apache::inputtags::response['-2']; |
my $submitid=$Apache::inputtags::response[-1]; |
my $response = $Apache::lonhomework::history{ |
my $response = $Apache::lonhomework::history{ |
"resource.$partid.$submitid.submission"}; |
"resource.$partid.$submitid.submission"}; |
&Apache::lonxml::debug("hintgroup is using $response<br />\n"); |
&Apache::lonxml::debug("hintgroup is using $response<br />\n"); |
Line 201 sub end_numericalhint {
|
Line 201 sub end_numericalhint {
|
} elsif ($target eq 'meta') { |
} elsif ($target eq 'meta') { |
$result=&Apache::response::meta_package_write($token->[1]); |
$result=&Apache::response::meta_package_write($token->[1]); |
} elsif ($target eq 'edit') { |
} elsif ($target eq 'edit') { |
$result.='</td></tr>'.&Apache::edit::end_table; |
$result.=&Apache::edit::end_row().&Apache::edit::end_table(); |
} |
} |
&Apache::response::end_hintresponse(); |
&Apache::response::end_hintresponse(); |
return $result; |
return $result; |
Line 255 sub end_stringhint {
|
Line 255 sub end_stringhint {
|
my $name= &Apache::lonxml::get_param('name',$parstack,$safeeval); |
my $name= &Apache::lonxml::get_param('name',$parstack,$safeeval); |
&Apache::response::setup_params('stringhint',$safeeval); |
&Apache::response::setup_params('stringhint',$safeeval); |
my $partid=$Apache::inputtags::part; |
my $partid=$Apache::inputtags::part; |
my $id=$Apache::inputtags::response['-1']; |
my $id=$Apache::inputtags::hint[-1]; |
#id submissions occured under |
#id submissions occured under |
my $submitid=$Apache::inputtags::response['-2']; |
my $submitid=$Apache::inputtags::response[-1]; |
my $response = $Apache::lonhomework::history{ |
my $response = $Apache::lonhomework::history{ |
"resource.$partid.$submitid.submission"}; |
"resource.$partid.$submitid.submission"}; |
&Apache::lonxml::debug("hintgroup is using $response<br />\n"); |
&Apache::lonxml::debug("hintgroup is using $response<br />\n"); |
Line 300 sub end_stringhint {
|
Line 300 sub end_stringhint {
|
} elsif ($target eq 'meta') { |
} elsif ($target eq 'meta') { |
$result=&Apache::response::meta_package_write($token->[1]); |
$result=&Apache::response::meta_package_write($token->[1]); |
} elsif ($target eq 'edit') { |
} elsif ($target eq 'edit') { |
$result.='</td></tr>'.&Apache::edit::end_table; |
$result.=&Apache::edit::end_row().&Apache::edit::end_table(); |
} |
} |
&Apache::response::end_hintresponse(); |
&Apache::response::end_hintresponse(); |
return $result; |
return $result; |
Line 322 sub start_hintpart {
|
Line 322 sub start_hintpart {
|
foreach $which (@Apache::hint::which) { if ($which eq $on) { $show = 1; last } } |
foreach $which (@Apache::hint::which) { if ($which eq $on) { $show = 1; last } } |
} |
} |
if (!$show) { |
if (!$show) { |
&Apache::lonxml::get_all_text("/hintpart",$parser); |
&Apache::lonxml::get_all_text("/hintpart",$parser,$style); |
} |
} |
} elsif ($target eq 'grade') { |
} elsif ($target eq 'grade') { |
&Apache::lonxml::get_all_text("/hintpart",$parser); |
&Apache::lonxml::get_all_text("/hintpart",$parser,$style); |
} elsif ($target eq 'edit') { |
} elsif ($target eq 'edit') { |
$result.= &Apache::edit::tag_start($target,$token); |
$result.= &Apache::edit::tag_start($target,$token); |
$result.= &Apache::edit::text_arg('On:','on',$token); |
$result.= &Apache::edit::text_arg('On:','on',$token); |
Line 345 sub start_hintpart {
|
Line 345 sub start_hintpart {
|
sub end_hintpart { |
sub end_hintpart { |
my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_; |
my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_; |
my $result; |
my $result; |
if ($target eq 'edit') { $result.=&Apache::edit::end_table; } |
if ($target eq 'edit') { |
|
$result.=&Apache::edit::end_row().&Apache::edit::end_table(); |
|
} |
return $result; |
return $result; |
} |
} |
|
|
Line 380 sub end_optionhint {
|
Line 382 sub end_optionhint {
|
my $name= &Apache::lonxml::get_param('name',$parstack,$safeeval); |
my $name= &Apache::lonxml::get_param('name',$parstack,$safeeval); |
my $partid=$Apache::inputtags::part; |
my $partid=$Apache::inputtags::part; |
#id submissions occured under |
#id submissions occured under |
my $submitid=$Apache::inputtags::response['-2']; |
my $submitid=$Apache::inputtags::response[-1]; |
my $part_id="$partid.$submitid"; |
my $part_id="$partid.$submitid"; |
my %answer; |
my %answer; |
my $answer=&Apache::lonxml::get_param('answer',$parstack,$safeeval); |
my $answer=&Apache::lonxml::get_param('answer',$parstack,$safeeval); |
if ($answer) { |
if ($answer) { |
eval('%answer ='.$answer); |
eval('%answer ='.$answer); |
|
&Apache::lonxml::debug("answwer hash"); |
&Apache::lonhomework::showhash(%answer); |
&Apache::lonhomework::showhash(%answer); |
my $response = $Apache::lonhomework::history{ |
my $response = $Apache::lonhomework::history{ |
"resource.$part_id.submission"}; |
"resource.$part_id.submission"}; |
Line 421 sub end_optionhint {
|
Line 424 sub end_optionhint {
|
($foilmatch eq '-1' || $foilmatch eq '1') ) { |
($foilmatch eq '-1' || $foilmatch eq '1') ) { |
push(@Apache::hint::which,$name); |
push(@Apache::hint::which,$name); |
} |
} |
} elsif ($target eq 'edit') { $result.=&Apache::edit::end_table; } |
} elsif ($target eq 'edit') { |
if ($target eq 'edit') { $result.=&Apache::edit::end_table; } |
$result.=&Apache::edit::end_row().&Apache::edit::end_table(); |
|
} |
&Apache::response::end_hintresponse(); |
&Apache::response::end_hintresponse(); |
return $result; |
return $result; |
} |
} |
Line 459 sub end_radiobuttonhint {
|
Line 463 sub end_radiobuttonhint {
|
eval('@answer ='.$answer); |
eval('@answer ='.$answer); |
my $partid=$Apache::inputtags::part; |
my $partid=$Apache::inputtags::part; |
#id submissions occured under |
#id submissions occured under |
my $submitid=$Apache::inputtags::response['-2']; |
my $submitid=$Apache::inputtags::response[-1]; |
my $part_id="$partid.$submitid"; |
my $part_id="$partid.$submitid"; |
my $response = $Apache::lonhomework::history{ |
my $response = $Apache::lonhomework::history{ |
"resource.$part_id.submission"}; |
"resource.$part_id.submission"}; |
Line 486 sub end_radiobuttonhint {
|
Line 490 sub end_radiobuttonhint {
|
} |
} |
} |
} |
} |
} |
} elsif ($target eq 'edit') { $result.=&Apache::edit::end_table; } |
} elsif ($target eq 'edit') { |
|
$result.=&Apache::edit::end_row().&Apache::edit::end_table(); |
|
} |
&Apache::response::end_hintresponse(); |
&Apache::response::end_hintresponse(); |
return $result; |
return $result; |
} |
} |