Skip to content

Commit

Permalink
MDL-75274 gradereport_grader: Column collapsing
Browse files Browse the repository at this point in the history
  • Loading branch information
Chocolate-lightning committed Apr 13, 2023
1 parent e285841 commit 1a1939a
Show file tree
Hide file tree
Showing 34 changed files with 1,332 additions and 42 deletions.
106 changes: 106 additions & 0 deletions grade/classes/external/get_gradeitems.php
@@ -0,0 +1,106 @@
<?php
// This file is part of Moodle - http://moodle.org/
//
// Moodle 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 3 of the License, or
// (at your option) any later version.
//
// Moodle 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.
//
// You should have received a copy of the GNU General Public License
// along with Moodle. If not, see <http://www.gnu.org/licenses/>.

namespace core_grades\external;

defined('MOODLE_INTERNAL') || die;

use context_course;
use core_external\external_api;
use core_external\external_function_parameters;
use core_external\external_multiple_structure;
use core_external\external_single_structure;
use core_external\external_value;
use core_external\external_warnings;
use core_external\restricted_context_exception;
use grade_item;

require_once($CFG->libdir . '/gradelib.php');

/**
* External grade get gradeitems API implementation
*
* @package core_grades
* @copyright 2023 Mathew May <mathew.solutions>
* @category external
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
class get_gradeitems extends external_api {

/**
* Returns description of method parameters.
*
* @return external_function_parameters
*/
public static function execute_parameters(): external_function_parameters {
return new external_function_parameters (
[
'courseid' => new external_value(PARAM_INT, 'Course ID', VALUE_REQUIRED)
]
);
}

/**
* Given a course ID find the grading objects and return their names & IDs.
*
* @param int $courseid
* @return array
* @throws restricted_context_exception
* @throws \invalid_parameter_exception
*/
public static function execute(int $courseid): array {
$params = self::validate_parameters(
self::execute_parameters(),
[
'courseid' => $courseid
]
);

$warnings = [];
$context = context_course::instance($params['courseid']);
parent::validate_context($context);

$allgradeitems = grade_item::fetch_all(['courseid' => $params['courseid']]);
$gradeitems = array_filter($allgradeitems, function($item) {
$item->itemname = $item->get_name();
$item->category = $item->get_parent_category()->get_name();
return $item->gradetype != GRADE_TYPE_NONE && !$item->is_category_item() && !$item->is_course_item();
});

return [
'gradeItems' => $gradeitems,
'warnings' => $warnings,
];
}

/**
* Returns description of what gradeitems fetch should return.
*
* @return external_single_structure
*/
public static function execute_returns(): external_single_structure {
return new external_single_structure([
'gradeItems' => new external_multiple_structure(
new external_single_structure([
'id' => new external_value(PARAM_ALPHANUM, 'An ID for the grade item', VALUE_REQUIRED),
'itemname' => new external_value(PARAM_TEXT, 'The full name of the grade item', VALUE_REQUIRED),
'category' => new external_value(PARAM_TEXT, 'The grade category of the grade item', VALUE_OPTIONAL),
])
),
'warnings' => new external_warnings(),
]);
}
}
38 changes: 26 additions & 12 deletions grade/lib.php
Expand Up @@ -1539,7 +1539,7 @@ public function get_element_type_string(array $element): string {
* @param bool $withdescription Show description if defined by this item.
* @param bool $fulltotal If the item is a category total, returns $categoryname."total"
* instead of "Category total" or "Course total"
* @param moodle_url|null $sortlink Link to sort column.
* @param moodle_url|null $sortlink Link to sort column.
*
* @return string header
*/
Expand All @@ -1563,19 +1563,25 @@ public function get_element_header(array &$element, bool $withlink = false, bool

if ($sortlink) {
$url = $sortlink;
$header = html_writer::link($url, $header,
['title' => $titleunescaped, 'class' => 'gradeitemheader']);
}

if (!$sortlink) {
$header = html_writer::link($url, $header, [
'title' => $titleunescaped,
'class' => 'gradeitemheader '
]);
} else {
if ($withlink && $url = $this->get_activity_link($element)) {
$a = new stdClass();
$a->name = get_string('modulename', $element['object']->itemmodule);
$a->title = $titleunescaped;
$title = get_string('linktoactivity', 'grades', $a);
$header = html_writer::link($url, $header, ['title' => $title, 'class' => 'gradeitemheader']);
$header = html_writer::link($url, $header, [
'title' => $title,
'class' => 'gradeitemheader ',
]);
} else {
$header = html_writer::span($header, 'gradeitemheader', ['title' => $titleunescaped, 'tabindex' => '0']);
$header = html_writer::span($header, 'gradeitemheader ', [
'title' => $titleunescaped,
'tabindex' => '0'
]);
}
}

Expand Down Expand Up @@ -2460,7 +2466,7 @@ public function set_grade_status_icons(array $element): string {
}
}

$class = 'grade_icons';
$class = 'grade_icons data-collapse_gradeicons';
if (isset($element['type']) && ($element['type'] == 'category')) {
$class = 'category_grade_icons';
}
Expand Down Expand Up @@ -2526,14 +2532,18 @@ public function get_cell_action_menu(array $element, string $mode, grade_plugin_
$element, $gpr, $mode, $context, true);
$context->advancedgradingurl = $this->get_advanced_grading_link($element, $gpr);
}
$context->divider1 = true;
}

if ($element['type'] == 'item') {
$context->divider1 = true;
if (($element['type'] == 'item') ||
(($element['type'] == 'userfield') && ($element['name'] !== 'fullname'))) {
$context->divider2 = true;
}

if (!empty($USER->editing) || $mode == 'setup') {
if (($element['type'] !== 'userfield') && ($mode !== 'setup')) {
if (($element['type'] == 'userfield') && ($element['name'] !== 'fullname')) {
$context->divider2 = true;
} else if (($mode !== 'setup') && ($element['type'] !== 'userfield')) {
$context->divider1 = true;
$context->divider2 = true;
}
Expand Down Expand Up @@ -2577,6 +2587,10 @@ public function get_cell_action_menu(array $element, string $mode, grade_plugin_
$context->descendingurl = $this->get_sorting_link($sortlink, $gpr, 'desc');
}
}
if ($mode !== 'setup') {
$context = grade_report::get_additional_context($this->context, $this->courseid,
$element, $gpr, $mode, $context);
}
} else if ($element['type'] == 'category') {
$context->datatype = 'category';
if ($mode !== 'setup') {
Expand Down

0 comments on commit 1a1939a

Please sign in to comment.