--- loncom/homework/chemresponse.pm 2003/06/30 20:41:12 1.7 +++ loncom/homework/chemresponse.pm 2003/07/01 21:04:48 1.10 @@ -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.10 2003/07/01 21:04:48 albertel Exp $ # # Copyright Michigan State University Board of Trustees # @@ -227,194 +227,21 @@ sub end_organicstructure { return $result; } -sub reaction_javascript { - my $rightarrow; - if ($ENV{'browser.unicode'}) { - $rightarrow=" → " - } else { - $rightarrow=" ® "; +sub edit_reaction_button { + my ($id,$field,$molecule)=@_; + my $id_es=&Apache::lonnet::escape($id); + my $field_es=&Apache::lonnet::escape($field); + my $molecule_es=&Apache::lonnet::escape($molecule); + my $result=< + 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(' LON-CAPA Reaction Editor '); } - my $result=< - -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(); - } - 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(); - } -} -REACTIONJAVASCRIPT + +EDITREACTION return $result; } @@ -422,15 +249,22 @@ 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 - -# $result.=&reaction_javascript(); -# $result.=''; -# $result.='' + if ($target eq 'meta') { + } elsif ($target eq 'web') { + $result.=&edit_reaction_button($id,"HWVAL_$id"); } elsif ($target eq "edit") { + $result .=&Apache::edit::tag_start($target,$token); + my $answer=&Apache::lonxml::get_param('answer',$parstack, + $safeeval); + $result .=''. + &Apache::edit::text_arg('Answer:','answer',$token,40); + $result .=&edit_reaction_button($id,&Apache::edit::html_element_name('answer'),$answer).''; + + $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 +272,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
\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;