uidaho / smartsettia

app/Http/Controllers/DashboardController.php

Spacing +12 added lines, -12 removed lines

@@ -35,7 +35,7 @@ 
             //Get the first device that doesn't have a null location_id
             $device = Device::publicDashData()->where('location_id', '!=', 'null')->orderBy('id', 'ASC')->first();
         }
-        catch(ModelNotFoundException $e)
+        catch (ModelNotFoundException $e)
         {
             //If no device is found then redirect the user to the home page and display a message about registering a device
             return redirect('home')->with('no_devices', 'To access the dashboard page there must be at least one registered device assigned to a location.');
@@ -48,7 +48,7 @@ 
     
         $data = $this->dashData($site, $location, $device);
         
-        return view('dashboard.index', [ 'active_device' => $data[0], 'devices' => $data[1], 'locations' => $data[2], 'sites' => $data[3] ]);
+        return view('dashboard.index', [ 'active_device' => $data[ 0 ], 'devices' => $data[ 1 ], 'locations' => $data[ 2 ], 'sites' => $data[ 3 ] ]);
     }
     
     /**
@@ -92,7 +92,7 @@ 
                 //Get the first site and if no sites exist throw an error
                 $site = Site::select('id', 'name')->firstOrFail();
             }
-            catch(ModelNotFoundException $e)
+            catch (ModelNotFoundException $e)
             {
                 //If no device is found then redirect the user to the home page and display a message about registering a device
                 return redirect('home')->with('no_devices', 'To access the dashboard page there must be at least one registered device assigned to a location.');
@@ -118,7 +118,7 @@ 
         
         $data = $this->dashData($site, $location, $device);
         
-        return response()->json([ 'active_device' => $data[0], 'devices' => $data[1], 'locations' => $data[2], 'sites' => $data[3] ]);
+        return response()->json([ 'active_device' => $data[ 0 ], 'devices' => $data[ 1 ], 'locations' => $data[ 2 ], 'sites' => $data[ 3 ] ]);
     }
     
     /**
@@ -138,7 +138,7 @@ 
         
         $data = $this->dashData($site, $location, $device);
         
-        return response()->json([ 'active_device' => $data[0], 'devices' => $data[1], 'locations' => $data[2], 'sites' => $data[3] ]);
+        return response()->json([ 'active_device' => $data[ 0 ], 'devices' => $data[ 1 ], 'locations' => $data[ 2 ], 'sites' => $data[ 3 ] ]);
     }
     
     /**
@@ -158,7 +158,7 @@ 
         
         $data = $this->dashData($site, $location, $device);
         
-        return response()->json([ 'active_device' => $data[0], 'devices' => $data[1], 'locations' => $data[2], 'sites' => $data[3] ]);
+        return response()->json([ 'active_device' => $data[ 0 ], 'devices' => $data[ 1 ], 'locations' => $data[ 2 ], 'sites' => $data[ 3 ] ]);
     }
     
     /**
@@ -180,9 +180,9 @@ 
         //Get all the devices that belong to the given location ordered by name
         $devices = $location->devices()->publicDashData()->orderBy('name', 'ASC')->get();
         
-        $active_device = collect([$device, $location, $site]);
+        $active_device = collect([ $device, $location, $site ]);
         
-        return collect([$active_device, $devices, $locations, $sites]);
+        return collect([ $active_device, $devices, $locations, $sites ]);
     }
     
     /**
@@ -203,7 +203,7 @@ 
             return response()->json("Device is currently in use.", 403);
         
         //1 = open, 2 = close, 3 = lock
-        switch($request->command)
+        switch ($request->command)
         {
             case 1:
                 $device->cover_command = 'open';
@@ -239,12 +239,12 @@ 
             
             //Check if the current time is during the open schedule or not
             if (($time_now > $open_time) && ($time_now < $close_time))
-                $command =  'open';
+                $command = 'open';
             else
-                $command =  'close';
+                $command = 'close';
         }
         else
-            $command =  'lock';
+            $command = 'lock';
         
         return $command;
     }

Braces +21 added lines, -17 removed lines

@@ -34,8 +34,7 @@ 
             //Todo use the users preferred device
             //Get the first device that doesn't have a null location_id
             $device = Device::publicDashData()->where('location_id', '!=', 'null')->orderBy('id', 'ASC')->first();
-        }
-        catch(ModelNotFoundException $e)
+        } catch(ModelNotFoundException $e)
         {
             //If no device is found then redirect the user to the home page and display a message about registering a device
             return redirect('home')->with('no_devices', 'To access the dashboard page there must be at least one registered device assigned to a location.');
@@ -85,14 +84,15 @@ 
         //Get the given device if it is still at the same location
         $device = Device::publicDashData()->where('location_id', '=', $request->location_id)->find($request->device_id);
         
-        if (empty($site))                 //Check if the site still exists
+        if (empty($site)) {
+            //Check if the site still exists
         {
             try
             {
                 //Get the first site and if no sites exist throw an error
                 $site = Site::select('id', 'name')->firstOrFail();
-            }
-            catch(ModelNotFoundException $e)
+        }
+            } catch(ModelNotFoundException $e)
             {
                 //If no device is found then redirect the user to the home page and display a message about registering a device
                 return redirect('home')->with('no_devices', 'To access the dashboard page there must be at least one registered device assigned to a location.');
@@ -102,19 +102,21 @@ 
             $location = $site->locations()->select('id', 'name', 'site_id')->firstOrFail();
             //Get the first device from the location
             $device = $location->devices()->publicDashData()->firstOrFail();
-        }
-        else if (empty($location))        //Check if the location still exists
+        } else if (empty($location)) {
+            //Check if the location still exists
         {
             //Get the first location from the given site
             $location = $site->locations()->select('id', 'name', 'site_id')->firstOrFail();
+        }
             //Get the first device from the location
             $device = $location->devices()->publicDashData()->firstOrFail();
-        }
-        else if (empty($device))        //Check if the device still exists at the given location
+        } else if (empty($device)) {
+            //Check if the device still exists at the given location
         {
             //Get the first device from the location
             $device = $location->devices()->publicDashData()->firstOrFail();
         }
+        }
         
         $data = $this->dashData($site, $location, $device);
         
@@ -199,8 +201,9 @@ 
         ])->validate();
         
         //Check that device isn't currently in use or has an error
-        if ($device->cover_status === 'opening' || $device->cover_status === 'closing' || $device->cover_status === 'error')
-            return response()->json("Device is currently in use.", 403);
+        if ($device->cover_status === 'opening' || $device->cover_status === 'closing' || $device->cover_status === 'error') {
+                    return response()->json("Device is currently in use.", 403);
+        }
         
         //1 = open, 2 = close, 3 = lock
         switch($request->command)
@@ -238,13 +241,14 @@ 
             $time_now = Carbon::now(Auth::user()->timezone);
             
             //Check if the current time is during the open schedule or not
-            if (($time_now > $open_time) && ($time_now < $close_time))
-                $command =  'open';
-            else
-                $command =  'close';
+            if (($time_now > $open_time) && ($time_now < $close_time)) {
+                            $command =  'open';
+            } else {
+                            $command =  'close';
+            }
+        } else {
+                    $command =  'lock';
         }
-        else
-            $command =  'lock';
         
         return $command;
     }