mirror of
https://bitbucket.org/studiotem/jandl-taskmanager-app.git
synced 2026-10-22 06:49:35 +00:00
feat(timeline): add scheduled time display and calculation across components. Fixed refresh for mastertask, after subtask was updated
This commit is contained in:
1 parent
6a550006d9
commit
4917993390
5 files changed
+43
-14
No files matched your search
@@ -25,6 +25,7 @@ export default {
|
||||
const selectedDate = moment(this.filter.start)
|
||||
const capacityMinutes = this._getRemainingWorkCapacityMinutes(employee)
|
||||
let scheduledCapacityMinutes = 0
|
||||
let totalScheduledTime = 0
|
||||
|
||||
this.calendarData.tasks.forEach(task => {
|
||||
// console.log(task)
|
||||
@@ -35,13 +36,16 @@ export default {
|
||||
return
|
||||
|
||||
if (selectedDate.isBefore(moment(), 'days')) {
|
||||
totalScheduledTime += timelineUtils._getDifferenceInMinutes(task._real_end, task._real_start)
|
||||
// Past
|
||||
return
|
||||
} else if (selectedDate.isSame(moment(), 'days')) {
|
||||
totalScheduledTime += timelineUtils._getDifferenceInMinutes(task._real_end, task._real_start)
|
||||
// Today
|
||||
|
||||
} else {
|
||||
scheduledCapacityMinutes += timelineUtils._getDifferenceInMinutes(task._real_end, task._real_start)
|
||||
totalScheduledTime += timelineUtils._getDifferenceInMinutes(task._real_end, task._real_start)
|
||||
}
|
||||
})
|
||||
|
||||
@@ -61,6 +65,7 @@ export default {
|
||||
fullname: `${employee.name} ${employee.surname}`,
|
||||
initials: employee.name.charAt(0).toUpperCase() + employee.surname.charAt(0).toUpperCase(),
|
||||
unscheduledTime: unscheduledTime > 0 ? (unscheduledTime / 60).toFixed(1) : 0,
|
||||
scheduledTime: totalScheduledTime > 0 ? (totalScheduledTime / 60).toFixed(1) : 0,
|
||||
isHomeoffice: homeoffice[index + 1] ? true : false
|
||||
})
|
||||
})
|
||||
|
||||
Reference in new issue
Block a user