forked from DGNum/metis
Utilise short_name
This commit is contained in:
parent
8628248b78
commit
d31a4bbcc4
2 changed files with 15 additions and 3 deletions
|
@ -1,5 +1,5 @@
|
||||||
<script>
|
<script>
|
||||||
import { Modal, ModalHeader, ModalBody, ModalFooter, Icon } from 'sveltestrap';
|
import { Modal, ModalHeader, ModalBody, ModalFooter, Icon, Badge } from 'sveltestrap';
|
||||||
|
|
||||||
export let event = undefined;
|
export let event = undefined;
|
||||||
export let open = undefined;
|
export let open = undefined;
|
||||||
|
@ -13,7 +13,14 @@
|
||||||
</script>
|
</script>
|
||||||
|
|
||||||
<Modal isOpen={open} {toggle} centered scrollable>
|
<Modal isOpen={open} {toggle} centered scrollable>
|
||||||
<ModalHeader {toggle}>{event.title}</ModalHeader>
|
<ModalHeader {toggle}>
|
||||||
|
<span class="pe-3">
|
||||||
|
<Badge color="custom" style="background-color:{event.backgroundColor}"
|
||||||
|
>{event.extendedProps.calendar}</Badge
|
||||||
|
>
|
||||||
|
</span>
|
||||||
|
<b>{event.extendedProps.short_name}</b>
|
||||||
|
</ModalHeader>
|
||||||
<ModalBody>
|
<ModalBody>
|
||||||
{#if event.extendedProps.description}
|
{#if event.extendedProps.description}
|
||||||
{#each event.extendedProps.description.split('\n') as line}
|
{#each event.extendedProps.description.split('\n') as line}
|
||||||
|
|
|
@ -55,6 +55,7 @@ class Calendar {
|
||||||
constructor(id, calendar) {
|
constructor(id, calendar) {
|
||||||
const metadata = calendars[id]
|
const metadata = calendars[id]
|
||||||
this.name = metadata.name
|
this.name = metadata.name
|
||||||
|
this.short_name = metadata.short_name
|
||||||
this.color = metadata.color || calendar[1][4][3]
|
this.color = metadata.color || calendar[1][4][3]
|
||||||
this.events = calendar[2]
|
this.events = calendar[2]
|
||||||
.filter(item => item[0] === 'vevent')
|
.filter(item => item[0] === 'vevent')
|
||||||
|
@ -75,12 +76,16 @@ function fcEventFromjCalEvent(cal) {
|
||||||
const start = new Date(evt.dtstart)
|
const start = new Date(evt.dtstart)
|
||||||
const end = new Date(evt.dtend)
|
const end = new Date(evt.dtend)
|
||||||
const fcEvent = {
|
const fcEvent = {
|
||||||
title: `${cal.name}: ${evt.summary}`,
|
title: `${cal.short_name ?? cal.name} : ${evt.summary}`,
|
||||||
start: evt.dtstart,
|
start: evt.dtstart,
|
||||||
end: evt.dtend,
|
end: evt.dtend,
|
||||||
color: cal.color,
|
color: cal.color,
|
||||||
duration: end - start // in ms
|
duration: end - start // in ms
|
||||||
}
|
}
|
||||||
|
console.log(cal)
|
||||||
|
|
||||||
|
fcEvent.calendar = cal.name
|
||||||
|
fcEvent.short_name = evt.summary
|
||||||
|
|
||||||
if (evt.description) {
|
if (evt.description) {
|
||||||
fcEvent.description = evt.description
|
fcEvent.description = evt.description
|
||||||
|
|
Loading…
Reference in a new issue