@@ -21,7 +21,7 @@ discard block |
||
21 | 21 | */ |
22 | 22 | public function index() |
23 | 23 | { |
24 | - return response()->json(['data' => 'SmartSettia API - Bad request type.'], 400); |
|
24 | + return response()->json([ 'data' => 'SmartSettia API - Bad request type.' ], 400); |
|
25 | 25 | } |
26 | 26 | |
27 | 27 | /** |
@@ -90,7 +90,7 @@ discard block |
||
90 | 90 | //event(new Registered(true)); |
91 | 91 | |
92 | 92 | // Return the new device info including the token. |
93 | - return response()->json(['data' => $device->toArray()], 201); |
|
93 | + return response()->json([ 'data' => $device->toArray() ], 201); |
|
94 | 94 | } |
95 | 95 | |
96 | 96 | /** |
@@ -127,13 +127,13 @@ discard block |
||
127 | 127 | foreach ($sensor_datas as $sensor_data) { |
128 | 128 | $sensor = Sensor::firstOrCreate([ |
129 | 129 | "device_id" => $device->id, |
130 | - "name" => $sensor_data['name'], |
|
131 | - "type" => $sensor_data['type'] |
|
130 | + "name" => $sensor_data[ 'name' ], |
|
131 | + "type" => $sensor_data[ 'type' ] |
|
132 | 132 | ]); |
133 | 133 | |
134 | 134 | SensorData::create([ |
135 | 135 | "sensor_id" => $sensor->id, |
136 | - "value" => $sensor_data['value'] |
|
136 | + "value" => $sensor_data[ 'value' ] |
|
137 | 137 | ]); |
138 | 138 | } |
139 | 139 | |
@@ -143,7 +143,7 @@ discard block |
||
143 | 143 | //event(new Registered(true)); |
144 | 144 | |
145 | 145 | // Return the new device info including the token. |
146 | - return response()->json(['data' => $device->toArray()], 201); |
|
146 | + return response()->json([ 'data' => $device->toArray() ], 201); |
|
147 | 147 | } |
148 | 148 | |
149 | 149 | /** |
@@ -162,7 +162,7 @@ discard block |
||
162 | 162 | |
163 | 163 | // If challenge string doesnt match then send 401 unauthorized. |
164 | 164 | if ($request->input('challenge') != env('API_CHALLENGE', 'temppass')) { |
165 | - return response()->json(['data' => 'Bad challenge.'], 401); |
|
165 | + return response()->json([ 'data' => 'Bad challenge.' ], 401); |
|
166 | 166 | } |
167 | 167 | |
168 | 168 | // If the uuid already exists then just send them the record. |
@@ -172,7 +172,7 @@ discard block |
||
172 | 172 | 'uuid' => $device->uuid, |
173 | 173 | 'id' => $device->id, |
174 | 174 | 'token' => $device->token, |
175 | - ]], 200); |
|
175 | + ] ], 200); |
|
176 | 176 | } |
177 | 177 | |
178 | 178 | // Create the new device. |
@@ -196,7 +196,7 @@ discard block |
||
196 | 196 | 'uuid' => $device->uuid, |
197 | 197 | 'id' => $device->id, |
198 | 198 | 'token' => $device->token, |
199 | - ]], 201); |
|
199 | + ] ], 201); |
|
200 | 200 | } |
201 | 201 | |
202 | 202 | /** |
@@ -217,21 +217,21 @@ discard block |
||
217 | 217 | $device = Device::getDeviceByUUID($request->input('uuid')); |
218 | 218 | |
219 | 219 | // Save the image to disk. |
220 | - $path = $request->file('image')->storeAs('deviceimage', $device['id'], 'private'); |
|
220 | + $path = $request->file('image')->storeAs('deviceimage', $device[ 'id' ], 'private'); |
|
221 | 221 | |
222 | 222 | // Update the url for the image. |
223 | 223 | $deviceimage = Deviceimage::updateOrCreate( |
224 | - ['device_id' => $device['id']], |
|
225 | - ['url' => $path] |
|
224 | + [ 'device_id' => $device[ 'id' ] ], |
|
225 | + [ 'url' => $path ] |
|
226 | 226 | ); |
227 | 227 | |
228 | 228 | // Force the updated_at timestamp to update as the url may not change. |
229 | 229 | $deviceimage->touch(); |
230 | 230 | |
231 | 231 | return response()->json([ 'data' => [ |
232 | - 'id' => $deviceimage['id'], |
|
232 | + 'id' => $deviceimage[ 'id' ], |
|
233 | 233 | 'url' => $path, |
234 | - ]], 201); |
|
234 | + ] ], 201); |
|
235 | 235 | } |
236 | 236 | } |
237 | 237 |
@@ -16,16 +16,16 @@ discard block |
||
16 | 16 | public function dataTable($query) |
17 | 17 | { |
18 | 18 | return datatables($query) |
19 | - ->editColumn('causer_id', function ($activity) { |
|
20 | - return ($activity->causer_id ? '<a href="/' . ($activity->causer_type == "App\User" ? 'user' : 'device') . '/' . $activity->causer_id . '">' . ($activity->causer->name ?? '') . '</a>' : 'App'); |
|
19 | + ->editColumn('causer_id', function($activity) { |
|
20 | + return ($activity->causer_id ? '<a href="/'.($activity->causer_type == "App\User" ? 'user' : 'device').'/'.$activity->causer_id.'">'.($activity->causer->name ?? '').'</a>' : 'App'); |
|
21 | 21 | }) |
22 | - ->editColumn('subject_id', function ($activity) { |
|
23 | - return ($activity->subject_id ? '<a href="/' . ($activity->subject_type == "App\User" ? 'user' : 'device') . '/' . $activity->subject_id . '">' . ($activity->subject->name ?? '') . '</a>' : 'App'); |
|
22 | + ->editColumn('subject_id', function($activity) { |
|
23 | + return ($activity->subject_id ? '<a href="/'.($activity->subject_type == "App\User" ? 'user' : 'device').'/'.$activity->subject_id.'">'.($activity->subject->name ?? '').'</a>' : 'App'); |
|
24 | 24 | }) |
25 | - ->editColumn('properties', function ($activity) { |
|
25 | + ->editColumn('properties', function($activity) { |
|
26 | 26 | return $activity->properties; |
27 | 27 | }) |
28 | - ->rawColumns(['causer_id', 'subject_id', 'properties']); |
|
28 | + ->rawColumns([ 'causer_id', 'subject_id', 'properties' ]); |
|
29 | 29 | } |
30 | 30 | |
31 | 31 | /** |
@@ -98,6 +98,6 @@ discard block |
||
98 | 98 | */ |
99 | 99 | protected function filename() |
100 | 100 | { |
101 | - return 'activitylog_' . time(); |
|
101 | + return 'activitylog_'.time(); |
|
102 | 102 | } |
103 | 103 | } |
@@ -16,17 +16,17 @@ |
||
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 | 31 | ->blacklist([ 'location', 'site', 'rates' ]) |
32 | 32 | ->rawColumns([ 'name' ]); |
@@ -15,18 +15,18 @@ |
||
15 | 15 | public function dataTable($query) |
16 | 16 | { |
17 | 17 | return datatables($query) |
18 | - ->editColumn('device_id', function ($sensor) { |
|
19 | - return '<a href="/device/' . $sensor->device_id . '">'. ($sensor->device->name ?? '') . '</a>'; |
|
18 | + ->editColumn('device_id', function($sensor) { |
|
19 | + return '<a href="/device/'.$sensor->device_id.'">'.($sensor->device->name ?? '').'</a>'; |
|
20 | 20 | }) |
21 | - ->editColumn('name', function ($sensor) { |
|
22 | - return '<a href="/sensor/' . $sensor->id . '">'. $sensor->name . '</a>'; |
|
21 | + ->editColumn('name', function($sensor) { |
|
22 | + return '<a href="/sensor/'.$sensor->id.'">'.$sensor->name.'</a>'; |
|
23 | 23 | }) |
24 | - ->addColumn('value', function ($sensor) { |
|
24 | + ->addColumn('value', function($sensor) { |
|
25 | 25 | return $sensor->latest_data->value; |
26 | 26 | }) |
27 | 27 | ->addColumn('action', 'sensor.action') |
28 | - ->blacklist([ 'action', 'value']) |
|
29 | - ->rawColumns(['device_id', 'name', 'action']); |
|
28 | + ->blacklist([ 'action', 'value' ]) |
|
29 | + ->rawColumns([ 'device_id', 'name', 'action' ]); |
|
30 | 30 | } |
31 | 31 | |
32 | 32 | /** |
@@ -15,12 +15,12 @@ |
||
15 | 15 | public function dataTable($query) |
16 | 16 | { |
17 | 17 | return datatables($query) |
18 | - ->editColumn('sensor_id', function ($sensordata) { |
|
19 | - return '<a href="/sensor/' . $sensordata->sensor_id . '">'. ($sensordata->sensor->name ?? '') . '</a>'; |
|
18 | + ->editColumn('sensor_id', function($sensordata) { |
|
19 | + return '<a href="/sensor/'.$sensordata->sensor_id.'">'.($sensordata->sensor->name ?? '').'</a>'; |
|
20 | 20 | }) |
21 | 21 | ->addColumn('action', 'sensordata.action') |
22 | - ->blacklist([ 'action']) |
|
23 | - ->rawColumns(['sensor_id', 'action']); |
|
22 | + ->blacklist([ 'action' ]) |
|
23 | + ->rawColumns([ 'sensor_id', 'action' ]); |
|
24 | 24 | } |
25 | 25 | |
26 | 26 | /** |
@@ -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; |
|
154 | + $this->attributes[ 'open_time' ] = $time; |
|
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; |
|
176 | + $this->attributes[ 'close_time' ] = $time; |
|
177 | 177 | } |
178 | 178 | |
179 | 179 | /** |
@@ -111,7 +111,7 @@ |
||
111 | 111 | { |
112 | 112 | SensorData::find($id)->delete(); |
113 | 113 | return redirect()->route('sensordata.index') |
114 | - ->with('success','SensorData deleted successfully'); |
|
114 | + ->with('success', 'SensorData deleted successfully'); |
|
115 | 115 | } |
116 | 116 | |
117 | 117 | } |
@@ -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 | } |
@@ -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 |