Testing requires some code modifications because there are not many datasources in Moodle LMS yet Create two cohorts, add a member to one of them (does not matter who) In Site administration>Users>User profile fields add user profile fields with the types "checkbox" and "date" Go to Site administration>Reports>Custom reports and create a report from the "Cohorts" datasource Add columns: Cohort: Name Cohort member: Time added User: Full name User: Confirmed two user profile fields you added in the step 2 above 5. View the report. In the row for the empty cohort all cells have to be completely empty (note that user profile field 'date' displays "Not set") 6. Modify the code in the file cohort/classes/local/entities/cohort_member.php around lines 86-95: Modification 1: Change the type to INTEGER and change callback from 'userdate' to 'percent'. View report - the "Time added" cell in the empty cohort row should be empty diff --git a/cohort/classes/reportbuilder/local/entities/cohort_member.php b/cohort/classes/reportbuilder/local/entities/cohort_member.php index b05a661714b..bcf353d0a10 100644 --- a/cohort/classes/reportbuilder/local/entities/cohort_member.php +++ b/cohort/classes/reportbuilder/local/entities/cohort_member.php @@ -89,10 +89,10 @@ class cohort_member extends base { $this->get_entity_name() )) ->add_joins($this->get_joins()) - ->set_type(column::TYPE_TIMESTAMP) + ->set_type(column::TYPE_INTEGER) ->add_fields("{$tablealias}.timeadded") ->set_is_sortable(true) - ->set_callback([format::class, 'userdate']); + ->set_callback([format::class, 'percent']); return $columns; } Modification 2: For the same column leave the type as INTEGER but remove callback completely. View report - the "Time added" cell in the empty cohort row should be empty diff --git a/cohort/classes/reportbuilder/local/entities/cohort_member.php b/cohort/classes/reportbuilder/local/entities/cohort_member.php index b05a661714b..519d1dbc50e 100644 --- a/cohort/classes/reportbuilder/local/entities/cohort_member.php +++ b/cohort/classes/reportbuilder/local/entities/cohort_member.php @@ -89,10 +89,10 @@ class cohort_member extends base { $this->get_entity_name() )) ->add_joins($this->get_joins()) - ->set_type(column::TYPE_TIMESTAMP) + ->set_type(column::TYPE_INTEGER) ->add_fields("{$tablealias}.timeadded") - ->set_is_sortable(true) - ->set_callback([format::class, 'userdate']); + ->set_is_sortable(true); return $columns; } Modification 3. Change the type to column::TYPE_FLOAT - assert the same result in the report Aggregation Rollback modifications from the previous test Use the same report, but only columns "Cohort: Name", "Cohort member: Time added" and "User: Confirmed" Aggregate the columns "Confirmed" and "Time added" using different aggregation methods (except for "count" and "count distinct") Assert that the aggregated values for the empty cohort show empty cells and the aggregated values for the non-empty cohort show values