MDL-32759 Assignment: Grades will not be scaled for new assignment module, and added warning message for user
This commit is contained in:
@@ -742,7 +742,8 @@ class grade_item extends grade_object {
|
||||
|
||||
// Standardise score to the new grade range
|
||||
// NOTE: this is not compatible with current assignment grading
|
||||
if ($this->itemmodule != 'assignment' and ($rawmin != $this->grademin or $rawmax != $this->grademax)) {
|
||||
$isassignmentmodule = ($this->itemmodule == 'assignment') || ($this->itemmodule == 'assign');
|
||||
if (!$isassignmentmodule && ($rawmin != $this->grademin or $rawmax != $this->grademax)) {
|
||||
$rawgrade = grade_grade::standardise_score($rawgrade, $rawmin, $rawmax, $this->grademin, $this->grademax);
|
||||
}
|
||||
|
||||
|
||||
@@ -65,6 +65,7 @@ $string['batchoperationconfirmreverttodraft'] = 'Revert selected submissions to
|
||||
$string['batchoperationlock'] = 'lock submissions';
|
||||
$string['batchoperationunlock'] = 'unlock submissions';
|
||||
$string['batchoperationreverttodraft'] = 'revert submissions to draft';
|
||||
$string['changegradewarning'] = 'This assignment has graded submissions and changing the grade will not automatically re-calculate existing submission grades. You must re-grade all existing submissions, if you wish to change the grade.';
|
||||
$string['comment'] = 'Comment';
|
||||
$string['conversionexception'] = 'Could not convert assignment. Exception was: {$a}.';
|
||||
$string['configshowrecentsubmissions'] = 'Everyone can see notifications of submissions in recent activity reports.';
|
||||
|
||||
+16
-1
@@ -45,7 +45,7 @@ class mod_assign_mod_form extends moodleform_mod {
|
||||
* @return void
|
||||
*/
|
||||
function definition() {
|
||||
global $CFG, $DB;
|
||||
global $CFG, $DB, $PAGE;
|
||||
$mform = $this->_form;
|
||||
|
||||
$mform->addElement('header', 'general', get_string('general', 'form'));
|
||||
@@ -120,6 +120,21 @@ class mod_assign_mod_form extends moodleform_mod {
|
||||
$this->standard_coursemodule_elements();
|
||||
|
||||
$this->add_action_buttons();
|
||||
|
||||
// Add warning popup/noscript tag, if grades are changed by user.
|
||||
if ($mform->elementExists('grade') && !empty($this->_instance) && $DB->record_exists_select('assign_grades', 'assignment = ? AND grade <> -1', array($this->_instance))) {
|
||||
$module = array(
|
||||
'name' => 'mod_assign',
|
||||
'fullpath' => '/mod/assign/module.js',
|
||||
'requires' => array('node', 'event'),
|
||||
'strings' => array(array('changegradewarning', 'mod_assign'))
|
||||
);
|
||||
$PAGE->requires->js_init_call('M.mod_assign.init_grade_change', null, false, $module);
|
||||
|
||||
// Add noscript tag in case
|
||||
$noscriptwarning = $mform->createElement('static', 'warning', null, html_writer::tag('noscript', get_string('changegradewarning', 'mod_assign')));
|
||||
$mform->insertElementBefore($noscriptwarning, 'grade');
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
@@ -127,4 +127,16 @@ M.mod_assign.init_grading_options = function(Y) {
|
||||
});
|
||||
}
|
||||
});
|
||||
};
|
||||
|
||||
M.mod_assign.init_grade_change = function(Y) {
|
||||
var gradenode = Y.one('#id_grade');
|
||||
if (gradenode) {
|
||||
var originalvalue = gradenode.get('value');
|
||||
gradenode.on('change', function() {
|
||||
if (gradenode.get('value') != originalvalue) {
|
||||
alert(M.str.mod_assign.changegradewarning);
|
||||
}
|
||||
});
|
||||
}
|
||||
};
|
||||
Reference in New Issue
Block a user