--- loncom/homework/hint.pm 2004/03/19 00:24:42 1.54
+++ loncom/homework/hint.pm 2009/06/28 19:40:41 1.76
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# implements the tags that control the hints
#
-# $Id: hint.pm,v 1.54 2004/03/19 00:24:42 albertel Exp $
+# $Id: hint.pm,v 1.76 2009/06/28 19:40:41 www Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -26,15 +26,23 @@
# http://www.lon-capa.org/
#
+
+
package Apache::hinttags;
use strict;
use Apache::lonnet();
use capa;
+use Apache::caparesponse();
+use Apache::lonmaxima();
+use Apache::lonr();
+use Apache::chemresponse();
+use Apache::response();
use Apache::lonlocal;
+use Storable qw(dclone);
BEGIN {
- &Apache::lonxml::register('Apache::hinttags',('hintgroup','hintpart','numericalhint','stringhint','formulahint','optionhint','radiobuttonhint'));
+ &Apache::lonxml::register('Apache::hinttags',('hintgroup','hintpart','numericalhint','stringhint','formulahint','optionhint','radiobuttonhint','mathhint','customhint','reactionhint','organichint'));
}
@@ -54,23 +62,22 @@ sub start_hintgroup {
$Apache::lonhomework::history{"resource.$id.solved"};
my $showoncorrect=lc(&Apache::lonxml::get_param('showoncorrect',$parstack,$safeeval));
&Apache::lonxml::debug("onc orrect $showoncorrect, $gradestatus");
- if ( ($showoncorrect ne 'yes' && $gradestatus =~ /^correct/) ||
+ if ( ($showoncorrect ne 'yes' && &Apache::response::show_answer()) ||
( $numtries < $hinttries) ) {
&Apache::lonxml::debug("Grabbin all");
- &Apache::lonxml::get_all_text("/hintgroup",$parser);
+ &Apache::lonxml::get_all_text("/hintgroup",$parser,$style);
}
&Apache::lonxml::startredirection;
} elsif ($target eq 'tex') {
$result .= '\keephidden{';
} elsif ($target eq 'edit') {
$result.=&Apache::edit::tag_start($target,$token);
- $result.=&Apache::edit::select_arg('Show hint when problem Correct:','showoncorrect',[['no',&mt('No')],['yes',&mt('Yes')]]);
+ $result.=&Apache::edit::select_arg('Show hint even if problem Correct:','showoncorrect',['no','yes'],$token);
$result.=&Apache::edit::end_row().&Apache::edit::start_spanning_row();
} elsif ($target eq 'modified') {
my $constructtag=&Apache::edit::get_new_args($token,$parstack,$safeeval,'showoncorrect');
if ($constructtag) {
$result =&Apache::edit::rebuild_tag($token);
- $result.=&Apache::edit::handle_insert();
}
}
@Apache::hint::which=();
@@ -94,7 +101,7 @@ sub end_hintgroup {
$hinttext.'</td></tr></table>';
}
} elsif ($target eq 'edit') {
- $result.=&Apache::edit::end_table();
+ $result.=&Apache::edit::end_row().&Apache::edit::end_table();
} elsif ($target eq 'tex') {
$result .= '}';
}
@@ -106,6 +113,7 @@ sub start_numericalhint {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
#do everything in end, so intervening <responseparams> work
&Apache::response::start_hintresponse($parstack,$safeeval);
+ &Apache::caparesponse::push_answer();
my $result;
if ($target eq 'edit') {
$result.=&Apache::edit::tag_start($target,$token);
@@ -116,12 +124,10 @@ sub start_numericalhint {
&Apache::loncommon::help_open_topic('Physical_Units');
$result.=&Apache::edit::text_arg('Format:','format',$token,4).
&Apache::loncommon::help_open_topic('Numerical_Response_Format');
- } elsif ($token->[1] eq 'stringhint') {
- $result.=&Apache::edit::select_arg('Type:','type',
- [['cs','Case Sensitive'],['ci','Case Insensitive'],
- ['mc','Case Insensitive, Any Order']],$token);
} elsif ($token->[1] eq 'formulahint') {
- $result.=&Apache::edit::text_arg('Sample Points:','samples',$token,40);
+ $result.=&Apache::edit::text_arg('Sample Points:','samples',
+ $token,40).
+ &Apache::loncommon::help_open_topic('Formula_Response_Sampling');
}
$result.=&Apache::edit::end_row();
$result.=&Apache::edit::start_spanning_row();
@@ -131,10 +137,6 @@ sub start_numericalhint {
$constructtag=&Apache::edit::get_new_args($token,$parstack,
$safeeval,'name',
'answer','unit','format');
- } elsif ($token->[1] eq 'stringhint') {
- $constructtag=&Apache::edit::get_new_args($token,$parstack,
- $safeeval,'name','answer',
- 'type');
} elsif ($token->[1] eq 'formulahint') {
$constructtag=&Apache::edit::get_new_args($token,$parstack,
$safeeval,'name','answer',
@@ -142,7 +144,6 @@ sub start_numericalhint {
}
if ($constructtag) {
$result = &Apache::edit::rebuild_tag($token);
- $result .= &Apache::edit::handle_insert();
}
} elsif ($target eq 'web') {
&Apache::response::reset_params();
@@ -158,51 +159,70 @@ sub end_numericalhint {
&Apache::lonxml::default_homework_load($safeeval);
}
$safeeval->share_from('capa',['&caparesponse_capa_check_answer']);
- my $name= &Apache::lonxml::get_param('name',$parstack,$safeeval);
+ my $hint_name= &Apache::lonxml::get_param('name',$parstack,$safeeval);
&Apache::response::setup_params('numericalhint',$safeeval);
+
my $partid=$Apache::inputtags::part;
- my $id=$Apache::inputtags::response['-1'];
- #id submissions occured under
- my $submitid=$Apache::inputtags::response['-2'];
+ my $id=$Apache::inputtags::hint[-1];
+ #id submissions occurred under
+ my $submitid=$Apache::inputtags::response[-1];
+
my $response = $Apache::lonhomework::history{
"resource.$partid.$submitid.submission"};
&Apache::lonxml::debug("hintgroup is using $response<br />\n");
+
+ my @args = ('type','tol','sig','ans_fmt','unit','calc','samples');
+ my $args_ref =
+ &Apache::caparesponse::setup_capa_args($safeeval,$parstack,
+ \@args,$response);
+
my $hideunit=&Apache::response::get_response_param($partid.'_'.$submitid,'turnoffunit');
- my $args_ref= \%{$safeeval->varglob('LONCAPA::CAPAresponse_args')};
- $$args_ref{'response'}=$response;
- #need to get all possible parms
- foreach my $arg ('type','tol','sig','ans_fmt','unit','calc',
- 'samples') {
- $$args_ref{$arg}=
- &Apache::lonxml::get_param($arg,$parstack,$safeeval);
- }
- foreach my $key (keys(%Apache::inputtags::params)) {
- $$args_ref{$key}=$Apache::inputtags::params{$key};
- }
if (lc($hideunit) eq "yes") { delete($$args_ref{'unit'}); }
+
if ($$tagstack[-1] eq 'formulahint') {
- $$args_ref{'type'}='fml';
+ if ($$args_ref{'samples'}) {
+ $$args_ref{'type'}='fml';
+ } else {
+ $$args_ref{'type'}='math';
+ }
} elsif ($$tagstack[-1] eq 'numericalhint') {
$$args_ref{'type'}='float';
}
- my @answer=&Apache::lonxml::get_param_var('answer',$parstack,$safeeval);
- &Apache::lonxml::debug('answer is'.join(':',@answer));
- @{$safeeval->varglob('LONCAPA::CAPAresponse_answer')}=@answer;
-
- ($result,my @msgs) = &Apache::run::run("&caparesponse_check_list()",
- $safeeval);
- &Apache::lonxml::debug('msgs are'.join(':',@msgs));
- &Apache::lonxml::debug("result:$result:$Apache::lonxml::curdepth");
- my ($awards)=split(/:/,$result);
- my (@awards) = split(/,/,$awards);
- my ($ad, $msg) = &Apache::inputtags::finalizeawards(\@awards,\@msgs);
- if ($ad eq 'EXACT_ANS' || $ad eq 'APPROX_ANS') { push (@Apache::hint::which,$name); }
+ &Apache::caparesponse::add_in_tag_answer($parstack,$safeeval);
+ my %answer = &Apache::caparesponse::get_answer();
+ my (@final_awards,@final_msgs,@ans_names);
+ foreach my $ans_name (keys(%answer)) {
+ &Apache::lonxml::debug(" doing $ans_name with ".join(':',@{ $answer{$ans_name}{'answers'} }));
+
+ ${$safeeval->varglob('LONCAPA::CAPAresponse_answer')}=
+ dclone($answer{$ans_name});
+ &Apache::caparesponse::setup_capa_response($args_ref,$response);
+ my ($result,@msgs) =
+ &Apache::run::run("&caparesponse_check_list()",$safeeval);
+ &Apache::lonxml::debug("checking $ans_name $result with $response");
+ &Apache::lonxml::debug('msgs are '.join(':',@msgs));
+ my ($awards)=split(/:/,$result);
+ my @awards= split(/,/,$awards);
+ my ($ad, $msg) =
+ &Apache::inputtags::finalizeawards(\@awards,\@msgs);
+ push(@final_awards,$ad);
+ push(@final_msgs,$msg);
+ push(@ans_names,$ans_name);
+ }
+ my ($ad, $msg, $ans_name) =
+ &Apache::inputtags::finalizeawards(\@final_awards,
+ \@final_msgs,
+ \@ans_names,1);
+ if ($ad eq 'EXACT_ANS' || $ad eq 'APPROX_ANS') {
+ push(@Apache::hint::which,$hint_name);
+ }
$result='';
} elsif ($target eq 'meta') {
$result=&Apache::response::meta_package_write($token->[1]);
} elsif ($target eq 'edit') {
- $result.='</td></tr>'.&Apache::edit::end_table;
+ $result.=&Apache::edit::end_row().&Apache::edit::end_table();
}
+ &Apache::caparesponse::pop_answer();
&Apache::response::end_hintresponse();
return $result;
}
@@ -215,6 +235,135 @@ sub end_formulahint {
return &end_numericalhint(@_);
}
+sub start_mathhint {
+ my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
+ #do everything in end, so intervening <responseparams> and <answer> work
+ &Apache::response::start_hintresponse($parstack,$safeeval);
+ &Apache::lonxml::register('Apache::response',('answer'));
+ my $result;
+ if ($target eq 'edit') {
+ $result.=&Apache::edit::tag_start($target,$token);
+ $result.=&Apache::edit::text_arg('Name:','name',$token);
+ $result.=&Apache::edit::select_arg('Algebra System:',
+ 'cas',
+ ['maxima','R'],
+ $token);
+ $result.=&Apache::edit::text_arg('Argument Array:',
+ 'args',$token);
+ $result.=&Apache::edit::end_row();
+ $result.=&Apache::edit::start_spanning_row();
+ } elsif ($target eq 'modified') {
+ my $constructtag;
+ $constructtag=&Apache::edit::get_new_args($token,$parstack,
+ $safeeval,'name','cas',
+ 'args');
+ $result = &Apache::edit::rebuild_tag($token);
+ } elsif ($target eq 'web') {
+ &Apache::response::reset_params();
+ }
+ return $result;
+}
+
+sub end_mathhint {
+ my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
+ my $result;
+ if ($target eq 'web') {
+ if (!$Apache::lonxml::default_homework_loaded) {
+ &Apache::lonxml::default_homework_load($safeeval);
+ }
+ my $name= &Apache::lonxml::get_param('name',$parstack,$safeeval);
+ &Apache::response::setup_params('mathhint',$safeeval);
+ my $partid=$Apache::inputtags::part;
+ my $submitid=$Apache::inputtags::response[-1];
+ my $response = $Apache::lonhomework::history{
+ "resource.$partid.$submitid.submission"};
+
+ my $cas = &Apache::lonxml::get_param('cas',$parstack,$safeeval);
+ my $award;
+ if ($cas eq 'maxima') {
+ my $args = [&Apache::lonxml::get_param_var('args',$parstack,$safeeval)];
+ $award=&Apache::lonmaxima::maxima_run($Apache::response::custom_answer[-1],$response,$args);
+ }
+ if ($cas eq 'R') {
+ my $args = [&Apache::lonxml::get_param_var('args',$parstack,$safeeval)];
+ $award=&Apache::lonr::r_run($Apache::response::custom_answer[-1],$response,$args);
+ }
+ if ($award eq 'EXACT_ANS' || $award eq 'APPROX_ANS') {
+ push (@Apache::hint::which,$name);
+ }
+ $result='';
+ } elsif ($target eq 'meta') {
+ $result=&Apache::response::meta_package_write($token->[1]);
+ } elsif ($target eq 'edit') {
+ $result.=&Apache::edit::end_row().&Apache::edit::end_table();
+ }
+ pop(@Apache::response::custom_answer);
+ pop(@Apache::response::custom_answer_type);
+ &Apache::response::end_hintresponse();
+ return $result;
+}
+
+sub start_customhint {
+ my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
+ #do everything in end, so intervening <responseparams> and <answer> work
+ &Apache::response::start_hintresponse($parstack,$safeeval);
+ &Apache::lonxml::register('Apache::response',('answer'));
+ my $result;
+ if ($target eq 'edit') {
+ $result.=&Apache::edit::tag_start($target,$token);
+ $result.=&Apache::edit::text_arg('Name:','name',$token);
+ $result.=&Apache::edit::end_row();
+ $result.=&Apache::edit::start_spanning_row();
+ } elsif ($target eq 'modified') {
+ my $constructtag;
+ $constructtag=&Apache::edit::get_new_args($token,$parstack,
+ $safeeval,'name');
+ $result = &Apache::edit::rebuild_tag($token);
+ } elsif ($target eq 'web') {
+ &Apache::response::reset_params();
+ }
+ return $result;
+}
+
+sub end_customhint {
+ my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
+ my $result;
+ if ($target eq 'web') {
+ if (!$Apache::lonxml::default_homework_loaded) {
+ &Apache::lonxml::default_homework_load($safeeval);
+ }
+ my $name= &Apache::lonxml::get_param('name',$parstack,$safeeval);
+ &Apache::response::setup_params('customhint',$safeeval);
+ my $partid=$Apache::inputtags::part;
+ my $submitid=$Apache::inputtags::response[-1];
+ my $response = $Apache::lonhomework::history{
+ "resource.$partid.$submitid.submission"};
+ my $award;
+ if ( $response =~ /[^\s]/ &&
+ $Apache::response::custom_answer_type[-1] eq 'loncapa/perl') {
+ if (!$Apache::lonxml::default_homework_loaded) {
+ &Apache::lonxml::default_homework_load($safeeval);
+ }
+ ${$safeeval->varglob('LONCAPA::customresponse_submission')}=
+ $response;
+
+ $award = &Apache::run::run('{ my $submission=$LONCAPA::customresponse_submission;'.$Apache::response::custom_answer[-1].'}',$safeeval);
+ }
+ if ($award eq 'EXACT_ANS' || $award eq 'APPROX_ANS') {
+ push (@Apache::hint::which,$name);
+ }
+ $result='';
+ } elsif ($target eq 'meta') {
+ $result=&Apache::response::meta_package_write($token->[1]);
+ } elsif ($target eq 'edit') {
+ $result.=&Apache::edit::end_row().&Apache::edit::end_table();
+ }
+ pop(@Apache::response::custom_answer);
+ pop(@Apache::response::custom_answer_type);
+ &Apache::response::end_hintresponse();
+ return $result;
+}
+
sub start_stringhint {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
#do everything in end, so intervening <responseparams> work
@@ -236,7 +385,6 @@ sub start_stringhint {
$safeeval,'name','answer',
'type');
$result = &Apache::edit::rebuild_tag($token);
- $result .= &Apache::edit::handle_insert();
} elsif ($target eq 'web') {
&Apache::response::reset_params();
}
@@ -250,55 +398,196 @@ sub end_stringhint {
if (!$Apache::lonxml::default_homework_loaded) {
&Apache::lonxml::default_homework_load($safeeval);
}
- my $answer=&Apache::lonxml::get_param('answer',$parstack,$safeeval);
$safeeval->share_from('capa',['&caparesponse_capa_check_answer']);
- my $name= &Apache::lonxml::get_param('name',$parstack,$safeeval);
+ my $hint_name= &Apache::lonxml::get_param('name',$parstack,$safeeval);
&Apache::response::setup_params('stringhint',$safeeval);
my $partid=$Apache::inputtags::part;
- my $id=$Apache::inputtags::response['-1'];
- #id submissions occured under
- my $submitid=$Apache::inputtags::response['-2'];
+ my $id=$Apache::inputtags::hint[-1];
+ #id submissions occurred under
+ my $submitid=$Apache::inputtags::response[-1];
my $response = $Apache::lonhomework::history{
"resource.$partid.$submitid.submission"};
&Apache::lonxml::debug("hintgroup is using $response<br />\n");
- my $args_ref= \%{$safeeval->varglob('LONCAPA::CAPAresponse_args')};
- $$args_ref{'response'}=$response;
- my $type=$$args_ref{'type'}=&Apache::lonxml::get_param('type',$parstack,$safeeval);
+ my $type = &Apache::lonxml::get_param('type',$parstack,$safeeval);
my ($ad,$msg);
if ($type eq 're' ) {
+ my $answer=&Apache::lonxml::get_param('answer',$parstack,
+ $safeeval);
${$safeeval->varglob('LONCAPA::response')}=$response;
- $result = &Apache::run::run('return $LONCAPA::response=~m'.$answer,$safeeval);
+ my $compare='=';
+ if ($answer=~/^\s*NOT\s*/) {
+ $answer=~s/^\s*NOT\s*//;
+ $compare='!';
+ }
+ my $test='$LONCAPA::response'.$compare.'~m'.$answer;
+ &Apache::lonxml::debug("test $test");
+ $result = &Apache::run::run("return $test",$safeeval);
&Apache::lonxml::debug("current $response");
&Apache::lonxml::debug("current $answer");
$ad = ($result) ? 'APPROX_ANS' : 'INCORRECT';
} else {
- foreach my $key (keys(%Apache::inputtags::params)) {
- $$args_ref{$key}=$Apache::inputtags::params{$key};
+ my @args = ('type');
+ my $args_ref =
+ &Apache::caparesponse::setup_capa_args($safeeval,$parstack,
+ \@args,$response);
+ if ($$args_ref{'type'} eq '') {
+ $$args_ref{'type'} = 'ci';
+ }
+ &Apache::caparesponse::add_in_tag_answer($parstack,$safeeval);
+ my (@final_awards,@final_msgs,@ans_names);
+ my %answer = &Apache::caparesponse::get_answer();
+ foreach my $ans_name (keys(%answer)) {
+ &Apache::lonxml::debug(" doing $ans_name with ".join(':',@{ $answer{$ans_name}{'answers'} }));
+ ${$safeeval->varglob('LONCAPA::CAPAresponse_answer')}=dclone($answer{$ans_name});
+ my ($result, @msgs)=&Apache::run::run("&caparesponse_check_list()",$safeeval);
+ &Apache::lonxml::debug('msgs are'.join(':',@msgs));
+ my ($awards) = split(/:/,$result);
+ my (@awards) = split(/,/,$awards);
+ ($ad,$msg) =
+ &Apache::inputtags::finalizeawards(\@awards,\@msgs);
+ push(@final_awards,$ad);
+ push(@final_msgs,$msg);
+ push(@ans_names,$ans_name);
+ &Apache::lonxml::debug("\n<br>result:$result:$Apache::lonxml::curdepth<br>\n");
}
- &Apache::lonxml::debug('answer is'.$answer);
- @{$safeeval->varglob('LONCAPA::CAPAresponse_answer')}=($answer);
-
- ($result,my @msgs)=&Apache::run::run("&caparesponse_check_list()",
- $safeeval);
- &Apache::lonxml::debug('msgs are'.join(':',@msgs));
- &Apache::lonxml::debug("result:$result:$Apache::lonxml::curdepth");
- my ($awards)=split(/:/,$result);
- my (@awards) = split(/,/,$awards);
- ($ad, $msg) = &Apache::inputtags::finalizeawards(\@awards,\@msgs);
+ my ($ad, $msg, $ans_name) =
+ &Apache::inputtags::finalizeawards(\@final_awards,
+ \@final_msgs,
+ \@ans_names,1);
}
if ($ad eq 'EXACT_ANS' || $ad eq 'APPROX_ANS') {
- push (@Apache::hint::which,$name);
+ push(@Apache::hint::which,$hint_name);
}
$result='';
} elsif ($target eq 'meta') {
$result=&Apache::response::meta_package_write($token->[1]);
} elsif ($target eq 'edit') {
- $result.='</td></tr>'.&Apache::edit::end_table;
+ $result.=&Apache::edit::end_row().&Apache::edit::end_table();
}
&Apache::response::end_hintresponse();
return $result;
}
+# reactionhint
+
+sub start_reactionhint {
+ my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
+ #do everything in end, so intervening <responseparams> work
+ &Apache::response::start_hintresponse($parstack,$safeeval);
+ my $result;
+ if ($target eq 'edit') {
+ $result.=&Apache::edit::tag_start($target,$token);
+ $result.=&Apache::edit::text_arg('Name:','name',$token);
+ $result.=&Apache::edit::text_arg('Answer:','answer',$token);
+ $result.=&Apache::edit::end_row();
+ $result.=&Apache::edit::start_spanning_row();
+ } elsif ($target eq 'modified') {
+ my $constructtag;
+ $constructtag=&Apache::edit::get_new_args($token,$parstack,
+ $safeeval,'name','answer',
+ );
+ $result = &Apache::edit::rebuild_tag($token);
+ } elsif ($target eq 'web') {
+ &Apache::response::reset_params();
+ }
+ return $result;
+}
+
+sub end_reactionhint {
+ my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
+ my $result;
+ if ($target eq 'web') {
+ if (!$Apache::lonxml::default_homework_loaded) {
+ &Apache::lonxml::default_homework_load($safeeval);
+ }
+ my $hint_name= &Apache::lonxml::get_param('name',$parstack,$safeeval);
+ &Apache::response::setup_params('reactionhint',$safeeval);
+ my $partid=$Apache::inputtags::part;
+ my $id=$Apache::inputtags::hint[-1];
+ #id submissions occurred under
+ my $submitid=$Apache::inputtags::response[-1];
+ my $response = $Apache::lonhomework::history{
+ "resource.$partid.$submitid.submission"};
+ &Apache::lonxml::debug("hintgroup is using $response<br />\n");
+ my $answer=&Apache::lonxml::get_param('answer',$parstack,
+ $safeeval);
+ &Apache::lonxml::debug("current $response");
+ &Apache::lonxml::debug("current $answer");
+ if (&Apache::chemresponse::chem_standard_order($response) eq
+ &Apache::chemresponse::chem_standard_order($answer)) {
+ push(@Apache::hint::which,$hint_name);
+ }
+ $result='';
+ } elsif ($target eq 'meta') {
+ $result=&Apache::response::meta_package_write($token->[1]);
+ } elsif ($target eq 'edit') {
+ $result.=&Apache::edit::end_row().&Apache::edit::end_table();
+ }
+ &Apache::response::end_hintresponse();
+ return $result;
+}
+
+# organichint
+
+sub start_organichint {
+ my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
+ #do everything in end, so intervening <responseparams> work
+ &Apache::response::start_hintresponse($parstack,$safeeval);
+ my $result;
+ if ($target eq 'edit') {
+ $result.=&Apache::edit::tag_start($target,$token);
+ $result.=&Apache::edit::text_arg('Name:','name',$token);
+ $result.=&Apache::edit::text_arg('Answer:','answer',$token);
+ $result.=&Apache::edit::end_row();
+ $result.=&Apache::edit::start_spanning_row();
+ } elsif ($target eq 'modified') {
+ my $constructtag;
+ $constructtag=&Apache::edit::get_new_args($token,$parstack,
+ $safeeval,'name','answer',
+ );
+ $result = &Apache::edit::rebuild_tag($token);
+ } elsif ($target eq 'web') {
+ &Apache::response::reset_params();
+ }
+ return $result;
+}
+
+sub end_organichint {
+ my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
+ my $result;
+ if ($target eq 'web') {
+ if (!$Apache::lonxml::default_homework_loaded) {
+ &Apache::lonxml::default_homework_load($safeeval);
+ }
+ my $hint_name= &Apache::lonxml::get_param('name',$parstack,$safeeval);
+ &Apache::response::setup_params('organichint',$safeeval);
+ my $partid=$Apache::inputtags::part;
+ my $id=$Apache::inputtags::hint[-1];
+ #id submissions occurred under
+ my $submitid=$Apache::inputtags::response[-1];
+ my $response = $Apache::lonhomework::history{
+ "resource.$partid.$submitid.submission"};
+ &Apache::lonxml::debug("hintgroup is using $response<br />\n");
+ my (@answers)=&Apache::lonxml::get_param_var('answer',$parstack,$safeeval);
+ my %previous = &Apache::response::check_for_previous($response,$partid,$id);
+ foreach my $answer (@answers) {
+ &Apache::lonxml::debug("submitted a $response for $answer<br \>\n");
+ if ($response eq $answer) {
+ push(@Apache::hint::which,$hint_name);
+ last;
+ }
+ }
+ $result='';
+ } elsif ($target eq 'meta') {
+ $result=&Apache::response::meta_package_write($token->[1]);
+ } elsif ($target eq 'edit') {
+ $result.=&Apache::edit::end_row().&Apache::edit::end_table();
+ }
+ &Apache::response::end_hintresponse();
+ return $result;
+}
+
+
# a part shows if it is on, if no specific parts are on, then default shows
sub start_hintpart {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
@@ -315,10 +604,10 @@ sub start_hintpart {
foreach $which (@Apache::hint::which) { if ($which eq $on) { $show = 1; last } }
}
if (!$show) {
- &Apache::lonxml::get_all_text("/hintpart",$parser);
+ &Apache::lonxml::get_all_text("/hintpart",$parser,$style);
}
} elsif ($target eq 'grade') {
- &Apache::lonxml::get_all_text("/hintpart",$parser);
+ &Apache::lonxml::get_all_text("/hintpart",$parser,$style);
} elsif ($target eq 'edit') {
$result.= &Apache::edit::tag_start($target,$token);
$result.= &Apache::edit::text_arg('On:','on',$token);
@@ -329,7 +618,6 @@ sub start_hintpart {
$safeeval,'on');
if ($constructtag) {
$result = &Apache::edit::rebuild_tag($token);
- $result.=&Apache::edit::handle_insert();
}
}
return $result;
@@ -338,7 +626,9 @@ sub start_hintpart {
sub end_hintpart {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
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;
}
@@ -357,7 +647,6 @@ sub start_optionhint {
'answer','concept');
if ($constructtag) {
$result = &Apache::edit::rebuild_tag($token);
- $result .= &Apache::edit::handle_insert();
}
} elsif ($target eq 'meta') {
$result=&Apache::response::meta_package_write('numericalhint');
@@ -372,13 +661,14 @@ sub end_optionhint {
my ($foilmatch,$conceptmatch)=(-1,-1);
my $name= &Apache::lonxml::get_param('name',$parstack,$safeeval);
my $partid=$Apache::inputtags::part;
- #id submissions occured under
- my $submitid=$Apache::inputtags::response['-2'];
+ #id submissions occurred under
+ my $submitid=$Apache::inputtags::response[-1];
my $part_id="$partid.$submitid";
my %answer;
my $answer=&Apache::lonxml::get_param('answer',$parstack,$safeeval);
if ($answer) {
eval('%answer ='.$answer);
+ &Apache::lonxml::debug("answwer hash");
&Apache::lonhomework::showhash(%answer);
my $response = $Apache::lonhomework::history{
"resource.$part_id.submission"};
@@ -414,8 +704,9 @@ sub end_optionhint {
($foilmatch eq '-1' || $foilmatch eq '1') ) {
push(@Apache::hint::which,$name);
}
- } elsif ($target eq 'edit') { $result.=&Apache::edit::end_table; }
- if ($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();
return $result;
}
@@ -434,7 +725,6 @@ sub start_radiobuttonhint {
'answer');
if ($constructtag) {
$result = &Apache::edit::rebuild_tag($token);
- $result .= &Apache::edit::handle_insert();
}
} elsif ($target eq 'meta') {
$result=&Apache::response::meta_package_write('numericalhint');
@@ -451,8 +741,8 @@ sub end_radiobuttonhint {
my $answer=&Apache::lonxml::get_param('answer',$parstack,$safeeval);
eval('@answer ='.$answer);
my $partid=$Apache::inputtags::part;
- #id submissions occured under
- my $submitid=$Apache::inputtags::response['-2'];
+ #id submissions occurred under
+ my $submitid=$Apache::inputtags::response[-1];
my $part_id="$partid.$submitid";
my $response = $Apache::lonhomework::history{
"resource.$part_id.submission"};
@@ -479,9 +769,67 @@ 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();
return $result;
}
1;
__END__
+
+
+=head1 NAME
+
+Apache::hinttags
+
+=head1 SYNOPSIS
+
+This handler coordinates the delivery of hints to students working on LON-CAPA problems and assignments.
+
+This is part of the LearningOnline Network with CAPA project
+described at http://www.lon-capa.org.
+
+=head1 SUBROUTINES
+
+=over
+
+=item start_hintgroup()
+
+=item end_hintgroup()
+
+=item start_numericalhint()
+
+=item end_numericalhint()
+
+=item start_formulahint()
+
+=item end_formulahint()
+
+=item start_mathhint()
+
+=item end_mathhint()
+
+=item start_customhint()
+
+=item end_customhint()
+
+=item start_stringhint()
+
+=item end_stringhint()
+
+=item start_hintpart()
+
+=item end_hintpart()
+
+=item start_optionhint()
+
+=item end_optionhint()
+
+=item start_radiobuttonhint()
+
+=item end_radiobuttonhint()
+
+=back
+
+=cut