From 861a0fd92a9a8ae3f970707a8e39a4ba96fbdaba Mon Sep 17 00:00:00 2001 From: David Monllao Date: Thu, 27 Nov 2014 18:08:43 +0800 Subject: [PATCH] MDL-38128 mod_assign: Changes in grading summary page using team submissions If there is an active group and (groupmode != NOGROUPS) the displayed info is related with that single group. --- mod/assign/locallib.php | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/mod/assign/locallib.php b/mod/assign/locallib.php index cb7918642d8..4effa4d7c54 100644 --- a/mod/assign/locallib.php +++ b/mod/assign/locallib.php @@ -1410,6 +1410,10 @@ class assign { */ public function count_teams() { + if ($currentgroup = groups_get_activity_group($this->get_course_module())) { + return 1; + } + $groups = groups_get_all_groups($this->get_course()->id, 0, $this->get_instance()->teamsubmissiongroupingid, @@ -1568,6 +1572,12 @@ class assign { $params['submissionstatus'] = $status; if ($this->get_instance()->teamsubmission) { + + $groupstr = ''; + if ($currentgroup != NOGROUPS) { + $groupstr = 's.groupid = :groupid AND'; + $params['groupid'] = $currentgroup; + } $sql = 'SELECT COUNT(s.groupid) FROM {assign_submission} s WHERE @@ -1575,6 +1585,7 @@ class assign { s.assignment = :assignid AND s.timemodified IS NOT NULL AND s.userid = :groupuserid AND + ' . $groupstr . ' s.status = :submissionstatus'; $params['groupuserid'] = 0; } else {