mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-03-19 23:20:09 +01:00
Code Issues Projects Releases Wiki Activity

Merge branch 'MDL-47232_master' of https://github.com/dmonllao/moodle

Browse Source
This commit is contained in:
Andrew Nicols 2015-01-13 11:43:43 +08:00 committed by Dan Poltawski
commit 2ae73817f4
2 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
completion/criteria/completion_criteria_activity.php
View File

@ -147,7 +147,7 @@ class completion_criteria_activity extends completion_criteria {
$data = $info->get_data($cm, false, $completion->userid);
// If the activity is complete
if (in_array($data->completionstate, array(COMPLETION_COMPLETE, COMPLETION_COMPLETE_PASS))) {
if (in_array($data->completionstate, array(COMPLETION_COMPLETE, COMPLETION_COMPLETE_PASS, COMPLETION_COMPLETE_FAIL))) {
if ($mark) {
$completion->mark_complete();
}
@ -229,6 +229,7 @@ class completion_criteria_activity extends completion_criteria {
AND (
mc.completionstate = '.COMPLETION_COMPLETE.'
OR mc.completionstate = '.COMPLETION_COMPLETE_PASS.'
OR mc.completionstate = '.COMPLETION_COMPLETE_FAIL.'
)
';

7
completion/upgrade.txt Normal file
View File

@ -0,0 +1,7 @@
This files describes API changes in /completion/* - completion,
information provided here is intended especially for developers.
=== 2.9 ===
* A completed and failed activity counts as a completed activity for
course completion.