mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-03-14 12:40:01 +01:00
Code Issues Projects Releases Wiki Activity

Merge branch 'wip-MDL-58666-master' of git://github.com/marinaglancy/moodle

Browse Source
This commit is contained in:
David Monllao 2017-04-24 11:47:56 +08:00
commit ac44bda247
9 changed files with 20 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
mod/choice/lib.php
View File

@ -1242,12 +1242,13 @@ function choice_get_coursemodule_info($coursemodule) {
global $DB;
$dbparams = ['id' => $coursemodule->instance];
$fields = 'id, completionsubmit';
$fields = 'id, name, completionsubmit';
if (!$choice = $DB->get_record('choice', $dbparams, $fields)) {
return false;
}
$result = new cached_cm_info();
$result->name = $choice->name;
// Populate the custom completion rules as key => value pairs, but only if the completion mode is 'automatic'.
if ($coursemodule->completion == COMPLETION_TRACKING_AUTOMATIC) {

3
mod/data/lib.php
View File

@ -4336,12 +4336,13 @@ function data_get_coursemodule_info($coursemodule) {
global $DB;
$dbparams = ['id' => $coursemodule->instance];
$fields = 'id, completionentries';
$fields = 'id, name, completionentries';
if (!$data = $DB->get_record('data', $dbparams, $fields)) {
return false;
}
$result = new cached_cm_info();
$result->name = $data->name;
// Populate the custom completion rules as key => value pairs, but only if the completion mode is 'automatic'.
if ($coursemodule->completion == COMPLETION_TRACKING_AUTOMATIC) {

3
mod/feedback/lib.php
View File

@ -3492,12 +3492,13 @@ function feedback_get_coursemodule_info($coursemodule) {
global $DB;
$dbparams = ['id' => $coursemodule->instance];
$fields = 'id, completionsubmit';
$fields = 'id, name, completionsubmit';
if (!$feedback = $DB->get_record('feedback', $dbparams, $fields)) {
return false;
}
$result = new cached_cm_info();
$result->name = $feedback->name;
// Populate the custom completion rules as key => value pairs, but only if the completion mode is 'automatic'.
if ($coursemodule->completion == COMPLETION_TRACKING_AUTOMATIC) {

3
mod/forum/lib.php
View File

@ -8244,12 +8244,13 @@ function forum_get_coursemodule_info($coursemodule) {
global $DB;
$dbparams = ['id' => $coursemodule->instance];
$fields = 'id, completionposts, completiondiscussions, completionreplies';
$fields = 'id, name, completionposts, completiondiscussions, completionreplies';
if (!$forum = $DB->get_record('forum', $dbparams, $fields)) {
return false;
}
$result = new cached_cm_info();
$result->name = $forum->name;
// Populate the custom completion rules as key => value pairs, but only if the completion mode is 'automatic'.
if ($coursemodule->completion == COMPLETION_TRACKING_AUTOMATIC) {

7
mod/glossary/lib.php
View File

@ -4220,16 +4220,17 @@ function glossary_get_coursemodule_info($coursemodule) {
global $DB;
$dbparams = ['id' => $coursemodule->instance];
$fields = 'id, completionentries';
if (!$choice = $DB->get_record('glossary', $dbparams, $fields)) {
$fields = 'id, name, completionentries';
if (!$glossary = $DB->get_record('glossary', $dbparams, $fields)) {
return false;
}
$result = new cached_cm_info();
$result->name = $glossary->name;
// Populate the custom completion rules as key => value pairs, but only if the completion mode is 'automatic'.
if ($coursemodule->completion == COMPLETION_TRACKING_AUTOMATIC) {
$result->customdata['customcompletionrules']['completionentries'] = $choice->completionentries;
$result->customdata['customcompletionrules']['completionentries'] = $glossary->completionentries;
}
return $result;

3
mod/lesson/lib.php
View File

@ -1665,12 +1665,13 @@ function lesson_get_coursemodule_info($coursemodule) {
global $DB;
$dbparams = ['id' => $coursemodule->instance];
$fields = 'id, completionendreached, completiontimespent';
$fields = 'id, name, completionendreached, completiontimespent';
if (!$lesson = $DB->get_record('lesson', $dbparams, $fields)) {
return false;
}
$result = new cached_cm_info();
$result->name = $lesson->name;
// Populate the custom completion rules as key => value pairs, but only if the completion mode is 'automatic'.
if ($coursemodule->completion == COMPLETION_TRACKING_AUTOMATIC) {

3
mod/quiz/lib.php
View File

@ -2178,12 +2178,13 @@ function quiz_get_coursemodule_info($coursemodule) {
global $DB;
$dbparams = ['id' => $coursemodule->instance];
$fields = 'id, completionattemptsexhausted, completionpass';
$fields = 'id, name, completionattemptsexhausted, completionpass';
if (!$quiz = $DB->get_record('quiz', $dbparams, $fields)) {
return false;
}
$result = new cached_cm_info();
$result->name = $quiz->name;
// Populate the custom completion rules as key => value pairs, but only if the completion mode is 'automatic'.
if ($coursemodule->completion == COMPLETION_TRACKING_AUTOMATIC) {

3
mod/scorm/lib.php
View File

@ -1660,12 +1660,13 @@ function scorm_get_coursemodule_info($coursemodule) {
global $DB;
$dbparams = ['id' => $coursemodule->instance];
$fields = 'id, completionstatusrequired, completionscorerequired, completionstatusallscos';
$fields = 'id, name, completionstatusrequired, completionscorerequired, completionstatusallscos';
if (!$scorm = $DB->get_record('scorm', $dbparams, $fields)) {
return false;
}
$result = new cached_cm_info();
$result->name = $scorm->name;
// Populate the custom completion rules as key => value pairs, but only if the completion mode is 'automatic'.
if ($coursemodule->completion == COMPLETION_TRACKING_AUTOMATIC) {

3
mod/survey/lib.php
View File

@ -1161,12 +1161,13 @@ function survey_get_coursemodule_info($coursemodule) {
global $DB;
$dbparams = ['id' => $coursemodule->instance];
$fields = 'id, completionsubmit';
$fields = 'id, name, completionsubmit';
if (!$survey = $DB->get_record('survey', $dbparams, $fields)) {
return false;
}
$result = new cached_cm_info();
$result->name = $survey->name;
// Populate the custom completion rules as key => value pairs, but only if the completion mode is 'automatic'.
if ($coursemodule->completion == COMPLETION_TRACKING_AUTOMATIC) {