mirror of
https://framagit.org/les/gancio.git
synced 2025-01-31 16:42:22 +01:00
better calendar attributes to past events
This commit is contained in:
parent
eb719e287f
commit
321b9ea134
1 changed files with 18 additions and 5 deletions
|
@ -9,15 +9,24 @@ export function attributesFromEvents (_events, _tags) {
|
||||||
attributes.push({ key: 'today', dates: new Date(), bar: { color: 'green', fillMode: 'outline' } })
|
attributes.push({ key: 'today', dates: new Date(), bar: { color: 'green', fillMode: 'outline' } })
|
||||||
const now = dayjs().unix()
|
const now = dayjs().unix()
|
||||||
|
|
||||||
function getColor (event) {
|
function getColor (event, where) {
|
||||||
const color = { class: 'vc-rounded-full', color: 'blue' }
|
const color = { class: 'vc-rounded-full', color: 'blue', fillMode: where === 'base' ? 'light' : 'solid' }
|
||||||
const tag = get(event, 'tags[0]')
|
const tag = get(event, 'tags[0]')
|
||||||
if (event.start_datetime < now) { color.class += ' vc-past' }
|
if (event.start_datetime < now) {
|
||||||
|
if (event.multidate) {
|
||||||
|
color.fillMode = where === 'base' ? 'light' : 'outline'
|
||||||
|
if (where === 'base') {
|
||||||
|
color.class += ' vc-past'
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
color.class += ' vc-past'
|
||||||
|
}
|
||||||
|
}
|
||||||
if (!tag) { return color }
|
if (!tag) { return color }
|
||||||
const idx = tags.indexOf(tag)
|
const idx = tags.indexOf(tag)
|
||||||
if (idx < 0) { return color }
|
if (idx < 0) { return color }
|
||||||
color.color = colors[idx]
|
color.color = colors[idx]
|
||||||
if (event.start_datetime < now) { color.class += ' vc-past' }
|
// if (event.start_datetime < now) { color.class += ' vc-past' }
|
||||||
return color
|
return color
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -35,7 +44,11 @@ export function attributesFromEvents (_events, _tags) {
|
||||||
.filter(e => e.multidate)
|
.filter(e => e.multidate)
|
||||||
.map(e => ({
|
.map(e => ({
|
||||||
key: e.id,
|
key: e.id,
|
||||||
highlight: { start: { ...getColor(e), fillMode: 'solid' }, end: { ...getColor(e), fillMode: 'solid' } },
|
highlight: {
|
||||||
|
start: getColor(e),
|
||||||
|
base: getColor(e, 'base'),
|
||||||
|
end: getColor(e)
|
||||||
|
},
|
||||||
dates: { start: new Date(e.start_datetime * 1000), end: new Date(e.end_datetime * 1000) }
|
dates: { start: new Date(e.start_datetime * 1000), end: new Date(e.end_datetime * 1000) }
|
||||||
})))
|
})))
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue