--- loncom/homework/chemresponse.pm 2008/03/12 02:46:52 1.78
+++ loncom/homework/chemresponse.pm 2025/01/27 18:43:23 1.103
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# chemical equation style response
#
-# $Id: chemresponse.pm,v 1.78 2008/03/12 02:46:52 raeburn Exp $
+# $Id: chemresponse.pm,v 1.103 2025/01/27 18:43:23 raeburn Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -68,29 +68,170 @@ sub chem_standard_order {
sub separate_jme_window {
my ($smile_input,$jme_input,$molecule,$options,$shown_text)=@_;
+ my $usejsme = 1;
+ if (($env{'request.course.id'}) && ($env{'request.state'} ne 'construct')) {
+ if (exists($env{'course.'.$env{'request.course.id'}.'.usejsme'})) {
+ if ($env{'course.'.$env{'request.course.id'}.'.usejsme'} eq '0') {
+ $usejsme = 0;
+ }
+ } else {
+ my %domdefs = &Apache::lonnet::get_domain_defaults($env{'course.'.$env{'request.course.id'}.'.domain'});
+ if ($domdefs{'usejsme'} eq '0') {
+ $usejsme = 0;
+ }
+ }
+ } else {
+ my %domdefs = &Apache::lonnet::get_domain_defaults($env{'course.'.$env{'request.course.id'}.'.domain'});
+ if ($domdefs{'usejsme'} eq '0') {
+ $usejsme = 0;
+ }
+ }
+ if ($usejsme) {
+ if ($env{'browser.type'} eq 'safari') {
+ unless ($env{'browser.mobile'}) {
+ if ($env{'browser.version'} < 534) {
+ $usejsme = 0;
+ }
+ }
+ } elsif ($env{'browser.type'} eq 'mozilla') {
+ if ($env{'browser.version'} < 5) {
+ $usejsme = 0;
+ } elsif ($env{'browser.info'} =~ /^firefox\-([\d\.]+)/) {
+ my $firefox = $1;
+ if ($firefox < 12) {
+ $usejsme = 0;
+ }
+ }
+ } elsif ($env{'browser.type'} eq 'explorer') {
+ if ($env{'browser.version'} < 7) {
+ $usejsme = 0;
+ }
+ } elsif ($env{'browser.type'} eq 'opera') {
+ if ($env{'browser.version'} < 15) {
+ $usejsme = 0;
+ }
+ }
+ } else {
+ if ($env{'browser.mobile'}) {
+ $usejsme = 1;
+ }
+ }
+ my $linkstyle = 'display:none';
+ my $creditstyle = 'display:inline';
+ if ($env{'browser.type'} eq 'explorer') {
+ if (($env{'browser.os'} eq 'win') && ($env{'browser.version'} < 9)) {
+ $linkstyle = 'display:inline';
+ $creditstyle = 'display:none';
+ }
+ }
my $smilesection;
if (defined($smile_input)) {
+ my $smiles;
+ if ($usejsme) {
+ $smiles = 'document.JME.smiles()';
+ } else {
+ $smiles = 'document.applets.JME.smiles()';
+ }
$smilesection=<<SMILESECTION;
- smiles = document.applets.JME.smiles();
- opener.document.lonhomework.$smile_input.value = smiles;
+ opener.document.lonhomework.$smile_input.value = $smiles;
SMILESECTION
}
my $jmesection;
+ my $jmefile;
if (defined($jme_input)) {
+ if ($usejsme) {
+ $jmefile = 'document.JME.jmeFile()';
+ } else {
+ $jmefile = 'document.applets.JME.jmeFile()';
+ }
$jmesection=<<JMESECTION;
- jmeFile = document.applets.JME.jmeFile();
- opener.document.lonhomework.$jme_input.value = jmeFile;
+ opener.document.lonhomework.$jme_input.value = $jmefile;
JMESECTION
}
- if ($molecule) { $molecule='<param name="jme" value="'.$molecule.'" />'; }
+ if ($molecule) {
+ if ($usejsme) {
+ $molecule = 'document.JME.readMolecule("'.$molecule.'")';
+ } else {
+ $molecule='<param name="jme" value="'.$molecule.'" />';
+ }
+ }
my $insert_answer;
if ($shown_text eq '') {
$insert_answer=
- '<input type="button" name="submit" value="Insert Answer" onclick="javascript:submitSmiles();" />';
+ '<input type="button" name="submit" value="'.&mt('Insert Answer').'" onclick="javascript:submitSmiles();" /><br />';
+ }
+
+
+
+ my ($jsme_js,$js,$buttonstyle,$viewportjs,$resizejs);
+ if ($usejsme) {
+ $buttonstyle = 'display:none';
+ $resizejs =<<RESIZEJS;
+<script type="text/javascript">
+function callResize() {
+ var timer;
+ clearTimeout(timer);
+ timer=setTimeout('resize_jsme()',100);
+}
+
+window.onresize = callResize;
+
+function resize_jsme() {
+ init_geometry();
+ var vph = Geometry.getViewportHeight();
+ var vpw = Geometry.getViewportWidth();
+ var lowerdivheight = document.getElementById('JMEbuttons').offsetHeight;
+ var formheight = document.getElementById('JMEform').offsetHeight;
+ var freevspace = vph-(lowerdivheight+50);
+ var freehspace = vpw-20;
+ if (typeof jsmeApplet !== 'undefined') {
+ jsmeApplet.setSize(freehspace,freevspace);
+ }
+}
+</script>
+RESIZEJS
+ $resizejs = &Apache::loncommon::js_ready($resizejs);
+ $jsme_js = '
+<script type="text/javascript" language="javascript" src="/adm/jsme/jsme.nocache.js"></script>'."\n";
+ $js =<<CHEMJS;
+<script type="text/javascript">
+function jsmeOnLoad() {
+ document.getElementById('JMErefresh').style.display="none";
+ document.getElementById('JMEcredits').style.display="inline";
+ jsmeApplet = new JSApplet.JSME("jme", "420px", "330px", {"options" : "$options"});
+ document.JME = jsmeApplet;
+ $molecule;
+ document.getElementById('JMEbuttons').style.display="block";
+ callResize();
+}
+
+function submitSmiles() {
+ jmeFile = document.JME.jmeFile();
+ if (jmeFile == "") {
+ alert("Nothing to submit");
+ } else {
+ $jmesection
+ $smilesection
+ window.close();
}
+}
+function openHelpWindow() {
+ window.open("https://jsme-editor.github.io/help.html","","scrollbars=yes,resizable=yes,width=500,height=600");
+}
- my $js = <<CHEMJS;
+</script>
+
+CHEMJS
+
+ $viewportjs = &Apache::loncommon::viewport_geometry_js();
+ $viewportjs = '<script type="text/javascript">'."\n".
+ $viewportjs."\n".
+ '</script>';
+
+ } else {
+ $buttonstyle = 'display:block';
+ $js =<<CHEMJS;
<script type="text/javascript">
function submitSmiles() {
jmeFile = document.applets.JME.jmeFile();
@@ -108,24 +249,41 @@ function openHelpWindow() {
function substituent(r) {document.applets.JME.setSubstituent(r);}
</script>
CHEMJS
+ }
my $start_page =
- &Apache::loncommon::start_page('Molecule Editor',undef,
+ &Apache::loncommon::start_page('Molecule Editor',$viewportjs,
{'only_body' => 1,
'js_ready' => 1,
'bgcolor' => '#FFFFFF',});
my $end_page =
&Apache::loncommon::end_page({'js_ready' => 1,});
-
- my $body=<<CHEMPAGE;
-$js
+ my $java_not_enabled=&Apache::lonhtmlcommon::java_not_enabled();
+ my %lt = &Apache::lonlocal::texthash(
+ 'seltext' => 'Select substituent...',
+ 'close' => 'Close',
+ 'help' => 'Help',
+ );
+ my $body = "
+$jsme_js
+$js".'
<center>
-<form>
+<form action="" id="JMEform">
+';
+ if ($usejsme) {
+ $body.= <<"ENDCHEM";
+<div id="jme">
+<div id="JMEcredits" style="$creditstyle">
+<span style="font-size:small; font-family:arial,sans-serif;"><a href="http://peter-ertl.com/jsme/">JSME Molecular Editor</a> courtesy of Peter Ertl (Novartis) and Bruno Bienfait</span></div>
+</div>
+ENDCHEM
+ } else {
+ $body.=<<CHEMPAGE;
<table width="440"><tr>
<td></td>
<td align="right">
<select onchange="javascript:substituent(options[selectedIndex].text)">
- <option>Select substituent</option>
+ <option>$lt{'seltext'}</option>
<option>-C(=O)OH</option>
<option>-C(=O)OMe</option>
<option>-OC(=O)Me</option>
@@ -143,17 +301,24 @@ $js
</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.
+$java_not_enabled
$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>
+</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>
+CHEMPAGE
+ }
+ $body .= <<CHEMPAGE;
+<div id="JMEbuttons" style="$buttonstyle">
$insert_answer
-<br />
-<input type="button" value=" Close " onclick = "javascript:window.close()" />
+<input type="button" value="$lt{'close'}" onclick="javascript:window.close()" />
-<input type="button" value=" Help " onclick = "javascript:openHelpWindow()" />
+<input type="button" value="$lt{'help'}" onclick="javascript:openHelpWindow()" />
+</div>
+<div id="JMErefresh" style="$linkstyle">
+<a href="javascript:location.reload();">Display Molecule Editor</a>
+</div>
</form>
</center>
CHEMPAGE
@@ -163,23 +328,32 @@ CHEMPAGE
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 $iconpath=$Apache::lonnet::perlvar{'lonIconsURL'};
+ my $function =
+ 'LONCAPA_draw_molecule_'.&get_uniq_name();
my $result=<<CHEMINPUT;
<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();
+ if (editor) {
+ editor.$docopen;
+ editor.document.write('$start_page $body $resizejs $end_page');
+ editor.document.close();
+ editor.focus();
+ }
}
</script>
-<input type="button" value="$display" onclick="javascript:$function();void(0);" />
CHEMINPUT
+ my $jscall = "javascript:$function();void(0);";
+ if ($shown_text eq '') {
+ $result .=<<PENCIL;
+<a href="$jscall"><img class="stift" src="$iconpath/stift.gif" alt="$display" title="$display" /></a>
+PENCIL
+ } else {
+ $result .= '<input type="button" value="'.&mt($shown_text).'" onclick="$jscall" />';
+ }
return $result;
}
-
sub jme_img {
my ($jme,$smile,$width,$options)=@_;
my $id=&Apache::loncommon::get_cgi_id();
@@ -203,30 +377,19 @@ sub start_organicresponse {
} elsif ($target eq 'web') {
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 (@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"})) {
- $molecule=$Apache::lonhomework::history{"resource.$partid.$id.molecule"};
- } else {
- $molecule=&Apache::lonxml::get_param('molecule',$parstack,
+ if (&Apache::response::show_answer()) {
+ my $jmeanswer=&Apache::lonxml::get_param('jmeanswer',$parstack,
+ $safeeval);
+ if ($jmeanswer ne '') {
+ my $options=&Apache::lonxml::get_param('options',$parstack,
+ $safeeval);
+ my $width=&Apache::lonxml::get_param('width',$parstack,
$safeeval);
- }
- my $options=&Apache::lonxml::get_param('options',$parstack,
- $safeeval);
- 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);
+ my (@answers)=&Apache::lonxml::get_param_var('answer',$parstack,
+ $safeeval);
+ $result.=&jme_img($jmeanswer,$answers[0],$width,$options);
+ }
+ } else {
$result.= '<input type="hidden" name="MOLECULE_'.$id.'" value="" />';
}
} elsif ($target eq 'edit') {
@@ -234,7 +397,7 @@ sub start_organicresponse {
my $options=&Apache::lonxml::get_param('options',$parstack,
$safeeval);
if ($options !~ /multipart/) { $options.=',multipart'; }
- $result .='<nobr>'.
+ $result .='<span class="LC_nobreak">'.
&Apache::edit::text_arg('Starting Molecule:','molecule',
$token,40);
my $molecule=&Apache::lonxml::get_param('molecule',$parstack,
@@ -242,11 +405,11 @@ sub start_organicresponse {
$result .=&separate_jme_window(undef,
&Apache::edit::html_element_name('molecule'),
$molecule,$options);
- $result .='</nobr><br /><nobr>';
+ $result .='</span><br /><span class="LC_nobreak">';
$result .=&Apache::edit::text_arg('Correct Answer:','answer',
$token,40);
- $result .='</nobr><br /><nobr>';
- $result .=&Apache::edit::text_arg('JME string of the answer (automatically updated when using the Draw Molecule button):',
+ $result .='</span><br /><span class="LC_nobreak">';
+ $result .=&Apache::edit::text_arg('JME string of the answer - automatically updated by "Insert Answer" in the JME pop-up (click pencil):',
'jmeanswer',$token);
my $jmeanswer=&Apache::lonxml::get_param('jmeanswer',$parstack,
$safeeval);
@@ -254,7 +417,7 @@ sub start_organicresponse {
&Apache::edit::html_element_name('answer'),
&Apache::edit::html_element_name('jmeanswer'),
$jmeanswer,$options);
- $result .='</nobr><br />';
+ $result .='</span><br />';
$result .=&Apache::edit::checked_arg('Options:','options',
[ ['autoez','Auto E,Z stereochemistry'],
['multipart','Multipart Structures'],
@@ -309,9 +472,17 @@ sub end_organicresponse {
$ad='INCORRECT';
}
}
- if ($ad && $Apache::lonhomework::type eq 'survey') {
- $ad='SUBMITTED';
- }
+ if ($ad) {
+ if ($Apache::lonhomework::type eq 'survey') {
+ $ad='SUBMITTED';
+ } elsif ($Apache::lonhomework::type eq 'surveycred') {
+ $ad='SUBMITTED_CREDIT';
+ } elsif ($Apache::lonhomework::type eq 'anonsurvey') {
+ $ad='ANONYMOUS';
+ } elsif ($Apache::lonhomework::type eq 'anonsurveycred') {
+ $ad='ANONYMOUS_CREDIT';
+ }
+ }
&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"};
@@ -334,20 +505,47 @@ sub end_organicresponse {
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
+ my $repetition = &Apache::response::repetition();
+ &Apache::lonxml::increment_counter($repetition,"$partid.$id"); # part.response
if ($target eq 'analyze') {
$Apache::lonhomework::analyze{"$partid.$id.type"} = 'organicresponse';
+ push (@{ $Apache::lonhomework::analyze{"parts"} },"$partid.$id");
&Apache::lonhomework::set_bubble_lines();
}
}
+ if ($target eq 'web' ) {
+ my ($showpencil,$shown_text);
+ if ($Apache::inputtags::status['-1'] eq 'CAN_ANSWER') {
+ $showpencil = 1;
+ } elsif (&Apache::response::show_answer()) {
+ my $jmeanswer=&Apache::lonxml::get_param('jmeanswer',$parstack, $safeeval);
+ if ($jmeanswer eq '') {
+ $showpencil = 1;
+ $shown_text="Show Your Last Answer";
+ }
+ }
+ if ($showpencil) {
+ my $options=&Apache::lonxml::get_param('options',$parstack,
+ $safeeval);
+
+ my $molecule;
+ if (defined($Apache::lonhomework::history{"resource.$partid.$id.molecule"})) {
+ $molecule=$Apache::lonhomework::history{"resource.$partid.$id.molecule"};
+ } else {
+ $molecule=&Apache::lonxml::get_param('molecule',$parstack,
+ $safeeval);
+ }
+ $result.=&separate_jme_window("HWVAL_$id","MOLECULE_$id",$molecule,
+ $options,$shown_text);
+ }
+ }
&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 $result=&mt('Smile representation: [_1]','"<tt>'.$answer.'</tt>"');
my $jme=$other_data->[0];
$result.=&jme_img($jme,$answer,400);
return $result;
@@ -360,10 +558,15 @@ sub start_organicstructure {
my $width=&Apache::lonxml::get_param('width',$parstack,$safeeval);
my $molecule=&Apache::lonxml::get_param('molecule',$parstack,$safeeval);
my $options=&Apache::lonxml::get_param('options',$parstack,$safeeval);
+ my $alttext=&Apache::lonxml::get_param('alt',$parstack,$safeeval);
+ if ($alttext eq '') {
+ $alttext = &mt('Organic structure');
+ }
+ $alttext = &HTML::Entities::encode($alttext,'<>&"');
my $id=&Apache::loncommon::get_cgi_id();
$result="<img src='/cgi-bin/convertjme.pl?$id'";
if ($options =~ /border/) { $result.= ' border="1"'; }
- $result.=' />';
+ $result.=' alt="'.$alttext.'" />';
&Apache::lonnet::appenv(
{'cgi.'.$id.'.JME' => &escape($molecule),
'cgi.'.$id.'.PNG' => 1,
@@ -387,13 +590,14 @@ sub start_organicstructure {
$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}';
+ $result .= '\graphicspath{{'.LONCAPA::tempdir().
+ '}}\includegraphics[width='.$texwidth.' mm]{'.$filename.'.eps}';
if ($options =~ /border/) { $result.= '} '; }
} elsif ($target eq 'edit') {
$result .=&Apache::edit::tag_start($target,$token);
$result .=&Apache::edit::text_arg('Width (pixels):','width',$token,5);
$result .=&Apache::edit::text_arg('TeXwidth (mm):','texwidth',$token,5);
- $result .='<nobr>';
+ $result .='<span class="LC_nobreak">';
$result .=&Apache::edit::text_arg('Molecule:','molecule',$token,40);
my $molecule=&Apache::lonxml::get_param('molecule',$parstack,
$safeeval);
@@ -406,17 +610,19 @@ sub start_organicstructure {
$result .=&separate_jme_window(undef,
&Apache::edit::html_element_name('molecule'),
$molecule,$options);
- $result.="</nobr><br />";
+ $result.="</span><br />";
$result .=&Apache::edit::checked_arg('Options:','options',
[ ['reaction','Is a reaction'],
['border','Draw a border'] ],
$token);
+ $result .= '<br />'.&Apache::edit::text_arg('Alt text in JME img tag:','alt',$token,30).
+ ' ('.&mt('student-viewable in HTML source').')';
$result .=&Apache::edit::end_row();
} elsif ($target eq 'modified') {
my $constructtag=&Apache::edit::get_new_args($token,$parstack,
$safeeval,'molecule',
'width','texwidth',
- 'options');
+ 'options','alt');
if ($constructtag) { $result = &Apache::edit::rebuild_tag($token); }
}
return $result;
@@ -437,32 +643,63 @@ sub edit_reaction_button {
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 $iconpath=$Apache::lonnet::perlvar{'lonIconsURL'};
+ my $display=&mt('Edit Answer');
+ 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('$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();
+ editor=window.open('','','width=500,height=270,scrollbars=no,resizable=yes');
+ editor.$docopen;
+ editor.document.writeln('$start_page <frame src="/adm/reactionresponse/reaction_viewer.html?inhibitmenu=yes" name="viewer" scrolling="no" /> <frame src="/adm/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);" />
+<a href="javascript:create_reaction_window_${id}_${field}();void(0);"><img class="stift" src='$iconpath/stift.gif' alt='$display' title='$display' /></a>
EDITREACTION
return $result;
}
+sub reaction_preview {
+ my ($field, $reaction) = @_;
+
+ # NOTE: $reaction should be encoded if the document was sent as XHTML
+ $reaction =~ s/"//g;
+ my $result=<<JS_PREVIEW;
+<input type="button" value="Help" onclick = "window.open('/adm/reactionresponse/reaction_help.html','','scrollbars=yes,resizable=yes,width=550,height=600')" />
+<script type="text/javascript">
+ if (typeof reaction_preview_started === 'undefined') {
+ var script = document.createElement('script');
+ script.type = 'text/javascript';
+ script.src = '/adm/reactionresponse/reaction_preview.js';
+ document.body.appendChild(script);
+ reaction_preview_started = true;
+ }
+ window.addEventListener('load', function(e) {
+ var input = document.forms.lonhomework.$field;
+ input.readonly = '';
+ input.value = "$reaction";
+ if (!input.id)
+ input.id = "$field";
+ var preview = new LC.HW.ReactionPreview(input.id);
+ preview.start_preview();
+ }, false);
+</script>
+JS_PREVIEW
+ return $result;
+}
+
sub start_reactionresponse {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
my $result;
@@ -472,12 +709,6 @@ sub start_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"};
- if ($reaction eq '') { $reaction=&Apache::lonxml::get_param('initial',$parstack,$safeeval); }
- my $status=$Apache::inputtags::status['-1'];
- if ($status eq 'CAN_ANSWER') {
- $result.=&edit_reaction_button($id,"HWVAL_$id",$reaction);
- }
if ( &Apache::response::show_answer() ) {
my $ans=&Apache::lonxml::get_param('answer',$parstack,$safeeval);
if (!$Apache::lonxml::default_homework_loaded) {
@@ -490,14 +721,22 @@ sub start_reactionresponse {
$result .=&Apache::edit::tag_start($target,$token);
my $answer=&Apache::lonxml::get_param('answer',$parstack,
$safeeval);
- $result .='<nobr>'.
+ $result .='<span class="LC_nobreak">'.
&Apache::edit::text_arg('Answer:','answer',$token,40);
- $result .=&edit_reaction_button($id,&Apache::edit::html_element_name('answer'),$answer).'</nobr>';
+ my $inline_chem = &use_inline_chem();
+ if ($inline_chem) {
+ $result .= &reaction_preview(&Apache::edit::html_element_name('answer'), $answer).'</span>';
+ } else {
+ $result .=&edit_reaction_button($id,&Apache::edit::html_element_name('answer'),$answer).'</span>';
+ }
my $initial=&Apache::lonxml::get_param('initial',$parstack,$safeeval);
- $result.='<nobr>'.
+ $result.='<span class="LC_nobreak">'.
&Apache::edit::text_arg('Initial Reaction:','initial',$token,40);
- $result .=&edit_reaction_button($id,&Apache::edit::html_element_name('initial'),$initial).'</nobr>';
-
+ if ($inline_chem) {
+ $result .= &reaction_preview(&Apache::edit::html_element_name('initial'), $initial).'</span>';
+ } else {
+ $result .=&edit_reaction_button($id,&Apache::edit::html_element_name('initial'),$initial).'</span>';
+ }
$result .=&Apache::edit::end_row().&Apache::edit::start_spanning_row();
} elsif ($target eq 'modified') {
my $constructtag=&Apache::edit::get_new_args($token,$parstack,
@@ -541,9 +780,17 @@ sub end_reactionresponse {
$ad='INCORRECT';
}
}
- if ($ad && $Apache::lonhomework::type eq 'survey') {
- $ad='SUBMITTED';
- }
+ if ($ad) {
+ if ($Apache::lonhomework::type eq 'survey') {
+ $ad='SUBMITTED';
+ } elsif ($ad && $Apache::lonhomework::type eq 'surveycred') {
+ $ad='SUBMITTED_CREDIT';
+ } elsif ($ad && $Apache::lonhomework::type eq 'anonsurvey') {
+ $ad='ANONYMOUS';
+ } elsif ($ad && $Apache::lonhomework::type eq 'anonsurveycred') {
+ $ad='ANONYMOUS_CREDIT';
+ }
+ }
&Apache::response::handle_previous(\%previous,$ad);
$Apache::lonhomework::results{"resource.$partid.$id.awarddetail"}=$ad;
}
@@ -565,16 +812,50 @@ sub end_reactionresponse {
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");
+ my $repetition = &Apache::response::repetition();
+ &Apache::lonxml::increment_counter($repetition,"$partid.$id");
if ($target eq 'analyze') {
$Apache::lonhomework::analyze{"$partid.$id.type"} = 'reactionresponse';
+ push (@{ $Apache::lonhomework::analyze{"parts"} },"$partid.$id");
&Apache::lonhomework::set_bubble_lines();
}
}
+ my $status=$Apache::inputtags::status['-1'];
+ if (($target eq 'web') && ($Apache::lonhomework::type ne 'exam') && ($status eq 'CAN_ANSWER')) {
+ my $reaction=$Apache::lonhomework::history{"resource.$partid.$id.submission"};
+ if ($reaction eq '') { $reaction=&Apache::lonxml::get_param('initial',$parstack,$safeeval); }
+ if (&use_inline_chem()) {
+ $result .= &reaction_preview("HWVAL_$id", $reaction);
+ } else {
+ $result.=&edit_reaction_button($id,"HWVAL_$id",$reaction);
+ }
+ }
&Apache::response::end_response();
return $result;
}
+sub use_inline_chem {
+ my $inline_chem = 1;
+ if (($env{'request.course.id'}) && ($env{'request.state'} ne 'construct')) {
+ if (exists($env{'course.'.$env{'request.course.id'}.'.inline_chem'})) {
+ if ($env{'course.'.$env{'request.course.id'}.'.inline_chem'} eq '0') {
+ $inline_chem = 0;
+ }
+ } else {
+ my %domdefs = &Apache::lonnet::get_domain_defaults($env{'course.'.$env{'request.course.id'}.'.domain'});
+ if ($domdefs{'inline_chem'} eq '0') {
+ $inline_chem = 0;
+ }
+ }
+ } else {
+ my %domdefs = &Apache::lonnet::get_domain_defaults($env{'course.'.$env{'request.course.id'}.'.domain'});
+ if ($domdefs{'inline_chem'} eq '0') {
+ $inline_chem = 0;
+ }
+ }
+ return $inline_chem;
+}
+
sub format_prior_response_reaction {
my ($mode,$answer) =@_;
return '<span class="LC_prior_reaction">'.
@@ -602,5 +883,11 @@ sub end_chem {
return $result;
}
+my $uniq=0;
+sub get_uniq_name {
+ $uniq++;
+ return 'uniquename'.$uniq;
+}
+
1;
__END__