mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-02-19 15:45:59 +01:00
Code Issues Projects Releases Wiki Activity

Merge branch 'MDL-56753-master' of git://github.com/lameze/moodle

Browse Source
This commit is contained in:
David Monllao 2016-11-10 11:38:24 +08:00
commit af49935a53
2 changed files with 107 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
mod/assign/locallib.php
View File

@ -1903,6 +1903,10 @@ class assign {
$count += 1;
}
}
} else if ($activitygroup != 0 && empty($groups)) {
// Set count to 1 if $groups returns empty.
// It means the group is not part of $this->get_instance()->teamsubmissiongroupingid.
$count = 1;
}
} else {
// It is faster to loop around participants if no grouping was specified.
@ -2074,6 +2078,12 @@ class assign {
array_keys($participants),
$this->get_instance()->teamsubmissiongroupingid,
'DISTINCT g.id, g.name');
if (empty($groups)) {
// If $groups is empty it means it is not part of $this->get_instance()->teamsubmissiongroupingid.
// All submissions from students that do not belong to any of teamsubmissiongroupingid groups
// count towards groupid = 0. Setting to true as only '0' key matters.
$groups = [true];
}
list($groupssql, $groupsparams) = $DB->get_in_or_equal(array_keys($groups), SQL_PARAMS_NAMED);
$groupsstr = 's.groupid ' . $groupssql . ' AND';
$params = $params + $groupsparams;

97
mod/assign/tests/behat/group_submission.feature
View File

@ -135,3 +135,100 @@ Feature: Group assignment submissions
And "Student 2" row "Status" column of "generaltable" table should contain "Submitted for grading"
And "Student 3" row "Status" column of "generaltable" table should contain "Submitted for grading"
And "Student 4" row "Status" column of "generaltable" table should contain "Submitted for grading"
Scenario: Confirm groups and submission counts are correct
Given the following "courses" exist:
| fullname | shortname | category | groupmode |
| Course 1 | C1 | 0 | 1 |
And the following "users" exist:
| username | firstname | lastname | email |
| student1 | Student | 1 | student1@example.com |
| student2 | Student | 2 | student2@example.com |
| student3 | Student | 3 | student3@example.com |
| student4 | Student | 4 | student4@example.com |
| student5 | Student | 5 | student5@example.com |
| student6 | Student | 6 | student6@example.com |
And the following "course enrolments" exist:
| user | course | role |
| student1 | C1 | student |
| student2 | C1 | student |
| student3 | C1 | student |
| student4 | C1 | student |
| student5 | C1 | student |
| student6 | C1 | student |
And the following "groups" exist:
| name | course | idnumber |
| Group 1 | C1 | G1 |
| Group 2 | C1 | G2 |
| Group 3 | C1 | G3 |
And the following "group members" exist:
| user | group |
| student1 | G1 |
| student2 | G1 |
| student3 | G2 |
| student4 | G2 |
| student5 | G3 |
| student6 | G3 |
And the following "groupings" exist:
| name | course | idnumber |
| Grouping 1 | C1 | GG1 |
And the following "grouping groups" exist:
| grouping | group |
| GG1 | G1 |
| GG1 | G2 |
And I log in as "admin"
And I am on site homepage
And I follow "Course 1"
And I turn editing mode on
And I add a "Assignment" to section "1" and I fill the form with:
| Assignment name | Test assignment name |
| Description | Test assignment description |
| assignsubmission_onlinetext_enabled | 1 |
| assignsubmission_file_enabled | 0 |
| Students submit in groups | Yes |
| Grouping for student groups | Grouping 1 |
| Group mode | Separate groups |
| Require group to make submission | No |
And I log out
And I log in as "student1"
And I follow "Course 1"
And I follow "Test assignment name"
And I press "Add submission"
And I set the following fields to these values:
| Online text | I'm the student's 1 submission |
And I press "Save changes"
And I log out
And I log in as "student3"
And I follow "Course 1"
And I follow "Test assignment name"
And I press "Add submission"
And I set the following fields to these values:
| Online text | I'm the student's 3 submission |
And I press "Save changes"
And I log out
And I log in as "student5"
And I follow "Course 1"
And I follow "Test assignment name"
And I press "Add submission"
And I set the following fields to these values:
| Online text | I'm the student's 5 submission |
And I press "Save changes"
And I log out
And I log in as "admin"
And I am on site homepage
And I follow "Course 1"
And I follow "Test assignment name"
And I should see "3" in the "Groups" "table_row"
And I should see "3" in the "Submitted" "table_row"
When I set the field "Separate groups" to "Group 1"
And I press "Go"
Then I should see "1" in the "Groups" "table_row"
And I should see "1" in the "Submitted" "table_row"
And I set the field "Separate groups" to "Group 2"
And I press "Go"
And I should see "1" in the "Groups" "table_row"
And I should see "1" in the "Submitted" "table_row"
And I set the field "Separate groups" to "Group 3"
And I press "Go"
And I should see "1" in the "Groups" "table_row"
And I should see "1" in the "Submitted" "table_row"