@@ -49,7 +49,7 @@ discard block |
||
| 49 | 49 | 'name' => 'required|min:2|max:75|regex:#(^[a-zA-Z0-9])([\w ]*)(\w$)#|unique:sites,name', |
| 50 | 50 | ]); |
| 51 | 51 | |
| 52 | - $site = Site::create(['name' => $request->name]); |
|
| 52 | + $site = Site::create([ 'name' => $request->name ]); |
|
| 53 | 53 | |
| 54 | 54 | return redirect()->route('site.show', $site->id) |
| 55 | 55 | ->with('success', 'Site created successfully'); |
@@ -67,7 +67,7 @@ discard block |
||
| 67 | 67 | $locations = $site->locations()->orderBy('name', 'ASC')->paginate(15); |
| 68 | 68 | |
| 69 | 69 | if (\Request::ajax()) |
| 70 | - return response()->json(['site' => $site, 'locations' => $locations]); |
|
| 70 | + return response()->json([ 'site' => $site, 'locations' => $locations ]); |
|
| 71 | 71 | else |
| 72 | 72 | return view('site.show', [ 'site' => $site, 'locations' => $locations ]); |
| 73 | 73 | } |
@@ -98,7 +98,7 @@ discard block |
||
| 98 | 98 | 'name' => 'required|min:2|max:75|regex:#(^[a-zA-Z0-9])([\w ]*)(\w$)#|unique:sites,name,'.$site->id, |
| 99 | 99 | ]); |
| 100 | 100 | |
| 101 | - $site->update(['name' => $request->name]); |
|
| 101 | + $site->update([ 'name' => $request->name ]); |
|
| 102 | 102 | |
| 103 | 103 | return redirect()->route('site.show', $site->id) |
| 104 | 104 | ->with('success', 'Site updated successfully'); |
@@ -114,6 +114,6 @@ discard block |
||
| 114 | 114 | { |
| 115 | 115 | Site::findOrFail($id)->delete(); |
| 116 | 116 | return redirect()->route('site.index') |
| 117 | - ->with('success','Site deleted successfully'); |
|
| 117 | + ->with('success', 'Site deleted successfully'); |
|
| 118 | 118 | } |
| 119 | 119 | } |
@@ -31,7 +31,7 @@ discard block |
||
| 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 |
||
| 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 |
||
| 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 |
||
| 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 |
||
| 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 |
||
| 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) |
@@ -143,7 +143,7 @@ |
||
| 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 | /** |
@@ -44,7 +44,7 @@ discard block |
||
| 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 |
||
| 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 |
||
| 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, |