Merge branch 'develop' into issue/slow-counts

Author: ht2

.github/issue_template.md

@@ -0,0 +1,19 @@
+You need to replace the parts of this template where you see {{some text}}.
+
+**Version**
+{{branch}} at {{commit}} on {{version - found in your copy of the VERSION file}} 
+
+**Steps to reproduce the bug**
+1. {{step 1}}
+2. {{step 2}}
+
+**Expected behaviour**
+{{feature}} should be {{expectedResult}} because {{reason}}.
+
+**Actual behaviour**
+{{feature}} is {{actualResult}}.
+
+**Additional information**
+OS: {{operatingSystem}}
+Browser: {{browser}} version 1.0.1
+{{additionalInfo}}

.travis.yml

@@ -17,8 +17,9 @@ before_script:
   - sudo chmod -R 777 ./uploads
   - php artisan migrate --env="testing"
 
-script: ./vendor/bin/phpunit
-after_success: sh test.sh
+script:
+  - ./vendor/bin/phpunit
+  - sh test.sh
 
 notifications:
   slack:

app/controllers/LrsController.php

@@ -134,7 +134,6 @@ public function show($lrs_id) {
     $dashboard = new \app\locker\data\dashboards\LrsDashboard($lrs_id);
     return View::make('partials.lrs.dashboard', array_merge($this->getLrs($lrs_id), [
       'stats' => $dashboard->getStats(),
-      'graph_data' => $dashboard->getGraphData(),
       'dash_nav' => true,
       'client' => (new \Client)->where('lrs_id', $lrs_id)->first()
     ]));

app/controllers/SiteController.php

@@ -38,7 +38,7 @@ public function index(){
       'site' => $site,
       'list' => $list,
       'stats' => $admin_dashboard->getFullStats(),
-      'graph_data' => $admin_dashboard->getGraphData()
+      'dash_nav' => true
     ]);
 
   }

app/locker/data/dashboards/BaseDashboard.php

@@ -1,6 +1,8 @@
 <?php namespace app\locker\data\dashboards;
 
 use Locker\Repository\Lrs\EloquentRepository as LrsRepo;
+use Carbon\Carbon as Carbon;
+use MongoDate;
 
 abstract class BaseDashboard extends \app\locker\data\BaseData {
   protected $lrs_repo;
@@ -144,16 +146,15 @@ public function actorCount(){
    *
    **/
   public function getStatementNumbersByDate(\DateTime $startDate = null, \DateTime $endDate = null) {
-    // If neither of the dates are set, default to the last 30 days.
-        if ($startDate === null && $endDate === null) {
-          $startDate = \Carbon\Carbon::now()->subMonth();
-          $endDate = \Carbon\Carbon::now();
-        }
+        // If neither of the dates are set, default to the last week
+        $startDate = $startDate ? Carbon::instance($startDate) : Carbon::now()->subWeek();
+        $endDate   = $endDate   ? Carbon::instance($endDate)   : Carbon::now();
+
 
         // Create the timestamp filter.
         $timestamp = [];
-        if ($startDate !== null) $timestamp['$gte'] = new \MongoDate($startDate->getTimestamp());
-        if ($endDate !== null) $timestamp['$lte'] = new \MongoDate($endDate->getTimestamp());
+        if ($startDate !== null) $timestamp['$gte'] = new MongoDate($startDate->timestamp, $startDate->micro);
+        if ($endDate !== null) $timestamp['$lte'] = new MongoDate($endDate->timestamp, $endDate->micro);
 
         $match = [
           'timestamp'=> $timestamp

app/locker/repository/Statement/EloquentIndexer.php

@@ -5,6 +5,8 @@
 use \Locker\XApi\Helpers as XApiHelpers;
 use \Jenssegers\Mongodb\Eloquent\Builder as Builder;
 use \Illuminate\Database\Eloquent\Model as Model;
+use Carbon\Carbon as Carbon;
+use MongoDate;
 
 interface IndexerInterface {
   public function index(IndexOptions $opts);
@@ -45,20 +47,22 @@ public function index(IndexOptions $opts) {
         $key = 'stored';
         $op = '>';
         return $builder->where(function ($query) use ($key, $value, $op) {
-          $date = new \MongoDate(strtotime($value));
+          $date    = new Carbon($value);
+          $mongodate = new MongoDate($date->timestamp, $date->micro);
           return $query
-            ->orWhere($key, $op, $date)
-            ->orWhere('refs.'.$key, $op, $date);
+            ->orWhere($key, $op, $mongodate)
+            ->orWhere('refs.'.$key, $op, $mongodate);
         });
       },
       'until' => function ($value, $builder, IndexOptions $opts) {
         $key = 'stored';
         $op = '<=';
         return $builder->where(function ($query) use ($key, $value, $op) {
-          $date = new \MongoDate(strtotime($value));
+          $date    = new Carbon($value);
+          $mongodate = new MongoDate($date->timestamp, $date->micro);
           return $query
-            ->orWhere($key, $op, $date)
-            ->orWhere('refs.'.$key, $op, $date);
+            ->orWhere($key, $op, $mongodate)
+            ->orWhere('refs.'.$key, $op, $mongodate);
         });
       },
       'active' => function ($value, $builder, IndexOptions $opts) {

app/locker/repository/Statement/EloquentLinker.php

@@ -3,6 +3,8 @@
 use \Illuminate\Database\Eloquent\Model as Model;
 use \Illuminate\Database\Eloquent\Collection as Collection;
 use \Locker\Helpers\Helpers as Helpers;
+use Carbon\Carbon as Carbon;
+use MongoDate;
 
 interface LinkerInterface {
   public function updateReferences(array $statements, StoreOptions $opts);
@@ -140,8 +142,10 @@ private function setRefs(\stdClass $statement, array $refs, StoreOptions $opts)
       ->update([
         'refs' => array_map(function ($ref) {
           $statement = Helpers::replaceFullStop(json_decode(json_encode($ref->statement), true));
-          $statement['stored'] = new \MongoDate( strtotime($statement['stored']));
-          $statement['timestamp'] = new \MongoDate( strtotime($statement['timestamp']));
+          $stored = new Carbon($statement['stored']);
+          $timestamp = new Carbon($statement['timestamp']);
+          $statement['stored'] = new MongoDate($stored->timestamp, $stored->micro);
+          $statement['timestamp'] = new MongoDate($timestamp->timestamp, $timestamp->micro);
           return $statement;
         }, $refs)
       ]);

app/routes.php

@@ -22,18 +22,10 @@
   if( Auth::check() ){
     $site = \Site::first();
 
-    $admin_dashboard = new \app\locker\data\dashboards\AdminDashboard();
 
     //if super admin, show site dashboard, otherwise show list of LRSs can access
     if( Auth::user()->role == 'super' ){
-      $list = Lrs::all();
-      return View::make('partials.site.dashboard', array(
-        'site' => $site,
-        'list' => $list,
-        'stats' => $admin_dashboard->getFullStats(),
-        'graph_data' => $admin_dashboard->getGraphData(),
-        'dash_nav' => true
-      ));
+      return Redirect::route('site.index');
     }else{
       $lrs = Lrs::where('users._id', \Auth::user()->_id)->get();
       return View::make('partials.lrs.list', array('lrs' => $lrs, 'list' => $lrs, 'site' => $site));
@@ -130,6 +122,7 @@
 |------------------------------------------------------------------
 */
 Route::get('site', array(
+  'as'   => 'site.index',
   'uses' => 'SiteController@index',
 ));
 Route::get('site/settings', array(

app/views/partials/lrs/dashboard.blade.php

@@ -35,6 +35,5 @@
 
   <script type='text/javascript'>
     window.LL.stats = {{ json_encode( $stats ) }};
-    window.LL.graph_data = {{ json_encode( $graph_data ) }};
   </script>
 @stop

app/views/partials/site/dashboard.blade.php

@@ -30,6 +30,5 @@
 
   <script type='text/javascript'>
     window.LL.stats = {{ json_encode( $stats ) }};
-    window.LL.graph_data = {{ json_encode( $graph_data ) }};
   </script>
 @stop