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

Added validation to grading form, implemented methods in advanced grading to return form contents and process and return the final grade

Browse Source
This commit is contained in:
Marina Glancy 2011-10-12 11:48:06 +08:00
parent 6abcb0c21f
commit 18e6298c7b
4 changed files with 133 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
grade/grading/form/lib.php
View File

@ -264,6 +264,16 @@ abstract class gradingform_controller {
}
}
/**
* Saves non-js data and returns the gradebook grade
*/
abstract public function save_and_get_grade($itemid, $formdata);
/**
* Returns html for form element
*/
abstract public function to_html($elementname, $itemid);
////////////////////////////////////////////////////////////////////////////

37
grade/grading/form/rubric/lib.php
View File

@ -226,6 +226,38 @@ class gradingform_rubric_controller extends gradingform_controller {
return $properties;
}
/**
* Saves non-js data and returns the gradebook grade
*/
public function save_and_get_grade($itemid, $formdata) {
// TODO: this function is a patch at the moment!
if (is_array($formdata) && array_key_exists('grade', $formdata)) {
return $formdata['grade'];
}
return -1;
}
/**
* Returns html for form element
*/
public function to_html($elementname, $submissionid) {
// TODO: this function is a patch at the moment!
//global $PAGE, $USER;
//$gradingrenderer = $this->prepare_renderer($PAGE);
$output = '';
$output .= "assessing submission $submissionid<br />";
$output .= html_writer::empty_tag('input', array('type' => 'text', 'name' => $elementname.'[grade]', 'size' => '20'));
//$output .= "assessing user $userid on assignment $assignmentid<br>";
//TODO find $submissionid from $userid & $assignmentid (may not exist yet, actually)
/*$submissionid = null;
$gradingwidget = $this->make_grading_widget($USER->id, $submissionid);
if ($gradingwidget instanceof renderable) {
return $output. $gradingrenderer->render($gradingwidget);
}*/
return $output;
}
// TODO the following functions may be moved to parent:
/**
@ -273,4 +305,9 @@ class gradingform_rubric_controller extends gradingform_controller {
// TODO change filearea for embedded files in grading_definition.description
return $data;
}
public function is_form_available($foruserid = null) {
return true;
// TODO this is temporary for testing!
}
}

13
grade/grading/lib.php
View File

@ -374,6 +374,19 @@ class grading_manager {
return new $classname($this->context, $this->component, $this->area, $this->areacache->id);
}
/**
* Returns the controller for the active method if it is available
*/
public function get_active_controller() {
if ($gradingmethod = $this->get_active_method()) {
$controller = $this->get_controller($gradingmethod);
if ($controller->is_form_available()) {
return $controller;
}
}
return null;
}
////////////////////////////////////////////////////////////////////////////
/**

80
mod/assignment/lib.php
View File

@ -630,7 +630,10 @@ class assignment_base {
switch ($mode) {
case 'grade': // We are in a main window grading
if ($submission = $this->process_feedback()) {
if (!$this->validate_and_preprocess_feedback()) {
// validation failed
$this->display_submission();
} else if ($submission = $this->process_feedback()) {
$this->display_submissions(get_string('changessaved'));
} else {
$this->display_submissions();
@ -744,7 +747,11 @@ class assignment_base {
case 'saveandnext':
///We are in pop up. save the current one and go to the next one.
//first we save the current changes
if ($submission = $this->process_feedback()) {
if (!$this->validate_and_preprocess_feedback()) {
// validation failed
$this->display_submission();
break;
} else if ($submission = $this->process_feedback()) {
//print_heading(get_string('changessaved'));
//$extra_javascript = $this->update_main_listing($submission);
}
@ -1039,7 +1046,7 @@ class assignment_base {
} elseif ($assignment->assignmenttype == 'uploadsingle') {
$mformdata->fileui_options = array('subdirs'=>0, 'maxbytes'=>$CFG->userquota, 'maxfiles'=>1, 'accepted_types'=>'*', 'return_types'=>FILE_INTERNAL);
}
$gradingman = get_grading_manager($this->context, 'mod_assignment', 'submission');
/*$gradingman = get_grading_manager($this->context, 'mod_assignment', 'submission');
if ($gradingmethod = $gradingman->get_active_method()) {
$controller = $gradingman->get_controller($gradingmethod);
if ($controller->is_form_available()) {
@ -1067,6 +1074,13 @@ class assignment_base {
} else {
notice(get_string('formnotavailable', 'core_grading'), new moodle_url('/course/view.php', array('id' => $assignment->course)));
}
}*/
if ($controller = get_grading_manager($this->context, 'mod_assignment', 'submission')->get_active_controller()) {
if (!isset($submission->id)) {
// TODO this is a patch if submission id does not exist yet
$mformdata->submission = $this->get_submission($user->id, true);
}
$mformdata->advancedgradingcontroller = $controller;
}
$submitform = new mod_assignment_grading_form( null, $mformdata );
@ -1074,7 +1088,9 @@ class assignment_base {
if (!$display) {
$ret_data = new stdClass();
$ret_data->mform = $submitform;
$ret_data->fileui_options = $mformdata->fileui_options;
if (isset($mformdata->fileui_options)) {
$ret_data->fileui_options = $mformdata->fileui_options;
}
return $ret_data;
}
@ -1574,6 +1590,34 @@ class assignment_base {
echo $OUTPUT->footer();
}
/**
* Validates the submitted form and returns false if validation did not pass.
* If validation passes, preprocess advanced grading (if applicable) and returns true.
*/
function validate_and_preprocess_feedback() {
if (!$feedback = data_submitted()) {
return true; // No incoming data, nothing to validate
}
$userid = required_param('userid', PARAM_INT);
$offset = required_param('offset', PARAM_INT);
$submissiondata = $this->display_submission($offset, $userid, false);
$mform = $submissiondata->mform;
if ($mform->is_submitted()) {
if (!$mform->is_validated()) {
return false;
}
// preprocess advanced grading here
if ($controller = $mform->use_advanced_grading()) {
$data = $mform->get_data();
// TODO find better way to find submission id
$submission = $this->get_submission($userid);
// TODO replace $_POST['advancedgrading'] with $data->advancedgrading when element type is changed from 'static' to 'grading'
$_POST['xgrade'] = $controller->save_and_get_grade($submission->id, $_POST['advancedgrading']);
}
}
return true;
}
/**
* Process teacher feedback submission
*
@ -2252,6 +2296,10 @@ class mod_assignment_grading_form extends moodleform {
global $OUTPUT;
$mform =& $this->_form;
if (isset($this->_customdata->advancedgradingcontroller)) {
$this->use_advanced_grading($this->_customdata->advancedgradingcontroller);
}
$formattr = $mform->getAttributes();
$formattr['id'] = 'submitform';
$mform->setAttributes($formattr);
@ -2297,6 +2345,19 @@ class mod_assignment_grading_form extends moodleform {
}
private $_advancegradingcontroller;
/**
* Gets or sets the controller for advanced grading
*
* @param <type> $controller
*/
public function use_advanced_grading($controller = false) {
if ($controller !== false) {
$this->_advancegradingcontroller = $controller;
}
return $this->_advancegradingcontroller;
}
function add_grades_section() {
global $CFG;
$mform =& $this->_form;
@ -2307,9 +2368,9 @@ class mod_assignment_grading_form extends moodleform {
$mform->addElement('header', 'Grades', get_string('grades', 'grades'));
if (!empty($this->_customdata->advancedgradingenabled)) {
$mform->addElement('static', 'advancedgradingwidget', get_string('grade').':', $this->_customdata->advancedgradingwidget);
if ($controller = $this->use_advanced_grading()) {
// TODO what if submission id does not exist yet!
$mform->addElement('static', 'advancedgrading', get_string('grade').':', $controller->to_html('advancedgrading', $this->_customdata->submission->id));
} else {
// use simple direct grading
$grademenu = make_grades_menu($this->_customdata->assignment->grade);
@ -2468,6 +2529,11 @@ class mod_assignment_grading_form extends moodleform {
}
$data = file_postupdate_standard_editor($data, 'submissioncomment', $editoroptions, $this->_customdata->context, $editoroptions['component'], $editoroptions['filearea'], $itemid);
}
if ($this->use_advanced_grading() && !isset($data->advancedgrading)) {
$data->advancedgrading = null;
}
return $data;
}
}