uidaho / smartsettia

app/Http/Controllers/SiteController.php

Doc Comments +3 added lines, -3 removed lines

@@ -41,7 +41,7 @@ 
      * Store a newly created resource in storage.
      *
      * @param  \Illuminate\Http\Request  $request
-     * @return \Illuminate\Http\Response
+     * @return \Illuminate\Http\RedirectResponse
      */
     public function store(Request $request)
     {
@@ -87,7 +87,7 @@ 
      *
      * @param  \Illuminate\Http\Request  $request
      * @param  Site  $site
-     * @return \Illuminate\Http\Response
+     * @return \Illuminate\Http\RedirectResponse
      */
     public function update(Request $request, Site $site)
     {
@@ -105,7 +105,7 @@ 
      * Remove the specified resource from storage.
      *
      * @param  int  $id
-     * @return \Illuminate\Http\Response
+     * @return \Illuminate\Http\RedirectResponse
      */
     public function destroy($id)
     {

Spacing +4 added lines, -4 removed lines

@@ -49,7 +49,7 @@ 
             'name' => 'required|min:2|max:75|regex:#(^[a-zA-Z0-9])([\w ]*)(\w$)#|unique:sites,name',
         ]);
         
-        $site = Site::create(['name' => $request->name]);
+        $site = Site::create([ 'name' => $request->name ]);
         
         return redirect()->route('site.show', $site->id)
             ->with('success', 'Site created successfully');
@@ -67,7 +67,7 @@ 
         $locations = $site->locations()->orderBy('name', 'ASC')->paginate(15);
     
         if (\Request::ajax())
-            return response()->json(['site' => $site, 'locations' => $locations]);
+            return response()->json([ 'site' => $site, 'locations' => $locations ]);
         else
             return view('site.show', [ 'site' => $site, 'locations' => $locations ]);
     }
@@ -98,7 +98,7 @@ 
             'name' => 'required|min:2|max:75|regex:#(^[a-zA-Z0-9])([\w ]*)(\w$)#|unique:sites,name,'.$site->id,
         ]);
         
-        $site->update(['name' => $request->name]);
+        $site->update([ 'name' => $request->name ]);
         
         return redirect()->route('site.show', $site->id)
             ->with('success', 'Site updated successfully');
@@ -114,6 +114,6 @@ 
     {
         Site::findOrFail($id)->delete();
         return redirect()->route('site.index')
-            ->with('success','Site deleted successfully');
+            ->with('success', 'Site deleted successfully');
     }
 }

Braces +5 added lines, -4 removed lines

@@ -66,10 +66,11 @@
         $site = Site::findOrFail($id);
         $locations = $site->locations()->orderBy('name', 'ASC')->paginate(15);
     
-        if (\Request::ajax())
-            return response()->json(['site' => $site, 'locations' => $locations]);
-        else
-            return view('site.show', [ 'site' => $site, 'locations' => $locations ]);
+        if (\Request::ajax()) {
+                    return response()->json(['site' => $site, 'locations' => $locations]);
+        } else {
+                    return view('site.show', [ 'site' => $site, 'locations' => $locations ]);
+        }
     }
     
     /**

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/Requests/EditLocation.php

Spacing +2 added lines, -2 removed lines

@@ -38,11 +38,11 @@
     {
         $validator = parent::getValidatorInstance();
         
-        $validator->sometimes('site', 'required|integer|digits_between:1,10|exists:sites,id', function ($input) {
+        $validator->sometimes('site', 'required|integer|digits_between:1,10|exists:sites,id', function($input) {
             return !$input->new_site_name;
         });
         
-        $validator->sometimes('new_site_name', 'bail|required|min:2|max:75|regex:#(^[a-zA-Z0-9])([\w ]*)(\w$)#|unique:sites,name', function ($input) {
+        $validator->sometimes('new_site_name', 'bail|required|min:2|max:75|regex:#(^[a-zA-Z0-9])([\w ]*)(\w$)#|unique:sites,name', function($input) {
             return !$input->site;
         });
         

app/Http/Requests/EditDevice.php

Unused Use Statements -1 removed lines

@@ -3,7 +3,6 @@
 namespace App\Http\Requests;
 
 use Illuminate\Foundation\Http\FormRequest;
-use App\Http\Requests\Request;
 use Illuminate\Support\Facades\Auth;
 
 class EditDevice extends FormRequest

Spacing +4 added lines, -4 removed lines

@@ -46,19 +46,19 @@
     {
         $validator = parent::getValidatorInstance();
     
-        $validator->sometimes('site_id', 'bail|required|integer|digits_between:1,10|exists:sites,id', function ($input) {
+        $validator->sometimes('site_id', 'bail|required|integer|digits_between:1,10|exists:sites,id', function($input) {
             return !$input->new_site_name && $input->site_id;
         });
     
-        $validator->sometimes('location_id', 'bail|required|integer|digits_between:1,10|exists:locations,id', function ($input) {
+        $validator->sometimes('location_id', 'bail|required|integer|digits_between:1,10|exists:locations,id', function($input) {
             return !$input->new_location_name && $input->location_id;
         });
     
-        $validator->sometimes('new_site_name', 'bail|required|string|max:75|unique:sites,name', function ($input) {
+        $validator->sometimes('new_site_name', 'bail|required|string|max:75|unique:sites,name', function($input) {
             return !$input->site_id;
         });
     
-        $validator->sometimes('new_location_name', 'bail|required|string|max:75|unique:locations,name', function ($input) {
+        $validator->sometimes('new_location_name', 'bail|required|string|max:75|unique:locations,name', function($input) {
             return !$input->location_id;
         });
         

app/Device.php

Doc Comments +1 added lines, -1 removed lines

@@ -330,7 +330,7 @@
      * Get the page number of the device for the dashboard device table pagination
      *
      * @param int $limit
-     * @return int
+     * @return double
      */
     public function dashPageNum($limit)
     {

Spacing +6 added lines, -6 removed lines

@@ -31,7 +31,7 @@ 
      *
      * @var array
      */
-    protected $hidden = ['token'];
+    protected $hidden = [ 'token' ];
     
     /**
      * The attributes that are mass assignable.
@@ -50,7 +50,7 @@ 
      *
      * @var array
      */
-    protected static $ignoreChangedAttributes = ['updated_at'];
+    protected static $ignoreChangedAttributes = [ 'updated_at' ];
     
     /**
      * The attributes to log in the Activity Log
@@ -91,7 +91,7 @@ 
      */
     public function getSiteAttribute()
     {
-        return $this->location->site ?? (object)[];
+        return $this->location->site ?? (object) [ ];
     }
     
     /**
@@ -151,7 +151,7 @@ 
         else
             $time = new Carbon($value, 'UTC');
         
-        $this->attributes['open_time'] = $time->format('H:i:s');
+        $this->attributes[ 'open_time' ] = $time->format('H:i:s');
     }
     
     /**
@@ -173,7 +173,7 @@ 
         else
             $time = new Carbon($value, 'UTC');
         
-        $this->attributes['close_time'] = $time->format('H:i:s');
+        $this->attributes[ 'close_time' ] = $time->format('H:i:s');
     }
     
     /**
@@ -299,7 +299,7 @@ 
         $isOpen = $this->cover_status === 'open';
         $isClosed = $this->cover_status === 'closed';
             
-        switch ($this['cover_command'])
+        switch ($this[ 'cover_command' ])
         {
             case 'open':
                 if ($isOpen)

Braces +28 added lines, -22 removed lines

@@ -107,8 +107,9 @@ 
         $time = new Carbon($value, 'UTC');
         
         //If the user is logged in then use there preferred timezone
-        if (Auth::check())
-            $time = $time->setTimezone(Auth::user()->timezone);
+        if (Auth::check()) {
+                    $time = $time->setTimezone(Auth::user()->timezone);
+        }
 
         return $time->format('H:i');
     }
@@ -126,8 +127,9 @@ 
         $time = new Carbon($value, 'UTC');
     
         //If the user is logged in then use there preferred timezone
-        if (Auth::check())
-            $time = $time->setTimezone(Auth::user()->timezone);
+        if (Auth::check()) {
+                    $time = $time->setTimezone(Auth::user()->timezone);
+        }
         
         return $time->format('H:i');
     }
@@ -147,9 +149,9 @@ 
         {
             $time = new Carbon($value, Auth::user()->timezone);
             $time = $time->setTimezone('UTC');
+        } else {
+                    $time = new Carbon($value, 'UTC');
         }
-        else
-            $time = new Carbon($value, 'UTC');
         
         $this->attributes['open_time'] = $time->format('H:i:s');
     }
@@ -169,9 +171,9 @@ 
         {
             $time = new Carbon($value, Auth::user()->timezone);
             $time = $time->setTimezone('UTC');
+        } else {
+                    $time = new Carbon($value, 'UTC');
         }
-        else
-            $time = new Carbon($value, 'UTC');
         
         $this->attributes['close_time'] = $time->format('H:i:s');
     }
@@ -282,10 +284,11 @@ 
         $time_now = Carbon::now($timezone);
     
         //Check if the current time is during the open schedule or not
-        if ($time_now->gt($open_time) && $time_now->lt($close_time))
-            return true;
-        else
-            return false;
+        if ($time_now->gt($open_time) && $time_now->lt($close_time)) {
+                    return true;
+        } else {
+                    return false;
+        }
     }
     
     /**
@@ -302,16 +305,18 @@ 
         switch ($this['cover_command'])
         {
             case 'open':
-                if ($isOpen)
-                    $status = 'open';
-                else
-                    $status = 'opening';
+                if ($isOpen) {
+                                    $status = 'open';
+                } else {
+                                    $status = 'opening';
+                }
                 break;
             case 'close':
-                if ($isClosed)
-                    $status = 'closed';
-                else
-                    $status = 'closing';
+                if ($isClosed) {
+                                    $status = 'closed';
+                } else {
+                                    $status = 'closing';
+                }
                 break;
             case 'lock':
                 $status = 'locked';
@@ -320,8 +325,9 @@ 
                 $status = 'error';
         }
     
-        if ($this->cover_status === 'error')
-            $status = 'error';
+        if ($this->cover_status === 'error') {
+                    $status = 'error';
+        }
         
         return $status;
     }

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

Unused Use Statements -1 removed lines

@@ -4,7 +4,6 @@
 
 use Illuminate\Support\Facades\Auth;
 use Illuminate\Http\Request;
-use Validator;
 use App\Device;
 use App\Site;
 use App\Location;

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,

Braces +14 added lines, -12 removed lines

@@ -43,13 +43,13 @@ 
             $location = $device->location ?? null;
             
             //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)]);
+            if ($location != null) {
+                            $request->merge(['page' => $device->dashPageNum(4)]);
+            }
             $site_id = $location->site_id ?? 0;
             $location_id = $location->id ?? 0;
             $device_id = $device->id ?? 0;
-        }
-        else
+        } else
         {
             //Get the active site, location, and device ids
             $site_id = $request->site_id ?? 0;
@@ -83,8 +83,9 @@ 
         {
             //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];
+            if ($active_device == null) {
+                            $active_device = $devices[0];
+            }
         
             //Add an attribute to each device defining if it is stale
             $devices->transform(function ($item)
@@ -98,9 +99,9 @@ 
                 {
                     $imageStaleMins = ceil(($item->image_rate * 3) / 60) + 1;
                     $item['isImageStale'] = ($item->image_updated_at <= Carbon::now()->subMinute($imageStaleMins)) ? true : false;
+                } else {
+                                    $item['isImageStale'] = false;
                 }
-                else
-                    $item['isImageStale'] = false;
                 
                 return $item;
             });
@@ -112,12 +113,13 @@ 
         //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();
         
-        if (\Request::ajax())
-            return response()->json([ 'active_data' => $active_data, 'devices' => $devices, 'locations' => $locations,
+        if (\Request::ajax()) {
+                    return response()->json([ 'active_data' => $active_data, 'devices' => $devices, 'locations' => $locations,
                 'sites' => $sites, 'html_device_table' => $html_device_table ]);
-        else
-            return view('dashboard.index', [ 'active_data' => $active_data, 'devices' => $devices,
+        } else {
+                    return view('dashboard.index', [ 'active_data' => $active_data, 'devices' => $devices,
                 'locations' => $locations, 'sites' => $sites ]);
+        }
     }
     
     /**