From ae88dd5dda537a950f1a0c4a8e9bca6dcc3c463f Mon Sep 17 00:00:00 2001 From: Fenrikur <3359222+Fenrikur@users.noreply.github.com> Date: Mon, 16 Sep 2024 19:47:18 +0200 Subject: [PATCH] feat(frontdesk): allow searching by name or keyword/category (#88) * feat(frontdesk): allow searching by name or keyword/category * fix(frontdesk): NRE on parent table access * fix(frontdesk): keypad height with search mode buttons --- app/Http/Controllers/FrontdeskController.php | 81 ++++++++++++++-- .../components/frontdesk/keywords.blade.php | 31 ++++++ resources/views/frontdesk.blade.php | 95 ++++++++++++++++--- 3 files changed, 188 insertions(+), 19 deletions(-) create mode 100644 resources/views/components/frontdesk/keywords.blade.php diff --git a/app/Http/Controllers/FrontdeskController.php b/app/Http/Controllers/FrontdeskController.php index 9cc698e..719844e 100644 --- a/app/Http/Controllers/FrontdeskController.php +++ b/app/Http/Controllers/FrontdeskController.php @@ -7,7 +7,9 @@ use App\Http\Requests\CheckInRequest; use App\Http\Requests\CheckOutRequest; use App\Http\Requests\CommentRequest; +use App\Models\Category; use App\Models\Comment; +use App\Models\Keyword; use App\Models\User; use Illuminate\Http\Request; use Illuminate\Support\Facades\Log; @@ -23,16 +25,79 @@ public function __invoke(Request $request) $this->authorize('view-any', Application::class); $search = $request->get('search'); + $type = $request->get('type') ?? 'default'; if (empty($search)) { + $categories = null; + if ($type === 'keyword') { + $categories = Category::orderBy('name', 'asc')->get(); + } return view('frontdesk', [ 'user' => \Auth::user(), 'search' => null, + 'type' => $type, + 'applications' => null, 'application' => null, - 'applicant' => null + 'applicant' => null, + 'categories' => $categories, ]); } + $searchResult = []; + switch ($type) { + case 'name': + $searchResult = $this->nameSearch($search); + break; + case 'keyword': + $searchResult = $this->keywordSearch($search); + break; + case 'default': + default: + $searchResult = $this->defaultSearch($search); + } + + return view('frontdesk', array_merge([ + 'user' => \Auth::user(), + 'search' => $search, + 'type' => $type, + 'showAdditional' => $request->has('show_additional'), + 'applications' => null, + 'application' => null, + 'applicant' => null, + ], $searchResult)); + } + + private function keywordSearch($search) + { + $keywordId = '-1'; + $searchString = $search; + if (str_starts_with($search, 'k::')) { + $keywordId = intval(substr($search, 3)); + $searchString = Keyword::where('id', $keywordId)?->first()?->name ?? $search; + } + $categoryId = '-1'; + if (str_starts_with($search, 'c::')) { + $categoryId = intval(substr($search, 3)); + $searchString = Category::where('id', $categoryId)?->first()?->name ?? $search; + } + $applications = Application::whereHas('profile.keywords', function ($query) use ($search, $keywordId) { + $query->where('name', 'like', "%$search%")->orWhere('id', '=', $keywordId); + })->orWhereHas('profile.keywords.category', function ($query) use ($search, $categoryId) { + $query->where('name', 'like', "%$search%")->orWhere('id', '=', $categoryId); + })->get(); + return ['applications' => $applications, 'search' => $searchString]; + } + + private function nameSearch($search) + { + $applications = Application::where('display_name', 'like', "%$search%")->orWhereHas('user', function ($query) use ($search) { + $query->where('name', 'like', "%$search%"); + })->get(); + return ['applications' => $applications]; + } + + private function defaultSearch($search) + { // 1. search by user user_id // 2. search by user name $user = User::where('reg_id', $search)->orWhere('name', 'like', $search)->first(); @@ -41,7 +106,12 @@ public function __invoke(Request $request) // 2. search by application table_number // 4. search by dealership display_name if ($application === null) { - $application = Application::where('table_number', strtoupper($search))->orWhere('display_name', 'like', $search)->first(); + $tableNumberVariation1 = preg_replace('/^([a-zA-Z]{1,2}[0-9])([0-9]+)$/', '\1/\2', $search); + $tableNumberVariation2 = preg_replace('/^([a-zA-Z]{1,2})([0-9]+)$/', '\1/\2', $search); + $application = Application::where('table_number', strtoupper($search)) + ->orWhere('table_number', strtoupper($tableNumberVariation1)) + ->orWhere('table_number', strtoupper($tableNumberVariation2)) + ->orWhere('display_name', 'like', $search)->first(); $user = $application ? $application->user : null; } @@ -65,9 +135,7 @@ public function __invoke(Request $request) $profile = $application ? $application->profile : null; - return view('frontdesk', [ - 'user' => \Auth::user(), - 'search' => $search, + return [ 'application' => $application, 'applicant' => $user, 'table' => $table, @@ -76,8 +144,7 @@ public function __invoke(Request $request) 'shares' => $shares, 'assistants' => $assistants, 'profile' => $profile, - 'showAdditional' => $request->has('show_additional'), - ]); + ]; } public function comment(CommentRequest $request) diff --git a/resources/views/components/frontdesk/keywords.blade.php b/resources/views/components/frontdesk/keywords.blade.php new file mode 100644 index 0000000..42abbf8 --- /dev/null +++ b/resources/views/components/frontdesk/keywords.blade.php @@ -0,0 +1,31 @@ +@props(['categories']) +
+ @foreach ($categories as $category) +
+

+ + 🔎 + + +

+
+
+
+ @foreach ($category->keywords()->get() as $keyword) + + 🔎 {{ $keyword->name }} + + @endforeach +
+
+ {{ $category->description }} +
+
+
+
+ @endforeach +
diff --git a/resources/views/frontdesk.blade.php b/resources/views/frontdesk.blade.php index 16eff54..a43a49b 100644 --- a/resources/views/frontdesk.blade.php +++ b/resources/views/frontdesk.blade.php @@ -101,10 +101,27 @@ class="btn btn-secondary">Dealer Profiles ⎋
+
+
+ + + +
+
+
-
+
+ ])>After + Dark
+ @else +
+
+ Search results for "{{ $search }}" +
+
+
+ @foreach ($applications as $applicationResult) + + {{ $applicationResult->user->name }} + ({{ $applicationResult->user->reg_id }}) + [{{ $applicationResult->parent?->table_number ?? $applicationResult->table_number }}] + @switch($applicationResult->type) + @case(\App\Enums\ApplicationType::Dealer) + {{ $applicationResult->type->name }} + @break + + @case(\App\Enums\ApplicationType::Share) + {{ $applicationResult->type->name }} + @break + + @case(\App\Enums\ApplicationType::Assistant) + {{ $applicationResult->type->name }} + @break + + @default + Unknown Type! + @endswitch + @if ($applicationResult->is_afterdark) + ADD + @endif + {{ $applicationResult->status->name }} + + @endforeach +
+
+
@endif