From 2b937e35d6551e83c834fc0bf8fa63d8a6738520 Mon Sep 17 00:00:00 2001
From: Andrew Nicols <andrew@nicols.co.uk>
Date: Thu, 15 Aug 2019 08:29:59 +0800
Subject: [PATCH] MDL-66378 gradereport_singleview: Add missing label for
 dropdown

---
 .../report/singleview/classes/local/ui/dropdown_attribute.php  | 3 ++-
 grade/report/singleview/templates/dropdown_attribute.mustache  | 1 +
 grade/report/singleview/tests/behat/singleview.feature         | 2 +-
 .../gradereport_singleview/dropdown_attribute.mustache         | 1 +
 4 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/grade/report/singleview/classes/local/ui/dropdown_attribute.php b/grade/report/singleview/classes/local/ui/dropdown_attribute.php
index 50f1ce99667..06b37e1aa67 100644
--- a/grade/report/singleview/classes/local/ui/dropdown_attribute.php
+++ b/grade/report/singleview/classes/local/ui/dropdown_attribute.php
@@ -93,7 +93,8 @@ class dropdown_attribute extends element {
                     'value' => $option,
                     'selected' => $selected == $option
                 ];
-            }, array_keys($options))
+            }, array_keys($options)),
+            'label' => get_string('gradefor', 'gradereport_singleview', $this->label),
         );
 
         return $OUTPUT->render_from_template('gradereport_singleview/dropdown_attribute', $context);
diff --git a/grade/report/singleview/templates/dropdown_attribute.mustache b/grade/report/singleview/templates/dropdown_attribute.mustache
index e6388ca809e..adecdd8891f 100644
--- a/grade/report/singleview/templates/dropdown_attribute.mustache
+++ b/grade/report/singleview/templates/dropdown_attribute.mustache
@@ -17,6 +17,7 @@
 {{!
     Dropdown attribute.
 }}
+<label for="{{name}}" class="accesshide">{{label}}</label>
 <select id="{{name}}" name="{{name}}" tabindex="1" {{#disabled}}disabled{{/disabled}}>
     {{#options}}
         <option value="{{value}}" {{#selected}}selected{{/selected}}>{{name}}</option>
diff --git a/grade/report/singleview/tests/behat/singleview.feature b/grade/report/singleview/tests/behat/singleview.feature
index d86cdcffc39..e6a2dbc8103 100644
--- a/grade/report/singleview/tests/behat/singleview.feature
+++ b/grade/report/singleview/tests/behat/singleview.feature
@@ -87,7 +87,7 @@ Feature: We can use Single view
     And the field "Grade for james (Student) 1" matches value "12.05"
     And the field "Exclude for holly (Student) 2" matches value "1"
     And I select "new grade item 1" from the "Select grade item..." singleselect
-    And I click on "Very good" "option"
+    And I set the field "Grade for james (Student) 1" to "Very good"
     And I press "Save"
     Then I should see "Grades were set for 1 items"
     And I press "Continue"
diff --git a/theme/boost/templates/gradereport_singleview/dropdown_attribute.mustache b/theme/boost/templates/gradereport_singleview/dropdown_attribute.mustache
index 9f3be1a882d..5bdb6579938 100644
--- a/theme/boost/templates/gradereport_singleview/dropdown_attribute.mustache
+++ b/theme/boost/templates/gradereport_singleview/dropdown_attribute.mustache
@@ -17,6 +17,7 @@
 {{!
     Dropdown attribute.
 }}
+<label for="{{name}}" class="accesshide">{{label}}</label>
 <select id="{{name}}" name="{{name}}" class="custom-select" tabindex="1" {{#disabled}}disabled{{/disabled}}>
     {{#options}}
         <option value="{{value}}" {{#selected}}selected{{/selected}}>{{name}}</option>