@@ -74,11 +74,11 @@ |
||
| 74 | 74 | } |
| 75 | 75 | } |
| 76 | 76 | return \BristolSU\ControlDB\Models\DataUser::where(function($query) use ($baseAttributes) { |
| 77 | - foreach($baseAttributes as $key => $value) { |
|
| 78 | - $query = $query->orWhere($key, 'LIKE', '%' . $value . '%'); |
|
| 77 | + foreach ($baseAttributes as $key => $value) { |
|
| 78 | + $query = $query->orWhere($key, 'LIKE', '%'.$value.'%'); |
|
| 79 | 79 | } |
| 80 | 80 | return $query; |
| 81 | - })->get()->filter(function (\BristolSU\ControlDB\Models\DataUser $dataUser) use ($additionalAttributes) { |
|
| 81 | + })->get()->filter(function(\BristolSU\ControlDB\Models\DataUser $dataUser) use ($additionalAttributes) { |
|
| 82 | 82 | foreach ($additionalAttributes as $additionalAttribute => $value) { |
| 83 | 83 | if ($dataUser->getAdditionalAttribute($additionalAttribute) !== $value) { |
| 84 | 84 | return false; |
@@ -31,7 +31,7 @@ discard block |
||
| 31 | 31 | { |
| 32 | 32 | $roles = $this->getAllWhere($attributes); |
| 33 | 33 | |
| 34 | - if($roles->count() > 0) { |
|
| 34 | + if ($roles->count() > 0) { |
|
| 35 | 35 | return $roles->first(); |
| 36 | 36 | } |
| 37 | 37 | throw (new ModelNotFoundException())->setModel(DataRole::class); |
@@ -69,11 +69,11 @@ discard block |
||
| 69 | 69 | } |
| 70 | 70 | } |
| 71 | 71 | return \BristolSU\ControlDB\Models\DataRole::where(function($query) use ($baseAttributes) { |
| 72 | - foreach($baseAttributes as $key => $value) { |
|
| 73 | - $query = $query->orWhere($key, 'LIKE', '%' . $value . '%'); |
|
| 72 | + foreach ($baseAttributes as $key => $value) { |
|
| 73 | + $query = $query->orWhere($key, 'LIKE', '%'.$value.'%'); |
|
| 74 | 74 | } |
| 75 | 75 | return $query; |
| 76 | - })->get()->filter(function (\BristolSU\ControlDB\Models\DataRole $dataRole) use ($additionalAttributes) { |
|
| 76 | + })->get()->filter(function(\BristolSU\ControlDB\Models\DataRole $dataRole) use ($additionalAttributes) { |
|
| 77 | 77 | foreach ($additionalAttributes as $additionalAttribute => $value) { |
| 78 | 78 | if ($dataRole->getAdditionalAttribute($additionalAttribute) !== $value) { |
| 79 | 79 | return false; |
@@ -29,7 +29,7 @@ discard block |
||
| 29 | 29 | { |
| 30 | 30 | $groups = $this->getAllWhere($attributes); |
| 31 | 31 | |
| 32 | - if($groups->count() > 0) { |
|
| 32 | + if ($groups->count() > 0) { |
|
| 33 | 33 | return $groups->first(); |
| 34 | 34 | } |
| 35 | 35 | throw (new ModelNotFoundException())->setModel(DataGroup::class); |
@@ -67,11 +67,11 @@ discard block |
||
| 67 | 67 | } |
| 68 | 68 | } |
| 69 | 69 | return \BristolSU\ControlDB\Models\DataGroup::where(function($query) use ($baseAttributes) { |
| 70 | - foreach($baseAttributes as $key => $value) { |
|
| 71 | - $query = $query->orWhere($key, 'LIKE', '%' . $value . '%'); |
|
| 70 | + foreach ($baseAttributes as $key => $value) { |
|
| 71 | + $query = $query->orWhere($key, 'LIKE', '%'.$value.'%'); |
|
| 72 | 72 | } |
| 73 | 73 | return $query; |
| 74 | - })->get()->filter(function (\BristolSU\ControlDB\Models\DataGroup $dataGroup) use ($additionalAttributes) { |
|
| 74 | + })->get()->filter(function(\BristolSU\ControlDB\Models\DataGroup $dataGroup) use ($additionalAttributes) { |
|
| 75 | 75 | foreach ($additionalAttributes as $additionalAttribute => $value) { |
| 76 | 76 | if ($dataGroup->getAdditionalAttribute($additionalAttribute) !== $value) { |
| 77 | 77 | return false; |
@@ -31,7 +31,7 @@ discard block |
||
| 31 | 31 | { |
| 32 | 32 | $positions = $this->getAllWhere($attributes); |
| 33 | 33 | |
| 34 | - if($positions->count() > 0) { |
|
| 34 | + if ($positions->count() > 0) { |
|
| 35 | 35 | return $positions->first(); |
| 36 | 36 | } |
| 37 | 37 | throw (new ModelNotFoundException())->setModel(DataPosition::class); |
@@ -69,11 +69,11 @@ discard block |
||
| 69 | 69 | } |
| 70 | 70 | } |
| 71 | 71 | return \BristolSU\ControlDB\Models\DataPosition::where(function($query) use ($baseAttributes) { |
| 72 | - foreach($baseAttributes as $key => $value) { |
|
| 73 | - $query = $query->orWhere($key, 'LIKE', '%' . $value . '%'); |
|
| 72 | + foreach ($baseAttributes as $key => $value) { |
|
| 73 | + $query = $query->orWhere($key, 'LIKE', '%'.$value.'%'); |
|
| 74 | 74 | } |
| 75 | 75 | return $query; |
| 76 | - })->get()->filter(function (\BristolSU\ControlDB\Models\DataPosition $dataPosition) use ($additionalAttributes) { |
|
| 76 | + })->get()->filter(function(\BristolSU\ControlDB\Models\DataPosition $dataPosition) use ($additionalAttributes) { |
|
| 77 | 77 | foreach ($additionalAttributes as $additionalAttribute => $value) { |
| 78 | 78 | if ($dataPosition->getAdditionalAttribute($additionalAttribute) !== $value) { |
| 79 | 79 | return false; |
@@ -38,17 +38,17 @@ discard block |
||
| 38 | 38 | public function search(Request $request, GroupRepository $groupRepository, DataGroupRepository $dataGroupRepository) |
| 39 | 39 | { |
| 40 | 40 | $search = []; |
| 41 | - if($request->has('name')) { |
|
| 41 | + if ($request->has('name')) { |
|
| 42 | 42 | $search['name'] = $request->input('name'); |
| 43 | 43 | } |
| 44 | - if($request->has('email')) { |
|
| 44 | + if ($request->has('email')) { |
|
| 45 | 45 | $search['email'] = $request->input('email'); |
| 46 | 46 | } |
| 47 | 47 | $dataGroups = $dataGroupRepository->getAllWhere($search); |
| 48 | 48 | $groups = new Collection(); |
| 49 | - foreach($dataGroups as $dataGroup) { |
|
| 49 | + foreach ($dataGroups as $dataGroup) { |
|
| 50 | 50 | $group = $dataGroup->group(); |
| 51 | - if($group !== null) { |
|
| 51 | + if ($group !== null) { |
|
| 52 | 52 | $groups->push($group); |
| 53 | 53 | } |
| 54 | 54 | } |
@@ -84,8 +84,8 @@ discard block |
||
| 84 | 84 | $request->input('email') |
| 85 | 85 | ); |
| 86 | 86 | |
| 87 | - foreach($dataGroup->getAdditionalAttributes() as $additionalAttribute) { |
|
| 88 | - if($request->has($additionalAttribute)) { |
|
| 87 | + foreach ($dataGroup->getAdditionalAttributes() as $additionalAttribute) { |
|
| 88 | + if ($request->has($additionalAttribute)) { |
|
| 89 | 89 | $dataGroup->saveAdditionalAttribute($additionalAttribute, $request->input($additionalAttribute)); |
| 90 | 90 | } |
| 91 | 91 | } |
@@ -104,15 +104,15 @@ discard block |
||
| 104 | 104 | public function update(Group $group, StoreGroupRequest $request) |
| 105 | 105 | { |
| 106 | 106 | $dataGroup = $group->data(); |
| 107 | - if($request->input('name') !== null) { |
|
| 107 | + if ($request->input('name') !== null) { |
|
| 108 | 108 | $dataGroup->setName($request->input('name')); |
| 109 | 109 | } |
| 110 | - if($request->input('email') !== null) { |
|
| 110 | + if ($request->input('email') !== null) { |
|
| 111 | 111 | $dataGroup->setEmail($request->input('email')); |
| 112 | 112 | } |
| 113 | 113 | |
| 114 | - foreach($dataGroup->getAdditionalAttributes() as $additionalAttribute) { |
|
| 115 | - if($request->has($additionalAttribute)) { |
|
| 114 | + foreach ($dataGroup->getAdditionalAttributes() as $additionalAttribute) { |
|
| 115 | + if ($request->has($additionalAttribute)) { |
|
| 116 | 116 | $dataGroup->saveAdditionalAttribute($additionalAttribute, $request->input($additionalAttribute)); |
| 117 | 117 | } |
| 118 | 118 | } |
@@ -40,20 +40,20 @@ discard block |
||
| 40 | 40 | public function search(Request $request, UserRepository $userRepository, DataUserRepository $dataUserRepository) |
| 41 | 41 | { |
| 42 | 42 | $search = []; |
| 43 | - if($request->has('first_name')) { |
|
| 43 | + if ($request->has('first_name')) { |
|
| 44 | 44 | $search['first_name'] = $request->input('first_name'); |
| 45 | 45 | } |
| 46 | - if($request->has('last_name')) { |
|
| 46 | + if ($request->has('last_name')) { |
|
| 47 | 47 | $search['last_name'] = $request->input('last_name'); |
| 48 | 48 | } |
| 49 | - if($request->has('email')) { |
|
| 49 | + if ($request->has('email')) { |
|
| 50 | 50 | $search['email'] = $request->input('email'); |
| 51 | 51 | } |
| 52 | 52 | $dataUsers = $dataUserRepository->getAllWhere($search); |
| 53 | 53 | $users = new Collection(); |
| 54 | - foreach($dataUsers as $dataUser) { |
|
| 54 | + foreach ($dataUsers as $dataUser) { |
|
| 55 | 55 | $user = $dataUser->user(); |
| 56 | - if($user !== null) { |
|
| 56 | + if ($user !== null) { |
|
| 57 | 57 | $users->push($user); |
| 58 | 58 | } |
| 59 | 59 | } |
@@ -90,8 +90,8 @@ discard block |
||
| 90 | 90 | $request->input('preferred_name') |
| 91 | 91 | ); |
| 92 | 92 | |
| 93 | - foreach($dataUser->getAdditionalAttributes() as $additionalAttribute) { |
|
| 94 | - if($request->has($additionalAttribute)) { |
|
| 93 | + foreach ($dataUser->getAdditionalAttributes() as $additionalAttribute) { |
|
| 94 | + if ($request->has($additionalAttribute)) { |
|
| 95 | 95 | $dataUser->saveAdditionalAttribute($additionalAttribute, $request->input($additionalAttribute)); |
| 96 | 96 | } |
| 97 | 97 | } |
@@ -112,24 +112,24 @@ discard block |
||
| 112 | 112 | { |
| 113 | 113 | $dataUser = $user->data(); |
| 114 | 114 | |
| 115 | - if($request->input('first_name') !== null) { |
|
| 115 | + if ($request->input('first_name') !== null) { |
|
| 116 | 116 | $dataUser->setFirstName($request->input('first_name')); |
| 117 | 117 | } |
| 118 | - if($request->input('last_name') !== null) { |
|
| 118 | + if ($request->input('last_name') !== null) { |
|
| 119 | 119 | $dataUser->setLastName($request->input('last_name')); |
| 120 | 120 | } |
| 121 | - if($request->input('email') !== null) { |
|
| 121 | + if ($request->input('email') !== null) { |
|
| 122 | 122 | $dataUser->setEmail($request->input('email')); |
| 123 | 123 | } |
| 124 | - if($request->input('dob') !== null) { |
|
| 124 | + if ($request->input('dob') !== null) { |
|
| 125 | 125 | $dataUser->setDob(Carbon::make($request->input('dob'))); |
| 126 | 126 | } |
| 127 | - if($request->input('preferred_name') !== null) { |
|
| 127 | + if ($request->input('preferred_name') !== null) { |
|
| 128 | 128 | $dataUser->setPreferredName($request->input('preferred_name')); |
| 129 | 129 | } |
| 130 | 130 | |
| 131 | - foreach($dataUser->getAdditionalAttributes() as $additionalAttribute) { |
|
| 132 | - if($request->has($additionalAttribute)) { |
|
| 131 | + foreach ($dataUser->getAdditionalAttributes() as $additionalAttribute) { |
|
| 132 | + if ($request->has($additionalAttribute)) { |
|
| 133 | 133 | $dataUser->saveAdditionalAttribute($additionalAttribute, $request->input($additionalAttribute)); |
| 134 | 134 | } |
| 135 | 135 | } |