From 5cb18337cb760fc27129ede56c5a8ae9e097f3bd Mon Sep 17 00:00:00 2001 From: Ilya Tregubov Date: Wed, 4 Jan 2023 09:39:49 +0700 Subject: [PATCH] MDL-76146 gradereport_grader: Remove show grade analysis icon preference --- grade/report/grader/classes/privacy/provider.php | 2 -- grade/report/grader/lang/en/deprecated.txt | 1 + grade/report/grader/lang/en/gradereport_grader.php | 2 +- grade/report/grader/lib.php | 2 +- grade/report/grader/preferences_form.php | 1 - grade/report/grader/settings.php | 3 --- lang/en/deprecated.txt | 3 +++ lang/en/grades.php | 6 +++--- lib/upgrade.txt | 1 + 9 files changed, 10 insertions(+), 11 deletions(-) diff --git a/grade/report/grader/classes/privacy/provider.php b/grade/report/grader/classes/privacy/provider.php index 0b35e810755..1b6766894c6 100644 --- a/grade/report/grader/classes/privacy/provider.php +++ b/grade/report/grader/classes/privacy/provider.php @@ -57,7 +57,6 @@ class provider implements $items->add_user_preference('grade_report_showuserimage', 'privacy:metadata:preference:grade_report_showuserimage'); $items->add_user_preference('grade_report_showactivityicons', 'privacy:metadata:preference:grade_report_showactivityicons'); $items->add_user_preference('grade_report_showranges', 'privacy:metadata:preference:grade_report_showranges'); - $items->add_user_preference('grade_report_showanalysisicon', 'privacy:metadata:preference:grade_report_showanalysisicon'); // Special rows preferences. $items->add_user_preference('grade_report_rangesdisplaytype', 'privacy:metadata:preference:grade_report_rangesdisplaytype'); $items->add_user_preference('grade_report_rangesdecimalpoints', 'privacy:metadata:preference:grade_report_rangesdecimalpoints'); @@ -94,7 +93,6 @@ class provider implements case 'grade_report_showuserimage': case 'grade_report_showactivityicons': case 'grade_report_showranges': - case 'grade_report_showanalysisicon': case 'grade_report_shownumberofgrades': case 'grade_report_quickgrading': case 'grade_report_showonlyactiveenrol': diff --git a/grade/report/grader/lang/en/deprecated.txt b/grade/report/grader/lang/en/deprecated.txt index 32c14d0f810..f392f86e06f 100644 --- a/grade/report/grader/lang/en/deprecated.txt +++ b/grade/report/grader/lang/en/deprecated.txt @@ -8,3 +8,4 @@ ajaxfieldchanged,gradereport_grader ajaxchoosescale,gradereport_grader privacy:metadata:preference:grade_report_showeyecons,gradereport_grader privacy:metadata:preference:grade_report_showlocks,gradereport_grader +privacy:metadata:preference:grade_report_showanalysisicon,gradereport_grader diff --git a/grade/report/grader/lang/en/gradereport_grader.php b/grade/report/grader/lang/en/gradereport_grader.php index 10a8ac452f2..b549e0f1de0 100644 --- a/grade/report/grader/lang/en/gradereport_grader.php +++ b/grade/report/grader/lang/en/gradereport_grader.php @@ -37,7 +37,6 @@ $string['privacy:metadata:preference:grade_report_quickgrading'] = 'Whether to d $string['privacy:metadata:preference:grade_report_rangesdecimalpoints'] = 'The number of decimal places to display for each range or whether the overall decimal places setting for the category or grade item is used (inherit)'; $string['privacy:metadata:preference:grade_report_rangesdisplaytype'] = 'Whether the range is displayed as real grades, percentages or letters, or whether the display type for the category or grade item is used (inherit)'; $string['privacy:metadata:preference:grade_report_showactivityicons'] = 'Whether to show the activity icons next to activity names'; -$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_shownumberofgrades'] = 'Whether to display in brackets after each average the number of grades used when calculating the average'; @@ -52,6 +51,7 @@ $string['overriddengrade'] = 'Overridden grade'; $string['cellactions'] = 'Cell actions'; // Deprecated since Moodle 4.2. +$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_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_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'; diff --git a/grade/report/grader/lib.php b/grade/report/grader/lib.php index f4cb8cbf3bc..2cc868d8dee 100644 --- a/grade/report/grader/lib.php +++ b/grade/report/grader/lib.php @@ -1663,7 +1663,7 @@ class grade_report_grader extends grade_report { } $gradeanalysisicon = ''; - if ($this->get_pref('showanalysisicon') && $element['type'] == 'grade') { + if ($element['type'] == 'grade') { $gradeanalysisicon .= $this->gtree->get_grade_analysis_icon($element['object']); } diff --git a/grade/report/grader/preferences_form.php b/grade/report/grader/preferences_form.php index 9fe48329803..485934dc4ff 100644 --- a/grade/report/grader/preferences_form.php +++ b/grade/report/grader/preferences_form.php @@ -108,7 +108,6 @@ class grader_report_preferences_form extends moodleform { $preferences['prefshow']['showuserimage'] = $checkbox_default; $preferences['prefshow']['showactivityicons'] = $checkbox_default; $preferences['prefshow']['showranges'] = $checkbox_default; - $preferences['prefshow']['showanalysisicon'] = $checkbox_default; if ($canviewhidden) { $preferences['prefrows']['shownumberofgrades'] = $checkbox_default; diff --git a/grade/report/grader/settings.php b/grade/report/grader/settings.php index a3c19146b43..716b47ec797 100644 --- a/grade/report/grader/settings.php +++ b/grade/report/grader/settings.php @@ -56,9 +56,6 @@ if ($ADMIN->fulltree) { $settings->add(new admin_setting_configcheckbox('grade_report_showranges', get_string('showranges', 'grades'), get_string('showranges_help', 'grades'), 0)); - $settings->add(new admin_setting_configcheckbox('grade_report_showanalysisicon', get_string('showanalysisicon', 'core_grades'), - get_string('showanalysisicon_desc', 'core_grades'), 1)); - $settings->add(new admin_setting_configcheckbox('grade_report_showuserimage', get_string('showuserimage', 'grades'), get_string('showuserimage_help', 'grades'), 1)); diff --git a/lang/en/deprecated.txt b/lang/en/deprecated.txt index 3533409ac8d..c9277cc2de2 100644 --- a/lang/en/deprecated.txt +++ b/lang/en/deprecated.txt @@ -78,3 +78,6 @@ showeyecons,core_grades showeyecons_help,core_grades showlocks,core_grades showlocks_help,core_grades +showanalysisicon,core_grades +showanalysisicon_desc,core_grades +showanalysisicon_help,core_grades diff --git a/lang/en/grades.php b/lang/en/grades.php index 4ae0e6475f9..b275f13b54d 100644 --- a/lang/en/grades.php +++ b/lang/en/grades.php @@ -753,9 +753,6 @@ $string['setting'] = 'Setting'; $string['settings'] = 'Settings'; $string['setup'] = 'Setup'; $string['setweights'] = 'Set weights'; -$string['showanalysisicon'] = 'Show grade analysis icon'; -$string['showanalysisicon_desc'] = '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['showanalysisicon_help'] = '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['showaverage'] = 'Show average'; $string['showaverage_help'] = 'Whether to show an average column. Note that participants may be able to estimate others\' grades if the average is calculated from a small number of grades. For performance reasons the average is approximate if it is dependent on any hidden items.'; $string['showcontributiontocoursetotal'] = 'Show contribution to course total'; @@ -905,6 +902,9 @@ $string['tabs'] = 'Tabs'; $string['combo'] = 'Tabs and drop-down menu'; // Deprecated since Moodle 4.2. +$string['showanalysisicon'] = 'Show grade analysis icon'; +$string['showanalysisicon_desc'] = '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['showanalysisicon_help'] = '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['showlocks'] = 'Show locks'; $string['showlocks_help'] = 'If enabled, when editing is turned on, a lock/unlock icon is shown for each grade for controlling whether the grade can be automatically updated by the related activity.'; $string['showeyecons'] = 'Show show/hide icons'; diff --git a/lib/upgrade.txt b/lib/upgrade.txt index f783f82c845..2fa0403ec0c 100644 --- a/lib/upgrade.txt +++ b/lib/upgrade.txt @@ -3,6 +3,7 @@ information provided here is intended especially for developers. === 4.2 === +* 'Show grade analysis icon' setting has been removed from grader report (link is moved to grade action menu) * 'Show locks' setting has been removed from grader report (link is moved to grade action menu) * '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