mirror of
https://bitbucket.org/studiotem/jandl-taskmanager-app.git
synced 2026-10-21 14:29:34 +00:00
[timeline] showing blockers
This commit is contained in:
commit
197ec8b7fe
2 files changed
+7
-3
No files matched your search
@@ -244,7 +244,7 @@ export default {
|
|||||||
const subtask = event.subtask
|
const subtask = event.subtask
|
||||||
const timeblock = subtask.timeblocks.find(originalTimeblock => originalTimeblock.id == event._timeblock_id)
|
const timeblock = subtask.timeblocks.find(originalTimeblock => originalTimeblock.id == event._timeblock_id)
|
||||||
|
|
||||||
timeblock.is_finished = timeblock.is_finished ? 0 : 1
|
timeblock.is_finished = timeblock?.is_finished ? 0 : 1
|
||||||
|
|
||||||
try {
|
try {
|
||||||
const {data: newTimeblock} = await this.$axios.put_auth(`v1/timeblocks/${timeblock.id}`, timeblock)
|
const {data: newTimeblock} = await this.$axios.put_auth(`v1/timeblocks/${timeblock.id}`, timeblock)
|
||||||
|
|||||||
@@ -112,11 +112,14 @@ export default {
|
|||||||
if (!subtask?.is_finished) { subtask.is_finished = 0 }
|
if (!subtask?.is_finished) { subtask.is_finished = 0 }
|
||||||
|
|
||||||
subtask.timeblocks.push({
|
subtask.timeblocks.push({
|
||||||
|
end: tmUtils.formatDateTimeForBackend(end),
|
||||||
id: null,
|
id: null,
|
||||||
start: tmUtils.formatDateTimeForBackend(start),
|
is_finished: 0,
|
||||||
end: tmUtils.formatDateTimeForBackend(end)
|
start: tmUtils.formatDateTimeForBackend(start)
|
||||||
})
|
})
|
||||||
|
|
||||||
|
subtask.deadline = tmUtils.formatDateTimeForBackend(subtask.deadline)
|
||||||
|
|
||||||
if (!subtask.id) {
|
if (!subtask.id) {
|
||||||
this.$emit('update-unfinished-subtask', subtask)
|
this.$emit('update-unfinished-subtask', subtask)
|
||||||
this.closeModal()
|
this.closeModal()
|
||||||
@@ -175,6 +178,7 @@ export default {
|
|||||||
this.closeModal()
|
this.closeModal()
|
||||||
this.$events.emit('on-subtask-edited', subtask)
|
this.$events.emit('on-subtask-edited', subtask)
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
|
console.error(error)
|
||||||
this.$toast.error(error.message || error)
|
this.$toast.error(error.message || error)
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
|||||||
Reference in new issue
Block a user