Completed
Pull Request — master (#96)
by
unknown
02:19
created
app/Http/Controllers/DashboardController.php 2 patches
Spacing   +11 added lines, -11 removed lines patch added patch discarded remove patch
@@ -41,13 +41,13 @@  discard block
 block discarded – undo
41 41
             ->get();
42 42
         //Get all locations for the selected site with the selected location first
43 43
         $locations = Location::select('id', 'name', 'site_id')
44
-            ->where('site_id', '=', $sites[0]->id ?? 0)
44
+            ->where('site_id', '=', $sites[ 0 ]->id ?? 0)
45 45
             ->orderByRaw("id = ? DESC", $location_id)
46 46
             ->orderBy('name', 'ASC')
47 47
             ->get();
48 48
         //Get all devices for the selected location
49 49
         $devices = Device::publicDashData()
50
-            ->where('location_id', '=', $locations[0]->id ?? 0)
50
+            ->where('location_id', '=', $locations[ 0 ]->id ?? 0)
51 51
             ->orderBy('name', 'ASC')
52 52
             ->limit(1)
53 53
             ->get();
@@ -56,10 +56,10 @@  discard block
 block discarded – undo
56 56
         $active_device = $devices->where('id', '=', $device_id)->first();
57 57
         //Set the active device to the first device in $devices if it is not empty and the original active device wasn't found
58 58
         if (!$devices->isEmpty() && $active_device == null)
59
-            $active_device = $devices[0];
59
+            $active_device = $devices[ 0 ];
60 60
     
61 61
         //Store the active site, location, and device in a collection
62
-        $active_data = collect([ 'device' => $active_device, 'location' => $locations[0] ?? null, 'site' => $sites[0] ?? null ]);
62
+        $active_data = collect([ 'device' => $active_device, 'location' => $locations[ 0 ] ?? null, 'site' => $sites[ 0 ] ?? null ]);
63 63
         
64 64
         return view('dashboard.index', [ 'active_data' => $active_data, 'devices' => $devices,
65 65
             'locations' => $locations, 'sites' => $sites ]);
@@ -102,37 +102,37 @@  discard block
 block discarded – undo
102 102
             ->get();
103 103
         //Get all locations for the selected site with the selected location first
104 104
         $locations = Location::select('id', 'name', 'site_id')
105
-            ->where('site_id', '=', $sites[0]->id ?? 0)
105
+            ->where('site_id', '=', $sites[ 0 ]->id ?? 0)
106 106
             ->orderByRaw("id = ? DESC", $location_id)
107 107
             ->orderBy('name', 'ASC')
108 108
             ->get();
109 109
         //Get all devices for the selected location
110 110
         $devices = Device::publicDashData()
111
-            ->where('location_id', '=', $locations[0]->id ?? 0)
111
+            ->where('location_id', '=', $locations[ 0 ]->id ?? 0)
112 112
             ->orderBy('name', 'ASC')
113 113
             ->limit($limit)
114 114
             ->offset($offset * $limit)
115 115
             ->get();
116 116
         //Get the total device count for the given location
117
-        $deviceCount = Device::where('location_id', '=', $locations[0]->id ?? 0)->count();
117
+        $deviceCount = Device::where('location_id', '=', $locations[ 0 ]->id ?? 0)->count();
118 118
     
119 119
         //Get the active device
120 120
         $active_device = $devices->where('id', $device_id)->first();
121 121
         //Set the active device to the first device in $devices if it is not empty and the original active device wasn't found
122 122
         if (!$devices->isEmpty() && $active_device == null)
123
-            $active_device = $devices[0];
123
+            $active_device = $devices[ 0 ];
124 124
         
125 125
         //Store the active site, location, and device in a collection
126
-        $active_data = collect(['device' => $active_device, 'location' => $locations[0] ?? null, 'site' => $sites[0] ?? null]);
126
+        $active_data = collect([ 'device' => $active_device, 'location' => $locations[ 0 ] ?? null, 'site' => $sites[ 0 ] ?? null ]);
127 127
         
128 128
         //Get the total amount of pages for pagination
129 129
         $page_count = ceil($deviceCount / $limit) - 1;
130 130
         
131 131
         //Store pagination data
132
-        $pag_data = collect(['offset' => $offset, 'page_count' => $page_count]);
132
+        $pag_data = collect([ 'offset' => $offset, 'page_count' => $page_count ]);
133 133
         
134 134
         return response()->json([ 'active_data' => $active_data, 'devices' => $devices, 'locations' => $locations,
135
-            'sites' => $sites, 'pag_data' => $pag_data]);
135
+            'sites' => $sites, 'pag_data' => $pag_data ]);
136 136
     }
137 137
     
138 138
     /**
Please login to merge, or discard this patch.
Braces   +6 added lines, -4 removed lines patch added patch discarded remove patch
@@ -55,8 +55,9 @@  discard block
 block discarded – undo
55 55
         //Get the active device
56 56
         $active_device = $devices->where('id', '=', $device_id)->first();
57 57
         //Set the active device to the first device in $devices if it is not empty and the original active device wasn't found
58
-        if (!$devices->isEmpty() && $active_device == null)
59
-            $active_device = $devices[0];
58
+        if (!$devices->isEmpty() && $active_device == null) {
59
+                    $active_device = $devices[0];
60
+        }
60 61
     
61 62
         //Store the active site, location, and device in a collection
62 63
         $active_data = collect([ 'device' => $active_device, 'location' => $locations[0] ?? null, 'site' => $sites[0] ?? null ]);
@@ -119,8 +120,9 @@  discard block
 block discarded – undo
119 120
         //Get the active device
120 121
         $active_device = $devices->where('id', $device_id)->first();
121 122
         //Set the active device to the first device in $devices if it is not empty and the original active device wasn't found
122
-        if (!$devices->isEmpty() && $active_device == null)
123
-            $active_device = $devices[0];
123
+        if (!$devices->isEmpty() && $active_device == null) {
124
+                    $active_device = $devices[0];
125
+        }
124 126
         
125 127
         //Store the active site, location, and device in a collection
126 128
         $active_data = collect(['device' => $active_device, 'location' => $locations[0] ?? null, 'site' => $sites[0] ?? null]);
Please login to merge, or discard this patch.