From 382168a0aa3dd66714730ced36898bf37c6fdff9 Mon Sep 17 00:00:00 2001 From: Michael Hawkins Date: Wed, 4 Sep 2019 11:19:27 +0800 Subject: [PATCH] MDL-66594 forumreport_summary: Added first/last post date columns Part of MDL-66076. --- .../report/summary/classes/summary_table.php | 30 +++++++++- .../summary/lang/en/forumreport_summary.php | 2 + .../behat/summary_data_post_dates.feature | 55 +++++++++++++++++++ 3 files changed, 86 insertions(+), 1 deletion(-) create mode 100644 mod/forum/report/summary/tests/behat/summary_data_post_dates.feature diff --git a/mod/forum/report/summary/classes/summary_table.php b/mod/forum/report/summary/classes/summary_table.php index 2e45e55b799..c59f3e20eb3 100644 --- a/mod/forum/report/summary/classes/summary_table.php +++ b/mod/forum/report/summary/classes/summary_table.php @@ -85,6 +85,8 @@ class summary_table extends table_sql { 'postcount' => get_string('postcount', 'forumreport_summary'), 'replycount' => get_string('replycount', 'forumreport_summary'), 'attachmentcount' => get_string('attachmentcount', 'forumreport_summary'), + 'earliestpost' => get_string('earliestpost', 'forumreport_summary'), + 'latestpost' => get_string('latestpost', 'forumreport_summary'), ]; $this->define_columns(array_keys($columnheaders)); @@ -156,6 +158,30 @@ class summary_table extends table_sql { return $data->attachmentcount; } + /** + * Generate the earliestpost column. + * + * @param \stdClass $data The row data. + * @return string Timestamp of user's earliest post, or a dash if no posts exist. + */ + public function col_earliestpost(\stdClass $data): string { + global $USER; + + return empty($data->earliestpost) ? '-' : userdate($data->earliestpost, "", \core_date::get_user_timezone($USER)); + } + + /** + * Generate the latestpost column. + * + * @param \stdClass $data The row data. + * @return string Timestamp of user's most recent post, or a dash if no posts exist. + */ + public function col_latestpost(\stdClass $data): string { + global $USER; + + return empty($data->latestpost) ? '-' : userdate($data->latestpost, "", \core_date::get_user_timezone($USER)); + } + /** * Override the default implementation to set a decent heading level. * @@ -263,7 +289,9 @@ class summary_table extends table_sql { SUM(CASE WHEN p.parent != 0 THEN 1 ELSE 0 END) AS replycount, u.firstname, u.lastname, - SUM(CASE WHEN att.attcount IS NULL THEN 0 ELSE att.attcount END) AS attachmentcount'; + SUM(CASE WHEN att.attcount IS NULL THEN 0 ELSE att.attcount END) AS attachmentcount, + MIN(p.created) AS earliestpost, + MAX(p.created) AS latestpost'; $this->sql->basefromjoins = ' {enrol} e JOIN {user_enrolments} ue ON ue.enrolid = e.id diff --git a/mod/forum/report/summary/lang/en/forumreport_summary.php b/mod/forum/report/summary/lang/en/forumreport_summary.php index 779d8a58fef..c4e0e34d231 100644 --- a/mod/forum/report/summary/lang/en/forumreport_summary.php +++ b/mod/forum/report/summary/lang/en/forumreport_summary.php @@ -23,6 +23,8 @@ */ $string['attachmentcount'] = 'Number of attachments'; +$string['earliestpost'] = 'Earliest post'; +$string['latestpost'] = 'Most recent post'; $string['nodetitle'] = 'Summary report'; $string['pluginname'] = 'Forum summary report'; $string['postcount'] = 'Number of discussions posted'; diff --git a/mod/forum/report/summary/tests/behat/summary_data_post_dates.feature b/mod/forum/report/summary/tests/behat/summary_data_post_dates.feature new file mode 100644 index 00000000000..c1834066f93 --- /dev/null +++ b/mod/forum/report/summary/tests/behat/summary_data_post_dates.feature @@ -0,0 +1,55 @@ +@mod @mod_forum @forumreport @forumreport_summary +Feature: Post date columns data available + In order to determine users' earliest and most recent forum posts + As a teacher + I need to view that data in the forum summary report + + Scenario: Add posts and view accurate summary report + Given the following "users" exist: + | username | firstname | lastname | email | + | teacher1 | Teacher | 1 | teacher1@example.com | + | student1 | Student | 1 | student1@example.com | + | student2 | Student | 2 | student1@example.com | + And the following "courses" exist: + | fullname | shortname | category | + | Course 1 | C1 | 0 | + | Course 2 | C2 | 0 | + And the following "course enrolments" exist: + | user | course | role | + | teacher1 | C1 | editingteacher | + | student1 | C1 | student | + | student2 | C1 | student | + | teacher1 | C2 | editingteacher | + And the following "activities" exist: + | activity | name | description | course | idnumber | + | forum | forum1 | C1 first forum | C1 | forum1 | + | forum | forum2 | C1 second forum | C1 | forum2 | + | forum | forum1 | C2 first forum | C2 | forum1 | + And the following forum discussions exist in course "Course 1": + | user | forum | name | message | created | + | teacher1 | forum1 | discussion1 | t1 earliest | ##2018-01-02 09:00:00## | + | teacher1 | forum1 | discussion2 | t1 between | ##2018-03-27 10:00:00## | + | teacher1 | forum2 | discussion3 | t1 other forum | ##2018-01-01 11:00:00## | + | student1 | forum1 | discussion4 | s1 latest | ##2019-03-27 13:00:00## | + | student2 | forum2 | discussion5 | s2 other forum | ##2018-03-27 09:00:00## | + And the following forum replies exist in course "Course 1": + | user | forum | discussion | message | created | + | teacher1 | forum1 | discussion1 | t1 between | ##2018-01-02 10:30:00## | + | teacher1 | forum1 | discussion2 | t1 latest | ##2019-09-01 07:00:00## | + | teacher1 | forum2 | discussion3 | t1 other forum | ##2019-09-12 08:00:00## | + | student1 | forum1 | discussion1 | s1 earliest | ##2019-03-27 04:00:00## | + | student2 | forum2 | discussion3 | s2 other forum | ##2018-03-27 10:00:00## | + And the following forum discussions exist in course "Course 2": + | user | forum | name | message | created | + | teacher1 | forum1 | discussion1 | t1 other course | ##2017-01-01 03:00:00## | + | teacher1 | forum1 | discussion2 | t1 other course | ##2019-09-13 23:59:00## | + When I log in as "teacher1" + And I am on "Course 1" course homepage + And I follow "forum1" + And I navigate to "Summary report" in current page administration + Then "Teacher 1" row "Earliest post" column of "forumreport_summary_table" table should contain "Tuesday, 2 January 2018, 9:00 AM" + Then "Teacher 1" row "Most recent post" column of "forumreport_summary_table" table should contain "Sunday, 1 September 2019, 7:00 AM" + Then "Student 1" row "Earliest post" column of "forumreport_summary_table" table should contain "Wednesday, 27 March 2019, 4:00 AM" + Then "Student 1" row "Most recent post" column of "forumreport_summary_table" table should contain "Wednesday, 27 March 2019, 1:00 PM" + Then "Student 2" row "Earliest post" column of "forumreport_summary_table" table should contain "-" + Then "Student 2" row "Most recent post" column of "forumreport_summary_table" table should contain "-" -- 2.17.1