Completed
Push — master ( cf6fde...563a7d )
by Brandon
28s
created
app/DataTables/SensorDataTable.php 1 patch
Spacing   +7 added lines, -7 removed lines patch added patch discarded remove patch
@@ -15,18 +15,18 @@
 block discarded – undo
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
     /**
Please login to merge, or discard this patch.
app/DataTables/UsersDataTable.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -16,7 +16,7 @@
 block discarded – undo
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) {
Please login to merge, or discard this patch.
app/DataTables/DevicesDataTable.php 1 patch
Spacing   +7 added lines, -7 removed lines patch added patch discarded remove patch
@@ -16,19 +16,19 @@
 block discarded – undo
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' ])
Please login to merge, or discard this patch.
app/Http/Controllers/UserController.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -154,7 +154,7 @@  discard block
 block discarded – undo
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
 block discarded – undo
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
 }
Please login to merge, or discard this patch.
app/DataTables/LocationDataTable.php 1 patch
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -15,15 +15,15 @@
 block discarded – undo
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
     /**
Please login to merge, or discard this patch.
app/DataTables/SiteDataTable.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -15,12 +15,12 @@
 block discarded – undo
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
     /**
Please login to merge, or discard this patch.
app/Http/Controllers/LocationController.php 1 patch
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -52,13 +52,13 @@  discard block
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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
 }
Please login to merge, or discard this patch.
app/Http/Requests/EditLocation.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -38,11 +38,11 @@
 block discarded – undo
38 38
     {
39 39
         $validator = parent::getValidatorInstance();
40 40
         
41
-        $validator->sometimes('site', 'required|integer|digits_between:1,10|exists:sites,id', function ($input) {
41
+        $validator->sometimes('site', 'required|integer|digits_between:1,10|exists:sites,id', function($input) {
42 42
             return !$input->new_site_name;
43 43
         });
44 44
         
45
-        $validator->sometimes('new_site_name', 'bail|required|min:2|max:75|regex:#(^[a-zA-Z0-9])([\w ]*)(\w$)#|unique:sites,name', function ($input) {
45
+        $validator->sometimes('new_site_name', 'bail|required|min:2|max:75|regex:#(^[a-zA-Z0-9])([\w ]*)(\w$)#|unique:sites,name', function($input) {
46 46
             return !$input->site;
47 47
         });
48 48
         
Please login to merge, or discard this patch.
app/Http/Controllers/DeviceController.php 1 patch
Spacing   +8 added lines, -8 removed lines patch added patch discarded remove patch
@@ -77,7 +77,7 @@  discard block
 block discarded – undo
77 77
         $sites = Site::select('id', 'name')->orderByRaw("id = ? DESC", $site_id)
78 78
             ->orderBy('name', 'ASC')->get();
79 79
         //Get all locations for the selected site with the selected location first
80
-        $locations = Location::select('id', 'name')->where('site_id', '=', $sites[0]->id ?? 0)
80
+        $locations = Location::select('id', 'name')->where('site_id', '=', $sites[ 0 ]->id ?? 0)
81 81
             ->orderByRaw("id = ? DESC", $location_id)->orderBy('name', 'ASC')->get();
82 82
         
83 83
         return view('device.edit', [ 'device' => $device, 'locations' => $locations, 'sites' => $sites ]);
@@ -98,7 +98,7 @@  discard block
 block discarded – undo
98 98
         if (!empty($request->input('new_site_name')))
99 99
         {
100 100
             //Create a new site
101
-            $site = Site::create(['name' => $request->input('new_site_name')]);
101
+            $site = Site::create([ 'name' => $request->input('new_site_name') ]);
102 102
             $site_id = $site->id;
103 103
         }
104 104
         else
@@ -108,7 +108,7 @@  discard block
 block discarded – undo
108 108
         if (!empty($request->input('new_location_name')))
109 109
         {
110 110
             //Create a new location
111
-            $location = Location::create(['name' => $request->input('new_location_name'), 'site_id' => $site_id]);
111
+            $location = Location::create([ 'name' => $request->input('new_location_name'), 'site_id' => $site_id ]);
112 112
             $location_id = $location->id;
113 113
         }
114 114
         else
@@ -135,9 +135,9 @@  discard block
 block discarded – undo
135 135
             if ($request->command === 'unlock')
136 136
             {
137 137
                 if ($device->isDuringScheduleOpen())
138
-                    $command =  'open';
138
+                    $command = 'open';
139 139
                 else
140
-                    $command =  'close';
140
+                    $command = 'close';
141 141
             }
142 142
             $device->cover_command = $command;
143 143
         }
@@ -145,7 +145,7 @@  discard block
 block discarded – undo
145 145
         $device->save();
146 146
     
147 147
         if (\Request::ajax())
148
-            return response()->json(['success' => 'Device updated successfully']);
148
+            return response()->json([ 'success' => 'Device updated successfully' ]);
149 149
         else
150 150
             return redirect()->route('device.show', $id)
151 151
                 ->with('success', 'Device updated successfully');
@@ -177,7 +177,7 @@  discard block
 block discarded – undo
177 177
         }
178 178
 
179 179
         return redirect()->route('device.index')
180
-            ->with('success','Device deleted successfully');
180
+            ->with('success', 'Device deleted successfully');
181 181
     }
182 182
     
183 183
     /**
@@ -193,6 +193,6 @@  discard block
 block discarded – undo
193 193
         $device->restore();
194 194
         
195 195
         return redirect()->route('device.show', $device->id)
196
-            ->with('success','Device restored successfully');
196
+            ->with('success', 'Device restored successfully');
197 197
     }
198 198
 }
Please login to merge, or discard this patch.