[Teams] Calendar fix

This commit is contained in:
Matej Glasnák committed 2023-02-22 14:43:44 +01:00
1 parent e4abc1fc36
commit c3e7e70da6
6 files changed
+42 -38

No files matched your search

+31 -22
View File
@@ -10,8 +10,9 @@
import ATeamFilter from './_components/a-team-filter.vue'
import ZTimeline from '@/plugins/tm@dashboard/_components/z-timeline.vue'
import { setHours, setMinutes } from 'date-fns'
import { setHours, setMinutes, addDays } from 'date-fns'
import moment from 'moment'
import timelineUtils from '../tasks/_utils/timeline.utils'
export default {
components: {
@@ -35,30 +36,37 @@ export default {
const days = []
this.filter.team.employees.forEach((employee, index) => {
let workingHours = 0
const capacityPerDay = employee.work_end - employee.work_start
this.timelineData.tasks.forEach(task => {
if (task?.subtask?.employee_id == employee.id)
workingHours += timelineUtils._getDifferenceInHours(task.end, task.start)
})
days.push({
id: index,
name: `${employee.name} ${employee.surname}`,
id: index + 1,
name: employee.name,
fullname: `${employee.name} ${employee.surname}`,
initials: employee.name.charAt(0).toUpperCase() + employee.surname.charAt(0).toUpperCase(),
unscheduledTime: 111
unscheduledTime: capacityPerDay - workingHours
})
})
return days
},
unscheduledTime() {
return 222
// if (!this.subtasks) return 0
// return timelineUtils.getUnscheduledTime(this.subtasks)
},
timelineData() {
if (!this.subtasks)
return
console.log([...this._generateNonWorking(), ...this._generateTasks()])
// let unscheduledTime = 0
// const tasks = [...this._generateNonWorking(), ...this._generateTasks()]
// tasks.forEach(task => {
// if (!task.nonWorking)
// workingHours += timelineUtils._getDifferenceInHours(task.end, task.start)
// })
return {
unscheduledTime: 333,
@@ -79,7 +87,7 @@ export default {
this.filter.team.employees.forEach((e, index) => {
if (e.id == subtask.employee_id) {
split = index
split = index + 1
employee = e
}
})
@@ -93,11 +101,11 @@ export default {
start: new Date(timeblock.start),
end: new Date(timeblock.end),
master_task: subtask.master_task,
name: employee.name,
surname: employee.surname,
name: employee?.name,
surname: employee?.surname,
// date: new Date(timeblock.start),
isWeekend: moment(timeblock.start).day() % 6 == 0,
initials: employee.name.charAt(0).toUpperCase() + employee.surname.charAt(0).toUpperCase(),
initials: employee?.name?.charAt(0)?.toUpperCase() + employee?.surname?.charAt(0)?.toUpperCase(),
split: split,
project_code: subtask.project_code,
subtask: subtask,
@@ -111,9 +119,10 @@ export default {
},
_generateNonWorking() {
const tasks = []
let earliestStartHour = null
const date = new Date(this.filter.start)
const tasks = []
const date = new Date(this.filter.start)
let earliestStartHour = null
this.config.date = date
this.filter.team.employees.forEach((employee, index) => {
if (!earliestStartHour || employee.work_start < earliestStartHour)
@@ -123,7 +132,7 @@ export default {
title: "Non working hours",
start: setMinutes(setHours(date, 0), 0),
end: setMinutes(setHours(date, employee.work_start), 0),
split: index,
split: index + 1,
nonWorking: true,
draggable: false
})
@@ -132,7 +141,7 @@ export default {
title: "Non working hours",
start: setMinutes(setHours(date, employee.work_end), 0),
end: setMinutes(setHours(date, 23), 59),
split: index,
split: index + 1,
nonWorking: true,
draggable: false
})