Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
MDL-70786 report_completion: respect fullname setting.
  • Loading branch information
lucaboesch committed May 4, 2021
1 parent 2047488 commit a11c2cb
Show file tree
Hide file tree
Showing 2 changed files with 40 additions and 2 deletions.
5 changes: 3 additions & 2 deletions report/completion/index.php
Expand Up @@ -546,7 +546,7 @@
if ($csv) {
$row = array();
$row[] = $user->id;
$row[] = fullname($user);
$row[] = fullname($user, has_capability('moodle/site:viewfullnames', $context));
foreach ($extrafields as $field) {
$row[] = $user->{$field};
}
Expand All @@ -559,7 +559,8 @@
$userurl = new moodle_url('/user/view.php', array('id' => $user->id, 'course' => $course->id));
}

print '<th scope="row"><a href="'.$userurl->out().'">'.fullname($user).'</a></th>';
print '<th scope="row"><a href="' . $userurl->out() . '">' .
fullname($user, has_capability('moodle/site:viewfullnames', $context)) . '</a></th>';
foreach ($extrafields as $field) {
echo '<td>'.s($user->{$field}).'</td>';
}
Expand Down
37 changes: 37 additions & 0 deletions report/completion/tests/behat/completion_report.feature
@@ -0,0 +1,37 @@
@report @report_completion
Feature: See the completion for items in a course
In order see completion data
As a teacher
I need to view completion report

Background:
Given the following "users" exist:
| username | firstname | lastname | email | idnumber | middlename | alternatename | firstnamephonetic | lastnamephonetic |
| teacher1 | Teacher | 1 | teacher1@example.com | t1 | | fred | | |
| student1 | Grainne | Beauchamp | student1@example.com | s1 | Ann | Jill | Gronya | Beecham |
And the following "courses" exist:
| fullname | shortname | category | enablecompletion |
| Course 1 | C1 | 0 | 1 |
And the following "course enrolments" exist:
| user | course | role |
| teacher1 | C1 | editingteacher |
| student1 | C1 | student |
And the following "activities" exist:
| activity | name | intro | course | idnumber | completion | completionview |
| page | PageName1 | PageDesc1 | C1 | PAGE1 | 1 | 1 |
And the following config values are set as admin:
| fullnamedisplay | firstname |
| alternativefullnameformat | middlename, alternatename, firstname, lastname |

@javascript
Scenario: Go to the completion report
Given I log in as "teacher1"
And I am on "Course 1" course homepage
And I navigate to "Course completion" in current page administration
And I expand all fieldsets
And I set the following fields to these values:
| Page - PageName1 | 1 |
And I press "Save changes"
And I am on "Course 1" course homepage
When I navigate to "Reports > Course completion" in current page administration
Then I should see "Ann, Jill, Grainne, Beauchamp"

0 comments on commit a11c2cb

Please sign in to comment.