Merge branch 'MDL-59133-master' of git://github.com/jleyva/moodle

diff --git a/mod/lesson/classes/external.php b/mod/lesson/classes/external.php
index 7763d6e..1e53c1c 100644 (file)
--- a/mod/lesson/classes/external.php
+++ b/mod/lesson/classes/external.php
@@ -1814,6 +1814,10 @@ class mod_lesson_external extends external_api {
         }
 
         list($answerpages, $userstats) = lesson_get_user_detailed_report_data($lesson, $userid, $params['lessonattempt']);
+        // Convert page object to page record.
+        foreach ($answerpages as $answerp) {
+            $answerp->page = self::get_page_fields($answerp->page);
+        }
 
         $result = array(
             'answerpages' => $answerpages,
@@ -1835,6 +1839,7 @@ class mod_lesson_external extends external_api {
                 'answerpages' => new external_multiple_structure(
                     new external_single_structure(
                         array(
+                            'page' => self::get_page_structure(VALUE_OPTIONAL),
                             'title' => new external_value(PARAM_RAW, 'Page title.'),
                             'contents' => new external_value(PARAM_RAW, 'Page contents.'),
                             'qtype' => new external_value(PARAM_TEXT, 'Identifies the page type of this page.'),

diff --git a/mod/lesson/locallib.php b/mod/lesson/locallib.php
index 8c32a2d..e0b143b 100644 (file)
--- a/mod/lesson/locallib.php
+++ b/mod/lesson/locallib.php
@@ -1078,6 +1078,8 @@ function lesson_get_user_detailed_report_data(lesson $lesson, $userid, $attempt)
     while ($pageid != 0) { // EOL
         $page = $lessonpages[$pageid];
         $answerpage = new stdClass;
+        // Keep the original page object.
+        $answerpage->page = $page;
         $data ='';
 
         $answerdata = new stdClass;

diff --git a/mod/lesson/tests/external_test.php b/mod/lesson/tests/external_test.php
index 3131639..64c5be9 100644 (file)
--- a/mod/lesson/tests/external_test.php
+++ b/mod/lesson/tests/external_test.php
@@ -1217,6 +1217,14 @@ class mod_lesson_external_testcase extends externallib_advanced_testcase {
         $this->assertEquals(1, $result['userstats']['gradeinfo']['total']);     // Total correct answers.
         $this->assertEquals(100, $result['userstats']['gradeinfo']['grade']);   // Correct answer.
 
+        // Check page object contains the lesson pages answered.
+        $pagesanswered = array();
+        foreach ($result['answerpages'] as $answerp) {
+            $pagesanswered[] = $answerp['page']['id'];
+        }
+        sort($pagesanswered);
+        $this->assertEquals(array($this->page1->id, $this->page2->id), $pagesanswered);
+
         // Test second attempt unfinished.
         $result = mod_lesson_external::get_user_attempt($this->lesson->id, $this->student->id, 1);
         $result = external_api::clean_returnvalue(mod_lesson_external::get_user_attempt_returns(), $result);

diff --git a/mod/lesson/upgrade.txt b/mod/lesson/upgrade.txt
index 79cc01a..9372654 100644 (file)
--- a/mod/lesson/upgrade.txt
+++ b/mod/lesson/upgrade.txt
@@ -1,5 +1,9 @@
 This files describes API changes in the lesson code.
 
+=== 3.4 ===
+
+* External function mod_lesson_external::get_user_attempt() now returns the full page object inside each answerpages.
+
 === 3.3 ===
 
 * lesson::callback_on_view() has an additional optional parameter $redirect default to true.