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); + } }