forked from moodle/moodle
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'MDL-42190-master-workshopdelsub' of git://github.com/mu…
…drd8mz/moodle
- Loading branch information
Showing
6 changed files
with
306 additions
and
19 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,111 @@ | ||
| <?php | ||
| // This file is part of Moodle - http://moodle.org/ | ||
| // | ||
| // Moodle is free software: you can redistribute it and/or modify | ||
| // it under the terms of the GNU General Public License as published by | ||
| // the Free Software Foundation, either version 3 of the License, or | ||
| // (at your option) any later version. | ||
| // | ||
| // Moodle is distributed in the hope that it will be useful, | ||
| // but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
| // GNU General Public License for more details. | ||
| // | ||
| // You should have received a copy of the GNU General Public License | ||
| // along with Moodle. If not, see <http://www.gnu.org/licenses/>. | ||
|
|
||
| /** | ||
| * The mod_workshop submission deleted event. | ||
| * | ||
| * @package mod_workshop | ||
| * @copyright 2015 Paul Nicholls | ||
| * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later | ||
| */ | ||
|
|
||
| namespace mod_workshop\event; | ||
| defined('MOODLE_INTERNAL') || die(); | ||
|
|
||
| /** | ||
| * The mod_workshop submission deleted event class. | ||
| * | ||
| * @property-read array $other { | ||
| * Extra information about the event. | ||
| * | ||
| * - string submissiontitle: (optional) Submission title. | ||
| * } | ||
| * | ||
| * @package mod_workshop | ||
| * @since Moodle 3.1 | ||
| * @copyright 2015 Paul Nicholls | ||
| * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later | ||
| */ | ||
| class submission_deleted extends \core\event\base { | ||
|
|
||
| /** | ||
| * Init method. | ||
| */ | ||
| protected function init() { | ||
| $this->data['crud'] = 'd'; | ||
| $this->data['edulevel'] = self::LEVEL_PARTICIPATING; | ||
| $this->data['objecttable'] = 'workshop_submissions'; | ||
| } | ||
|
|
||
| /** | ||
| * Returns non-localised description of what happened. | ||
| * | ||
| * @return string | ||
| */ | ||
| public function get_description() { | ||
| return "The user with id '$this->userid' deleted the submission with id '$this->objectid' for the workshop " . | ||
| "with course module id '$this->contextinstanceid'."; | ||
| } | ||
|
|
||
| /** | ||
| * Returns localised general event name. | ||
| * | ||
| * @return string | ||
| */ | ||
| public static function get_name() { | ||
| return get_string('eventsubmissiondeleted', 'workshop'); | ||
| } | ||
|
|
||
| /** | ||
| * Returns relevant URL. | ||
| * | ||
| * @return \moodle_url | ||
| */ | ||
| public function get_url() { | ||
| return new \moodle_url('/mod/workshop/submission.php', | ||
| array('cmid' => $this->contextinstanceid, 'id' => $this->objectid)); | ||
| } | ||
|
|
||
| /** | ||
| * Replace add_to_log() statement. | ||
| * | ||
| * @return array of parameters to be passed to legacy add_to_log() function. | ||
| */ | ||
| protected function get_legacy_logdata() { | ||
| return array($this->courseid, 'workshop', 'delete submission', | ||
| 'submission.php?cmid=' . $this->contextinstanceid . '&id=' . $this->objectid, | ||
| $this->objectid, $this->contextinstanceid); | ||
| } | ||
|
|
||
| /** | ||
| * Defines mapping of the 'objectid' property when restoring course logs. | ||
| * | ||
| * @return array | ||
| */ | ||
| public static function get_objectid_mapping() { | ||
| return array('db' => 'workshop_submissions', 'restore' => 'workshop_submission'); | ||
| } | ||
|
|
||
| /** | ||
| * Defines mapping of the 'other' property when restoring course logs. | ||
| * | ||
| * @return array|bool | ||
| */ | ||
| public static function get_other_mapping() { | ||
| // Nothing to map. | ||
| return false; | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,106 @@ | ||
| @mod @mod_workshop | ||
| Feature: Workshop submission removal | ||
| In order to get rid of accidentally submitted or otherwise inappropriate contents | ||
| As a student and as a teacher | ||
| I need to be able to delete my submission, or any submission respectively | ||
|
|
||
| Background: | ||
| Given the following "users" exist: | ||
| | username | firstname | lastname | email | | ||
| | student1 | Sam1 | Student1 | student1@example.com | | ||
| | student2 | Sam2 | Student2 | student2@example.com | | ||
| | student3 | Sam3 | Student3 | student3@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 | | ||
| | student3 | c1 | student | | ||
| | teacher1 | c1 | editingteacher | | ||
| And the following "activities" exist: | ||
| | activity | name | intro | course | idnumber | | ||
| | workshop | TestWorkshop | Test workshop description | c1 | workshop1 | | ||
| # Teacher sets up assessment form and changes the phase to submission. | ||
| And I log in as "teacher1" | ||
| And I follow "Course1" | ||
| And I edit assessment form in workshop "TestWorkshop" as:" | ||
| | id_description__idx_0_editor | Aspect1 | | ||
| | id_description__idx_1_editor | Aspect2 | | ||
| | id_description__idx_2_editor | | | ||
| And I change phase in workshop "TestWorkshop" to "Submission phase" | ||
| And I log out | ||
| # Student1 submits. | ||
| And I log in as "student1" | ||
| And I follow "Course1" | ||
| And I follow "TestWorkshop" | ||
| And I add a submission in workshop "TestWorkshop" as:" | ||
| | Title | Submission1 | | ||
| | Submission content | Some content | | ||
| And I log out | ||
| # Student2 submits. | ||
| And I log in as "student2" | ||
| And I follow "Course1" | ||
| And I add a submission in workshop "TestWorkshop" as:" | ||
| | Title | Submission2 | | ||
| | Submission content | Some content | | ||
| And I log out | ||
| # Teacher allocates student3 to be reviewer of student2's submission. | ||
| And I log in as "teacher1" | ||
| And I follow "Course1" | ||
| And I follow "TestWorkshop" | ||
| And I allocate submissions in workshop "TestWorkshop" as:" | ||
| | Participant | Reviewer | | ||
| | Sam2 Student2 | Sam3 Student3 | | ||
| And I log out | ||
|
|
||
| Scenario: Students can delete their submissions as long as the submissions are editable and not allocated for assessments | ||
| Given I log in as "student1" | ||
| And I follow "Course1" | ||
| And I follow "TestWorkshop" | ||
| When I follow "My submission" | ||
| Then I should see "Submission1" | ||
| And "Delete submission" "button" should exist | ||
| And I click on "Delete submission" "button" | ||
| And I should see "Are you sure you want to delete the following submission?" | ||
| And I should see "Submission1" | ||
| And I click on "Continue" "button" | ||
| And I should see "You have not submitted your work yet" | ||
|
|
||
| Scenario: Students cannot delete their submissions if the submissions are not editable | ||
| Given I log in as "teacher1" | ||
| And I follow "Course1" | ||
| And I follow "TestWorkshop" | ||
| And I change phase in workshop "TestWorkshop" to "Closed" | ||
| And I log out | ||
| And I log in as "student1" | ||
| And I follow "Course1" | ||
| And I follow "TestWorkshop" | ||
| When I follow "My submission" | ||
| Then I should see "Submission1" | ||
| And "Delete submission" "button" should not exist | ||
|
|
||
| Scenario: Students cannot delete their submissions if the submissions are allocated for assessments | ||
| Given I log in as "student2" | ||
| And I follow "Course1" | ||
| And I follow "TestWorkshop" | ||
| When I follow "My submission" | ||
| Then I should see "Submission2" | ||
| And "Delete submission" "button" should not exist | ||
|
|
||
| Scenario: Teachers can delete submissions even if the submissions are allocated for assessments. | ||
| Given I log in as "teacher1" | ||
| And I follow "Course1" | ||
| And I follow "TestWorkshop" | ||
| And "Submission1" "link" should exist | ||
| And "Submission2" "link" should exist | ||
| When I follow "Submission2" | ||
| Then "Delete submission" "button" should exist | ||
| And I click on "Delete submission" "button" | ||
| And I should see "Are you sure you want to delete the following submission?" | ||
| And I should see "Note this will also delete 1 assessments associated with this submission, which may affect the reviewers' grades." | ||
| And I click on "Continue" "button" | ||
| And "Submission1" "link" should exist | ||
| And "Submission2" "link" should not exist |
Oops, something went wrong.