]> git.mjollnir.org Git - moodle.git/commitdiff
MDL-15680 Added grade category aggregation settings and weights, plus correct handlin...
authornicolasconnault <nicolasconnault>
Fri, 10 Oct 2008 07:18:19 +0000 (07:18 +0000)
committernicolasconnault <nicolasconnault>
Fri, 10 Oct 2008 07:18:19 +0000 (07:18 +0000)
grade/edit/tree/item_form.php
grade/edit/weights/ajax.php
grade/edit/weights/index.php
grade/edit/weights/lib.php [new file with mode: 0644]
grade/edit/weights/tree.css
grade/report/grader/lib.php
lang/en_utf8/grades.php
lib/grade/grade_item.php
pix/t/nonempty.gif [new file with mode: 0644]
pix/t/sigmaplus.gif [new file with mode: 0644]

index 8b203e1f123f8e486e85a0cd450e1e59cd38199f..3f1fee6c18055cdecff52d720e3a117b68d97de5 100644 (file)
@@ -136,15 +136,13 @@ class edit_item_form extends moodleform {
         $mform->addElement('header', 'headerparent', get_string('parentcategory', 'grades'));
 
         $options = array();
-        $default = '';
         $coefstring = '';
         $categories = grade_category::fetch_all(array('courseid'=>$COURSE->id));
+
         foreach ($categories as $cat) {
             $cat->apply_forced_settings();
             $options[$cat->id] = $cat->get_name();
-            if ($cat->is_course_category()) {
-                $default = $cat->id;
-            }
+
             if ($cat->is_aggregationcoef_used()) {
                 if ($cat->aggregation == GRADE_AGGREGATE_WEIGHTED_MEAN) {
                     $coefstring = ($coefstring=='' or $coefstring=='aggregationcoefweight') ? 'aggregationcoefweight' : 'aggregationcoef';
index 393a48fba622e3294b151a8a0bc63fbd1545d60b..5dff7f66c93c002c74ae0bf1132c54a5ef14750f 100755 (executable)
@@ -22,36 +22,47 @@ YAHOO.grade_edit_weights.buildTreeNode = function(element, parentNode) {
     }
 
     if (element.item.table == 'grade_categories') {
-        var tmpNode = new YAHOO.widget.TextNode(element.item.name, parentNode, parentNode.isRoot());
+        var aggregation_types = '<select name="aggregation_'+element.item.id+'">';
+
+        for (var i = 0; i < gew.options.length; i++) {
+            aggregation_types += '<option>' + gew.options[i] + '</option>';
+        }
+
+        var gradecategory = '<span class="gradecategory">'+element.item.name+' '+aggregation_types+'<'+'/span>';
+        var tmpNode = new YAHOO.widget.TextNode(gradecategory, parentNode, parentNode.isRoot());
+        // var tmpNode = new YAHOO.widget.TextNode(element.item.name, parentNode, parentNode.isRoot());
         for (var i = 0; i < element.children.length; i++) {
             gew.buildTreeNode(element.children[i], tmpNode, false);
         }
     } else if (element.item.itemtype == 'mod') {
-        var tmpNode = new YAHOO.widget.TextNode(element.item.name, parentNode, false);
+        var gradeitem = '<span class="gradeitem"><input type="text" size="6" name="weight_'+element.item.id+'" value="'+element.item.aggregationcoef+'"/>'+
+                        element.item.name + '<'+'/span>';
+        var tmpNode = new YAHOO.widget.HTMLNode(gradeitem, parentNode, false);
     }
 };
 
 YAHOO.grade_edit_weights.init = function() {
     var gew = YAHOO.grade_edit_weights;
     var div = document.getElementById('weightstree');
-    gew.tree = new YAHOO.widget.TreeView('weightstree');
-
-     //handler for expanding all nodes
-     YAHOO.util.Event.on("expand", "click", function(e) {
-         YAHOO.log("Expanding all TreeView  nodes.", "info", "example");
-         gew.tree.expandAll();
-         YAHOO.util.Event.preventDefault(e);
-     });
-
-     //handler for collapsing all nodes
-     YAHOO.util.Event.on("collapse", "click", function(e) {
-         YAHOO.log("Collapsing all TreeView  nodes.", "info", "example");
-         gew.tree.collapseAll();
-         YAHOO.util.Event.preventDefault(e);
-     });
-
-     gew.buildTreeNode();
-     gew.tree.draw();
+    gew.tree = new YAHOO.widget.TreeView('gradetree');
+
+    //handler for expanding all nodes
+    YAHOO.util.Event.on("expand", "click", function(e) {
+        YAHOO.log("Expanding all TreeView  nodes.", "info", "example");
+        gew.tree.expandAll();
+        YAHOO.util.Event.preventDefault(e);
+    });
+
+    //handler for collapsing all nodes
+    YAHOO.util.Event.on("collapse", "click", function(e) {
+        YAHOO.log("Collapsing all TreeView  nodes.", "info", "example");
+        gew.tree.collapseAll();
+        YAHOO.util.Event.preventDefault(e);
+    });
+
+    // gew.buildTreeNode();
+    gew.tree.render();
+    gew.tree.expandAll();
 };
 
 YAHOO.util.Event.onDOMReady(YAHOO.grade_edit_weights.init);
index 6a1ec1143f8ef740685f6339bb42363487954e5e..d7428b5c9b1acb14a689e93c6032f652d1449318 100755 (executable)
 require_once '../../../config.php';
 require_once $CFG->dirroot.'/grade/lib.php';
 require_once $CFG->dirroot.'/grade/report/lib.php'; // for preferences
+require_once $CFG->dirroot.'/grade/edit/weights/lib.php';
 
-$courseid = required_param('id', PARAM_INT);
-$action   = optional_param('action', 0, PARAM_ALPHA);
-$eid      = optional_param('eid', 0, PARAM_ALPHANUM);
+$courseid        = required_param('id', PARAM_INT);
+$action          = optional_param('action', 0, PARAM_ALPHA);
+$eid             = optional_param('eid', 0, PARAM_ALPHANUM);
+$category        = optional_param('category', null, PARAM_INT);
+$aggregationtype = optional_param('aggregationtype', null, PARAM_INT);
 
 require_js(array('yui_yahoo', 'yui_dom', 'yui_event', 'yui_json', 'yui_connection', 'yui_dragdrop', 'yui_treeview'));
 
@@ -44,9 +47,19 @@ $context = get_context_instance(CONTEXT_COURSE, $course->id);
 require_capability('moodle/grade:manage', $context);
 
 /// return tracking object
-$gpr = new grade_plugin_return(array('type'=>'edit', 'plugin'=>'weight', 'courseid'=>$courseid));
+$gpr = new grade_plugin_return(array('type'=>'edit', 'plugin'=>'weights', 'courseid'=>$courseid));
 $returnurl = $gpr->get_return_url(null);
 
+// Change category aggregation if requested
+if (!is_null($category) && !is_null($aggregationtype)) {
+    if (!$grade_category = grade_category::fetch(array('id'=>$category, 'courseid'=>$courseid))) {
+        error('Incorrect category id!');
+    }
+    $data->aggregation = $aggregationtype;
+    grade_category::set_properties($grade_category, $data);
+    $grade_category->update();
+}
+
 //first make sure we have proper final grades - we need it for locking changes
 grade_regrade_final_grades($courseid);
 
@@ -64,57 +77,97 @@ $strcategoriesanditems = get_string('categoriesanditems', 'grades');
 $navigation = grade_build_nav(__FILE__, $strcategoriesanditems, array('courseid' => $courseid));
 $moving = false;
 
-switch ($action) {
-    default:
-        break;
-}
-
 $CFG->stylesheets[] = $CFG->wwwroot.'/grade/edit/weights/tree.css';
 print_header_simple($strgrades . ': ' . $strgraderreport, ': ' . $strcategoriesedit, $navigation, '', '', true, '', navmenu($course));
 
 /// Print the plugin selector at the top
 print_grade_plugin_selector($courseid, 'edit', 'tree');
 
-print_heading(get_string('categoriesedit', 'grades'));
+print_heading(get_string('weightsedit', 'grades'));
 $tree_json = json_encode(get_tree_json($gtree, $gtree->top_element));
 
-require_once('ajax.php');
+$form_key = optional_param('sesskey', null, PARAM_ALPHANUM);
+
+if ($form_key) {
+    $data = data_submitted();
+
+    foreach ($data as $key => $value) {
+        if (preg_match('/aggregation_type_([0-9]*)/', $key, $matches)) {
+            $aggtype = required_param($matches[0], PARAM_INT);
+            $a->id = $matches[1];
+
+            if (!$DB->update_record('grade_categories', array('id' => $matches[1], 'aggregation' => $aggtype))) {
+                print_error('errorupdatinggradecategoryaggregation', 'grades', $a);
+            }
+
+        } elseif (preg_match('/weight_([0-9]*)/', $key, $matches)) {
+            $weight = required_param($matches[0], PARAM_NUMBER);
+            $a->id = $matches[1];
+
+            if (!$DB->update_record('grade_items', array('id' => $matches[1], 'aggregationcoef' => $weight))) {
+                print_error('errorupdatinggradeitemaggregationcoef', 'grades', $a);
+            }
+
+        } elseif (preg_match('/extracredit_original_([0-9]*)/', $key, $matches)) { // Sum extra credit checkbox
+            $extracredit = optional_param("extracredit_{$matches[1]}", null, PARAM_BOOL);
+            $original_value = required_param($matches[0], PARAM_BOOL);
+            $a->id = $matches[1];
+            $newvalue = null;
+
+            if ($original_value == 1 && is_null($extracredit)) {
+                $newvalue = 0;
+            } elseif ($original_value == 0 && $extracredit == 1) {
+                $newvalue = 1;
+            } else {
+                continue;
+            }
+
+            if (!$DB->update_record('grade_items', array('id' => $matches[1], 'aggregationcoef' => $newvalue))) {
+                print_error('errorupdatinggradeitemaggregationcoef', 'grades', $a);
+            }
+
+        } elseif (preg_match('/aggregate(onlygraded|subcats|outcomes)_original_([0-9]*)/', $key, $matches)) {
+            $setting = optional_param('aggregate'.$matches[1].'_'.$matches[2], null, PARAM_BOOL);
+            $original_value = required_param($matches[0], PARAM_BOOL);
+            $a->id = $matches[2];
+
+            $newvalue = null;
+            if ($original_value == 1 && is_null($setting)) {
+                $newvalue = 0;
+            } elseif ($original_value == 0 && $setting == 1) {
+                $newvalue = 1;
+            } else {
+                continue;
+            }
+
+            if (!$DB->update_record('grade_categories', array('id' => $matches[2], 'aggregate'.$matches[1] => $newvalue))) {
+                print_error('errorupdatinggradecategoryaggregate'.$matches[1], 'grades', $a);
+            }
+        }
+    }
+}
+
+// AJAX interface not really needed: adds nice tree functions but not very useful
+// require_once('ajax.php');
 
 print_box_start('gradetreebox generalbox');
 
-echo '<div id="expandcontractdiv">
-       <a id="expand" href="#">Expand all</a>
-           <a id="collapse" href="#">Collapse all</a>
-       </div> ';
+// echo '<div id="expandcontractdiv"> <a id="expand" href="#">Expand all</a> <a id="collapse" href="#">Collapse all</a> </div> ';
 
 echo '<form method="post" action="'.$returnurl.'">';
-echo '<div id="weightstree">';
+echo '<input type="hidden" name="sesskey" value="'.sesskey().'" />';
+echo '<div id="gradetree">';
+echo build_html_tree(get_tree_json($gtree, $gtree->top_element), null, $returnurl);
 
 // print_grade_tree($gtree, $gtree->top_element, $gpr, $switch);
 //
-echo '</div>';
-echo '</form>';
+echo '</div><div>';
+
+echo '<input type="submit" value="Update weights" />';
+echo '</div></form>';
 print_box_end();
 
 print_footer($course);
 die;
 
-function get_tree_json(&$gtree, $element) {
-
-    $return_array = array();
-
-    $object = $element['object'];
-    $eid    = $element['eid'];
-    $object->name = $gtree->get_element_header($element, false, false, false);
-
-    $return_array['item'] = $object;
-
-    if ($element['type'] == 'category') {
-        foreach($element['children'] as $child_el) {
-            $return_array['children'][] = get_tree_json($gtree, $child_el);
-        }
-    }
-
-    return $return_array;
-}
 ?>
diff --git a/grade/edit/weights/lib.php b/grade/edit/weights/lib.php
new file mode 100644 (file)
index 0000000..ef53634
--- /dev/null
@@ -0,0 +1,199 @@
+<?php  // $Id$
+
+///////////////////////////////////////////////////////////////////////////
+//                                                                       //
+// NOTICE OF COPYRIGHT                                                   //
+//                                                                       //
+// Moodle - Modular Object-Oriented Dynamic Learning Environment         //
+//          http://moodle.com                                            //
+//                                                                       //
+// Copyright (C) 1999 onwards  Martin Dougiamas  http://moodle.com       //
+//                                                                       //
+// This program is free software; you can redistribute it and/or modify  //
+// it under the terms of the GNU General Public License as published by  //
+// the Free Software Foundation; either version 2 of the License, or     //
+// (at your option) any later version.                                   //
+//                                                                       //
+// This program is distributed in the hope that it will be useful,       //
+// but WITHOUT ANY WARRANTY; without even the implied warranty of        //
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         //
+// GNU General Public License for more details:                          //
+//                                                                       //
+//          http://www.gnu.org/copyleft/gpl.html                         //
+//                                                                       //
+///////////////////////////////////////////////////////////////////////////
+
+function get_tree_json(&$gtree, $element, $totals=false) {
+
+    $return_array = array();
+
+    $object = $element['object'];
+    $eid    = $element['eid'];
+    $object->name = $gtree->get_element_header($element, false, false, false);
+
+    $return_array['item'] = $object;
+
+    if ($element['type'] == 'category') {
+        foreach($element['children'] as $child_el) {
+            if (!empty($child_el['object']->itemtype) && ($child_el['object']->itemtype == 'course' || $child_el['object']->itemtype == 'category') && !$totals) {
+                continue;
+            }
+            $return_array['children'][] = get_tree_json($gtree, $child_el);
+        }
+    }
+
+    return $return_array;
+}
+
+function build_html_tree($tree, $element=null) {
+    global $CFG;
+
+    $options = array(GRADE_AGGREGATE_MEAN            =>get_string('aggregatemean', 'grades'),
+                     GRADE_AGGREGATE_WEIGHTED_MEAN   =>get_string('aggregateweightedmean', 'grades'),
+                     GRADE_AGGREGATE_WEIGHTED_MEAN2  =>get_string('aggregateweightedmean2', 'grades'),
+                     GRADE_AGGREGATE_EXTRACREDIT_MEAN=>get_string('aggregateextracreditmean', 'grades'),
+                     GRADE_AGGREGATE_MEDIAN          =>get_string('aggregatemedian', 'grades'),
+                     GRADE_AGGREGATE_MIN             =>get_string('aggregatemin', 'grades'),
+                     GRADE_AGGREGATE_MAX             =>get_string('aggregatemax', 'grades'),
+                     GRADE_AGGREGATE_MODE            =>get_string('aggregatemode', 'grades'),
+                     GRADE_AGGREGATE_SUM             =>get_string('aggregatesum', 'grades'));
+
+    $html = '';
+    $root = false;
+
+    if (is_null($element)) {
+        $html .= "<ul>\n";
+        $element = $tree;
+        $root = true;
+    }
+
+
+    $id = required_param('id', PARAM_INT);
+
+    if (!empty($element['children'])) { // Grade category
+        $category = grade_category::fetch(array('id' => $element['item']->id));
+        $item = $category->get_grade_item();
+
+        $html .= "<li class=\"category\">\n";
+        $script = "window.location='index.php?id=$id&amp;category={$category->id}&amp;aggregationtype='+this.value";
+        $aggregation_type = choose_from_menu($options, 'aggregation_type_'.$category->id, $category->aggregation, get_string('choose'), $script, 0, true);
+
+        $onlygradedcheck = ($category->aggregateonlygraded == 1) ? 'checked="checked"' : '';
+        $subcatscheck = ($category->aggregatesubcats == 1) ? 'checked="checked"' : '';
+        $outcomescheck = ($category->aggregateoutcomes == 1) ? 'checked="checked"' : '';
+
+        $aggregateonlygraded = '<label for="aggregateonlygraded_'.$category->id.'">'
+                           . '<img src="'.$CFG->pixpath.'/t/nonempty.gif" class="icon caticon" alt="'.get_string('aggregateonlygraded', 'grades').'" '
+                                . 'title="'.get_string('aggregateonlygraded', 'grades').'" /></label>'
+                           . '<input type="checkbox" id="aggregateonlygraded_'.$category->id.'" name="aggregateonlygraded_'.$category->id.'" '
+                                . $onlygradedcheck . ' />';
+
+        $aggregatesubcats = '<label for="aggregatesubcats_'.$category->id.'">'
+                           . '<img src="'.$CFG->pixpath.'/t/sigmaplus.gif" class="icon caticon" alt="'.get_string('aggregatesubcats', 'grades').'" '
+                                . 'title="'.get_string('aggregatesubcats', 'grades').'" /></label>'
+                           . '<input type="checkbox" id="aggregatesubcats_'.$category->id.'" name="aggregatesubcats_'.$category->id.'" '
+                                . $subcatscheck.' />';
+
+        $aggregateoutcomes = '<label for="aggregateoutcomes_'.$category->id.'">'
+                           . '<img src="'.$CFG->pixpath.'/t/outcomes.gif" class="icon caticon" alt="'.get_string('aggregateoutcomes', 'grades').'" '
+                                . 'title="'.get_string('aggregateoutcomes', 'grades').'" /></label>'
+                           . '<input type="checkbox" id="aggregateoutcomes_'.$category->id.'" name="aggregateoutcomes_'.$category->id.'" '
+                                . $outcomescheck.' />';
+
+        $hidden = '<input type="hidden" name="aggregateonlygraded_original_'.$category->id.'" value="'.$category->aggregateonlygraded.'" />';
+        $hidden .= '<input type="hidden" name="aggregatesubcats_original_'.$category->id.'" value="'.$category->aggregatesubcats.'" />';
+        $hidden .= '<input type="hidden" name="aggregateoutcomes_original_'.$category->id.'" value="'.$category->aggregateoutcomes.'" />';
+
+        // Add aggregation coef input if not a course item and if parent category has correct aggregation type
+        $aggcoef_input = get_weight_input($item);
+
+        $html .= '<span class="name">' . $element['item']->name . '</span>'
+              . $aggregation_type . $aggregateonlygraded . $aggregatesubcats . $aggregateoutcomes . $aggcoef_input . $hidden . "<ul>\n";
+
+        foreach ($element['children'] as $child) {
+            $html .= build_html_tree($tree, $child);
+        }
+
+        $html .= "</ul>\n";
+
+    } else { // Dealing with a grade item
+        $html .= "<li>\n";
+
+        $item = grade_item::fetch(array('id' => $element['item']->id));
+        $element['type'] = 'item';
+        $element['object'] = $item;
+
+        $element['item']->name = grade_structure::get_element_icon($element). $element['item']->name;
+
+        if (!empty($item->itemmodule) && $cm = get_coursemodule_from_instance($item->itemmodule, $item->iteminstance, $item->courseid)) {
+
+            $dir = $CFG->dirroot.'/mod/'.$item->itemmodule;
+
+            if (file_exists($dir.'/grade.php')) {
+                $url = $CFG->wwwroot.'/mod/'.$item->itemmodule.'/grade.php?id='.$cm->id;
+            } else {
+                $url = $CFG->wwwroot.'/mod/'.$item->itemmodule.'/view.php?id='.$cm->id;
+            }
+
+            $element['item']->name = '<a href="'.$url.'">'.$element['item']->name.'</a>';
+        }
+
+        // Determine aggregation coef element
+        $aggcoef_input = get_weight_input($item);
+        $html .= '<span class="gradeitem">' . "\n$aggcoef_input\n{$element['item']->name} (" . $item->get_formatted_range() . ")</span>\n";
+    }
+
+    $html .= "</li>\n";
+
+    if ($root) {
+        $html .= "</ul>\n";
+    }
+
+    return $html;
+}
+
+/**
+ * Given a grade_item object, returns a labelled input if an aggregation coefficient (weight or extra credit) applies to it.
+ * @param grade_item $item
+ * @return string HTML
+ */
+function get_weight_input($item) {
+    if ($item->is_course_item()) {
+        return '';
+    }
+
+    $parent_category = $item->get_parent_category();
+
+    if ($item->is_category_item()) {
+        $parent_category = $parent_category->get_parent_category();
+    }
+
+    $parent_category->apply_forced_settings();
+
+    if ($parent_category->is_aggregationcoef_used()) {
+        $aggcoef = '';
+
+        if ($parent_category->aggregation == GRADE_AGGREGATE_WEIGHTED_MEAN) {
+            $aggcoef = 'aggregationcoefweight';
+        } elseif ($parent_category->aggregation == GRADE_AGGREGATE_EXTRACREDIT_MEAN) {
+            $aggcoef = 'aggregationcoefextra';
+        } elseif ($parent_category->aggregation == GRADE_AGGREGATE_SUM) {
+            $aggcoef = 'aggregationcoefextrasum';
+        }
+
+        if ($aggcoef == 'aggregationcoefweight' || $aggcoef == 'aggregationcoefextra') {
+            return '<label class="weight" for="weight_'.$item->id.'">'.get_string($aggcoef, 'grades').'</label>'
+                           . '<input type="text" size="6" id="weight_'.$item->id.'" name="weight_'.$item->id.'" value="'.$item->aggregationcoef.'" />';
+        } elseif ($aggcoef == 'aggregationcoefextrasum' ) {
+            $checked = ($item->aggregationcoef > 0) ? 'checked="checked"' : '';
+            $extracredit = ($item->aggregationcoef > 0) ? 1 : 0;
+
+            return '<label class="weight" for="extracredit_'.$item->id.'">'.get_string($aggcoef, 'grades').'</label>'
+                           . '<input type="checkbox" id="extracredit_'.$item->id.'" name="extracredit_'.$item->id.'" ' . "$checked />\n"
+                           . '<input type="hidden" name="extracredit_original_'.$item->id.'" value="'.$extracredit.'" />';
+        } else {
+            return '';
+        }
+    }
+}
+?>
index d70421942fc5d281a1976246563672f196427fd1..dcdbc8b95aff2d22f286c3e89f8413936a007985 100644 (file)
     padding:1em;
     margin-top:1em;
 }
+
+span.gradeitem input {
+    margin-right: 10px;
+}
+
+span.gradeitem label,
+li.category label.weight {
+    margin-right: 10px;
+}
+
+li.category label.weight {
+    margin-left: 5px;
+}
+
+li.category span.name {
+    font-weight: bold;
+}
+
+img.caticon {
+    width: 11px;
+    height: 11px;
+    margin: 0px -1px 3px 5px;
+}
+
+#gradetree select {
+    margin-left: 10px;
+}
+
+li.category {
+    margin-top: 10px;
+}
+
+li.category ul {
+    margin-top: 10px;
+}
index 89c42f319f68de8be034609a77fc041564bf9dc8..1cbcdeb0c29380299d076d6cbb1cd0ba2609ee83 100644 (file)
@@ -1091,40 +1091,14 @@ class grade_report_grader extends grade_report {
             foreach ($this->gtree->get_items() as $itemid=>$unused) {
                 $item =& $this->gtree->get_item($itemid);
 
-                // Determine which display type to use for this average
-                if ($USER->gradeediting[$this->courseid]) {
-                    $displaytype = GRADE_DISPLAY_TYPE_REAL;
-
-                } else if ($rangesdisplaytype == GRADE_REPORT_PREFERENCE_INHERIT) { // no ==0 here, please resave report and user prefs
-                    $displaytype = $item->get_displaytype();
-
-                } else {
-                    $displaytype = $rangesdisplaytype;
-                }
-
-                // Override grade_item setting if a display preference (not default) was set for the averages
-                if ($rangesdecimalpoints == GRADE_REPORT_PREFERENCE_INHERIT) {
-                    $decimalpoints = $item->get_decimals();
-
-                } else {
-                    $decimalpoints = $rangesdecimalpoints;
-                }
-
-                if ($displaytype == GRADE_DISPLAY_TYPE_PERCENTAGE) {
-                    $grademin = "0 %";
-                    $grademax = "100 %";
-
-                } else {
-                    $grademin = grade_format_gradevalue($item->grademin, $item, true, $displaytype, $decimalpoints);
-                    $grademax = grade_format_gradevalue($item->grademax, $item, true, $displaytype, $decimalpoints);
-                }
-
                 $hidden = '';
                 if ($item->is_hidden()) {
                     $hidden = ' hidden ';
                 }
 
-                $scalehtml .= '<th class="header c'.$columncount++.' range"><span class="rangevalues'.$hidden.'">'. $grademin.'&ndash;'. $grademax.'</span></th>';
+                $formatted_range = $item->get_formatted_range($rangesdisplaytype, $rangesdecimalpoints);
+
+                $scalehtml .= '<th class="header c'.$columncount++.' range"><span class="rangevalues'.$hidden.'">'. $formatted_range .'</span></th>';
             }
             $scalehtml .= '</tr>';
         }
index 69e99100cd97823c944a96fb266333bb6a5dbc0f..fe6b2a760d573c55313ffc946829e2b5fb6bfe19 100644 (file)
@@ -153,6 +153,11 @@ $string['errornocalculationallowed'] = 'Calculations are not allowed for this it
 $string['errornocategorisedid'] = 'Could not get an uncategorised id!';
 $string['errornocourse'] = 'Could not get course information';
 $string['errorreprintheadersnonnumeric'] = 'Received non-numeric value for reprint-headers';
+$string['errorupdatinggradecategoryaggregateonlygraded'] = 'Error updating the \"Aggregate only graded items\" setting of of grade category ID $a->id';
+$string['errorupdatinggradecategoryaggregateoutcomes'] = 'Error updating the \"Aggregate outcomes\" setting of of grade category ID $a->id';
+$string['errorupdatinggradecategoryaggregatesubcats'] = 'Error updating the \"Aggregate sub-categories\" setting of of grade category ID $a->id';
+$string['errorupdatinggradecategoryaggregation'] = 'Error updating the aggregation type of grade category ID $a->id';
+$string['errorupdatinggradeitemaggregationcoef'] = 'Error updating the aggregation coefficient (weight or extra credit) of grade item ID $a->id';
 $string['exceptions'] = 'Exceptions';
 $string['excluded'] = 'Excluded';
 $string['excludedhelp'] = 'If -excluded- is switched on, this grade will be excluded from any aggregation performed by any parent grade item or category.';
@@ -514,6 +519,8 @@ $string['weightedascending'] = 'Sort by weighted percent ascending';
 $string['weighteddescending'] = 'Sort by weighted percent descending';
 $string['weightedpct'] = 'weighted %%';
 $string['weightedpctcontribution'] = 'weighted %% contribution';
+$string['weights'] = 'Weights';
+$string['weightsedit'] = 'Edit weights and extra credits';
 $string['writinggradebookinfo'] = 'Writing gradebook settings';
 $string['xml'] = 'XML';
 $string['yes'] = 'Yes';
index fba8038e4421cc0778a2c09357d84cd941eb48ac..c56331798b6d8a9be18f75eb47b4622129c93674 100644 (file)
@@ -1893,5 +1893,40 @@ class grade_item extends grade_object {
             return $this->decimals;
         }
     }
+
+    function get_formatted_range($rangesdisplaytype=null, $rangesdecimalpoints=null) {
+
+        global $USER;
+
+        // Determine which display type to use for this average
+        if (isset($USER->gradeediting) && $USER->gradeediting[$this->courseid]) {
+            $displaytype = GRADE_DISPLAY_TYPE_REAL;
+
+        } else if ($rangesdisplaytype == GRADE_REPORT_PREFERENCE_INHERIT) { // no ==0 here, please resave report and user prefs
+            $displaytype = $this->get_displaytype();
+
+        } else {
+            $displaytype = $rangesdisplaytype;
+        }
+
+        // Override grade_item setting if a display preference (not default) was set for the averages
+        if ($rangesdecimalpoints == GRADE_REPORT_PREFERENCE_INHERIT) {
+            $decimalpoints = $this->get_decimals();
+
+        } else {
+            $decimalpoints = $rangesdecimalpoints;
+        }
+
+        if ($displaytype == GRADE_DISPLAY_TYPE_PERCENTAGE) {
+            $grademin = "0 %";
+            $grademax = "100 %";
+
+        } else {
+            $grademin = grade_format_gradevalue($this->grademin, $this, true, $displaytype, $decimalpoints);
+            $grademax = grade_format_gradevalue($this->grademax, $this, true, $displaytype, $decimalpoints);
+        }
+
+        return $grademin.'&ndash;'. $grademax;
+    }
 }
 ?>
diff --git a/pix/t/nonempty.gif b/pix/t/nonempty.gif
new file mode 100644 (file)
index 0000000..5b65b2c
Binary files /dev/null and b/pix/t/nonempty.gif differ
diff --git a/pix/t/sigmaplus.gif b/pix/t/sigmaplus.gif
new file mode 100644 (file)
index 0000000..e9756e4
Binary files /dev/null and b/pix/t/sigmaplus.gif differ