@@ -23,7 +23,7 @@ |
||
23 | 23 | /** |
24 | 24 | * Display index page and process dataTable ajax request. |
25 | 25 | * |
26 | - * @param \App\DataTables\UsersDataTable $dataTable |
|
26 | + * @param ActivityLogDataTable $dataTable |
|
27 | 27 | * @return \Illuminate\Http\JsonResponse|\Illuminate\View\View |
28 | 28 | */ |
29 | 29 | public function index(ActivityLogDataTable $dataTable) |
@@ -17,7 +17,7 @@ discard block |
||
17 | 17 | /** |
18 | 18 | * Creates a json response for all the devices. |
19 | 19 | * |
20 | - * @return Response |
|
20 | + * @return \Illuminate\Http\JsonResponse |
|
21 | 21 | */ |
22 | 22 | public function index() |
23 | 23 | { |
@@ -28,7 +28,7 @@ discard block |
||
28 | 28 | * Creates a json response for a specifc device. |
29 | 29 | * |
30 | 30 | * @param Device $device |
31 | - * @return Response |
|
31 | + * @return \Illuminate\Http\JsonResponse |
|
32 | 32 | */ |
33 | 33 | public function show(Device $device) |
34 | 34 | { |
@@ -39,7 +39,7 @@ discard block |
||
39 | 39 | * Updates the status of a device. |
40 | 40 | * |
41 | 41 | * @param Request $request |
42 | - * @return Response |
|
42 | + * @return \Illuminate\Http\JsonResponse |
|
43 | 43 | */ |
44 | 44 | public function update(Request $request) |
45 | 45 | { |
@@ -107,7 +107,7 @@ discard block |
||
107 | 107 | * Updates the sensors of a device. |
108 | 108 | * |
109 | 109 | * @param Request $request |
110 | - * @return Response |
|
110 | + * @return \Illuminate\Http\JsonResponse |
|
111 | 111 | */ |
112 | 112 | public function sensor(Request $request) |
113 | 113 | { |
@@ -170,7 +170,7 @@ discard block |
||
170 | 170 | * Registers a new device. |
171 | 171 | * |
172 | 172 | * @param Request $request |
173 | - * @return Response |
|
173 | + * @return \Illuminate\Http\JsonResponse |
|
174 | 174 | */ |
175 | 175 | public function register(Request $request) |
176 | 176 | { |
@@ -228,7 +228,7 @@ discard block |
||
228 | 228 | * Updates the image for a device. |
229 | 229 | * |
230 | 230 | * @param Request $request |
231 | - * @return Response |
|
231 | + * @return \Illuminate\Http\JsonResponse |
|
232 | 232 | */ |
233 | 233 | public function image(Request $request) { |
234 | 234 | // Validate the request. |
@@ -10,42 +10,42 @@ discard block |
||
10 | 10 | class SensorController extends Controller |
11 | 11 | { |
12 | 12 | /** |
13 | - * Create a new controller instance. |
|
14 | - * |
|
15 | - * @return void |
|
16 | - */ |
|
13 | + * Create a new controller instance. |
|
14 | + * |
|
15 | + * @return void |
|
16 | + */ |
|
17 | 17 | public function __construct() |
18 | 18 | { |
19 | 19 | $this->middleware('auth'); |
20 | 20 | } |
21 | 21 | |
22 | 22 | /** |
23 | - * Display a listing of the resource. |
|
24 | - * |
|
25 | - * @param SensorDataTable $dataTable |
|
26 | - * @return Response |
|
27 | - */ |
|
23 | + * Display a listing of the resource. |
|
24 | + * |
|
25 | + * @param SensorDataTable $dataTable |
|
26 | + * @return Response |
|
27 | + */ |
|
28 | 28 | public function index(SensorDataTable $dataTable) |
29 | 29 | { |
30 | 30 | return $dataTable->render('sensor.index'); |
31 | 31 | } |
32 | 32 | |
33 | 33 | /** |
34 | - * Show the form for creating a new resource. |
|
35 | - * |
|
36 | - * @return Response |
|
37 | - */ |
|
34 | + * Show the form for creating a new resource. |
|
35 | + * |
|
36 | + * @return Response |
|
37 | + */ |
|
38 | 38 | public function create() |
39 | 39 | { |
40 | 40 | return view('sensor.create'); |
41 | 41 | } |
42 | 42 | |
43 | 43 | /** |
44 | - * Store a newly created resource in storage. |
|
45 | - * |
|
46 | - * @param Request $request |
|
47 | - * @return Response |
|
48 | - */ |
|
44 | + * Store a newly created resource in storage. |
|
45 | + * |
|
46 | + * @param Request $request |
|
47 | + * @return Response |
|
48 | + */ |
|
49 | 49 | public function store(Request $request) |
50 | 50 | { |
51 | 51 | request()->validate([ |
@@ -61,12 +61,12 @@ discard block |
||
61 | 61 | } |
62 | 62 | |
63 | 63 | /** |
64 | - * Display the specified resource. |
|
65 | - * |
|
66 | - * @param Request $request |
|
67 | - * @param int $id |
|
68 | - * @return Response |
|
69 | - */ |
|
64 | + * Display the specified resource. |
|
65 | + * |
|
66 | + * @param Request $request |
|
67 | + * @param int $id |
|
68 | + * @return Response |
|
69 | + */ |
|
70 | 70 | public function show(Request $request, $id) |
71 | 71 | { |
72 | 72 | $sensor = Sensor::findOrFail($id); |
@@ -75,12 +75,12 @@ discard block |
||
75 | 75 | } |
76 | 76 | |
77 | 77 | /** |
78 | - * Show the form for editing the specified resource. |
|
79 | - * |
|
80 | - * @param Request $request |
|
81 | - * @param int $id |
|
82 | - * @return Response |
|
83 | - */ |
|
78 | + * Show the form for editing the specified resource. |
|
79 | + * |
|
80 | + * @param Request $request |
|
81 | + * @param int $id |
|
82 | + * @return Response |
|
83 | + */ |
|
84 | 84 | public function edit(Request $request, $id) |
85 | 85 | { |
86 | 86 | $sensor = Sensor::findOrFail($id); |
@@ -89,12 +89,12 @@ discard block |
||
89 | 89 | } |
90 | 90 | |
91 | 91 | /** |
92 | - * Update the specified resource in storage. |
|
93 | - * |
|
94 | - * @param Request $request |
|
95 | - * @param int $id |
|
96 | - * @return Response |
|
97 | - */ |
|
92 | + * Update the specified resource in storage. |
|
93 | + * |
|
94 | + * @param Request $request |
|
95 | + * @param int $id |
|
96 | + * @return Response |
|
97 | + */ |
|
98 | 98 | public function update(Request $request, $id) |
99 | 99 | { |
100 | 100 | request()->validate([ |
@@ -108,11 +108,11 @@ discard block |
||
108 | 108 | } |
109 | 109 | |
110 | 110 | /** |
111 | - * Remove the specified resource from storage. |
|
112 | - * |
|
113 | - * @param int $id |
|
114 | - * @return Response |
|
115 | - */ |
|
111 | + * Remove the specified resource from storage. |
|
112 | + * |
|
113 | + * @param int $id |
|
114 | + * @return Response |
|
115 | + */ |
|
116 | 116 | public function destroy($id) |
117 | 117 | { |
118 | 118 | Sensor::findOrFail($id)->delete(); |
@@ -44,7 +44,7 @@ discard block |
||
44 | 44 | * Store a newly created resource in storage. |
45 | 45 | * |
46 | 46 | * @param Request $request |
47 | - * @return Response |
|
47 | + * @return \Illuminate\Http\RedirectResponse |
|
48 | 48 | */ |
49 | 49 | public function store(Request $request) |
50 | 50 | { |
@@ -95,7 +95,7 @@ discard block |
||
95 | 95 | * |
96 | 96 | * @param Request $request |
97 | 97 | * @param int $id |
98 | - * @return Response |
|
98 | + * @return \Illuminate\Http\RedirectResponse |
|
99 | 99 | */ |
100 | 100 | public function update(Request $request, $id) |
101 | 101 | { |
@@ -113,7 +113,7 @@ discard block |
||
113 | 113 | * Remove the specified resource from storage. |
114 | 114 | * |
115 | 115 | * @param int $id |
116 | - * @return Response |
|
116 | + * @return \Illuminate\Http\RedirectResponse |
|
117 | 117 | */ |
118 | 118 | public function destroy($id) |
119 | 119 | { |
@@ -9,42 +9,42 @@ discard block |
||
9 | 9 | class SensorDataController extends Controller |
10 | 10 | { |
11 | 11 | /** |
12 | - * Create a new controller instance. |
|
13 | - * |
|
14 | - * @return void |
|
15 | - */ |
|
12 | + * Create a new controller instance. |
|
13 | + * |
|
14 | + * @return void |
|
15 | + */ |
|
16 | 16 | public function __construct() |
17 | 17 | { |
18 | 18 | $this->middleware('auth'); |
19 | 19 | } |
20 | 20 | |
21 | 21 | /** |
22 | - * Display a listing of the resource. |
|
23 | - * |
|
24 | - * @param SensorDataDataTable $dataTable |
|
25 | - * @return Response |
|
26 | - */ |
|
22 | + * Display a listing of the resource. |
|
23 | + * |
|
24 | + * @param SensorDataDataTable $dataTable |
|
25 | + * @return Response |
|
26 | + */ |
|
27 | 27 | public function index(SensorDataDataTable $dataTable) |
28 | 28 | { |
29 | 29 | return $dataTable->render('sensordata.index'); |
30 | 30 | } |
31 | 31 | |
32 | 32 | /** |
33 | - * Show the form for creating a new resource. |
|
34 | - * |
|
35 | - * @return Response |
|
36 | - */ |
|
33 | + * Show the form for creating a new resource. |
|
34 | + * |
|
35 | + * @return Response |
|
36 | + */ |
|
37 | 37 | public function create() |
38 | 38 | { |
39 | 39 | return view('sensordata.create'); |
40 | 40 | } |
41 | 41 | |
42 | 42 | /** |
43 | - * Store a newly created resource in storage. |
|
44 | - * |
|
45 | - * @param Request $request |
|
46 | - * @return Response |
|
47 | - */ |
|
43 | + * Store a newly created resource in storage. |
|
44 | + * |
|
45 | + * @param Request $request |
|
46 | + * @return Response |
|
47 | + */ |
|
48 | 48 | public function store(Request $request) |
49 | 49 | { |
50 | 50 | request()->validate([ |
@@ -59,12 +59,12 @@ discard block |
||
59 | 59 | } |
60 | 60 | |
61 | 61 | /** |
62 | - * Display the specified resource. |
|
63 | - * |
|
64 | - * @param Request $request |
|
65 | - * @param int $id |
|
66 | - * @return Response |
|
67 | - */ |
|
62 | + * Display the specified resource. |
|
63 | + * |
|
64 | + * @param Request $request |
|
65 | + * @param int $id |
|
66 | + * @return Response |
|
67 | + */ |
|
68 | 68 | public function show(Request $request, $id) |
69 | 69 | { |
70 | 70 | $sensordata = SensorData::findOrFail($id); |
@@ -73,11 +73,11 @@ discard block |
||
73 | 73 | } |
74 | 74 | |
75 | 75 | /** |
76 | - * Show the form for editing the specified resource. |
|
77 | - * |
|
78 | - * @param int $id |
|
79 | - * @return Response |
|
80 | - */ |
|
76 | + * Show the form for editing the specified resource. |
|
77 | + * |
|
78 | + * @param int $id |
|
79 | + * @return Response |
|
80 | + */ |
|
81 | 81 | public function edit(Request $request, $id) |
82 | 82 | { |
83 | 83 | $sensordata = SensorData::findOrFail($id); |
@@ -86,11 +86,11 @@ discard block |
||
86 | 86 | } |
87 | 87 | |
88 | 88 | /** |
89 | - * Update the specified resource in storage. |
|
90 | - * |
|
91 | - * @param int $id |
|
92 | - * @return Response |
|
93 | - */ |
|
89 | + * Update the specified resource in storage. |
|
90 | + * |
|
91 | + * @param int $id |
|
92 | + * @return Response |
|
93 | + */ |
|
94 | 94 | public function update($id) |
95 | 95 | { |
96 | 96 | request()->validate([ |
@@ -103,11 +103,11 @@ discard block |
||
103 | 103 | } |
104 | 104 | |
105 | 105 | /** |
106 | - * Remove the specified resource from storage. |
|
107 | - * |
|
108 | - * @param int $id |
|
109 | - * @return Response |
|
110 | - */ |
|
106 | + * Remove the specified resource from storage. |
|
107 | + * |
|
108 | + * @param int $id |
|
109 | + * @return Response |
|
110 | + */ |
|
111 | 111 | public function destroy($id) |
112 | 112 | { |
113 | 113 | SensorData::find($id)->delete(); |
@@ -43,7 +43,7 @@ discard block |
||
43 | 43 | * Store a newly created resource in storage. |
44 | 44 | * |
45 | 45 | * @param Request $request |
46 | - * @return Response |
|
46 | + * @return \Illuminate\Http\RedirectResponse |
|
47 | 47 | */ |
48 | 48 | public function store(Request $request) |
49 | 49 | { |
@@ -89,7 +89,7 @@ discard block |
||
89 | 89 | * Update the specified resource in storage. |
90 | 90 | * |
91 | 91 | * @param int $id |
92 | - * @return Response |
|
92 | + * @return \Illuminate\Http\RedirectResponse |
|
93 | 93 | */ |
94 | 94 | public function update($id) |
95 | 95 | { |
@@ -106,7 +106,7 @@ discard block |
||
106 | 106 | * Remove the specified resource from storage. |
107 | 107 | * |
108 | 108 | * @param int $id |
109 | - * @return Response |
|
109 | + * @return \Illuminate\Http\RedirectResponse |
|
110 | 110 | */ |
111 | 111 | public function destroy($id) |
112 | 112 | { |
@@ -44,7 +44,7 @@ discard block |
||
44 | 44 | * Store a newly created resource in storage. |
45 | 45 | * |
46 | 46 | * @param EditLocation $request |
47 | - * @return \Illuminate\Http\Response |
|
47 | + * @return \Illuminate\Http\RedirectResponse |
|
48 | 48 | */ |
49 | 49 | public function store(EditLocation $request) |
50 | 50 | { |
@@ -97,7 +97,7 @@ discard block |
||
97 | 97 | * |
98 | 98 | * @param EditLocation $request |
99 | 99 | * @param int $id |
100 | - * @return \Illuminate\Http\Response |
|
100 | + * @return \Illuminate\Http\RedirectResponse |
|
101 | 101 | */ |
102 | 102 | public function update(EditLocation $request, $id) |
103 | 103 | { |
@@ -122,7 +122,7 @@ discard block |
||
122 | 122 | * Remove the specified resource from storage. |
123 | 123 | * |
124 | 124 | * @param int $id |
125 | - * @return \Illuminate\Http\Response |
|
125 | + * @return \Illuminate\Http\RedirectResponse |
|
126 | 126 | */ |
127 | 127 | public function destroy($id) |
128 | 128 | { |
@@ -41,7 +41,7 @@ discard block |
||
41 | 41 | * Store a newly created resource in storage. |
42 | 42 | * |
43 | 43 | * @param \Illuminate\Http\Request $request |
44 | - * @return \Illuminate\Http\Response |
|
44 | + * @return \Illuminate\Http\RedirectResponse |
|
45 | 45 | */ |
46 | 46 | public function store(Request $request) |
47 | 47 | { |
@@ -87,7 +87,7 @@ discard block |
||
87 | 87 | * |
88 | 88 | * @param \Illuminate\Http\Request $request |
89 | 89 | * @param Site $site |
90 | - * @return \Illuminate\Http\Response |
|
90 | + * @return \Illuminate\Http\RedirectResponse |
|
91 | 91 | */ |
92 | 92 | public function update(Request $request, Site $site) |
93 | 93 | { |
@@ -105,7 +105,7 @@ discard block |
||
105 | 105 | * Remove the specified resource from storage. |
106 | 106 | * |
107 | 107 | * @param int $id |
108 | - * @return \Illuminate\Http\Response |
|
108 | + * @return \Illuminate\Http\RedirectResponse |
|
109 | 109 | */ |
110 | 110 | public function destroy($id) |
111 | 111 | { |
@@ -330,7 +330,7 @@ |
||
330 | 330 | * Get the page number of the device for the dashboard device table pagination |
331 | 331 | * |
332 | 332 | * @param int $limit |
333 | - * @return int |
|
333 | + * @return double |
|
334 | 334 | */ |
335 | 335 | public function dashPageNum($limit) |
336 | 336 | { |
@@ -137,7 +137,7 @@ |
||
137 | 137 | /** |
138 | 138 | * Returns the users role as a string. |
139 | 139 | * |
140 | - * @return Users |
|
140 | + * @return string |
|
141 | 141 | */ |
142 | 142 | public function roleString() |
143 | 143 | { |