MDL-9628 Basic support for compact view

diff --git a/grade/report/grader/index.php b/grade/report/grader/index.php
index 1d95ee499afe44a93e06d4129bc981158f45da8b..558fb39572d82214973950d0e987ceecd261a301 100644 (file)
--- a/grade/report/grader/index.php
+++ b/grade/report/grader/index.php
@@ -34,7 +34,7 @@ $perpageurl    = optional_param('perpage', 0, PARAM_INT);
 $edit          = optional_param('edit', -1, PARAM_BOOL); // sticky editting mode
 
 $sortitemid    = optional_param('sortitemid', 0, PARAM_ALPHANUM); // sort by which grade item
-$action        = optional_param('action', 0, PARAM_ALPHA);
+$action        = optional_param('action', 0, PARAM_ALPHAEXT);
 $move          = optional_param('move', 0, PARAM_INT);
 $type          = optional_param('type', 0, PARAM_ALPHA);
 $target        = optional_param('target', 0, PARAM_ALPHANUM);

diff --git a/grade/report/grader/lib.php b/grade/report/grader/lib.php
index bd09921df06af95be94cc41515efe945d0d3d7b0..c2af344834ae33bd1925e7d3ef9b255779046717 100644 (file)
--- a/grade/report/grader/lib.php
+++ b/grade/report/grader/lib.php
@@ -365,8 +365,11 @@ class grade_report_grader extends grade_report {
     function get_headerhtml() {
         global $CFG, $USER;
 
-        $strsortasc  = $this->get_lang_string('sortasc', 'grades');
-        $strsortdesc = $this->get_lang_string('sortdesc', 'grades');
+        $strsortasc   = $this->get_lang_string('sortasc', 'grades');
+        $strsortdesc  = $this->get_lang_string('sortdesc', 'grades');
+        $strfirstname = $this->get_lang_string('firstname');
+        $strlastname  = $this->get_lang_string('lastname');
+
         if ($this->sortitemid === 'lastname') {
             if ($this->sortorder == 'ASC') {
                 $lastarrow = print_arrow('up', $strsortasc, true);
@@ -402,8 +405,8 @@ class grade_report_grader extends grade_report {
             $headerhtml .= '<tr class="heading">';
 
             if ($key == $numrows - 1) {
-                $headerhtml .= '<th class="user"><a href="'.$this->baseurl.'&amp;sortitemid=firstname">Firstname</a> ' //TODO: localize
-                            . $firstarrow. '/ <a href="'.$this->baseurl.'&amp;sortitemid=lastname">Lastname </a>'. $lastarrow .'</th>';
+                $headerhtml .= '<th class="user"><a href="'.$this->baseurl.'&amp;sortitemid=firstname">' . $strfirstname . '</a> ' //TODO: localize
+                            . $firstarrow. '/ <a href="'.$this->baseurl.'&amp;sortitemid=lastname">' . $strlastname . '</a>'. $lastarrow .'</th>';
             } else {
                 $headerhtml .= '<td class="topleft">&nbsp;</td>';
             }
@@ -418,16 +421,23 @@ class grade_report_grader extends grade_report {
                     $categoryid = $element['object']->id;
                     $aggregationview = $this->get_pref('aggregationview', $categoryid);
 
+
                     if ($aggregationview == GRADE_REPORT_AGGREGATION_VIEW_COMPACT) {
                         $categorystate = get_user_preferences('grade_report_categorystate' . $categoryid, GRADE_CATEGORY_EXPANDED);
 
+                        $hideall = false;
+                        if (in_array($eid, $columns_to_unset)) {
+                            $categorystate = GRADE_CATEGORY_CONTRACTED;
+                            $hideall = true;
+                        }
+
                         // Expand/Contract icon must be set appropriately
                         if ($categorystate == GRADE_CATEGORY_CONTRACTED) {
                             // The category is contracted: this means we only show 1 item for this category: the
                             // category's aggregation item. The others must be removed from the grade_tree
                             $element['colspan'] = 1;
                             foreach ($element['children'] as $index => $child) {
-                                if ($child['type'] != 'categoryitem') {
+                                if ($child['type'] != 'categoryitem' OR $hideall) {
                                     $columns_to_unset[] = $child['eid'];
                                 }
                             }
@@ -441,9 +451,12 @@ class grade_report_grader extends grade_report {
                                     $columns_to_unset[] = $child['eid'];
                                 }
                             }
+                        } else {
+                            debugging("The category state ($categorystate) was not amongst the allowed values (0 or 1)");
+                            var_dump($element);
                         }
                     }
-                }
+                } // End of category handling
 
                 if (!empty($element['colspan'])) {
                     $colspan = 'colspan="'.$element['colspan'].'"';
@@ -928,7 +941,9 @@ class grade_report_grader extends grade_report {
             $strswitch_minus = $this->get_lang_string('contract', 'grades');
             $strswitch_plus  = $this->get_lang_string('expand', 'grades');
             $expand_contract = 'switch_minus'; // Default: expanded
-            $state = get_user_preferences('grade_category_'.$element['object']->id, GRADE_CATEGORY_EXPANDED);
+
+            $state = get_user_preferences('grade_report_categorystate' . $element['object']->id, GRADE_CATEGORY_EXPANDED);
+
             if ($state == GRADE_CATEGORY_CONTRACTED) {
                 $expand_contract = 'switch_plus';
             }
@@ -940,5 +955,28 @@ class grade_report_grader extends grade_report {
 
         return '<div class="grade_icons">'.$edit_icon.$edit_calculation_icon.$show_hide_icon.$lock_unlock_icon.$contract_expand_icon.'</div>';
     }
+
+    /**
+     * Processes a single action against a category, grade_item or grade.
+     * @param string $target eid ({type}{id}, e.g. c4 for category4)
+     * @param string $action Which action to take (edit, delete etc...)
+     * @return
+     */
+    function process_action($target, $action) {
+        $targettype = substr($target, 0, 1);
+        $targetid = substr($target, 1);
+        switch ($action) {
+            case 'switch_minus':
+                set_user_preference('grade_report_categorystate' . $targetid, GRADE_CATEGORY_CONTRACTED);
+                break;
+            case 'switch_plus':
+                set_user_preference('grade_report_categorystate' . $targetid, GRADE_CATEGORY_EXPANDED);
+                break;
+            default:
+                break;
+        }
+
+        return true;
+    }
 }
 ?>

diff --git a/lang/en_utf8/grades.php b/lang/en_utf8/grades.php
index 6176b89e9b61a0aeb4f42836ffd1a3e78578d5d3..d4c19ce46b539489953c221bc510e74da84f00cc 100644 (file)
--- a/lang/en_utf8/grades.php
+++ b/lang/en_utf8/grades.php
@@ -139,6 +139,7 @@ $string['gradeletternote'] = 'To delete a grade letter just empty any of the<br
 $string['grademax'] = 'Maximum grade';
 $string['grademin'] = 'Minimum grade';
 $string['gradepass'] = 'Grade to pass';
+$string['graderreport'] = 'Grader report';
 $string['gradessettings'] = 'Grade settings';
 $string['groupavg'] = 'Group average';
 $string['hidden'] = 'Hidden';