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

[raeburn]

raeburn		Sat Mar  5 20:06:33 2011 EDT

  Modified files:              
    /loncom/homework	inputtags.pm 
  Log:
  - Bug 6429; 6430.
    - Appropriate text in Previous Tries pop-up for optionresponse 
      submission in scantronmode -- lenient grading.
  
  
Index: loncom/homework/inputtags.pm
diff -u loncom/homework/inputtags.pm:1.278 loncom/homework/inputtags.pm:1.279
--- loncom/homework/inputtags.pm:1.278	Thu Jan 13 17:44:27 2011
+++ loncom/homework/inputtags.pm	Sat Mar  5 20:06:33 2011
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # input  definitons
 #
-# $Id: inputtags.pm,v 1.278 2011/01/13 17:44:27 www Exp $
+# $Id: inputtags.pm,v 1.279 2011/03/05 20:06:33 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -1522,6 +1522,17 @@
 		) {
 		
                 my $txt_correct = &mt('Correct');
+                my $awarded = $Apache::lonhomework::history{"$prefix.awarded"};
+                my $txt_correct = &mt('Correct');
+                if ($awarded < 1 && $awarded > 0) {
+                    $txt_correct=&mt('Partially correct');
+                } elsif ($awarded < 1) {
+                    if ($awarded eq '') {
+                        $txt_correct='';
+                    } else {
+                        $txt_correct=&mt('Incorrect');
+                    }
+                }
 		$message =~ s{(<td.*?>)(.*?)(</td>)}
                              {$1 <strong>$txt_correct</strong>. $3}s;
 	    }