From 08ae6d037455569e0a36d867288c0951b5a64f6a Mon Sep 17 00:00:00 2001 From: Nafies Luthfi Date: Mon, 18 Mar 2019 23:34:23 +0800 Subject: [PATCH 1/6] Every issue has priority level --- app/Entities/Projects/Issue.php | 5 +++ app/Entities/Projects/Priority.php | 36 ++++++++++++++++++++++ database/factories/IssueFactory.php | 11 ++++--- .../2019_03_03_210017_create_issues_table.php | 1 + resources/lang/de/issue.php | 5 +++ resources/lang/en/issue.php | 5 +++ resources/lang/id/issue.php | 5 +++ tests/Unit/Models/IssueTest.php | 8 +++++ 8 files changed, 71 insertions(+), 5 deletions(-) create mode 100644 app/Entities/Projects/Priority.php diff --git a/app/Entities/Projects/Issue.php b/app/Entities/Projects/Issue.php index b8cf43d..535276f 100644 --- a/app/Entities/Projects/Issue.php +++ b/app/Entities/Projects/Issue.php @@ -25,6 +25,11 @@ class Issue extends Model return $this->belongsTo(User::class); } + public function getPriorityAttribute() + { + return Priority::getNameById($this->priority_id); + } + public function getStatusAttribute() { return IssueStatus::getNameById($this->status_id); diff --git a/app/Entities/Projects/Priority.php b/app/Entities/Projects/Priority.php new file mode 100644 index 0000000..2e61f52 --- /dev/null +++ b/app/Entities/Projects/Priority.php @@ -0,0 +1,36 @@ + 'minor', + 2 => 'major', + 3 => 'critical', + ]; + + protected static $colors = [ + 0 => 'yellow', + 1 => 'info', + 2 => 'warning', + 3 => 'danger', + ]; + + public static function getNameById($singleId) + { + return trans('issue.'.static::getById($singleId)); + } + + public static function toArray() + { + $lists = []; + foreach (static::$lists as $key => $value) { + $lists[$key] = trans('issue.'.$value); + } + + return $lists; + } +} diff --git a/database/factories/IssueFactory.php b/database/factories/IssueFactory.php index 5c43722..2941f50 100644 --- a/database/factories/IssueFactory.php +++ b/database/factories/IssueFactory.php @@ -7,14 +7,15 @@ use App\Entities\Projects\Project; $factory->define(Issue::class, function (Faker $faker) { return [ - 'project_id' => function () { + 'project_id' => function () { return factory(Project::class)->create()->id; }, - 'title' => $faker->words(3, true), - 'body' => $faker->sentences(3, true), - 'creator_id' => function () { + 'title' => $faker->words(3, true), + 'body' => $faker->sentences(3, true), + 'creator_id' => function () { return factory(User::class)->create()->id; }, - 'status_id' => 0, + 'status_id' => 0, + 'priority_id' => 1, ]; }); diff --git a/database/migrations/2019_03_03_210017_create_issues_table.php b/database/migrations/2019_03_03_210017_create_issues_table.php index 520a386..ea55458 100644 --- a/database/migrations/2019_03_03_210017_create_issues_table.php +++ b/database/migrations/2019_03_03_210017_create_issues_table.php @@ -19,6 +19,7 @@ class CreateIssuesTable extends Migration $table->string('title', 60); $table->string('body'); $table->unsignedInteger('creator_id'); + $table->unsignedTinyInteger('priority_id'); $table->unsignedInteger('pic_id')->nullable(); $table->unsignedTinyInteger('status_id')->default(0); $table->timestamps(); diff --git a/resources/lang/de/issue.php b/resources/lang/de/issue.php index 9def5f9..2d81052 100644 --- a/resources/lang/de/issue.php +++ b/resources/lang/de/issue.php @@ -41,6 +41,11 @@ return [ 'pic' => 'Issue PIC', 'creator' => 'Issue Creator', + // Priority + 'minor' => 'Minor', + 'major' => 'Major', + 'critical' => 'Critical', + // Statuses 'open' => 'Open', 'resolved' => 'Resolved', diff --git a/resources/lang/en/issue.php b/resources/lang/en/issue.php index 9def5f9..2d81052 100644 --- a/resources/lang/en/issue.php +++ b/resources/lang/en/issue.php @@ -41,6 +41,11 @@ return [ 'pic' => 'Issue PIC', 'creator' => 'Issue Creator', + // Priority + 'minor' => 'Minor', + 'major' => 'Major', + 'critical' => 'Critical', + // Statuses 'open' => 'Open', 'resolved' => 'Resolved', diff --git a/resources/lang/id/issue.php b/resources/lang/id/issue.php index 8948b23..3946ac5 100644 --- a/resources/lang/id/issue.php +++ b/resources/lang/id/issue.php @@ -41,6 +41,11 @@ return [ 'pic' => 'PIC Issue', 'creator' => 'Pembuat Issue', + // Priority + 'minor' => 'Minor', + 'major' => 'Major', + 'critical' => 'Critical', + // Statuses 'open' => 'Open', 'resolved' => 'Selesai', diff --git a/tests/Unit/Models/IssueTest.php b/tests/Unit/Models/IssueTest.php index f0a6b4e..1c61152 100644 --- a/tests/Unit/Models/IssueTest.php +++ b/tests/Unit/Models/IssueTest.php @@ -63,4 +63,12 @@ class IssueTest extends TestCase $this->assertEquals(''.$issue->status.'', $issue->status_label); } + + /** @test */ + public function an_issue_has_priority_attribute() + { + $issue = factory(Issue::class)->make(); + + $this->assertEquals(__('issue.minor'), $issue->priority); + } } From 7b30caff8eaec92770c7e856660c2ff4089fa010 Mon Sep 17 00:00:00 2001 From: Nafies Luthfi Date: Tue, 19 Mar 2019 22:23:11 +0800 Subject: [PATCH 2/6] User can create issue with selected priority --- app/Entities/Projects/Issue.php | 4 +++- app/Entities/Projects/Priority.php | 1 - app/Http/Controllers/Projects/IssueController.php | 22 +++++++++++++--------- resources/lang/en/issue.php | 1 + resources/views/projects/issues/create.blade.php | 1 + tests/Feature/Projects/ProjectIssuesTest.php | 18 ++++++++++-------- 6 files changed, 28 insertions(+), 19 deletions(-) diff --git a/app/Entities/Projects/Issue.php b/app/Entities/Projects/Issue.php index 535276f..1e69c8b 100644 --- a/app/Entities/Projects/Issue.php +++ b/app/Entities/Projects/Issue.php @@ -8,7 +8,9 @@ use Illuminate\Database\Eloquent\Model; class Issue extends Model { - protected $fillable = ['project_id', 'title', 'body', 'pic_id', 'creator_id']; + protected $fillable = [ + 'project_id', 'title', 'body', 'priority_id', 'pic_id', 'creator_id', + ]; public function project() { diff --git a/app/Entities/Projects/Priority.php b/app/Entities/Projects/Priority.php index 2e61f52..da953f1 100644 --- a/app/Entities/Projects/Priority.php +++ b/app/Entities/Projects/Priority.php @@ -13,7 +13,6 @@ class Priority extends ReferenceAbstract ]; protected static $colors = [ - 0 => 'yellow', 1 => 'info', 2 => 'warning', 3 => 'danger', diff --git a/app/Http/Controllers/Projects/IssueController.php b/app/Http/Controllers/Projects/IssueController.php index 86fb337..09ea564 100644 --- a/app/Http/Controllers/Projects/IssueController.php +++ b/app/Http/Controllers/Projects/IssueController.php @@ -6,6 +6,7 @@ use App\Entities\Users\User; use Illuminate\Http\Request; use App\Entities\Projects\Issue; use App\Entities\Projects\Project; +use App\Entities\Projects\Priority; use App\Http\Controllers\Controller; use App\Entities\Projects\IssueStatus; @@ -21,23 +22,26 @@ class IssueController extends Controller public function create(Project $project) { $users = User::pluck('name', 'id'); + $priorities = Priority::toArray(); - return view('projects.issues.create', compact('project', 'users')); + return view('projects.issues.create', compact('project', 'users', 'priorities')); } public function store(Request $request, Project $project) { $issueData = $request->validate([ - 'title' => 'required|max:60', - 'body' => 'required|max:255', - 'pic_id' => 'nullable|exists:users,id', + 'title' => 'required|max:60', + 'body' => 'required|max:255', + 'priority_id' => 'required|in:1,2,3', + 'pic_id' => 'nullable|exists:users,id', ]); Issue::create([ - 'project_id' => $project->id, - 'creator_id' => auth()->id(), - 'title' => $issueData['title'], - 'body' => $issueData['body'], - 'pic_id' => $issueData['pic_id'], + 'project_id' => $project->id, + 'creator_id' => auth()->id(), + 'title' => $issueData['title'], + 'body' => $issueData['body'], + 'priority_id' => $issueData['priority_id'], + 'pic_id' => $issueData['pic_id'], ]); flash(__('issue.created'), 'success'); diff --git a/resources/lang/en/issue.php b/resources/lang/en/issue.php index 2d81052..1be2737 100644 --- a/resources/lang/en/issue.php +++ b/resources/lang/en/issue.php @@ -42,6 +42,7 @@ return [ 'creator' => 'Issue Creator', // Priority + 'priority' => 'Priority', 'minor' => 'Minor', 'major' => 'Major', 'critical' => 'Critical', diff --git a/resources/views/projects/issues/create.blade.php b/resources/views/projects/issues/create.blade.php index c7a7da7..1422715 100755 --- a/resources/views/projects/issues/create.blade.php +++ b/resources/views/projects/issues/create.blade.php @@ -18,6 +18,7 @@
{!! FormField::text('title', ['label' => __('issue.title')]) !!} {!! FormField::textarea('body', ['label' => __('issue.body')]) !!} + {!! FormField::radios('priority_id', $priorities, ['label' => __('issue.priority'), 'placeholder' => false]) !!} {!! FormField::select('pic_id', $users, ['label' => __('issue.pic')]) !!}
diff --git a/tests/Feature/Projects/ProjectIssuesTest.php b/tests/Feature/Projects/ProjectIssuesTest.php index c85d1c4..fa5f75c 100644 --- a/tests/Feature/Projects/ProjectIssuesTest.php +++ b/tests/Feature/Projects/ProjectIssuesTest.php @@ -37,20 +37,22 @@ class ProjectIssuesTest extends TestCase $this->visitRoute('projects.issues.create', $project); $this->submitForm(__('issue.create'), [ - 'title' => 'First Issue.', - 'body' => 'First Issue description.', - 'pic_id' => $admin->id, + 'title' => 'First Issue.', + 'body' => 'First Issue description.', + 'priority_id' => 1, + 'pic_id' => $admin->id, ]); $this->seePageIs(route('projects.issues.index', $project)); $this->see(__('issue.created')); $this->seeInDatabase('issues', [ - 'project_id' => $project->id, - 'title' => 'First Issue.', - 'body' => 'First Issue description.', - 'pic_id' => $admin->id, - 'creator_id' => $admin->id, + 'project_id' => $project->id, + 'title' => 'First Issue.', + 'body' => 'First Issue description.', + 'priority_id' => 1, + 'pic_id' => $admin->id, + 'creator_id' => $admin->id, ]); } From 449a0ac45eea56e086f5318da0ccf7a1389e5983 Mon Sep 17 00:00:00 2001 From: Nafies Luthfi Date: Tue, 19 Mar 2019 22:30:50 +0800 Subject: [PATCH 3/6] Add issue priority label on issue list and detail page --- app/Entities/Projects/Issue.php | 7 +++++++ resources/views/projects/issues.blade.php | 2 ++ resources/views/projects/issues/show.blade.php | 1 + tests/Unit/Models/IssueTest.php | 10 ++++++++++ 4 files changed, 20 insertions(+) diff --git a/app/Entities/Projects/Issue.php b/app/Entities/Projects/Issue.php index 1e69c8b..17a31af 100644 --- a/app/Entities/Projects/Issue.php +++ b/app/Entities/Projects/Issue.php @@ -32,6 +32,13 @@ class Issue extends Model return Priority::getNameById($this->priority_id); } + public function getPriorityLabelAttribute() + { + $classColor = Priority::getColorById($this->priority_id); + + return ''.$this->priority.''; + } + public function getStatusAttribute() { return IssueStatus::getNameById($this->status_id); diff --git a/resources/views/projects/issues.blade.php b/resources/views/projects/issues.blade.php index 890da34..a582c34 100755 --- a/resources/views/projects/issues.blade.php +++ b/resources/views/projects/issues.blade.php @@ -17,6 +17,7 @@ {{ __('app.table_no') }} {{ __('issue.title') }} + {{ __('issue.priority') }} {{ __('app.status') }} {{ __('issue.pic') }} {{ __('issue.creator') }} @@ -30,6 +31,7 @@ {{ $no }} {{ $issue->title }} + {!! $issue->priority_label !!} {!! $issue->status_label !!} {{ $issue->pic->name }} {{ $issue->creator->name }} diff --git a/resources/views/projects/issues/show.blade.php b/resources/views/projects/issues/show.blade.php index 70bf183..42f60af 100755 --- a/resources/views/projects/issues/show.blade.php +++ b/resources/views/projects/issues/show.blade.php @@ -22,6 +22,7 @@ {{ __('issue.title') }}{{ $issue->title }} {{ __('issue.body') }}{{ $issue->body }} + {{ __('issue.priority') }}{!! $issue->priority_label !!} {{ __('issue.pic') }}{{ $issue->pic->name }} {{ __('app.created_by') }}{{ $issue->creator->name }} diff --git a/tests/Unit/Models/IssueTest.php b/tests/Unit/Models/IssueTest.php index 1c61152..7877fdd 100644 --- a/tests/Unit/Models/IssueTest.php +++ b/tests/Unit/Models/IssueTest.php @@ -6,6 +6,7 @@ use Tests\TestCase; use App\Entities\Users\User; use App\Entities\Projects\Issue; use App\Entities\Projects\Project; +use App\Entities\Projects\Priority; use Illuminate\Foundation\Testing\RefreshDatabase; class IssueTest extends TestCase @@ -71,4 +72,13 @@ class IssueTest extends TestCase $this->assertEquals(__('issue.minor'), $issue->priority); } + + /** @test */ + public function an_issue_has_priority_label_attribute() + { + $issue = factory(Issue::class)->make(); + $colorClass = Priority::getColorById($issue->priority_id); + + $this->assertEquals(''.$issue->priority.'', $issue->priority_label); + } } From 7746ca7f2fdecd7a244e22b402148a3fcb0b2240 Mon Sep 17 00:00:00 2001 From: Nafies Luthfi Date: Tue, 19 Mar 2019 22:34:57 +0800 Subject: [PATCH 4/6] User can change issue priority --- app/Http/Controllers/Issues/OptionController.php | 6 ++++-- app/Http/Controllers/Projects/IssueController.php | 5 ++++- resources/views/projects/issues/show.blade.php | 1 + tests/Feature/Projects/ProjectIssuesTest.php | 24 +++++++++++++++++++++++ 4 files changed, 33 insertions(+), 3 deletions(-) diff --git a/app/Http/Controllers/Issues/OptionController.php b/app/Http/Controllers/Issues/OptionController.php index bad3511..a37a200 100644 --- a/app/Http/Controllers/Issues/OptionController.php +++ b/app/Http/Controllers/Issues/OptionController.php @@ -11,9 +11,11 @@ class OptionController extends Controller public function update(Request $request, Issue $issue) { $issueData = $request->validate([ - 'status_id' => 'required|in:0,1,2,3,4', - 'pic_id' => 'nullable|exists:users,id', + 'priority_id' => 'required|in:1,2,3', + 'status_id' => 'required|in:0,1,2,3,4', + 'pic_id' => 'nullable|exists:users,id', ]); + $issue->priority_id = $issueData['priority_id']; $issue->status_id = $issueData['status_id']; $issue->pic_id = $issueData['pic_id']; $issue->save(); diff --git a/app/Http/Controllers/Projects/IssueController.php b/app/Http/Controllers/Projects/IssueController.php index 09ea564..247143e 100644 --- a/app/Http/Controllers/Projects/IssueController.php +++ b/app/Http/Controllers/Projects/IssueController.php @@ -50,10 +50,13 @@ class IssueController extends Controller public function show(Project $project, Issue $issue) { + $priorities = Priority::toArray(); $statuses = IssueStatus::toArray(); $users = User::pluck('name', 'id'); - return view('projects.issues.show', compact('project', 'issue', 'users', 'statuses')); + return view('projects.issues.show', compact( + 'project', 'issue', 'users', 'statuses', 'priorities' + )); } public function edit(Project $project, Issue $issue) diff --git a/resources/views/projects/issues/show.blade.php b/resources/views/projects/issues/show.blade.php index 42f60af..e06613a 100755 --- a/resources/views/projects/issues/show.blade.php +++ b/resources/views/projects/issues/show.blade.php @@ -37,6 +37,7 @@

{{ __('app.action') }}

+ {!! FormField::radios('priority_id', $priorities, ['label' => __('issue.priority')]) !!} {!! FormField::radios('status_id', $statuses, ['label' => __('app.status')]) !!} {!! FormField::select('pic_id', $users, ['label' => __('issue.assign_pic'), 'placeholder' => __('issue.select_pic')]) !!}
diff --git a/tests/Feature/Projects/ProjectIssuesTest.php b/tests/Feature/Projects/ProjectIssuesTest.php index fa5f75c..9d27f9f 100644 --- a/tests/Feature/Projects/ProjectIssuesTest.php +++ b/tests/Feature/Projects/ProjectIssuesTest.php @@ -192,4 +192,28 @@ class ProjectIssuesTest extends TestCase 'status_id' => 2, // resolved ]); } + + /** @test */ + public function user_can_change_issue_priority() + { + $this->adminUserSigningIn(); + $worker = $this->createUser('worker'); + $issue = factory(Issue::class)->create(); + + $this->visitRoute('projects.issues.show', [$issue->project, $issue]); + $this->submitForm(__('issue.update'), [ + 'priority_id' => 2, // major + 'status_id' => 2, // resolved + 'pic_id' => $worker->id, + ]); + $this->seeRouteIs('projects.issues.show', [$issue->project, $issue]); + $this->seeText(__('issue.updated')); + + $this->seeInDatabase('issues', [ + 'id' => $issue->id, + 'pic_id' => $worker->id, + 'priority_id' => 2, // major + 'status_id' => 2, // resolved + ]); + } } From e6d2b21000da5bac848046dd3bb507c343c347e2 Mon Sep 17 00:00:00 2001 From: Nafies Luthfi Date: Tue, 19 Mar 2019 22:36:51 +0800 Subject: [PATCH 5/6] Add back to issue listing link --- resources/views/projects/issues/show.blade.php | 1 + 1 file changed, 1 insertion(+) diff --git a/resources/views/projects/issues/show.blade.php b/resources/views/projects/issues/show.blade.php index e06613a..42ccb12 100755 --- a/resources/views/projects/issues/show.blade.php +++ b/resources/views/projects/issues/show.blade.php @@ -29,6 +29,7 @@
{{ link_to_route('projects.issues.edit', __('issue.edit'), [$project, $issue], ['id' => 'edit-issue-'.$issue->id, 'class' => 'btn btn-warning']) }} + {{ link_to_route('projects.issues.index', __('issue.back_to_index'), [$project], ['class' => 'btn btn-default pull-right']) }}
From 3697dae4a5919ba0da7edaff5cdb88df421bfa34 Mon Sep 17 00:00:00 2001 From: Nafies Luthfi Date: Tue, 19 Mar 2019 22:38:36 +0800 Subject: [PATCH 6/6] Move issue listing view to projects/issues directory --- app/Http/Controllers/Projects/IssueController.php | 2 +- resources/views/projects/{issues.blade.php => issues/index.blade.php} | 0 2 files changed, 1 insertion(+), 1 deletion(-) rename resources/views/projects/{issues.blade.php => issues/index.blade.php} (100%) diff --git a/app/Http/Controllers/Projects/IssueController.php b/app/Http/Controllers/Projects/IssueController.php index 247143e..1a0c603 100644 --- a/app/Http/Controllers/Projects/IssueController.php +++ b/app/Http/Controllers/Projects/IssueController.php @@ -16,7 +16,7 @@ class IssueController extends Controller { $issues = $project->issues()->with(['pic', 'creator'])->get(); - return view('projects.issues', compact('project', 'issues')); + return view('projects.issues.index', compact('project', 'issues')); } public function create(Project $project) diff --git a/resources/views/projects/issues.blade.php b/resources/views/projects/issues/index.blade.php similarity index 100% rename from resources/views/projects/issues.blade.php rename to resources/views/projects/issues/index.blade.php