mirror of
https://bitbucket.org/studiotem/jandl-taskmanager-app.git
synced 2026-10-21 14:29:34 +00:00
[Master task] Modal fix
This commit is contained in:
1 parent
f3adc68c73
commit
aac8620a0f
3 files changed
+28
-22
No files matched your search
@@ -44,16 +44,16 @@ export default {
|
||||
if (!workingHours[task.split])
|
||||
workingHours[task.split] = 0
|
||||
|
||||
if (task.type == 'home_office') {
|
||||
return homeoffice[task.split] = true
|
||||
}
|
||||
|
||||
if (task.type == 'non-working-hours' || task.subtask?.is_finished || task.blocker?.is_finished)
|
||||
return
|
||||
|
||||
workingHours[task.split] += timelineUtils._getDifferenceInHours(task.end, task.start)
|
||||
})
|
||||
|
||||
this.timelineData.homeoffices.forEach(task => {
|
||||
homeoffice[task.split] = true
|
||||
})
|
||||
|
||||
for (let i = 0; i < 7; i++) {
|
||||
days.push({
|
||||
id: i + 1,
|
||||
@@ -80,11 +80,14 @@ export default {
|
||||
if (!this.subtasks || !this.filter)
|
||||
return null
|
||||
|
||||
const { tasks, blockers, nonWorkingHours, homeoffices } = timelineUtils.generateTimelineTasks(this.subtasks, new Date(this.filter.start), this.filter.employee)
|
||||
|
||||
return {
|
||||
name: this.filter.employee.name,
|
||||
surname: this.filter.employee.surname,
|
||||
unscheduledTime: this.unscheduledTime,
|
||||
tasks: timelineUtils.generateTimelineTasks(this.subtasks, new Date(this.filter.start), this.filter.employee)
|
||||
tasks: [...tasks, ...blockers, ...nonWorkingHours],
|
||||
homeoffices
|
||||
}
|
||||
}
|
||||
},
|
||||
|
||||
Reference in new issue
Block a user