L-electron-Rare/moodle
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

MDL-45073 report_log: setup table if log reader enabled

Browse Source
This commit is contained in:
Rajesh Taneja
2014-04-15 15:47:51 +08:00
parent 875d1e30e9
commit 7ca6a3fa4e
2 changed files with 23 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
report/log/tests/behat/user_log.feature
+16 -2
View File
@@ -33,14 +33,28 @@ Feature: User can view activity log.
| Online text | I'm the student first submission |
And I press "Save changes"
And I log out
And I log in as "teacher1"
@javascript
Scenario: View Todays' and all log report for user
Given I follow "Course 1"
Given I log in as "teacher1"
And I follow "Course 1"
And I navigate to "Participants" node in "Current course > C1"
And I follow "Student 1"
When I navigate to "Today's logs" node in "Profile settings for Student 1 > Activity reports"
And I should see "Assignment: Test assignment name"
And I navigate to "All logs" node in "Profile settings for Student 1 > Activity reports"
Then I should see "Assignment: Test assignment name"
@javascript
Scenario: No log reader enabled should be visible when no log store enabled.
Given I log in as "admin"
And I navigate to "Manage log stores" node in "Site administration > Plugins > Logging"
And I click on "Disable" "link" in the "Standard log" "table_row"
And I log out
And I log in as "teacher1"
And I navigate to "Participants" node in "Current course > C1"
And I follow "Student 1"
When I navigate to "Today's logs" node in "Profile settings for Student 1 > Activity reports"
And I should see "No log reader enabled"
And I navigate to "All logs" node in "Profile settings for Student 1 > Activity reports"
Then I should see "No log reader enabled"
report/log/user.php
+7 -2
View File
@@ -90,8 +90,13 @@ if ($mode === 'today') {
$output = $PAGE->get_renderer('report_log');
$reportlog = new report_log_renderable($logreader, $course, $user->id, 0, '', -1, -1, false, false, true, false, $PAGE->url,
$timefrom, '', $page, $perpage, 'timecreated DESC');
$reportlog->setup_table();
$reportlog->tablelog->is_downloadable(false);
// Setup table if log reader is enabled.
if (!empty($reportlog->selectedlogreader)) {
$reportlog->setup_table();
$reportlog->tablelog->is_downloadable(false);
}
echo $output->reader_selector($reportlog);
if ($mode === 'today') {