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

Diff for /loncom/homework/chemresponse.pm between versions 1.62 and 1.68

version 1.62, 2005/07/05 10:06:34 version 1.68, 2006/07/03 01:16:04
Line 31  use strict; Line 31  use strict;
 use Apache::lonxml;  use Apache::lonxml;
 use Apache::lonnet;  use Apache::lonnet;
 use Apache::lonlocal;  use Apache::lonlocal;
   use lib '/home/httpd/lib/perl/';
   use LONCAPA;
    
   
 BEGIN {  BEGIN {
     &Apache::lonxml::register('Apache::chemresponse',('organicresponse','organicstructure','reactionresponse','chem'));      &Apache::lonxml::register('Apache::chemresponse',('organicresponse','organicstructure','reactionresponse','chem'));
Line 87  JMESECTION Line 90  JMESECTION
     '<input type="button" name="submit" value="Insert Answer" onclick="javascript:submitSmiles();" />';      '<input type="button" name="submit" value="Insert Answer" onclick="javascript:submitSmiles();" />';
     }      }
   
     my $body=<<CHEMPAGE;      my $js = <<CHEMJS;
 <html>  
 <head>  
 <title>Molecule Editor</title>  
 <script type="text/javascript">  <script type="text/javascript">
 function submitSmiles() {  function submitSmiles() {
     jmeFile = document.applets.JME.jmeFile();      jmeFile = document.applets.JME.jmeFile();
Line 107  function openHelpWindow() { Line 107  function openHelpWindow() {
 }  }
 function substituent(r) {document.applets.JME.setSubstituent(r);}  function substituent(r) {document.applets.JME.setSubstituent(r);}
 </script>  </script>
 </head>  CHEMJS
 <body bgcolor="#ffffff">  
       my $start_page = 
           &Apache::loncommon::start_page('Molecule Editor',$js,
          {'only_body' => 1,
    'bgcolor'   => '#FFFFFF',});
       my $end_page = 
    &Apache::loncommon::end_page();
   
       my $body=<<CHEMPAGE;
   $start_page
 <center>  <center>
 <form>  <form>
   <table width="440"><tr>    <table width="440"><tr>
Line 146  $insert_answer Line 155  $insert_answer
 <input type="button" value="  Help  " onclick = "javascript:openHelpWindow()" />  <input type="button" value="  Help  " onclick = "javascript:openHelpWindow()" />
 </form>  </form>
 </center>  </center>
 </body>  $end_page
 </html>  
 CHEMPAGE  CHEMPAGE
   
     $body=&HTML::Entities::encode($body,'<>&"');      $body=&HTML::Entities::encode($body,'<>&"');
     $body=~s/\n/ /g;      $body=~s/\n/ /g;
     my $nothing=&Apache::lonhtmlcommon::javascript_nothing();      my $nothing=&Apache::lonhtmlcommon::javascript_nothing();
Line 168  sub jme_img { Line 177  sub jme_img {
     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'   =>
     &Apache::lonnet::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 226  sub start_organicresponse { Line 235  sub start_organicresponse {
  $result .='</nobr><br /><nobr>';   $result .='</nobr><br /><nobr>';
  $result .=&Apache::edit::text_arg('Correct Answer:','answer',   $result .=&Apache::edit::text_arg('Correct Answer:','answer',
   $token,40);    $token,40);
  $result .=&Apache::edit::hidden_arg('jmeanswer',$token);   $result .=&Apache::edit::text_arg('JME string of the answer (automatically updated when using the Draw Molecule button):',
     'jmeanswer',$token);
  my $jmeanswer=&Apache::lonxml::get_param('jmeanswer',$parstack,   my $jmeanswer=&Apache::lonxml::get_param('jmeanswer',$parstack,
  $safeeval);   $safeeval);
  $result .=&separate_jme_window(   $result .=&separate_jme_window(
Line 251  sub start_organicresponse { Line 261  sub start_organicresponse {
      'options','width');       'options','width');
  if ($constructtag) { $result = &Apache::edit::rebuild_tag($token); }   if ($constructtag) { $result = &Apache::edit::rebuild_tag($token); }
     }      }
   
     return $result;      return $result;
 }  }
   
 sub end_organicresponse {  sub end_organicresponse {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;      my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
     my $result;      my $result;
     if ($target eq 'grade' && &Apache::response::submitted()) {  
       my $partid = $Apache::inputtags::part;
       my $id = $Apache::inputtags::response['-1'];
   
       if ($target eq 'grade' 
    && &Apache::response::submitted()
    && $Apache::lonhomework::type eq 'exam') {
   
    &Apache::response::scored_response($partid,$id);
   
       } elsif ($target eq 'grade' 
    && &Apache::response::submitted()
    && $Apache::lonhomework::type ne 'exam') {
   
  &Apache::response::setup_params($$tagstack[-1],$safeeval);   &Apache::response::setup_params($$tagstack[-1],$safeeval);
  my $response = &Apache::response::getresponse();   my $response = &Apache::response::getresponse();
  if ( $response =~ /[^\s]/) {   if ( $response =~ /[^\s]/) {
     my $partid = $Apache::inputtags::part;  
     my $id = $Apache::inputtags::response['-1'];  
     my (@answers)=&Apache::lonxml::get_param_var('answer',$parstack,$safeeval);      my (@answers)=&Apache::lonxml::get_param_var('answer',$parstack,$safeeval);
     my %previous = &Apache::response::check_for_previous($response,$partid,$id);      my %previous = &Apache::response::check_for_previous($response,$partid,$id);
     $Apache::lonhomework::results{"resource.$partid.$id.submission"}=$response;      $Apache::lonhomework::results{"resource.$partid.$id.submission"}=$response;
Line 294  sub end_organicresponse { Line 316  sub end_organicresponse {
  }   }
  $result.=&Apache::response::answer_footer('organicresponse');   $result.=&Apache::response::answer_footer('organicresponse');
     }      }
     &Apache::response::end_response;  
       if ($target eq 'grade' || $target eq 'web' || $target eq 'answer' || 
    $target eq 'tex' || $target eq 'analyze') {
    &Apache::lonxml::increment_counter(&Apache::response::repetition());
       }
       &Apache::response::end_response();
     return $result;      return $result;
 }  }
   
Line 310  sub start_organicstructure { Line 337  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'   => &Apache::lonnet::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') {
Line 326  sub start_organicstructure { Line 353  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'   => &Apache::lonnet::escape($molecule),       'cgi.'.$id.'.JME'   => &escape($molecule),
      'cgi.'.$id.'.PS' => 1,       'cgi.'.$id.'.PS' => 1,
      'cgi.'.$id.'.WIDTH' => $texwidth );       'cgi.'.$id.'.WIDTH' => $texwidth );
  $id=&Apache::lonnet::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{{/home/httpd/perl/tmp/}}\includegraphics[width='.$texwidth.' mm]{'.$filename.'.eps}';
Line 378  sub end_organicstructure { Line 405  sub end_organicstructure {
   
 sub edit_reaction_button {  sub edit_reaction_button {
     my ($id,$field,$reaction)=@_;      my ($id,$field,$reaction)=@_;
     my $id_es=&Apache::lonnet::escape($id);      my $id_es=&escape($id);
     my $field_es=&Apache::lonnet::escape($field);      my $field_es=&escape($field);
     my $reaction_es=&Apache::lonnet::escape($reaction);      my $reaction_es=&escape($reaction);
     my $docopen=&Apache::lonhtmlcommon::javascript_docopen();      my $docopen=&Apache::lonhtmlcommon::javascript_docopen();
       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=<<EDITREACTION;      my $result=<<EDITREACTION;
 <script type="text/javascript">  <script type="text/javascript">
 // <!--  // <!--
     function create_reaction_window_${id}_${field} () {      function create_reaction_window_${id}_${field} () {
  editor=window.open('','','width=500,height=270,scrollbars=no,resizable=yes');   editor=window.open('','','width=500,height=270,scrollbars=no,resizable=yes');
  editor.$docopen;   editor.$docopen;
  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?inhibitmenu=yes" name="viewer" scrolling="no" />  <frame src="/res/adm/pages/reactionresponse/reaction_editor.html?inhibitmenu=yes&reaction=$reaction_es&id=$id_es&field=$field_es" name="editor" scrolling="no" /> </frameset> </html>');   editor.document.writeln('$start_page <frame src="/res/adm/pages/reactionresponse/reaction_viewer.html?inhibitmenu=yes" name="viewer" scrolling="no" />  <frame src="/res/adm/pages/reactionresponse/reaction_editor.html?inhibitmenu=yes&reaction=$reaction_es&id=$id_es&field=$field_es" name="editor" scrolling="no" /> $end_page');
    editor.document.close();
     }      }
 // -->  // -->
 </script>  </script>
Line 445  sub start_reactionresponse { Line 483  sub start_reactionresponse {
 sub end_reactionresponse {  sub end_reactionresponse {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;      my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
     my $result;      my $result;
     if ($target eq 'grade' && &Apache::response::submitted()) {  
       my $partid = $Apache::inputtags::part;
       my $id = $Apache::inputtags::response['-1'];
   
       if ($target eq 'grade' 
    && &Apache::response::submitted()
    && $Apache::lonhomework::type eq 'exam') {
   
    &Apache::response::scored_response($partid,$id);
   
       } elsif ($target eq 'grade' 
    && &Apache::response::submitted()
    && $Apache::lonhomework::type ne 'exam') {
   
  &Apache::response::setup_params($$tagstack[-1],$safeeval);   &Apache::response::setup_params($$tagstack[-1],$safeeval);
  my $response = &Apache::response::getresponse();   my $response = &Apache::response::getresponse();
  if ( $response =~ /[^\s]/) {   if ( $response =~ /[^\s]/) {
     my $partid = $Apache::inputtags::part;  
     my $id = $Apache::inputtags::response['-1'];  
     my (@answers)=&Apache::lonxml::get_param_var('answer',$parstack,$safeeval);      my (@answers)=&Apache::lonxml::get_param_var('answer',$parstack,$safeeval);
     my %previous = &Apache::response::check_for_previous($response,$partid,$id);      my %previous = &Apache::response::check_for_previous($response,$partid,$id);
     $Apache::lonhomework::results{"resource.$partid.$id.submission"}=$response;      $Apache::lonhomework::results{"resource.$partid.$id.submission"}=$response;
Line 482  sub end_reactionresponse { Line 531  sub end_reactionresponse {
  }   }
  $result.=&Apache::response::answer_footer('reactionresponse');   $result.=&Apache::response::answer_footer('reactionresponse');
     }      }
     &Apache::response::end_response;  
       if ($target eq 'grade' || $target eq 'web' || $target eq 'answer' || 
    $target eq 'tex' || $target eq 'analyze') {
    &Apache::lonxml::increment_counter(&Apache::response::repetition());
       }
       &Apache::response::end_response();
     return $result;      return $result;
 }  }
   
Removed from v.1.62  
changed lines
  Added in v.1.68

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