From: nicolasconnault <nicolasconnault>
Date: Fri, 14 Sep 2007 06:57:30 +0000 (+0000)
Subject: Issue:
X-Git-Url: http://git.mjollnir.org/gw?a=commitdiff_plain;h=098042baeae0e42b7a2fb6b4b5e8bf0b098df21f;p=moodle.git

Issue:
    The number of submissions in the Group average and Course average calculations
    should be shown in brackets. (submissions) should be added after the Group average
    and Course average labels.
Solution:
    new grader report preference (Display number of grades in average cells).
---

diff --git a/grade/report/grader/lib.php b/grade/report/grader/lib.php
index 4595f8f146..a3028083e0 100644
--- a/grade/report/grader/lib.php
+++ b/grade/report/grader/lib.php
@@ -791,7 +791,9 @@ class grade_report_grader extends grade_report {
 
         $averagesdisplaytype   = $this->get_pref('averagesdisplaytype');
         $averagesdecimalpoints = $this->get_pref('averagesdecimalpoints');
-        $meanselection = $this->get_pref('meanselection');
+        $meanselection         = $this->get_pref('meanselection');
+        $shownumberofgrades    = $this->get_pref('shownumberofgrades');
+
         $avghtml = '';
         $avgcssclass = 'avg';
 
@@ -923,7 +925,13 @@ class grade_report_grader extends grade_report {
                         $gradehtml = grade_grade::get_letter($letters, $gradeval, $item->grademin, $item->grademax);
                     }
 
-                    $avghtml .= '<td class="cell c' . $columncount++.'">'.$gradehtml.'</td>';
+                    $numberofgrades = '';
+
+                    if ($shownumberofgrades) {
+                        $numberofgrades = " ($mean_count)";
+                    }
+
+                    $avghtml .= '<td class="cell c' . $columncount++.'">'.$gradehtml.$numberofgrades.'</td>';
                 }
             }
             $avghtml .= '</tr>';
diff --git a/grade/report/grader/preferences_form.php b/grade/report/grader/preferences_form.php
index 592d15d58e..bf2542a892 100644
--- a/grade/report/grader/preferences_form.php
+++ b/grade/report/grader/preferences_form.php
@@ -66,6 +66,7 @@ class grader_report_preferences_form extends moodleform {
                                          'showactivityicons' => $checkbox_default);
 
         $preferences['prefrows'] = array(
+                    'shownumberofgrades'  => $checkbox_default,
                     'averagesdisplaytype'    => array(GRADE_REPORT_PREFERENCE_DEFAULT => 'default',
                                                       GRADE_REPORT_PREFERENCE_INHERIT => $strinherit,
                                                       GRADE_REPORT_GRADE_DISPLAY_TYPE_REAL => get_string('real', 'grades'),
diff --git a/grade/report/grader/settings.php b/grade/report/grader/settings.php
index d63ea3d9c5..252a1b662d 100644
--- a/grade/report/grader/settings.php
+++ b/grade/report/grader/settings.php
@@ -77,6 +77,9 @@ $settings->add(new admin_setting_configcheckbox('grade_report_showuserimage', ge
 $settings->add(new admin_setting_configcheckbox('grade_report_showactivityicons', get_string('showactivityicons', 'grades'),
                                             get_string('configshowactivityicons', 'grades'), 1));
 
+$settings->add(new admin_setting_configcheckbox('grade_report_shownumberofgrades', get_string('shownumberofgrades', 'grades'),
+                                            get_string('configshownumberofgrades', 'grades'), 0));
+
 $settings->add(new admin_setting_configselect('grade_report_averagesdisplaytype', get_string('averagesdisplaytype', 'grades'),
                                           get_string('configaveragesdisplaytype', 'grades'), false,
                                           array(GRADE_REPORT_PREFERENCE_INHERIT => $strinherit,
diff --git a/grade/report/grader/version.php b/grade/report/grader/version.php
index 36f52ca7ab..48c48f45d4 100644
--- a/grade/report/grader/version.php
+++ b/grade/report/grader/version.php
@@ -1,6 +1,6 @@
 <?PHP // $Id$
 
-$plugin->version  = 2007081001;
-$plugin->requires = 2007081001;
+$plugin->version  = 2007091400;
+$plugin->requires = 2007091400;
 
 ?>
diff --git a/lang/en_utf8/grades.php b/lang/en_utf8/grades.php
index 12cbe59d20..96b531df5c 100644
--- a/lang/en_utf8/grades.php
+++ b/lang/en_utf8/grades.php
@@ -82,6 +82,7 @@ $string['configshowaverages'] = 'Show column averages in the grader report.';
 $string['configshowgroups'] = 'Show group averages and means in the grader report.';
 $string['configshowlocks'] = 'Whether to show a lock/unlock icon near each grade.';
 $string['configshowfeedback'] = 'Whether to show a feedback icon (for adding/editing) near each grade.';
+$string['configshownumberofgrades'] = 'Shows the number of grades being aggregated next to each average, between brackets. Example: 45 (34).';
 $string['configshowranges'] = 'Display a row showing the range of possible for each grading item in the grader report.';
 $string['configshowuserimage'] = 'Whether to show the user\'s profile image next to the name in the grader report.';
 $string['configstudentsperpage'] = 'The number of students to display per page in the grader report.';
@@ -358,6 +359,7 @@ $string['showgroups'] = 'Show groups';
 $string['showhiddenitems'] = 'Show Hidden Items';
 $string['showlocks'] = 'Show locks';
 $string['shownooutcomes'] = 'Hide outcomes';
+$string['shownumberofgrades'] = 'Show number of grades in averages';
 $string['showranges'] = 'Show ranges';
 $string['showuserimage'] = 'Show user profile images';
 $string['sitedefault'] = 'Site default ($a)';
diff --git a/version.php b/version.php
index 90a61d1d60..4c1000c741 100644
--- a/version.php
+++ b/version.php
@@ -6,7 +6,7 @@
 // This is compared against the values stored in the database to determine
 // whether upgrades should be performed (see lib/db/*.php)
 
-    $version = 2007090600;  // YYYYMMDD = date
+    $version = 2007091400;  // YYYYMMDD = date
                             //       XY = increments within a single day
 
     $release = '1.9 Beta +';   // Human-friendly version name