--- loncom/homework/externalresponse.pm	2010/12/20 15:54:03	1.16
+++ loncom/homework/externalresponse.pm	2014/02/26 20:52:11	1.19.10.1
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # external style responses
 #
-# $Id: externalresponse.pm,v 1.16 2010/12/20 15:54:03 www Exp $
+# $Id: externalresponse.pm,v 1.19.10.1 2014/02/26 20:52:11 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -33,6 +33,7 @@ use strict;
 use HTTP::Request::Common;
 use Apache::loncapagrade;
 use Apache::lonnet;
+use Apache::lonlocal;
 
 BEGIN {
     &Apache::lonxml::register('Apache::externalresponse',('externalresponse'));
@@ -56,13 +57,14 @@ sub start_externalresponse {
     if ($target eq 'edit') {
   	$result .=&Apache::edit::tag_start($target,$token);
 	$result .=&Apache::edit::text_arg('URL:','url',$token,60).'<br />';
-	$result .=&Apache::edit::text_arg('Answer:','answer',$token);
-	$result .=&Apache::edit::text_arg('Form:','form',$token);
+	$result .=&Apache::edit::text_arg(&mt('Answer:'),'answer',$token);
+	$result .=&Apache::edit::text_arg(&mt('Form:'),'form',$token).'<br />';
+        $result .=&Apache::edit::text_arg(&mt('Answer display:'),'answerdisplay',$token,80);
 	$result .=&Apache::edit::end_row().&Apache::edit::start_spanning_row();
     } elsif ($target eq 'modified') {
 	my $constructtag =
 	    &Apache::edit::get_new_args($token,$parstack,$safeeval,
-					'answer','form','url');
+					'answerdisplay','answer','form','url');
 	if ($constructtag) {
 	    $result = &Apache::edit::rebuild_tag($token);
 	}
@@ -116,6 +118,10 @@ sub end_externalresponse {
                 $Apache::externalresponse::message=$Apache::loncapagrade::results{'message'};
 		&Apache::response::handle_previous(\%previous,
 						   $Apache::loncapagrade::results{'awarddetail'});
+                if ($Apache::loncapagrade::results{'awarddetail'} eq 'ASSIGNED_SCORE') {
+                   $Apache::lonhomework::results{"resource.$part.$id.awarded"}=
+                        1.*$Apache::loncapagrade::results{"awarded"};
+                }
 		&Apache::lonxml::debug("response of");
 		&Apache::lonhomework::showhash(%$res);
 		&Apache::lonxml::debug("capagrade of");
@@ -127,8 +133,15 @@ sub end_externalresponse {
     }
     if ($target eq 'web') {
 	&Apache::response::setup_prior_tries_hash(\&format_prior_response);
+        if (&Apache::response::show_answer()) {
+           $result.='<table border="1"><tr><th>'.&mt('Your answer:').'</th></tr><tr><td><pre>'.
+                    &HTML::Entities::encode(
+                        $Apache::lonhomework::history{"resource.$part.$id.submission"},'"<>&').
+                    '</pre></td></table><br />'.&Apache::lonxml::get_param('answerdisplay',$parstack,$safeeval).
+                    '<br />';
+        }
         if ($Apache::externalresponse::message) {
-           $result.='<br />'.$Apache::externalresponse::message;
+           $result.='<br /><table><tr><td bgcolor="#FFFFAA">'.$Apache::externalresponse::message.'</td></tr></table><br />';
         }
         $Apache::externalresponse::message='';
     }