uidaho / smartsettia

app/Http/Controllers/SensorController.php

Indentation +41 added lines, -41 removed lines

@@ -10,42 +10,42 @@ 
 class SensorController extends Controller 
 {
     /**
-    * Create a new controller instance.
-    *
-    * @return void
-    */
+     * Create a new controller instance.
+     *
+     * @return void
+     */
     public function __construct()
     {
         $this->middleware('auth');
     }
 
     /**
-    * Display a listing of the resource.
-    *
-    * @param  SensorDataTable   $dataTable
-    * @return Response
-    */
+     * Display a listing of the resource.
+     *
+     * @param  SensorDataTable   $dataTable
+     * @return Response
+     */
     public function index(SensorDataTable $dataTable)
     {
         return $dataTable->render('sensor.index');
     }
 
     /**
-    * Show the form for creating a new resource.
-    *
-    * @return Response
-    */
+     * Show the form for creating a new resource.
+     *
+     * @return Response
+     */
     public function create()
     {
         return view('sensor.create');
     }
 
     /**
-    * Store a newly created resource in storage.
-    *
-    * @param Request $request
-    * @return Response
-    */
+     * Store a newly created resource in storage.
+     *
+     * @param Request $request
+     * @return Response
+     */
     public function store(Request $request)
     {
         request()->validate([
@@ -61,12 +61,12 @@ 
     }
 
     /**
-    * Display the specified resource.
-    *
-    * @param  Request  $request
-    * @param  int  $id
-    * @return Response
-    */
+     * Display the specified resource.
+     *
+     * @param  Request  $request
+     * @param  int  $id
+     * @return Response
+     */
     public function show(Request $request, $id)
     {
         $sensor = Sensor::findOrFail($id);
@@ -75,12 +75,12 @@ 
     }
 
     /**
-    * Show the form for editing the specified resource.
-    *
-    * @param  Request  $request
-    * @param  int  $id
-    * @return Response
-    */
+     * Show the form for editing the specified resource.
+     *
+     * @param  Request  $request
+     * @param  int  $id
+     * @return Response
+     */
     public function edit(Request $request, $id)
     {
         $sensor = Sensor::findOrFail($id);
@@ -89,12 +89,12 @@ 
     }
 
     /**
-    * Update the specified resource in storage.
-    *
-    * @param  Request  $request
-    * @param  int  $id
-    * @return Response
-    */
+     * Update the specified resource in storage.
+     *
+     * @param  Request  $request
+     * @param  int  $id
+     * @return Response
+     */
     public function update(Request $request, $id)
     {
         request()->validate([
@@ -108,11 +108,11 @@ 
     }
 
     /**
-    * Remove the specified resource from storage.
-    *
-    * @param  int  $id
-    * @return Response
-    */
+     * Remove the specified resource from storage.
+     *
+     * @param  int  $id
+     * @return Response
+     */
     public function destroy($id)
     {
         Sensor::findOrFail($id)->delete();

app/Http/Controllers/SensorDataController.php

Indentation +39 added lines, -39 removed lines

@@ -9,42 +9,42 @@ 
 class SensorDataController extends Controller 
 {
     /**
-    * Create a new controller instance.
-    *
-    * @return void
-    */
+     * Create a new controller instance.
+     *
+     * @return void
+     */
     public function __construct()
     {
         $this->middleware('auth');
     }
 
     /**
-    * Display a listing of the resource.
-    *
-    * @param SensorDataDataTable $dataTable
-    * @return Response
-    */
+     * Display a listing of the resource.
+     *
+     * @param SensorDataDataTable $dataTable
+     * @return Response
+     */
     public function index(SensorDataDataTable $dataTable)
     {
         return $dataTable->render('sensordata.index');
     }
 
     /**
-    * Show the form for creating a new resource.
-    *
-    * @return Response
-    */
+     * Show the form for creating a new resource.
+     *
+     * @return Response
+     */
     public function create()
     {
         return view('sensordata.create');
     }
 
     /**
-    * Store a newly created resource in storage.
-    *
-    * @param Request $request
-    * @return Response
-    */
+     * Store a newly created resource in storage.
+     *
+     * @param Request $request
+     * @return Response
+     */
     public function store(Request $request)
     {
         request()->validate([
@@ -59,12 +59,12 @@ 
     }
 
     /**
-    * Display the specified resource.
-    *
-    * @param  Request  $request
-    * @param  int  $id
-    * @return Response
-    */
+     * Display the specified resource.
+     *
+     * @param  Request  $request
+     * @param  int  $id
+     * @return Response
+     */
     public function show(Request $request, $id)
     {
         $sensordata = SensorData::findOrFail($id);
@@ -73,11 +73,11 @@ 
     }
 
     /**
-    * Show the form for editing the specified resource.
-    *
-    * @param  int  $id
-    * @return Response
-    */
+     * Show the form for editing the specified resource.
+     *
+     * @param  int  $id
+     * @return Response
+     */
     public function edit(Request $request, $id)
     {
         $sensordata = SensorData::findOrFail($id);
@@ -86,11 +86,11 @@ 
     }
 
     /**
-    * Update the specified resource in storage.
-    *
-    * @param  int  $id
-    * @return Response
-    */
+     * Update the specified resource in storage.
+     *
+     * @param  int  $id
+     * @return Response
+     */
     public function update($id)
     {
         request()->validate([
@@ -103,11 +103,11 @@ 
     }
 
     /**
-    * Remove the specified resource from storage.
-    *
-    * @param  int  $id
-    * @return Response
-    */
+     * Remove the specified resource from storage.
+     *
+     * @param  int  $id
+     * @return Response
+     */
     public function destroy($id)
     {
         SensorData::find($id)->delete();

app/Http/Controllers/LocationController.php

Braces +4 added lines, -4 removed lines

@@ -54,9 +54,9 @@ 
             //Create a new site
             $site = Site::create(['name' => $request->input('new_site_name')]);
             $site_id = $site->id;
+        } else {
+                    $site_id = $request->input('site');
         }
-        else
-            $site_id = $request->input('site');
     
         $location = Location::create(['name' => $request->input('name'), 'site_id' => $site_id]);
     
@@ -107,9 +107,9 @@ 
             //Create a new site
             $site = Site::create(['name' => $request->input('new_site_name')]);
             $site_id = $site->id;
+        } else {
+                    $site_id = $request->input('site');
         }
-        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]);

app/Http/Controllers/DeviceController.php

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/SiteController.php

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/Device.php

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

Braces +12 added lines, -10 removed lines

@@ -45,13 +45,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;
@@ -79,8 +79,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]);
@@ -88,12 +89,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 ]);
+        }
     }
     
     /**