From 4229e9fa8df30f1310f43c73c77c273b53f41b60 Mon Sep 17 00:00:00 2001
From: Zachary Durber <zdurber@gmail.com>
Date: Tue, 23 Sep 2014 04:12:26 +0000
Subject: [PATCH] MDL-18229 gradebook: Added filter icons for activities and
 users.

Corrected CSS for grades column, was far too large.
---
 grade/report/single_view/classes/lib.php                    | 1 -
 .../report/single_view/lang/en/gradereport_single_view.php  | 2 +-
 grade/report/single_view/screens/grade/lib.php              | 6 ++++--
 grade/report/single_view/screens/user/lib.php               | 4 +++-
 grade/report/single_view/styles.css                         | 4 ++++
 lang/en/grades.php                                          | 1 +
 6 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/grade/report/single_view/classes/lib.php b/grade/report/single_view/classes/lib.php
index 4347e47eecb..9b9265c7398 100644
--- a/grade/report/single_view/classes/lib.php
+++ b/grade/report/single_view/classes/lib.php
@@ -324,7 +324,6 @@ abstract class single_view_tablelike extends single_view_screen implements tabba
             $tab = ($i * $this->total) + $this->index;
 
             $html = $this->factory()->create($field)->format($grade, $tab);
-
             if ($field == 'finalgrade' and !empty($this->structure)) {
                 $html .= $this->structure->get_grade_analysis_icon($grade);
             }
diff --git a/grade/report/single_view/lang/en/gradereport_single_view.php b/grade/report/single_view/lang/en/gradereport_single_view.php
index fbd53fe7a7c..e3ce90beb42 100755
--- a/grade/report/single_view/lang/en/gradereport_single_view.php
+++ b/grade/report/single_view/lang/en/gradereport_single_view.php
@@ -27,7 +27,7 @@ $string['pluginname'] = 'Single view';
 $string['single_view:view'] = 'View the '.$string['pluginname'].' report';
 
 $string['not_allowed'] = 'Not allowed to quick edit this item';
-
+$string['filtergrades'] = 'Show grades for {$a}.';
 $string['no_screens'] = 'Could not find a suitable Single view screen.';
 
 $string['exclude'] = 'Exclude';
diff --git a/grade/report/single_view/screens/grade/lib.php b/grade/report/single_view/screens/grade/lib.php
index 74541d8ed40..ebfbca1fc34 100644
--- a/grade/report/single_view/screens/grade/lib.php
+++ b/grade/report/single_view/screens/grade/lib.php
@@ -109,7 +109,8 @@ class single_view_grade extends single_view_tablelike
 
     public function original_headers() {
         $headers = array(
-            '',
+            '', // for filter icon.
+            '', // for user picture.
             get_string('firstname') . ' (' . get_string('alternatename') . ') ' . get_string('lastname'),
             get_string('range', 'grades'),
             get_string('grade', 'grades'),
@@ -142,7 +143,8 @@ class single_view_grade extends single_view_tablelike
 
         $item->imagealt = $fullname;
 
-        $line = array(
+        $line = array( 
+            $OUTPUT->action_icon($this->format_link('grade', $item->id), new pix_icon('t/editstring', get_string('filtergrades', 'gradereport_single_view', $fullname))),
             $OUTPUT->user_picture($item),
             $this->format_link('user', $item->id, $fullname),
             $this->item_range()
diff --git a/grade/report/single_view/screens/user/lib.php b/grade/report/single_view/screens/user/lib.php
index 2141641cc07..f472e10a791 100644
--- a/grade/report/single_view/screens/user/lib.php
+++ b/grade/report/single_view/screens/user/lib.php
@@ -47,7 +47,8 @@ class single_view_user extends single_view_tablelike implements selectable_items
 
     public function original_headers() {
         return array(
-            '',
+            '', // for filter icon.
+            '', // for activity icon.
             get_string('assessmentname', 'gradereport_single_view'),
             get_string('gradecategory', 'grades'),
             get_string('range', 'grades'),
@@ -72,6 +73,7 @@ class single_view_user extends single_view_tablelike implements selectable_items
              $lockicon =  $OUTPUT->pix_icon('t/locked', 'grade is locked');
 
         $line = array(
+            $OUTPUT->action_icon($this->format_link('grade', $item->id), new pix_icon('t/editstring', get_string('filtergrades', 'gradereport_single_view', $item->get_name()))),
             $this->format_icon($item) . $lockicon,
             $this->format_link('grade', $item->id, $item->get_name()),
             $this->category($item),
diff --git a/grade/report/single_view/styles.css b/grade/report/single_view/styles.css
index f6b58710bc3..90b023d0f08 100644
--- a/grade/report/single_view/styles.css
+++ b/grade/report/single_view/styles.css
@@ -25,3 +25,7 @@
 #page-grade-report-single_view-index div.generalbox h2 {
    text-align: center;
 }
+
+input[name^="finalgrade"] {
+    width: 50px;
+}
diff --git a/lang/en/grades.php b/lang/en/grades.php
index 118d3663db4..31816c06ca4 100644
--- a/lang/en/grades.php
+++ b/lang/en/grades.php
@@ -654,6 +654,7 @@ $string['showrank_help'] = 'Show the position of the student in relation to the
 $string['showuserimage'] = 'Show user profile images';
 $string['showuserimage_help'] = 'Whether to show the user\'s profile image next to the name in the grader report.';
 $string['showverbose'] = 'Show {$a->category} {$a->itemmodule} {$a->itemname}';
+$string['simpleview'] = 'Single view';
 $string['sitewide'] = 'Site-wide';
 $string['sort'] = 'sort';
 $string['sortasc'] = 'Sort in ascending order';