jjsm01/kimai2
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

calendar: update popover content when shown (#4045)

Browse Source
This commit is contained in:
Kevin Papst
2023-05-22 18:41:30 +02:00
committed by GitHub
parent 97092acae9
commit 2681b81990
6 changed files with 19 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
assets/js/widgets/KimaiCalendar.js
View File

@@ -220,15 +220,23 @@ export default class KimaiCalendar {
}
const element = mouseEnterInfo.el;
let popover = Popover.getInstance(element);
const popoverTitle = DATES.getFormattedDate(event.start) + ' | ' + DATES.formatTime(event.start) + ' - ' + (event.end ? DATES.formatTime(event.end) : '');
const popoverContent = this.renderEventPopoverContent(event);
if (popover === null) {
let popover = Popover.getInstance(element);
if (popover !== null) {
// see https://github.com/kimai/kimai/issues/4043
popover.setContent({
'.popover-header': popoverTitle,
'.popover-body': popoverContent
});
} else {
// https://getbootstrap.com/docs/5.0/components/popovers/#options
popover = new Popover(element, {
title: DATES.getFormattedDate(event.start) + ' | ' + DATES.formatTime(event.start) + ' - ' + (event.end ? DATES.formatTime(event.end) : ''),
title: popoverTitle,
placement: 'top',
html: true,
content: this.renderEventPopoverContent(event),
content: popoverContent,
trigger: 'focus',
});
}