@@ -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 | /** |