forked from moodle/moodle
-
Notifications
You must be signed in to change notification settings - Fork 1
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
MDL-71252 completion: Avoid showing the 'Mark as done' button
The following activites will be applied: - Label - File (Force download/Open/In pop-up) - URL (Open/In pop-up)
- Loading branch information
Showing
15 changed files
with
539 additions
and
10 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
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
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,63 @@ | ||
@mod @mod_assign @core_completion | ||
Feature: View activity completion information in the Assign resource | ||
In order to have visibility of assign completion requirements | ||
As a student | ||
I need to be able to view my assign completion progress | ||
|
||
Background: | ||
Given the following "users" exist: | ||
| username | firstname | lastname | email | | ||
| student1 | Vinnie | Student1 | student1@example.com | | ||
| teacher1 | Darrell | Teacher1 | teacher1@example.com | | ||
And the following "courses" exist: | ||
| fullname | shortname | category | | ||
| Course 1 | C1 | 0 | | ||
And the following "course enrolments" exist: | ||
| user | course | role | | ||
| student1 | C1 | student | | ||
| teacher1 | C1 | editingteacher | | ||
And I log in as "teacher1" | ||
|
||
@javascript | ||
Scenario: The manual completion button will be shown on the course page if the Show completion conditions is set to Yes | ||
Given I am on "Course 1" course homepage with editing mode on | ||
And I navigate to "Edit settings" in current page administration | ||
And I expand all fieldsets | ||
And I set the following fields to these values: | ||
| Enable completion tracking | Yes | | ||
| Show completion conditions | Yes | | ||
And I press "Save and display" | ||
And I add a "Assignment" to section "1" and I fill the form with: | ||
| Assignment name | History of ants | | ||
| Completion tracking | Students can manually mark the activity as completed | | ||
# Teacher view. | ||
And the manual completion button for "History of ants" should exist | ||
And the manual completion button for "History of ants" should be disabled | ||
And I log out | ||
# Student view. | ||
When I log in as "student1" | ||
And I am on "Course 1" course homepage | ||
Then the manual completion button for "History of ants" should exist | ||
And the manual completion button of "History of ants" is displayed as "Mark as done" | ||
And I toggle the manual completion state of "History of ants" | ||
And the manual completion button of "History of ants" is displayed as "Done" | ||
|
||
@javascript | ||
Scenario: The manual completion button will not be shown on the course page if the Show completion conditions is set to No | ||
Given I am on "Course 1" course homepage with editing mode on | ||
And I navigate to "Edit settings" in current page administration | ||
And I expand all fieldsets | ||
And I set the following fields to these values: | ||
| Enable completion tracking | Yes | | ||
| Show completion conditions | No | | ||
And I press "Save and display" | ||
And I add a "Assignment" to section "1" and I fill the form with: | ||
| Assignment name | History of ants | | ||
| Completion tracking | Students can manually mark the activity as completed | | ||
# Teacher view. | ||
And the manual completion button for "History of ants" should not exist | ||
And I log out | ||
# Student view. | ||
When I log in as "student1" | ||
And I am on "Course 1" course homepage | ||
Then the manual completion button for "History of ants" should not exist |
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,73 @@ | ||
<?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/>. | ||
|
||
declare(strict_types=1); | ||
|
||
namespace mod_label\completion; | ||
|
||
use core_completion\activity_custom_completion; | ||
|
||
/** | ||
* Activity custom completion subclass for the label. | ||
* | ||
* Class for defining mod_label's custom completion rules and fetching the completion statuses | ||
* of the custom completion rules for a given label instance and a user. | ||
* | ||
* @package mod_label | ||
* @copyright 2021 Huong Nguyen <[email protected]> | ||
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later | ||
*/ | ||
class custom_completion extends activity_custom_completion { | ||
|
||
/** | ||
* Fetches the completion state for a given completion rule. | ||
* | ||
* @param string $rule The completion rule. | ||
* @return int The completion state. | ||
*/ | ||
public function get_state(string $rule): int { | ||
return COMPLETION_UNKNOWN; | ||
} | ||
|
||
/** | ||
* Fetch the list of custom completion rules that this module defines. | ||
* | ||
* @return array | ||
*/ | ||
public static function get_defined_custom_rules(): array { | ||
// This activity/resource do not have any custom rules. | ||
return []; | ||
} | ||
|
||
/** | ||
* Returns an associative array of the descriptions of custom completion rules. | ||
* | ||
* @return array | ||
*/ | ||
public function get_custom_rule_descriptions(): array { | ||
// This activity/resource do not have any custom rule descriptions. | ||
return []; | ||
} | ||
|
||
/** | ||
* Show the manual completion or not regardless of the course's showcompletionconditions setting. | ||
* | ||
* @return bool | ||
*/ | ||
public function manual_completion_always_shown(): bool { | ||
return true; | ||
} | ||
} |
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,45 @@ | ||
@mod @mod_label @core_completion | ||
Feature: View activity completion information for the label | ||
In order to have visibility of Label completion requirements | ||
As a student | ||
I need to be able to view my Label completion progress | ||
|
||
Background: | ||
Given the following "users" exist: | ||
| username | firstname | lastname | email | | ||
| student1 | Vinnie | Student1 | student1@example.com | | ||
| teacher1 | Darrell | Teacher1 | teacher1@example.com | | ||
And the following "courses" exist: | ||
| fullname | shortname | category | | ||
| Course 1 | C1 | 0 | | ||
And the following "course enrolments" exist: | ||
| user | course | role | | ||
| student1 | C1 | student | | ||
| teacher1 | C1 | editingteacher | | ||
And I log in as "teacher1" | ||
And I am on "Course 1" course homepage | ||
And I navigate to "Edit settings" in current page administration | ||
And I expand all fieldsets | ||
And I set the following fields to these values: | ||
| Enable completion tracking | Yes | | ||
| Show completion conditions | No | | ||
And I press "Save and display" | ||
|
||
@javascript | ||
Scenario: The manual completion button will be shown on the course page if the Show completion conditions is set to No | ||
Given I am on "Course 1" course homepage with editing mode on | ||
When I add a "label" to section "1" and I fill the form with: | ||
| Label text | Swanky label | | ||
| Availability | Show on course page | | ||
| Completion tracking | Students can manually mark the activity as completed | | ||
# Teacher view. | ||
And the manual completion button for "Swanky label" should exist | ||
And the manual completion button for "Swanky label" should be disabled | ||
And I log out | ||
# Student view. | ||
When I log in as "student1" | ||
And I am on "Course 1" course homepage | ||
Then the manual completion button for "Swanky label" should exist | ||
And the manual completion button of "Swanky label" is displayed as "Mark as done" | ||
And I toggle the manual completion state of "Swanky label" | ||
And the manual completion button of "Swanky label" is displayed as "Done" |
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
Oops, something went wrong.