--- loncom/homework/chemresponse.pm 2008/09/21 20:28:27 1.82 +++ loncom/homework/chemresponse.pm 2017/01/04 20:09:08 1.99 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # chemical equation style response # -# $Id: chemresponse.pm,v 1.82 2008/09/21 20:28:27 raeburn Exp $ +# $Id: chemresponse.pm,v 1.99 2017/01/04 20:09:08 damieng 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=<'; } + if ($molecule) { + if ($usejsme) { + $molecule = 'document.JME.readMolecule("'.$molecule.'")'; + } else { + $molecule=''; + } + } my $insert_answer; if ($shown_text eq '') { $insert_answer= - ''; + '
'; } - my $js = < +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); + } +} + +RESIZEJS + $resizejs = &Apache::loncommon::js_ready($resizejs); + $jsme_js = ' +'."\n"; + $js =< +function jsmeOnLoad() { + document.getElementById('JMErefresh').style.display="none"; + document.getElementById('JMEcredits').style.display="inline"; + jsmeApplet = new JSApplet.JSME("jme", "420px", "330px"); + 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("http://peter-ertl.com/jsme/2013_03/help.html","","scrollbars=yes,resizable=yes,width=500,height=600"); +} + + + +CHEMJS + + $viewportjs = &Apache::loncommon::viewport_geometry_js(); + $viewportjs = ''; + + } else { + $buttonstyle = 'display:block'; + $js =< function submitSmiles() { jmeFile = document.applets.JME.jmeFile(); @@ -108,24 +249,41 @@ function openHelpWindow() { function substituent(r) {document.applets.JME.setSubstituent(r);} 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=< 'Select substituent...', + 'close' => 'Close', + 'help' => 'Help', + ); + my $body = " +$jsme_js +$js".'
-
+ +'; + if ($usejsme) { + $body.= <<"ENDCHEM"; +
+
+JSME Molecular Editor courtesy of Peter Ertl (Novartis) and Bruno Bienfait
+
+ENDCHEM + } else { + $body.=< +    - + + +
CHEMPAGE @@ -164,20 +329,29 @@ CHEMPAGE 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(); + my $function = + 'LONCAPA_draw_molecule_'.&get_uniq_name(); my $result=< 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(); + } } -$display CHEMINPUT + my $jscall = "javascript:$function();void(0);"; + if ($shown_text eq '') { + $result .=<$display +PENCIL + } else { + $result .= ''; + } return $result; } sub jme_img { @@ -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"; - } - #stift $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.= ''; } } 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 .=''. + $result .=''. &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 .='
'; + $result .='
'; $result .=&Apache::edit::text_arg('Correct Answer:','answer', $token,40); - $result .='

'; - $result .=&Apache::edit::text_arg('JME string of the answer (automatically updated when using the Draw Molecule button):', + $result .='
'; + $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 .='

'; + $result .='
'; $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,29 @@ 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' ) && ($Apache::lonhomework::type ne 'exam') && ($Apache::inputtags::status['-1'] eq 'CAN_ANSWER')){ - my $options=&Apache::lonxml::get_param('options',$parstack, - $safeeval); - my $shown_text; - if (&Apache::response::show_answer()) { + 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"}; @@ -355,8 +535,9 @@ sub end_organicresponse { $molecule=&Apache::lonxml::get_param('molecule',$parstack, $safeeval); } - $result.=&separate_jme_window("HWVAL_$id","MOLECULE_$id",$molecule, - $options,$shown_text); + $result.=&separate_jme_window("HWVAL_$id","MOLECULE_$id",$molecule, + $options,$shown_text); + } } &Apache::response::end_response(); return $result; @@ -364,7 +545,7 @@ sub end_organicresponse { sub format_prior_answer_organic { my ($mode,$answer,$other_data) = @_; - my $result=&mt('Smile representation: "[_1]"',''.$answer.''); + my $result=&mt('Smile representation: [_1]','"'.$answer.'"'); my $jme=$other_data->[0]; $result.=&jme_img($jme,$answer,400); return $result; @@ -404,13 +585,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 .=''; + $result .=''; $result .=&Apache::edit::text_arg('Molecule:','molecule',$token,40); my $molecule=&Apache::lonxml::get_param('molecule',$parstack, $safeeval); @@ -423,7 +605,7 @@ sub start_organicstructure { $result .=&separate_jme_window(undef, &Apache::edit::html_element_name('molecule'), $molecule,$options); - $result.="
"; + $result.="
"; $result .=&Apache::edit::checked_arg('Options:','options', [ ['reaction','Is a reaction'], ['border','Draw a border'] ], @@ -448,37 +630,32 @@ sub end_organicstructure { return $result; } -sub edit_reaction_button { - my ($id,$field,$reaction)=@_; - my $id_es=&escape($id); - 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, - 'js_ready' => 1, - 'add_entries' => { - 'rows' => "30%,*", - 'border' => "0",}},); - my $end_page = - &Apache::loncommon::end_page({'frameset' => 1, - 'js_ready' => 1}); - my $result=< -$display -EDITREACTION +JS_PREVIEW return $result; } @@ -505,11 +682,11 @@ sub start_reactionresponse { $safeeval); $result .=''. &Apache::edit::text_arg('Answer:','answer',$token,40); - $result .=&edit_reaction_button($id,&Apache::edit::html_element_name('answer'),$answer).''; + $result .= &reaction_preview(&Apache::edit::html_element_name('answer'), $answer).''; my $initial=&Apache::lonxml::get_param('initial',$parstack,$safeeval); $result.=''. &Apache::edit::text_arg('Initial Reaction:','initial',$token,40); - $result .=&edit_reaction_button($id,&Apache::edit::html_element_name('initial'),$initial).''; + $result .= &reaction_preview(&Apache::edit::html_element_name('initial'), $initial).''; $result .=&Apache::edit::end_row().&Apache::edit::start_spanning_row(); } elsif ($target eq 'modified') { my $constructtag=&Apache::edit::get_new_args($token,$parstack, @@ -553,9 +730,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; } @@ -577,9 +762,11 @@ 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(); } } @@ -587,7 +774,7 @@ sub end_reactionresponse { 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); + $result .= &reaction_preview("HWVAL_$id", $reaction); } &Apache::response::end_response(); return $result; @@ -620,5 +807,11 @@ sub end_chem { return $result; } +my $uniq=0; +sub get_uniq_name { + $uniq++; + return 'uniquename'.$uniq; +} + 1; __END__