Skip to content

Commit

Permalink
MDL-11835 Implemented all the default settings suggested in the pdf r…
Browse files Browse the repository at this point in the history
…eport, and turned down the size of the report table fonts.
  • Loading branch information
nicolasconnault committed Dec 4, 2007
1 parent d5ca7a5 commit 5203f72
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 6 deletions.
9 changes: 6 additions & 3 deletions admin/settings/grades.php
Expand Up @@ -50,7 +50,7 @@
/// Grade category settings
$temp = new admin_settingpage('gradecategorysettings', get_string('gradecategorysettings', 'grades'), 'moodle/grade:manage');

$temp->add(new admin_setting_configcheckbox('grade_hideforcedsettings', get_string('hideforcedsettings', 'grades'), get_string('confighideforcedsettings', 'grades'), 0, PARAM_INT));
$temp->add(new admin_setting_configcheckbox('grade_hideforcedsettings', get_string('hideforcedsettings', 'grades'), get_string('confighideforcedsettings', 'grades'), 1, PARAM_INT));

$strnoforce = get_string('noforce', 'grades');

Expand All @@ -64,12 +64,12 @@
GRADE_AGGREGATE_MAX =>get_string('aggregatemax', 'grades'),
GRADE_AGGREGATE_MODE =>get_string('aggregatemode', 'grades'),
GRADE_AGGREGATE_SUM =>get_string('aggregatesum', 'grades'));
$defaults = array('value'=>GRADE_AGGREGATE_MEAN, 'forced'=>false, 'adv'=>false);
$defaults = array('value'=>GRADE_AGGREGATE_WEIGHTED_MEAN, 'forced'=>false, 'adv'=>false);
$temp->add(new admin_setting_gradecat_combo('grade_aggregation', get_string('aggregation', 'grades'), get_string('aggregationhelp', 'grades'), $defaults, $options));

$options = array(0 => get_string('no'), 1 => get_string('yes'));

$defaults = array('value'=>0, 'forced'=>false, 'adv'=>true);
$defaults = array('value'=>1, 'forced'=>false, 'adv'=>true);
$temp->add(new admin_setting_gradecat_combo('grade_aggregateonlygraded', get_string('aggregateonlygraded', 'grades'),
get_string('aggregateonlygradedhelp', 'grades'), $defaults, $options));
$temp->add(new admin_setting_gradecat_combo('grade_aggregateoutcomes', get_string('aggregateoutcomes', 'grades'),
Expand All @@ -82,8 +82,11 @@
$options[$i] = $i;
}

$defaults['value'] = 0;
$defaults['forced'] = true;
$temp->add(new admin_setting_gradecat_combo('grade_keephigh', get_string('keephigh', 'grades'),
get_string('keephighhelp', 'grades'), $defaults, $options));
$defaults['forced'] = false;
$temp->add(new admin_setting_gradecat_combo('grade_droplow', get_string('droplow', 'grades'),
get_string('droplowhelp', 'grades'), $defaults, $options));

Expand Down
6 changes: 3 additions & 3 deletions grade/report/grader/settings.php
Expand Up @@ -31,7 +31,7 @@

/// Add settings for this module to the $settings object (it's already defined)
$settings->add(new admin_setting_configtext('grade_report_studentsperpage', get_string('studentsperpage', 'grades'),
get_string('configstudentsperpage', 'grades'), 20));
get_string('configstudentsperpage', 'grades'), 100));

$settings->add(new admin_setting_configcheckbox('grade_report_quickgrading', get_string('quickgrading', 'grades'),
get_string('configquickgrading', 'grades'), 1));
Expand All @@ -52,7 +52,7 @@
GRADE_REPORT_AGGREGATION_VIEW_GRADES_ONLY => get_string('gradesonly', 'grades'))));

$settings->add(new admin_setting_configselect('grade_report_meanselection', get_string('meanselection', 'grades'),
get_string('configmeanselection', 'grades'), GRADE_REPORT_MEAN_ALL,
get_string('configmeanselection', 'grades'), GRADE_REPORT_MEAN_GRADED,
array(GRADE_REPORT_MEAN_ALL => get_string('meanall', 'grades'),
GRADE_REPORT_MEAN_GRADED => get_string('meangraded', 'grades'))));

Expand All @@ -66,7 +66,7 @@
get_string('configshoweyecons', 'grades'), 0));

$settings->add(new admin_setting_configcheckbox('grade_report_showaverages', get_string('showaverages', 'grades'),
get_string('configshowaverages', 'grades'), 0));
get_string('configshowaverages', 'grades'), 1));

$settings->add(new admin_setting_configcheckbox('grade_report_showgroups', get_string('showgroups', 'grades'),
get_string('configshowgroups', 'grades'), 0));
Expand Down

0 comments on commit 5203f72

Please sign in to comment.