mirror of
https://bitbucket.org/studiotem/jandl-taskmanager-app.git
synced 2026-10-21 06:20:21 +00:00
[subtask] fileUpload - Update
This commit is contained in:
1 parent
8e1072a1d8
commit
4e9700069a
2 files changed
+3
-4
No files matched your search
@@ -319,7 +319,7 @@ export default {
|
|||||||
try {
|
try {
|
||||||
this.isSaving = true
|
this.isSaving = true
|
||||||
this.mastertask.deadline = moment(this.mastertask.deadline).format('YYYY-MM-DD HH:MM:SS')
|
this.mastertask.deadline = moment(this.mastertask.deadline).format('YYYY-MM-DD HH:MM:SS')
|
||||||
if (this.mastertask.id) await this.$axios.put_auth_data(`v1/mastertasks/${this.mastertask.id}`, this.mastertask)
|
if (this.mastertask.id) await this.$axios.patch_auth_form(`v1/mastertasks/${this.mastertask.id}`, this.mastertask)
|
||||||
else await this.$axios.post_auth_data('v1/mastertasks', this.mastertask)
|
else await this.$axios.post_auth_data('v1/mastertasks', this.mastertask)
|
||||||
|
|
||||||
this.$emit('master-task-edited', this.mastertask)
|
this.$emit('master-task-edited', this.mastertask)
|
||||||
|
|||||||
@@ -319,8 +319,7 @@ export default {
|
|||||||
return timesheet
|
return timesheet
|
||||||
})
|
})
|
||||||
|
|
||||||
// const { subtask } = await this.$axios.patch_auth_form(`v1/subtasks/${this.subtask.id}`, { ...this.subtask, timesheets })
|
const { subtask } = await this.$axios.patch_auth_form(`v1/subtasks/${this.subtask.id}`, { ...this.subtask, timesheets })
|
||||||
const { subtask } = await this.$axios.put_auth(`v1/subtasks/${this.subtask.id}`, { ...this.subtask, timesheets })
|
|
||||||
|
|
||||||
this.$store.commit('tm/update_subtask', subtask)
|
this.$store.commit('tm/update_subtask', subtask)
|
||||||
this.$events.emit('on-subtask-edited', this.subtask)
|
this.$events.emit('on-subtask-edited', this.subtask)
|
||||||
@@ -329,7 +328,7 @@ export default {
|
|||||||
if (employee.id)
|
if (employee.id)
|
||||||
employee.timeblocks = this.timeblocks.filter(timeblock => timeblock.date).map(timeblock => { return { start: `${moment(timeblock.date).format('YYYY-MM-DD')} ${timeblock.starts_at_time}:00`, end: `${moment(timeblock.date).format('YYYY-MM-DD')} ${timeblock.ends_at_time}:00`, id: null } })
|
employee.timeblocks = this.timeblocks.filter(timeblock => timeblock.date).map(timeblock => { return { start: `${moment(timeblock.date).format('YYYY-MM-DD')} ${timeblock.starts_at_time}:00`, end: `${moment(timeblock.date).format('YYYY-MM-DD')} ${timeblock.ends_at_time}:00`, id: null } })
|
||||||
})
|
})
|
||||||
const subtaskCopy = JSON.parse(JSON.stringify(this.subtask))
|
const subtaskCopy = this.subtask
|
||||||
delete subtaskCopy._master_task
|
delete subtaskCopy._master_task
|
||||||
const { subtasks } = await this.$axios.post_auth(`v1/mastertasks/${this.subtask.master_task_id}/subtasks`, subtaskCopy)
|
const { subtasks } = await this.$axios.post_auth(`v1/mastertasks/${this.subtask.master_task_id}/subtasks`, subtaskCopy)
|
||||||
this.subtask.id = subtasks[0].id
|
this.subtask.id = subtasks[0].id
|
||||||
|
|||||||
Reference in new issue
Block a user