diff --git a/app/Http/Controllers/Tasks/TimeTrackerController.php b/app/Http/Controllers/Tasks/TimeTrackerController.php index 3d4fa75..6a387c7 100644 --- a/app/Http/Controllers/Tasks/TimeTrackerController.php +++ b/app/Http/Controllers/Tasks/TimeTrackerController.php @@ -36,7 +36,6 @@ class TimeTrackerController } public function completeTask(int $taskId){ - $tracker = timeTracker::where('trackable_type', Task::class)->where('trackable_id', $taskId) ->where('user_id', Auth::user()->getAuthIdentifier())->where('time_end', null)->first(); $tracker->time_end = Carbon::now(); @@ -56,7 +55,7 @@ class TimeTrackerController $milestone->save(); } - $project = $milestone->project->first(); + $project = $milestone->project; $projectPendingTasks = $project->tasks->where('status', '!=', 12); if(!$projectPendingTasks->count()){ diff --git a/resources/assets/vue/components/project/forms/ProjectFiltersComponent.vue b/resources/assets/vue/components/project/forms/ProjectFiltersComponent.vue index c512cd9..155337b 100644 --- a/resources/assets/vue/components/project/forms/ProjectFiltersComponent.vue +++ b/resources/assets/vue/components/project/forms/ProjectFiltersComponent.vue @@ -34,7 +34,7 @@
diff --git a/resources/assets/vue/components/task/elements/TaskDetailsComponent.vue b/resources/assets/vue/components/task/elements/TaskDetailsComponent.vue index 340a3e5..b7827fc 100644 --- a/resources/assets/vue/components/task/elements/TaskDetailsComponent.vue +++ b/resources/assets/vue/components/task/elements/TaskDetailsComponent.vue @@ -143,7 +143,7 @@
No department assigned for this task -
+
@@ -170,7 +170,7 @@ Assign task to employee No employee assigned for this task - +