From ccdda8550b668474820849d55bfdff5e31e2c6da Mon Sep 17 00:00:00 2001
From: Cameron Ball <cameron@moodle.com>
Date: Wed, 24 Feb 2016 10:30:43 +0800
Subject: [PATCH] MDL-53214 grades: Ensure grader report correctly labels
 fields.

The editable fields for the grader report should have unique labels.
Previously category grade items were not being labelled with the
category name.
---
 grade/report/grader/lib.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/grade/report/grader/lib.php b/grade/report/grader/lib.php
index d0b13f51281..e8bfbe73c83 100644
--- a/grade/report/grader/lib.php
+++ b/grade/report/grader/lib.php
@@ -1067,7 +1067,7 @@ class grade_report_grader extends grade_report {
                                 $nogradestr = $this->get_lang_string('nooutcome', 'grades');
                             }
                             $attributes = array('tabindex' => $tabindices[$item->id]['grade'], 'id'=>'grade_'.$userid.'_'.$item->id);
-                            $gradelabel = $fullname . ' ' . $item->itemname;
+                            $gradelabel = $fullname . ' ' . $item->get_name(true);
                             $itemcell->text .= html_writer::label(
                                 get_string('useractivitygrade', 'gradereport_grader', $gradelabel), $attributes['id'], false,
                                     array('class' => 'accesshide'));
@@ -1087,7 +1087,7 @@ class grade_report_grader extends grade_report {
                     } else if ($item->gradetype != GRADE_TYPE_TEXT) { // Value type
                         if ($quickgrading and $grade->is_editable()) {
                             $value = format_float($gradeval, $decimalpoints);
-                            $gradelabel = $fullname . ' ' . $item->itemname;
+                            $gradelabel = $fullname . ' ' . $item->get_name(true);
                             $itemcell->text .= '<label class="accesshide" for="grade_'.$userid.'_'.$item->id.'">'
                                           .get_string('useractivitygrade', 'gradereport_grader', $gradelabel).'</label>';
                             $itemcell->text .= '<input size="6" tabindex="' . $tabindices[$item->id]['grade']