--- loncom/homework/hint.pm 2001/01/22 16:42:01 1.5
+++ loncom/homework/hint.pm 2001/10/09 20:45:13 1.20
@@ -2,6 +2,7 @@ package Apache::hinttags;
use strict;
use Apache::lonnet;
+use capa;
sub BEGIN {
&Apache::lonxml::register('Apache::hinttags',('hintgroup','hintpart','numericalhint'));
@@ -10,34 +11,35 @@ sub BEGIN {
@Apache::hint::which=();
sub start_hintgroup {
- my ($target,$token,$parstack,$parser,$safeeval,$style)=@_;
- my $skiptoend='1';
+ my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
+ my $skiptoend='0';
my $result;
-
- if ($target ne 'meta' || $target ne 'grade') {
+
+ if ($target eq 'web') {
my $id=$Apache::inputtags::part;
my $numtries=$Apache::lonhomework::history{"resource.$id.tries"};
if ( $numtries eq '') { $numtries = 0; }
my $hinttries=&Apache::lonnet::EXT("resource.$id.hinttries");
if ( $hinttries eq '') { $hinttries = 1; }
&Apache::lonxml::debug("found :$id:$numtries:$hinttries:");
- if ( $numtries >= $hinttries ) {
- $skiptoend='0';
+ if ( $numtries < $hinttries ) {
+ $skiptoend='1';
+ } else {
if ($target eq 'web') {$result='<table bgcolor="#dddddd"><tr><td>';}
- }
- }
- if ($skiptoend) {
- &Apache::lonxml::get_all_text("/hintgroup",$$parser[$#$parser]);
+ }
+ if ($skiptoend) {
+ &Apache::lonxml::get_all_text("/hintgroup",$$parser[$#$parser]);
+ }
}
@Apache::hint::which=();
return $result;
}
sub end_hintgroup {
- my ($target,$token,$parstack,$parser,$safeeval,$style)=@_;
+ my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
my $result;
- if ($target ne 'meta' || $target ne 'grade') {
+ if ($target eq 'web') {
my $id=$Apache::inputtags::part;
my $numtries=$Apache::lonhomework::history{"resource.$id.tries"};
if ( $numtries eq '') { $numtries = 0; }
@@ -45,52 +47,88 @@ sub end_hintgroup {
if ( $hinttries eq '') { $hinttries = 1; }
&Apache::lonxml::debug("found :$id:$numtries:$hinttries:");
if ( $numtries >= $hinttries ) {
- if ($target eq 'web') {$result='</td></tr></table>';}
- }
+ $result='</td></tr></table>';
+ }
+ } elsif ($target eq 'edit') {
+ $result.=&Apache::edit::end_table();
}
- @Apache::hint::which='';
+ @Apache::hint::which=();
return $result;
}
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);
+ 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::text_arg('Unit:','unit',$token,5);
+ $result.=&Apache::edit::text_arg('Format:','format',$token,4);
+ $result.='</td></tr><tr><td colspan="3">';
+ } elsif ($target eq 'modified') {
+ my $constructtag=
+ &Apache::edit::get_new_args($token,$parstack,$safeeval,
+ 'name','answer','unit', 'format');
+ if ($constructtag) {
+ $result = &Apache::edit::rebuild_tag($token);
+ $result .= &Apache::edit::handle_insert();
+ }
+ }
+ return $result;
}
sub end_numericalhint {
- my ($target,$token,$parstack,$parser,$safeeval,$style)=@_;
+ my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
my $result;
- if ($target ne 'meta' && $target ne 'grade') {
- my $args ='';
- if ( $#$parstack > -1 ) { $args=$$parstack[$#$parstack]; }
- my $name = &Apache::run::run("{$args;".'return $name}',$safeeval);
- my $response = $Apache::lonhomework::history{"resource.$Apache::inputtags::part.$Apache::inputtags::response['-1'].submission"};
- &Apache::lonxml::debug("hintgroup is using $response<br>\n");
+ if ($target eq 'web') {
+ $safeeval->share_from('capa',['&caparesponse_capa_check_answer']);
+ my $name= &Apache::lonxml::get_param('name',$parstack,$safeeval);
+ &Apache::response::setup_params('numericalhint');
+ my $partid=$Apache::inputtags::part;
+ my $id=$Apache::inputtags::response['-1'];
+ #id submissions occured under
+ my $submitid=$Apache::inputtags::response['-2'];
+ my $response = $Apache::lonhomework::history{
+ "resource.$partid.$submitid.submission"};
+ &Apache::lonxml::debug("hintgroup is using $response<br />\n");
+ #build safe space expression
my $expression="&caparesponse_check_list('".$response."','".
- $$parstack[$#$parstack].
- ';my $tol="'.$Apache::inputtags::params{'tol'}.'"'.
- ';my $sig="'.$Apache::inputtags::params{'sig'}.'"'.
- "');";
+ $$parstack[$#$parstack];
+ #need to get all possible parms
+ foreach my $key (keys(%Apache::inputtags::params)) {
+ $expression.= ';my $'. #'
+ $key.'="'.$Apache::inputtags::params{$key}.'"';
+ }
+ $expression.="');";
$result = &Apache::run::run($expression,$safeeval);
+ &Apache::lonxml::debug("$expression:result:$result:$Apache::lonxml::curdepth");
my ($awards) = split /:/ , $result;
my ($ad) = &Apache::inputtags::finalizeawards(split /,/ , $awards);
if ($ad eq 'EXACT_ANS' || $ad eq 'APPROX_ANS') { push (@Apache::hint::which,$name); }
- &Apache::lonxml::debug("\n<br>result:$result:$Apache::lonxml::curdepth<br>\n");
$result='';
+ } elsif ($target eq 'meta') {
+ $result=&Apache::response::meta_package_write('numericalhint');
+ } elsif ($target eq 'edit') {
+ $result.='</td></tr>'.&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,$parstack,$parser,$safeeval,$style)=@_;
+ my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
my $show ='0';
-
- if ($target ne 'meta' && $target ne 'grade') {
- my $args ='';
- if ( $#$parstack > -1 ) { $args=$$parstack[$#$parstack]; }
- my $on = &Apache::run::run("{$args;".'return $on}',$safeeval);
+ my $result = '';
+ if ($target eq 'web') {
+ my $on= &Apache::lonxml::get_param('on',$parstack,$safeeval);
+ &Apache::lonxml::debug("hintpart sees $on and ,$#Apache::hint::which");
if ( $on eq 'default' && $#Apache::hint::which == '-1') {
+ $show=1;
} else {
my $which;
foreach $which (@Apache::hint::which) { if ($which eq $on) { $show = 1; last } }
@@ -98,13 +136,28 @@ sub start_hintpart {
if (!$show) {
&Apache::lonxml::get_all_text("/hintpart",$$parser[$#$parser]);
}
- } else {
+ } elsif ($target eq 'grade') {
&Apache::lonxml::get_all_text("/hintpart",$$parser[$#$parser]);
+ } elsif ($target eq 'edit') {
+ $result.= &Apache::edit::tag_start($target,$token,
+ &Apache::lonxml::description($token));
+ $result.= &Apache::edit::text_arg('On:','on',$token).'</td></tr><tr><td colspan="3">';
+ } elsif ($target eq 'modified') {
+ my $constructtag=&Apache::edit::get_new_args($token,$parstack,$safeeval,
+ 'on');
+ if ($constructtag) {
+ $result = &Apache::edit::rebuild_tag($token);
+ $result.=&Apache::edit::handle_insert();
+ }
}
- return '';
+ return $result;
}
sub end_hintpart {
+ my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
+ my $result;
+ if ($target eq 'edit') { $result.=&Apache::edit::end_table; }
+ return $result;
}
1;