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

Merge branch 'MDL-40285_m28' of git://github.com/markn86/moodle into MOODLE_28_STABLE

Browse Source
This commit is contained in:
Eloy Lafuente (stronk7)
2015-01-27 12:21:11 +01:00
parent 01f200ad39 041dd2902d
commit 8d4ef0df4b
2 changed files with 73 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mod/assign/gradingtable.php
+2 -2
View File
@@ -875,7 +875,7 @@ class assign_grading_table extends table_sql implements renderable {
$group = false;
$submission = false;
$this->get_group_and_submission($row->id, $group, $submission, -1);
if ($group && $submission && $submission->timemodified) {
if ($submission && $submission->timemodified && $submission->status != ASSIGN_SUBMISSION_STATUS_NEW) {
$o = userdate($submission->timemodified);
} else if ($row->timesubmitted) {
$o = userdate($row->timesubmitted);
@@ -903,7 +903,7 @@ class assign_grading_table extends table_sql implements renderable {
$group = false;
$submission = false;
$this->get_group_and_submission($row->id, $group, $submission, -1);
if ($group && $submission) {
if ($submission) {
$timesubmitted = $submission->timemodified;
$status = $submission->status;
} else {
mod/assign/tests/behat/group_submission.feature
+71
View File
@@ -63,3 +63,74 @@ Feature: Group assignment submissions
And "//tr[contains(., 'Student 1')][contains(., 'Group 1')]" "xpath_element" should exist
And "//tr[contains(., 'Student 2')][contains(., 'Default group')]" "xpath_element" should exist
And "//tr[contains(., 'Student 3')][contains(., 'Default group')]" "xpath_element" should exist
@javascript
Scenario: Confirm that the grading status changes for each group member
Given the following "courses" exist:
| fullname | shortname | category | groupmode |
| Course 1 | C1 | 0 | 1 |
And the following "users" exist:
| username | firstname | lastname | email |
| teacher1 | Teacher | 1 | teacher1@asd.com |
| student1 | Student | 1 | student1@asd.com |
| student2 | Student | 2 | student2@asd.com |
| student3 | Student | 3 | student3@asd.com |
| student4 | Student | 4 | student4@asd.com |
And the following "course enrolments" exist:
| user | course | role |
| teacher1 | C1 | editingteacher |
| student1 | C1 | student |
| student2 | C1 | student |
| student3 | C1 | student |
| student4 | C1 | student |
And the following "groups" exist:
| name | course | idnumber |
| Group 1 | C1 | G1 |
And the following "group members" exist:
| user | group |
| student1 | G1 |
| student2 | G1 |
And I log in as "teacher1"
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 |
| Group mode | No groups |
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 first submission |
And I press "Save changes"
And I log out
And I log in as "teacher1"
And I follow "Course 1"
And I follow "Test assignment name"
When I follow "View/grade all submissions"
Then "Student 1" row "Status" column of "generaltable" table should contain "Submitted for grading"
And "Student 2" row "Status" column of "generaltable" table should contain "Submitted for grading"
And "Student 3" row "Status" column of "generaltable" table should not contain "Submitted for grading"
And "Student 4" row "Status" column of "generaltable" table should not contain "Submitted for grading"
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 first submission |
And I press "Save changes"
And I log out
And I log in as "teacher1"
And I follow "Course 1"
And I follow "Test assignment name"
And I follow "View/grade all submissions"
And "Student 1" row "Status" column of "generaltable" table should contain "Submitted for grading"
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"