@@ -4,7 +4,6 @@ |
||
4 | 4 | |
5 | 5 | use Illuminate\Database\Eloquent\Model; |
6 | 6 | use Illuminate\Database\Eloquent\SoftDeletes; |
7 | -use Illuminate\Support\Facades\DB; |
|
8 | 7 | |
9 | 8 | class Device extends Model |
10 | 9 | { |
@@ -55,9 +55,9 @@ |
||
55 | 55 | */ |
56 | 56 | public function orderedSiteLocationsBy($site_id, $location_id) |
57 | 57 | { |
58 | - $locations = self::query()->select(['id', 'name']) |
|
58 | + $locations = self::query()->select([ 'id', 'name' ]) |
|
59 | 59 | ->where('site_id', '=', $site_id) |
60 | - ->orderByRaw(DB::raw("(id = " . $location_id . ") DESC")) |
|
60 | + ->orderByRaw(DB::raw("(id = ".$location_id.") DESC")) |
|
61 | 61 | ->get(); |
62 | 62 | return $locations; |
63 | 63 | } |
@@ -79,8 +79,7 @@ discard block |
||
79 | 79 | { |
80 | 80 | $sites = $this->site_m->orderedSitesBy($location->site_id); |
81 | 81 | $locations = $this->location_m->orderedSiteLocationsBy($location->site_id, $device->location_id); |
82 | - } |
|
83 | - else |
|
82 | + } else |
|
84 | 83 | { |
85 | 84 | $locations = null; |
86 | 85 | $sites = $this->site_m->all(); |
@@ -141,8 +140,7 @@ discard block |
||
141 | 140 | //Create a new site |
142 | 141 | $siteName = $request->input('new_site_name'); |
143 | 142 | $site_id = $this->site_m->createSite($siteName); |
144 | - } |
|
145 | - else |
|
143 | + } else |
|
146 | 144 | { |
147 | 145 | $site_id = $request->input('site'); |
148 | 146 | } |
@@ -154,8 +152,7 @@ discard block |
||
154 | 152 | //Create a new location |
155 | 153 | $locationName = $request->input('new_location_name'); |
156 | 154 | $location_id = $this->location_m->createLocation($locationName, $site_id); |
157 | - } |
|
158 | - else |
|
155 | + } else |
|
159 | 156 | { |
160 | 157 | $location_id = $request->input('location'); |
161 | 158 | } |
@@ -185,8 +182,7 @@ discard block |
||
185 | 182 | { |
186 | 183 | //If the user was already deleted then permanently delete it |
187 | 184 | $this->device_m->destroy($id); |
188 | - } |
|
189 | - else |
|
185 | + } else |
|
190 | 186 | { |
191 | 187 | //Remove the location from the device |
192 | 188 | $oldLocation_id = $device->location_id; |
@@ -232,8 +228,7 @@ discard block |
||
232 | 228 | { |
233 | 229 | //Get the site connected to the location and delete it |
234 | 230 | $this->site_m->findOrFail($site_id)->delete(); |
235 | - } |
|
236 | - else |
|
231 | + } else |
|
237 | 232 | { |
238 | 233 | //Delete the location that isn't used anymore |
239 | 234 | $oldLocation->delete(); |
@@ -42,8 +42,8 @@ |
||
42 | 42 | */ |
43 | 43 | public function orderedSitesBy($id) |
44 | 44 | { |
45 | - $sites = self::query()->select(['id', 'name']) |
|
46 | - ->orderByRaw(DB::raw("(id = " . $id . ") DESC")) |
|
45 | + $sites = self::query()->select([ 'id', 'name' ]) |
|
46 | + ->orderByRaw(DB::raw("(id = ".$id.") DESC")) |
|
47 | 47 | ->get(); |
48 | 48 | return $sites; |
49 | 49 | } |