--- loncom/homework/chemresponse.pm 2003/06/30 20:58:52 1.8
+++ loncom/homework/chemresponse.pm 2004/03/08 17:31:37 1.30
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# chemical equation style response
#
-# $Id: chemresponse.pm,v 1.8 2003/06/30 20:58:52 albertel Exp $
+# $Id: chemresponse.pm,v 1.30 2004/03/08 17:31:37 www Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -35,11 +35,12 @@ BEGIN {
&Apache::lonxml::register('Apache::chemresponse',('organicresponse','organicstructure','reactionresponse'));
}
-sub seperate_jme_window {
+sub separate_jme_window {
my ($smile_input,$jme_input,$molecule,$options)=@_;
my $smilesection;
if (defined($smile_input)) {
$smilesection=<'; }
my $body=<
Molecule Editor
+
+EDITREACTION
+ return $result;
+}
+
sub start_reactionresponse {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
my $result;
my $id = &Apache::response::start_response($parstack,$safeeval);
- if ($target eq 'web') {
- $result.=<
-EDITREACTION
-
-# $result.=&reaction_javascript();
-# $result.='';
-# $result.=''
+ if ($target eq 'meta') {
+ $result=&Apache::response::meta_package_write('reactionresponse');
+ } elsif ($target eq 'web') {
+ my $partid = $Apache::inputtags::part;
+ my $id = $Apache::inputtags::response['-1'];
+ my $reaction=$Apache::lonhomework::history{"resource.$partid.$id.submission"};
+ $result.=&edit_reaction_button($id,"HWVAL_$id",$reaction);
} elsif ($target eq "edit") {
+ $result .=&Apache::edit::tag_start($target,$token);
+ my $answer=&Apache::lonxml::get_param('answer',$parstack,
+ $safeeval);
+ $result .=''.
+ &Apache::edit::text_arg('Answer:','answer',$token,40);
+ $result .=&edit_reaction_button($id,&Apache::edit::html_element_name('answer'),$answer).'';
+
+ $result .=&Apache::edit::end_row().&Apache::edit::start_spanning_row();
+ } elsif ($target eq 'modified') {
+ my $constructtag=&Apache::edit::get_new_args($token,$parstack,
+ $safeeval,'answer');
+ if ($constructtag) { $result = &Apache::edit::rebuild_tag($token); }
}
return $result;
}
@@ -247,8 +325,38 @@ EDITREACTION
sub end_reactionresponse {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
my $result;
- if ($target eq "edit") {
+ if ($target eq 'grade' && defined($ENV{'form.submitted'})) {
+ &Apache::response::setup_params($$tagstack[-1]);
+ my $response = &Apache::response::getresponse();
+ if ( $response =~ /[^\s]/) {
+ my $partid = $Apache::inputtags::part;
+ my $id = $Apache::inputtags::response['-1'];
+ my (@answers)=&Apache::lonxml::get_param_var('answer',$parstack,$safeeval);
+ my %previous = &Apache::response::check_for_previous($response,$partid,$id);
+ $Apache::lonhomework::results{"resource.$partid.$id.submission"}=$response;
+ my $ad;
+ foreach my $answer (@answers) {
+ &Apache::lonxml::debug("submitted a $response for $answer
\n");
+ if ($response eq $answer) {
+ $ad='EXACT_ANS';
+ } else {
+ $ad='INCORRECT';
+ }
+ }
+ &Apache::response::handle_previous(\%previous,$ad);
+ $Apache::lonhomework::results{"resource.$partid.$id.awarddetail"}=$ad;
+ }
+ } elsif ($target eq "edit") {
$result.= &Apache::edit::tag_end($target,$token,'');
+ } elsif ($target eq 'answer') {
+ my (@answers)=&Apache::lonxml::get_param_var('answer',$parstack,
+ $safeeval);
+ $result.=&Apache::response::answer_header('reactionresponse');
+ foreach my $answer (@answers) {
+ $result.=&Apache::response::answer_part('reactionresponse',
+ $answer);
+ }
+ $result.=&Apache::response::answer_footer('reactionresponse');
}
&Apache::response::end_response;
return $result;