Completed
Pull Request — master (#99)
by
unknown
02:33
created
app/Http/Controllers/DashboardController.php 1 patch
Spacing   +10 added lines, -10 removed lines patch added patch discarded remove patch
@@ -44,7 +44,7 @@  discard block
 block discarded – undo
44 44
             
45 45
             //If the location exists then set the pagination page to be where the device is located
46 46
             if ($location != null)
47
-                $request->merge(['page' => $device->dashPageNum(4)]);
47
+                $request->merge([ 'page' => $device->dashPageNum(4) ]);
48 48
             $site_id = $location->site_id ?? 0;
49 49
             $location_id = $location->id ?? 0;
50 50
             $device_id = $device->id ?? 0;
@@ -64,14 +64,14 @@  discard block
 block discarded – undo
64 64
             ->get();
65 65
         //Get all locations for the selected site with the selected location first
66 66
         $locations = Location::select('id', 'name', 'site_id')
67
-            ->where('site_id', '=', $sites[0]->id ?? 0)
67
+            ->where('site_id', '=', $sites[ 0 ]->id ?? 0)
68 68
             ->orderByRaw("id = ? DESC", $location_id)
69 69
             ->orderBy('name', 'ASC')
70 70
             ->get();
71 71
         //Get all devices for the selected location
72 72
         $devices = Device::publicDashData()
73 73
             ->leftJoin('deviceimages as image', 'devices.id', '=', 'image.device_id')
74
-            ->where('location_id', '=', $locations[0]->id ?? 0)
74
+            ->where('location_id', '=', $locations[ 0 ]->id ?? 0)
75 75
             ->orderBy('name', 'ASC')
76 76
             ->paginate(4);
77 77
     
@@ -84,33 +84,33 @@  discard block
 block discarded – undo
84 84
             //If the original device with the given device id was not found
85 85
             //Then assign the the first device in the device list as the active device
86 86
             if ($active_device == null)
87
-                $active_device = $devices[0];
87
+                $active_device = $devices[ 0 ];
88 88
         
89 89
             //Add an attribute to each device defining if it is stale
90
-            $devices->transform(function ($item)
90
+            $devices->transform(function($item)
91 91
             {
92 92
                 //Mark the device as stale if the device has missed three updates plus a minute
93 93
                 $deviceStaleMins = ceil(($item->update_rate * 3) / 60) + 1;
94
-                $item['isDeviceStale'] = ($item->last_network_update_at <= Carbon::now()->subMinute($deviceStaleMins)) ? true : false;
94
+                $item[ 'isDeviceStale' ] = ($item->last_network_update_at <= Carbon::now()->subMinute($deviceStaleMins)) ? true : false;
95 95
     
96 96
                 //Mark the device image as stale if the device has missed three image updates plus a minute
97 97
                 if ($item->image_updated_at != null)
98 98
                 {
99 99
                     $imageStaleMins = ceil(($item->image_rate * 3) / 60) + 1;
100
-                    $item['isImageStale'] = ($item->image_updated_at <= Carbon::now()->subMinute($imageStaleMins)) ? true : false;
100
+                    $item[ 'isImageStale' ] = ($item->image_updated_at <= Carbon::now()->subMinute($imageStaleMins)) ? true : false;
101 101
                 }
102 102
                 else
103
-                    $item['isImageStale'] = false;
103
+                    $item[ 'isImageStale' ] = false;
104 104
                 
105 105
                 return $item;
106 106
             });
107 107
         }
108 108
     
109 109
         //Store the active site, location, and device in a collection
110
-        $active_data = collect(['device' => $active_device, 'location' => $locations[0] ?? null, 'site' => $sites[0] ?? null]);
110
+        $active_data = collect([ 'device' => $active_device, 'location' => $locations[ 0 ] ?? null, 'site' => $sites[ 0 ] ?? null ]);
111 111
     
112 112
         //Use the device_list.blade.php to generate the device table html
113
-        $html_device_table = view('dashboard.device_list', ['devices' => $devices, 'active_data' => $active_data])->render();
113
+        $html_device_table = view('dashboard.device_list', [ 'devices' => $devices, 'active_data' => $active_data ])->render();
114 114
         
115 115
         if (\Request::ajax())
116 116
             return response()->json([ 'active_data' => $active_data, 'devices' => $devices, 'locations' => $locations,
Please login to merge, or discard this patch.