From 4baf254f5a347218e154c57dfded3dec8d8c6faf Mon Sep 17 00:00:00 2001 From: moodler Date: Mon, 8 Oct 2007 06:55:34 +0000 Subject: [PATCH] Re-ordered some preferences to be a bit more logical --- grade/report/grader/preferences.php | 2 +- grade/report/grader/preferences_form.php | 16 ++++++++-------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/grade/report/grader/preferences.php b/grade/report/grader/preferences.php index b61b1f0a2e..9fa9e034bc 100644 --- a/grade/report/grader/preferences.php +++ b/grade/report/grader/preferences.php @@ -88,7 +88,7 @@ if (has_capability('moodle/site:config', $systemcontext)) { print_simple_box_start("center"); -include('./preferences_form.php'); +require('preferences_form.php'); $mform = new grader_report_preferences_form('preferences.php', compact('course')); echo $mform->display(); print_simple_box_end(); diff --git a/grade/report/grader/preferences_form.php b/grade/report/grader/preferences_form.php index bed4d87e4d..1081115215 100644 --- a/grade/report/grader/preferences_form.php +++ b/grade/report/grader/preferences_form.php @@ -37,10 +37,7 @@ class grader_report_preferences_form extends moodleform { 'aggregationview' => array(GRADE_REPORT_PREFERENCE_DEFAULT => '*default*', GRADE_REPORT_AGGREGATION_VIEW_FULL => get_string('fullmode', 'grades'), GRADE_REPORT_AGGREGATION_VIEW_AGGREGATES_ONLY => get_string('aggregatesonly', 'grades'), - GRADE_REPORT_AGGREGATION_VIEW_GRADES_ONLY => get_string('gradesonly', 'grades')), - 'meanselection' => array(GRADE_REPORT_PREFERENCE_DEFAULT => '*default*', - GRADE_REPORT_MEAN_ALL => get_string('meanall', 'grades'), - GRADE_REPORT_MEAN_GRADED => get_string('meangraded', 'grades'))); + GRADE_REPORT_AGGREGATION_VIEW_GRADES_ONLY => get_string('gradesonly', 'grades'))); $preferences['prefshow'] = array('showcalculations' => $checkbox_default, @@ -50,18 +47,21 @@ class grader_report_preferences_form extends moodleform { 'showlocks' => $checkbox_default); $preferences['prefrows'] = array( - 'averagesdisplaytype' => array(GRADE_REPORT_PREFERENCE_DEFAULT => get_string('default'), + 'rangesdisplaytype' => array(GRADE_REPORT_PREFERENCE_DEFAULT => get_string('default'), GRADE_DISPLAY_TYPE_REAL => get_string('real', 'grades'), GRADE_DISPLAY_TYPE_PERCENTAGE => get_string('percentage', 'grades'), GRADE_DISPLAY_TYPE_LETTER => get_string('letter', 'grades')), - 'rangesdisplaytype' => array(GRADE_REPORT_PREFERENCE_DEFAULT => get_string('default'), + 'rangesdecimalpoints' => array(GRADE_REPORT_PREFERENCE_DEFAULT => get_string('default'), + '0'=>0, '1'=>1, '2'=>2, '3'=>3, '4'=>4, '5'=>5), + 'averagesdisplaytype' => array(GRADE_REPORT_PREFERENCE_DEFAULT => get_string('default'), GRADE_DISPLAY_TYPE_REAL => get_string('real', 'grades'), GRADE_DISPLAY_TYPE_PERCENTAGE => get_string('percentage', 'grades'), GRADE_DISPLAY_TYPE_LETTER => get_string('letter', 'grades')), 'averagesdecimalpoints' => array(GRADE_REPORT_PREFERENCE_DEFAULT => get_string('default'), '0'=>0, '1'=>1, '2'=>2, '3'=>3, '4'=>4, '5'=>5), - 'rangesdecimalpoints' => array(GRADE_REPORT_PREFERENCE_DEFAULT => get_string('default'), - '0'=>0, '1'=>1, '2'=>2, '3'=>3, '4'=>4, '5'=>5)); + 'meanselection' => array(GRADE_REPORT_PREFERENCE_DEFAULT => '*default*', + GRADE_REPORT_MEAN_ALL => get_string('meanall', 'grades'), + GRADE_REPORT_MEAN_GRADED => get_string('meangraded', 'grades'))); } -- 2.39.5