uidaho / smartsettia

app/Http/Controllers/SiteController.php

Doc Comments +4 added lines, -4 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)
     {
@@ -118,7 +118,7 @@ 
      * Get the locations belonging to the given site
      *
      * @param  Site $site
-     * @return Illuminate\Database\Eloquent\Builder[]|\Illuminate\Database\Eloquent\Collection
+     * @return \Illuminate\Http\JsonResponse
      */
     public function locations(Site $site)
     {

Spacing +3 added lines, -3 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');
@@ -95,7 +95,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');
@@ -111,7 +111,7 @@ 
     {
         Site::findOrFail($id)->delete();
         return redirect()->route('site.index')
-            ->with('success','Site deleted successfully');
+            ->with('success', 'Site deleted successfully');
     }
     
     /**

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/Http/Controllers/DeviceController.php

Spacing +8 added lines, -8 removed lines

@@ -77,7 +77,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 ]);
@@ -98,7 +98,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
@@ -108,7 +108,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
@@ -135,9 +135,9 @@ 
             if ($request->command === 'unlock')
             {
                 if ($device->isDuringScheduleOpen())
-                    $command =  'open';
+                    $command = 'open';
                 else
-                    $command =  'close';
+                    $command = 'close';
             }
             $device->cover_command = $command;
         }
@@ -145,7 +145,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');
@@ -177,7 +177,7 @@ 
         }
 
         return redirect()->route('device.index')
-            ->with('success','Device deleted successfully');
+            ->with('success', 'Device deleted successfully');
     }
     
     /**
@@ -193,6 +193,6 @@ 
         $device->restore();
         
         return redirect()->route('device.show', $device->id)
-            ->with('success','Device restored successfully');
+            ->with('success', 'Device restored successfully');
     }
 }

Braces +18 added lines, -16 removed lines

@@ -100,9 +100,9 @@ 
             //Create a new site
             $site = Site::create(['name' => $request->input('new_site_name')]);
             $site_id = $site->id;
+        } else {
+                    $site_id = $request->input('site_id');
         }
-        else
-            $site_id = $request->input('site_id');
         
         //Get the location id of the old or newly created location
         if (!empty($request->input('new_location_name')))
@@ -110,9 +110,9 @@ 
             //Create a new location
             $location = Location::create(['name' => $request->input('new_location_name'), 'site_id' => $site_id]);
             $location_id = $location->id;
+        } else {
+                    $location_id = $request->input('location_id');
         }
-        else
-            $location_id = $request->input('location_id');
         
         //Update the device
         $device->location_id = $location_id;
@@ -126,29 +126,32 @@ 
         if ($request->input('command') != null)
         {
             //If device is currently opening, closing or in an error state don't update command
-            if (!$device->isReadyForCommand())
-                return response()->json("Device is currently in use.", 403);
+            if (!$device->isReadyForCommand()) {
+                            return response()->json("Device is currently in use.", 403);
+            }
     
             $command = $request->input('command');
             
             //If command is to unlock the device then check if the device should be open or closed based on the schedule
             if ($request->command === 'unlock')
             {
-                if ($device->isDuringScheduleOpen())
-                    $command =  'open';
-                else
-                    $command =  'close';
+                if ($device->isDuringScheduleOpen()) {
+                                    $command =  'open';
+                } else {
+                                    $command =  'close';
+                }
             }
             $device->cover_command = $command;
         }
         
         $device->save();
     
-        if (\Request::ajax())
-            return response()->json(['success' => 'Device updated successfully']);
-        else
-            return redirect()->route('device.show', $id)
+        if (\Request::ajax()) {
+                    return response()->json(['success' => 'Device updated successfully']);
+        } else {
+                    return redirect()->route('device.show', $id)
                 ->with('success', 'Device updated successfully');
+        }
     }
 
     /**
@@ -165,8 +168,7 @@ 
         {
             //If the device was already deleted then permanently delete it
             $device->forceDelete($device->id);
-        }
-        else
+        } else
         {
             //Remove the location from the device
             $device->location_id = null;

app/Http/Controllers/DashboardController.php

Spacing +11 added lines, -11 removed lines

@@ -41,13 +41,13 @@ 
             ->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()
-            ->where('location_id', '=', $locations[0]->id ?? 0)
+            ->where('location_id', '=', $locations[ 0 ]->id ?? 0)
             ->orderBy('name', 'ASC')
             ->limit(1)
             ->get();
@@ -56,10 +56,10 @@ 
         $active_device = $devices->where('id', '=', $device_id)->first();
         //Set the active device to the first device in $devices if it is not empty and the original active device wasn't found
         if (!$devices->isEmpty() && $active_device == null)
-            $active_device = $devices[0];
+            $active_device = $devices[ 0 ];
     
         //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 ]);
         
         return view('dashboard.index', [ 'active_data' => $active_data, 'devices' => $devices,
             'locations' => $locations, 'sites' => $sites ]);
@@ -102,37 +102,37 @@ 
             ->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()
-            ->where('location_id', '=', $locations[0]->id ?? 0)
+            ->where('location_id', '=', $locations[ 0 ]->id ?? 0)
             ->orderBy('name', 'ASC')
             ->limit($limit)
             ->offset($offset * $limit)
             ->get();
         //Get the total device count for the given location
-        $deviceCount = Device::where('location_id', '=', $locations[0]->id ?? 0)->count();
+        $deviceCount = Device::where('location_id', '=', $locations[ 0 ]->id ?? 0)->count();
     
         //Get the active device
         $active_device = $devices->where('id', $device_id)->first();
         //Set the active device to the first device in $devices if it is not empty and the original active device wasn't found
         if (!$devices->isEmpty() && $active_device == null)
-            $active_device = $devices[0];
+            $active_device = $devices[ 0 ];
         
         //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 ]);
         
         //Get the total amount of pages for pagination
         $page_count = ceil($deviceCount / $limit) - 1;
         
         //Store pagination data
-        $pag_data = collect(['offset' => $offset, 'page_count' => $page_count]);
+        $pag_data = collect([ 'offset' => $offset, 'page_count' => $page_count ]);
         
         return response()->json([ 'active_data' => $active_data, 'devices' => $devices, 'locations' => $locations,
-            'sites' => $sites, 'pag_data' => $pag_data]);
+            'sites' => $sites, 'pag_data' => $pag_data ]);
     }
     
     /**

Braces +6 added lines, -4 removed lines

@@ -55,8 +55,9 @@ 
         //Get the active device
         $active_device = $devices->where('id', '=', $device_id)->first();
         //Set the active device to the first device in $devices if it is not empty and the original active device wasn't found
-        if (!$devices->isEmpty() && $active_device == null)
-            $active_device = $devices[0];
+        if (!$devices->isEmpty() && $active_device == null) {
+                    $active_device = $devices[0];
+        }
     
         //Store the active site, location, and device in a collection
         $active_data = collect([ 'device' => $active_device, 'location' => $locations[0] ?? null, 'site' => $sites[0] ?? null ]);
@@ -119,8 +120,9 @@ 
         //Get the active device
         $active_device = $devices->where('id', $device_id)->first();
         //Set the active device to the first device in $devices if it is not empty and the original active device wasn't found
-        if (!$devices->isEmpty() && $active_device == null)
-            $active_device = $devices[0];
+        if (!$devices->isEmpty() && $active_device == null) {
+                    $active_device = $devices[0];
+        }
         
         //Store the active site, location, and device in a collection
         $active_data = collect(['device' => $active_device, 'location' => $locations[0] ?? null, 'site' => $sites[0] ?? null]);

app/Device.php

Braces +16 added lines, -12 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');
     }
@@ -267,8 +269,9 @@ 
     {
         $isReady = false;
         
-        if ($this->cover_status == 'open' || $this->cover_status == 'closed' || $this->cover_status == 'locked')
-            $isReady = true;
+        if ($this->cover_status == 'open' || $this->cover_status == 'closed' || $this->cover_status == 'locked') {
+                    $isReady = true;
+        }
         
         return $isReady;
     }
@@ -289,8 +292,9 @@ 
         $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))
-            $isOpenHours = true;
+        if ($time_now->gt($open_time) && $time_now->lt($close_time)) {
+                    $isOpenHours = true;
+        }
         
         return $isOpenHours;
     }