--- loncom/homework/chemresponse.pm 2003/06/30 20:58:52 1.8
+++ loncom/homework/chemresponse.pm 2003/07/01 21:10:43 1.11
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# chemical equation style response
#
-# $Id: chemresponse.pm,v 1.8 2003/06/30 20:58:52 albertel Exp $
+# $Id: chemresponse.pm,v 1.11 2003/07/01 21:10:43 albertel Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -227,19 +227,47 @@ sub end_organicstructure {
return $result;
}
+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>');
+ }
+</script>
+<input type='button' value='Edit Reaction' onClick="javascript:create_reaction_window_${id}_${field}();void(0);" />
+EDITREACTION
+ return $result;
+}
+
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;
}
@@ -247,7 +275,26 @@ 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 $answer=&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;
+ &Apache::lonxml::debug("submitted a $response for $answer<br \>\n");
+ my $ad;
+ 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;