From 126d92d3dda2672ab494bf44966d834905a1c65d Mon Sep 17 00:00:00 2001 From: nicolasconnault Date: Wed, 4 Mar 2009 14:20:45 +0000 Subject: [PATCH] MDL-18228 Fixed the language issue and removed the grader report preference --- grade/edit/tree/index.php | 8 +++++++- grade/report/grader/lib.php | 6 +++--- grade/report/grader/preferences_form.php | 1 - grade/report/grader/styles.php | 1 + lang/en_utf8/grades.php | 4 ++-- 5 files changed, 13 insertions(+), 7 deletions(-) diff --git a/grade/edit/tree/index.php b/grade/edit/tree/index.php index 918960dcf3..39f61fdebd 100644 --- a/grade/edit/tree/index.php +++ b/grade/edit/tree/index.php @@ -246,7 +246,13 @@ if ($form_key && $data = data_submitted()) { // Grade item text inputs } elseif (preg_match('/(grademax|aggregationcoef|multfactor|plusfactor)_([0-9]*)/', $key, $matches)) { - $value = required_param($matches[0], PARAM_NUMBER); + $defaults = array('grademax' => 100, 'aggregationcoef' => 1, 'multfactor' => 1, 'plusfactor' => 0); + + if (is_string($_POST[$matches[0]]) && strlen($_POST[$matches[0]]) < 1) { + $_POST[$matches[0]] = null; + } + $value = optional_param($matches[0], $defaults[$matches[1]], PARAM_NUMBER); + $param = $matches[1]; $a->id = $matches[2]; $grade_item = grade_item::fetch(array('id'=>$a->id, 'courseid'=>$courseid)); diff --git a/grade/report/grader/lib.php b/grade/report/grader/lib.php index 481eeb3b83..293df0e62f 100644 --- a/grade/report/grader/lib.php +++ b/grade/report/grader/lib.php @@ -503,7 +503,7 @@ class grade_report_grader extends grade_report { global $CFG, $USER; $this->rowcount = 0; - $fixedstudents = empty($USER->screenreader) && $this->get_pref('fixedstudents'); + $fixedstudents = empty($USER->screenreader) && $CFG->grade_report_fixedstudents; if (!$fixedstudents) { $strsortasc = $this->get_lang_string('sortasc', 'grades'); @@ -676,7 +676,7 @@ class grade_report_grader extends grade_report { $numusers = count($this->users); $showuserimage = $this->get_pref('showuserimage'); $showuseridnumber = $this->get_pref('showuseridnumber'); - $fixedstudents = empty($USER->screenreader) && $this->get_pref('fixedstudents'); + $fixedstudents = empty($USER->screenreader) && $CFG->grade_report_fixedstudents; // Preload scale objects for items with a scaleid $scales_list = array(); @@ -919,7 +919,7 @@ class grade_report_grader extends grade_report { $showuserimage = $this->get_pref('showuserimage'); $showuseridnumber = $this->get_pref('showuseridnumber'); - $fixedstudents = empty($USER->screenreader) && $this->get_pref('fixedstudents'); + $fixedstudents = empty($USER->screenreader) && $CFG->grade_report_fixedstudents; $strsortasc = $this->get_lang_string('sortasc', 'grades'); $strsortdesc = $this->get_lang_string('sortdesc', 'grades'); diff --git a/grade/report/grader/preferences_form.php b/grade/report/grader/preferences_form.php index a1ea340d81..f6ee6b1e7f 100644 --- a/grade/report/grader/preferences_form.php +++ b/grade/report/grader/preferences_form.php @@ -111,7 +111,6 @@ class grader_report_preferences_form extends moodleform { // View capability is the lowest permission. Users with grade:manage or grade:edit must also have grader:view if (has_capability('gradereport/grader:view', $context)) { - $preferences['prefgeneral']['fixedstudents'] = $checkbox_default; $preferences['prefgeneral']['studentsperpage'] = 'text'; $preferences['prefgeneral']['aggregationposition'] = array(GRADE_REPORT_PREFERENCE_DEFAULT => '*default*', GRADE_REPORT_AGGREGATION_POSITION_FIRST => get_string('positionfirst', 'grades'), diff --git a/grade/report/grader/styles.php b/grade/report/grader/styles.php index 657254c16c..2f1c981dd2 100644 --- a/grade/report/grader/styles.php +++ b/grade/report/grader/styles.php @@ -129,6 +129,7 @@ border-style:solid; } + .grade-report-grader table#user-grades tr.heading { border-width:0px 0px 0px 0px; border-style:solid; diff --git a/lang/en_utf8/grades.php b/lang/en_utf8/grades.php index 29ee72da85..8ecf782db2 100644 --- a/lang/en_utf8/grades.php +++ b/lang/en_utf8/grades.php @@ -81,7 +81,7 @@ $string['configcoursegradedisplaytype'] = 'Select the default display type of gr $string['configdecimalpoints'] = 'Specifies the number of decimal points to display for each grade. This setting may be overridden per grading item.'; $string['configenableajax'] = 'Adds a layer of AJAX functionality to the grader report, simplifying and speeding up common operations. Depends on Javascript being switched on at the user\'s browser level.'; $string['configenableoutcomes'] = 'Support for Outcomes (also known as Competencies, Goals, Standards or Criteria) means that we can grade things using one or more scales that are tied to outcome statements. Enabling outcomes makes such special grading possible throughout the site.'; -$string['configfixedstudents'] = 'Fixes the students column in the grader report, allowing the grades to scroll horizontally.'; +$string['configfixedstudents'] = 'Allows grades to scroll horizontally without losing sight of the students column, by making it static.'; $string['configgradeboundary'] = 'A percentage boundary over which grades will be assigned a grade letter (if the Letter grade display type is used). '; $string['configgradedisplaytype'] = 'Specifies how to display grades in the grader and user reports. Grades may be shown as actual grades, as percentages (in reference to the minimum and maximum grades) or as letters.'; $string['configgradeexportdisplaytype'] = 'Grades can be shown as real grades, as percentages (in reference to the minimum and maximum grades) or as letters (A, B, C etc..) during export. This can be overridden during export.'; @@ -194,7 +194,7 @@ $string['feedbackview'] = 'View feedback'; $string['feedbacksaved'] = 'Feedback saved'; $string['finalgrade'] = 'Final grade'; $string['finalgradehelp'] = 'The final grade (cached) after all calculations are performed.'; -$string['fixedstudents'] = 'Fixed students column'; +$string['fixedstudents'] = 'Static students column'; $string['forceoff'] = 'Force: Off'; $string['forceon'] = 'Force: On'; $string['forelementtypes'] = ' for the selected $a'; -- 2.39.5