Merge pull request #573 from LearningLocker/develop

v1.3.9

Author: ryasmi

VERSION

@@ -1 +1 @@
-1.3.8
+1.3.9

app/controllers/LrsController.php

@@ -2,7 +2,6 @@
 
 use Locker\Repository\Lrs\LrsRepository as Lrs;
 use Locker\Repository\Statement\StatementRepository as Statement;
-use Locker\Data\Analytics\AnalyticsInterface;
 
 class LrsController extends BaseController {
 
@@ -11,11 +10,6 @@ class LrsController extends BaseController {
   */
   protected $lrs;
 
-  /**
-  * Analytics
-  */
-  protected $analytics;
-
   /**
    * Statements
    **/
@@ -26,14 +20,12 @@ class LrsController extends BaseController {
    * Construct
    *
    * @param Locker\Repository\Lrs\LrsRepository
-   * @param Locker\Data\AnalyticsInterface
    * @param Locker\Repository\StatementRepository
    *
    */
-  public function __construct(Lrs $lrs, AnalyticsInterface $analytics, Statement $statement){
+  public function __construct(Lrs $lrs, Statement $statement){
 
     $this->lrs       = $lrs;
-    $this->analytics = $analytics;
     $this->statement = $statement;
 
     $this->beforeFilter('auth');

app/controllers/api/Analytics.php

@@ -2,14 +2,13 @@
 
 use \Locker\Data\Analytics\AnalyticsInterface as AnalyticsData;
 use \LockerRequest as LockerRequest;
-use \Locker\Helpers\Exceptions as Exceptions;
 
 class Analytics extends Base {
   protected $analytics;
 
   /**
    * Constructs a new AnalyticsController.
-   * @param Analytics $analytics
+   * @param AnalyticsData $analytics
    */
   public function __construct(AnalyticsData $analytics) {
     parent::__construct();
@@ -18,12 +17,7 @@ public function __construct(AnalyticsData $analytics) {
 
   // http://docs.learninglocker.net/analytics_api/
   public function index() {
-    $data = $this->analytics->analytics($this->lrs->_id, LockerRequest::getParams());
-
-    if ($data['success'] == false) throw new Exceptions\Exception(
-      trans('apps.no_data')
-    );
-
-    return $this->returnJson($data['data']['result']);
+    $data = $this->analytics->timedGrouping($this->lrs->_id, LockerRequest::getParams());
+    return $this->returnJson($data);
   }
-}
+}

app/controllers/api/Base.php

@@ -11,7 +11,7 @@
 use \Lrs as Lrs;
 use \Client as Client;
 
-abstract class Base extends Controller {
+class Base extends Controller {
 
   /**
    * Constructs a new base controller.
@@ -45,7 +45,7 @@ protected function returnJson($data) {
       'debug' => !Config::get('app.debug') ? trans('api.info.trace') : DB::getQueryLog()
     ]);
   }
-  
+
   /**
    * Get the LRS details based on Auth credentials
    **/
@@ -64,9 +64,9 @@ public function getLrs() {
         throw new Exceptions\Exception('Unauthorized request.', 401);
       }
     }
-		   
+
     $this->lrs = $lrs;
   }
 
 
-}
+}

app/controllers/api/Statements.php

@@ -1,6 +1,5 @@
 <?php namespace Controllers\API;
 
-use \Locker\Data\Analytics\AnalyticsInterface as AnalyticsData;
 use \Locker\Repository\Query\QueryRepository as QueryRepository;
 use \Locker\Helpers\Exceptions as Exceptions;
 
@@ -9,12 +8,9 @@ class Statements extends Base {
 
   /**
    * Constructs a new StatementController.
-   * @param Document $document
-   * @param Activity $activity
    */
-  public function __construct(AnalyticsData $analytics, QueryRepository $query) {
+  public function __construct(QueryRepository $query) {
     parent::__construct();
-    $this->analytics = $analytics;
     $this->query = $query;
   }
 
@@ -40,7 +36,7 @@ public function aggregate() {
       \LockerRequest::getParam('pipeline'),
       true
     ) ?: [['match' => []]];
-    return \Response::json($this->query->aggregate($this->lrs->_id, $pipeline)); 
+    return \Response::json($this->query->aggregate($this->lrs->_id, $pipeline));
   }
 
   /**
@@ -75,17 +71,12 @@ public function aggregateObject() {
   public function index(){
     $section = json_decode(LockerRequest::getParam('sections', '[]'));
 
-    $data = $this->analytics->analytics(
+    $data = $this->analytics->statements(
       $this->lrs->_id,
       LockerRequest::getParams(),
-      'statements',
       $section
     );
 
-    if ($data['success'] == false) {
-      throw new Exceptions\Exception(trans('apps.no_data'));
-    }
-
-    return $this->returnJson($data['data']);
+    return $this->returnJson($data);
   }
-}
+}