mirror of
https://bitbucket.org/studiotem/jandl-taskmanager-app.git
synced 2026-10-21 14:29:34 +00:00
[Calendar] Fixed non working hours, added blockers to teams
This commit is contained in:
1 parent
f3f86261f4
commit
11c73b2b37
8 files changed
+281
-212
No files matched your search
@@ -99,11 +99,13 @@ export default {
|
||||
generateTimelineNonWorkingHours(date, employee) {
|
||||
const events = []
|
||||
|
||||
const { start: dayStart, end: dayEnd } = this._getDayStartEnd(date)
|
||||
|
||||
for (let i = 0; i < 7; i++) {
|
||||
events.push({
|
||||
title: "Non working hours",
|
||||
start: setMinutes(setHours(date, 0), 0),
|
||||
end: setMinutes(setHours(date, employee.work_start), 0),
|
||||
start: dayStart,
|
||||
end: this._setMinutesToDate(employee.work_start, date),
|
||||
type: 'non-working-hours',
|
||||
split: i + 1,
|
||||
draggable: false
|
||||
@@ -111,14 +113,16 @@ export default {
|
||||
|
||||
events.push({
|
||||
title: "Non working hours",
|
||||
start: setMinutes(setHours(date, employee.work_end), 0),
|
||||
end: setMinutes(setHours(date, 23), 59),
|
||||
start: this._setMinutesToDate(employee.work_end, date),
|
||||
end: dayEnd,
|
||||
type: 'non-working-hours',
|
||||
split: i + 1,
|
||||
draggable: false
|
||||
})
|
||||
}
|
||||
|
||||
console.log(events)
|
||||
|
||||
return events
|
||||
},
|
||||
|
||||
@@ -130,5 +134,18 @@ export default {
|
||||
let diff =(date1.getTime() - date2.getTime()) / 1000;
|
||||
diff /= (60 * 60)
|
||||
return Math.abs(Math.round(diff))
|
||||
},
|
||||
|
||||
_getDayStartEnd(date) {
|
||||
return {
|
||||
start: this._setMinutesToDate(0, date),
|
||||
end: this._setMinutesToDate(1439, date)
|
||||
}
|
||||
},
|
||||
|
||||
_setMinutesToDate(minutes, date) {
|
||||
const newDate = new Date(date)
|
||||
newDate.setHours(Math.floor(minutes / 60), minutes % 60, 0, 0)
|
||||
return newDate
|
||||
}
|
||||
}
|
||||
Reference in new issue
Block a user