@@ -117,7 +117,7 @@ |
||
117 | 117 | { |
118 | 118 | Sensor::findOrFail($id)->delete(); |
119 | 119 | return redirect()->route('sensor.index') |
120 | - ->with('success','Sensor deleted successfully'); |
|
120 | + ->with('success', 'Sensor deleted successfully'); |
|
121 | 121 | } |
122 | 122 | |
123 | 123 | } |
@@ -15,15 +15,15 @@ |
||
15 | 15 | public function dataTable($query) |
16 | 16 | { |
17 | 17 | return datatables($query) |
18 | - ->addColumn('sensor', function ($sensordata) { |
|
19 | - return '<a href="' . route('sensor.show', $sensordata->sensor_id) . '">'. ($sensordata->sensor->name ?? 'null') . '</a>'; |
|
18 | + ->addColumn('sensor', function($sensordata) { |
|
19 | + return '<a href="'.route('sensor.show', $sensordata->sensor_id).'">'.($sensordata->sensor->name ?? 'null').'</a>'; |
|
20 | 20 | }) |
21 | - ->addColumn('device', function ($sensordata) { |
|
22 | - return '<a href="' . route('device.show', $sensordata->sensor->device->id ?? '0') . '">'. ($sensordata->sensor->device->name ?? 'null') . '</a>'; |
|
21 | + ->addColumn('device', function($sensordata) { |
|
22 | + return '<a href="'.route('device.show', $sensordata->sensor->device->id ?? '0').'">'.($sensordata->sensor->device->name ?? 'null').'</a>'; |
|
23 | 23 | }) |
24 | 24 | ->addColumn('action', 'sensordata.action') |
25 | - ->blacklist([ 'action']) |
|
26 | - ->rawColumns(['device', 'sensor', 'action']); |
|
25 | + ->blacklist([ 'action' ]) |
|
26 | + ->rawColumns([ 'device', 'sensor', 'action' ]); |
|
27 | 27 | } |
28 | 28 | |
29 | 29 | /** |
@@ -15,18 +15,18 @@ |
||
15 | 15 | public function dataTable($query) |
16 | 16 | { |
17 | 17 | return datatables($query) |
18 | - ->editColumn('name', function ($sensor) { |
|
19 | - return '<a href="' . route('sensor.show', $sensor->id) . '">'. $sensor->name . '</a>'; |
|
18 | + ->editColumn('name', function($sensor) { |
|
19 | + return '<a href="'.route('sensor.show', $sensor->id).'">'.$sensor->name.'</a>'; |
|
20 | 20 | }) |
21 | - ->editColumn('device_id', function ($sensor) { |
|
22 | - return '<a href="' . route('device.show', $sensor->device_id) . '">'. ($sensor->device->name ?? '') . '</a>'; |
|
21 | + ->editColumn('device_id', function($sensor) { |
|
22 | + return '<a href="'.route('device.show', $sensor->device_id).'">'.($sensor->device->name ?? '').'</a>'; |
|
23 | 23 | }) |
24 | - ->addColumn('value', function ($sensor) { |
|
25 | - return '<a href="' . route('sensordata.show', $sensor->latest_data->id ?? '0') . '">'. ($sensor->latest_data->value ?? 'null') . '</a>'; |
|
24 | + ->addColumn('value', function($sensor) { |
|
25 | + return '<a href="'.route('sensordata.show', $sensor->latest_data->id ?? '0').'">'.($sensor->latest_data->value ?? 'null').'</a>'; |
|
26 | 26 | }) |
27 | 27 | ->addColumn('action', 'sensor.action') |
28 | 28 | ->blacklist([ 'value', 'action' ]) |
29 | - ->rawColumns(['device_id', 'name', 'value', 'action']); |
|
29 | + ->rawColumns([ 'device_id', 'name', 'value', 'action' ]); |
|
30 | 30 | } |
31 | 31 | |
32 | 32 | /** |
@@ -16,7 +16,7 @@ |
||
16 | 16 | { |
17 | 17 | return datatables($query) |
18 | 18 | ->editColumn('name', function(User $user) { |
19 | - return '<a href="' . route('user.show', $user->id) . '">'. $user->name . '</a>'; |
|
19 | + return '<a href="'.route('user.show', $user->id).'">'.$user->name.'</a>'; |
|
20 | 20 | }) |
21 | 21 | |
22 | 22 | ->editColumn('role', function(User $user) { |
@@ -16,19 +16,19 @@ |
||
16 | 16 | public function dataTable($query) |
17 | 17 | { |
18 | 18 | return datatables($query) |
19 | - ->editColumn('name', function ($device) { |
|
20 | - return '<a href="' . route('device.show', $device->id) . '">' . $device->name . '</a>'; |
|
19 | + ->editColumn('name', function($device) { |
|
20 | + return '<a href="'.route('device.show', $device->id).'">'.$device->name.'</a>'; |
|
21 | 21 | }) |
22 | - ->addColumn('location', function ($device) { |
|
22 | + ->addColumn('location', function($device) { |
|
23 | 23 | return ($device->location->name ?? 'null'); |
24 | 24 | }) |
25 | - ->addColumn('site', function ($device) { |
|
25 | + ->addColumn('site', function($device) { |
|
26 | 26 | return ($device->location->site->name ?? 'null'); |
27 | 27 | }) |
28 | - ->addColumn('rates', function ($device) { |
|
29 | - return $device->update_rate . '/' . $device->image_rate .'/' . $device->sensor_rate; |
|
28 | + ->addColumn('rates', function($device) { |
|
29 | + return $device->update_rate.'/'.$device->image_rate.'/'.$device->sensor_rate; |
|
30 | 30 | }) |
31 | - ->editColumn('updated_at', function ($device) { |
|
31 | + ->editColumn('updated_at', function($device) { |
|
32 | 32 | return (is_object($device->updated_at) ? $device->updated_at->diffForHumans() : 'never'); |
33 | 33 | }) |
34 | 34 | ->blacklist([ 'location', 'site', 'rates' ]) |
@@ -154,7 +154,7 @@ discard block |
||
154 | 154 | } |
155 | 155 | |
156 | 156 | return redirect()->route('user.index') |
157 | - ->with('success','User deleted successfully'); |
|
157 | + ->with('success', 'User deleted successfully'); |
|
158 | 158 | } |
159 | 159 | |
160 | 160 | /** |
@@ -170,6 +170,6 @@ discard block |
||
170 | 170 | $user->restore(); |
171 | 171 | |
172 | 172 | return redirect()->route('user.show', $user->id) |
173 | - ->with('success','User restored successfully'); |
|
173 | + ->with('success', 'User restored successfully'); |
|
174 | 174 | } |
175 | 175 | } |
@@ -15,15 +15,15 @@ |
||
15 | 15 | public function dataTable($query) |
16 | 16 | { |
17 | 17 | return datatables($query) |
18 | - ->editColumn('name', function ($location) { |
|
19 | - return '<a href="' . route('location.show', $location->id) . '">'. $location->name . '</a>'; |
|
18 | + ->editColumn('name', function($location) { |
|
19 | + return '<a href="'.route('location.show', $location->id).'">'.$location->name.'</a>'; |
|
20 | 20 | }) |
21 | - ->editColumn('site_id', function ($location) { |
|
22 | - return '<a href="' . route('site.show', $location->site_id) . '">'. ($location->site->name ?? '') . '</a>'; |
|
21 | + ->editColumn('site_id', function($location) { |
|
22 | + return '<a href="'.route('site.show', $location->site_id).'">'.($location->site->name ?? '').'</a>'; |
|
23 | 23 | }) |
24 | 24 | ->addColumn('action', 'location.action') |
25 | 25 | ->blacklist([ 'action' ]) |
26 | - ->rawColumns(['site_id', 'name', 'action']); |
|
26 | + ->rawColumns([ 'site_id', 'name', 'action' ]); |
|
27 | 27 | } |
28 | 28 | |
29 | 29 | /** |
@@ -15,12 +15,12 @@ |
||
15 | 15 | public function dataTable($query) |
16 | 16 | { |
17 | 17 | return datatables($query) |
18 | - ->editColumn('name', function ($site) { |
|
19 | - return '<a href="' . route('site.show', $site->id) . '">'. $site->name . '</a>'; |
|
18 | + ->editColumn('name', function($site) { |
|
19 | + return '<a href="'.route('site.show', $site->id).'">'.$site->name.'</a>'; |
|
20 | 20 | }) |
21 | 21 | ->addColumn('action', 'site.action') |
22 | 22 | ->blacklist([ 'action' ]) |
23 | - ->rawColumns(['name', 'action']); |
|
23 | + ->rawColumns([ 'name', 'action' ]); |
|
24 | 24 | } |
25 | 25 | |
26 | 26 | /** |
@@ -52,13 +52,13 @@ discard block |
||
52 | 52 | if (!empty($request->input('new_site_name'))) |
53 | 53 | { |
54 | 54 | //Create a new site |
55 | - $site = Site::create(['name' => $request->input('new_site_name')]); |
|
55 | + $site = Site::create([ 'name' => $request->input('new_site_name') ]); |
|
56 | 56 | $site_id = $site->id; |
57 | 57 | } |
58 | 58 | else |
59 | 59 | $site_id = $request->input('site'); |
60 | 60 | |
61 | - $location = Location::create(['name' => $request->input('name'), 'site_id' => $site_id]); |
|
61 | + $location = Location::create([ 'name' => $request->input('name'), 'site_id' => $site_id ]); |
|
62 | 62 | |
63 | 63 | return redirect()->route('location.show', $location->id) |
64 | 64 | ->with('success', 'Location created successfully'); |
@@ -105,14 +105,14 @@ discard block |
||
105 | 105 | if (!empty($request->input('new_site_name'))) |
106 | 106 | { |
107 | 107 | //Create a new site |
108 | - $site = Site::create(['name' => $request->input('new_site_name')]); |
|
108 | + $site = Site::create([ 'name' => $request->input('new_site_name') ]); |
|
109 | 109 | $site_id = $site->id; |
110 | 110 | } |
111 | 111 | else |
112 | 112 | $site_id = $request->input('site'); |
113 | 113 | |
114 | 114 | //Update the location with the supplied name and the site |
115 | - Location::findOrFail($id)->update(['name' => $request->input('name'), 'site_id' => $site_id]); |
|
115 | + Location::findOrFail($id)->update([ 'name' => $request->input('name'), 'site_id' => $site_id ]); |
|
116 | 116 | |
117 | 117 | return redirect()->route('location.show', $id) |
118 | 118 | ->with('success', 'Location updated successfully'); |
@@ -128,6 +128,6 @@ discard block |
||
128 | 128 | { |
129 | 129 | Location::findOrFail($id)->delete(); |
130 | 130 | return redirect()->route('location.index') |
131 | - ->with('success','Location deleted successfully'); |
|
131 | + ->with('success', 'Location deleted successfully'); |
|
132 | 132 | } |
133 | 133 | } |