Completed
Pull Request — master (#128)
by Brandon
10:02
created
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 2 patches
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.
Braces   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -54,9 +54,9 @@  discard block
 block discarded – undo
54 54
             //Create a new site
55 55
             $site = Site::create(['name' => $request->input('new_site_name')]);
56 56
             $site_id = $site->id;
57
+        } else {
58
+                    $site_id = $request->input('site');
57 59
         }
58
-        else
59
-            $site_id = $request->input('site');
60 60
     
61 61
         $location = Location::create(['name' => $request->input('name'), 'site_id' => $site_id]);
62 62
     
@@ -107,9 +107,9 @@  discard block
 block discarded – undo
107 107
             //Create a new site
108 108
             $site = Site::create(['name' => $request->input('new_site_name')]);
109 109
             $site_id = $site->id;
110
+        } else {
111
+                    $site_id = $request->input('site');
110 112
         }
111
-        else
112
-            $site_id = $request->input('site');
113 113
         
114 114
         //Update the location with the supplied name and the site
115 115
         Location::findOrFail($id)->update(['name' => $request->input('name'), 'site_id' => $site_id]);
Please login to merge, or discard this patch.
app/Http/Controllers/SiteController.php 2 patches
Braces   +5 added lines, -4 removed lines patch added patch discarded remove patch
@@ -66,10 +66,11 @@
 block discarded – undo
66 66
         $site = Site::findOrFail($id);
67 67
         $locations = $site->locations()->orderBy('name', 'ASC')->paginate(15);
68 68
     
69
-        if (\Request::ajax())
70
-            return response()->json(['site' => $site, 'locations' => $locations]);
71
-        else
72
-            return view('site.show', [ 'site' => $site, 'locations' => $locations ]);
69
+        if (\Request::ajax()) {
70
+                    return response()->json(['site' => $site, 'locations' => $locations]);
71
+        } else {
72
+                    return view('site.show', [ 'site' => $site, 'locations' => $locations ]);
73
+        }
73 74
     }
74 75
     
75 76
     /**
Please login to merge, or discard this patch.
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -49,7 +49,7 @@  discard block
 block discarded – undo
49 49
             'name' => 'required|min:2|max:190|name|unique:sites,name',
50 50
         ]);
51 51
         
52
-        $site = Site::create(['name' => $request->name]);
52
+        $site = Site::create([ 'name' => $request->name ]);
53 53
         
54 54
         return redirect()->route('site.show', $site->id)
55 55
             ->with('success', 'Site created successfully');
@@ -67,7 +67,7 @@  discard block
 block discarded – undo
67 67
         $locations = $site->locations()->orderBy('name', 'ASC')->paginate(15);
68 68
     
69 69
         if (\Request::ajax())
70
-            return response()->json(['site' => $site, 'locations' => $locations]);
70
+            return response()->json([ 'site' => $site, 'locations' => $locations ]);
71 71
         else
72 72
             return view('site.show', [ 'site' => $site, 'locations' => $locations ]);
73 73
     }
@@ -98,7 +98,7 @@  discard block
 block discarded – undo
98 98
             'name' => 'required|min:2|max:190|name|unique:sites,name,'.$site->id,
99 99
         ]);
100 100
         
101
-        $site->update(['name' => $request->name]);
101
+        $site->update([ 'name' => $request->name ]);
102 102
         
103 103
         return redirect()->route('site.show', $site->id)
104 104
             ->with('success', 'Site updated successfully');
@@ -114,6 +114,6 @@  discard block
 block discarded – undo
114 114
     {
115 115
         Site::findOrFail($id)->delete();
116 116
         return redirect()->route('site.index')
117
-            ->with('success','Site deleted successfully');
117
+            ->with('success', 'Site deleted successfully');
118 118
     }
119 119
 }
Please login to merge, or discard this patch.
app/User.php 2 patches
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -143,7 +143,7 @@
 block discarded – undo
143 143
     public function roleString()
144 144
     {
145 145
         $role_en = array(0 => "Registered", 1 => "User", 2 => "Manager", 3 => "Admin");
146
-        return $role_en[ $this->role ] . ' (' . $this->role . ')';
146
+        return $role_en[ $this->role ].' ('.$this->role.')';
147 147
     }
148 148
     
149 149
     /**
Please login to merge, or discard this patch.
Braces   +10 added lines, -8 removed lines patch added patch discarded remove patch
@@ -89,10 +89,11 @@  discard block
 block discarded – undo
89 89
      */
90 90
     public function getUpdatedAtHumanAttribute()
91 91
     {
92
-        if ($this->updated_at->diffInDays() > 0)
93
-            return $this->updated_at->setTimezone(Auth::user()->timezone)->format('M d, Y h:i a');
94
-        else
95
-            return $this->updated_at->diffForHumans();
92
+        if ($this->updated_at->diffInDays() > 0) {
93
+                    return $this->updated_at->setTimezone(Auth::user()->timezone)->format('M d, Y h:i a');
94
+        } else {
95
+                    return $this->updated_at->diffForHumans();
96
+        }
96 97
     }
97 98
     
98 99
     /**
@@ -107,9 +108,10 @@  discard block
 block discarded – undo
107 108
      */
108 109
     public function getCreatedAtHumanAttribute()
109 110
     {
110
-        if ($this->created_at->diffInDays() > 0)
111
-            return $this->created_at->setTimezone(Auth::user()->timezone)->format('M d, Y h:i a');
112
-        else
113
-            return $this->created_at->diffForHumans();
111
+        if ($this->created_at->diffInDays() > 0) {
112
+                    return $this->created_at->setTimezone(Auth::user()->timezone)->format('M d, Y h:i a');
113
+        } else {
114
+                    return $this->created_at->diffForHumans();
115
+        }
114 116
     }
115 117
 }
Please login to merge, or discard this patch.
app/Http/Controllers/DashboardController.php 2 patches
Spacing   +10 added lines, -10 removed lines patch added patch discarded remove patch
@@ -44,7 +44,7 @@  discard block
 block discarded – undo
44 44
             
45 45
             //If the location exists then set the pagination page to be where the device is located
46 46
             if ($location != null)
47
-                $request->merge(['page' => $device->dashPageNum(4)]);
47
+                $request->merge([ 'page' => $device->dashPageNum(4) ]);
48 48
             $site_id = $location->site_id ?? 0;
49 49
             $location_id = $location->id ?? 0;
50 50
             $device_id = $device->id ?? 0;
@@ -64,14 +64,14 @@  discard block
 block discarded – undo
64 64
             ->get();
65 65
         //Get all locations for the selected site with the selected location first
66 66
         $locations = Location::select('id', 'name', 'site_id')
67
-            ->where('site_id', '=', $sites[0]->id ?? 0)
67
+            ->where('site_id', '=', $sites[ 0 ]->id ?? 0)
68 68
             ->orderByRaw("id = ? DESC", $location_id)
69 69
             ->orderBy('name', 'ASC')
70 70
             ->get();
71 71
         //Get all devices for the selected location
72 72
         $devices = Device::publicDashData()
73 73
             ->leftJoin('deviceimages as image', 'devices.id', '=', 'image.device_id')
74
-            ->where('location_id', '=', $locations[0]->id ?? 0)
74
+            ->where('location_id', '=', $locations[ 0 ]->id ?? 0)
75 75
             ->orderBy('name', 'ASC')
76 76
             ->paginate(4);
77 77
     
@@ -84,33 +84,33 @@  discard block
 block discarded – undo
84 84
             //If the original device with the given device id was not found
85 85
             //Then assign the the first device in the device list as the active device
86 86
             if ($active_device == null)
87
-                $active_device = $devices[0];
87
+                $active_device = $devices[ 0 ];
88 88
         
89 89
             //Add an attribute to each device defining if it is stale
90
-            $devices->transform(function ($item)
90
+            $devices->transform(function($item)
91 91
             {
92 92
                 //Mark the device as stale if the device has missed three updates plus a minute
93 93
                 $deviceStaleMins = ceil(($item->update_rate * 3) / 60) + 1;
94
-                $item['isDeviceStale'] = ($item->last_network_update_at <= Carbon::now()->subMinute($deviceStaleMins)) ? true : false;
94
+                $item[ 'isDeviceStale' ] = ($item->last_network_update_at <= Carbon::now()->subMinute($deviceStaleMins)) ? true : false;
95 95
     
96 96
                 //Mark the device image as stale if the device has missed three image updates plus a minute
97 97
                 if ($item->image_updated_at != null)
98 98
                 {
99 99
                     $imageStaleMins = ceil(($item->image_rate * 3) / 60) + 1;
100
-                    $item['isImageStale'] = ($item->image_updated_at <= Carbon::now()->subMinute($imageStaleMins)) ? true : false;
100
+                    $item[ 'isImageStale' ] = ($item->image_updated_at <= Carbon::now()->subMinute($imageStaleMins)) ? true : false;
101 101
                 }
102 102
                 else
103
-                    $item['isImageStale'] = false;
103
+                    $item[ 'isImageStale' ] = false;
104 104
                 
105 105
                 return $item;
106 106
             });
107 107
         }
108 108
     
109 109
         //Store the active site, location, and device in a collection
110
-        $active_data = collect(['device' => $active_device, 'location' => $locations[0] ?? null, 'site' => $sites[0] ?? null]);
110
+        $active_data = collect([ 'device' => $active_device, 'location' => $locations[ 0 ] ?? null, 'site' => $sites[ 0 ] ?? null ]);
111 111
     
112 112
         //Use the device_list.blade.php to generate the device table html
113
-        $html_device_table = view('dashboard.device_list', ['devices' => $devices, 'active_data' => $active_data])->render();
113
+        $html_device_table = view('dashboard.device_list', [ 'devices' => $devices, 'active_data' => $active_data ])->render();
114 114
         
115 115
         if (\Request::ajax())
116 116
             return response()->json([ 'active_data' => $active_data, 'devices' => $devices, 'locations' => $locations,
Please login to merge, or discard this patch.
Braces   +14 added lines, -12 removed lines patch added patch discarded remove patch
@@ -43,13 +43,13 @@  discard block
 block discarded – undo
43 43
             $location = $device->location ?? null;
44 44
             
45 45
             //If the location exists then set the pagination page to be where the device is located
46
-            if ($location != null)
47
-                $request->merge(['page' => $device->dashPageNum(4)]);
46
+            if ($location != null) {
47
+                            $request->merge(['page' => $device->dashPageNum(4)]);
48
+            }
48 49
             $site_id = $location->site_id ?? 0;
49 50
             $location_id = $location->id ?? 0;
50 51
             $device_id = $device->id ?? 0;
51
-        }
52
-        else
52
+        } else
53 53
         {
54 54
             //Get the active site, location, and device ids
55 55
             $site_id = $request->site_id ?? 0;
@@ -83,8 +83,9 @@  discard block
 block discarded – undo
83 83
         {
84 84
             //If the original device with the given device id was not found
85 85
             //Then assign the the first device in the device list as the active device
86
-            if ($active_device == null)
87
-                $active_device = $devices[0];
86
+            if ($active_device == null) {
87
+                            $active_device = $devices[0];
88
+            }
88 89
         
89 90
             //Add an attribute to each device defining if it is stale
90 91
             $devices->transform(function ($item)
@@ -98,9 +99,9 @@  discard block
 block discarded – undo
98 99
                 {
99 100
                     $imageStaleMins = ceil(($item->image_rate * 3) / 60) + 1;
100 101
                     $item['isImageStale'] = ($item->image_updated_at <= Carbon::now()->subMinute($imageStaleMins)) ? true : false;
102
+                } else {
103
+                                    $item['isImageStale'] = false;
101 104
                 }
102
-                else
103
-                    $item['isImageStale'] = false;
104 105
                 
105 106
                 return $item;
106 107
             });
@@ -112,12 +113,13 @@  discard block
 block discarded – undo
112 113
         //Use the device_list.blade.php to generate the device table html
113 114
         $html_device_table = view('dashboard.device_list', ['devices' => $devices, 'active_data' => $active_data])->render();
114 115
         
115
-        if (\Request::ajax())
116
-            return response()->json([ 'active_data' => $active_data, 'devices' => $devices, 'locations' => $locations,
116
+        if (\Request::ajax()) {
117
+                    return response()->json([ 'active_data' => $active_data, 'devices' => $devices, 'locations' => $locations,
117 118
                 'sites' => $sites, 'html_device_table' => $html_device_table ]);
118
-        else
119
-            return view('dashboard.index', [ 'active_data' => $active_data, 'devices' => $devices,
119
+        } else {
120
+                    return view('dashboard.index', [ 'active_data' => $active_data, 'devices' => $devices,
120 121
                 'locations' => $locations, 'sites' => $sites ]);
122
+        }
121 123
     }
122 124
     
123 125
     /**
Please login to merge, or discard this patch.
app/Http/Controllers/DeviceController.php 2 patches
Spacing   +10 added lines, -10 removed lines patch added patch discarded remove patch
@@ -55,10 +55,10 @@  discard block
 block discarded – undo
55 55
     {
56 56
         $device = Device::findOrFail($id);
57 57
         
58
-        $charts = [];
58
+        $charts = [ ];
59 59
         foreach ($device->sensors as $sensor) {
60 60
             $data = $sensor->last_month_daily_avg_data;
61
-            $charts[$sensor->id] = Charts::create('line', 'highcharts')
61
+            $charts[ $sensor->id ] = Charts::create('line', 'highcharts')
62 62
                 ->title($sensor->name)
63 63
                 ->elementLabel($sensor->type)
64 64
                 ->labels($data->pluck('date'))
@@ -90,7 +90,7 @@  discard block
 block discarded – undo
90 90
         $sites = Site::select('id', 'name')->orderByRaw("id = ? DESC", $site_id)
91 91
             ->orderBy('name', 'ASC')->get();
92 92
         //Get all locations for the selected site with the selected location first
93
-        $locations = Location::select('id', 'name')->where('site_id', '=', $sites[0]->id ?? 0)
93
+        $locations = Location::select('id', 'name')->where('site_id', '=', $sites[ 0 ]->id ?? 0)
94 94
             ->orderByRaw("id = ? DESC", $location_id)->orderBy('name', 'ASC')->get();
95 95
         
96 96
         return view('device.edit', [ 'device' => $device, 'locations' => $locations, 'sites' => $sites ]);
@@ -116,7 +116,7 @@  discard block
 block discarded – undo
116 116
             if (!empty($request->input('new_site_name')))
117 117
             {
118 118
                 //Create a new site
119
-                $site = Site::create(['name' => $request->input('new_site_name')]);
119
+                $site = Site::create([ 'name' => $request->input('new_site_name') ]);
120 120
                 $site_id = $site->id;
121 121
             } else
122 122
                 $site_id = $request->input('site_id');
@@ -125,7 +125,7 @@  discard block
 block discarded – undo
125 125
             if (!empty($request->input('new_location_name')))
126 126
             {
127 127
                 //Create a new location
128
-                $location = Location::create(['name' => $request->input('new_location_name'), 'site_id' => $site_id]);
128
+                $location = Location::create([ 'name' => $request->input('new_location_name'), 'site_id' => $site_id ]);
129 129
                 $location_id = $location->id;
130 130
             } else
131 131
                 $location_id = $request->input('location_id');
@@ -159,9 +159,9 @@  discard block
 block discarded – undo
159 159
             if ($request->command === 'unlock')
160 160
             {
161 161
                 if ($device->isDuringScheduleOpen())
162
-                    $command =  'open';
162
+                    $command = 'open';
163 163
                 else
164
-                    $command =  'close';
164
+                    $command = 'close';
165 165
             }
166 166
             $device->cover_command = $command;
167 167
         }
@@ -169,7 +169,7 @@  discard block
 block discarded – undo
169 169
         $device->save();
170 170
     
171 171
         if (\Request::ajax())
172
-            return response()->json(['success' => 'Device updated successfully']);
172
+            return response()->json([ 'success' => 'Device updated successfully' ]);
173 173
         else
174 174
             return redirect()->route('device.show', $id)
175 175
                 ->with('success', 'Device updated successfully');
@@ -201,7 +201,7 @@  discard block
 block discarded – undo
201 201
         }
202 202
 
203 203
         return redirect()->route('device.index')
204
-            ->with('success','Device deleted successfully');
204
+            ->with('success', 'Device deleted successfully');
205 205
     }
206 206
     
207 207
     /**
@@ -217,6 +217,6 @@  discard block
 block discarded – undo
217 217
         $device->restore();
218 218
         
219 219
         return redirect()->route('device.show', $device->id)
220
-            ->with('success','Device restored successfully');
220
+            ->with('success', 'Device restored successfully');
221 221
     }
222 222
 }
Please login to merge, or discard this patch.
Braces   +38 added lines, -28 removed lines patch added patch discarded remove patch
@@ -116,8 +116,9 @@  discard block
 block discarded – undo
116 116
                 //Create a new site
117 117
                 $site = Site::create(['name' => $request->input('new_site_name')]);
118 118
                 $site_id = $site->id;
119
-            } else
120
-                $site_id = $request->input('site_id');
119
+            } else {
120
+                            $site_id = $request->input('site_id');
121
+            }
121 122
     
122 123
             //Get the location id of the old or newly created location
123 124
             if (!empty($request->input('new_location_name')))
@@ -125,53 +126,63 @@  discard block
 block discarded – undo
125 126
                 //Create a new location
126 127
                 $location = Location::create(['name' => $request->input('new_location_name'), 'site_id' => $site_id]);
127 128
                 $location_id = $location->id;
128
-            } else
129
-                $location_id = $request->input('location_id');
129
+            } else {
130
+                            $location_id = $request->input('location_id');
131
+            }
130 132
     
131 133
             //Update the device
132 134
             $device->location_id = $location_id;
133 135
         }
134 136
         
135 137
         //Update the device
136
-        if ($request->input('name') != null)
137
-            $device->name = $request->input('name');
138
-        if ($request->input('open_time') != null)
139
-            $device->open_time = $request->input('open_time');
140
-        if ($request->input('close_time') != null)
141
-            $device->close_time = $request->input('close_time');
142
-        if ($request->input('update_rate') != null)
143
-            $device->update_rate = $request->input('update_rate');
144
-        if ($request->input('image_rate') != null)
145
-            $device->image_rate = $request->input('image_rate');
146
-        if ($request->input('sensor_rate') != null)
147
-            $device->sensor_rate = $request->input('sensor_rate');
138
+        if ($request->input('name') != null) {
139
+                    $device->name = $request->input('name');
140
+        }
141
+        if ($request->input('open_time') != null) {
142
+                    $device->open_time = $request->input('open_time');
143
+        }
144
+        if ($request->input('close_time') != null) {
145
+                    $device->close_time = $request->input('close_time');
146
+        }
147
+        if ($request->input('update_rate') != null) {
148
+                    $device->update_rate = $request->input('update_rate');
149
+        }
150
+        if ($request->input('image_rate') != null) {
151
+                    $device->image_rate = $request->input('image_rate');
152
+        }
153
+        if ($request->input('sensor_rate') != null) {
154
+                    $device->sensor_rate = $request->input('sensor_rate');
155
+        }
148 156
         //Check if the cover_command needs to be updated
149 157
         if ($request->input('command') != null)
150 158
         {
151 159
             //If device is currently opening, closing or in an error state don't update command
152
-            if (!$device->isReadyForCommand())
153
-                return response()->json("Device is currently in use.", 403);
160
+            if (!$device->isReadyForCommand()) {
161
+                            return response()->json("Device is currently in use.", 403);
162
+            }
154 163
     
155 164
             $command = $request->input('command');
156 165
             
157 166
             //If command is to unlock the device then check if the device should be open or closed based on the schedule
158 167
             if ($request->command === 'unlock')
159 168
             {
160
-                if ($device->isDuringScheduleOpen())
161
-                    $command =  'open';
162
-                else
163
-                    $command =  'close';
169
+                if ($device->isDuringScheduleOpen()) {
170
+                                    $command =  'open';
171
+                } else {
172
+                                    $command =  'close';
173
+                }
164 174
             }
165 175
             $device->cover_command = $command;
166 176
         }
167 177
         
168 178
         $device->save();
169 179
     
170
-        if (\Request::ajax())
171
-            return response()->json(['success' => 'Device updated successfully']);
172
-        else
173
-            return redirect()->route('device.show', $id)
180
+        if (\Request::ajax()) {
181
+                    return response()->json(['success' => 'Device updated successfully']);
182
+        } else {
183
+                    return redirect()->route('device.show', $id)
174 184
                 ->with('success', 'Device updated successfully');
185
+        }
175 186
     }
176 187
 
177 188
     /**
@@ -188,8 +199,7 @@  discard block
 block discarded – undo
188 199
         {
189 200
             //If the device was already deleted then permanently delete it
190 201
             $device->forceDelete($device->id);
191
-        }
192
-        else
202
+        } else
193 203
         {
194 204
             //Remove the location from the device
195 205
             $device->location_id = null;
Please login to merge, or discard this patch.
app/Sensor.php 2 patches
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -69,7 +69,7 @@
 block discarded – undo
69 69
     {
70 70
         return SensorData::whereRaw('id = (SELECT MAX(id)
71 71
                                                     FROM sensor_data
72
-                                                    WHERE sensor_id = ?)', [$this->id])->first() ?? (object)[];
72
+                                                    WHERE sensor_id = ?)', [ $this->id ])->first() ?? (object) [ ];
73 73
     }
74 74
     
75 75
     /**
Please login to merge, or discard this patch.
Braces   +10 added lines, -8 removed lines patch added patch discarded remove patch
@@ -145,10 +145,11 @@  discard block
 block discarded – undo
145 145
      */
146 146
     public function getUpdatedAtHumanAttribute()
147 147
     {
148
-        if ($this->updated_at->diffInDays() > 0)
149
-            return $this->updated_at->setTimezone(Auth::user()->timezone)->format('M d, Y h:i a');
150
-        else
151
-            return $this->updated_at->diffForHumans();
148
+        if ($this->updated_at->diffInDays() > 0) {
149
+                    return $this->updated_at->setTimezone(Auth::user()->timezone)->format('M d, Y h:i a');
150
+        } else {
151
+                    return $this->updated_at->diffForHumans();
152
+        }
152 153
     }
153 154
     
154 155
     /**
@@ -163,9 +164,10 @@  discard block
 block discarded – undo
163 164
      */
164 165
     public function getCreatedAtHumanAttribute()
165 166
     {
166
-        if ($this->created_at->diffInDays() > 0)
167
-            return $this->created_at->setTimezone(Auth::user()->timezone)->format('M d, Y h:i a');
168
-        else
169
-            return $this->created_at->diffForHumans();
167
+        if ($this->created_at->diffInDays() > 0) {
168
+                    return $this->created_at->setTimezone(Auth::user()->timezone)->format('M d, Y h:i a');
169
+        } else {
170
+                    return $this->created_at->diffForHumans();
171
+        }
170 172
     }
171 173
 }
172 174
\ No newline at end of file
Please login to merge, or discard this patch.
app/Device.php 2 patches
Spacing   +8 added lines, -8 removed lines patch added patch discarded remove patch
@@ -29,7 +29,7 @@  discard block
 block discarded – undo
29 29
      *
30 30
      * @var array
31 31
      */
32
-    protected $hidden = ['token'];
32
+    protected $hidden = [ 'token' ];
33 33
     
34 34
     /**
35 35
      * The attributes that are mass assignable.
@@ -48,7 +48,7 @@  discard block
 block discarded – undo
48 48
      *
49 49
      * @var array
50 50
      */
51
-    protected static $ignoreChangedAttributes = ['updated_at', 'last_network_update_at'];
51
+    protected static $ignoreChangedAttributes = [ 'updated_at', 'last_network_update_at' ];
52 52
     
53 53
     /**
54 54
      * The attributes to log in the Activity Log
@@ -89,7 +89,7 @@  discard block
 block discarded – undo
89 89
      */
90 90
     public function getSiteAttribute()
91 91
     {
92
-        return $this->location->site ?? (object)[];
92
+        return $this->location->site ?? (object) [ ];
93 93
     }
94 94
     
95 95
     /**
@@ -119,7 +119,7 @@  discard block
 block discarded – undo
119 119
      */
120 120
     public function getOpenTimeHumanAttribute()
121 121
     {
122
-        $time = new Carbon($this->attributes['open_time'], 'UTC');
122
+        $time = new Carbon($this->attributes[ 'open_time' ], 'UTC');
123 123
         $time = $time->setTimezone(Auth::user()->timezone);
124 124
         
125 125
         return $time->format('h:i a');
@@ -152,7 +152,7 @@  discard block
 block discarded – undo
152 152
      */
153 153
     public function getCloseTimeHumanAttribute()
154 154
     {
155
-        $time = new Carbon($this->attributes['close_time'], 'UTC');
155
+        $time = new Carbon($this->attributes[ 'close_time' ], 'UTC');
156 156
         $time = $time->setTimezone(Auth::user()->timezone);
157 157
         
158 158
         return $time->format('h:i a');
@@ -177,7 +177,7 @@  discard block
 block discarded – undo
177 177
         else
178 178
             $time = new Carbon($value, 'UTC');
179 179
         
180
-        $this->attributes['open_time'] = $time->format('H:i:s');
180
+        $this->attributes[ 'open_time' ] = $time->format('H:i:s');
181 181
     }
182 182
     
183 183
     /**
@@ -199,7 +199,7 @@  discard block
 block discarded – undo
199 199
         else
200 200
             $time = new Carbon($value, 'UTC');
201 201
         
202
-        $this->attributes['close_time'] = $time->format('H:i:s');
202
+        $this->attributes[ 'close_time' ] = $time->format('H:i:s');
203 203
     }
204 204
     
205 205
     /**
@@ -371,7 +371,7 @@  discard block
 block discarded – undo
371 371
         $isClosed = $this->cover_status === 'closed';
372 372
         $isLocked = $this->cover_status === 'locked';
373 373
             
374
-        switch ($this['cover_command'])
374
+        switch ($this[ 'cover_command' ])
375 375
         {
376 376
             case 'open':
377 377
                 if ($isOpen)
Please login to merge, or discard this patch.
Braces   +47 added lines, -38 removed lines patch added patch discarded remove patch
@@ -103,8 +103,9 @@  discard block
 block discarded – undo
103 103
         $time = new Carbon($value, 'UTC');
104 104
         
105 105
         //If the user is logged in then use there preferred timezone
106
-        if (Auth::check())
107
-            $time = $time->setTimezone(Auth::user()->timezone);
106
+        if (Auth::check()) {
107
+                    $time = $time->setTimezone(Auth::user()->timezone);
108
+        }
108 109
 
109 110
         return $time->format('H:i');
110 111
     }
@@ -136,8 +137,9 @@  discard block
 block discarded – undo
136 137
         $time = new Carbon($value, 'UTC');
137 138
     
138 139
         //If the user is logged in then use there preferred timezone
139
-        if (Auth::check())
140
-            $time = $time->setTimezone(Auth::user()->timezone);
140
+        if (Auth::check()) {
141
+                    $time = $time->setTimezone(Auth::user()->timezone);
142
+        }
141 143
         
142 144
         return $time->format('H:i');
143 145
     }
@@ -171,9 +173,9 @@  discard block
 block discarded – undo
171 173
         {
172 174
             $time = new Carbon($value, Auth::user()->timezone);
173 175
             $time = $time->setTimezone('UTC');
176
+        } else {
177
+                    $time = new Carbon($value, 'UTC');
174 178
         }
175
-        else
176
-            $time = new Carbon($value, 'UTC');
177 179
         
178 180
         $this->attributes['open_time'] = $time->format('H:i:s');
179 181
     }
@@ -193,9 +195,9 @@  discard block
 block discarded – undo
193 195
         {
194 196
             $time = new Carbon($value, Auth::user()->timezone);
195 197
             $time = $time->setTimezone('UTC');
198
+        } else {
199
+                    $time = new Carbon($value, 'UTC');
196 200
         }
197
-        else
198
-            $time = new Carbon($value, 'UTC');
199 201
         
200 202
         $this->attributes['close_time'] = $time->format('H:i:s');
201 203
     }
@@ -211,10 +213,11 @@  discard block
 block discarded – undo
211 213
      */
212 214
     public function getLastNetworkUpdateAtHumanAttribute()
213 215
     {
214
-        if ($this->last_network_update_at->diffInDays() > 0)
215
-            return $this->last_network_update_at->setTimezone(Auth::user()->timezone)->format('M d, Y h:i a');
216
-        else
217
-            return $this->last_network_update_at->diffForHumans();
216
+        if ($this->last_network_update_at->diffInDays() > 0) {
217
+                    return $this->last_network_update_at->setTimezone(Auth::user()->timezone)->format('M d, Y h:i a');
218
+        } else {
219
+                    return $this->last_network_update_at->diffForHumans();
220
+        }
218 221
     }
219 222
     
220 223
     /**
@@ -229,10 +232,11 @@  discard block
 block discarded – undo
229 232
      */
230 233
     public function getUpdatedAtHumanAttribute()
231 234
     {
232
-        if ($this->updated_at->diffInDays() > 0)
233
-            return $this->updated_at->setTimezone(Auth::user()->timezone)->format('M d, Y h:i a');
234
-        else
235
-            return $this->updated_at->diffForHumans();
235
+        if ($this->updated_at->diffInDays() > 0) {
236
+                    return $this->updated_at->setTimezone(Auth::user()->timezone)->format('M d, Y h:i a');
237
+        } else {
238
+                    return $this->updated_at->diffForHumans();
239
+        }
236 240
     }
237 241
     
238 242
     /**
@@ -246,10 +250,11 @@  discard block
 block discarded – undo
246 250
      */
247 251
     public function getCreatedAtHumanAttribute()
248 252
     {
249
-        if ($this->created_at->diffInDays() > 0)
250
-            return $this->created_at->setTimezone(Auth::user()->timezone)->format('M d, Y h:i a');
251
-        else
252
-            return $this->created_at->diffForHumans();
253
+        if ($this->created_at->diffInDays() > 0) {
254
+                    return $this->created_at->setTimezone(Auth::user()->timezone)->format('M d, Y h:i a');
255
+        } else {
256
+                    return $this->created_at->diffForHumans();
257
+        }
253 258
     }
254 259
     
255 260
     /**
@@ -360,10 +365,11 @@  discard block
 block discarded – undo
360 365
         $time_now = Carbon::now($timezone);
361 366
     
362 367
         //Check if the current time is during the open schedule or not
363
-        if ($time_now->gt($open_time) && $time_now->lt($close_time))
364
-            return true;
365
-        else
366
-            return false;
368
+        if ($time_now->gt($open_time) && $time_now->lt($close_time)) {
369
+                    return true;
370
+        } else {
371
+                    return false;
372
+        }
367 373
     }
368 374
     
369 375
     /**
@@ -380,20 +386,22 @@  discard block
 block discarded – undo
380 386
         switch ($this['cover_command'])
381 387
         {
382 388
             case 'open':
383
-                if ($isOpen)
384
-                    $status = 'open';
385
-                else if ($isLocked)
386
-                    $status = 'unlocking';
387
-                else
388
-                    $status = 'opening';
389
+                if ($isOpen) {
390
+                                    $status = 'open';
391
+                } else if ($isLocked) {
392
+                                    $status = 'unlocking';
393
+                } else {
394
+                                    $status = 'opening';
395
+                }
389 396
                 break;
390 397
             case 'close':
391
-                if ($isClosed)
392
-                    $status = 'closed';
393
-                else if ($isLocked)
394
-                    $status = 'unlocking';
395
-                else
396
-                    $status = 'closing';
398
+                if ($isClosed) {
399
+                                    $status = 'closed';
400
+                } else if ($isLocked) {
401
+                                    $status = 'unlocking';
402
+                } else {
403
+                                    $status = 'closing';
404
+                }
397 405
                 break;
398 406
             case 'lock':
399 407
                 $status = 'locked';
@@ -402,8 +410,9 @@  discard block
 block discarded – undo
402 410
                 $status = 'error';
403 411
         }
404 412
     
405
-        if ($this->cover_status === 'error')
406
-            $status = 'error';
413
+        if ($this->cover_status === 'error') {
414
+                    $status = 'error';
415
+        }
407 416
         
408 417
         return $status;
409 418
     }
Please login to merge, or discard this patch.