- 
+
- {{#pluginname}}
+ {{#showpluginname}}
{{{pluginname}}}
- {{/pluginname}}
+ {{/showpluginname}}
{{#activityname}}
{{$ core/inplace_editable }}
diff --git a/course/lib.php b/course/lib.php
index f01de15b6c752..505411acfacfa 100644
--- a/course/lib.php
+++ b/course/lib.php
@@ -3444,10 +3444,9 @@ function duplicate_module($course, $cm) {
// Proceed with activity renaming before everything else. We don't use APIs here to avoid
// triggering a lot of create/update duplicated events.
$newcm = get_coursemodule_from_id($cm->modname, $newcmid, $cm->course);
- // Add ' (copy)' to duplicates. Note we don't cleanup or validate lengths here. It comes
- // from original name that was valid, so the copy should be too.
+ // Add ' (copy)' language string postfix to duplicated module.
$newname = get_string('duplicatedmodule', 'moodle', $newcm->name);
- $DB->set_field($cm->modname, 'name', $newname, ['id' => $newcm->instance]);
+ set_coursemodule_name($newcm->id, $newname);
$section = $DB->get_record('course_sections', array('id' => $cm->section, 'course' => $cm->course));
$modarray = explode(",", trim($section->sequence));
diff --git a/course/renderer.php b/course/renderer.php
index 4894ff901e145..70c2bc8ca9861 100644
--- a/course/renderer.php
+++ b/course/renderer.php
@@ -1210,7 +1210,7 @@ protected function course_overview_files(core_course_list_element $course): stri
$file->get_filearea() . $file->get_filepath() . $file->get_filename(), !$isimage);
if ($isimage) {
$contentimages .= html_writer::tag('div',
- html_writer::empty_tag('img', ['src' => $url]),
+ html_writer::empty_tag('img', ['src' => $url, 'alt' => '']),
['class' => 'courseimage']);
} else {
$image = $this->output->pix_icon(file_file_icon($file, 24), $file->get_filename(), 'moodle');
@@ -1662,13 +1662,13 @@ public function course_category($category) {
if (core_course_category::is_simple_site()) {
// There is only one category in the system, do not display link to it.
$strfulllistofcourses = get_string('fulllistofcourses');
- $this->page->set_title("$site->shortname: $strfulllistofcourses");
+ $this->page->set_title($strfulllistofcourses);
} else if (!$coursecat->id || !$coursecat->is_uservisible()) {
$strcategories = get_string('categories');
- $this->page->set_title("$site->shortname: $strcategories");
+ $this->page->set_title($strcategories);
} else {
$strfulllistofcourses = get_string('fulllistofcourses');
- $this->page->set_title("$site->shortname: $strfulllistofcourses");
+ $this->page->set_title($strfulllistofcourses);
}
// Print current category description
diff --git a/course/search.php b/course/search.php
index ccaf4b302a994..f0d9d62561403 100644
--- a/course/search.php
+++ b/course/search.php
@@ -86,10 +86,10 @@
if (empty($searchcriteria)) {
// no search criteria specified, print page with just search form
- $PAGE->set_title("$site->fullname : $strsearch");
+ $PAGE->set_title($strsearch);
} else {
// this is search results page
- $PAGE->set_title("$site->fullname : $strsearchresults");
+ $PAGE->set_title($strsearchresults);
// Link to manage search results should be visible if user have system or category level capability
if ((can_edit_in_category() || !empty($usercatlist))) {
$aurl = new moodle_url('/course/management.php', $searchcriteria);
diff --git a/course/templates/coursecard.mustache b/course/templates/coursecard.mustache
index 0fc3e6083471a..e9c5fabdac216 100644
--- a/course/templates/coursecard.mustache
+++ b/course/templates/coursecard.mustache
@@ -39,7 +39,7 @@
data-course-id="{{{id}}}">
- {{#str}}aria:courseimage, core_course{{/str}}
+ {{fullname}}
@@ -58,8 +58,8 @@
{{> core_course/favouriteicon }}
- {{#str}}aria:coursename, core_course{{/str}}
-
+ {{#str}}aria:coursename, core_course{{/str}}
+
{{$coursename}}{{/coursename}}
diff --git a/course/tests/behat/activity_resource_delete.feature b/course/tests/behat/activity_resource_delete.feature
new file mode 100644
index 0000000000000..15f03d063d07d
--- /dev/null
+++ b/course/tests/behat/activity_resource_delete.feature
@@ -0,0 +1,39 @@
+@core @core_course
+Feature: Delete activity and resource works correctly
+ As a teacher
+ I want to be able to delete an activity and resource
+ So that I can remove it from the course
+
+ Background:
+ Given the following "users" exist:
+ | username | firstname | lastname | email |
+ | teacher1 | Teacher | 1 | teacher1@example.com |
+ And the following "courses" exist:
+ | fullname | shortname | category |
+ | Course 1 | C1 | 0 |
+ And the following "course enrolments" exist:
+ | user | course | role |
+ | teacher1 | C1 | editingteacher |
+ And the following "activities" exist:
+ | activity | course | name | intro |
+ | label | C1 | Label 1 | Label 1 |
+ | glossary | C1 | Glossary 1 | Glossary 1 |
+
+ @javascript
+ Scenario: Activity and resource can be deleted properly
+ Given I am on the "Course 1" course page logged in as teacher1
+ And I turn editing mode on
+ And I open "Label 1" actions menu
+ When I click on "Delete" "link" in the "Label 1" activity
+ And I click on "Yes" "button" in the "Confirm" "dialogue"
+ # Confirm that label is successfully deleted
+ Then I should not see "Label 1"
+ And I open "Glossary 1" actions menu
+ And I click on "Delete" "link" in the "Glossary 1" activity
+ And I click on "Yes" "button" in the "Confirm" "dialogue"
+ # Confirm that glossary is successfully deleted
+ And I should not see "Glossary 1"
+ # Reload the page and confirm that both the label and glossary are really deleted
+ And I reload the page
+ And I should not see "Label 1"
+ And I should not see "Glossary 1"
diff --git a/course/tests/behat/activity_resource_description_display.feature b/course/tests/behat/activity_resource_description_display.feature
new file mode 100644
index 0000000000000..8a1ac00e34baf
--- /dev/null
+++ b/course/tests/behat/activity_resource_description_display.feature
@@ -0,0 +1,71 @@
+@core @core_course
+Feature: Display activity and resource description
+ In order to display activity and resource description
+ As teacher
+ I should be able to enable "Display description on course page"
+
+ Background:
+ Given the following "users" exist:
+ | username | firstname | lastname | email |
+ | teacher1 | Teacher | 1 | teacher1@example.com |
+ And the following "courses" exist:
+ | fullname | shortname |
+ | Course 1 | C1 |
+ And the following "course enrolments" exist:
+ | user | course | role |
+ | teacher1 | C1 | editingteacher |
+
+ Scenario Outline: Display activity and resource descriptions
+ # Generate activity/resource with description
+ Given the following "activities" exist:
+ | activity | course | name | intro | showdescription |
+ | | C1 | | intro | 1 |
+ When I am on the "Course 1" course page logged in as teacher1
+ # Confirm that activity name and description are displayed
+ Then I should see "" in the "region-main" "region"
+ And I should see " intro" in the "region-main" "region"
+
+ Examples:
+ | acttype | actname |
+ | assign | Assign 1 |
+ | book | Book 1 |
+ | chat | Chat 1 |
+ | data | Database 1 |
+ | feedback | Feedback 1 |
+ | forum | Forum 1 |
+ | label | Label 1 |
+ | lti | LTI 1 |
+ | page | Page 1 |
+ | quiz | Quiz 1 |
+ | resource | Resource 1 |
+ | imscp | IMSCP 1 |
+ | folder | Folder 1 |
+ | glossary | Glossary 1 |
+ | scorm | Scorm 1 |
+ | lesson | Lesson 1 |
+ | survey | Survey 1 |
+ | url | URL 1 |
+ | wiki | Wiki 1 |
+ | workshop | Workshop 1 |
+
+ Scenario: Display url activity description with pop-up display
+ # Generate url activity with description and popup appearance
+ Given the following "activities" exist:
+ | activity | course | name | intro | showdescription | display | popupwidth | popupheight |
+ | url | C1 | URL 1 | URL 1 intro | 1 | 6 | 620 | 450 |
+ When I am on the "Course 1" course page logged in as teacher1
+ # Confirm that activity name and description are displayed
+ Then I should see "URL 1" in the "region-main" "region"
+ And I should see "URL 1 intro" in the "region-main" "region"
+
+ Scenario: Display activity with image description
+ # Generate page activity with image embedded in description
+ Given the following "activities" exist:
+ | activity | course | name | intro | showdescription |
+ | page | C1 | Page 1 | Page 1 intro with image: 
| 1 |
+ When I am on the "Course 1" course page logged in as teacher1
+ # Confirm that activity name and description are displayed
+ Then I should see "Page 1" in the "region-main" "region"
+ And I should see "Page 1 intro with image:" in the "region-main" "region"
+ # Confirm that image element exists
+ And "//img[contains(@src, 'http://download.moodle.org/unittest/test.jpg')]" "xpath_element" should exist in the "region-main" "region"
diff --git a/course/tests/reportbuilder/datasource/participants_test.php b/course/tests/reportbuilder/datasource/participants_test.php
index 25025ae019113..3c9c1abf9ccf2 100644
--- a/course/tests/reportbuilder/datasource/participants_test.php
+++ b/course/tests/reportbuilder/datasource/participants_test.php
@@ -80,7 +80,7 @@ public function test_participants_datasource(): void {
// Update final grade for the user.
$courseitem = grade_item::fetch_course_item($course->id);
- $courseitem->update_final_grade($user1->id, 80);
+ $courseitem->update_final_grade($user1->id, 42.5);
// Set some last access value for the user in the course.
$DB->insert_record('user_lastaccess',
@@ -152,7 +152,7 @@ public function test_participants_datasource(): void {
'', // Reagreggate.
'2', // Days taking course.
'2', // Days until completion.
- '80.00', // Grade.
+ '42.50', // Grade.
], array_values($content[0]));
}
diff --git a/course/view.php b/course/view.php
index 659834c565ad4..4ecf21dd46c49 100644
--- a/course/view.php
+++ b/course/view.php
@@ -227,13 +227,21 @@
$PAGE->set_button($buttons);
}
+ $editingtitle = '';
+ if ($PAGE->user_is_editing()) {
+ // Append this to the page title's lang string to get its equivalent when editing mode is turned on.
+ $editingtitle = 'editing';
+ }
+
// If viewing a section, make the title more specific
if ($section and $section > 0 and course_format_uses_sections($course->format)) {
$sectionname = get_string('sectionname', "format_$course->format");
$sectiontitle = get_section_name($course, $section);
- $PAGE->set_title(get_string('coursesectiontitle', 'moodle', array('course' => $course->fullname, 'sectiontitle' => $sectiontitle, 'sectionname' => $sectionname)));
+ $PAGE->set_title(get_string('coursesectiontitle' . $editingtitle, 'moodle', array(
+ 'course' => $course->fullname, 'sectiontitle' => $sectiontitle, 'sectionname' => $sectionname)
+ ));
} else {
- $PAGE->set_title(get_string('coursetitle', 'moodle', array('course' => $course->fullname)));
+ $PAGE->set_title(get_string('coursetitle' . $editingtitle, 'moodle', array('course' => $course->fullname)));
}
$PAGE->set_heading($course->fullname);
diff --git a/customfield/field/textarea/lib.php b/customfield/field/textarea/lib.php
index 83389f37dad36..92fb5523b7587 100644
--- a/customfield/field/textarea/lib.php
+++ b/customfield/field/textarea/lib.php
@@ -72,5 +72,5 @@ function customfield_textarea_pluginfile($course, $cm, $context, $filearea, $arg
}
// We can now send the file back to the browser - in this case with a cache lifetime of 1 day and no filtering.
- send_file($file, 86400, 0, $forcedownload, $options);
+ send_stored_file($file, DAYSECS, 0, $forcedownload, $options);
}
diff --git a/customfield/lib.php b/customfield/lib.php
index 2f9b97eeb1599..c91a8892898e2 100644
--- a/customfield/lib.php
+++ b/customfield/lib.php
@@ -80,6 +80,5 @@ function core_customfield_pluginfile($course, $cm, $context, $filearea, $args, $
}
// We can now send the file back to the browser - in this case with a cache lifetime of 1 day and no filtering.
- // From Moodle 2.3, use send_stored_file instead.
- send_file($file, 86400, 0, $forcedownload, $options);
+ send_stored_file($file, DAYSECS, 0, $forcedownload, $options);
}
diff --git a/enrol/lti/classes/local/ltiadvantage/task/sync_grades.php b/enrol/lti/classes/local/ltiadvantage/task/sync_grades.php
index d2ecd53a69416..cd2ea3a88bd33 100644
--- a/enrol/lti/classes/local/ltiadvantage/task/sync_grades.php
+++ b/enrol/lti/classes/local/ltiadvantage/task/sync_grades.php
@@ -195,7 +195,8 @@ protected function sync_grades_for_resource($resource): array {
continue;
}
- if ($response['status'] == 200) {
+ $successresponses = [200, 201, 202, 204];
+ if (in_array($response['status'], $successresponses)) {
$user->set_lastgrade(grade_floatval($grade));
$syncedusergrades[$user->get_id()] = $user;
mtrace("Success - The grade '$floatgrade' $mtracecontent was sent.");
diff --git a/enrol/lti/tests/local/ltiadvantage/task/sync_grades_test.php b/enrol/lti/tests/local/ltiadvantage/task/sync_grades_test.php
index 3282491e18938..62b9a36396a5a 100644
--- a/enrol/lti/tests/local/ltiadvantage/task/sync_grades_test.php
+++ b/enrol/lti/tests/local/ltiadvantage/task/sync_grades_test.php
@@ -144,6 +144,70 @@ protected function override_resource_completion_status_for_user(\stdClass $resou
}
}
+
+ /**
+ * Data provider for test_grade_sync_positive_case.
+ *
+ * @return array
+ */
+ public static function grade_sync_positive_cases(): array {
+ return [
+ [200],
+ [201],
+ [202],
+ [204],
+ ];
+ }
+
+ /**
+ * Test the sync grades task works correct when platform responses with given status code.
+ *
+ * @covers ::execute
+ * @param string $statuscode the response status code with which the job should work correctly
+ * @dataProvider grade_sync_positive_cases
+ */
+ public function test_grade_sync_positive_case($statuscode): void {
+ $this->resetAfterTest();
+
+ [$course, $resource] = $this->create_test_environment();
+ $launchservice = $this->get_tool_launch_service();
+ $task = $this->get_task_with_mocked_grade_service($statuscode);
+
+ // Launch the resource for an instructor which will create the domain objects needed for service calls.
+ $teachermocklaunch = $this->get_mock_launch($resource, $this->get_mock_launch_users_with_ids(['1'], false)[0]);
+ $instructoruser = $this->getDataGenerator()->create_user();
+ [$teacherid, $resource] = $launchservice->user_launches_tool($instructoruser, $teachermocklaunch);
+
+ // Launch the resource for a few more users, creating those enrolments and allowing grading to take place.
+ $studentusers = $this->get_mock_launch_users_with_ids(['2'], false,
+ 'http://purl.imsglobal.org/vocab/lis/v2/membership#Learner');
+
+ $student1mocklaunch = $this->get_mock_launch($resource, $studentusers[0]);
+ $student1user = $this->getDataGenerator()->create_user();
+ [$student1id] = $launchservice->user_launches_tool($student1user, $student1mocklaunch);
+
+ // Grade student1.
+ $expectedstudent1grade = $this->set_user_grade_for_resource($student1id, 65, $resource);
+
+ // Sync and verify that only student1's grade is sent.
+ ob_start();
+ $task->execute();
+ $ob = ob_get_contents();
+ ob_end_clean();
+ $expectedtraces = [
+ "Starting - LTI Advantage grade sync for shared resource '$resource->id' in course '$course->id'.",
+ "Skipping - Invalid grade for the user '$teacherid', for the resource '$resource->id' and the course ".
+ "'$course->id'.",
+ "Success - The grade '$expectedstudent1grade' for the user '$student1id', for the resource ".
+ "'$resource->id' and the course '$course->id' was sent.",
+ "Completed - Synced grades for tool '$resource->id' in the course '$course->id'. ".
+ "Processed 2 users; sent 1 grades."
+ ];
+ foreach ($expectedtraces as $expectedtrace) {
+ $this->assertStringContainsString($expectedtrace, $ob);
+ }
+ }
+
/**
* Test confirming task name.
*
diff --git a/enrol/manual/lib.php b/enrol/manual/lib.php
index 3ae5d0fd1761d..d896db70780d7 100644
--- a/enrol/manual/lib.php
+++ b/enrol/manual/lib.php
@@ -173,6 +173,9 @@ public function update_instance($instance, $data) {
}
}
}
+
+ $data->notifyall = $data->expirynotify == 2 ? 1 : 0;
+
return parent::update_instance($instance, $data);
}
diff --git a/enrol/manual/tests/lib_test.php b/enrol/manual/tests/lib_test.php
index a8a6e86a3bdaa..0f4b09bdc1094 100644
--- a/enrol/manual/tests/lib_test.php
+++ b/enrol/manual/tests/lib_test.php
@@ -647,4 +647,118 @@ public function default_enrolment_instance_data_provider(): array {
],
];
}
+
+ /**
+ * Tests an enrolment instance is updated properly.
+ *
+ * @covers \enrol_manual::update_instance
+ * @dataProvider update_enrolment_instance_data_provider
+ *
+ * @param stdClass $expectation
+ * @param stdClass $updatedata
+ */
+ public function test_enrolment_instance_is_updated(stdClass $expectation, stdClass $updatedata): void {
+ global $DB;
+
+ $this->resetAfterTest();
+
+ $generator = $this->getDataGenerator();
+
+ $studentroles = get_archetype_roles('student');
+ $studentrole = array_shift($studentroles);
+
+ // Given the plugin is globally configured with the following settings.
+ $plugin = enrol_get_plugin('manual');
+ $plugin->set_config('status', ENROL_INSTANCE_ENABLED);
+ $plugin->set_config('roleid', $studentrole->id);
+ $plugin->set_config('enrolperiod', 30 * DAYSECS);
+ $plugin->set_config('expirynotify', 1);
+ $plugin->set_config('expirythreshold', 2 * DAYSECS);
+
+ // And a course is created with the default enrolment instance.
+ $course = $generator->create_course();
+
+ // When the enrolment instance is being updated.
+ $enrolinstance = $DB->get_record('enrol', ['courseid' => $course->id, 'enrol' => 'manual']);
+ $successfullyupdated = $plugin->update_instance($enrolinstance, $updatedata);
+
+ // Then the update is successful.
+ $this->assertTrue($successfullyupdated);
+
+ // And the updated enrolment instance contains the expected values.
+ $enrolinstance = $DB->get_record('enrol', ['id' => $enrolinstance->id]);
+ $this->assertEquals($expectation->status, $enrolinstance->status);
+ $this->assertEquals($expectation->roleid, $enrolinstance->roleid);
+ $this->assertEquals($expectation->enrolperiod, $enrolinstance->enrolperiod);
+ $this->assertEquals($expectation->expirynotify, $enrolinstance->expirynotify);
+ $this->assertEquals($expectation->notifyall, $enrolinstance->notifyall);
+ $this->assertEquals($expectation->expirythreshold, $enrolinstance->expirythreshold);
+ }
+
+ /**
+ * Data provider for test_enrolment_instance_is_updated().
+ *
+ * @return array
+ */
+ public function update_enrolment_instance_data_provider(): array {
+ $studentroles = get_archetype_roles('student');
+ $studentrole = array_shift($studentroles);
+
+ $teacherroles = get_archetype_roles('teacher');
+ $teacherrole = array_shift($teacherroles);
+
+ return [
+ 'disabled, all the others are default' => [
+ 'expectation' => (object) [
+ 'status' => ENROL_INSTANCE_DISABLED,
+ 'roleid' => $studentrole->id,
+ 'enrolperiod' => 30 * DAYSECS,
+ 'expirynotify' => 1,
+ 'notifyall' => 0,
+ 'expirythreshold' => 2 * DAYSECS,
+ ],
+ 'update data' => (object) [
+ 'status' => ENROL_INSTANCE_DISABLED,
+ 'roleid' => $studentrole->id,
+ 'enrolperiod' => 30 * DAYSECS,
+ 'expirynotify' => 1,
+ 'expirythreshold' => 2 * DAYSECS,
+ ],
+ ],
+ 'enabled, teacher role, no duration set, notify no one on expiry, 0 notification threshold' => [
+ 'expectation' => (object) [
+ 'status' => ENROL_INSTANCE_ENABLED,
+ 'roleid' => $teacherrole->id,
+ 'enrolperiod' => 0,
+ 'expirynotify' => 0,
+ 'notifyall' => 0,
+ 'expirythreshold' => 0,
+ ],
+ 'update data' => (object) [
+ 'status' => ENROL_INSTANCE_ENABLED,
+ 'roleid' => $teacherrole->id,
+ 'enrolperiod' => 0,
+ 'expirynotify' => 0,
+ 'expirythreshold' => 0,
+ ],
+ ],
+ 'notify enroller and enrolled on expiry, all the others are default' => [
+ 'expectation' => (object) [
+ 'status' => ENROL_INSTANCE_ENABLED,
+ 'roleid' => $studentrole->id,
+ 'enrolperiod' => 30 * DAYSECS,
+ 'expirynotify' => 2,
+ 'notifyall' => 1,
+ 'expirythreshold' => 2 * DAYSECS,
+ ],
+ 'update data' => (object) [
+ 'status' => ENROL_INSTANCE_ENABLED,
+ 'roleid' => $studentrole->id,
+ 'enrolperiod' => 30 * DAYSECS,
+ 'expirynotify' => 2,
+ 'expirythreshold' => 2 * DAYSECS,
+ ],
+ ],
+ ];
+ }
}
diff --git a/filter/tidy/filter.php b/filter/tidy/filter.php
index 2bdb79ffba39b..350beb24f2354 100644
--- a/filter/tidy/filter.php
+++ b/filter/tidy/filter.php
@@ -47,7 +47,6 @@ function filter($text, array $options = array()) {
'show-body-only' => true,
'tidy-mark' => false,
'drop-proprietary-attributes' => true,
- 'clean' => true,
'drop-empty-paras' => true,
'indent' => true,
'quiet' => true,
diff --git a/grade/classes/external/get_groups_for_search_widget.php b/grade/classes/external/get_groups_for_search_widget.php
index 7ca8230ec63cf..300cb4627751c 100644
--- a/grade/classes/external/get_groups_for_search_widget.php
+++ b/grade/classes/external/get_groups_for_search_widget.php
@@ -63,12 +63,8 @@ public static function execute_parameters(): external_function_parameters {
* @param int $courseid
* @param string $actionbaseurl The base URL for the group action.
* @return array Groups and warnings to pass back to the calling widget.
- * @throws coding_exception
- * @throws invalid_parameter_exception
- * @throws moodle_exception
- * @throws restricted_context_exception
*/
- protected static function execute(int $courseid, string $actionbaseurl): array {
+ public static function execute(int $courseid, string $actionbaseurl): array {
global $DB, $USER, $COURSE;
$params = self::validate_parameters(
diff --git a/grade/edit/tree/lib.php b/grade/edit/tree/lib.php
index d49b451fe527c..9a82049c0a7bc 100644
--- a/grade/edit/tree/lib.php
+++ b/grade/edit/tree/lib.php
@@ -312,8 +312,8 @@ public function build_html_tree($element, $totals, $parents, $level, &$row_count
$headercell = new html_table_cell();
$headercell->header = true;
$headercell->scope = 'row';
- $headercell->attributes['title'] = $object->stripped_name;
$headercell->attributes['class'] = 'cell column-rowspan rowspan ' . $levelclass;
+ $headercell->attributes['aria-hidden'] = 'true';
$headercell->rowspan = $row_count + 1;
$row->cells[] = $headercell;
@@ -338,6 +338,7 @@ public function build_html_tree($element, $totals, $parents, $level, &$row_count
$endcell = new html_table_cell();
$endcell->colspan = (19 - $level);
$endcell->attributes['class'] = 'emptyrow colspan ' . $levelclass;
+ $endcell->attributes['aria-hidden'] = 'true';
$returnrows[] = new html_table_row(array($endcell));
@@ -749,13 +750,11 @@ public abstract function get_header_cell();
public function get_category_cell($category, $levelclass, $params) {
$cell = clone($this->categorycell);
$cell->attributes['class'] .= ' ' . $levelclass;
- $cell->attributes['text'] = '';
return $cell;
}
public function get_item_cell($item, $params) {
$cell = clone($this->itemcell);
- $cell->attributes['text'] = '';
if (isset($params['level'])) {
$level = $params['level'] + (($item->itemtype == 'category' || $item->itemtype == 'course') ? 0 : 1);
$cell->attributes['class'] .= ' level' . $level;
@@ -1029,7 +1028,7 @@ public function get_category_cell($category, $levelclass, $params) {
}
// Build the master checkbox.
$mastercheckbox = new \core\output\checkbox_toggleall($togglegroup, true, [
- 'id' => $togglegroup,
+ 'id' => 'select_category_' . $category->id,
'name' => $togglegroup,
'value' => 1,
'classes' => 'itemselect ignoredirty',
diff --git a/grade/export/index.php b/grade/export/index.php
index 7901e2b75a972..7e2957b8ee040 100644
--- a/grade/export/index.php
+++ b/grade/export/index.php
@@ -37,14 +37,21 @@
$context = context_course::instance($courseid);
require_capability('moodle/grade:export', $context);
-$exportplugins = core_component::get_plugin_list('gradeexport');
+// Retrieve all grade export plugins the current user can access.
+$exportplugins = array_filter(core_component::get_plugin_list('gradeexport'),
+ static function(string $exportplugin) use ($context): bool {
+ return has_capability("gradeexport/{$exportplugin}:view", $context);
+ },
+ ARRAY_FILTER_USE_KEY
+);
+
if (!empty($exportplugins)) {
$exportplugin = array_key_first($exportplugins);
$url = new moodle_url("/grade/export/{$exportplugin}/index.php", ['id' => $courseid]);
redirect($url);
}
-// Otherwise, output the page with a notification stating that there are no available grade import options.
+// Otherwise, output the page with a notification stating that there are no available grade export options.
$PAGE->set_title(get_string('export', 'grades'));
$PAGE->set_pagelayout('incourse');
$PAGE->set_heading($course->fullname);
diff --git a/grade/export/txt/tests/behat/export.feature b/grade/export/txt/tests/behat/export.feature
index 9ed149dced5f4..6ef31567d8571 100644
--- a/grade/export/txt/tests/behat/export.feature
+++ b/grade/export/txt/tests/behat/export.feature
@@ -20,13 +20,10 @@ Feature: I need to export grades as text
| activity | course | idnumber | name | intro | assignsubmission_onlinetext_enabled |
| assign | C1 | a1 | Test assignment name | Submit your online text | 1 |
| assign | C1 | a2 | Test assignment name 2 | Submit your online text | 1 |
- And I log in as "teacher1"
- And I am on "Course 1" course homepage
- And I navigate to "View > Grader report" in the course gradebook
- And I turn editing mode on
- And I change window size to "large"
- And I give the grade "80.00" to the user "Student 1" for the grade item "Test assignment name"
- And I press "Save changes"
+ And the following "grade grades" exist:
+ | gradeitem | user | grade |
+ | Test assignment name | student1 | 80.00 |
+ And I am on the "Course 1" "grades > Grader report > View" page logged in as "teacher1"
@javascript
Scenario: Export grades as text
diff --git a/grade/export/xml/tests/behat/export.feature b/grade/export/xml/tests/behat/export.feature
index 60308cf2dc940..de88363aaf5f0 100644
--- a/grade/export/xml/tests/behat/export.feature
+++ b/grade/export/xml/tests/behat/export.feature
@@ -19,15 +19,13 @@ Feature: I need to export grades as xml
| student1 | C1 | student |
| student2 | C1 | student |
And the following "activities" exist:
- | activity | course | idnumber | name | intro |
- | assign | C1 | a1 | Test assignment name | Submit something! |
- And I log in as "teacher1"
- And I am on "Course 1" course homepage
- And I navigate to "View > Grader report" in the course gradebook
- And I turn editing mode on
- And I give the grade "80.00" to the user "Student 1" for the grade item "Test assignment name"
- And I give the grade "42.00" to the user "Student 2" for the grade item "Test assignment name"
- And I press "Save changes"
+ | activity | course | idnumber | name |
+ | assign | C1 | a1 | Test assignment name |
+ And the following "grade grades" exist:
+ | gradeitem | user | grade |
+ | Test assignment name | student1 | 80.00 |
+ | Test assignment name | student2 | 42.00 |
+ And I am on the "Course 1" course page logged in as teacher1
@javascript
Scenario: Export grades as XML
diff --git a/grade/grading/form/rubric/tests/behat/behat_gradingform_rubric.php b/grade/grading/form/rubric/tests/behat/behat_gradingform_rubric.php
index 6f23158b75acc..09c76679dd1e5 100644
--- a/grade/grading/form/rubric/tests/behat/behat_gradingform_rubric.php
+++ b/grade/grading/form/rubric/tests/behat/behat_gradingform_rubric.php
@@ -27,9 +27,9 @@
require_once(__DIR__ . '/../../../../../../lib/behat/behat_base.php');
-use Behat\Gherkin\Node\TableNode as TableNode,
- Behat\Mink\Exception\ElementNotFoundException as ElementNotFoundException,
- Behat\Mink\Exception\ExpectationException as ExpectationException;
+use Behat\Gherkin\Node\TableNode;
+use Behat\Mink\Exception\ElementNotFoundException;
+use Behat\Mink\Exception\ExpectationException;
/**
* Steps definitions to help with rubrics.
@@ -66,7 +66,6 @@ class behat_gradingform_rubric extends behat_base {
* @param TableNode $rubric
*/
public function i_define_the_following_rubric(TableNode $rubric) {
-
// Being a smart method is nothing good when we talk about step definitions, in
// this case we didn't have any other options as there are no labels no elements
// id we can point to without having to "calculate" them.
@@ -80,7 +79,6 @@ public function i_define_the_following_rubric(TableNode $rubric) {
// Cleaning the current ones.
$deletebuttons = $this->find_all('css', "input[value='" . get_string('criteriondelete', 'gradingform_rubric') . "']");
if ($deletebuttons) {
-
// We should reverse the deletebuttons because otherwise once we delete
// the first one the DOM will change and the [X] one will not exist anymore.
$deletebuttons = array_reverse($deletebuttons, true);
@@ -132,7 +130,10 @@ public function i_define_the_following_rubric(TableNode $rubric) {
}
// Add new criterion.
- $addcriterionbutton->click();
+ $this->execute('behat_general::i_click_on', [
+ $addcriterionbutton,
+ 'NodeElement',
+ ]);
$criterionroot = 'rubric[criteria][NEWID' . ($criterionit + 1) . ']';
@@ -158,12 +159,14 @@ public function i_define_the_following_rubric(TableNode $rubric) {
if ($this->running_javascript()) {
$deletelevel = $this->find_button($criterionroot . '[levels][NEWID' . $i . '][delete]');
$this->click_and_confirm($deletelevel);
-
} else {
// Only if the level exists.
$buttonname = $criterionroot . '[levels][NEWID' . $i . '][delete]';
if ($deletelevel = $this->getSession()->getPage()->findButton($buttonname)) {
- $deletelevel->click();
+ $this->execute('behat_general::i_click_on', [
+ $deletelevel,
+ 'NodeElement',
+ ]);
}
}
}
@@ -171,7 +174,10 @@ public function i_define_the_following_rubric(TableNode $rubric) {
// Adding levels if we don't have enough.
$addlevel = $this->find_button($criterionroot . '[levels][addlevel]');
for ($i = ($defaultnumberoflevels + 1); $i <= $nlevels; $i++) {
- $addlevel->click();
+ $this->execute('behat_general::i_click_on', [
+ $addlevel,
+ 'NodeElement',
+ ]);
}
}
@@ -226,7 +232,6 @@ public function i_define_the_following_rubric(TableNode $rubric) {
* @param string $criterionname
*/
public function i_replace_rubric_level_with($currentvalue, $value, $criterionname) {
-
$currentvalueliteral = behat_context_helper::escape($currentvalue);
$criterionliteral = behat_context_helper::escape($criterionname);
@@ -247,14 +252,15 @@ public function i_replace_rubric_level_with($currentvalue, $value, $criterionnam
"/descendant::textarea[text()=$currentvalueliteral]";
if ($this->running_javascript()) {
-
$spansufix = "/ancestor::div[@class='level-wrapper']" .
"/descendant::div[@class='definition']" .
"/descendant::span[@class='textvalue']";
// Expanding the level input boxes.
- $spannode = $this->find('xpath', $inputxpath . $spansufix . '|' . $textareaxpath . $spansufix);
- $spannode->click();
+ $this->execute('behat_general::i_click_on', [
+ $inputxpath . $spansufix . '|' . $textareaxpath . $spansufix,
+ 'xpath',
+ ]);
$inputfield = $this->find('xpath', $inputxpath . '|' . $textareaxpath);
$inputfield->setValue($value);
@@ -263,7 +269,6 @@ public function i_replace_rubric_level_with($currentvalue, $value, $criterionnam
$fieldnode = $this->find('xpath', $inputxpath . '|' . $textareaxpath);
$this->set_rubric_field_value($fieldnode->getAttribute('name'), $value);
}
-
}
/**
@@ -275,7 +280,6 @@ public function i_replace_rubric_level_with($currentvalue, $value, $criterionnam
* @param TableNode $rubric
*/
public function i_grade_by_filling_the_rubric_with(TableNode $rubric) {
-
$criteria = $rubric->getRowsHash();
$stepusage = '"I grade by filling the rubric with:" step needs you to provide a table where each row is a criterion' .
@@ -288,7 +292,6 @@ public function i_grade_by_filling_the_rubric_with(TableNode $rubric) {
// First element -> name, second -> points, third -> Remark.
foreach ($criteria as $name => $criterion) {
-
// We only expect the points and the remark, as the criterion name is $name.
if (count($criterion) !== 2) {
throw new ExpectationException($stepusage, $this->getSession());
@@ -349,7 +352,6 @@ public function i_grade_by_filling_the_rubric_with(TableNode $rubric) {
* @return void
*/
public function the_level_with_points_was_previously_selected_for_the_rubric_criterion($points, $criterionname) {
-
$levelxpath = $this->get_criterion_xpath($criterionname) .
$this->get_level_xpath($points) .
"[contains(concat(' ', normalize-space(@class), ' '), ' currentchecked ')]";
@@ -378,7 +380,6 @@ public function the_level_with_points_was_previously_selected_for_the_rubric_cri
* @return void
*/
public function the_level_with_points_is_selected_for_the_rubric_criterion($points, $criterionname) {
-
$levelxpath = $this->get_criterion_xpath($criterionname) .
$this->get_level_xpath($points);
@@ -409,7 +410,6 @@ public function the_level_with_points_is_selected_for_the_rubric_criterion($poin
* @return void
*/
public function the_level_with_points_is_not_selected_for_the_rubric_criterion($points, $criterionname) {
-
$levelxpath = $this->get_criterion_xpath($criterionname) .
$this->get_level_xpath($points);
@@ -437,12 +437,13 @@ public function the_level_with_points_is_not_selected_for_the_rubric_criterion($
* @return void
*/
protected function set_rubric_field_value($name, $value, $visible = false) {
-
// Fields are hidden by default.
if ($this->running_javascript() == true && $visible === false) {
$xpath = "//*[@name='$name']/following-sibling::*[contains(concat(' ', normalize-space(@class), ' '), ' plainvalue ')]";
- $textnode = $this->find('xpath', $xpath);
- $textnode->click();
+ $this->execute('behat_general::i_click_on', [
+ $xpath,
+ 'xpath',
+ ]);
}
// Set the value now.
@@ -457,19 +458,20 @@ protected function set_rubric_field_value($name, $value, $visible = false) {
* @return void
*/
protected function click_and_confirm($node) {
-
// Clicks to perform the action.
- $node->click();
+ $this->execute('behat_general::i_click_on', [
+ $node,
+ 'NodeElement',
+ ]);
// Confirms the delete.
if ($this->running_javascript()) {
- $confirmbutton = $this->get_node_in_container(
- 'button',
+ $this->execute('behat_general::i_click_on_in_the', [
get_string('yes'),
+ 'button',
+ get_string('confirmation', 'admin'),
'dialogue',
- get_string('confirmation', 'admin')
- );
- $confirmbutton->click();
+ ]);
}
}
diff --git a/grade/import/index.php b/grade/import/index.php
index fc8d4f9cbf34a..e5acd9b87308a 100644
--- a/grade/import/index.php
+++ b/grade/import/index.php
@@ -37,7 +37,14 @@
$context = context_course::instance($courseid);
require_capability('moodle/grade:import', $context);
-$importplugins = core_component::get_plugin_list('gradeimport');
+// Retrieve all grade import plugins the current user can access.
+$importplugins = array_filter(core_component::get_plugin_list('gradeimport'),
+ static function(string $importplugin) use ($context): bool {
+ return has_capability("gradeimport/{$importplugin}:view", $context);
+ },
+ ARRAY_FILTER_USE_KEY
+);
+
if (!empty($importplugins)) {
$importplugin = array_key_first($importplugins);
$url = new moodle_url("/grade/import/{$importplugin}/index.php", ['id' => $courseid]);
diff --git a/grade/lib.php b/grade/lib.php
index f069d54da72ee..1aa9e9e5b9eb6 100644
--- a/grade/lib.php
+++ b/grade/lib.php
@@ -770,8 +770,8 @@ function grade_get_plugin_info($courseid, $active_type, $active_plugin) {
break;
}
foreach ($plugins as $plugin) {
- if (is_a($plugin, 'grade_plugin_info')) {
- if ($active_plugin == $plugin->id) {
+ if (is_a($plugin, grade_plugin_info::class)) {
+ if ($plugin_type === $active_type && $active_plugin == $plugin->id) {
$plugin_info['strings']['active_plugin_str'] = $plugin->string;
}
}
@@ -880,7 +880,7 @@ public function __construct($id, $link, $string, $parent=null) {
* @param string|null $headerhelpidentifier The help string identifier if required.
* @param string|null $headerhelpcomponent The component for the help string.
* @param stdClass|null $user The user object for use with the user context header.
- * @param actionbar|null $actionbar The actions bar which will be displayed on the page if $shownavigation is set
+ * @param action_bar|null $actionbar The actions bar which will be displayed on the page if $shownavigation is set
* to true. If $actionbar is not explicitly defined, the general action bar
* (\core_grades\output\general_action_bar) will be used by default.
* @param boolean $showtitle If set to false just show course full name as a title.
@@ -889,7 +889,7 @@ public function __construct($id, $link, $string, $parent=null) {
function print_grade_page_head(int $courseid, string $active_type, ?string $active_plugin = null, $heading = false,
bool $return = false, $buttons = false, bool $shownavigation = true, ?string $headerhelpidentifier = null,
?string $headerhelpcomponent = null, ?stdClass $user = null, ?action_bar $actionbar = null, $showtitle = true) {
- global $CFG, $OUTPUT, $PAGE;
+ global $CFG, $OUTPUT, $PAGE, $USER;
// Put a warning on all gradebook pages if the course has modules currently scheduled for background deletion.
require_once($CFG->dirroot . '/course/lib.php');
@@ -922,7 +922,19 @@ function print_grade_page_head(int $courseid, string $active_type, ?string $acti
} else {
$PAGE->set_pagelayout('admin');
}
- $PAGE->set_title(get_string('grades') . ': ' . $stractive_type);
+ $coursecontext = context_course::instance($courseid);
+ // Title will be constituted by information starting from the unique identifying information for the page.
+ if (in_array($active_type, ['report', 'settings'])) {
+ $uniquetitle = $stractive_plugin;
+ } else {
+ $uniquetitle = $stractive_type . ': ' . $stractive_plugin;
+ }
+ $titlecomponents = [
+ $uniquetitle,
+ get_string('grades'),
+ $coursecontext->get_context_name(false),
+ ];
+ $PAGE->set_title(implode(moodle_page::TITLE_SEPARATOR, $titlecomponents));
$PAGE->set_heading($title);
$PAGE->set_secondary_active_tab('grades');
@@ -970,15 +982,16 @@ function print_grade_page_head(int $courseid, string $active_type, ?string $acti
$output = '';
// Add a help dialogue box if provided.
- if (isset($headerhelpidentifier)) {
+ if (isset($headerhelpidentifier) && !empty($heading)) {
$output = $OUTPUT->heading_with_help($heading, $headerhelpidentifier, $headerhelpcomponent);
- } else {
- if (isset($user)) {
- $renderer = $PAGE->get_renderer('core_grades');
- $output = $OUTPUT->heading($renderer->user_heading($user, $courseid));
- } else {
- $output = $OUTPUT->heading($heading);
- }
+ } else if (isset($user)) {
+ $renderer = $PAGE->get_renderer('core_grades');
+ // If the user is viewing their own grade report, no need to show the "Message"
+ // and "Add to contact" buttons in the user heading.
+ $showuserbuttons = $user->id != $USER->id;
+ $output = $renderer->user_heading($user, $courseid, $showuserbuttons);
+ } else if (!empty($heading)) {
+ $output = $OUTPUT->heading($heading);
}
if ($return) {
@@ -987,8 +1000,7 @@ function print_grade_page_head(int $courseid, string $active_type, ?string $acti
echo $output;
}
- $returnval .= print_natural_aggregation_upgrade_notice($courseid, context_course::instance($courseid), $PAGE->url,
- $return);
+ $returnval .= print_natural_aggregation_upgrade_notice($courseid, $coursecontext, $PAGE->url, $return);
if ($return) {
return $returnval;
diff --git a/grade/report/grader/tests/behat/switch_views.feature b/grade/report/grader/tests/behat/switch_views.feature
index ad68e12ced013..9f21eacabe729 100644
--- a/grade/report/grader/tests/behat/switch_views.feature
+++ b/grade/report/grader/tests/behat/switch_views.feature
@@ -75,8 +75,7 @@ Feature: We can change what we are viewing on the grader report
And the following "role capability" exists:
| role | editingteacher |
| moodle/grade:viewhidden | prevent |
- And I am on the "C1" "course" page logged in as "teacher1"
- And I navigate to "View > Grader report" in the course gradebook
+ And I am on the "Course 1" "grades > Grader report > View" page logged in as "teacher1"
Then I should see "Test assignment name 1" in the "user-grades" "table"
And I should see "Test assignment name 2" in the "user-grades" "table"
And I should see "Manual grade"
diff --git a/grade/report/history/tests/behat/basic_functionality.feature b/grade/report/history/tests/behat/basic_functionality.feature
index d633f622badc6..0889b4e176b43 100644
--- a/grade/report/history/tests/behat/basic_functionality.feature
+++ b/grade/report/history/tests/behat/basic_functionality.feature
@@ -25,14 +25,12 @@ Feature: A teacher checks the grade history report in a course
| student1 | C1 | student |
| student2 | C1 | student |
And the following "activities" exist:
- | activity | course | section | name | intro |
- | assign | C1 | 1 | The greatest assignment ever | Write a behat test for Moodle - it's amazing |
- | assign | C1 | 1 | Rewarding assignment | After writing your behat test go grab a beer! |
+ | activity | course | name |
+ | assign | C1 | The greatest assignment ever |
+ | assign | C1 | Rewarding assignment |
Given the following config values are set as admin:
| showuseridentity | email,profile_field_food |
- And I log in as "teacher1"
- And I am on "Course 1" course homepage with editing mode on
- And I navigate to "View > Grader report" in the course gradebook
+ And I am on the "Course 1" "grades > Grader report > View" page logged in as "teacher1"
And I should see "apple" in the "student1" "table_row"
And I should see "orange" in the "student2" "table_row"
And I turn editing mode on
@@ -41,10 +39,7 @@ Feature: A teacher checks the grade history report in a course
And I give the grade "50.00" to the user "Student 2" for the grade item "The greatest assignment ever"
And I give the grade "60.00" to the user "Student 2" for the grade item "Rewarding assignment"
And I press "Save changes"
- And I log out
- And I log in as "teacher2"
- And I am on "Course 1" course homepage
- And I navigate to "View > Grader report" in the course gradebook
+ And I am on the "Course 1" "grades > Grader report > View" page logged in as "teacher2"
And I should see "apple" in the "student1" "table_row"
And I should see "orange" in the "student2" "table_row"
And I turn editing mode on
diff --git a/grade/report/singleview/classes/local/screen/tablelike.php b/grade/report/singleview/classes/local/screen/tablelike.php
index 6d06f36acf013..38b2d95eabcf4 100644
--- a/grade/report/singleview/classes/local/screen/tablelike.php
+++ b/grade/report/singleview/classes/local/screen/tablelike.php
@@ -225,7 +225,7 @@ public function bulk_insert() {
return html_writer::tag(
'div',
(new bulk_insert($this->item))->html(),
- ['class' => 'singleview_bulk', 'hidden' => true]
+ ['class' => 'singleview_bulk', 'hidden' => 'hidden']
);
}
diff --git a/grade/report/singleview/classes/local/ui/dropdown_attribute.php b/grade/report/singleview/classes/local/ui/dropdown_attribute.php
index d2726304b6d70..1c30a8e2d35b7 100644
--- a/grade/report/singleview/classes/local/ui/dropdown_attribute.php
+++ b/grade/report/singleview/classes/local/ui/dropdown_attribute.php
@@ -105,7 +105,6 @@ public function html(): string {
'name' => $this->name,
'value' => $this->selected,
'text' => $options[$selected],
- 'tabindex' => 1,
'disabled' => !empty($this->isdisabled),
'readonly' => $this->isreadonly,
'options' => array_map(function($option) use ($options, $selected) {
diff --git a/grade/report/singleview/classes/local/ui/text_attribute.php b/grade/report/singleview/classes/local/ui/text_attribute.php
index ead123e950089..164f1ec4e94f0 100644
--- a/grade/report/singleview/classes/local/ui/text_attribute.php
+++ b/grade/report/singleview/classes/local/ui/text_attribute.php
@@ -85,10 +85,8 @@ public function html(): string {
$context->label = '';
if (preg_match("/^feedback/", $this->name)) {
$context->label = get_string('feedbackfor', 'gradereport_singleview', $this->label);
- $context->tabindex = '2';
} else if (preg_match("/^finalgrade/", $this->name)) {
$context->label = get_string('gradefor', 'gradereport_singleview', $this->label);
- $context->tabindex = '1';
}
return $OUTPUT->render_from_template('gradereport_singleview/text_attribute', $context);
diff --git a/grade/report/singleview/templates/dropdown_attribute.mustache b/grade/report/singleview/templates/dropdown_attribute.mustache
index e2d225ab65fc4..d04a631708aae 100644
--- a/grade/report/singleview/templates/dropdown_attribute.mustache
+++ b/grade/report/singleview/templates/dropdown_attribute.mustache
@@ -33,7 +33,7 @@
{{/readonly}}
{{^readonly}}
-
| 1 |
+ When I am on the "Course 1" course page logged in as teacher1
+ # Confirm that activity name and description are displayed
+ Then I should see "Page 1" in the "region-main" "region"
+ And I should see "Page 1 intro with image:" in the "region-main" "region"
+ # Confirm that image element exists
+ And "//img[contains(@src, 'http://download.moodle.org/unittest/test.jpg')]" "xpath_element" should exist in the "region-main" "region"
diff --git a/course/tests/reportbuilder/datasource/participants_test.php b/course/tests/reportbuilder/datasource/participants_test.php
index 25025ae019113..3c9c1abf9ccf2 100644
--- a/course/tests/reportbuilder/datasource/participants_test.php
+++ b/course/tests/reportbuilder/datasource/participants_test.php
@@ -80,7 +80,7 @@ public function test_participants_datasource(): void {
// Update final grade for the user.
$courseitem = grade_item::fetch_course_item($course->id);
- $courseitem->update_final_grade($user1->id, 80);
+ $courseitem->update_final_grade($user1->id, 42.5);
// Set some last access value for the user in the course.
$DB->insert_record('user_lastaccess',
@@ -152,7 +152,7 @@ public function test_participants_datasource(): void {
'', // Reagreggate.
'2', // Days taking course.
'2', // Days until completion.
- '80.00', // Grade.
+ '42.50', // Grade.
], array_values($content[0]));
}
diff --git a/course/view.php b/course/view.php
index 659834c565ad4..4ecf21dd46c49 100644
--- a/course/view.php
+++ b/course/view.php
@@ -227,13 +227,21 @@
$PAGE->set_button($buttons);
}
+ $editingtitle = '';
+ if ($PAGE->user_is_editing()) {
+ // Append this to the page title's lang string to get its equivalent when editing mode is turned on.
+ $editingtitle = 'editing';
+ }
+
// If viewing a section, make the title more specific
if ($section and $section > 0 and course_format_uses_sections($course->format)) {
$sectionname = get_string('sectionname', "format_$course->format");
$sectiontitle = get_section_name($course, $section);
- $PAGE->set_title(get_string('coursesectiontitle', 'moodle', array('course' => $course->fullname, 'sectiontitle' => $sectiontitle, 'sectionname' => $sectionname)));
+ $PAGE->set_title(get_string('coursesectiontitle' . $editingtitle, 'moodle', array(
+ 'course' => $course->fullname, 'sectiontitle' => $sectiontitle, 'sectionname' => $sectionname)
+ ));
} else {
- $PAGE->set_title(get_string('coursetitle', 'moodle', array('course' => $course->fullname)));
+ $PAGE->set_title(get_string('coursetitle' . $editingtitle, 'moodle', array('course' => $course->fullname)));
}
$PAGE->set_heading($course->fullname);
diff --git a/customfield/field/textarea/lib.php b/customfield/field/textarea/lib.php
index 83389f37dad36..92fb5523b7587 100644
--- a/customfield/field/textarea/lib.php
+++ b/customfield/field/textarea/lib.php
@@ -72,5 +72,5 @@ function customfield_textarea_pluginfile($course, $cm, $context, $filearea, $arg
}
// We can now send the file back to the browser - in this case with a cache lifetime of 1 day and no filtering.
- send_file($file, 86400, 0, $forcedownload, $options);
+ send_stored_file($file, DAYSECS, 0, $forcedownload, $options);
}
diff --git a/customfield/lib.php b/customfield/lib.php
index 2f9b97eeb1599..c91a8892898e2 100644
--- a/customfield/lib.php
+++ b/customfield/lib.php
@@ -80,6 +80,5 @@ function core_customfield_pluginfile($course, $cm, $context, $filearea, $args, $
}
// We can now send the file back to the browser - in this case with a cache lifetime of 1 day and no filtering.
- // From Moodle 2.3, use send_stored_file instead.
- send_file($file, 86400, 0, $forcedownload, $options);
+ send_stored_file($file, DAYSECS, 0, $forcedownload, $options);
}
diff --git a/enrol/lti/classes/local/ltiadvantage/task/sync_grades.php b/enrol/lti/classes/local/ltiadvantage/task/sync_grades.php
index d2ecd53a69416..cd2ea3a88bd33 100644
--- a/enrol/lti/classes/local/ltiadvantage/task/sync_grades.php
+++ b/enrol/lti/classes/local/ltiadvantage/task/sync_grades.php
@@ -195,7 +195,8 @@ protected function sync_grades_for_resource($resource): array {
continue;
}
- if ($response['status'] == 200) {
+ $successresponses = [200, 201, 202, 204];
+ if (in_array($response['status'], $successresponses)) {
$user->set_lastgrade(grade_floatval($grade));
$syncedusergrades[$user->get_id()] = $user;
mtrace("Success - The grade '$floatgrade' $mtracecontent was sent.");
diff --git a/enrol/lti/tests/local/ltiadvantage/task/sync_grades_test.php b/enrol/lti/tests/local/ltiadvantage/task/sync_grades_test.php
index 3282491e18938..62b9a36396a5a 100644
--- a/enrol/lti/tests/local/ltiadvantage/task/sync_grades_test.php
+++ b/enrol/lti/tests/local/ltiadvantage/task/sync_grades_test.php
@@ -144,6 +144,70 @@ protected function override_resource_completion_status_for_user(\stdClass $resou
}
}
+
+ /**
+ * Data provider for test_grade_sync_positive_case.
+ *
+ * @return array
+ */
+ public static function grade_sync_positive_cases(): array {
+ return [
+ [200],
+ [201],
+ [202],
+ [204],
+ ];
+ }
+
+ /**
+ * Test the sync grades task works correct when platform responses with given status code.
+ *
+ * @covers ::execute
+ * @param string $statuscode the response status code with which the job should work correctly
+ * @dataProvider grade_sync_positive_cases
+ */
+ public function test_grade_sync_positive_case($statuscode): void {
+ $this->resetAfterTest();
+
+ [$course, $resource] = $this->create_test_environment();
+ $launchservice = $this->get_tool_launch_service();
+ $task = $this->get_task_with_mocked_grade_service($statuscode);
+
+ // Launch the resource for an instructor which will create the domain objects needed for service calls.
+ $teachermocklaunch = $this->get_mock_launch($resource, $this->get_mock_launch_users_with_ids(['1'], false)[0]);
+ $instructoruser = $this->getDataGenerator()->create_user();
+ [$teacherid, $resource] = $launchservice->user_launches_tool($instructoruser, $teachermocklaunch);
+
+ // Launch the resource for a few more users, creating those enrolments and allowing grading to take place.
+ $studentusers = $this->get_mock_launch_users_with_ids(['2'], false,
+ 'http://purl.imsglobal.org/vocab/lis/v2/membership#Learner');
+
+ $student1mocklaunch = $this->get_mock_launch($resource, $studentusers[0]);
+ $student1user = $this->getDataGenerator()->create_user();
+ [$student1id] = $launchservice->user_launches_tool($student1user, $student1mocklaunch);
+
+ // Grade student1.
+ $expectedstudent1grade = $this->set_user_grade_for_resource($student1id, 65, $resource);
+
+ // Sync and verify that only student1's grade is sent.
+ ob_start();
+ $task->execute();
+ $ob = ob_get_contents();
+ ob_end_clean();
+ $expectedtraces = [
+ "Starting - LTI Advantage grade sync for shared resource '$resource->id' in course '$course->id'.",
+ "Skipping - Invalid grade for the user '$teacherid', for the resource '$resource->id' and the course ".
+ "'$course->id'.",
+ "Success - The grade '$expectedstudent1grade' for the user '$student1id', for the resource ".
+ "'$resource->id' and the course '$course->id' was sent.",
+ "Completed - Synced grades for tool '$resource->id' in the course '$course->id'. ".
+ "Processed 2 users; sent 1 grades."
+ ];
+ foreach ($expectedtraces as $expectedtrace) {
+ $this->assertStringContainsString($expectedtrace, $ob);
+ }
+ }
+
/**
* Test confirming task name.
*
diff --git a/enrol/manual/lib.php b/enrol/manual/lib.php
index 3ae5d0fd1761d..d896db70780d7 100644
--- a/enrol/manual/lib.php
+++ b/enrol/manual/lib.php
@@ -173,6 +173,9 @@ public function update_instance($instance, $data) {
}
}
}
+
+ $data->notifyall = $data->expirynotify == 2 ? 1 : 0;
+
return parent::update_instance($instance, $data);
}
diff --git a/enrol/manual/tests/lib_test.php b/enrol/manual/tests/lib_test.php
index a8a6e86a3bdaa..0f4b09bdc1094 100644
--- a/enrol/manual/tests/lib_test.php
+++ b/enrol/manual/tests/lib_test.php
@@ -647,4 +647,118 @@ public function default_enrolment_instance_data_provider(): array {
],
];
}
+
+ /**
+ * Tests an enrolment instance is updated properly.
+ *
+ * @covers \enrol_manual::update_instance
+ * @dataProvider update_enrolment_instance_data_provider
+ *
+ * @param stdClass $expectation
+ * @param stdClass $updatedata
+ */
+ public function test_enrolment_instance_is_updated(stdClass $expectation, stdClass $updatedata): void {
+ global $DB;
+
+ $this->resetAfterTest();
+
+ $generator = $this->getDataGenerator();
+
+ $studentroles = get_archetype_roles('student');
+ $studentrole = array_shift($studentroles);
+
+ // Given the plugin is globally configured with the following settings.
+ $plugin = enrol_get_plugin('manual');
+ $plugin->set_config('status', ENROL_INSTANCE_ENABLED);
+ $plugin->set_config('roleid', $studentrole->id);
+ $plugin->set_config('enrolperiod', 30 * DAYSECS);
+ $plugin->set_config('expirynotify', 1);
+ $plugin->set_config('expirythreshold', 2 * DAYSECS);
+
+ // And a course is created with the default enrolment instance.
+ $course = $generator->create_course();
+
+ // When the enrolment instance is being updated.
+ $enrolinstance = $DB->get_record('enrol', ['courseid' => $course->id, 'enrol' => 'manual']);
+ $successfullyupdated = $plugin->update_instance($enrolinstance, $updatedata);
+
+ // Then the update is successful.
+ $this->assertTrue($successfullyupdated);
+
+ // And the updated enrolment instance contains the expected values.
+ $enrolinstance = $DB->get_record('enrol', ['id' => $enrolinstance->id]);
+ $this->assertEquals($expectation->status, $enrolinstance->status);
+ $this->assertEquals($expectation->roleid, $enrolinstance->roleid);
+ $this->assertEquals($expectation->enrolperiod, $enrolinstance->enrolperiod);
+ $this->assertEquals($expectation->expirynotify, $enrolinstance->expirynotify);
+ $this->assertEquals($expectation->notifyall, $enrolinstance->notifyall);
+ $this->assertEquals($expectation->expirythreshold, $enrolinstance->expirythreshold);
+ }
+
+ /**
+ * Data provider for test_enrolment_instance_is_updated().
+ *
+ * @return array
+ */
+ public function update_enrolment_instance_data_provider(): array {
+ $studentroles = get_archetype_roles('student');
+ $studentrole = array_shift($studentroles);
+
+ $teacherroles = get_archetype_roles('teacher');
+ $teacherrole = array_shift($teacherroles);
+
+ return [
+ 'disabled, all the others are default' => [
+ 'expectation' => (object) [
+ 'status' => ENROL_INSTANCE_DISABLED,
+ 'roleid' => $studentrole->id,
+ 'enrolperiod' => 30 * DAYSECS,
+ 'expirynotify' => 1,
+ 'notifyall' => 0,
+ 'expirythreshold' => 2 * DAYSECS,
+ ],
+ 'update data' => (object) [
+ 'status' => ENROL_INSTANCE_DISABLED,
+ 'roleid' => $studentrole->id,
+ 'enrolperiod' => 30 * DAYSECS,
+ 'expirynotify' => 1,
+ 'expirythreshold' => 2 * DAYSECS,
+ ],
+ ],
+ 'enabled, teacher role, no duration set, notify no one on expiry, 0 notification threshold' => [
+ 'expectation' => (object) [
+ 'status' => ENROL_INSTANCE_ENABLED,
+ 'roleid' => $teacherrole->id,
+ 'enrolperiod' => 0,
+ 'expirynotify' => 0,
+ 'notifyall' => 0,
+ 'expirythreshold' => 0,
+ ],
+ 'update data' => (object) [
+ 'status' => ENROL_INSTANCE_ENABLED,
+ 'roleid' => $teacherrole->id,
+ 'enrolperiod' => 0,
+ 'expirynotify' => 0,
+ 'expirythreshold' => 0,
+ ],
+ ],
+ 'notify enroller and enrolled on expiry, all the others are default' => [
+ 'expectation' => (object) [
+ 'status' => ENROL_INSTANCE_ENABLED,
+ 'roleid' => $studentrole->id,
+ 'enrolperiod' => 30 * DAYSECS,
+ 'expirynotify' => 2,
+ 'notifyall' => 1,
+ 'expirythreshold' => 2 * DAYSECS,
+ ],
+ 'update data' => (object) [
+ 'status' => ENROL_INSTANCE_ENABLED,
+ 'roleid' => $studentrole->id,
+ 'enrolperiod' => 30 * DAYSECS,
+ 'expirynotify' => 2,
+ 'expirythreshold' => 2 * DAYSECS,
+ ],
+ ],
+ ];
+ }
}
diff --git a/filter/tidy/filter.php b/filter/tidy/filter.php
index 2bdb79ffba39b..350beb24f2354 100644
--- a/filter/tidy/filter.php
+++ b/filter/tidy/filter.php
@@ -47,7 +47,6 @@ function filter($text, array $options = array()) {
'show-body-only' => true,
'tidy-mark' => false,
'drop-proprietary-attributes' => true,
- 'clean' => true,
'drop-empty-paras' => true,
'indent' => true,
'quiet' => true,
diff --git a/grade/classes/external/get_groups_for_search_widget.php b/grade/classes/external/get_groups_for_search_widget.php
index 7ca8230ec63cf..300cb4627751c 100644
--- a/grade/classes/external/get_groups_for_search_widget.php
+++ b/grade/classes/external/get_groups_for_search_widget.php
@@ -63,12 +63,8 @@ public static function execute_parameters(): external_function_parameters {
* @param int $courseid
* @param string $actionbaseurl The base URL for the group action.
* @return array Groups and warnings to pass back to the calling widget.
- * @throws coding_exception
- * @throws invalid_parameter_exception
- * @throws moodle_exception
- * @throws restricted_context_exception
*/
- protected static function execute(int $courseid, string $actionbaseurl): array {
+ public static function execute(int $courseid, string $actionbaseurl): array {
global $DB, $USER, $COURSE;
$params = self::validate_parameters(
diff --git a/grade/edit/tree/lib.php b/grade/edit/tree/lib.php
index d49b451fe527c..9a82049c0a7bc 100644
--- a/grade/edit/tree/lib.php
+++ b/grade/edit/tree/lib.php
@@ -312,8 +312,8 @@ public function build_html_tree($element, $totals, $parents, $level, &$row_count
$headercell = new html_table_cell();
$headercell->header = true;
$headercell->scope = 'row';
- $headercell->attributes['title'] = $object->stripped_name;
$headercell->attributes['class'] = 'cell column-rowspan rowspan ' . $levelclass;
+ $headercell->attributes['aria-hidden'] = 'true';
$headercell->rowspan = $row_count + 1;
$row->cells[] = $headercell;
@@ -338,6 +338,7 @@ public function build_html_tree($element, $totals, $parents, $level, &$row_count
$endcell = new html_table_cell();
$endcell->colspan = (19 - $level);
$endcell->attributes['class'] = 'emptyrow colspan ' . $levelclass;
+ $endcell->attributes['aria-hidden'] = 'true';
$returnrows[] = new html_table_row(array($endcell));
@@ -749,13 +750,11 @@ public abstract function get_header_cell();
public function get_category_cell($category, $levelclass, $params) {
$cell = clone($this->categorycell);
$cell->attributes['class'] .= ' ' . $levelclass;
- $cell->attributes['text'] = '';
return $cell;
}
public function get_item_cell($item, $params) {
$cell = clone($this->itemcell);
- $cell->attributes['text'] = '';
if (isset($params['level'])) {
$level = $params['level'] + (($item->itemtype == 'category' || $item->itemtype == 'course') ? 0 : 1);
$cell->attributes['class'] .= ' level' . $level;
@@ -1029,7 +1028,7 @@ public function get_category_cell($category, $levelclass, $params) {
}
// Build the master checkbox.
$mastercheckbox = new \core\output\checkbox_toggleall($togglegroup, true, [
- 'id' => $togglegroup,
+ 'id' => 'select_category_' . $category->id,
'name' => $togglegroup,
'value' => 1,
'classes' => 'itemselect ignoredirty',
diff --git a/grade/export/index.php b/grade/export/index.php
index 7901e2b75a972..7e2957b8ee040 100644
--- a/grade/export/index.php
+++ b/grade/export/index.php
@@ -37,14 +37,21 @@
$context = context_course::instance($courseid);
require_capability('moodle/grade:export', $context);
-$exportplugins = core_component::get_plugin_list('gradeexport');
+// Retrieve all grade export plugins the current user can access.
+$exportplugins = array_filter(core_component::get_plugin_list('gradeexport'),
+ static function(string $exportplugin) use ($context): bool {
+ return has_capability("gradeexport/{$exportplugin}:view", $context);
+ },
+ ARRAY_FILTER_USE_KEY
+);
+
if (!empty($exportplugins)) {
$exportplugin = array_key_first($exportplugins);
$url = new moodle_url("/grade/export/{$exportplugin}/index.php", ['id' => $courseid]);
redirect($url);
}
-// Otherwise, output the page with a notification stating that there are no available grade import options.
+// Otherwise, output the page with a notification stating that there are no available grade export options.
$PAGE->set_title(get_string('export', 'grades'));
$PAGE->set_pagelayout('incourse');
$PAGE->set_heading($course->fullname);
diff --git a/grade/export/txt/tests/behat/export.feature b/grade/export/txt/tests/behat/export.feature
index 9ed149dced5f4..6ef31567d8571 100644
--- a/grade/export/txt/tests/behat/export.feature
+++ b/grade/export/txt/tests/behat/export.feature
@@ -20,13 +20,10 @@ Feature: I need to export grades as text
| activity | course | idnumber | name | intro | assignsubmission_onlinetext_enabled |
| assign | C1 | a1 | Test assignment name | Submit your online text | 1 |
| assign | C1 | a2 | Test assignment name 2 | Submit your online text | 1 |
- And I log in as "teacher1"
- And I am on "Course 1" course homepage
- And I navigate to "View > Grader report" in the course gradebook
- And I turn editing mode on
- And I change window size to "large"
- And I give the grade "80.00" to the user "Student 1" for the grade item "Test assignment name"
- And I press "Save changes"
+ And the following "grade grades" exist:
+ | gradeitem | user | grade |
+ | Test assignment name | student1 | 80.00 |
+ And I am on the "Course 1" "grades > Grader report > View" page logged in as "teacher1"
@javascript
Scenario: Export grades as text
diff --git a/grade/export/xml/tests/behat/export.feature b/grade/export/xml/tests/behat/export.feature
index 60308cf2dc940..de88363aaf5f0 100644
--- a/grade/export/xml/tests/behat/export.feature
+++ b/grade/export/xml/tests/behat/export.feature
@@ -19,15 +19,13 @@ Feature: I need to export grades as xml
| student1 | C1 | student |
| student2 | C1 | student |
And the following "activities" exist:
- | activity | course | idnumber | name | intro |
- | assign | C1 | a1 | Test assignment name | Submit something! |
- And I log in as "teacher1"
- And I am on "Course 1" course homepage
- And I navigate to "View > Grader report" in the course gradebook
- And I turn editing mode on
- And I give the grade "80.00" to the user "Student 1" for the grade item "Test assignment name"
- And I give the grade "42.00" to the user "Student 2" for the grade item "Test assignment name"
- And I press "Save changes"
+ | activity | course | idnumber | name |
+ | assign | C1 | a1 | Test assignment name |
+ And the following "grade grades" exist:
+ | gradeitem | user | grade |
+ | Test assignment name | student1 | 80.00 |
+ | Test assignment name | student2 | 42.00 |
+ And I am on the "Course 1" course page logged in as teacher1
@javascript
Scenario: Export grades as XML
diff --git a/grade/grading/form/rubric/tests/behat/behat_gradingform_rubric.php b/grade/grading/form/rubric/tests/behat/behat_gradingform_rubric.php
index 6f23158b75acc..09c76679dd1e5 100644
--- a/grade/grading/form/rubric/tests/behat/behat_gradingform_rubric.php
+++ b/grade/grading/form/rubric/tests/behat/behat_gradingform_rubric.php
@@ -27,9 +27,9 @@
require_once(__DIR__ . '/../../../../../../lib/behat/behat_base.php');
-use Behat\Gherkin\Node\TableNode as TableNode,
- Behat\Mink\Exception\ElementNotFoundException as ElementNotFoundException,
- Behat\Mink\Exception\ExpectationException as ExpectationException;
+use Behat\Gherkin\Node\TableNode;
+use Behat\Mink\Exception\ElementNotFoundException;
+use Behat\Mink\Exception\ExpectationException;
/**
* Steps definitions to help with rubrics.
@@ -66,7 +66,6 @@ class behat_gradingform_rubric extends behat_base {
* @param TableNode $rubric
*/
public function i_define_the_following_rubric(TableNode $rubric) {
-
// Being a smart method is nothing good when we talk about step definitions, in
// this case we didn't have any other options as there are no labels no elements
// id we can point to without having to "calculate" them.
@@ -80,7 +79,6 @@ public function i_define_the_following_rubric(TableNode $rubric) {
// Cleaning the current ones.
$deletebuttons = $this->find_all('css', "input[value='" . get_string('criteriondelete', 'gradingform_rubric') . "']");
if ($deletebuttons) {
-
// We should reverse the deletebuttons because otherwise once we delete
// the first one the DOM will change and the [X] one will not exist anymore.
$deletebuttons = array_reverse($deletebuttons, true);
@@ -132,7 +130,10 @@ public function i_define_the_following_rubric(TableNode $rubric) {
}
// Add new criterion.
- $addcriterionbutton->click();
+ $this->execute('behat_general::i_click_on', [
+ $addcriterionbutton,
+ 'NodeElement',
+ ]);
$criterionroot = 'rubric[criteria][NEWID' . ($criterionit + 1) . ']';
@@ -158,12 +159,14 @@ public function i_define_the_following_rubric(TableNode $rubric) {
if ($this->running_javascript()) {
$deletelevel = $this->find_button($criterionroot . '[levels][NEWID' . $i . '][delete]');
$this->click_and_confirm($deletelevel);
-
} else {
// Only if the level exists.
$buttonname = $criterionroot . '[levels][NEWID' . $i . '][delete]';
if ($deletelevel = $this->getSession()->getPage()->findButton($buttonname)) {
- $deletelevel->click();
+ $this->execute('behat_general::i_click_on', [
+ $deletelevel,
+ 'NodeElement',
+ ]);
}
}
}
@@ -171,7 +174,10 @@ public function i_define_the_following_rubric(TableNode $rubric) {
// Adding levels if we don't have enough.
$addlevel = $this->find_button($criterionroot . '[levels][addlevel]');
for ($i = ($defaultnumberoflevels + 1); $i <= $nlevels; $i++) {
- $addlevel->click();
+ $this->execute('behat_general::i_click_on', [
+ $addlevel,
+ 'NodeElement',
+ ]);
}
}
@@ -226,7 +232,6 @@ public function i_define_the_following_rubric(TableNode $rubric) {
* @param string $criterionname
*/
public function i_replace_rubric_level_with($currentvalue, $value, $criterionname) {
-
$currentvalueliteral = behat_context_helper::escape($currentvalue);
$criterionliteral = behat_context_helper::escape($criterionname);
@@ -247,14 +252,15 @@ public function i_replace_rubric_level_with($currentvalue, $value, $criterionnam
"/descendant::textarea[text()=$currentvalueliteral]";
if ($this->running_javascript()) {
-
$spansufix = "/ancestor::div[@class='level-wrapper']" .
"/descendant::div[@class='definition']" .
"/descendant::span[@class='textvalue']";
// Expanding the level input boxes.
- $spannode = $this->find('xpath', $inputxpath . $spansufix . '|' . $textareaxpath . $spansufix);
- $spannode->click();
+ $this->execute('behat_general::i_click_on', [
+ $inputxpath . $spansufix . '|' . $textareaxpath . $spansufix,
+ 'xpath',
+ ]);
$inputfield = $this->find('xpath', $inputxpath . '|' . $textareaxpath);
$inputfield->setValue($value);
@@ -263,7 +269,6 @@ public function i_replace_rubric_level_with($currentvalue, $value, $criterionnam
$fieldnode = $this->find('xpath', $inputxpath . '|' . $textareaxpath);
$this->set_rubric_field_value($fieldnode->getAttribute('name'), $value);
}
-
}
/**
@@ -275,7 +280,6 @@ public function i_replace_rubric_level_with($currentvalue, $value, $criterionnam
* @param TableNode $rubric
*/
public function i_grade_by_filling_the_rubric_with(TableNode $rubric) {
-
$criteria = $rubric->getRowsHash();
$stepusage = '"I grade by filling the rubric with:" step needs you to provide a table where each row is a criterion' .
@@ -288,7 +292,6 @@ public function i_grade_by_filling_the_rubric_with(TableNode $rubric) {
// First element -> name, second -> points, third -> Remark.
foreach ($criteria as $name => $criterion) {
-
// We only expect the points and the remark, as the criterion name is $name.
if (count($criterion) !== 2) {
throw new ExpectationException($stepusage, $this->getSession());
@@ -349,7 +352,6 @@ public function i_grade_by_filling_the_rubric_with(TableNode $rubric) {
* @return void
*/
public function the_level_with_points_was_previously_selected_for_the_rubric_criterion($points, $criterionname) {
-
$levelxpath = $this->get_criterion_xpath($criterionname) .
$this->get_level_xpath($points) .
"[contains(concat(' ', normalize-space(@class), ' '), ' currentchecked ')]";
@@ -378,7 +380,6 @@ public function the_level_with_points_was_previously_selected_for_the_rubric_cri
* @return void
*/
public function the_level_with_points_is_selected_for_the_rubric_criterion($points, $criterionname) {
-
$levelxpath = $this->get_criterion_xpath($criterionname) .
$this->get_level_xpath($points);
@@ -409,7 +410,6 @@ public function the_level_with_points_is_selected_for_the_rubric_criterion($poin
* @return void
*/
public function the_level_with_points_is_not_selected_for_the_rubric_criterion($points, $criterionname) {
-
$levelxpath = $this->get_criterion_xpath($criterionname) .
$this->get_level_xpath($points);
@@ -437,12 +437,13 @@ public function the_level_with_points_is_not_selected_for_the_rubric_criterion($
* @return void
*/
protected function set_rubric_field_value($name, $value, $visible = false) {
-
// Fields are hidden by default.
if ($this->running_javascript() == true && $visible === false) {
$xpath = "//*[@name='$name']/following-sibling::*[contains(concat(' ', normalize-space(@class), ' '), ' plainvalue ')]";
- $textnode = $this->find('xpath', $xpath);
- $textnode->click();
+ $this->execute('behat_general::i_click_on', [
+ $xpath,
+ 'xpath',
+ ]);
}
// Set the value now.
@@ -457,19 +458,20 @@ protected function set_rubric_field_value($name, $value, $visible = false) {
* @return void
*/
protected function click_and_confirm($node) {
-
// Clicks to perform the action.
- $node->click();
+ $this->execute('behat_general::i_click_on', [
+ $node,
+ 'NodeElement',
+ ]);
// Confirms the delete.
if ($this->running_javascript()) {
- $confirmbutton = $this->get_node_in_container(
- 'button',
+ $this->execute('behat_general::i_click_on_in_the', [
get_string('yes'),
+ 'button',
+ get_string('confirmation', 'admin'),
'dialogue',
- get_string('confirmation', 'admin')
- );
- $confirmbutton->click();
+ ]);
}
}
diff --git a/grade/import/index.php b/grade/import/index.php
index fc8d4f9cbf34a..e5acd9b87308a 100644
--- a/grade/import/index.php
+++ b/grade/import/index.php
@@ -37,7 +37,14 @@
$context = context_course::instance($courseid);
require_capability('moodle/grade:import', $context);
-$importplugins = core_component::get_plugin_list('gradeimport');
+// Retrieve all grade import plugins the current user can access.
+$importplugins = array_filter(core_component::get_plugin_list('gradeimport'),
+ static function(string $importplugin) use ($context): bool {
+ return has_capability("gradeimport/{$importplugin}:view", $context);
+ },
+ ARRAY_FILTER_USE_KEY
+);
+
if (!empty($importplugins)) {
$importplugin = array_key_first($importplugins);
$url = new moodle_url("/grade/import/{$importplugin}/index.php", ['id' => $courseid]);
diff --git a/grade/lib.php b/grade/lib.php
index f069d54da72ee..1aa9e9e5b9eb6 100644
--- a/grade/lib.php
+++ b/grade/lib.php
@@ -770,8 +770,8 @@ function grade_get_plugin_info($courseid, $active_type, $active_plugin) {
break;
}
foreach ($plugins as $plugin) {
- if (is_a($plugin, 'grade_plugin_info')) {
- if ($active_plugin == $plugin->id) {
+ if (is_a($plugin, grade_plugin_info::class)) {
+ if ($plugin_type === $active_type && $active_plugin == $plugin->id) {
$plugin_info['strings']['active_plugin_str'] = $plugin->string;
}
}
@@ -880,7 +880,7 @@ public function __construct($id, $link, $string, $parent=null) {
* @param string|null $headerhelpidentifier The help string identifier if required.
* @param string|null $headerhelpcomponent The component for the help string.
* @param stdClass|null $user The user object for use with the user context header.
- * @param actionbar|null $actionbar The actions bar which will be displayed on the page if $shownavigation is set
+ * @param action_bar|null $actionbar The actions bar which will be displayed on the page if $shownavigation is set
* to true. If $actionbar is not explicitly defined, the general action bar
* (\core_grades\output\general_action_bar) will be used by default.
* @param boolean $showtitle If set to false just show course full name as a title.
@@ -889,7 +889,7 @@ public function __construct($id, $link, $string, $parent=null) {
function print_grade_page_head(int $courseid, string $active_type, ?string $active_plugin = null, $heading = false,
bool $return = false, $buttons = false, bool $shownavigation = true, ?string $headerhelpidentifier = null,
?string $headerhelpcomponent = null, ?stdClass $user = null, ?action_bar $actionbar = null, $showtitle = true) {
- global $CFG, $OUTPUT, $PAGE;
+ global $CFG, $OUTPUT, $PAGE, $USER;
// Put a warning on all gradebook pages if the course has modules currently scheduled for background deletion.
require_once($CFG->dirroot . '/course/lib.php');
@@ -922,7 +922,19 @@ function print_grade_page_head(int $courseid, string $active_type, ?string $acti
} else {
$PAGE->set_pagelayout('admin');
}
- $PAGE->set_title(get_string('grades') . ': ' . $stractive_type);
+ $coursecontext = context_course::instance($courseid);
+ // Title will be constituted by information starting from the unique identifying information for the page.
+ if (in_array($active_type, ['report', 'settings'])) {
+ $uniquetitle = $stractive_plugin;
+ } else {
+ $uniquetitle = $stractive_type . ': ' . $stractive_plugin;
+ }
+ $titlecomponents = [
+ $uniquetitle,
+ get_string('grades'),
+ $coursecontext->get_context_name(false),
+ ];
+ $PAGE->set_title(implode(moodle_page::TITLE_SEPARATOR, $titlecomponents));
$PAGE->set_heading($title);
$PAGE->set_secondary_active_tab('grades');
@@ -970,15 +982,16 @@ function print_grade_page_head(int $courseid, string $active_type, ?string $acti
$output = '';
// Add a help dialogue box if provided.
- if (isset($headerhelpidentifier)) {
+ if (isset($headerhelpidentifier) && !empty($heading)) {
$output = $OUTPUT->heading_with_help($heading, $headerhelpidentifier, $headerhelpcomponent);
- } else {
- if (isset($user)) {
- $renderer = $PAGE->get_renderer('core_grades');
- $output = $OUTPUT->heading($renderer->user_heading($user, $courseid));
- } else {
- $output = $OUTPUT->heading($heading);
- }
+ } else if (isset($user)) {
+ $renderer = $PAGE->get_renderer('core_grades');
+ // If the user is viewing their own grade report, no need to show the "Message"
+ // and "Add to contact" buttons in the user heading.
+ $showuserbuttons = $user->id != $USER->id;
+ $output = $renderer->user_heading($user, $courseid, $showuserbuttons);
+ } else if (!empty($heading)) {
+ $output = $OUTPUT->heading($heading);
}
if ($return) {
@@ -987,8 +1000,7 @@ function print_grade_page_head(int $courseid, string $active_type, ?string $acti
echo $output;
}
- $returnval .= print_natural_aggregation_upgrade_notice($courseid, context_course::instance($courseid), $PAGE->url,
- $return);
+ $returnval .= print_natural_aggregation_upgrade_notice($courseid, $coursecontext, $PAGE->url, $return);
if ($return) {
return $returnval;
diff --git a/grade/report/grader/tests/behat/switch_views.feature b/grade/report/grader/tests/behat/switch_views.feature
index ad68e12ced013..9f21eacabe729 100644
--- a/grade/report/grader/tests/behat/switch_views.feature
+++ b/grade/report/grader/tests/behat/switch_views.feature
@@ -75,8 +75,7 @@ Feature: We can change what we are viewing on the grader report
And the following "role capability" exists:
| role | editingteacher |
| moodle/grade:viewhidden | prevent |
- And I am on the "C1" "course" page logged in as "teacher1"
- And I navigate to "View > Grader report" in the course gradebook
+ And I am on the "Course 1" "grades > Grader report > View" page logged in as "teacher1"
Then I should see "Test assignment name 1" in the "user-grades" "table"
And I should see "Test assignment name 2" in the "user-grades" "table"
And I should see "Manual grade"
diff --git a/grade/report/history/tests/behat/basic_functionality.feature b/grade/report/history/tests/behat/basic_functionality.feature
index d633f622badc6..0889b4e176b43 100644
--- a/grade/report/history/tests/behat/basic_functionality.feature
+++ b/grade/report/history/tests/behat/basic_functionality.feature
@@ -25,14 +25,12 @@ Feature: A teacher checks the grade history report in a course
| student1 | C1 | student |
| student2 | C1 | student |
And the following "activities" exist:
- | activity | course | section | name | intro |
- | assign | C1 | 1 | The greatest assignment ever | Write a behat test for Moodle - it's amazing |
- | assign | C1 | 1 | Rewarding assignment | After writing your behat test go grab a beer! |
+ | activity | course | name |
+ | assign | C1 | The greatest assignment ever |
+ | assign | C1 | Rewarding assignment |
Given the following config values are set as admin:
| showuseridentity | email,profile_field_food |
- And I log in as "teacher1"
- And I am on "Course 1" course homepage with editing mode on
- And I navigate to "View > Grader report" in the course gradebook
+ And I am on the "Course 1" "grades > Grader report > View" page logged in as "teacher1"
And I should see "apple" in the "student1" "table_row"
And I should see "orange" in the "student2" "table_row"
And I turn editing mode on
@@ -41,10 +39,7 @@ Feature: A teacher checks the grade history report in a course
And I give the grade "50.00" to the user "Student 2" for the grade item "The greatest assignment ever"
And I give the grade "60.00" to the user "Student 2" for the grade item "Rewarding assignment"
And I press "Save changes"
- And I log out
- And I log in as "teacher2"
- And I am on "Course 1" course homepage
- And I navigate to "View > Grader report" in the course gradebook
+ And I am on the "Course 1" "grades > Grader report > View" page logged in as "teacher2"
And I should see "apple" in the "student1" "table_row"
And I should see "orange" in the "student2" "table_row"
And I turn editing mode on
diff --git a/grade/report/singleview/classes/local/screen/tablelike.php b/grade/report/singleview/classes/local/screen/tablelike.php
index 6d06f36acf013..38b2d95eabcf4 100644
--- a/grade/report/singleview/classes/local/screen/tablelike.php
+++ b/grade/report/singleview/classes/local/screen/tablelike.php
@@ -225,7 +225,7 @@ public function bulk_insert() {
return html_writer::tag(
'div',
(new bulk_insert($this->item))->html(),
- ['class' => 'singleview_bulk', 'hidden' => true]
+ ['class' => 'singleview_bulk', 'hidden' => 'hidden']
);
}
diff --git a/grade/report/singleview/classes/local/ui/dropdown_attribute.php b/grade/report/singleview/classes/local/ui/dropdown_attribute.php
index d2726304b6d70..1c30a8e2d35b7 100644
--- a/grade/report/singleview/classes/local/ui/dropdown_attribute.php
+++ b/grade/report/singleview/classes/local/ui/dropdown_attribute.php
@@ -105,7 +105,6 @@ public function html(): string {
'name' => $this->name,
'value' => $this->selected,
'text' => $options[$selected],
- 'tabindex' => 1,
'disabled' => !empty($this->isdisabled),
'readonly' => $this->isreadonly,
'options' => array_map(function($option) use ($options, $selected) {
diff --git a/grade/report/singleview/classes/local/ui/text_attribute.php b/grade/report/singleview/classes/local/ui/text_attribute.php
index ead123e950089..164f1ec4e94f0 100644
--- a/grade/report/singleview/classes/local/ui/text_attribute.php
+++ b/grade/report/singleview/classes/local/ui/text_attribute.php
@@ -85,10 +85,8 @@ public function html(): string {
$context->label = '';
if (preg_match("/^feedback/", $this->name)) {
$context->label = get_string('feedbackfor', 'gradereport_singleview', $this->label);
- $context->tabindex = '2';
} else if (preg_match("/^finalgrade/", $this->name)) {
$context->label = get_string('gradefor', 'gradereport_singleview', $this->label);
- $context->tabindex = '1';
}
return $OUTPUT->render_from_template('gradereport_singleview/text_attribute', $context);
diff --git a/grade/report/singleview/templates/dropdown_attribute.mustache b/grade/report/singleview/templates/dropdown_attribute.mustache
index e2d225ab65fc4..d04a631708aae 100644
--- a/grade/report/singleview/templates/dropdown_attribute.mustache
+++ b/grade/report/singleview/templates/dropdown_attribute.mustache
@@ -33,7 +33,7 @@
{{/readonly}}
{{^readonly}}
-