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

Diff for /loncom/homework/chemresponse.pm between versions 1.73 and 1.84

version 1.73, 2007/04/18 00:48:06 version 1.84, 2008/12/22 14:55:28
Line 163  CHEMPAGE Line 163  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 $iconpath=$Apache::lonnet::perlvar{'lonIconsURL'};
     my $function =       my $function = 
  'LONCAPA_draw_molecule_'.&Apache::lonhtmlcommon::get_uniq_name();   'LONCAPA_draw_molecule_'.&Apache::lonhtmlcommon::get_uniq_name();
     my $result=<<CHEMINPUT;      my $result=<<CHEMINPUT;
Line 175  CHEMPAGE Line 176  CHEMPAGE
  editor.focus();   editor.focus();
     }      }
 </script>  </script>
 <input type="button" value="$display" onclick="javascript:$function();void(0);" />  <a href="javascript:$function();void(0);"><img class="stift" src='$iconpath/stift.gif' alt='$display' title='$display' /></a>
 CHEMINPUT  CHEMINPUT
     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 225  sub start_organicresponse { Line 225  sub start_organicresponse {
     if (&Apache::response::show_answer()) {      if (&Apache::response::show_answer()) {
  $shown_text="Show Your Last Answer";   $shown_text="Show Your Last Answer";
     }      }
     $result=&separate_jme_window("HWVAL_$id","MOLECULE_$id",$molecule,      #stift $result=&separate_jme_window("HWVAL_$id","MOLECULE_$id",$molecule,
  $options,$shown_text);  # $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 234  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 242  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 .='</spann><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 when using the Draw Molecule button):',
   'jmeanswer',$token);    'jmeanswer',$token);
  my $jmeanswer=&Apache::lonxml::get_param('jmeanswer',$parstack,   my $jmeanswer=&Apache::lonxml::get_param('jmeanswer',$parstack,
Line 254  sub start_organicresponse { Line 254  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 334  sub end_organicresponse { Line 334  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());   &Apache::lonxml::increment_counter(&Apache::response::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()) {
                   $shown_text="Show Your Last Answer";
               }
       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;
Line 360  sub start_organicstructure { Line 383  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 376  sub start_organicstructure { Line 399  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{'; }
Line 388  sub start_organicstructure { Line 411  sub start_organicstructure {
  $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 401  sub start_organicstructure { Line 424  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 432  sub edit_reaction_button { Line 455  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 453  sub edit_reaction_button { Line 478  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 467  sub start_reactionresponse { Line 492  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 485  sub start_reactionresponse { Line 504  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 560  sub end_reactionresponse { Line 578  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());   &Apache::lonxml::increment_counter(&Apache::response::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;
Removed from v.1.73  
changed lines
  Added in v.1.84

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