[LON-CAPA-cvs] cvs: loncom /homework hint.pm optionresponse.pm
albertel
lon-capa-cvs@mail.lon-capa.org
Mon, 28 Oct 2002 23:31:48 -0000
albertel Mon Oct 28 18:31:48 2002 EDT
Modified files:
/loncom/homework hint.pm optionresponse.pm
Log:
- BUG#34, <optionhint> now fucntional for both foils and concepts
- edit mode non intuitive
Index: loncom/homework/hint.pm
diff -u loncom/homework/hint.pm:1.29 loncom/homework/hint.pm:1.30
--- loncom/homework/hint.pm:1.29 Fri Oct 25 15:02:38 2002
+++ loncom/homework/hint.pm Mon Oct 28 18:31:48 2002
@@ -1,7 +1,7 @@
# 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.30 2002/10/28 23:31:48 albertel Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -241,13 +241,78 @@
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;
}
@@ -273,7 +338,7 @@
return $result;
}
-sub end_radiobuttonhint {
+sp;&end_radiobuttonhint {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
my $result;
if ($target eq 'web') {
Index: loncom/homework/optionresponse.pm
diff -u loncom/homework/optionresponse.pm:1.56 loncom/homework/optionresponse.pm:1.57
--- loncom/homework/optionresponse.pm:1.56 Mon Oct 28 09:27:27 2002
+++ loncom/homework/optionresponse.pm Mon Oct 28 18:31:48 2002
@@ -1,7 +1,7 @@
# LearningOnline Network with CAPA
# option list style responses
#
-# $Id: optionresponse.pm,v 1.56 2002/10/28 14:27:27 sakharuk Exp $
+# $Id: optionresponse.pm,v 1.57 2002/10/28 23:31:48 albertel Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -42,6 +42,7 @@
&Apache::lonxml::register('Apache::optionresponse',('foilgroup','foil','conceptgroup'));
push (@Apache::lonxml::namespace,'optionresponse');
my $id = &Apache::response::start_response($parstack,$safeeval);
+ %Apache::hint::option=();
if ($target eq 'edit') {
$result.=&Apache::edit::start_table($token).
"<tr><td>Multiple Option Response Question</td><td>Delete:".
@@ -179,6 +180,7 @@
my @whichopt = &whichfoils($max,$randomize);
my $temp=1;my $name;
my %responsehash;
+ my %grade;
my $right=0;
my $wrong=0;
my $ignored=0;
@@ -188,7 +190,11 @@
if ( $response =~ /[^\s]/) {
my $value=$Apache::response::foilgroup{$name.'.value'};
&Apache::lonxml::debug("submitted a $response for $value<br />\n");
- if ($value eq $response) {$right++;} else {$wrong++;}
+ if ($value eq $response) {
+ $grade{$name}='1'; $right++;
+ } else {
+ $grade{$name}='0'; $wrong++;
+ }
} else {
$ignored++;
}
@@ -197,6 +203,7 @@
my $part=$Apache::inputtags::part;
my $id = $Apache::inputtags::response['-1'];
my $responsestr=&Apache::lonnet::hash2str(%responsehash);
+ my $gradestr =&Apache::lonnet::hash2str(%grade);
my %previous=&Apache::response::check_for_previous($responsestr,
$part,$id);
&Apache::lonxml::debug("Got $right right and $wrong wrong, and $ignored were ignored");
@@ -214,6 +221,7 @@
}
$Apache::lonhomework::results{"resource.$part.$id.submission"}=
$responsestr;
+ $Apache::lonhomework::results{"resource.$part.$id.submissiongrading"}=$gradestr;
$Apache::lonhomework::results{"resource.$part.$id.awarddetail"}=
$ad;
&Apache::response::handle_previous(\%previous,$ad);
@@ -498,6 +506,12 @@
$Apache::lonhomework::analyze{"$part_id.foil.location.$name"} =
$Apache::response::conceptgroup{"$name.location"};
}
+ } elsif ($target eq 'web') {
+ my $part_id="$Apache::inputtags::part.$Apache::inputtags::response[-1]";
+ push(@{ $Apache::hint::option{"$part_id.concepts"} },
+ $concept);
+ $Apache::hint::option{"$part_id.concept.$concept"}=
+ $Apache::response::conceptgroup{'names'};
}
}
} elsif ($target eq 'edit') {