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

albertel lon-capa-cvs@mail.lon-capa.org
Tue, 13 Sep 2005 19:05:17 -0000


albertel		Tue Sep 13 15:05:17 2005 EDT

  Modified files:              
    /loncom/homework	grades.pm 
  Log:
  - BUG#4355 show off what validation file was picked if one is needed and put out a red None in case none was picked
  
  
Index: loncom/homework/grades.pm
diff -u loncom/homework/grades.pm:1.283 loncom/homework/grades.pm:1.284
--- loncom/homework/grades.pm:1.283	Mon Sep 12 16:27:25 2005
+++ loncom/homework/grades.pm	Tue Sep 13 15:05:15 2005
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # The LON-CAPA Grading handler
 #
-# $Id: grades.pm,v 1.283 2005/09/12 20:27:25 albertel Exp $
+# $Id: grades.pm,v 1.284 2005/09/13 19:05:15 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -4378,14 +4378,26 @@
 sub scantron_warning_screen {
     my ($button_text)=@_;
     my $title=&Apache::lonnet::gettitle($env{'form.selectpage'});
+    my %scantron_config=&get_scantron_config($env{'form.scantron_format'});
+    my $CODElist="a";
+    if ($scantron_config{'CODElocation'} &&
+	$scantron_config{'CODEstart'} &&
+	$scantron_config{'CODElength'}) {
+	$CODElist=$env{'form.scantron_CODElist'};
+	if ($CODElist eq '') { $CODElist='<font color="red">None</font>'; }
+	$CODElist=
+	    '<tr><td><b>List of CODES to validate against:</b></td><td><tt>'.
+	    $CODElist.'</tt></td></tr>';
+    }
     return (<<STUFF);
 <p>
 <font color="red">Please double check the information
                  below before clicking on '$button_text'</font>
 </p>
 <table>
-<tr><td><b>Sequence To be Graded:</b></td><td>$title</td></tr>
+<tr><td><b>Sequence to be Graded:</b></td><td>$title</td></tr>
 <tr><td><b>Data File that will be used:</b></td><td><tt>$env{'form.scantron_selectfile'}</tt></td></tr>
+$CODElist
 </table>
 </font>
 <br />