uidaho / smartsettia

app/Http/Controllers/ActivityLogController.php

Doc Comments +1 added lines, -1 removed lines

@@ -23,7 +23,7 @@
     /**
      * Display index page and process dataTable ajax request.
      *
-     * @param \App\DataTables\UsersDataTable $dataTable
+     * @param ActivityLogDataTable $dataTable
      * @return \Illuminate\Http\JsonResponse|\Illuminate\View\View
      */
     public function index(ActivityLogDataTable $dataTable)

app/Http/Controllers/ApiController.php

Doc Comments +6 added lines, -6 removed lines

@@ -17,7 +17,7 @@ 
     /**
      * Creates a json response for all the devices.
      *
-     * @return Response
+     * @return \Illuminate\Http\JsonResponse
      */    
     public function index()
     {
@@ -28,7 +28,7 @@ 
      * Creates a json response for a specifc device.
      *
      * @param  Device  $device
-     * @return Response
+     * @return \Illuminate\Http\JsonResponse
      */    
     public function show(Device $device)
     {
@@ -39,7 +39,7 @@ 
      * Updates the status of a device.
      *
      * @param  Request  $request
-     * @return Response
+     * @return \Illuminate\Http\JsonResponse
      */
     public function update(Request $request)
     {
@@ -107,7 +107,7 @@ 
      * Updates the sensors of a device.
      *
      * @param  Request  $request
-     * @return Response
+     * @return \Illuminate\Http\JsonResponse
      */
     public function sensor(Request $request)
     {
@@ -170,7 +170,7 @@ 
      * Registers a new device.
      *
      * @param  Request  $request
-     * @return Response
+     * @return \Illuminate\Http\JsonResponse
      */
     public function register(Request $request)
     {
@@ -228,7 +228,7 @@ 
      * Updates the image for a device.
      *
      * @param  Request  $request
-     * @return Response
+     * @return \Illuminate\Http\JsonResponse
      */
     public function image(Request $request) {
         // Validate the request.

Braces +3 added lines, -2 removed lines

@@ -68,8 +68,9 @@
         $device->mac_address = $request->input('mac_address');
         $device->time = $request->input('time');
         $device->cover_status = $request->input('cover_status');
-        if ($request->input('cover_command') != null)
-            $device->cover_command = $request->input('cover_command');
+        if ($request->input('cover_command') != null) {
+                    $device->cover_command = $request->input('cover_command');
+        }
         $device->error_msg = $request->input('error_msg');
         $device->last_network_update_at = Carbon::now();
         

app/Http/Controllers/SensorController.php

Doc Comments +3 added lines, -3 removed lines

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

app/Http/Controllers/SensorDataController.php

Doc Comments +3 added lines, -3 removed lines

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

app/Http/Controllers/LocationController.php

Doc Comments +3 added lines, -3 removed lines

@@ -44,7 +44,7 @@ 
      * Store a newly created resource in storage.
      *
      * @param  EditLocation $request
-     * @return \Illuminate\Http\Response
+     * @return \Illuminate\Http\RedirectResponse
      */
     public function store(EditLocation $request)
     {
@@ -97,7 +97,7 @@ 
      *
      * @param  EditLocation  $request
      * @param  int  $id
-     * @return \Illuminate\Http\Response
+     * @return \Illuminate\Http\RedirectResponse
      */
     public function update(EditLocation $request, $id)
     {
@@ -122,7 +122,7 @@ 
      * Remove the specified resource from storage.
      *
      * @param  int  $id
-     * @return \Illuminate\Http\Response
+     * @return \Illuminate\Http\RedirectResponse
      */
     public function destroy($id)
     {

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/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)
     {

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

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)
     {

Braces +47 added lines, -38 removed lines

@@ -103,8 +103,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');
     }
@@ -136,8 +137,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');
     }
@@ -171,9 +173,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');
     }
@@ -193,9 +195,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');
     }
@@ -211,10 +213,11 @@ 
      */
     public function getLastNetworkUpdateAtHumanAttribute()
     {
-        if ($this->last_network_update_at->diffInDays() > 0)
-            return $this->last_network_update_at->setTimezone(Auth::user()->timezone)->format('M d, Y h:i a');
-        else
-            return $this->last_network_update_at->diffForHumans();
+        if ($this->last_network_update_at->diffInDays() > 0) {
+                    return $this->last_network_update_at->setTimezone(Auth::user()->timezone)->format('M d, Y h:i a');
+        } else {
+                    return $this->last_network_update_at->diffForHumans();
+        }
     }
     
     /**
@@ -229,10 +232,11 @@ 
      */
     public function getUpdatedAtHumanAttribute()
     {
-        if ($this->updated_at->diffInDays() > 0)
-            return $this->updated_at->setTimezone(Auth::user()->timezone)->format('M d, Y h:i a');
-        else
-            return $this->updated_at->diffForHumans();
+        if ($this->updated_at->diffInDays() > 0) {
+                    return $this->updated_at->setTimezone(Auth::user()->timezone)->format('M d, Y h:i a');
+        } else {
+                    return $this->updated_at->diffForHumans();
+        }
     }
     
     /**
@@ -246,10 +250,11 @@ 
      */
     public function getCreatedAtHumanAttribute()
     {
-        if ($this->created_at->diffInDays() > 0)
-            return $this->created_at->setTimezone(Auth::user()->timezone)->format('M d, Y h:i a');
-        else
-            return $this->created_at->diffForHumans();
+        if ($this->created_at->diffInDays() > 0) {
+                    return $this->created_at->setTimezone(Auth::user()->timezone)->format('M d, Y h:i a');
+        } else {
+                    return $this->created_at->diffForHumans();
+        }
     }
     
     /**
@@ -360,10 +365,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;
+        }
     }
     
     /**
@@ -380,20 +386,22 @@ 
         switch ($this['cover_command'])
         {
             case 'open':
-                if ($isOpen)
-                    $status = 'open';
-                else if ($isLocked)
-                    $status = 'unlocking';
-                else
-                    $status = 'opening';
+                if ($isOpen) {
+                                    $status = 'open';
+                } else if ($isLocked) {
+                                    $status = 'unlocking';
+                } else {
+                                    $status = 'opening';
+                }
                 break;
             case 'close':
-                if ($isClosed)
-                    $status = 'closed';
-                else if ($isLocked)
-                    $status = 'unlocking';
-                else
-                    $status = 'closing';
+                if ($isClosed) {
+                                    $status = 'closed';
+                } else if ($isLocked) {
+                                    $status = 'unlocking';
+                } else {
+                                    $status = 'closing';
+                }
                 break;
             case 'lock':
                 $status = 'locked';
@@ -402,8 +410,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 +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 ]);
+        }
     }
     
     /**

app/Http/Controllers/DeviceController.php

Braces +38 added lines, -28 removed lines

@@ -116,8 +116,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')))
@@ -125,53 +126,63 @@ 
                 //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;
         }
         
         //Update the device
-        if ($request->input('name') != null)
-            $device->name = $request->input('name');
-        if ($request->input('open_time') != null)
-            $device->open_time = $request->input('open_time');
-        if ($request->input('close_time') != null)
-            $device->close_time = $request->input('close_time');
-        if ($request->input('update_rate') != null)
-            $device->update_rate = $request->input('update_rate');
-        if ($request->input('image_rate') != null)
-            $device->image_rate = $request->input('image_rate');
-        if ($request->input('sensor_rate') != null)
-            $device->sensor_rate = $request->input('sensor_rate');
+        if ($request->input('name') != null) {
+                    $device->name = $request->input('name');
+        }
+        if ($request->input('open_time') != null) {
+                    $device->open_time = $request->input('open_time');
+        }
+        if ($request->input('close_time') != null) {
+                    $device->close_time = $request->input('close_time');
+        }
+        if ($request->input('update_rate') != null) {
+                    $device->update_rate = $request->input('update_rate');
+        }
+        if ($request->input('image_rate') != null) {
+                    $device->image_rate = $request->input('image_rate');
+        }
+        if ($request->input('sensor_rate') != null) {
+                    $device->sensor_rate = $request->input('sensor_rate');
+        }
         //Check if the cover_command needs to be updated
         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');
+        }
     }
 
     /**
@@ -188,8 +199,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;