This commit is contained in:
romankko2 committed 2023-08-09 15:28:14 +02:00
1 parent a2fb04d3b2
commit 63b66084e1
8 files changed
+42 -28

No files matched your search

@@ -111,7 +111,7 @@ export default {
//fixnut validacie employee_id
this.blocker = blocker
} else {
this.blocker = {start: null }
this.blocker = {start: null, employee_id: this.user.id }
if (blocker.starts_at_time && blocker.datepicker && blocker.employee_id) {
this.datepicker = blocker.datepicker
@@ -73,8 +73,11 @@ export default {
'mastertask.team_id'(value) {
if (!value) return
this.mastertask.team = this.teams.find(team => team.id == value)
this.mastertask.employees = this.mastertask.team.employees
const team = this.teams.find(team => team.id == value)
if (!team) return
this.mastertask.team = JSON.parse(JSON.stringify(team))
this.mastertask.employees = [...this.mastertask.team.employees]
},
}
}
@@ -256,7 +256,7 @@ export default {
this.$store.commit('tm/update_subtask', subtask)
this.$events.emit("on-subtask-edited", this.subtask)
} else {
const { subtasks } = await this.$axios.post_auth(`v1/mastertasks/${this.subtask.master_task_id}/subtasks`, this.subtask, this.subtask.project_code)
const { subtasks } = await this.$axios.post_auth(`v1/mastertasks/${this.subtask.master_task_id}/subtasks`, this.subtask)
this.subtask.id = subtasks[0].id
subtasks.forEach(subtask => {
@@ -372,14 +372,10 @@ export default {
deep: true
},
'subtask.master_task_id'(value, newValue) {
'subtask.master_task_id'(value) {
if (!value) return
this.subtask._master_task = this.mastertasks.find((mastertask) => mastertask.id == this.subtask.master_task_id)
// let selectedMasterTask = null
// if (newValue) selectedMasterTask = this.mastertasks.find((mastertask) => mastertask.id === newValue)
// if (selectedMasterTask) this.subtask.project_code = selectedMasterTask.project_code
this.subtask.project_code = this.subtask._master_task?.project_code || null
},
editMode() {