[LON-CAPA-cvs] cvs: loncom /interface courseprefs.pm lonquickgrades.pm

[www]

www		Sat Nov 27 20:51:26 2010 EDT

  Modified files:              
    /loncom/interface	courseprefs.pm lonquickgrades.pm 
  Log:
  New grading mode: categories
  
  
Index: loncom/interface/courseprefs.pm
diff -u loncom/interface/courseprefs.pm:1.33 loncom/interface/courseprefs.pm:1.34
--- loncom/interface/courseprefs.pm:1.33	Fri Nov 19 14:56:14 2010
+++ loncom/interface/courseprefs.pm	Sat Nov 27 20:51:26 2010
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Handler to set configuration settings for a course
 #
-# $Id: courseprefs.pm,v 1.33 2010/11/19 14:56:14 raeburn Exp $
+# $Id: courseprefs.pm,v 1.34 2010/11/27 20:51:26 www Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -2742,11 +2742,12 @@
                    input => 'selectbox',
                    options => {
                                 standard => &mt('Standard: shows points'),
+                                categories => &mt('Categories: shows points according to categories'),
                                 external => &mt('External: shows number of completed parts and totals'),
                                 externalnototals => &mt('External: shows only number of completed parts'),
                                 spreadsheet => &mt('Spreadsheet: (with link to detailed scores)'), 
                               },
-                   order => ['standard','external','externalnototals','spreadsheet'],
+                   order => ['standard','categories','external','externalnototals','spreadsheet'],
                  },
         'rndseed' => {
                    text => '<b>'.&mt($itemtext->{'rndseed'}).'</b>'.
Index: loncom/interface/lonquickgrades.pm
diff -u loncom/interface/lonquickgrades.pm:1.49 loncom/interface/lonquickgrades.pm:1.50
--- loncom/interface/lonquickgrades.pm:1.49	Sat Nov 21 18:07:03 2009
+++ loncom/interface/lonquickgrades.pm	Sat Nov 27 20:51:26 2010
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Quick Student Grades Display
 #
-# $Id: lonquickgrades.pm,v 1.49 2009/11/21 18:07:03 www Exp $
+# $Id: lonquickgrades.pm,v 1.50 2010/11/27 20:51:26 www Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -68,6 +68,9 @@
       || ($env{'course.'.$env{'request.course.id'}.'.grading'} eq 'externalnototals'));
     my $notshowTotals=
         $env{'course.'.$env{'request.course.id'}.'.grading'} eq 'externalnototals';
+    my $showCategories=
+        $env{'course.'.$env{'request.course.id'}.'.grading'} eq 'categories';
+
 
     # Create the nav map
     my $navmap = Apache::lonnavmaps::navmap->new();