Merge branch 'master' into Nicosoft-patch-1

classes/log/store.php

@@ -154,10 +154,12 @@ class store extends php_obj implements log_writer {
         $sentevents = [];
         foreach ($eventbatches as $translatoreventsbatch) {
             $xapievents = $xapicontroller->create_events($translatoreventsbatch);
-            foreach (array_keys($xapievents) as $key) {
+            $statements = $xapievents['statements'];
+            $response = $xapievents['response'];
+            foreach (array_keys($statements) as $key) {
                 if (is_numeric($key)) {
-                    $k = $xapievents[$key]['context']['extensions'][$translatoreventreadreturn[0]['context_ext_key']]['id'];
-                    $sentevents[$k] = $xapievents['last_action_result'];
+                    $k = $statements[$key]['context']['extensions'][$translatoreventreadreturn[0]['context_ext_key']]['id'];
+                    $sentevents[$k] = $this->getlast_action_result($response);
                 }
             }
             $this->error_log_value('xapievents', $xapievents);
@@ -166,6 +168,19 @@ class store extends php_obj implements log_writer {
         return $sentevents;
     }
 
+    /**
+     * Get last action result from Learning Locker.
+     * @param Object TinCan\LRSResponse
+     *
+     */
+    private function getlast_action_result($response) {
+        if ($response->success == 1) {
+            return "success";
+        } else {
+            return "failure";
+        }
+    }
+
     private function error_log_value($key, $value) {
         $this->error_log('['.$key.'] '.json_encode($value));
     }

classes/task/emit_task.php

@@ -53,6 +53,7 @@ class emit_task extends \core\task\scheduled_task {
         foreach (array_keys($storereturn) as $eventid) {
             if ($storereturn[$eventid] == 'success') {
                 $DB->delete_records_list('logstore_xapi_log', 'id', array($eventid));
+                mtrace("Event id ".$eventid." has been successfully sent to LRS.");
             }
         }