[BACK]Return to chemresponse.pm CVS log [TXT] [DIR] Up to [LON-CAPA] / loncom / homework

Diff for /loncom/homework/chemresponse.pm between versions 1.75 and 1.94

version 1.75, 2007/10/15 09:47:29 version 1.94, 2014/08/20 18:02:08
Line 68  sub chem_standard_order { Line 68  sub chem_standard_order {
   
 sub separate_jme_window {  sub separate_jme_window {
     my ($smile_input,$jme_input,$molecule,$options,$shown_text)=@_;      my ($smile_input,$jme_input,$molecule,$options,$shown_text)=@_;
       my $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;      my $smilesection;
     if (defined($smile_input)) {      if (defined($smile_input)) {
           my $smiles;
           if ($usejsme) {
               $smiles = 'document.JME.smiles()'; 
           } else {
               $smiles = 'document.applets.JME.smiles()';
           }
  $smilesection=<<SMILESECTION;   $smilesection=<<SMILESECTION;
         smiles = document.applets.JME.smiles();   opener.document.lonhomework.$smile_input.value = $smiles;
  opener.document.lonhomework.$smile_input.value = smiles;  
 SMILESECTION  SMILESECTION
     }      }
     my $jmesection;      my $jmesection;
       my $jmefile;
     if (defined($jme_input)) {      if (defined($jme_input)) {
           if ($usejsme) {
               $jmefile = 'document.JME.jmeFile()';
           } else {
               $jmefile = 'document.applets.JME.jmeFile()';
           }
  $jmesection=<<JMESECTION;   $jmesection=<<JMESECTION;
  jmeFile = document.applets.JME.jmeFile();   opener.document.lonhomework.$jme_input.value = $jmefile;
  opener.document.lonhomework.$jme_input.value = jmeFile;  
 JMESECTION  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;      my $insert_answer;
     if ($shown_text eq '') {       if ($shown_text eq '') { 
  $insert_answer=   $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 $js = <<CHEMJS;     
   
       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");
       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");
   }
   
   </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">  <script type="text/javascript">
 function submitSmiles() {  function submitSmiles() {
     jmeFile = document.applets.JME.jmeFile();      jmeFile = document.applets.JME.jmeFile();
Line 108  function openHelpWindow() { Line 202  function openHelpWindow() {
 function substituent(r) {document.applets.JME.setSubstituent(r);}  function substituent(r) {document.applets.JME.setSubstituent(r);}
 </script>  </script>
 CHEMJS  CHEMJS
       }
   
     my $start_page =       my $start_page = 
         &Apache::loncommon::start_page('Molecule Editor',undef,          &Apache::loncommon::start_page('Molecule Editor',$viewportjs,
        {'only_body' => 1,         {'only_body' => 1,
  'js_ready'  => 1,   'js_ready'  => 1,
  'bgcolor'   => '#FFFFFF',});   'bgcolor'   => '#FFFFFF',});
     my $end_page =      my $end_page =
   &Apache::loncommon::end_page({'js_ready' => 1,});    &Apache::loncommon::end_page({'js_ready' => 1,});
       my $java_not_enabled=&Apache::lonhtmlcommon::java_not_enabled();
     my $body=<<CHEMPAGE;      my %lt = &Apache::lonlocal::texthash(
 $js          'seltext' => 'Select substituent...',
           'close'   => 'Close',
           'help'    => 'Help',
          );
       my $body = "
   $jsme_js
   $js".'
 <center>  <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>    <table width="440"><tr>
     <td></td>      <td></td>
     <td align="right">      <td align="right">
       <select onchange="javascript:substituent(options[selectedIndex].text)">        <select onchange="javascript:substituent(options[selectedIndex].text)">
         <option>Select substituent</option>          <option>$lt{'seltext'}</option>
         <option>-C(=O)OH</option>          <option>-C(=O)OH</option>
         <option>-C(=O)OMe</option>          <option>-C(=O)OMe</option>
         <option>-OC(=O)Me</option>          <option>-OC(=O)Me</option>
Line 143  $js Line 254  $js
     </td></tr>      </td></tr>
   </table>    </table>
 <applet code="JME.class" name="JME" archive="/adm/jme/JME.jar" width="440" height="390" mayscript>  <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  $molecule
 <param name="options" value="$options" />  <param name="options" value="$options" />
 </applet><br />  </applet>
 <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>  
 <br />  <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  $insert_answer
 <br />  <input type="button" value="$lt{'close'}" onclick="javascript:window.close()" />
 <input type="button" value="  Close  " onclick = "javascript:window.close()" />  
 &nbsp;&nbsp;  &nbsp;&nbsp;
 <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>  </form>
 </center>  </center>
 CHEMPAGE  CHEMPAGE
Line 163  CHEMPAGE Line 281  CHEMPAGE
     my $docopen=&Apache::lonhtmlcommon::javascript_docopen();      my $docopen=&Apache::lonhtmlcommon::javascript_docopen();
     my $display=&mt('Draw Molecule');      my $display=&mt('Draw Molecule');
     if (defined($shown_text)) { $display=&mt($shown_text); }      if (defined($shown_text)) { $display=&mt($shown_text); }
     my $function =       my $iconpath=$Apache::lonnet::perlvar{'lonIconsURL'};
  'LONCAPA_draw_molecule_'.&Apache::lonhtmlcommon::get_uniq_name();      my $function =
    'LONCAPA_draw_molecule_'.&get_uniq_name();
     my $result=<<CHEMINPUT;      my $result=<<CHEMINPUT;
 <script type="text/javascript">  <script type="text/javascript">
     function $function() {      function $function() {
  editor=window.open($nothing,'jmeedit','width=500,height=500,menubar=no,scrollbars=no,resizable=yes');   editor=window.open($nothing,'jmeedit','width=500,height=500,menubar=no,scrollbars=no,resizable=yes');
  editor.$docopen;          if (editor) {
  editor.document.write('$start_page $body $end_page');      editor.$docopen;
  editor.document.close();      editor.document.write('$start_page $body $resizejs $end_page');
  editor.focus();      editor.document.close();
       editor.focus();
           }
     }      }
 </script>  </script>
 <input type="button" value="$display" onclick="javascript:$function();void(0);" />  
 CHEMINPUT  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;      return $result;
 }  }
   
 sub jme_img {  sub jme_img {
     my ($jme,$smile,$width,$options)=@_;      my ($jme,$smile,$width,$options)=@_;
     my $id=&Apache::loncommon::get_cgi_id();      my $id=&Apache::loncommon::get_cgi_id();
     my $result='<img alt="'.$smile.'" src="/cgi-bin/convertjme.pl?'.$id.'"';      my $result='<img alt="'.$smile.'" src="/cgi-bin/convertjme.pl?'.$id.'"';
     if ($options =~ /border/) { $result.= ' border="1"'; }      if ($options =~ /border/) { $result.= ' border="1"'; }
     $result.=' />';      $result.=' />';
     &Apache::lonnet::appenv('cgi.'.$id.'.JME'   =>      &Apache::lonnet::appenv({'cgi.'.$id.'.JME'   =>
     &escape($jme),       &escape($jme),
     'cgi.'.$id.'.PNG'   => 1,       'cgi.'.$id.'.PNG'   => 1,
     'cgi.'.$id.'.WIDTH' => $width);       'cgi.'.$id.'.WIDTH' => $width});
     return $result;      return $result;
 }  }
   
Line 203  sub start_organicresponse { Line 330  sub start_organicresponse {
     } elsif ($target eq 'web') {      } elsif ($target eq 'web') {
  my $jmeanswer=&Apache::lonxml::get_param('jmeanswer',$parstack,   my $jmeanswer=&Apache::lonxml::get_param('jmeanswer',$parstack,
  $safeeval);   $safeeval);
  if (  &Apache::response::show_answer() && $jmeanswer ne '') {   if (&Apache::response::show_answer()) {
     my $options=&Apache::lonxml::get_param('options',$parstack,              my $jmeanswer=&Apache::lonxml::get_param('jmeanswer',$parstack,
    $safeeval);                                                       $safeeval);
     my $width=&Apache::lonxml::get_param('width',$parstack,              if ($jmeanswer ne '') {
    $safeeval);          my $options=&Apache::lonxml::get_param('options',$parstack,
     my (@answers)=&Apache::lonxml::get_param_var('answer',$parstack,             $safeeval);
  $safeeval);          my $width=&Apache::lonxml::get_param('width',$parstack,
     $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,  
      $safeeval);       $safeeval);
     }          my (@answers)=&Apache::lonxml::get_param_var('answer',$parstack,
     my $options=&Apache::lonxml::get_param('options',$parstack,       $safeeval);
    $safeeval);          $result.=&jme_img($jmeanswer,$answers[0],$width,$options);
     my $shown_text;              }
     if (&Apache::response::show_answer()) {   } else {
  $shown_text="Show Your Last Answer";  
     }  
     $result=&separate_jme_window("HWVAL_$id","MOLECULE_$id",$molecule,  
  $options,$shown_text);  
     $result.= '<input type="hidden" name="MOLECULE_'.$id.'" value="" />';      $result.= '<input type="hidden" name="MOLECULE_'.$id.'" value="" />';
  }   }
     } elsif ($target eq 'edit') {      } elsif ($target eq 'edit') {
Line 234  sub start_organicresponse { Line 350  sub start_organicresponse {
  my $options=&Apache::lonxml::get_param('options',$parstack,   my $options=&Apache::lonxml::get_param('options',$parstack,
        $safeeval);         $safeeval);
  if ($options !~ /multipart/) { $options.=',multipart'; }   if ($options !~ /multipart/) { $options.=',multipart'; }
  $result .='<nobr>'.   $result .='<span class="LC_nobreak">'.
     &Apache::edit::text_arg('Starting Molecule:','molecule',      &Apache::edit::text_arg('Starting Molecule:','molecule',
     $token,40);      $token,40);
  my $molecule=&Apache::lonxml::get_param('molecule',$parstack,   my $molecule=&Apache::lonxml::get_param('molecule',$parstack,
Line 242  sub start_organicresponse { Line 358  sub start_organicresponse {
  $result .=&separate_jme_window(undef,   $result .=&separate_jme_window(undef,
       &Apache::edit::html_element_name('molecule'),        &Apache::edit::html_element_name('molecule'),
       $molecule,$options);        $molecule,$options);
  $result .='</nobr><br /><nobr>';   $result .='</span><br /><span class="LC_nobreak">';
  $result .=&Apache::edit::text_arg('Correct Answer:','answer',   $result .=&Apache::edit::text_arg('Correct Answer:','answer',
   $token,40);    $token,40);
  $result .='</nobr><br /><nobr>';   $result .='</span><br /><span class="LC_nobreak">';
  $result .=&Apache::edit::text_arg('JME string of the answer (automatically updated when using the Draw Molecule button):',   $result .=&Apache::edit::text_arg('JME string of the answer - automatically updated by "Insert Answer" in the JME pop-up (click pencil):',
   'jmeanswer',$token);    'jmeanswer',$token);
  my $jmeanswer=&Apache::lonxml::get_param('jmeanswer',$parstack,   my $jmeanswer=&Apache::lonxml::get_param('jmeanswer',$parstack,
  $safeeval);   $safeeval);
Line 254  sub start_organicresponse { Line 370  sub start_organicresponse {
                       &Apache::edit::html_element_name('answer'),                        &Apache::edit::html_element_name('answer'),
                       &Apache::edit::html_element_name('jmeanswer'),                        &Apache::edit::html_element_name('jmeanswer'),
       $jmeanswer,$options);        $jmeanswer,$options);
  $result .='</nobr><br />';   $result .='</span><br />';
  $result .=&Apache::edit::checked_arg('Options:','options',   $result .=&Apache::edit::checked_arg('Options:','options',
     [ ['autoez','Auto E,Z stereochemistry'],      [ ['autoez','Auto E,Z stereochemistry'],
       ['multipart','Multipart Structures'],        ['multipart','Multipart Structures'],
Line 309  sub end_organicresponse { Line 425  sub end_organicresponse {
     $ad='INCORRECT';      $ad='INCORRECT';
  }   }
     }      }
     if ($ad && $Apache::lonhomework::type eq 'survey') {              if ($ad) {
  $ad='SUBMITTED';          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::response::handle_previous(\%previous,$ad);
     $Apache::lonhomework::results{"resource.$partid.$id.awarddetail"}=$ad;      $Apache::lonhomework::results{"resource.$partid.$id.awarddetail"}=$ad;
     $Apache::lonhomework::results{"resource.$partid.$id.molecule"}=$env{"form.MOLECULE_$id"};      $Apache::lonhomework::results{"resource.$partid.$id.molecule"}=$env{"form.MOLECULE_$id"};
Line 334  sub end_organicresponse { Line 458  sub end_organicresponse {
   
     if ($target eq 'grade' || $target eq 'web' || $target eq 'answer' ||       if ($target eq 'grade' || $target eq 'web' || $target eq 'answer' || 
  $target eq 'tex' || $target eq 'analyze') {   $target eq 'tex' || $target eq 'analyze') {
  &Apache::lonxml::increment_counter(&Apache::response::repetition(),           my $repetition = &Apache::response::repetition();
    "$partid.$id"); # part.response   &Apache::lonxml::increment_counter($repetition,"$partid.$id"); # part.response
  if ($target eq 'analyze') {   if ($target eq 'analyze') {
               $Apache::lonhomework::analyze{"$partid.$id.type"} = 'organicresponse';
               push (@{ $Apache::lonhomework::analyze{"parts"} },"$partid.$id");
     &Apache::lonhomework::set_bubble_lines();      &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();      &Apache::response::end_response();
     return $result;      return $result;
 }  }
   
 sub format_prior_answer_organic {  sub format_prior_answer_organic {
     my ($mode,$answer,$other_data) = @_;      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];      my $jme=$other_data->[0];
     $result.=&jme_img($jme,$answer,400);      $result.=&jme_img($jme,$answer,400);
     return $result;      return $result;
Line 364  sub start_organicstructure { Line 516  sub start_organicstructure {
  if ($options =~ /border/) { $result.= ' border="1"'; }   if ($options =~ /border/) { $result.= ' border="1"'; }
  $result.=' />';   $result.=' />';
  &Apache::lonnet::appenv(   &Apache::lonnet::appenv(
             'cgi.'.$id.'.JME'   => &escape($molecule),              {'cgi.'.$id.'.JME'   => &escape($molecule),
     'cgi.'.$id.'.PNG' => 1,       'cgi.'.$id.'.PNG' => 1,
     'cgi.'.$id.'.WIDTH' => $width );       'cgi.'.$id.'.WIDTH' => $width});
     } elsif ($target eq 'tex') {      } elsif ($target eq 'tex') {
  my $texwidth=&Apache::lonxml::get_param('texwidth',$parstack,$safeeval,undef,1);   my $texwidth=&Apache::lonxml::get_param('texwidth',$parstack,$safeeval,undef,1);
  my $webwidth=&Apache::lonxml::get_param('width', $parstack, $safeeval);   my $webwidth=&Apache::lonxml::get_param('width', $parstack, $safeeval);
Line 380  sub start_organicstructure { Line 532  sub start_organicstructure {
     '_'.time.'_'.$$.int(rand(1000)).'_organicstructure';      '_'.time.'_'.$$.int(rand(1000)).'_organicstructure';
  my $id=$filename;   my $id=$filename;
  &Apache::lonnet::appenv(   &Apache::lonnet::appenv(
      'cgi.'.$id.'.JME'   => &escape($molecule),       {'cgi.'.$id.'.JME'   => &escape($molecule),
      'cgi.'.$id.'.PS' => 1,        'cgi.'.$id.'.PS' => 1,
      'cgi.'.$id.'.WIDTH' => $texwidth );        'cgi.'.$id.'.WIDTH' => $texwidth});
  $id=&escape($id);   $id=&escape($id);
  &Apache::lonxml::register_ssi("/cgi-bin/convertjme.pl?$id");   &Apache::lonxml::register_ssi("/cgi-bin/convertjme.pl?$id");
  if ($options =~ /border/) { $result.= '\fbox{'; }   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.= '} '; }   if ($options =~ /border/) { $result.= '} '; }
     } elsif ($target eq 'edit') {      } elsif ($target eq 'edit') {
  $result .=&Apache::edit::tag_start($target,$token);   $result .=&Apache::edit::tag_start($target,$token);
  $result .=&Apache::edit::text_arg('Width (pixels):','width',$token,5);   $result .=&Apache::edit::text_arg('Width (pixels):','width',$token,5);
  $result .=&Apache::edit::text_arg('TeXwidth (mm):','texwidth',$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);   $result .=&Apache::edit::text_arg('Molecule:','molecule',$token,40);
  my $molecule=&Apache::lonxml::get_param('molecule',$parstack,   my $molecule=&Apache::lonxml::get_param('molecule',$parstack,
  $safeeval);   $safeeval);
Line 405  sub start_organicstructure { Line 558  sub start_organicstructure {
  $result .=&separate_jme_window(undef,   $result .=&separate_jme_window(undef,
  &Apache::edit::html_element_name('molecule'),   &Apache::edit::html_element_name('molecule'),
        $molecule,$options);         $molecule,$options);
  $result.="</nobr><br />";   $result.="</span><br />";
  $result .=&Apache::edit::checked_arg('Options:','options',   $result .=&Apache::edit::checked_arg('Options:','options',
      [ ['reaction','Is a reaction'],       [ ['reaction','Is a reaction'],
        ['border','Draw a border'] ],         ['border','Draw a border'] ],
Line 436  sub edit_reaction_button { Line 589  sub edit_reaction_button {
     my $field_es=&escape($field);      my $field_es=&escape($field);
     my $reaction_es=&escape($reaction);      my $reaction_es=&escape($reaction);
     my $docopen=&Apache::lonhtmlcommon::javascript_docopen();      my $docopen=&Apache::lonhtmlcommon::javascript_docopen();
       my $iconpath=$Apache::lonnet::perlvar{'lonIconsURL'};
       my $display=&mt('Edit Answer');
     my $start_page =       my $start_page = 
  &Apache::loncommon::start_page('LON-CAPA Reaction Editor',undef,   &Apache::loncommon::start_page('LON-CAPA Reaction Editor',undef,
        {'frameset'    => 1,         {'frameset'    => 1,
Line 457  sub edit_reaction_button { Line 612  sub edit_reaction_button {
     }      }
 // -->  // -->
 </script>  </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  EDITREACTION
     return $result;      return $result;
 }  }
Line 471  sub start_reactionresponse { Line 626  sub start_reactionresponse {
     } elsif ($target eq 'web') {      } elsif ($target eq 'web') {
  my $partid = $Apache::inputtags::part;   my $partid = $Apache::inputtags::part;
  my $id = $Apache::inputtags::response['-1'];   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() ) {   if (  &Apache::response::show_answer() ) {
     my $ans=&Apache::lonxml::get_param('answer',$parstack,$safeeval);      my $ans=&Apache::lonxml::get_param('answer',$parstack,$safeeval);
     if (!$Apache::lonxml::default_homework_loaded) {      if (!$Apache::lonxml::default_homework_loaded) {
Line 489  sub start_reactionresponse { Line 638  sub start_reactionresponse {
  $result .=&Apache::edit::tag_start($target,$token);   $result .=&Apache::edit::tag_start($target,$token);
  my $answer=&Apache::lonxml::get_param('answer',$parstack,   my $answer=&Apache::lonxml::get_param('answer',$parstack,
  $safeeval);   $safeeval);
  $result .='<nobr>'.   $result .='<span class="LC_nobreak">'.
     &Apache::edit::text_arg('Answer:','answer',$token,40);      &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);   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);      &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();   $result .=&Apache::edit::end_row().&Apache::edit::start_spanning_row();
     }  elsif ($target eq 'modified') {      }  elsif ($target eq 'modified') {
  my $constructtag=&Apache::edit::get_new_args($token,$parstack,   my $constructtag=&Apache::edit::get_new_args($token,$parstack,
Line 540  sub end_reactionresponse { Line 688  sub end_reactionresponse {
     $ad='INCORRECT';      $ad='INCORRECT';
  }   }
     }      }
     if ($ad && $Apache::lonhomework::type eq 'survey') {              if ($ad) {
  $ad='SUBMITTED';                  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::response::handle_previous(\%previous,$ad);
     $Apache::lonhomework::results{"resource.$partid.$id.awarddetail"}=$ad;      $Apache::lonhomework::results{"resource.$partid.$id.awarddetail"}=$ad;
  }   }
Line 564  sub end_reactionresponse { Line 720  sub end_reactionresponse {
   
     if ($target eq 'grade' || $target eq 'web' || $target eq 'answer' ||       if ($target eq 'grade' || $target eq 'web' || $target eq 'answer' || 
  $target eq 'tex' || $target eq 'analyze') {   $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); }
           $result.=&edit_reaction_button($id,"HWVAL_$id",$reaction);
     }      }
     &Apache::response::end_response();      &Apache::response::end_response();
     return $result;      return $result;
Line 597  sub end_chem { Line 765  sub end_chem {
     return $result;      return $result;
 }  }
   
   my $uniq=0;
   sub get_uniq_name {
       $uniq++;
       return 'uniquename'.$uniq;
   }
   
 1;  1;
 __END__  __END__
Removed from v.1.75  
changed lines
  Added in v.1.94

FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>