[Unscheduled time] Added unscheduled time to tasks and teams

This commit is contained in:
Matej Glasnák committed 2023-04-13 23:05:08 +02:00
1 parent d93e356265
commit e3b1460c83
5 files changed
+78 -34

No files matched your search

+7 -12
View File
@@ -1,6 +1,6 @@
<template>
<div>
<A-task-filter v-if="$store.getters['tm/isInitialized']" :unscheduledTime="timelineData?.unscheduledTime || 0" @filter-changed="onFilterChanged" />
<A-task-filter v-if="$store.getters['tm/isInitialized']" :split-days="timelineData ? splitDays : 0" @filter-changed="onFilterChanged" />
<Z-timeline v-if="timelineData" :calData="timelineData" :calConfig="config" :splits="splitDays" />
</div>
</template>
@@ -54,7 +54,7 @@ export default {
// Ignore elapsed task
return
}
else if (now.isAfter(moment(task._real_start) && now.isBefore(moment(task._real_end)))) {
else if (now.isAfter(moment(task._real_start)) && now.isBefore(moment(task._real_end))) {
// Task in progress
schedulesCapacityBySplit[task.split] += timelineUtils._getDifferenceInMinutes(task._real_end, new Date())
}
@@ -64,13 +64,10 @@ export default {
}
})
schedulesCapacityBySplit[1] = 0 // Set YESTERDAY value to 0
this.timelineData.homeoffices.forEach(task => {
homeoffice[task.split] = true
homeoffice[task.split - 1] = true
})
for (let i = 0; i < 7; i++) {
@@ -79,10 +76,12 @@ export default {
let unscheduledTime
if (i == 0) {
const date = moment(addDays(this.filter.start, i))
if (date.isBefore(moment(), 'days')) {
// Yesterday
unscheduledTime = 0
} else if (i == 1) {
} else if (date.isSame(moment(), 'days')) {
// Today
const elapsedMinutes = now.diff(now.clone().startOf('day'), 'minutes')
const workStart = this.user.work_start * 60 > elapsedMinutes ? this.user.workStart : elapsedMinutes
@@ -93,8 +92,6 @@ export default {
unscheduledTime = dailyCapacityMinutes - schedulesCapacityBySplit[i + 1]
}
console.log(unscheduledTime)
days.push({
id: i + 1,
fullname: `${this.filter.employee.name} ${this.filter.employee.surname}`,
@@ -106,8 +103,6 @@ export default {
})
}
console.log(days)
return days
},