[LON-CAPA-cvs] cvs: loncom /interface lonparmset.pm lonquickgrades.pm /interface/spreadsheet lonspreadsheet.pm

[albertel]

albertel		Fri Nov 21 13:18:04 2003 EDT

  Modified files:              
    /loncom/interface	lonparmset.pm lonquickgrades.pm 
    /loncom/interface/spreadsheet	lonspreadsheet.pm 
  Log:
  - BUG#2389, new gradin mode external, doesn't show points on quickgrades, but also doesn't show link to SPRS
  
  
Index: loncom/interface/lonparmset.pm
diff -u loncom/interface/lonparmset.pm:1.137 loncom/interface/lonparmset.pm:1.138
--- loncom/interface/lonparmset.pm:1.137	Tue Nov 18 17:21:00 2003
+++ loncom/interface/lonparmset.pm	Fri Nov 21 13:18:04 2003
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Handler to set parameters for assessments
 #
-# $Id: lonparmset.pm,v 1.137 2003/11/18 22:21:00 albertel Exp $
+# $Id: lonparmset.pm,v 1.138 2003/11/21 18:18:04 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -1520,8 +1520,8 @@
              'courseid'       => '<b>Course ID or number</b><br />'.
                                  '(internal, optional)',
              'grading'        => '<b>Grading</b>'.
-                                 '"standard" or any other value.  '.
-                                 'Default for new courses is "standard".',
+                                 '"standard", "external", or any other value.'.
+                                 '  Default for new courses is "standard".',
 
              'default_xml_style' => '<b>Default XML Style File</b> '.
                     '<a href="javascript:openbrowser'.
Index: loncom/interface/lonquickgrades.pm
diff -u loncom/interface/lonquickgrades.pm:1.28 loncom/interface/lonquickgrades.pm:1.29
--- loncom/interface/lonquickgrades.pm:1.28	Thu Sep 25 15:22:14 2003
+++ loncom/interface/lonquickgrades.pm	Fri Nov 21 13:18:04 2003
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Quick Student Grades Display
 #
-# $Id: lonquickgrades.pm,v 1.28 2003/09/25 19:22:14 bowersj2 Exp $
+# $Id: lonquickgrades.pm,v 1.29 2003/11/21 18:18:04 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -67,6 +67,8 @@
 
     my $showPoints = 
         $ENV{'course.'.$ENV{'request.course.id'}.'.grading'} eq 'standard';
+    my $notshowSPRSlink = 
+        $ENV{'course.'.$ENV{'request.course.id'}.'.grading'} eq 'external';
 
     # Create the nav map
     my $navmap = Apache::lonnavmaps::navmap->new();
@@ -85,7 +87,7 @@
     my $title = $showPoints ? "Quick Points Display" : "Quick Completed Problems Display";
     $r->print(&Apache::loncommon::bodytag($title, '', ''));
 
-    if (!$showPoints) {
+    if (!$showPoints && !$notshowSPRSlink ) {
         $r->print(<<HEADER); 
 <p>This screen shows how many problems (or problem parts) you have completed, and
 how many you have not yet done. You can also look at <a href="/adm/studentcalc">a detailed
Index: loncom/interface/spreadsheet/lonspreadsheet.pm
diff -u loncom/interface/spreadsheet/lonspreadsheet.pm:1.29 loncom/interface/spreadsheet/lonspreadsheet.pm:1.30
--- loncom/interface/spreadsheet/lonspreadsheet.pm:1.29	Tue Nov 11 15:27:15 2003
+++ loncom/interface/spreadsheet/lonspreadsheet.pm	Fri Nov 21 13:18:04 2003
@@ -1,5 +1,5 @@
 #
-# $Id: lonspreadsheet.pm,v 1.29 2003/11/11 20:27:15 albertel Exp $
+# $Id: lonspreadsheet.pm,v 1.30 2003/11/21 18:18:04 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -227,9 +227,12 @@
     }
     my $courseid = $ENV{'request.course.id'};
     #
-    # Do not allow students to continue if standard grading is in effect.
+    # Do not allow students to continue if standard or external grading is in
+    # effect.
+    #
     if ($ENV{'request.role'} =~ /^st\./) {
-        if ($ENV{'course.'.$courseid.'.grading'} eq 'standard') {
+        if ($ENV{'course.'.$courseid.'.grading'} eq 'standard' ||
+	    $ENV{'course.'.$courseid.'.grading'} eq 'external' ) {
             return HTTP_NOT_ACCEPTABLE;
         }
     }