@@ -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'); |
@@ -95,7 +95,7 @@ discard block |
||
| 95 | 95 | 'name' => 'required|min:2|max:75|regex:#(^[a-zA-Z0-9])([\w ]*)(\w$)#|unique:sites,name,'.$site->id, |
| 96 | 96 | ]); |
| 97 | 97 | |
| 98 | - $site->update(['name' => $request->name]); |
|
| 98 | + $site->update([ 'name' => $request->name ]); |
|
| 99 | 99 | |
| 100 | 100 | return redirect()->route('site.show', $site->id) |
| 101 | 101 | ->with('success', 'Site updated successfully'); |
@@ -111,7 +111,7 @@ discard block |
||
| 111 | 111 | { |
| 112 | 112 | Site::findOrFail($id)->delete(); |
| 113 | 113 | return redirect()->route('site.index') |
| 114 | - ->with('success','Site deleted successfully'); |
|
| 114 | + ->with('success', 'Site deleted successfully'); |
|
| 115 | 115 | } |
| 116 | 116 | |
| 117 | 117 | /** |
@@ -77,7 +77,7 @@ discard block |
||
| 77 | 77 | $sites = Site::select('id', 'name')->orderByRaw("id = ? DESC", $site_id) |
| 78 | 78 | ->orderBy('name', 'ASC')->get(); |
| 79 | 79 | //Get all locations for the selected site with the selected location first |
| 80 | - $locations = Location::select('id', 'name')->where('site_id', '=', $sites[0]->id ?? 0) |
|
| 80 | + $locations = Location::select('id', 'name')->where('site_id', '=', $sites[ 0 ]->id ?? 0) |
|
| 81 | 81 | ->orderByRaw("id = ? DESC", $location_id)->orderBy('name', 'ASC')->get(); |
| 82 | 82 | |
| 83 | 83 | return view('device.edit', [ 'device' => $device, 'locations' => $locations, 'sites' => $sites ]); |
@@ -98,7 +98,7 @@ discard block |
||
| 98 | 98 | if (!empty($request->input('new_site_name'))) |
| 99 | 99 | { |
| 100 | 100 | //Create a new site |
| 101 | - $site = Site::create(['name' => $request->input('new_site_name')]); |
|
| 101 | + $site = Site::create([ 'name' => $request->input('new_site_name') ]); |
|
| 102 | 102 | $site_id = $site->id; |
| 103 | 103 | } |
| 104 | 104 | else |
@@ -108,7 +108,7 @@ discard block |
||
| 108 | 108 | if (!empty($request->input('new_location_name'))) |
| 109 | 109 | { |
| 110 | 110 | //Create a new location |
| 111 | - $location = Location::create(['name' => $request->input('new_location_name'), 'site_id' => $site_id]); |
|
| 111 | + $location = Location::create([ 'name' => $request->input('new_location_name'), 'site_id' => $site_id ]); |
|
| 112 | 112 | $location_id = $location->id; |
| 113 | 113 | } |
| 114 | 114 | else |
@@ -135,9 +135,9 @@ discard block |
||
| 135 | 135 | if ($request->command === 'unlock') |
| 136 | 136 | { |
| 137 | 137 | if ($device->isDuringScheduleOpen()) |
| 138 | - $command = 'open'; |
|
| 138 | + $command = 'open'; |
|
| 139 | 139 | else |
| 140 | - $command = 'close'; |
|
| 140 | + $command = 'close'; |
|
| 141 | 141 | } |
| 142 | 142 | $device->cover_command = $command; |
| 143 | 143 | } |
@@ -145,7 +145,7 @@ discard block |
||
| 145 | 145 | $device->save(); |
| 146 | 146 | |
| 147 | 147 | if (\Request::ajax()) |
| 148 | - return response()->json(['success' => 'Device updated successfully']); |
|
| 148 | + return response()->json([ 'success' => 'Device updated successfully' ]); |
|
| 149 | 149 | else |
| 150 | 150 | return redirect()->route('device.show', $id) |
| 151 | 151 | ->with('success', 'Device updated successfully'); |
@@ -177,7 +177,7 @@ discard block |
||
| 177 | 177 | } |
| 178 | 178 | |
| 179 | 179 | return redirect()->route('device.index') |
| 180 | - ->with('success','Device deleted successfully'); |
|
| 180 | + ->with('success', 'Device deleted successfully'); |
|
| 181 | 181 | } |
| 182 | 182 | |
| 183 | 183 | /** |
@@ -193,6 +193,6 @@ discard block |
||
| 193 | 193 | $device->restore(); |
| 194 | 194 | |
| 195 | 195 | return redirect()->route('device.show', $device->id) |
| 196 | - ->with('success','Device restored successfully'); |
|
| 196 | + ->with('success', 'Device restored successfully'); |
|
| 197 | 197 | } |
| 198 | 198 | } |
@@ -46,19 +46,19 @@ |
||
| 46 | 46 | { |
| 47 | 47 | $validator = parent::getValidatorInstance(); |
| 48 | 48 | |
| 49 | - $validator->sometimes('site_id', 'bail|required|integer|digits_between:1,10|exists:sites,id', function ($input) { |
|
| 49 | + $validator->sometimes('site_id', 'bail|required|integer|digits_between:1,10|exists:sites,id', function($input) { |
|
| 50 | 50 | return !$input->new_site_name && $input->site_id; |
| 51 | 51 | }); |
| 52 | 52 | |
| 53 | - $validator->sometimes('location_id', 'bail|required|integer|digits_between:1,10|exists:locations,id', function ($input) { |
|
| 53 | + $validator->sometimes('location_id', 'bail|required|integer|digits_between:1,10|exists:locations,id', function($input) { |
|
| 54 | 54 | return !$input->new_location_name && $input->location_id; |
| 55 | 55 | }); |
| 56 | 56 | |
| 57 | - $validator->sometimes('new_site_name', 'bail|required|string|max:75|unique:sites,name', function ($input) { |
|
| 57 | + $validator->sometimes('new_site_name', 'bail|required|string|max:75|unique:sites,name', function($input) { |
|
| 58 | 58 | return !$input->site_id; |
| 59 | 59 | }); |
| 60 | 60 | |
| 61 | - $validator->sometimes('new_location_name', 'bail|required|string|max:75|unique:locations,name', function ($input) { |
|
| 61 | + $validator->sometimes('new_location_name', 'bail|required|string|max:75|unique:locations,name', function($input) { |
|
| 62 | 62 | return !$input->location_id; |
| 63 | 63 | }); |
| 64 | 64 | |
@@ -41,13 +41,13 @@ discard block |
||
| 41 | 41 | ->get(); |
| 42 | 42 | //Get all locations for the selected site with the selected location first |
| 43 | 43 | $locations = Location::select('id', 'name', 'site_id') |
| 44 | - ->where('site_id', '=', $sites[0]->id ?? 0) |
|
| 44 | + ->where('site_id', '=', $sites[ 0 ]->id ?? 0) |
|
| 45 | 45 | ->orderByRaw("id = ? DESC", $location_id) |
| 46 | 46 | ->orderBy('name', 'ASC') |
| 47 | 47 | ->get(); |
| 48 | 48 | //Get all devices for the selected location |
| 49 | 49 | $devices = Device::publicDashData() |
| 50 | - ->where('location_id', '=', $locations[0]->id ?? 0) |
|
| 50 | + ->where('location_id', '=', $locations[ 0 ]->id ?? 0) |
|
| 51 | 51 | ->orderBy('name', 'ASC') |
| 52 | 52 | ->limit(1) |
| 53 | 53 | ->get(); |
@@ -56,10 +56,10 @@ discard block |
||
| 56 | 56 | $active_device = $devices->where('id', '=', $device_id)->first(); |
| 57 | 57 | //Set the active device to the first device in $devices if it is not empty and the original active device wasn't found |
| 58 | 58 | if (!$devices->isEmpty() && $active_device == null) |
| 59 | - $active_device = $devices[0]; |
|
| 59 | + $active_device = $devices[ 0 ]; |
|
| 60 | 60 | |
| 61 | 61 | //Store the active site, location, and device in a collection |
| 62 | - $active_data = collect([ 'device' => $active_device, 'location' => $locations[0] ?? null, 'site' => $sites[0] ?? null ]); |
|
| 62 | + $active_data = collect([ 'device' => $active_device, 'location' => $locations[ 0 ] ?? null, 'site' => $sites[ 0 ] ?? null ]); |
|
| 63 | 63 | |
| 64 | 64 | return view('dashboard.index', [ 'active_data' => $active_data, 'devices' => $devices, |
| 65 | 65 | 'locations' => $locations, 'sites' => $sites ]); |
@@ -102,37 +102,37 @@ discard block |
||
| 102 | 102 | ->get(); |
| 103 | 103 | //Get all locations for the selected site with the selected location first |
| 104 | 104 | $locations = Location::select('id', 'name', 'site_id') |
| 105 | - ->where('site_id', '=', $sites[0]->id ?? 0) |
|
| 105 | + ->where('site_id', '=', $sites[ 0 ]->id ?? 0) |
|
| 106 | 106 | ->orderByRaw("id = ? DESC", $location_id) |
| 107 | 107 | ->orderBy('name', 'ASC') |
| 108 | 108 | ->get(); |
| 109 | 109 | //Get all devices for the selected location |
| 110 | 110 | $devices = Device::publicDashData() |
| 111 | - ->where('location_id', '=', $locations[0]->id ?? 0) |
|
| 111 | + ->where('location_id', '=', $locations[ 0 ]->id ?? 0) |
|
| 112 | 112 | ->orderBy('name', 'ASC') |
| 113 | 113 | ->limit($limit) |
| 114 | 114 | ->offset($offset * $limit) |
| 115 | 115 | ->get(); |
| 116 | 116 | //Get the total device count for the given location |
| 117 | - $deviceCount = Device::where('location_id', '=', $locations[0]->id ?? 0)->count(); |
|
| 117 | + $deviceCount = Device::where('location_id', '=', $locations[ 0 ]->id ?? 0)->count(); |
|
| 118 | 118 | |
| 119 | 119 | //Get the active device |
| 120 | 120 | $active_device = $devices->where('id', $device_id)->first(); |
| 121 | 121 | //Set the active device to the first device in $devices if it is not empty and the original active device wasn't found |
| 122 | 122 | if (!$devices->isEmpty() && $active_device == null) |
| 123 | - $active_device = $devices[0]; |
|
| 123 | + $active_device = $devices[ 0 ]; |
|
| 124 | 124 | |
| 125 | 125 | //Store the active site, location, and device in a collection |
| 126 | - $active_data = collect(['device' => $active_device, 'location' => $locations[0] ?? null, 'site' => $sites[0] ?? null]); |
|
| 126 | + $active_data = collect([ 'device' => $active_device, 'location' => $locations[ 0 ] ?? null, 'site' => $sites[ 0 ] ?? null ]); |
|
| 127 | 127 | |
| 128 | 128 | //Get the total amount of pages for pagination |
| 129 | 129 | $page_count = ceil($deviceCount / $limit) - 1; |
| 130 | 130 | |
| 131 | 131 | //Store pagination data |
| 132 | - $pag_data = collect(['offset' => $offset, 'page_count' => $page_count]); |
|
| 132 | + $pag_data = collect([ 'offset' => $offset, 'page_count' => $page_count ]); |
|
| 133 | 133 | |
| 134 | 134 | return response()->json([ 'active_data' => $active_data, 'devices' => $devices, 'locations' => $locations, |
| 135 | - 'sites' => $sites, 'pag_data' => $pag_data]); |
|
| 135 | + 'sites' => $sites, 'pag_data' => $pag_data ]); |
|
| 136 | 136 | } |
| 137 | 137 | |
| 138 | 138 | /** |