@@ -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) |
@@ -46,7 +46,7 @@ discard block |
||
46 | 46 | |
47 | 47 | //If the location exists then set the pagination page to be where the device is located |
48 | 48 | if ($location != null) |
49 | - $request->merge(['page' => $device->dashPageNum(4)]); |
|
49 | + $request->merge([ 'page' => $device->dashPageNum(4) ]); |
|
50 | 50 | $site_id = $location->site_id ?? 0; |
51 | 51 | $location_id = $location->id ?? 0; |
52 | 52 | $device_id = $device->id ?? 0; |
@@ -66,13 +66,13 @@ discard block |
||
66 | 66 | ->get(); |
67 | 67 | //Get all locations for the selected site with the selected location first |
68 | 68 | $locations = Location::select('id', 'name', 'site_id') |
69 | - ->where('site_id', '=', $sites[0]->id ?? 0) |
|
69 | + ->where('site_id', '=', $sites[ 0 ]->id ?? 0) |
|
70 | 70 | ->orderByRaw("id = ? DESC", $location_id) |
71 | 71 | ->orderBy('name', 'ASC') |
72 | 72 | ->get(); |
73 | 73 | //Get all devices for the selected location |
74 | 74 | $devices = Device::publicDashData() |
75 | - ->where('location_id', '=', $locations[0]->id ?? 0) |
|
75 | + ->where('location_id', '=', $locations[ 0 ]->id ?? 0) |
|
76 | 76 | ->orderBy('name', 'ASC') |
77 | 77 | ->paginate(4); |
78 | 78 | |
@@ -80,13 +80,13 @@ discard block |
||
80 | 80 | $active_device = $devices->where('id', $device_id)->first(); |
81 | 81 | //Set the active device to the first device in $devices if it is not empty and the original active device wasn't found |
82 | 82 | if (!$devices->isEmpty() && $active_device == null) |
83 | - $active_device = $devices[0]; |
|
83 | + $active_device = $devices[ 0 ]; |
|
84 | 84 | |
85 | 85 | //Store the active site, location, and device in a collection |
86 | - $active_data = collect(['device' => $active_device, 'location' => $locations[0] ?? null, 'site' => $sites[0] ?? null]); |
|
86 | + $active_data = collect([ 'device' => $active_device, 'location' => $locations[ 0 ] ?? null, 'site' => $sites[ 0 ] ?? null ]); |
|
87 | 87 | |
88 | 88 | //Use the device_list.blade.php to generate the device table html |
89 | - $html_device_table = view('dashboard.device_list', ['devices' => $devices, 'active_data' => $active_data])->render(); |
|
89 | + $html_device_table = view('dashboard.device_list', [ 'devices' => $devices, 'active_data' => $active_data ])->render(); |
|
90 | 90 | |
91 | 91 | if (\Request::ajax()) |
92 | 92 | return response()->json([ 'active_data' => $active_data, 'devices' => $devices, 'locations' => $locations, |
@@ -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 | /** |