added heat map to dashboard

kerberos-io · Mar 2, 2016 · c0e2041 · c0e2041
1 parent 9db3562
commit c0e2041
Show file tree

Hide file tree

Showing 14 changed files with 295 additions and 80 deletions.
diff --git a/app/api.php b/app/api.php
@@ -39,6 +39,7 @@
 
         Route::get('images/latest_sequence', 'Controllers\ImageController@getLatestSequence');
         Route::get('images/days', 'Controllers\ImageController@getDays');
+        Route::get('images/regions', 'Controllers\ImageController@getRegions');
         Route::get('images/perhour/{days?}', 'Controllers\ImageController@getImagesPerHour');
         Route::get('images/perday/{days?}', 'Controllers\ImageController@getImagesPerDay');
         Route::get('images/perweekday/{days?}', 'Controllers\ImageController@getAverageImagesPerWeekDay');

diff --git a/app/controllers/ImageController.php b/app/controllers/ImageController.php
@@ -62,6 +62,17 @@ public function getDays()
 
         return Response::json($days);
     }
+
+    /*************************************
+     *  Get all regions
+     */ 
+    public function getRegions()
+    {
+        $numberOfRegions = 250;
+        $regions = $this->imageHandler->getRegions($numberOfRegions);
+
+        return Response::json($regions);
+    }
 
     /*************************************
      *  Get the latest image that was taken.

diff --git a/app/repositories/imagehandler/ImageFileSystemHandler.php b/app/repositories/imagehandler/ImageFileSystemHandler.php
@@ -168,6 +168,39 @@ public function getDays($numberOfDays)
             return $days;
         }
     }
+
+    public function getRegions($numberOfRegions)
+    {
+        // -------------------------------------
+        // Cache images directory for x seconds
+
+        $key = $this->user->username . "_regions";
+
+        $regions = $this->cache->storeAndGet($key, function() use ($numberOfRegions)
+        {
+            $heap = $this->getImagesFromFilesystem();
+
+            $regions = [];
+
+            $i = 0;
+            while($i++ < $numberOfRegions && $heap->valid())
+            {
+                $image = new Image;
+                $image->setTimezone($this->date->timezone);
+                $image->parse($heap->current());
+
+                array_push($regions, [
+                    "regionCoordinates" => $image->getRegion(),
+                    "numberOfChanges" => $image->getChanges()
+                ]);
+                $heap->next();
+            }
+
+            return $regions;
+        });
+
+        return $regions;
+    }
 
     public function getImages()
     {

diff --git a/app/repositories/imagehandler/ImageHandlerInterface.php b/app/repositories/imagehandler/ImageHandlerInterface.php
@@ -21,6 +21,11 @@ public function getLastHourOfDay($day);
      *  Calculate the last x days
      */
 	public function getDays($numberOfDays);
+
+    /********************************
+     *  Get all regions
+     */
+	public function getRegions($numberOfRegions);
 
 	/*******************************
      * Get all images

diff --git a/app/views/dashboard.blade.php b/app/views/dashboard.blade.php
@@ -20,6 +20,9 @@
                                     <li>
                                         <a class="activity"><i href="#"class="fa fa-fw fa-refresh"></i> Last activity</a>
                                     </li>
+                                    <li>
+                                        <a class="heat"><i href="#"class="fa fa-fw fa-fire"></i> Heatmap</a>
+                                    </li>
                                 </ul>
                             </li>
                         </ul>
@@ -32,6 +35,10 @@
                             <li class="activity">
                                 <canvas id="latest-activity-sequence"></canvas>
                             </li>
+                            <li class="heat">
+                                <img src="<?=App::make("Controllers\ImageController")->getLatestImage()?>" id="latest-image" style="display: none;"/>
+                                <div class="heatmap" style="width: 100%;"></div>
+                            </li>
                         </ul>
                     </div>
                 </div>
@@ -81,11 +88,12 @@
                         
                         require(["app/controllers/dashboard_live",
                                  "app/controllers/dashboard_sequencer",
+                                 "app/controllers/dashboard_heatmap",
                                  "app/controllers/dashboard_pie",
                                  "app/controllers/dashboard_graph",
                                  "app/controllers/dashboard_radar"
                                  ], 
-                        function(Streamer, Sequencer, Pie, Graph, Radar)
+                        function(Streamer, Sequencer, Heatmap, Pie, Graph, Radar)
                         {
                             Streamer.initialize(
                             {
@@ -96,6 +104,18 @@ function(Streamer, Sequencer, Pie, Graph, Radar)
                                 callback: function(){}
                             });
                             
+                            Heatmap.initialize(
+                            {
+                                element: "heatmap",
+                                url: _baseUrl + "/api/v1/images/regions",
+                                callback: function(){}
+                            });
+                            
+                            $("ul.dropdown-menu li a.heat").click(function(event)
+                            {
+                                Heatmap.redraw();
+                            });
+                            
                             Sequencer.initialize(
                             {
                                 element: "canvas",

diff --git a/docker/Dockerfile b/docker/Dockerfile
@@ -1,4 +1,4 @@
-FROM ubuntu:latest
+FROM phusion/baseimage:latest
 
 MAINTAINER "Cédric Verstraeten" <hello@cedric.ws>
 
@@ -52,7 +52,7 @@ ENV BRANCH develop
 
 RUN git clone https://github.com/kerberos-io/web /var/www/web && \
 cd /var/www/web && \ 
-git checkout $BRANCH && \
+git checkout develop && \
 chown -Rf www-data.www-data /var/www/web && \
 curl -sS https://getcomposer.org/installer | sudo php -- --install-dir=/usr/local/bin --filename=composer && \
 cd /var/www/web && \

diff --git a/public/bower.json b/public/bower.json
@@ -34,6 +34,7 @@
     "fancybox": "*",
     "csshake": "*",
     "chartjs": "*",
-    "mjpegcanvas": "~0.4.0"
+    "mjpegcanvas": "~0.4.0",
+    "heatmap.js-amd": "*"
   }
 }