diff --git a/app/Http/Controllers/ReportController.php b/app/Http/Controllers/ReportController.php index 3ec1913c6b8d..109967081678 100644 --- a/app/Http/Controllers/ReportController.php +++ b/app/Http/Controllers/ReportController.php @@ -130,7 +130,7 @@ class ReportController extends BaseController private function generateTaskReport($startDate, $endDate, $isExport) { - $columns = ['client', 'date', 'duration']; + $columns = ['client', 'date', 'description', 'duration']; $displayData = []; $tasks = Task::scope() @@ -141,7 +141,8 @@ class ReportController extends BaseController foreach ($tasks->get() as $task) { $displayData[] = [ $task->client ? ($isExport ? $task->client->getDisplayName() : $task->client->present()->link) : trans('texts.unassigned'), - $task->getStartTime(), + link_to($task->present()->url, $task->getStartTime()), + $task->present()->description, Utils::formatTime($task->getDuration()), ]; } diff --git a/app/Ninja/Presenters/TaskPresenter.php b/app/Ninja/Presenters/TaskPresenter.php index d9b96c1e9afa..28dd05d81846 100644 --- a/app/Ninja/Presenters/TaskPresenter.php +++ b/app/Ninja/Presenters/TaskPresenter.php @@ -21,6 +21,11 @@ class TaskPresenter extends EntityPresenter return $this->entity->user->getDisplayName(); } + public function description() + { + return substr($this->entity->description, 0, 40) . (strlen($this->entity->description) > 40 ? '...' : ''); + } + /** * @param $account * @return mixed