--- loncom/homework/chemresponse.pm 2004/09/27 20:59:21 1.39
+++ loncom/homework/chemresponse.pm 2005/01/08 03:54:32 1.43
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# chemical equation style response
#
-# $Id: chemresponse.pm,v 1.39 2004/09/27 20:59:21 www Exp $
+# $Id: chemresponse.pm,v 1.43 2005/01/08 03:54:32 albertel Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -121,9 +121,9 @@ $molecule
CHEMPAGE
$body=&HTML::Entities::encode($body,'<>&"');
$body=~s/\n/ /g;
- my $nothing= &Apache::lonhtmlcommon::javascript_nothing();
+ my $docopen=&Apache::lonhtmlcommon::javascript_docopen();
my $result=<
+
CHEMINPUT
return $result;
}
@@ -211,6 +211,9 @@ sub end_organicresponse {
$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;
$Apache::lonhomework::results{"resource.$partid.$id.molecule"}=$ENV{"form.MOLECULE_$id"};
@@ -309,12 +312,12 @@ sub edit_reaction_button {
my $id_es=&Apache::lonnet::escape($id);
my $field_es=&Apache::lonnet::escape($field);
my $reaction_es=&Apache::lonnet::escape($reaction);
- my $nothing= &Apache::lonhtmlcommon::javascript_nothing();
+ my $docopen=&Apache::lonhtmlcommon::javascript_docopen();
my $result=<
function create_reaction_window_${id}_${field} () {
editor=window.open('','','width=500,height=270,scrollbars=no,resizable=yes');
- editor.document.open($nothing,'replace');
+ editor.$docopen;
editor.document.writeln(' LON-CAPA Reaction Editor ');
}
@@ -352,7 +355,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();
@@ -387,6 +390,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;
}