Completed
Pull Request — master (#94)
by Brandon
02:17
created
app/Device.php 1 patch
Spacing   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -31,7 +31,7 @@  discard block
 block discarded – undo
31 31
      *
32 32
      * @var array
33 33
      */
34
-    protected $hidden = ['token'];
34
+    protected $hidden = [ 'token' ];
35 35
     
36 36
     /**
37 37
      * The attributes that are mass assignable.
@@ -50,7 +50,7 @@  discard block
 block discarded – undo
50 50
      *
51 51
      * @var array
52 52
      */
53
-    protected static $ignoreChangedAttributes = ['updated_at'];
53
+    protected static $ignoreChangedAttributes = [ 'updated_at' ];
54 54
     
55 55
     /**
56 56
      * The attributes to log in the Activity Log
@@ -91,7 +91,7 @@  discard block
 block discarded – undo
91 91
      */
92 92
     public function getSiteAttribute()
93 93
     {
94
-        return $this->location->site ?? (object)[];
94
+        return $this->location->site ?? (object) [ ];
95 95
     }
96 96
     
97 97
     /**
@@ -151,7 +151,7 @@  discard block
 block discarded – undo
151 151
         else
152 152
             $time = new Carbon($value, 'UTC');
153 153
         
154
-        $this->attributes['open_time'] = $time->format('H:i:s');
154
+        $this->attributes[ 'open_time' ] = $time->format('H:i:s');
155 155
     }
156 156
     
157 157
     /**
@@ -173,7 +173,7 @@  discard block
 block discarded – undo
173 173
         else
174 174
             $time = new Carbon($value, 'UTC');
175 175
         
176
-        $this->attributes['close_time'] = $time->format('H:i:s');
176
+        $this->attributes[ 'close_time' ] = $time->format('H:i:s');
177 177
     }
178 178
     
179 179
     /**
@@ -299,7 +299,7 @@  discard block
 block discarded – undo
299 299
         $isOpen = $this->cover_status === 'open';
300 300
         $isClosed = $this->cover_status === 'closed';
301 301
             
302
-        switch ($this['cover_command'])
302
+        switch ($this[ 'cover_command' ])
303 303
         {
304 304
             case 'open':
305 305
                 if ($isOpen)
Please login to merge, or discard this patch.
app/User.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -143,7 +143,7 @@
 block discarded – undo
143 143
     public function roleString()
144 144
     {
145 145
         $role_en = array(0 => "Registered", 1 => "User", 2 => "Manager", 3 => "Admin");
146
-        return $role_en[ $this->role ] . ' (' . $this->role . ')';
146
+        return $role_en[ $this->role ].' ('.$this->role.')';
147 147
     }
148 148
     
149 149
     /**
Please login to merge, or discard this patch.
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.
app/Http/Controllers/DeviceController.php 1 patch
Spacing   +10 added lines, -10 removed lines patch added patch discarded remove patch
@@ -55,10 +55,10 @@  discard block
 block discarded – undo
55 55
     {
56 56
         $device = Device::findOrFail($id);
57 57
         
58
-        $charts = [];
58
+        $charts = [ ];
59 59
         foreach ($device->sensors as $sensor) {
60 60
             $data = $sensor->last_month_daily_avg_data;
61
-            $charts[$sensor->id] = Charts::create('line', 'highcharts')
61
+            $charts[ $sensor->id ] = Charts::create('line', 'highcharts')
62 62
                 ->title($sensor->name)
63 63
                 ->elementLabel($sensor->type)
64 64
                 ->labels($data->pluck('date'))
@@ -90,7 +90,7 @@  discard block
 block discarded – undo
90 90
         $sites = Site::select('id', 'name')->orderByRaw("id = ? DESC", $site_id)
91 91
             ->orderBy('name', 'ASC')->get();
92 92
         //Get all locations for the selected site with the selected location first
93
-        $locations = Location::select('id', 'name')->where('site_id', '=', $sites[0]->id ?? 0)
93
+        $locations = Location::select('id', 'name')->where('site_id', '=', $sites[ 0 ]->id ?? 0)
94 94
             ->orderByRaw("id = ? DESC", $location_id)->orderBy('name', 'ASC')->get();
95 95
         
96 96
         return view('device.edit', [ 'device' => $device, 'locations' => $locations, 'sites' => $sites ]);
@@ -111,7 +111,7 @@  discard block
 block discarded – undo
111 111
         if (!empty($request->input('new_site_name')))
112 112
         {
113 113
             //Create a new site
114
-            $site = Site::create(['name' => $request->input('new_site_name')]);
114
+            $site = Site::create([ 'name' => $request->input('new_site_name') ]);
115 115
             $site_id = $site->id;
116 116
         }
117 117
         else
@@ -121,7 +121,7 @@  discard block
 block discarded – undo
121 121
         if (!empty($request->input('new_location_name')))
122 122
         {
123 123
             //Create a new location
124
-            $location = Location::create(['name' => $request->input('new_location_name'), 'site_id' => $site_id]);
124
+            $location = Location::create([ 'name' => $request->input('new_location_name'), 'site_id' => $site_id ]);
125 125
             $location_id = $location->id;
126 126
         }
127 127
         else
@@ -148,9 +148,9 @@  discard block
 block discarded – undo
148 148
             if ($request->command === 'unlock')
149 149
             {
150 150
                 if ($device->isDuringScheduleOpen())
151
-                    $command =  'open';
151
+                    $command = 'open';
152 152
                 else
153
-                    $command =  'close';
153
+                    $command = 'close';
154 154
             }
155 155
             $device->cover_command = $command;
156 156
         }
@@ -158,7 +158,7 @@  discard block
 block discarded – undo
158 158
         $device->save();
159 159
     
160 160
         if (\Request::ajax())
161
-            return response()->json(['success' => 'Device updated successfully']);
161
+            return response()->json([ 'success' => 'Device updated successfully' ]);
162 162
         else
163 163
             return redirect()->route('device.show', $id)
164 164
                 ->with('success', 'Device updated successfully');
@@ -190,7 +190,7 @@  discard block
 block discarded – undo
190 190
         }
191 191
 
192 192
         return redirect()->route('device.index')
193
-            ->with('success','Device deleted successfully');
193
+            ->with('success', 'Device deleted successfully');
194 194
     }
195 195
     
196 196
     /**
@@ -206,6 +206,6 @@  discard block
 block discarded – undo
206 206
         $device->restore();
207 207
         
208 208
         return redirect()->route('device.show', $device->id)
209
-            ->with('success','Device restored successfully');
209
+            ->with('success', 'Device restored successfully');
210 210
     }
211 211
 }
Please login to merge, or discard this patch.