diff --git a/be/app/Http/Resources/SubTaskResource.php b/be/app/Http/Resources/SubTaskResource.php index 7ab1840..147a3ff 100644 --- a/be/app/Http/Resources/SubTaskResource.php +++ b/be/app/Http/Resources/SubTaskResource.php @@ -17,11 +17,12 @@ class SubTaskResource extends JsonResource return [ 'id' => $this->id, 'created_by' => $this->created_by, + 'master_task' => $this->mastertask->title, 'master_task_description' => $this->mastertask->description, + 'master_task_deadline' => $this->mastertask->deadline, + 'master_task_id' => $this->mastertask->id, 'description' => $this->description, 'project_code' => ($this->mastertask->project) ? $this->mastertask->project->code . ' ' . $this->mastertask->project->name : null, - 'master_task_id' => $this->mastertask->id, - 'master_task' => $this->mastertask->title, 'title' => $this->title, 'team_id' => ($this->mastertask->team) ? $this->mastertask->team->id : null, 'team' => $this->mastertask->team, @@ -29,7 +30,6 @@ class SubTaskResource extends JsonResource 'duration' => $this->estimated_time, 'spent_time' => $this->tracked_time, 'deadline' => $this->deadline, - 'master_task_deadline' => $this->mastertask->deadline, 'is_finished' => $this->is_finished, 'timeblocks' => TimeblockResource::collection($this->timeblocks), 'timesheets' => TimesheetResource::collection($this->timesheets),