From: skodak Date: Fri, 13 Jul 2007 08:59:46 +0000 (+0000) Subject: grade_tree minor cleanup - grades not included anymore; fixed categroy item position... X-Git-Url: http://git.mjollnir.org/gw?a=commitdiff_plain;h=938e00b6cbfc13c4768a8716faf36d1b191413d8;p=moodle.git grade_tree minor cleanup - grades not included anymore; fixed categroy item position in grader report --- diff --git a/grade/edit/tree.php b/grade/edit/tree.php index 76720f5b04..8ac1b5d999 100644 --- a/grade/edit/tree.php +++ b/grade/edit/tree.php @@ -48,7 +48,7 @@ $returnurl = 'tree.php?id='.$course->id; // get the grading tree object // note: total must be first for moving to work correctly, if you want it last moving code must be rewritten! -$gtree = new grade_tree($courseid, false, false, false); +$gtree = new grade_tree($courseid, false, false); if (empty($eid)) { $element = null; diff --git a/grade/report/lib.php b/grade/report/lib.php index 8ded1f572c..9ae353116b 100755 --- a/grade/report/lib.php +++ b/grade/report/lib.php @@ -77,7 +77,7 @@ class grade_report { $this->gradebookroles = $CFG->gradebookroles; // Grab the grade_tree for this course - $this->gtree = new grade_tree($this->courseid, true, false, $this->get_pref('aggregationposition')); + $this->gtree = new grade_tree($this->courseid, true, $this->get_pref('aggregationposition')); } /** @@ -153,24 +153,24 @@ class grade_report { case 'hide': // TODO Implement calendar for selection of a date to hide element until $element['object']->set_hidden(1); - $this->gtree = new grade_tree($this->courseid); + $this->gtree = new grade_tree($this->courseid, true, $this->get_pref('aggregationposition')); break; case 'show': $element['object']->set_hidden(0); - $this->gtree = new grade_tree($this->courseid); + $this->gtree = new grade_tree($this->courseid, true, $this->get_pref('aggregationposition')); break; case 'lock': // TODO Implement calendar for selection of a date to lock element after if (!$element['object']->set_locked(1)) { debugging("Could not update the element's locked state!"); } - $this->gtree = new grade_tree($this->courseid); + $this->gtree = new grade_tree($this->courseid, true, $this->get_pref('aggregationposition')); break; case 'unlock': if (!$element['object']->set_locked(0)) { debugging("Could not update the element's locked state!"); } - $this->gtree = new grade_tree($this->courseid); + $this->gtree = new grade_tree($this->courseid, true, $this->get_pref('aggregationposition')); break; default: break; diff --git a/lib/grade/grade_category.php b/lib/grade/grade_category.php index d443e904f4..a3ab203224 100644 --- a/lib/grade/grade_category.php +++ b/lib/grade/grade_category.php @@ -547,17 +547,13 @@ class grade_category extends grade_object { * Returns tree with all grade_items and categories as elements * @static * @param int $courseid - * @param boolean $include_grades include final grades * @param boolean $include_category_items as category children * @return array */ - function fetch_course_tree($courseid, $include_grades=false, $include_category_items=false) { + function fetch_course_tree($courseid, $include_category_items=false) { $course_category = grade_category::fetch_course_category($courseid); $category_array = array('object'=>$course_category, 'type'=>'category', 'depth'=>1, - 'children'=>$course_category->get_children($include_grades, $include_category_items)); - if ($include_grades) { - $category_array['finalgrades'] = $course_category->get_final(); - } + 'children'=>$course_category->get_children($include_category_items)); $sortorder = 1; $course_category->set_sortorder($sortorder); $course_category->sortorder = $sortorder; @@ -599,7 +595,7 @@ class grade_category extends grade_object { * as well as all levels (0). The elements are indexed by sort order. * @return array Array of child objects (grade_category and grade_item). */ - function get_children($include_grades=false, $include_category_items=false) { + function get_children($include_category_items=false) { // This function must be as fast as possible ;-) // fetch all course grade items and categories into memory - we do not expect hundreds of these in course @@ -659,7 +655,7 @@ class grade_category extends grade_object { unset($items); // not needed unset($cats); // not needed - $children_array = grade_category::_get_children_recursion($category, $include_grades); + $children_array = grade_category::_get_children_recursion($category); ksort($children_array); @@ -667,7 +663,7 @@ class grade_category extends grade_object { } - function _get_children_recursion($category, $include_grades) { + function _get_children_recursion($category) { $children_array = array(); foreach($category->children as $sortorder=>$child) { @@ -683,17 +679,13 @@ class grade_category extends grade_object { $children_array[$sortorder] = array('object'=>$grade_item, 'type'=>$type, 'depth'=>$depth); } else { - $children = grade_category::_get_children_recursion($child, $include_grades); + $children = grade_category::_get_children_recursion($child); $grade_category = new grade_category($child, false); if (empty($children)) { $children = array(); } $children_array[$sortorder] = array('object'=>$grade_category, 'type'=>'category', 'depth'=>$grade_category->depth, 'children'=>$children); } - - if ($include_grades) { - $children_array[$sortorder]['finalgrades'] = $grade_item->get_final(); - } } // sort the array diff --git a/lib/grade/grade_tree.php b/lib/grade/grade_tree.php index f0c3b332ca..60f8bf34ab 100644 --- a/lib/grade/grade_tree.php +++ b/lib/grade/grade_tree.php @@ -39,12 +39,6 @@ class grade_tree { */ var $top_element; - /** - * Whether or not this grade_tree should load and store all the grades in addition to the categories and items. - * @var boolean $include_grades - */ - var $include_grades; - /** * A string of GET URL variables, namely courseid and sesskey, used in most URLs built by this class. * @var string $commonvars @@ -62,21 +56,19 @@ class grade_tree { * and renumbering. * @param int $courseid * @param boolean $fillers include fillers and colspans, make the levels var "rectangular" - * @param boolean $include_grades * @param boolean $category_grade_last category grade item is the last child * @param boolean $aggregation_view Either full view (0) or compact view (1) */ - function grade_tree($courseid, $fillers=true, $include_grades=false, $category_grade_last=true, + function grade_tree($courseid, $fillers=true, $category_grade_last=false, $aggregation_view=GRADER_REPORT_AGGREGATION_VIEW_FULL) { global $USER; $this->courseid = $courseid; - $this->include_grades = $include_grades; $this->commonvars = "&sesskey=$USER->sesskey&id=$this->courseid"; $this->levels = array(); // get course grade tree - $this->top_element = grade_category::fetch_course_tree($courseid, $include_grades, true); + $this->top_element = grade_category::fetch_course_tree($courseid, true); if ($category_grade_last) { grade_tree::category_grade_last($this->top_element);