mirror of
https://github.com/moodle/moodle.git
synced 2025-03-14 04:30:15 +01:00
Merge branch 'MDL-58628-master' of git://github.com/jleyva/moodle
This commit is contained in:
commit
aabee00d58
@ -110,7 +110,11 @@ class mod_quiz_external extends external_api {
|
||||
|
||||
$quizdetails['introfiles'] = external_util::get_area_files($context->id, 'mod_quiz', 'intro', false, false);
|
||||
$viewablefields = array('timeopen', 'timeclose', 'grademethod', 'section', 'visible', 'groupmode',
|
||||
'groupingid');
|
||||
'groupingid', 'attempts', 'timelimit', 'grademethod', 'decimalpoints',
|
||||
'questiondecimalpoints', 'sumgrades', 'grade', 'preferredbehaviour');
|
||||
// Some times this function returns just empty.
|
||||
$hasfeedback = quiz_has_feedback($quiz);
|
||||
$quizdetails['hasfeedback'] = (!empty($hasfeedback)) ? 1 : 0;
|
||||
|
||||
$timenow = time();
|
||||
$quizobj = quiz::create($quiz->id, $USER->id);
|
||||
@ -119,20 +123,15 @@ class mod_quiz_external extends external_api {
|
||||
|
||||
// Fields the user could see if have access to the quiz.
|
||||
if (!$accessmanager->prevent_access()) {
|
||||
// Some times this function returns just empty.
|
||||
$hasfeedback = quiz_has_feedback($quiz);
|
||||
$quizdetails['hasfeedback'] = (!empty($hasfeedback)) ? 1 : 0;
|
||||
$quizdetails['hasquestions'] = (int) $quizobj->has_questions();
|
||||
$quizdetails['autosaveperiod'] = get_config('quiz', 'autosaveperiod');
|
||||
|
||||
$additionalfields = array('timelimit', 'attempts', 'attemptonlast', 'grademethod', 'decimalpoints',
|
||||
'questiondecimalpoints', 'reviewattempt', 'reviewcorrectness', 'reviewmarks',
|
||||
$additionalfields = array('attemptonlast', 'reviewattempt', 'reviewcorrectness', 'reviewmarks',
|
||||
'reviewspecificfeedback', 'reviewgeneralfeedback', 'reviewrightanswer',
|
||||
'reviewoverallfeedback', 'questionsperpage', 'navmethod', 'sumgrades', 'grade',
|
||||
'reviewoverallfeedback', 'questionsperpage', 'navmethod',
|
||||
'browsersecurity', 'delay1', 'delay2', 'showuserpicture', 'showblocks',
|
||||
'completionattemptsexhausted', 'completionpass', 'overduehandling',
|
||||
'graceperiod', 'preferredbehaviour', 'canredoquestions',
|
||||
'allowofflineattempts');
|
||||
'graceperiod', 'canredoquestions', 'allowofflineattempts');
|
||||
$viewablefields = array_merge($viewablefields, $additionalfields);
|
||||
}
|
||||
|
||||
|
@ -192,15 +192,15 @@ class mod_quiz_external_testcase extends externallib_advanced_testcase {
|
||||
// Create what we expect to be returned when querying the two courses.
|
||||
// First for the student user.
|
||||
$allusersfields = array('id', 'coursemodule', 'course', 'name', 'intro', 'introformat', 'introfiles', 'timeopen',
|
||||
'timeclose', 'grademethod', 'section', 'visible', 'groupmode', 'groupingid');
|
||||
$userswithaccessfields = array('timelimit', 'attempts', 'attemptonlast', 'grademethod', 'decimalpoints',
|
||||
'questiondecimalpoints', 'reviewattempt', 'reviewcorrectness', 'reviewmarks',
|
||||
'timeclose', 'grademethod', 'section', 'visible', 'groupmode', 'groupingid',
|
||||
'attempts', 'timelimit', 'grademethod', 'decimalpoints', 'questiondecimalpoints', 'sumgrades',
|
||||
'grade', 'preferredbehaviour', 'hasfeedback');
|
||||
$userswithaccessfields = array('attemptonlast', 'reviewattempt', 'reviewcorrectness', 'reviewmarks',
|
||||
'reviewspecificfeedback', 'reviewgeneralfeedback', 'reviewrightanswer',
|
||||
'reviewoverallfeedback', 'questionsperpage', 'navmethod', 'sumgrades', 'grade',
|
||||
'reviewoverallfeedback', 'questionsperpage', 'navmethod',
|
||||
'browsersecurity', 'delay1', 'delay2', 'showuserpicture', 'showblocks',
|
||||
'completionattemptsexhausted', 'completionpass', 'autosaveperiod', 'hasquestions',
|
||||
'hasfeedback', 'overduehandling', 'graceperiod', 'preferredbehaviour', 'canredoquestions',
|
||||
'allowofflineattempts');
|
||||
'overduehandling', 'graceperiod', 'canredoquestions', 'allowofflineattempts');
|
||||
$managerfields = array('shuffleanswers', 'timecreated', 'timemodified', 'password', 'subnet');
|
||||
|
||||
// Add expected coursemodule and other data.
|
||||
|
Loading…
x
Reference in New Issue
Block a user