--- loncom/homework/chemresponse.pm 2003/06/30 20:41:12 1.7
+++ loncom/homework/chemresponse.pm 2003/10/16 14:56:27 1.14
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# chemical equation style response
#
-# $Id: chemresponse.pm,v 1.7 2003/06/30 20:41:12 albertel Exp $
+# $Id: chemresponse.pm,v 1.14 2003/10/16 14:56:27 albertel Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -51,6 +51,7 @@ SMILESECTION
JMESECTION
}
+ if ($molecule) { $molecule='<param name="jme" value="'.$molecule.'" />'; }
my $body=<<CHEMPAGE;
<html>
<head>
@@ -75,7 +76,7 @@ function openHelpWindow() {
<center>
<applet code="JME.class" name="JME" archive="/adm/jme/JME.jar" width="97%" height="78%">
You have to enable Java and JavaScript on your machine.
-<param name="jme" value="$molecule" />
+$molecule
<param name="options" value="$options" />
</applet><br />
<font face="arial,helvetica,sans-serif" size=-1><a href="http://www.molinspiration.com/jme/index.html">JME Editor</a> courtesy of Peter Ertl, Novartis</font>
@@ -123,6 +124,9 @@ sub start_organicresponse {
$result.= '<input type="hidden" name="MOLECULE_'.$id.'" value="" />';
} elsif ($target eq 'edit') {
$result .=&Apache::edit::tag_start($target,$token);
+ my $options=&Apache::lonxml::get_param('options',$parstack,
+ $safeeval);
+ if ($options !~ /multipart/) { $options.=',multipart'; }
$result .='<nobr>'.
&Apache::edit::text_arg('Starting Molecule:','molecule',
$token,40);
@@ -130,7 +134,7 @@ sub start_organicresponse {
$safeeval);
$result .=&seperate_jme_window(undef,
&Apache::edit::html_element_name('molecule'),
- $molecule,'multipart');
+ $molecule,$options);
$result .='</nobr><br /><nobr>';
$result .=&Apache::edit::text_arg('Correct Answer:','answer',
$token,40);
@@ -140,16 +144,23 @@ sub start_organicresponse {
$result .=&seperate_jme_window(
&Apache::edit::html_element_name('answer'),
&Apache::edit::html_element_name('jmeanswer'),
- $jmeanswer,'multipart');
- $result .='</nobr>'.
- &Apache::edit::select_arg('Multipart:','multipart',
- ['no','yes'],$token);
+ $jmeanswer,$options);
+ $result .='</nobr><br />';
+ $result .=&Apache::edit::checked_arg('Options:','options',
+ [ ['autoez','Auto E,Z sterochemistry'],
+ ['multipart','MultiPart Structures'],
+ ['hydrogens','Show Hydrogens'],
+ ['nostereo','No stereochemistry'],
+ ['reaction','Is a reaction'],
+ ['number','Able to number atoms'],
+ ['border','Draw a border'] ],
+ ,$token);
$result .=&Apache::edit::end_row().&Apache::edit::start_spanning_row();
} elsif ($target eq 'modified') {
my $constructtag=&Apache::edit::get_new_args($token,$parstack,
$safeeval,'molecule',
'answer','jmeanswer',
- 'multipart');
+ 'options');
if ($constructtag) { $result = &Apache::edit::rebuild_tag($token); }
}
return $result;
@@ -164,15 +175,18 @@ sub end_organicresponse {
if ( $response =~ /[^\s]/) {
my $partid = $Apache::inputtags::part;
my $id = $Apache::inputtags::response['-1'];
- my $answer=&Apache::lonxml::get_param('answer',$parstack,$safeeval);
+ 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;
- &Apache::lonxml::debug("submitted a $response for $answer<br \>\n");
my $ad;
- if ($response eq $answer) {
- $ad='EXACT_ANS';
- } else {
- $ad='INCORRECT';
+ foreach my $answer (@answers) {
+ &Apache::lonxml::debug("submitted a $response for $answer<br \>\n");
+ if ($response eq $answer) {
+ $ad='EXACT_ANS';
+ last;
+ } else {
+ $ad='INCORRECT';
+ }
}
&Apache::response::handle_previous(\%previous,$ad);
$Apache::lonhomework::results{"resource.$partid.$id.awarddetail"}=$ad;
@@ -192,9 +206,10 @@ sub start_organicstructure {
my $width=&Apache::lonxml::get_param('width',$parstack,$safeeval);
my $height=&Apache::lonxml::get_param('height',$parstack,$safeeval);
my $molecule=&Apache::lonxml::get_param('molecule',$parstack,$safeeval);
+ my $options=&Apache::lonxml::get_param('options',$parstack,$safeeval);
$result=<<CHEMOUTPUT;
<applet code="JME.class" archive="/adm/jme/JME.jar" width="$width" height="$height">
-<param name="options" value="depict border" />
+<param name="options" value="depict,$options" />
<param name="jme" value="$molecule" />
</applet>
CHEMOUTPUT
@@ -202,17 +217,31 @@ CHEMOUTPUT
$result .=&Apache::edit::tag_start($target,$token);
$result .=&Apache::edit::text_arg('Width:','width',$token,5);
$result .=&Apache::edit::text_arg('Height:','height',$token,5);
+ $result .='<nobr>';
$result .=&Apache::edit::text_arg('Molecule:','molecule',$token,40);
my $molecule=&Apache::lonxml::get_param('molecule',$parstack,
$safeeval);
+ my $options=&Apache::lonxml::get_param('options',$parstack,
+ $safeeval);
+ if ($options !~ /reaction/) {
+ $options.= ',multipart,number';
+ }
+
$result .=&seperate_jme_window(undef,
- &Apache::edit::html_element_name('molecule'),
- $molecule,'multipart');
+ &Apache::edit::html_element_name('molecule'),
+ $molecule,$options);
+ $result.="</nobr><br />";
+ $result .=&Apache::edit::checked_arg('Options:','options',
+ [ ['hydrogens','Show Hydrogens'],
+ ['reaction','Is a reaction'],
+ ['border','Draw a border'] ],
+ $token);
$result .=&Apache::edit::end_row().&Apache::edit::start_spanning_row();
} elsif ($target eq 'modified') {
my $constructtag=&Apache::edit::get_new_args($token,$parstack,
$safeeval,'molecule',
- 'width','height');
+ 'width','height',
+ 'options');
if ($constructtag) { $result = &Apache::edit::rebuild_tag($token); }
}
return $result;
@@ -227,194 +256,21 @@ sub end_organicstructure {
return $result;
}
-sub reaction_javascript {
- my $rightarrow;
- if ($ENV{'browser.unicode'}) {
- $rightarrow=" → "
- } else {
- $rightarrow=" <font face=symbol>®</font> ";
- }
- my $result=<<REACTIONJAVASCRIPT;
- <script language="JavaScript">
-
-var level;
-var reactants;
-var products;
-
-
-function parse_reaction(string) {
- var reaction_array = string.split('->');
- var i;
- reactants = new Array(0);
- products = new Array(0);
-
- if (reaction_array.length > 0)
- reactants = reaction_array[0].split(' +');
- if (reaction_array.length > 1)
- products = reaction_array[1].split(' +');
-}
-
-function to_capa(string) {
- var reaction = "";
- var i;
-
- parse_reaction(string);
-
- for (i = 0; i < reactants.length; i++)
- reactants[i] = capa_component(reactants[i]);
- for (i = 0; i < products.length; i++)
- products[i] = capa_component(products[i]);
-
- reactants.sort();
- products.sort();
-
- for (i = 0; i < reactants.length-1; i++) {
- reaction += reactants[i];
- reaction += " + ";
- }
- if (i < reactants.length)
- reaction += reactants[i];
- if (products.length > 0) {
- reaction += " -> ";
- for (i = 0; i < products.length-1; i++) {
- reaction += products[i];
- reaction += " + ";
- }
- if (i < products.length)
- reaction += products[i];
- }
-
- return reaction;
-}
-
-function capa_component(string) {
- var reactant = "";
- var i = 0;
- level = 0;
-
- for (;string.substring(i,i+1) == ' ';i++)
- ;
- for (;isDigit(string.substring(i,i+1));i++)
- reactant += string.substring(i,i+1);
- for (;i < string.length;i++)
- reactant += capa_char(string.substring(i,i+1));
-
- return reactant;
-}
-
-function capa_char(chr) {
- if (level == 0) { // baseline
- if (chr == '^')
- level = 1;
- if (chr == ' ')
- return "";
- return chr;
- }
- if (level == 1) { // superscript
- if (isDigit(chr))
- return chr;
- level = 0;
- return chr;
- }
-}
-
-function to_html(string) {
- var reaction = "";
- var i;
-
- parse_reaction(string);
- for (i = 0; i < reactants.length-1; i++) {
- reaction += html_component(reactants[i]);
- reaction += " + ";
- }
- if (i < reactants.length)
- reaction += html_component(reactants[i]);
-
- if (products.length > 0) {
- reaction += " $rightarrow ";
- for (i = 0; i < products.length-1; i++) {
- reaction += html_component(products[i]);
- reaction += " + ";
- }
- if (i < products.length)
- reaction += html_component(products[i]);
- }
-
- return reaction;
-}
-
-function html_component(string) {
- var reactant = "";
- var i = 0;
- level = 0;
-
- for (;string.substring(i,i+1) == ' ';i++)
- ;
- for (;isDigit(string.substring(i,i+1));i++)
- reactant += string.substring(i,i+1);
- for (;i < string.length;i++)
- reactant += html_char(string.substring(i,i+1));
-
- return reactant;
-}
-
-function html_char(chr) {
- if (level == 0) { // baseline
- if (isDigit(chr))
- return chr.sub();
- if (chr == '^') {
- level = 1;
- return "";
- }
- if (chr == '+') // baseline or superscript
- return "?";
- if (chr == ' ')
- return "";
- return chr;
- }
- if (level == 1) { // superscript
- if (isDigit(chr))
- return chr.sup();
- if (chr == '+' || chr == '-') {
- level = 0;
- return chr.sup();
+sub edit_reaction_button {
+ my ($id,$field,$reaction)=@_;
+ my $id_es=&Apache::lonnet::escape($id);
+ my $field_es=&Apache::lonnet::escape($field);
+ my $reaction_es=&Apache::lonnet::escape($reaction);
+ my $result=<<EDITREACTION;
+<script type="text/javascript">
+ function create_reaction_window_${id}_${field} () {
+ editor=window.open('','','width=500,height=270,scrollbars=no,resizable=yes');
+ editor.document.open('text/html','replace');
+ editor.document.writeln('<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN"><html> <head><title>LON-CAPA Reaction Editor</title></head><frameset rows="30%,*" border="0"> <frame src="/res/adm/pages/reactionresponse/reaction_viewer.html" name="viewer" scrolling="no" /> <frame src="/res/adm/pages/reactionresponse/reaction_editor.html?reaction=$reaction_es&id=$id_es&field=$field_es" name="editor" scrolling="no" /> </frameset> </html>');
}
- if (chr == ' ') {
- level = 0;
- return "";
- }
- level = 0;
- return chr;
- }
-}
-
-function isDigit(string) {
- if (string >= '0' && string <='9')
- return 1;
- else
- return 0;
-}
-
-function openHelpWindow() {
- window.open("reaction_help.html","","scrollbars=yes,resizable=yes,width=550,height=600")
-}
-
-function submitReaction() {
- reaction = to_capa(document.form.text.value);
- if (reaction == "") {
- alert("Nothing to submit");
- }
- else {
- name = "INPUT" + ((problem < 10) ? "0" : "") + problem;
- i = 0;
- while (parent.opener.document.CAPA.elements[i].name != name)
- i++;
- parent.opener.document.CAPA.elements[i].value = reaction;
- parent.opener.document.CAPA.submit();
- }
-}
</script>
-REACTIONJAVASCRIPT
+<input type='button' value='Edit Reaction' onClick="javascript:create_reaction_window_${id}_${field}();void(0);" />
+EDITREACTION
return $result;
}
@@ -422,15 +278,25 @@ 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;
-<input type='button' value='Edit Reaction' onClick="javascript:editor=window.open('/res/adm/reactionresponse/reaction_window.html','','width=500,height=270,scrollbars=no,resizable=yes'); document.cookie='problem=$id';" />
-EDITREACTION
-
-# $result.=&reaction_javascript();
-# $result.='<iframe name="REACTION_'.$id.'" width="200" height="100" src="/adm/jme/reaction_viewer.html"></iframe>';
-# $result.='<input type="button" value="Check" onClick = "javascript:newWindow=open(\'\',\'new_W\',\'width=500,height=200,scrollbars=1\');newWindow.document.open(\'text/html\',\'replace\');newWindow.document.writeln(\'<center><br />\'+to_html(document.lonhomework.HWVAL_'.$id.'.value)+\'</center><input type="button" value=" Close " onClick = "parent.window.close()" />\');newWindow.document.close()" />'
+ if ($target eq 'meta') {
+ } 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 .='<nobr>'.
+ &Apache::edit::text_arg('Answer:','answer',$token,40);
+ $result .=&edit_reaction_button($id,&Apache::edit::html_element_name('answer'),$answer).'</nobr>';
+
+ $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;
}
@@ -438,7 +304,28 @@ 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('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<br \>\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,'');
}
&Apache::response::end_response;