--- loncom/homework/chemresponse.pm 2004/07/02 08:15:56 1.35
+++ loncom/homework/chemresponse.pm 2005/06/27 14:27:25 1.59
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# chemical equation style response
#
-# $Id: chemresponse.pm,v 1.35 2004/07/02 08:15:56 albertel Exp $
+# $Id: chemresponse.pm,v 1.59 2005/06/27 14:27:25 albertel Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -30,9 +30,10 @@ package Apache::chemresponse;
use strict;
use Apache::lonxml;
use Apache::lonnet;
+use Apache::lonlocal;
BEGIN {
- &Apache::lonxml::register('Apache::chemresponse',('organicresponse','organicstructure','reactionresponse'));
+ &Apache::lonxml::register('Apache::chemresponse',('organicresponse','organicstructure','reactionresponse','chem'));
}
sub chem_standard_order {
@@ -63,7 +64,7 @@ sub chem_standard_order {
}
sub separate_jme_window {
- my ($smile_input,$jme_input,$molecule,$options)=@_;
+ my ($smile_input,$jme_input,$molecule,$options,$shown_text)=@_;
my $smilesection;
if (defined($smile_input)) {
$smilesection=<'; }
+ my $insert_answer;
+ if ($shown_text eq '') {
+ $insert_answer=
+ '';
+ }
+
my $body=<
Molecule Editor
-
-
+
EDITREACTION
return $result;
}
@@ -338,8 +391,11 @@ sub start_reactionresponse {
}
if ( &Apache::response::show_answer() ) {
my $ans=&Apache::lonxml::get_param('answer',$parstack,$safeeval);
- $ans=~s/(\\|\')/\\$1/g;
- $Apache::inputtags::answertxt{$id}=&Apache::run::run("return &chemparse('$ans');",$safeeval);
+ if (!$Apache::lonxml::default_homework_loaded) {
+ &Apache::lonxml::default_homework_load($safeeval);
+ }
+ @Apache::scripttag::parser_env = @_;
+ $Apache::inputtags::answertxt{$id}=&Apache::run::run("return &chemparse(q\0$ans\0);",$safeeval);
}
} elsif ($target eq "edit") {
$result .=&Apache::edit::tag_start($target,$token);
@@ -350,7 +406,7 @@ sub start_reactionresponse {
$result .=&edit_reaction_button($id,&Apache::edit::html_element_name('answer'),$answer).'';
my $initial=&Apache::lonxml::get_param('initial',$parstack,$safeeval);
$result.=''.
- &Apache::edit::text_arg('Initial Reation:','initial',$token,40);
+ &Apache::edit::text_arg('Initial Reaction:','initial',$token,40);
$result .=&edit_reaction_button($id,&Apache::edit::html_element_name('initial'),$initial).'';
$result .=&Apache::edit::end_row().&Apache::edit::start_spanning_row();
@@ -366,7 +422,7 @@ sub start_reactionresponse {
sub end_reactionresponse {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
my $result;
- if ($target eq 'grade' && defined($ENV{'form.submitted'})) {
+ if ($target eq 'grade' && &Apache::response::submitted()) {
&Apache::response::setup_params($$tagstack[-1],$safeeval);
my $response = &Apache::response::getresponse();
if ( $response =~ /[^\s]/) {
@@ -385,6 +441,9 @@ sub end_reactionresponse {
$ad='INCORRECT';
}
}
+ if ($ad && $Apache::lonhomework::type eq 'survey') {
+ $ad='SUBMITTED';
+ }
&Apache::response::handle_previous(\%previous,$ad);
$Apache::lonhomework::results{"resource.$partid.$id.awarddetail"}=$ad;
}
@@ -404,5 +463,26 @@ sub end_reactionresponse {
return $result;
}
+sub start_chem {
+ my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style) = @_;
+ my $result = '';
+ my $inside = &Apache::lonxml::get_all_text_unbalanced("/chem",$parser);
+ if ($target eq 'tex' || $target eq 'web') {
+ $inside=&Apache::run::evaluate($inside,$safeeval,$$parstack[-1]);
+ if (!$Apache::lonxml::default_homework_loaded) {
+ &Apache::lonxml::default_homework_load($safeeval);
+ }
+ @Apache::scripttag::parser_env = @_;
+ $result=&Apache::run::run("return &chemparse(q\0$inside\0);",$safeeval);
+ }
+ return $result;
+}
+
+sub end_chem {
+ my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style) = @_;
+ my $result = '';
+ return $result;
+}
+
1;
__END__