--- loncom/homework/hint.pm 2002/10/25 19:02:38 1.29
+++ loncom/homework/hint.pm 2003/02/23 20:37:56 1.36
@@ -1,13 +1,13 @@
# The LearningOnline Network with CAPA
# implements the tags that control the hints
#
-# $Id: hint.pm,v 1.29 2002/10/25 19:02:38 albertel Exp $
+# $Id: hint.pm,v 1.36 2003/02/23 20:37:56 www Exp $
#
# Copyright Michigan State University Board of Trustees
#
# This file is part of the LearningOnline Network with CAPA (LON-CAPA).
#
-# LON-CAPA is free software; you can redistribute it and/or modify
+# LON-CAPA me&aree software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 2 of the License, or
# (at your option) any later version.
@@ -56,7 +56,7 @@ sub start_hintgroup {
if ($target eq 'web') {$result='<table bgcolor="#dddddd"><tr><td>';}
}
if ($skiptoend) {
- &Apache::lonxml::get_all_text("/hintgroup",$$parser[$#$parser]);
+ &Apache::lonxml::get_all_text("/hintgroup",$parser);
}
} elsif ($target eq 'tex') {
$result .= '\keephidden{';
@@ -98,8 +98,10 @@ sub start_numericalhint {
$result.=&Apache::edit::text_arg('Name:','name',$token);
$result.=&Apache::edit::text_arg('Answer:','answer',$token);
if ($token->[1] eq 'numericalhint') {
- $result.=&Apache::edit::text_arg('Unit:','unit',$token,5);
- $result.=&Apache::edit::text_arg('Format:','format',$token,4);
+ $result.=&Apache::edit::text_arg('Unit:','unit',$token,5).
+ &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','ci','mc'],$token);
} elsif ($token->[1] eq 'formulahint') {
@@ -123,6 +125,8 @@ sub start_numericalhint {
$result = &Apache::edit::rebuild_tag($token);
$result .= &Apache::edit::handle_insert();
}
+ } elsif ($target eq 'web') {
+ &Apache::response::reset_params();
}
return $result;
}
@@ -131,6 +135,9 @@ sub end_numericalhint {
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);
+ }
$safeeval->share_from('capa',['&caparesponse_capa_check_answer']);
my $name= &Apache::lonxml::get_param('name',$parstack,$safeeval);
&Apache::response::setup_params('numericalhint');
@@ -157,7 +164,7 @@ sub end_numericalhint {
if ($ad eq 'EXACT_ANS' || $ad eq 'APPROX_ANS') { push (@Apache::hint::which,$name); }
$result='';
} elsif ($target eq 'meta') {
- $result=&Apache::response::meta_package_write('numericalhint');
+ $result=&Apache::response::meta_package_write($token->[1]);
} elsif ($target eq 'edit') {
$result.='</td></tr>'.&Apache::edit::end_table;
}
@@ -166,33 +173,19 @@ sub end_numericalhint {
}
sub start_stringhint {
- my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
- my $result;
- if ($target eq 'meta') {
- $result=&Apache::response::meta_package_write('stringhint');
- } else {
- $result.=&start_numericalhint(@_);
- }
- return $result;
+ return &start_numericalhint(@_);
}
sub end_stringhint {
- return end_numericalhint(@_);
+ return &end_numericalhint(@_);
}
sub start_formulahint {
- my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
- my $result;
- if ($target eq 'meta') {
- $result=&Apache::response::meta_package_write('formulahint');
- } else {
- $result.=&start_numericalhint(@_);
- }
- return $result;
+ return &start_numericalhint(@_);
}
sub end_formulahint {
- return end_numericalhint(@_);
+ return end_numericalhint(@_);
}
# a part shows if it is on, if no specific parts are on, then default shows
@@ -211,10 +204,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[$#$parser]);
+ &Apache::lonxml::get_all_text("/hintpart",$parser);
}
} elsif ($target eq 'grade') {
- &Apache::lonxml::get_all_text("/hintpart",$$parser[$#$parser]);
+ &Apache::lonxml::get_all_text("/hintpart",$parser);
} elsif ($target eq 'edit') {
$result.= &Apache::edit::tag_start($target,$token);
$result.= &Apache::edit::text_arg('On:','on',$token);
@@ -241,13 +234,78 @@ sub end_hintpart {
sub start_optionhint {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
my $result;
+ &Apache::response::start_hintresponse($parstack,$safeeval);
+ 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,40);
+ $result.=&Apache::edit::text_arg('Concept:','concept',$token,50);
+ } elsif ($target eq 'modified') {
+ my $constructtag=&Apache::edit::get_new_args($token,$parstack,
+ $safeeval,'name',
+ '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');
+ }
return $result;
}
sub end_optionhint {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
my $result;
+ if ($target eq 'web') {
+ 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'];
+ my $part_id="$partid.$submitid";
+ my %answer;
+ my $answer=&Apache::lonxml::get_param('answer',$parstack,$safeeval);
+ if ($answer) {
+ eval('%answer ='.$answer);
+ &Apache::lonhomework::showhash(%answer);
+ my $response = $Apache::lonhomework::history{
+ "resource.$part_id.submission"};
+ my %response=&Apache::lonnet::str2hash($response);
+ &Apache::lonhomework::showhash(%response);
+ foreach my $foil (keys(%answer)) {
+ $foilmatch=1;
+ if ($answer{$foil} ne $response{$foil}) {$foilmatch=0;last;}
+ }
+ }
+ my %concept;
+ my $constr=&Apache::lonxml::get_param('concept',$parstack,$safeeval);
+ if ( $constr ) { eval('%concept ='.$constr); }
+ my $response = $Apache::lonhomework::history{
+ "resource.$part_id.submissiongrading"};
+ my %response=&Apache::lonnet::str2hash($response);
+ foreach my $concept (keys(%concept)) {
+ my $compare;
+ if ($concept{$concept} eq 'correct') {$compare=1}else{$compare=0}
+ $conceptmatch=1;
+ if (ref($Apache::hint::option{"$part_id.concepts"})) {
+ foreach my $foil (@{ $Apache::hint::option{"$part_id.concept.$concept"} }) {
+ &Apache::lonxml::debug("compare -$foil- -$response{$foil}-$compare-");
+ if ( exists($response{$foil}) &&
+ $response{$foil} ne $compare) {$conceptmatch=0;last;}
+ }
+ } else {
+ $conceptmatch=0;
+ }
+ if ($conceptmatch eq '0') { last; }
+ }
+ if ( ($conceptmatch eq '-1' || $conceptmatch eq '1') &&
+ ($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; }
+ &Apache::response::end_hintresponse();
return $result;
}