mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-01-19 06:18:28 +01:00
Code Issues Projects Releases Wiki Activity

MDL-11835 Merging from 1.9

Browse Source
This commit is contained in:
nicolasconnault 2007-12-06 09:45:58 +00:00
parent ee022cb7b8
commit f9124bd22f
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
admin/settings/grades.php
View File

@ -50,7 +50,7 @@ $ADMIN->add('grades', $temp);
/// Grade category settings /// Grade category settings
$temp = new admin_settingpage('gradecategorysettings', get_string('gradecategorysettings', 'grades'), 'moodle/grade:manage'); $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'); $strnoforce = get_string('noforce', 'grades');
@ -64,12 +64,12 @@ $options = array(GRADE_AGGREGATE_MEAN =>get_string('aggregatemean', '
GRADE_AGGREGATE_MAX =>get_string('aggregatemax', 'grades'), GRADE_AGGREGATE_MAX =>get_string('aggregatemax', 'grades'),
GRADE_AGGREGATE_MODE =>get_string('aggregatemode', 'grades'), GRADE_AGGREGATE_MODE =>get_string('aggregatemode', 'grades'),
GRADE_AGGREGATE_SUM =>get_string('aggregatesum', '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)); $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')); $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'), $temp->add(new admin_setting_gradecat_combo('grade_aggregateonlygraded', get_string('aggregateonlygraded', 'grades'),
get_string('aggregateonlygradedhelp', 'grades'), $defaults, $options)); get_string('aggregateonlygradedhelp', 'grades'), $defaults, $options));
$temp->add(new admin_setting_gradecat_combo('grade_aggregateoutcomes', get_string('aggregateoutcomes', 'grades'), $temp->add(new admin_setting_gradecat_combo('grade_aggregateoutcomes', get_string('aggregateoutcomes', 'grades'),
@ -82,8 +82,11 @@ for ($i=1; $i<=20; $i++) {
$options[$i] = $i; $options[$i] = $i;
} }
$defaults['value'] = 0;
$defaults['forced'] = true;
$temp->add(new admin_setting_gradecat_combo('grade_keephigh', get_string('keephigh', 'grades'), $temp->add(new admin_setting_gradecat_combo('grade_keephigh', get_string('keephigh', 'grades'),
get_string('keephighhelp', 'grades'), $defaults, $options)); get_string('keephighhelp', 'grades'), $defaults, $options));
$defaults['forced'] = false;
$temp->add(new admin_setting_gradecat_combo('grade_droplow', get_string('droplow', 'grades'), $temp->add(new admin_setting_gradecat_combo('grade_droplow', get_string('droplow', 'grades'),
get_string('droplowhelp', 'grades'), $defaults, $options)); get_string('droplowhelp', 'grades'), $defaults, $options));

1
grade/report/grader/index.php
View File

@ -163,6 +163,7 @@ $reporthtml = '<script src="functions.js" type="text/javascript"></script>';
$reporthtml .= '<table id="user-grades" class="gradestable flexible boxaligncenter generaltable">'; $reporthtml .= '<table id="user-grades" class="gradestable flexible boxaligncenter generaltable">';
$reporthtml .= $report->get_headerhtml(); $reporthtml .= $report->get_headerhtml();
$reporthtml .= $report->get_iconshtml();
$reporthtml .= $report->get_rangehtml(); $reporthtml .= $report->get_rangehtml();
$reporthtml .= $report->get_studentshtml(); $reporthtml .= $report->get_studentshtml();
$reporthtml .= $report->get_avghtml(true); $reporthtml .= $report->get_avghtml(true);