[LON-CAPA-cvs] cvs: loncom /homework edit.pm hint.pm radiobuttonresponse.pm
albertel
lon-capa-cvs@mail.lon-capa.org
Fri, 25 Oct 2002 19:02:38 -0000
albertel Fri Oct 25 15:02:38 2002 EDT
Modified files:
/loncom/homework radiobuttonresponse.pm hint.pm edit.pm
Log:
- working <radiobuttonhint>, edit mode is non-intuitive but functional
Index: loncom/homework/radiobuttonresponse.pm
diff -u loncom/homework/radiobuttonresponse.pm:1.57 loncom/homework/radiobuttonresponse.pm:1.58
--- loncom/homework/radiobuttonresponse.pm:1.57 Thu Oct 17 13:13:44 2002
+++ loncom/homework/radiobuttonresponse.pm Fri Oct 25 15:02:38 2002
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# mutliple choice style responses
#
-# $Id: radiobuttonresponse.pm,v 1.57 2002/10/17 17:13:44 albertel Exp $
+# $Id: radiobuttonresponse.pm,v 1.58 2002/10/25 19:02:38 albertel Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -42,6 +42,7 @@
&Apache::lonxml::register('Apache::radiobuttonresponse',('foilgroup','foil','conceptgroup'));
push (@Apache::lonxml::namespace,'radiobuttonresponse');
my $id = &Apache::response::start_response($parstack,$safeeval);
+ %Apache::hint::radiobutton=();
if ($target eq 'meta') {
$result=&Apache::response::meta_package_write('radiobuttonresponse');
} elsif ($target eq 'edit' ) {
@@ -383,7 +384,7 @@
}
} else {
if ($Apache::lonhomework::type eq 'exam') {
- $result .= '{\small \textbf{'.$alphabet[$i].'}}$\bigcirc$'.$Apache::response::foilgroup{$name.'.text'}.'\\\\';
+ $result .= '{\small \textbf{'.$alphabet[$i].'}}$\bigcirc$'.$Apache::response::foilgroup{$name.'.text'}.'\\\\'; #' stupid emacs
$i++;
} else {
$result .= '\item '.$Apache::response::foilgroup{$name.'.text'};
@@ -441,6 +442,10 @@
my $concept = &Apache::lonxml::get_param('concept',$parstack,$safeeval);
$Apache::response::foilgroup{"$name.concept"} = $concept;
&Apache::lonxml::debug("Selecting $name in $concept");
+ my $part_id="$Apache::inputtags::part.$Apache::inputtags::response[-1]";
+ push(@{ $Apache::hint::radiobutton{"$part_id.concepts"} },$concept);
+ $Apache::hint::radiobutton{"$part_id.concept.$concept"}=
+ $Apache::response::conceptgroup{'names'};
}
} elsif ($target eq 'edit') {
$result=&Apache::edit::end_table();
Index: loncom/homework/hint.pm
diff -u loncom/homework/hint.pm:1.28 loncom/homework/hint.pm:1.29
--- loncom/homework/hint.pm:1.28 Mon Oct 14 16:42:57 2002
+++ loncom/homework/hint.pm Fri Oct 25 15:02:38 2002
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# implements the tags that control the hints
#
-# $Id: hint.pm,v 1.28 2002/10/14 20:42:57 albertel Exp $
+# $Id: hint.pm,v 1.29 2002/10/25 19:02:38 albertel Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -33,7 +33,7 @@
use capa;
BEGIN {
- &Apache::lonxml::register('Apache::hinttags',('hintgroup','hintpart','numericalhint','stringhint','formulahint'));
+ &Apache::lonxml::register('Apache::hinttags',('hintgroup','hintpart','numericalhint','stringhint','formulahint','optionhint','radiobuttonhint'));
}
@@ -232,11 +232,75 @@
}
sub end_hintpart {
- my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
- my $result;
- if ($target eq 'edit') { $result.=&Apache::edit::end_table; }
- return $result;
+ my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
+ my $result;
+ if ($target eq 'edit') { $result.=&Apache::edit::end_table; }
+ return $result;
+}
+
+sub start_optionhint {
+ my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
+ my $result;
+ return $result;
+}
+
+sub end_optionhint {
+ my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
+ my $result;
+ if ($target eq 'edit') { $result.=&Apache::edit::end_table; }
+ 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;
__END__
Index: loncom/homework/edit.pm
diff -u loncom/homework/edit.pm:1.36 loncom/homework/edit.pm:1.37
--- loncom/homework/edit.pm:1.36 Wed Aug 7 12:23:05 2002
+++ loncom/homework/edit.pm Fri Oct 25 15:02:38 2002
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# edit mode helpers
#
-# $Id: edit.pm,v 1.36 2002/08/07 16:23:05 albertel Exp $
+# $Id: edit.pm,v 1.37 2002/10/25 19:02:38 albertel Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -290,6 +290,12 @@
return '
<numericalhint>
</numericalhint>';
+}
+
+sub insert_radiobuttonhint {
+ return '
+<radiobuttonhint>
+</radiobuttonhint>';
}
sub insert_startouttext {