uidaho / smartsettia

app/DataTables/UsersDataTable.php

Spacing +1 added lines, -1 removed lines

@@ -16,7 +16,7 @@
     {
         return datatables($query)
             ->editColumn('name', function(User $user) {
-                return '<a href="' . route('user.show', $user->id) . '">'. $user->name . '</a>';
+                return '<a href="'.route('user.show', $user->id).'">'.$user->name.'</a>';
             })
 
             ->editColumn('role', function(User $user) {

app/DataTables/DevicesDataTable.php

Spacing +7 added lines, -7 removed lines

@@ -16,19 +16,19 @@
     public function dataTable($query)
     {
         return datatables($query)
-            ->editColumn('name', function ($device) {
-                return '<a href="' . route('device.show', $device->id) . '">' . $device->name . '</a>';
+            ->editColumn('name', function($device) {
+                return '<a href="'.route('device.show', $device->id).'">'.$device->name.'</a>';
             })
-            ->addColumn('location', function ($device) {
+            ->addColumn('location', function($device) {
                 return ($device->location->name ?? 'null');
             })
-            ->addColumn('site', function ($device) {
+            ->addColumn('site', function($device) {
                 return ($device->location->site->name ?? 'null');
             })
-            ->addColumn('rates', function ($device) {
-                return $device->update_rate . '/' . $device->image_rate .'/' . $device->sensor_rate;
+            ->addColumn('rates', function($device) {
+                return $device->update_rate.'/'.$device->image_rate.'/'.$device->sensor_rate;
             })
-            ->editColumn('updated_at', function ($device) {
+            ->editColumn('updated_at', function($device) {
                 return (is_object($device->updated_at) ? $device->updated_at->diffForHumans() : 'never');
             })
             ->blacklist([ 'location', 'site', 'rates' ])

app/Http/Controllers/UserController.php

Spacing +2 added lines, -2 removed lines

@@ -154,7 +154,7 @@ 
         }
 
         return redirect()->route('user.index')
-            ->with('success','User deleted successfully');
+            ->with('success', 'User deleted successfully');
     }
     
     /**
@@ -170,6 +170,6 @@ 
         $user->restore();
         
         return redirect()->route('user.show', $user->id)
-            ->with('success','User restored successfully');
+            ->with('success', 'User restored successfully');
     }
 }

app/DataTables/LocationDataTable.php

Spacing +5 added lines, -5 removed lines

@@ -15,15 +15,15 @@
     public function dataTable($query)
     {
         return datatables($query)
-            ->editColumn('name', function ($location) {
-                return '<a href="' . route('location.show', $location->id) . '">'. $location->name . '</a>';
+            ->editColumn('name', function($location) {
+                return '<a href="'.route('location.show', $location->id).'">'.$location->name.'</a>';
             })
-            ->editColumn('site_id', function ($location) {
-                return '<a href="' . route('site.show', $location->site_id) . '">'. ($location->site->name ?? '') . '</a>';
+            ->editColumn('site_id', function($location) {
+                return '<a href="'.route('site.show', $location->site_id).'">'.($location->site->name ?? '').'</a>';
             })
             ->addColumn('action', 'location.action')
             ->blacklist([ 'action' ])
-            ->rawColumns(['site_id', 'name', 'action']);
+            ->rawColumns([ 'site_id', 'name', 'action' ]);
     }
     
     /**

app/DataTables/SiteDataTable.php

Spacing +3 added lines, -3 removed lines

@@ -15,12 +15,12 @@
     public function dataTable($query)
     {
         return datatables($query)
-            ->editColumn('name', function ($site) {
-                return '<a href="' . route('site.show', $site->id) . '">'. $site->name . '</a>';
+            ->editColumn('name', function($site) {
+                return '<a href="'.route('site.show', $site->id).'">'.$site->name.'</a>';
             })
             ->addColumn('action', 'site.action')
             ->blacklist([ 'action' ])
-            ->rawColumns(['name', 'action']);
+            ->rawColumns([ 'name', 'action' ]);
     }
     
     /**

app/Http/Controllers/LocationController.php

Spacing +5 added lines, -5 removed lines

@@ -52,13 +52,13 @@ 
         if (!empty($request->input('new_site_name')))
         {
             //Create a new site
-            $site = Site::create(['name' => $request->input('new_site_name')]);
+            $site = Site::create([ 'name' => $request->input('new_site_name') ]);
             $site_id = $site->id;
         }
         else
             $site_id = $request->input('site');
     
-        $location = Location::create(['name' => $request->input('name'), 'site_id' => $site_id]);
+        $location = Location::create([ 'name' => $request->input('name'), 'site_id' => $site_id ]);
     
         return redirect()->route('location.show', $location->id)
             ->with('success', 'Location created successfully');
@@ -105,14 +105,14 @@ 
         if (!empty($request->input('new_site_name')))
         {
             //Create a new site
-            $site = Site::create(['name' => $request->input('new_site_name')]);
+            $site = Site::create([ 'name' => $request->input('new_site_name') ]);
             $site_id = $site->id;
         }
         else
             $site_id = $request->input('site');
         
         //Update the location with the supplied name and the site
-        Location::findOrFail($id)->update(['name' => $request->input('name'), 'site_id' => $site_id]);
+        Location::findOrFail($id)->update([ 'name' => $request->input('name'), 'site_id' => $site_id ]);
         
         return redirect()->route('location.show', $id)
             ->with('success', 'Location updated successfully');
@@ -128,6 +128,6 @@ 
     {
         Location::findOrFail($id)->delete();
         return redirect()->route('location.index')
-            ->with('success','Location deleted successfully');
+            ->with('success', 'Location deleted successfully');
     }
 }

app/User.php

Spacing +1 added lines, -1 removed lines

@@ -143,7 +143,7 @@
     public function roleString()
     {
         $role_en = array(0 => "Registered", 1 => "User", 2 => "Manager", 3 => "Admin");
-        return $role_en[ $this->role ] . ' (' . $this->role . ')';
+        return $role_en[ $this->role ].' ('.$this->role.')';
     }
     
     /**

app/Http/Controllers/DashboardController.php

Spacing +10 added lines, -10 removed lines

@@ -44,7 +44,7 @@ 
             
             //If the location exists then set the pagination page to be where the device is located
             if ($location != null)
-                $request->merge(['page' => $device->dashPageNum(4)]);
+                $request->merge([ 'page' => $device->dashPageNum(4) ]);
             $site_id = $location->site_id ?? 0;
             $location_id = $location->id ?? 0;
             $device_id = $device->id ?? 0;
@@ -64,14 +64,14 @@ 
             ->get();
         //Get all locations for the selected site with the selected location first
         $locations = Location::select('id', 'name', 'site_id')
-            ->where('site_id', '=', $sites[0]->id ?? 0)
+            ->where('site_id', '=', $sites[ 0 ]->id ?? 0)
             ->orderByRaw("id = ? DESC", $location_id)
             ->orderBy('name', 'ASC')
             ->get();
         //Get all devices for the selected location
         $devices = Device::publicDashData()
             ->leftJoin('deviceimages as image', 'devices.id', '=', 'image.device_id')
-            ->where('location_id', '=', $locations[0]->id ?? 0)
+            ->where('location_id', '=', $locations[ 0 ]->id ?? 0)
             ->orderBy('name', 'ASC')
             ->paginate(4);
     
@@ -84,33 +84,33 @@ 
             //If the original device with the given device id was not found
             //Then assign the the first device in the device list as the active device
             if ($active_device == null)
-                $active_device = $devices[0];
+                $active_device = $devices[ 0 ];
         
             //Add an attribute to each device defining if it is stale
-            $devices->transform(function ($item)
+            $devices->transform(function($item)
             {
                 //Mark the device as stale if the device has missed three updates plus a minute
                 $deviceStaleMins = ceil(($item->update_rate * 3) / 60) + 1;
-                $item['isDeviceStale'] = ($item->last_network_update_at <= Carbon::now()->subMinute($deviceStaleMins)) ? true : false;
+                $item[ 'isDeviceStale' ] = ($item->last_network_update_at <= Carbon::now()->subMinute($deviceStaleMins)) ? true : false;
     
                 //Mark the device image as stale if the device has missed three image updates plus a minute
                 if ($item->image_updated_at != null)
                 {
                     $imageStaleMins = ceil(($item->image_rate * 3) / 60) + 1;
-                    $item['isImageStale'] = ($item->image_updated_at <= Carbon::now()->subMinute($imageStaleMins)) ? true : false;
+                    $item[ 'isImageStale' ] = ($item->image_updated_at <= Carbon::now()->subMinute($imageStaleMins)) ? true : false;
                 }
                 else
-                    $item['isImageStale'] = false;
+                    $item[ 'isImageStale' ] = false;
                 
                 return $item;
             });
         }
     
         //Store the active site, location, and device in a collection
-        $active_data = collect(['device' => $active_device, 'location' => $locations[0] ?? null, 'site' => $sites[0] ?? null]);
+        $active_data = collect([ 'device' => $active_device, 'location' => $locations[ 0 ] ?? null, 'site' => $sites[ 0 ] ?? null ]);
     
         //Use the device_list.blade.php to generate the device table html
-        $html_device_table = view('dashboard.device_list', ['devices' => $devices, 'active_data' => $active_data])->render();
+        $html_device_table = view('dashboard.device_list', [ 'devices' => $devices, 'active_data' => $active_data ])->render();
         
         if (\Request::ajax())
             return response()->json([ 'active_data' => $active_data, 'devices' => $devices, 'locations' => $locations,

app/Http/Controllers/DeviceController.php

Spacing +10 added lines, -10 removed lines

@@ -55,10 +55,10 @@ 
     {
         $device = Device::findOrFail($id);
         
-        $charts = [];
+        $charts = [ ];
         foreach ($device->sensors as $sensor) {
             $data = $sensor->last_month_daily_avg_data;
-            $charts[$sensor->id] = Charts::create('line', 'highcharts')
+            $charts[ $sensor->id ] = Charts::create('line', 'highcharts')
                 ->title($sensor->name)
                 ->elementLabel($sensor->type)
                 ->labels($data->pluck('date'))
@@ -90,7 +90,7 @@ 
         $sites = Site::select('id', 'name')->orderByRaw("id = ? DESC", $site_id)
             ->orderBy('name', 'ASC')->get();
         //Get all locations for the selected site with the selected location first
-        $locations = Location::select('id', 'name')->where('site_id', '=', $sites[0]->id ?? 0)
+        $locations = Location::select('id', 'name')->where('site_id', '=', $sites[ 0 ]->id ?? 0)
             ->orderByRaw("id = ? DESC", $location_id)->orderBy('name', 'ASC')->get();
         
         return view('device.edit', [ 'device' => $device, 'locations' => $locations, 'sites' => $sites ]);
@@ -116,7 +116,7 @@ 
             if (!empty($request->input('new_site_name')))
             {
                 //Create a new site
-                $site = Site::create(['name' => $request->input('new_site_name')]);
+                $site = Site::create([ 'name' => $request->input('new_site_name') ]);
                 $site_id = $site->id;
             } else
                 $site_id = $request->input('site_id');
@@ -125,7 +125,7 @@ 
             if (!empty($request->input('new_location_name')))
             {
                 //Create a new location
-                $location = Location::create(['name' => $request->input('new_location_name'), 'site_id' => $site_id]);
+                $location = Location::create([ 'name' => $request->input('new_location_name'), 'site_id' => $site_id ]);
                 $location_id = $location->id;
             } else
                 $location_id = $request->input('location_id');
@@ -159,9 +159,9 @@ 
             if ($request->command === 'unlock')
             {
                 if ($device->isDuringScheduleOpen())
-                    $command =  'open';
+                    $command = 'open';
                 else
-                    $command =  'close';
+                    $command = 'close';
             }
             $device->cover_command = $command;
         }
@@ -169,7 +169,7 @@ 
         $device->save();
     
         if (\Request::ajax())
-            return response()->json(['success' => 'Device updated successfully']);
+            return response()->json([ 'success' => 'Device updated successfully' ]);
         else
             return redirect()->route('device.show', $id)
                 ->with('success', 'Device updated successfully');
@@ -201,7 +201,7 @@ 
         }
 
         return redirect()->route('device.index')
-            ->with('success','Device deleted successfully');
+            ->with('success', 'Device deleted successfully');
     }
     
     /**
@@ -217,6 +217,6 @@ 
         $device->restore();
         
         return redirect()->route('device.show', $device->id)
-            ->with('success','Device restored successfully');
+            ->with('success', 'Device restored successfully');
     }
 }