MDL-9545 minor refactoring and comment cleanup

This commit is contained in:
skodak 2007-06-03 12:37:50 +00:00
parent 1970d24381
commit 8b4fb44ed1

View file

@ -1841,7 +1841,7 @@ function assignment_get_user_grades($assignmentid, $userid=0) {
* @param object $grade_item null means all assignments * @param object $grade_item null means all assignments
* @param int $userid specific user only, 0 mean all * @param int $userid specific user only, 0 mean all
*/ */
function assignment_update_grades($grade_item=null, $userid=0) { function assignment_update_grades($grade_item=null, $userid=0, $nullifnone=true) {
global $CFG; global $CFG;
if ($grade_item != null) { if ($grade_item != null) {
@ -1880,29 +1880,40 @@ function assignment_update_grades($grade_item=null, $userid=0) {
/** /**
* Return (create if needed) grade item for given assignment * Return (create if needed) grade item for given assignment
* *
* @param object $assignment object with extra cmidnumber and courseid property * @param object $assignment object with optional cmidnumber
* @return object grade_item * @return object grade_item
*/ */
function assignment_grade_item_get($assignment) { function assignment_grade_item_get($assignment) {
if (!isset($assignment->courseid)) {
$assignment->courseid = $assignment->course;
}
if ($items = grade_get_items($assignment->courseid, 'mod', 'assignment', $assignment->id)) { if ($items = grade_get_items($assignment->courseid, 'mod', 'assignment', $assignment->id)) {
if (count($items) > 1) { if (count($items) > 1) {
debugging('Multiple grade items present!'); debugging('Multiple grade items present!');
} }
$grade_item = reset($items); $grade_item = reset($items);
return $grade_item;
} else { } else {
if (!isset($forum->cmidnumber)) {
if (!$cm = get_coursemodule_from_instance('assignment', $assignment->id)) {
error("Course Module ID was incorrect");
}
$assignment->cmidnumber = $cm->idnumber;
}
if (!$itemid = assignment_grade_item_create($assignment)) { if (!$itemid = assignment_grade_item_create($assignment)) {
error('Can not create grade item!'); error('Can not create grade item!');
} }
$grade_item = grade_item::fetch('id', $itemid); $grade_item = grade_item::fetch('id', $itemid);
} }
return $grade_item; return $grade_item;
} }
/** /**
* Update grade item for given assignment * Update grade item for given assignment
* *
* @param object $assignment object with extra cmidnumber and courseid property * @param object $assignment object with extra cmidnumber
* @return object grade_item * @return object grade_item
*/ */
function assignment_grade_item_update($assignment) { function assignment_grade_item_update($assignment) {
@ -1935,10 +1946,14 @@ function assignment_grade_item_update($assignment) {
/** /**
* Create grade item for given assignment * Create grade item for given assignment
* *
* @param object $assignment object with extra cmidnumber and courseid property * @param object $assignment object with extra cmidnumber
* @return object grade_item * @return object grade_item
*/ */
function assignment_grade_item_create($assignment) { function assignment_grade_item_create($assignment) {
if (!isset($assignment->courseid)) {
$assignment->courseid = $assignment->course;
}
$params = array('courseid' =>$assignment->courseid, $params = array('courseid' =>$assignment->courseid,
'itemtype' =>'mod', 'itemtype' =>'mod',
'itemmodule' =>'assignment', 'itemmodule' =>'assignment',
@ -1970,10 +1985,14 @@ function assignment_grade_item_create($assignment) {
/** /**
* Delete grade item for given assignment * Delete grade item for given assignment
* *
* @param object $assignment object with extra cmidnumber and courseid property * @param object $assignment object
* @return object grade_item * @return object grade_item
*/ */
function assignment_grade_item_delete($assignment) { function assignment_grade_item_delete($assignment) {
if (!isset($assignment->courseid)) {
$assignment->courseid = $assignment->course;
}
if ($grade_items = grade_get_items($assignment->courseid, 'mod', 'assignment', $assignment->id)) { if ($grade_items = grade_get_items($assignment->courseid, 'mod', 'assignment', $assignment->id)) {
foreach($grade_items as $grade_item) { foreach($grade_items as $grade_item) {
$grade_item->delete(); $grade_item->delete();