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

[www]

www		Fri Oct 22 15:29:57 2010 EDT

  Modified files:              
    /loncom/homework	grades.pm 
  Log:
  * Undoing 1.634 
  - was causing JavaScript error
  - formulation different from the other alerts (need consistent message)
  - what the button actually says depends on the browser
  * Warning message if points>weight (caused a problem this week for an instructor)
  
  
Index: loncom/homework/grades.pm
diff -u loncom/homework/grades.pm:1.637 loncom/homework/grades.pm:1.638
--- loncom/homework/grades.pm:1.637	Thu Sep  2 10:34:04 2010
+++ loncom/homework/grades.pm	Fri Oct 22 15:29:57 2010
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # The LON-CAPA Grading handler
 #
-# $Id: grades.pm,v 1.637 2010/09/02 10:34:04 www Exp $
+# $Id: grades.pm,v 1.638 2010/10/22 15:29:57 www Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -3861,7 +3861,7 @@
 }
 
 sub checkforfile_js {
-    my $alertmsg = &mt('Please use the "Choose File" button to select a file from your local directory.');
+    my $alertmsg = &mt('Please use the browse button to select a file from your local directory.');
     my $result = &Apache::lonhtmlcommon::scripttag(<<CSVFORMJS);
     function checkUpload(formname) {
 	if (formname.upfile.value == "") {
@@ -4057,6 +4057,9 @@
                     my $pcr=$entries{$fields{$dest}} / $wgt;
                     my $award=($pcr == 0) ? 'incorrect_by_override'
                                           : 'correct_by_override';
+                    if ($pcr>1) {
+                       push(@skipped,&mt("[_1]: point value larger than weight","$username:$domain"));
+                    }
                     $grades{"resource.$part.awarded"}=$pcr;
                     $grades{"resource.$part.solved"}=$award;
                     $points{$part}=1;