JandL_gitea/jandl-taskmanager-app
1
0 Fork 0
mirror of https://bitbucket.org/studiotem/jandl-taskmanager-app.git synced 2026-10-21 14:29:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

[Unscheduled time] Unscheduled time fix

Browse Source
This commit is contained in:
Matej Glasnák committed 2023-04-18 01:08:17 +02:00
1 parent 26be814406
commit 892777791f
1 file changed
+6 -3
Download Patch File Download Diff File Expand all files Collapse all files
app/src/plugins/tm@dashboard/tasks/tasks.vue
+6 -3
View File
@@ -87,14 +87,17 @@ export default {
} else if (date.isSame(moment(), 'days')) { } else if (date.isSame(moment(), 'days')) {
// Today // Today
const elapsedMinutes = now.diff(now.clone().startOf('day'), 'minutes') const elapsedMinutes = now.diff(now.clone().startOf('day'), 'minutes')
const workStart = this.user.work_start * 60 > elapsedMinutes ? this.user.workStart : elapsedMinutes const workStart = this.user.work_start * 60 > elapsedMinutes ? this.user.work_start : elapsedMinutes
const todayCapacityMinutes = this.user.work_end * 60 - workStart const todayCapacityMinutes = (this.user.work_end - workStart) * 60
unscheduledTime = todayCapacityMinutes - schedulesCapacityBySplit[i + 1] < 0 ? 0 : todayCapacityMinutes - schedulesCapacityBySplit[i + 1] unscheduledTime = todayCapacityMinutes - schedulesCapacityBySplit[i + 1] / 60 < 0 ? 0 : todayCapacityMinutes - schedulesCapacityBySplit[i + 1]
} else { } else {
// Future // Future
unscheduledTime = dailyCapacityMinutes - schedulesCapacityBySplit[i + 1] unscheduledTime = dailyCapacityMinutes - schedulesCapacityBySplit[i + 1]
} }
if (isNaN(unscheduledTime))
unscheduledTime = dailyCapacityMinutes
days.push({ days.push({
id: i + 1, id: i + 1,
fullname: `${this.filter.employee.name} ${this.filter.employee.surname}`, fullname: `${this.filter.employee.name} ${this.filter.employee.surname}`,