@@ -18,12 +18,12 @@ discard block |
||
| 18 | 18 | ') |
| 19 | 19 | ->join('users', 'users.id', 'interactions.user_id') |
| 20 | 20 | ->join('contexts', 'users.context_id', 'contexts.id') |
| 21 | - ->where(function ($query) use ($type){ |
|
| 22 | - $query->when($type === 'follow', function ($query) { |
|
| 21 | + ->where(function($query) use ($type){ |
|
| 22 | + $query->when($type === 'follow', function($query) { |
|
| 23 | 23 | $query->where('follow', true); |
| 24 | 24 | $query->orWhere('done', true); |
| 25 | 25 | }) |
| 26 | - ->when($type === 'do', function ($query) { |
|
| 26 | + ->when($type === 'do', function($query) { |
|
| 27 | 27 | $query->where('done', true); |
| 28 | 28 | }); |
| 29 | 29 | }) |
@@ -33,7 +33,7 @@ discard block |
||
| 33 | 33 | ->get(); |
| 34 | 34 | |
| 35 | 35 | $interactionsToReturn = []; |
| 36 | - foreach($interactions as $interaction){ |
|
| 36 | + foreach ($interactions as $interaction) { |
|
| 37 | 37 | $characteristicsModel = CharacteristicsModel::query()->where('code', $interaction->department)->first(); |
| 38 | 38 | |
| 39 | 39 | // FIXME : This test is only necessary because corsica breaks the line above. When corsica is correctly handled, |
@@ -58,12 +58,12 @@ discard block |
||
| 58 | 58 | ->join('contexts', 'users.context_id', 'contexts.id') |
| 59 | 59 | ->join('user_characteristics', 'user_characteristics.user_id', 'users.id') |
| 60 | 60 | ->join('characteristics', 'characteristics.id', 'user_characteristics.characteristic_id') |
| 61 | - ->where(function ($query) use ($type){ |
|
| 62 | - $query->when($type === 'follow', function ($query) { |
|
| 61 | + ->where(function($query) use ($type){ |
|
| 62 | + $query->when($type === 'follow', function($query) { |
|
| 63 | 63 | $query->where('follow', true); |
| 64 | 64 | $query->orWhere('done', true); |
| 65 | 65 | }) |
| 66 | - ->when($type === 'do', function ($query) { |
|
| 66 | + ->when($type === 'do', function($query) { |
|
| 67 | 67 | $query->where('done', true); |
| 68 | 68 | }); |
| 69 | 69 | }) |
@@ -76,7 +76,7 @@ discard block |
||
| 76 | 76 | ->get(); |
| 77 | 77 | |
| 78 | 78 | $characteristicsToReturn = []; |
| 79 | - foreach($characteristicsCount as $characteristicCount){ |
|
| 79 | + foreach ($characteristicsCount as $characteristicCount) { |
|
| 80 | 80 | $characteristic = CharacteristicsModel::query()->find($characteristicCount->characteristic_id); |
| 81 | 81 | $characteristic->count = $characteristicCount->count; |
| 82 | 82 | $c = $characteristic->toArray(); |
@@ -38,8 +38,9 @@ |
||
| 38 | 38 | |
| 39 | 39 | // FIXME : This test is only necessary because corsica breaks the line above. When corsica is correctly handled, |
| 40 | 40 | // we should remove the test for emptyness. |
| 41 | - if (!empty($characteristicsModel)) |
|
| 42 | - $characteristicsModel->icon = route('api.icon.serve', ['id' => $characteristicsModel->uuid]); |
|
| 41 | + if (!empty($characteristicsModel)) { |
|
| 42 | + $characteristicsModel->icon = route('api.icon.serve', ['id' => $characteristicsModel->uuid]); |
|
| 43 | + } |
|
| 43 | 44 | |
| 44 | 45 | $interaction->departmentData = $characteristicsModel; |
| 45 | 46 | $interactionsToReturn[] = $interaction->toArray(); |
@@ -36,7 +36,7 @@ discard block |
||
| 36 | 36 | public function adminlte_image() |
| 37 | 37 | { |
| 38 | 38 | $urlPicture = $this->path_picture != "" ? asset('storage/'.str_replace('app/public/', '', $this->path_picture)) : null; |
| 39 | - if(!isset($urlPicture) || $urlPicture === ""){ |
|
| 39 | + if (!isset($urlPicture) || $urlPicture === "") { |
|
| 40 | 40 | $urlPicture = url('').'/'.config('adminlte.logo_img'); |
| 41 | 41 | } |
| 42 | 42 | return $urlPicture; |
@@ -45,7 +45,7 @@ discard block |
||
| 45 | 45 | public function adminlte_desc() |
| 46 | 46 | { |
| 47 | 47 | $desc = $this->firstname.' '.$this->lastname; |
| 48 | - if($this->organization_id !== null){ |
|
| 48 | + if ($this->organization_id !== null) { |
|
| 49 | 49 | $organization = app(OrganizationRepository::class)->get($this->organization_id); |
| 50 | 50 | $desc .= ' - organisme : '.$organization->name(); |
| 51 | 51 | } |
@@ -61,14 +61,14 @@ discard block |
||
| 61 | 61 | return $this->firstname.' '.$this->lastname; |
| 62 | 62 | } |
| 63 | 63 | |
| 64 | - public function organizationId():?string |
|
| 64 | + public function organizationId(): ?string |
|
| 65 | 65 | { |
| 66 | 66 | return $this->organizationId; |
| 67 | 67 | } |
| 68 | 68 | |
| 69 | 69 | public function provider(string $provider, string $providerId):bool |
| 70 | 70 | { |
| 71 | - if(isset($this->providers[$provider]) && $this->providers[$provider] == $providerId){ |
|
| 71 | + if (isset($this->providers[$provider]) && $this->providers[$provider] == $providerId) { |
|
| 72 | 72 | return true; |
| 73 | 73 | } |
| 74 | 74 | return false; |
@@ -87,8 +87,8 @@ discard block |
||
| 87 | 87 | |
| 88 | 88 | public function create(string $passwordHashed = null, Picture $picture = null) |
| 89 | 89 | { |
| 90 | - if(isset($picture)) { |
|
| 91 | - $picture->resize('app/public/users/' . $this->id); |
|
| 90 | + if (isset($picture)) { |
|
| 91 | + $picture->resize('app/public/users/'.$this->id); |
|
| 92 | 92 | $this->pathPicture = $picture->relativePath(); |
| 93 | 93 | } |
| 94 | 94 | app(UserRepository::class)->add($this, $passwordHashed); |
@@ -130,20 +130,20 @@ discard block |
||
| 130 | 130 | $this->email = $email; |
| 131 | 131 | $this->firstname = $firstname; |
| 132 | 132 | $this->lastname = $lastname; |
| 133 | - if($pathPicture !== "") { |
|
| 133 | + if ($pathPicture !== "") { |
|
| 134 | 134 | $picture = new Picture($pathPicture); |
| 135 | - $picture->resize('app/public/users/' . $this->id . '.' . $ext); |
|
| 136 | - $this->pathPicture = 'app/public/users/' . $this->id . '.' . $ext; |
|
| 135 | + $picture->resize('app/public/users/'.$this->id.'.'.$ext); |
|
| 136 | + $this->pathPicture = 'app/public/users/'.$this->id.'.'.$ext; |
|
| 137 | 137 | } |
| 138 | 138 | app(UserRepository::class)->update($this); |
| 139 | 139 | } |
| 140 | 140 | |
| 141 | 141 | public function updateAvatar(string $pathPicture, string $ext = 'jpg') |
| 142 | 142 | { |
| 143 | - if($pathPicture !== "") { |
|
| 143 | + if ($pathPicture !== "") { |
|
| 144 | 144 | $picture = new Picture($pathPicture); |
| 145 | - $picture->resize('app/public/users/' . $this->id . '.' . $ext); |
|
| 146 | - $this->pathPicture = 'app/public/users/' . $this->id . '.' . $ext; |
|
| 145 | + $picture->resize('app/public/users/'.$this->id.'.'.$ext); |
|
| 146 | + $this->pathPicture = 'app/public/users/'.$this->id.'.'.$ext; |
|
| 147 | 147 | } |
| 148 | 148 | app(UserRepository::class)->update($this); |
| 149 | 149 | return $this->pathPicture; |
@@ -16,7 +16,7 @@ |
||
| 16 | 16 | */ |
| 17 | 17 | public function handle($request, Closure $next) |
| 18 | 18 | { |
| 19 | - if(Auth::user() !== null && !Auth::user()->hasRole('admin')){ |
|
| 19 | + if (Auth::user() !== null && !Auth::user()->hasRole('admin')) { |
|
| 20 | 20 | return redirect()->route('show.profile'); |
| 21 | 21 | } |
| 22 | 22 | return $next($request); |