@@ -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; |
@@ -26,7 +26,7 @@ discard block |
||
| 26 | 26 | ->where('page_id', $interaction->pageId()) |
| 27 | 27 | ->first(); |
| 28 | 28 | |
| 29 | - if($interactionModel === null) { |
|
| 29 | + if ($interactionModel === null) { |
|
| 30 | 30 | $interactionModel = new InteractionModel(); |
| 31 | 31 | $interactionModel->{$canInteract->key()} = isset($user->id) ? $user->id : $canInteract->identifier(); |
| 32 | 32 | } |
@@ -38,7 +38,7 @@ discard block |
||
| 38 | 38 | |
| 39 | 39 | public function getByInteractUser(CanInteract $canInteract, int $pageId): ?Interaction |
| 40 | 40 | { |
| 41 | - if($canInteract->key() == 'user_id') { |
|
| 41 | + if ($canInteract->key() == 'user_id') { |
|
| 42 | 42 | $user = User::query()->where('uuid', $canInteract->identifier())->first(); |
| 43 | 43 | } |
| 44 | 44 | |
@@ -47,7 +47,7 @@ discard block |
||
| 47 | 47 | ->where('page_id', $pageId) |
| 48 | 48 | ->first(); |
| 49 | 49 | |
| 50 | - if(!isset($interactionModel)){ |
|
| 50 | + if (!isset($interactionModel)) { |
|
| 51 | 51 | return null; |
| 52 | 52 | } |
| 53 | 53 | |
@@ -83,9 +83,9 @@ discard block |
||
| 83 | 83 | ->orderBy('updated_at', 'desc') |
| 84 | 84 | ->get(); |
| 85 | 85 | |
| 86 | - foreach($interactionsModel as $interaction) { |
|
| 86 | + foreach ($interactionsModel as $interaction) { |
|
| 87 | 87 | $page = PageModel::query()->where('page_id', $interaction->page_id)->first(); |
| 88 | - if(!isset($page)){ |
|
| 88 | + if (!isset($page)) { |
|
| 89 | 89 | continue; |
| 90 | 90 | } |
| 91 | 91 | $applause = InteractionModel::query()->where('page_id', $interaction->page_id)->where('applause', true)->count(); |
@@ -108,7 +108,7 @@ discard block |
||
| 108 | 108 | ->where('user_id', $user->id) |
| 109 | 109 | ->where('done', true) |
| 110 | 110 | ->get(); |
| 111 | - foreach ($records as $record){ |
|
| 111 | + foreach ($records as $record) { |
|
| 112 | 112 | $practises[] = new PractiseVo( |
| 113 | 113 | $record->page_id, |
| 114 | 114 | $record->page->title ?? '', |
@@ -138,18 +138,18 @@ discard block |
||
| 138 | 138 | |
| 139 | 139 | return InteractionModel::query() |
| 140 | 140 | ->with('user.context') |
| 141 | - ->where(function ($query) use ($type){ |
|
| 142 | - $query->when($type === 'follow', function ($query) { |
|
| 141 | + ->where(function($query) use ($type){ |
|
| 142 | + $query->when($type === 'follow', function($query) { |
|
| 143 | 143 | $query->where('follow', true); |
| 144 | 144 | $query->orWhere('done', true); |
| 145 | 145 | }) |
| 146 | - ->when($type === 'do', function ($query) { |
|
| 146 | + ->when($type === 'do', function($query) { |
|
| 147 | 147 | $query->where('done', true); |
| 148 | 148 | }); |
| 149 | 149 | }) |
| 150 | - ->when($characteristicId !== null, function ($query) use($characteristicId) { |
|
| 150 | + ->when($characteristicId !== null, function($query) use($characteristicId) { |
|
| 151 | 151 | $characteristic = CharacteristicsModel::query()->where('uuid', $characteristicId)->first(); |
| 152 | - if(!isset($characteristic)){ |
|
| 152 | + if (!isset($characteristic)) { |
|
| 153 | 153 | return; |
| 154 | 154 | } |
| 155 | 155 | $query->whereRaw( |
@@ -157,9 +157,9 @@ discard block |
||
| 157 | 157 | $characteristic->id |
| 158 | 158 | ); |
| 159 | 159 | }) |
| 160 | - ->when($characteristicIdCroppingSystem !== null, function ($query) use($characteristicIdCroppingSystem) { |
|
| 160 | + ->when($characteristicIdCroppingSystem !== null, function($query) use($characteristicIdCroppingSystem) { |
|
| 161 | 161 | $characteristic = CharacteristicsModel::query()->where('uuid', $characteristicIdCroppingSystem)->first(); |
| 162 | - if(!isset($characteristic)){ |
|
| 162 | + if (!isset($characteristic)) { |
|
| 163 | 163 | return; |
| 164 | 164 | } |
| 165 | 165 | $query->whereRaw( |
@@ -167,7 +167,7 @@ discard block |
||
| 167 | 167 | $characteristic->id |
| 168 | 168 | ); |
| 169 | 169 | }) |
| 170 | - ->when($departmentNumber !== null, function ($query) use($departmentNumber) { |
|
| 170 | + ->when($departmentNumber !== null, function($query) use($departmentNumber) { |
|
| 171 | 171 | $query |
| 172 | 172 | ->join('users', 'users.id', 'interactions.user_id') |
| 173 | 173 | ->join('contexts', 'users.context_id', 'contexts.id') |
@@ -177,7 +177,7 @@ discard block |
||
| 177 | 177 | ->whereNotNull('interactions.user_id') |
| 178 | 178 | ->orderBy('interactions.updated_at', 'desc') |
| 179 | 179 | ->paginate() |
| 180 | - ->through(function ($item){ |
|
| 180 | + ->through(function($item) { |
|
| 181 | 181 | return $item->user->context->toDto($item->user->uuid, $item->start_done_at ? $item->start_done_at->format('Y-m-d') : $item->done); |
| 182 | 182 | }) |
| 183 | 183 | ; |
@@ -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); |