+PENCIL
+ } else {
+ $result .= '';
+ }
return $result;
}
-
sub jme_img {
my ($jme,$smile,$width,$options)=@_;
my $id=&Apache::loncommon::get_cgi_id();
my $result=''; $result .=&Apache::edit::text_arg('Correct Answer:','answer', $token,40); - $result .=&Apache::edit::hidden_arg('jmeanswer',$token); + $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); $result .=&separate_jme_window( &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'], @@ -297,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"}; @@ -315,15 +498,59 @@ sub end_organicresponse { } $result.=&Apache::response::answer_footer('organicresponse'); } + if ($target eq 'web') { + &Apache::response::setup_prior_tries_hash(\&format_prior_answer_organic, + ['molecule']) + } if ($target eq 'grade' || $target eq 'web' || $target eq 'answer' || $target eq 'tex' || $target eq 'analyze') { - &Apache::lonxml::increment_counter(&Apache::response::repetition()); + 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' ) { + 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(); return $result; } +sub format_prior_answer_organic { + my ($mode,$answer,$other_data) = @_; + my $result=&mt('Smile representation: [_1]','"'.$answer.'"'); + my $jme=$other_data->[0]; + $result.=&jme_img($jme,$answer,400); + return $result; +} + sub start_organicstructure { my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; my $result; @@ -336,9 +563,9 @@ sub start_organicstructure { if ($options =~ /border/) { $result.= ' border="1"'; } $result.=' />'; &Apache::lonnet::appenv( - 'cgi.'.$id.'.JME' => &escape($molecule), - 'cgi.'.$id.'.PNG' => 1, - 'cgi.'.$id.'.WIDTH' => $width ); + {'cgi.'.$id.'.JME' => &escape($molecule), + 'cgi.'.$id.'.PNG' => 1, + 'cgi.'.$id.'.WIDTH' => $width}); } elsif ($target eq 'tex') { my $texwidth=&Apache::lonxml::get_param('texwidth',$parstack,$safeeval,undef,1); my $webwidth=&Apache::lonxml::get_param('width', $parstack, $safeeval); @@ -352,19 +579,20 @@ sub start_organicstructure { '_'.time.'_'.$$.int(rand(1000)).'_organicstructure'; my $id=$filename; &Apache::lonnet::appenv( - 'cgi.'.$id.'.JME' => &escape($molecule), - 'cgi.'.$id.'.PS' => 1, - 'cgi.'.$id.'.WIDTH' => $texwidth ); + {'cgi.'.$id.'.JME' => &escape($molecule), + 'cgi.'.$id.'.PS' => 1, + 'cgi.'.$id.'.WIDTH' => $texwidth}); $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::checked_arg('Options:','options', [ ['reaction','Is a reaction'], ['border','Draw a border'] ], @@ -408,12 +636,14 @@ sub edit_reaction_button { 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%", + 'rows' => "30%,*", 'border' => "0",}},); my $end_page = &Apache::loncommon::end_page({'frameset' => 1, @@ -425,10 +655,11 @@ sub edit_reaction_button { editor=window.open('','','width=500,height=270,scrollbars=no,resizable=yes'); editor.$docopen; editor.document.writeln('$start_page $end_page'); + editor.document.close(); } // --> - +
EDITREACTION
return $result;
}
@@ -442,32 +673,25 @@ sub start_reactionresponse {
} elsif ($target eq 'web') {
my $partid = $Apache::inputtags::part;
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() ) {
my $ans=&Apache::lonxml::get_param('answer',$parstack,$safeeval);
if (!$Apache::lonxml::default_homework_loaded) {
&Apache::lonxml::default_homework_load($safeeval);
}
@Apache::scripttag::parser_env = @_;
- $Apache::inputtags::answertxt{$id}=&Apache::run::run("return &chemparse(q\0$ans\0);",$safeeval);
+ $Apache::inputtags::answertxt{$id}=[&Apache::run::run("return &chemparse(q\0$ans\0);",$safeeval)];
}
} elsif ($target eq "edit") {
$result .=&Apache::edit::tag_start($target,$token);
my $answer=&Apache::lonxml::get_param('answer',$parstack,
$safeeval);
- $result .='