From 456f5a2446541810abfaf11f578c259d554ac74b Mon Sep 17 00:00:00 2001 From: Nafies Luthfi Date: Tue, 26 Mar 2019 17:37:40 +0800 Subject: [PATCH] Apply filter issue by priority and and status --- app/Http/Controllers/Projects/IssueController.php | 15 ++++++++++++--- resources/lang/id/issue.php | 2 +- resources/views/projects/issues/index.blade.php | 2 +- 3 files changed, 14 insertions(+), 5 deletions(-) diff --git a/app/Http/Controllers/Projects/IssueController.php b/app/Http/Controllers/Projects/IssueController.php index 99e4463..97c46e2 100644 --- a/app/Http/Controllers/Projects/IssueController.php +++ b/app/Http/Controllers/Projects/IssueController.php @@ -15,11 +15,20 @@ class IssueController extends Controller { public function index(Project $project) { - $issues = $project->issues() + $issueQuery = $project->issues() ->orderBy('updated_at', 'desc') ->with(['pic', 'creator']) - ->withCount(['comments']) - ->get(); + ->withCount(['comments']); + + if ($priorityId = request('priority_id')) { + $issueQuery->where('priority_id', $priorityId); + } + + if ($statusId = request('status_id')) { + $issueQuery->where('status_id', $priorityId); + } + + $issues = $issueQuery->get(); return view('projects.issues.index', compact('project', 'issues')); } diff --git a/resources/lang/id/issue.php b/resources/lang/id/issue.php index 873be9e..120fd46 100644 --- a/resources/lang/id/issue.php +++ b/resources/lang/id/issue.php @@ -9,7 +9,7 @@ return [ 'all' => 'Semua Issue', 'select' => 'Pilih Issue', 'detail' => 'Detail Issue', - 'not_found' => 'Issue tidak ditemukan', + 'not_found' => 'Issue tidak ditemukan.', 'empty' => 'Belum ada Issue', 'back_to_show' => 'Kembali ke detail Issue', 'back_to_index' => 'Kembali ke daftar Issue', diff --git a/resources/views/projects/issues/index.blade.php b/resources/views/projects/issues/index.blade.php index 7c4f020..629b524 100755 --- a/resources/views/projects/issues/index.blade.php +++ b/resources/views/projects/issues/index.blade.php @@ -56,7 +56,7 @@ @empty - {{ __('issue.empty') }} + {{ __('issue.not_found') }} @endforelse