[LON-CAPA-cvs] cvs: loncom /homework inputtags.pm

albertel lon-capa-cvs@mail.lon-capa.org
Tue, 15 Nov 2005 22:28:30 -0000


albertel		Tue Nov 15 17:28:30 2005 EDT

  Modified files:              
    /loncom/homework	inputtags.pm 
  Log:
  - Don't say computer's answer shown above on handgraded problems
  
  
Index: loncom/homework/inputtags.pm
diff -u loncom/homework/inputtags.pm:1.179 loncom/homework/inputtags.pm:1.180
--- loncom/homework/inputtags.pm:1.179	Thu Nov 10 17:19:27 2005
+++ loncom/homework/inputtags.pm	Tue Nov 15 17:28:30 2005
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # input  definitons
 #
-# $Id: inputtags.pm,v 1.179 2005/11/10 22:19:27 albertel Exp $
+# $Id: inputtags.pm,v 1.180 2005/11/15 22:28:30 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -448,6 +448,14 @@
 	  'no_message' => '#fffff',
 	  );
 
+    my $part = $Apache::inputtags::part;
+    my $handgrade = 
+	('yes' eq lc(&Apache::lonnet::EXT("resource.$part.handgrade")));
+    
+    my $computer = ($handgrade)? ''
+	                       : " ".&mt("Computer's answer now shown above.");
+    &Apache::lonxml::debug("handgrade has :$handgrade:");
+
     if ($previous) { $previousmsg=&mt('You have entered that answer before'); }
     
     if      ($solved =~ /^correct/) {
@@ -469,7 +477,7 @@
 		$message = '\textbf{'.$message.'}';
 	    } else {
 		$message = "<b>".$message."</b>";
-		$message.=" ".&mt("Computer's answer now shown above.");
+		$message.= $computer;
 	    }
 	    $added_computer_text=1;
 	    unless ($env{'course.'.
@@ -501,7 +509,7 @@
 		$message = '\textbf{'.&mt('You are correct.').'}';
 	    } else {
 		$message = "<b>".&mt('You are correct.')."</b>";
-		$message.=" ".&mt("Computer's answer now shown above.");
+		$message.= $computer;
 	    }
 	    $added_computer_text=1;
 	    unless ($env{'course.'.
@@ -617,7 +625,7 @@
     }
     if ($Apache::inputtags::status[-1] eq 'SHOW_ANSWER' && 
 	!$added_computer_text && $target ne 'tex') {
-	$message.=" ".&mt("Computer's answer now shown above.");
+	$message.= $computer;
 	$added_computer_text=1;
     }
     return ($button,$bgcolor,$message,$previousmsg);