--- loncom/homework/chemresponse.pm 2005/02/17 21:42:37 1.46
+++ loncom/homework/chemresponse.pm 2008/02/06 16:32:30 1.77
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# chemical equation style response
#
-# $Id: chemresponse.pm,v 1.46 2005/02/17 21:42:37 albertel Exp $
+# $Id: chemresponse.pm,v 1.77 2008/02/06 16:32:30 raeburn Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -30,6 +30,10 @@ package Apache::chemresponse;
use strict;
use Apache::lonxml;
use Apache::lonnet;
+use Apache::lonlocal;
+use lib '/home/httpd/lib/perl/';
+use LONCAPA;
+
BEGIN {
&Apache::lonxml::register('Apache::chemresponse',('organicresponse','organicstructure','reactionresponse','chem'));
@@ -63,7 +67,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=<<SMILESECTION;
@@ -80,11 +84,14 @@ JMESECTION
}
if ($molecule) { $molecule='<param name="jme" value="'.$molecule.'" />'; }
- my $body=<<CHEMPAGE;
-<html>
-<head>
-<title>Molecule Editor</title>
-<script language="JavaScript">
+ my $insert_answer;
+ if ($shown_text eq '') {
+ $insert_answer=
+ '<input type="button" name="submit" value="Insert Answer" onclick="javascript:submitSmiles();" />';
+ }
+
+ my $js = <<CHEMJS;
+<script type="text/javascript">
function submitSmiles() {
jmeFile = document.applets.JME.jmeFile();
if (jmeFile == "") {
@@ -98,36 +105,94 @@ function submitSmiles() {
function openHelpWindow() {
window.open("/adm/jme/jme_help.html","","scrollbars=yes,resizable=yes,width=500,height=600");
}
+function substituent(r) {document.applets.JME.setSubstituent(r);}
</script>
-</head>
-<body bgcolor="#ffffff">
+CHEMJS
+
+ my $start_page =
+ &Apache::loncommon::start_page('Molecule Editor',undef,
+ {'only_body' => 1,
+ 'js_ready' => 1,
+ 'bgcolor' => '#FFFFFF',});
+ my $end_page =
+ &Apache::loncommon::end_page({'js_ready' => 1,});
+
+ my $body=<<CHEMPAGE;
+$js
<center>
-<applet code="JME.class" name="JME" archive="/adm/jme/JME.jar" width="440" height="390">
+<form>
+ <table width="440"><tr>
+ <td></td>
+ <td align="right">
+ <select onchange="javascript:substituent(options[selectedIndex].text)">
+ <option>Select substituent</option>
+ <option>-C(=O)OH</option>
+ <option>-C(=O)OMe</option>
+ <option>-OC(=O)Me</option>
+ <option>-CMe3</option>
+ <option>-CF3</option>
+ <option>-CCl3</option>
+ <option>-NO2</option>
+ <option>-SO2-NH2</option>
+ <option>-NH-SO2-Me</option>
+ <option>-NMe2</option>
+ <option>-C#N</option>
+ <option>-C#C-Me</option>
+ <option>-C#CH</option>
+ </select>
+ </td></tr>
+ </table>
+<applet code="JME.class" name="JME" archive="/adm/jme/JME.jar" width="440" height="390" mayscript>
You have to enable Java and JavaScript on your machine.
$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>
-<form>
-<input type="button" name="submit" value="Insert Answer" onClick = "submitSmiles();" />
+<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>
+<br />
+$insert_answer
<br />
-<input type="button" value=" Close " onClick = "window.close()" />
+<input type="button" value=" Close " onclick = "javascript:window.close()" />
-<input type="button" value=" Help " onClick = "openHelpWindow()" />
+<input type="button" value=" Help " onclick = "javascript:openHelpWindow()" />
</form>
</center>
-</body>
-</html>
CHEMPAGE
- $body=&HTML::Entities::encode($body,'<>&"');
- $body=~s/\n/ /g;
+
+ $body=&Apache::loncommon::js_ready($body);
+ my $nothing=&Apache::lonhtmlcommon::javascript_nothing();
my $docopen=&Apache::lonhtmlcommon::javascript_docopen();
+ my $display=&mt('Draw Molecule');
+ if (defined($shown_text)) { $display=&mt($shown_text); }
+ my $function =
+ 'LONCAPA_draw_molecule_'.&Apache::lonhtmlcommon::get_uniq_name();
my $result=<<CHEMINPUT;
-<input type="button" value="Draw Molecule" onClick="javascript:editor=window.open('','','width=500,height=500,scrollbars=no,resizable=yes');editor.$docopen;editor.document.writeln('$body')" />
+<script type="text/javascript">
+ function $function() {
+ editor=window.open($nothing,'jmeedit','width=500,height=500,menubar=no,scrollbars=no,resizable=yes');
+ editor.$docopen;
+ editor.document.write('$start_page $body $end_page');
+ editor.document.close();
+ editor.focus();
+ }
+</script>
+<input type="button" value="$display" onclick="javascript:$function();void(0);" />
CHEMINPUT
return $result;
}
+sub jme_img {
+ my ($jme,$smile,$width,$options)=@_;
+ my $id=&Apache::loncommon::get_cgi_id();
+ my $result='<img alt="'.$smile.'" src="/cgi-bin/convertjme.pl?'.$id.'"';
+ if ($options =~ /border/) { $result.= ' border="1"'; }
+ $result.=' />';
+ &Apache::lonnet::appenv('cgi.'.$id.'.JME' =>
+ &escape($jme),
+ 'cgi.'.$id.'.PNG' => 1,
+ 'cgi.'.$id.'.WIDTH' => $width);
+ return $result;
+}
+
sub start_organicresponse {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
my $result;
@@ -136,21 +201,16 @@ sub start_organicresponse {
if ($target eq 'meta') {
$result=&Apache::response::meta_package_write('organicresponse');
} elsif ($target eq 'web') {
- if ( &Apache::response::show_answer() ) {
- my $jmeanswer=&Apache::lonxml::get_param('jmeanswer',$parstack,
- $safeeval);
+ my $jmeanswer=&Apache::lonxml::get_param('jmeanswer',$parstack,
+ $safeeval);
+ if ( &Apache::response::show_answer() && $jmeanswer ne '') {
my $options=&Apache::lonxml::get_param('options',$parstack,
$safeeval);
my $width=&Apache::lonxml::get_param('width',$parstack,
$safeeval);
- my $id=&Apache::loncommon::get_cgi_id();
- $result="<img src='/cgi-bin/convertjme.pl?$id'";
- if ($options =~ /border/) { $result.= ' border="1"'; }
- $result.=' />';
- &Apache::lonnet::appenv('cgi.'.$id.'.JME' =>
- &Apache::lonnet::escape($jmeanswer),
- 'cgi.'.$id.'.PNG' => 1,
- 'cgi.'.$id.'.WIDTH' => $width);
+ my (@answers)=&Apache::lonxml::get_param_var('answer',$parstack,
+ $safeeval);
+ $result.=&jme_img($jmeanswer,$answers[0],$width,$options);
} else {
my $molecule;
if (defined($Apache::lonhomework::history{"resource.$partid.$id.molecule"})) {
@@ -161,7 +221,12 @@ sub start_organicresponse {
}
my $options=&Apache::lonxml::get_param('options',$parstack,
$safeeval);
- $result=&separate_jme_window("HWVAL_$id","MOLECULE_$id",$molecule,$options);
+ my $shown_text;
+ if (&Apache::response::show_answer()) {
+ $shown_text="Show Your Last Answer";
+ }
+ $result=&separate_jme_window("HWVAL_$id","MOLECULE_$id",$molecule,
+ $options,$shown_text);
$result.= '<input type="hidden" name="MOLECULE_'.$id.'" value="" />';
}
} elsif ($target eq 'edit') {
@@ -180,7 +245,9 @@ sub start_organicresponse {
$result .='</nobr><br /><nobr>';
$result .=&Apache::edit::text_arg('Correct Answer:','answer',
$token,40);
- $result .=&Apache::edit::hidden_arg('jmeanswer',$token);
+ $result .='</nobr><br /><nobr>';
+ $result .=&Apache::edit::text_arg('JME string of the answer (automatically updated when using the Draw Molecule button):',
+ 'jmeanswer',$token);
my $jmeanswer=&Apache::lonxml::get_param('jmeanswer',$parstack,
$safeeval);
$result .=&separate_jme_window(
@@ -205,18 +272,30 @@ sub start_organicresponse {
'options','width');
if ($constructtag) { $result = &Apache::edit::rebuild_tag($token); }
}
+
return $result;
}
sub end_organicresponse {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
my $result;
- if ($target eq 'grade' && &Apache::response::submitted()) {
+
+ my $partid = $Apache::inputtags::part;
+ my $id = $Apache::inputtags::response['-1'];
+
+ if ($target eq 'grade'
+ && &Apache::response::submitted()
+ && $Apache::lonhomework::type eq 'exam') {
+
+ &Apache::response::scored_response($partid,$id);
+
+ } elsif ($target eq 'grade'
+ && &Apache::response::submitted()
+ && $Apache::lonhomework::type ne 'exam') {
+
&Apache::response::setup_params($$tagstack[-1],$safeeval);
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;
@@ -235,7 +314,7 @@ sub end_organicresponse {
}
&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"};
+ $Apache::lonhomework::results{"resource.$partid.$id.molecule"}=$env{"form.MOLECULE_$id"};
}
} elsif ($target eq "edit") {
$result.= &Apache::edit::tag_end($target,$token,'');
@@ -248,7 +327,29 @@ sub end_organicresponse {
}
$result.=&Apache::response::answer_footer('organicresponse');
}
- &Apache::response::end_response;
+ if ($target eq 'web') {
+ &Apache::response::setup_prior_tries_hash(\&format_prior_answer_organic,
+ ['molecule'])
+ }
+
+ if ($target eq 'grade' || $target eq 'web' || $target eq 'answer' ||
+ $target eq 'tex' || $target eq 'analyze') {
+ &Apache::lonxml::increment_counter(&Apache::response::repetition(),
+ "$partid.$id"); # part.response
+ if ($target eq 'analyze') {
+ $Apache::lonhomework::analyze{"$partid.$id.type"} = 'organicresponse';
+ &Apache::lonhomework::set_bubble_lines();
+ }
+ }
+ &Apache::response::end_response();
+ return $result;
+}
+
+sub format_prior_answer_organic {
+ my ($mode,$answer,$other_data) = @_;
+ my $result=&mt('Smile representation: "[_1]"','<tt>'.$answer.'</tt>');
+ my $jme=$other_data->[0];
+ $result.=&jme_img($jme,$answer,400);
return $result;
}
@@ -264,22 +365,26 @@ sub start_organicstructure {
if ($options =~ /border/) { $result.= ' border="1"'; }
$result.=' />';
&Apache::lonnet::appenv(
- 'cgi.'.$id.'.JME' => &Apache::lonnet::escape($molecule),
+ 'cgi.'.$id.'.JME' => &escape($molecule),
'cgi.'.$id.'.PNG' => 1,
'cgi.'.$id.'.WIDTH' => $width );
} elsif ($target eq 'tex') {
my $texwidth=&Apache::lonxml::get_param('texwidth',$parstack,$safeeval,undef,1);
+ my $webwidth=&Apache::lonxml::get_param('width', $parstack, $safeeval);
+ my $webheight=&Apache::lonxml::get_param('height', $parstack, $safeeval);
+ if (!$webheight) { $webheight = $webwidth; }
if (!$texwidth) { $texwidth='90'; }
+ $result = "%DYNAMICIMAGE:$webwidth:$webheight:$texwidth\n";
my $molecule=&Apache::lonxml::get_param('molecule',$parstack,$safeeval);
my $options=&Apache::lonxml::get_param('options',$parstack,$safeeval);
- my $filename = $ENV{'user.name'}.'_'.$ENV{'user.domain'}.
+ my $filename = $env{'user.name'}.'_'.$env{'user.domain'}.
'_'.time.'_'.$$.int(rand(1000)).'_organicstructure';
my $id=$filename;
&Apache::lonnet::appenv(
- 'cgi.'.$id.'.JME' => &Apache::lonnet::escape($molecule),
+ 'cgi.'.$id.'.JME' => &escape($molecule),
'cgi.'.$id.'.PS' => 1,
'cgi.'.$id.'.WIDTH' => $texwidth );
- $id=&Apache::lonnet::escape($id);
+ $id=&escape($id);
&Apache::lonxml::register_ssi("/cgi-bin/convertjme.pl?$id");
if ($options =~ /border/) { $result.= '\fbox{'; }
$result .= '\graphicspath{{/home/httpd/perl/tmp/}}\includegraphics[width='.$texwidth.' mm]{'.$filename.'.eps}';
@@ -328,19 +433,32 @@ sub end_organicstructure {
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 $id_es=&escape($id);
+ my $field_es=&escape($field);
+ my $reaction_es=&escape($reaction);
my $docopen=&Apache::lonhtmlcommon::javascript_docopen();
+ my $start_page =
+ &Apache::loncommon::start_page('LON-CAPA Reaction Editor',undef,
+ {'frameset' => 1,
+ 'js_ready' => 1,
+ 'add_entries' => {
+ 'rows' => "30%,*",
+ 'border' => "0",}},);
+ my $end_page =
+ &Apache::loncommon::end_page({'frameset' => 1,
+ 'js_ready' => 1});
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.$docopen;
- 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?inhibitmenu=yes" name="viewer" scrolling="no" /> <frame src="/res/adm/pages/reactionresponse/reaction_editor.html?inhibitmenu=yes&reaction=$reaction_es&id=$id_es&field=$field_es" name="editor" scrolling="no" /> </frameset> </html>');
+ editor.document.writeln('$start_page <frame src="/res/adm/pages/reactionresponse/reaction_viewer.html?inhibitmenu=yes" name="viewer" scrolling="no" /> <frame src="/res/adm/pages/reactionresponse/reaction_editor.html?inhibitmenu=yes&reaction=$reaction_es&id=$id_es&field=$field_es" name="editor" scrolling="no" /> $end_page');
+ editor.document.close();
}
+// -->
</script>
-<input type='button' value='Edit Answer' onClick="javascript:create_reaction_window_${id}_${field}();void(0);" />
+<input type='button' value='Edit Answer' onclick="javascript:create_reaction_window_${id}_${field}();void(0);" />
EDITREACTION
return $result;
}
@@ -362,8 +480,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);
@@ -390,12 +511,23 @@ sub start_reactionresponse {
sub end_reactionresponse {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
my $result;
- if ($target eq 'grade' && &Apache::response::submitted()) {
+
+ my $partid = $Apache::inputtags::part;
+ my $id = $Apache::inputtags::response['-1'];
+
+ if ($target eq 'grade'
+ && &Apache::response::submitted()
+ && $Apache::lonhomework::type eq 'exam') {
+
+ &Apache::response::scored_response($partid,$id);
+
+ } elsif ($target eq 'grade'
+ && &Apache::response::submitted()
+ && $Apache::lonhomework::type ne 'exam') {
+
&Apache::response::setup_params($$tagstack[-1],$safeeval);
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;
@@ -427,15 +559,39 @@ sub end_reactionresponse {
}
$result.=&Apache::response::answer_footer('reactionresponse');
}
- &Apache::response::end_response;
+ if ($target eq 'web') {
+ &Apache::response::setup_prior_tries_hash(\&format_prior_response_reaction);
+ }
+
+ if ($target eq 'grade' || $target eq 'web' || $target eq 'answer' ||
+ $target eq 'tex' || $target eq 'analyze') {
+ &Apache::lonxml::increment_counter(&Apache::response::repetition(), "$partid.$id");
+ if ($target eq 'analyze') {
+ $Apache::lonhomework::analyze{"$partid.$id.type"} = 'reactionresponse';
+ &Apache::lonhomework::set_bubble_lines();
+ }
+ }
+ &Apache::response::end_response();
return $result;
}
+sub format_prior_response_reaction {
+ my ($mode,$answer) =@_;
+ return '<span class="LC_prior_reaction">'.
+ &HTML::Entities::encode($answer,'"<>&').'</span>';
+}
+
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') {
- &Apache::lonxml::startredirection();
+ $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;
}
@@ -443,14 +599,6 @@ sub start_chem {
sub end_chem {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style) = @_;
my $result = '';
- if ($target eq 'tex' || $target eq 'web') {
- @Apache::scripttag::parser_env = @_;
- if (!$Apache::lonxml::default_homework_loaded) {
- &Apache::lonxml::default_homework_load($safeeval);
- }
- my $innards=&Apache::lonxml::endredirection();
- $result=&Apache::run::run("return &chemparse(q\0$innards\0);",$safeeval);
- }
return $result;
}