fix error when no images are stored (bug in previous scommit)

kerberos-io · Jan 7, 2017 · 3386ad6 · 3386ad6
1 parent 3d0b028
commit 3386ad6
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 3 deletions.
diff --git a/app/controllers/DashboardController.php b/app/controllers/DashboardController.php
@@ -24,8 +24,19 @@ public function index()
 
         $days = $this->imageHandler->getDays(5);
 
+        $lastImage = $this->imageHandler->getLatestImage();
+        if($lastImage)
+        {
+            $lastImage = $lastImage['src'];
+        }
+        else
+        {
+            $lastImage = '';
+        }
+
 		return View::make('dashboard', [
             'days' => $days,
+            'lastImage' => $lastImage,
             'isUpdateAvailable' => $this->isUpdateAvailable()
         ]);
 	}

diff --git a/app/views/controls/hullselection.blade.php b/app/views/controls/hullselection.blade.php
@@ -8,11 +8,13 @@
         if($imageFile)
         {
             $image = Image::make($imageFile['path']);
+            $src = $imageFile['src'];
         }
         else
         {
             // fake an image
             $image = Image::canvas(800, 640);
+            $src = '';
         }
     ?>
 
@@ -24,7 +26,7 @@
             require(["app/controllers/hullselection"], function(hull)
             {
                 hull.setElement($("#map"));
-                hull.setImage("{{$imageFile['src']}}");
+                hull.setImage("{{$src}}");
                 hull.setImageSize("{{$image->width()}}","{{$image->height()}}");
                 hull.setCoordinates("{{$value}}");
                 hull.setName("{{$file."__".$attribute}}");

diff --git a/app/views/controls/twolines.blade.php b/app/views/controls/twolines.blade.php
@@ -8,11 +8,13 @@
         if($imageFile)
         {
             $image = Image::make($imageFile['path']);
+            $src = $imageFile['src'];
         }
         else
         {
             // fake an image
             $image = Image::canvas(800, 640);
+            $src = '';
         }
     ?>
 
@@ -24,7 +26,7 @@
             require(["app/controllers/twolines"], function(twolines)
             {
                 twolines.setElement($(".twolines #map"));
-                twolines.setImage("{{$imageFile['src']}}");
+                twolines.setImage("{{$src}}");
                 twolines.setImageSize("{{$image->width()}}","{{$image->height()}}");
                 twolines.setCoordinates("{{$value}}");
                 twolines.setName("{{$file."__".$attribute}}");

diff --git a/app/views/dashboard.blade.php b/app/views/dashboard.blade.php
@@ -36,7 +36,7 @@
                                 <canvas id="latest-activity-sequence"></canvas>
                             </li>
                             <li class="heat">
-                                <img src="<?=App::make("Controllers\ImageController")->getLatestImage()['src']?>" id="latest-image" style="display: none;"/>
+                                <img src="<?= $lastImage ?>" id="latest-image" style="display: none;"/>
                                 <div class="heatmap" style="width: 100%;"></div>
                             </li>
                         </ul>