--- loncom/homework/chemresponse.pm 2006/07/27 20:34:40 1.69
+++ loncom/homework/chemresponse.pm 2013/05/03 16:29:40 1.92
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# chemical equation style response
#
-# $Id: chemresponse.pm,v 1.69 2006/07/27 20:34:40 albertel Exp $
+# $Id: chemresponse.pm,v 1.92 2013/05/03 16:29:40 bisitz Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -116,11 +116,11 @@ CHEMJS
'bgcolor' => '#FFFFFF',});
my $end_page =
&Apache::loncommon::end_page({'js_ready' => 1,});
-
+ my $java_not_enabled=&Apache::lonhtmlcommon::java_not_enabled();
my $body=<<CHEMPAGE;
$js
<center>
-<form>
+<form action="">
<table width="440"><tr>
<td></td>
<td align="right">
@@ -143,7 +143,7 @@ $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 />
@@ -163,8 +163,9 @@ CHEMPAGE
my $docopen=&Apache::lonhtmlcommon::javascript_docopen();
my $display=&mt('Draw Molecule');
if (defined($shown_text)) { $display=&mt($shown_text); }
+ my $iconpath=$Apache::lonnet::perlvar{'lonIconsURL'};
my $function =
- 'LONCAPA_draw_molecule_'.&Apache::lonhtmlcommon::get_uniq_name();
+ 'LONCAPA_draw_molecule_'.&get_uniq_name();
my $result=<<CHEMINPUT;
<script type="text/javascript">
function $function() {
@@ -175,21 +176,26 @@ CHEMPAGE
editor.focus();
}
</script>
-<input type="button" value="$display" onclick="javascript:$function();void(0);" />
CHEMINPUT
+ if ($shown_text eq '') {
+ $result .=<<PENCIL;
+<a href="javascript:$function();void(0);"><img class="stift" src='$iconpath/stift.gif' alt='$display' title='$display' /></a>
+PENCIL
+ } else {
+ $result .= '<input type="button" value="'.&mt($shown_text).'" onclick="javascript:'.$function.'();void(0);" />';
+ }
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);
+ &Apache::lonnet::appenv({'cgi.'.$id.'.JME' =>
+ &escape($jme),
+ 'cgi.'.$id.'.PNG' => 1,
+ 'cgi.'.$id.'.WIDTH' => $width});
return $result;
}
@@ -203,30 +209,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 +229,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,10 +237,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 .=&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);
@@ -253,7 +249,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'],
@@ -308,9 +304,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"};
@@ -326,15 +330,59 @@ sub end_organicresponse {
}
$result.=&Apache::response::answer_footer('organicresponse');
}
+ 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());
+ 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 $jme=$other_data->[0];
+ $result.=&jme_img($jme,$answer,400);
+ return $result;
+}
+
sub start_organicstructure {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
my $result;
@@ -347,9 +395,9 @@ sub start_organicstructure {
if ($options =~ /border/) { $result.= ' border="1"'; }
$result.=' />';
&Apache::lonnet::appenv(
- 'cgi.'.$id.'.JME' => &escape($molecule),
- 'cgi.'.$id.'.PNG' => 1,
- 'cgi.'.$id.'.WIDTH' => $width );
+ {'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);
@@ -363,19 +411,20 @@ sub start_organicstructure {
'_'.time.'_'.$$.int(rand(1000)).'_organicstructure';
my $id=$filename;
&Apache::lonnet::appenv(
- 'cgi.'.$id.'.JME' => &escape($molecule),
- 'cgi.'.$id.'.PS' => 1,
- 'cgi.'.$id.'.WIDTH' => $texwidth );
+ {'cgi.'.$id.'.JME' => &escape($molecule),
+ 'cgi.'.$id.'.PS' => 1,
+ 'cgi.'.$id.'.WIDTH' => $texwidth});
$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);
@@ -388,7 +437,7 @@ 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'] ],
@@ -419,6 +468,8 @@ sub edit_reaction_button {
my $field_es=&escape($field);
my $reaction_es=&escape($reaction);
my $docopen=&Apache::lonhtmlcommon::javascript_docopen();
+ 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,
@@ -440,7 +491,7 @@ sub edit_reaction_button {
}
// -->
</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;
}
@@ -454,32 +505,25 @@ 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) {
&Apache::lonxml::default_homework_load($safeeval);
}
@Apache::scripttag::parser_env = @_;
- $Apache::inputtags::answertxt{$id}=&Apache::run::run("return &chemparse(q\0$ans\0);",$safeeval);
+ $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);
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>';
+ $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>';
-
+ $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,
@@ -523,9 +567,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;
}
@@ -541,15 +593,36 @@ sub end_reactionresponse {
}
$result.=&Apache::response::answer_footer('reactionresponse');
}
+ 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());
+ 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); }
+ $result.=&edit_reaction_button($id,"HWVAL_$id",$reaction);
}
&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 = '';
@@ -571,5 +644,11 @@ sub end_chem {
return $result;
}
+my $uniq=0;
+sub get_uniq_name {
+ $uniq++;
+ return 'uniquename'.$uniq;
+}
+
1;
__END__