@@ -35,7 +35,7 @@ discard block |
||
| 35 | 35 | $allCharacteristics = app(GetAllCharacteristics::class)->get(); |
| 36 | 36 | try { |
| 37 | 37 | $context = $contextQueryByUser->execute(Auth::user()->uuid)->toArray(); |
| 38 | - }catch (\Throwable $e){ |
|
| 38 | + } catch (\Throwable $e){ |
|
| 39 | 39 | Log::emergency($e->getMessage().' '.$e->getLine().' '.$e->getFile().' '.$e->getTraceAsString()); |
| 40 | 40 | return redirect()->route('wizard.profile'); |
| 41 | 41 | } |
@@ -66,7 +66,7 @@ discard block |
||
| 66 | 66 | { |
| 67 | 67 | try { |
| 68 | 68 | $user = app(GetUser::class)->get($userId)->toArray(); |
| 69 | - }catch (UserNotFound $e){ |
|
| 69 | + } catch (UserNotFound $e){ |
|
| 70 | 70 | throw new NotFoundHttpException(); |
| 71 | 71 | } |
| 72 | 72 | |
@@ -35,7 +35,7 @@ discard block |
||
| 35 | 35 | $allCharacteristics = app(GetAllCharacteristics::class)->get(); |
| 36 | 36 | try { |
| 37 | 37 | $context = $contextQueryByUser->execute(Auth::user()->uuid)->toArray(); |
| 38 | - }catch (\Throwable $e){ |
|
| 38 | + } catch (\Throwable $e) { |
|
| 39 | 39 | Log::emergency($e->getMessage().' '.$e->getLine().' '.$e->getFile().' '.$e->getTraceAsString()); |
| 40 | 40 | return redirect()->route('wizard.profile'); |
| 41 | 41 | } |
@@ -43,7 +43,7 @@ discard block |
||
| 43 | 43 | $roles = app(GetUserRole::class)->get()->toArray(); |
| 44 | 44 | $practises = app(GetUserPractises::class)->get(Auth::user()->uuid); |
| 45 | 45 | $interactions = app(InteractionsQueryByUser::class)->get(Auth::user()->uuid); |
| 46 | - $usersCharacteristics = array_merge($context['productions'], $context['characteristics'], $context['characteristicsDepartement']); |
|
| 46 | + $usersCharacteristics = array_merge($context['productions'], $context['characteristics'], $context['characteristicsDepartement']); |
|
| 47 | 47 | $uuidsUserCharacteristics = array_column($usersCharacteristics, 'uuid'); |
| 48 | 48 | $role = last($user['roles']); |
| 49 | 49 | $routeComment = route('profile.comments.show'); |
@@ -68,7 +68,7 @@ discard block |
||
| 68 | 68 | { |
| 69 | 69 | try { |
| 70 | 70 | $user = app(GetUser::class)->get($userId)->toArray(); |
| 71 | - }catch (UserNotFound $e){ |
|
| 71 | + } catch (UserNotFound $e) { |
|
| 72 | 72 | throw new NotFoundHttpException(); |
| 73 | 73 | } |
| 74 | 74 | |
@@ -77,7 +77,7 @@ discard block |
||
| 77 | 77 | $roles = app(GetUserRole::class)->get()->toArray(); |
| 78 | 78 | $practises = app(GetUserPractises::class)->get($userId); |
| 79 | 79 | $interactions = app(InteractionsQueryByUser::class)->get($userId); |
| 80 | - $usersCharacteristics = array_merge($context['productions'], $context['characteristics']); |
|
| 80 | + $usersCharacteristics = array_merge($context['productions'], $context['characteristics']); |
|
| 81 | 81 | $uuidsUserCharacteristics = array_column($usersCharacteristics, 'uuid'); |
| 82 | 82 | $role = last($user['roles']); |
| 83 | 83 | |
@@ -143,9 +143,9 @@ discard block |
||
| 143 | 143 | $uri = config('wiki.api_uri').'?action=query&list=search&srwhat=text&srsearch='.$qry.'&srqiprofile=classic_noboostlinks&srnamespace=3000&format=json'; |
| 144 | 144 | $response = $client->get($uri); |
| 145 | 145 | $content = json_decode($response->getBody()->getContents(), true); |
| 146 | - if(isset($content['query']['search'])){ |
|
| 146 | + if (isset($content['query']['search'])) { |
|
| 147 | 147 | $results = array_column($content['query']['search'], 'title'); |
| 148 | - return array_map(function ($item){ |
|
| 148 | + return array_map(function($item) { |
|
| 149 | 149 | return str_replace('Structure:', '', $item); |
| 150 | 150 | }, $results); |
| 151 | 151 | } |
@@ -38,9 +38,9 @@ |
||
| 38 | 38 | $pages = $this->pageRepository->getByIds($pagesIds); |
| 39 | 39 | |
| 40 | 40 | $characteristics = []; |
| 41 | - foreach ($pages as $page){ |
|
| 41 | + foreach ($pages as $page) { |
|
| 42 | 42 | $characteristic = $this->characteristicsRepository->getByPageId($page->pageId()); |
| 43 | - if(!isset($characteristic)){ |
|
| 43 | + if (!isset($characteristic)) { |
|
| 44 | 44 | $type = $page->type() === 'Culture' ? Characteristic::FARMING_TYPE : Characteristic::CROPPING_SYSTEM; |
| 45 | 45 | $characteristic = new Characteristic( |
| 46 | 46 | Uuid::uuid4(), |
@@ -15,11 +15,11 @@ discard block |
||
| 15 | 15 | |
| 16 | 16 | class ContextRepositorySql implements ContextRepository |
| 17 | 17 | { |
| 18 | - public function getByUser(string $userId):?Context |
|
| 18 | + public function getByUser(string $userId): ?Context |
|
| 19 | 19 | { |
| 20 | 20 | $user = User::where('uuid', $userId)->first(); |
| 21 | 21 | $context = DB::table('contexts')->where('id', $user->context_id)->first(); |
| 22 | - if($context == null){ |
|
| 22 | + if ($context == null) { |
|
| 23 | 23 | return null; |
| 24 | 24 | } |
| 25 | 25 | return new Context( |
@@ -38,8 +38,8 @@ discard block |
||
| 38 | 38 | $user = User::where('uuid', $userId)->first(); |
| 39 | 39 | |
| 40 | 40 | $farmings = $contextData->get('farmings'); |
| 41 | - foreach($farmings as $farming){ |
|
| 42 | - $characteristic = CharacteristicsModel::where('uuid', (string)$farming)->first(); |
|
| 41 | + foreach ($farmings as $farming) { |
|
| 42 | + $characteristic = CharacteristicsModel::where('uuid', (string) $farming)->first(); |
|
| 43 | 43 | $user->characteristics()->save($characteristic); |
| 44 | 44 | } |
| 45 | 45 | |
@@ -51,21 +51,21 @@ discard block |
||
| 51 | 51 | public function getByUserDto(string $userId): ?ContextDto |
| 52 | 52 | { |
| 53 | 53 | $user = User::where('uuid', $userId)->first(); |
| 54 | - if($user == null){ |
|
| 54 | + if ($user == null) { |
|
| 55 | 55 | return null; |
| 56 | 56 | } |
| 57 | 57 | $context = ContextModel::find($user->context_id); |
| 58 | - if($context == null){ |
|
| 58 | + if ($context == null) { |
|
| 59 | 59 | return null; |
| 60 | 60 | } |
| 61 | - $characteristics = $user->characteristics()->get()->transform(function(CharacteristicsModel $item){ |
|
| 61 | + $characteristics = $user->characteristics()->get()->transform(function(CharacteristicsModel $item) { |
|
| 62 | 62 | return $item->toDto(); |
| 63 | 63 | }); |
| 64 | 64 | |
| 65 | 65 | $numberDepartment = (new PostalCode($context->postal_code))->department(); |
| 66 | 66 | $characteristicDepartment = CharacteristicsModel::query()->where('code', $numberDepartment)->first(); |
| 67 | 67 | |
| 68 | - if(isset($characteristicDepartment)){ |
|
| 68 | + if (isset($characteristicDepartment)) { |
|
| 69 | 69 | $characteristics->push($characteristicDepartment->toDto()); |
| 70 | 70 | } |
| 71 | 71 | |
@@ -83,12 +83,12 @@ discard block |
||
| 83 | 83 | public function update(Context $context, string $userId) |
| 84 | 84 | { |
| 85 | 85 | $user = User::where('uuid', $userId)->first(); |
| 86 | - if($user == null){ |
|
| 86 | + if ($user == null) { |
|
| 87 | 87 | return null; |
| 88 | 88 | } |
| 89 | 89 | |
| 90 | 90 | $contextModel = ContextModel::where('uuid', $context->id())->first(); |
| 91 | - if($contextModel == null){ |
|
| 91 | + if ($contextModel == null) { |
|
| 92 | 92 | return null; |
| 93 | 93 | } |
| 94 | 94 | $contextData = collect($context->toArray()); |
@@ -96,9 +96,9 @@ discard block |
||
| 96 | 96 | |
| 97 | 97 | $farmings = $contextData->get('farmings'); |
| 98 | 98 | $characteristics = []; |
| 99 | - foreach($farmings as $farming){ |
|
| 100 | - $characteristicModel = CharacteristicsModel::where('uuid', (string)$farming)->first(); |
|
| 101 | - if(isset($characteristicModel)) { |
|
| 99 | + foreach ($farmings as $farming) { |
|
| 100 | + $characteristicModel = CharacteristicsModel::where('uuid', (string) $farming)->first(); |
|
| 101 | + if (isset($characteristicModel)) { |
|
| 102 | 102 | $characteristics[] = $characteristicModel->id; |
| 103 | 103 | } |
| 104 | 104 | } |
@@ -19,7 +19,7 @@ |
||
| 19 | 19 | { |
| 20 | 20 | $practisesToReturn = []; |
| 21 | 21 | $practises = $this->interactionsRepository->getDoneByUser($userId); |
| 22 | - foreach ($practises as $practise){ |
|
| 22 | + foreach ($practises as $practise) { |
|
| 23 | 23 | $year = $practise->doneAt() !== null ? $practise->doneAt()->format('Y') : 'Non datée'; |
| 24 | 24 | $practisesToReturn[$year][] = $practise->toArray(); |
| 25 | 25 | } |
@@ -24,7 +24,7 @@ discard block |
||
| 24 | 24 | { |
| 25 | 25 | $httpClient = new Client(); |
| 26 | 26 | |
| 27 | - PageModel::query()->where('dry', true)->chunkById(50, function ($items, $count) use($httpClient){ |
|
| 27 | + PageModel::query()->where('dry', true)->chunkById(50, function($items, $count) use($httpClient){ |
|
| 28 | 28 | $this->info(($count*50).' Pages'); |
| 29 | 29 | $pages = $items->pluck('page_id')->toArray(); |
| 30 | 30 | $pagesApiUri = config('wiki.api_uri').$this->queryPages.implode('|', $pages); |
@@ -32,7 +32,7 @@ discard block |
||
| 32 | 32 | $content = json_decode($response->getBody()->getContents(), true); |
| 33 | 33 | $wikiPages = $content['query']['pages']; |
| 34 | 34 | |
| 35 | - foreach($wikiPages as $page){ |
|
| 35 | + foreach ($wikiPages as $page) { |
|
| 36 | 36 | $pageModel = PageModel::query()->where('page_id', $page['pageid'])->first(); |
| 37 | 37 | |
| 38 | 38 | if (!isset($page['title'])) |
@@ -124,7 +124,7 @@ |
||
| 124 | 124 | * @param string|null $characteristicIdCroppingSystem |
| 125 | 125 | * @return Paginator |
| 126 | 126 | * |
| 127 | - */ |
|
| 127 | + */ |
|
| 128 | 128 | |
| 129 | 129 | public function getFollowersPage(int $pageId, string $type = 'follow', ?string $departmentNumber = null, ?string $characteristicId = null, ?string $characteristicIdCroppingSystem = null): Paginator |
| 130 | 130 | { |
@@ -130,8 +130,9 @@ |
||
| 130 | 130 | { |
| 131 | 131 | // Handle Corsica differently: |
| 132 | 132 | if (strtolower($departmentNumber) == '2a' || |
| 133 | - strtolower($departmentNumber) == '2b') |
|
| 134 | - $departmentNumber = '20'; |
|
| 133 | + strtolower($departmentNumber) == '2b') { |
|
| 134 | + $departmentNumber = '20'; |
|
| 135 | + } |
|
| 135 | 136 | |
| 136 | 137 | return InteractionModel::query() |
| 137 | 138 | ->with('user.context') |
@@ -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 | ; |
@@ -23,14 +23,14 @@ |
||
| 23 | 23 | |
| 24 | 24 | public function toDto(?string $userUid = null, $hasDone = false):ContextDto |
| 25 | 25 | { |
| 26 | - $characteristics = $this->user->characteristics()->get()->transform(function(CharacteristicsModel $item){ |
|
| 26 | + $characteristics = $this->user->characteristics()->get()->transform(function(CharacteristicsModel $item) { |
|
| 27 | 27 | return $item->toDto(); |
| 28 | 28 | }); |
| 29 | 29 | |
| 30 | 30 | $numberDepartment = (new PostalCode($this->postal_code))->department(); |
| 31 | 31 | $characteristicDepartment = CharacteristicsModel::query()->where('code', $numberDepartment)->first(); |
| 32 | 32 | |
| 33 | - if(isset($characteristicDepartment)){ |
|
| 33 | + if (isset($characteristicDepartment)) { |
|
| 34 | 34 | $characteristics->push($characteristicDepartment->toDto()); |
| 35 | 35 | } |
| 36 | 36 | |
@@ -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 | } |