@@ -68,6 +68,6 @@ |
||
| 68 | 68 | */ |
| 69 | 69 | public function getLatestDataAttribute() |
| 70 | 70 | { |
| 71 | - return $this->hasOne('App\SensorData')->latest()->first() ?? (object)[]; |
|
| 71 | + return $this->hasOne('App\SensorData')->latest()->first() ?? (object) [ ]; |
|
| 72 | 72 | } |
| 73 | 73 | } |
| 74 | 74 | \ No newline at end of file |
@@ -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 | } |
@@ -213,7 +213,7 @@ discard block |
||
| 213 | 213 | } |
| 214 | 214 | |
| 215 | 215 | return redirect()->route('device.index') |
| 216 | - ->with('success','Device deleted successfully'); |
|
| 216 | + ->with('success', 'Device deleted successfully'); |
|
| 217 | 217 | } |
| 218 | 218 | |
| 219 | 219 | /** |
@@ -229,6 +229,6 @@ discard block |
||
| 229 | 229 | $device->restore(); |
| 230 | 230 | |
| 231 | 231 | return redirect()->route('device.show', $device->id) |
| 232 | - ->with('success','Device restored successfully'); |
|
| 232 | + ->with('success', 'Device restored successfully'); |
|
| 233 | 233 | } |
| 234 | 234 | } |
@@ -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 | /** |