cief/tickme
1
0
Fork 0
mirror of https://gitlab.com/CIEFWorldwideSdnBhd/tickme.git synced 2026-08-25 15:34:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

minor fixes

Browse Source
This commit is contained in:
omair saleh
2020-05-13 14:13:34 +08:00
parent c85c2fdd2d
commit 564191e423
3 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Http/Controllers/Tasks/TimeTrackerController.php
+1 -2
View File
@@ -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()){
resources/assets/vue/components/project/forms/ProjectFiltersComponent.vue
+1 -1
View File
@@ -34,7 +34,7 @@
<div class="row mb-3 animated fadeInDown fast">
<div class="col">
<label class="form-group has-float-label mb-1">
<selectable-component :endpoint="route('api.modular_type.list')" section="statusTypeSection" valueColumn="id" labelColumn="name" v-model="parameters.status"></selectable-component>
<selectable-component :endpoint="route('api.modular_type.list', 'status')" section="statusTypeSection" valueColumn="id" labelColumn="name" v-model="parameters.status"></selectable-component>
<span>status</span>
</label>
</div>
resources/assets/vue/components/task/elements/TaskDetailsComponent.vue
+2 -2
View File
@@ -143,7 +143,7 @@
<div class="row">
<div class="col">
<small class="text-warning d-block mt-2" v-if="!task.assignees.departments.length">No department assigned for this task</small>
<div class="row mt-3" v-if="task.assignees.departments.length">
<div class="row mt-2" v-if="task.assignees.departments.length">
<div class="col">
<div class="mr-2 mb-1 d-inline-block text-center assignee-avatar" v-for="assignee in task.assignees.departments">
<avatar :size="30" :username="assignee.name"></avatar>
@@ -170,7 +170,7 @@
<small class="toggleAssignList mt-2 d-block pointer" v-if="!task.milestone">Assign task to employee <i class="iconsminds-arrow-down float-right"></i></small>
<task-assignee-form-component section="taskSection" :assignable="{assignment_id: task.id, assignee_type: 'User'}" v-if="!task.milestone"></task-assignee-form-component>
<small class="text-warning d-block" v-if="!task.assignees.users.length">No employee assigned for this task</small>
<task-assignee-component section="taskSection" v-if="task.assignees.users.length" :data="task.assignees.users" :assignable="{assignment_id: task.id, assignee_type: 'User'}" :manageable="!task.milestone"></task-assignee-component>
<task-assignee-component class="mt-2" section="taskSection" v-if="task.assignees.users.length" :data="task.assignees.users" :assignable="{assignment_id: task.id, assignee_type: 'User'}" :manageable="!task.milestone"></task-assignee-component>
</div>
</div>
</div>