[Master task] Created_by fix

This commit is contained in:
Matej Glasnák committed 2023-03-02 09:05:59 +01:00
1 parent 66eeec4525
commit 6b73deb0f4
4 files changed
+19 -9

No files matched your search

@@ -21,12 +21,22 @@
</template>
<script>
import { mapGetters } from 'vuex';
export default {
props: {
employee: {
type: [Object, Number],
employeeId: {
type: [Number],
required: false
}
},
computed: {
...mapGetters('tm', ['enrichedEmployees']),
employee() {
return this.enrichedEmployees.find(employee => employee.id == this.employeeId)
}
}
}
</script>
@@ -1,7 +1,7 @@
<template>
<Z-status :status="mastertask.is_finished" />
<Z-deadline :deadline="mastertask.deadline" />
<Z-created-by :employee="mastertask.created_by" />
<Z-created-by :employee-id="mastertask.created_by" />
<Z-team :team="mastertask.team" :employees="mastertask.employees" />
<Z-planned-time :hours="mastertask.duration" />
<Z-remaining-time :hours="mastertask.duration - mastertask.time_worked" />
@@ -2,7 +2,7 @@
<A-mastertask-name :name="task.master_task?.name || task.master_task" :id="task.master_task.id" :color="task.master_task.color" @close-modal="$emit('close-modal')" />
<A-mastertask-status :status="task.is_finished" />
<A-task-timeblocks :timeblocks="task.timeblocks" :task="task" />
<A-task-assigned-by :employee="task._created_by" v-if="task._created_by" />
<Z-created-by :employee-id="task.created_by" />
<A-task-assigned-employee :employee="task.employee" />
<A-task-planned-time :hours="task.duration" />
<A-task-remaining-time :hours="task.duration - task.spent_time" />
@@ -15,7 +15,7 @@
import AMastertaskName from './_components/a-mastertask-name.vue'
import AMastertaskStatus from './_components/a-mastertask-status.vue'
import ATaskTimeblocks from './_components/a-task-timeblocks.vue'
import ATaskAssignedBy from './_components/a-task-assigned-by.vue'
import ZCreatedBy from '../../_components/read-only/z-created-by.vue'
import ATaskAssignedEmployee from './_components/a-task-assigned-employee.vue'
import ATaskPlannedTime from './_components/a-task-planned-time.vue'
import ATaskSpentTime from './_components/a-task-spent-time.vue'
@@ -31,7 +31,7 @@ export default {
AMastertaskName,
AMastertaskStatus,
ATaskTimeblocks,
ATaskAssignedBy,
ZCreatedBy,
ATaskAssignedEmployee,
ATaskPlannedTime,
ATaskSpentTime,