mirror of
https://bitbucket.org/studiotem/jandl-taskmanager-app.git
synced 2026-10-21 14:29:34 +00:00
[timeblocks] fix
This commit is contained in:
1 parent
197ec8b7fe
commit
56c9904d43
1 file changed
+3
-2
@@ -101,7 +101,6 @@ export default {
|
|||||||
return
|
return
|
||||||
|
|
||||||
const subtask = JSON.parse(JSON.stringify(this.subtask))
|
const subtask = JSON.parse(JSON.stringify(this.subtask))
|
||||||
|
|
||||||
const splittedStartsAtTime = this.form.starts_at_time.split(':')
|
const splittedStartsAtTime = this.form.starts_at_time.split(':')
|
||||||
const splittedEndsAtTime = this.form.ends_at_time.split(':')
|
const splittedEndsAtTime = this.form.ends_at_time.split(':')
|
||||||
const start = moment(this.form.date).hours(parseInt(splittedStartsAtTime[0])).minutes(parseInt(splittedStartsAtTime[1])).toISOString()
|
const start = moment(this.form.date).hours(parseInt(splittedStartsAtTime[0])).minutes(parseInt(splittedStartsAtTime[1])).toISOString()
|
||||||
@@ -118,7 +117,7 @@ export default {
|
|||||||
start: tmUtils.formatDateTimeForBackend(start)
|
start: tmUtils.formatDateTimeForBackend(start)
|
||||||
})
|
})
|
||||||
|
|
||||||
subtask.deadline = tmUtils.formatDateTimeForBackend(subtask.deadline)
|
if(subtask.deadline) subtask.deadline = tmUtils.formatDateTimeForBackend(subtask.deadline)
|
||||||
|
|
||||||
if (!subtask.id) {
|
if (!subtask.id) {
|
||||||
this.$emit('update-unfinished-subtask', subtask)
|
this.$emit('update-unfinished-subtask', subtask)
|
||||||
@@ -159,6 +158,7 @@ export default {
|
|||||||
async deleteTimeblock({ id }) {
|
async deleteTimeblock({ id }) {
|
||||||
const subtask = JSON.parse(JSON.stringify(this.subtask))
|
const subtask = JSON.parse(JSON.stringify(this.subtask))
|
||||||
subtask.timeblocks = subtask.timeblocks.filter(timeblock => timeblock.id != id)
|
subtask.timeblocks = subtask.timeblocks.filter(timeblock => timeblock.id != id)
|
||||||
|
if(subtask.deadline) subtask.deadline = tmUtils.formatDateTimeForBackend(subtask.deadline)
|
||||||
|
|
||||||
this._update(subtask)
|
this._update(subtask)
|
||||||
},
|
},
|
||||||
@@ -173,6 +173,7 @@ export default {
|
|||||||
delete timesheet.employee_name
|
delete timesheet.employee_name
|
||||||
return timesheet
|
return timesheet
|
||||||
})
|
})
|
||||||
|
|
||||||
const { subtask } = await this.$axios.put_auth(`v1/subtasks/${data.id}`, {...data, timesheets})
|
const { subtask } = await this.$axios.put_auth(`v1/subtasks/${data.id}`, {...data, timesheets})
|
||||||
|
|
||||||
this.closeModal()
|
this.closeModal()
|
||||||
|
|||||||
Reference in new issue
Block a user