cief/tickme
1
0
Fork 0
mirror of https://gitlab.com/CIEFWorldwideSdnBhd/tickme.git synced 2026-08-19 04:23:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

changes related to activating the create task module

Browse Source
This commit is contained in:
omair saleh
2020-05-13 04:42:22 +08:00
parent 06074949dc
commit c85c2fdd2d
13 changed files with 131 additions and 199 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Http/Controllers/Tasks/TimeTrackerController.php
+18 -16
View File
@@ -47,25 +47,27 @@ class TimeTrackerController
$task->status = 12;
$task->save();
$milestone = ProjectMilestone::find($task->milestone_id);
$milestonPendingTasks = Task::where('milestone_id', $task->milestone_id)->where('status', '!=', 12);
if($task->milestone_id) {
$milestone = ProjectMilestone::find($task->milestone_id);
$milestonPendingTasks = Task::where('milestone_id', $task->milestone_id)->where('status', '!=', 12);
if(!$milestonPendingTasks->exists()){
$milestone->complete = true;
$milestone->save();
}
if(!$milestonPendingTasks->exists()){
$milestone->complete = true;
$milestone->save();
}
$project = $milestone->project->first();
$projectPendingTasks = $project->tasks->where('status', '!=', 12);
$project = $milestone->project->first();
$projectPendingTasks = $project->tasks->where('status', '!=', 12);
if(!$projectPendingTasks->count()){
$project->status = 12;
$project->save();
} else {
$nextTask = $projectPendingTasks->first();
$nextTask->status = 7;
$nextTask->active = true;
$nextTask->save();
if(!$projectPendingTasks->count()){
$project->status = 12;
$project->save();
} else {
$nextTask = $projectPendingTasks->first();
$nextTask->status = 7;
$nextTask->active = true;
$nextTask->save();
}
}
return (new ApiResponseObject('Task Completed Successfully',
app/Http/Resources/TaskResource.php
+1 -1
View File
@@ -28,7 +28,7 @@ class TaskResource extends JsonResource
return [
'id' => $this->id,
'milestone' => new ProjectMilestoneResource($this->milestone),
'business_service' => new ModularTypeResource($this->milestone->project->projectType),
'business_service' => $this->milestone ? new ModularTypeResource($this->milestone->project->projectType): null,
'type_id' => $this->type_id,
'task_type' => new ModularTypeResource($this->taskType),
'title' => $this->title,