mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-04-25 10:26:17 +02:00
Code Issues Projects Releases Wiki Activity

Merge branch 'MDL-60991' of https://github.com/mkassaei/moodle

Browse Source
This commit is contained in:
Jake Dallimore 2018-03-07 09:29:54 +08:00
commit 98aaa343f1
2 changed files with 95 additions and 4 deletions

13
mod/workshop/locallib.php

@ -3694,10 +3694,15 @@ class workshop_user_plan implements renderable {
$phase->tasks['submissionenddatetime'] = $task;
}
if (($workshop->submissionstart < time()) and $workshop->latesubmissions) {
$task = new stdclass();
$task->title = get_string('latesubmissionsallowed', 'workshop');
$task->completed = 'info';
$phase->tasks['latesubmissionsallowed'] = $task;
// If submission deadline has passed and late submissions are allowed, only display 'latesubmissionsallowed' text to
// users (students) who have not submitted and users(teachers, admins) who can switch pahase..
if (has_capability('mod/workshop:switchphase', $workshop->context, $userid) ||
(!$workshop->get_submission_by_author($userid) && $workshop->submissionend < time())) {
$task = new stdclass();
$task->title = get_string('latesubmissionsallowed', 'workshop');
$task->completed = 'info';
$phase->tasks['latesubmissionsallowed'] = $task;
}
}
if (isset($phase->tasks['submissionstartdatetime']) or isset($phase->tasks['submissionenddatetime'])) {
if (has_capability('mod/workshop:ignoredeadlines', $workshop->context, $userid)) {

86
mod/workshop/tests/behat/workshop_late_submission.feature Normal file

@ -0,0 +1,86 @@
@mod @mod_workshop
Feature: Workshop 'Late submissions are allowed' task
In order to encourage students submit their submissions on time when late submissions are allowed
We want only students who have not submitted their work to see the 'Late submissions are allowed' task
and they can only see this after the submission deadline.
Background:
Given the following "users" exist:
| username | firstname | lastname | email |
| student1 | Sam1 | Student1 | student1@example.com |
| student2 | Sam2 | Student2 | student2@example.com |
| teacher1 | Terry1 | Teacher1 | teacher1@example.com |
And the following "courses" exist:
| fullname | shortname |
| Course1 | c1 |
And the following "course enrolments" exist:
| user | course | role |
| student1 | c1 | student |
| student2 | c1 | student |
| teacher1 | c1 | editingteacher |
And the following "activities" exist:
| activity | name | intro | course | idnumber | latesubmissions | submisstionstart | submissionend |
| workshop | TestWorkshop1 | TW3 with Submission deadline in future (1 Jan 2030)| c1 | workshop1 | 1 | 1514904308 | 1893369600 |
# Teacher sets up assessment form and changes the phase to submission.
And I log in as "teacher1"
And I am on "Course1" course homepage
And I follow "TestWorkshop1"
And I edit assessment form in workshop "TestWorkshop1" as:"
| id_description__idx_0_editor | Aspect1 |
| id_description__idx_1_editor | Aspect2 |
| id_description__idx_2_editor | Aspect3 |
And I change phase in workshop "TestWorkshop1" to "Submission phase"
And I log out
@javascript
Scenario: Student1 add his submission to TestWorkshop1 before submission deadline, but student2 does not submitt
# Student1 submits.
Given I log in as "student1"
And I am on "Course1" course homepage
When I follow "TestWorkshop1"
Then I should see "Submissions deadline:"
And I should not see "Late submissions are allowed"
And I add a submission in workshop "TestWorkshop1" as:"
| Title | Submission from s1 |
| Submission content | Some content from student1 |
And I log out
# Teacher modifies submission deadline.
Given I log in as "teacher1"
And I am on "Course1" course homepage
When I follow "TestWorkshop1"
Then I should see "Late submissions are allowed"
And I navigate to "Edit settings" in current page administration
And I follow "Expand all"
And I set the field "id_submissionend_day" to "1"
And I set the field "id_submissionend_month" to "January"
And I set the field "id_submissionend_year" to "2018"
And I click on "Save and display" "button"
And I follow "Switch to the assessment phase"
And I log out
# Student1 has already submitted and cannot see 'Late submissions are allowed'.
Given I log in as "student1"
And I am on "Course1" course homepage
When I follow "TestWorkshop1"
Then I should see "Submissions deadline:"
And I should not see "Late submissions are allowed"
And I log out
# Student2 has not submitted yet who can see 'Late submissions are allowed' text after the submission deadline.
Given I log in as "student2"
And I am on "Course1" course homepage
When I follow "TestWorkshop1"
Then I should see "Submissions deadline:"
And I should see "Monday, 1 January 2018"
And I should see "Late submissions are allowed"
And I log out
# Teacher can see 'Late submissions are allowed' text after submission deadline.
Given I log in as "teacher1"
And I am on "Course1" course homepage
When I follow "TestWorkshop1"
Then I should see "Submissions deadline:"
And I should see "Monday, 1 January 2018"
And I should see "Late submissions are allowed"
And I log out