version 1.22, 2002/01/11 16:32:29
|
version 1.37, 2003/04/02 18:51:11
|
Line 7
|
Line 7
|
# |
# |
# This file is part of the LearningOnline Network with CAPA (LON-CAPA). |
# 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 |
# it under the terms of the GNU General Public License as published by |
# the Free Software Foundation; either version 2 of the License, or |
# the Free Software Foundation; either version 2 of the License, or |
# (at your option) any later version. |
# (at your option) any later version. |
Line 32 use strict;
|
Line 32 use strict;
|
use Apache::lonnet; |
use Apache::lonnet; |
use capa; |
use capa; |
|
|
sub BEGIN { |
BEGIN { |
&Apache::lonxml::register('Apache::hinttags',('hintgroup','hintpart','numericalhint')); |
&Apache::lonxml::register('Apache::hinttags',('hintgroup','hintpart','numericalhint','stringhint','formulahint','optionhint','radiobuttonhint')); |
} |
} |
|
|
|
|
Line 53 sub start_hintgroup {
|
Line 53 sub start_hintgroup {
|
if ( $numtries < $hinttries ) { |
if ( $numtries < $hinttries ) { |
$skiptoend='1'; |
$skiptoend='1'; |
} else { |
} else { |
if ($target eq 'web') {$result='<table bgcolor="#dddddd"><tr><td>';} |
if ($target eq 'web' && $Apache::lonhomework::type ne 'exam') { |
|
$result='<table bgcolor="#dddddd"><tr><td>'; |
|
} elsif ($Apache::lonhomework::type eq 'exam') { |
|
&Apache::lonxml::startredirection; |
|
} |
} |
} |
if ($skiptoend) { |
if ($skiptoend) { |
&Apache::lonxml::get_all_text("/hintgroup",$$parser[$#$parser]); |
&Apache::lonxml::get_all_text("/hintgroup",$parser); |
} |
} |
|
} elsif ($target eq 'tex') { |
|
$result .= '\keephidden{'; |
} |
} |
@Apache::hint::which=(); |
@Apache::hint::which=(); |
return $result; |
return $result; |
Line 74 sub end_hintgroup {
|
Line 80 sub end_hintgroup {
|
my $hinttries=&Apache::lonnet::EXT("resource.$id.hinttries"); |
my $hinttries=&Apache::lonnet::EXT("resource.$id.hinttries"); |
if ( $hinttries eq '') { $hinttries = 1; } |
if ( $hinttries eq '') { $hinttries = 1; } |
&Apache::lonxml::debug("found :$id:$numtries:$hinttries:"); |
&Apache::lonxml::debug("found :$id:$numtries:$hinttries:"); |
if ( $numtries >= $hinttries ) { |
if ( $numtries >= $hinttries && $Apache::lonhomework::type ne 'exam') { |
$result='</td></tr></table>'; |
$result='</td></tr></table>'; |
|
} elsif ($Apache::lonhomework::type eq 'exam') { |
|
my $garbage = &Apache::lonxml::endredirection; |
} |
} |
} elsif ($target eq 'edit') { |
} elsif ($target eq 'edit') { |
$result.=&Apache::edit::end_table(); |
$result.=&Apache::edit::end_table(); |
|
} elsif ($target eq 'tex') { |
|
$result .= '}'; |
} |
} |
@Apache::hint::which=(); |
@Apache::hint::which=(); |
return $result; |
return $result; |
Line 93 sub start_numericalhint {
|
Line 103 sub start_numericalhint {
|
$result.=&Apache::edit::tag_start($target,$token); |
$result.=&Apache::edit::tag_start($target,$token); |
$result.=&Apache::edit::text_arg('Name:','name',$token); |
$result.=&Apache::edit::text_arg('Name:','name',$token); |
$result.=&Apache::edit::text_arg('Answer:','answer',$token); |
$result.=&Apache::edit::text_arg('Answer:','answer',$token); |
$result.=&Apache::edit::text_arg('Unit:','unit',$token,5); |
if ($token->[1] eq 'numericalhint') { |
$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') { |
|
$result.=&Apache::edit::text_arg('Sample Points:','samples',$token,40); |
|
} |
$result.=&Apache::edit::end_row(); |
$result.=&Apache::edit::end_row(); |
$result.=&Apache::edit::start_spanning_row(); |
$result.=&Apache::edit::start_spanning_row(); |
} elsif ($target eq 'modified') { |
} elsif ($target eq 'modified') { |
my $constructtag= |
my $constructtag; |
&Apache::edit::get_new_args($token,$parstack,$safeeval, |
if ($token->[1] eq 'numericalhint') { |
'name','answer','unit', 'format'); |
$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','samples'); |
|
} |
if ($constructtag) { |
if ($constructtag) { |
$result = &Apache::edit::rebuild_tag($token); |
$result = &Apache::edit::rebuild_tag($token); |
$result .= &Apache::edit::handle_insert(); |
$result .= &Apache::edit::handle_insert(); |
} |
} |
|
} elsif ($target eq 'web') { |
|
&Apache::response::reset_params(); |
} |
} |
return $result; |
return $result; |
} |
} |
Line 113 sub end_numericalhint {
|
Line 141 sub end_numericalhint {
|
my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; |
my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; |
my $result; |
my $result; |
if ($target eq 'web') { |
if ($target eq 'web') { |
|
if (!$Apache::lonxml::default_homework_loaded) { |
|
&Apache::lonxml::default_homework_load($safeeval); |
|
} |
$safeeval->share_from('capa',['&caparesponse_capa_check_answer']); |
$safeeval->share_from('capa',['&caparesponse_capa_check_answer']); |
my $name= &Apache::lonxml::get_param('name',$parstack,$safeeval); |
my $name= &Apache::lonxml::get_param('name',$parstack,$safeeval); |
&Apache::response::setup_params('numericalhint'); |
&Apache::response::setup_params('numericalhint'); |
Line 139 sub end_numericalhint {
|
Line 170 sub end_numericalhint {
|
if ($ad eq 'EXACT_ANS' || $ad eq 'APPROX_ANS') { push (@Apache::hint::which,$name); } |
if ($ad eq 'EXACT_ANS' || $ad eq 'APPROX_ANS') { push (@Apache::hint::which,$name); } |
$result=''; |
$result=''; |
} elsif ($target eq 'meta') { |
} elsif ($target eq 'meta') { |
$result=&Apache::response::meta_package_write('numericalhint'); |
$result=&Apache::response::meta_package_write($token->[1]); |
} elsif ($target eq 'edit') { |
} elsif ($target eq 'edit') { |
$result.='</td></tr>'.&Apache::edit::end_table; |
$result.='</td></tr>'.&Apache::edit::end_table; |
} |
} |
Line 147 sub end_numericalhint {
|
Line 178 sub end_numericalhint {
|
return $result; |
return $result; |
} |
} |
|
|
|
sub start_stringhint { |
|
return &start_numericalhint(@_); |
|
} |
|
|
|
sub end_stringhint { |
|
return &end_numericalhint(@_); |
|
} |
|
|
|
sub start_formulahint { |
|
return &start_numericalhint(@_); |
|
} |
|
|
|
sub end_formulahint { |
|
return end_numericalhint(@_); |
|
} |
|
|
# a part shows if it is on, if no specific parts are on, then default shows |
# a part shows if it is on, if no specific parts are on, then default shows |
sub start_hintpart { |
sub start_hintpart { |
my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; |
my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; |
Line 163 sub start_hintpart {
|
Line 210 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[$#$parser]); |
&Apache::lonxml::get_all_text("/hintpart",$parser); |
} |
} |
} elsif ($target eq 'grade') { |
} elsif ($target eq 'grade') { |
&Apache::lonxml::get_all_text("/hintpart",$$parser[$#$parser]); |
&Apache::lonxml::get_all_text("/hintpart",$parser); |
} 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 184 sub start_hintpart {
|
Line 231 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_table; } |
return $result; |
return $result; |
|
} |
|
|
|
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; |
|
} |
|
|
|
sub start_radiobuttonhint { |
|
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); |
|
} elsif ($target eq 'modified') { |
|
my $constructtag=&Apache::edit::get_new_args($token,$parstack, |
|
$safeeval,'name', |
|
'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'); |
|
} |
|
return $result; |
|
} |
|
|
|
sub end_radiobuttonhint { |
|
my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_; |
|
my $result; |
|
if ($target eq 'web') { |
|
my $name= &Apache::lonxml::get_param('name',$parstack,$safeeval); |
|
my @answer; |
|
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']; |
|
my $part_id="$partid.$submitid"; |
|
my $response = $Apache::lonhomework::history{ |
|
"resource.$part_id.submission"}; |
|
($response)=&Apache::lonnet::str2hash($response); |
|
if ($answer[0] eq 'foil' && $response eq $answer[1]) { |
|
push (@Apache::hint::which,$name); |
|
} elsif ($answer[0] eq 'concept') { |
|
if (ref($Apache::hint::radiobutton{"$part_id.concept.".$answer[1]})) { |
|
my @names=@{ $Apache::hint::radiobutton{"$part_id.concept.".$answer[1]} }; |
|
if (grep(/^\Q$response\E$/,@names)) { |
|
push(@Apache::hint::which,$name); |
|
} |
|
} |
|
} |
|
} elsif ($target eq 'edit') { $result.=&Apache::edit::end_table; } |
|
&Apache::response::end_hintresponse(); |
|
return $result; |
|
} |
1; |
1; |
__END__ |
__END__ |