diff --git a/grade/report/grader/classes/privacy/provider.php b/grade/report/grader/classes/privacy/provider.php index 431a71761c0..dfa26465057 100644 --- a/grade/report/grader/classes/privacy/provider.php +++ b/grade/report/grader/classes/privacy/provider.php @@ -53,7 +53,6 @@ class provider implements // There are several user preferences (shared between different courses). // Show/hide toggles preferences. $items->add_user_preference('grade_report_showcalculations', 'privacy:metadata:preference:grade_report_showcalculations'); - $items->add_user_preference('grade_report_showeyecons', 'privacy:metadata:preference:grade_report_showeyecons'); $items->add_user_preference('grade_report_showaverages', 'privacy:metadata:preference:grade_report_showaverages'); $items->add_user_preference('grade_report_showlocks', 'privacy:metadata:preference:grade_report_showlocks'); $items->add_user_preference('grade_report_showuserimage', 'privacy:metadata:preference:grade_report_showuserimage'); @@ -92,7 +91,6 @@ class provider implements $transformedvalue = null; switch ($name) { case 'grade_report_showcalculations': - case 'grade_report_showeyecons': case 'grade_report_showaverages': case 'grade_report_showlocks': case 'grade_report_showuserimage': diff --git a/grade/report/grader/lang/en/deprecated.txt b/grade/report/grader/lang/en/deprecated.txt index 278741afbc3..71f5642efb9 100644 --- a/grade/report/grader/lang/en/deprecated.txt +++ b/grade/report/grader/lang/en/deprecated.txt @@ -6,3 +6,4 @@ ajaxerror,gradereport_grader ajaxfailedupdate,gradereport_grader ajaxfieldchanged,gradereport_grader ajaxchoosescale,gradereport_grader +privacy:metadata:preference:grade_report_showeyecons,gradereport_grader diff --git a/grade/report/grader/lang/en/gradereport_grader.php b/grade/report/grader/lang/en/gradereport_grader.php index b331885947f..0a42e6987bb 100644 --- a/grade/report/grader/lang/en/gradereport_grader.php +++ b/grade/report/grader/lang/en/gradereport_grader.php @@ -40,7 +40,6 @@ $string['privacy:metadata:preference:grade_report_showactivityicons'] = 'Whether $string['privacy:metadata:preference:grade_report_showanalysisicon'] = 'Whether to show grade analysis icon by default. If the activity module supports it, the grade analysis icon links to a page with more detailed explanation of the grade and how it was obtained.'; $string['privacy:metadata:preference:grade_report_showaverages'] = 'Whether to display an additional row with the average (mean) for each category and grade item'; $string['privacy:metadata:preference:grade_report_showcalculations'] = 'Whether a calculator icon for each grade item and category with a visual indicator that a grade item is calculated is displayed or not when editing is turned on'; -$string['privacy:metadata:preference:grade_report_showeyecons'] = 'Whether to display the show/hide icon for each grade for controlling its visibility to the student'; $string['privacy:metadata:preference:grade_report_showlocks'] = 'Whether to display a lock/unlock icon for each grade for controlling if the grade can be automatically updated by the related activity when editing is turned on'; $string['privacy:metadata:preference:grade_report_shownumberofgrades'] = 'Whether to display in brackets after each average the number of grades used when calculating the average'; $string['privacy:metadata:preference:grade_report_showonlyactiveenrol'] = 'Whether to display only active enrolled users (not suspended) in gradebook report or all the enrolled users'; @@ -54,6 +53,7 @@ $string['overriddengrade'] = 'Overridden grade'; $string['cellactions'] = 'Cell actions'; // Deprecated since Moodle 4.2. +$string['privacy:metadata:preference:grade_report_showeyecons'] = 'Whether to display the show/hide icon for each grade for controlling its visibility to the student'; $string['privacy:metadata:preference:grade_report_showquickfeedback'] = 'Whether to display a feedback text input box with a dotted border for each grade, allowing the feedback for many grades to be edited at the same time'; $string['privacy:metadata:preference:grade_report_enableajax'] = 'Whether to add a layer of AJAX functionality to the grader report, simplifying and speeding up common operations'; $string['useractivityfeedback'] = '{$a} feedback'; diff --git a/grade/report/grader/lib.php b/grade/report/grader/lib.php index 4b84fa038ac..043e5e2c448 100644 --- a/grade/report/grader/lib.php +++ b/grade/report/grader/lib.php @@ -1657,9 +1657,7 @@ class grade_report_grader extends grade_report { $editcalculationicon = $this->gtree->get_calculation_icon($element, $this->gpr); } - if ($this->get_pref('showeyecons')) { - $showhideicon = $this->gtree->get_hiding_icon($element, $this->gpr); - } + $showhideicon = $this->gtree->get_hiding_icon($element, $this->gpr); if ($this->get_pref('showlocks')) { $lockunlockicon = $this->gtree->get_locking_icon($element, $this->gpr); diff --git a/grade/report/grader/preferences_form.php b/grade/report/grader/preferences_form.php index 691427877d1..fe096d721cb 100644 --- a/grade/report/grader/preferences_form.php +++ b/grade/report/grader/preferences_form.php @@ -58,7 +58,6 @@ class grader_report_preferences_form extends moodleform { $preferences['prefshow']['showcalculations'] = $checkbox_default; - $preferences['prefshow']['showeyecons'] = $checkbox_default; if ($canviewhidden) { $preferences['prefshow']['showaverages'] = $checkbox_default; } diff --git a/grade/report/grader/settings.php b/grade/report/grader/settings.php index ee4ef2b1b08..317e68234b5 100644 --- a/grade/report/grader/settings.php +++ b/grade/report/grader/settings.php @@ -50,9 +50,6 @@ if ($ADMIN->fulltree) { get_string('showcalculations', 'grades'), get_string('showcalculations_help', 'grades'), 1)); - $settings->add(new admin_setting_configcheckbox('grade_report_showeyecons', get_string('showeyecons', 'grades'), - get_string('showeyecons_help', 'grades'), 0)); - $settings->add(new admin_setting_configcheckbox('grade_report_showaverages', get_string('showaverages', 'grades'), get_string('showaverages_help', 'grades'), 1)); diff --git a/lang/en/deprecated.txt b/lang/en/deprecated.txt index 3c72dc71bc6..83ec07aab38 100644 --- a/lang/en/deprecated.txt +++ b/lang/en/deprecated.txt @@ -74,3 +74,5 @@ showquickfeedback,core_grades showquickfeedback_help,core_grades enableajax,core_grades enableajax_help,core_grades +showeyecons,core_grades +showeyecons_help,core_grades diff --git a/lang/en/grades.php b/lang/en/grades.php index 992006559d2..cb68dacbb31 100644 --- a/lang/en/grades.php +++ b/lang/en/grades.php @@ -784,8 +784,6 @@ $string['showaverages'] = 'Show column averages'; $string['showaverages_help'] = 'If enabled, the grader report will contain an additional row displaying the average (mean) for each category and grade item.'; $string['showcalculations'] = 'Show calculations'; $string['showcalculations_help'] = 'If enabled, when editing, a calculator icon is shown for each grade item and category with a visual indicator that a grade item is calculated.'; -$string['showeyecons'] = 'Show show/hide icons'; -$string['showeyecons_help'] = 'If enabled, when editing is turned on, a show/hide icon is shown for each grade for controlling its visibility to the student.'; $string['showgroups'] = 'Show groups'; $string['showhiddenitems'] = 'Show hidden items'; $string['showhiddenitems_help'] = 'Whether hidden grade items are hidden entirely or if the names of hidden grade items are visible to students. @@ -909,6 +907,8 @@ $string['tabs'] = 'Tabs'; $string['combo'] = 'Tabs and drop-down menu'; // Deprecated since Moodle 4.2. +$string['showeyecons'] = 'Show show/hide icons'; +$string['showeyecons_help'] = 'If enabled, when editing is turned on, a show/hide icon is shown for each grade for controlling its visibility to the student.'; $string['showquickfeedback'] = 'Show quick feedback'; $string['showquickfeedback_help'] = 'If enabled, when editing is turned on, a feedback text input box with a dotted border appears for each grade, allowing the feedback for many grades to be edited at the same time. Changes are saved and highlighted when the update button is clicked. diff --git a/lib/upgrade.txt b/lib/upgrade.txt index 62906ec8483..c8407c8c01e 100644 --- a/lib/upgrade.txt +++ b/lib/upgrade.txt @@ -3,6 +3,7 @@ information provided here is intended especially for developers. === 4.2 === +* 'Show show/hide icons' setting has been removed from grader report (link is moved to grade action menu) * 'Enable AJAX' interface has been deprecated for grader report * 'Quick feedback' interface has been deprecated for grader report * \single_button constructor signature has been changed to manage more types than just primary buttons.